2005-05-30 Michael Snyder <msnyder@redhat.com>

	Add support for writing tracepoint/checkpoint data to a file.

	* breakpoint.c (bpstat_stop_status): Add hook for interpreting
	breakpoints as tracepoints, enabling gdb to handle them directly
	by a "default" fallback method (writing data to a file).

	* tracepoint.c (default_tracepoint_method): New user-settable
	mode variable -- tells gdb to use a "default" (fallback) method
	for collecting tracepoint data.
	(trace_start_command, trace_stop_command, trace_status_command):
	Add "default" mode.

	(tracepoint_event_p, default_do_tracepoints_command): New
	functions, entry points into default tracepoint collection method.

	(checkpoint_open, checkpoint_close): Open / close checkpoint file.
	(checkpoint_command): Drop a checkpoint into checkpoint file.

	(emit_checkpoint_method1, emit_checkpoint_method2,
	emit_checkpoint_method3, emit_checkpoint_method4): Experimental
	methods for writing checkpoint/tracepoint data to a file.

	(checkpoint_emit_memrange, checkpoint_emit_gregs,
	checkpoint_emit_stack, checkpoint_emit_id, etc.):
	Support functions for writing checkpoint/tracepoint data.

	(get_tracepoint_by_address): New function.
	(validate_actionline): Add "$stack" pseudo-object for collection.
	(tracepoint_top_of_stack, tracepoint_size_of_stack):
	New user-settable variables.
	(encode_actions): Interpret "$stack" pseudo-object, collect stack.

	* tracepoint.h (default_trace_method, tracepoint_event_p):
	Exported interface for default tracepoint method.

3014 files changed, 654 insertions, 546321 deletions

diff --git a/compile b/compile
deleted file mode 100644
index 3d2170320ef..00000000000
--- a/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2004-10-12.08
-
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# 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.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit 0
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit 0
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 98a42e3adfd..436925a75a2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,40 @@
+2005-05-30  Michael Snyder  <msnyder@redhat.com>
+
+	Add support for writing tracepoint/checkpoint data to a file.
+
+	* breakpoint.c (bpstat_stop_status): Add hook for interpreting
+	breakpoints as tracepoints, enabling gdb to handle them directly
+	by a "default" fallback method (writing data to a file).
+	
+	* tracepoint.c (default_tracepoint_method): New user-settable
+	mode variable -- tells gdb to use a "default" (fallback) method
+	for collecting tracepoint data.
+	(trace_start_command, trace_stop_command, trace_status_command):
+	Add "default" mode.
+
+	(tracepoint_event_p, default_do_tracepoints_command): New 
+	functions, entry points into default tracepoint collection method.
+
+	(checkpoint_open, checkpoint_close): Open / close checkpoint file.
+	(checkpoint_command): Drop a checkpoint into checkpoint file.
+
+	(emit_checkpoint_method1, emit_checkpoint_method2, 
+	emit_checkpoint_method3, emit_checkpoint_method4): Experimental
+	methods for writing checkpoint/tracepoint data to a file.
+
+	(checkpoint_emit_memrange, checkpoint_emit_gregs, 
+	checkpoint_emit_stack, checkpoint_emit_id, etc.): 
+	Support functions for writing checkpoint/tracepoint data.
+	
+	(get_tracepoint_by_address): New function.
+	(validate_actionline): Add "$stack" pseudo-object for collection.
+	(tracepoint_top_of_stack, tracepoint_size_of_stack): 
+	New user-settable variables.
+	(encode_actions): Interpret "$stack" pseudo-object, collect stack.
+
+	* tracepoint.h (default_trace_method, tracepoint_event_p):
+	Exported interface for default tracepoint method.
+
 2005-05-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* config/djgpp/fnchange.lst: Add mappings for linux-ppc-low.c and
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index c8e15d91554..cb11c6a3d8e 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -26,6 +26,7 @@
 #include "symtab.h"
 #include "frame.h"
 #include "breakpoint.h"
+#include "tracepoint.h"	/* for default tracepoint method */
 #include "gdbtypes.h"
 #include "expression.h"
 #include "gdbcore.h"
@@ -2841,6 +2842,14 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid, int stopped_by_watchpoint)
 	real_breakpoint = 1;
       }
 
+    /* tracepoint */
+    /* OK -- if we put the action here, it means we will
+       check for a tracepoint if a watchpoint has triggered, 
+       or if we have a breakpoint at the current PC.  By
+       checking now, we will NOT honor the breakpoint's 
+       condition if any.  We would do that later.  */
+
+
     if (frame_id_p (b->frame_id)
 	&& !frame_id_eq (b->frame_id, get_frame_id (get_current_frame ())))
       bs->stop = 0;
@@ -2880,20 +2889,37 @@ bpstat_stop_status (CORE_ADDR bp_addr, ptid_t ptid, int stopped_by_watchpoint)
 	  }
 	else
 	  {
-	    /* We will stop here */
-	    if (b->disposition == disp_disable)
-	      b->enable_state = bp_disabled;
-	    if (b->silent)
-	      bs->print = 0;
-	    bs->commands = b->commands;
-	    if (bs->commands &&
-		(strcmp ("silent", bs->commands->line) == 0
-		 || (xdb_commands && strcmp ("Q", bs->commands->line) == 0)))
+	    /* tracepoint */
+	    /* If we put the check here, we can honor the breakpoint's
+	       condition and/or ignore-count and/or thread, if any.  */
+
+	    if (default_trace_method && tracepoint_event_p ())
 	      {
-		bs->commands = bs->commands->next;
+		/* This breakpoint has been handled as a tracepoint.
+		   Don't stop.  */
+		bs->stop = 0;
 		bs->print = 0;
+		/* hit_count -- should we consider this a hit?  */
+	      }
+	    else
+	      {
+		/* Not tracepoint -- back to your regularly scheduled
+		   breakpoint handling.  */
+		/* We will stop here */
+		if (b->disposition == disp_disable)
+		  b->enable_state = bp_disabled;
+		if (b->silent)
+		  bs->print = 0;
+		bs->commands = b->commands;
+		if (bs->commands &&
+		    (strcmp ("silent", bs->commands->line) == 0
+		     || (xdb_commands && strcmp ("Q", bs->commands->line) == 0)))
+		  {
+		    bs->commands = bs->commands->next;
+		    bs->print = 0;
+		  }
+		bs->commands = copy_command_lines (bs->commands);
 	      }
-	    bs->commands = copy_command_lines (bs->commands);
 	  }
       }
     /* Print nothing for this entry if we dont stop or if we dont print.  */
diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
deleted file mode 100644
index f2a1569f6fa..00000000000
--- a/gdb/gdbtk/ChangeLog
+++ /dev/null
@@ -1,62 +0,0 @@
-2005-05-26  Keith Seitz  <keiths@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_set_mem): target_write_memory now takes
-	gdb_byte* instead of char*.
-	* generic/gdbtk-register.c (get_register): frame_register and val_print
-	take gdb_byte* instead of char*.
-	* generic/gdbtk-wrapper.c: Ditto the val_print part.
-
-	From Paul Schlie  <schlie@comcast.net>:
-	* generic/gdbtk-bp.c (gdb_set_bp): Use lbasename instead of basename.
-	* generic/gdbtk-cmds.c (gdb_listfiles): Likewise.
-
-2005-04-28  Ben Elliston  <bje@au.ibm.com>
-
-	* generic/gdbtk-interp.c (gdbtk_interpreter_exec): Return struct
-	gdb_exception due to the 2005-04-26 renaming of struct exception.
-	* generic/gdbtk.c (gdbtk_source_start_file): Likewise.
-
-2005-02-25  Keith Seitz  <kseitz@sources.redhat.com>
-
-	* generic/gdbtk.c (gdbtk_source_start_file): In the _WIN32 case,
-	use throw_exception (struct exception).
-
-2005-02-16  Martin Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-stack.c (get_frame_name): Replace
-	print_address_numeric with deprecated_print_address_numeric.
-	* generic/gdbtk-cmds.c (gdbtk_load_asm): Ditto.
-
-2005-02-07  Keith Seitz  <kseitz@sources.redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_eval): VALUE_EMBEDDED_OFFSET and
-	VALUE_CONTENTS are now functions.
-
-
-2005-01-19  Keith Seitz  <kseitz@sources.redhat.com>
-
-	* Makefile.in: Regenerate.
-	* aclocal.m4: Regenerate.
-	* plugins/Makefile.in; Regenerate.
-	* plugins/aclocal.m4: Regenerate.
-
-2005-01-17  Keith Seitz  <kseitz@sources.redhat.com>
-
-	* generic/gdbtk-varobj.c (variable_value): Remove all instances
-	of error_last_message. It's gone.
-
-	* generic/gdbtk-wrapper.c: Include exceptions.h
-	* generic/gdbtk-cmds.c: Likewise.
-	* generic/gdbtk-interp.c: Likewise.
-	(gdbtk_interpreter_exec): Change return type to struct
-	exception. Return exception_none.	
-
-2005-01-13  Keith Seitz  <keiths@redhat.com>
-
-	* configure.in: Rename to ...
-	* configure.ac: ... this.
-	* configure: Regenerate with autoconf 2.59.
-	* plugins/configure.in: Rename to ...
-	* plugins/configure.ac: ... this.
-	* pluginx/configure: Regenerate with autoconf 2.59.
-
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/ChangeLog-2003 b/gdb/gdbtk/ChangeLog-2003
deleted file mode 100644
index 5a005a2aafc..00000000000
--- a/gdb/gdbtk/ChangeLog-2003
+++ /dev/null
@@ -1,431 +0,0 @@
-2003-12-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* generic/gdbtk-bp.c: Change calls to decode_line_1 to add
-	new NULL parameter.
-	* generic/gdbtk-cmds.c: Ditto.
-	* generic/gdbtk-stack.c: Ditto.
-
-2003-12-11  Jim Blandy  <jimb@redhat.com>
-
-	* library/prefs.tcl (pref_read): The section marker or the word
-	'option' must be the first thing on the line; they don't count if
-	they appear in the middle of the line.
-
-2003-11-24  David Carlton  <carlton@kealia.com>
-
-	* generic/gdbtk.c (target_is_native): Replace STREQ by strcmp.
-	* generic/gdbtk-cmds.c (gdb_stop): Replace STREQ by strcmp.
-	(gdb_search): Replace STREQN by strncmp and DEPRECATED_SYMBOL_NAME
-	by SYMBOL_LINKAGE_NAME.
-	* generic/gdbtk-varobj.c (variable_format): Replace STREQN by
-	strncmp.
-
-2003-11-11  David Carlton  <carlton@kealia.com>
-
-	* generic/gdbtk-bp.c (gdb_find_bp_at_addr): Replace use of
-	BREAKPOINT->address by BREAKPOINT->loc->address.
-	(gdb_get_breakpoint_info): Ditto.
-
-2003-10-06  David Carlton  <carlton@kealia.com>
-
-	* generic/gdbtk-register.c (get_register_size): Replace
-	REGISTER_RAW_SIZE by DEPRECATED_REGISTER_RAW_SIZE.
-	(get_register, register_changed_p): Ditto.
-
-2003-09-30  David Carlton  <carlton@kealia.com>
-
-	* generic/gdbtk-register.c (get_register): Replace
-	REGISTER_VIRTUAL_SIZE by
-	DEPRECATED_REGISTER_VIRTUAL_SIZE.
-
-2003-09-08  Andrew Cagney  <cagney@redhat.com>
-
-	* generic/gdbtk-cmds.c: Include "disasm.h".
-	(gdbtk_load_asm): Use "gdb_print_insn" instead of
-	TARGET_PRINT_INSN .
-	(gdb_disassemble_driver): Delete code referencing
-	"deprecated_tm_print_insn_info".  Delete "di" and "di_initialized"
-	and any code initializing those variables.  Pass NULL as "di"
-	parameter to "print_asm_fn".
-	(disassemble_from_exec): Mention that it is unused.
-
-2003-08-05  Andrew Cagney  <cagney@redhat.com>
-
-	* generic/gdbtk-register.c (gdb_reggrouplist): Update, use
-	reggroup_next.
-	(gdb_reggroup): Ditto.
-
-2003-08-04  David Carlton  <carlton@kealia.com>
-
-	* generic/gdbtk.c (gdbtk_source_start_file): Add "%s" first
-	argument to error call.
-	(tk_command): Ditto.
-	(view_command): Ditto.
-
-2003-07-29  Martin Hunt  <hunt@redhat.com>
-
-	* library/prefs.tcl (pref_set_option_db): On Windows, fix 
-	highlighting of buttons.  On Unix, fix highlighting of
-	menus.
-
-2003-07-10  Martin Hunt  <hunt@redhat.com>
-
-	* library/prefs.tcl (pref_set_option_db): Only set 
-	activeBackground for Unix.
-
-2003-07-02  Martin Hunt  <hunt@redhat.com>
-
-	* library/prefs.tcl (pref_set_option_db): Only
-	set checkbutton select color for Unix.  Fixes Windows
-	checkbutton problem.
-
-2003-06-26  Keith R Seitz  <keiths@redhat.com>
-
-	From Roland Schwingel <Roland.Schwingel@onevision.de>:
-	* generic/gdbtk-cmds.c (gdb_find_file_command): If filename
-	is already an absolute filename, try stat'ing it before searching
-	symtabs.
-
-2003-06-13  Martin Hunt  <hunt@redhat.com>
-
-	* library/prefs.tcl (load_gnome_file): Fix parsing
-	of gtk theme files so Red Hat 9 (and others) GNOME colors 
-	are correct.
-
-2003-06-11  David Carlton  <carlton@bactrian.org>
-
-	* generic/gdbtk-stack.c: Include dictionary.h.
-	(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
-	(gdb_get_blocks, gdb_get_vars_command): Ditto.
-	* generic/gdbtk-cmds.c: Include dictionary.h.
-	(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
-
-2003-06-11  David Carlton  <carlton@bactrian.org>
-
-	* generic/gdbtk-register.c (get_register): REGISTER_CONVERTIBLE
-	and REGISTER_CONVERT_TO_VIRTUAL are deprecated.
-
-2003-05-12  Elena Zannoni  <ezannoni@redhat.com>
-
-        * generic/gdbtk-cmds.c (gdb_search): Replace namespace_enum
-        with domain_emum, and *_NAMESPACE with *_DOMAIN.
-
-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-2004 b/gdb/gdbtk/ChangeLog-2004
deleted file mode 100644
index 07201506650..00000000000
--- a/gdb/gdbtk/ChangeLog-2004
+++ /dev/null
@@ -1,209 +0,0 @@
-2004-12-13  Ben Elliston  <bje@au.ibm.com>
-
-	Remove some warnings:
-	* generic/gdbtk-hooks.c (gdbtk_pre_add_symbol): Cast `name'.
-	* generic/gdbtk-cmds.c (gdbtk_dis_asm_read_memory): Remove.
-
-2004-12-08  Keith Seitz  <kseitz@sources.redhat.com>
-
-	* library/download.ith (completed_steps): New variable.
-	* library/download.itb (Download::constructor): Remove
-	"-fraction" option from iwidgets feedback widget. It's not a valid
-	option!
-	(update_download): Compute the step number and use that to
-	update the feedback widget.
-	(done): Use completed_steps to figure out how many steps
-	the dumb feedback meter needs to show full.
-	(download_it): Initialize completed_steps.
-	
-2004-11-18  Keith Seitz  <kseitz@sources.redhat.com>
-
-	* generic/gdbtk-wrapper.c (wrap_type_print): Use value_type instead
-	of VALUE_TYPE.
-	* generic/gdbtk-cmds.c (gdb_eval): Likewise.
-
-2004-10-31  David Lecomber <dsl@sources.redhat.com>
-	* generic/gdbtk-register.c: Add message parameter
-	to call of get_selected_frame.
-
-2004-08-27  Martin Hunt  <hunt@redhat.com>
-
-	* library/ipc.tcl: New file.
-	* library/ipcpref.ith: New file.
-	* library/ipcpref.itb: New file.
-
-	* library/srcwin.itb (SrcWin::inferior): Call ipc
-	send if enabled.
-	
-	* library/prefs.tcl (pref_set_defaults): Enable color
-	schemes by default. Add IPC defaults.
-	
-	* library/srcbar.itcl (create_pref_menu): Create
-	"Advanced" cascade menu and put "Edit Color Schemes"
-	and "IPC Support" under it.
-
-	* library/managedwin.itb (ManagedWin::destructor): 
-	If IPC enabled then send "quit" on exit.
-	
-	* library/main.tcl: Start IPC if enabled.
-
-	* library/prefs.tcl (pref_set_defaults): Add IPC defaults.
-
-	* library/gdbmenubar.itcl (menubar_get_current_menu): 
-	New method.
-
-2004-08-09  Ben Elliston  <bje@au.ibm.com>
-
-	* generic/gdbtk-register.c (get_register_size): Use
-	register_size() instead of DEPRECATED_REGISTER_RAW_SIZE.
-	(get_register): Likewise.
-	(register_changed_p): Likewise.
-
-2004-07-02  Martin Hunt  <hunt@redhat.com>
-
-	* library/targetselection.itb: Use /dev/comX for
-	cygwin instead of just comX.
-
-	* library/interface.tcl (gdbtk_tcl_preloop): Set baud rate.
-
-2004-07-02  Martin Hunt  <hunt@redhat.com>
-	
-	* generic/gdbtk-cmds.c (symtab_to_filename): New function. Like
-	symtab_to_fullname() but returns the filename if the fullname 
-	cannot be found.
-	
-	* generic/gdbtk-cmds.c (gdb_find_file_command): Revert
-	patch of 2004-06-11. Use symtab_to_filename() again.
-	(gdb_loc): Ditto.
-	(gdb_loadfile): Ditto.
-	* generic/gdbtk-bp.c (gdb_get_breakpoint_info): Ditto.
-	(gdb_get_tracepoint_info): Ditto.
-
-	* generic/gdbtk-cmds.h: Declare symtab_to_filename().
-
-2004-06-26  Andrew Cagney  <cagney@gnu.org>
-
-	* generic/gdbtk-hooks.c (gdbtk_add_hooks): Call
-	deprecated_set_gdb_event_hooks.
-
-2004-06-25  Andrew Cagney  <cagney@gnu.org>
-
-	* generic/gdbtk.h: "ui_loop_hook" was deprecated, update.
-	* generic/gdbtk-hooks.c (gdbtk_add_hooks, x_event): Ditto.
-	* generic/gdbtk-cmds.c: Ditto.
-
-2004-06-24  Andrew Cagney  <cagney@gnu.org>
-
-	* generic/gdbtk-hooks.c (gdbtk_add_hooks): Update references to
-	pre_add_symbol_hook and post_add_symbol_hook, both deprecated.
-	* library/interface.tcl (gdbtk_memory_changed): Update comments.
-	
-2004-06-24  Andrew Cagney  <cagney@gnu.org>
-
-	* generic/gdbtk-hooks.c (ui_loop_hook, pre_add_symbol_hook)
-	(post_add_symbol_hook, selected_frame_level_changed_hook): Delete
-	extern declarations.
-
-2004-06-15  Alan Modra  <amodra@bigpond.net.au>
-
-	* generic/gdbtk-cmds.c (gdb_load_info): Use bfd_get_section_size
-	instead of bfd_get_section_size_before_reloc.
-
-2004-06-11  Martin Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-cmds.c (gdb_find_file_command): Use
-	symtab_to_fullname() instead of symtab_to_filename().
-	(gdb_loc): Ditto.
-	(gdb_loadfile): Ditto.
-	* generic/gdbtk-bp.c (gdb_get_breakpoint_info): Ditto.
-	(gdb_get_tracepoint_info): Ditto.	
-
-	* generic/gdbtk-register.c (get_register): Simplify and remove
-	references to DEPRECATED_REGISTER_CONVERT_TO_VIRTUAL.
-
-2004-05-27  Martin Hunt  <hunt@redhat.com>
-
-	* library/tdump.tcl (build_win): Remove old nonworking
-	code to select scrolledtext mode.  Just use "dynamic".
-
-2004-04-22  Keith Seitz  <kseitz@sources.redhat.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_add_hooks): "Update" deprecated hooks.
-	"Houston... We have a problem."
-	* generic/gdbtk-interp.c (gdbtk_interpreter_resume): Likewise.
- 	* generic/gdbtk.c (gdbtk_init_1): Likewise.
-	
-2004-04-19  Roland McGrath  <roland@redhat.com>
-
-	* generic/gdbtk-hooks.c: Update gdbtk_pre_add_symbol forward decl to
-	match defn type change.
-
-2004-04-15  Roland McGrath  <roland@redhat.com>
-
-	* generic/gdbtk-hooks.c (gdbtk_pre_add_symbol): Add const to arg type.
-	(pre_add_symbol): Likewise in extern decl.
-
-2004-04-05  Martin Hunt  <hunt@redhat.com>
-
-	* library/session.tcl: Make hostname and portname
-	session-dependent. Add gdb_bg_num (the color
-	scheme number) as a per-session variable.
-
-	* library/prefs.tcl (pref_read): If color schemes are in use,
-	set colors based on the current scheme.
-	(pref_save): Add "bg" section.
-	(pref_set_defaults): Define new variable gdb/use_color_schemes
-	and define 16 default background colors.
-
-	* library/managedwin.itb (ManagedWin::window_name): Append
-	window "instance" string to window name.
-	(ManagedWin::window_instance): Set window instance string.
-
-	* library/debugwin.itb: Add a reconfig method to restore
-	unique black textbackground, overriding color scheme.
-
-	* library/csprefs.itb:
-	* library/csprefs.ith: New files. Implement color scheme
-	preferences.
-
-	* library/util.tcl (set_bg_colors): New function.
-	(r_setcolors): New function.
-
-	* library/regwin.itb (_prefs_changed): Deleted.
-	(reconfig): New function.  Updates tkTable color tags
-	if color scheme changes.
-	* library/regwin.ith: Update to reflect above changes.
-
-	* library/srcbar.itcl (create_pref_menu): Add pulldown
-	menus for "Edit Color Schemes..." and "Use Color Schemes".
-	(reconfig): Fix up menu items for color schemes.
-
-	* library/globalpref.itb (_init_var): Add
-	gdb/use_color_schemes to variable list.
-	(_build_win): Add a checkbutton to enable/disable
-	color schemes.
-
-	* library/gdbmenubar.itcl (menubar_add_cascade): Add a class
-	argument so cascade menus can be managed by class too.
-
-	* library/interface.tcl (gdbtk_tcl_fputs): Check for
-	existence of gdbtk_state(console).  Stops annoying error
-	messages.
-	(gdbtk_tcl_fputs_error): Ditto.
-	(gdbtk_tcl_fputs_log): Ditto.
-
-2004-03-29  Martin Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-register.c (map_arg_registers): If a specific
-	register was requested, just return it without validating it
-	has a name.
-	(get_register): Check DEPRECATED_REGISTER_CONVERTIBLE_P ().
-
-2004-02-17  Martin Hunt  <hunt@redhat.com>
-
-	* generic/gdbtk-register.c (Gdbtk_Register_Init): Replace
-	calls to register_gdbarch_swap with deprecated_register_gdbarch_swap.
-
-	* library/srcwin.itb: Remove an apparently redundant call
-	to gdbtk_locate_main and location. This actually broke in
-	situations where no source files were found.
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 fa1492cacdf..00000000000
--- a/gdb/gdbtk/Makefile.in
+++ /dev/null
@@ -1,391 +0,0 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  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.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
-	README ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/../../mkinstalldirs
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES =
-depcomp =
-am__depfiles_maybe =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = cygnus
-SUBDIRS = plugins
-all: all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-uninstall-info-am:
-
-# 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.
-$(RECURSIVE_TARGETS):
-	@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; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	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
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-am:
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive distclean distclean-generic \
-	distclean-recursive distclean-tags dvi dvi-am html html-am \
-	info info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am
-
-# 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 62f670bb1a1..00000000000
--- a/gdb/gdbtk/aclocal.m4
+++ /dev/null
@@ -1,943 +0,0 @@
-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-# This file 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.
-
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# 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
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.3])])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright (C) 2001, 2003 Free Software Foundation, 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, 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, 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, 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.
-
-# serial 6
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
-# serial 7						-*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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, 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.
-
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, 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, 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.
-
-#serial 2
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# 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.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, 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, 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.
-
-# serial 11
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])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
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, 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, 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.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, 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, 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.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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, 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.
-
-# serial 3
-
-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
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, 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, 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.
-
-# serial 2
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-#  -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, 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, 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.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, 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, 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.
-
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, 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, 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.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, 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, 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.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# 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 conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $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]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, 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, 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.
-
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
diff --git a/gdb/gdbtk/configure b/gdb/gdbtk/configure
deleted file mode 100755
index 4116160096f..00000000000
--- a/gdb/gdbtk/configure
+++ /dev/null
@@ -1,3706 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="generic/gdbtk.h"
-ac_subdirs_all="$ac_subdirs_all plugins"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT subdirs LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --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
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in ../.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $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
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# 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"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /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
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-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 "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&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}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f conftest*
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-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"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 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 conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&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 "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:$LINENO: checking for working aclocal" >&5
-echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:$LINENO: checking for working autoconf" >&5
-echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:$LINENO: checking for working automake" >&5
-echo $ECHO_N "checking for working automake... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:$LINENO: checking for working autoheader" >&5
-echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:$LINENO: checking for working makeinfo" >&5
-echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-    # 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 "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&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.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 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 conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-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 $# != 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
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&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 "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-subdirs="$subdirs plugins"
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@subdirs@,$subdirs,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-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=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d $srcdir/$ac_dir || continue
-
-    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
-echo "$as_me: configuring in $ac_dir" >&6;}
-    { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-    cd $ac_dir
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-    elif test -f $ac_srcdir/configure; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-    elif test -f $ac_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&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_top_builddir$cache_file ;;
-      esac
-
-      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval $ac_sub_configure $ac_sub_configure_args \
-	   --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/gdb/gdbtk/configure.ac b/gdb/gdbtk/configure.ac
deleted file mode 100644
index 5925d6b84e0..00000000000
--- a/gdb/gdbtk/configure.ac
+++ /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 c4be8490239..00000000000
--- a/gdb/gdbtk/generic/gdbtk-bp.c
+++ /dev/null
@@ -1,995 +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 "source.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]->loc->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->loc->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->loc->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->loc->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", lbasename (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, NULL);
-  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 13e3467d6c4..00000000000
--- a/gdb/gdbtk/generic/gdbtk-cmds.c
+++ /dev/null
@@ -1,3009 +0,0 @@
-/* Tcl/Tk command definitions for Insight.
-   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
-   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"
-#include "dictionary.h"
-#include "filenames.h"
-#include "disasm.h"
-#include "value.h"
-#include "exceptions.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.  */
-/* NOTE: cagney/2003-09-08: This variable is unused.  */
-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 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 deprecated_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 (strcmp (s, "detach") == 0)
-	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 (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, NULL);
-  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, NULL);
-  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, NULL);
-  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 = NULL;
-
-  if (objc != 2)
-    {
-      Tcl_WrongNumArgs (interp, 1, objv, "filename");
-      return TCL_ERROR;
-    }
-
-  filename = Tcl_GetStringFromObj (objv[1], NULL);
-
-  /* Shortcut: There seems to be some mess in gdb dealing with
-     files. While we should let gdb sort it out, it doesn't hurt
-     to be a little defensive here.
-
-     If the filename is already an absolute filename, just try
-     to stat it. If it's not found, then ask gdb to find it for us. */
-  if (IS_ABSOLUTE_PATH (filename))
-    {
-      struct stat st;
-      const int status = stat (filename, &st);
-
-      if (status == 0)
-	{
-	  if (S_ISREG (st.st_mode))
-	    fullname = filename;
-	}
-    }
-  else
-    {
-      /* Ask gdb to find the file for us. */
-      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;
-	}
-
-      fullname =
-	(st->fullname == NULL ? symtab_to_filename (st) : 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;
-  const char *lastfile, *pathname = NULL;
-  const char **files;
-  int files_size;
-  int i, numfiles = 0, len = 0;
-
-  files_size = 1000;
-  files = (const 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 = (const char **) xrealloc (files, sizeof (char *) * files_size);
-	}
-      if (psymtab->filename)
-	{
-	  if (!len || !strncmp (pathname, psymtab->filename, len)
-	      || !strcmp (psymtab->filename, lbasename (psymtab->filename)))
-	    {
-	      files[numfiles++] = lbasename (psymtab->filename);
-	    }
-	}
-    }
-
-  ALL_SYMTABS (objfile, symtab)
-    {
-      if (numfiles == files_size)
-	{
-	  files_size = files_size * 2;
-	  files = (const 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, lbasename (symtab->filename)))
-	    {
-	      files[numfiles++] = lbasename (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;
-  domain_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_DOMAIN;
-      break;
-    case SEARCH_VARIABLES:
-      space = VARIABLES_DOMAIN;
-      break;
-    case SEARCH_TYPES:
-      space = TYPES_DOMAIN;
-      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
-	   && strncmp (SYMBOL_LINKAGE_NAME (p->symbol), "__tf", 4) != 0
-	   && strncmp (SYMBOL_LINKAGE_NAME (p->symbol), "_GLOBAL_", 8) != 0)
-	  || 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;
-  struct dict_iterator iter;
-  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, iter, 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;
-    }
-}
-
-
-/* FIXME: cagney/2003-09-08: "di" is not used and unneeded.  */
-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);
-
-  deprecated_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];
-  /* FIXME: cagney/2003-09-08: This should use gdb_disassembly.  */
-  insn = gdb_print_insn (pc, gdb_stdout);
-  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;
-
-  /* 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;
-	      /* FIXME: cagney/2003-09-08: This entire function should
-                 be replaced by gdb_disassembly.  */
-	      pc = print_asm_fn (clientData, pc, NULL);
-            }
-        }
-    }
-  else
-    {
-    assembly_only:
-      for (pc = low; pc < high; )
-        {
-          QUIT;
-	  /* FIXME: cagney/2003-09-08: This entire function should be
-	     replaced by gdb_disassembly.  */
-	  pc = print_asm_fn (clientData, pc, NULL);
-        }
-    }
-
-  return TCL_OK;
-}
-
-/* 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;
-  gdb_byte 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, (char *) 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;
-}
-
-/* Another function that was removed in GDB and replaced
- * with something similar, but different enough to break
- * Insight.
- */
-int find_and_open_source (struct objfile *objfile, const char *filename,
-			  const char *dirname, char **fullname);
-
-char *
-symtab_to_filename (struct symtab *s)
-{
-
-  int r;
-
-  if (!s)
-    return NULL;
-
-  /* Don't check s->fullname here, the file could have been 
-     deleted/moved/..., look for it again */
-  r = find_and_open_source (s->objfile, s->filename, s->dirname,
-			    &s->fullname);
-  if (r)
-    close (r);
-
-  if (s->fullname && *s->fullname)
-      return s->fullname;
-  return s->filename;
-}
diff --git a/gdb/gdbtk/generic/gdbtk-cmds.h b/gdb/gdbtk/generic/gdbtk-cmds.h
deleted file mode 100644
index a659b382d00..00000000000
--- a/gdb/gdbtk/generic/gdbtk-cmds.h
+++ /dev/null
@@ -1,60 +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);
-
-/* replacement for removed gdb function */
-char *symtab_to_filename (struct symtab *s);
-
-#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 c01a30573e4..00000000000
--- a/gdb/gdbtk/generic/gdbtk-hooks.c
+++ /dev/null
@@ -1,791 +0,0 @@
-/* Startup code for Insight.
-
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 200, 2002, 2003, 2004 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);
-
-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 (const 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;
-  deprecated_set_gdb_event_hooks (&handlers);
-
-  /* Hooks */
-  deprecated_call_command_hook = gdbtk_call_command;
-  deprecated_set_hook = gdbtk_set_hook;
-  deprecated_readline_begin_hook = gdbtk_readline_begin;
-  deprecated_readline_hook = gdbtk_readline;
-  deprecated_readline_end_hook = gdbtk_readline_end;
-
-  deprecated_print_frame_info_listing_hook = gdbtk_print_frame_info;
-  deprecated_query_hook = gdbtk_query;
-  deprecated_warning_hook = gdbtk_warning;
-
-  deprecated_interactive_hook = gdbtk_interactive;
-  deprecated_target_wait_hook = gdbtk_wait;
-  deprecated_ui_load_progress_hook = gdbtk_load_hash;
-
-  deprecated_ui_loop_hook = x_event;
-  deprecated_pre_add_symbol_hook = gdbtk_pre_add_symbol;
-  deprecated_post_add_symbol_hook = gdbtk_post_add_symbol;
-  deprecated_file_changed_hook = gdbtk_file_changed;
-  specify_exec_file_hook (gdbtk_exec_file_display);
-
-  deprecated_trace_find_hook = gdbtk_trace_find;
-  deprecated_trace_start_stop_hook = gdbtk_trace_start_stop;
-
-  deprecated_attach_hook            = gdbtk_attach;
-  deprecated_detach_hook            = gdbtk_detach;
-
-  deprecated_register_changed_hook = gdbtk_register_changed;
-  deprecated_memory_changed_hook = gdbtk_memory_changed;
-  deprecated_selected_frame_level_changed_hook = gdbtk_selected_frame_changed;
-  deprecated_context_hook = gdbtk_context_change;
-
-  deprecated_error_begin_hook = gdbtk_error_begin;
-
-  deprecated_annotate_signal_hook = gdbtk_annotate_signal;
-  deprecated_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 deprecated_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 deprecated_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 deprecated_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 (const char *name)
-{
-  gdbtk_two_elem_cmd ("gdbtk_tcl_pre_add_symbol", (char *) 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 0e668352f3a..00000000000
--- a/gdb/gdbtk/generic/gdbtk-interp.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Insight Definitions for GDB, the GNU debugger.
-   Written by Keith Seitz <kseitz@sources.redhat.com>
-
-   Copyright 2003, 2004 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 "exceptions.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;
-
-  deprecated_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 struct gdb_exception
-gdbtk_interpreter_exec (void *data, const char *command_str)
-{
-  return exception_none;
-}
-
-/* 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 04c5cf3d549..00000000000
--- a/gdb/gdbtk/generic/gdbtk-register.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* Tcl/Tk command definitions for Insight - Registers
-   Copyright 2001, 2002, 2004 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 ();
-
-  deprecated_register_gdbarch_swap (&old_regs, sizeof (old_regs), NULL);
-  deprecated_register_gdbarch_swap (&regformat, sizeof (regformat), NULL);
-  deprecated_register_gdbarch_swap (&regtype, sizeof (regtype), NULL);
-  deprecated_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_size (current_gdbarch, 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;
-  gdb_byte 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 (NULL), regnum, &optim, &lval, 
-		  &addr, &realnum, buffer);
-
-  if (optim)
-    {
-      Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr,
-				Tcl_NewStringObj ("Optimized out", -1));
-      return;
-    }
-
-  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_size (current_gdbarch, regnum); j++)
-	{
-	  int idx = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG ? j
-	    : register_size (current_gdbarch, regnum) - 1 - j;
-	  sprintf (ptr, "%02x", (unsigned char) 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)), buffer, 0, 0,
-		     stb, format, 1, 0, Val_pretty_default);
-	}
-      else
-	val_print (reg_vtype, 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)
-	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_size (current_gdbarch, regnum)) == 0)
-    return;
-
-  /* Found a changed register.  Save new value and return its number. */
-
-  memcpy (&old_regs[regnum * MAX_REGISTER_SIZE], raw_buffer,
-	  register_size (current_gdbarch, 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 *group;
-  int i = 0;
-
-  if (objc != 0)
-    {
-      Tcl_WrongNumArgs (interp, 0, objv, "gdb_reginfo grouplist");
-      return TCL_ERROR;
-    }
-
-  for (group = reggroup_next (current_gdbarch, NULL);
-       group != NULL;
-       group = reggroup_next (current_gdbarch, group))
-    {
-      if (reggroup_type (group) == USER_REGGROUP)
-	Tcl_ListObjAppendElement (NULL, result_ptr->obj_ptr, Tcl_NewStringObj (reggroup_name (group), -1));
-    }
-  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 *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 = reggroup_next (current_gdbarch, NULL);
-       group != NULL;
-       group = reggroup_next (current_gdbarch, 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 9cf8975ffa2..00000000000
--- a/gdb/gdbtk/generic/gdbtk-stack.c
+++ /dev/null
@@ -1,623 +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 "dictionary.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;
-  struct dict_iterator iter;
-  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, iter, 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;
-  struct dict_iterator iter;
-  int 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, iter, 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;
-  struct dict_iterator iter;
-  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, NULL);
-      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, iter, 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)
-	{
-	  deprecated_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 c67085a2c5d..00000000000
--- a/gdb/gdbtk/generic/gdbtk-varobj.c
+++ /dev/null
@@ -1,611 +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 (strncmp (fmt, "natural", len) == 0)
-	varobj_set_display_format (var, FORMAT_NATURAL);
-      else if (strncmp (fmt, "binary", len) == 0)
-	varobj_set_display_format (var, FORMAT_BINARY);
-      else if (strncmp (fmt, "decimal", len) == 0)
-	varobj_set_display_format (var, FORMAT_DECIMAL);
-      else if (strncmp (fmt, "hexadecimal", len) == 0)
-	varobj_set_display_format (var, FORMAT_HEXADECIMAL);
-      else if (strncmp (fmt, "octal", len) == 0)
-	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))
-            {
-	      gdbtk_set_result (interp, "Could not assign expression to variable object");
-	      return TCL_ERROR;
-            }
-	}
-
-      Tcl_ResetResult (interp);
-      return TCL_OK;
-    }
-
-  r = varobj_get_value (var);
-
-  if (r == NULL)
-    {
-      gdbtk_set_result (interp, "Could not read variable object value after assignment");
-      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 e49f1732365..00000000000
--- a/gdb/gdbtk/generic/gdbtk-wrapper.c
+++ /dev/null
@@ -1,722 +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 "exceptions.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;
-  const gdb_byte *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 = (gdb_byte *) (*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 778b082c4bd..00000000000
--- a/gdb/gdbtk/generic/gdbtk.c
+++ /dev/null
@@ -1,771 +0,0 @@
-/* Startup code for Insight
-   Copyright 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004
-   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"
-#include "exceptions.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 (strcmp (name, "exec") == 0 || strcmp (name, "hpux-threads") == 0
-      || strcmp (name, "child") == 0 || strcmp (name, "procfs") == 0
-      || strcmp (name, "solaris-threads") == 0
-      || strcmp (name, "linuxthreads") == 0
-      || strcmp (name, "multi-thread") == 0)
-    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).  Unfortunately 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);
-      {
-        struct gdb_exception e;
-        e.reason  = RETURN_ERROR;
-        e.error   = GENERIC_ERROR;
-        e.message = msg;
-        throw_exception (e);
-      }
-#else
-      /* FIXME: cagney/2002-04-17: Wonder what the lifetime of
-	 ``msg'' is - does it need a cleanup?  */
-      error ("%s", 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;
-  deprecated_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)
-    deprecated_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 ("%s", 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 ("%s", 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 c46b285b509..00000000000
--- a/gdb/gdbtk/generic/gdbtk.h
+++ /dev/null
@@ -1,189 +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 deprecated_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/cspref.itb b/gdb/gdbtk/library/cspref.itb
deleted file mode 100644
index 900f721ab41..00000000000
--- a/gdb/gdbtk/library/cspref.itb
+++ /dev/null
@@ -1,152 +0,0 @@
-# Color Scheme preferences dialog for Insight.
-# Copyright 2004 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 CSPref::constructor {args} {
-  window_name "Color Scheme Preferences"
-  _init_var
-  _build_win
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  init_var - initialize preference variables
-# ------------------------------------------------------------------
-itcl::body CSPref::_init_var {} {
-  for {set i 0} {$i < 16} {incr i} {
-    lappend vlist gdb/bg/$i
-  }
-
-  foreach var $vlist {
-    set _saved($var) [pref get $var]
-    set _new($var) $_saved($var)
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the dialog
-# ------------------------------------------------------------------
-itcl::body CSPref::_build_win {} {
-  frame $itk_interior.f
-  frame $itk_interior.f.a
-  frame $itk_interior.f.b
-  set f $itk_interior.f.a
-
-  # Description frame
-  set d [labelframe $f.desc -text "Description"]
-  label $d.txt -justify left -wraplength 6i -background $::Colors(textbg) \
-    -text "There are many situations where multiple instances\
-of Insight may be running.  Some examples are when debugging itself, when debugging\
-client and server programs, or multiprocessor systems. In these situations, it is easy\
-to get confused by the many different windows.  Insight provides a simple way to have\
-all the windows belonging to a particular Insight instance use the same background color.\
-\n\nClick on a color below to edit it. This is a text background color.  Other colors are\
-computed based on it."
-  pack $d.txt -side top
-  pack $f.desc -expand yes -fill both 
-
-  set w [labelframe $f.colors -text "Text Backgrounds"]
-  for {set i 0} {$i < 16} {incr i} {
-    set color $_new(gdb/bg/$i)
-    button $w.$i -text [format "%X" $i] -activebackground $color -bg $color \
-      -command [code $this _pick $color $w.$i  $i]
-  }
-
-  grid $w.0 $w.1 $w.2 $w.3 $w.4 $w.5 $w.6 $w.7 -padx 10 -pady 10 -sticky we
-  grid $w.8 $w.9 $w.10 $w.11 $w.12 $w.13 $w.14 $w.15 -padx 10 -pady 10 -sticky we
-
-  pack $w -fill both -expand yes
-  pack $f.colors -fill both -expand yes
-
-  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 CSPref::_apply {} {
-  foreach var [array names _new] {
-    if {$_new($var) != [pref get $var]} {
-      pref set $var $_new($var)
-    }
-  }
-  set_bg_colors
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _cancel
-# ------------------------------------------------------------------
-itcl::body CSPref::_cancel {} {
-  set bg_changed 0
-
-  if {[string compare [pref get gdb/bg/$::gdb_bg_num] $_saved(gdb/bg/$::gdb_bg_num)] != 0} {
-    set bg_changed 1
-  }
-  
-  foreach elem [array names _saved] {
-    set cur_val [pref get $elem]
-    if {[string compare $cur_val $_saved($elem)] != 0} {
-      pref set $elem $_saved($elem)
-    }
-  }
-
-  if {$bg_changed} {
-    set_bg_colors
-  } else {
-    ManagedWin::restart
-  }
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  save - apply changes and quit
-# ------------------------------------------------------------------
-itcl::body CSPref::_save {} {
-  _apply
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  reconfig - called when windows are reconfigured
-# ------------------------------------------------------------------
-
-itcl::body CSPref::reconfig {} {
-  # Unfortunately, r_setcolors recolors buttons if we do an Apply, 
-  # so fix them up here.
-
-  for {set i 0} {$i < 10} {incr i} {
-    set color $_new(gdb/bg/$i)
-    $w.$i configure -activebackground $color -bg $color
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  pick - pick colors
-# ------------------------------------------------------------------
-itcl::body CSPref::_pick {color win num} {
-  #debug "$color $win $num"
-  set new_color [tk_chooseColor -initialcolor $color -title "Choose color"]
-  if {$new_color != $color && $new_color != {}} {
-    $win configure -activebackground $new_color -bg $new_color \
-      -command [code $this _pick $new_color $w.${num}b  $num]
-    set _new(gdb/bg/$num) $new_color
-    pref set gdb/bg/$num $new_color
-  }
-}
diff --git a/gdb/gdbtk/library/cspref.ith b/gdb/gdbtk/library/cspref.ith
deleted file mode 100644
index a65f11b436f..00000000000
--- a/gdb/gdbtk/library/cspref.ith
+++ /dev/null
@@ -1,36 +0,0 @@
-# Color Scheme preferences dialog class definition for GDBtk.
-# Copyright 2004, 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 CSPref {
-  inherit ManagedWin ModalDialog
-
-  private {
-    variable _saved	;# These are the saved values...
-    variable _new	;# These are the changed values
-    variable w
-    method _apply {}
-    method _build_win {}
-    method _cancel {}
-    method _init_var {}
-    method _pick {color win num}
-    method _save {}
-    method _setcolors {}
-  }
-
-  public {
-    method constructor {args}
-    method reconfig {}
-  }
-}
-
diff --git a/gdb/gdbtk/library/debugwin.itb b/gdb/gdbtk/library/debugwin.itb
deleted file mode 100644
index 636ede4aeca..00000000000
--- a/gdb/gdbtk/library/debugwin.itb
+++ /dev/null
@@ -1,483 +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::reconfig
-#	
-# SYNOPSIS:	Reconfigure callback
-#
-# DESC:		Fixes up window colors
-#
-# ARGS:		None
-# -----------------------------------------------------------------------------
-itcl::body DebugWin::reconfig {} {
-  # This keeps the Debug window using its unique black background.
-  # Otherwise, a reconfigure event will color it to match the other windows
-  $itk_interior.s configure -textbackground black
-}
-
-# -----------------------------------------------------------------------------
-# 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 e7118015deb..00000000000
--- a/gdb/gdbtk/library/debugwin.ith
+++ /dev/null
@@ -1,93 +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 {}
-    method reconfig {}
-  }
-
-  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 c2a5e3ae60b..00000000000
--- a/gdb/gdbtk/library/download.itb
+++ /dev/null
@@ -1,304 +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
-    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} {
-      # Advance feedback meter. The iwidgets meter leaves a lot to
-      # be desired. No way to query the current setting. No way to
-      # set the state of the meter by percentage. It only understands
-      # steps, and we must be careful not to step the widget past the
-      # the configured number of steps, or else the meter will be
-      # set wrong. How lame.
-      set steps [expr {$num / $bytes($i) * $num_steps}]
-      if {[expr {$completed_steps($s) + $steps}] > $num_steps} {
-	set steps [expr {$num_steps - $completed_steps($s)}]
-      }
-      incr completed_steps($s) $steps
-      $itk_interior.f.meter$i step $steps
-      break
-    } else {
-      # Section already loaded. Make sure meter is at 100%.
-      if {$completed_steps($s) < $num_steps} {
-        set steps [expr {$num_steps - $completed_steps($s)}]
-        set completed_steps($s) $num_steps
-        $itk_interior.f.meter$i step $steps
-      }
-    }
-  }
-
-  ::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)
-      if {$completed_steps($sec) < $num_steps} {
-        set steps [expr {$num_steps - $completed_steps($sec)}]
-        set completed_steps($sec) $num_steps
-        $itk_interior.f.meter$i step $steps
-      }
-    }
-  } 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
-    set completed_steps($s) 0
-    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 daea4311727..00000000000
--- a/gdb/gdbtk/library/download.ith
+++ /dev/null
@@ -1,45 +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
-
-    # completed steps in feedback meter (iwidget::feedback is lame)
-    common completed_steps
-
-    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 3e80b760792..00000000000
--- a/gdb/gdbtk/library/gdbmenubar.itcl
+++ /dev/null
@@ -1,332 +0,0 @@
-# GDBMenuBar
-# Copyright 2000, 2004 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 class label underline} {
-    set m [menu $current_menu.$menu_name -tearoff false]
-    $current_menu add cascade -menu $m -label $label \
-      -underline $underline
-    incr item_number
-    switch $class {
-      None {}
-      default {
-        foreach elem $class {
-	  lappend menu_classes($elem) [list $current_menu $item_number]
-	}
-      }
-    }
-    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
-  }
-
-  # ------------------------------------------------------------------
-  # METHOD:  menubar_get_current_menu - Get the current_menu pointer.
-  #          Returns the current value so it can be restored.
-  # ------------------------------------------------------------------
-  method menubar_get_current_menu {} {
-    return $current_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 486bc5025d6..00000000000
--- a/gdb/gdbtk/library/globalpref.itb
+++ /dev/null
@@ -1,481 +0,0 @@
-# Global preference class implementation for Insight.
-# Copyright 1997, 1998, 1999, 2002, 2003, 2004 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 gdb/use_color_schemes}
-
-  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)]
-
-  # colored backgrounds
-  checkbutton $f.use_cs -text "Enable Color Schemes" \
-    -variable [scope _new(gdb/use_color_schemes)]
-
-  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
-  grid $f.use_cs -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 f6bad0be7eb..00000000000
--- a/gdb/gdbtk/library/interface.tcl
+++ /dev/null
@@ -1,1826 +0,0 @@
-# Interface between GDB and Insight.
-# Copyright 1997, 1998, 1999, 2001, 2002, 2004 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
-    set_baud
-    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 {[info exists gdbtk_state(console)] &&   $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 {[info exists gdbtk_state(console)] && $::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 {[info exists gdbtk_state(console)] && $::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"                              #
-#         - deprecated_pre_add_symbol_hook                         #
-#            Called in symbol_file_add before loading. The tcl     #
-#            hook is "gdbtk_tcl_pre_add_symbol"                    #
-#         - deprecated_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 deprecated_ui_loop_hook to keep us
-# alive. For native unix, we use an interval timer.  Simulators either
-# call deprecated_ui_loop_hook directly (older sims, at least) or they
-# call gdb's os_poll_quit callback, where we insert a call to
-# deprecated_ui_loop_hook. Some targets (like v850ice and windows
-# native) require a call to deprecated_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 15000 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/ipc.tcl b/gdb/gdbtk/library/ipc.tcl
deleted file mode 100755
index a5e87e22d5c..00000000000
--- a/gdb/gdbtk/library/ipc.tcl
+++ /dev/null
@@ -1,135 +0,0 @@
-# ipc.tcl
-# Copyright 2004 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 IPC for multiple Insight instances, allowing any Insight
-# to send commands to all other Insights on the same host.
-#
-#   PUBLIC METHODS:
-#
-#     send $cmd - sends $cmd to all Insights
-#
-# ----------------------------------------------------------------------
-
-itcl::class Iipc {
-
-  private variable socklist
-  private variable portnum 9909
-  private variable serversock
-
-  constructor {} {
-    init
-  }
-
-  destructor {
-    debug
-    foreach sock $socklist {
-      catch {::close $sock}
-    }
-
-    if {$serversock != "0"} {
-      catch {::close $serversock}
-    }
-    set ::iipc 0
-  }
-  
-  private method init {} {
-    debug "iipc init"
-    set socklist {}
-    set serversock 0
-    set portnum [pref get gdb/ipc/port]
-    if {[catch {socket -server [code $this accept] $portnum} serversock]} {
-      debug "server already exists.  Connecting to it."
-      set socklist [socket localhost $portnum]
-      fconfigure $socklist -buffering line -blocking 0
-      fileevent $socklist readable [code $this read $socklist]
-    }
-    set ::iipc 1
-  }
-
-  # accept new connection to server
-  private method accept {sock addr port} {
-    debug "accepting connecting from $sock -> $addr:$port"
-    fconfigure $sock -buffering line -blocking 0
-    lappend socklist $sock
-    fileevent $sock readable [code $this sread $sock]
-  }
-
-  private method read {s} {
-    if [eof $s] {
-      debug "The server died on $s!!"
-      catch {::close $s}
-      init
-      return
-    }
-    gets $s res
-    debug "Server: $res"
-    switch $res {
-      quit { gdb_force_quit }
-      stop { gdbtk_stop }
-      run { gdbtk_run }
-      default {
-	catch {gdb_immediate "$res"}
-      }
-    }
-  }
-
-  # server read method.  Reads data then forwards
-  # it to all listening sockets.
-  private method sread {s} {
-    if [eof $s] {
-      close $s
-      return
-    }
-    gets $s res
-    if {$res != ""} {
-      debug "Got: $res"
-      foreach sock $socklist {
-	if {$s != $sock} {
-	  if {[catch {puts $sock $res}]} {
-	    close $sock
-	  }
-	}
-      }
-      switch $res {
-	quit { gdb_force_quit }
-	stop { gdbtk_stop }
-	run { gdbtk_run }
-	default {
-	  catch {gdb_immediate "$res"}
-	}
-      }
-    }
-  }
-
-  # send data to all sockets.
-  public method send {cmd} {
-    debug "send $cmd"
-    foreach sock $socklist {
-      if {[catch {puts $sock $cmd}]} {
-	close $sock
-      }
-    }
-  }
-
-  private method close {s} {
-    debug "closing socket $s"
-    set socklist [lremove $socklist $s]
-    catch {::close $s}
-  }
-}
-
-
-
-
-
diff --git a/gdb/gdbtk/library/ipcpref.itb b/gdb/gdbtk/library/ipcpref.itb
deleted file mode 100644
index 7622070ef9c..00000000000
--- a/gdb/gdbtk/library/ipcpref.itb
+++ /dev/null
@@ -1,135 +0,0 @@
-# IPC preferences dialog for Insight.
-# Copyright 2004 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 IPC preferences window
-# ------------------------------------------------------------------
-itcl::body IPCPref::constructor {args} {
-  window_name "Insight IPC Preferences"
-  _init_var
-  _build_win
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  init_var - initialize preference variables
-# ------------------------------------------------------------------
-itcl::body IPCPref::_init_var {} {
-  set vlist [list gdb/ipc/enabled gdb/ipc/port gdb/ipc/step_button gdb/ipc/stop_button \
-	       gdb/ipc/cont_button gdb/ipc/exit gdb/ipc/run_button]
-  
-  foreach var $vlist {
-    set _saved($var) [pref get $var]
-    set _new($var) $_saved($var)
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  METHOD:  build_win - build the dialog
-# ------------------------------------------------------------------
-itcl::body IPCPref::_build_win {} {
-  frame $itk_interior.f
-  frame $itk_interior.f.a
-  frame $itk_interior.f.b
-  set f $itk_interior.f.a
-
-  # Description frame
-  set d [labelframe $f.desc -text "Description"]
-  label $d.txt -justify left -wraplength 6i -background $::Colors(textbg) \
-    -text "Some multiprocessor systems use multiple instances of Insight \
-for debugging different CPUs.  In these cases it may be desirable to have \
-all the instances stop, start, or continue at the same time.  The IPC \
-feature can do that and more.\n\nThe IPC uses local TCP connections to the\
-port number specified below."
-
-  pack $d.txt -side top
-
-  checkbutton $f.enabled -text "Enable IPC" -variable [scope _new(gdb/ipc/enabled)]
-  frame $f.port
-  spinbox $f.port.box -from 0 -to 65535 -wrap 0\
-    -width 6 -textvariable [scope _new(gdb/ipc/port)] -validate key \
-    -vcmd {string is integer %P}
-  label $f.port.label -text "TCP Port Number"
-  pack $f.desc -expand yes -fill both
-  pack $f.enabled  -anchor w -pady 10
-  pack $f.port.box $f.port.label -side left -pady 10
-  pack $f.port -anchor w -pady 10
-
-  set w [labelframe $f.buttons -text "Enable IPC on these buttons"]
-  checkbutton $w.0 -text "Run" -variable [scope _new(gdb/ipc/run_button)]
-  checkbutton $w.1 -text "Stop" -variable [scope _new(gdb/ipc/stop_button)]
-  checkbutton $w.2 -text "Continue" -variable [scope _new(gdb/ipc/cont_button)]
-  checkbutton $w.3 -text "Step" -variable [scope _new(gdb/ipc/step_button)]
-  checkbutton $w.4 -text "Exit" -variable [scope _new(gdb/ipc/exit)]
-  grid $w.0 $w.1 -padx 10 -pady 10 -sticky w
-  grid $w.2 $w.3 -padx 10 -pady 10 -sticky w
-  grid $w.4  -padx 10 -pady 10 -sticky w
-  pack $w -fill both -expand yes
-  pack $f.buttons -fill both -expand yes
-
-  button $itk_interior.f.b.ok -text OK -width 7 -underline 0 -command [code $this _save]
-  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 IPCPref::_apply {} {
-  set enable_changed 0
-  if {[pref get gdb/ipc/enabled] != $_new(gdb/ipc/enabled)} {
-    set enable_changed 1
-  } 
-  if {$_new(gdb/ipc/enabled) && [pref get gdb/ipc/port] != $_new(gdb/ipc/port)} {
-    set enable_changed 1
-  }
-
-  foreach var [array names _new] {
-    if {$_new($var) != [pref get $var]} {
-      pref set $var $_new($var)
-    }
-  }
-
-  if {$enable_changed} {
-    if {$_new(gdb/ipc/enabled)} {
-      # must start up ipc
-      catch {delete object $::insight_ipc}
-      set ::insight_ipc [Iipc \#auto]
-    } else {
-      delete object $::insight_ipc
-    }
-  }
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  _cancel
-# ------------------------------------------------------------------
-itcl::body IPCPref::_cancel {} {
-  foreach elem [array names _saved] {
-    set cur_val [pref get $elem]
-    if {[string compare $cur_val $_saved($elem)] != 0} {
-      pref set $elem $_saved($elem)
-    }
-  }
-  unpost
-}
-
-# ------------------------------------------------------------------
-#  METHOD:  save - apply changes and quit
-# ------------------------------------------------------------------
-itcl::body IPCPref::_save {} {
-  _apply
-  unpost
-}
diff --git a/gdb/gdbtk/library/ipcpref.ith b/gdb/gdbtk/library/ipcpref.ith
deleted file mode 100644
index 5df7f718e90..00000000000
--- a/gdb/gdbtk/library/ipcpref.ith
+++ /dev/null
@@ -1,33 +0,0 @@
-# IPC preferences dialog class definition for Insight.
-# Copyright 2004, 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 IPCPref {
-  inherit ManagedWin ModalDialog
-
-  private {
-    variable _saved	;# These are the saved values...
-    variable _new	;# These are the changed values
-    variable w
-    method _apply {}
-    method _build_win {}
-    method _cancel {}
-    method _init_var {}
-    method _save {}
-  }
-
-  public {
-    method constructor {args}
-    method reconfig {}
-  }
-}
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 2440876fa0d..00000000000
--- a/gdb/gdbtk/library/main.tcl
+++ /dev/null
@@ -1,191 +0,0 @@
-# GDBtk (Insight) entry point
-# Copyright 1997, 1998, 1999, 2002, 2003, 2004 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
-
-# initialize IPC to enable multiple Insight's to communicate
-# with each other.
-set iipc 0
-if {[pref get gdb/ipc/enabled]} {
-  set ::insight_ipc [Iipc \#auto]
-}
-
-gdbtk_idle
-
diff --git a/gdb/gdbtk/library/managedwin.itb b/gdb/gdbtk/library/managedwin.itb
deleted file mode 100644
index 445fb6c9f24..00000000000
--- a/gdb/gdbtk/library/managedwin.itb
+++ /dev/null
@@ -1,419 +0,0 @@
-# Managed window for Insight.
-# Copyright 1998, 1999, 2000, 2001, 2002, 2004 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]} {
-    if {$::iipc && [pref get gdb/ipc/exit]} {
-      $::insight_ipc send quit
-    }
-    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 ""}} {
-
-  if {$wname != ""} {
-    set _wname $wname
-  } else {
-    set wname $_wname
-  }
-  if {$iname != ""} {
-    set _iname $iname
-  } else {
-    set iname $_iname
-  }
-
-  if {$win_instance != ""} {
-    append wname " \[$win_instance\]"
-    if {$iname != ""} {
-      append iname " \[$win_instance\]"
-    }
-  }
-  wm title $_top $wname
-  if {$iname != ""} {
-    wm iconname $_top $iname
-  } else {
-    wm iconname $_top $wname
-  }
-}
-
-# ------------------------------------------------------------
-#  PUBLIC METHOD:  window_instance - Set the string to be
-#   appended to each window title for this instance of Insight
-# ------------------------------------------------------------
-itcl::body ManagedWin::window_instance {ins} {
-  set win_instance $ins
-  foreach obj [itcl_info objects -isa ManagedWin] {
-    debug "$obj ManagedWin::_wname"
-    $obj window_name ""
-  }
-}
-
-# ------------------------------------------------------------
-#  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 5bc9ab2f973..00000000000
--- a/gdb/gdbtk/library/managedwin.ith
+++ /dev/null
@@ -1,72 +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 window_instance {ins}
-
-    proc find {win}
-    proc open {class args}
-    proc open_dlg {class args}
-    proc init {}
-    proc restart {}
-    proc startup {}
-    proc shutdown {}
-
-    common win_instance ""
-  }
-
-  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"}}
-    variable _wname {}
-    variable _iname {}
-  }
-}
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 271a36b3007..00000000000
--- a/gdb/gdbtk/library/prefs.tcl
+++ /dev/null
@@ -1,762 +0,0 @@
-# Local preferences functions for Insight.
-# Copyright 1997, 1998, 1999, 2002, 2003, 2004 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
-	  }
-
-	  {^[ \t\n]*\[.*\]} {
-	    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
-  if {[pref get gdb/use_color_schemes] != "1"} {
-    pref_set_colors $home
-  } else {
-    global Colors
-    # These colors are the same for all schemes
-    set Colors(textfg) black
-    set Colors(fg) black
-    set Colors(sbg) \#4c59a5
-    set Colors(sfg) white
-    set_bg_colors
-  }
-}
-
-# ------------------------------------------------------------------
-#  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 bg ipc
-
-    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 ""
-
-  # background colors
-  set ::gdb_bg_num 0
-  pref define gdb/use_color_schemes	1
-  pref define gdb/bg/0	\#ffffff
-  pref define gdb/bg/1	\#ffffd0
-  pref define gdb/bg/2	\#ffd0ff
-  pref define gdb/bg/3	\#ffd0d0
-  pref define gdb/bg/4	\#d0ffff
-  pref define gdb/bg/5	\#d0ffd0
-  pref define gdb/bg/6	\#d0d0ff
-  pref define gdb/bg/7	\#d0d0d0
-  pref define gdb/bg/8	\#ffffb0
-  pref define gdb/bg/9	\#ffb0ff
-  pref define gdb/bg/10	\#ffb0b0
-  pref define gdb/bg/11	\#b0ffff
-  pref define gdb/bg/12	\#b0ffb0
-  pref define gdb/bg/13	\#b0b0ff
-  pref define gdb/bg/14	\#b0b0b0
-  pref define gdb/bg/15	\#d0b0d0
-
-  # IPC prefs
-  # set prefs based on GDB version?
-  #set vers [lindex [split [lindex [split [gdb_cmd "show version"]] end-1 ] \"] 1]
-  pref define gdb/ipc/enabled	1
-  pref define gdb/ipc/port		9909
-  pref define gdb/ipc/stop_button	1
-  pref define gdb/ipc/step_button	1
-  pref define gdb/ipc/cont_button	1
-  pref define gdb/ipc/run_button	1
-  pref define gdb/ipc/exit		1
-}
-
-
-##########################################################################
-#
-# Everything below this point is code to try to determine the current OS
-# color scheme and use that.  It mostly works, but is not very compatible 
-# with the use of multiple color schemes for different instances of Insight.
-#
-##########################################################################
-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 
-    }
-
-    if {[regexp "\"#......\"" $val a] == 1} {
-	set val [lindex $a 0]
-    } else {
-	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 *buttonBackground $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)
-
-  if {$::tcl_platform(platform) == "unix"}  {
-    option add *activeBackground $Colors(sbg)
-  }
-
-  option add *selectForeground $Colors(sfg)
-  option add *Menu*activeForeground $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} {
-    # calculate trough and activebackground as 90% of background
-    set dbg [recolor $::Colors(bg) 90]
-    option add *activeBackground $dbg
-    option add *troughColor $dbg
-  }
-
-  # Change the default select color for checkbuttons, etc to match 
-  # selectBackground.
-  if {$::tcl_platform(platform) == "unix"}  {
-    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 a2b57b5e412..00000000000
--- a/gdb/gdbtk/library/regwin.itb
+++ /dev/null
@@ -1,1050 +0,0 @@
-# Register display window for Insight.
-# Copyright 1998, 1999, 2001, 2002, 2003, 2004 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::reconfig
-#  DESCRIPTION:  Reconfigures register window when a preference
-#                changes.
-#
-#  ARGUMENTS:	 None
-#  RETURNS:      Nothing
-#
-# ------------------------------------------------------------------
-itcl::body RegWin::reconfig {} {
-  $itk_component(table) tag configure normal  \
-    -state disabled -bg $::Colors(textbg) -fg $::Colors(textfg)
-}
-
-
-#
-# 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 88b7a99482e..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 _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}
-    method reconfig {}
-  }
-}
diff --git a/gdb/gdbtk/library/session.tcl b/gdb/gdbtk/library/session.tcl
deleted file mode 100644
index 01ebefc0f58..00000000000
--- a/gdb/gdbtk/library/session.tcl
+++ /dev/null
@@ -1,336 +0,0 @@
-# Local preferences functions for Insight.
-# Copyright 2000, 2001, 2002, 2004 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(hostname) [pref getd gdb/load/$gdb_target_name-hostname]
-    set values(port) [pref getd gdb/load/$gdb_target_name-portname]
-    set values(target_cmd) $::gdb_target_cmd
-    set values(bg) $::gdb_bg_num
-
-    # 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 20 sessions.
-    set recent [concat [list $name] \
-		  [lremove [pref getd gdb/recent-projects] $name]]
-    if {[llength $recent] > 20} {
-      set recent [lreplace $recent 20 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 $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)
-
-      if {[info exists values(hostname)]} {
-	pref setd gdb/load/$gdb_target_name-hostname $values(hostname)
-	#debug "Restoring Hostname: $values(hostname)"
-      }
-
-      if {[info exists values(port)]} {
-	pref setd gdb/load/$gdb_target_name-portname $values(port)
-	#debug "Restoring Port: $values(port)"
-      }
-
-      #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)
-    }
-
-    if {[info exists values(bg)] && [pref get gdb/use_color_schemes]} {
-      set_bg_colors $values(bg)
-    }
-  }
-
-  #
-  # 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 123f5ead504..00000000000
--- a/gdb/gdbtk/library/srcbar.itcl
+++ /dev/null
@@ -1,1246 +0,0 @@
-# SrcBar
-# Copyright 2001, 2002, 2004 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
-
-    set save_menu [$Menu menubar_get_current_menu]
-
-    set advanced_menu [$Menu add cascade adv Advanced "Advanced" 0]
-
-    $advanced_menu add command -label "Edit Color Schemes..." -underline 0 \
-      -command "ManagedWin::open CSPref -transient" -underline 0
-
-    $advanced_menu add command -label "IPC Support..." -underline 0 \
-      -command "ManagedWin::open IPCPref -transient" -underline 0
-
-    $Menu menubar_set_current_menu $save_menu
-
-    $Menu add separator
-
-    set color_menu [$Menu add cascade use_cs Color "Use Color Scheme" 0]
-    for {set i 0} {$i < 16} {incr i} {
-      set dbg [recolor [pref get gdb/bg/$i] 80]
-      $color_menu add command -label $i -background [pref get gdb/bg/$i] \
-	-activebackground $dbg -command "set_bg_colors $i" -underline 0
-    }
-
-    if {[pref get gdb/use_color_schemes] == "1"} {
-      set cs_state normal
-    } else {
-      set cs_state disabled
-    }
-    $Menu set_class_state "Color $cs_state"
-  }
-
-  # ------------------------------------------------------------------
-  #  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
-
-    if {[pref get gdb/use_color_schemes] == "1"} {
-      set cs_state normal
-    } else {
-      set cs_state disabled
-    }
-    $Menu set_class_state "Color $cs_state"
-    for {set i 0} {$i < 16} {incr i} {
-      set dbg [recolor [pref get gdb/bg/$i] 80]
-      $color_menu entryconfigure $i -activebackground $dbg -background [pref get gdb/bg/$i]
-    }
-    # 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
-  private variable color_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 ec6ca75e2c0..00000000000
--- a/gdb/gdbtk/library/srcwin.itb
+++ /dev/null
@@ -1,1051 +0,0 @@
-# Source window for Insight.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 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
-    }
-  }
-}
-
-
-# ------------------------------------------------------------------
-#  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} {
-
-  # Check to see if this action is forwarded to other Insight instances
-  if {$::iipc} {
-    switch $action {
-      step -
-      next -
-      stepi -
-      nexti -
-      finish {
-	if {[pref get gdb/ipc/step_button]} {
-	  $::insight_ipc send $action
-	}
-      }
-      continue {
-	if {[pref get gdb/ipc/cont_button]} {
-	  $::insight_ipc send $action
-	}
-      }
-      run { 
-	if {[pref get gdb/ipc/run_button]} {
-	  $::insight_ipc send $action
-	}
-      }
-      stop {
-	if {[pref get gdb/ipc/stop_button]} {
-	  $::insight_ipc send $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 898992cd127..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, 2004 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 /dev/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 /dev/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 03ad77e86a5..00000000000
--- a/gdb/gdbtk/library/tclIndex
+++ /dev/null
@@ -1,639 +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(Iipc) [list source [file join $dir ipc.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(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(set_bg_colors) [list source [file join $dir util.tcl]]
-set auto_index(r_setcolors) [list source [file join $dir util.tcl]]
-set auto_index(recolor) [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(CSPref) [list source [file join $dir cspref.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(IPCPref) [list source [file join $dir ipcpref.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(::CSPref::constructor) [list source [file join $dir cspref.itb]]
-set auto_index(::CSPref::_init_var) [list source [file join $dir cspref.itb]]
-set auto_index(::CSPref::_build_win) [list source [file join $dir cspref.itb]]
-set auto_index(::CSPref::_apply) [list source [file join $dir cspref.itb]]
-set auto_index(::CSPref::_cancel) [list source [file join $dir cspref.itb]]
-set auto_index(::CSPref::_save) [list source [file join $dir cspref.itb]]
-set auto_index(::CSPref::reconfig) [list source [file join $dir cspref.itb]]
-set auto_index(::CSPref::_pick) [list source [file join $dir cspref.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::reconfig) [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(::IPCPref::constructor) [list source [file join $dir ipcpref.itb]]
-set auto_index(::IPCPref::_init_var) [list source [file join $dir ipcpref.itb]]
-set auto_index(::IPCPref::_build_win) [list source [file join $dir ipcpref.itb]]
-set auto_index(::IPCPref::_apply) [list source [file join $dir ipcpref.itb]]
-set auto_index(::IPCPref::_cancel) [list source [file join $dir ipcpref.itb]]
-set auto_index(::IPCPref::_save) [list source [file join $dir ipcpref.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::window_instance) [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::reconfig) [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 8ce0c271759..00000000000
--- a/gdb/gdbtk/library/tdump.tcl
+++ /dev/null
@@ -1,95 +0,0 @@
-# Trace dump window for Insight
-# Copyright 1998, 1999, 2001, 2002, 2004 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 dynamic \
-	-vscrollmode dynamic -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 4e9737d112e..00000000000
--- a/gdb/gdbtk/library/util.tcl
+++ /dev/null
@@ -1,331 +0,0 @@
-# Utilities for Insight.
-# Copyright 1997, 1998, 1999, 2004 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.
-
-
-# ----------------------------------------------------------------------
-# 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
-}
-
-# ------------------------------------------------------------------
-#  PROC:  set_bg_colors - set background and text background for
-#                        all windows.
-# ------------------------------------------------------------------
-proc set_bg_colors {{num ""}} {
-  debug $num
-
-  if {$num != ""} {
-    set ::gdb_bg_num $num
-  }
-  set ::Colors(textbg) [pref get gdb/bg/$::gdb_bg_num]
-
-  # calculate background as 80% of textbg
-  set ::Colors(bg) [recolor $::Colors(textbg) 80]
-
-  # calculate trough and activebackground as 90% of background
-  set dbg [recolor $::Colors(bg) 90]
-
-  r_setcolors . -background $::Colors(bg)
-  r_setcolors . -highlightbackground $::Colors(bg)
-  r_setcolors . -textbackground $::Colors(textbg)
-  r_setcolors . -troughcolor $dbg
-  r_setcolors . -activebackground $dbg
-
-  pref_set_option_db 1
-  ManagedWin::restart
-}
-
-# ------------------------------------------------------------------
-#  PROC:  r_setcolors - recursively set background and text background for
-#                        all windows.
-# ------------------------------------------------------------------
-proc r_setcolors {w option color} {
-  debug "$w $option $color"
-
-  # exception(s)
-  if {![catch {$w isa Balloon} result] && $result == "1"} {
-    return
-  }
-  catch {$w config $option $color}
-  
-  foreach child [winfo children $w] {
-    r_setcolors $child $option $color
-  }
-}
-
-# ------------------------------------------------------------------
-#  PROC:  recolor - returns a darker or lighter color
-# ------------------------------------------------------------------
-proc recolor {color percent} {
-  set c [winfo rgb . $color]
-  return [format #%02x%02x%02x [expr {($percent * [lindex $c 0]) / 25600}]  \
-	    [expr {($percent * [lindex $c 1]) / 25600}] [expr {($percent * [lindex $c 2]) / 25600}]]
-}
-
-
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 15112709ffc..00000000000
--- a/gdb/gdbtk/plugins/Makefile.in
+++ /dev/null
@@ -1,447 +0,0 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  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.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/../../../config.guess \
-	$(srcdir)/../../../config.sub ChangeLog $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(srcdir)/../../../mkinstalldirs \
-	$(top_srcdir)/rhabout/Makefile.in $(srcdir)/Make-rules \
-	$(top_srcdir)/rhabout/rhabout.tcl.in \
-	$(top_srcdir)/intel-pentium/Makefile.in $(srcdir)/Make-rules \
-	$(top_srcdir)/intel-pentium/intel-pentium.tcl.in
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/../../../config/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
-CONFIG_CLEAN_FILES = rhabout/Makefile rhabout/rhabout.tcl \
-	intel-pentium/Makefile intel-pentium/intel-pentium.tcl
-depcomp =
-am__depfiles_maybe =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCYGWIN_A = @LIBCYGWIN_A@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-NM = @NM@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TCLCONFIG = @TCLCONFIG@
-TCLHDIR = @TCLHDIR@
-TCL_BIN_DIR = @TCL_BIN_DIR@
-TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
-TCL_CFLAGS = @TCL_CFLAGS@
-TCL_DBGX = @TCL_DBGX@
-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@
-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_ct_AS = @ac_ct_AS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_NM = @ac_ct_NM@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-make_subdirs = @make_subdirs@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-plugin_builddir = @plugin_builddir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = cygnus
-SUBDIRS = @make_subdirs@
-all: all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-rhabout/Makefile: $(top_builddir)/config.status $(top_srcdir)/rhabout/Makefile.in $(srcdir)/Make-rules
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-rhabout/rhabout.tcl: $(top_builddir)/config.status $(top_srcdir)/rhabout/rhabout.tcl.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-intel-pentium/Makefile: $(top_builddir)/config.status $(top_srcdir)/intel-pentium/Makefile.in $(srcdir)/Make-rules
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-intel-pentium/intel-pentium.tcl: $(top_builddir)/config.status $(top_srcdir)/intel-pentium/intel-pentium.tcl.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
-
-# 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.
-$(RECURSIVE_TARGETS):
-	@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; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	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
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-check-am:
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive distclean distclean-generic \
-	distclean-recursive distclean-tags dvi dvi-am html html-am \
-	info info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am
-
-# 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 470426149b5..00000000000
--- a/gdb/gdbtk/plugins/aclocal.m4
+++ /dev/null
@@ -1,944 +0,0 @@
-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-# This file 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.
-
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# 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
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.3])])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright (C) 2001, 2003 Free Software Foundation, 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, 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, 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, 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.
-
-# serial 6
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
-# serial 7						-*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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, 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.
-
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, 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, 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.
-
-#serial 2
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# 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.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, 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, 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.
-
-# serial 11
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])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
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, 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, 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.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, 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, 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.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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, 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.
-
-# serial 3
-
-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
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, 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, 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.
-
-# serial 2
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-#  -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, 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, 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.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, 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, 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.
-
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, 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, 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.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, 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, 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.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# 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 conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $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]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, 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, 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.
-
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-m4_include([acinclude.m4])
diff --git a/gdb/gdbtk/plugins/configure b/gdb/gdbtk/plugins/configure
deleted file mode 100755
index db35383e093..00000000000
--- a/gdb/gdbtk/plugins/configure
+++ /dev/null
@@ -1,5082 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="Make-rules"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT TCLCONFIG TCL_DEFS TCL_LIB_FILE TCL_LIB_FULL_PATH TCL_LIBS TCL_CFLAGS TCL_SHLIB_CFLAGS TCL_SHLIB_LD TCL_LD_FLAGS TCL_LD_SEARCH_FLAGS TCL_RANLIB TCL_BUILD_LIB_SPEC TCL_LIB_SPEC TCL_BIN_DIR TKCONFIG TK_VERSION TK_DEFS TK_LIB_FILE TK_LIB_FULL_PATH TK_LIBS TK_BUILD_INCLUDES TK_XINCLUDES TK_XLIBSW TK_BUILD_LIB_SPEC TK_LIB_SPEC CPP EGREP TCLHDIR TKHDIR TCL_DBGX TCL_SHLIB_SUFFIX NM ac_ct_NM AS ac_ct_AS LD ac_ct_LD LIBCYGWIN_A DLLTOOL ac_ct_DLLTOOL make_subdirs plugin_builddir LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --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
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-tclconfig           directory containing tcl configuration (tclConfig.sh)
-  --with-tkconfig           directory containing tk configuration (tkConfig.sh)
-  --with-tclinclude       directory where tcl headers are
-  --with-tkinclude       directory where tk headers are
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in ../../.. $srcdir/../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $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
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# 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"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /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
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-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 "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&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}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f conftest*
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-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"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 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 conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&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 "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:$LINENO: checking for working aclocal" >&5
-echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:$LINENO: checking for working autoconf" >&5
-echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:$LINENO: checking for working automake" >&5
-echo $ECHO_N "checking for working automake... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:$LINENO: checking for working autoheader" >&5
-echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:$LINENO: checking for working makeinfo" >&5
-echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
-# 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 "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-    # 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 "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&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 "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 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 conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-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 $# != 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
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&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 "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-# 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 "$as_me:$LINENO: checking for Tcl configuration script" >&5
-echo $ECHO_N "checking for Tcl configuration script... $ECHO_C" >&6
-    if test "${ac_cv_c_tclconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5
-echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: WARNING: Can't find Tcl configuration definitions" >&5
-echo "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;}
-    else
-        no_tcl=""
-        TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh
-        echo "$as_me:$LINENO: result: ${TCLCONFIG}" >&5
-echo "${ECHO_T}${TCLCONFIG}" >&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 "$as_me:$LINENO: checking for Tk configuration script" >&5
-echo $ECHO_N "checking for Tk configuration script... $ECHO_C" >&6
-    if test "${ac_cv_c_tkconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 "$as_me:$LINENO: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&5
-echo "$as_me: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: WARNING: Can't find Tk configuration definitions" >&5
-echo "$as_me: WARNING: Can't find Tk configuration definitions" >&2;}
-    else
-        no_tk=""
-        TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh
-        echo "$as_me:$LINENO: result: ${TKCONFIG}" >&5
-echo "${ECHO_T}${TKCONFIG}" >&6
-     fi
-fi
-
-
-
-    if test -f "$TKCONFIG" ; then
-      . $TKCONFIG
-    fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#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);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
-no_tcl=true
-echo "$as_me:$LINENO: checking for Tcl headers in the source tree" >&5
-echo $ECHO_N "checking for Tcl headers in the source tree... $ECHO_C" >&6
-
-# Check whether --with-tclinclude or --without-tclinclude was given.
-if test "${with_tclinclude+set}" = set; then
-  withval="$with_tclinclude"
-  with_tclinclude=${withval}
-fi;
-if test "${ac_cv_c_tclh+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 "$as_me:$LINENO: error: ${with_tclinclude} directory doesn't contain headers" >&5
-echo "$as_me: error: ${with_tclinclude} directory doesn't contain headers" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
-   if test "${ac_cv_header_tcl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for tcl.h" >&5
-echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6
-if test "${ac_cv_header_tcl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5
-echo "${ECHO_T}$ac_cv_header_tcl_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking tcl.h usability" >&5
-echo $ECHO_N "checking tcl.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <tcl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking tcl.h presence" >&5
-echo $ECHO_N "checking tcl.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <tcl.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: tcl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: tcl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: tcl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: tcl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: tcl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: tcl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: tcl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: tcl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: tcl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: tcl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: tcl.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for tcl.h" >&5
-echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6
-if test "${ac_cv_header_tcl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_tcl_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5
-echo "${ECHO_T}$ac_cv_header_tcl_h" >&6
-
-fi
-if test $ac_cv_header_tcl_h = yes; then
-  ac_cv_c_tclh=installed
-else
-  ac_cv_c_tclh=""
-fi
-
-
-else
-   echo "$as_me:$LINENO: result: ${ac_cv_c_tclh}" >&5
-echo "${ECHO_T}${ac_cv_c_tclh}" >&6
-fi
-
-fi
-
-  TCLHDIR=""
-if test x"${ac_cv_c_tclh}" = x ; then
-    { { echo "$as_me:$LINENO: error: Can't find any Tcl headers" >&5
-echo "$as_me: error: Can't find any Tcl headers" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: result: ${ac_cv_c_tclh}" >&5
-echo "${ECHO_T}${ac_cv_c_tclh}" >&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 "$as_me:$LINENO: checking for Tk headers in the source tree" >&5
-echo $ECHO_N "checking for Tk headers in the source tree... $ECHO_C" >&6
-
-# Check whether --with-tkinclude or --without-tkinclude was given.
-if test "${with_tkinclude+set}" = set; then
-  withval="$with_tkinclude"
-  with_tkinclude=${withval}
-fi;
-if test "${ac_cv_c_tkh+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 "$as_me:$LINENO: error: ${with_tkinclude} directory doesn't contain headers" >&5
-echo "$as_me: error: ${with_tkinclude} directory doesn't contain headers" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
-            ccpath=`which ${CC}  | sed -e 's:/bin/.*::'`/include
-    if test -f $ccpath/tk.h; then
-	ac_cv_c_tkh=$ccpath
-    fi
-else
-   echo "$as_me:$LINENO: result: ${ac_cv_c_tkh}" >&5
-echo "${ECHO_T}${ac_cv_c_tkh}" >&6
-fi
-
-fi
-
-  TKHDIR=""
-if test x"${ac_cv_c_tkh}" = x ; then
-    { { echo "$as_me:$LINENO: error: Can't find any Tk headers" >&5
-echo "$as_me: error: Can't find any Tk headers" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: result: found in ${ac_cv_c_tkh}" >&5
-echo "${ECHO_T}found in ${ac_cv_c_tkh}" >&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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CFLAGS="${ocflags}"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-    ;;
-  *) ;;
-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*)
-    if test -n "$ac_tool_prefix"; then
-  # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NM="${ac_tool_prefix}nm"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-NM=$ac_cv_prog_NM
-if test -n "$NM"; then
-  echo "$as_me:$LINENO: result: $NM" >&5
-echo "${ECHO_T}$NM" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_NM"; then
-  ac_ct_NM=$NM
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_NM"; then
-  ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NM="nm"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_NM" && ac_cv_prog_ac_ct_NM="nm"
-fi
-fi
-ac_ct_NM=$ac_cv_prog_ac_ct_NM
-if test -n "$ac_ct_NM"; then
-  echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
-echo "${ECHO_T}$ac_ct_NM" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  NM=$ac_ct_NM
-else
-  NM="$ac_cv_prog_NM"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  echo "$as_me:$LINENO: result: $AS" >&5
-echo "${ECHO_T}$AS" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AS="as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="as"
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-echo "${ECHO_T}$ac_ct_AS" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  AS=$ac_ct_AS
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LD="${ac_tool_prefix}ld"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-LD=$ac_cv_prog_LD
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_LD"; then
-  ac_ct_LD=$LD
-  # Extract the first word of "ld", so it can be a program name with args.
-set dummy ld; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_LD"; then
-  ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LD="ld"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_LD" && ac_cv_prog_ac_ct_LD="ld"
-fi
-fi
-ac_ct_LD=$ac_cv_prog_ac_ct_LD
-if test -n "$ac_ct_LD"; then
-  echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
-echo "${ECHO_T}$ac_ct_LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  LD=$ac_ct_LD
-else
-  LD="$ac_cv_prog_LD"
-fi
-
-    echo "$as_me:$LINENO: checking \"for libcygwin.a\"" >&5
-echo $ECHO_N "checking \"for libcygwin.a\"... $ECHO_C" >&6
-    LIBCYGWIN_A=`$CC -print-file-name=libcygwin.a`
-    echo "$as_me:$LINENO: result: $LIBCYGWIN_A" >&5
-echo "${ECHO_T}$LIBCYGWIN_A" >&6
-
-    if test -n "$ac_tool_prefix"; then
-  # 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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  DLLTOOL=$ac_ct_DLLTOOL
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-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
-
-
-
-
-                                                  ac_config_files="$ac_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"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "rhabout/Makefile" ) CONFIG_FILES="$CONFIG_FILES rhabout/Makefile:rhabout/Makefile.in:Make-rules" ;;
-  "rhabout/rhabout.tcl" ) CONFIG_FILES="$CONFIG_FILES rhabout/rhabout.tcl" ;;
-  "intel-pentium/Makefile" ) CONFIG_FILES="$CONFIG_FILES intel-pentium/Makefile:intel-pentium/Makefile.in:Make-rules" ;;
-  "intel-pentium/intel-pentium.tcl" ) CONFIG_FILES="$CONFIG_FILES intel-pentium/intel-pentium.tcl" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@TCLCONFIG@,$TCLCONFIG,;t t
-s,@TCL_DEFS@,$TCL_DEFS,;t t
-s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
-s,@TCL_LIB_FULL_PATH@,$TCL_LIB_FULL_PATH,;t t
-s,@TCL_LIBS@,$TCL_LIBS,;t t
-s,@TCL_CFLAGS@,$TCL_CFLAGS,;t t
-s,@TCL_SHLIB_CFLAGS@,$TCL_SHLIB_CFLAGS,;t t
-s,@TCL_SHLIB_LD@,$TCL_SHLIB_LD,;t t
-s,@TCL_LD_FLAGS@,$TCL_LD_FLAGS,;t t
-s,@TCL_LD_SEARCH_FLAGS@,$TCL_LD_SEARCH_FLAGS,;t t
-s,@TCL_RANLIB@,$TCL_RANLIB,;t t
-s,@TCL_BUILD_LIB_SPEC@,$TCL_BUILD_LIB_SPEC,;t t
-s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
-s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
-s,@TKCONFIG@,$TKCONFIG,;t t
-s,@TK_VERSION@,$TK_VERSION,;t t
-s,@TK_DEFS@,$TK_DEFS,;t t
-s,@TK_LIB_FILE@,$TK_LIB_FILE,;t t
-s,@TK_LIB_FULL_PATH@,$TK_LIB_FULL_PATH,;t t
-s,@TK_LIBS@,$TK_LIBS,;t t
-s,@TK_BUILD_INCLUDES@,$TK_BUILD_INCLUDES,;t t
-s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t
-s,@TK_XLIBSW@,$TK_XLIBSW,;t t
-s,@TK_BUILD_LIB_SPEC@,$TK_BUILD_LIB_SPEC,;t t
-s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@TCLHDIR@,$TCLHDIR,;t t
-s,@TKHDIR@,$TKHDIR,;t t
-s,@TCL_DBGX@,$TCL_DBGX,;t t
-s,@TCL_SHLIB_SUFFIX@,$TCL_SHLIB_SUFFIX,;t t
-s,@NM@,$NM,;t t
-s,@ac_ct_NM@,$ac_ct_NM,;t t
-s,@AS@,$AS,;t t
-s,@ac_ct_AS@,$ac_ct_AS,;t t
-s,@LD@,$LD,;t t
-s,@ac_ct_LD@,$ac_ct_LD,;t t
-s,@LIBCYGWIN_A@,$LIBCYGWIN_A,;t t
-s,@DLLTOOL@,$DLLTOOL,;t t
-s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
-s,@make_subdirs@,$make_subdirs,;t t
-s,@plugin_builddir@,$plugin_builddir,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/gdb/gdbtk/plugins/configure.ac b/gdb/gdbtk/plugins/configure.ac
deleted file mode 100644
index 58a54808124..00000000000
--- a/gdb/gdbtk/plugins/configure.ac
+++ /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 f87b23b37ca..00000000000
--- a/gdb/gdbtk/plugins/rhabout/ChangeLog
+++ /dev/null
@@ -1,24 +0,0 @@
-2004-12-08  Keith Seitz  <kseitz@sources.redhat.com>
-
-	From Ben Elliston (bje@gnu.org):
-	* rhabout.c (extra_text): Convert to object interface.
-	(Rhabout_Init): Use Tcl_CreateObjCommand instead of older argc/argv
-	Tcl_CreateCommand.
-
-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 fd043dc355a..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 objc, Tcl_Obj *CONST objv[]);
-
-/* 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 objc, Tcl_Obj *CONST objv[])
-{
-  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_CreateObjCommand (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/infrun.c b/gdb/infrun.c
index f0a3a5d61a1..5149cd02da7 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2062,7 +2062,7 @@ process_event_stop_test:
 	  fprintf_unfiltered (gdb_stdlog, "infrun: BPSTATE_WHAT_STOP_NOISY\n");
 	stop_print_frame = 1;
 
-	/* We are about to nuke the step_resume_breakpointt via the
+	/* We are about to nuke the step_resume_breakpoint via the
 	   cleanup chain, so no need to worry about it here.  */
 
 	stop_stepping (ecs);
diff --git a/gdb/testsuite/.gdbinit b/gdb/testsuite/.gdbinit
deleted file mode 100644
index 62bcb743093..00000000000
--- a/gdb/testsuite/.gdbinit
+++ /dev/null
@@ -1 +0,0 @@
-set height 400
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
deleted file mode 100644
index 3bc7c7eee1f..00000000000
--- a/gdb/testsuite/ChangeLog
+++ /dev/null
@@ -1,13447 +0,0 @@
-2005-05-29  Joel Brobecker  <brobecker@adacore.com>
-
-	* gdb.arch/alpha-step.c: New file.
-	* gdb.arch/alpha-step.exp: New testcase.
-
-2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>
-	    Dennis Brueni  <dennis@slickedit.com>
-
-	* gdb.mi/mi-cli.exp, gdb.mi/mi-return.exp, gdb.mi/mi-stack.exp,
-	gdb.mi/mi-stepi.exp, gdb.mi/mi-syn-frame.exp, gdb.mi/mi-until.exp,
-	gdb.mi/mi-var-display.exp, gdb.mi/mi-watch.exp, gdb.mi/mi2-cli.exp,
-	gdb.mi/mi2-return.exp, gdb.mi/mi2-stack.exp,
-	gdb.mi/mi2-syn-frame.exp, gdb.mi/mi2-until.exp,
-	gdb.mi/mi2-var-display.exp: Expect fullname field in stack frames.
-	* lib/mi-support.exp (mi_runto, mi_execute_to_helper): Likewise.
-
-2005-05-17  Paul Gilliam  <pgilliam@us.ibm.com>
-	    Wu Zhou  <woodzltc@cn.ibm.com>
-
-	* gdb.base/shreloc.exp: Use gdb_compile_shlib.  Add support for
-	IBM's xlc compiler.
-	* gdb.base/shreloc1.c (fn_1): Reference variable static_var_1.
-	* gdb.base/shreloc2.c (fn_2): Reference variable static_var_2.
-
-2005-05-13  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/call-ar-st.exp: Call 'untested' and return -1 instead of
-	calling gdb_suppress_entire_file.
-	* gdb.base/charset.exp: Same.
-	* gdb.base/call-rt-st.exp: Same.
-
-2005-05-05  Bob Rossi  <bob_rossi@cox.net>
-
-	* lib/gdb.exp (fullname_syntax): Added global regex.
-	(fullname_syntax_POSIX): Ditto.
-	(fullname_syntax_UNC): Ditto.
-	(fullname_syntax_DOS_CASE): Ditto.
-	(fullname_syntax_DOS): Ditto.
-	* gdb.mi/mi-file.exp (test_file_list_exec_source_file): Added
-	fullname_syntax variable to scope and use it.
-	(test_file_list_exec_source_files): Ditto.
-	* gdb.mi/mi2-file.exp (test_file_list_exec_source_file): Ditto.
-
-2005-05-04  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* gdb.threads/linux-dp.exp: Check for *-*-linux-gnu*.
-
-2004-05-02  Paul Gilliam  <pgilliam@us.ibm.com>
-
-        * lib/gdb.exp (skip_altivec_tests): New function, based on
-        check_vmx_hw_available from the GCC testsuite.
-        * lib/gdb.arch/altivec-abi.exp: Use skip_altivec_tests.
-        * lib/gdb.arch/altivec-regs.exp: Likewise.
-
-2005-05-02  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/auxv.exp: Call 'untested' and return -1 instead of
-	calling gdb_suppress_entire_file.
-
-2005-04-30  Randolph Chung  <tausq@debian.org>
-
-	* gdb.threads/staticthreads.exp: Override signal to check for hppa.
-	Slightly relax "sem_post" name checking.
-
-2005-04-29  Paul Gilliam  <pgilliam@us.ibm.com>
-
-	* gdb.base/unload.exp: Use new shared library infrastructure.
-
-2005-04-29  Paul Gilliam  <pgilliam@us.ibm.com>
-
-	* gdb.base/so-impl-ld.exp: Use new shared library
-        infrastructure.
-
-2005-04-29  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add h8300 to supported targets.
-	* gdb.asm/h8300.inc: New file.
-
-2005-04-28  Paul Gilliam  <pgilliam@us.ibm.com>
-
-	* gdb.base/shlib-call.exp: Change to use new shared library
-	infrastructure.
-
-2005-04-28  Paul Gilliam  <pgilliam@us.ibm.com>
-
-        * gdb.base/pending.exp: Change to use new shared library
-        infrastructure.
-
-2005-04-28  Paul Gilliam  <pgilliam@us.ibm.com>
-
-        * gdb.base/nodebug.exp: Allow for compiling by IBM's xlc compiler,
-        use test_compiler_info instead of gcc_compiled, and update copyright.
-
-2005-04-27  Paul Gilliam  <pgilliam@us.ibm.com>
-
-        * gdb.base/annota1.exp : Deal with messages caused by breakpoints in
-        shared objects being adjusted and update copyright years.
-
-2005-04-27  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* ChangeLog: Correct some 2003-01-13 dates.
-	* gdb.base/sigbpt.exp, gdb.base/signull.exp, gdb.cp/bs15503.exp,
-	gdb.cp/exception.exp, gdb.cp/userdef.cc, gdb.cp/userdef.exp,
-	gdb.mi/mi-console.exp, gdb.mi/mi2-console.exp,
-	gdb.trace/collection.exp, gdb.trace/passc-dyn.exp,
-	gdb.trace/tfind.exp: Update copyright years.
-
-2005-04-14  Paul Gilliam  <pgilliam@us.ibm.com>
-	    Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* lib/gdb.exp (gdb_compile): Handle shlib=.
-	(gdb_compile_shlib): New function.
-
-2005-04-12  Paul Gilliam  <pgilliam@us.ibm.com>
-
-        * lib/gdb.exp (test_compiler_info): Give argument a default value.
-
-2005-04-08  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* Makefile.in (ALL_SUBDIRS): Replace gdb.gdbserver with
-	gdb.server.
-	* configure.ac: Likewise.
-	* configure: Regenerated.
-	* gdb.gdbserver/Makefile.in: Moved to...
-	* gdb.server/Makefile.in: ... here.
-	* gdb.gdbserver/server.c: Moved to...
-	* gdb.server/server.c: ... here.
-	* gdb.gdbserver/server-run.exp: Moved to...
-	* gdb.server/server-run.exp: ... here.
-
-2005-04-08  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* Makefile.in (ALL_SUBDIRS): Add gdb.gdbserver.
-	* configure.ac: Create gdb.gdbserver/Makefile.
-	* configure: Regenerated.
-	* lib/gdbserver-support.exp: New file, derived from
-	config/gdbserver.exp.
-	* config/gdbserver.exp: Use gdbserver-support.exp.
-	* gdb.gdbserver/Makefile.in: New file.
-	* gdb.gdbserver/server.c: New file.
-	* gdb.gdbserver/server-run.exp: New file.
-
-2005-04-06  Paul Gilliam  <pgilliam@us.ibm.com>
-
-        * lib/gdb.exp (test_compiler_info): Return compiler_info
-        if no arguments are given.
-
-2005-04-01  Paul Gilliam  <pgilliam@us.ibm.com>
-
-	* gdb.arch/altivec-abi.exp: Check for compiler and set
-	use altivec' flag accordingly.
-	* gdb.arch/altivec-regs.exp: Likewise.
-
-2005-03-29  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* gdb.base/ptr-typedef.exp, gdb.base/ptr-typedef.c: New files.
-
-2005-03-27  Andreas Schwab  <schwab@suse.de>
-
-	* gdb.base/bigcore.c (main): Add missing mode argument in open
-	call.
-
-2005-03-25  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* lib/mi-support.exp (mi_gdb_load): Use /tmp for gdbserver
-	downloads.
-	* config/gdbserver.exp (gdb_load): Likewise.
-
-2005-03-14  Paul Brook  <paul@codesourcery.com>
-
-	* lib/mi-support.exp: Use mi_gdb_target_cmd to connect to remote
-	targets.
-
-2005-03-09  Joel Brobecker  <brobecker@adacore.com>
-
-	* gdb.dwarf2/dup-psym.S: New file.
-	* gdb.dwarf2/dup-psym.exp: New testcase.
-
-2005-03-09  Joel Brobecker  <brobecker@adacore.com>
-
-	* gdb.ada/exec_changed/first.adb: New file.
-	* gdb.ada/exec_changed/second.adb: New file.
-	* gdb.ada/exec_changed.exp: New testcase.
-
-2005-03-08  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* gdb.cp/userdef.cc (A1::operator+): New unary plus.
-	(A2): New class.
-	(main): Test operator+.
-	* gdb.cp/userdef.exp: Test unary plus.  Use A2::operator+ for
-	breakpoint test.
-
-	* gdb.base/sigbpt.exp: Disable if gdb,nosignals.
-	* gdb.base/signull.exp: Disable if gdb,nosignals.
-	* gdb.cp/bs15503.exp: Disable if skip_cplus_tests
-	* gdb.cp/exception.exp: Disable if skip_cplus_tests.
-	* gdb.mi/mi-console.exp: Disable hello test if gdb,noinferiorio.
-	* gdb.mi/mi2-console.exp: Likewise.
-	* gdb.trace/collection.exp (run_trace_experiment): Consume the
-	continue output at start.
-	(gdb_collect_locals_test): Robustify regexp.
-	* gdb.trace/passc-dyn.exp: Fix comment typo.
-	* gdb.trace/tfind.exp: Don't enable optimization. Remove stray ']'.
-
-2005-03-08  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add iq2000 case.
-	* gdb.asm/iq2000.inc: New file.
-
-2005-03-07  Manoj Iyer <manjo@austin.ibm.com>
-	
-	* gdb.base/command.exp: Change hardcoded value to regular expression.
-	* gdb.base/float.exp: Add powerpc to the list of targets checked.
-
-2005-03-07  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* gdb.asm/alpha.inc, gdb.asm/frv.inc, gdb.asm/i386.inc,
-	gdb.asm/ia64.inc, gdb.asm/m68hc11.inc, gdb.asm/m68k.inc,
-	gdb.asm/mips.inc, gdb.asm/pa.inc, gdb.asm/powerpc.inc,
-	gdb.asm/s390.inc, gdb.asm/s390x.inc, gdb.asm/sh.inc,
-	gdb.asm/x86_64.inc: Use .purgem before redefining macros.
-
-2005-03-05  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.cp/ovldbreak.exp: Adjust regular expression for recent
-	changes.
-
-2004-03-03  Paul Gilliam  <pgilliam@us.ibm.com>
-
-        * lib/compiler.c: Add test for IBM's xlc compiler.
-        * lib/compiler.cc: Likewise.
-
-2004-02-24  Joel Brobecker  <brobecker@adacore.com>
-
-	* gdb.ada/fixed_points.exp: Create compilation object directory
-	before running the test.
-	* gdb.ada/null_record.exp: Likewise.
-	* gdb.ada/packed_array.exp: Likewise.
-	* gdb.ada/start.exp: Likewise.
-
-2005-02-15  Joel Brobecker  <brobecker@adacore.com>
-
-	* gdb.ada/packed_array/pa.adb: New file.
-	* gdb.ada/packed_array.exp: New testcase.
-
-2005-02-10  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.dwarf2/dw2-intermix.exp, gdb.dwarf2/dw2-intermix.S: New
-	files.
-
-	* gdb.dwarf2/dw2-basic.exp, gdb.dwarf2/dw2-intercu.exp: Run tests
-	on *-*-openbsd*.  Correctly match whitespace in regukar
-	expressions.
-
-2005-02-10  Daniel Jacobowitz  <dan@debian.org>
-
-	From Ramana Radhakrishnan <ramana.radhakrishnan@codito.com>:
-	PR exp/1821
-	* gdb.base/gdb1821.c: New test file.
-	* gdb.base/gdb1821.exp: New test file.
-
-2005-02-09  Joel Brobecker  <brobecker@adacore.com>
-
-	* gdb.base/start.c: New file.
-	* gdb.base/start.exp: New testcase.
-
-2005-02-09  Joel Brobecker  <brobecker@adacore.com>
-
-	* gdb.ada/start/dummy.adb: New file.
-	* gdb.ada/start.exp: New testcase.
-
-2005-02-09  Corinna Vinschen  <vinschen@redhat.com>
-
-	* maint.exp: Raise timeout to give Cygwin targeted GDBs more time
-	for printing symbols and statistics.
-	Add test for using relative pathnames in "maint print msymbols" test.
-	Mark "maint info sections DATA" XFAIL on Cygwin.
-	Remove Cygwin XFAIL mark on "help maint dump-me" and "maint dump-me"
-	tests.
-
-2005-02-09  Andreas Schwab  <schwab@suse.de>
-
-	Committed by Andrew Cagney  <cagney@gnu.org>
-	* gdb.base/remotetimeout.exp: New file.
-
-2005-02-07  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/interp.exp: Remove trailing \n in gdb_test commands.
-
-2005-02-03  Joel Brobecker  <brobecker@adacore.com>
-
-	* gdb.ada/gnat_ada.gpr: New file.
-	* gdb.ada/gnat_ada.gin: Delete, no longer used.
-	* lib/ada.exp (gdb_compile_ada): Minor adaptation to new project file.
-	* configure.ac: No longer generate gnat_ada.gpr.
-	* configure: Regenerate.
-	* gdb.ada/Makefile.in: Minor adaptations due to new project file.
-	* gdb.ada/null_record/null_record.adb: Moved here from gdb.ada.
-	* gdb.ada/null_record/bar.ads: Likewise.
-	* gdb.ada/null_record/bar.adb: Likewise.
-	* gdb.ada/fixed_points/fixed_points.adb: Likewise.
-	* gdb.ada/null_record.exp (testdir): New variable.
-	(testfile): executable is now in testdir subdirectory.
-	(srcfile): Use full path to the main compilation unit.
-	* gdb.ada/fixed_points.exp: Same changes as above.
-
-2005-02-03  Nick Roberts  <nickrob@snap.net.nz>
-
-	* gdb.base/interp.exp: New test.
-
-2005-01-24  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/sigrepeat.exp, gdb.base/sigrepeat.c: New test.
-
-2005-01-19  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.stabs/Makefile.in (Makefile): Update dependencies -
-	configure.ac not configure.in.
-
-	* gdb.base/scope.exp (test_at_main): Delete any XFAIL and/or KFAIL
-	of powerpc*-*-*.
-	* gdb.hp/gdb.base-hp/callfwmall.exp (do_function_calls): Ditto.
-	* gdb.base/list.exp (test_list_function) 
-	(test_list_filename_and_function): Ditto.
-	* gdb.base/callfuncs.exp (do_function_calls): Ditto.
-
-2005-01-16  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/source.exp: Delete KFAIL gdb/1846, simplify.
-
-	* gdb.base/source-error.gdb, gdb.base/source.exp: New files.
-
-2005-01-14  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.mi/mi-var-cmd.exp: Adjust "create int" test to match output.
-	* gdb.mi/mi2-var-cmd.exp: Ditto.
-
-2005-01-10  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/fileio.c: Include unistd.h as required for lseek(2).
-
-2005-01-07  Andrew Cagney  <cagney@gnu.org>
-
-	* configure.ac: Rename configure.in, require autoconf 2.59.
-	* configure: Re-generate.
-	* gdb.stabs/configure.ac: Rename configure.in, require autoconf 2.59.
-	* gdb.stabs/configure: Re-generate.
-	* gdb.hp/configure.ac: Rename configure.in, require autoconf 2.59.
-	* gdb.hp/configure: Re-generate.
-	* gdb.hp/gdb.objdbg/configure.ac: Rename configure.in, require
-	autoconf 2.59.
-	* gdb.hp/gdb.objdbg/configure: Re-generate.
-	* gdb.hp/gdb.defects/configure.ac: Rename configure.in, require
-	autoconf 2.59.
-	* gdb.hp/gdb.defects/configure: Re-generate.
-	* gdb.hp/gdb.compat/configure.ac: Rename configure.in, require
-	autoconf 2.59.
-	* gdb.hp/gdb.compat/configure: Re-generate.
-	* gdb.hp/gdb.base-hp/configure.ac: Rename configure.in, require
-	autoconf 2.59.
-	* gdb.hp/gdb.base-hp/configure: Re-generate.
-	* gdb.hp/gdb.aCC/configure.ac: Rename configure.in, require
-	autoconf 2.59.
-	* gdb.hp/gdb.aCC/configure: Re-generate.
-
-2004-12-15  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.threads/linux-dp.exp: Fix output regexp to handle output
-	under NPTL when there is debugging info available for libpthread.
-
-2004-12-13  Jerome Guitton  <guitton@gnat.com>
-
-	* gdb.ada/fixed_points.c: New file.
-	* gdb.ada/fixed_points.exp: New file.
-
-2004-12-03  Randolph Chung  <tausq@debian.org>
-
-	* gdb.arch/pa-nullify.exp: New file.
-	* gdb.arch/pa-nullify.s: New file.
-
-2004-11-30  Randolph Chung  <tausq@debian.org>
-
-	* gdb.threads/thread_check.exp: Use ${srcfile} for test program name
-	instead of "tbug".  Fix regexp to work properly with gdb_test.
-
-2004-11-29  Paul Hilfinger  <Hilfinger@gnat.com>
-
-	* gdb.base/bitfields2.exp: New test.
-	* gdb.base/bitfields2.c: New file.
-
-2004-11-28  Richard Earnshaw  <rearnsha@arm.com>
-
-	* config/sim.exp (gdb_load): Return 0 on success, -1 on failure.
-
-2004-11-16  Randolph Chung  <tausq@debian.org>
-
-	* gdb.base/unload.exp: Pass relative path to gdb_get_line_number.
-
-2004-11-14  Daniel Jacobowitz  <dan@debian.org>
-
-	* gdb.threads/threadapply.exp: Correct "macro details" test.
-
-2004-11-11  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.threads/threadapply.exp: New test.
-	* gdb.threads/threadapply.c: New file.
-
-2004-11-07  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/savedregs.exp: Correct pattern used for sigtramp
-	frames.
-
-2004-11-05  Felix Lee  <felix+log1@specifixinc.com>
-
-	* gdb.base/cursal.exp: New file.
-	* gdb.base/cursal.c: New file.
-
-2004-11-03  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/savedregs.exp, gdb.base/savedregs.c: New files.
-
-2004-10-30  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/asm-source.exp: Add mips*-*-netbsd* to the list of
-	NetBSD/ELF targets.
-
-2004-10-29  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.threads/bp_in_thread.c: New file, copied from
-	pthread_cond_wait.c.
-	* gdb.threads/bp_in_thread.c: Use bp_in_thread.c as the source
-	file, rather than reusing the .c file from another testcase.
-
-2004-10-20  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.ada/null_record.exp: Check where we stopped after
-	sending the start command, instead of where the associated
-	temporary breakpoint was inserted.
-
-2004-10-14  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.mi/gdb701.c (main): Return 0.
-
-2004-10-13  Daniel Jacobowitz  <dan@debian.org>
-
-	* gdb.dwarf2/dw2-intercu.S, gdb.dwarf2/dw2-intercu.exp: New files.
-
-2004-10-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.threads/schedlock.c: Add comment markers to use to find
-	line numbers.
-	* gdb.threads/schedlock.exp: Adjust regex to handle the new
-	comments.
-	* gdb.threads/watchthreads.exp: Use gdb_get_line_number to find
-	breakpoint lines.
-
-2004-10-12  Daniel Jacobowitz  <dan@debian.org>
-
-	* gdb.dwarf2/dw2-basic.exp: Run on Hurd also.
-
-2004-10-12  Daniel Jacobowitz  <dan@debian.org>
-
-	* configure.in: Add gdb.dwarf2.
-	* configure: Regenerated.
-	* Makefile.in: Add gdb.dwarf2.
-	* gdb.dwarf2/Makefile.in, gdb.dwarf2/dw2-basic.S,
-	gdb.dwarf2/dw2-basic.exp, gdb.dwarf2/main.c,
-	gdb.dwarf2/file1.txt: New files.
-
-2004-10-11  Orjan Friberg  <orjanf@axis.com>
-
-	* gdb.threads/bp_in_thread.exp: Use runto_main and "continue" instead 
-	of "run", since the latter doesn't work with remote targets.  Adjust
-	the breakpoint numbering accordingly.
-	* gdb.threads/pthread_cond_wait.exp: Ditto.
-
-2004-10-08  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/overlays.exp: Update copyright years.
-
-2004-10-08  Kei Sakamoto  <sakamoto.kei@renesas.com>
-
-	* gdb.base/overlays.exp: Disable if target is Linux.
-
-2004-10-06  Felix Lee  <felix+log1@specifixinc.com>
-
-	* config/gdbserver.exp (gdb_load): Use right filename on remote.
-
-2004-10-05  Kei Sakamoto  <sakamoto.kei@renesas.com>
-
-	* gdb.asm/asm-source.exp: Add m32r-linux target.
-	* gdb.asm/m32r-linux.inc: New file.
-
-2004-09-24  Andrew Cagney  <cagney@redhat.com>
-	    David Anderson <anderson@redhat.com>
-
-	* gdb.base/bigcore.exp (extract_heap): If the expect "file size"
-	command fails, assume things will work.
-	* gdb.base/bigcore.c: Include <sys/stat.h> and <fcntl.h>.
-	(_GNU_SOURCE): Define.
-	(print_unsigned, print_hex): Change parameter to "long long".
-	(print_byte_count): New function, use to print byte counts.
-	(large_off_t, large_lseek, O_LARGEFILE): Define dependant on
-	O_LARGEFILE.
-	(main): Compute an upper bound on a corefile in max_core_size.
-	Limit memory chunk size to max_core_size.  Limit total memory
-	allocated to max_core_size.
-
-2004-09-23  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/bigcore.exp: Replace the code that creates a corefile
-	from a separate process with code that creates a corefile by
-	making the inferior dump core.
-
-2004-09-23  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/sigstep.exp: Avoid comments withing gdb_test_multiple
-	block.
-
-2004-09-23  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/constvars.exp (local_compiler_xfail_check_2):
-	New proc.  Accept both gcc 3.x.x and gcc 4.x.x.
-	* gdb.base/volatile.exp (local_compiler_xfail_check_2):
-	Likewise.
-
-2004-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.java/jprint.exp: New test case for java inferior call.
-	* gdb.java/jprint.java: Ditto.
-
-2004-09-15  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.base/bigcore.exp: Deactivate on IRIX targets.
-
-2004-09-14  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.threads/killed.c: Include <stdlib.h>.
-	* gdb.threads/pthreads.c: Likewise.
-
-2004-09-14  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.threads/killed.c: Add copyright notice.
-
-2004-09-10  Jason Molenda  (jmolenda@apple.com)
-
-        * gdb.base/define.exp: Two new tests to verify zero space chars
-        after 'if' and 'while' commands in a user-defined command is correctly
-        parsed.
-
-2004-09-08  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/signals.exp (signal_tests_1): Delete.  Merge signal
-	delivery test with duplicate at end of file.
-
-2004-09-06  Mark Kettenis  <kettenis@jive.nl>
-
-	* gdb.base/unload.exp: Link with -dl on *-*-solaris*.
-
-2004-09-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* config/hppro.exp: Removed.
-
-2004-09-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* config/sparclet.exp: Removed.
-
-2004-09-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* config/udi.exp: Removed.
-
-2004-09-02  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/sigstep.exp (advance): Use "-continue_timer" option
-	of "exp_continue".
-	(advancei): Likewise.
-
-2004-09-01  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.base/unload.exp: Fix so messages aren't duplicated.
-
-2004-09-01  Manoj Iyer  <manjo@austin.ibm.com>
-
-	* gdb.gdb/complaints.exp (setup_test): Use new gdb.exp functionality
-	to check for nodebug in executable.
-	* gdb.gdb/observer.exp (setup_test): Likewise.
-	* gdb.gdb/selftest.exp (test_with_self): Likewise.
-	* gdb.gdb/xfullpath.exp (setup_test): Likewise.
-
-2004-09-01  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.threads/staticthreads.c, gdb.threads/staticthreads.exp: New
-	files.
-
-2004-09-01  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.base/unload.exp: Fix expected warning message to match
-	latest format.
-
-2004-09-01  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/call-rt-st.exp: Fix typos.
-
-2004-08-31  Manoj Iyer  <manjo@austin.ibm.com>
-
-	* gdb.threads/thread_check.exp: New testcase.
-	* gdb.threads/thread_check.c: New testcase.
-
-2004-08-31  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/sigstep.exp (breakpoint_to_handler_entry)
-	(skip_to_handler_entry): New procedures.  Test stepping into a
-	handler when the breakpoint is at the handler's entry point.
-
-2004-08-30  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/sigstep.exp (breakpoint_over_handler): Remove kfail
-	gdb/1757.
-
-2004-08-27  Michael Chastain  <mec.gnu@mindspring.com>
-
-	With code from Manoj Iyer <manjo@austin.ibm.com>:
-	* lib/gdb.exp (gdb_file_cmd): Return more information in the
-	return value.  Add an arm for "no debugging symbols found".
-	Change a stray "error" to "perror".
-	(gdb_run_cmd): Adapt to new return value.
-	* gdb.base/remote.exp: Adapt to new return value.
-	* gdb.gdb/complaints.exp: Likewise.
-	* gdb.gdb/observer.exp: Likewise.
-	* gdb.gdb/selftest.exp: Likewise.
-	* gdb.gdb/xfullpath.exp: Likewise.
-
-2004-08-27  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.threads/bp_in_thread.exp: New testcase.
-
-2004-08-27  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Fix PR testsuite/1735.
-	* gdb.threads/schedlock.c (thread_function): Add a cast
-	to suppress a gcc warning.
-	* gdb.threads/thread-specific.c (thread_function): Likewise.
-
-2004-08-26  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/unload.c: Include <stdlib.h>.
-
-2004-08-26  Michael Chastain  <mec.gnu@mindspring.com>
-
-	From Paul Gilliam <pgilliam@us.ibm.com>:
-	* gdb.base/call-sc.exp (test_scalar_returns): Make sure PC is
-	synchronized after the "return".
-
-2004-08-26  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.mi/basics.c: Include <stdio.h>.
-	* gdb.mi/pthreads.c: Include <stdlib.h>.
-	* gdb.mi/var-cmd.c: Include <stdlib.h>.
-
-2004-08-26  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.threads/schedlock.c: Add copyright notice.
-
-2004-08-25  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/sigstep.exp (breakpoint_to_handler, skip_to_handler)
-	(skip_over_handler, breakpoint_over_hander): New test procedures.
-	(advance, advancei): Add a proper prefix, do not use
-	rerun_to_main.
-	* gdb.base/sigstep.c (main): Change to use an infinite loop.
-
-2004-08-24  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.mi/basics.c: Add copyright notice.
-	* gdb.mi/var-cmd.c: Add copyright notice.
-
-2004-08-23  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* lib/gdb.exp: Remove signed_keyword_not_used.
-	* lib/compiler.c: Likewise.
-	* lib/compiler.cc: Likewise.
-
-2004-08-23  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/whatis.c: Remove conditional disabling of "signed".
-	* gdb.base/whatis.exp: Remove signed_keyword_not_used.
-
-2004-08-23  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/whatis.c: Add copyright notice.
-
-2004-08-20  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.arch/i386-prologue.exp (skip_breakpoint): New function.  Use
-	it to skip the breakpoints encoded in the inline assembly.
-
-2004-08-20  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* Makefile.in: Add gdb.fortran.
-
-2004-08-20  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/call-sc.exp (test_scalar_returns):
-	Fix cut-and-paste glitch in "Make fun return now".
-
-2004-08-17  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* configure.in: Add gdb.fortran.
-	* configure: Regenerate.
-	* gdb.fortran/Makefile.in: New file.
-	* lib/gdb.exp (skip_fortran_tests): New procedure.
-
-2004-08-17  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.mi/mi-var-block.exp: Use gdb_get_line_number.  Remove
-	reference to bug-gnu@prep.ai.mit.edu.
-	* gdb.mi/mi-var-child.exp: Likewise.
-	* gdb.mi/mi-var-cmd.exp: Likewise.
-	* gdb.mi/mi-var-display.exp: Likewise.
-	* gdb.mi/mi2-var-block.exp: Likewise.
-	* gdb.mi/mi2-var-child.exp: Likewise.
-	* gdb.mi/mi2-var-cmd.exp: Likewise.
-	* gdb.mi/mi2-var-display.exp: Likewise.
-
-2004-08-15  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/unload.c (main): Make local variable msg const.
-
-2004-08-15  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.mi/mi-cli.exp: Use gdb_get_line_number.  Remove reference
-	to bug-gnu@prep.ai.mit.edu.
-	* gdb.mi/mi-disassemble.exp: Likewise.
-	* gdb.mi/mi-eval.exp: Likewise.
-	* gdb.mi/mi-file.exp: Likewise.  Also, add comment about the
-	default line number.
-	* gdb.mi/mi-return.exp: Likewise.
-	* gdb.mi/mi-simplerun.exp: Likewise.
-	* gdb.mi/mi-stack.exp: Likewise.
-	* gdb.mi/mi-stepi.exp: Likewise.  Also, replace wildcarded line
-	number with explicit range test.
-	* gdb.mi/mi-watch.exp: Likewise.
-	* gdb.mi/mi2-break.exp: Likewise.
-	* gdb.mi/mi2-cli.exp: Likewise.
-	* gdb.mi/mi2-disassemble.exp: Likewise.
-	* gdb.mi/mi2-eval.exp: Likewise.
-	* gdb.mi/mi2-file.exp: Likewise.  Also, add comment about the
-	default line number.
-	* gdb.mi/mi2-return.exp: Likewise.
-	* gdb.mi/mi2-simplerun.exp: Likewise.
-	* gdb.mi/mi2-stack.exp: Likewise.
-	* gdb.mi/mi2-stepi.exp: Likewise.  Also, replace wildcarded line
-	number with explicit range test.
-	* gdb.mi/mi2-watch.exp: Likewise.
-
-2004-08-15  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/ctti.exp: Tweak srcfile and objfile to have no slashes.
-	* gdb.cp/m-static.exp: Likewise.
-	* gdb.cp/rtti.exp: Likewise.
-
-2004-08-14  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/bigcore.c: Include <sys/types.h> and <sys/time.h>.
-
-2004-08-14  Eli Zaretskii  <eliz@gnu.org>
-
-	* ChangeLog: Prefix Local Variables with semi-colons and indent
-	the reference to older ChangeLog files, to fix fontification in
-	Emacs.
-
-2004-08-13  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.mi/mi-break.exp: Use gdb_get_line_number.
-	* gdb.mi/mi2-break.exp: Likewise.
-
-2004-08-13  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.gdb/selftest.exp: Revert removal of call to init_malloc.
-
-2004-08-13  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/inherit.exp: Use cp_test_ptype_class.
-
-2004-08-13  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/classes.exp: Remove unused declarations.  Just let
-	test names default instead of providing special names.  Remove
-	extraneous demangler test.
-
-2004-08-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.base/unload.exp: New test for breakpoints in dynamically
-	loaded libraries.
-	* gdb.base/unload.c: Ditto.
-	* gdb.base/unloadshr.c: Ditto.
-
-2004-08-12  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/classes.exp (test_ptype_class_objects): Call
-	cp_test_ptype_class.
-	(test_enums): Likewise.
-
-2004-08-10  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.threads/staticthreads.c, gdb.threads/staticthreads.exp: New
-	files.
-
-2004-08-10  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.gdb/selftest.exp (do_steps_and_nexts): Remove code to skip
-	init_malloc call.
-
-2004-08-10  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* ChangeLog: Add copyright notice.  The notice is copied
-	from emacs 21.3 top level ChangeLog.
-
-2004-08-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* lib/cp-support.exp: New file.
-	* lib/cp-support.exp (cp_test_type_class): New function.
-	* gdb.cp/derivation.exp: Use cp_test_ptype_class.
-	* gdb.cp/virtfunc.exp (test_one_ptype): Removed.
-	* gdb.cp/virtfunc.exp (test_ptype_of_classes): Use
-	cp_test_ptype_class.
-
-2004-08-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.mi/mi2-basics.exp, gdb.mi/mi2-break.exp,
-	gdb.mi/mi2-console.exp, gdb.mi/mi2-disassemble.exp,
-	gdb.mi/mi2-eval.exp, gdb.mi/mi2-file.exp, gdb.mi/mi2-hack-cli.exp,
-	gdb.mi/mi2-read-memory.exp, gdb.mi/mi2-regs.exp,
-	gdb.mi/mi2-return.exp, gdb.mi/mi2-simplerun.exp,
-	gdb.mi/mi2-stack.exp, gdb.mi/mi2-stepi.exp, gdb.mi/mi2-until.exp,
-	gdb.mi/mi2-var-block.exp, gdb.mi/mi2-var-child.exp,
-	gdb.mi/mi2-var-cmd.exp, gdb.mi/mi2-var-display.exp,
-	gdb.mi/mi2-watch.exp: Update copyright years.
-
-2004-08-09  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/sigaltstack.exp: Provide proper anchoring.
-
-2004-08-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.mi/gdb792.exp, gdb.mi/mi-basics.exp, gdb.mi/mi-break.exp,
-	gdb.mi/mi-console.exp, gdb.mi/mi-disassemble.exp,
-	gdb.mi/mi-eval.exp, gdb.mi/mi-file.exp, gdb.mi/mi-hack-cli.exp,
-	gdb.mi/mi-read-memory.exp, gdb.mi/mi-regs.exp,
-	gdb.mi/mi-return.exp, gdb.mi/mi-simplerun.exp,
-	gdb.mi/mi-stack.exp, gdb.mi/mi-stepi.exp, gdb.mi/mi-until.exp,
-	gdb.mi/mi-var-block.exp, gdb.mi/mi-var-child.exp,
-	gdb.mi/mi-var-cmd.exp, gdb.mi/mi-var-display.exp,
-	gdb.mi/mi-watch.exp: Update copyright years.
-
-2004-08-08  Daniel Jacobowitz  <dan@debian.org>
-
-	PR gdb/1738
-	* gdb.base/signals.exp (signal_tests_1): KFAIL bug in continuing
-	from a breakpoint with a pending signal.
-
-2004-08-08  Daniel Jacobowitz  <dan@debian.org>
-
-	PR gdb/1736
-	* lib/gdb.exp (gdb_test_multiple): Handle return -code return.
-	* gdb.base/sigaltstack.exp (finish_test): Consume output until
-	the prompt.
-	* gdb.base/sigstep.exp: Add KFAIL for gdb/1736.
-
-2004-08-08  Daniel Jacobowitz  <dan@debian.org>
-
-	* gdb.cp/templates.exp: Handle (char)115 for template argument 's'.
-
-2004-08-08  Daniel Jacobowitz  <dan@debian.org>
-
-	PR gdb/1736
-	* gdb.base/sigaltstack.exp (finish_test): New procedure.  KFAIL
-	for i?86-*-linux*.
-
-2004-08-08  Daniel Jacobowitz  <dan@debian.org>
-
-	* gdb.arch/i386-prologue.exp: Compile without debug information.
-
-2004-08-08  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* lib/gdb.exp (gdb_get_line_number): Rewrite with native tcl
-	rather than asking gdb to search.
-
-2004-08-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/gcore.c: Include <string.h>.
-
-2004-08-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/gcore.c: Add copyright notice.
-
-2004-08-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/freebpcmd.c: Include <stdio.h>.
-	* gdb.base/long_long.c: Include <string.h>.
-	* gdb.base/sigaltstack.c: Include <stdlib.h> <string.h>.
-	* gdb.base/siginfo.c: Include <string.h>.
-	* gdb.base/sigstep.c: Include <string.h>.
-
-2004-08-04  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/complex.c: Include <stdlib.h>.
-
-2004-08-04  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/complex.c: Add copyright notice.
-
-2004-08-04  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/charset.c: Include <stdlib.h>.
-
-2004-08-04  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/auxv.c: Include <stdlib.h>.
-
-2004-08-04  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/auxv.c: Add copyright notice.
-
-2004-08-04  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/coremaker.c: Add copyright notice.
-	* gdb.base/coremaker2.c: Add copyright notice.
-
-2004-08-04  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/store.exp: Update copyright.
-	(check_set, up_set, check_struct, up_struct): Add a prefix to test
-	names, do not import gdb_prompt.
-
-2004-08-01  Andrew Cagney  <cagney@gnu.org>
-
-	Fix PR testsuite/1729.
-	* gdb.base/dump.exp: Add test name to callers of capture_value, do
-	not use capture_value with value 4.
-	(capture_value): Add optional test name parameter.
-	(test_reload_saved_value, test_restore_saved_value): Use $msg as
-	the prefix, pass to capture_value.
-
-2004-08-01  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.arch/i386-prologue.exp: Add testcase for standard prolgue.
-	* gdb.arch/i386-prologue.c (standard): New prototype and function.
-	(main): Call new function.
-
-2004-07-31  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/namespace.exp: Accept more varieties of ptype output.
-
-2004-07-31  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/virtfunc.exp: Accept more varieties of ptype output.
-
-2004-07-31  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/inherit.exp: Accept more varieties of ptype output.
-	Accept more values of vtbl pointer.  Remove some messages
-	about "obsolete gcc or gdb".
-
-2004-07-30  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/classes.exp: Accept more varieties of ptype output.
-
-2004-07-30  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/asm-source.exp: Properly convert target board
-	debug flags from gcc format to binutils format.
-
-2004-07-28  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.arch/i386-prologue.exp: Remove KFAIL of "backtrace in
-	gdb1718".  PR backtrace/1718 partially fixed.
-
-2004-07-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.threads/watchthreads.exp: New test for threaded watchpoints.
-
-2004-07-26  Nick Clifton  <nickc@redhat.com>
-
-	* gdb.asm/asm-source.exp (debug-flags): New variable.  If a known
-	good default value for a specific architecture is available then
-	set it to that value.  Otherwise default to the -gstabs switch.
-	Remove the -g... switches from the asm-flags variable.  Allow the
-	target board info to override the value if it wants to.  Pass the
-	switch on the assembler command line.
-
-2004-07-23  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.arch/i386-prologue.exp: Add testcase for PR backtrace/1718.
-	* gdb.arch/i386-prologue.c (gdb1718): New prototype and function.
-	(main): Call new function.
-
-2004-07-22  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Test for PR exp/1715.
-	* gdb.base/radix.exp: Refactor common procedures.  Make all
-	test names unique.  Change XFAIL to KFAIL.
-
-2004-07-20  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.ada/gnat_ada.gpr.in: Rename from here ...
-	* gdb.ada/gnat_ada.gin: ... to here.
-	* configure.in: Use gnat_ada.gin.
-	* configure: Regenerate.
-
-2004-07-20  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/signals.exp: Replace send_gdb and gdb_expect with
-	gdb_test and gdb_test_multiple.  Delete bash_bug.  Delete suspect
-	XFAILs.  Clean up test messages and comments.  Check backtraces.
-	Delete re-sync code.
-
-2004-07-19  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Fix PR cli/740.
-	* gdb.base/annota1.exp: Honor gdb,nosignals.
-	* gdb.base/annota3.exp: Likewise.
-
-2004-07-19  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* lib/java.exp: Update copyright notice.
-
-2004-07-19  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/selftest.exp: Copy file from here ...
-	* gdb.gdb/selftest.exp: ... to here.
-
-2004-07-16  Andrew Cagney  <cagney@redhat.com>
-
-	* lib/insight-support.exp: Delete file.
-	* lib/java.exp (java_init): Fix copyright.
-
-2004-07-16  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/restore.c: Append "prologue" to comments marking the a
-	function's prologue.
-	* gdb.base/restore.exp: Update copyright, re-indent.
-	(restore_tests): Use gdb_test_multiple.  Add "calleeN calls
-	callerN" prefix where needed.  Update patterns that match a
-	function's prologue.
-
-2004-07-16  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/restore.c: Add copyright notice.
-
-2004-07-16  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/logical.exp: Update copyright.
-	(evaluate): New procedure.  Use to re-implement tests using
-	several tables.
-
-2004-07-14  Martin Hunt  <hunt@redhat.com>
-
-	* lib/insight-support.exp (gdbtk_start): Unset TCL_LIBRARY
-	which fixes some problems where init.tcl was not found.
-
-2004-07-13  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/sizeof.exp: Skip test when no inferior I/O.
-	(check_sizeof, check_valueof): Do not include the output in the
-	test name.  Use gdb_test.
-	(get_valueof): Use gdb_test_multiple.
-
-	* gdb.base/step-test.exp: Update copyright.  Use
-	gdb_test_multiple.  Ensure that test names do not include
-	architecture dependent output.
-
-	* gdb.gdb/observer.exp: Update copyright.
-	(setup_test): Use gdb_test_multiple.
-	(attach_first_observer, attach_second_observer)
-	(attach_third_observer, detach_first_observer)
-	(detach_second_observer, detach_third_observer)
-	(reset_counters, check_counters): Make $message a prefix.
-	(test_normal_stop_notifications): Add "args" parameter - a list of
-	init functions to be called.  Make $message a prefix,
-	(test_observer_normal_stop): Change the message prefixes so that
-	they are unique, pass the attach / detach procedures to
-	test_normal_stop_notifications.
-
-	* gdb.base/signull.exp (test_segv): Prefix all tests with
-	"${name}".  Clean up test messages.
-
-	* gdb.base/annota3.exp, gdb.base/annota1.exp: Update copyright.
-
-	* gdb.base/ena-dis-br.exp: Update copyright.
-	(break_at): New function.  Replace send_gdb with gdb_test,
-	break_at, and gdb_test_multiple.  Replace XFAIL of "continue with
-	ignore count, not stopped at bpt", with KFAIL.
-
-2004-07-13  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/attach.exp: Remove cleanupfile handling.
-
-2004-07-12  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/annota1.exp: Cleanup corefile test name.
-	* gdb.base/annota3.exp: Ditto.
-
-2004-07-12  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/signals.exp: Clean up copyright, re-indent.
-
-	* gdb.base/attach.exp: Replace send_gdb and gdb_expect with
-	gdb_test and gdb_test_multiple.
-
-2004-07-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.java/jmain.exp: Fix expected line number for main to
-	break at.  Set XFAIL for break at main test since gcj does not 
-	provide line number info for first statement in main.
-
-2004-07-08  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/attach.exp: Cleanup copyright.  Re-indent.
-
-	* gdb.base/sigbpt.exp: Make the common part of each test name a
-	prefix instead of suffix.
-
-2004-07-07  Bob Rossi  <bob_rossi@cox.net>
-
-	* gdb.mi/mi2-file.exp: Revert to version 1.1, except changed name of
-	test from test_tbreak_creation_and_listing to
-	test_file_list_exec_source_file
-	* gdb.mi/mi-file.exp: Add test for -file-list-exec-source-files
-	Changed name of test from test_tbreak_creation_and_listing to
-	test_file_list_exec_source_file
-
-2004-07-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.java/jmisc.exp: Fix expected output of ptype to look for
-	the jmisc() constructor instead of <init>.
-	* gdb.java/jmisc1.exp: Ditto.
-
-2004-07-07  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/sigbpt.exp (stepi_out): Check for a single step
-	corrupting the PC.
-
-2004-07-06  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/templates.exp: Accept whitespace change in demangler
-	output.
-
-2004-07-06  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/sigbpt.exp, gdb.base/sigbpt.c: New test.
-
-2004-07-02  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* lib/compiler.c: Accept __HP_CXD_SPP for old hp ansi c compiler.
-	* lib/compiler.cc: Likewise.
-
-2004-06-30  Michael Chastain   <mec.gnu@mindspring.com>
-
-	* lib/compiler.cc: Work around string preprocessing problem
-	with old hp c++ compiler.
-	* lib/compiler.c: Likewise.
-
-2004-06-29  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.arch/i386-prologue.c: Add copyright header.  Use preprocessor
-	directives to conditionalize symbol prefixing.
-	* gdb.arch/i386-prologue.exp: Allow symbol prefixing by adding
-	additional_flags handling.  Add underscore prefix for Cygwin.
-	* gdb.arch/i386-unwind.c: Use preprocessor directives to
-	conditionalize symbol prefixing.
-	* gdb.arch/i386-unwind.exp: Allow symbol prefixing by adding
-	additional_flags handling.  Add underscore prefix for Cygwin.
-
-2004-06-29  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/bigcore.exp: Skip test on Cygwin.
-
-2004-06-28  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.hp/gdb.base-hp/reg.exp: Accept both old and new gdb output
-	formats for "info register".  Use gdb_test_multiple.  Fix
-	the "invalid register" test.
-
-2004-06-28  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/attach.exp: Fix copyright date.  Set testpid to Windows
-	PID for Cygwin.  Add Cygwin specific strings to check for in some
-	tests.
-	(do_attach_tests): Add a test for user interaction when attaching
-	to a process with no matching symbol table already loaded.
-
-2004-06-26  Andrew Cagney  <cagney@gnu.org>
-
-	Test PR java/1567 and PR java/1565.
-	* gdb.java/jmain.exp, gdb.java/jmain.java: New files.
-	* gdb.java/jmisc2.exp: Delete file.
-
-2004-06-26  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.hp/gdb.base-hp/reg.exp: Update copyright notice.
-
-2004-06-25  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/attach.exp (do_attach_tests): Don't forget to kill second
-	attach process.
-
-2004-06-23  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/pr-1553.exp: Remove.
-
-2004-06-22  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/pr-1553.cc: Remove.
-	* gdb.cp/pr-1553.exp: Disable this test.
-
-2004-06-20  Jim Blandy  <jimb@redhat.com>
-
-        Fix PR testsuite/1680.
-	* gdb.arch/i386-sse.exp: Properly quote curly braces in
-	regular expressions.
-
-2004-06-19  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Fix PR testsuite/1679.
-	* gdb.arch/i386-sse.exp: Do not call gdb_suppress_entire_file.
-	Issue an UNSUPPORTED result instead.
-
-2004-06-18  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/charset.exp: Only send a control-C if we see a new
-	prompt and incomplete command.
-
-2004-06-18  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/pr-574.cc: Add copyright notice.
-
-2004-06-17  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/charset.exp: Don't refer to $expect_out(1,string) in
-	cases where the regexp has no groups; this grabs random text from
-	the previous test suite, whatever that was.
-
-2004-06-17  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/printmethod.cc: Add copyright notice.
-
-2004-06-16  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/psmang1.cc, gdb.cp/psmang2.cc: Add copyright notice.
-
-2004-06-16  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/signull.c: Update copyright.  Include <string.h>.
-	(bowler): Replace data_pointer with data_read
-	and data_write cases.  Add code_descriptor case.
-	(zero, desc): New array and pointer.
-	(data, code): Change to simple pointers.
-	* gdb.base/signull.exp: Fix probe pattern matching a function
-	descriptor SIGSEGV.  Replace data_pointer with data_read and
-	data_write tests.
-
-2004-06-16  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/long_long.exp, gdb.base/long_long.c: Rewrite.
-
-2004-06-15  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/long_long.c: Add copyright notice.
-
-2004-06-15  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/long_long.exp: Remove reference to
-	bug-gdb@prep.ai.mit.edu.  Change line-number-specific breakpoint
-	to gdb_breakpoint and gdb_continue_to_breakpoint.
-
-2004-06-14  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.arch/e500-regs.exp: Fix up 'print' pattern for the little-
-	endian case.
-
-2004-06-14  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/gcore.exp (capture_command_output): Delete the always
-	passing tests containing inferior values.
-	* gdb.base/ending-run.exp: Do not include the breakpoint address
-	in the test message.  Update copyright.
-	* gdb.base/sizeof.exp (check_sizeof): Do not include the type's
-	size in the test name, use gdb_test_multiple.  Update copyright.
-
-2004-06-14  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/ref-types.cc: Add copyright notice.
-
-2004-06-14  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* lib/compiler.c: Remove gcc_compiled, hp_cc_compiler,
-	hp_aCC_compiler.
-	* lib/compiler.cc: Likewise.
-	* lib/gdb.exp (get_compiler_info): Eval lines only if they are
-	'set' commands.  Log diagnostics for other lines.  Set
-	gcc_compiled, hp_cc_compiler, and hp_aCC_compiler.
-
-2004-06-13  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/try_catch.cc: Add copyright notice.
-
-2004-06-12  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/userdef.cc: Add copyright notice.
-
-2004-06-11  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/virtfunc.cc: Add copyright notice.
-
-2004-06-11  Randolph Chung  <tausq@debian.org>
-
-	* gdb.base/structs2.exp: Mark two tests as xfail because of a compiler
-	problem.
-
-2004-06-10  Andrew Cagney  <cagney@gnu.org>
-
-	* lib/compiler.cc, lib/compiler.c: Append either
-	__GNUC_PATCHLEVEL__, or "unknown" to the compiler_info.
-	* gdb.base/structs.exp (test_struct_calls): Check for gcc-3-3-*
-	instead of gcc-3-3.
-
-2004-06-09  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/structs.exp (test_struct_calls): Fix KFAIL for
-	gdb/1455, bug is specific to "long long" and "double".
-	
-	* gdb.base/structs.exp (test_struct_returns, test_struct_returns)
-	(test_struct_calls): Remove KFAIL of "long double" on i*86-*-*,
-	x86_64-*-*, sparc64-*-*, and sparc*-*-solaris2*.  PR tdep/1447
-	fixed.
-
-2004-06-09  Andrew Cagney  <cagney@gnu.org>
-
-	* gdb.base/structs.exp (test_struct_returns): Replace
-	"return_value_unknown" and "finish_value_unknown" by
-	"return_value_known" and "finish_value_known".  Instead of
-	"return_value_unknown" iff "finish_value_unknown", check
-	"return_value_known" implies "finish_value_known".
-
-2004-06-08  Martin Hunt  <hunt@redhat.com>
-
-	* gdb.base/float.exp: Add pattern for mips targets.
-
-2004-06-08  Randolph Chung  <tausq@debian.org>
-
-	* gdb.base/float.exp: Add pattern for hppa*-* target; make the failure
-	message for unknown architectures more clear.
-
-2004-06-08  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.ada/null_record.exp: Use "start" instead of "begin" to
-	start the execution of the program.
-
-2004-06-07  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.arch/i386-sse.exp, gdb.arch/i386-sse.c: New tests.
-	* gdb.arch/i386-cpuid.h: New helper file.
-
-2004-06-07  Randolph Chung  <tausq@debian.org>
-
-	* gdb.base/shlib-call.exp: Allow breakpoint to be added after inferior
-	has started.
-
-2004-06-04  Roland McGrath  <roland@redhat.com>
-
-	Fix PR gdb/1647.
-	* gdb.base/auxv.exp (fetch_auxv): Revert last change and fix it
-	differently to be robust to output buffering differences.
-
-2004-06-04  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.threads/pthreads.exp: Update copyright years.
-	(check_control_c): Change asynchronous 'after' to synchronous.
-
-2004-06-04  Roland McGrath  <roland@redhat.com>
-
-	* gdb.base/auxv.exp (fetch_auxv): Consume output fully through
-	next gdb prompt.
-
-2004-06-02  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Fix PR gdb/1636.
-	* gdb.threads/manythreads.exp: Change asynchronous 'after'
-	calls to synchronous.
-
-2004-05-26  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.arch/e500-prologue.exp, gdb.arch/e500-prologue.c: New tests.
-
-2004-05-24  Randolph Chung  <tausq@debian.org>
-
-	* gdb.asm/asm-source.exp: Enable test for hppa-linux target.
-	* gdb.asm/pa.inc: New file.
-
-2004-05-22  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/signull.c: Use sigjmp_buf instead of jmp_buf.
-
-2004-05-21  Joel Brobecker  <brobecker@gnat.com>
-            Daniel Jacobowitz  <drow@mvista.com>
-
-	* lib/gdb.exp (gdb_test_multiple): Improve regexp matching the
-	GDB prompt.
-
-2004-05-20  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
-
-	* gdb.base/signull.c: Use sigsetjmp/siglongjmp instead of
-	setjmp/longjmp.  Use sigaction instead of signal.
-
-2004-05-19  J. Brobecker  <brobecker@gnat.com>
-            Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.threads/pthread_cond_wait.c: New file.
-	* gdb.threads/pthread_cond_wait.exp: New testcase.
-
-2004-05-13  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/signull.exp, gdb.base/signull.c: New files.
-	* gdb.base/gdb1476.c, gdb.base/gdb1476.exp: Delete files.
-
-2004-05-11  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/sigstep.exp (advancei): Update KFAILs.  gdb/1613 is
-	fixed but revealed gdb/1639.
-
-2004-05-10  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/signals.exp (signal_tests_1): Simplify "continue to
-	func1" and "next to 2nd alarm", kernel bug avoided.
-
-2004-05-10  Daniel Jacobowitz  <dan@debian.org>
-
-	PR external/1568
-	* gdb.base/bigcore.exp: Check the size of the dumped core file.
-	XFAIL if it is smaller than bytes_allocated.
-	* gdb.base/bigcore.c (bytes_allocated): Make static and unsigned.
-	(main): Make chunks_allocated unsigned.  Correct comment.
-
-2004-05-07  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.arch/powerpc-aix-prologue.c: New file.
-	* gdb.arch/powerpc-aix-prologue.exp: New file.
-
-2004-05-07  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/lineinc.exp, gdb.base/lineinc1.h, gdb.base/lineinc2.h,
-	gdb.base/lineinc3.h, gdb.base/lineinc.c: New tests.
-
-2004-05-06  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.base/sep.exp: No longer setup_kfail when the program was
-	built with dwarf2.
-
-2004-05-05  Jim Ingham  <jingham@apple.com>
-
-	* gdb.base/pending.exp: Make sure pending breakpoints
-	preserve the ignore count.
-
-2004-04-27  Jerome Guitton  <guitton@gnat.com>
-
-	* i386-prologue.exp: Add testcase for jump instruction as first
-	instruction of the real code.
-	* i386-prologue.c (jump_at_beginning): New function.
-
-2004-04-28  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/call-sc.exp: Remove patterns to KFAIL PR gdb/1624 on
-	x86_64-*-*.
-
-2004-04-28  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/call-sc.exp: Remove patterns to KFAIL PR gdb/1623 on
-	i*86-*-*.
-
-2004-04-25  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/call-sc.exp (start_scalars_test): Fix regular
-	expression that checks the return type.
-
-2004-04-23  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/call-sc.exp: New test of scalar call/return values.
-	* gdb.base/call-sc.c: Ditto.
-
-2004-04-23  Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
-
-	* gdb.threads/manythreads.c: Reduce thread stack size.
-
-2004-04-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.threads/manythreads.c: Add copyright notice.
-
-2004-04-23  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/siginfo.exp: Better handle step out of signal.
-	* gdb.base/sigstep.exp: Ditto.
-
-2004-04-22  Jeff Johnston  <jjohnstn@redhat.com>
-            Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/manythreads.c: New testcase.
-	* gdb.threads/manythreads.exp: Ditto.
-
-2004-04-22  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.stabs/exclfwd.exp, gdb.stabs/exclfwd1.c,
-	gdb.stabs/exclfwd2.c, gdb.stabs/exclfwd.h: New test.
-
-2004-04-21  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.stabs/weird.exp: Accept full pathname for $binfile.
-
-2004-04-21  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/sigstep.c: New file.
-	* gdb.base/sigstep.exp: New file.
-
-2004-04-16  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.gdb/observer.exp (test_normal_stop_notifications): Update
-	call to observer_notify_normal_stop.
-
-2004-04-15  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/siginfo.c: New file.
-	* gdb.base/siginfo.exp: New file.
-
-2004-04-12  J. Brobecker  <brobecker@gnat.com>
-
-	* gdb.base/sep.exp: Fix typo in comment.
-
-2004-04-12  J. Brobecker  <brobecker@gnat.com>
-
-	* gdb.base/sep.c: New file.
-	* gdb.base/sep-proc.c: New file.
-	* gdb.base/sep.exp: New testcase.
-
-2004-04-09  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/bigcore.exp: Disable on Solaris; no sparse core file
-	support.
-
-2004-04-05  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/sigaltstack.c: New file.
-	* gdb.base/sigaltstack.exp: New file.
-
-2004-04-04  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.base/foll-fork.exp: Update the expected output for
-	"help set follow-fork-mode", to match a change that was made
-	to the help of this variable on 2004-01-13.
-
-2004-04-01  Joel Brobecker  <brobecker@gnat.com>
-
-	* lib/ada.exp: Add copyright notice.
-	* bar.ads: Likewise.
-	* bar.adb: Likewise.
-	* null_record.adb: Likewise.
-	* null_record.exp: Likewise.
-	* gnat_ada.gpr.in: Likewise. Fix typo in a comment, clarify another.
-
-2004-04-01  Joel Brobecker  <brobecker@gnat.com>
-
-	* configure.in: Generate gdb.ada/Makefile and gdb.ada/gnat_ada.gpr.
-	* configure: Regenerate.
-
-2004-04-01  Joel Brobecker  <brobecker@gnat.com>
-
-	* lib/ada.exp (gdb_compile_ada): Emit UNSUPPORTED if we failed
-	to build the application. Remove the message printed when in
-	verbose mode, redundant with the UNSUPPORTED message above.
-
-2004-03-31  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.ada (bar.ads, bar.adb, null_record.adb): New files.
-	* gdb.ada (null_record.exp): New testcase.
-
-2004-03-31  Joel Brobecker  <brobecker@gnat.com>
-
-	* Makefile.in (ALL_SUBDIRS) Add gdb.ada.
-
-2004-03-31  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.ada: New subdirectory.
-	* gdb.ada/Makefile.in: New file.
-	* gdb.ada/gnat_ada.gpr.in: New file.
-
-2004-03-31  Joel Brobecker  <brobecker@gnat.com>
-
-	* lib/ada.exp: New file.
-
-2004-03-24  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/gdb1250.exp: Use runto {allow-pending}.
-	* lib/gdb.exp (runto, gdb_breakpoint): Support {allow-pending}.
-
-2004-03-22  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/watchpoint.exp (test_stepping): Delete bogus XFAILs
-	hiding problems with DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET.
-	Problem identified by Ulrich Weigand.
-
-2004-03-17  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/classes.exp (test_enums): Refer to PR c++/1588 instead of
-	PR c++/826.
-
-2004-03-16  Roland McGrath  <roland@redhat.com>
-
-	* gdb.base/auxv.exp: New file.
-	* gdb.base/auxv.c: New file, copied verbatim from coremaker2.c.
-
-2004-03-12  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/pr-1553.exp: New.  Tests for PR c++/1553.
-	* gdb.cp/pr-1553.cc: Ditto.
-	* gdb.cp/local.exp (ptype NestedInnerLocal): Add comment, third
-	pass branch.
-
-2004-03-12  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/templates.exp: Accept more template types.
-
-2004-03-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	From Corinna Vinschen with modifications.
-	* gdb.cp/classes.cc (enums1): Add a line to extend scope of
-	local variable obj_with_enum.
-	* gdb.cp/classes.exp (test_enums): Remove TODO note about FAIL
-	results with obj_with_enum.
-
-2004-03-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/classes.cc: New file, copied from misc.cc.
-	* gdb.cp/classes.exp: Use classes.cc rather than misc.cc.
-
-2004-03-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/misc.cc: Add copyright notice.
-
-2004-03-05  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/rtti.exp: Add 'print *obj3' test.
-	* gdb.cp/rtti.h: Update copyright.
-	(namespace n2::n3): New.
-	* gdb.cp/rtti1.cc: (refer_to (n2::n3::C3 *)): New.
-	(n2::n3::func3): New.
-	(main): Call n2::n3::func3.
-	* gdb.cp/rtti2.cc: Update copyright.
-	(n2::create3): New.
-
-2004-03-04  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/openbsd.inc: Fix typo.
-
-2004-03-03  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/pc-fp.exp (get_valueofx): Fix apparent typo to now set
-	"val" instead of unused "size".  Update copyright year.
-
-2004-02-29  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.cp/ctti.exp: Handle unsigned char type.  Expect templates
-	to use unsigned char.
-	* gdb.cp/cttiadd.c, gdb.cp/cttiadd1.c, gdb.cp/cttiadd2.c,
-	gdb.cp/cttiadd3.c: Change type of variable to unsigned char.
-
-2004-02-29  Daniel Jacobowitz  <drow@mvista.com>
-
-	* config/gdbserver.exp (gdbserver_gdb_load): Wait for a complete
-	line of output.
-
-2004-02-28  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/relocate.c (dummy): Initialize.
-
-2004-02-28  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/chng-syms.exp: Anchor exit pattern.  Allow
-	a breakpoint at exit.
-
-2004-02-27  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/chng-syms.exp: Add expect condition to match failing
-	case that isn't a timeout.
-
-2004-02-27  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/bigcore.exp: Disable on HP/UX, no sparse corefile
-	support.
-
-2004-02-26  Fred Fish  <fnf@redhat.com>
-
-	* gdb.arch/gdb1431.c: Remove.
-	* gdb.arch/gdb1431.s: New file, copy of gdb1291.s
-	* gdb.arch/gdb1431.exp: Use "advance" correctly instead
-	of "until" incorrectly.
-
-2004-02-26  J. Brobecker  <brobecker@gnat.com>
-
-	* gdb.cp/class2.cc (empty): New class.
-	(refer): New function.
-	(main): Declare an object of type empty and use it.
-	* gdb.cp/class2.exp: Print the value of an object of type empty.
-
-2004-02-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.base/langs.exp: Update query string to match the
-	new nquery format used for pending breakpoints.
-
-2004-02-26  Andrew Cagney  <cagney@redhat.com>
-
-	Fix PR i18n/1570.
-	* gdb.base/charset.c: Update copyright notice.
-	(main, init_string): Remove the escape character '\e' tests.
-	* gdb.base/printcmds.exp (test_print_all_chars): Ditto.
-	* gdb.base/charset.exp (valid_host_charset): Ditto.
-	* gdb.base/setvar.exp: Ditto.
-
-2004-02-24  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/corefile.exp: Use gdb_test_multiple, make "accessing
-	mmapped data in core file" PASS and FAIL messages consistent.
-
-	* gdb.java/jmisc.exp: Use the fully quallified name of "main" when
-	setting a breakpoint.  Work around PR java/1565.
-
-2004-02-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* lib/gdb.exp (gdb_breakpoint): Update query string to match
-	new nquery format.
-	* gdb.base/pending.exp: Ditto.
-
-2004-02-22  Mark Kettenis  <kettenis@gnu.org>
-
-	* configure.in: Run stabs tests on *BSD.
-	* configure: Regenerated.
-
-2004-02-21  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/bigcore.exp: Bail out on *BSD instead of only NetBSD.
-
-2004-02-20  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/callfuncs.exp (do_function_calls): Remove extraneous
-	blank in test for "returns short", for consistency with other
-	"returns xxx" tests.  Update copyright year.
-
-2004-02-19  Fred Fish  <fnf@redhat.com>
-
-	New testcase for PR breakpoint/1558.
-	* gdb.arch/gdb1558.exp: New file.
-	* gdb.arch/gdb1558.c: New file.
-
-2004-02-19  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/nodebug.exp: Fix typo.
-
-2004-02-17  Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
-
-	Committed by Jim Blandy  <jimb@redhat.com>.
-
-	* gdb.objc/basicclass.exp: Adapt to fixed return type of printHi.
-
-	* gdb.base/dump.exp: Handle negative offsets in decimal, not hex.
-
-	* gdb.base/float.exp: Support s390*-*-* targets.
-
-2004-02-17  Adam Fedor  <fedor@gnu.org>
-
-	* gdb.base/gdb1555.exp: New file.
-	* gdb.base/gdb1555-main.c, gdb.base/gdb1555.c: New files.
-
-2004-02-17  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/selftest.exp (do_steps_and_nexts): Add comment.
-
-2004-02-16  Fred Fish  <fnf@redhat.com>
-
-	* gdb.arch/gdb1291.c: Remove
-	* gdb.arch/gdb1291.s: New test input file.
-	* gdb.arch/gdb1291.exp: Expand test to check case that should not
-	fail.  Test for correct result, known incorrect result, other
-	failures and timeouts.
-
-2004-02-16  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/bigcore.exp: New file.
-	* gdb.base/bigcore.c: New file.
-
-2004-02-13  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.mi/mi1-basics.exp, gdb.mi/mi1-break.exp: Delete file.
-	* gdb.mi/mi1-console.exp, gdb.mi/mi1-disassemble.exp: Delete file.
-	* gdb.mi/mi1-eval.exp, gdb.mi/mi1-hack-cli.exp: Delete file.
-	* gdb.mi/mi1-pthreads.exp, gdb.mi/mi1-read-memory.exp: Delete file.
-	* gdb.mi/mi1-regs.exp, gdb.mi/mi1-return.exp: Delete file.
-	* gdb.mi/mi1-simplerun.exp, gdb.mi/mi1-stack.exp: Delete file.
-	* gdb.mi/mi1-stepi.exp, gdb.mi/mi1-symbol.exp: Delete file.
-	* gdb.mi/mi1-until.exp, gdb.mi/mi1-var-block.exp: Delete file.
-	* gdb.mi/mi1-var-child.exp, gdb.mi/mi1-var-cmd.exp: Delete file.
-	* gdb.mi/mi1-var-display.exp, gdb.mi/mi1-watch.exp: Delete file.
-
-2004-02-11  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.asm/ia64.inc (gdbasm_startup): Make sure first instruction
-	executed is an alloc instruction.
-
-2004-02-11  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/breakpoint.exp: New.
-	* gdb.cp/breakpoint.cc: New.
-
-2004-02-11  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR gdb/1543.
-	* gdb.cp/ambiguous.exp, gdb.cp/annota2.exp, gdb.cp/annota3.exp,
-	gdb.cp/anon-union.exp, gdb.cp/casts.exp, gdb.cp/classes.exp,
-	gdb.cp/cplusfuncs.exp, gdb.cp/ctti.exp, gdb.exp/demangle.exp,
-	gdb.cp/derivation.exp, gdb.cp/exception.exp, gdb.cp/hang.exp,
-	gdb.cp/inherit.exp, gdb.cp/local.exp, gdb.cp/maint.exp,
-	gdb.cp/member-ptr.exp, gdb.cp/method.exp, gdb.cp/misc.exp,
-	gdb.cp/namespace.exp, gdb.cp/overload.exp, gdb.cp/ovldbreak.exp,
-	gdb.cp/psmang.exp, gdb.cp/ref-types.exp, gdb.cp/templates.exp,
-	gdb.cp/userdef.exp, gdb.cp/virtfunc.exp: Remove reference
-	to bug-gdb@prep.ai.mit.edu .
-	* gdb.cp/bs15503.cc, gdb.cp/class2.cc, gdb.cp/cttiadd.cc,
-	gdb.cp/cttiadd1.cc, gdb.cp/cttiadd2.cc, gdb.cp/cttiadd3.cc,
-	gdb.cp/exception.cc, gdb.cp/member-ptr.cc, gdb.cp/namespace1.cc:
-	Likewise.
-
-2004-02-10  Andrew Cagney  <cagney@redhat.com>
-
-	* lib/gdb.exp (gdb_expect_list): Recover from internal-errors
-	using gdb_internal_error_resync.
-
-2004-02-09  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/thread-specific.exp: Stop early if no threads are
-	found.
-
-2004-02-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/pending.exp: Remove extra \n from gdb_test calls.
-
-2004-02-08  Daniel Jacobowitz  <drow@mvista.com>
-
-	* lib/gdb.exp (gdb_breakpoint): Fail on unexpected pending
-	breakpoints.
-
-2004-02-07  Daniel Jacobowitz  <drow@mvista.com>
-
-	* config/sim.exp (gdb_load): Handle $arg == "".
-	* lib/gdb.exp (gdb_run_cmd): Honor gdb,do_reload_on_run.
-	* gdb.objc/basicclass.exp: Use gdb_run_cmd.
-
-2004-02-07  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.base/maint.exp: Update test to reflect
-         obstack changes.
-
-2004-02-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.base/pendshr.c (pendfunc): New function that calls
-	pendfunc1.
-	* gdb.base/pending.c: Call pendfunc instead of pendfunc1.
-
-2004-02-04  Fred Fish  <fnf@redhat.com>
-
-	* gdb.arch/gdb1431.c: Add underbar prefixed version of global
-	function symbols and update copyright years.
-	* gdb.arch/gdb1291.c: Ditto.
-
-2004-02-03  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/virtfunc.exp: Accept both "ctor()" and "ctor(void)".
-
-2004-02-03  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/inherit.exp: Accept both "ctor()" and "ctor(void)".
-
-2004-02-03  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/inherit.exp: Accept output with gcc 3.2-7-rh.
-
-2004-02-02  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/bang.exp: Use gdb_run_cmd so this tests works with
-	remote targets.  Update copyright years.
-
-2004-02-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* lib/gdb.exp (gdb_breakpoint): Add pending breakpoint
-	support.
-	* gdb.base/langs.exp: Fix test which attempts to create
-	breakpoint on non-existent function to handle new pending
-	support.
-	* gdb.base/shlib-call.exp: Use gdb_breakpoint to set
-	a breakpoint.
-	* gdb.base/pending.exp: New test.
-	* gdb.base/pending.c: New file.
-	* gdb.base/pendshr.c: Ditto.
-
-2004-02-02  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/overload.exp: Add overloadNamespace tests.
-	* gdb.cp/overload.cc (dummyClass, dummyInstance): New.
-	(overloadNamespace, XXX): New.
-	(main): Call XXX::marker2.
-
-2004-02-01  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/dump.exp: Use runto_main instead of "runto main".
-	* gdb.base/finish.exp: Ditto.
-	* gdb.base/gcore.exp: Ditto.
-	* gdb.base/huge.exp: Ditto.
-	* gdb.base/info-proc.exp: Ditto.
-	* gdb.base/return2.exp: Ditto.
-	* gdb.threads/gcore-thread.exp: Ditto.
-
-2004-02-01  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/thread-specific.exp: Add missing anchor to regexp.
-
-2004-02-01  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/fileio.c (test_open): Replace O_RDONLY with O_RDWR such
-	that opening the file succeeds on OpenBSD.
-
-2004-02-01  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/thread-specific.c: New file.
-	* gdb.threads/threads-specific.exp: New test script.
-	* lib/gdb.exp (gdb_test_multiple): Allow user patterns access
-	to expect_out.
-
-2004-02-01  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/call-ar-st.exp: Call get_debug_format.  Remove xfail on
-	sparc*-*-solaris* into a kfail PR gdb/1539 on sparc-*-* for stabs
-	only on the "print_small_structs from print_long_arg_list" test.
-
-2004-02-01  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/completion.exp: Kill a stray backslash.
-
-	From Jim Ingham <jingham@apple.com>:
-	* gdb.base/completion.exp: Test that "complete file ./gdb.base/compl"
-	agrees with the result from sending a tab.
-
-2004-01-31  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/chng-syms.exp: Remove stray newline.
-
-2004-01-31  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/asm-source.exp: Set asm-note to "openbsd" for
-	*-*-openbsd*.
-	* gdb.asm/openbsd.inc: New file.
-
-2004-01-30  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/asm-source.exp: Strip -Wl, from link-flags.  Don't
-	append -static to link-flags for *-*-freebsd*, *-*netbsd* and
-	*-*solaris2*.  Remove commented out default settings for
-	asm-flags.  Replace gdb_compile with target_link.
-
-2004-01-29  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/inherit.exp: Rewrite.  Use gdb_test_multiple and gdb
-	for all tests.  Remove old hp-ux and cygnus xfail cases.
-
-2004-01-29  Paul N. Hilfinger  <Hilfinger@gnat.com>
-
-	* gdb.base/chng-syms.exp: New file.
-	* gdb.base/chng-syms.c: New file.
-
-2004-01-24  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/local.exp: Rewrite "ptype Local".  Add "ptype l".
-	Provide arms for current output in all my configurations.
-
-2004-01-24  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* lib/compiler.c: Add hp_cc_compiler and hp_aCC_compiler.
-	* lib/compiler.cc: Likewise.
-	* lib/gdb.exp (get_compiler_info): Always call gdb_compile to
-	get the right preprocessor.  Eval the output directly.  Remove
-	special tests for hp_cc_compiler and hp_aCC_compiler.  Remove
-	hp_f77_compiler and hp_f90_compiler completely.
-	(gdb_preprocess): Delete.
-	(get_compiler): Delete.
-
-2004-01-24  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/charset.c, gdb.base/dump.c, gdb.base/huge.c: Include
-	<string.h>.
-
-2004-01-24  Nick Roberts  <nick@nick.uklinux.net>
-
-	* gdb.mi/mi-stack.exp: Update copyright.
-
-2004-01-23  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/rtti.exp: Don't include full path in ${srcfile}.  Add
-	test for cp_lookup_transparent_type.
-	* gdb.cp/rtti1.cc: Update copyright.  Add n2::func and refer_to;
-	call them.
-
-2004-01-23  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.mi/mi-var-child.exp: Update copyright year.  Move new test
-	after -var-update.
-
-2004-01-23  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/namespace.cc (C::ensureRefs): New.
-	* gdb.cp/namespace1.cc (C::ensureOtherRefs): New.
-
-2004-01-20  Nick Roberts  <nick@nick.uklinux.net>
-
-	* gdb.mi/mi-stack.exp (test_stack_locals_listing): Test for
-	case "-stack-list-locals 2".
-	* gdb.mi/mi-var-child.exp: Test for case
-	"-var-list-children --all-values NAME".
-
-2004-01-18  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/local.exp: Accept correct output for gcc v3 -gstabs+.
-
-2004-01-18  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/fileio.exp: Add "$gdb_prompt $" anchors to patterns
-	used with gdb_test_multiple.
-
-	* gdb.base/gdb1476.exp: Accept alternat pattern for failed memory
-	read at address 0.  This fixes PR testsuite/1504.
-
-2004-01-18  Daniel Jacobowitz  <drow@mvista.com>
-
-	* config/gdbserver.exp (gdbserver_gdb_load): Rename from gdb_load.
-	Remove downloading, guessing the host executable, the calls to
-	gdb_file_cmd and gdb_target_cmd, and "load" support.
-	(infer_host_exec): New function broken out from gdb_load.
-	(gdb_load): New wrapper for gdbserver_gdb_load.
-	* lib/mi-support.exp (mi_gdb_target_cmd): New function, based on
-	gdb_target_cmd.  Use -target-select.
-	(mi_gdb_file_cmd): New function, broken out from mi_gdb_load.
-	Download binaries to the host.  Clear last_mi_remote_file when
-	we load a new binary.
-	(mi_gdb_load): Call mi_gdb_file_cmd.  If gdbserver.exp is loaded,
-	call gdbserver_gdb_load and mi_gdb_target_cmd.
-
-2004-01-17  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/templates.exp: Accept more spaces with "<foo, ?bar>"
-	type patterns.
-
-2004-01-17  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/templates.exp: Fix typo in test name of
-	"print Foo<volatile char*>::foo".
-
-2004-01-15  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/setvar.exp: Remove setup_xfail for hppa*-*-*11*.
-
-2004-01-16  Ben Elliston  <bje@wasabisystems.com>
-
-	* gdb.arch/Makefile.in (MISCELLANEOUS): Remove.
-	(clean mostlyclean): Remove empty rm.
-
-2004-01-15  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/setvar.exp: Add copyright years.
-
-2004-01-14  David Carlton  <carlton@bactrian.org>
-
-	* gdb.cp/rtti.exp: Update copyright.  KFAIL test with repect to
-	PR c++/1511 and update coment.
-	* gdb.cp/templates.exp: Update patterns to match current output.
-	If changes involve something other than whitespace, KFAIL
-	w.r.t. PR c++/1512 or PR c++/931 as appropriate.
-
-2004-01-14  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/namespace.exp: Add tests involving classes defined within
-	namespaces.
-	* gdb.cp/namespace.cc (C::CClass): New.
-	* gdb.cp/namespace1.cc (C::OtherFileClass): New.
-
-2004-01-14  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/sepdebug.exp: Bail out of the test if we don't know
-	what debug info we have. Print a better message if something goes
-	wrong while producing the separate debug info file.
-
-2004-01-14  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/callfuncs.c: Remove explicit declaration of malloc.
-
-2004-01-14  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/callfuncs.c: Add copyright notice.
-
-2004-01-13  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/derivation.exp: Add XFAIL for bug with protected
-	inheritance.  PR gdb/1498, PR gcc/13539.
-
-2004-01-13  Elena Zannoni  <ezannoni@redhat.com>
-
-         * gdb.threads/gcore-thread.exp: Prefix name of binary with
-         test specific name.
-         * gdb.mi/gdb669.exp: Ditto.
-         * gdb.mi/mi-pthreads.exp: Ditto.
-         * gdb.mi/mi1-pthreads.exp: Ditto.
-         * gdb.mi/mi2-pthreads.exp: Ditto.
-
-2004-01-12  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/member-ptr.cc: Add copyright notice.
-
-2004-01-12  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/member-ptr.exp: Use gdb_test, gdb_test_multiple.  Add
-	some patterns for recent versions of gcc and hpacc.  Delete
-	calls to setup_xfail for hppa*-*-*.  Delete redundant tests.
-	Delete tests that access a NULL pointer-to-member-data.  This
-	script is still disabled for gcc.
-
-2004-01-12  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.mi/mi2-basics.exp: Make sure that full pathnames are
-        escaped correctly.
-
-2004-01-12  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/sepdebug.exp: New file.
-	* gdb.base/sepdebug.c: New file.
-	* lib/gdb.exp (separate_debug_filename): New procedure.
-	(gdb_gnu_strip_debug): New procedure.
-
-2004-01-12  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.mi/ChangeLog: Delete file.  Renamed to ...
-	* gdb.mi/ChangeLog-1999-2003: New file.
-
-2004-01-12  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/fileio.exp: Update copyright year.  On GNU/Linux, for
-	"Renaming a directory to a non-empty directory returns ENOTEMPTY
-	or EEXIST", treat EBUSY as an XFAIL.
-
-2004-01-11  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/scope.exp: Remove obsolete setup_xfail for
-	hp_cc_compiler.
-
-2004-01-10  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/classes.exp: Remove old "(obsolescent gcc or gdb)"
-	decorations.
-
-2004-01-10  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/virtfunc.exp: Remove old "(obsolescent gcc or gdb)"
-	and "(aCC)" decorations.  Remove obsolete doco about old
-	test results.
-
-2004-01-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/exception.exp: Fix typo in doco.
-
-2004-01-09  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/gdb1476.exp: Fix typo.
-
-2004-01-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.hp/gdb.aCC/exception.exp: Re-create as a nearly empty
-	file.
-
-2004-01-09  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/exception.cc: Change <iostream.h> to <iostream>.
-	* gdb.cp/exception.exp: Use gdb test, gdb_test_multiple.
-	Use gdb_compile.  Remove restriction on gcc.  Add some patterns
-	for recent version of gdb.  Delete second half, which was a copy
-	of the first half with different build flags.  This test is
-	still disabled because it is still not ready for production.
-
-2004-01-08  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/exception.cc: Add copyright notice.
-	* gdb.cp/exception.exp: Add a notice that this file is broken
-	because of line number changes caused by addition of copyright
-	notice.
-
-2004-01-08  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/exception.cc: Renamed from gdb.hp/gdb.aCC/exception.cc.
-	* gdb.cp/exception.exp: Renamed from gdb.hp/gdb.aCC/exception.exp.
-
-2004-01-08  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/classes.exp: Accept gnu abi 2.
-	* gdb.cp/derivation.exp: Likewise.
-	* gdb.cp/overload.exp: Likewise.
-	* gdb.cp/virtfunc.exp: Likewise.
-
-2004-01-08  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.mi/pthreads.c (done_making_threads): Remove extraneous
-	semicolon after end of function.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/bs15503.cc: Include <iostream>, not <iostream.h>.
-	* gdb.cp/bs15503.exp: Remove hp-only restriction.  Use modern
-	boilerplate code for compiling and running the program under
-	test.  Add some string method tests.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/bs15503.cc: Add copyright notice.
-	* gdb.cp/bs15503.exp: Adjust line number.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.hp/gdb.defects/bs15503.exp: Renamed to gdb.cp/bs15503.exp.
-	* gdb.hp/gdb.defects/bs15503.cc: Renamed to gdb.cp/bs15503.cc.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/funcargs.exp: Remove obsolete setup_xfail for
-	hp_cc_compiler.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/cttiadd.c: Add a marker for gdb_get_line_number.
-	* gdb.cp/ctti.exp: Use the marker instead of "next".
-	With gcc, run further before bailing.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/cttiadd.cc: Add copyright notice.
-	* gdb.cp/cttiadd1.cc: Likewise.
-	* gdb.cp/cttiadd2.cc: Likewise.
-	* gdb.cp/cttiadd3.cc: Likewise.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/ctti.exp: Partial rewrite.  Call gdb_compile properly.
-	Use gdb_test, gdb_test_multiple.  Use floating-point values that
-	have exact representations in IEEE-ish formats.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/constvars.exp: Do not force lang=c++ if using HP
-	compilers.  Delete duplicate call to get_compiler_info.
-	(local_compiler_xfail_check): setup_xfail if $hp_cc_compiler.
-	* gdb.base/volatile.exp: Likewise.
-
-2004-01-07  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/gdb1476.exp: Only run the tests if we can't read the
-	memory at address 0.
-
-2004-01-07  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.stabs/weird.exp: Use hp_cc_compiler and hp_aCC_compiler
-	to test for hp-ux assembler.  Fix copyright years.
-
-2004-01-07  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/fileio.c (strerrno): Add "EBUSY".
-
-2004-01-07  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/fileio.c (test_open): Do not pass S_IWUSR to "open"
-	when creating the read-only file.  From analysis by Roland McGrath
-	and Elena Zannoni.
-
-2004-01-06  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/namespace.exp: Call get_compiler_info with "c++".
-
-2004-01-06  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/cvexpr.c: Be type-safe with function pointers and
-	data pointers.
-
-2004-01-06  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/m-static.exp: Compile one source file at a time.
-	Delete unused call to get_compiler_info.
-
-2004-01-06  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/call-ar-st.exp: Delete explicit reference to ${binfile}.ci.
-	* gdb.base/call-rt-st.exp: Likewise.
-	* gdb.base/nodebug.exp: Likewise.
-	* gdb.base/volatile.exp: Likewise.
-	* gdb.cp/ref-types.exp: Likewise.
-	* gdb.cp/templates.exp: Likewise.
-
-2004-01-05  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/gdb1476.exp, gdb.base/gdb1476.c: New files.
-
-2004-01-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/funcargs.exp: Delete special timeout of 240 seconds for
-	hppa*-hp-hpux*.
-
-2004-01-04  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/structs.exp: Add patterns to kfail PR gdb/1447 for
-	x86_64-*-*.
-
-	* gdb.base/structs.exp: Add patterns to kfail PR gdb/1447 for
-	sparc64-*-* and sparc*-solaris2*.
-
-2004-01-04  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/structs.exp: Remove ${testfile} from "zed L<n> for
-	return ${tests}" test.  The ${tests} already mentions the
-	filename.
-
-2004-01-02  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/local.exp: Accept gcc abi 2.
-
-2004-01-02  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/templates.exp: Accept gcc abi 2.
-
-2004-01-02  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* lib/compiler.cc: Remove supports_template_debugging.
-	* gdb.cp/templates.exp: Do not test supports_template_debugging.
-
-2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/namespace.exp: Accept gcc abi 2.
-
-2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/method.exp: Accept gcc abi 2.
-
-2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/classes.exp: Generate identical results as old version.
-	* gdb.cp/derivation.exp: Likewise.
-	* gdb.cp/overload.exp: Likewise.
-	* gdb.cp/virtfunc.exp: Likewise.
-
-2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/virtfunc.exp: Modify some patterns to avoid a
-	mysterious bug with sourceware version of expect.
-
-2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/overload.exp: Rewrite.  Clean up patterns to match
-	current versions of gcc, including gcc abi 2.  Remove gratuitous
-	restart of test program.  Use gdb_test_multiple and gdb_test for
-	all tests.  Add patterns to xfail missing "const" in "const char *"
-	and kfail PR gdb/1155.
-
-2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/derivation.exp: Rewrite.  Clean up patterns to match
-	current versions of gcc, including gcc abi 2.  Remove gratuitous
-	restart of test program.  Use gdb_test_multiple and gdb_test for
-	all tests.  Add patterns to kfail PR gdb/1498.
-
-2003-12-31  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/virtfunc.exp: Rewrite.  Clean up patterns to match
-	current versions of gcc, including gcc abi 2.  Use "breakpoint"
-	and "continue" instead of restarting the target program.  Use
-	gdb_test_multiple and gdb_test for all tests.
-
-2004-01-01  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/asm-source.exp: Update copyright year.  Link statically
-	for *-*-solaris2*.
-
-2003-12-31  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/classes.exp: Rewrite.  Clean up patterns to match
-	current versions of gcc, including gcc abi 2.  Use "breakpoint"
-	and "continue" instead of restarting the target program several
-	times.  Use gdb_test_multiple and gdb_test for all tests.
-
-2003-12-18  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/sect-cmd.exp: Handle compiling test case from multiple
-	source files.
-
-2003-12-16  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/environ.exp: Handle compiling test case from multiple
-	source files.
-
-2003-12-16  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/structs.exp: Call gdb_exit as well as gdb_start.
-
-2003-12-17  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/freebpcmd.c: Add copyright notice.
-
-	* gdb.base/freebpcmd.exp: Mark the interesting failure as known.
-
-2003-12-16  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/maint.exp: Add generic FAIL patterns to prevent timeouts.
-
-2003-12-13  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/freebpcmd.exp, gdb.base/freebpcmd.c: New test.
-
-2003-12-12  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.asm/frv.inc: New file.
-	* gdb.asm/asm-source.exp: Add frv-*-* as a supported target.
-
-2003-12-09  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/break.c (marker1, marker2, marker3, marker4): Move
-	functions to break1.c and leave prototypes behind.  Add more
-	"set breakpoint NN here" comments.
-	* gdb.base/break1.c: New file.
-
-	* gdb.base/break.exp: Handle compiling test case from multiple
-	source files and change source file references as needed.
-	* gdb.base/completion.exp: Ditto.
-	* gdb.base/condbreak.exp: Ditto.
-	* gdb.base/define.exp: Ditto.
-	* gdb.base/ena-dis-br.exp: Ditto.
-	* gdb.base/info-proc.exp: Ditto.
-	* gdb.base/maint.exp: Ditto.
-	* gdb.base/until.exp: Ditto.
-
-	* gdb.base/condbreak.exp: Use bp_locationNN variables instead of
-	hardcoded line numbers.
-	* gdb.base/define.exp: Ditto.
-	* gdb.base/ena-dis-br.exp: Ditto.
-	* gdb.base/maint.exp: Ditto.
-	* gdb.base/until.exp: Ditto.
-
-	* gdb.base/completion.exp: Use "break1" for completion tests since
-	"break" is no longer a unique prefix.
-
-2003-12-06  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/structs.exp (test_struct_returns): When applicable, set
-	"return_value_unimplemented".  When an unimplemented struct return
-	architecture, report incorrect values as a KFAIL
-
-2003-12-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/rtti.exp: Accept new wording of warning from
-	cp_lookup_rtti_type.
-
-2003-12-05  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.base/scope.exp (test_at_main): Replace references to
-	gcc_compiled with calls to test_compiler_info.
-	(test_at_foo): Likewise.
-	(test_at_bar): Likewise.
-
-2003-12-04  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.base/so-impl-ld.exp: Replace reference to gcc_compiled with call
-	to test_compiler_info.
-
-2003-12-03  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.base/so-impl-ld.exp: Update copyright notice.
-
-2003-12-02  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.base/mips_pro.exp: Replace references to gcc_compiled with calls
-	to test_compiler_info.
-
-2003-11-28  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.objc/objcdecode.exp: Match and KFAIL the output that comes
-	from current versions of gdb.  Clean up regular expressions.
-	Delete redundant timeout case.
-
-2003-11-28  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.objc/nondebug.exp: Match and KFAIL the output that comes
-	from current versions of gdb.  Clean up regular expressions.
-	Delete redundant timeout case.
-
-2003-12-01  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.base/callfuncs.exp (do_function_calls): Replace reference to
-	gcc_compiled with call to test_compiler_info.
-
-2003-11-30  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.base/list.exp (test_list_function): Delete unused declaration
-	of gcc_compiled.
-
-2003-11-29  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.base/complex.exp: Replace reference to gcc_compiled with
-	call to test_compiler_info.
-
-2003-11-29  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/asm-source.exp: Initialize asm-note to "empty".  Set
-	asm-note to "netbsd" for *-*-netbsdelf* and x86_64-*-netbsd*.  Use
-	it to create the appropriate note.inc.
-	* gdb.asm/asmsrc1.s: Include "note.inc".
-	* gdb.asm/netbsd.inc: New file.
-	* gdb.asm/empty.inc: New file.
-
-2003-11-28  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.base/constvars.exp: Replace references to gcc_compiled with
-	calls to test_compiler_info.
-
-2003-11-27  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.base/volatile.exp: Replace references to gcc_compiled with
-	calls to test_compiler_info.
-
-2003-11-27  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/structs.exp: Use i*86-*-* instead of i686-*-* as a
-	pattern for the KFAILs.
-
-2003-11-25  Adam Fedor  <fedor@gnu.org>
-
-	* gdb.objc/objcdecode.exp: Test for PR objc/1238.
-	* gdb.objc/objcdecode.m: New file.
-
-2003-11-25  Adam Fedor  <fedor@gnu.org>
-
-	* gdb.objc/nondebug.exp: Test for PR objc/1236.
-	* gdb.objc/nondebug.m: New file.
-
-2003-11-26  Ben Elliston  <bje@wasabisystems.com>
-
-	* gdb.asm/asm-source.exp: Make sure the final link succeeds on
-	NetBSD as it does on FreeBSD.  Modelled on a similar change by
-	Mark Kettenis on 2003-05-30.
-	(link-flags): Set to "--entry _start" regardless of target.
-	Special linker flags are to be appended to $link-flags.
-	* gdb.asm/mips.inc (gdbasm_startup): Remove __start label.
-
-2003-11-25  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/method.exp: Accept output of new demangler.
-
-2003-11-25  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb/class2.exp: New file.
-	* gdb/class2.cc: New file.
-
-2003-11-25  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.cp/templates.exp (test_ptype_of_templates): Accept output
-	of new demangler.
-
-2003-11-23  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.arch/i386-unwind.exp: Use gdb_run_cmd and gdb_expect instead
-	of gdb_test "run".
-
-2003-11-23  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.arch/i386-unwind.exp: Don't use runto_main.  Change
-	"continue" into "run".
-
-2003-11-23  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Partial fix for PR testsuite/1456.
-	* gdb.cp/ambiguous.exp: Replace reference to gcc_compiled with
-	call to test_compiler_info.
-	* gdb.cp/ctti.exp: Likewise.
-	* gdb.cp/derivation.exp: Likewise.
-	* gdb.cp/member-ptr.exp: Likewise.
-	* gdb.cp/virtfunc.exp (test_virtual_calls): Remove unused
-	reference to gcc_compiled.
-
-2003-11-23  Michael Chastain  <mec.gnu@mindspring.com>
-
-	Fix PR testsuite/1463.
-	* gdb.base/structs.exp (start_structs_test): Call
-	get_debug_format before using the debug format.
-
-2003-11-22  Andrew Cagney  <cagney@redhat.com>
-
-	* lib/gdb.exp (gdb_test_multiple): Add simple example.
-	* gdb.base/structs.exp: Use gdb_test_multiple.
-
-2003-11-20  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/structs.exp: Handle and recover from internal errors.
-	Replace "foo${n}" with "foo<n>" in test messages.
-
-	* gdb.base/structs.exp: Update copyright.  Rewrite.
-	* gdb.base/structs.c: Update copyright.  Rewrite.
-
-	* lib/gdb.exp (gdb_internal_error_resync): Issue a perror when the
-	resync count exceeded.
-
-	* gdb.base/maint.exp: Use gdb_internal_error_resync to recover
-	from the internal error.
-	* lib/gdb.exp (gdb_internal_error_resync): New procedure.
-	Original from Jim Blandy.
-	(gdb_test_multiple): Use gdb_internal_error_resync.
-
-2003-11-19  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/callfuncs.exp: Change the XFAILed descriptor test to a
-	KFAIL.
-
-2003-11-17  Mark Kettenis  <kettenis@gnu.org>
-
-	New testcase for PR backtrace/1435.
-	* gdb.arch/i386-unwind.exp: New file.
-	* gdb.arch/i386-unwind.c: New file.
-
-2003-11-17  Andrew Cagney  <cagney@redhat.com>
-
-	* lib/gdb.exp (compiler_info): New global.
-	(test_compiler_info): New function.
-	(get_compiler_info): Set compiler_info.
-	* lib/compiler.c, lib/compiler.cc: Add copyright.  When GNUC, set
-	"compiler_info" to gcc-<major>-<minor>.
-
-2003-11-15  Michael Chastain  <mec.gnu@mindspring.com>
-
-	* gdb.trace/configure: Remove.
-
-2003-11-13  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/break.c: Add comments to aid finding line numbers for
-	breakpoints.
-	* gdb.base/break.exp: Remove all references to explicit line
-	numbers.
-
-2003-11-11  Nick Clifton  <nickc@redhat.com>
-
-	* gdb.base/shreloc.exp: Do not run for targets which do not
-	support shared objects.
-
-2003-11-10  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/fileio.exp: Drop tests for nointerrupts and noinferiorio.
-	Don't run tests if nofileio flag is given.
-
-2003-11-07  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.cp/annota3.exp: Make sure we can match 'Hardware watchpoint'
-        as well as 'Watchpoint'.
-
-2003-11-06  Elena Zannoni  <ezannoni@redhat.com>
-
-	Reported by Jim Ingham <jingham@apple.com>:
-	* gdb.base/annota1.exp: Match at least one occurrence of the
-	signal handler annotation.
-
-2003-11-06  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.cp/annota2.exp: Make sure we can match 'Hardware watchpoint'
-        as well as 'Watchpoint'.
-
-2003-11-05  Michael Chastain  <mec@shout.net>
-
-	* gdb.mi/pthreads.c (routine): Handle early return from sleep.
-
-2003-11-03  Kris Warkentin  <kewarken@qnx.com>
-
-	* gdb.arch/gdb1291.c: New test file.
-	* gdb.arch/gdb1291.exp: New test script.
-	* gdb.arch/gdb1431.c: New test file.
-	* gdb.arch/gdb1431.exp: New test script.
-
-2003-10-22  Michael Chastain  <mec@shout.net>
-
-	* gdb.mi/pthreads.c: Add copyright notice.
-
-2003-10-22  Michael Chastain  <mec@shout.net>
-
-	* gdb.threads/pthreads.c: Add copyright notice.
-
-2003-10-20  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/gdb1056.exp: New test script.
-
-2003-10-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/killed.exp: Use gdb_run_cmd.
-
-2003-10-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/gcore.exp: Issue an UNSUPPORTED and exit if we can't
-	create a core file.
-	* gdb.threads/gcore-thread.exp: Likewise.
-
-2003-10-13  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/call-rt-st.c (struct bit_flags_char_t): New bitfield
-	type, based on char type.
-	(struct bit_flags_short_t): New bitfield type, based on short type.
-	(init_bit_flags_char): New fuction.
-	(init_bit_flags_short): Ditto.
-	(print_bit_flags_char): Ditto.
-	(print_bit_flags_short): Ditto.
-	(main): Add handling for bit_flags_char_t and bit_flags_short_t.
-
-2003-10-11  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/call-rt-st.exp: Update copyright year.
-
-2003-10-10  Kei Sakamoto  <sakamoto.kei@renesas.com>
-
-	* config/hmsirom.exp: Replace "Hitachi" with "Renesas".
-	* gdb.disasm/sh3.s: Ditto.
-
-2003-10-07  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/switch-threads.exp: New test.
-	* gdb.threads/switch-threads.c: New source file.
-
-2003-10-07  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/ending-run.exp: Add sh specific case.
-
-2003-10-06  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/watchpoint.exp: Delete obsolete clear_xfail.
-	* gdb.disasm/mn10200.exp: Delete obsolete file.
-
-2003-09-29  Daniel Jacobowitz  <drow@mvista.com>
-
-	* ChangeLog: Correct an entry command.exp -> commands.exp.
-	* gdb.base/commands.exp (bp_deleted_in_command_test)
-	(temporary_breakpoint_commands): Check noargs.
-
-2003-09-25  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/namespace.exp: Tweak comments.  Add non-quoted versions
-	of some print tests, where appropriate.  Add tests for C::D::cd,
-	E::ce, F::cXfX, G::XgX.
-	* gdb.cp/namespace.cc: Add XgX, cXfX, ce.
-
-2003-09-25  Richard Earnshaw  <rearnsha@arm.com>
-
-	* lib/java.exp (java_init): Import target_alias before using it.
-
-2003-09-25  David Carlton  <carlton@kealia.com>
-
-	* gdb.base/corefile.exp: Delete obsolete setup_xfail.
-
-2003-09-23  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/selftest.exp: Accomodate more instruction reordering
-        weirdness.
-
-2003-09-17  Michael Chastain  <mec@shout.net>
-
-	* gdb.cp/gdb1355.exp: New file.
-	* gdb.cp/gdb1355.c: New file.
-
-2003-09-15  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add sh*-*-* as supported target.
-	* gdb.asm/sh.inc: New file.
-
-2003-09-11  David Carlton  <carlton@kealia.com>
-
-	* gdb.cp/namespace.exp: Add tests for namespace types.
-	* gdb.cp/maint.exp (test_help): Test 'help maint cp namespace'.
-	(test_namespace): New.
-
-2003-09-11  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.base/relocate.exp: Handle new gdb output at startup.
-	* gdb.stabs/weird.exp: Ditto.
-
-2003-09-08  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/gdb1250.c: Rename 'gamma' to 'my_gamma'.
-
-2003-09-07  Michael Chastain  <mec@shout.net>
-
-	* gdb.cp/classes.exp: Accommodate both 'syntax error' and
-	'parse error'.
-
-2003-09-07  Mark Kettenis  <m.kettenis@osp.nl>
-
-	* gdb.arch/i386-prologue.exp: Add checks for saved registers.
-
-2003-08-30  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/selftest.exp: Remove support for m68k*-*-hpux.
-	* gdb.gdb/observer.exp: Ditto.
-	* gdb.gdb/xfullpath.exp: Ditto.
-
-2003-08-29  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/interrupt.exp: XFAIL "call function when asleep" for
-	*-*-*bsd*.
-
-2003-08-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.base/dump.exp: Skip for ia64.
-
-2003-08-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add ia64 support.
-	* gdb.asm/ia64.inc: New file.
-
-2003-08-22  Michael Chastain  <mec@shout.net>
-
-	* gdb.cp: New directory.
-	* gdb.cp/*: Copy from gdb.c++/*.
-	* gdb.c++/*: Remove.
-	* Makefile.in: Change gdb.c++ to gdb.cp.
-	* configure.in:  Ditto.
-	* configure: Regnerate.
-
-2003-08-18  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.arch/i386-prologue.exp: Add testcase for PR backtrace/1338.
-	* gdb.arch/i386-prologue.c (gdb1338): Add function.
-
-2003-08-17  Daniel Jacobowitz  <drow@mvista.com>
-
-	* mi-var-display.exp (-var-list-children weird): Accept function
-	pointers with argument types.
-	* mi1-var-display.exp (-var-list-children weird): Likewise.
-	* mi2-var-display.exp (-var-list-children weird): Likewise.
-
-2003-08-17  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/annota3.exp: Add missing newline.
-
-2003-08-06  Michael Chastain  <mec@shout.net>
-
-	* gdb.java/jmisc1.exp: Add test for pr gdb/1322.
-
-2003-08-12  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/float.exp: Add test for SH.
-
-2003-08-10  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.arch/i386-prologue.c, gdb.arch/i386-prologue.exp: New files.
-
-2003-08-07  Elena Zannoni  <ezannoni@redhat.com>
-
-       * gdb.base/completion.exp: Remove reduntant completion test
-       on filename.
-
-2003-08-07  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.base/attach.exp, gdb.base/detach.exp, gdb.base/gcore.exp,
-        gdb.mi/mi-basics.exp, gdb.threads/gcore-thread.exp,
-        gdb.trace/save-trace.exp: Make sure that full pathnames are
-        escaped correctly.
-
-2003-08-07  Elena Zannoni  <ezannoni@redhat.com>
-
-        * configure.in: Don't generate config.h from config.hin.
-        * configure: Regenerate.
-        * config.hin: Remove file.
-        * gdb.mi/pthreads.c: Remove include of config.h, and other ifdefs.
-        * gdb.threads/pthreads.c: Ditto.
-
-2003-08-07  Daniel Jacobowitz  <drow@mvista.com>
-
-	From Kei Sakamoto <sakamoto.kei@renesas.com>:
-	* gdb.asm/asm-source.exp : Add -lgloss to link-flags.
-	* gdb.asm/m32r.inc : Remove an illegal nop after bl instruction.
-	Replace ld24 with seth/add3.
-
-2003-08-02  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/annota3.exp: New file.
-	* gdb.base/annota3.c: New file.
-	* gdb.c++/annota3.exp: New file.
-	* gdb.c++/annota3.cc: New file.
-
-2003-07-29  Michael Chastain  <mec@shout.net>
-
-	* gdb.threads/tls.c (spin): Check errno only if sem_wait
-	actually failed.
-	(do_pass): Likewise.
-	* gdb.threads/tls.exp: Always initialize no_of_threads.
-
-2003-07-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/print-threads.exp (test_all_threads): Loosen KFAIL
-	pattern.
-	* gdb.threads/tls-shared.exp: Don't use gdb_suppress_entire_file.
-	* gdb.threads/tls.exp: Recognize one case of the host library not
-	supporting TLS.
-
-2003-07-27  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/fileio.exp: Use SH when running commands using
-	remote_exec.
-
-2003-07-24  Daniel Jacobowitz  <drow@mvista.com>
-
-	From Kei Sakamoto <sakamoto.kei@renesas.com>:
-	* gdb.base/relocate.c (dummy): New padding array.
-
-2003-07-22  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.disasm/8300s.s: Fix syntax of bsr insn.
-
-	* gdb.disasm/h8300s.exp : Minor changes in disassembler output require
-	patterns to be more general, accepting old and new output.
-	Some output chars (such as '+') also must be quoted.
-	Some addresses are displayed numerically instead of
-	symbolically.
-
-2003-07-23  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/return2.exp: Don't test long-long return.
-
-	* gdb.disasm/t01_mov.s: New file, h8300sx disassembly tests.
-	* gdb.disasm/t01_mov.exp: Ditto.
-	* gdb.disasm/t02_mova.s: Ditto.
-	* gdb.disasm/t02_mova.exp: Ditto.
-	* gdb.disasm/t03_add.s: Ditto.
-	* gdb.disasm/t03_add.exp: Ditto.
-	* gdb.disasm/t04_sub.s: Ditto.
-	* gdb.disasm/t04_sub.exp: Ditto.
-	* gdb.disasm/t05_cmp.s: Ditto.
-	* gdb.disasm/t05_cmp.exp: Ditto.
-	* gdb.disasm/t06_ari2.s: Ditto.
-	* gdb.disasm/t06_ari2.exp: Ditto.
-	* gdb.disasm/t07_ari3.s: Ditto.
-	* gdb.disasm/t07_ari3.exp: Ditto.
-	* gdb.disasm/t08_or.s: Ditto.
-	* gdb.disasm/t08_or.exp: Ditto.
-	* gdb.disasm/t09_xor.s: Ditto.
-	* gdb.disasm/t09_xor.exp: Ditto.
-	* gdb.disasm/t10_and.s: Ditto.
-	* gdb.disasm/t10_and.exp: Ditto.
-	* gdb.disasm/t11_logs.s: Ditto.
-	* gdb.disasm/t11_logs.exp: Ditto.
-	* gdb.disasm/t12_bit.s: Ditto.
-	* gdb.disasm/t12_bit.exp: Ditto.
-	* gdb.disasm/t13_otr.s: Ditto.
-	* gdb.disasm/t13_otr.exp: Ditto.
-
-2003-07-22  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.threads/tls.exp :Add kfail for 'info address' case.
-
-2003-07-22  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.threads/tls.c : New file.
-        * gdb.threads/tls.exp : New file.
-        * gdb.threads/tls-main.c : New file.
-        * gdb.threads/tls-shared.c : New file.
-        * gdb.threads/tls-shared.exp : New file.
-
-2003-07-22  Andreas Schwab  <schwab@suse.de>
-
-	* gdb.asm/powerpc.inc (gdbasm_startup): Force alignment.
-
-2003-07-20  Andreas Schwab  <schwab@suse.de>
-
-	* gdb.base/selftest.exp (do_steps_and_nexts): Add more patterns
-	due to insn reordering.
-
-2003-07-15  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.asm/asm-source.exp: Do not allow "start" in the backtrace.
-
-2003-07-15  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/gdb1250.exp: New file.
-	* gdb.base/gdb1250.c: New file.
-
-2003-07-09  Michal Ludvig  <mludvig@suse.cz>
-
-	* gdb.c++/templates.exp (test_ptype_of_templates): Recognize
-	expansion of size_t to 'unsigned long', not only to 'unsigned'.
-
-2003-07-09  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.threads/tls.c: New file.
-        * gdb.threads/tls.exp: New file.
-        * gdb.threads/tls-main.c: New file.
-        * gdb.threads/tls-shared.c: New file.
-        * gdb.threads/tls-shared.exp: New file.
-
-2003-07-09  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/annota1.exp: Make sure that we properly escape the
-	full path of the source file. Xfail more permissive patterns,
-	due to a compiler debug info problem.
-
-2003-07-07  Andreas Schwab  <schwab@suse.de>
-
-	* gdb.asm/m68k.inc: New file.
-	* gdb.asm/asm-source.exp: Use it for m68k-*-*.
-
-	* gdb.objc/basicclass.exp ("Call an Objective-C method with no
-	arguments"): Also match negative number.
-
-	* gdb.base/float.exp ("info float"): Add test for m68k-*-*.
-
-2003-07-03  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/store.c (charest): New typedef.
-	(add_char): Rename to add_charest, update.
-	(wack_char): Rename to wack_charest, update types.  Return l + r
-	to keep r live across the call.
-	(wack_short, wack_int, wack_long, wack_longest, wack_float)
-	(wack_double, wack_doublest): Return l + r to keep r live across
-	the call.
-	* gdb.base/store.exp: Accomodate store.c changes.
-
-2003-06-30  David Carlton  <carlton@kealia.com>
-
-	* gdb.c++/maint.exp (test_invalid_name): New.
-	(test_first_component): Add tests for invalid names.
-
-2003-06-29  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/inherit.exp (test_print_svi_classes): Accept gdb
-	output of '<VTT for class>' for virtual base classes.
-
-2003-06-29  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/completion.exp: Tab-complete "complet" instead of
-	"compl".
-	* gdb.base/complex.exp, gdb.base/complex.c: New files.
-
-2003-06-29  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/constvars.exp: Remove most xfails for GCC 3.x.
-	* gdb.base/volatile.exp: Likewise.
-
-2003-06-29  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/print-threads.exp (test_all_threads): Add kfail for
-	gdb/1265.
-
-2003-06-28  Michael Chastain  <mec@shout.net>
-	    Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/selftest.exp (do_steps_and_nexts): Increase maximum
-	initial line count of 'captured_main' from 26 to 32.
-	(test_with_self): Allow xmalloc call to be interleaved with the
-	preceding two lines.
-
-2003-06-24  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.base/bang.exp: New testcase.
-
-2003-06-23  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.base/langs.exp: Add some tests for the "minimal" language
-	support.
-
-2003-06-23  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.objc/basicclass.exp: Return -1 if we cannot compile
-	the testcase.
-
-2003-06-22  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/relocate.exp: Test add-symbol-file with a variable
-	offset.
-
-2003-06-22  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/pr-1210.cc: New file.
-	* gdb.c++/pr-1210.exp: New file.
-
-2003-06-21  Daniel Jacobowitz  <drow@mvista.com>
-
-	* lib/mi-support.exp (mi_run_cmd): Expect an MI response to
-	000-exec-continue.
-
-2003-06-15  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/attach.exp: Use -1 for the ID of a nonexistent process
-	on *-*-*bsd* instead of *-*-freebsd*.
-
-2003-06-14  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/store.exp: Test longest and doublest.  Test all
-	parameters.  Weaken return statement match.
-	* gdb.base/store.c: Add longest and doublest - aka long long and
-	long double functions.  Put all parameters into local register
-	variables.  Use negative values.
-
-2003-06-14  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/fileio.c: Include <errno.h>, and <sys/wait.h>.  Gag
-	-Wformat errors.  Add lost line.  Use WEXITSTATUS to get system
-	exit status.
-	* gdb.base/fileio.exp: Disable target when nointerrupts and
-	noinferiorio, instead of limiting it to remote.  Use remote_exec
-	instead of system.
-
-2003-06-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.base/float.exp: Add ia64 support.
-
-2003-06-12  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/fileio.exp: Run only on remote targets.
-
-2003-06-10  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/fileio.c: New file, testing File-I/O.
-	* gdb.base/fileio.exp: Ditto.
-
-2003-06-09  Raoul Gough  <RaoulGough@yahoo.co.uk>
-
-	* gdb.base/shreloc.exp: New file, check symbol values obtained from
-	shared objects after relocation at load time (gdb PR/1132).
-	* gdb.base/shreloc.c, gdb.base/shreloc1.c, gdb.base/shreloc2.c:
-        as above, part of the shared object relocation test.
-
-2003-06-08  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/readline.exp: Add tests for operate-and-get-next with a
-	fully filled history list.
-	* gdb.base/gdb_history: New file.
-
-	* gdb.base/signals.exp: XFAIL "continue to func1" on
-	i*86-*-freebsd*.
-
-	* gdb.base/attach.exp: When trying to attach to a nonexistent
-	process, make it possible to specify the PID based on the target,
-	and do so for *-*-freebsd*.
-
-2003-06-02  Richard Henderson  <rth@redhat.com>
-
-	* gdb.base/float.exp: Add expected regexp for alpha-*-*.
-
-2003-06-02  Richard Henderson  <rth@redhat.com>
-
-	* gdb.base/selftest.exp: Next over lim_at_start initialization.
-
-2003-06-02  Richard Henderson  <rth@redhat.com>
-
-	* gdb.base/dump.exp [alpha*-*-*]: Add -taso linker switch.
-
-2003-06-01  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.asm/asm-source.exp: Dissassemble from &globalvar instead
-	of globalvar.
-
-2003-06-01  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/asm-source.exp: Check for memory read errors in
-	disassembler test on *BSD too.
-
-2003-06-01  Richard Henderson  <rth@redhat.com>
-
-	* gdb.asm/alpha.inc (gdbasm_enter): Use numeric register names
-	for .frame.
-	(gdbasm_call): Lose ldgp.
-	(gdbasm_startup): Add frame information.
-	* gdb.asm/asm-source.exp (alpha*-*): Add -no-mdebug to asm-flags.
-
-2003-05-31  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/float.exp: Expect similar output for x86_64-*-* as for
-	i?86-*-*.
-
-2003-05-30  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/asm-source.exp: Make sure the final link succeeds on
-	FreeBSD.
-
-2003-05-29  Richard Henderson  <rth@redhat.com>
-
-	* gdb.asm/alpha.inc: New file.
-	* gdb.asm/asm-source.exp: Use it.
-
-2003-05-29  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/corefile.exp: Find corefiles on Linux, which names them
-	'core.PID'.
-
-2003-05-22  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/corefile.exp: Tolerate stuff after argument parens in
-	backtrace.
-
-2003-05-20  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/namespace1.cc: Actually do 'cvs add' before committing
-	this time.
-
-2003-05-19  David Carlton  <carlton@bactrian.org>
-
-	* gdb.c++/rtti.exp: New file, containing tests for PR c++/488.
-	* gdb.c++/rtti.h, gdb.c++/rtti1.cc, gdb.c++/rtti2.cc: Ditto.
-
-2003-05-19  David Carlton  <carlton@bactrian.org>
-
-	* gdb.c++/namespace.exp: Add namespace scope and anonymous
-	namespace tests.
-	Bump copyright date.
-	* gdb.c++/namespace.cc: Add anonymous namespace and namespace C.
-	(main): Call C::D::marker2.
-	* gdb.c++/namespace1.cc: New file.
-
-2003-05-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	Roland McGrath  <roland@redhat.com>
-	* gdb.threads/linux-dp.exp: Account for fact that in nptl model
-	there is no manager thread.
-
-2003-05-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb.threads/schedlock.exp: Remove assumption that all threads
-	will run in a particular small time slice.  Also ensure we break
-	in one of the child threads rather than the main thread.
-
-2003-05-07  Jim Blandy  <jimb@redhat.com>
-
-	Add support for assembly source testing on the s390x.
-	* gdb.asm/asm-source.exp: Add a case for the s390x-*-*
-	architecture.
-	* gdb.asm/s390x.inc: New file.
-
-	* gdb.asm/asm-source.exp: Use a 'switch -glob' statement, not a
-	succession of 'if' statements.
-
-2003-05-05  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/maint.exp: Add tests for "maint print dummy-frames".
-
-2003-05-05  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/watchpoint.exp: Rename CALL_DUMMY_BREAKPOINT_OFFSET to
-	DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET in comments.
-
-2003-05-02  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/charset.exp: Update based on new behavior of set/show
-	charset commands.
-
-2003-05-01  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.asm/asm-source.exp: Check that "disassm" and "x/i" of a
-	variable do not give memory errors.
-
-2003-04-30  Adam Fedor  <fedor@gnu.org>
-
-	* Makefile.in (ALL_SUBDIRS): Add gdb.objc
-	* configure.in (AC_OUTPUT): Add gdb.objc/Makefile
-	* gdb.objc/Makefile.in, gdb.objc/basicclass.exp,
-	gdb.objc/basicclass.m: : New files
-
-	* lib/gdb.exp (gdb_compile_objc): New procedure.
-
-2003-04-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/signals.exp: Make backtrace tests more specific.
-
-2003-04-23  David Carlton  <carlton@bactrian.org>
-
-	* gdb.c++/maint.exp (test_first_component): Add tests for
-	'operator' in more locations.
-
-2003-04-16  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/args.exp: Invoke gdb_load for simulator targets.
-
-2003-04-16  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/completion.exp: Make 'info func mark' complete on 'info
-        func marke' instead. Update test name.
-
-2003-04-15  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/maint.exp: New file.
-
-2003-04-14  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.threads/schedlock.c: Change type of thread function argument
-	to long, to avoid warnings on 64-bit platforms.
-
-2003-04-14  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.base/attach.exp: Add new message from ptrace in case of
-        attaching to nonexistent process.
-
-2003-04-11  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/derivation.exp, gdb.c++/overload.exp,
-	gdb.c++/userdef.cc: Place comments on the lines to which the
-	marker function might return.
-	* gdb.c++/derivation.exp, gdb.c++/overload.exp,
-	gdb.c++/userdef.exp: Look for those comments to check that we've
-	returned to the right place, instead of checking line numbers.
-
-2003-04-11  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.threads/pthreads.exp (test_startup): When setting a breakpoint
-        match on sourcefile name, instead of directory name.
-
-2003-04-10  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/completion.exp: Use string_to_regexp to match the
-	working directory name.
-
-2003-04-09  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/derivation.exp, gdb.c++/overload.exp,
-	gdb.c++/userdef.exp: If GDB fails to restore the selected frame
-	after an inferior function call, report the failure, but allow the
-	test to continue.
-
-2003-04-05  Stephane Carrez  <stcarrez@nerim.fr>
-
-	* gdb.base/break.exp: marker4() is defined at line 46 when compiled
-	with -DPROTOTYPES.
-
-2003-04-05  Stephane Carrez  <stcarrez@nerim.fr>
-
-	* gdb.base/break.exp: Revert last patch.
-
-2003-04-04  Stephane Carrez  <stcarrez@nerim.fr>
-
-	* gdb.base/break.exp: marker4() is defined at line 46 when compiled
-	with -DPROTOTYPES.
-
-2003-04-02  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/callfuncs.exp: Make "print add" messages unique.
-	* gdb.base/ending-run.exp: Put spaces around "breakpoint" to stop
-	matching directories by the name breakpoint.
-	* gdb.base/pointers.exp: Make "ptype pppC" message consistent.
-	Make "continue to marker1" consistent.
-	* gdb.base/call-rt-st.exp: Make "finish out from loop_count"
-	message consistent.
-	* lib/gdb.exp: Put "the program is no longer running", and "the
-	program exited" in parenthesis.
-	* lib/mi-support.exp: Ditto.
-
-2003-04-02  Bob Rossi  <bob_rossi@cox.net>
-
-	* gdb.mi/mi-file.exp: New file for -file-list-exec-source-file.
-
-2003-03-29  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/sizeof.c (main): Print the value of '\377'.
-	* gdb.base/sizeof.exp: Check the sign of '\377'.
-
-2003-03-27  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/gdb1090.exp: New file.
-	* gdb.base/gdb1090.cc: New file.
-
-2003-03-27  J. Brobecker  <brobecker@gnat.com>
-
-	* gdb.gdb/observer.exp: New regression test.
-
-2003-03-27  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/list.exp: Remove setup_xfail_format for DWARF 1.
-	* gdb.base/ptype.exp: Likewise.
-
-2003-03-27  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.c++/casts.exp: Fix startup to run also on embedded targets.
-
-2003-03-26  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/ptype.exp: Actually use some typedef'd types.
-
-2003-03-21  Stephane Carrez  <stcarrez@nerim.fr>
-
-	* gdb.asm/asm-source.exp: Set asm-arch for m6811 and m6812.
-	* gdb.asm/m68hc11.inc: New file for HC11/HC12 macros.
-
-2003-03-20  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/default.exp: Fix regular expression.
-
-2003-03-20  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/args.exp: Fix regular expression.
-
-2003-03-20  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/help.exp: Allow Win32 child process.
-
-2003-03-20  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/ending-run.exp: Check for Cygwin specific wrapper function
-	when stepping out of main().
-
-2003-03-20  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/default.exp: Check for win32 specific message when calling
-	"run" without executable.
-
-2003-03-20  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/args.exp: Expect .exe in output.
-
-2003-03-20  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add appropriate --entry linker flag for
-	Cygwin native.
-
-2003-03-17  Andrew Cagney  <cagney@redhat.com>
-
-	From Elena Zannoni <ezannoni@redhat.com>.  Test e500 abi and
-	vector registes.
-	* gdb.arch/e500-regs.c, gdb.arch/e500-regs.exp: New files.
-	* gdb.arch/e500-abi.c, gdb.arch/e500-abi.exp: New files.
-
-2003-03-17  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.base/watchpoint.exp (test_watchpoint_and_breakpoint): New
-	test, for PR breakpoints/38.
-	Call test_watchpoint_and_breakpoint.
-	* gdb.base/watchpoint.c (func3): New function.
-	(main): Call func3.
-
-2003-03-04  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/templates.exp (do_tests): Accept valid const in "print
-	Garply<Garply<char> >:: garply".
-	(test_ptype_of_templates): KFAIL "ptype T5<int>" and "ptype t5i"
-	with respect to PR c++/1111; note also PR c++/1113.
-	(test_template_breakpoints): KFAIL "constructor breakpoint" with
-	respect to PR c++/1062.
-	KFAIL "destructor breakpoint" with respect to PR c++/1112.
-
-2003-03-03  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/classes.exp (test_enums): KFAIL "ptype obj_with_enum"
-	with respect to PR c++/57.
-	KFAIL "print (ClassWithEnum::PrivEnum) 42" with respect to PR
-	c++/826.
-	Create "print ('ClassWithEnum::PrivEnum') 42"; KFAIL it with
-	respect to PR c++/57.
-
-2003-03-03  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/templates.exp (do_tests): Convert the KFAILs with
-	respect to PR c++/33 into FAILs.
-
-2003-03-03  Michael Chastain  <mec@shout.net>
-
-	* configure.in: Update copyright years.
-
-2003-03-03  Michael Chastain  <mec@shout.net>
-
-	* Makefile.in: Update copyright years.
-
-2003-02-28  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/classes.exp (test_ptype_class_objects): Accept it if we
-	print class instead of struct and/or superfluous protection
-	specifiers, as long as the resulting output is equivalent to the
-	source code.
-	Delete FIXME from end of messages on tests that don't need
-	fixing.
-
-2003-02-28  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/templates.exp (do_tests): Allow const in the two
-	Foo<volatile char *>::foo tests.
-
-2003-02-27  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/restore.c (main): Return zero, so exit code
-	will be consistant.
-
-2003-02-26  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/templates.exp (do_tests): KFAIL the "print Foo<volatile
-	char *>::foo" test with respect to PR c++/33.  Create a new test
-	which is identical to that one except that it doesn't put the
-	space between the "char" and the "*"; KFAIL it, too.
-
-2003-02-26  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/templates.exp (do_tests): Convert XFAILs about printing
-	template types into either PASSes or KFAILs (corresponding to PR
-	c++/57).  Tweak indentation.  Update copyright.
-
-2003-02-23  Stephane Carrez  <stcarrez@nerim.fr>
-
-	* lib/gdb.exp: Don't execute C++ tests on m6811/m6812 targets.
-
-2003-02-13  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/exprs.exp: Remove i960 remnants.
-	* gdb.base/funcargs.exp: Likewise.
-	* gdb.base/list.exp: Likewise.
-	* gdb.base/ptype.exp: Likewise.
-
-2003-02-14  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/virtfunc.exp (test_virtual_calls): Change 'print
-	pEe->D::vg()" from XFAIL to KFAIL.
-
-2003-02-13  Jason Molenda  (jmolenda@apple.com)
-
-	* gdb.base/maint.exp: Update maint print statistics regexp to include
-	new entries.
-
-2003-02-13  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/inherit.exp: Remove call to get_debug_format.
-
-2003-02-12  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/classes.exp: Remove setup_xfail_format for DWARF 1.
-	* gdb.c++/inherit.exp: Likewise.
-	* gdb.c++/cplusfuncs.exp: Remove suppression logic for DWARF 1.
-	* gdb.c++/templates.exp: Likewise.
-	* gdb.c++/virtfunc.exp: Likewise.
-
-2003-02-06  Jason Molenda  (jason-cl@molenda.com)
-
-	* gdb.mi/mi-syn-frame.c (subroutine): Add a comment explaining
-	why the code is written that way.
-
-2003-02-05  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/dump.exp: Add missing copyright line.
-
-2003-02-05  Jason Molenda  (jason-cl@molenda.com)
-
-	* gdb.mi/mi-syn-frame.c (subroutine): Add an extra statement
-	at the beginning so the breakpoint doesn't get set on the loop.
-
-2003-02-05  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/local.exp: Relax the test for PR gdb/825 to accept
-	output for configurations with gcc 2.95.3.
-
-2003-02-05  Keith Seitz  <keiths@redhat.com>
-	    Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.mi/mi-cli.exp: New file.
-
-2003-02-04  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/anon-union.exp: Do not call gdb_suppress_entire_file.
-	Call perror and then continue.
-
-2003-02-03  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/pr-1023.cc: New file.
-	* gdb.c++/pr-1023.exp: New file.
-
-2003-02-05  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/local.exp: Don't expect Local to be in scope in main;
-	it's local to foobar.  Check for it there, and check that it's not
-	present in main.
-	* gdb.c++/local.cc (marker2): New function.
-	(foobar): Call marker1.
-	(main): Call marker2 instead of marker1.
-
-2003-02-04  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.disasm/mn10200.exp: Obsolete file.
-	* gdb.trace/Makefile.in (clean mostlyclean): Remove mn10200.
-	* gdb.disasm/Makefile.in (clean mostlyclean): Remove mn10200.
-	* gdb.base/watchpoint.exp: Mark the mn10200 xfails as obsolete.
-
-2003-02-04  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/overload.exp: Test intToChar(1).
-	* gdb.c++/overload.cc (intToChar): New.
-	(main): Call intToChar.
-
-2003-02-03  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/ovldbreak.exp (continue_to_bp_overloaded): Add
-	'might_kfail' arg.
-	KFAIL some of the continue_to_bp_overloaded calls, according to
-	PR c++/1025.
-
-2003-02-01  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/advance.c (marker1): New marker function.
-	* gdb.base/advance.exp: When the 'advance' command lands on the
-	return breakpoint, it can legitimately stop on either the
-	current line or the next line.  Accommodate both outcomes.
-	* gdb.base/until.exp: Likewise.
-
-2003-02-02  Andrew Cagney  <ac131313@redhat.com>
-
-	2002-11-10 Jason Molenda (jason-cl@molenda.com):
-        * gdb.mi/mi-var-child.exp: -var-list-children's CHILDREN field is
-        now a list, not a tuple.
-        * gdb.mi/mi-var-display.exp: Ditto.
-        * gdb.mi/gdb792.exp: Ditto.
-
-2003-02-01  Andrew Cagney  <ac131313@redhat.com>
-
-	From 2002-11-09 Jason Molenda (jason-cl@molenda.com):
-        * gdb.mi/mi-syn-frame.exp: New tests for synthetic frames in
-        stack backtraces.
-        * gdb.mi/mi-syn-frame.c: Part of same.
-
-2003-02-01  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.mi/gdb669.exp, gdb.mi/mi-pthreads.exp,
-	gdb.mi/mi1-pthreads.exp: Return instead of calling
-	gdb_suppress_entire_file.
-
-2003-02-01  Mark Salter  <msalter@redhat.com>
-
-	* gdb.asm/arm.inc (gdbasm_startup): Clear frame pointer, not sp.
-
-2003-01-31  Mark Salter  <msalter@redhat.com>
-
-	* lib/mi-support.exp (mi_gdb_load): Support remote targets.
-	Support empty arg.
-
-2003-01-30  Michael Chastain  <mec@shout.net>
-
-	* lib/gdb.exp: Revert patch of 2003-01-06, which set LC_ALL.
-	This was a workaround for a UTF-8 bug in readline 4.3.  The bug
-	has been fixed in gdb/readline on 2003-01-09.
-
-2003-01-29  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/maint.exp: Allow for leading underscore in symbol.
-	* gdb.base/display.exp: Allow for leading underscore in symbol.
-	* gdb.base/args.exp: Skip if target does not support args passing.
-
-2003-01-22  Daniel Jacobowitz  <drow@mvista.com>
-
-	* lib/gdb.exp (gdb_test_multiple): New function, cloned from
-	gdb_test.  Accept a list of expect arguments as the third
-	parameter.
-	(gdb_test): Use it.
-
-2003-01-20  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.arch/altivec-abi.exp: Set variable 'srcfile' differently, to
-	allow for different test tree configurations.  Update some
-	tescases accordingly.
-	* gdb.arch/altivec-regs.exp: Ditto.
-	* gdb.asm/asm-source.exp: Ditto.
-	* gdb.base/advance.exp: Ditto.
-	* gdb.base/display.exp: Ditto.
-	* gdb.base/long_long.exp: Ditto.
-	* gdb.base/mips_pro.exp: Ditto.
-	* gdb.base/overlays.exp: Ditto.
-	* gdb.base/relocate.exp: Ditto.
-	* gdb.base/setshow.exp: Ditto.
-	* gdb.base/step-line.exp: Ditto.
-	* gdb.base/step-test.exp: Ditto.
-	* gdb.base/until.exp: Ditto.
-	* gdb.c++/virtfunc.exp: Get rid of variable 'src'.
-
-2003-01-17  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/demangle.exp (test_lucid_style_demangling): KFAIL test
-	corresponding to PR c++/945.
-	Update copyright.
-
-2003-01-17  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/inherit.exp (test_print_mi_members): KFAIL tests
-	corresponding to PR c++/68.
-
-2003-01-17  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/cplusfuncs.exp (print_addr_2_kfail): New procedure.
-	(test_paddr_hairy_functions): Call print_addr_2_kfail for
-	hairyfunc5 through hairyfunc7.  KFAIL for PR c++/19.
-
-2003-01-15  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/break.exp: Fix change of default location, because of
-	removal of until tests.
-	* gdb.base/help.exp: Update test for new 'until' help message.
-	Add test for help on 'advance'.
-        * gdb.base/args.exp: Fix foobar with GDBFLAGS global.
-
-2003-01-15  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/default.exp: Adapt "info float" test for recent changes
-	to that command.  Add test for "info vector".
-	* gdb.base/float.exp: New file.  Add test for "info float" that
-	resembles the old test in gdb.base/default.exp.
-
-2003-01-15  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.base/selftest.exp (do_steps_and_nexts): Allow gdb_sysroot.
-
-2003-01-15  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/break.exp: Move the tests of until command from here...
-	* gdb.base/until.exp: ... to here. New file. Add other tests.
-	* gdb.base/advance.c: New file.
-	* gdb.base/advance.exp: New file.
-
-2003-01-14  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.base/args.c: New file.
-        * gdb.base/args.exp: New file.
-
-2003-01-14  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/virtfunc.exp: Remove fixed XFAIL.
-
-2003-01-14  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/killed.exp: Use KFAIL for gdb/568.
-
-2003-01-14  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/constvars.exp: Remove two extra XFAILs.  Update copyright
-	dates.
-
-2003-01-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/printmethod.exp (print virtual method): Accept "(void)".
-
-2003-01-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/printcmds.exp: Enable setup_kfail for gdb/538
-	(ptype &*"foo").
-	* gdb.c++/local.exp: Enable setup_kfail for gdb/482.
-
-2003-01-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.mi/mi-console.exp: Remove extra "(known bug)".
-	* gdb.mi/mi1-console.exp: Likewise.
-
-2003-01-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.mi/mi-console.exp: Add KFAIL for "Hello message (known bug)".
-	* gdb.mi/mi1-console.exp: Likewise.
-
-2003-01-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/overload.exp: Remove some fixed XFAILs.
-
-2003-01-09  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/detach.exp: New test.
-
-2003-01-09  Daniel Jacobowitz  <drow@mvista.com>
-
-	* Makefile.in (ALL_SUBDIRS): New variable.
-	(subdirs, clean, distclean): Use it.
-	* gdb.arch/Makefile.in: Clean up Makefile.  Remove rules for
-	regenerating Makefile, since it is generated from the top level.
-	* gdb.asm/Makefile.in: Likewise.
-	* gdb.base/Makefile.in: Likewise.
-	* gdb.c++/Makefile.in: Likewise.
-	* gdb.disasm/Makefile.in: Likewise.
-	* gdb.java/Makefile.in: Likewise.
-	* gdb.mi/Makefile.in: Likewise.
-	* gdb.threads/Makefile.in: Likewise.
-	* gdb.trace/Makefile.in: Likewise.
-
-2003-01-09  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/annota2.exp: KFAIL "watch triggered on a.x".
-	Add copyright year 2003.
-
-2003-01-06  Michael Chastain  <mec@shout.net>
-
-	* gdb.mi/mi-pthreads.exp (check_mi_thread_command_set):
-	When selecting a thread, 'line' and 'file' are optional.
-	* gdb.mi/mi1-pthreads.exp: Likewise.
-
-2003-01-06  Andreas Schwab  <schwab@suse.de>
-
-	* lib/gdb.exp: Set LC_ALL to "C" to avoid spurious testsuite
-	failures.
-
-2003-01-04  Daniel Jacobowitz  <drow@mvista.com>
-
-	Fix PR gdb/844
-	* lib/gdb.exp (gdb_compile): Handle "quiet" option.
-	(gdb_compile_pthreads): Pass "quiet" to gdb_compile.
-
-	* gdb.threads/gcore-thread.exp: Use gdb_compile_pthreads.  Return
-	instead of calling gdb_suppress_entire_file.
-	* gdb.threads/print-threads.exp: Likewise.
-	* gdb.threads/schedlock.exp: Likewise.
-
-	* gdb.threads/killed.exp: Return instead of calling
-	gdb_suppress_entire_file.
-	* gdb.threads/linux-dp.exp: Likewise.
-	* gdb.threads/pthreads.exp: Likewise.
-
-2003-01-04  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/callfuncs.exp: Don't XFAIL unprototyped functions for
-	stabs.
-	* gdb.base/completion.exp: Allow marker1(void) as well as marker1().
-	* gdb.base/whatis.exp: Always allow (void) after function names.
-
-2003-01-04  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/casts.exp: Correct regexp.
-
-2003-01-04  Mark Kettenis  <kettenis@gnu.org>
-
-	* configure.in: Call AC_CONFIG_HEADER.  Don't call
-	AC_CONFIG_SUBDIRS on gdb.arch, gdb.asm, gdb.base gdb.c++ gdb.java,
-	gdb.disasm, gdb.mi, gdb.threads and gdb.trace.  Call
-	AC_CHECK_HEADERS on pthread.h.  Put Makefiles in the
-	aforementioned directories in the AC_OUPUT call.
-	* config.hin: New file.
-	* gdb.mi/gdb669.exp, gdb.mi/mi-pthreads.exp,
-	gdb.mi/mi1-pthreads.exp, gdb.threads/gcore-thread.exp,
-	gdb.threads/killed.exp, gdb.threads/print-threads.exp,
-	gdb.threads/pthreads.exp, gdb.threads/schedlock.exp: Make sure we
-	pass -I$objdir instead of -I$objdir/$subdir in compilation.
-	* gdb.arch/configure.in, gdb.arch/configure, gdb.asm/configure.in,
-	gdb.asm/configure, gdb.base/configure.in, gdb.base/configure,
-	gdb.c++/configure.in, gdb.c++/configure, gdb.disasm/configure.in,
-	gdb.disasm/configure, gdb.java/configure.in, gdb.java/configure,
-	gdb.mi/configure.in, gdb.mi/configure, gdb.mi/config.in,
-	gdb.threads/configure.in, gdb.threads/configure,
-	gdb.threads/config.in, gdb.trace/configure.in,
-	gdb.trace/configure: Removed.
-
-2003-01-03  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/miscexprs.c: Fix PR gdb/697, "buglet in
-	testsuite/gdb.base/miscexprs.c, off-by-1 array reference".
-
-2003-01-03  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/store.exp: Fix regular expressions.
-
-2002-12-28  Mark Kettenis  <kettenis@gnu.org>
-
-	* configure.in: Rewrite.
-	* configure: Regenerated.
-
-2003-01-03  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.base/psymtab.exp: New file.
-	* gdb.base/psymtab1.c: Ditto.
-	* gdb.base/psymtab2.c: Ditto.
-
-2002-12-23  Adam Fedor  <fedor@gnu.org>
-
-	* gdb.base/maint.exp: Update expect output to include 'ObjC'.
-
-2002-12-23  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.base/selftest.exp (do_steps_and_nexts): Allow initial brace
-	and current_directory initialization.
-
-2002-12-22  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.trace/tfind.exp: Pass '-O1' flag via the 'optimize' option,
-	rather than as part of the output file name.
-
-	* gdb.base/attach.exp: There's no need to copy the test program to
-	/tmp; that was only ever necessary on HP/UX, and this test is
-	entirely disabled there anyway.
-
-2002-12-21  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/psmang.exp: Doc fix.
-
-	* gdb.c++/psmang.exp, gdb.c++/psmang1.cc, gdb.c++/psmang2.cc: New
-	test.
-
-2002-12-20  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/annota2.exp: KFAIL annotate-quit.
-
-2002-12-18  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/annota2.exp: Add copyright year 2002.
-
-2002-12-17  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/try_catch.cc: Add marker comments.
-	* gdb.c++/try_catch.exp: Get line numbers from marker comments.
-	* gdb.c++/m-data.cc: Delete namespace __gnu_test.
-	* gdb.c++/m-static.cc: Ditto.
-	* gdb.c++/m-static1.cc: Ditto.
-	* gdb.c++/try_catch.cc: Ditto.
-
-2002-12-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* lib/mi-support.exp (mi_reinitialize_dir): Check mi level
-	to see whether we are using the new -environment-directory
-	command which resets via -r or the old version of the command
-	which may prompt the user.  Part of fix for gdb/741.
-
-2002-12-13  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.fortran/types.exp: Update obsolete comment.
-	* gdb.fortran/exprs.exp: Ditto.
-	* lib/gdb.exp: Delete obsolete code.
-	* gdb.chill/ChangeLog, gdb.chill/Makefile.in: Delete.
-	* gdb.chill/builtins.ch, gdb.chill/builtins.exp: Delete.
-	* gdb.chill/callch.ch, gdb.chill/callch.exp: Delete.
-	* gdb.chill/chexp.exp, gdb.chill/chillvars.ch: Delete.
-	* gdb.chill/chillvars.exp, gdb.chill/configure: Delete.
-	* gdb.chill/configure.in, gdb.chill/enum.ch: Delete.
-	* gdb.chill/enum.exp, gdb.chill/func1.ch: Delete.
-	* gdb.chill/gch1041.ch, gdb.chill/gch1041.exp: Delete.
-	* gdb.chill/gch1272.ch, gdb.chill/gch1272.exp: Delete.
-	* gdb.chill/gch1280.ch, gdb.chill/gch1280.exp: Delete.
-	* gdb.chill/gch922.ch, gdb.chill/gch922.exp: Delete.
-	* gdb.chill/gch981.ch, gdb.chill/gch981.exp: Delete.
-	* gdb.chill/misc.ch, gdb.chill/misc.exp: Delete.
-	* gdb.chill/powerset.ch, gdb.chill/powerset.exp: Delete.
-	* gdb.chill/pr-4975-grt.ch, gdb.chill/pr-4975.ch: Delete.
-	* gdb.chill/pr-4975.exp, gdb.chill/pr-5016.ch: Delete.
-	* gdb.chill/pr-5016.exp, gdb.chill/pr-5020.ch: Delete.
-	* gdb.chill/pr-5020.exp, gdb.chill/pr-5022.ch: Delete.
-	* gdb.chill/pr-5022.exp, gdb.chill/pr-5646-grt.ch: Delete.
-	* gdb.chill/pr-5646.ch, gdb.chill/pr-5646.exp: Delete.
-	* gdb.chill/pr-5984.ch, gdb.chill/pr-5984.exp: Delete.
-	* gdb.chill/pr-6292.ch, gdb.chill/pr-6292.exp: Delete.
-	* gdb.chill/pr-6632-grt.ch, gdb.chill/pr-6632.ch: Delete.
-	* gdb.chill/pr-6632.exp, gdb.chill/pr-8134.exp: Delete.
-	* gdb.chill/pr-8136.ch, gdb.chill/pr-8136.exp: Delete.
-	* gdb.chill/pr-8405.ch, gdb.chill/pr-8405.exp: Delete.
-	* gdb.chill/pr-8742.ch, gdb.chill/pr-8742.exp: Delete.
-	* gdb.chill/pr-8894-grt.ch, gdb.chill/pr-8894.ch: Delete.
-	* gdb.chill/pr-8894.exp, gdb.chill/pr-9095.ch: Delete.
-	* gdb.chill/pr-9095.exp, gdb.chill/pr-9946.ch: Delete.
-	* gdb.chill/pr-9946.exp, gdb.chill/result.ch: Delete.
-	* gdb.chill/result.exp, gdb.chill/string.ch: Delete.
-	* gdb.chill/string.exp, gdb.chill/tests1.ch: Delete.
-	* gdb.chill/tests1.exp, gdb.chill/tests2.ch: Delete.
-	* gdb.chill/tests2.exp, gdb.chill/tuples.ch: Delete.
-	* gdb.chill/tuples.exp, gdb.chill/xstruct-grt.ch: Delete.
-	* gdb.chill/xstruct.ch, gdb.chill/xstruct.exp: Delete.
-
-2002-12-11  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/m-data.exp: Add test for members that shadow global
-	variables: see PR gdb/804.
-	* gdb.c++/m-data.cc: Ditto.
-
-2002-12-10  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/foll-vfork.exp: Re-enable test on HP/UX.
-
-2002-12-06  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.base/store.c: Don't declare functions static.
-
-2002-12-04  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/store.exp, gdb.base/store.c: New files.
-
-2002-12-03  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/selftest.exp: Update for current gdb.
-
-2002-12-03  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/maint.exp: Only dump symbols from one source file
-	or objfile.
-
-2002-12-03  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/step-test.exp: Allow MIPS to return to the line of a
-	function call.
-
-2002-11-25  Jim Blandy  <jimb@redhat.com>
-
-	* lib/mi-support.exp (mi_delete_breakpoints): Change name of
-	function appearing in error message.
-
-2002-11-21  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/maint.exp (help maint dump-me): Update with typo fix.
-
-2002-11-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* lib/mi-support.exp (mi_gdb_start): Verify the startup message
-	for mi1 and current mi is in correct format.  New mi startup message
-	should be in mi console format.  This is part of fix for PR gdb/604.
-
-2002-09-18  Fernando Nasser  <fnasser@redhat.com>
-
-	* gdb.asm/asm-source.exp: Adjust patter to new disassembler routine
-	which explicitly prints the zero offset as "+0".
-
-2002-10-22  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/schedlock.c (args): Make unsigned.
-
-2002-10-21  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.asm/asm-source.exp: Add "mips*-*" pattern.  Update line
-	numbers.  Allow "foo2|selected stack frame".
-	* gdb.asm/asmsrc1.s: Use gdbasm_declare and gdbasm_end.
-	* gdb.asm/asmsrc2.s: Likewise.
-	* gdb.asm/common.inc: Define gdbasm_declare and gdbasm_end.  Update
-	comments.
-	* gdb.asm/mips.inc: New file.
-
-2002-10-18  Adam Fedor  <fedor@gnu.org>
-
-	* gdb.base/default.exp: Update expected output to include 'ObjC'.
-	* gdb.base/help.exp: Likewise.
-
-2002-10-17  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/constvars.c (struct crass, struct crisp): New structs.
-	* gdb.base/constvars.exp (ptype crass, ptype crisp): New tests.
-
-2002-10-02  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/casts.cc, gdb.c++/casts.exp: New test.
-
-2002-10-01  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi1-basics.exp: Copy of mi1-basics.exp MIFLAGS set "-i=mi1".
-	* mi1-break.exp, mi1-console.exp, mi1-disassemble.exp: Ditto.
-	* mi1-eval.exp, mi1-hack-cli.exp, mi1-pthreads.exp: Ditto.
-	* mi1-read-memory.exp, mi1-regs.exp, mi1-return.exp: Ditto.
-	* mi1-simplerun.exp, mi1-stack.exp, mi1-stepi.exp: Ditto.
-	* mi1-until.exp, mi1-var-block.exp, mi1-var-child.exp: Ditto.
-	* mi1-var-cmd.exp, mi1-var-display.exp, mi1-watch.exp: Ditto.
-
-2002-09-29  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi0-basics.exp, mi0-break.exp, mi0-console.exp: Delete.
-	* mi0-disassemble.exp, mi0-eval.exp: Delete.
-	* mi0-hack-cli.exp, mi0-read-memory.exp: Delete.
-	* mi0-regs.exp, mi0-return.exp, mi0-simplerun.exp: Delete.
-	* mi0-stack.exp, mi0-stepi.exp, mi0-until.exp: Delete.
-	* mi0-var-block.exp, mi0-var-child.exp: Delete.
-	* mi0-var-cmd.exp, mi0-var-display.exp, mi0-watch.exp: Delete.
-
-2002-09-27  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/annota1.exp (info break): Make directory components of
-	path optional since not all compilers emit this debug information.
-
- 	* gdb.base/shlib-call.exp (step inside shr2): Don't fail if first
- 	step ends up stepping out of the function instead of stopping on
- 	the epilogue.
-
-2002-09-26  Keith Seitz  <keiths@redhat.com>
-
-	* lib/insight-support.exp (gdbtk_start): Figure out where
-	the insight executable is based on where gdb is. Use this
-	executable to start insight instead of gdb.
-
-2002-09-25  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.base/pc-fp.exp, gdb.base/pc-fp.c: New test.
-
-2002-09-24  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.gdb/complaints.exp (test_initial_complaints): Rename
-	test_isolated_complaints.
-	(test_empty_complaint): New function.
-	(test_empty_complaints): New function.  Check no output when no
-	complaints.
-
-2002-09-19  Jim Blandy  <jimb@redhat.com>
-
-        * gdb.base/charset.exp, gdb.base/charset.c: New files.
-
-2002-09-19  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.gdb/complaints.exp: New file.
-
-2002-09-18  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/maint.exp: Check `help maint internal-warning'.
-
-2002-09-18  David Carlton  <carlton@math.stanford.edu>
-
-	* gdb.c++/m-static.exp: Remove breakpoints depending on line
-	numbers, and replace them by a single breakpoint after the
-	constructors are all finished.
-	Add test 4.
-	* gdb.c++/m-static.cc: Add test 4.
-	* gdb.c++/m-static.h: New file.
-	* gdb.c++/m-static1.cc: New file.
-
-	* gdb.c++/printmethod.exp: New file.
-	* gdb.c++/printmethod.cc: New file.
-
-	* gdb.c++/pr-574.exp: New file.
-	* gdb.c++/pr-574.cc: New file.
-
-2002-09-18  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/ending-run.exp: Add handling of "step to end of run" for
-	embedded targets which never actually exit.
-
-2002-09-18  Fernando Nasser  <fnasser@redhat.com>
-
-	* gdb.base/ending-run.exp: Properly mark "continue after exit" and
-	"don't step after run" as unresolved or unsupported, instead of xfail.
-
-2002-09-18  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/ending-run.exp: Fix expected string for _wrap_main to
-	allow correct handling of #ifdef UNDERSCORES from dejagnu/testglue.c.
-	Add newline to expected string in "step out of main (status wrapper)"
-	case.
-
-2002-09-18  Corinna Vinschen  <vinschen@redhat.com>
-
-	* lib/gdb.exp (rerun_to_main): Allow restarting application.
-	* gdb.base/ena-dis-br.exp (rerun_to_main): Eliminate.
-
-2002-09-17  Tom Tromey  <tromey@redhat.com>
-
-	* gdb.base/printcmds.exp (test_print_string_constants): Expect
-	\000, not \0, in double-quoted string.
-
-2002-09-14  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/commands.exp: Don't expect a "Program exited normally"
-	string after running the commands execution on breakpoint tests.
-
-2002-09-13  Corinna Vinschen  <vinschen@redhat.com>
-
-	* lib/gdb.exp (gdb_continue_to_end): Fix typo in expected string.
-
-2002-09-12  Joel Brobecker  <brobecker@gnat.com>
-
-	* gdb.base/call-strs.exp: Fix a small typo in one of the comments.
-
-2002-09-10  Keith Seitz  <keiths@redhat.com>
-
-	* lib/mi-support.exp (mi_runto): New proc. Does the same as gdb's
-	runto proc.
-	(mi_run_to_main): Use mi_runto.
-	(mi_execute_to): Renamed from mi_run_to. Changed all callers.
-
-2002-09-10  Keith Seitz  <keiths@redhat.com>
-
-	* lib/mi-support.exp: (mi_run_to_main): Allow anything to precede
-	regexp for stopping at main. Could have multiple event notifications.
-	Don't assume that main was declared with no parameters.
-	(mi_next): Use mi_step_to.
-	(mi_step): Use mi_next_to.
-
-2002-09-09  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/default.exp: Fix expected string in `info float' test.
-
-2002-09-09  Ben Elliston  <bje@redhat.com>
-
-	* config/mips.exp: Update comments.
-	* config/mips-idt.exp: Likewise.
-	* config/nind.exp: Likewise.
-	* config/slite.exp: Likewise.
-	* config/sparclet.exp: Likewise.
-	* config/udi.exp: Likewise.
-	* config/vx.exp: Likewise.
-	* config/vxworks29k.exp: Likewise.
-
-2002-09-05  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.threads/killed.exp: Fix test failure message.
-
-2002-09-04  Keith Seitz  <keiths@redhat.com>
-
-	* lib/mi-support.exp: Update copyright.
-	(mi_gdb_test): Increase the priority of the expected pattern
-	so that it matches gdb_test.
-
-2002-09-03  Keith Seitz  <keiths@redhat.com>
-
-	* lib/gdb.exp (gdb_compile_pthreads): Fix "build_bin" typo.
-	Use integer comparison instead of string comparison for testing
-	whether binary was built.
-
-2002-09-03  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.threads/killed.exp, gdb.threads/killed.c: New test.
-
-2002-08-29  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.threads/pthreads.exp: Move the portable thread compilation
-	code into a function in lib/gdb.exp, and call that from here.
-	* lib/gdb.exp (gdb_compile_pthreads): New function.
-
-2002-08-29  Keith Seitz  <keiths@redhat.com>
-
-	* lib/mi-support.exp (mi_gdb_test): Add global declaration for
-	expect_out so that callers can get at it.
-
-2002-08-23  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/print-threads.c: New file.
-	* gdb.threads/print-threads.exp: New file.
-	* gdb.threads/schedlock.c: New file.
-	* gdb.threads/schedlock.exp: New file.
-
-2002-08-22  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.arch/altivec-abi.exp: The source C file is altivec-abi.c,
-        not altivec.c.
-
-2002-08-17  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/return.exp: Remove i*86-*-* from list of xfail'ed
-	targets.  The problem should be fixed now.
-
-2002-08-15  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.java/jv-print.exp: Fix p '' and p ''' tests to deal with
-	2002-07-24 change that removes final dots from error messages.
-
-2002-08-13  Tom Tromey  <tromey@redhat.com>
-
-	* gdb.base/readline.exp: New file.
-
-2002-08-01  Andrew Cagney  <ac131313@redhat.com>
-
-	* lib/gdb.exp (gdb_expect_list): Only print one pass, fail, or
-	supress message.
-
-2002-08-01  Andrew Cagney  <cagney@redhat.com>
-
-	* Makefile.in (TARGET_FLAGS_TO_PASS): Remove CHILLFLAGS, CHILL,
-	CHILL_FOR_TARGET and CHILL_LIB.
-	* configure.in (configdirs): Remove gdb.chill.
-	* configure: Regenerate.
-	* lib/gdb.exp: Obsolete references to chill.
-	* gdb.fortran/types.exp: Ditto.
-	* gdb.fortran/exprs.exp: Ditto.
-
-2002-07-30  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/shlib-call.exp (additional_flags): Conditionally
-	set Irix-specific compile and link flags.
-
-2002-07-29  Kevin Buettner  <kevinb@redhat.com>
-
-	* lib/gdb.exp (mips*-*-irix*): Use alternate method for preprocessing
-	source files.  The ``-o'' option doesn't work with the ``-E'' option
-	when using the Irix compiler.
-
-2002-07-19  Daniel Jacobowitz  <drow@mvista.com>
-
-	* config/gdbserver.exp (gdb_load): Don't use TCL varargs.
-	Improve support for reusing an exec file.  Copy exec file
-	to target, and run gdbserver on the target instead of on the host.
-
-2002-07-18  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/ending-run.exp: Don't expect to see the program end in
-	some orderly fashion when we're running on a real stand-alone
-	board.
-
-	* gdb.base/interrupt.exp: Correct logic for skipping tests on
-	targets that don't support interrupts.
-
-2002-07-10  Paul N. Hilfinger  <hilfingr@otisco.mckusick.com>
-
-	* gdb.base/attach.exp: Add patterns to match output from /proc-based
-	systems.
-	Move comments in expect statements to inside the actions, so that they
-	don't get matched against.
-
-2002-07-10  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/interrupt.exp: Setup xfail for all i386 BSD's on "call
-	function when asleep" test.
-
-2002-07-10  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/page.exp: Rewrite to handle problems with very long
-	`info set' output.  Update copyright.
-
-2002-06-26  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.hp/configure.in (AC_CONFIG_SUBDIRS): Do not try to configure
-	gdb.threads-hp.
-	* gdb.hp/configure: Regenerate.
-	* gdb.hp/gdb.threads-hp/configure.in: Delete file.
-	* gdb.hp/gdb.threads-hp/configure: Delete file.
-	* gdb.hp/gdb.threads-hp/Makefile.in: Delete file.
-
-2002-06-22  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/selftest.exp (do_stes_and_next): Skip calls to
-	setlocale, bindtextdomain and textdomain.
-
-2002-06-11  Jim Blandy  <jimb@redhat.com>
-
-	* lib/gdb.exp (get_debug_format): Tolerate message saying whether
-	preprocessor macro information is present.
-
-	* macscp.exp, macscp1.c, macscp2.h, macscp3.h, macscp4.h: New
-	tests.
-
-2002-06-06  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/overlays.exp: Record addresses of overlay
-	functions in TCL variables rather than in GDB variables,
-	to avoid having GDB convert them to pointers (with loss
-	of information).
-
-	* gdb.base/d10v.ld: Merge in several years worth of
-	default linker script changes.
-	* gdb.base/long_long.exp: Add check for sizeof (long double).
-
-2002-06-06  Michal Ludvig  <mludvig@suse.cz>
-
-	* gdb.asm/asm-source.exp: Add x86-64 target.
-	* gdb.asm/x86_64.inc: New.
-
-2002-05-30  Michael Chastain  <mec@shout.net>
-
-	From Benjamin Kosnik <bkoz@redhat.com>:
-	* gdb.c++/m-static.cc: New file.
-	* gdb.c++/m-static.exp: New file.
-
-2002-05-28  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/call-ar-st.exp: Allow for reduced floating point
-	precision.
-
-2002-05-27  Michael Chastain  <mec@shout.net>
-
-	From Benjamin Kosnik <bkoz@redhat.com>:
-	* gdb.c++/m-data.cc: New file.
-	* gdb.c++/m-data.exp: New file.
-
-2002-05-27  Michael Chastain  <mec@shout.net>
-
-	From Benjamin Kosnik <bkoz@redhat.com>:
-	* gdb.c++/try_catch.cc: New file.
-	* gdb.c++/try_catch.exp: New file.
-
-2002-05-27  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/local.exp: Accept more nested types in output.
-
-2002-05-26  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/call-rt-st.exp: Fix typo in brace quoting.
-
-2002-05-15  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	* lib/gdb.exp (gdb_wrapper_init): Just because
-	gdb_wrapper_file exists, this does not mean that the file
-	should not be rebuilt.  That is what gdb_wrapper_initialized
-	is for.
-	(default_gdb_init): Reset gdb_wrapper_initialized.
-
-2002-05-23  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/all-bin.exp: Revise previous patch by just reducing
-	the precision of the floating point test results.
-	* gdb.base/call-rt-st.exp: Ditto.
-
-	* gdb.base/all-bin.exp: Allow for reduced floating point precision.
-	* gdb.base/call-rt-st.exp: Ditto.
-
-2002-05-19  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/inherit.exp: Accept "VTT for ..." in output strings.
-
-2002-05-19  Elena Zannoni  <ezannoni@redhat.com>
-
-        * configure.in (configdirs): Add gdb.arch.
-        * configure: Regenerate.
-
-2002-05-17  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/completion.exp: Recognize the more detailed error
-	messages produced by the macro expander's lexical analyzer.
-
-2002-05-14  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.arch/altivec-abi.c: New file.
-        * gdb.arch/altivec-abi.exp: New file.
-        * gdb.arch/altivec-regs.c: New file.
-        * gdb.arch/altivec-regs.exp: New file.
-
-2002-05-14  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/maint.exp (maint print type): Update for new type
-	structure.
-
-2002-05-14  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.arch: New directory.
-	* gdb.arch/configure.in: New file.
-	* gdb.arch/configure: New file.
-	* gdb.arch/Makefile.in: New file.
-
-2002-05-13  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add v850 as supported target.
-	* gdb.asm/v850.inc: New file.
-
-2002-05-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/annota2.exp (annotate-quit): Add comment.
-
-2002-05-12  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/break.exp: Check 'break "marker2"'.
-
-2002-05-10  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/long_long.exp: Fix typo.
-
-2002-05-10  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/printcmds.exp: Don't xfail the ptype command.  This is
-	a bug.
-
-	* gdb.base/printcmds.exp (test_integer_literals_rejected):
-	Recognize more detailed error message produced by the macro
-	expander's lexical analyzer.
-	* lib/gdb.exp (test_print_reject): Same.
-
-2002-05-09  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.c++/method.exp: Fix typo.
-
-2002-05-08  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.mi/mi-var-child.exp: Accept (void) as well as ().
-	* gdb.mi/mi0-var-child.exp: Accept (void) as well as ().
-	* gdb.base/default.exp: Merge clauses for arm, strongarm, xscale.
-	* gdb.base/long_long.exp: Merge clauses for arm and xscale.
-	Add iftarget clause for strongarm.
-
-2002-05-06  Michael Snyder  <msnyder@redhat.com>
-
-	* lib/gdb.exp (gdb_test): Add case to allow for status wrapper.
-	(gdb_continue_to_end): Accept output from status wrapper.
-	* gdb.base/ending-run.exp: Add case for output from status wrapper.
-	Clean up fail messages to match pass messages.
-
-	Enable the "needs_status_wrapper" testsuite feature.
-	* lib/gdb.exp (gdb_wrapper_init): New procedure.
-	(gdb_compile): Conditionally call gdb_wrapper_init.
-	* gdb.base/a2-run.exp: Recognize output from status wrapper.
-	* gdb.c++/method.exp: Recognize output from status wrapper.
-
-2002-05-06  Ben Elliston  <bje@redhat.com>
-From Graydon Hoare  <graydon@redhat.com>
-
-	* config/sid.exp: Include support for "rawsid" protocol.
-
-2002-05-03  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/hang.exp: Check for corruption of the cv_type chain.
-	* gdb.c++/hang3.C: New file.
-
-2002-05-04  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/default.exp: Remove obsolete code.
-	* gdb.c++/misc.exp: Ditto.  Update copyright.
-	* gdb.c++/cplusfuncs.exp: Ditto.  Update copyright.
-	* gdb.base/whatis.exp: Ditto.  Update copyright.
-	* gdb.base/scope.exp: Ditto.  Update copyright.
-	* gdb.base/ptype.exp: Ditto.  Update copyright.
-	* gdb.base/printcmds.exp: Ditto.  Update copyright.
-	* gdb.base/opaque.exp: Ditto.  Update copyright.
-	* gdb.base/list.exp: Ditto.
-	* gdb.base/funcargs.exp: Ditto.  Update copyright.
-	* gdb.hp/gdb.threads-hp/usrthbasic.c: Delete.
-	* gdb.hp/gdb.threads-hp/usrthbasic.exp: Delete.
-	* gdb.hp/gdb.threads-hp/usrthcore.c: Delete.
-	* gdb.hp/gdb.threads-hp/usrthcore.exp: Delete.
-	* gdb.hp/gdb.threads-hp/usrthfork.c: Delete.
-	* gdb.hp/gdb.threads-hp/usrthfork.exp: Delete.
-
-2002-05-02  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/watchpoint.exp: Add xscale target.
-	* gdb.base/long_long.exp: Add xscale target.
-	* gdb.base/default.exp: Add xscale target.
-
-2002-05-01  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/hang1.C, gdb.c++/hang2.C, gdb.c++/hang.H,
-	gdb.c++/hang.exp: New test.
-
-2002-05-01  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/completion.exp: Handle completions of "./Make" for
-	more than one completion possibility, as is the case when we
-	build and test in the source tree.
-
-2002-04-29  Anthony Green  <green@redhat.com>
-
-	* gdb.java/jmisc1.exp: New file.
-	* gdb.java/jmisc2.exp: New file.
-
-2002-04-24  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/linux-dp.exp: Use 'unset' instead of 'array unset'.
-
-2002-04-23  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.base/help.exp: Change 'help status' to allow for target
-	dependent output differences.
-
-2002-04-22  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/local.exp: Add PR numbers: gdb/482, gdb/483.
-
-2002-04-22  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/method.exp: Fix syntax of reference to gdb/277.
-
-2002-04-17  David S. Miller  <davem@redhat.com>
-
-	* gdb.asm/sparc64.inc: New file.
-	* gdb.asm/asm-source.exp: Handle sparc64-*-*.
-
-2002-04-19  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.asm/asm-source.exp: Don't use a symlink, just copy the
-	instruction file directly into the build tree.  Clean up at end of
-	test.
-
-2002-04-18  David S. Miller  <davem@redhat.com>
-
-	* gdb.base/annota1.exp: Expect addresses as $hex + whitespace to
-	handle 64-bit platforms correctly.
-	* gdb.base/maint.exp: Likewise.
-
-2002-04-18  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/shlib-call.exp (additional_flags): AIX doesn't need
-	``-fpic'' when compiling files comprising a shared library, but
-	it does need additional linker flags in order to find shared
-	libraries at run time.
-
-2002-04-18  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/cvexpr.c (use): New function.
-	(main): Invoke use() on all global variables to prevent
-	some linkers from deleting these otherwise unused symbols.
-
-2002-04-17  Michael Chastain  <mec@shout.net>
-From David S. Miller  <davem@redhat.com>
-
-	* gdb.c++/ovldbreak.exp: Expect addresses as $hex + whitespace to
-	handle 64-bit platforms correctly.
-
-2002-04-12  Michael Snyder  <msnyder@redhat.com>
-From Jim Blandy  <jimb@redhat.com>
-        * gdb.base/foo.c (foox): Remove section attribute; the linker
-	script can handle this instead.
-	* gdb.base/bar.c (barx): Same.
-	* gdb.base/baz.c (bazx): Same.
-	* gdb.base/grbx.c (grbxx): Same.
-
-	* gdb.base/overlays.exp: New test: check that GDB's manual overlay
-	manager doesn't automatically unmap overlays unnecessarily.
-
-2002-04-10  Martin M. Hunt  <hunt@redhat.com>
-
-	* gdb.base/ending-run.exp: Fix pattern for Mips targets
-	stepping out of main.
-
-2002-04-09  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/local.cc (main): Move call to marker1() inside nested
-	scope so that the nested scope tests will make sense.
-	* gdb.c++/local.exp: Write patterns that actually work with gcc
-	(the HP patterns "were never known to work with gcc").
-	Keep the old aCC patterns too.
-
-2002-04-09  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/attach.exp: Correct target board test.
-
-2002-04-08  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/method.exp: Require "const ... A * ..." for "ptype this"
-	in a const method.  Add some xfail and fail cases for configurations
-	that do not emit the "const ...".
-
-2002-04-07  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/method.exp: Use gdb_test instead of send_gdb/gdb_expect.
-	Accept "A * const" and "const A * const" as type of "this".
-	Fix spelling of getFunky throughout.  Make messages uniform.
-
-2002-04-07  Elena Zannoni  <ezannoni@redhat.com>
-
-        Work around for PR gdb/285:
-	* gdb.asm/asm-source.exp: Bail out if multilibs are detected.
-
-2002-04-07  Elena Zannoni  <ezannoni@redhat.com>
-
-	* gdb.asm/asm-source.exp: Build symbolic link to arch specific
-	instructions file at run time instead of configure time.
-	Sometimes we run the test in a directory that is not the one we
-	configured in.
-	* gdb.asm/configure.in: Delete creation of symlink.
-	* gdb.asm/configure: Regenerate.
-
-2002-04-05  J. Brobecker  <brobecker@gnat.com>
-
-	* gdb.gdb/xfullpath.exp: New test, to exercise the new
-	xfullpath () function.
-
-2002-04-04  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.asm/Makefile.in: Correct dependencies.
-
-	* gdb.asm/powerpc.inc: New file.
-	* gdb.asm/asm-source.exp: Add PowerPC.
-	* gdb.asm/configure.in: Likewise.
-	* gdb.asm/configure: Regenerated.
-
-2002-04-04  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/relocate.exp: New file.
-	* gdb.base/relocate.c: New file.
-
-2002-04-04  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/step-test.exp: Update comment regarding stopping in
-	memcpy/bcopy calls inserted as part of the compiler runtime.
-
-2002-04-04  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/ovlymgr.c: Add overlay event breakpoint support.
-
-2002-04-03  Daniel Jacobowitz  <drow@mvista.com>
-
-	* lib/gdb.exp (gdb_test): Move -notransfer inside of gdb_expect.
-	(gdb_expect): Remove $notransfer hack.
-
-2002-04-02  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/classes.exp ("calling method for small class"): Match
-	updated register output.
-
-2002-03-30  Daniel Jacobowitz  <drow@mvista.com>
-
-	Fix PR gdb/452
-	* gdb.base/dbx.exp: Restore old definition of gdb_file_cmd
-	when finished.  Make gdb_file_cmd send "exec-file" when
-	appropriate.
-
-2002-03-30  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/attach.exp: Remove extra setup_xfail.
-
-2002-03-26  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/default.exp: Add tests for dump, append, and restore.
-	* gdb.base/help.exp: Add tests for dump, append, and restore.
-	* gdb.base/dump.exp: New file, test dump, append and restore.
-	* gdb.base/dump.c: New file.
-
-2002-03-27  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/help.exp: Modify expect strings to reflect
-	clean-ups in help messages.
-
-2002-03-26  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/step-test.exp: Accept stopping in memcpy/bcopy when we
-	have debugging info for those functions and the compiler uses them
-	internally to copy structs around.
-
-2002-03-26  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/list.exp: Revert the change made yesterday and add note
-	about why we don't list the default lines for remote targets.
-
-2002-03-25  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/help.exp: Clean up unnecessary wild cards in regexps.
-
-2002-03-25  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/list.exp: This test works on remote targets so remove
-	the short circuit for remote targets.  Update copyright.
-
-2002-03-25  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/attach.exp: Fix logic error that was suppressing this
-	test for all non hppa*-*-hpux* targets, instead of the hp target.
-	Move comments closer to the suppression point.  Also now need to
-	check that we are running natively.
-
-2002-03-22  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/default.exp: Add test for gcore.  Update copyright.
-	* gdb.base/help.exp: Add test for gcore.  Update copyright.
-
-2002-03-06  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/funcargs.c:  Remove extraneous ';' character.
-	* gdb.trace/gdb_c_test.c: Remove extraneous ';' character.
-
-2002-03-04  Michael Chastain  <mec@shout.net>
-
-	* gdb.mi/mi-var-cmd.exp: In test "create local variable func",
-	accommodate gcc v3 function signature.
-	* gdb.mi/mi0-var-cmd-exp: Ditto.
-
-2002-02-24  Andrew Cagney  <ac131313@redhat.com>
-
-	* testsuite/gdb.base/huge.c: Replace ``Linux'' with either
-	``GNU/Linux'' or ``Linux kernel''
-	* testsuite/gdb.threads/pthreads.c: Ditto.
-
-2002-02-24  Michael Chastain  <mec@shout.net>
-
-	* gdb.threads/pthreads.c (thread1): Add a return statement.
-	(thread2): Likewise.
-	(foo): Likewise.
-
-2002-02-23  Michael Chastain  <mec@shout.net>
-
-	* gdb.threads/linux-dp.c (philosopher): Add a return statement
-	to placate gcc.
-
-2002-02-23  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/templates.exp: Remove setup_xfail_format "stabs" on
-	test "ptype bint".  The test passes on all my stabs configurations.
-
-2002-02-21  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.asm/asm-source.exp: Parse the output from `info sources' one
-	filename at a time, and watch for the ones we want to see.
-
-	* gdb.base/ptype.exp, gdb.base/ptype.c: Add tests for printing
-	types of pointers to prototyped functions.
-
-2002-02-20  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/sizeof.c (main): Call fill_structs.  Print value of
-	signed, unsigned and straight char.
-	(padding_char, padding_short, padding_int, padding_long,
-	padding_long_long, padding_float, padding_double,
-	padding_long_double): New global variables.
-	(fill, fill_structs): New functions.
-
-	* gdb.base/sizeof.exp: Check for signed and unsigned char.  Check
-	for correctly sized writes.  Update copyright.
-	(get_valueof): New procedure.
-	(get_sizeof): Call get_valueof.
-	(check_valueof): New procedure.
-	(check_padding): New procedure.
-
-2002-02-20  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/virtfunc.exp (test_virtual_calls): Remove obsolete calls
-	to setup_xfail.  Document some of the remaining calls.
-
-2002-02-18  Michael Chastain  <mec@shout.net>
-
-	* gdb.c++/userdef.exp: Update copyright year.
-
-2002-02-18  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/userdef.exp: Test overloaded operators properly.
-	Remove xfails.
-
-2002-02-14  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/gcore.exp: Relax recognition of function breakpoint.
-
-2002-02-14  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/a2-run.exp: Check for a remote target properly.
-	* gdb.base/annota1.exp: Likewise.
-	* gdb.base/list.exp: Likewise.
-	* gdb.base/reread.exp: Likewise.
-	* gdb.base/scope.exp: Likewise.
-	* gdb.base/shlib-call.exp: Likewise.
-	* gdb.base/term.exp: Likewise.
-	* gdb.c++/annota2.exp: Likewise.
-
-2002-02-13  Richard Earnshaw  <rearnsha@arm.com>
-
-	* gdb.base/watchpoint.exp: Restore previous timeout at end of test.
-
-2002-02-10  Michael Chastain  <mec@shout.net>
-
-	* gdb.base/funcargs.c (localvars_after_alloca): Fix return type.
-	(call_after_alloca): Ditto.
-
-2002-02-10  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/ending-run.exp: Guard "cont" test with
-	gdb_skip_stdio_test.
-
-2002-02-06  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/callfwmall.c, gdb.base/callfwmall.exp: Move these tests
-	from here...
-	* gdb.hp/gdb.base-hp/callfwmall.c, gdb.hp/gdb.base-hp/callfwmall.exp:
-	To here.  Disable this test on non-HP platforms.  Add big comment.
-
-2002-02-04  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/ovlymgr.c  (ovly_copy): Generalize for targets
-	  other than d10v and m32r.
-
-2002-02-02  Richard Earnshaw  <rearnsha@arm.com>
-
-	* gdb.base/default.exp: Rewrite test patterns to reduce time
-	taken to match them.
-
-2002-01-30  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/annota1.exp (backtrace from shlibrary): Fix spelling.
-	Allow a start function above main.
-	* gdb.threads/linux-dp.exp: Fix copyright date.
-
-2002-01-30  Daniel Jacobowitz  <drow@mvista.com>
-
-        * gdb.threads/linux-dp.exp: Use 'array unset', not 'array set'.
-        (check_philosopher_stack): Check for manager thread before checking
-        for a just-starting thread.
-
-2002-01-30  Daniel Jacobowitz  <drow@mvista.com>
-
-	From Neil Booth <neil@daikokuya.demon.co.uk>:
-	* gdb.base/bitfields.c: Correct assignments to bitfields to avoid
-	warnings.
-
-2002-01-21  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/restore.exp (restore_tests): Fix obvious typo, callee
-	not caller.
-
-2002-01-21  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/reread.exp: Check that GDB properly re-reads the
-	executable file when it changes while no inferior is running.
-
-2002-01-21  Fred Fish  <fnf@redhat.com>
-
-        * gdb.base/maint.exp: Simplify the "maint info breakpoints" test to
-        optionally accept the "shlib events" variation.
-
-2002-01-21  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/ending-run.c (main): Avoid messing with setvbuf; just
-	call `fflush' after every `printf', so that the output is produced
-	at predictable points, regardless of whatever buffering does (or
-	doesn't) take place.
-	* gdb.base/ending-run.exp: Adjust tests to expect output to appear
-	at different points.
-
-2002-01-20  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/inherit.exp: Update copyright years.
-	* gdb.c++/method.exp: Likewise.
-
-2002-01-20  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/classes.exp: Update for improved v3 support and skipping
-	artificial methods/arguments.
-	* gdb.c++/derivation.exp: Likewise.
-	* gdb.c++/inherit.exp: Likewise.
-	* gdb.c++/method.exp: Likewise.
-	* gdb.c++/virtfunc.exp: Likewise.
-
-2002-01-18  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.hp/gdb.threads-hp/usrthfork.exp: Mark as obsolete.
-	* gdb.hp/gdb.threads-hp/usrthcore.exp: Ditto.
-	* gdb.hp/gdb.threads-hp/usrthbasic.exp: Ditto.
-	* gdb.hp/gdb.threads-hp/usrthfork.c: Ditto.
-	* gdb.hp/gdb.threads-hp/usrthbasic.c: Ditto.
-	* gdb.hp/gdb.threads-hp/usrthcore.c: Ditto.
-
-2002-01-17  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.asm/asm-source.exp (info symbol): Take another shot at
-	anchoring the pattern matching the entry point symbol's name.
-
-2002-01-17  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/maint.exp: Update ``maint internal-error'' to match
-	continue/quit query.  Update copyright.
-
-2002-01-14  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/gcore.exp: Remove extra debugging output.
-
-2002-01-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/demangle.exp: Accept slightly dubious v2 demangler result
-	for slightly dubious v2 mangled string.
-
-2002-01-13  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/completion.exp: Expand ${srcdir} to an absolute path.
-
-2002-01-10  Jason Merrill  <jason@redhat.com>
-
-	* gdb.c++/namespace.exp: Accept trailing const for 'this'.
-
-	* gdb.c++/classes.exp: Accept 'A const' or 'const A' in copy
-	constructors.
-	* gdb.c++/derivation.exp: Likewise.
-	* gdb.c++/templates.exp: Likewise.
-	* gdb.c++/virtfunc.exp: Likewise.
-
-2002-01-10  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.c++/namespace.exp: Accept both '\0' and '\000'.
-
-2002-01-08  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/gcore.exp: New test for generate-core-file command.
-	* gdb.base/gcore.c: Testcase for above.
-	* gdb.threads/gcore-thread.exp: New test for gcore (threaded).
-
-2002-01-08  Jason Merrill  <jason@redhat.com>
-
-	* gdb.c++/userdef.cc: Use <iostream> instead of <iostream.h>.
-
-2002-01-07  Fred Fish  <fnf@redhat.com>
-
-	* gdb.c++/overload.exp: Remove unconditional xfails for:
-	print foo_instance1.overloadargs(1)
-	print foo_instance1.overloadargs(1, 2)
-	print foo_instance1.overloadargs(1, 2, 3)
-	print foo_instance1.overloadargs(1, 2, 3, 4)
-	print foo_instance1.overloadargs(1, 2, 3, 4, 5)
-	print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6)
-	print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7)
-	print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8)
-	print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9)
-	print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
-	print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)
-	print foo_instance1.overload1arg()
-	print foo_instance1.overload1arg((char)arg2)
-	print foo_instance1.overload1arg((signed char)arg3)
-	print foo_instance1.overload1arg((unsigned char)arg4)
-	print foo_instance1.overload1arg((int)arg7)
-	print foo_instance1.overload1arg((unsigned int)arg8)
-	print foo_instance1.overload1arg((float)arg11)
-	print foo_instance1.overload1arg((double)arg12)
-
-2002-01-07  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/huge.exp: New test.  Print a very large target data object.
-	(skip_huge_test): New test variable.  Define if you want to skip this
-	test.  The test reads an 8 megabyte data object from the target, so it
-	might be very time consuming on remote targets with a slow connection.
-	* gdb.base/huge.c: New file.  Test case for above.
-
-2002-01-07  Fred Fish  <fnf@redhat.com>
-
-	* gdb.c++/derivation.exp: Remove gcc xfails for g_instance.afoo,
-	g_instance.bfoo, and g_instance.cfoo.
-
-Mon Jan  7 12:22:18 2002  Jeffrey A Law  (law@redhat.com)
-
- 	* gdb.base/break.c (multi_line_if_conditional): New function.
- 	(multi_ilne_while_conditional): Likewise.
- 	* gdb.base/break.exp: Verify that a breakpoint on a multi-line
- 	IF or WHILE condition puts the breakpoint at the start of
- 	the condition.
-
-	* gdb.base/selftest.exp (backtrace through signal handler): Remove
-	hppa*-*-hpux* expected failure.
-	* gdb.base/structs.exp (do_function_calls): Similarly.
-
-	* gdb.c++/annota2.exp (watch triggered on a.x): Handle hardware
-	watchpoints.
-
-2002-01-06  Andrew Cagney  <ac131313@redhat.com>
-
-	Fix PR gdb/66.
-	* gdb.base/structs.exp: Replace skip for a29k with skip for
-	gdb,cannot_call_functions.
-	* gdb.base/call-ar-st.exp: Remove references to a29k in comments.
-	* gdb.base/callfuncs.exp: Ditto.
-	* gdb.base/call-rt-st.exp: Ditto.
-	* gdb.base/call-strs.exp: Ditto.
-	* gdb.base/callfwmall.exp: Ditto.
-	* gdb.base/scope.exp: Obsolete xfail a29k.
-	* gdb.c++/misc.exp: Ditto.
-	* gdb.c++/cplusfuncs.exp: Ditto.
-	* gdb.base/ptype.exp: Ditto.
-	* gdb.base/printcmds.exp: Ditto.
-	* gdb.base/opaque.exp: Ditto.
-	* gdb.base/list.exp: Ditto.
-	* gdb.base/funcargs.exp: Ditto.
-	* gdb.base/default.exp: Ditto.
-
-2002-01-04  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/info-proc.exp: New file, test for "info proc" cmd.
-	* gdb.base/maint.exp: Add tests for maint info sections options.
-
-Fri Dec 21 09:42:11 2001  Jeffrey A Law  (law@redhat.com)
-
-	* gdb.base/default.exp: Remove bogus hppa*-hp-hpux* xfails.
-
-2001-12-20  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/arm.inc: New file.
-	* gdb.asm/asm-source.exp: Add arm targets.
-	* gdb.asm/configure.in: Ditto.
-	* gdb.asm/configure: Recreated from configure.in.
-
-Thu Dec 20 09:54:36 2001  Jeffrey A Law  (law@redhat.com)
-
-	* gdb.hp/gdb.defects/bs15503.exp: Only run this test if compiling
-	with HP's compiler.
-	* gdb.hp/gdb.objdbg/objdbg01.exp: Likewise.
-	* gdb.hp/gdb.objdbg/objdbg02.exp: Likewise.
-	* gdb.hp/gdb.objdbg/objdbg03.exp: Likewise.
-	* gdb.hp/gdb.objdbg/objdbg04.exp: Likewise.
-
-	* gdb.hp/gdb.defects/solib-d.exp: Update to handle building with
-	either HP's compilers or GCC.
-
-	* gdb.hp/gdb.base-hp/hwwatchbus.exp: Allow inferior to get either
-	a SIGBUS or SIGSEGV.
-
-	* gdb.hp/gdb.base-hp/so-thresh.exp: Remove useless send_user command.
-
-	* gdb.hp/gdb.defects/bs14602.exp: Revamp slightly so that test
-	can be compiled with either HP's compiler or GCC.
-
-	* gdb.hp/gdb.threads-hp/usrthbasic.exp: Disable completely.
-	* gdb.hp/gdb.threads-hp/usrthcore.exp: Disable completely.
-	* gdb.hp/gdb.threads-hp/usrthfork.exp: Disable completely.
-
-	* gdb.hp/gdb.base-hp/so-thresh.exp: Update text in expect strings
-	to match current gdb output.  Update due to using auto-solib-limit
-	for limiting instead of overloading auto-solib-add.
-	* gdb.hp/gdb.base-hp/so-thresh.mk: Always use "cc" to build the
-	test program.
-
-	* gdb.c++/templates.exp: Use "hppa64-*-*", not "hppa2.0w-*-*"
-	* gdb.hp/gdb.base-hp/dollar.exp: Likewise
-	* gdb.hp/gdb.base-hp/pxdb.exp: Likewise.
-	* gdb.hp/gdb.base-hp/reg-pa64.exp: Likewise.
-	* gdb.hp/gdb.base-hp/reg.exp: Likewise.
-	* gdb.hp/gdb.compat/xdb3.exp: Likewise.
-	* gdb.hp/gdb.defects/bs15503.exp: Likewise.
-	* gdb.hp/gdb.objdbg/objdbg01.exp: Likewise
-	* gdb.hp/gdb.objdbg/objdbg02.exp: Likewise
-	* gdb.hp/gdb.objdbg/objdbg03.exp: Likewise
-	* gdb.hp/gdb.threads-hp/usrthbasic.exp: Likewise.
-	* gdb.hp/gdb.threads-hp/usrthcore.exp: Likewise.
-	* gdb.hp/gdb.threads-hp/usrthfork.exp: Likewise.
-
-	* gdb.base/annota1.exp: Expect failure for hpux11 when posting
-	a SIGTRAP to the inferior.
-
-2001-12-19  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/asm-source.exp: Drop setting link-flags for xstormy16.
-	Substitute call to target_link by call to gdb_compile.
-
-Wed Dec 19 14:10:57 2001  Jeffrey A Law  (law@redhat.com)
-
-        * gdb.base/break.exp: Fix HP specific search string when testing
-        backtracing in a called function.
-
-        * gdb.base/constvars.exp: Only set lang to C++ if we're
-        compiling the test with HP's compilers.
-        * gdb.base/volatile.exp: Similarly.
-
-2001-12-19  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/printcmds.exp: Expect the null character to be printed
-	as '\0', and the '\013' to be printed as '\v'.
-	* gdb.base/callfuncs.exp ("backtrace at nested call level 4"): Same.
-	* gdb.base/setvar.exp: Same.
-
-2001-12-17  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/completion.exp: Rather than completing very long
-	filenames, which can make the readline library produce output we
-	don't recognize, cd to the directory first, and then complete
-	using nice, short relative paths.
-
-	* gdb.base/completion.exp: On some systems, there is, in fact, a
-	variable named `b' in scope, since GDB treats all static
-        variables as being in scope.  So use `no_var_named_this'
-        instead of `b'.
-
-	* gdb.base/corefile.exp: Recognize the message saying that GDB
- 	can't find the core file's registers as a failure.
-
-2001-12-13  Jackie Smith Cashion  <jsmith@redhat.com>
-
-        * gdb.base/commands.exp (user_defined_command_test): Make "show user"
-        test expect string more specific.
-
-2001-12-13  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add support for xstormy16.
-	* gdb.asm/configure.in: Ditto.
-	* gdb.asm/configure: Rebuild.
-	* gdb.asm/xstormy16.inc: New file.
-
-2001-12-10  Fred Fish  <fnf@redhat.com>
-
-	* gdb.base/maint.exp: Update to match changes in type dumping code.
-
-2001-12-10  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.asm/asm-source.exp (info symbol): Anchor the pattern
- 	matching the entry point symbol's name at the beginning of the
- 	line.
-
-2001-12-07  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/classes.exp, gdb.c++/derivation.exp,
-	gdb.c++/inherit.exp, gdb.c++/method.exp,
-	gdb.c++/namespace.exp, gdb.c++/templates.exp,
-	gdb.c++/userdef.exp, gdb.c++/virtfunc.exp: Updates for v3 demangler
-	and class layout support.
-
-2001-12-07  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.c++/classes.exp: Add test for static member function.
-	* gdb.c++/misc.cc: Add class with static member function.
-
-2001-12-07  Jim Blandy  <jimb@redhat.com>
-
-	If GDB says it can't find the struct the function returned, report
-	those tests as `unsupported'.
-	* gdb.base/call-rt-st.exp (print_struct_call): New function.
-	Rewrite subsequent tests to use it.
-
-	If GDB says it can't find the struct the function returned, report
-	those tests as `unsupported'.
-	* gdb.base/structs.exp (call_struct_func): New function.
-	(do_function_calls): Use call_struct_func to call the functions
-	returning structs.
-
-	* gdb.base/callfuncs.exp: The stabs generated by GCC don't tell us
-	whether functions are prototyped or not, so we can't possibly pass
-	arguments to t_float_values2 properly.
-
-	* gdb.base/break.exp: (test_next_with_recursion): Don't change the
-	value of `timeout' for targets other than the mips*tx39-*.
-
-2001-12-06  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add tests for info target, info symbol,
-	and detect whether the start symbol has a leading underscore.
-
-2001-12-04  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/completion.exp: Clarify indentation.
-
-2001-12-03  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.asm/s390.inc (gdbasm_datavar): Use `.long' to create `int'
-	variables on the S/390, not `.word'.
-
-2001-11-30  Jim Blandy  <jimb@redhat.com>
-
-	Add assembly-source tests for s390-ibm-linux.
-	* gdb.asm/s390.inc: New file.
-	* gdb.asm/configure.in, gdb.asm/asm-source.exp: Add clauses for
-	the S/390 architecture.
-        * gdb.asm/configure: Regenerated.
-
-2001-11-30  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.asm/asm-source.exp: Add tests for list, search, finish, return,
-	next, info source, info sources, info line, global and static
-	variables, and static functions.
-	* gdb.asm/common.inc: New macro gdbasm_datavar (default definition).
-	* gdb.asm/i386.inc: Override default definition of gdbasm_datavar.
-	* gdb.asm/asmsrc1.s: Add a static function and some variables.
-	* gdb.asm/asmsrc2.s: Make foo2 call foo3 twice (to test 'next').
-	* gdb.asm/d10v.inc (gdbasm_enter): Set up frame pointer.
-	(gdbasm_leave): Restore frame pointer.
-	(gdbasm_startup): Copy stack set-up from crt0.S.
-
-2001-11-26  Fernando Nasser  <fnasser@redhat.com>
-
-	From 2001-11-12 Jackie Smith Cashion  <jsmith@redhat.com>:
-	* gdb.base/callfuncs.c (t_structs_a): Do not return a pointer
-	to a local (non-static) variable. Copy tstruct.a to a static buffer
-	and return a pointer to that buffer.
-	* gdb.base/callfwmall.c (t_structs_a): Ditto.
-
-2001-11-24  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.asm/configure.in: Fix recognition of ix86 target.
-	* gdb.asm/configure: Regenerate.
-
-2001-11-21  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.asm/sparc.inc: New file.
-	* gdb.asm/asm-source.exp: Recognize sparc target.
-	* gdb.asm/configure.in: Recognize sparc target.
-	* gdb.asm/configure: Regenerate.
-
-2001-11-21  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.asm/m32r.inc: New file.
-	* gdb.asm/asm-source.exp: Recognize m32r target.
-	* gdb.asm/configure.in: Recognize m32r target.
-	* gdb.asm/configure: Regenerate.
-
-2001-11-20  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.asm/i386.inc: New file.
-	* gdb.asm/asm-source.exp: Recognize ix86 target.
-	* gdb.asm/configure.in: Recognize ix86 target.
-	* gdb.asm/configure: Regenerate.
-
-	* gdb.c++/namespace.exp: Fix quotes in output messages.
-
-2001-11-14  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/code-expr.exp: New file.  Tests use of the "@code"
-	qualifier in a type cast expression, to designate an address
-	in the instruction space (Harvard architecture).
-
-2001-11-13  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/cvexpr.c, gdb.base/cvexpr.exp: New files.
-	Tests for expressions using 'const' and 'volatile'.
-
-2001-11-13  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.asm/asm-sources.exp: Allow defining linker flags.
-
-2001-11-12  Daniel Jacobowitz  <drow@mvista.com>
-
-	* lib/mi-support.exp (mi_run_to_helper): Move comments
-	outside of gdb_expect.
-
-2001-11-11  Daniel Jacobowitz  <drow@mvista.com>
-
-	* lib/mi-support.exp: (mi_run_to_helper, mi_run_to,
-	mi_step_to, mi_next_to, mi_continue_to, mi_finish_to,
-	mi0_step_to, mi0_next_to, mi0_continue_to, mi0_finish_to,
-	mi0_run_to): New functions.
-	* gdb.mi/mi-simplerun.exp: Use them.
-	* gdb.mi/mi0-simplerun.exp: Likewise.
-	* gdb.mi/mi-var-cmd.exp: Likewise.
-	* gdb.mi/mi0-var-cmd.exp: Likewise.
-
-2001-11-10  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.asm/asmsrc1.s: Add ``gdbasm_'' prefix to all macros.
-	* gdb.asm/asmsrc2.s, gdb.asm/d10v.inc: Update.
-
-2001-11-09  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/restore.exp: Include $expected value in restored test
-	message.
-
-2001-11-09  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.asm/asm-source.exp: Supress file, instead of skip, when not
-	implemented.
-
-2001-11-08  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/callfuncs.exp: Add tests for nested call dummies.
-	Add pass/fail message for stop at breakpoint in call dummy function.
-
-2001-11-07  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.c++/templates.exp (test_template_breakpoints):
-	If we get an overload menu, but it does not match what
-	we expect, we still need to issue the "cancel" command.
-	* gdb.c++/templates.exp: Replace "void \\*" with "void ?\\*",
-	making the whitespace optional.  Argument for "new" may be
-	"unsigned" as well as "unsigned int/long".
-	* gdb.c++/templates.exp: Replace "const &" with "const ?&",
-	making the whitespace optional.  Also replace "(void) with
-	"((void|)), making the keyword "void" optional.
-	* gdb.c++/virtfunc.exp: Replace "const &" with "const ?&",
-	making the whitespace optional.  Also replace "(void) with
-	"((void|)), making the keyword "void" optional.
-	* gdb.base/callfuncs.c (t_float_values): This function must
-	_not_ be prototyped, and the following function (t_float_values2)
-	must be prototyped (if the compiler supports it), so that GDB
-	can be tested against both cases.  Usually one case involves
-	promotion of float to double, while the other does not.
-	* gdb.base/callfwmall.c: Ditto.
-	* gdb.asm/asm-source.exp (bt ALL in foo2): Accept a backtrace that
-	includes a stack frame for "start".
-
-2001-11-05  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.stabs/weird.exp: Delete "p v_comb" test.  It assumes that
-	pointers are 32 bits long, and that offsets of relocs are always
-	stored in the data (REL-style), and not in the reloc entry itself
-	(RELA-style).
-	* gdb.stabs/weird.def (v_comb, v_comb_shared): Remove symbols and
-	stabs.
-
-2001-11-01  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.c++/cplusfuncs.exp: Fix conflicts between operator names
-	and regular expression operators by using quoting.
-
-2001-10-31  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.c++/overload.exp: Select overloadfnarg(void) or overloadfnarg(),
-	depending on what the symbol table contains.
-	* gdb.c++/derivation.exp: Accept both "foo(void)" and "foo()" in
-	the output of the ptype command.  Similarly, accept both "const &"
-	and "const&".
-
-2001-10-31  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/miscexprs.c (main): Add usage of preprocessor
-	symbol `STORAGE' to allow to choose the storage class of
-	the local datastructures.
-	* gdb.base/miscexprs.exp: Handle setting a `-DSTORAGE=...'
-	compiler directive.
-
-2001-10-30  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/jump.exp: Allow it to run for all targets.
-
-2001-10-29  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/call-ar-st.c (print_double_array): Match for loop
-	with new double_array size.
-	(main): Change storage class of all local variables to static.
-	Reduce size of double_array to 9.
-	* gdb.base/call-ar-st.exp:  Increase timeout value.
-	Change expected output for double array to match new size in
-	call-ar-st.c.
-
-2001-10-29  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/ending-run.exp: Create identical output when passing
-	`step to end of run' case.  Add regular expression branch satisfying
-	Stormy16 target.
-
-2001-10-28  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/interrupt.exp: Treat SIGILL similar to SIGSEGV such
-	that we catch the expected failure under Linux/x86.
-
-2001-10-29  Orjan Friberg  <orjanf@axis.com>
-
-	* gdb.base/setvar.exp: Escape curly braces.
-	* gdb.stabs/weird.exp: Ditto.
-
-2001-10-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.mi/mi-hack-cli.exp: Remove excess newlines from test strings.
-	* gdm.mi/mi0-hack-cli.exp: Likewise.
-
-2001-10-25  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.stabs/weird.exp: Unify ``variable VAR printed properly''
-	messages.
-
-2001-10-21  Andrew Cagney  <ac131313@redhat.com>
-
-	* lib/mi-support.exp (mi_gdb_start): Don't require MI_OUT when
-	checking MI enabled.
-
-2001-10-09  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/maint.exp: Treat $EXEEXT as optional in output.
-
-2001-10-04  Frank Ch. Eigler  <fche@redhat.com>
-
-	* lib/insight-support.exp (gdbtk_start): Don't exit dejagnu
-	if gdb child process crashes, just signal an error.
-
-2001-10-02  Jim Blandy  <jimb@redhat.com>
-
-	* lib/gdb.exp (test_xfail_format): Simplify.
-
-	* lib/gdb.exp (setup_xfail_format): Don't forget to put a `$' in
-	front of the variable name `format'.  Simplify `if'.
-
-2001-10-01  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.threads/pthreads.exp: Wait for output and delay
-	before sending ^C.
-
-2001-10-01  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.mi/mi-var-display.exp (continue to incr_a):  Recognize
-	some incorrect output instead of timing out.
-	* gdb.mi/mi-var-display.exp (continue to incr_a):  Likewise.
-
-2001-09-28  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/volatile.exp (local_compiler_xfail_check): Change qux2
-	check to allow additional `int'.
-
-2001-09-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	* gdb.base/completion.exp: Remove incorrect 'p "a' test.
-	Add tests for 'p "break' (pass) and 'p "break.' (xfail).
-
-2001-09-27  Michael Snyder  <msnyder@redhat.com>
-
-	* lib/gdb.exp (test_debug_format): New proc.
-	(setup_xfail_format): Use new proc test_debug_format.
-	* gdb.base/constvars.exp (local_compiler_xfail_check): New
-	proc; use new service proc test_debug_format.
-	Replace all other "gcc_compiled" tests with this test.
-	* gdb.base/volatile.exp (local_compiler_xfail_check): New
-	proc; use new service proc test_debug_format.
-	Replace all other "gcc_compiled" tests with this test.
-
-2001-09-27  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/cvexpr.exp: New file.
-	* gdb.base/cvexpr.c: New file
-	Test for expressions using const and volatile keywords.
-
-2001-09-26  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/constvars.exp: Check for different orders of keywords
-	and additional "int" strings in output.
-
-2001-09-22  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.base/maint.exp: Add "maintenance set/show" to list of valid
-	responses from "help maint".
-
-2001-09-19  Frank Ch. Eigler  <fche@redhat.com>
-
-	* lib/insight-support.exp (_gdbtk_xvfb_init): Set DISPLAY
-	to localhost:NNN instead of :NNN, in case Xvfb is listening
-	only on TCP.
-
-2001-09-19  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/recurse.exp: When checking leaving the watchpoint
-	scope, recognize when gdb is in function's epilogue and pass.
-
-2001-09-18  Keith Seitz  <keiths@redhat.com>
-
-	* lib/insight-support.exp (_gdbtk_export_target_info): Add
-	support for running tests against sid targets.
-	(gdbtk_done): Ditto.
-
-2001-09-18  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/ending-run.c (main): Set stdout buffersize
-	to the same reasonable value for any target.
-	* gdb.base/ending-run.exp: Add a regular expression
-	to make testsuite happy on Sanyo Stormy16 target.
-
-2001-09-17  Corinna Vinschen  <vinschen@redhat.com>
-
-	* gdb.base/display.c (do_loops): Add float variable `f'.
-	Increment f in loop.
-	* gdb.base/display.exp: Increment timeout by 60 seconds.
-	Change float display test to use variable `f'.
-
-2001-09-17  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/restore.exp: Use temporary breakpoints, to avoid
-	overflowing the limited breakpoint tables on some ROM monitors
-	(like the ROM68K).
-
-2001-09-15  Frank Ch. Eigler  <fche@redhat.com>
-
-	* lib/insight-support.exp (_gdbtk_xvfb_init): Start Xvfb with
-	the "-ac" (disable access control) flag.
-
-2001-08-30  Jeff Holcomb  <jeffh@redhat.com>
-
-	* gdb.base/remote.c: Use a small buffer for targets with 16-bit
-	ints.
-
-2001-08-30  Keith Seitz  <keiths@redhat.com>
-
-	* lib/gdb.exp: Move all insight-related functionality into
-	separate file.
-	* lib/insight-support.exp: New file.
-
-2001-08-29  Frank Ch. Eigler  <fche@redhat.com>
-
-	* config/sid.exp (sid_start): Never set sid verbosity; disable
-	expect_background {} that consumed its stdout; tolerate </dev/null.
-	Attempt to set endianness override in "sid" protocol mode.  Cleanup.
-
-2001-08-18  Andrew Cagney  <ac131313@redhat.com>
-
-	* lib/mi-support.exp (mi_gdb_start): If a remote target, use the
-	CLI jump command to start it.
-	(mi_run_to_main): Fail immediatly when unexpected output.
-
-2001-08-18  Andrew Cagney  <ac131313@redhat.com>
-
-	* lib/mi-support.exp (mi_gdb_start): Move call to sid_start to
-	beginning of function.  Fix PR gdb/191.
-
-2001-08-16  Frank Ch. Eigler  <fche@redhat.com>
-
-	* config/sid.exp (sid_start): Don't warn if we cannot figure out
-	what to force sid endianness to.
-
-2001-08-15  Keith Seitz  <keiths@redhat.com>
-
-	* lib/gdb.exp (gdbtk_start): Don't set environment
-	variables for TCL_LIBRARY and friends. Insight will
-	now figure these out for itself.
-
-2001-08-02  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/completion.exp: Remove the symbol "a64l" from
-	the expect string; this is target-specific, and not related
-	to what is being tested.
-
-2001-08-02  Dave Brolley  <brolley@redhat.com>
-
-	* config/sid.exp: Rename gdb-socket to cpu-gdb-socket.
-
-2001-07-25  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/consecutive.exp: New file.  Test stepping over
-	breakpoints on consecutive instructions.
-	* gdb.base/consecutive.c: New file.
-
-	* gdb.base/call-rt-st.exp: Use double-backslash to quote
-	curly braces in regular expressions.
-
-2001-07-25  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/ending-run.exp: Accept "Program exited normally" as
-	legitimate output from stepping out of main.
-
-2001-07-22  Keith Seitz  <keiths@redhat.com>
-
-	* lib/gdb.exp (_gdbtk_xvfb_init): If GDB_DISPLAY is
-	the empty string, do not run the tests.
-
-2001-07-17  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
-
-	* gdb.base/long_long.exp: Detect size of pointer.  Take into
-	account 2-byte pointers when testing for p/a results.
-
-2001-07-17  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
-
-	* gdb.base/remote.c (RANDOM_DATA_SIZE): New define, defaults to 48K
-	and defined to 1K for m68hc11.
-	(random_data): Reduce table to 1K for embedded platforms (68hc11).
-	* gdb.base/remote.exp (get_sizeof): New function from sizeof.exp.
-	(sizeof_random_data): New variable to tell the size of the data table;
-	don't test past this size; always run to main.
-
-2001-07-16  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
-
-	* gdb.base/return2.exp: return of long long and double fails for
-	68HC11; don't execute these tests on that platform.
-	* gdb.base/return.exp: Return of a double fails for 68hc11.
-
-2001-07-16  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
-
-	* call-ar-st.exp: Use gdb_skip_float_test to avoid executing
-	tests that print a float.
-	* call-rt-st.exp: Likewise.
-
-2001-07-12  Mark Kettenis  <kettenis@gnu.org>
-
-	* gdb.base/so-impl-ld.exp: Remove stray space that prevented
-	running this test on Linux.
-
-2001-06-24  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.base/arithmet.exp: Remove some tests to make all test names
-	unique.
-
-2001-07-03  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.c++/classes.exp: Accept both "foo(void)" and "foo()" in
-	the output of the ptype command.
-
-2001-07-02  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/completion.exp: Don't assume that break.c is the only
-	source file that may contain functions named "marker".
-	* gdb.base/corefile.exp: Quote the curly braces in regexp.
-
-2001-06-28  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.disasm/Makefile.in (clean mostlyclean): Add h8300s to list
-	of files to delete.
-
-	From 2000-06-15 Kazu Hirata <kazu@hxi.com>:
-	* gdb.disasm/h8300s.exp: New file.
-	gdb.disasm/h8300s.s: Likewise.
-
-2001-06-27  Andrew Cagney  <ac131313@redhat.com>
-
-	* lib/mi-support.exp (mi_delete_breakpoints): Accept mi1 format
-	empty breakpoint tables.
-
-2001-06-25  Andrew Cagney  <ac131313@redhat.com>
-
-	* lib/mi-support.exp: Update args=... part of stop-reason
-	patterns. Accept either a list or a tuple.
-
-2001-06-23  Andrew Cagney  <ac131313@redhat.com>
-
-	* lib/mi-support.exp: Remove local emacs variable defining
-	change-log-default-name.
-
-2001-06-22  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.base/arithmet.exp: Use gdb_test instead of send_gdb/gdb_expect.
-	This is operationally compatible with the previous version.
-
-2001-06-13  Jim Blandy  <jimb@redhat.com>
-
-	* lib/gdb.exp (gdb_test): Doc fix.
-
-2001-06-10  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.base/exprs.exp: Remove a duplicate test.
-
-2001-06-06  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/return2.exp (main): Use values to test float and double
-	returns that are not NaN's, to avoid being confused by IEEE
-	comparison rules.
-
-2001-06-04  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.threads/pthreads.exp (check_control_c): Return 0 for success,
-	non-zero if control_c fails.  Terminate the test on failure,
-	rather than wait for 12 more tests to time out.
-
-2001-06-06  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/exprs.exp ("sizeof (long long) > sizeof (long) (true)"):
-	Don't forget to match the GDB prompt.
-
-	* gdb.trace/gdb_c_test.c, actions.c: Fix misspellings.
-
-2001-06-04  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/help.exp: Update pattern to exclude `print-load-map'
-	command.
-
-2001-05-31  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/annota1.exp (info break): Match four or more spaces
-	after "Address".
-
-2001-05-31  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/cplusfuncs.cc (dm_type_char_star): Remove superfluous cast.
-	(dm_type_int_star): Likewise.
-	(dm_type_long_star): Likewise.
-	(dm_type_void_star): Likewise.
-
-2001-05-29  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/completion.exp (INPUTRC): Set this environment variable
-	to a known value in order to get consistent results regardless
-	of the setting of INPUTRC or the presence or contents of .inputrc.
-
-2001-05-24  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.threads/linux-dp.exp: Remove assumptions about thread ordering.
-	Don't require that the main thread and the manager thread are the
-	first in the list.
-
-	* gdb.threads/pthreads.exp (test_startup): Relax test for thread
-	debugging.  If test fails, issue an "unsupported" not a "fail".
-
-2001-05-24  Jim Blandy  <jimb@redhat.com>
-
-	Don't assume that short is shorter than int.
-	* gdb.base/exprs.exp ("print unsigned short == (~0)"): Don't
-	assume that shorts are smaller than ints.  On a 16-bit machine,
-	this isn't true.
-	("print unsigned char == (~0)"): Add test that verifies that ~0,
-	an int, is not equal to ~0 stored in an unsigned char.  This tests
-	the same thing that the previous test meant to, but works on
-	16-bit machines, too.
-	("print unsigned char != (~0)"): Same test, complemented.
-
-2001-05-24  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.threads/pthreads.exp (all_threads_running): Add an explicit
-	test for (full_coverage == 0).  This makes the test run faster,
-	and prevents dejagnu getting out of step.
-
-2001-05-23  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/finish.exp (finish_void): Revise pattern for
-	stopping on the call statement to not permit stopping at
-	the start of the instructions comprising the call sequence.
-
-2001-05-19  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.base/callfuncs.exp: Make all test names unique.
-	* gdb.base/commands.exp: Make all test names unique.
-	* gdb.base/condbreak.exp: Make all test names unique.
-	* gdb.base/dbx.exp: Make all test names unique.
-	* gdb.base/default.exp: Make all test names unique.
-	* gdb.base/define.exp: Make all test names unique.  Conform some FAIL
-	and TIMEOUT messages to their corresponding PASS message.
-	* gdb.base/ending-run.exp: Make all test names unique.
-	* gdb.base/long_long.exp: Remove duplicate test.
-
-2001-05-21  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/finish.exp (finish_void): Allow "finish" command to
-	stop on the call statement as well as the statement after the
-	call.
-
-2001-05-21  Michael Snyder  <msnyder@redhat.com>
-
-	* gdb.base/long_long.exp: Allow for targets with 4-byte short.
-
-2001-05-10  Elena Zannoni  <ezannoni@redhat.com>
-
-        * gdb.base/completion.exp: Revamp test. Make it execute on all
-        platforms.
-
-2001-05-10  Elena Zannoni  <ezannoni@redhat.com>
-
-        * config/gdbserver.exp (gdb_load): Handle the case
-        in which the arguments to gdbserver are given in the
-        baseboard configuration file.
-        Also handle the case in which the server needs to do a
-        load.
-
-2001-05-07  Keith Seitz <keiths@cygnus.com>
-
-        * lib/gdb.exp (gdbtk_initialize_display): New proc which will
-        set up the display for testing.
-        (gdbtk_start): Convert all paths to paths that tcl will like.
-        Export target information to environment.
-        (_gdbtk_xvfb_init): New proc to start Xvfb if available and
-        necessary.
-        (_gdbtk_xvfb_exit): New proc to kill Xvfb if necessary.
-        (to_tcl_path): New proc to convert a given pathname into
-        a path acceptible as an argument to a tcl command.
-        (_gdbtk_export_target_info): New proc to export target info
-        into the environment for gdbtk testing.
-        (gdbtk_done): New proc to signal end-of-test.
-
-2001-05-06  Jim Blandy  <jimb@redhat.com>
-
-	* restore.c: Make the code of caller0 correspond to its comment.
-
-2001-05-03  Michael Snyder  <msnyder@redhat.com>
-
-	* config/sid.exp (gdb_target_sid): Check for error messages.
-	On error or timeout, don't make expect exit (which will terminate
-	all subsequent tests); instead just make gdb exit.
-	(gdb_load): Check for error messages.  On error or timeout,
-	return a negative value.
-
-2001-04-24  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/templates.exp: If we see the prompt for the overload
-	list, but we haven't recognized any of the longer patterns,
-	arrange for this test to fail, not hang.
-
-	* gdb.c++/classes.exp (ptype class A): Tolerate whitespace
-	variations.
-
-2001-04-22  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/local.exp: Use the 'runto' library function.
-	* gdb.c++/namespace.exp: Likewise.
-	* gdb.c++/overload.exp: Likewise.
-
-2001-03-26  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/Makefile.in (EXECUTABLES): Add step-line.
-	* gdb.base/step-line.exp: New file.  Test step/next in presence of
-	#line directives.
-	* gdb.base/step-line.c: New file.  Test program for the above.
-	* gdb.base/step-line.inp: New file.  We pretend that this file has
-	been transformed by some other tool into step-line.c.
-
-2001-03-21  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/userdef.exp: Check that GDB tolerates whitespace in
-	unmangled operator names.
-
-2001-03-20  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.threads/linux-dp.exp: Recognize an additional message
-	generated by GDB when it doesn't understand how to debug threads
-	on the target system.
-
-2001-03-19  Andrew Cagney  <ac131313@redhat.com>
-
-	* gdb.mi/mi-console.exp: Document ``Hello'' as a known bug.
-
-2001-03-12  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/derivation.exp: Use the 'runto' library function.
-
-2001-03-12  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/annota2.exp: Fix regular expression for "post-query".
-
-2001-02-24  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/ref-types.exp: Change handwritten code to library
-	function 'runto'.
-
-2001-03-16  Orjan Friberg  <orjanf@axis.com>
-
-	* gdb.base/signals.exp: Set count to 0 explicitly.
-
-2001-03-15  Mark Salter  <msalter@redhat.com>
-
-	* config/monitor.exp (gdb_target_cmd): Add explicit error return.
-	(gdb_target_monitor): Add check of gdb_target_cmd return value.
-	(gdb_load): Add support for additional target_info: gdb_download_size
-	and gdb_load_timeout.
-
-Thu Mar  8 16:06:00 2001  David Taylor  <taylor@redhat.com>
-
-	* gdb.base/annota1.exp: Move test of isnative to earlier in the
- 	file -- to prevent failing when the compile fails but we have no
- 	intention of running the tests anyway.
-
-	* gdb.base/long_long.exp: Test target_info for no_long_long, skip
-	tests if set.
-
-	* gdb.base/maint.exp: Support 2 byte integers as well as 4 byte
- 	integers.
-
-	* gdb.c++/ctti.exp: Skip tests if skip_cplus_tests returns true.
-	* gdb.c++/namespace.exp: Ditto.
-
-2001-03-07  Orjan Friberg  <orjanf@axis.com>
-
-	* gdb.base/pointers.c: Don't assume doubles are >= 8 bytes.
-	* gdb.base/pointers.exp: Relax pattern match of decimals.
-
-2001-03-06  Kevin Buettner  <kevinb@redhat.com>
-
-	* Makefile.in, config/abug.exp, config/cfdbug.exp,
-	config/cpu32bug.exp, config/dve.exp, config/est.exp,
-	config/gdbserver.exp, config/hmsirom.exp, config/hppro.exp,
-	config/i960.exp, config/m32r.exp, config/mn10300-eval.exp,
-	config/monitor.exp, config/proelf.exp, config/rom68k.exp,
-	config/sh.exp, config/sid.exp, config/slite.exp,
-	config/sparclet.exp, config/udi.exp, config/unknown.exp,
-	config/vr4300.exp, config/vr5000.exp, config/vx.exp,
-	config/vxworks.exp, config/vxworks29k.exp,
-	gdb.asm/asm-source.exp, gdb.base/a2-run.exp,
-	gdb.base/all-bin.exp, gdb.base/annota1.exp,
-	gdb.base/arithmet.exp, gdb.base/assign.exp,
-	gdb.base/async.exp, gdb.base/attach.exp,
-	gdb.base/bitfields.exp, gdb.base/bitops.exp,
-	gdb.base/break.exp, gdb.base/call-ar-st.exp,
-	gdb.base/call-rt-st.exp, gdb.base/call-strs.exp,
-	gdb.base/callfuncs.exp, gdb.base/callfwmall.exp,
-	gdb.base/commands.exp, gdb.base/completion.exp,
-	gdb.base/cond-expr.exp, gdb.base/condbreak.exp,
-	gdb.base/constvars.exp, gdb.base/corefile.exp,
-	gdb.base/dbx.exp, gdb.base/default.exp, gdb.base/define.exp,
-	gdb.base/display.exp, gdb.base/ena-dis-br.exp,
-	gdb.base/ending-run.exp, gdb.base/environ.exp,
-	gdb.base/eval-skip.exp, gdb.base/exprs.exp,
-	gdb.base/finish.exp, gdb.base/foll-exec.exp,
-	gdb.base/foll-fork.exp, gdb.base/foll-vfork.exp,
-	gdb.base/funcargs.exp, gdb.base/help.exp,
-	gdb.base/interrupt.exp, gdb.base/jump.exp, gdb.base/list.exp,
-	gdb.base/logical.exp, gdb.base/long_long.exp,
-	gdb.base/maint.exp, gdb.base/mips_pro.exp,
-	gdb.base/miscexprs.exp, gdb.base/nodebug.exp,
-	gdb.base/opaque.exp, gdb.base/overlays.exp, gdb.base/page.exp,
-	gdb.base/pointers.exp, gdb.base/printcmds.exp,
-	gdb.base/ptype.exp, gdb.base/radix.exp, gdb.base/recurse.exp,
-	gdb.base/regs.exp, gdb.base/relational.exp,
-	gdb.base/remote.exp, gdb.base/reread.exp,
-	gdb.base/restore.exp, gdb.base/return2.exp,
-	gdb.base/scope.exp, gdb.base/sect-cmd.exp,
-	gdb.base/selftest.exp, gdb.base/setshow.exp,
-	gdb.base/setvar.exp, gdb.base/shlib-call.exp,
-	gdb.base/sigall.exp, gdb.base/signals.exp,
-	gdb.base/sizeof.exp, gdb.base/so-impl-ld.exp,
-	gdb.base/so-indr-cl.exp, gdb.base/solib.exp,
-	gdb.base/step-test.exp, gdb.base/structs.c,
-	gdb.base/structs.exp, gdb.base/structs2.exp,
-	gdb.base/term.exp, gdb.base/twice.exp, gdb.base/varargs.exp,
-	gdb.base/volatile.exp, gdb.base/watchpoint.exp,
-	gdb.base/whatis-exp.exp, gdb.base/whatis.exp,
-	gdb.c++/ambiguous.exp, gdb.c++/annota2.exp,
-	gdb.c++/anon-union.exp, gdb.c++/classes.exp, gdb.c++/ctti.exp,
-	gdb.c++/derivation.exp, gdb.c++/inherit.exp,
-	gdb.c++/local.exp, gdb.c++/member-ptr.exp, gdb.c++/method.exp,
-	gdb.c++/misc.exp, gdb.c++/namespace.exp, gdb.c++/overload.exp,
-	gdb.c++/ref-types.exp, gdb.c++/templates.exp,
-	gdb.c++/userdef.exp, gdb.c++/virtfunc.exp,
-	gdb.disasm/am33.exp, gdb.disasm/hppa.exp,
-	gdb.disasm/mn10200.exp, gdb.disasm/mn10300.exp,
-	gdb.fortran/types.exp, gdb.java/jmisc.exp,
-	gdb.java/jv-exp.exp, gdb.java/jv-print.exp,
-	gdb.stabs/weird.exp, gdb.threads/linux-dp.exp,
-	gdb.trace/actions.exp, gdb.trace/backtrace.exp,
-	gdb.trace/circ.exp, gdb.trace/collection.exp,
-	gdb.trace/deltrace.exp, gdb.trace/infotrace.exp,
-	gdb.trace/limits.exp, gdb.trace/packetlen.exp,
-	gdb.trace/passc-dyn.exp, gdb.trace/passcount.exp,
-	gdb.trace/report.exp, gdb.trace/save-trace.exp,
-	gdb.trace/tfind.exp, gdb.trace/tracecmd.exp,
-	gdb.trace/while-dyn.exp, gdb.trace/while-stepping.exp,
-	lib/gdb.exp, lib/mi-support.exp: Update/correct copyright
-	notices.
-
-2001-02-27  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/varargs.c (find_max_double): Fix printf format string:
-	first arg is int not float.
-
-2001-02-22  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/reread.exp: Unsupported for non-native targets;
-	doesn't work for remote debugging.
-
-2001-02-19  Fernando Nasser  <fnasser@redhat.com>
-
-	From  Drew Moseley  <dmoseley@redhat.com>
-        * gdb.base/ending-run.exp: Properly handle the BSP state when
-        stepping past the end of main.
-
-2001-02-19  John Moore  <jmoore@redhat.com>
-
-	* gdb.base/commands.exp (infrun_breakpoint_command_test):
-	Converted HPUX fix for non-expected items following multiple
-	step commands into general solution for all platforms.
-
-2001-02-18  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/classes.exp (do_tests): Change runto statements
-	from "runto 'foo(void)'" to "runto 'foo'".  This makes the
-	statements demangler agnostic.
-	* gdb.c++/virtfunc.exp (do_tests): Likewise.
-	(gdb_virtfunc_restart): Likewise.
-
-2001-02-14  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/inherit.exp (do_tests): Change runto statements
-	from "runto 'foo(void)'" to "runto 'foo'".  This makes the
-	statements demangler agnostic.
-
-Sun Feb  4 17:32:21 2001  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb.threads/pthreads.exp: Unify pass/fail messages for
- 	``continue to bkpt at common_routine in thread 2'' and ``stopped
- 	before calling common_routine 15 times'' tests.
-
-2001-02-11  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/cplusfuncs.cc (dm_type_char_star): New function.
-	Helps the test script figure out which demangler is in use.
-	(dm_type_foo_ref): Ditto.
-	(dm_type_int_star): Ditto.
-	(dm_type_long_star): Ditto.
-	(dm_type_unsigned_int): Ditto.
-	(dm_type_void): Ditto.
-	(dm_type_void_star): Ditto.
-	* gdb.base/cplusfuncs.exp (probe_demangler): New function.
-	Probe the gdb demangler and set variables to accommodate
-	formatting differences.
-	(info_func_regexp): New function.  Same as info_func, but
-	matches against a regexp.
-	(info_func): Match against a literal string.
-	(print_addr_2): New function.  Match against a literal string,
-	which can be different from the input to gdb.
-	(print_addr): Simply call print_addr_2 with the same argument twice.
-	(test_lookup_operator_functions): Use demangler formatting variables.
-	Blow away the xfails and workarounds for gnats gdb bug gdb/18.  Sort
-	the tests in the same order as the C++ class declaration.
-	(test_paddr_operator_functions): Ditto.
-	(test_paddr_overloaded_functions): Ditto.
-	(test_paddr_hairy_functions): Use demangler formatting variables.
-	Add reference to gdb/19 for related tests.
-	(do_tests): Call probe_demangler.
-
-2001-01-30  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.c++/templates.cc (printf): Remove unused function definition.
-
-2001-01-26  Felix Lee  <flee@redhat.com>
-
-	* sid.exp (sid_exit): Pass host, not target, to remote_close.
-
-2001-01-25  matthew green  <mrg@redhat.com>
-
-	* config/sid.exp (sid_start): Call `remote_push_conn' after firing
-	up sid.
-	(sid_exit): Call `remote_pop_conn' after GDB is gone.
-
-2001-01-25  matthew green  <mrg@redhat.com>
-
-	* config/sid.exp (sid_start): Use `remote_spawn' instead of `spawn.'
-	Deprecate $sid_spawn_id.
-	(sid_exit): Remove code necessary only for `spawn.'
-
-2001-01-25  matthew green  <mrg@redhat.com>
-
-	* config/sid.exp (sid_start): Handle sim,protocol of `sid.'
-
-2001-01-28  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.c++/ovldbreak.exp (take_gdb_out_of_choice_menu): New proc
-	to call when tests fail.  It takes gdb out of the overloaded
-	function choice menu back to the main prompt, so that the test
-	program stays synchronized.
-	(set_bp_overloaded): New proc to collect all the common
-	code for setting a breakpoint on an overloaded name.  Calls
-	take_gdb_out_of_choice_menu when needed.
-	(menu_overload1arg): New variable to collect the repeated
-	instances of the expected menu for an overloaded name.  Change
-	the regular expression to handle changes in g++ type encoding:
-	"void" can be either "void" or "", and "unsigned int" can be
-	either "unsigned int" or "unsigned".
-	(continue_to_bp_overloaded): Change regular expressions to handle
-	changes in g++ type encoding.
-	(no proc): Call take_gdb_out_of_choice_menu when needed.
-	Remove redundant calls to "info break".  Accept either "canceled"
-	or "cancelled".  Change regular expressions in "info break"
-	calls to handle changes in g++ type encoding.  Give all tests
-	unique strings.
-
-2001-01-17  Ben Elliston  <bje@redhat.com>
-
-	* config/sid.exp: New file.
-
-Fri Jan 12 18:29:01 2001  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/callfuncs.exp: Add space after ``Value returned is''.
-
-2000-12-21  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/finish.exp: Accept '1' instead of \001 from char_func.
-	Add a RE to accept a non-ascii char if one is ever presented.
-
-2000-12-20  Fernando Nasser  <fnasser@redhat.com>
-
-	* lib/mi-support.exp (mi_gdb_start): Test for MI_OUT, not UI_OUT.
-
-2000-12-18  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/setvar.exp: Use double '\\' to quote curly braces
-	in regexp.  One '\' does not suffice on Linux.
-
-2000-12-09  Michael Chastain  <chastain@redhat.com>
-
-	* gdb.base/break.exp (test_clear_command): Use a marker function
-	rather than 'main' for the test function.  Also move this
-	test to an execution point where the marker function names are
-	guaranteed to be bound to functions.  (Executing tests after a
-	'finish' from main runs into name conflicts with local names
-	in __libc_start_main).
-
-2000-12-07  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/finish.exp: New test for gdb's "finish" command.
-	* gdb.base/return2.exp: New test for gdb's "return" command.
-	* gdb.base/return2.c: New source file for above.
-
-2000-12-05  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/constvars.exp: Add a "pass" message if "up" succeeds.
-	* gdb.base/miscexprs.exp: Ditto.
-	* gdb.base/pointers.exp:  Ditto.
-	* gdb.c++/derivation.exp: Ditto.
-	* gdb.c++/local.exp:      Ditto.
-	* gdb.c++/namespace.exp:  Ditto.
-	* gdb.c++/overload.exp:   Ditto.
-	* gdb.c++/ref-types.exp:  Ditto.
-
-2000-12-05  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/constvars.exp: Test result of "up" command.
-	* gdb.base/miscexprs.exp: Ditto.
-	* gdb.base/pointers.exp:  Ditto.
-	* gdb.base/scope.exp:     Ditto.
-	* gdb.c++/derivation.exp: Ditto.
-	* gdb.c++/local.exp:      Ditto.
-	* gdb.c++/namespace.exp:  Ditto.
-	* gdb.c++/overload.exp:   Ditto.
-	* gdb.c++/ref-types.exp:  Ditto.
-
-2000-11-22  Michael Chastain  <chastain@redhat.com>
-
-	* mips_pro.exp: Accept either "middle -> top -> main" or
-	"middle -> main" in the backtrace, because gcc can optimize
-	tail calls to jumps.  Remove setup_xfail for the hppa case.
-	Add a comment with the original warning messages from PR 3016,
-	which was filed in 1993, to preserve them for posterity.
-
-2000-11-17  Nick Duffek  <nsd@redhat.com>
-
-	* lib/gdb.exp (gdb_test): Override timeout with board info.
-
-2000-11-17  Nick Duffek  <nsd@redhat.com>
-
-	* gdb.base/display.exp: Don't kill running stub.  Add "again" to
-	the second kill and detach messages.
-
-2000-11-17  Nick Duffek  <nsd@redhat.com>
-
-	* configure.in: Add AC_EXEEXT.
-	* configure: Regenerate.
-	* Makefile.in (just-check): Export EXEEXT.
-	* lib/gdb.exp ($EXEEXT): Import from environment.
-	* gdb.base/maint.exp: Expect $EXEEXT in executable name.  Don't
-	expect "maint dump-me" on Cygwin.
-	* gdb.base/reread.exp ($binfile, $binfile1, $binfile2): Append
-	$EXEEXT.
-
-2000-11-17  Nick Duffek  <nsd@redhat.com>
-
-	* gdb.base/break.exp: Test backtrace and finish from called
-	function on all platforms, not just HP-UX.
-
-2000-11-03  Michael Snyder  <msnyder@cygnus.com>
-
-	* config/monitor.exp (gdb_target_cmd): Abstracts some of the
-	code from gdb_target_monitor, so it can be used independantly
-	for gdbserver.  Also comment out an unnecessary PUTS.
-
-2000-11-03  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/a2-run.exp: Use gdb_skip_stdio_test.
-	* gdb.base/corefile.exp: Expect the message "Program is being
-	debugged already" when we send the "corefile" command, since
-	the preceeding gdb_load may have connected gdb to a remote target.
-	* gdb.base/display.exp: Disable hardware watchpoints if new
-	board info variable "no_hardware_watchpoints" is true.
-	Replace single-letter commands with more readable ones.
-	* gdb.base/recurse.exp (recurse_tests): Disable hardware watchpoints
-	if new board info variable "no_hardware_watchpoints" is true.
-	* gdb.base/restore.exp (restore_tests): Call gdb_skip_stdio_tests
-	to see if stdio (printf) testing is possible.
-	* gdb.base/watchpoint.exp: Disable hardware watchpoints if new
-	board info variable "no_hardware_watchpoints" is true.  Use new
-	proc "gdb_skip_stdio_tests" to see if printf tests are possible.
-
-2000-11-13  Fernando Nasser  <fnasser@redhat.com>
-
-	From Orjan Friberg  <orjanf@axis.com>:
-	* gdb.base/printcmds.exp: Escape curly braces followed by a number
-	in array print pattern match.
-
-2000-11-09  Fernando Nasser  <fnasser@redhat.com>
-
-	* gdb.c++/templates.exp (test_template_breakpoints): Change Britsh
-	spelling "cancelled" to U.S. spelling "canceled" to match changes
-	made to gdb.
-	* gdb.c++/ovldbreak.exp: Ditto.
-
-2000-11-06  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
-
-	* gdb.base/callfuncs.c (main):  Moved to end of file, call
-	t_double_values to initialize the FPU before inferior calls are made.
-	* gdb.base/callfuncs.exp:  Test for register preservation after calling
-	inferior functions.  Add tests for continuining, finishing and
-	returning from a stop in a call dummy.
-
-2000-10-24  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/commands.exp: Break up long lines, and re-indent.
-
-2000-10-19  Michael Snyder  <msnyder@cygnus.com>
-
-	* config/gdbserver.exp:  Rewritten from the ground up, to make it
-	compatible with the current dejagnu tree, and to make it work with
-	the new "gdbserver" in libremote.
-
-2000-10-16  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/sizeof.exp (check_sizeof): Skip if no printf support.
-	* gdb.base/varargs.exp: Skip entire test if no printf support.
-	* gdb.base/ending-run.exp (Step to return): Skip if no printf supt.
-	* gdb.base/shlib-call.exp: Skip several tests if no printf support.
-
-2000-10-13  Michael Snyder  <msnyder@cygnus.com>
-
-	* lib/gdb.exp (gdb_skip_float_test): New proc.  Skip test if
-	no floating point support.
-	(gdb_skip_stdio_test): New proc.  Skip test if no stdio support.
-	* gdb.base/call-ar-st.exp: Use above procs to skip tests.
-	* gdb.base/call-rt-st.exp: Ditto.
-	* gdb.base/call-strs.exp: Ditto.
-
-2000-08-02  Jimmy Guo  <guo@hpcleara.cup.hp.com>
-
-	* gdb.base/sizeof.c: include <stdio.h>.
-
-	* gdb.c++/classes.exp: Use gdb_test instead of send_gdb to
-        'finish', otherwise uncaptured gdb_prompt would potentially
-        throw remaining test points out of sync.
-
-2000-07-26  Scott Bambrough <scottb@netwinder.org>
-
-	* gdb.base/recurse.exp: Run tests for all targets.
-	* gdb.base/so-impl-ld.exp: Added wildcard to handle the
-	gnu-oldld case on ARM.
-	* gdb.base/watchpoint.exp (test_stepping): Clear xfail
-	for ARM targets.
-
-Mon Jul 24 07:46:02 CDT 2000  Clinton Popetz  <cpopetz@cygnus.com>
-
-	* gdb.java/configure.in (AC_INIT): Use jmisc.exp.
-	* gdb.java/configure: Rebuild.
-
-Sun Jul 23 21:42:34 2000  Anthony Green  <green@redhat.com>
-
-	* gdb.java/jv-exp.exp: New file.
-
-Sun Jul 23 21:02:42 2000  Anthony Green  <green@redhat.com>
-
-	* configure: Rebuilt.
-	* configure.in (configdirs): Add gdb.java.
-	* gdb.java/jmisc.java: New file.
-	* gdb.java/jmisc.exp: New file.
-	* gdb.java/Makefile.in: New file.
-	* gdb.java/configure: Rebuilt.
-	* gdb.java/configure.in: New file.
-	* lib/java.exp: New file.
-
-Wed Jul 12 18:14:29 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/exprs.exp: Test casts to a pointer including over and
- 	underflow.
-
-Thu Jul 13 11:52:53 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/sizeof.exp, gdb.base/sizeof.c: New files.  Compare GDB
- 	and the compilers sizes.
-
-2000-07-09  Nick Duffek  <nsd@redhat.com>
-
-	* gdb.c++/misc.cc (class ClassParam, class_param): Define.
-	(use_methods): New function.
-	(main): Call use_methods().
-	* gdb.c++/classes.exp (test_method_param_class): New procedure.
-	(do_tests): Call test_method_param_class.
-
-2000-07-09  Nick Duffek  <nsd@redhat.com>
-
-	* gdb.c++/classes.exp (test_nonexistant_members): Fix name
-	spelling.
-	(test_enums): New procedure.  Move enum tests from end of script
-	to here.  Set breakpoint on function name instead of line number.
-	* gdb.c++/misc.cc (ClassWithEnum): Move past Foo definitions.
-	(enums2): New marker function.
-	(enums1): New function.
-	(main): Call enums1().  Move enum tests to enums1().
-
-Tue Jul  4 03:43:49 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.asm/asm-source.exp: Use raw AS/LD instead of CC to
- 	compile/link program.  Update line numbers.
-	* gdb.asm/d10v.inc: Define ``startup''.
-	* gdb.asm/asmsrc1.s: Add definition of _start.
-
-Fri Jun 23 17:45:52 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/call-ar-st.exp: More rewrites of multi-line patterns.
-
-2000-06-18  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/maint.exp: Add 'maint print architecture' item to output
- 	of 'help maint print' command.
-
-Fri Jun 16 18:22:05 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/call-ar-st.exp: Rewrite all multi-line patterns so that
- 	they use gdb_expect_list.
-
-Wed Jun  7 13:02:40 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/commands.exp: Use ``set remote
- 	memory-read-packet-size'' instead of ``set endian big'' to test
- 	long commands.
-
-2000-06-03  Daniel Berlin  <dan@cgsoftware.com>
-
-	* gdb.c++/templates.exp (do_tests): Make all of these work under
-	g++, and stop skipping them.
-
-	* gdb.c++/namespace.exp: Move from gdb.hp/gdb.aCC to here, make it
-	work under g++.
-
-	* gdb.c++/misc.cc: Fix ambiguous initialization with correct
-	initialization.
-
-2000-06-02  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/annota1.exp (run until main breakpoint): Loosen up
-	the regular expression: accept an (almost) arbitrary sequence of
-	"frames-invalid" and "breakpoints-invalid" messages both before
-	and after the "starting" message.
-
-2000-06-02  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.c++/local.exp: This test has never been known to work with g++.
-
-2000-05-18  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/annota1.exp (annotate-signal-handler-caller):
-	Relax the regular expression a little, make it pass on Solaris 8.
-
-2000-05-12  Kevin Buettner  <kevinb@redhat.com>
-
-	* gdb.base/step-test.exp: On IA-64 targets, when stepping out of
-	a call, do not require that gdb stop on the line after the call.
-	Instead, it is permissible for gdb to stop on the line of the
-	call itself.
-
-2000-05-12  Michael Snyder  <msnyder@.cygnus.com>
-
-	* gdb.base/break.exp (bp on small function, optimized file):
-	Add a second pass pattern.  The behavior differs here between stabs
-	and dwarf for one-line functions.  Stabs preserves two line symbols
-	(one before the prologue and one after) with the same line number,
-	but dwarf regards these as duplicates and discards one of them.
-	Therefore the address after the prologue (where the breakpoint is)
-	has no exactly matching line symbol, and GDB reports the breakpoint
-	as if it were in the middle of a line rather than at the beginning.
-
-2000-05-08  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/interrupt.exp: Make "pass" message say "send"
-	rather than "send_gdb" (for consistancy).
-
-Mon May  1 15:37:58 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	From 2000-04-28 Andreas Jaeger  <aj@suse.de>:
-	* gdb.c++/templates.cc: Properly check for GCC version number.
-	* lib/compiler.cc: Likewise
-
-2000-04-28  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/break.exp: When compiled with -O2 optimization,
-	gdb may not stop at the first line of main, due to code motion.
-
-2000-04-26  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/call-ar-st.exp: Bail out if target is sparclet.
-	This test depends on parsing the printf output from the target.
-	Since the sparclet stub doesn't do stdio, this will never work.
-	* gdb.base/call-rt-st.exp: ditto.
-	* gdb.base/call-strs: ditto.
-
-2000-04-24  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/miscexprs.exp: make sizeof long array test portable.
-
-	* gdb.base/ending-run.exp: After connecting to a remote target,
-	but before running, the target will appear to be in a random
-	location.  Specify both a file and a line for breakpoints.
-	Also, the function that calls main may be called 'init'
-	rather than 'start'.
-
-2000-04-17  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/help.exp: Update output for add-symbol-file command.
-
-2000-04-10  Fernando Nasser  <fnasser@cygnus.com>
-
-	From Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
-	* gdb.base/structs2.c: Support platforms defaulting to a unsigned char.
-
-2000-04-07  J.T. Conklin  <jtc@redback.com>
-
-	* gdb.base/call-ar-st.exp: Relax patterns matching tab characters.
-
-	* gdb.base/funcargs.exp: Relax patterns matching pointers to char.
-
-Thu Mar 30 13:26:19 2000  Philippe De Muyter  <phdm@macqel.be>
-
-	* gdb.base/call-ar-st.c (init_small_structs, main): Use floating-point
- 	values that can be represented exactly.
-	* gdb.base/call-ar-st.exp (print print_small_structs): Fixed to match
-	above change, and to not check against the directory part of the source
-	file name.
-	(step into print_long_arg_list): Likewise.
-	(print print_small_structs from print_long_arg_list): Likewise.
-	(print print_long_arg_list): Likewise.
-
-2000-03-27  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/printcmds.c: Terminate char array ctable2 with 0.
-
-Mon Mar 27 14:46:37 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* ChangeLog, gdb.base/commands.exp: Revert whitespace changes.
-
-2000-03-25  Daniel Berlin  <dan@cgsoftware.com>
-
-	* gdb.base/commands.exp (deprecated_command_test): Add test for
-	deprecate with no arguments.
-
-2000-03-24  Jonathan Larmour  <jlarmour@redhat.co.uk>
-
-	* gdb.base/break.exp: Add new test for setting breakpoints on
-	optimized code so we can test breakpoints work even when function
-	prologues may be optimized away
-
-2000-03-23  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	From David Whedon <dwhedon@gordian.com>
-        * gdb.base/commands.exp : Added command deprecator tests.
-
-2000-03-22  Daniel Berlin   <dan@cgsoftware.com>
-
-       * gdb.base/help.exp: Added test for new apropos command.
-
-2000-03-21  Kevin Buettner <kevinb@redhat.com>
-
-	* gdb.base/pointers.c (usevar): New function.
-	(main): Make sure that global variables v_int_pointer2, rptr,
-	and y are all referenced someplace in the program by calling
-	usevar() on them.  [Some linkers delete symbols which are
-	never referenced.  The space remains, but there's no way to
-	get a (symbolic) handle on the variable from the debugger.]
-
-2000-03-14  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/printcmds.c: Add typedeffed arrays.
-
-	* gdb.base/printcmds.exp (test_print_typedef_arrays): New
- 	procedure to test arrays that are typedef'd.
-
-2000-03-13  James Ingham  <jingham@leda.cygnus.com>
-
-	* lib/gdb.exp: Fix the gdbtk_start routine to correctly find all
-	the library directories.
-
-Mon Feb 21 13:05:36 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* configure.in (configdirs): Add sub directory gdb.mi.
-	* configure: Re-generate.
-
-	* gdb.mi: New directory.
-
-2000-02-25  Scott Bambrough <scottb@netwinder.org>
-
-	* gdb.base/long_long.exp: Correct test suite failure when printing
- 	a long long value as a double on ARM platforms.
-
-2000-02-16  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.base/break.exp ("breakpoint line number"): Make sure the
-	default source file is set properly before running this test.
-
-2000-02-14  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* lib/gdb.exp: Tell the testsuite that now gdbtk is in the
- 	gdbtk/library directory, not in gdbtcl2.
-
-2000-02-04  Jim Blandy  <jimb@redhat.com>
-
-	* gdb.c++/templates.exp: ("ptype T5<int>"): Remove extraneous
-	backslash from regexp pattern.
-
-	* gdb.c++/ovldbreak.exp (continue_to_bp_overloaded): New
-	procedure.  Use it to run all the "continue to bp overloaded"
-	tests.  Note that this changes the names of the tests slightly.
-	If the breakpoint hit message includes a hex PC value, because
-	GCC's Dwarf 2 line info doesn't help us distinguish the prologue
-	from the real source code, still consider that a pass.
-
-	* gdb.base/condbreak.exp ("run until breakpoint at marker2"):
-	XFAIL here if the breakpoint message contains a hex address.  Note
-	similar change on 1999-11-02.
-
-	* gdb.base/step-test.exp: Comment Fernando's change of 2000-02-02.
-
-	* gdb.base/ptype.exp: Establish a default source file before
-	calling get_debug_format.
-
-2000-02-03  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/watchpoint.exp: Remove duplication of test messages.
-
-2000-02-02  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/step-test.exp: Fix the steps to enter a callee by means
-	of successive stepi commands -- while in the prologue we should see
-	the function entry bracket.
-
-2000-02-02  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/ending-run.exp: Add ARM in thumb mode case, where we
-	reach __change_mode() when stepping through the end of main().
-
-2000-01-17  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/default.exp: Fix expected pattern.
-	* gdb.base/help.exp: Same.
-
-2000-01-10  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/so-indr-cl.exp: Don't execute the test if not on HPUX.
-  	Don't use xfail's because that affects only the following test.
-
-	* gdb.base/so-impl-ld.exp: Don't execute the tests if not on hpux,
- 	solaris or linux.
-
-	* gdb.base/selftest.exp: Update to reflect changes to main.c.
-
-2000-01-07  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/display.exp: Some yacc parsers like to say
-	"A syntax error" rather than "A parse error".  Accept both.
-
-2000-01-06  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/default.exp: Remove OS dependent string from "target
-	remote" test.
-	* gdb.base/help.exp: Same for "help target remote" test.
-
-2000-01-04  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	From Jim Kingdon <kingdon@redhat.com>:
-
-	* gdb.c++/annota2.exp: Fix "delete bps" test to wait for the
- 	prompt (cleanup rather than necessity, but still might keep output
- 	from spilling to next test).
-
-2000-01-02  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/ptype.c (FALSE, TRUE): #undef these to avoid clash on
-	AIX, which defines them in <sys/types.h>.
-
-1999-12-16  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/default.exp: Match arm* etc instead of arm in "info
- 	float" test.
-
-1999-12-13 Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/watchpoint.exp: Add missing "(timeout)" to test message.
-
-	* gdb.base/break.exp: Add missing anchor to reg exp on "finish from
-	outermost frame disallowed".
-
-1999-12-09  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/setvar.exp: New tests for setting the value of a struct
-	with a constant list.
-
-1999-12-08  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/setvar.exp: Remove pair os tests that expected gdb to
-	require the user to type a cast before setting the value of a struct.
-
-1999-12-06  Jim Blandy  <jimb@cygnus.com>
-
-	* gdb.base/default.exp: Expect the new 'info float' command on
-	all i386 platforms.
-
-	* gdb.threads/linux-dp.exp: Expand our ability to recognize
-	LinuxThreads libraries that don't support debugging.
-
-Sat Dec  4 15:21:18 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/remote.c: Fill the buffer with truely random data.
-  	Change the buffer type to ``unsigned char'' to simplify size
- 	arithmetic.
-
-	* gdb.base/remote.exp: Reduce download numbers by one.  Typical
- 	stub only handles 400-1 byte packets.  Verify that the download
- 	worked.
-
-1999-11-30  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* lib/gdb.exp (gdb_expect_list): FAIL only once on multiple pattern
-	tests, using UNRESOLVED for the untested cases.  Also, does not wait
-	for a timeout if the prompt was received before a recognizable pattern.
-
-1999-11-29  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* lib/gdb.exp (gdb_expect_list): Fix spelling.
-
-1999-11-29  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/watchpoint.exp: Add tests cases for the hit count of
- 	watchpoints.
-
-1999-11-24  Jason Merrill  <jason@casey.cygnus.com>
-
-	* gdb.base/condbreak.exp: Add missing '$gdb_prompt $'.
-
-	* gdb.c++/local.exp: Be more flexible in recognizing local class
-	name mangling.  Don't allow horribly truncated method names.
-	* gdb.c++/derivation.exp: Expect protected inheritance.
-	* gdb.c++/inherit.exp: Be more flexible in recognizing vbase pointers.
-	* gdb.c++/virtfunc.exp: Likewise.
-	* gdb.c++/classes.exp: Likewise.  Don't require the enclosing scope
-	when printing a nested enum.
-
-1999-11-22  Jim Blandy  <jimb@cygnus.com>
-
-	* gdb.base/step-test.exp: Properly await GDB's response to setting
-	a breakpoint on the call to large_struct_by_value.
-
-	* gdb.base/ending-run.exp ("step to end of run 1"): Don't fail
-	just because we have debug info for the `start' function.
-
-1999-11-19  Jim Blandy  <jimb@zenia.red-bean.com>
-
-	* gdb.threads/linux-dp.exp ("create philosopher"): Recognize the
-	"Unknown signal" messages, which indicate (on LinuxThreads) that
-	GDB doesn't know how to debug threads on this system.  This is
-	better than hanging while philosopher 0 dumps chatter into gdb.log.
-
-1999-11-18  Tom Tromey  <tromey@cygnus.com>
-
-	* gdb.trace/deltrace.exp: Updated test to reflect new error text.
-
-1999-11-18  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/coremaker2.c: Add sample program for generating
-	cores that is more self contained than coremaker.c.  Eventually
-	I'll add more code to this and tie it into the testsuite.
-
-1999-11-12  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/dollar.exp: Remove, now in gdb.hp.
-
-1999-11-10  Jimmy Guo  <guo@cup.hp.com>
-
-	* gdb.exp (get_compiler_info): pick up compiler.c and compiler.cc
- 	from $srcdir/lib/.
-	* lib/compiler.c, lib/compiler.cc: New files, moved from gdb.base/
- 	and gdb.c++/.
-
-	* gdb.c++/derivation.exp: remove redundant get compiler info code.
-
-	* gdb.base/commands.exp: add '$gdb_prompt $' anchor to
-	'continue with watch' test point.
-
-1999-11-08  Jim Blandy  <jimb@zenia.red-bean.com>
-
-	Merged from p2linux-990323-branch:
-
-	* lib/gdb.exp (gdb_continue_to_breakpoint): New function.
-
-Mon Nov  8 23:07:09 1999  Andrew Cagney  <cagney@amy.cygnus.com>
-
-	* gdb.base/remote.exp: Test ``set remote memory-write-packet-sized
- 	{limit,fixed}''.  Test ``set download-write-size''.
-
-Sun Nov  7 17:37:01 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/funcargs.exp: Rewrite stack traceback checks using
- 	gdb_expect_list.
-
-Fri Nov  5 18:40:52 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* lib/gdb.exp (gdb_expect_list): Return a success/fail indication.
-
-1999-11-03  Mark Salter  <msalter@cygnus.com>
-
-	* gdb.base/break.exp: Fix "stub continue" pattern.
-
-1999-11-03  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.base/shlib-call.exp ("next to shr1"): Fix test name.
-
-1999-11-02  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.base/display.exp ("finish"): Add timeout clause.
-
-	* gdb.base/condbreak.exp ("run until breakpoint at marker1"): Add
-	plain prompt clause, so this doesn't have to time out in order to
-	fail.
-
-	* gdb.base/condbreak.exp, gdb.base/ena-dis-br.exp: XFAIL if the
- 	breakpoint hit messages include an address.
-
-	* gdb.base/display.exp: Don't forget to escape parens in regular
-	expressions.  Unix regexp notatation sucks.
-
-1999-11-02  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/annota1.exp: Test for annotate-signalled: change output
- 	order for 'signalled' message.
-
-1999-11-01  Stan Shebs  <shebs@andros.cygnus.com>
-
-	From Jimmy Guo  <guo@cup.hp.com>:
-	* gdb.base/annota1.exp: Add tests for annotate ignore count change.
-	* gdb.base/annota1.c: Add code for tests to work with.
-
-1999-10-26  Frank Ch. Eigler  <fche@cygnus.com>
-
-	* gdb.base/remote.exp: New test for remote downloading settings.
-	* gdb.base/remote.c: New file with large .data.
-
-1999-10-18  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.threads/linux-dp.c, gdb.threads/linux-dp.exp: New test suite
-	for LinuxThreads support, merged from the Code Fusion branch.
-
-Mon Oct 11 13:57:21 1999  Andrew Cagney  <cagney@amy.cygnus.com>
-
-	* lib/gdb.exp (gdb_run_cmd): Break complicated gdb_expect
- 	containing exp_continue into a while within an expect.  Don't
- 	attempt a start more than three times.  Check return value from
- 	gdb_load.
-
-Wed Oct  6 12:05:58 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/watchpoint.exp: Match fail ``finish from marker1'' with
- 	a pass case.
-
-1999-10-01  Kevin Buettner <kevinb@cygnus.com>
-
-	* gdb.base/break.c (main): Added a statement that we can step
-	off of.
-	* gdb.base/break.exp: Added tests for setting a breakpoint
-	at an offset and stepping onto a breakpoint.
-
-1999-10-01  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/help.exp (help add-symbol-file): Update to match current
-	gdb output.
-
-1999-09-18  Jim Blandy  <jimb@cris.red-bean.com>
-
-	* gdb.base/break.exp: Code locations are in hex, don't forget!
-	(For HP-UX.)
-
-1999-09-17  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* condbreak.exp: Use break.c as test program.
-	* condbreak.c: Remove, redundant with break.c.
-
-1999-09-15  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* config/monitor.exp (gdb_target_monitor): Disable X- and
- 	Z-packets if the target needs it.
-
-1999-09-13  James Ingham  <jingham@leda.cygnus.com>
-
-	* gdb.c++/overload.exp: Added tests for listing overloaded
-	functions with function pointers in the arg, explicitly calling
-	out the version you want.
-
-1999-09-09  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* long_long.exp: Add variations of test cases that work for
-	targets with 16-bit ints and 32-bit doubles.
-
-1999-09-08  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* break.c (main): Compare a possibly-uninitialized argc with an
-	unlikely value that fits in 16 bits.
-
-1999-09-07  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/restore.c, gdb.base/restore.exp: Use 0x7eeb instead of
-	0xfeeb, don't want negative numbers if ints are 16 bits.
-
-	* lib/gdb.exp (skip_cplus_tests): New proc.
-	* gdb.c++/ambiguous.exp, gdb.c++/annota2.exp,
- 	gdb.c++/anon-union.exp, gdb.c++/classes.exp,
- 	gdb.c++/cplusfuncs.exp, gdb.c++/ctti.exp, gdb.c++/demangle.exp,
- 	gdb.c++/derivation.exp, gdb.c++/inherit.exp, gdb.c++/local.exp,
- 	gdb.c++/member-ptr.exp, gdb.c++/method.exp, gdb.c++/misc.exp,
- 	gdb.c++/overload.exp, gdb.c++/ovldbreak.exp,
- 	gdb.c++/ref-types.exp, gdb.c++/templates.exp, gdb.c++/userdef.exp,
- 	gdb.c++/virtfunc.exp: Use it to skip over C++ tests.
-
-	* gdb.c++/cplusfuncs.exp: Use get_compiler_info consistently.
-
-Fri Sep  3 15:37:12 1999  Kevin Buettner  <kevinb@cygnus.com>
-
-	* gdb.base/corefile.exp (up): Allow a parameter to appear
-	in the frame that we're going up to.
-
-	From Jim Blandy <jimb@cygnus.com>:
-
-	* gdb.base/default.exp (info float): Expect some output now.
-
-	* gdb.base/callfuncs.exp (do_function_calls): We no longer expect
-	returning floating-point values to fail on the x86.
-	* gdb.base/callfwmall.exp (do_function_calls): Same.
-
-	* gdb.base/list.exp (test_listsize): Correct expectations for
-	listing line 1 with listsize 2.  Also, listing a single line
-	works now, as does listing three lines.  [Kevin's note: There
-	were a number of other cases fixed too where the expectations
-	differed...]
-
-1999-09-02  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/selftest.exp: Add case for when version prints as
-	constant string instead of char pointer.
-
-1999-08-25  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/ending-run.exp: Add Solaris case for what happens when
- 	stepping out of main.
-
-	* gdb.c++/derivation.exp: XFAIL inf fn calls for all configs, if
-	G++ used.
-
-	* gdb.c++/local.exp: Expect ptype NestedInnerLocal to succeed
- 	always, expect ptype InnerLocal::NestedInnerLocal to fail always.
-
-	* gdb.c++/ovldbreak.exp: Update match string in test that
-	includes a warning of multiple breakpoints.
-
-1999-08-24  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/display.exp: Improve precision of step-after-finish
-	added yesterday.
-
-	* gdb.base/signals.exp: Add extra wildcard to "handle all print"
- 	test.
-
-	* gdb.c++/classes.exp: XFAIL HP-compiler-only tests for all
-	configs when using G++, not just hppa*.
-
-1999-08-24  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/async.c: New file.
-	* gdb.base/async.exp: New file.
-
-Tue Aug 24 03:24:53 1999  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/break.exp: Tweak PA specific tests to properly handle
-	PA64.
-
-Mon Aug 23 10:25:20 1999  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/display.exp: "finish" can leave us mid-line on many
-	targets, deal with it.  Add a small constant to main, instead of
-	1000 since main+1000 may not be a valid address in the target.
-
-	* gdb.base/dollar.exp: Do not run for PA processors in wide mode
-	on hpux11.
-
-	* gdb.base/attach.exp: Handle another hpux11 error message variant
-	when attaching to a process that does not exist.
-
-1999-08-19  J.T. Conklin  <jtc@redback.com>
-
-	* gdb.base/call-ar-exp.exp: Fix pattern matching whitespace
- 	characters in 'continue to 1241' test.
-
-1999-08-17  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/call-ar-st.exp: Add a shorter match case for the
-	stop in print_long_arg_list, define and use a whitespace
-	variable in print_small_structs test, add an XFAIL for Solaris.
-	* gdb.base/dbx.exp: XFAIL func commands until somebody is
-	interested enough to fix.
-
-1999-08-13  Keith Seitz  <keiths@cygnus.com>
-
-	* gdb.base/dbx.exp (dbx_gdb_file_cmd): Rename to gdb_file_cmd.
-	(dbx_gdb_load): Remove. Use gdb_load instead, since that
-	proc knows about targets other than the natives.
-	(test_assign): Use "gdb_run_cmd" to "run" the target.
-	Check that we've actually hit the breakpoint at main.
-	When we attempt to assign a value to a local variable, check
-	that the variable is in the current scope, i.e., don't use
-	a test with an empty result.
-
-Tue Aug 10 15:25:16 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/maint.exp: Add test of ``maintenance internal-error''
- 	command.
-
-1999-08-09  Stan Shebs  <shebs@andros.cygnus.com>
-
-	From Jimmy Guo <guo@cup.hp.com> and others at HP:
-	gdb.hp: Move tests into subdirectories gdb.aCC, gdb.base-hp,
-	gdb.compat, gdb.threads-hp.
-	gdb.hp/configure, gdb.hp/configure.in: New files.
-	gdb.hp/Makefile.in: Recurse into new subdirs.
-	gdb.hp/gdb.defects: New directory, tests for HP bug reports.
-	gdb.hp/gdb.objdbg: New directory, tests for debugging info
-	in object files.
-	gdb.hp/tools: New directory, aux tools for HP-specific tests.
-
-1999-08-05  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/display.exp: Help expect by putting a newline in the
- 	funky printf, remove a bogus p/a test.
-
-1999-08-05  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/display.exp: Make sure that when we say 'run', we are
- 	connected to the target. This is necessary when running not
- 	natively.
-
-1999-08-03  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/step-test.exp: Removed some extraneous messages.
-
-	* gdb.base/long_long.exp: Don't run memory examination tests
-	on little-endian targets (they will need a different set of
-	results to match).
-
-1999-08-02  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.c++/virtfunc.exp: Expect to fail the virtual call tests
-	until somebody decides to fix GDB.
-
-	* gdb.base/long_long.c: Stop compiler complaint by specifying long
- 	constant as "ULL".
-	* gdb.base/long_long.exp: Loosen x/c test, add partial result
-	matches for a couple x/2 commands.
-
-1999-07-30  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.c++/ref-types.cc, gdb.c++/ref-types.exp: Appease doschk
-	by merging in ref-types2 tests.
-	* gdb.c++/ref-types2.cc, gdb.c++/ref-types2.exp: Remove.
-
-	From Jimmy Guo <guo@cup.hp.com> and others at HP:
-	* gdb.c++/Makefile.in: Add standard actions.
-	(EXECUTABLES): Rename from PROGS, update list.
-	* gdb.c++/ambiguous.cc, gdb.c++/ambiguous.exp: Move to here
-	from gdb.hp.
-	* gdb.c++/anon-union.cc: Don't use anonymous struct, make
-	foo and bar locals.
-	* gdb.c++/anon-union.exp: Fix tests to match.
-	* gdb.c++/classes.exp: Run if HP compiler used, add extra
-	expect matches to handle output variations.
-	* gdb.c++/cplusfuncs.cc: Make operator -> return foo *.
-	* gdb.c++/cplusfuncs.exp: Update to match, allow word "class" in
- 	output, add HP alternatives for new and delete prints.
-	* gdb.c++/ctti.exp, gdb.c++/cttiadd.cc, gdb.c++/cttiadd1.cc,
- 	gdb.c++/cttiadd2.cc, gdb.c++/cttiadd3.cc: Move here from gdb.hp.
-	* gdb.c++/demangle.exp: Use $style when reporting failure.
-	* gdb.c++/derivation.exp: Add some xfails if GCC-compiled.
-	* gdb.c++/inherit.exp: Run if HP compiler used, add some
-	match alternatives.
-	* gdb.c++/local.exp: Add match alternatives or xfails for HP
- 	compilers.
-	* gdb.c++/member-ptr.exp: Add xfails for hppa*-*-*.
-	* gdb.c++/method.exp: Add match alternatives.
-	* gdb.c++/misc.cc: Add bool types.
-	* gdb.c++/misc.exp: Add tests for bool types.
-	* gdb.c++/overload.exp: Add xfails.
-	* gdb.c++/templates.cc: Remove bogus arglist init, init fvpchar.
-	* gdb.c++/templates.exp: Run if HP compiler used, add some xfails,
-	add some more template parameter tests (only for HP currently).
-	* gdb.c++/userdef.exp: Add xfails for hppa*-*-*.
-	* gdb.c++/virtfunc.cc: Add return type and value for main.
-	* gdb.c++/virtfunc.exp: Run if HP compiler used, add some
-	match alternatives.
-
-1999-07-30  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/display.exp: Fix output of 'p/a &&j' test.
-
-1999-07-29  Jim Blandy  <jimb@savonarola.red-bean.com>
-
-	* gdb.base/signals.exp: Don't expect getting a backtrace from
-	within a signal handler to fail on Linux.
-
-1999-07-29  Stan Shebs  <shebs@andros.cygnus.com>
-
-	From Jimmy Guo <guo@cup.hp.com> and others at HP:
-	* lib/gdb.exp: Remove some gratuitious semicolons.
-	(delete_breakpoints): Increase timeout.
-	(gdb_expect): Add -notransfer option.
-	(gdb_test): Use -notransfer option.
-	(get_compiler_info): Add f77 case.
-	(get_compiler): New proc, split out from gdb_preprocess, add f77
- 	case.
-	(gdb_preprocess): Call get_compiler.
-
-	* gdb.base/Makefile.in (EXECUTABLES): Update the list.
-	* gdb.base/attach.exp, gdb.base/display.exp,
- 	gdb.base/ending-run.exp, gdb.base/gdbvars.exp,
- 	gdb.base/long_long.exp, gdb.base/printcmds.exp,
- 	gdb.base/structs.exp, gdb.base/structs2.exp: Remove or fill in
- 	third arg to gdb_test.
-	* gdb.base/call-ar-st.exp: Add HP-UX xfail for >10-arg functions.
-	* gdb.base/callfuncs.exp, gdb.base/callfwmall.exp: Remove some
- 	HP-UX xfails, add others.
-	* gdb.base/completion.exp: Reflect name change of self-test.
-	* gdb.base/condbreak.exp, gdb.base/corefile.exp,
- 	gdb.base/foll-exec.exp, gdb.base/interrupt.exp,
- 	gdb.base/ptype.exp, gdb.base/scope.exp, gdb.base/setvar.exp: Note
- 	HP failure number.
-	* gdb.base/foll-vfork.exp: Loosen matches slightly, remove
-	useless HP-UX 10.30 references.
-	* gdb.base/maint.exp: Loosen matches.
-	* gdb.base/pointers.c (main): Declare more_code.
-	* gdb.base/pointers.exp: Match on output of a `next'.
-	* gdb.base/structs.c: Add prototypes.
-	* gdb.base/watchpoint.exp: Remove HP-UX 10.30 reference.
-	* gdb.base/whatis.exp: Fail for both HP-UX 10.20 and 11.
-
-1999-07-29  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/list.exp: Add tests for repeating 'list <linenum>'
- 	command.
-
-1999-07-27  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.c++/annota2.exp: Fix delete breakpoint query testcase.
-	Fix run to main failures. Watchpoint can be hardware watchpoint.
-
-	* gdb.base/annota1.exp: Clean up some more, in case printf has
-	debug info.  Deal with lack of signal hanlder info in stack.
-
-        From Jim Kingdon  <kingdon@redhat.com>:
-	* gdb.base/annota1.exp: If printf has debug info, deal with it.
-
-1999-07-19  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/foll-exec.exp, gdb.base/foll-fork.exp,
- 	gdb.base/foll-vfork.exp: Don't run for crosses.
-
-Tue Jul 13 23:37:18 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/configure.in: Check for gdbvars.exp instead of
- 	a1-selftest.exp.
-	* gdb.base/configure: Re-generate.
-
-1999-07-12  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/selftest.exp: Rename from a1-selftest.exp, no point
-	in trying to run first and name is too long.
-
-	* gdb.base/pointers.c, gdb.base/pointers.exp: Add contents of
-	pointers2.c and pointers2.exp, respectively.
-	* gdb.base/pointers2.c, gdb.base/pointers2.exp: Remove, makes
-	doschk happier.
-
-1999-07-08  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/callfwmall.c, gdb.base/callfwmall.exp: Renamed from
-	callfuncs2.c and callfuncs2.exp.
-
-	* gdb.base/list.exp: Remove mistaken xfails.
-	* gdb.base/list0.h: Add optional prototypes.
-
-Wed Jul  7 00:27:35 1999  Andrew Cagney  <cagney@amy.cygnus.com>
-
-        * gdb.base/setvar.exp: Increase the time-out on tests indirectly
- 	calling malloc.
-        * nodebug.exp, printcmds.exp, ptype.exp, setvar.exp: Ditto.
-        * ptype.exp: Move test for get_debug_format to before its first
- 	use.
-
-1999-07-06  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/Makefile.in (EXECUTABLES): Remove annota2 executable.
-	* gdb.base/annota2.cc, annota2.exp: Move from here.
-	* gdb.c++/annota2.cc, annota2.exp: To here.
-	* gdb.c++/Makefile.in (PROGS): Add annota2 executable.
-
-Tue Jun 29 11:56:06 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* lib/gdb.exp (gdb_expect_list): Output one message per pattern in
- 	a consistent format.
-
-1999-06-25  Stan Shebs  <shebs@andros.cygnus.com>
-
-	From Jimmy Guo <guo@cup.hp.com> and others at HP:
-	* lib/gdb.exp (get_compiler_info): Add detection for assorted
-	HP compilers, also set the globals $true and $false.
-
-	* gdb.base/annota1.c, bitfields.c, break.c, call-ar-st.c,
- 	call-rt-st.c, call-strs.c, callfuncs.c, callfuncs2.c, condbreak.c,
- 	coremaker.c, ending-run.c, exprs.c, funcargs.c, interrupt.c,
- 	jump.c, langs0.c, langs1.c, langs2.c, list0.c, list1.c,
- 	long_long.c, mips_pro.c, nodebug.c, opaque0.c, opaque1.c,
- 	printcmds.c, ptype.c, recurse.c, restore.c, return.c, run.c,
- 	scope0.c, scope1.c, setshow.c, setvar.c, shmain.c, shr1.c, shr2.c,
- 	sigall.c, signals.c, so-impl-ld.c, so-indr-cl.c, solib.c,
- 	solib1.c, solib2.c, step-test.c, twice.c, varargs.c, watchpoint.c,
- 	whatis.c} Add C++ compatible function definitions and return
- 	types, add includes for library functions.
-	* gdb.base/ptype.c (my_false, my_true): Use instead of false/true.
-	* gdb.base/step-test.c (myglob): Rename from glob.
-	* gdb.base/attach.c, attach2.c, average.c, execd-prog.c,
- 	foll-exec.c, foll-fork.c, foll-vfork.c, sum.c, vforked-prog.c: New
- 	files, move here from gdb.hp.
-	* gdb.base/annota1.exp, break.exp, call-ar-st.exp, call-rt-st.exp,
- 	commands.exp, condbreak.exp, define.exp, ena-dis-br.exp,
- 	ending-run.exp, jump.exp. list.exp, long_long.exp, so-impl-ld.exp:
- 	Adjust line numbers in regexps.
-
-	* gdb.base/all-bin.exp, eval-skip.exp, exprs.exp, logical.exp,
-	miscexprs.exp, pointers.exp, relational.exp: Use $true and $false
-	instead of 0/1.
-
-	* gdb.base/attach.exp, dbx.exp, foll-exec.exp, foll-fork.exp,
-	foll-vfork.exp: New files, move here from gdb.hp.
-	* gdb.base/page.exp: New file, test of pagination command.
-
-	* gdb.base/watchpoint.c (recurser): New function, for watchpoint
-	recursion test.
-	* gdb.base/watchpoint.exp: Add more test cases for watchpoints.
-
-	* gdb.base/so-impl-ld.exp, gdb.base/so-indr-cl.exp,
- 	gdb.base/solib.exp: Fix compiler invocation process.
-
-	* gdb.base/callfuncs.exp, gdb.base/callfuncs2.exp: Don't xfail for
- 	HP-UX 11, turn off overload resolution explicitly.
-	* gdb.base/commands.exp: Set argument list explicitly, add
- 	watchpoint test.
-	* gdb.base/completion.exp: Enable if HP-UX, tweak tests to make
-	them work.
-	* gdb.base/constvars.exp, gdb.base/volatile.exp: Escape the
-	expressions properly.
-	* gdb.base/corefile.exp: Loosen the match slightly.
-	* gdb.base/default.exp: Allow "Error accessing memory" message
-	also.
-	* gdb.base/display.exp: Skip over x/0 j if PA64.
-	* gdb.base/funcargs.exp: Add xfails for HP-UX.
-	* gdb.base/interrupt.exp: Ditto.
-	* gdb.base/langs.exp: Add symbolic matches governed by compiler
-	in use.
-	* gdb.base/list.exp: Add xfails for HP-UX.
-	* gdb.base/long_long.exp: Refine some of the numeric matches.
-	* gdb.base/mips_pro.exp: Xfail on HP-UX.
-	* gdb.base/miscexprs.exp: Add PA2.0 case for array size test.
-	* gdb.base/nodebug.exp: Succeed on more varieties of output.
-	* gdb.base/opaque.exp: Remove some HP-UX xfails.
-	* gdb.base/ptype.exp: Succeed on more varieties of output.
-	* gdb.base/scope.exp: Add xfails for HP-UX.
-	* gdb.base/sect-cmd.exp: Add more cases.
-	* gdb.base/setvar.exp: Add xfails for HP-UX.
-	* gdb.base/shlib-call.exp: Loosen some matches slightly.
-	* gdb.base/signals.exp: Match on void symbolically.
-	* gdb.base/step-test.exp: Add case for PA64.
-	* gdb.base/term.exp: Add exit and restart.
-	* gdb.base/twice.exp: Clean up after self.
-	* gdb.base/varargs.exp: Disable overload resolution explicitly.
-	* gdb.base/whatis.exp: Allow more ways to pass tests.
-
-	* gdb.base/smoke.exp, gdb.base/smoke.c, gdb.base/smoke.cc: Remove,
- 	no longer useful.
-
-Fri Jun 25 19:27:28 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* lib/gdb.exp (proc gdb_expect_list): New procedure.  Matches a
- 	list of patterns.
-	* gdb.base/call-ar-st.exp: Use gdb_expect_list in "print
- 	print_double_array(double_array)", "continuing to breakpoint
- 	1018", "print print_double_array(array_d)" and "continuing to
- 	1034" tests.
-
-1999-06-24  Jason Molenda  (jsm@bugshack.cygnus.com)
-
-        * Makefile.in: Add empty html and install-html targets.
-
-1999-06-24  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* config/mt-*: Remove, these haven't been used since 1996.
-
-1999-06-22  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/call-strs.c, gdb.base/ending-run.c,
- 	gdb.base/step-test.c: Include stdlib.h and string.h as needed.
-	* gdb.c++/member-ptr.exp: Skip over these tests if using G++.
-
-1999-06-18  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.c++/overload.exp: XFAIL everything if using G++, add a
-	simpler match case for the ptype of the big class.
-
-1999-06-16  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.exp: Fix test for gdb_prompt existence.
-
-1999-06-16  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.exp (gdb_test): Add fail after calls to perror.
-
-1999-06-16  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.exp (gdb_test): Accept variations of Undefined command messages.
-
-1999-06-16  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.exp (gdb_test): Fix anchors on gdb_expect statement.
-
-Fri Jun 11 12:56:50 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/call-strs.c (link_malloc): New function.  Ensure that
- 	malloc() is linked in.
-
-1999-06-08  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.base/ending-run.exp: Make sure we fail and do not timeout at
-	step at end.
-
-	* gdb.base/annota1.exp: Increase match_max to prevent timeout.
-
-1999-06-08  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.java/jv-print.exp: New file.  (Our first Java test!)
-
-Fri Jun  4 10:47:46 1999  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/a1-selftest.exp: Remove bogus hppa xfail.
-	* gdb.base/mips_pro.exp: Likewise.
-
-1999-06-02  Keith Seitz  <keiths@cygnus.com>
-
-	* gdb.c++/templates.cc: Change all "new" operators to throw
-	an exception.
-	* gdb.c++/cplusfuncs.cc: Likewise.
-
-	* gdb.base/Makefile.in (EXECUTABLES): Add smoke1, annota1, and annota2.
-
-Wed Jun  2 17:37:05 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/condbreak.exp: Use rerun_to_main to start the program.
-        * gdb.base/ending-run.exp: When stepping out of main, accept a
-        step into an arbitrary assembler file.
-
-1999-05-20  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/annota1.exp: Allow any number of "frames-invalid" and
-	"breakpoint-invalid" to be printed.
-	* gdb.base/annota2.exp: Revise line number for main breakpoint. Allow any
-	number of "frames-invalid" and "breakpoint-invalid" to be printed.
-	* gdb.base/annota2.cc: Initialize a.x to 0.
-
-1999-05-17  Keith Seitz  <keiths@cygnus.com>
-
-	* gdb.base/call-ar-st.exp: Skip "print print_double_array (double_array)"
-	when "skip_float_tests" set.
-	Ditto for "print print_double_array(array_d)", "print print_small_structs",
-	"print print_ten_doubles", and "step into print_long_arg_list".
-	Don't assume we can step into "print_long_arg_list": we could step into memcpy.
-	* gdb.base/call-rt-st.exp: Don't run float-related tests when "skip_float_tests"
-	is set: "print print_one_double(*d1)" and "print print_two_floats(*f3)".
-	* gdb.base/funcargs.exp: Don't run "float_and_integral_args" when
-	"skip_float_tests" is set.
-	* gdb.base/varargs.exp: Skip "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)"
-	when "skip_float_tests" set.
-
-1999-05-06  Keith Seitz  <keiths@cygnus.com>
-
-	* gdb.base/annota2.cc: Include stdio.h.
-
-Wed May  5 17:44:31 1999  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/crossload.exp: Remove, this has been disabled ever
-	since BFD stopped including all targets, and cross-GDB gets
-	plenty of testing anyway.
-	* gdb.base/i486-elf.u, gdb.base/m68k-aout.u, gdb.base/m68k-elf.u,
- 	gdb.base/sparc-aout.u, gdb.base/i860-elf.u, gdb.base/m68k-aout2.u,
- 	gdb.base/mips-ecoff.u, gdb.base/sparc-elf.u: Remove.
-	* gdb.base/README: Remove, was doc for this.
-	* gdb.base/Makefile.in (CROSS_EXECUTABLES): Remove, no longer
- 	needed.
-
-1999-05-04  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/call-ar-st.exp: Fix one regular expression in test
-	output.
-
-	* gdb.base/annota1.exp: New file. Annotation level 2 tests.
-	* gdb.base/annota2.exp: New file. More annotation tests.
-	* gdb.base/annota1.c: New file. Source file for annota1.exp.
-	* gdb.base/annota2.cc: New file. Source file for annota2.exp.
-
-1999-04-23  Angela Marie Thomas <angela@cygnus.com>
-
-	* config/cfdbug.exp: New file.
-
-1999-04-20  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.c++/demangle.exp (test_gnu_style_demangling): Add tests for
-	Marcus Daniel's and Dale Hawkins's demangler crashes.
-
-	* gdb.c++/demangle.exp (test_gnu_style_demangling,
- 	test_lucid_style_demangling, test_arm_style_demangling,
- 	test_hp_style_demangling): Try Tom Tromey's core-dumping
- 	identifier under each demangling style.
-
-1999-04-07  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.c++/demangle.exp: Include the current demangling style
-	in all test names.
-	(current_demangling_style): New global variable.
-	(set_demangling_style, test_demangling_core, test_demangling,
-	test_demangling_exact): New functions.
-	(test_gnu_style_demangling, test_lucid_style_demangling,
-	test_arm_style_demangling, test_hp_style_demangling): Use those,
-	instead of calling gdb_test and gdb_test_exact directly.
-	(catch_demangling_errors): New function, which reports errors
-	signalled by the demangling test functions in an orderly way.
-	(do_tests): Use catch_demangling_errors.
-
-1999-04-06  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.base/signals.exp (test_handle_all_print): Use () for
- 	grouping in expressions, not {}.
-
-	* gdb.base/smoke.exp: Test value of x, not y.  The latter isn't
- 	initialized yet.
-
-1999-04-01  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.c++/derivation.exp: Pass ptype tests if synthesized methods
-	are listed.
-
-1999-03-26  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.stabs/weird.exp: Test for CC being defined before
-	looking at its value.
-
-1999-03-25  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/call-ar-st.exp: Remove stray '#'.
-	* gdb.base/miscexprs.exp: Allow "short" and "long" as well as
-	"short int" and "long int".
-	* gdb.c++/overload.cc: Cast the string added in the previous
- 	change, to mollify finicky HP compiler.
-	* gdb.hp/reg-test.exp (testfile): Fix file name.
-	* gdb.stabs/weird.exp: Don't try to run if HP compiler in use.
-
-	* gdb.c++/misc.cc (main): Initialize obj_with_enum.
-	* gdb.c++/classes.exp: Fix test of obj_with_enum values, allow
-	alternate form of enum ptype.
-
-1999-03-23  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* lib/gdb.exp (skip_hp_tests): Remove gcc_used argument.
-	* gdb.hp/*.exp: Change all to run compiler probe only after
- 	passing skip_hp_tests, so as not to waste time on guaranteed
- 	failure.
-
-	* gdb.c++/overload.cc: Pass string instead of char addr, always
-	init ccpfoo.
-	* gdb.c++/templates.cc: Fix syntax error.
-
-Tue Mar 23 14:56:36 1999  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.base/commands.exp: Add test for correct position of '>'
-	when issuing the 'commands' command after a 'while' or 'if'
-	command.
-
-1999-03-18  James Ingham  <jingham@cygnus.com>
-
-	* gdb.c++/ovldbreak.exp: Use gdb_continue_to_end
-
-	* gdb.c++/method.exp: It was testing an uninitialized int on the
-	stack and assuming it was positive.
-
-	* gdb.base/watchpoint.exp: Use gdb_continue_to_end.
-
-	* gdb.base/step-test.exp: Catch a case where finish is broken and
-	keep it from killing the rest of the tests.
-	Use gdb_continue_to_end.
-
-	* gdb.base/sigall.exp: use gdb_continue_to_end.
-
-	* gdb.base/ena-dis-br.exp: use gdb_continue_to_end.
-
-	* gdb.base/display.exp: use runto_main, not run.
-
-	* gdb.base/default.exp: Check for the current error message in the
-	r abbreviation test.
-	Add strongarm to the targets that know info float.
-
-	* gdb.base/condbreak.exp: Use the gdb_run command rather than just
-	run which doesn't work with monitors.
-
-	* gdb.base/call-ar-st.exp: fixed bogus regexp in continuing to 1034 test.
-
-	* gdb.base/break.exp: use the gdb_continue_to_end proc.
-
-	* lib/gdb.exp: I had added gdb_continue_to_end used to run to the end of a
-	program.  Traps the case (in Cygmon) when the program never really
-	exits.  Same as Mark's continue_to_exit, but I had put it in a lot
-	more places, so I used my name.  Sorry Mark...
-
-	* config/monitor.exp (gdb_target_monitor): added another
-	target_info parameter: remotebinarydownload.  This will set the
-	remotebinarydownload flag if this is causing some boards trouble.
-
-1999-03-18  Mark Salter  <msalter@cygnus.com>
-
-	* lib/gdb.exp (continue_to_exit): New function.
-
-	* gdb.base/ena-dis-br.exp: Clean up for remote targets.
-	* gdb.base/ending-run.exp: Ditto.
-	* gdb.base/step-test.exp: Ditto.
-
-1999-03-16  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/miscexprs.c: Clean up file, clear cbig.c[0] explicitly
-	(suggested by Art Haas <ahaas@neosoft.com>).
-
-1999-03-16  Jim Blandy  <jimb@zwingli.cygnus.com>
-
- 	* gdb.base/signals.exp: Filter out *-*-linux* before matching *-*-gnu*.
-
-Fri Mar 12 18:06:21 1999  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.c++/ref-types.exp, ref-types2.exp: Allow alternate
- 	descriptions of types (short unsigned int vs unsigned short, etc).
-
-1999-03-12  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.base/call-strs.exp: Don't assume that `step' will step over
-	a call to strlen; sometimes we do have sources.
-
-1999-03-08  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.base/call-ar-st.c (main): Terminate char_array with a null
- 	character, so GDB won't print garbage after its end.
-
-	* gdb.base/call-ar-st.exp: Don't step into sum_array_print; set a
-	breakpoint there instead.  Sometimes GCC emits memcpy to handle
-	the large structures being passed by value, so we step into that
-	instead of sum_array_print, which obscures what we're really testing.
-	* gdb.base/step-test.exp: However, we do want a test that notices
- 	the bizarre steps into memcpy, so do that here.  Add check for
- 	stepping into function calls that pass large structures by value.
-  	("Is that a noun clause, or are you just happy to see me?")
-	Remove all references to specific line numbers.
-	* gdb.base/step-test.c (struct rhomboidal, large_struct_by_value):
-	New type and function.
-	(main): Call large_struct_by_value, passing it a large struct by value.
-	* lib/gdb.exp (gdb_get_line_number): New function.
-
-	* gdb.base/step-test.exp: Rewrite `stepi' and `nexti' tests to be
-	more portable.
-
-1999-03-08  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* lib/gdb.exp: Doc fixes.
-
-1999-03-05  Nick Clifton  <nickc@cygnus.com>
-
-	* gdb.base/a2-run.exp: Add expected fails for strongarm-coff.
-
-1999-03-04  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.base/display.exp: Don't exercise the "detach" and "kill"
- 	commands.  They're not germane to this test, and they don't work
- 	that way on remote targets.
-
-1999-03-01  James Ingham  <jingham@cygnus.com>
-
-	* Changelog entries merged over from gdb development branch.
-
-       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.
-
-	1998-12-07  Martin M. Hunt  <hunt@cygnus.com>
-
-	       * lib/gdb.exp (gdbtk_start): Fix path for itcl library.
-
-1999-02-25  Felix Lee  <flee@cygnus.com>
-
-	* lib/gdb.exp (debug_format): initialize
-
-1999-02-25  Jason Molenda  (jsm@bugshack.cygnus.com)
-
-	* gdb.base/call-ar-st.c: Include string.h, not strings.h.
-	* gdb.base/call-rt-st.c: Ditto.
-
-1999-02-13  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.threads/pthreads.exp (horiz): New variable.
-	(test_startup): Fix regexps that capture thread numbers.
-
-1999-02-10  Jason Molenda  (jsm@bugshack.cygnus.com)
-
-	* gdb.base/smoke.exp: Disambiguate two test case names (both
-	called ``print'').
-
-Fri Feb  5 12:42:56 1999  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/volatile.exp: Use gdb_test, add xfails for GCC
- 	compilation.
-
-1999-02-04  Jason Molenda  (jsm@bugshack.cygnus.com)
-
-	* gdb.base/miscexprs.exp: Change patterns to match GDB's
-	actual output formatting.
-	* gdb.base/smoke.exp: GDB removes leading 0's.
-	* gdb.base/volatile.exp: Don't check type of remuneration;
-	that variable is no longer defined in constvars.c.
-	* gdb.base/step-test.c (main): Exit with explicit exit code.
-	* gdb.base/step-test.exp: Remove two nexti checks--they are
-	not portable.
-
-1999-02-04  Jason Molenda  (jsm@bugshack.cygnus.com)
-
-	* gdb.base/help.exp ("help delete display"): Fix test to match
-	gdb's output.
-
-	* gdb.base/long_long.c (known_types): Initialize values to zero.
-	* gdb.base/long_long.exp: Step one more line
-	so 'dec' is initialized in "get to known place".  GDB removes
-        leading zeros.  Explicitly ask for hex formatting.  Use
-        unique test case names.
-
-Tue Feb  2 10:16:08 1999  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* lib/gdb.exp (gdb_preprocess): Remove 'puts' statement.
-
-	* gdb.c++/method.exp: Add missing close brace.
-
-1999-01-30  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.base/maint.exp: Use 'set height 0' to disable page
-	prompting, not 'set height 400'.
-
-	Fix a bunch of timeouts.
-	* gdb.base/maint.exp ("maint print objfiles"): Break this up into
-	four separate tests, so expect doesn't take forever to match a ton
-	of text against a regexp with lots of .* forms.
-	("maint print psymbols", "maint print symbols"): Make some of
-	these greps more selective, so that expect doesn't try to wade
-	through huge piles of output and time out.
-
-	* gdb.base/maint.exp ("maint print msymbols"): Fix pattern.
-
-	* gdb.base/maint.exp ("maint info breakpoints"): Split into two
- 	tests: one which doesn't expect shlib events to be reported, and
- 	another which does, but is XFAIL for all platforms other than
- 	HP/UX.
-
-	* gdb.base/break.exp: Teach the test suite that the `catch
-	fork', `catch vfork', and `catch exec' commands produce error
-	messages on platforms that don't provide these features.
-
-Mon Jan 25 18:35:56 1999  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.hp/gen-so-thresh.c, so-thresh.sh, so-thresh.exp,
- 	so-thresh.linkopts, so-thresh.mk: Move to gdb.hp from gdb.base
- 	(shortening names from solib_threshold.exp etc), won't run on
- 	anything but HP-UX for the foreseeable future.
-	* gdb.hp/Makefile.in, gdb.base/Makefile.in (clean): Adjust to
- 	reflect move.
-
-Thu Jan 21 15:46:49 1999  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/Makefile.in, gdb.c++/Makefile.in,
- 	gdb.trace/Makefile.in (clean): Remove all test executables.
-
-Tue Jan 19 17:20:09 1999  David Taylor  <taylor@texas.cygnus.com>
-
-	* gdb.base/shlib-call.exp: add test cases to verify that gdb
-	successfully re-sets breakpoints in shared libraries.
-	* gdb.base/shmain.c (main): return 0, don't fall off the end.
-
-Fri Jan 15 14:04:57 1999  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.hp/xdb3.exp: do not execute unless on hppa-hpux platform
-	and compiled w/o GCC.
-
-	* gdb.hp/watch-cmd.exp: ditto.
-
-	* gdb.hp/watch-hp.exp: ditto.
-
-	* gdb.hp/xdb1.exp: ditto.
-
-	* gdb.hp/xdb2.exp: ditto.
-
-	* gdb.hp/dbx.exp: ditto.
-
-Thu Jan 14 18:36:48 1999  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* constvars.c: Remove C++-isms.
-	* constvars.exp: Use gdb_test everywhere, add xfails if compiled
- 	with GCC.
-
-Mon Jan 11 10:08:03 1999  David Taylor  <taylor@texas.cygnus.com>
-
-	The following changes are part of the HP merge.
-
-	* gdb.base/break.exp: new tests to verify that catchpoints for
-	fork, vfork, and exec don't trigger inappropriately.
-
-	* gdb.base/opaque.exp: compile one file at a time, then link.
-
-	* gdb.base/signals.exp: be more restrictive about which hppa
-	systems receive a setup_xfail.  new tests.
-
-	* gdb.base/solib_threshold.build: new file.
-	* gdb.base/solib_threshold.exp: new file.
-	* gdb.base/solib_threshold.link_opts: new file.
-	* gdb.base/solib_threshold.mk: new file.
-	* gdb.base/gen_solib_threshold.c: new file.
-
-	* gdb.c++/classes.exp: if on HPUX and not using gcc, skip the
-	tests.  New tests for enums inside classes.
-
-	* gdb.c++/compiler.cc: indicate support of template debugging.
-
-	* gdb.c++/demangle.exp: run hp style demangling tests.
-
-	* gdb.c++/inherit.exp: if on HPUX and not using gcc, skip the
-	tests.
-
-	* gdb.c++/misc.cc: changes to support new tests.
-
-	* gdb.c++/templates.cc: changes to support HP's compiler; changes
-	to support new tests.
-
-	* gdb.c++/virtfunc.exp: if we are on HPUX and we are not using
-	gcc, then skip these tests.
-
-Sun Jan 10 23:44:11 1999  David Taylor  <taylor@texas.cygnus.com>
-
-	The following files are part of the HP merge; some had longer
-	names at HP, but have been renamed to be no more than 14
-	characters in length.
-
-	* gdb.hp/ambiguous.cc: new file.
-	* gdb.hp/ambiguous.exp: new file.
-	* gdb.hp/attach.exp: new file.
-	* gdb.hp/attach2.exp: new file.
-	* gdb.hp/classes-hp.exp: new file.
-	* gdb.hp/ctti.exp: new file.
-	* gdb.hp/ctti-add.cc: new file.
-	* gdb.hp/ctti-add1.cc: new file.
-	* gdb.hp/ctti-add2.cc: new file.
-	* gdb.hp/ctti-add3.cc: new file.
-	* gdb.hp/dbx.exp: new file.
-	* gdb.hp/exception.cc: new file.
-	* gdb.hp/exception.exp: new file.
-	* gdb.hp/foll-exec.c: new file.
-	* gdb.hp/foll-exec.exp: new file.
-	* gdb.hp/foll-fork.c: new file.
-	* gdb.hp/foll-fork.exp: new file.
-	* gdb.hp/foll-vfork.c: new file.
-	* gdb.hp/foll-vfork.exp: new file.
-	* gdb.hp/inherit-hp.exp: new file.
-	* gdb.hp/more-steps.exp: new file.
-	* gdb.hp/namespace.cc: new file.
-	* gdb.hp/namespace.exp: new file.
-	* gdb.hp/optimize.exp: new file.
-	* gdb.hp/pxdb.c: new file.
-	* gdb.hp/pxdb.exp: new file.
-	* gdb.hp/quicksort.exp: new file.
-	* gdb.hp/reg-test.exp: new file.
-	* gdb.hp/reg-test.s: new file.
-	* gdb.hp/sized-enum.c: new file.
-	* gdb.hp/sized-enum.exp: new file.
-	* gdb.hp/start-stop.exp: new file.
-	* gdb.hp/templ-hp.cc: new file.
-	* gdb.hp/templ-hp.exp: new file.
-	* gdb.hp/thr-lib.c: new file.
-	* gdb.hp/thr-lib.exp: new file.
-	* gdb.hp/thr-lib.h: new file.
-	* gdb.hp/thr-liblib.c: new file.
-	* gdb.hp/virtfun-hp.c: new file.
-	* gdb.hp/virtfun-hp.exp: new file.
-	* gdb.hp/watch-cmd.exp: new file.
-	* gdb.hp/watch-hp.exp: new file.
-	* gdb.hp/xdb1.exp: new file.
-	* gdb.hp/xdb2.exp: new file.
-	* gdb.hp/xdb3.exp: new file.
-
-Wed Jan  6 18:41:15 1999  David Taylor  <taylor@texas.cygnus.com>
-
-	The following files are part of the HP merge; some had longer
-	names at HP, but have been renamed to be no more than 14
-	characters in length.
-
-	* gdb.base/ss.h: new file.
-	* gdb.base/call-ar-st.c: new file.
-	* gdb.base/call-ar-st.exp: new file.
-	* gdb.base/call-rt-st.c: new file.
-	* gdb.base/call-rt-st-exp: new file.
-	* gdb.base/call-strs.exp: new file.
-	* gdb.base/ena-dis-br.exp: new file.
-	* gdb.base/environ.exp: new file.
-	* gdb.base/long_long.exp: new file.
-	* gdb.base/sect-cmd.exp: new file.
-	* gdb.base/shlib-cl2.exp: new file.
-	* gdb.base/smoke.exp: new file.
-	* gdb.base/so-impl-ld.c: new file.
-	* gdb.base/so-impl-ld.exp: new file.
-	* gdb.base/so-indr-cl.c: new file.
-	* gdb.base/so-indr-cl.exp: new file.
-	* gdb.base/varargs.exp: new file.
-	* gdb.base/volatile.exp: new file.
-	* gdb.base/whatis-exp.exp: new file.
-	* gdb.base/display.exp: new file.
-	* gdb.c++/derivation.exp: new file.
-	* gdb.c++/local.exp: new file.
-	* gdb.c++/member-ptr.exp: new file.
-	* gdb.c++/overload.exp: new file.
-	* gdb.c++/ovldbreak.exp: new file.
-	* gdb.c++/ref-types.exp: new file.
-	* gdb.c++/ref-types2.exp: new file.
-	* gdb.c++/userdef.exp: new file.
-
-Wed Jan  6 13:50:57 1999  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/default.exp: Reflect wording change in remote.c.
-
-Tue Jan  5 19:14:51 1999  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/help.exp: Update to reflect current text.
-
-Tue Jan  5 13:05:32 1999  David Taylor  <taylor@texas.cygnus.com>
-
-	* gdb.c++/anon-union.cc: make foo and bar global, otherwise
-	they're stack variables and contain garbage.
-	* gdb.c++/anon-union.exp: new file.
-
-	The following changes were made by David Taylor
- 	<taylor@cygnus.com>, Elena Zannoni <ezannoni@cygnus.com>, and
- 	Edith Epstein <eepstein@cygnus.com> as part of a project to merge
- 	in changes by HP.
-
-	* gdb.base/bitops.exp: new file.
-	* gdb.base/default.exp: change expected messages for catch and
-	info catch tests to reflect HP merge changes.
-	* gdb.base/enable-disable-break.exp
-	* gdb.base/ending-run.c: new file.
-	* gdb.base/long_long.c: new file.
-	* gdb.base/maint.exp: new file.
-	* gdb.base/pointers2.exp: new file.
-	* gdb.base/shlib-call2.exp: new file.
-	* gdb.base/solib.exp: new file.
-	* gdb.base/step-test.c: new file.
-	* gdb.c++/anon-union.cc: new file.
-	* gdb.c++/local.cc: new file.
-	* gdb.c++/member-pointer.cc: new file.
-	* gdb.c++/method.cc: new file.
-	* gdb.c++/ref-types.cc: new file.
-	* gdb.c++/ref-types2.cc: new file.
-	* gdb.c++/userdef.cc: new file.
-
-	* gdb.base/scope.exp: compile one file at a time, then link.
-	* gdb.base/langs.exp: ditto.
-	* gdb.base/list.exp: ditto.
-
-Mon Jan  4 10:06:43 1999  David Taylor  <taylor@texas.cygnus.com>
-
-	The following changes were made by David Taylor
- 	<taylor@cygnus.com>, Elena Zannoni <ezannoni@cygnus.com>, and
- 	Edith Epstein <eepstein@cygnus.com> as part of a project to merge
- 	in changes by HP.
-
-	* gdb.c++/inherit.exp: if on hppa*-*-hpux* and not using gcc,
-	skip tests.  When compiling pass c++ flag to gdb_compile.
-	* gdb.c++/
-
-	* lib/gdb.exp (get_compiler_info): new, optional argument -- args;
-	test for on hppa*-*-hpux*; use args to see if c++ was specified.
-	(skip_hp_tests): new function.
-	(gdb_preprocess): new function.
-
-	* configure.in (hpdir): decide whether to configure gdb.hp.
-	* configure: regenerated.
-
-	* gdb.base/Makefile.in (MISCELLANEOUS): new macros -- extra things
-	to delete on clean.
-	(EXECUTABLES): update to reflect new additions.
-	* gdb.base/commands.exp: update message expected.
-	* gdb.base/default.exp: add copyright notice.
-	* gdb.base/funcargs.exp (timeout): if hpux, increase timeout.
-	* gdb.base/help.exp: update messages to reflect current text.
-	* gdb.base/recurse.exp: add hpppa*-*-bsd* to 'list' of enabled
-	targets for recurse tests.
-	* gdb.base/watchpoint.exp: if on hpux and not gcc compiled, then
-	skip this file.
-
-	* gdb.c++/Makefile.in (PROGS): update to reflect new executables.
-	* gdb.c++/cplusfuncs.exp: tell gdb_compile that it's a c++
-	compilation.
-	* gdb.c++/misc.exp: ditto.
-	* gdb.c++/templates.exp: if we're on hpux and it's not gcc, don't
-	run the tests.  tell gdb_compile that it's a c++ compilation.
-
-	* gdb.threads/pthreads.exp: fix typo in message.
-
-	* gdb.base/all-bin.exp: new file.
-	* gdb.base/arithmet.exp: new file.
-	* gdb.base/assign.exp: new file.
-	* gdb.base/completion.exp: new file.
-	* gdb.base/cond-expr.exp: new file.
-	* gdb.base/condbreak.exp: new file.
-	* gdb.base/define.exp: new file.
-	* gdb.base/dollar.exp: new file.
-	* gdb.base/environment.exp: new file.
-	* gdb.base/eval-skip.exp: new file.
-	* gdb.base/jump.exp: new file.
-	* gdb.base/logical.exp: new file.
-	* gdb.base/pointers.exp: new file.
-	* gdb.base/relational.exp: new file.
-	* gdb.base/section_command.exp: new file.
-	* gdb.base/whatis-expr.exp: new file.
-
-	* gdb.base/all-types.c: new file.
-	* gdb.base/call-array-struct.c: new file.
-	* gdb.base/call-return-struct.c: new file.
-	* gdb.base/call-strings.c: new file.
-	* gdb.base/callfuncs2.c: new file.
-	* gdb.base/condbreak.c: new file.
-	* gdb.base/constvars.c: new file.
-	* gdb.base/display.c: new file.
-	* gdb.base/int-type.c: new file.
-	* gdb.base/jump.c: new file.
-	* gdb.base/miscexprs.c: new file.
-	* gdb.base/pointers.c: new file.
-	* gdb.base/pointers2.c: new file.
-	* gdb.base/shmain.c: new file.
-	* gdb.base/shr1.c: new file.
-	* gdb.base/shr2.c: new file.
-	* gdb.base/solib.c: new file.
-	* gdb.base/solib1.c: new file.
-	* gdb.base/solib2.c: new file.
-	* gdb.base/varargs.c: new file.
-	* gdb.c++/derivation.cc: new file.
-	* gdb.c++/overload.cc: new file.
-	* gdb.c++/ovldbreak.cc: new file.
-	* gdb.hp/attach.c: new file.
-	* gdb.hp/attach2.c: new file.
-	* gdb.hp/average.c: new file.
-	* gdb.hp/compiler.c: new file.
-	* gdb.hp/compiler.cc: new file.
-	* gdb.hp/execd-program.c: new file.
-	* gdb.hp/follow-exec.c: new file.
-	* gdb.hp/follow-fork.c: new file.
-	* gdb.hp/follow-vfork-and-exec.c: new file.
-	* gdb.hp/misc-hp.cc: new file.
-	* gdb.hp/more-steps.c: new file.
-	* gdb.hp/optimize.c: new file.
-	* gdb.hp/quicksort.c: new file.
-	* gdb.hp/run-hp.c: new file.
-	* gdb.hp/start-stop.c: new file.
-	* gdb.hp/sum.c: new file.
-	* gdb.hp/templates-hp.cc: new file.
-	* gdb.hp/thread-local-in-lib.c: new file.
-	* gdb.hp/thread-local-in-lib.h: new file.
-	* gdb.hp/thread-local-in-lib.lib.c: new file.
-	* gdb.hp/vforked-program.c: new file.
-	* gdb.hp/virtfunc-hp.cc: new file.
-	* gdb.hp/watchpoint-hp.c: new file.
-	* gdb.hp/xdb.c: new file.
-	* gdb.hp/xdb0.c: new file.
-	* gdb.hp/xdb0.h: new file.
-	* gdb.hp/xdb1.c: new file.
-
-Mon Dec 21 14:08:38 1998  David Taylor  <taylor@texas.cygnus.com>
-
-	The following change was made by Edith Epstein
- 	<eepstein@cygnus.com> as part of a project to merge in changes
- 	originally made by HP; HP did not create ChangeLog entries.
-
-	* gdb.c++/demangle.exp: changed the expected output for some
-	ARM-style mangling -- removed second reference to datatype.
- 	For example, maint demangle __dt__11T1__pt__2_cFv
-                     T1<char>::~T1<char>(void)
-	becomes,
-	             maint demangle __dt__11T1__pt__2_cFv
-                     T1<char>::~T1(void)
-
- 	(test_hp_style_demangling): new hp specific demangling test cases.
-
-Mon Dec 14 15:07:03 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.trace/actions.exp: Ignore compiler warnings compiling actions.c
-	* gdb.trace/backtrace.exp: Likewise.
-	* gdb.trace/circ.exp: Likewise.
-	* gdb.trace/collection.exp: Likewise.
-	* gdb.trace/deltrace.exp: Likewise.
-	* gdb.trace/infotrace.exp: Likewise.
-	* gdb.trace/limits.exp: Likewise.
-	* gdb.trace/packetlen.exp: Likewise.
-	* gdb.trace/passc-dyn.exp: Likewise.
-	* gdb.trace/passcount.exp: Likewise.
-	* gdb.trace/report.exp: Likewise.
-	* gdb.trace/save-trace.exp: Likewise.
-	* gdb.trace/tfind.exp: Likewise.
-	* gdb.trace/tracecmd.exp: Likewise.
-	* gdb.trace/while-dyn.exp: Likewise.
-	* gdb.trace/while-stepping.exp: Likewise.
-
-1998-12-07  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* gdb.base/restore.exp, gdb.base/restore.c: New tests.
-
-Wed Dec  2 20:03:53 1998  Stan Shebs  <shebs@andros.cygnus.com>
-
-	From Brendan Kehoe:
-	* gdb.c++/cplusfuncs.cc, misc.cc, virtfunc.cc: Add now-required
-	int return types.
-
-Sat Oct 24 18:04:22 1998  Felix Lee  <flee@cygnus.com>
-
-	* config/slite.exp (gdb_load): use gdb_file_cmd, so we can do
- 	remote dos host testing right.
-
-Mon Oct 19 01:31:59 1998  Felix Lee  <flee@cygnus.com>
-
-	* gdb.base/corefile.exp: remove some xfails.
-
-Thu Oct 15 10:04:38 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/reread.exp: Sleep 1 - ensures that the two executables
- 	have different timestamps.
-
-Thu Oct  1 20:56:14 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* lib/gdb.exp, gdb.base/default.exp, config/monitor.exp,
- 	gdb.base/default.exp: Replace "exec" with "executable".
-
-Tue Sep 29 15:06:29 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/default.exp: Change else if to elseif from previous
- 	delta.
-
-Mon Sep 28 13:21:43 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* gdb.base/default.exp: Add brace missing from previous delta.
-
-Mon Sep 21 14:39:27 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* gdb.base/default.exp: Support test for info float for all
-	varieties of arm toolchain.
-
-Fri Sep 18 14:07:44 1998  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.trace/*.exp: remove "remote_download" command.
-
-Wed Sep 16 11:38:21 1998  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.trace/*.exp: remove -gdwarf from compile.
-
-Wed Sep 16 01:23:11 1998  Felix Lee  <flee@cygnus.com>
-
-	* gdb.trace/configure.in(AC_INIT): typo
-	* gdb.trace/configure: regenerated
-
-Mon Sep 14 20:00:04 1998  Michael Snyder  <msnyder@cygnus.com>
-
-	* config/m68k-emc.exp: New file.
-	* lib/<emc-support.exp trace-support.exp}: New files.
-	* configure.in: add new test directory gdb.trace.
-	* gdb.trace/{configure configure.in Makefile.in}: New files.
-	* gdb.trace/{actions.c actions.exp gdb_c_test.c}: New files.
-	* gdb.trace/{circ.c circ.exp limits.c limits.exp}: New files.
-	* gdb.trace/{collection.c collection.exp tfind.exp }: New files.
-	* gdb.trace/{backtrace.exp deltrace.exp infotrace.exp}: New files.
-	* gdb.trace/{packetlen.exp passc-dyn.exp passcount.exp}: New files.
-	* gdb.trace/{report.exp save-trace.exp tracecmd.exp}: New files.
-	* gdb.trace/{while-dyn.exp while-stepping.exp}: New files.
-
-Fri Sep 11 13:58:02 1998  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.c++/classes.exp: Change all regular expressions to match
-	arbitrary combinations of newline/carriage-return, so that they
-	will work equally well on Unix and Windows.
-	* gdb.c++/inherit.exp: ditto.
-	* gdb.c++/virtfunc.exp: ditto.
-
-1998-08-11 Dawn Perchik  <dawn@cygnus.com>
-
-	* gdb.base/setshow.exp: Fix error introduced by call to runto_main.
-
-Fri Jul 24 15:51:34 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/am33.s: Add tests for autoincrement instructions.
-	* gdb.disasm/am33.exp: Run time.  Update tests which use r8-r15
-	to use a0-a3/d0-d3 as needed.
-
-Thu Jul 16 18:20:46 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/am33.s: Add 4 operand mul and mulu tests.
-	* gdb.disasm/am33.exp: Corresponding changes.
-
-1998-07-11  Felix Lee  <flee@cygnus.com>
-
-	* gdb.base/callfuncs.exp: add cmp10 test.
-	* gdb.base/callfuncs.c (cmp10): new function.
-
-Thurs Jul 9 11:08:31 1998  Dawn Perchik  <dawn@cygnus.com>
-
-	* gdb.base/commands.exp: Break up infrun_breakpoint_command_test
-	into two parts to get around a synchronization problem in expect.
-
-Fri Jun 26 14:27:13 1998  Keith Seitz  <keiths@cygnus.com>
-
-	* lib/gdb.exp (gdbtk_start): Add startup for gdbtk.
-
-	* configure.in: Add options for gdbtk testsuite.
-
-	* configure: Regenerate.
-
-	* gdb.gdbtk: New directory to hold gdbtk tests.
-
-Fri Jun 26 14:52:47 1998  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
-
-	* gdb.fortran/types.exp:  Escape brackets in expect patterns
-	for test_float_literal_types_accepted tests.
-	* gdb.base/scope.exp:  Remove extraneous newline in filelocal_bss
-	before run test.
-
-Fri Jun 26 11:12:17 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* am33.exp: Just compile, do not link the testcase.
-	* am33.s: Add ".am33" pseudoop to force am33 mode.
-
-1998-06-25  Felix Lee  <flee@cygnus.com>
-
-	* gdb.base/setshow.exp: make sure $pc is sane.
-
-	* gdb.stabs/weird.exp: split expect patterns properly.
-
-Wed Jun 24 13:03:15 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/am33.s: New disassembler testfile for the am33.
-	* gdb.disasm/am33.exp: Run it.
-
-Tue Jun 23 11:45:01 1998  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/funcargs.exp: simplify expect strings to ease pattern
-	match processing (and eliminate spurious timeouts when running).
-
-Fri Jun 12 17:28:22 1998  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/signals.exp (test_handle_all_print): put back Mach
-	exception test, but conditionalize it on target [mach | gnu].
-
-Wed Jun 10 10:40:03 1998  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/overlays.exp: fixup compile line for linker script.
-
-Thu Jun  4 21:54:15 1998  Felix Lee  <flee@zog.cygnus.com>
-
-	* gdb.fortran/types.exp: don't guess at float size.
-
-Thu May 21 02:28:37 1998  Felix Lee  <flee@zog.cygnus.com>
-
-	* gdb.base/exprs.exp: delete test that depends on int size.
-
-Sun May 17 17:10:22 1998  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/sim.exp: Removed checks for target triplets.
-	(gdb_target_sim): Use gdb,target_sim_options.
-
-Sat May 16 23:43:35 1998  Mark Alexander  <marka@cygnus.com>
-
-	* gdb.base/reread.exp: New file.
-	* gdb.base/reread1.c: New file.
-	* gdb.base/reread2.c: New file.
-
-Sat May 16 23:22:09 1998  Mark Alexander  <marka@cygnus.com>
-
-	* config/sim.exp: Use 'target sim -sparclite' when running
-	SPARClite programs.
-
-Sat May 16 18:48:08 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* gdb.base/structs2.exp: New file.
-	* gdb.base/structs2.c: New file.
-
-Wed May 13 13:36:14 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* gdb.asm/common.inc: New file.
-	* gdb.asm/d10v.inc: New file.
-	* asm-source.exp: Pass -I's to gas to find .inc files.
-	Update line numbers in expected output.
-	* asmsrc1.s: Rewrite.
-	* asmsrc2.s: Rewrite.
-	* configure.in: Create arch.inc symlink.
-	* configure: Regenerate.
-	* Makefile.in (distclean): Delete arch.inc.
-
-Wed May  6 10:30:54 1998  John Metzler  <jmetzler@cygnus.com>
-
-	*  callfuncs.c (t_enum_value1) : Cleanup return value warnings
- 	(t_enum_value2): ditto
- 	(t_enum_value3): ditto
- 	(main): ditto
-Fri May  1 09:33:37 1998  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
-
-	* gdb.base/break.exp:  Remove xfail for `deleting all breakpoints
-	when none' unexpected prompt case, fixed by breakpoint.c:delete_command
-	change.
-	Use gdb_test instead of send_gdb/gdb_expect sequences.
-
-Thu Apr 23 12:56:19 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-	* gdb.c++/virtfunc.cc: Declare extern "C" printf to return int,
-	not void.
-
-Thu Apr 16 10:52:34 1998  John Metzler  <jmetzler@cygnus.com>
-
-	* gdb.base/branches.c: Code with lots of loops and
- 	subroutines. Used to test gdbs ability to single step through PC
- 	changes, especially to test mips-tdep.c:mips_next_pc
-
-Mon Apr 13 22:32:51 1998 Frank Ch. Eigler <fche@cygnus.com>
-
-	* gdb.c++/virtfunc.cc: Make extern "C" printf declaration pass
-	more rigorous EGCS C++ error checking.
-
-Fri Apr 10 22:38:12 1998 Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-        * gdb.base/help.exp:  Clean up `help set args' and `help show args'
-        tests.
-        * gdb.base/interrupt.exp:  Add "i*86-*-solaris2*" xfail for calling
-        function when asleep.
-        * gdb.base/signals.exp:  Add "i*86-*-solaris2*" xfails. Add comment
-        for i*86 Linux and SVR4 signal handling problems.
-        Remove linux xfail for `next to handler in signals_tests_1', fixed
-        by recent infrun.c change.
-        Limit backtrace to 10 frames to avoid timeout problems with infinite
-        stack backtraces.
-        Adjust expect pattern in `handle all print' test to match Apr 28 1997
-        target.[ch] change.
-
-Tue Mar 31 00:40:32 1998  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_test): Send multiline commands one at a time; wait
-	for a newline from gdb before continuing.
-	(default_gdb_exit): Just look for y or n.
-	(gdb_test): Detect abnormal exit from GDB running on DOS; if
-	it does, fail the rests of the tests in the file.
-
-Tue Mar 24 22:44:52 1998  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/cygmon.exp: New file.
-
-Mon Mar 16 21:39:11 1998  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/list.exp: Fix problem with "list default lines around
- 	main" test on remote targets.
-
-	* gdb.base/scope.exp: Fix problem with filelocal_bss before
-	run test on remote targets.
-
-Thu Mar 12 16:23:00 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* gdb.asm: New directory.
-	* configure.in: Configure it.
-	* configure: Regenerate.
-	* gdb.asm/{Makefile.in,configure.in,configure}: New files.
-	* gdb.asm/{asm-source.exp,asmsrc1.s,asmsrc2.s}: New files.
-
-Mon Feb 23 08:22:44 1998  Mark Alexander  <marka@cygnus.com>
-
-	* config/mn10300-eval.exp: New file to support MN10300 eval board.
-
-Wed Feb 18 16:43:46 1998  Michael Snyder  (msnyder@cygnus.com)
-
-        * gdb.base/overlays (several files): Merge the two overlay
-        managers into one.  Change variables (foox, barx, bazx, grbxx)
-        back into ints but force them to load in their proper sections.
-
-Thu Feb 12 13:49:30 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/d10vovly.c (D10VTranslate): Map IMAP0 to low 128k of
- 	on-chip insn memory and IMAP1 to upper 128k.
-	(D10VCopy): Handle memory regions crossing 16k boundaries.
-	(D10VCopy): Transfer data in 32 bit chunks.
-
-Tue Feb 10 17:23:22 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/overlays.c (main): Exit normally when result is
- 	correct.
-
-	* gdb.base/d10v.ld: Update LMAs to reflect current d10v address
- 	map.  Include space for printf in .text segment.
-
-	* gdb.base/d10vovly.c (D10VTranslate): New function, handle
- 	updated d10v memory VMA/LMA map.
-	(D10VCopy): Call D10VTranslate.
-
-Fri Feb  6 14:13:12 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/m32rovly.c: Force variable _novlys into .data section.
-
-	* gdb.base/bar.c (barx, bar): Change variable to small array so
- 	that it won't be put into the .sdata - small data -
- 	section. Update reference.
-	* gdb.base/baz.c (bazx, baz): Ditto.
-	* gdb.base/foo.c (foox, foo): Ditto.
-	* gdb.base/grbx.c (grbxx, grbx): Ditto.
-
-	* gdb.base/overlays.exp: Expect variables barx, bazx, foox, grbxx
- 	to be arrays.
-
-Thu Jan 29 14:48:19 1998  Michael Snyder  (msnyder@cygnus.com)
-
-        * gdb.base/overlays.exp: fix up and get working again.
-        Add tests for backtraces from an overlay function.
-
-Fri Jan 23 07:52:45 1998  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/watchpoint.exp: Set "d10v*-*-*" clear_xfail for
-	"calling function with watchpoint enabled".
-
-Thu Jan 22 14:23:29 1998  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/break.exp (test_next_with_recursion): Remove
- 	gdb_suppress_tests for d10v-*-*.
-	* lib/gdb.exp (gdb_suppress_tests): Disable this function
-	pending review of whether it is useful or not.
-
-Tue Jan 20 13:02:09 1998  Mark Alexander  <marka@cygnus.com>
-
-	* gdb.base/funcargs.exp: Increase timeout for slow TX39 boards.
-
-Mon Jan 19 08:53:04 1998  Mark Alexander  <marka@cygnus.com>
-
-	* gdb.base/break.exp: Increase timeout for slow TX39 boards.
-	* config/dve.exp: New file to support Densan boards.
-
-Mon Dec 15 22:38:05 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/interrupt.exp: Document problem of simulators, signals,
- 	reads and BSD.
-
-Wed Nov 26 22:29:18 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/monitor.exp: Be a bit less picky about the "Remote debugging"
-	response.
-
-	* gdb.c++/misc.exp: Call runto_main instead of doint it manually.
-
-Tue Nov 25 12:46:36 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/mips_pro.exp: Add "mips64*-*-elf" xfail for backtrace
- 	test.
-
-	* gdb.base/funcargs.exp: Query GDB for target_sizeof_int,
- 	target_sizeof_long and target_bigendian_p.
-	(structs_by_value, structs_by_reference): Check values according
- 	to targets word size and endianess.
-
-Mon Nov 24 16:37:06 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.base/langs.exp: For "continue to exit" ignore any trailing
- 	output.
-
-Fri Oct 17 13:24:43 1997  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/default.exp, gdb.base/help.exp, gdb.base/setshow.exp:
- 	Update test of set args help to match source change.
-
-Fri Sep 26 17:36:20 1997  Jason Molenda  (crash@pern.cygnus.com)
-
-	* gdb.base/default.exp: Expect help system output to be in
-	alphabetical order.
-	* gdb.base/help.exp: Ditto.
-
-Wed Sep 24 13:08:14 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/signals.exp: Change "i*86-pc-linux-gnu" to
-	"i*86-pc-linux-gnu*".
-	* gdb.base/interrupt.exp: Ditto.
-	* gdb.base/corefile.exp: Ditto.
-
-	* lib/gdb.exp(gdb_compile): If is_vxworks target feature is set,
- 	define vxworks when building the testcase.
-
-	* gdb.base/ptype.exp: Fix testnames to be unique.
-	* gdb.base/radix.exp: Ditto.
-	* gdb.base/term.exp: Ditto.
-	* gdb.base/whatis.exp: Ditto.
-	* gdb.c++/classes.exp: Ditto.
-
-Tue Sep 16 22:21:48 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/callfuncs.exp: Fix indentation.
-
-	* lib/gdb.exp(gdb_expect): Set remote_suppress_flag if
-	suppress_flag has been set.
-	(gdb_step_for_stub): Check for gdb,use_breakpoint_for_stub
-	target feature.
-
-Mon Sep 15 15:43:17 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.stabs/weird.exp: Don't start gdb 'til after we've compiled
-	the testcase.
-
-	* gdb.c++/cplusfuncs.cc(main): Add extern "C" declaration for
- 	set_debug_traps() and breakpoint().
-	* gdb.c++/misc.cc (main): Ditto.
-	* gdb.c++/templates.cc (main): Ditto.
-	* gdb.c++/virtfunc.cc (main): Ditto.
-
-Fri Sep 12 16:56:38 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_step_for_stub): New function.
-	(gdb_run_cmd): Look for gdb,do_reload_on_run target feature--if it
-	exists, reload the executable and do a "continue" instead of
-	doing a jump.
-	(runto_main): Use gdb_step_for_stub.
-
-	* gdb.base/break.exp: Use gdb_step_for_stub. Also, rename certain
- 	tests to have unique names.
-	* gdb.base/callfuncs.exp: Ditto.
-	* gdb.base/commands.exp: Ditto.
-	* gdb.base/default.exp: Ditto.
-	* gdb.base/help.exp: Ditto.
-	* gdb.base/list.exp: Ditto.
-	* gdb.base/opaque.exp: Ditto.
-	* gdb.base/printcmds.exp: Ditto. Use a loop to emit multiple
-	similar tests.
-
-	* gdb.base/setshow.c: Add set_debug_traps/breakpoint calls.
-	* gdb.c++/cplusfuncs.cc: Ditto.
-	* gdb.c++/virtfunc.cc: Ditto.
-
-	* config/monitor.exp: Keep track of the last file we saw, rather
-	than trying to get the info from gdb.
-
-	* gdb.fortran/types.exp: Move comment to previous line.
-
-Tue Sep  2 19:55:34 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/sparclet.exp: Detect gratuitous change to sparclet gdb
- 	target mode.
-
-Mon Jul 28 12:14:47 1997  Stan Shebs  <shebs@andros.cygnus.com>
-
-	From Bob Manson:
-	* config/monitor.exp (gdb_target_monitor): Look for "Connected to"
- 	string from GDB when it connects.
-
-	* lib/gdb.exp: Look for $TOOL_EXECUTABLE.
-
-Thu Jul  3 15:35:12 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(get_debug_format): Don't cause the testsuite to fail
- 	if we can't get a debug format from GDB (we may be testing an
- 	older GDB). Use a 10 second timeout when checking for the format.
-
-	* gdb.stabs/weird.exp: Fix quoting.
-
-	* config/sparclet.exp: Renamed sparclet-loader.c to stub-loader.c.
-
-Mon Jun 30 18:31:43 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/arm-ice.exp: New file.
-
-Sun Jun 29 16:43:30 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/overlays.exp: Preliminary fixes; temporarily disabled
- 	until it has been modified to work with the new testsuite.
-
-	* gdb.*/*.exp: Instead of causing 1 unresolved test when the
- 	testcase won't compile, cause all of the testcases in the file to
- 	fail instead.
-
-	* lib/gdb.exp(gdb_suppress_entire_file): New procedure.
-	(gdb_clear_suppressed): New procedure.
-	(gdb_stop_suppressing_tests): Only clear suppress_flag if
-	it contains a positive value.
-
-Sat Jun 28 13:31:11 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(default_gdb_start): Use gdb_opts host feature.
-
-	* gdb.c++/virtfunc.exp: Remove setting of libs variable.
-
-Fri Jun 27 07:44:25 1997  Fred Fish  <fnf@cygnus.com>
-
-	* lib/gdb.exp (setup_xfail_format): New function.
-	(get_debug_format): New function to get debug format.
-	(debug_format): New global variable to hold last value set
-	by get_debug_format.
-	* gdb.base/list.exp: Call get_debug_format and expect some
- 	tests to fail for DWARF 1 and COFF formats.
-	* gdb.c++/ptype.exp: Ditto.
-	* gdb.c++/classes.exp: Ditto.
-	* gdb.c++/cplusfuncs.exp: Ditto.
-	* gdb.c++/inherit.exp: Ditto.
-	* gdb.c++/templates.exp: Ditto.
-	* gdb.c++/virtfunc.exp: Ditto.
-
-Wed Jun 25 09:08:51 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(default_gdb_exit): Don't give an error if the remote
-	host doesn't have a currently-open connection.
-
-	* config/sparclet.exp: Cleanups and fixes to make it generic for
- 	any gdb stub target. Handle cases where gdb doesn't respond when
- 	interrupted in a sane fashion.
-
-	* config/m32r-stub.exp: Load sparclet.exp instead of trying to do the
- 	same thing in a totally different way.
-
-	* config/monitor.exp: Pass in timeouts to gdb_expect instead of
- 	setting "timeout".
-	(gdb_start): We set the global gdb_prompt variable in
- 	default_gdb_init now.
-
-Sun Jun 22 09:11:02 1997  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/printcmds.exp: Fix "check for floating addition"
-	regexp to accept results within approx +/- .01 of exact value.
-	* lib/gdb.exp (gdb_test): Remove unused expect_out global decl.
-
-Wed Jun 18 11:11:39 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_init): Pass our arguments to default_gdb_init
- 	properly.
-	(gdb_expect): Add optional timeout parameter, and add timeout
-	value to various calls.
-	(gdb_suppress_tests): Only give one warning message per group.
-
-Tue Jun 17 13:10:10 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_expect): Declare errorInfo and errorCode as
- 	global variables. Handle getting a value for $timeout more
- 	gracefully.
-
-Sat Jun 14 09:23:26 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp: Close connection to remote host if gdb doesn't
- 	initialize.
-	(default_gdb_init): New procedure; allow gdb_init to be overridden
- 	by a target configuration file.
-	(gdb_expect): Pass the timeout to remote_expect.
-
-	* config/monitor.exp(gdb_load): Fix typo in regexp.
-
-Thu Jun 12 20:57:12 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/funcargs.exp: Remove spurious suppress tests call.
-
-Tue Jun  3 15:20:20 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/monitor.exp(gdb_target_monitor): Call gdb_file_cmd
- 	here. Call gdb_target_exec before rebooting the target, to make
- 	sure the connection to the target is closed.
-	(gdb_load): Pass the name of the executable to gdb_target_monitor.
-	Don't call gdb_file_cmd here; let gdb_target_monitor do it.
-	Also detect "Timeout reading from remote" error.
-
-	* config/gdbserver.exp: Pass the executable being loaded to
- 	gdb_target_monitor. Don't call gdb_file_cmd here; let
- 	gdb_target_monitor do it.
-
-	* gdb.disasm/hppa.exp: Don't use exec_output.
-
-Fri May 23 13:28:29 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/list.exp: If we're debugging a non-native target,
-	try to set the pc register to point to the start of the
-	program before doing the first list command.
-
-	* gdb.c++/virtfunc.exp(gdb_virtfunc_restart): Make sure we run
- 	test_calls after restarting.
-
-	* lib/gdb.exp(gdb_run_cmd): Send jump command again after
- 	reloading.
-
-	* gdb.base/watchpoint.exp: Fix typo.
-
-	* gdb.base/setshow.exp: Check for use_gdb_stub.
-
-	* gdb.base/break.exp: Fix continue until exit test for the gdb
- 	stub case.
-	* gdb.base/langs.exp: Ditto.
-
-	* config/monitor.exp(gdb_load): Handle gdb_sect_offset and
- 	gdb_load_offset. If we weren't given a file to load, figure out
- 	what the current file is and use it.
-
-	* config/i386-bozo.exp: New file.
-
-Thu May 22 18:51:32 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_expect): Look for gdb,timeout target
-	feature.
-
-	* config/proelf.exp: New entry.
-
-Wed May 21 21:23:16 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp: Remove spurious .* patterns at the beginning
-	of regexps.
-
-	* gdb.base/watchpoint.exp: Don't run the test_stepping
-	tests if gdb can't call functions on the target.
-
-	* gdb.base/setshow.exp: Don't run the set prompt tests if
-	the board has gdb_prompt set.
-
-Tue May 20 08:58:49 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/a2-run.exp: Change "gdb,noargs" to just "noargs".
-	* gdb.base/commands.exp: Likewise.
-	* gdb.base/setshow.exp: Likewise.
-
-Mon May 19 15:37:50 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/monitor.exp(gdb_start): Look for gdb_prompt target
-	feature.
-
-	* config/i960.exp: New file.
-
-Thu May  1 18:01:50 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/funcargs.exp: Check for gdb,short_int target
-	feature instead of looking for explicit target triplets.
-
-Mon Apr 28 17:27:40 1997  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/printcmds.exp: add a couple more tests a la
-	"p 123DEADBEEF", to check parse_number.
-	* top.c: change "to enable to enable" to "to enable" in a couple
-	of help strings.
-
-Thu Apr 24 14:38:18 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/callfuncs.exp: Mark some tests as expected to fail
-	on the mn10300.
-
-Mon Apr 21 15:05:42 1997  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/a2-run.exp: Add arm-*-coff setup_xfails for cases
-	where the test executable is run with explicit args.
-	* gdb.base/default.exp: Handle arm-*-coff case for "info float".
-
-Mon Apr 21 13:38:58 1997  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/run.c: Use FAKEARGV to build test executable that
-	does not require a command line arg, since most simulators
-	don't currently support passing such an arg into the simulated
-	program.
-	* gdb.base/commands.exp: Change tests to insert the proper
-	value as the arg to the first recursive factorial call.  Change
-	compilation line to define FAKEARGV at compile time.
-
-Wed Apr  9 11:12:36 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/recurse.exp: Enable these tests for the mn10300.
-	* gdb.base/watchpoint.exp: Don't expect a failure for an "calling
-	function with watchpoint enabled" test.
-
-Tue Apr  8 19:33:20 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/watchpoint.exp(test_watchpoint_triggered_in_syscall):
- 	Don't call gdb_test when the command doesn't return to a gdb prompt.
-
-	* lib/gdb.exp(gdb_stop_suppressing_tests): Don't print gratuitous
- 	"Tests restarted" messages.
-
-Tue Apr  8 16:38:46 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/mn10300.exp: Fix buglets in "other" tests.
-
-Thu Apr  3 15:21:26 1997  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/help.exp: update help msg for INFO ADDR; add help test
-	for INFO SYMBOL; add help tests for OVERLAY commands.
-	* gdb.base/default.exp: add tests for INFO SYMBOL command;
-	add tests for OVERLAY commands
-	* gdb.base/overlays.c overlays.exp foo.c bar.c baz.c grbx.c ovlymgr.h
-	d10v.ld m32r.ld d10vovly.c m32rovly.c: add test case for overlays.
-	* gdb.base/sigall.c: add usestubs code frag
-	* gdb.base/watchpoint.exp: turn on complex watchpoint test for M32R.
-
-Thu Apr  3 09:38:53 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_suppress_tests): Add explanation for subsequent
-	failures.
-	(gdb_stop_suppressing_tests): Note that tests have restarted.
-
-Wed Apr  2 19:04:20 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/h8300.exp: New file.
-
-Sun Mar 30 13:38:25 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/setshow.exp: Check for the existence of a
-	feature, not its value.
-
-Sat Mar 29 11:19:46 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.c++/virtfunc.exp: Restart gdb in a sane fashion.
-
-	* gdb.base/scope.exp: It's now init0(), not init().
-
-	* gdb.base/scope0.c: For now, change init() to be init0().
-
-	* config/monitor.exp: Use gdb_serial in preference to serial
-	or netport.
-
-	* lib/gdb.exp: Set GDB to [transform gdb] if we're using a remote host
- 	and it's not already set.
-
-Fri Mar 28 19:54:18 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/setshow.exp: Only test the run command if the target
- 	isn't using a stub and if it supports argument passing.
-
-Sat Mar 22 19:50:25 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/udi.exp(gdb_start): Make sure UDICONF is set
-	properly before starting gdb.
-
-Mon Mar 24 14:40:33 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/mn10300.s: New test file for mn10300 disassembler.
-	* gdb.disasm/mn10300.exp: Run mn10300 disassembler tests.
-	* gdb.disasm/Makefile.in: Remove "mn10300" when cleaning.
-
-Tue Mar 11 11:42:58 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/vx.exp: Use remote_ld, not vxworks_ld. Don't use
- 	specialized code to reboot the board, use remote_reboot instead.
-
-	* config/vxworks29k.exp: Use vx.exp, not vx-gdb.exp.
-
-	* lib/gdb.exp: Add GDB_TESTCASE_OPTIONS.
-
-	* config/monitor.exp: Make sure we disconnect from the target.
-	Also, try a reboot/reload cycle instead of failing if the
-	load fails.
-
-Fri Mar  7 13:48:30 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/default.exp: Don't set match_max.
-	* gdb.base/help.exp: Ditto.
-	* gdb.base/list.exp: Ditto.
-	* gdb.base/signals.exp: Ditto.
-
-	* config/monitor.exp(gdb_load): If gdb,use_standard_load is
-	set, use remote_ld to download the testcase instead of
-	the GDB loader.
-
-Wed Mar  5 00:00:43 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/vr5000.exp: New file.
-
-	* config/monitor.exp(gdb_target_monitor): Add pattern for
-	"Ending remote" to detect errors in connecting.
-
-	* gdb.base/setshow.exp: Add .* within auto language test.
-
-	* lib/gdb.exp(gdb_run_cmd): Add check for gdb_init_command
-	target feature.
-
-	* config/monitor.exp(gdb_load): Check for a failure when loading,
- 	and reboot the board if necessary.
-
-	* gdb.base/setvar.exp(test_set): Handle multiple prints within
-	a set of tests. Remove print.* from the patterns being checked.
-
-Mon Mar  3 11:57:43 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/a1-selftest.exp: Use send_gdb consistently. Don't
-	refer to gdb_spawn_id.
-
-	* config/m32r-stub.exp: Remove references to gdb_spawn_id, no
-	longer used.
-	* config/sparclet.exp: Ditto.
-	* config/sparclet-old.exp: Ditto.
-	* config/slite.exp: Ditto.
-	* config/sim.exp: Ditto.
-	* gdb.base/funcargs.exp: Ditto.
-
-	* lib/gdb.exp:Remove references to gdb_spawn_id.
-	(gdb_expect): Move to remote.exp.
-
-Fri Feb 28 20:47:39 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/monitor.exp: Detect the "Couldn't establish connection"
-	message from GDB.
-
-Tue Feb 25 14:08:55 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/bitfields.exp: Use runto instead of explicit
-	gdb_run_cmd/gdb_expect sequences.
-
-	* gdb.base/break.exp(text_next_with_recursion): Add match for
-	gdb_expect call.
-
-	* config/monitor.exp(gdb_target_monitor): Calling exit loses big.
-	We also need to handle the "A program is being debugged already"
-	prompt from gdb. Use gdb_test to set the baud rate.
-
-	* lib/gdb.exp(gdb_init): Increase the default expect buffer size
-	to 20000. Really. I mean it.
-
-Mon Feb 24 13:23:26 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_test): Generate a FAIL message when send_gdb
- 	fails. If suppress_flag is set, skip perror message about not
- 	being able to send to GDB.
-	(send_gdb): If suppress_flag is set, don't try to send commands to
- 	GDB.
-	(gdb_expect): If suppress_flag is set, always fail immediately.
-	(gdb_suppress_tests, gdb_stop_suppressing_tests): New functions.
-	(gdb_init): Call gdb_stop_suppressing_tests.
-	(default_gdb_exit): Ditto.
-	(default_gdb_start): Ditto.
-
-	* gdb.base/bitfields.exp: Call gdb_suppress_tests and
- 	gdb_stop_suppressing_tests as appropriate.
-	* gdb.base/break.exp: Ditto.
- 	* gdb.base/callfuncs.exp: Ditto.
-	* gdb.base/commands.exp: Ditto.
-	* gdb.base/exprs.exp: Ditto.
- 	* gdb.base/funcargs.exp: Ditto.
-	* gdb.base/list.exp: Ditto.
-	* gdb.base/recurse.exp: Ditto.
- 	* gdb.base/scope.exp:  Ditto.
-	* gdb.base/structs.exp: Ditto.
-	* gdb.c++/inherit.exp: Ditto.
-
-Sun Feb 23 19:56:02 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/vr4300.exp: New file.
-
-	* gdb.*/*.exp: Call gdb_expect instead of expect.
-
-	* lib/gdb.exp(gdb_expect): New function.
-
-Thu Feb 20 13:57:01 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_init): New function.
-
-	* gdb.base/setvar.exp(test_set): Don't bother printing a PASS/FAIL
- 	for each individual variable set.
-
-	* gdb.base/exprs.exp(test_expr): Make sure each test gets a unique
-	name.
-
-	* gdb.base/help.exp: Fix the syntax of a few gdb_test calls.
-
-	* gdb.base/scope.exp: Use gdb_test.
-
-	* gdb.base/ptype.exp: Don't call "gdb_exit; gdb_start" if we're
-	aborting; the testsuite driver will do that for us (see
-	gdb_finish). Also, use gdb_test in a few more places.
-
-Thu Feb 20 13:32:24 1997  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/help.exp: Fix syntax of "help info all-registers" test.
-
-Thu Feb 20 10:34:21 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/mn10200.s: Add "nop" after "main" so that "main"
-	and "add_tests" are not at the same address.
-
-Fri Feb 14 18:47:23 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/ptype.exp: Use gdb_test.
-
-Thu Feb 13 16:09:36 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/mn10200.s (misc_tests): Fix targets for "jsr" insns.
-	* gdb.disasm/mn10200.exp (misc_tests): Remove bogus line accidentally
-	left in.  No longer expect them to fail.
-
-	* gdb.stabs/*.mt; Deleted, no longer used.
-	* gdb.stabs/configure.in: Remove references to target makefile
-	frags.
-	* gdb.stabs/configure: Rebuilt.
-
-	* gdb.disasm/*.mt: Deleted, no longer used.
-	* gdb.disasm/configure.in: Remove references to target makefile
-	frags.  Use "sh3.s" as the unique filename for this directory.
-	* gdb.disasm/configure: Rebuilt.
-
-	* gdb.disasm/mn10200.s: New test file for mn10200 disassembler.
-	* gdb.disasm/mn10200.exp: Run mn10200 disassembler tests.
-	* gdb.disasm/Makefile.in: Remove "mn10200" when cleaning.
-
-Tue Feb 11 16:57:58 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/udi.exp: Use mondfe,name instead of remote_host.
-
-Tue Feb 11 11:22:36 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/watchpoint.exp: Don't expect a failure when calling
-	a function with a watchpoint enabled on the mn10200.
-
-	* gdb.stabs/weird.exp: Don't quit if "weird.s" doesn't exist
-	before trying to create it!
-
-Mon Feb 10 16:40:47 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/vx.exp: Use hostname instead of netport.
-
-	* config/vxworks.exp: New file.
-
-	* gdb.base/a2-run.exp: Change vxworks cases to use gdb_spawn_id.
-
-	* config/monitor.exp(gdb_target_monitor): Look for a prompt from
- 	gdb before assuming everything worked. Send a ^C if a timeout
-	occurs.
-
-	* lib/gdb.exp(gdb_test): Check the result of send_gdb. Use
-	$gdb_spawn_id directly.
-	(gdb_run_cmd): Try _start as well as start. Use the target feature
-	gdb,start_symbol as the symbol to start from when jumping.
-
-Mon Feb 10 11:26:59 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/exprs.exp: Delete bogus/incorrect (and probably
-	redundant) test.
-
-	* gdb.base/recurse.exp: Relax final value test for 'b' so that
-	it doesn't lose for 16bit integer systems.
-
-Fri Feb  7 09:31:21 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.fortran/types.exp: If the target doesn't support "double"
-	data types, then expect "real" types to only be 4 bytes.
-
-	* gdb.c++/virtfunc.exp: Expect failure for virtual function
-	call tests if the target doesn't support inferior function calls.
-
-	* gdb.base/printcmds.exp: Allow minor deviation in FP values
-	in printf tests.
-
-Thu Feb  6 12:46:14 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/help.exp: Disable "help set", "help show", and
-	"help support".  Simplify regexp for "help stack".
-
-	* gdb.base/default.exp: Set match_max to 5000 and the timeout
-	to 60 seconds.  Temporarily set match_max to 15000 around the
-	"info copying" test.
-
-	* gdb.base/nodebug.exp: Don't try to do an inferior function
-	call if the target doesn't support them.
-	* gdb.base/printcmds.exp: Likewise.
-	* gdb.base/setvar.exp: Likewise.
-	* gdb.base/structs.exp: Likewise.
-	* gdb.c++/templates.exp: Likewise.
-	* gdb.base/ptype.exp: Likewise.  Remove UDI specific stuff.
-
-	* gdb.base/recurse.exp: Enable for the mn10200.
-
-	* configure.in: Do configure gdb.stabs directory for *-*-elf
-	targets.
-	* configure: Rebuilt.
-
-	* gdb.base/break.exp: Check for gdb,noresults before testing
-	exit status and/or results from the target.
-	* gdb.base/watchpoint.exp, gdb.base/langs.exp: Likewise.
-	* lib/gdb.exp: Remove old (now bogus) initialization of
-	noinferior, noargs, noresults and nosignals.
-
-Tue Feb  4 21:52:17 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/sh.exp: New file.
-
-	* config/slite.exp: Try to connect multiple times to the board
-	before rebooting. Only send a "monitor run" if need_monitor_run
-	is set.
-
-	* gdb.base/break.exp: Don't do the "stub continue" test if
-	the target has gdb_stub set.
-
-	* gdb.base/callfuncs.exp: Increase the timeout.
-
-	* gdb.base/interrupt.exp: Don't even try to compile the testcase
-	if the target has gdb,noinferiorio set.
-
-	* gdb.base/list.exp: Increase match_max to 10000 characters.
-
-	* gdb.base/sigall.exp: Check for gdb,nosignals on the target.
-
-	* gdb.base/watchpoint.exp: Check for gdb,noinferiorio on the
-	target.
-
-	* lib/gdb.exp(gdb_run_cmd): Fix for targets that use stubs.
-
-Mon Feb  3 12:09:37 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/a1-selftest.exp: Make sure we call gdb_exit before
- 	trying to delete the copy of gdb. Catch the file delete so we
- 	don't die if the delete fails; also, the file should be copied to
- 	the host, not to the build.
-
-Sun Feb  2 00:55:14 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* lib/gdb.exp(gdb_test): Surround the result pattern with
- 	parenthesis in case it contains multiple regexps separated
-	with |.
-
-	* gdb.base/watchpoint.exp: Use gdb_test.
-	* gdb.base/default.exp: Ditto.
-
-Sat Feb  1 23:51:01 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.*/*.exp: Replace $prompt with $gdb_prompt.
-
-	* gdb.base/scope.exp: Use gdb_test.
-	* gdb.c++/classes.exp: Ditto.
-	* gdb.c++/inherit.exp: Ditto.
-
-Fri Jan 31 13:09:12 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* gdb.base/crossload.exp: Don't use execute_anywhere, use
-	remote_exec instead.
-	* gdb.base/corefile.exp: Don't be ridiculous.
-	* gdb.base/*.c: Add missing stub invocations.
-
-Thu Jan 30 16:49:25 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* config/slite.exp: Miscellaneous fixes.
-
-	* lib/gdb.exp: Fix runto.
-
-	* gdb.base/signals.exp: Check for a gdb,nosignals feature of
-	the target.
-
-	* gdb.base/watchpoint.exp: Fix regexp.
-
-	* lib/gdb.exp(default_gdb_exit): Add a catch to the
-	close and wait commands, as the descriptor may now be
-	invalid. Always call "remote_close host".
-
-Tue Jan 28 14:42:31 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	   Major rewrite for testsuite revision.
-
-	* lib/gdb.exp: Remove references to global CC, CXX, B_OPTIONS,
-	TARGET_INCLUDES, LDFLAGS and target_alias. Use gdb_spawn_id
-	instead of relying on spawn_id to always contain a valid
-	spawn id.
-	(get_compiler_info): New procedure to build the ${binfile}.ci
-	file, instead of replicating this in N different places.
-	(gdb_compile): New procedure.
-
-	gdb.*/*.exp: Use gdb_compile and get_compiler_info (with
- 	appropriate arguments) instead of compile. Use gdb_test in a lot
- 	more places.  Use send_gdb instead of send. Always run gdb_start
-	at the start of a testcase, as this is no longer done magically.
-
-	config/*-gdb.exp: Rename without the -gdb suffix.
-
-	config/mips.exp: Use remote_close instead of exit_remote_shell.
-	config/monitor.exp: Use target_info instead of looking at
-	baud, timeout, etc.
-	config/sim.exp: Use gdb_spawn_id instead of relying on spawn_id.
-
-Sat Dec 14 00:43:57 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.c++/templates.exp (test_ptype_of_templates),
-	gdb.c++/inherit.exp (test_ptype_si, test_print_anon_union):
-	Update expect patterns for destructors and assignment operators
-	to match corresponding c-typeprint.c changes.
-	* gdb.c++/templates.exp (test_template_breakpoints):  Revert change
-	to destructor breakpoint test, GDB should be able to set the
-	destructor breakpoint without specifying arguments.
-
-Tue Dec  3 20:17:52 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.threads/pthreads.exp: Change result for failure to compile due
-	to lack of pthreads runtime support from an error to simply an
-	unsupported test, per dejagnu standards.
-
-Sun Dec  1 00:18:59 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* lib/gdb.exp (gdb_test):  Simplify expect pattern for the case
-	where GDB exits to reduce pattern match time.
-	(skip_chill_tests):  Skip chill tests for mips*-sgi-irix6*.
-
-	* gdb.base/nodebug.exp:  Add mips*-sgi-irix6* xfails.
-
-Tue Nov 26 18:29:23 1996  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/callfuncs.exp: Turn on function call tests for h8300.
-	* gdb.base/default.exp:   ditto.
-	* gdb.base/nodebug.exp:   ditto.
-	* gdb.base/printcmds.exp: ditto.
-	* gdb.base/ptype.exp:     ditto.
-	* gdb.base/setvar.exp:    ditto.
-	* gdb.base/structs.exp:   ditto.
-	* gdb.base/setshow.c:     Guard against uninitialized values of argc.
-
-Tue Nov 26 17:23:28 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure, */configure: Rebuild with autoconf 2.12.
-
-Sat Nov 23 13:32:15 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/a1-selftest.exp: Change x86 linux setup_xfails to
-	use new i*86-pc-linux*-gnu quads.
-	* gdb.base/corefile.exp: Ditto.
-	* gdb.base/signals.exp: Ditto.
-	* gdb.base/sigall.exp: Ditto.
-	* gdb.base/interrupt.exp: Ditto.
-
-	* gdb.base/signals.exp (signal_tests_1): Remove setup_xfail
-	"i*86-*-linux" for "signal SIGUSR1".  Now works, at least with
-	RedHat 4.0.
-
-	* gdb.threads/pthreads.c (_MIT_POSIX_THREADS): Define if target is
- 	linux.  This allows the test case to at least compile on latest
- 	linux, but still not run due to missing the threads runtime library.
-
-Fri Nov 22 10:13:29 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/a1-selftest.exp (do_steps_and_nexts):  Reinitialize source
-	directory to search gdb directory. Accept and step over conditional
-	stack alignment code. Consume $prompt in failure cases.
-	Reset timeout to $oldtimeout instead of some arbitrary value.
-	* gdb.base/nodebug.exp:  Limit backtrace to 10 frames to avoid
-	timeout problems with infinite stack backtraces.
-	* gdb.base/ptype.exp (ptype struct link, union tu_link):
-	Accept function parameters for linkfunc member.
-
-Thu Nov 21 09:17:19 1996  Fred Fish  <fnf@cygnus.com>
-
-	* lib/gdb.exp (CFLAGS): Remove, unreferenced.
-	(CXXFLAGS): Remove, unreferenced.
-	(B_OPTIONS): Add for -B options and add code to initialize with
- 	previous -B options and also add -B option to pick up cross compiled
- 	runtime.
-	(TARGET_INCLUDES): Add for -I options and add code to initialize when
-	doing cross compiles.
-	(target_alias): Declare global.
-	(xgcc): Set variable to full path of gcc in build tree.  Use findfile
-	to verify that gcc exists in build tree, and if so set CC to that
-	gcc and to use B_OPTIONS and TARGET_INCLUDES.
-
-Tue Nov 12 16:20:13 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/inherit.exp (test_print_anon_union): Reenable
-	ptype test for anonymous union.  Fixup testcase to match
-	current gcc debug output.
-
-Mon Nov 11 14:12:06 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/funcargs.c: Use cast rather than "UL" suffix to
-	force argument to an unsigned long type.
-
-Mon Nov 11 10:27:55 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/inherit.exp (test_ptype_si): Fix tagless struct ptype
- 	tests and anonymous union print/ptype tests.
-	* gdb.base/list.exp (test_forward-search): Increase timeout by
-	5 minutes for the "search extremely long line" case.
-	* lib/gdb.exp (gdb_test): Document that the third arg to gdb_test is
-	completely optional and that the pass/fail messages use the command as
-	the message if that third arg is a null string.
-	(gdb_test_exact):  Arrange that a null string pattern means match a
-	null string output rather than any output, which might include random
- 	errors.
-	* gdb.base/mips_pro.exp: Add "mips*-sgi-irix4*" xfail for
-	backtrace test.
-	* gdb.c++/demangle.exp: Add a "*-*-*" xfail for test that was
-	always failing and failure is now exposed by gdb.exp changes.
-
-Sat Nov  9 11:13:24 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/inherit.exp (test_ptype_vi): Log some passes that
-	weren't being noted.
-
-Sat Nov  9 01:05:10 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/corefile.exp:  Consume $prompt in mmap fail cases.
-	* gdb.stabs/weird.exp:  Remove v_comb xfails.
-
-Tue Nov  5 10:44:23 1996  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/[bitfields.exp crossload.exp funcargs.exp interrupt.exp
-	            list.exp scope.exp watchpoint.exp]
-	  Make all timeout error msgs explicitly say "(timeout)".
-
-Mon Nov  4 12:03:06 1996  Michael Snyder  <msnyder@cygnus.com>
-
-	* config/monitor.exp: Increase download timeout to 1000 seconds.
-
-Mon Nov  4 12:02:26 1996  Michael Snyder  <msnyder@cygnus.com>
-
-	* config/m32r.exp: Increase timeout to 120 seconds.
-
-Sun Nov  3 14:37:05 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/classes.exp: Modify to handle current gcc C++ member ordering
-	and accept older ordering as obsolescent gcc or gdb.
-	* gdb.c++/templates.exp: Ditto.
-	* gdb.c++/virtfunc.exp: Ditto.
-
-Fri Nov  1 11:56:09 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/coremaker.c: Add code to mmap some data so we
-	can check that it ends up in the core file.
-	* gdb.base/corefile.exp: Add test to read mmapped data
-	from core file.
-
-Wed Oct 30 18:19:16 1996  Michael Snyder  <msnyder@cygnus.com>
-
-	* config/m32r.exp: New file.
-
-Mon Oct 21 14:40:50 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* testsuite/gdb.base/nodebug.exp:  Whack out -g options by hand so
-	that cflags can contains -gstabs, and work correctly for other tests.
-
-Mon Oct 21 14:00:37 1996  Michael Snyder  <msnyder@cygnus.com>
-
-	* gdb.base/setshow.exp: New file, tests show and set.
-	* gdb.base/setshow.c:   New file, tests show and set.
-	* gdb.base/help.exp: Add test for help set|show annotate.
-	* gdb.base/default.exp: Add test for set|show annotate.
-
-Wed Oct 16 19:03:54 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* testsuite/gdb.base/break.exp:  Make backtrace from factorial
-	errors unique.
-	* testsuite/gdb.base/nodebug.exp:  Whack out all -g options
-	explicitly.
-
-Tue Oct 15 16:45:02 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* config/sim-gdb.exp (gdb_target_sim):  Remove setting of height
-	and width commands.  This is done elsewhere.
-	* (gdb_start):  Don't call gdb_start_sim here.  That's already
-	done in gdb_load.  This fixes lots of failures in default.exp.
-
-Sun Oct 13 10:40:23 1996  Fred Fish  <fnf@cygnus.com>
-
-	From Peter Schauer <Peter.Schauer@Regent.E-Technik.TU-Muenchen.DE>:
-	* gdb.base/mips_pro.exp: Fix misplaced gdb_exit/gdb_start/gdb_load.
-	* lib/gdb.exp (gdb_test): Treat failures due to program exiting
-	in the same we we treat other failures (since it may be an expected
- 	condition), rather than as an error.
-	* gdb.base/signals.exp (test_handle_all_print): Revert back to
-	old test format.
-
-Fri Oct 11 17:05:22 1996  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (clean mostlyclean): Also remove chill *.grt files.
-	(distclean maintainer-clean realclean): No need to remove files
- 	twice.  Nuke the duplicates.
-	* gdb.base/Makefile.in (EXECUTABLES): Add "structs".
-	* gdb.threads/Makefile.in (distclean maintainer-clean realclean):
-	Remove config.h along with other config files.
-
-Mon Sep 30 20:16:22 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/interrupt.exp: Add i*86-*-linux* setup_xfail for
-	"p func1 ()" and note that rests of tests are skipped.
-	* gdb.base/corefile.exp: Add i*86-*-linux* and m68*-*-hpux*
- 	setup_xfails for "print func2::coremaker_local".
-	Add i*86-*-linux* setup_xfail for "backtrace in corefile.exp".
-	* gdb.base/mips_pro.exp: Restart gdb in this test so it isn't
-	affected by the previous run test.
-	* gdb.chill/misc.exp: Add m68*-*-hpux* setup_xfails for
-	"print array () ubyte (foo)" and "print/x array () byte (\$i)"
-	* gdb.chill/pr-8742.exp: Add m68*-*-hpux* setup_xfails for
-	"pass int powerset tuple" and "pass modeless int powerset tuple".
-	* gdb.chill/tests2.exp: Add m68*-*-hpux* setup xfails for
-	"real write 4" and "real write 8".
-	* gdb.shill/tuples.exp: Add i*86-*-linux* and m68*-*-hpux*
- 	setup_xfails for "print vs1 after tuple assign 2",
-	"print \$i after tuple assign 2", and
-	"print vs2 after tuple assign 2".
-	* lib/gdb.exp (gdb_test): When a gdb aborts, print a more
-	meaningful error message and return -1 so the caller can
-	suppress further tests and avoid a cascade of errors.
-
-Fri Sep 27 10:34:51 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/a1-selftest.exp: Tweak tests to account for new
-	format for printing version.
-	* gdb.base/default.exp: Ditto.
-	* gdb.base/interrupt.exp: Fix problem with cascade of
-	errors if child process dies while calling a function.
-
-Fri Sep 13 21:43:48 1996  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (VPATH): Add
-	* Makefile.in (Makefile, config.status): Fix rules so things get
-	remade when necessary.
-
-Fri Sep 13 18:16:10 1996  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (just-check): Add path to sibling expect dir
-	to environment variable specified by RPATH_ENVVAR.
-
-Fri Sep 13 12:05:34 1996  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (RPATH_ENVVAR): New var, set to @RPATH_ENVVAR@.
-	(just-check): Add shared library paths for libstdc++, tk,
-	tcl, bfd, and opcodes to the environment variable specified
-	in RPATH_ENVVAR.
-	* configure.in: Add support to recognize --enable-shared flag
-	and generate correct value for RPATH_ENVVAR.
-	* configure: Regenerated with autoconf.
-
-Mon Sep  2 06:36:02 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/break.exp: Expand "Delete all breakpoints" xfail to
- 	include all osf versions.
-	* gdb.threads/pthreads.exp: Expand "run to main" xfail to include
-	all osf versions.  Add -D_MIT_POSIX_THREADS to compilation command
-	when target is linux.  When failing to build pthreads test
-	executable, give more meaningful message.
-	* gdb.threads/pthreads.c: Hpux also uses old definition of second
-	arg for pthread_create.
-
-Mon Aug 19 09:58:59 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.threads/pthreads.c (PTHREAD_CREATE_ARG2,
- 	PTHREAD_CREATE_NULL_ARG2): Accomodate old pthreads implementations.
-	* gdb.threads/pthreads.exp: Try linking with both -lpthread (Solaris)
- 	and -lpthreads (everybody else).
-	(test_startup): Fail gracefully if threads are not supported.
-	* gdb.base/nodebug.exp: Add setup_xfail hppa*-*-hpux* for
-	"p/c array_index("abcdef",2)" when not gcc compiled.
-	* gdb.base/corefile.exp: Add setup_xfail hppa*-*-hpux* for
-	"print func2::coremaker_local" when not gcc compiled.
-	* gdb.base/opaque.exp: Remove setup_xfail hppa*-*-hpux* for
-	"ptype on opaque struct tagname (statically)",
-	"ptype on opaque struct tagname (dynamically) 1", and
-	"ptype on opaque struct tagname (dynamically) 2"
-	for not compiled with gcc.
-	* gdb.base/mips_pro.exp: Only do setup_xfail hppa*-*-* for
-	backtrace when compiled with gcc.
-	* lib/gdb.exp (runto_main): Return result of "runto main" rather
-	than always return success.
-
-Sat Aug 17 13:28:00 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/virtfunc.exp: Remove setup_xfail for "mips-*-irix5*".
-
-Tue Aug 13 10:26:10 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/structs.exp: Undo last change.
-
-Mon Aug 12 15:29:08 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/a1-selftest.exp (do_steps_and_nexts): New routine to
-	encapsulate all the steps/nexts done during self test, starting
-	at main, and makes them less sensitive to optimization issues.
-	Add "hppa*-*-hpux*" to setup_xfail for "backtrace through
-	signal handler" test.
-	* gdb.threads/pthreads.exp: Only run this for native configs.
-	* gdb.base/structs.exp (do_function_calls): Add hppa*-*-hpux9*"
-	setup_xfails for "p fun5()", "p fun6()", "p fun7()", and "p fun8"
-	tests.
-	gdb.c++/virtfunc.exp (do_tests): Add "mips-*-irix5*" setup_xfail
-	for "runto test_calls(void)" test.
-
-Sun Aug 11 13:11:24 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/term.exp: Set 7-bit strings, address off, width to 0,
-	and don't expect address info in breakpoint confirmations.
-
-Wed Aug  7 20:47:43 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/list.exp (test_forward_search): Increase timeout
-	temporarily by 60 seconds for searching extremely long line,
- 	and then reset to old value when done.  Increase expect input
-	buffer to 10000.
-
-Wed Aug  7 15:34:22 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/list.exp (test_forward_search): Fix to handle very
-	long source line without overflowing expect's input buffer.
-
-Wed Aug  7 12:03:25 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	* config/slite-gdb.exp (gdb_start): Use "full_buffer", not
-	"buffer_full".
-
-	* config/nind-gdb.exp (gdb_start): Use "full_buffer", not
-	"buffer_full".
-
-	* config/mips-gdb.exp (gdb_start): Use "full_buffer", not
-	"buffer_full".
-
-	* lib/gdb.exp (gdb_test): Correct pattern is "full_buffer", not
-	"buffer_full".
-
-Wed Aug  7 11:05:47 1996  Fred Fish  <fnf@cygnus.com>
-
-	* configure.in (configdirs): Add gdb.threads.
-	* configure: Regenerated with autoconf.
-	* gdb.threads/{config.in, pthreads.c, pthreads.exp}: New.
-	* gdb.threads/{Makefile.in, configure.in}: Complete rewrites.
-	* gdb.threads/configure: New, generated with autoconf.
-
-Tue Aug  6 10:23:04 1996  Tom Tromey  <tromey@rtl.cygnus.com>
-
-	* lib/gdb.exp (gdb_test_exact): Turn \n in pattern into \r\n.
-
-Mon Aug  5 18:11:53 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/signals.exp (test_handle_all_print): Test separately for
-	each signal's status in the output of "handle all print".
-	* lib/gdb.exp (gdb_test): Document that the pattern must NOT include
-	the \r\n sequence that immediately precedes the gdb prompt.
-	* gdb.base/a1-selftest.exp: Save original timeout and restore
-	after test.
-
-Sun Aug  4 10:20:50 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/hppa.s: Export fmemLRbug_tests_4 as a ST_CODE
-	symbol.
-
-Fri Aug  2 17:37:26 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>
-
-	* config/vx-gdb.exp (gdb_start): Fix syntax of `$shell_id < 0'.
-
-Thu Jun 27 20:41:40 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/signals.exp (test_handle_all_print): Temporarily increase
-	timeout by 60 seconds.
-
-Thu Jun 27 18:13:57 1996  Fred Fish  <fnf@cygnus.com>
-
-	* config/unix-gdb.exp: Increase default timeout from 30 to 60 sec.
-	* config/netware.exp (gdb_run_cmd): Restore old timeout before doing
-	error return.
-
-Thu Jun 27 10:54:58 1996  Fred Fish  <fnf@cygnus.com>
-
-	* lib/gdb.exp (default_gdb_start): When reporting a timeout during
-	gdb initialization, also report how long dejagnu waited.  Restore
-	old timeout before doing error return.  Temporarily increase timeout
- 	by 3 minutes to allow for slow startups over heavy NFS use.
-
-Tue Jun 25 19:59:17 1996  Fred Fish  <fnf@cygnus.com>
-
-	* lib/gdb.exp: Report timeout value for verbosity level 2.
-	* config/gdbserver.exp: Ditto.
-	* config/hppro.exp: Ditto.
-	* config/mips-gdb.exp: Ditto.
-	* config/monitor.exp: Ditto.
-	* config/netware.exp: Ditto.
-	* config/sim-gdb.exp: Ditto.
-	* config/slite-gdb.exp: Ditto.
-	* config/udi-gdb.exp: Ditto.
-	* config/unix-gdb.exp: Ditto.
-	* config/vx-gdb.exp: Ditto.
-	* gdb.base/a1-selftest.exp: Ditto.
-	* gdb.base/a2-run.exp: Ditto.
-	* gdb.base/break.exp: Ditto.
-	* gdb.base/corefile.exp: Ditto.
-	* gdb.base/list.exp: Ditto.
-	* gdb.base/recurse.exp: Ditto.
-	* gdb.base/scope.exp: Ditto.
-	* gdb.base/signals.exp: Ditto.
-
-Tue Jun 25 23:16:58 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* gdb.threads/Makefile.in (docdir): Removed.
-
-Tue Jun 25 17:02:39 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* configure.in (AC_PREREQ): autoconf 2.5 or higher.
-	* gdb.{base,c++,chill,disasm,stabs}/Makefile.in (VPATH): set to
-	@srcdir@.
-	* gdb.{base,c++,chill,disasm,stabs}/configure.in (AC_PREREQ):
-	autoconf 2.5 or higher.
-	* gdb.{base,c++,chill,disasm,stabs}/configure: Rebuilt.
-
-Thu Jun 13 11:16:10 1996  Tom Tromey  <tromey@thepub.cygnus.com>
-
-	* configure: Regenerated.
-	* aclocal.m4 (CY_AC_PATH_TCLH, CY_AC_PATH_TKH): Use odd names to
-	avoid name clashes with SunOS headers.
-
-Wed Jun  5 16:43:27 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.c++/virtfunc.exp: Search $objdir/../../libstdc++ for libstdc++.
-
-Thu May 30 11:35:11 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/callfuncs.exp: Finish last change -- make sure the
-	prototype information ends up in the compiler info file.
-
-Thu May 23 12:48:41 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/callfuncs.exp: Remove the compiler info file prior to
-	attempting to regenerate it.  Eliminate use of a temporary file
-	and just generate the info file directly.  Source it immediately,
-	for consistency of use.
-	* gdb.base/corefile.exp: Ditto
-	* gdb.base/exprs.exp: Ditto.
-	* gdb.base/funcargs.exp: Ditto.
-	* gdb.base/langs.exp: Ditto.
-	* gdb.base/list.exp: Ditto.
-	* gdb.base/mips_pro.exp: Ditto.
-	* gdb.base/nodebug.exp: Ditto.
-	* gdb.base/opaque.exp: Ditto.
-	* gdb.base/ptype.exp: Ditto.
-	* gdb.base/scope.exp: Ditto.
-	* gdb.base/setvar.exp: Ditto.
-	* gdb.base/signals.exp: Ditto.
-	* gdb.base/whatis.exp: Ditto.
-	* gdb.c++/templates.exp: Ditto.
-	* gdb.c++/virtfunc.exp: Ditto.
-	* gdb.c++/virtfunc.exp: Use contents of gcc_compiled to decide
- 	whether or not to add -lstdc++ to the compile command line args.
-
-Sat May 18 02:43:58 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/recurse.exp:  Remove setup_xfail for "sparc*-*-sunos4*",
-	it got fixed by the recent lookup_minimal_symbol_by_pc change.
-	Increase timeout, a lot of single stepping might be needed if the
-	target has no hardware watchpoints.
-
-Wed May 15 08:47:42 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/break.exp: Ignore compiler warnings when compiling
-	break.c.
-	* gdb.base/callfuncs.exp: Don't run these tests on the h8300.
-	* gdb.base/default.exp: Add h8300 xfails.  Handle messages
-	from remote-sim.
-	* gdb.base/exprs.exp: Add h8300 xfails.
-	* gdb.base/funcargs.exp: Likewise.
-	* gdb.base/nodebug.exp: Likewise.
-	* gdb.base/printcmds.exp: Likewise.
-	* gdb.base/ptype.exp: Likewise.
-	* gdb.base/setvar.exp: Handle sizeof (int) != 4 for h8300.  Add
-	h8300 xfails.
-	* gdb.base/return.exp: Handle float/double precision problems
-	on the h8300.
-	* gdb.base/funcargs.c: Explicitly make last constant argument to
-	call_after_alloca_subr an unsigned long type.
-	* gdb.base/return.c: Include stdio.h.
-
-Tue May  7 22:01:12 1996  Rob Savoye  <rob@chinadoll.cygnus.com>
-
-	* config/abug.exp: New file for the older Motorola Bug monitor
-	that runs on the mvme13x series VME boards.
-	* config/monitor.exp: Use the new config array for target settings
-	if they exist.
-
-Fri May  3 16:02:55 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* sim-gdb.exp: Make the SH simulator allocate less space when
-	it is targeted.
-
-Thu May  2 12:31:56 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/mips_pro.exp: Expect failure for hppa*-*-* in backtrace
-	test.
-
-Wed Mar 20 08:48:03 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/list.exp (test_list_function): Remove setup_xfail for
-	"rs6000-*-*" for "list function in include file" when gcc compiled.
-	* gdb.base/printcmds.exp: Remove setup_xfail for "rs6000-*-aix*"
-	for "p ctable1[120]".
-	* gdb.base/scope.exp: Remove setup_xfail for "rs6000-*-*" for
-	"print 'scope0.c'::filelocal_bss before run" when gcc compiled.
-	Remove setup_xfail for "rs6000-*-*" for
-	"print 'scope0.c'::filelocal before run".
-	* gdb.base/{langs.exp, lists.exp, opaque.exp, scope.exp},
-	gdb.stabs/weird.exp: Remove use of compiler options "-c -o ..."
-	since some compilers don't allow both options to be given
-	on the same command line.  Create object file and move it.
-
-Tue Mar 19 23:49:31 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/corefile.exp: Always regenerate the core file, since
-	we always regenerate the coremaker program.  Detect special case
-	where registers cannot be read from core file.
-
-Tue Mar 19 16:52:49 1996  Fred Fish  <fnf@cygnus.com>
-
-	From Peter Schauer <Peter.Schauer@Regent.E-Technik.TU-Muenchen.DE>
-	* gdb.base/funcargs.c: Patch for SPARCworks alloca compatibility
-	* gdb.c++/templates.exp: Only match on basename of file since
-	some formats like xcoff don't encode directory information.
-	* gdb.stabs/weird.exp: Use the right sed script for powerpc
-	and rs6000 AIX xcoff targets.
-	* configure.in: Add stabsdirs to configdirs for powerpc-*-aix*.
-	* configure: Regenerate.
-	* gdb.base/Makefile.in (clean): Remove generated file twice-tmp.c
-	here, rather than in distclean.
-
-Sun Mar 17 13:35:31 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/mips_pro.exp: Create mips_pro.ci to get gcc_compiled
-	defined, and use it to compile the test case with -O2.  The
-	native compilation still uses no optimization.
-	* gdb.base/mips_pro.c: Remove inline assembly code since
-	it is compiled PIC by default, which results in assembler
-	warnings that make the testsuite think the compilation
-	was unsuccessful.
-
-Sat Mar 16 15:02:24 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/misc.exp: Add note to message for
-	"print s.a for foo struct" that this is a known gcc 2.7.2
-	and earlier bug.
-
-Fri Mar 15 17:49:57 1996  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.base/break.exp: Fix pattern for matching "Delete all
-	breakpoints (y or n) ".  Add "mips-dec-ultrix*" to
-	setup_xfail for deleting all breakpoints test.  Fix various
-	timeout messages to include "(timeout)".
-	* gdb.base/callfuncs.exp: Add "i*86-*-sysv4*" to setup_xfail
-	for "p t_float_values2(3.14159,float_val2)".
-	* gdb.base/funcargs.exp: Remove "mips-sgi-irix4*" setup_xfail
-	for "continue to call2g" when gcc compiled.
-	* gdb.base/langs.exp: Remove "i*86-*-sysv4*" setup_xfail for
-	"up to foo in langs.exp", "show language at foo in langs.exp",
-	"show language at cppsub_ in langs.exp", "up to fsub in langs.exp",
-	and "show language at fsub in langs.exp".
-	* gdb.base/list.exp: Remove "*-*-sysv4*" setup_xfail for
-	"list line 1 in include file", "list message for lines past EOF",
-	"list function in include file", "list list0.h:foo", and
-	"list filename:function; nonexistant function".
-	* gdb.base/ptype.exp: Change "i*86-*-sysv4*" setup_xfail for
-	"whatis unnamed typedef'd enum (compiler bug in IBM's xlc)"
-	and "ptype t_char_array" to be for native cc only.
-
-Fri Mar 15 16:17:22 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/corefile.exp: Remove "alpha-dec-osf2*" native compiled
-	setup_xfail for "print coremaker_bss", "print coremaker_ro",
- 	"print func2::coremaker_local", and "backtrace in corefile.exp".
-
-Wed Mar 13 14:54:11 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/signals.exp: Remove "alpha-*-osf2*" setup_xfail for
-	"bt in signals.exp".  This problem only appears when running
-	the testsuite, and then only intermittently.
-
-Tue Mar 12 15:00:16 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/return.exp (return_tests): Differentiate between
-	two tests of continuing.
-
-Tue Mar  5 14:33:33 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* */Makefile.in (maintainer-clean): Remove config.log.
-	* gdb.base/Makefile.in (EXECUTABLES): Replace twice with twice-tmp.
-	* gdb.c++/Makefile.in (PROGS): Add inherit.
-	(clean): Remove *.ci.
-
-Tue Feb 20 16:36:10 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/misc.cc: Add test code from Mike Stump.
-	* gdb.c++/misc.exp: Add test to print s.a, for Mike Stump.
-
-Sun Feb 18 11:39:12 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/signals.exp: Change setup_xfail for "alpha-*-osf2"
-	to "alpha-*-osf2*" and add comment.
-	* gdb.base/a1-selftest.exp (test_with_self): Remove "alpha-dec-osf2*"
- 	setup_xfail for "step over execarg initialization" and
- 	"step over corearg initialization".
-	* gdb.base/callfuncs.exp (do_function_calls): Restore setup_xfail
-	for "hppa*-*-*", "sparc-*-*", "mips*-*-*", and "alpha-dec-osf2*".
-	* gdb.base/corefile.exp: Add "alpha-dec-osf2*" setup_xfail when not
- 	gcc compiled for "print coremaker_bss", "print coremaker_ro",
-	"print func2::coremaker_local", and "backtrace in corefile.exp".
-	* gdb.base/signals.exp: Build and source signals.ci.
-	Change "alpha-dec-osf2*" setup_xfail for "bt in signals.exp"
-	to be for gcc only.
-	* lib/gdb.exp: Move verbose statements outside conditionals.
-
-Sat Feb 17 02:22:14 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/sigall.exp:  Remove setup_xfail for irix4.  Fixed by
-	Feb 3 procfs.c change.
-
-Fri Feb 16 13:25:31 1996  Fred Fish  <fnf@cygnus.com>
-
-	* config/unix-gdb.exp: Remove extraneous newlines from end of file.
-
-Thu Feb 15 08:12:55 1996  Fred Fish  <fnf@cygnus.com>
-
-	* config/unix-gdb.exp: Default timeout in UNIX case to 30 seconds, up
-	from dejagnu's apparent default of 10 seconds, which gives random
-	results when running the tests over NFS on moderately loaded systems.
-	* lib/gdb.exp (gdb_run_cmd): Add "(timeout)" in timeout case.
-
-Mon Feb 12 16:50:28 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/callfuncs.exp: Remove setup_xfail for PR 5318.  Now fixed.
-	* gdb.base/a2-run.exp: Replace $binfile with $testfile in test
- 	result reports.
-
-Fri Feb  9 15:56:51 1996  Fred Fish  <fnf@cygnus.com>
-
-	* configure.in (CY_AC_PATH_TCLH): Remove.
-	* configure: Regenerate.
-
-Fri Feb  9 08:21:31 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/Makefile.in (clean): Add missing '{'.
-
-Fri Feb  2 10:19:40 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* lib/gdb.exp: Provide a default value for noinferior.
-
-	* lib/gdb.exp: Fix typos (LDLAGS -> LDFLAGS).
-	Load libgloss.exp.
-
-Thu Feb  1 20:20:14 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/hppa.exp: Compile directly into an executable, use
-	the executable, not the .o to run the tests from.
-
-Wed Jan 31 14:21:09 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/break.exp: Don't test for program exit or exit status
-	if $noresults if nonzero.
-	* gdb.base/langs.exp: Likewise.
-	* gdb.base/watchpoint.exp: Likewise.
-
-	* gdb.base/default.exp: Remove extraneous call to load gdb.exp.
-	* gdb.chill/pr-8405.exp: Move skip_chill_tests check to just before
-	trying to compile the testcase.
-
-Wed Jan 24 23:42:39 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* gdb.base/interrupt.exp (p func1): xfail sparc64-*-solaris2.
-	* gdb.base/signals.exp (continue to handler): Likewise.
-
-Tue Jan 23 16:28:22 1996  Per Bothner  <bothner@kalessin.cygnus.com>
-
-	* gdb.c++/classes.exp:  Now = returns false/true, not 1/0.
-
-	* gdb.fortran/exprs.exp:  .LT. and .GT. now return .TRUE. or .FALSE..
-
-Tue Jan 23 15:41:57 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/corefile.exp: Recognize "not found" as failure
-	when trying to determine if a core file was generated.
-	If no core file was generate the first time, try again without
-	the ulimit -c to work around braindamaged shells.
-
-Mon Jan 15 09:33:00 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.stabs/configure.in (alpha-*-*,mips-*-*): Replace
-	[] tests with "test" and enclose string in quotes.
-	* gdb.stabs/configure: Rebuild
-
-Thu Jan 11 09:43:14 1996  Tom Tromey  <tromey@creche.cygnus.com>
-
-	Changes in sync with expect:
-	* aclocal.m4 (CY_AC_PATH_TCLH): Handle Tcl 7.5 and greater.
-	(CY_AC_PATH_TCLLIB): Handle Tcl 7.5 and greater.
-	(CY_AC_PATH_TKH): Handle Tk 4.1 and greater.
-	(CY_AC_PATH_TKLIB): Handle Tk 4.1 and greater.  Properly quote
-	argument to AC_REQUIRE.
-	* configure: Regenerated.
-
-Thu Jan  4 08:17:22 1996  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/corefile.exp: When generating a core, discard any
-	error messages about ulimit not found and the "core dumped"
-	message from the shell that runs the coredumper.
-
-Wed Jan  3 01:30:41 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* lib/gdb.exp (skip_chill_tests): Skip them on the PA too.
-
-	* gdb.stabs/weird.exp: Use ${target_triplet} to determine
-	which sed script to run.  Expect failure for v_comb test
-	on PA targets too.
-
-Sat Dec 30 16:09:04 1995  Fred Fish  <fnf@rtl.cygnus.com>
-
-	* gdb.base/corefile.exp: Remove "i*86-*-linux" xfail for
- 	"print func2::coremaker_local" and for "backtrace in corefile.exp"
-
-Sat Dec 30 12:59:12 1995  Fred Fish  <fnf@cygnus.com>
-
-	* lib/gdb.exp: Fix typo and rewrite skip_chill_tests.
-	* gdb.stabs/weird.exp: Setup "sparc-sun-sunos4*" and
- 	"sparc-sun-solaris*" xfails for "p v_comb".
-	* lib/gdb.exp (default_gdb_start): Fix typo.
-	* gdb.base/corefile.exp: Allow "Core was generated by ..."
-	messages to not include the full program name that caused
-	the core dump since some systems (such as solaris) apparently
-	truncate this path to about 80 characters.
-	When generating a core file first try increasing the core file
-	size limit to unlimited since some systems may default it to
-	zero, and it is harmless to try it.  Move the test for failing
-	to generate a core file to where it will actually get executed.
-	* gdb.c++/templates.exp (test_ptype_of_templates): Accept
-	new gdb result from g++ debug info improvements and make old
-	pattern obsolescent.  Also account for size_t differences
-	(may be int or long).
-	* gdb.base/a1-selftest.exp (test_with_self): Check for case where
-	initialization before function call is placed in the delay slot
-	and thus appears to be skipped over by commands such as "next".
-
-Fri Dec 29 16:09:20 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/a1-selftest.exp (test_with_self): Run without windows.
-
-Wed Dec  6 10:45:42 1995  Jeffrey A. Law  <law@sethra.cygnus.com>
-
-	* gdb.base/*.exp: Make ${srcfile} only be the basename of the
-	input source file; fix code to compile test to deal with this
-	convention.
-	* gdb.c++/*.exp: Likewise.
-
-Mon Nov 27 11:40:16 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/signals.exp: Setup "alpha-*-osf2*" xfail for
-	"bt in signals.exp".
-
-Sat Nov 25 20:52:15 1995  Fred Fish  <fnf@phydeaux.cygnus.com>
-
-	* gdb.base/a1-selftest.exp: Add alpha-dec-osf2 setup_xfail for
-	"step over execarg initialization" and
- 	"step over corearg initialization".
-
-Sat Nov 25 18:20:14 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/ptype.c (main): Declare malloc as a "char *" for systems
-	with sizeof(pointer) > sizeof(int).  Avoid "void *" or include files.
-
-Sat Nov 25 11:03:42 1995  Fred Fish  <fnf@cygnus.com>
-
-	From Rob Savoye  (rob@poseidon.cygnus.com)
-	* Makefile.in, configure.in, gdb.base/{Makefile.in, configure.in},
-	gdb.c++/{Makefile.in, configure.in}, gdb.chill/{Makefile.in,
- 	configure.in}, gdb.disasm/{Makefile.in, configure.in},
- 	gdb.stabs/{Makefile.in, configure.in}, gdb.threads/{Makefile.in,
- 	configure.in}: Major reworking for autoconfig.
-	* aclocal.m4, configure, gdb.base/configure, gdb.c++/configure,
-	gdb.disasm/configure, gdb.stabs/configure, gdb.stabs/default.mt :
- 	New files.
-	* config/unix-gdb.exp:  Make GDB global.
-	* gdb.base/{a1-selftest.exp, a2-run.exp,bitfields.exp, break.exp,
- 	callfuncs.exp, commands.exp, corefile.exp, crossload.exp, exprs.exp,
- 	funcargs.exp, interrupt.exp, langs.exp, list.exp, mips_pro.exp,
- 	nodebug.exp, opaque.exp, printcmds.exp, ptype.exp, recurse.exp,
- 	regs.exp, return.exp, scope.exp, setvar.exp, sigall.exp, signals.exp,
- 	term.exp, twice.exp, watchpoint.exp, whatis.exp},
-	gdb.c++/{classes.exp, callfuncs.exp, inherit.exp, misc.exp,
- 	templates.exp, virtfunc.exp}, gdb.chill/{callch.exp, chillvars.exp,
- 	misc.exp, pr-4975.exp, pr-5016.exp, pr-5020.exp, pr-5022.exp,
- 	pr-5646.exp, pr-5984.exp, pr-6292.exp, pr-6632.exp, pr-8134.exp,
- 	pr-8136.exp, result.exp, string.exp, tuples.exp},
-	gdb.disasm/{hppa.exp, sh3.exp}, gdb.stabs/weird.exp: Change continues
- 	to returns as necessary, arrange for test to compile own testcase
- 	executable.
-	* lib/gdb.exp: Changes for testsuite to compile own test cases.
-
-Tue Nov 21 16:15:45 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.c++/classes.exp (test_pointers_to_class_members): Add
- 	clear_xfail at end of test which might not call either pass or fail.
-	* gdb.base/a1-selftest.exp: Add i*86-*-linuxaout xfail for
-	"backtrace through signal handler".
-
-Sat Nov 18 04:09:31 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/sigall.exp:  Work around OSF/1-3.x kernel bug when
-	continuing from a job control stop signal.
-	* gdb.stabs/alpha.mt:  Use $(CFLAGS) when building weird.o.
-
-Wed Nov 15 00:28:03 1995  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/callfuncs.exp: Remove bogus hppa xfails.
-	* gdb.base/corefile.exp: Likewise.
-	* gdb.base/funcargs.exp: Likewise.
-
-Tue Nov 14 15:18:10 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* config/hmsirom.exp:  Setup for talking to hmsi ROM monitor.
-	* config/monitor.exp:  Add support for setting baud rate.
-
-Sat Nov  4 15:35:52 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/a1-selftest.exp: Remove i*86-*-sysv4* and
-	i*86-*-linux* xfails for "backtrace through signal handler".
-	* gdb.base/corefile.exp: Add i*86-*-sysv4* xfail for
-	"print func2::coremaker_local".
-	* gdb.base/break.exp: Add i*86-*-sysv4*, sparc-sun-sunos4,
- 	alpha-dec-osf2* xfail for
-	"delete all breakpoints when none".
-
-Wed Nov  1 15:57:16 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/break.exp: Change test that deletes all breakpoints
-	when no user breakpoints are installed.  A post 4.15 change
-	causes gdb to no longer prompt in this case.
-
-Tue Oct 31 15:13:43 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/return.exp (return_tests):  Change xfail for test
-	"correct value returned double test" to stop xfailing at
-	Solaris 2.5.  Apparently the bug has been fixed.
-
-Sun Oct 29 12:18:16 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.stabs/ecoff.sed: Remove comment lines except for first one.
-	IRIX 4.0 /bin/sed chokes on them, though they work fine elsewhere.
-
-Tue Oct 24 11:12:12 1995  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.disasm/hppa.exp: Test lci and syncdma instructions.
-	* gdb.disasm/hppa.s: Corresponding changes.
-
-Wed Oct 18 11:27:47 1995  Jeffrey A Law  (law@cygnus.com)
-
-	* gdb.base/configure.in (hppa*-*-hpux*): No longer needs target
-	makefile fragment.
-	* config/mt-hpux: Deleted.
-
-Tue Oct 17 23:02:12 1995  Jeffrey A Law  (law@cygnus.com)
-
-	* Many files: When warning about suppressed tests due to a
-	nonexistant test binary, avoid incrementing the warning count.
-
-Tue Oct 10 11:00:41 1995  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (TARGET_FLAGS_TO_PASS):  Remove BISON.
-
-Sun Oct  8 04:23:14 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/return.exp:  Change xfail from "sparc-*-solaris2.*" to
-	"sparc-*-solaris2*".
-
-Sat Sep 23 01:22:23 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/coremaker.c:  Produce a full core dump for AIX targets.
-	Add global and local variables and initialize them.
-	* gdb.base/corefile.exp:  Test correct mapping of corefile sections
-	by printing variables. Remove rs6000 and powerpc xfails, BFD now
-	extracts the file name and terminating signal from the core file.
-	* TODO:  Remove note about tests for correct mapping of corefile.
-	* gdb.base/ptype.c (main):  Use boolean2 to inhibit AIX 4.1 xlc
-	from optimizing it away.
-	* gdb.stabs/weird.exp:  Remove rs6000 xfail, xcoffread.c now
-	handles common blocks.
-
-Thu Sep 21 01:28:10 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/sh3.s (fmac): Update for new assembler syntax
-	* gdb.disasm/sh3.exp (fmac): Corresponding changes.
-
-Wed Sep 20 13:15:05 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (maintainer-clean): New target, synonym for
-	realclean.
-	* gdb.base/Makefile.in (maintainer-clean): Likewise.
-	* gdb.c++/Makefile.in (maintainer-clean): Likewise.
-	* gdb.chill/Makefile.in (maintainer-clean): Likewise.
-	* gdb.disasm/Makefile.in (maintainer-clean): Likewise.
-	* gdb.stabs/Makefile.in (maintainer-clean): Likewise.
-	* gdb.threads/Makefile.in (maintainer-clean): Likewise.
-
-Sun Sep 10 13:14:01 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/scope.exp (text_at_main):  Add "hppa*-*-hpux*"
-	xfails when not gcc compiled for "print foo::funclocal".
-	(test_at_foo):  Add "hppa*-*-hpux*" xfails when not gcc compiled for:
-	"print foo::funclocal at foo",
-	"print 'scope1.c'::foo::funclocal at foo",
-	"print foo::funclocal_bss at foo",
-	"print 'scope1.c'::foo::funclocal_bss at foo",
-	"print foo::funclocal_ro at foo",
-	"print 'scope1.c'::foo::funclocal_ro at foo",
-	"print bar::funclocal at foo" and
-	"print 'scope1.c'::bar::funclocal at foo".
-	(test_at_bar):  Add "hppa*-*-hpux*" xfails when not
-	gcc compiled for "print foo::funclocal at bar".
-	Expand all messages to ensure that they identify that
-	the test is at bar().
-	* gdb.base/opaque.exp: Add "hppa*-*-hpux*" xfails when not
-	gcc compiled for:
-	"ptype on opaque struct pointer (statically)",
-	"ptype on opaque struct tagname (statically)",
-	"ptype on opaque struct pointer (dynamically) 1",
-	"ptype on opaque struct tagname (dynamically) 1",
-	"ptype on opaque struct pointer (dynamically) 2" and
-	"ptype on opaque struct tagname (dynamically) 2
-	* gdb.base/nodebug.exp: Add "hppa*-*-hpux*" xfails when not
-	gcc compiled for:
-	"p datalocal"
-	"whatis datalocal",
-	"ptype datalocal",
-	"p bsslocal",
-	"whatis bsslocal", and
-	"ptype bsslocal".
-	* gdb.base/langs.exp: Add "hppa*-*-hpux*" xfails for
-	"backtrace in langs.exp" and "up to langs0__2do in langs.exp"
-	when not gcc compiled.
-	* gdb.base/funcargs.exp (float_and_integral_args):  Add
-	"hppa*-*-hpux*" xfail for "run to call2a" when not gcc
-	compiled.
-	(discard_and_shuffle):  Add "hppa*-*-hpux*" xfail for
-	"backtrace from call6a" when not gcc compiled.
-	(shuffle_round_robin): Add "hppa*-*-hpux*" xfail for
-	"backtrace from call7a" when not gcc compiled.
-	* gdb.base/callfuncs.exp (do_function_calls):
-	Add "hppa*-*-hpux*" xfail when not gcc compiled for
-	"p t_char_array_values(char_array_val2,char_array_val1)",
-	"p t_char_array_values(char_array_val1,char_array_val2)",
-	"p t_char_array_values("carray 1","carray 2")",
-	"p t_char_array_values("carray 1",char_array_val2)",
-	"p t_char_array_values(char_array_val1,"carray 2")",
-	"p sum_args(1,{2})",
-	"p sum_args(2,{2,3})",
-	"p sum_args(3,{2,3,4})",
-	"p sum_args(4,{2,3,4,5})"
-	* gdb.base/corefile.exp: Add "hppa*-*-hpux*" xfail for
-	"backtrace in corefile.exp" when not gcc compiled.
-
-Sat Sep  9 01:35:39 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/signals.exp:  Rewrite `handle all print' test as
-	a procedure. Accept blanks or TABs as whitespace, increase
-	timeout and expect input buffer size for the large output
-	from the command. Remove "i*86-*-bsdi2.0" xfail.
-
-Sat Sep  2 06:41:26 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/setvar.exp:  Add new testcases for truncation when
-	assigning invalid values to bitfields.
-
-Sat Sep  2 00:17:31 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/callfuncs.exp (do_function_calls):  Remove
-	mips-sgi-irix* xfail for
-	"call inferior func with struct - returns char *"
-	and fix test so that an optional (unsigned char *) cast is
- 	accepted in the result.
-
-Fri Sep  1 13:42:01 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/funcargs.exp (float_and_integral_args):  Remove
-	sparc-sun-solaris2* xfail for "print f1 after run to call2a".
-	* gdb.c++/Makefile.in (SUFFIXES): Add .SUFFIXES and ".cc" suffix.
-	* gdb.base/signals.exp: Remove duplicate "handle all print" test
-	that accidentally got checked in.
-
-Sun Aug 27 23:35:35 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/callfuncs.exp (do_function_calls):  Add alpha-dec-osf2*
-	clear_xfail for "p t_float_values2(3.14159,float_val2)" for gcc
-	compiled test.
-	* gdb.base/opaque.exp (setup_xfail_on_opaque_pointer):
-	Add mips-sgi-irix5* xfail for not gcc compiled.
-	* gdb.base/Makefile.in (nodebug.o):  Also create nodebug.ci.
-	* gdb.base/nodebug.exp: Add mips-sgi-irix5 xfail when not gcc compiled for
-	"p top", "whatis top", "p middle", and "whatis middle".
-	* gdb.base/whatis.exp: Add mips-sgi-irix* xfail for
-	"whatis signed char" for not gcc compiled.
-	* gdb.base/setvar.exp: Add mips-sgi-irix4* xfail (works on irix5) for
-	"set variable signed char=-1 (-1)" and
-	"set variable signed char=0xFF (0xFF)" for not gcc compiled.
-	* gdb.base/funcargs.exp (float_and_integral_args):
-	Add mips-sgi-irix5* xfail for "run to call2a" for not gcc compiled.
-	Add mips-sgi-irix* xfail when not gcc compiled for
-	"continue to call2b".
-	Add mips-sgi-irix4* xfail (works with irix5) when gcc compiled for
-	"continue to call2g".
-	(discard_and_shuffle): Add mips-sgi-irix5* xfail whn not gcc compiled for
-	"backtrace from call6a"
-	(shuffle_round_robin): Add mips-sgi-irix* xfail when not gcc compiled for
-	"backtrace from call7k".
-	Add mips-sgi-irix5* xfail when not gcc compiled for
-	"backtrace from call7a".
-	(localvars_after_alloca):  Fix gdb_test cmds for
-	"print * after runto ...".
-	Remove rs6000-*-* xfails for
-	"print i after runto localvars_after_alloca" and
-	"print l after runto localvars_after_alloca"
-	for all compilers.
-	* gdb.base/exprs.exp: Add mips-sgi-irix4* xfails (works with irix5),
- 	when not compiled with gcc, for:
-	"print signed char == (minus)",
-	"print signed char != (minus)",
-	"print signed char < (minus)",
-	"print signed char > (minus)".
-	* gdb.base/callfuncs.exp (do_function_calls):
-	Add mips-sgi-irix* xfail, when compiled with native compiler, for
-	"call inferior func with struct - returns char *".
-	* gdb.base/return.exp (return_tests): Change xfail for
-	"correct value returned double test" to include Solaris 2.4.
-	* gdb.base/funcargs.exp (float_and_integral_args):
-	Add sparc-sun-solaris2* xfail for "print f1 after run to call2a".
-
-Sat Aug 26 00:26:11 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/setvar.c, gdb.base/setvar.exp:  Add new tests for
-	enumeration bitfields if compiling with GNU C.
-	* lib/gdb.exp:  Consume `(y or n) ' in `Reinitialize source path
-	to empty' prompt.
-
-Tue Aug 22 00:30:37 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/scope.exp: xfail 'scope0.c'::filelocal_bss before run
-	test for PRO targets.
-
-	* gdb.base/funcargs.exp: Avoid ever setting more than 8
-	breakpoints in the inferior at any given time by making
-	two groups of breakpoints for call2*, call6* and call7*
-	tests.
-
-Sun Aug 20 06:58:25 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/funcargs.exp:  Fix typos introduced by Aug 15 change.
-	* gdb.base/callfuncs.c (main):  Use struct_val1 to inhibit xlc
-	from optimizing it away.
-	* gdb.base/callfuncs.exp:  Remove rs6000-*-* xfails for
-	"call inferior func with struct".
-
-Wed Aug 16 11:57:15 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* configure.in: Only configure gdb.chill for particular targets.
-
-Tue Aug 15 09:42:44 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/Makefile.in:  Add action to .c.o transformation
-	rule that generates a .ci file for each .o file and remove
-	explicit .c.o rules except for callfuncs.o.
-	* gdb.c++/Makefile.in:  Add .cc.o transformation rule that
-	generates a .ci file for each .o file and remove explicit
-	.cc.o rules.
-	(clean): Remove *.tmp *.ci files.
-	(EXECUTABLES): Remove templ-info.exp.
-	* gdb.base/compiler.c: New file.
-	* gdb.c++/compiler.cc: New file
-	* gdb.base/scope.exp: Source gdb.base/scope.ci.
-	Change rs6000-*-* xfail for
-	"print 'scope0.c'::filelocal_ro" and
-	"print 'scope1.c'::filelocal" and
-	"print 'scope1.c'::filelocal_bss" and
-	"print 'scope1.c'::filelocal_ro" and
-	"print 'scope1.c'::foo::funclocal" and
-	"print 'scope1.c'::foo::funclocal_ro" and
-	"print 'scope1.c'::bar::funclocal" and
-	"print 'scope0.c'::filelocal_ro" and
-	"print 'scope1.c'::filelocal at foo" and
-	"print 'scope1.c'::filelocal_bss at foo" and
-	"print 'scope1.c'::filelocal_ro at foo" and
-	"print 'scope1.c'::foo::funclocal at foo" and
-	"print 'scope1.c'::foo::funclocal_bss at foo" and
-	"print 'scope1.c'::foo::funclocal_ro at foo" and
-	"print 'scope1.c'::bar::funclocal at foo" and
-	"print 'scope0.c'::filelocal_ro" and
-	"print 'scope1.c'::filelocal" and
-	"print 'scope1.c'::filelocal_bss" and
-	"print 'scope1.c'::filelocal_ro" and
-	"print 'scope1.c'::foo::funclocal" and
-	"print 'scope1.c'::foo::funclocal_bss" and
-	"print 'scope1.c'::foo::funclocal_ro" and
-	"print 'scope1.c'::bar::funclocal" and
-	"print 'scope1.c'::bar::funclocal_bss"
-	to only be xfail'd when not compiled with gcc.
-	Add rs6000-*-* xfail for
-	"print 'scope0.c'::filelocal_bss before run"
-	when compiled with gcc.
-	(test_at_main): Add rs6000-*-* xfail for
-	"print filelocal_ro in test_at_main"
-	when compiled with gcc.
-	* gdb.base/ptype.exp: Source gdb.base/ptype.ci.
- 	Add rs6000-*-aix* xfail for
-	"whatis unnamed typedef'd enum (compiler bug in IBM's xlc)" and
-	"ptype t_char_array",  not compiled with gcc.
-	* gdb.base/list.exp (test_list_function):  Add rs6000-*-*
-	xfail for "list foo (in include file)" when gcc	compiled.
-	* gdb.base/funcargs.exp: Source gdb.base/funcargs.ci
- 	(integral_args): Add rs6000-*-* xfail for
-	"run to call0a" if not compiled with gcc.
-	(unsigned_integral_args): Add rs6000-*-* xfail for
-	"run to call1a" if not compiled with gcc.
-	(float_and_integral_args):  Add rs6000-*-* xfail for
-	"run to call2a" if not compiled with gcc and for
-	"continue to call2b" for any compiler.
-	Add rs6000-*-* xfail to
-	"print f1 after run to call2a" for gcc compiled.
-	(discard_and_shuffle): Add rs6000-*-* xfail for
-	"run to call6a".
-	(shuffle_round_robin): Add rs6000-*-* xfail for
-	"backtrace from call7a" if not compiled with gcc.
-	Add rs6000-*-* xfail for
-	"backtrace from call7b" if compiled with gcc.
-	(call_after_alloca): Add rs6000-*-* xfail for
-	"print c in call_after_alloca" and
-	"print s in call_after_alloca" and
-	"backtrace from call_after_alloca_subr"
-	if not compiled with gcc.
-	(localvars_in_indirect_call): Add rs6000-*-* xfail for
-	"print c in localvars_in_indirect_call" and
-	"print c in localvars_in_indirect_call" and
-	"backtrace in indirectly called function" and
-	"stepping into indirectly called function"
-	if not compiled with gcc.
-	(localvars_after_alloca): Add rs6000-*-* xfail for
-	"print c after runto localvars_after_alloca" and
-	"print s after runto localvars_after_alloca" and
-	"print i after runto localvars_after_alloca" and
-	"print l after runto localvars_after_alloca"
-	for all compilers.
-	* gdb.base/whatis.exp: Source gdb.base/whatis.ci rather
-	than whatis-info.exp.
-	* gdb.base/opaque.exp: Source gdb.base/opaque0.ci rather
-	than opaque-info.exp.
-	Setup rs6000-*-* xfail for
-	"ptype on opaque struct pointer (statically)" and
-	"ptype on opaque struct pointer (dynamically)" when
-	not compiled with gcc.
-	* gdb.base/callfuncs.exp: Source gdb.base/callfuncs.ci
-	rather than callf-info.exp.
-	(do_function_calls):  Add clear_xfail for rs6000-*-* for
-	"p t_float_values2(3.14159,float_val2)".  Seems to work
-	fine there, both with xlc and gcc.  Need to find out what
-	it is doing right and fix other platforms.
-	* gdb.base/callfuncs.exp: Add rs6000-*-* xfail for
-	"call inferior func with struct - returns int",
-	"call inferior func with struct - returns long",
-	"call inferior func with struct - returns float",
-	"call inferior func with struct - returns double",
-	"call inferior func with struct - returns char *",
-	but only if not gcc compiled (presumes xlc compiled).
-	Change rs6000-*-* xfails for
-	"call inferior func with struct - returns char" and
-	" call inferior func with struct -  returns short" to only
-	xfail if not using gcc.
-	(clean mostlyclean):  Remove *.ci and *.tmp files.
-	* gdb.c++/templates.exp: Source gdb.c++/templates.ci rather
-	than templ-info.exp.
-	* gdb.base/langs.exp:  Source gdb.base/langs.ci.
-	Add rs6000-*-* xfail for "up to foo in langs.exp"
-	"up to cppsub_ in langs.exp" and "up to fsub in langs.exp"
- 	when not gcc compiled.
-
-Sat Aug 12 15:05:36 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
-
-	* gdb.base/callfuncs.exp: Add xfails for the powerpc.
-	* gdb.base/corefile.exp: Likewise.
-	* gdb.base/list.exp: Likewise.
-	* gdb.base/scope.exp: Likewise.
-	* gdb.base/siganls.exp: Likewise.
-
-	* gdb.base/nodebug.exp: Add xfails for the powerpc.  Handle aix4
-	compiler output.
-	* gdb.base/whatis.exp: Likewise.
-
-Fri Aug 11 13:36:20 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/sh3.exp (all_fp_misc_tests): No longer expect a
-	failure (opcode table has been fixed to match reality).
-
-Mon Aug 14 09:01:59 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/callfuncs.exp: Add rs6000-*-* xfails for
-	"call inferior func with struct - returns char",
-	"call inferior func with struct - returns short"
-
-	* gdb.base/scope.exp: Remove rs6000-*-* xfails for
-	"print 'scope0.c'::filelocal at main",
-	"print 'scope0.c'::filelocal_bss in test_at_main",
-	"print 'scope0.c'::filelocal at foo",
-	"print 'scope0.c'::filelocal_bss in test_at_foo",
-	"print 'scope0.c'::filelocal at bar",
-	"print 'scope0.c'::filelocal_bss in test_at_bar"
-
-	* gdb.base/list.exp: Remove rs6000-*-* xfail for "list function
-	in source file 1".  This bug seems to have been fixed with both
-	gcc and native cc (was native assembler bug?).
-
-Wed Aug  9 08:04:12 1995  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.base/a1-selftest.exp: Change "i*86-*-sysv4" xfail for
-	"backtrace through signal handler" to "i*86-*-sysv4*".
-	* gdb.base/signals.exp: Add xfail for "'next' behaved as
-	continue" case.  Add "known SVR4 bug" to fail message.
-	Add "i*86-*-bsdi2.0" xfail for "handle all print".
-	Add "i*86-*-bsdi2.0" xfail for "backtrace in signals_tests_1".
-	* gdb.base/ptype.exp: Add "i*86-*-sysv4*" xfail for
-	"whatis unnamed typedef'd enum..." and "ptype t_char_array".
-	* gdb.base/langs.exp: Add "i*86-*-sysv4*" xfail for
-	"up to foo in langs.exp", "show language at foo in
-	langs.exp", "up to cppsub_ in langs.exp", "show
-	language at cppsub_ in langs.exp", "up to fsub in
-	langs.exp", and "show language at fsub in langs.exp".
-	* gdb.base/corefile.exp: Add "i*86-*-sysv4*" to xfail for
-	"bactrace in corefile.exp".
-	* gdb.base/callfuncs.exp: Change xfail to "i*86-*-*" for
-	"call inferior function with struct - returns float" and
-	"call inferior function with struct - returns double".
-
-Mon Aug  7 02:43:28 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/sh3.s: Source for sh3 disassembler tests.
-	* gdb.disasm/sh3.exp: Run the sh3 disassembler tests.
-	* gdb.disasm/configure.in (sh-*-*): Use sh3.mt makefile fragment.
-	* gdb.disasm/sh3.mt: Makefile fragment for sh3 ests.
-
-Mon Aug  7 08:09:37 1995  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (CHILL_FOR_TARGET): Use previously defined
-	(or overriden) "CHILL" macro rather then bare "gcc".
-	Also look for ../../gcc/xgcc since that is what we will
-	actually need, not "Makefile".  Remove following assignment
-	of CHILL to CHILL_FOR_TARGET because that results in
-	recursive definition.
-
-Sun Aug  6 16:52:29 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/corefile.exp:  Change xfail for backtrace in
-	corefile.exp from linuxaout to all linux.
-	* gdb.base/sigall.exp (test_one_sig):  Specifically deal with
-	cases where we miss the breakpoint at the signal handler
-	for some reason.  Setup xfail for linuxoldld/linuxaout and
-	getting SIGIO.  Setup xfail for linuxoldld/linuxaout for
-	hitting SIGURG breakpoint.
-	* gdb.base/signals.exp:  Setup xfail for "next" acting like
-	continue to add linuxoldld.  Setup xfail for all linux for
-	"next to handler in signals_tests_1", "backtrace in
-	signals_tests_1", "continue to func1", "pass SIGUSR1",
-	and continue to handler".
-
-Thu Aug  3 10:45:37 1995  Fred Fish  <fnf@cygnus.com>
-
-	* Update all FSF addresses except those in COPYING* files.
-
-Sun Jul 30 17:50:35 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/a2-run.exp: Change messages to be more explicit about
-	the status of args, and quote binfile in results.
-
-Sun Jul 30 10:24:20 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/callfuncs.exp: Add tests for passing structs to
-	inferior functions and return various types.
-	* gdb.base/callfuncs.c: Add functions to receive a struct
-	and return a member of the struct, in various types.
-
-Sat Jul 29 14:22:33 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/Makefile.in (clean):  Remove callf-info.exp.
-
-Fri Jul 28 13:36:11 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
-
-	* config/vxworks29k.exp: New file, sources vxworks.exp.
-
-Fri Jul 28 00:28:36 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
-
-	* config/gdbremote.exp: New file.  Testing framework using
-	gdbserver.
-
-Thu Jul 27 12:17:14 1995  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.base/interrupt.exp: Setup "i*86-*-linux" xfail for
-	"call function when asleep" and "send end of file".
-	* gdb.base/corefile.exp: Add "i*86-*-linuxaout" to xfail list
-	for "backtrace in corefile.exp".
-	* gdb.base/a1-selftest.exp: Add "i*86-*-linux*" to xfail list
-	for "backtrace through signal handler".
-	* gdb.base/corefile.exp: Make sure we actually generate a core file
-	before trying the core tests.  Some systems allow the user to suppress
-	generation of core files and default to that (linux for example).
-	* gdb.base/signals.exp: Change xfail for "next" acting like "continue"
-	from "i*86-*-linux" to "i*86-*-linuxaout".  Works with ELF beta.
-
-Tue Jul 25 17:30:10 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
-
-	* gdb.threads: New directory with some crude multi-threaded
-	gdb tests (step.exp and step2.exp).
-	* config/mt-lynx (STEP_EXECUTABLE): Define.
-	(THREADFLAGS): Define.
-
-Tue Jul 25 01:03:52 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/sigall.exp: Avoid losing in SIGPRIO test on lynx.
-
-	* gdb.base/signals.exp: Disable whole file for lynx until
-	further notice.
-
-	* gdb.base/signals.exp: xfail test where "next" acts like
-	"continue" for lynx.
-
-	* gdb.base/interrupt.exp: xfail test for calling function while
-	inferior is asleep for lynx.
-
-	* gdb.base/watchpoint.exp: Handle more cases of gdb echoing more
-	than one cr-lf	after each command.
-
-Sun Jul 23 23:33:18 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* configure.in:  Reinstate setting of stabsdirs variable, fix
-	typo in setting up configdirs for native builds.
-
-	* gdb.base/return.exp:  Fix typo in return double test.
-	* gdb.base/return.c (tmp2, tmp3):  Made global to inhibit the
-	compiler from optimizing them away.
-
-Fri Jul 21 11:39:34 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/gdbvars.exp: Expect zero or more additional cr-lf
-	sequences to be echo'd by gdb when using gdb_test.
-	* gdb.chill/chexp.exp: Likewise.
-	* gdb.fortran/exprs.exp: Likewise
-
-Thu Jul 20 13:28:36 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
-
-	* gdb.base/a1-selftest.exp: Reset the timeout value to 30 seconds
-	after the inferior gdb has started.
-
-	* gdb.base/a2-run.exp: Handle gdb echoing more than one cr-lf
-	after each command.
-	* gdb.base/funcargs.exp: Likewise.
-	* gdb.base/gdbvars.exp: Likewise.
-	* gdb.base/interrupt.exp: Likewise.
-	* gdb.base/list.exp: Likewise.
-	* gdb.base/watchpoint.exp: Likewise.
-	* gdb.c++/demangle.exp: Likewise.
-	* gdb.c++/inherit.exp: Likewise.
-	* gdb.chill/chexp.exp: Likewise.
-	* gdb.fortran/exprs.exp: Likewise.
-
-	* gdb.base/watchpoint.exp: Disable watchpoint triggered in syscall
-	test if we can't handle IO to/from the inferior.
-
-	* gdb.c++/misc.exp: Always check for a program already being
-	started after sending a "run" command to gdb.
-
-	* gdb.base/twice.exp: Start with a fresh gdb.
-
-	* gdb.chill/chexp.exp: Remove skip_chill_tests check; these tests
-	only depend on gdb's expression code, not the chill runtime.
-
-	* gdb.base/return.c: Put return values into variables so we
-	can have gdb print them rather than depending on the program
-	to print them.
-	* gdb.base/return.exp: Corresponding changes.
-
-	* lib/gdb.exp: Provide default value for noinferiorio.
-	* gdb.base/interrupt.exp: Skip tests if we can't handle IO to/from
-	the inferior.
-
-	* gdb.base/break.exp: Always check for a program already being
-	started after sending a "run" command to gdb.
-	(text_next_with_recursion): Don't check the output from the
-	program's printf statement.  Instead just make sure the program
-	exited.
-
-	* gdb.base/commands.exp: Protect tests which need arguments with
-	$noargs conditionals.
-
-Wed Jul 19 22:42:43 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/printcmds.exp:  Adjust expect patterns for addresses
-	of structure member arrays to match gdb/valops.c:value_addr change.
-
-Mon Jul 17 10:12:27 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/a1-selftest.exp: Fix unmatched quotes in many timeout
-	cases.
-
-Wed Jul 12 10:20:08 1995  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in (configdirs):  Remove gdb.chill from default list
-	of subdirs and then add it back in only if doing a native build.
-	The current chill compiler does not yet work in any cross build.
-	* Revert all signal changes from Jul 6.
-	* gdb.base/{sigall.c signals.c}:  Define away signal() and alarm()
-	for sh-hms targets, allowing these tests to link, with no other
-	changes.  Testing is suppressed by setting "nosignals" in site.exp.
-
-Thu Jul  6 20:58:30 1995  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in (signaldirs): Define and add to configdirs for all
-	targets except some specific ones that are known to not support signals.
-	Also clean up formatting.
-	* gdb.base/Makefile.in (EXECUTABLES):  Remove sigall and signals.
-	(signals, sigall):  Remove rules to build.
-	* gdb.base/{sigall.c, sigall.exp, signals.c, signals.exp}:
-	Moved to new gdb.signals directory.
-	* gdb.signals: New test directory.
-	* gdb.signals/{Makefile.in, configure.in, sigall.c, sigall.exp,
-	signals.c signals.exp}:  New or moved files.
-
-Sun Jun 25 12:55:18 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/interrupt.exp: Don't choke if $nointerrupts doesn't exist.
-
-Wed Jun 21 16:35:55 1995  Fred Fish  <fnf@cygnus.com>
-
-	* gdb.base/return.exp:  Xfail `return double' test failure
-	on at least Solaris 2.3 and handle future/past versions on
-	a case by case basis as appropriate.  Also update message
-	to include i*86 failures.
-
-Wed May 24 07:10:10 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Makefile.in: Change variable CFLAGS to TESTSUITE_CFLAGS.
-
-	* lib/gdb.exp: Fix comment which erroneously identified
-	gdb_file_cmd as gdb_load (the 19 May change was in fact to
-	gdb_file_cmd not gdb_load).
-	* config/unix-gdb.exp (gdb_load): Add "upvar timeout timeout".
-
-	* gdb.base/setvar.exp: Make test names consistent between pass and
-	fail cases.  Use gdb_test more.
-
-Fri May 19 07:22:58 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp (gdb_load): Add "upvar timeout timeout".
-
-Mon May 15 23:50:51 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/help.exp:  Fix expected help string for `show commands'.
-
-Thu May 11 07:55:11 1995  Jim Kingdon  <kingdon@deneb.cygnus.com>
-
-	* gdb.stabs/xcoff.sed: Change N_LSYM to C_DECL not C_LSYM.
-
-	* gdb.stabs/weird.exp: Remove xfail for xcoff bitching about lack
-	of a text section.
-
-Thu May 11 15:02:24 1995  Stu Grossman  (grossman@andros.cygnus.com)
-
-	* config/monitor.exp (gdb_target_monitor):  Fix loop interator so
-	that loop eventually terminates.  Fix Connection refused logic so
-	that testsuite will expire nicely.
-
-Wed May 10 17:57:35 1995  Stu Grossman  (grossman@andros.cygnus.com)
-
-	* config/cpu32bug.exp, config/est.exp, config/hppro.exp,
-	config/rom68k.exp:  New tcl glue for the appropriate monitors.
-	These all just end up calling monitor.exp.
-	* config/monitor.exp (gdb_target_monitor):  Handle `Connection
-	refused' by retrying.  Cleanup some timeout issues.
-	* (gdb_load):  Reduce timeout.  Cleanup some timeout issues.
-	* lib/gdb.exp (gdb_test gdb_test_exact):  Upvar timeout so that
-	callers don't have to set/restore global timeout variable.
-
-	* The following set of changes centralizes management of the global
-	timeout	variable.  This way, it can be set in one target dependent
-	place instead of dozens of places scattered throughout the test suite.
-	If you need to lengthen a timeout, then you should either set timeout
-	in one of the config/{target}.exp files, or multiply it by a factor.
-	Setting it to an absolute value is always going to lose for some
-	targets.
-	* gdb.base/a1-selftest.exp (test_with_self):  Only use local timeout.
-	* gdb.base/callfuncs.exp (do_function_calls):  Don't set timeout.
-	* gdb.base/funcargs.exp:  Don't set timeout.
-	* gdb.base/list.exp (test_forward_search):  Only use local timeout.
-	* gdb.base/printcmds.exp (test_print_string_constants
-	test_print_array_constants):  Don't set timeout.
-	* gdb.base/ptype.exp:  Don't set timeout.
-	* gdb.base/recurse.exp:  Don't set timeout.
-	* gdb.base/return.exp:  Don't set timeout.
-	* gdb.base/watchpoint.exp:  Don't set timeout.
-	* gdb.c++/classes.exp (do_tests):  Don't set timeout.
-	* gdb.c++/virtfunc.exp (test_virtual_calls):  Don't set timeout.
-
-Wed May 10 16:03:23 1995  Torbjorn Granlund  <tege@adder.cygnus.com>
-
-	* Makefile.in: Make clean targets work also when SUBDIRS is empty.
-
-Mon May  1 07:32:48 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp: Disable chill tests for irix5.
-
-Wed Apr 26 07:36:03 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/scope.exp: Make test names unique.  Use gdb_test.  Make
-	each test pass or fail.
-
-Sun Apr 23 21:32:32 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/opaque.exp: Remove xfails for aix; print a warning if
-	xlc not gcc.
-
-Fri Apr 21 15:44:02 1995  Stu Grossman  (grossman@rtl.cygnus.com)
-
-	* cpu32bug.exp est.exp rom68k.exp:  Delete.  Unify into monitor.exp.
-
-Wed Apr 19 17:41:21 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* config/est.exp:  Fix copyright and comments.  Remove dead code.
-	Use targetname, serialport and baud variables instead of fixed
-	constants.
-	* config/rom68k.exp:  Fix copyright and comments.  Remove dead code.
-	* config/cpu32bug.exp:  New file to support cpu32bug monitors.
-
-Wed Apr 19 13:47:16 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/watchpoint.exp: Don't run
-	test_watchpoint_triggered_in_syscall for sunos.
-
-Mon Apr 17 12:48:52 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/{break.c,run.c}: Don't include vxWorks.h or stdioLib.h;
-	they don't seem to exist.  Do include stdio.h.
-
-Fri Apr 14 09:40:22 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/a1-selftest.exp: Add alpha xfail.
-
-Mon Apr 10 13:07:50 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/watchpoint.c (main): Prompt before calling read().
-	* gdb.base/watchpoint.exp (test_watchpoint_triggered_in_syscall):
-	Revise accordingly.  Remove cruft about sending "123" several
-	times, until it gets noticed.  Clean up the "print buf[0]" stuff
-	so that it passes or fails, and waits for prompts in the usual way.
-
-Sun Apr  9 09:02:36 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/recurse.exp: Fix comment.
-
-	* TODO: Remove item about printing variables in nodebug.exp.  Add
-	item about enabling tests which are only run on some targets.
-
-	* gdb.base/watchpoint.exp: Various cleanups (make each test pass or
-	fail, make test names unique, use new gdb_test convention
-	regarding pattern, use gdb_test more, etc.).
-
-	* gdb.base/bitfields.exp: Various cleanups (make each test pass or
-	fail, make test names unique, etc.).
-
-Sat Apr  8 02:47:45 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/nodebug.c:  Change return type of top and middle to
-	short.
-	* gdb.base/nodebug.exp:  Remove xfails for ecoff systems, they
-	are fixed by the recent mdebugread.c changes. Allow `short ()'
-	as type for top and middle.
-
-Thu Apr  6 08:54:18 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/break.exp: Remove commented out if $usestubs {}.  As
-	nearly as I can tell, the whole thing was an accident in Stu's
-	change of 24 Mar 1995 (logged in ../ChangeLog), in which he meant
-	to replace a send/expect pair with gdb_test, but ended up only
-	adding the gdb_test.  My change of 24 Mar 1995 and Kung's change
-	of 30 Mar 1995 took care of it, but left this vestigial comment
-	which I am now nuking.
-
-Mon Apr  3 09:00:27 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/break.exp: Look for different line number for
-	breakpoint at main depending on usestubs.
-
-Sun Apr  2 08:15:45 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/list.exp:  Adjust some alternate expect patterns to
-	match recent list0.c change. Add alternate expect pattern for
-	output from `list default lines around main' for optimizing
-	compilers.
-
-Sat Apr  1 07:23:22 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp: If nosignals is not set, set it to 0.
-
-Fri Mar 31 16:13:48 1995  Kung Hsu  <kung@mexican.cygnus.com>
-
-	* config/slite-gdb.exp: Responds to load symbol table prompt.
-	* gdb.base/break.exp: Adjust line number, fix rerun.
-	* gdb.base/langs0.c: Add #ifdef usestubs.
-
-Thu Mar 30 15:36:55 1995  Kung Hsu  <kung@mexican.cygnus.com>
-
-	* gdb.base/list.exp: Adjust line contents after adding new lines in
-	list0.c. Also fix a syntax error.
-
-	* lib/gdb.exp (gdb_run_cmd): Special handling for targets use stubs.
-	* gdb.base/break.exp: ditto.
-	* gdb.base/list.exp: ditto.
-	* gdb.base/bitfields.c: Add #ifdef usestubs in main().
-	* gdb.base/run.c: ditto.
-	* gdb.base/list0.c: ditto.
-	* gdb.base/funcargs.c: ditto.
-
-Wed Mar 29 17:09:29 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* testsuite/config/rom68k.exp (gdb_target_rom68k):  Use
-	$targetname, $serialport and $baud instead of hardwired variables.
-	* testsuite/gdb.base/{sigall.exp signals.exp}:  Skip these if the
-	target doesn't support signals.
-
-Wed Mar 29 12:29:34 1995  Kung Hsu  <kung@mexican.cygnus.com>
-
-	* lib/gdb.exp (runto_main): Fix regular expression bug, add return 1.
-
-Tue Mar 28 08:46:45 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/recurse.exp: Make test names unique.  Change \\(+ to \\(.
-	Don't rely on the value of an auto variable before it has been
-	initialized.  Use gdb_test more.
-
-Mon Mar 27 08:00:34 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp (default_gdb_version): A version number must start
-	with a digit, but other than that contains all characters up to
-	the first whitespace character.
-
-Sun Mar 26 13:19:32 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/commands.exp (breakpoint_command_test): New tests.
-
-Sat Mar 25 15:38:06 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.c++/*.exp: Warn if executable does not exist.  The original
-	reason for skipping the warning was that configure.in sometimes
-	intentionally skipped building the executables but the tcl code
-	had no way of knowing.  That (a) was always bogus with respect to
-	error handling, (b) is no longer true (right now there is no way
-	to skip C++ tests).
-
-	* gdb.c++/demangle.exp: Remove unused binfile and srcfile variables.
-
-Sat Mar 25 01:16:10 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/list.exp:  Add expect patterns for output from
-	SunPRO compiled executables.
-	* gdb.base/whatis.exp:  Allow leading `signed' for all v_signed_*
-	types.
-
-Fri Mar 24 06:11:05 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/break.exp (test_next_with_recursion): Accept any line
-	number (we are already testing that the correct source line text
-	gets printed).
-
-	* gdb.base/break.exp: Make one test if $usestubs.  I'm not sure
-	that is what is intended, but something needed to be done to get
-	sunos4 native working again.
-
-	* gdb.c++/misc.cc (main): Fix typo (#iffef -> #ifdef).
-
-	* gdb.base/a1-selftest.exp (test_with_self): Remove comment which
-	apparently went with a (very) old xfail.
-
-Fri Mar 24 13:41:09 1995  Kung Hsu  <kung@mexican.cygnus.com>
-
-	* gdb.base/callfuncs.exp: call runto_main instead of runto main.
-	runto_main is a proc in gdb.exp that will do 'step' for target use
-	stubs.
-	* gdb.base/exprs.exp: ditto.
-	* gdb.base/interrupt.exp: ditto.
-	* gdb.base/opaque.exp: ditto.
-	* gdb.base/printcmds.exp: ditto.
-	* gdb.base/ptype.exp: ditto.
-	* gdb.base/scope.exp: ditto.
-	* gdb.base/setvar.exp: ditto.
-	* gdb.base/signals.exp: ditto.
-	* gdb.base/twice.exp: ditto.
-	* gdb.c++/classes.exp: ditto.
-	* gdb.c++/inherit.exp: ditto.
-	* gdb.c++/templates.exp: ditto.
-	* gdb.base/break.exp: no run and hit main for stubs. Change line
-	numbers for breakpoints and info breakpoint.
-	* gdb.base/break.c: Add #ifdef usestubs for set_debug_traps() and
-	breakpoint().
-	* gdb.base/callfuncs.c: ditto.
-	* gdb.base/exprs: ditto.
-	* gdb.base/interrupt.c: ditto.
-	* gdb.base/opaque0.c: ditto.
-	* gdb.base/printcmds.c: ditto.
-	* gdb.base/ptype.c: ditto.
-	* gdb.base/scope0.c: ditto.
-	* gdb.base/setvar.c: ditto.
-	* gdb.base/signals.c: ditto.
-	* gdb.base/twice.c: ditto.
-	* gdb.c++/misc.cc: ditto.
-	* gdb.c++/templates.cc: ditto.
-
-Fri Mar 24 06:11:05 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config/vx-gdb.exp, lib/gdb.exp: Regexp cleanups (\[(\] -> \\(, etc.).
-
-	* gdb.base/a1-selftest.exp: Don't check for # followed by a digit
-	somewhere between `read' and `main.c'.  I'm pretty sure the
-	pattern ".*#\[0-9\].*" was slowing down pattern matching a lot,
-	and it isn't particularly useful.
-
-	* gdb.base/scope.exp: Make test names unique.  \[(\] -> \\(.
-
-Thu Mar 23 14:58:35 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/commands.exp (infrun_breakpoint_command_test): New test.
-
-Wed Mar 22 18:36:05 1995  Kung Hsu  <kung@mexican.cygnus.com>
-
-	* config/mt-slite: add LIBS and -nostdlib.
-	* config/slite-gdb.exp: add this new file to support sparclite target.
-
-Tue Mar 21 21:41:04 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* config/vx-gdb.exp (gdb_load): Update test of vxworks_ld return code.
-
-	* gdb.base/a2-run.exp: Change argument to istarget from
-	"*-*-vxworks" to "*-*-vxworks*".
-	* gdb.base/{break.exp,default.exp,scope.exp}: Likewise.
-
-Tue Mar 21 17:08:47 1995  Kung Hsu  <kung@mexican.cygnus.com>
-
-	* lib/gdb.exp: add proc runto_main, for targets that use stubs, this
-	will not runto main but do a 'step' to step out of breakpoint().
-	* config/mt-slite: add -Dusestubs.
-
-Tue Mar 21 12:14:12 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/printcmds.exp (test_artificial_arrays): Send ^V@
-	instead of just @.
-
-	* gdb.base/signals.exp: Add test for "handle all print".
-	* TODO: Remove "handle all print".  Also remove item about
-	checking copyright date (I don't like the idea of a spurious FAIL
-	based on when we run the tests).
-
-	* gdb.base/recurse.exp: Enable test for SunOS4.  xfail one test
-	for SunOS4 (reason for failure not investigated).  Remove
-	redundant test for $binfile.
-
-	* gdb.base/nodebug.c (array_index): Call malloc.
-
-	* gdb.base/{corefile.exp,default.exp}: Make names of "up" tests unique.
-
-Mon Mar 20 10:08:17 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/recurse.exp: Update gdb_test invocation to use new
-	conventions and slightly simplify the matching regexp.
-
-Fri Mar 17 05:43:28 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/break.exp: Update gdb_test invocation to use new
-	convention.
-
-	* lib/gdb.exp: If noargs is not set, set it to 0.
-
-	* gdb.base/nodebug.exp: Comment out redundant test.  Make name of
-	tests unique.
-
-	* lib/gdb.exp: Skip CHILL for AIX and Solaris.
-
-Thu Mar 16 16:27:07 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/nodebug.exp: It is OK if GDB thinks top and middle have
-	one argument of type "<non-float parameter>".
-
-Wed Mar 15 15:54:56 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* config/rom68k.exp:  New file to support Motorola IDP board.
-	* gdb.base/a2-run.exp:  Skip this file if noargs is set.
-	* gdb.base/break.c:  Change things around so that this program
-	doesn't depend upon args.  This is necessary to make remote
-	targets work (in general, they can't take args).
-	* gdb.base/break.exp:  Don't try to send args to program.  Don't
-	expect output.  Also, replace lots of code with gdb_test.
-
-Wed Mar 15 04:11:14 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/printcmds.exp (test_character_literals_accepted): Test
-	printing of '\'' (which is what the comment says we are testing,
-	even though we were not), not '''.
-	(test_integer_literals_rejected): Test that printing ''' is an error.
-
-	* gdb.fortran/exprs.exp, gdb.fortran/types.exp,
-	gdb.chill/chexp.exp, gdb.base/printcmds.exp,
-	gdb.c++/cplusfuncs.exp, gdb.chill/callch.exp, gdb.chill/misc.exp,
-	gdb.chill/pr-6292.exp, gdb.chill/string.exp, gdb.chill/tuples.exp:
-	Use gdb_test not test_print_accept.
-	* lib/gdb.exp: Remove test_print_accept.
-
-	* gdb.base/signals.exp (signal_tests_1): Make pass message
-	consistent with fail message.
-
-	* gdb.base/whatis.exp: Remove xfails for printing char vs.
-	unsigned char; the bug (PR 1821) is fixed.
-
-	* gdb.base/scope.exp: Remove xfails for PRs 1843 and 1868.
-
-	* gdb.base/scope.exp (test_at_localscopes): Call pass for
-	successful tests--makes xfailing them work right.
-
-Tue Mar 14 07:39:19 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp (gdb_test): Between $pattern and $prompt, expect
-	only \r\n, not .*.  The test can pass .* as the last thing in
-	$pattern if that is what it wants.  In addition to providing this
-	flexibility, this change should speed up pattern matching in cases
-	where the pattern already ended with .* (there were a number of
-	them).  This change also helps catch bad patterns--in the old
-	scheme the typo "char \*" instead of "char \\*" would pass.  Now
-	it is caught.
-	* Many .exp files: Update callers.
-
-	* gdb.base/funcargs.exp: Replace \[(\]+ with \\(.  The latter is
-	clearer and does not spuriously match multiple ('s.  Likewise for
-	) and *.
-
-	* gdb.base/nodebug.exp: Test ability to call a function and pass
-	it a string (even with no debugging info).
-
-	* gdb.base/printcmds.exp (test_integer_literals_rejected): Change
-	"p '\'", which is the same as "p ''" once tcl gets done with
-	quoting, to "p '\\'", which I suspect is what is intended (one
-	backslash gets sent to GDB).
-
-	* gdb.base/printcmds.exp (test_artificial_arrays): New tests.
-
-Fri Mar 10 13:31:46 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/a1-selftest.exp: Remove xfail for solaris.  The bug (PR
-	1817) was fixed literally years ago.
-
-Fri Mar 10 02:49:40 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/funcargs.exp (call_after_alloca):  Remove `next'
-	test, it causes stepping out of call_after_alloca_subr with
-	optimizing compilers.
-	(localvars_in_indirect_call):  Consume GDB prompt if `finish'
-	fails.
-
-	* gdb.c++/templates.exp:  Source templ-info.exp only if
-	the templates executable exists.
-
-	* gdb.c++/misc.cc (class Contains_static_instance,
-	class Contains_nested_static_instance),
-	gdb.c++/classes.exp (test_static_members):  Test printing of
-	a class that contains a static instance of the class.
-
-Thu Mar  9 11:43:55 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/langs2.c (cppsub_): Don't prototype.
-	* gdb.base/langs2.cxx (cppsub_): Fix prototype (cosmetic value
-	only, I believe).
-
-Wed Mar  8 10:29:33 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp (skip_chill_tests): New procedure.
-
-	* gdb.base/signals.exp (signal_tests_1): xfail for irix.
-
-Mon Mar  6 10:44:06 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.exp: Delete redundant ".*" at the beginning of
-	each expect pattern.  Cuts runtime from 12 to about 4 seconds.
-
-Thu Mar  2 05:31:34 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/langs.exp: Don't insist that foo__Fi be demangled.
-
-	* gdb.disasm/hppa.exp (all_fpu_comparison_tests): Only
-	disassemble 8, not 16, instructions for part 4.
-
-	* config/vx-gdb.exp (gdb_start): Use \030, not \CX.  tcl doesn't
-	support the latter anymore.
-
-	* gdb.base/Makefile.in: Try compiling callfuncs.c, if that fails try
-	-DNO_PROTOTYPES.
-	* gdb.base/callfuncs.c: Control use of prototypes based on
-	NO_PROTOTYPES, not __STDC__.
-	* gdb.base/callfuncs.exp (do_function_calls): xfail one of the
-	t_float_values2 tests if prototypes in use.
-
-	* gdb.base/callfuncs.c (t_float_values, t_float_values2,
-	t_double_values):  When checking differences against DELTA, check
-	that difference is within the range (-DELTA,DELTA), not just
-	(-infinity,DELTA).
-
-Tue Feb 28 16:28:54 1995  Kung Hsu  <kung@mexican.cygnus.com>
-
-	* config/mips-gdb.exp (gdb_load): In every test case, we need to do
-	'file' command firts, then 'target', then 'load', this is due to gdb
-	target set up.
-	* config/mips-gdb.exp: Fix a couple regular exp bugs.
-
-Thu Feb 23 17:44:55 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.s (fmemLRbug_tests): Add tests for the indexing
-	FP load/store variants.
-	* gdb.disasm/hppa.exp (fmemLRbug_tests): Test new variants.
-
-Wed Feb 22 18:29:08 1995  Jim Kingdon  <kingdon@rtl.cygnus.com>
-
-	* gdb.base/term.exp: Do not give a warning if not native, it is
-	not an abnormal condition.
-
-Tue Feb 21 13:08:47 1995  Jim Kingdon  <kingdon@cygnus.com>
-
-	* gdb.base/ptype.exp: Accept char[0] as well as char[] for "ptype
-	t_char_array".
-
-Sun Feb 19 13:10:06 1995  Jim Kingdon  <kingdon@rtl.cygnus.com>
-
-	* lib/gdb.exp (default_gdb_version): Pass GDBFLAGS to gdb when we
-	are getting the version number.
-
-	* gdb.base/{a1-selftest.exp,corefile.exp}: Do not give a warning
-	if not native, it is not an abnormal condition.
-
-Thu Feb 16 15:56:56 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp: Just use "file exists", rather than undocumented
-	dejagnu procedure "findfile".
-
-Thu Feb 16 10:30:24 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* config/mt-vxworks (CFLAGS): Set to -g -Dvxworks.
-	  (LDFLAGS): Set to -Xlinker -Ur.
-
-	* Makefile.in, gdb.{base,c++,chill}/Makefile.in (GDB, GDBFLAGS):
-	  Removed, these values are set by lib/gdb.exp.
-
-	* lib/gdb.exp: If GDBFLAGS is unset, set it to -nx.
-
-Wed Feb 15 14:23:28 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* config/vx-gdb.exp (spawn_vxgdb): Use default_gdb_start instead
-	  of replicating gdb startup code.
-
-	* config/mt-vxworks (LDFLAGS): Set to -r.
-	  (CFLAGS_FOR_TARGET): Removed.
-
-	* config/vx-gdb.exp: always set prompt; gdb.exp sets it to
-	  (gdb) and gdb for vxworks uses (vxgdb).
-
-	* Makefile.in, gdb.{base,c++,chill}/Makefile.in (GDB): If a gdb
-	  executable is not in the tree and host != target, use sed and
-	  program_transform_name to determine the gdb name used by the
-	  target.
-
-	* configure.in, gdb.{base,c++,chill}/configure.in: changed so
-	  *-*-vxworks* matches vxworks and *-*-netware* matches NetWare.
-
-Sun Feb 12 08:11:58 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/{callfuncs.exp,callfuncs.c}: Add tests for passing
-	floats, chars, and shorts where there are ANSI-style function
-	definitions.
-
-	* gdb.base/langs.exp, gdb.base/langs*: New test.
-	* gdb.base/Makefile.in: Build it.
-	* TODO: Remove item about checking that C names don't get C++
-	demangling applied; this test tests it.
-
-Thu Feb  9 12:43:56 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.stabs/weird.exp: Remove "Haven't examined" comment which
-	went with the const70 xfail.  The xfail went away a year ago.
-
-	* gdb.base/signals.exp: Rename a bunch of tests to give unique names.
-
-	* gdb.base/corefile.exp: Give backtrace test unique name.  xfail
-	for hp300.
-
-	* gdb.base/interrupt.exp: Also xfail hpux (for hp300).
-
-	* gdb.base/a1-selftest.exp: Don't run on hp300.
-
-Sat Feb  4 15:04:32 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Makefile.in (site.exp): Set host_alias and target_alias as well
-	as host_triplet and target_triplet.
-
-Wed Feb  1 08:03:48 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/a1-selftest.exp: Invoke stty before starting inferior.
-
-	* gdb.base/nodebug.exp: Add xfails for ultrix and irix5 (same
-	places as other ecoff systems).
-
-	* gdb.base/a1-selftest.exp (test_with_self): Don't invoke stty on
-	ultrix.
-
-Mon Jan 30 11:44:52 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/nodebug.c (inner): Use variables so AIX linker doesn't
-	remove them.
-	* gdb.base/nodebug.exp: Accept "function" in addition to "text
-	variable and "variable" in addition to "data variable".
-	* gdb.base/nodebug.exp: xfail datalocal and bsslocal tests for AIX.
-
-	* gdb.base/list.exp (test_forward_search): Set listsize to 4 not
-	2.
-	* gdb.base/list1.c (long_line): Add additional statement at start
-	of function.
-	* gdb.base/list.exp (test_forward_search): Update line number to
-	reflect new statement.
-
-Sun Jan 29 13:34:25 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/signals.exp:  Reinitialize searched source directories
-	after gdb_start call.
-
-Sat Jan 28 01:34:44 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/Makefile.in (clean): Delete "errs" file.
-	* gdb.stabs/Makefile.in: Likewise.
-
-	* gdb.disasm/hppa.exp (all_fpu_comparison_tests): Revert last
-	change.  Instead split the tests into smaller pieces.
-	* gdb.disasm/hppa.s: Corresponding changes.
-
-Fri Jan 27 09:24:51 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/a1-selftest.exp (test_with_self), gdb.base/interrupt.exp:
-	Quote ^C when passing it to stty.  For some shells ^ is a pipe.
-
-	* gdb.base/funcargs.exp: Modify many tests so that every test
-	either passes or fails.  Make some test names unique.
-
-Thu Jan 26 19:20:34 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/a1-selftest.exp (test_with_self), gdb.base/interrupt.exp:
-	Call stty to set interrupt character.
-
-	* gdb.disasm/hppa.mt (hppa), gdb.stabs/hppa.mt (weird.o): Check
-	for HP assembler versus GNU assembler based on actual behavior of
-	$(CC), rather than assuming that $(AS) is always the GNU assembler.
-
-	* TODO: Suggest a few more stepping tests.
-
-Wed Jan 25 14:52:41 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/default.exp: xfail no-stack backtraces for h8300,
-	restart GDB for h8300 after a continue.
-	(return): Add pattern to match a29k-udi behavior.
-	* gdb.base/nodebug.exp: Remove obsolete comment.
-	* gdb.base/regs.exp: New file, testing of register displays.
-	* gdb.base/return.exp: Fix typo in reference to $objdir.
-	* gdb.base/whatis.exp: Always start with a fresh GDB.
-
-Wed Jan 25 11:12:07 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.disasm/hppa.exp (all_fpu_comparison_tests): Set timeout
-	higher, these tests generate a lot of output.
-
-Tue Jan 24 07:58:44 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp (gdb_test): Remove catch from around the send.  The
-	code following the catch silently ignored some errors; without the
-	catch they should be thrown like any other tcl error.  Also, the
-	catch used "" instead of {} which meant all the callers who wanted
-	to include one of the characters "[]$ had to quote it an extra time.
-	* gdb.base/{callfuncs.exp,commands.exp,gdbvars.exp,printcmds.exp,
-	ptype.exp,signals.exp,watchpoint.exp}, gdb.c++/{cplusfuncs.exp,
-	demangle.exp}, gdb.chill/chexp.exp, gdb.fortran/exprs.exp:
-	Remove extra quoting.
-
-Mon Jan 23 21:57:54 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/commands.exp: Make test names unique; every test either
-	passes or fails.  Update some comments.
-
-	* gdb.disasm/hppa.exp (do_system_control_tests): Update.
-
-Sat Jan 21 15:34:52 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	The following fixes a FAIL caused by the fact that the alpha stabs
-	configuration didn't use the ".if alpha" code in weird.def.
-	* gdb.stabs/weird.def (v_comb): Use type attribute to specify 32
-	bit pointer, so the 32 bit version works even on the alpha.
-	* gdb.stabs/{alpha.mt,ecoff.mt,aout.sed,hppa.sed,xcoff.sed,weird.def}:
-	Remove the stuff which allowed us to have separate versions for
-	alpha and everything else.
-
-	* gdb.c++/cplusfuncs.exp (test_lookup_operator_functions): Fix
-	regexp which "info func operator\[\](" is supposed to match.  Fix
-	string to send to GDB.  Note that GDB still doesn't work right.  Add a
-	new test for "info func .perator\[\](" which GDB does handle correctly.
-
-	* gdb.base/nodebug.exp: xfail most of the new tests for ecoff systems.
-
-Fri Jan 20 12:14:23 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.c++/classes.exp, gdb.c++/cplusfuncs.exp,
-	gdb.c++/inherit.exp, gdb.c++/templates.exp, gdb.c++/virtfunc.exp,
-	gdb.fortran/exprs.exp, gdb.fortran/types.exp, gdb.chill/chexp.exp,
-	gdb.base/printcmds.exp: Remove passcount, failcount, etc., stuff;
-	it makes the tests harder to understand and confuses test-o-matic.
-	The preferred style is that each test provides a PASS or a FAIL,
-	and has a unique message (e.g. "continue #54" not just "continue")
-	which is the same for the pass and the fail.
-	* gdb.fortran/exprs.exp, gdb.fortran/types.exp,
-	gdb.chill/chexp.exp: Move test_print_accept and test_print_reject
-	to lib/gdb.exp.
-	* gdb.base/printcmds.exp: Use test_print_accept.  Remove
-	prt_accept which was basically the same thing.  Likewise for
-	test_print_reject and prt_reject.
-	* lib/gdb.exp (test_print_reject): Add some more error message
-	patterns to match from the former printcmds.exp (prt_reject).
-	* gdb.c++/classes.exp, gdb.base/scope.exp: Remove spurious xfails.
-	One defect of the passcount stuff is that some of it failed to
-	report XPASS where appropriate.
-	* gdb.c++/cplusfuncs.exp (print_addr_of): No longer accept extra
-	stuff before and after arg in expected pattern.
-	(test_paddr_operator_functions): Re-do test without print_addr_of;
-	this is the only test which seems to want extra stuff there.
-
-Tue Jan 17 10:47:53 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* gdb.base/nodebug.exp: Update new tests to reflect improved
-	wording of gdb output.
-
-	* gdb.base/nodebug.exp: Add tests to check that "print", "whatis"
-	and "ptype" work on variables in files compiled without -g.
-	Replaces commented out "maint print msymbol" tests.
-
-Mon Jan 16 12:13:28 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* gdb.base/setvar.c (dummy): Call malloc.
-
-	* gdb.stabs/aout.sed: Enclose comments within a sed command to avoid
-	losing with the irix4 sed.
-
-	* gdb.base/sigall.exp (test_one_sig): Add xfail for "get signal
-	ALRM" on irix4.
-
-Sun Jan 15 21:58:26 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* TODO: Remove items about corefile.exp testing new exec-file and
-	backtrace; both are now done.  Add items about printing enums.
-
-Sat Jan 14 11:25:28 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* gdb.base/sigall.exp (test_one_sig): Attempt to recover if
-	"get signal $thissig" test fails.
-
-	* gdb.base/setvar.exp: Check for and reject crazy expected type hacks.
-
-Thu Jan 12 01:14:53 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* gdb.base/sigall.c (gen_*): Pass argument to handle_* to avoid
-	compiler warning with dec alpha compiler.
-
-	* gdb.base/commands.exp (if_while_breakpoint_command_test): Remove
-	extra \n from gdb_test call (this explains why the prompt test
-	that I removed yesterday was there).
-	(user_defined_command_test): Remove extra \n and prompt test.
-
-	* gdb.base/sigall.c: If SIGABRT == SIGLOST, just act as if SIGLOST
-	doesn't exist.  Likewise if SIGIO == SIGPOLL, pretend SIGPOLL
-	doesn't exist.
-	* gdb.base/sigall.exp: Remove special handling for SIGIO and SIGPOLL.
-	Also remove alpha workaround, which turns out to be because
-	SIGABRT == SIGLOST.
-
-	* gdb.base/sigall.exp: Add workaround for alpha weirdness.
-
-	* gdb.base/help.exp: Don't test "help show".
-
-Wed Jan 11 14:37:04 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* gdb.base/commands.exp: Call gdb_exit and gdb_start so that
-	"set print address" is on.
-	* gdb.base/commands.exp (if_while_breakpoint_command_test): Don't
-	pass prompt to gdb_test; gdb_test already looks for the prompt.
-
-	* gdb.base/help.exp: Replace most of docstring for "define" with ".*".
-
-	* gdb.base/a1-selftest.exp: Don't test "maint dump-me".  That test
-	was a vestige of the manual TESTSTRATEGY, and the purpose of it
-	was to make sure that gdb can read a core file.  But (a) the "read
-	the corefile" part didn't make it to a1-selftest.exp, we just
-	delete the corefile after creating it, and (b) we test reading
-	corefiles in corefile.exp anyway.  Also, this test left around a
-	xgdb process on Solaris.
-
-	* gdb.base/corefile.exp: Also test backtrace.
-
-Wed Jan 11 00:14:40 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/commands.exp: Test a simple user defined command with
-	arguments and if/while statements; verify the full user command is
-	printed by "show user".
-
-	* gdb.base/commands.exp: Test if/while commands as part of a
-	breakpoint command list; verify they appear in breakpoint
-	information.
-
-Wed Jan 11 00:47:58 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* gdb.base/sigall.c (gen_FPE): Generate SIGFPE with kill() rather
-	than by dividing by zero.
-
-Tue Jan 10 21:38:05 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/watchpoint.exp: hppa*-*-*bsd* no longer has problems
-	performing an inferior call with watchpoints enabled.
-	* gdb.base/watchpoint.c (main): Delete second unnecessary read
-	call.
-
-Tue Jan 10 18:42:07 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* gdb.stabs/weird.exp: Allow spaces followed by backspaces in echo
-	of "file" command.
-
-	* gdb.c++/classes.exp (test_ptype_class_objects, ptype class Foo):
-	Add additional pattern for when "int operator int(void);" appears
-	in a different order.
-
-Mon Jan  9 16:22:46 1995  Jim Kingdon  <kingdon@lioth.cygnus.com>
-
-	* gdb.base/signals.exp: Call gdb_exit and gdb_start.
-
-	* gdb.base/help.exp: Replace most of docstrings for "info signals"
-	and "signal" with ".*".
-
-Wed Jan  4 11:35:19 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Add note about "handle all nostop".
-
-	* gdb.base/{sigall.c, sigall.exp}: New test.
-	* gdb.base/Makefile.in: Add it.
-
-Thu Jan  5 17:34:03 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* lib/gdb.exp, gdb.base/corefile.exp: Supply -nw as argument
-	when invoking GDB, suppresses any windowing interface.
-
-Mon Jan  2 17:40:21 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* config/sim-gdb: New file, simulator testing support.
-
-Wed Dec 28 12:21:50 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/interrupt.exp: Test calling func1 twice.
-
-Wed Dec 21 12:51:37 1994  Jim Kingdon  <kingdon@deneb.cygnus.com>
-
-	* gdb.base/list.exp (test_forward_search): Set timeout higher
-	when we'll be getting lots of output from gdb.
-
-	* gdb.base/a1-selftest.exp: Move code that was inside expect -re
-	"init_malloc" to after the expect statement.  Run it if that
-	regexp is taken, but also for two others which happen if source
-	cannot be found.
-
-Tue Dec 20 12:35:21 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/printcmds.exp: New test, for printing register before
-	program is running.
-
-Mon Dec 19 00:32:55 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/list.exp:  Correct some alternate expect patterns
-	to reflect changes in list1.c.
-
-Sat Dec 17 14:20:03 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Add item regarding large frames.
-
-	* gdb.base/{funcargs.exp, funcargs.c} (call_after_alloca): New test.
-
-	* TODO: Remove item about enabling return.exp; it
-	is enabled.  Suggest a few more "return" tests.
-
-Sat Dec 17 02:33:37 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.c++/misc.cc, gdb.c++/inherit.exp:  Add testcases for
-	anonymous unions.
-
-Tue Dec 13 11:26:00 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.chill/Makefile.in: Put all rule before rules for pr-4975.o
-	and pr-5646.o, so "make" is the same as "make all", not "make
-	pr-4975.o".
-
-Wed Dec  7 19:02:02 1994  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/list.exp: Adjust expectations to reflect changes in
-	list1.c.
-	(test_forward_search): New test proc.
-	* gdb.base/list1.c (long_line): New function, has long source line.
-
-Thu Dec  1 23:14:49 1994  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* gdb.base/a1-selftest.exp: Change initial stepping to know about
-	additional line of code that was added.
-
-Wed Nov 30 19:43:14 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.s: Break the large branching tests into smaller
-	tests so as not to overflow expect's input buffers.
-	* gdb.disasm/hppa.exp: Corresponding changes.
-
-Fri Nov 25 13:37:10 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	Beginnings of template debugging tests.
-	* gdb.c++/templ-info.cc:  New file to test for template
-	debugging capability of the compiler.
-	* gdb.c++/Makefile.in:  Add rule to build templ-info.exp from
-	templ-info.cc.
-	* gdb.c++/templates.cc:  Add explicit template instantiations
-	to enable compiling with -fno-implicit-templates. Add destructor
-	and 'value' method to T5 class for template tests.
-	* gdb.c++/templates.exp:  Add testcases for printing of template
-	types, setting breakpoints on template methods and calling a
-	template method.
-
-Sat Nov  5 00:20:17 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.exp (branch_tests): Allow any symbol as the
-	branch target since some assemblers (gas-2.5)  may emit a
-	relocation for the branch instead of resolving it in the
-	assembler.
-
-Sat Oct 29 02:40:40 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/a1-selftest.exp:  Remove RS/6000 xfail for backtrace
-	through signal handler.
-
-Fri Oct 21 11:10:16 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* configure.in (*-*-netware): Use config/mt-netware.
-
-	* config/mt-netware: New file.
-	* config/mt-i386-netware: Removed, separate configs for different
-	  netware architectures are no longer needed now that we have
-	  --with-headers.
-
-Sat Oct 15 03:43:00 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/exprs.exp:  Remove xfail for alpha, it is fixed
-	by the recent changes to use ANSI C arithmetic conversions.
-
-Sun Oct  9 07:44:06 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/corefile.exp: Add (xfail'd) test for reinit_frame_cache
-	bug involving using inferior_pid to figure out whether to select a
-	frame.
-
-Wed Sep 28 23:12:02 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.exp: Change arg[0..3] to r[26..23] to
-	match the current disassembler output.
-
-Fri Sep 16 11:42:41 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* gdb.fortran/exprs.exp: Expect VOID instead of void.
-	* gdb.fortran/types.exp: Escape the expected '*'s in Fortran
-	types, expect "int" as type of integer values (for now).
-
-Wed Sep  7 23:33:51 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/commands.exp: New tests for if/while commands.
-
-Tue Sep  6 13:16:11 1994  Per Bothner  (bothner@kalessin.cygnus.com)
-
-	* lib/gdb.exp (runto):  Replace sub-pattern for hex value
-	by .*, since hex values have different syntax in Chill mode.
-
-Tue Sep  6 02:15:51 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.c++/demangle.exp (test_arm_style_demangling):  Remove
-	linefeed from expect pattern for repeated types with indices > 9.
-
-Mon Aug 29 14:20:44 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	First part of Fortran test suite.
-	* gdb.fortran: New directory.
-	* gdb.fortran/exprs.exp, gdb.fortran/types.exp: New files.
-
-Sat Aug 27 23:32:43 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/default.exp:  Update expect pattern for load command
-	without arguments.
-
-Wed Aug 24 13:15:02 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* configure.in: Change i386 to i[345]86.
-	* gdb.base/configure.in: Likewise.
-	* gdb.c++/configure.in: Likewise.
-	* gdb.chill/configure.in: Likewise.
-
-Tue Aug 23 19:14:06 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* lib/gdb.exp (gdb_run_cmd): Move comment out from between expect
-	patterns, since that is not a valid context for comments.
-
-Fri Aug 19 15:07:30 1994  Kung Hsu  (kung@mexican.cygnus.com)
-
-	* gdb.c++/demangle.exp (test_arm_style_demangling): Add tests for
-	repeated types and repeated types with indices > 9.
-
-Tue Aug 16 15:57:52 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* gdb.base/printcmds.exp: Remove all the a29k XFAILs tagged with
-	2417; old bug has been fixed.
-
-Fri Aug 12 19:35:41 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/interrupt.exp: When trying to wake up the inferior,
-	send the newline ourselves instead of assuming gdb_test will do
-	so when passed an empty input string.
-
-	* gdb.stabs/hppa.mt: Use $(AS), not $(CC) to assemble the
-	stabs testcode.
-
-Fri Aug  5 17:01:07 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* lib/gdb.exp (gdb_test): Don't send anything if the first
-	  argument is an empty string.  This makes cases where we want to
-	  match output that is already in expect's buffers (for example,
-	  matching a breakpoint after gdb_run_cmd has been called) work
-	  reliably.
-
-Tue Aug  2 10:24:08 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* config/netware.exp: New file.
-
-Thu Jul 28 12:54:07 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* config/mt-slite (LDFLAGS): If using the newlib in the tree, set
-	  the -B and -L prefixes so we can find the debugging stub.
-
-	* Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Use newlib if it is
-	  there and we are using the gcc from the tree.
-
-	* gdb.base/types.c: Removed.
-
-	* gdb.base/configure.in: Look for makefile fragments in ../config.
-	  Recognize i386-*-netware.
-	* gdb.c++/configure.in: Likewise.
-
-Mon Jul 25 23:48:50 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/corefile.exp:  Change `else if' to `elseif', which is
-	the correct TCL syntax.
-
-Mon Jul 25 15:35:56 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* gdb.base/opaque.exp: use runto instead of messing around with
-	  breakpoints.  Simplify by using gdb_test.
-
-	* gdb.base/bitfields.exp: restart between tests on netware targets
-	  because breakpoints aren't relocated after target death.  Run
-	  processes to completion.
-
-	* gdb.base/{opaque,watchpoint}.exp: Use gdb_run_cmd.
-
-Sun Jul 24 09:55:51 1994  Fred Fish  (fnf@cygnus.com)
-
-	* Makefile.in:  Remove extra tabs that confuse some versions
-	of "make".  Use the newly built gdb to test with by default,
-	rather than the first one in the tester's search path.
-
-Sat Jul 23 15:05:47 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* gdb.base/whatis.exp (v_signed_short_array): Fix a typo.
-
-	* gdb.base/help.exp: Update expected add-symbol-file, ignore, and
-	condition help.
-
-Tue Jul 19 10:26:32 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* lib/gdb.exp (runto): Rewrite in terms of gdb_run_cmd.
-
-	* lib/gdb.exp (gdb_run_cmd): New function, used to start program
-	  running.
-	* gdb.base/bitfields.exp: Use gdb_run_cmd to start program.
-	* gdb.base/funcargs.exp: Likewise.
-
-	* gdb.base/bitfields.exp: Simplify by using gdb_test.
-	* gdb.base/funcargs.exp: Likewise.
-
-	* lib/gdb.exp (gdb_test): if match times out, don't call fail if
-	  message is "".
-
-Mon Jul 18 12:18:07 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* gdb.base/{a2-run,callfuncs,funcargs,interrupt,mips_pro,nodebug,
-	  return,signals,twice}.exp: Handle non-existant binaries
-	  consistantly.
-
-	* gdb.base/corefile.exp: Execute coremaker to generate core dump.
-	* gdb.base/Makefile.in: Don't try to generate a core dump, we
-	  might testing a cross development system.
-
-Thu Jul 14 18:13:56 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* Makefile.in (RUNTEST_FOR_TARGET): Fix relative pathname, the
-	  runtest script is relative to ${srcdir}, not ${rootdir}.
-
-Thu Jul 14 14:56:59 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* gdb.base/signals.exp: Allow for optionality of breakpoint
-	address.
-
-Thu Jul 14 11:21:27 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.base/{ptype.exp,ptype.c}: Add t_char_array test.
-
-Tue Jul 12 12:22:32 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* gdb.c++/cplusfuncs.cc: Include <stddef.h>, not <sys/types.h>,
-	  for size_t definition.
-	* gdb.c++/templates.cc: Likewise
-
-	* config/mt-i386-netware: New file.
-
-	* gdb.base/interrupt.c: Do not test if errno == EINTR if it's not
-	  defined.
-
-	* gdb.base/Makefile.in: Added support for systems that name core
-	  files by appending "core" to the program name.
-	* gdb.base/a1-selftest.exp: Likewise.
-
-Mon Jul 11 23:59:18 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/return.exp:  Add comment and message for `return double'
-	test failure on Sparc Solaris.
-
-Mon Jul  4 12:10:48 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* lib/gdb.exp (runto): Allow for optionality of breakpoint address.
-
-Wed Jun 29 00:26:17 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.c++/misc.cc:  Instantiate classes to inhibit the compiler
-	from optimizing them away.
-	* gdb.c++/classes.exp, gdb.c++/inherit.exp:  Update ptype expect
-	patterns to include default constructors and assignment operators,
-	to match gcc versions beyond 2.5.8. Accept any cplus demangling
-	character in the output of the virtual base pointer.
-
-Fri Jun 24 08:15:42 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.c++/cplusfuncs.exp:  Use string_to_regexp and a regular
-	expression match in print_addr_of to avoid unintented matches.
-	* gdb.c++/virtfunc.exp:  Accept alternate ptype output of g++
-	versions up to 2.5.8.
-
-Mon Jun 20 23:54:37 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.base/list.exp:  Tweak alternate pattern for listing of an
-	included file to run under newer versions of expect.
-	* gdb.c++/demangle.exp:  Add spaces to the expect patterns between
-	consecutive >'s in templates to accomodate recent cplus-dem.c change.
-	Remove xfail for the virtual table of BDDHookV.
-
-Sat Jun 18 12:51:34 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* lib/gdb.exp (string_to_regexp): Set a default result.
-	(default_gdb_start): Fix misleading message.
-
-Wed Jun 15 12:10:10 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* config/mt-a29k-udi, config/mt-i960-nindy, config/mt-sparc-aout:
-	Remove all CC, etc definitions.
-	* config/mt-hpux: New file.
-	* config/mt-mips-ecoff (CFLAGS_FOR_TARGET): Remove:
-	(CFLAGS, LDFLAGS): Define.
-	* config/mt-slite (CFLAGS_FOR_TARGET): Change to LDFLAGS.
-
-	* Makefile.in (site.exp): Don't insert host_os, etc.
-	(just-check): Just use RUNTEST with RUNTESTFLAGS only.
-	(distclean): Check existence of subdir.
-	* gdb.base/configure.in (hppa*-*-hpux*): Recognize.
-	* gdb.base/Makefile.in: General cleanup and simplification.
-	Use CC, CFLAGS, and LDFLAGS instead of ..._FOR_TARGET versions
-	to build executables.	Use default rule to build .o files.
-	(EXPECT, RUNTEST, CC): Fix relative pathname.
-	(site.exp): Don't insert host_os, etc.
-	* gdb.base/signals.c (main): Don't call signal unless SIGALRM
-	and/or SIGUSR1 defined.
-	* gdb.base/watchpoint.c: Don't include stdio.h a second time.
-	* gdb.c++/Makefile.in: General cleanup and simplification.
-	Use CC, CFLAGS, and LDFLAGS instead of ..._FOR_TARGET versions
-	(CFLAGS): Remove.
-	(EXPECT, RUNTEST_FOR_TARGET, CXX): Fix relative pathname.
-
-Fri Jun 10 10:55:09 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* gdb.base/recurse.exp: Misc changes to get tests running again
-	after Kung's changes to the watchpoint code.
-	* gdb.base/watchpoint.exp: Likewise.
-
-Thu Jun  9 15:16:55 1994  Per Bothner  (bothner@kalessin.cygnus.com)
-
-	* lib/gdb.exp (string_to_regexp):  Convert {\} also.
-
-Wed Jun  8 12:12:17 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* config/udi-gdb.exp, config/unix-gdb.exp: Call default_gdb_start.
-	* lib/gdb.exp (default_gdb_start): Define.
-	* gdb.base/bitfields.exp, gdb.base/break.exp, gdb.base/exprs.exp,
-	gdb.base/funcargs.exp, gdb.base/opaque.exp,
-	gdb.base/printcmds.exp, gdb.base/ptype.exp, gdb.base/recurse.exp,
-	gdb.base/scope.exp, gdb.base/setvar.exp, gdb.base/watchpoint.exp,
-	gdb.c++/classes.exp, gdb.c++/misc.exp, gdb.c++/virtfunc.exp:
-	Don't call gdb_target_udi in between tests.
-
-Tue Jun  7 08:30:15 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.c++/demangle.exp: Use gdb_test_exact, rather than demangle
-	(which was basically just a local version of the same thing).  In
-	addition to avoiding duplication, gdb_test_exact is faster.
-	* lib/gdb.exp (gdb_test_exact): Fix typo.
-
-	* lib/gdb.exp (delete_breakpoints): If there were no breakpoints,
-	don't give an error.
-
-	* gdb.base/term.exp: Call delete_breakpoints before starting.
-
-	* gdb.base/Makefile.in (EXECUTABLES): Remove t10.
-	(t10): Add comment.
-
-Mon Jun  6 18:26:50 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	Reorganization of the GDB Test Suite.
-
-	* gdb.base: New directory, contains all the basic tests.
-	* gdb.c++: New directory, tests specific to C++.
-	* gdb.chill: New directory, tests specific to Chill.
-	* gdb.t00, gdb.t01, gdb.t02, gdb.t03, gdb.t04, gdb.t05, gdb.t06,
-	gdb.t07, gdb.t08, gdb.t09, gdb.t10, gdb.t11, gdb.t12, gdb.t13,
-	gdb.t15, gdb.t16, gdb.t17, gdb.t20, gdb.t21, gdb.t22, gdb.t23,
-	gdb.t24, gdb.t30, gdb.t31: Removed directories, contents moved
-	into appropriate new directories (t00-t17 to base, t20-t23 to c++,
-	t30-31 to chill).
-	* */gdbme.*: Rename to match appropriate expect scripts.
-	* gdb.base/bitfields.c, gdb.base/break.c, gdb.base/callfuncs.c,
-	gdb.base/coremaker.c, gdb.base/exprs.c, gdb.base/funcargs.c,
-	gdb.base/interrupt.c, gdb.base/list0.c, gdb.base/list0.h,
-	gdb.base/list1.c, gdb.base/mips_pro.c, gdb.base/nodebug.c,
-	gdb.base/opaque-info.c, gdb.base/opaque0.c, gdb.base/opaque1.c,
-	gdb.base/printcmds.c, gdb.base/ptype.c, gdb.base/recurse.c,
-	gdb.base/return.c, gdb.base/run.c, gdb.base/scope0.c,
-	gdb.base/scope1.c, gdb.base/setvar.c, gdb.base/signals.c,
-	gdb.base/types.c, gdb.base/twice.c, gdb.base/watchpoint.c,
-	gdb.base/whatis-info.c, gdb.base/whatis.c: New names of C files.
-	* gdb.c++/cplusfuncs.cc, gdb.c++/templates.cc, gdb.c++/misc.cc,
-	gdb.c++/virtfunc.cc: New names of C++ files.
-	* gdb.chill/chillvars.ch: New name of Chill file.
-	* gdb.base/configure.in, gdb.c++/configure.in,
-	gdb.chill/configure.in: Merge in contents of gdb.t*/configure.in.
-	* gdb.base/Makefile.in, gdb.c++/Makefile.in,
-	gdb.chill/Makefile.in: Merge in contents of gdb.t*/Makefile.in.
-	* configure.in (configdirs): Update to reflect directory changes.
-	(target_abbrev): No longer define for any configuration.
-	* Makefile.in: Cosmetic improvements to header comments.
-
-Fri Jun  3 18:56:06 1994  Per Bothner  (bothner@kalessin.cygnus.com)
-
-	Various changes to gdb.t31:
-
-	* Makefile.in (gdbme.o):  Compile with -fspecial_UC.
-	* gdbme.ch:  Make all key-words and predefineds be upper-case.
-	* chillvars.exp:  Expect key-words and predefinds in upper-case.
-
-	* chillvars.exp:  Use gdb_test_exact many places.
-	Change expected output for arrays (which now includes index labels).
-
-	* pr-5020.exp, gdme.ch (module PR_5020):
-	New test, for PR-5020.
-
-Thu Jun  2 16:02:41 1994  Per Bothner  (bothner@kalessin.cygnus.com)
-
-	* lib/gdb.exp (string_to_regexp, gdb_test_exact):  New procedures.
-	* Makefile.in (CHILL_LIB):  Remove bogus redundant definitions.
-
-Sun May 29 22:31:42 1994  Per Bothner  (bothner@kalessin.cygnus.com)
-
-	* Makefile.in:  Fix bit-rot in definitions of CHILL,
-	CHILL_FOR_TARGET and Chill_LIB.
-	* gdb.t31/gdbme.ch:  Fix syntax of nested array tuples.
-	* gdb.t31/Makefile.in:  Add definitions for CHILLFLAGS,
-	CHILL, and CHILL_LIB.
-
-Sat May 21 10:05:08 1994  Bill Cox  (bill@rtl.cygnus.com)
-
-	* Revert the previous changes.  Please see Rob's directory
-	  /lisa/test/rob/progressive/gdb/testsuite for these fixes.
-
-Thu May 19 12:51:00 1994  Bill Cox  (bill@rtl.cygnus.com)
-
-	* Makefile.in, configure.in, config/mips-gdb.exp,
-          config/mt-a29k-udi, config/mt-i386-aout, config/mt-i960-nindy,
-          config/mt-sparc-aout, config/udi-gdb.exp, config/unix-gdb.exp,
-          config/unknown.exp, gdb.t00/default.exp, gdb.t00/help.exp,,
-	  gdb.t00/teststrategy.exp, gdb.t01/Makefile.in, gdb.t02/Makefile.in,
-	  gdb.t02/whatis.exp, gdb.t03/Makefile.in, gdb.t03/gdbme.c,
-	  gdb.t04/Makefile.in, gdb.t05/Makefile.in, gdb.t06/Makefile.in,
-	  gdb.t06/break.exp, gdb.t06/signals.c, gdb.t06/signals.exp,
-	  gdb.t08/Makefile.in, gdb.t08/opaque.exp, gdb.t09/Makefile.in,
-	  gdb.t10/Makefile.in, gdb.t11/Makefile.in, gdb.t12/Makefile.in,
-	  gdb.t13/Makefile.in, gdb.t15/Makefile.in, gdb.t15/funcargs.exp,
-	  gdb.t15/gdbme.c, gdb.t15/return.exp, gdb.t16/Makefile.in,
-	  gdb.t17/Makefile.in, gdb.t17/callfuncs.exp, gdb.t17/gdbme.c,
-	  gdb.t20/Makefile.in, gdb.t21/Makefile.in, gdb.t21/cplusfuncs.exp,
-	  gdb.t22/Makefile.in, gdb.t22/virtfunc.exp, gdb.t23/Makefile.in,
-	  gdb.t24/demangle.exp, lib/gdb.exp:  Check in Rob's testing
-	  changes from 94Q1.
-
-Wed May 18 17:04:03 1994  Bill Cox  (bill@rtl.cygnus.com),
-
-	* config/mt-lynx, config/mt-m68k, config/mt-mips-ecoff,
-	  config/mt-slite, config/mt-unix, config/mt-vxworks: Add
-	  Rob's new testing fragments.
-
-Tue May 17 15:04:14 1994  Bill Cox  (bill@rtl.cygnus.com)
-
-	* config/mips-gdb.exp, config/udi-gdb.exp, config/vx-gdb.exp,
-          lib/gdb.exp: Replace error proc calls with perror.
-
-Mon May 16 19:00:50 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* gdb.t00/teststrategy.exp: Reorder so that AIX gdb can print the
-	version also, match on casted version strings, and match on
-	gdb startup case where the line numbers might be messed up.
-
-Fri May 13 18:00:27 1994  Bill Cox  (bill@rtl.cygnus.com)
-
-	* config/mt-i960-vx (LDFLAGS): Add '-r' option for test links.
-          (CFLAGS): Delete it from here.
-
-Tue May  3 16:08:09 1994  Kung Hsu  (kung@mexican.cygnus.com)
-
-	* gdb.t22/virtfunc.exp: Fix g++ ptype expected outputs.
-
-Fri Apr 29 14:26:35 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* Makefile.in (RUNTEST): Default to just "runtest".
-
-Tue Apr 26 22:21:40 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.t17/callfuncs.exp: More comments about t_func_values tests.
-	* gdb.t17/gdbme.c (t_func_values): Add comments about how and why
-	the code has been restructured.
-
-Thu Apr 21 12:48:07 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/default.exp (set write): Allow any number of \r and/or
-	\n, not just one of each.
-
-	* gdb.t07/gdbme.c (main): Don't take address of an array; SunOS4
-	/bin/cc gives a warning if you do.
-
-Thu Apr 21 11:54:04 1994  Kung Hsu  (kung@mexican.cygnus.com)
-
-	* gdb.t24/demangle.exp: change expect pattern of
-	__t10ListS_link1ZUiRCUiPT0
-
-Wed Apr 13 15:05:00 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.t07/{recurse.exp, recurse.c}: New tests for watchpoints
-	on local variables in recursive functions.
-
-	* gdb.t07/Makefile.in: Build the new test.
-
-Tue Apr 12 20:45:25 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.t17/gdbme.c (t_func_values): Do not compare function pointers
-	directly.  Instead compare the return values from actual calls.
-
-Mon Apr 11 10:31:00 1994  Bill Cox  (bill@rtl.cygnus.com)
-
-	* Makefile.in (check): Set TCL_LIBRARY for runtest.
-
-Mon Apr 11 09:15:30 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* From Peter Schauer with minor modifications.
-        * gdb.t15/return.exp (return_tests): Handle targets where "return"
-        stops in mid-line in the caller.  Add xfail for returning a float
-        value on X86 targets.
-
-Tue Apr  5 15:16:33 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.exp (fcmp_tests): Break up into two halves
-	to avoid expect lossage.
-	(fmem_LRbug_tests): Likewise.
-	* gdb.disasm/hppa.s: Corresponding changes.
-
-	* gdb.disasm/hppa.exp: Rework escape sequences and end-of-line
-	conditions to work with latest dejagnu/expect.
-
-	* gdb.t15/funcargs.exp (finish from indirect call): No longer
-	expected to fail on the PA.
-	(backtrace in call with trampolines): Explicitly require main
-	to be frame #1 (no trampolines should show up in backtrace).
-
-	* gdb.t00/default.exp: Use "exp_continue" rather than obsolete
-	"continue -expect".
-	* gdb.t06/break.exp: Likewise.
-	* gdb.t07/watchpoint.exp: Likewise.
-	* gdb.t13/bitfields.exp: Likewise.
-	* gdb.t15/{funcargs,return}.exp: Likewise.
-	* gdb.stabs/weird.exp: Likewise.
-	* config/{mips,udi}-gdb.exp: Likewise.
-
-	* hppa.sed: Enclose comments within a sed command to avoid
-	losing with the old OSF1 sed.
-
-Wed Mar 30 00:31:49 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t02/whatis.exp, gdb.t08/opaque.exp:  Add XFAILs for
-	sequent dynix.
-	* gdb.t06/signals.exp:  Add clear_xfail for sequent dynix.
-	* gdb.t15/funcargs.exp:  Conditionally step again to really
-	finish from marker_call_with_trampolines. Handle the case where
-	the first step from within call_with_trampolines already steps
-	us back to main.
-	* gdb.t15/gdbme.c:  Add comment to closing brace of
-	call_with_trampolines for funcargs.exp.
-
-Tue Mar 29 23:55:27 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.t07/watchpoint.exp (test_watchpoint_triggered_in_syscall):
-	Fix typo(s).
-
-Sun Mar 27 16:53:14 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.t07/gdbme.c: More code for watchpoint testing.
-
-	* gdb.t07/watchpoint.exp: Accept both "Watchpoint" and
-	"Hardware watchpoint" throughout file.
-	(test_watchpoint_triggered_in_syscall): New test.
-	(test_complex_watchpoint): New test.
-
-Fri Mar 25 17:05:31 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdbme.c (call_with_trampolines): New function to try and step
-	into.  Tests trampoline problems on the PA.
-
-	* funcargs.exp (localvars_in_indirect_call): No longer expect
-	stepping into indirect call to fail on PAs.
-	(test_stepping_over_trampolines): New test.
-
-Wed Mar 23 07:43:33 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Add suggestions for static member function tests, and
-	completion tests.
-
-Wed Mar 16 08:28:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Add suggestions for "p/a" tests.
-
-	* lib/gdb.exp: Set prompt to (gdb) if it isn't already set.
-	(default_gdb_exit): Replace all the hair with sending "quit" to
-	the process with a simple close.
-
-Tue Mar 15 08:45:50 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Add suggestions for shared library tests.
-
-Sun Mar 13 10:45:22 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Add suggestions for x/s tests.
-
-Fri Mar 11 08:22:00 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/help.exp: Replace most of docstrings for "tbreak",
-	"enable once", and "enable breakpoints once" with ".*".
-
-Thu Mar 10 08:34:27 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Add suggestions about structure passing tests.
-
-Mon Mar  7 13:45:54 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t03/gdbme.c:  gcc version 1 puts out the wrong stabs for
-	the primary1 test, use work around if __GNUC__ < 2.
-	* gdb.t06/signals.c:  Add comments for signals.exp pattern matching.
-	* gdb.t06/signals.exp:  Add XFAILs for i386 bsd and vax ultrix.
-	Test for bad output rather than waiting for timeout.  Issue
-	second continue only if first continue failed.
-
-Wed Mar  2 10:08:01 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* gdb.t21/cplusfuncs.exp (test_paddr_operator_functions): Do
-	operator[] test with gdb_test because the old code didn't seem to
-	be getting the quoting right with the new dejagnu.
-
-Thu Feb 24 19:49:25 1994  Rob Savoye  (rob@poseidon.cygnus.com)
-
-	* lib/gdb.exp: Set GDB to a fresh gdb if there is one, else use
-	one from the path.
-	* Makefile.in: Use a fresh expect if there is one, use runtest
-	from the src tree if there is one.
-
-Thu Feb 24 18:49:37 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* gdb.t06/break.exp (test_next_with_recursion): Remove xfail for
-	next over recursive call.  Revise the tests from that point on
-	(which had been skipped) to match GDB's actual (correct) output.
-
-	* gdb.t07/watchpoint.exp (test_stepping): Remove xfail for bug
-	with next over a breakpoint whose condition is false.
-
-	* gdb.t00/help.exp: Comment out "help set print" tests just like
-	(and for same reason as) "help set" test.
-
-Mon Feb 14 09:58:23 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.s (fmemLRbug_tests): New tests.
-	* gdb.disasm/hppa.exp (fmemLRbug_tests): Run them.
-
-Sun Feb  6 15:36:13 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t06/break.exp (test_next_with_recursion): Remove no longer
-	necessary gdb_target_udi.
-
-	* gdb.t03/ptype.exp: For UDI, skip tests which call malloc.
-
-	* gdb.t02/whatis.exp, gdb.t03/ptype.exp: Remove xfails for PRs
-	1838 and 2417; they are fixed.
-
-	* gdb.t02/whatis.exp (v_char_array, v_signed_char_array),
-	gdb.t03/ptype.exp (ptype structure, ptype union):
-	Remove xfails; the test is looser than when the xfails were added.
-
-	* gdb.t00/{help.exp,default.exp}: Don't test "target remote" on UDI.
-	* gdb.t00/help.exp: Don't expect remote to be in "help target" output.
-
-	* gdb.t01/run.exp: Only run shell test if isnative.
-
-	* config/udi-gdb.exp (gdb_load): Use "file", not "load" command,
-	since "run" automatically loads if necessary.  Call gdb_target_udi
-	after the "file" since "file" kills any execution target.
-
-	* config/udi-gdb.exp (gdb_start): Don't send "set args main" to
-	GDB.  GDB doesn't work that way (not anymore at least) on UDI.
-	* gdb.t01/run.exp, gdb.t06/break.exp: Don't pass extra first
-	argument for UDI.
-
-Fri Feb  4 12:19:32 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* gdb.t17/interrupt.c: If we get EINTR, don't print an error message.
-
-	* gdb.t17/callfuncs.exp: Add xfails for rs6000.
-
-Sat Feb  5 09:11:56 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t24/demangle.exp: Re-write demangle to just call gdb_test,
-	properly quoting regexps.  This makes the second argument to
-	demangle a fixed string, which matches the callers, instead of a
-	shell-style pattern which is what the previous implementation
-	used.  Update some of the callers.
-
-Sat Feb  5 10:19:09 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.s (comib_tests): Add missing instruction.
-	(comib_nullified_tests): Fix typo.
-	* gdb.disasm/hppa.exp (all comb tests): Fix thinkos in expect
-	strings.  No longer expected to fail.
-
-	* gdb.disasm/hppa.s (addib_tests): Fix typo.
-	* gdb.disasm/hppa.exp (all addb tests): Fix thinkos in expect
-	strings.  No longer expected to fail.
-
-	* gdb.disasm/hppa.exp (fmpy_addsub_tests): Fix typo in expect
-	string.  No longer expected to fail.
-
-Fri Feb  4 23:45:11 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.exp (fcmp_tests): Fix thinko in expect string.
-	No longer expected to fail.
-
-	* gdb.disasm/hppa.exp (xmpyu_tests): Fix buglet in expect
-	string.  No longer expected to fail.
-
-Fri Feb  4 10:35:42 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t24/demangle.exp: Remove a bunch more tests which differ
-	only in the names (I probably got most of them).  I was even
-	generous with some which differed in underscores in names, and
-	probably missed a few, and I *still* was able to remove almost a
-	third of the file with almost no impact on testsuite coverage.
-
-Thu Feb  3 12:04:49 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/default.exp: Match udi_attach error message as well as
-	the one from child_attach.
-
-	* gdb.t00/default.exp: Use "." instead of "?" to match a question mark.
-
-	* gdb.stabs/weird.exp: Remove xfail for const70; just fixed in GDB.
-
-	* gdb.stabs/weird.def (bad_neg0type): Size of this type is 16, not 8.
-	* gdb.stabs/weird.exp: Remove xfail for "p bad_neg0"; this fixes it.
-
-	* Move test with enums and partial symbols back to
-	gdb.t03/{ptype.exp,gdbme.c} from gdb.stabs/{weird.def,weird.exp}.
-	Reverts the change of 26 May 93.  Per today's change to
-	stabs.texinfo, the behavior that weird.exp was expecting was
-	unreasonable; what is important is that the compiler+gdb get
-	things right, which happens with a recent gcc.  Also fix the test
-	to deal with native compilers which put out the stab gdb can't
-	deal with.
-
-Mon Jan 31 15:40:11 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t24/demangle.exp: Remove a bunch of tests which differ only
-	in the names.  The main thing these accomplish is to slow things down.
-	Many more such duplicates surely remain.
-
-	* gdb.t00/help.exp: Comment out "help support" test just like
-	(and for same reason as) "help set" test.
-
-Mon Jan 31 06:43:45 1994  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t06/break.exp:  Remove setup_xfails for
-	sparc-sun-solaris2.*, these tests now pass with latest gcc and gdb.
-	* gdb.t20/inherit.exp (test_ptype_si):  Update warning message
-	about known bug in gcc to include up through 2.5.8.
-	* gdb.t20/inherit.exp (test_ptype_vi):  Accept "_vb." as well as
-	well as "_vb$".
-	* gdb.t21/cplusfuncs.exp (test_lookup_operator_functions):
-	Remove setup_xfails for sparc-sun-solaris2.*, these tests now pass
-	with latest gcc and gdb.
-	* gdb.t22/virtfunc.exp (test_ptype_of_classes):  Accept "_vb." as
-	well as "_vb$".
-
-Sat Jan 29 23:31:26 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* configure.in (hppa*-*-*): Also configure and build stabs-only
-	tests.
-
-Thu Jan 27 08:21:16 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.t10/hppa.mt: A makefile fragment for the PA.
-	* gdb.t10/configure.in (hppa*-*-*): Use it.
-
-Tue Jan 25 12:58:26 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t09/corefile:  Increase timeout when spawning gdb explicitly.
-
-Wed Jan 19 12:40:25 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t06/signals.exp:  Handle blocked SIGTRAP on sun3 for bash
-	versions prior to 1.13.5.
-
-Tue Jan 18 20:10:50 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/default.exp (show prompt): In FAIL case, only match if
-	the prompt is at the start of a line.
-
-Mon Jan 17 20:07:51 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.disasm/hppa.s: Add new tests for sfu and copr instructions.
-	Enable "diag" instruction.  Delete copr from fpu_misc_tests, it's
-	in the copr tests now.
-	* gdb.disasm/hppa.exp: Run new sfu and copr tests.  Do not expect
-	copr in the fpu_misc tests anymore.  fpu_misc tests are no longer
-	expected to fail.
-
-Fri Jan 14 14:24:21 1994  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* gdb.t00/teststrategy.exp, gdb.t07/watchpoint.exp,
-	gdb.t31/chillvars.exp, lib/gdb.exp:
-	Tweak to run under either version of expect.
-	* lib/gdb.exp (default_gdb_exit): Remove "catch" statement.
-	* gdb.t00/teststrategy.exp: Use isnative and verbose procedures.
-	* gdb.t11/list.exp: Remove extraneous whitespace.
-
-Sat Jan 15 09:57:22 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t16/printcmds.exp (test_print_strings): Accept
-	"(unsigned char *) " before the string.
-
-	* TODO: Add notes about printing of fancy types and GDB expressions.
-
-Thu Jan 13 17:16:09 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* Makefile.in: Pass LDFLAGS and LIBS to sub-makes.
-	* gdb.t06/configure.in: Don't try to compile signals test program
-	if doing mips-idt-ecoff.
-
-Thu Jan 13 08:25:55 1994  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* Most .exp files: Tweak to run under either version of expect.
-
-Tue Jan 11 15:21:13 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t12/scope.exp: Add xfails for rs6000.  Remove 1806 from existing
-	xfails; I'm not sure why they are failing, but not because of PR 1806.
-
-Mon Jan 10 22:14:20 1994  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* config/unix-gdb.exp: Remove gdb_unload cause it's already
-	defined in lib/gdb.exp.
-
-Fri Jan  7 12:42:45 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t07/watchpoint.exp:  Clear xfail for calling function with
-	watchpoint enabled on mips, CALL_DUMMY_BREAKPOINT_OFFSET got defined.
-	* gdb.t20/gdbme.cc, gdb.t21/gdbme.cc:  Conversion operator functions
-	have to be typeless.
-
-Tue Jan  4 09:32:22 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Add suggestion for copyright year test.
-
-Mon Jan  3 11:35:26 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* configure.in (*-*-lynxos*): Add stabs tests.
-
-Wed Dec  1 21:54:05 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.stabs/hppa.sed: Only lables should ever start in column zero,
-	so insert a tab before any assembler directive in column zero.
-
-	* gdb.disasm/hppa.exp (all_fpu_memory_tests): Test FP quadword
-	stores.
-	* gdb.disasm/hppa.s (fpu_memory_indexing_tests): Add FP quadword
-	stores.
-	(fpu_short_memory_tests): Likewise.
-
-Mon Nov 22 13:23:22 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.stabs/ecoff.mt:  Delete alpha specific if block, fix typo.
-	* gdb.stabs/ecoff.sed:  Escape inserted blanks with backslashes, embed
-	.stabs directives in comments.
-
-Fri Nov 19 14:09:02 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: New file, describing tests we could write.
-	* gdb.t09/corefile.exp: Move description of tests to write to TODO.
-
-Tue Nov 16 21:07:44 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t06/signals.exp: Add kludge to force re-sync.
-
-	* gdb.t00/teststrategy.exp: If we accidently send the "maint dump-me"
-	to xgdb instead of gdb, get out of gdb.
-
-Tue Nov 16 10:21:57 1993  Rob Savoye  (rob@cygnus.com)
-
-	* lib/gdb.exp: Make GDB and GDBFLAGS global so the scoping work
-	for info.
-
-Sat Nov 13 23:17:48 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* gdb.stabs/hppa.mt: A makefile fragment for the PA.
-	* gdb.stabs/configure.in (hppa*-*-*): Use it.
-	* gdb.stabs/hppa.sed: New sed script for the PA.
-
-Sat Nov 13 22:50:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.stabs: Re-write weird.def and configuration to use sed
-	instead of cpp.  sed is portable and POSIX; cpp is neither.
-
-Fri Nov 12 15:26:36 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t06/signals.exp: Remove one sun3 XFAIL which has been fixed.
-
-Mon Nov  8 16:55:28 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t20/gdbme.cc: Add comment about pmi being optimized out.
-
-Thu Nov  4 23:07:59 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.stabs/weird.exp, gdb.t22/virtfunc.exp: Accept "_vb." as well as
-	"_vb$".
-	* gdb.t00/teststrategy.exp: Add xfail for RS/6000.
-	* gdb.t03/ptype.exp: Add comments and messages about FAILs with xlc.
-
-Wed Nov  3 13:53:34 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* lib/gdb.exp: Comment out code which depends on non-existent
-	`transform' procedure.
-
-Wed Nov  3 11:23:11 1993  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* lib/gdb.exp (default_gdb_exit): Remove `catch "close"'.
-	* lib/gdb.exp: Transform tool name.
-	* gdb.t*/*.exp: Change error to perror so it works with DejaGnu
-	1.1's new error handling system.
-
-Mon Nov  1 10:36:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Makefile.in, gdb.t2*/Makefile.in: Add -O to CXXFLAGS.
-
-Fri Oct 29 17:58:14 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/default.exp: Avoid tests with a lot of .* in them.
-	They made pattern matching so slow that timeouts happened on
-	heavily loaded systems.  Now any output from "show print" which
-	gets us back to the GDB prompt is a PASS.
-
-Mon Oct 25 14:36:50 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* gdb.disasm/hppa.mt:  Use $(srcdir) in hppa.o make rule.
-
-Mon Oct 25 13:35:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t06/signals.exp: Skip whole file with xfail for HPPA.
-
-	* gdb.t24/demangle.exp: Remove "3220" from the one remaining xfail.
-	It is not from PR 3220.
-
-Sun Oct 24 18:49:58 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/{help.exp,default.exp}: Loosen up a few more tests which
-	just started failing because they depended on the order the
-	subcommands are presented, or exact docstring text.  This kind of
-	test is a pain and has minimal benefit.
-
-Thu Oct 21 08:26:48 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t09/corefile.exp: At end of test, use "core" command with
-	no arguments.
-
-Wed Oct 20 08:56:02 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* gdb.t{01 02 03 04 05 06 07 08 09 10 11 12 13 15 16
-	17}/Makefile.in:  Make it possible to run the testsuite with Sun
-	make and CC = cross gcc by adding explicit build rules for .o
-	files.
-
-Tue Oct 19 14:57:38 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t15/funcargs.exp: Don't put comments on same line as
-	setup_xfail (@#$*%& tcl braindamage!).
-
-Mon Oct 18 21:50:08 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.disasm/hppa.exp: Use $objdir/$subdir/$binfile not just $binfile.
-
-Fri Oct 15 15:39:54 1993  Kung Hsu  (kung@cirdan.cygnus.com)
-
-	* gdb.t20/classes.exp: 'const xxx &' becomes 'xxx const &'.
-	* gdb.t20/inherit.exp: remove three dumplicate entries.
-
-Fri Oct 15 13:45:25 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t06/break.exp: For "next over recursive call", fail on any
-	incorrect output, not just on "factorial (value=2)".
-
-Fri Oct 15 11:52:56 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t12/scope.exp:  Remove xfails, filename::var syntax should be
-	working now. Add an xfail if accesing a bss variable causes
-	a memory error if the target is not yet run.
-
-Thu Oct 14 19:16:56 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t24/demangle.exp: Clean up spacing (2 strings), inclusion of
-	constructor name (2 string), name of _GLOBAL_ demangling (2 strings),
-	name of __st* demangling (2 strings).  Did Kung really get the
-	more than 95 others right without testing them?
-
-Thu Oct 14 16:27:08 1993  Kung Hsu  (kung@cirdan.cygnus.com)
-
-	* gdb.t24/demangle.exp: clean up XFAILS, more than 100
-
-Thu Oct 14 11:40:30 1993  Jeffrey Law  (law@cs.uah.edu)
-
-	* configure.in (configdirs): Add gdb.disasm
-	* gdb.disasm: New directory for GDB disassembler tests.
-	* gdb.disasm/hppa.{exp,s,mt}: Disassembly tests for the HPPA.
-
-Thu Oct 14 11:40:30 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/help.exp: Don't test "help set".
-
-	* gdb.t20/inherit.exp, gdb.t22/virtfunc.exp: Remove all xfails
-	from within expect statements.  None of these happen anymore and
-	they cause regressions to be silently unnoticed.
-
-	* gdb.t20/inherit.exp, gdb.t22/virtfunc.exp: Add notes (in failure
-	messages) about known failures with gcc cygnus-2.4.5-930417.
-
-	* gdb.t02/Makefile.in, gdb.t08/Makefile.in: Make all depend on
-	comp-info.exp so it gets built if it doesn't exist.
-
-	* gdb.t13/{Makefile.in,bitfields.exp}: Remove comp-info.exp stuff;
-	it is no longer used.
-	* gdb.t13/comp-info.c: Removed.
-
-Wed Oct 13 22:54:06 1993  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* gdb.t06/signals.exp: Add xfail for sun3.
-
-Thu Oct  7 12:01:03 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t17/interrupt.exp: Add xfail for Irix (currently not really
-	relevant because ^C doesn't get sent but failure can be reproduced
-	interactively).
-
-Tue Oct  5 10:43:11 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.stabs/alpha.mt:  New configuration file for alpha.
-	* gdb.stabs/configure.in:  Use it.
-	* gdb.stabs/ecoff.mt, weird-ecoff.sed:  Change sed script to enable
-	sharing with alpha.mt, redefine long to word via preprocessor.
-	* gdb.stabs/weird.def:  Conditionally adapt storage layout of v_comb
-	for alpha.
-	* gdb.stabs/weird.exp:  Handle compilation of weird.s by alpha
-	native cc.
-	* gdb.t00/teststrategy.exp:  Change expect string so that we
-	consume the `(xgdb)' from the command echo and from the gdb prompt.
-	* gdb.t05/expr.exp:  xfail "print unsigned int == (~0)" on the alpha.
-	gdb currently compares all values as long, so this failure probably
-	applies to any configuration where LONGEST is bigger than a target int.
-	* gdb.t08/comp-info.c:  New file to determine if gdbme is compiled
-	with gcc.
-	* gdb.t08/Makefile.in, opaque.exp:  Use it. Alpha native cc is unable
-	to handle opaque pointers, gcc is.
-	* gdb.t21/gdbme.cc, gdb.t23/gdbme.cc:  operator new takes a size_t
-	as first argument. Include <sys/types.h> and change all operator
-	new definitions to use size_t.
-	* gdb.t21/cplusfuncs.exp:  Handle changes in output for operator new
-	now that we use size_t.
-
-Wed Sep 29 00:55:49 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-        * gdb.t03/ptype.exp, gdb.t15/printcmds.exp:  When constructing
-	a long or float array cast all array members to the same type.
-        * gdb.t04/setvar.exp:  Handle the decimal output of an unsigned long
-	with 64 bit longs.
-        * gdb.t07/watchpoint.exp:  Add finish and until variations encountered
-	on alpha.
-        * gdb.t08/opaque.exp, gdb.t17/interrupt.exp:  Add xfails for alpha.
-
-Tue Sep 28 17:26:47 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t24 (demangle.exp): Constructors of templates have names like
-	vector<int>::vector(int) not vector<int>::vector<int>(int).  See
-	section 14.6 of the ARM.
-
-	* gdb.t24 (demangle.exp): Remove a whole bunch of tests of the form
-	"_vt$MoveCmd"; these differ only in name from "_vt$foo", so they
-	accomplish little and slow down the testsuite.
-
-	* gdb.t24 (demangle.exp): Accept "XXX const" as well as "const XXX".
-	Accept spaces various places.
-
-Tue Sep 21 17:28:45 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t07/watchpoint.exp: On sparc, clear xfail for calling function
-	with watchpoint enabled.
-
-	* Makefile.in: Remove definition of CC and remove the second
-	definition of CXX (the "CXX = gcc" one remains).  These definitions
-	were causing backquotes to be expanded within backquotes, which
-	doesn't work.
-
-Sat Sep 18 09:43:21 1993  Jim Kingdon  (kingdon@poseidon.cygnus.com)
-
-	* gdb.t17/callfuncs.exp: Add "return 0" to end.
-
-Fri Sep 17 04:41:17 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-        * gdb.stabs/ecoff.mt:  Remove STABSCC hack.
-        * gdb.stabs/weird.exp:  Handle the case where weird.o is compiled
-	by mips cc and contains no stabs entries.
-
-Thu Sep 16 17:22:12 1993  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* config/vx-gdb.exp: Use fake device to load files rather than
-	NFS.
-	* lib/gdb.exp: New proc to do "file" command.
-	* config/unix-gdb.exp: Use new "file" proc.
-
-Thu Sep 16 13:45:44 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* config/mips-gdb.exp (gdb_load): Increase timeout to 2400.
-	Rework board rebooting slightly.
-	(gdb_exit): Don't exit from the remote shell; there isn't one.
-	* gdb.stabs/weird.exp: If a program is being debugged already,
-	kill it.
-	* gdb.t04/setvar.exp: Stop and restart gdb.
-	* gdb.t05/expr.exp: Likewise.
-	* gdb.t07/watchpoint.exp: If target is mips-idt-*, stop and
-	restart gdb and reload the program.
-	* gdb.t08/opaque.exp: Likewise.
-	* gdb.t12/scope.exp: Likewise.
-	* gdb.t13/bitfields.exp: Likewise.
-	* gdb.t15/funcargs.exp: Likewise.
-	* gdb.t20/classes.exp: Likewise.
-	* gdb.t03/ptype.exp: Increase timeout.
-	* gdb.t16/printcmds.exp (test_print_string_constants,
-	test_print_array_constants): Likewise.
-	* gdb.t17/callfuncs.exp (do_function_calls): Likewise.
-	* gdb.t20/classes.exp (do_tests): Likewise.
-	* gdb.t22/virtfunc.exp (test_virtual_calls): Likewise.
-
-Wed Sep 15 14:24:36 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* gdb.stabs: Renamed *wierd* to *weird*.
-
-Wed Sep 15 10:36:50 1993  Jim Kingdon  (kingdon@cirdan.cygnus.com)
-
-	* gdb.t13/bitfields.exp: Test for bad output rather than waiting
-	for timeout.  Add "known gcc 2.4.5 bug" to failure message.
-
-Tue Sep 14 17:16:44 1993  Jim Kingdon  (kingdon@cirdan.cygnus.com)
-
-	* gdb.stabs/wierd.exp (print_wierd_var): Test size, not type name.
-	(do_tests): Remove xfail for whatis on one_var and two_var.
-
-Wed Sep  8 23:14:23 1993  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* Makefile.in: Made cross building work better by adding
-	{RUNTEST,CC}_FOR_TARGET and using TARGET_FLAGS_TO_PASS.
-
-Tue Sep  7 14:11:52 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t15/{return.c,return.exp,Makefile.in}:
-	New test, currently commented out.
-
-Tue Aug 31 16:51:29 1993  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* config/udi-gdb.exp: gdb_exit now kills any isstip processes
-	still running and removes the leftover named socket so GDb can do
-	clean restarts.
-
-Mon Aug 30 17:55:16 1993  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* gdb.t01/run.exp: Add match for VxWorks, cause I/O comes out the
-	console, not GDB.
-	* config/mt-*: Added default values for RUNTEST and RUNTESTFLAGS so
-	cross testing works better with "make check"
-	* config/unix-gdb: Use default procedures for exit and version.
-	* config/vx-gdb.exp: Cleaned up and massaged back to working order
-	with the newest VxWorks.
-
-Thu Aug 26 17:50:28 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t20/classes.exp: For "ptype class Base1", continue to accept
-	old form.
-
-	* gdb.t22/virtfunc.exp: If it prints `struct' (not `class') with a
-	name (e.g. devo gdb with gcc 2.4.5), it is still a pass.
-
-	* gdb.t10/crossload.exp: Skip whole file (for now, until we fix it).
-
-	* config/unix-gdb.exp: Remove this version of gdb_exit
-	* lib/gdb.exp: Merge in all the crap from config/unix-gdb.exp.
-	Rob says he'll look at it when he gets back to testing boards.
-
-Thu Aug 26 07:20:00 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* gdb.t22/virtfunc.exp:  Accept missing struct/class names as
-	an expected fail for certain ptype commands.
-
-	* gdb.t20/classes.exp:  Update expected results of "ptype class
-	Base1" to account for the constructor that now appears in the type.
-
-Wed Aug 25 16:48:05 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* configure.in (configdirs):  Restore gdb.t04, which mysteriously
-	disappeared from list.
-	* config/{udi-gdb.exp, gdb-unix.exp}:  Replace calls to obsolete
-	"alldone" proc with call to cleanup and exit.
-	* {gdb.t01/run.exp, gdb.t01/term.exp, gdb.t02/whatis.exp,
-	gdb.t03/ptype.exp, gdb.t04/setvar.exp, gdb.t05/expr.exp,
-	gdb.t06/break.exp, gdb.t07/watchpoint.exp, gdb.t08/opaque.exp,
-	gdb.t09/corefile.exp, gdb.t10/crossload.exp, gdb.t11/list.exp,
-	gdb.t12/scope.exp, gdb.t13/bitfields.exp}:  Replace calls to
-	"alldone" proc with simple returns that suppress remaining
-	tests.  The alldone proc went away many months ago.
-
-Tue Aug 24 11:04:06 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t10/nodebug.exp: Comment out "maint print msymbols" tests.
-
-	* gdb.t12/gdbme0.c (localscopes, autovars): Modify to foil gcc -O.
-
-Thu Aug 19 22:08:41 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t15/funcargs.exp:  Allow arguments for main in backtraces
-	as vax gdb will display them.
-
-Thu Aug 19 18:18:59 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t20/gdbme.cc: Do some calculation with v.x, to confound
-	optimizers.
-
-	* scope.exp: Change "bad value for localval" messages so each one
-	is unique.
-
-	* config/unix-gdb.exp (gdb_exit): Move info on this vs.
-	lib/gdb.exp (gdb_exit) from ChangeLog to comments.
-
-	* gdb.t06/signals.exp: Skip the whole file with xfail for delta68.
-
-Tue Aug 17 00:05:28 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/teststrategy.exp: Deal with it if cmdsize = 1 line
-	doesn't exist (due to optimization).
-
-Mon Aug 16 21:05:49 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.stabs/wierd.exp: Deal with it if echo of "file" command
-	contains \r because the filename is long.
-
-	* gdb.t06/signals.exp: Revise comments regarding "'next' behaved as
-	'continue'" bug, and change xfail back to i*86-univel-sysv4*.
-
-Mon Aug 16 03:05:17 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t00/help.exp, gdb.t02/whatis.exp, gdb.t07/watchpoint.exp,
-	gdb.t08/opaque.exp, gdb.t17/interrupt.exp:  Update for vax running
-	Ultrix.
-	* gdb.t02/whatis.exp:  Use procedure to setup xfails on long versus
-	int tests.
-	* gdb.t08/opaque.exp:  Use procedure to setup xfails for opaque tests.
-
-Thu Aug 12 15:24:28 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* Makefile.in (distclean):  Remove *.log *.plog *.sum *.psum site.*.
-
-	* gdb.t17/interrupt.exp:  Fix 'missing Continuing' case so pattern
-	to match does not match the passing case but still matches the
-	failing case.
-
-Thu Aug 12 16:58:59 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Makefile.in (distclean): Remove *.plog *.sum *.psum site.*.
-
-Wed Aug 11 19:47:27 1993  John Gilmore  (gnu@rtl.cygnus.com)
-
-	* lib/gdb.exp (gdb_exit):  Move the best version of gdb_exit
-	to here.  Fix 'Quit anyway.*?' bug (? is a regexp metacharacter).
-	* config/{mips-gdb.exp, nind-gdb.exp, udi-gdb.exp, vx-gdb.exp}:
-	Remove various versions of gdb_exit.
-	* config/vx-gdb.exp:  Remove quit_vxgdb, change a caller to call
-	gdb_exit.
-	* config/unix-gdb.exp:  gdb_exit remains here, and should override
-	the generic version, since it's doing a lot of wierd stuff that
-	the other versions aren't.  FIXME, fold it in, or abandon this
-	version.
-
-Wed Aug 11 12:09:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t24/demangle.exp: Add tests for PR 3220.
-
-Tue Aug 10 15:49:35 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t24/demangle.exp: Add lucid test for __vtbl__3foo__vt_cc_main_.
-
-Tue Aug 10 15:45:25 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* gdb.t07/watchpoint.exp:  Clear xfail with "i*86-*-*", not just
-	"i386-*-*".  Works for i486 as well.
-
-	* gdb.t06/signals.exp:  Rework code that recognizes known SVR4
-	bug, and expand domain of xfail to all SVR4 systems, since the
-	actual problem is likely to be in generic SVR4 /proc support.
-
-Tue Aug 10 15:49:35 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config/unix-gdb.exp (gdb_load): Add eof to expect statement.
-
-Tue Aug 10 09:56:56 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* gdb.t17/interrupt.exp:  Set up xfail for *-*-sysv4*, in chain of
-	xfails for other systems.  Match a missing 'Continuing.' as an
-	explicit fail for i*86-*-sysv4*, so it doesn't hose other tests.
-
-	* gdb.t20 {classes.exp, inherit.exp, misc.exp}, gdb.t21/cplusfuncs.exp,
-	gdb.t22/virtfunc.exp, gdb.t23/templates.exp, gdb.t31/chillvars.exp:
-	Only issue warning for missing executables if -all option is used.
-
-	* gdb.stabs/wierd.exp:  Only issue warning for missing wierd.o
-	file if -all option is used.  It's like an unpredictable XFAIL.
-
-Mon Aug  9 10:13:34 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t15/funcargs.exp: Add comments that hppa xfails are only
-	for dynamically linked binaries.
-
-	* gdb.t10/crossload.exp: Add `set gnutarget auto' at end of tests.
-
-Sun Aug  8 14:21:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t20/inherit.exp: Change message for "print tagless struct"
-	to state that this is a known bug in old versions of g++.
-
-Fri Aug  6 21:40:30 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t17/interrupt.exp:  Add xfail for 386 bsd. Accept echoed newline
-	while waiting for `Continuing'.
-
-Fri Aug  6 13:38:08 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* gdb.t10/nodebug.exp:  Expect to find local/global minimal symbols
-	in text, data, and bss.
-	* gdb.t10/nodebug.c:  Add local and global test variables for
-	initialized and uninitialized data.
-
-Thu Aug  5 12:18:40 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config/unix-gdb.exp (gdb_exit): Add "wait".
-
-Thu Aug  5 18:14:06 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t06/signals.exp:  xfail the continue from the handler for all
-	targets.
-
-	* gdb.t07/watchpoint.exp:  clear_xfail for i386 when calling a
-	function with watchpoints enabled, the i386 call dummy starts with
-	a call.
-
-	* gdb.t00/teststrategy.exp, gdb.t09/Makefile.in:  Handle the way
-	386 bsd names its corefiles.
-
-Wed Aug  4 08:53:41 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t10/Makefile.in (nodebug.o):  Don't use "-c -o", many
-	compilers don't grok it.
-	* gdb.t16/gdbme.c (ctable1):  Initialize unsigned char array
-	with small octal ints rather than character constants, which
-	are signed and might not fit if first promoted to int.
-
-Tue Aug  3 18:28:25 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t09/Makefile.in (clean):  Remove corefile.
-
-Mon Aug  2 12:47:44 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t07/watchpoint.exp: Add missing `$prompt $'.
-
-Mon Aug  2 12:30:14 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-			  and Jim Kingdon (kingdon@cygnus.com)
-
-	* gdb.t06/signals.exp: Change xfail from "*-*-*" to be only for
-	NO_SINGLE_STEP machines.  Fix comment about its cause.  Uncomment
-	the `continue' test right after it (also xfailed if NO_SINGLE_STEP).
-
-Fri Jul 30 19:46:55 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t17/interrupt.exp: Add xfail for hppa.
-
-Fri Jul 30 12:54:11 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t02/whatis.exp, gdb.t03/ptype.exp, gdb.t08/opaque.exp,
-	gdb.t09/corefile.exp:  Cleanup xfails for fixed mips bugs.
-	* gdb.t13/bitfields.exp, gdbme.c:  Examine a variable in the inferior
-	to determine signed-ness of bitfields and use the result to setup
-	the xfail.
-	* gdb.t15/gdbme.c:  Add comments to the two indirect call0a lines.
-	* gdb.t15/funcargs.exp:  Use them to step until the second indirect
-	call line is reached if necessary.
-
-Thu Jul 29 20:33:08 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.stabs/wierd.exp: New test, for nameless baseclasses.
-
-Mon Jul 26 00:15:02 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t06/break.exp: Also test `clear' command.
-
-Wed Jul 21 18:03:38 1993  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* gdb.t00/teststrategy.exp: Remove extra quote.
-
-	* gdb.t07/watchpoint.exp: Change xfail for calling function with
-	watchpoint enabled to be for all non-68k machines.
-
-	* gdb.t15/{mips_pro.{c,exp},Makefile.in}: New test.
-
-Mon Jul 19 23:59:26 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.stabs/configure.in: If configured -with-gnu-as for mips-*-*
-	targets use aout.mt instead of ecoff.mt as gas understands
-	standard aout format.
-
-Mon Jul 19 18:14:06 1993  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* lib/gdb.exp (runto): Don't insist that function we are running to
-	was compiled with -g.
-
-	* gdb.t10/{nodebug.{c,exp},Makefile.in}: New test.
-
-	* gdb.t17/interrupt.exp: Before sending ^C, give the inferior time
-	to get back into the read system call.
-	Accept leading newline in case where we woke it up.
-
-Sun Jul 18 08:40:45 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.stabs/{ecoff.mt,wierd-ecoff.S,wierd-ecoff.sed}:  New files
-	to make the stabs test work on ecoff systems using gcc and -with-stabs.
-	* gdb.stabs/{Makefile.in,configure.in,aout.mt,xcoff.mt}:  Modify to
-	enable ecoff configuration.
-
-Thu Jul 15 11:54:58 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t15/funcargs.exp (localvars_in_indirect_call): New test.
-
-Wed Jul 14 09:36:42 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t16/printcmds.exp: Add another printf test.
-
-Wed Jul 14 15:37:13 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* configure.in: If configured -with-stabs on any target, add
-	stabsdirs to configdirs.
-
-Wed Jul 14 09:36:42 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t16/printcmds.exp: Change printf "%f\n" to printf "%f is
-	fun" so pattern does not match the command itself.
-
-Mon Jul 12 11:22:06 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t15/{gdbme.c,funcargs.exp}: Test for alloca-influenced frames.
-
-Sun Jul 11 12:03:24 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t17/interrupt.exp: Test for more things.
-
-Fri Jul  9 14:11:17 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t07/watchpoint.exp: In until test, deal with the way the DEC
-	compiler arranges the code and line numbers.
-
-	* gdb.t17/interrupt.exp: Don't send \n after ^C.
-
-Fri Jul  9 09:47:02 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t00/help.exp:  Increase expect input buffer size.
-
-Thu Jul  8 14:26:50 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t06/signals.exp: Remove sparc xfail; bug fixed.
-
-	* gdb.t07/watchpoint.exp: Add xfail for hppa.
-
-	* gdb.t17/{gdbme.c,callfuncs.exp}: Add sum10 function, to test pa bug.
-
-	* gdb.t06/signals.exp: At "p func1 ()" test, check for breakpoint
-	[0-9]*, not just [0-9].
-
-Wed Jul  7 17:52:28 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t20/{gdbme.cc,classes.exp}: Add xfail for gdb/2972.
-
-	* gdb.t2*: Set CXXFLAGS, not CFLAGS, since that's what we use.
-
-Tue Jul  6 13:54:49 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/help.exp: Replace most of docstring for "continue" with .*.
-
-Mon Jul  5 22:03:45 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t06/signals.c: Add xfails for sun3.
-
-	* gdb.t07/watchpoint.exp: Comment out xfail for fixed bug 1836.
-
-	* gdb.t07/{gdbme.c,watchpoint.exp}: Add test for 2597.  Also add
-	test_stepping tests.
-
-Fri Jul  2 09:08:10 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t{06,17}/Makefile.in (clean): Remove all executables.
-
-	* gdb.t17/{interrupt.{c,exp},Makefile.in}: New test for solaris bug.
-
-	* gdb.t06/twice.exp, Makefile.in: Just use an include of twice.c
-	rather than actually putting it through cpp twice.
-
-	* gdb.t06/signals.exp: Add xfails for unixware and rs6000.
-
-Fri Jul  2 10:48:03 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* config/mips-gdb.exp (gdb_exit): Removed close statement which is
-	no longer needed.
-
-Fri Jul  2 09:08:10 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t06/signals.exp: Add test for sparc bug with do_save_insn.
-
-	* gdb.t20/{classes,inherit}.exp: If a class which doesn't use any
-	C++ features prints as "struct", make it a pass, not an xfail.
-
-Thu Jul  1 22:03:33 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t22/virtfunc.exp: Remove a bunch of xfails.
-	Don't require VA to print as "class" rather than "struct".
-
-Thu Jul  1 18:27:40 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* gdb.t06/twice.exp: Don't care about the file name GDB prints.
-
-Wed Jun 30 18:01:00 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t{02,13}/comp-info.c, gdb.t06/twice.exp: Add "return 0" to end.
-
-Tue Jun 29 13:15:42 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t12/scope.exp:  Remove xfail for parameter printing in wrong
-	order.
-
-Tue Jun 29 09:22:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t16/printcmds.exp: Add printf tests.
-
-	* gdb.t06/{twice.{c,exp},Makefile.in}: New test.
-
-	* gdb.t10/Makefile.in (clean): Remove $(EXECUTABLES) too.
-
-Mon Jun 28 11:25:59 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t20/classes.exp:  Add clear_xfail's before printing summary
-	pass counts, to counteract any existing or future setup_xfails.
-
-Mon Jun 28 09:15:17 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.stabs/wierd{.def,-aout.S,-xcoff.S}: Use new macros
-	{BEGIN,END}_COMMON for common block instead of STAB.
-	* gdb.stabs/wierd.exp: Add xfail for rs6000.
-
-	* gdb.stabs/wierd.def: Make value of N_GSYM's 0.
-	intp_var should be N_GSYM not N_LSYM.
-	wierd-aout.S: Use a label for the value of the N_SO.
-	wierd.def: Remove all backslashes.
-	wierd-{aout,xcoff}.S: Put a few tests with backslashes here.
-
-Mon Jun 28 07:21:51 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t20/gdbme.cc (main): Move variable initialization for AIX to
-	get the expected next to inheritance3.
-
-Sun Jun 27 12:29:53 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t00/teststrategy.exp: Remove expected failure for mips-*-*
-	now that gcc-2.4 gets it right.
-
-Fri Jun 25 12:00:46 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.stabs/wierd{.def,.exp,-aout.S,-xcoff.S}: Add common block test.
-
-	* gdb.t{02,13}/{Makefile.in,gdbme.c,comp-info.c}: New way of
-	generating comp-info.exp which works for cross-compilation.
-
-Thu Jun 24 16:55:05 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t11/list.exp:  For SVR4 xfails, match "*-*-sysv4*", not
-	"*-*-sysv4.*".
-
-Tue Jun 22 21:17:26 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t01/run.exp:  Start with a fresh gdb.
-	* gdb.t11/list.exp:  For SVR4 xfails, match on all versions of
-	SVR4.x.
-
-Mon Jun 21 15:23:22 1993  Fred Fish  (fnf@cygnus.com)
-
-	* {gdb.t01, gdb.t02, gdb.t03, gdb.t04, gdb.t05, gdb.t06, gdb.t07,
-	gdb.t08, gdb.t09, gdb.t10, gdb.t11, gdb.t12, gdb.t13, gdb.t15,
-	gdb.t16, gdb.t17, gdb.t20, gdb.t21, gdb.t22, gdb.t23, gdb.t30}/
-	Makefile.in (distclean, realclean):  Remove gdbme.c from list of
-	things to remove.
-
-Sat Jun 19 07:49:10 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t24/demangle.exp (test_gnu_style_demangling):  Add some new
-	test cases from bug reports.
-
-Fri Jun 18 10:38:49 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t06/break.exp:  Add xfails for sparc-sun-solaris2.*.
-	* gdb.t12/scope.exp:  Add clear_xfails at appropriate places to
-	  avoid spurious xfails.
-	* gdb.t20/classes.exp:  Add xfails for longstanding C++ problems.
-	* gdb.t21/cplusfuncs.exp:  Add xfails for sparc-sun-solaris2.*.
-	* gdb.t22/virtfunc.exp:  Add xfails for longstanding C++ problems.
-
-Wed Jun 16 10:11:57 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t00/teststrategy.exp:  Rework to provide more useful
-	description of each test, fix problem with systems that define
-	ALIGN_STACK_ON_STARTUP code, other misc cleanups.
-	* gdb.t06/break.exp (test_next_with_recursion):  Fix expected
-	results for "next over recursive call" so timeouts aren't taken
-	by error.
-
-Mon Jun 14 09:09:04 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* gdb.t12/scope.exp: Test printing of variables before run.
-
-	* gdb.t12/{gdbme0.c,scope.exp}: Test for bug where parameters are
-	printed in wrong order due to sorting.
-
-Sat Jun 12 15:03:58 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t00/teststrategy.exp:  Fix expected results for printing
-	user entered string constant.  Is array of char, prints with no
-	address.
-
-	* gdb.t00/{default.exp, help.exp}:  Account for changes to radix
-	commands.
-	* gdb.t16/gdbme.c:  Add and use struct containing arrays of char.
-	* gdb.t16/printcmds.exp:  Fix all lines that match "unsigned char *".
-	* gdb.t16/printcmds.exp (test_print_char_arrays):  Test printing
-	of struct of char arrays.
-	* gdb.t00/radix.exp:  New tests for radix commands.
-
-Fri Jun 11 13:12:27 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* gdb.t16/printcmd.exp: Print a variable before running program
-	(with xfail for AIX).
-
-Thu Jun 10 11:04:04 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* gdb.t06/{signals.exp,signals.c,Makefile.in}: New test.
-
-	* gdb.t16/printcmd.exp: Don't print variables before running program.
-
-	* gdb.t06/break.exp: Don't require envp argument to main.
-
-	* gdb.t0{2,3,4,5}/gdbme.c [_AIX]: Use signed keyword.
-
-	* gdb.t02/whatis.exp, gdb.t11/list.exp:
-	Add xfails for rs6000.
-
-	* gdb.t02/whatis.exp: Change other tests not to re-test something
-	we already tested.
-
-	* gdb.t{03,15,16}/gdbme.c: Reference all variables and make sure
-	each type used has a variable of that type.
-
-Tue Jun  8 16:45:20 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
-
-	* gdb.t20/{inherit.exp,gdbme.cc}: Test tagless structure.
-
-Fri Jun  4 11:07:19 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* configure.in: change srctrigger to be a file, not a directory
-
-Fri Jun  4 08:23:57 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* configure.in (mips-idt-ecoff*): Added trailing '*'.
-
-	* gdb.t11/list.exp: Fixed a couple of typos.
-
-Tue Jun  1 21:28:06 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t00 (teststrategy.exp):  Remove notice about PR 1823.  Bug
-	is fixed and PR is closed.
-	* gdb.t16 (gdbme.c):  Add simple test string variable.
-	* gdb.t16 (printcmds.exp):  Add tests with simple test string
-	variable, primarily for boundaries on "set print elements".
-
-Mon May 31 11:36:08 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* gdb.stabs/wierd.exp: Remove xfail for printing big integer.
-	Make leading 0's optional and don't expect a tab in the middle
-	of the number.
-
-	* gdb.t00/teststrategy.exp: Remove xgdb before trying the copy.
-
-	* gdb.stabs/wierd.def: Type attributes must be preceded by number=.
-	* gdb.stabs/wierd.exp: Remove xfails for type attributes.  Also
-	don't end command passed to gdb_test with newline.
-
-	* gdb.t13/{Makefile.in,gdbme.c,bitfields.exp}: If we #defined the
-	signed keyword away, don't expect signed bitfields to be signed.
-
-	* gdb.t13/bitfields.exp (bitfield containment): Accept the fields
-	printing with only as many 1's as are in the field as well as printing
-	with 32 1's (see comment).
-
-Sat May 29 17:57:01 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t00/default.exp:  Start with a fresh gdb.
-	* configure.in (configdirs):  Remove gdb.t31 until the chill
-	compiler works again.  It no longer is able to find chillrt0
-	since it isn't in libchill.a anymore.
-	* gdb.stabs/wierd.exp:  Rewrite to properly handling a missing
-	wierd.o, make more modular.
-	* gdb.stabs/wierd.def (bad_neg0type, bad_neg0const):  Remove
-	spurious newlines that caused problems.
-
-Wed May 26 09:57:19 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Move test with enums and partial symbols from gdb.t03/ptype.exp
-	to gdb.stabs/wierd.exp since GCC has worked around the bug.
-	gdb.stabs/wierd.{exp,def}: Many new tests.
-
-	* gdb.t00/default.exp: update info line for new message.
-
-	* gdb.t02/{whatis.exp,gdbme.c}:
-	Test that "char *" doesn't print as "caddr_t".
-
-Tue May 25 13:28:27 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t00/help.exp: Use .* in place of some help messages which
-	just changed.
-	gdb.t00/default.exp: Update "info frame" test for new message.
-	* gdb.stabs/wierd.exp: Check for eof, directly or via gdb_test.
-	Remove some xfails
-
-Mon May 24 00:24:47 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* gdb.t03/{gdbme.c,ptype.exp}:
-	Add tests for typedef'd struct and union without tags.
-	Also check "whatis" on a variable of a typedef'd enum without a tag.
-
-	* gdb.t00/teststrategy.exp: For p "foo", remove sun4 XFAIL (see
-	PRMS 1823; the bug still exists but isn't reproduced by this test
-	anymore), and remove rs6000 XFAIL (the bug is fixed).
-
-	* gdb.t03/ptype.exp: Comment out a lot of tests which are basically
-	duplicated from whatis.exp.  For those that are left, accept
-	"long", "long int", or "int" for long variables (whatis.exp already
-	has an XFAIL for "int", so no need to fail it here).
-
-	* gdb.t02/whatis.exp, gdb.t10/crossload.exp:
-	Deal with GCC's names for types now that GDB uses the compiler's names.
-
-	* gdb.t02/{Makefile.in,gdbme.c,whatis.exp}:  If not GCC, do some
-	setup_xfail's for sunos4.  If we #defined the signed keyword away,
-	don't expect GDB to know that char it is signed.
-
-	* gdb.t00/teststrategy.exp: Update for symbolic signal names.
-
-Sun May 23 08:44:55 1993  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in (configdirs):  Add gdb.t24 for C++ tests that
-	should work on any system, regardless of debugging format.
-	* gdb.t21/demangle.exp:  Move to gdb.t24.
-	* gdb.t24/demangle.exp:  Move from gdb.t21.
-	* gdb.t24/{Makefile.in, configure.in}:  New files.
-
-Thu May 20 19:39:03 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* configure.in: Do gdb.stabs and C++ tests only for stabs.
-	* gdb.stabs: New directory.
-
-Tue May 18 21:12:09 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config/{mips,nind,udi,unix,vx}-gdb.exp: Look for "Quit anyway.*?"
-	not just "Quit anyway?".
-
-Tue May 18 17:13:20 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t21/demangle.exp:  Add a couple of new patterns.  Ensure
-	that all setup_xfails are immediately followed by clear_xfails.
-
-Tue May 11 09:10:47 1993  Fred Fish  (fnf@cygnus.com)
-
-	* config/unix-gdb.exp, gdb.t00/echo.exp, gdb.t00/help.exp,
-	gdb.t00/teststrategy.exp, gdb.t00/gdbvars.exp, gdb.t01/run.exp,
-	gdb.t01/term.exp, gdb.t02/whatis.exp, gdb.t03/ptype.exp,
-	gdb.t04/setvar.exp, gdb.t05/expr.exp, gdb.t06/break.exp,
-	gdb.t07/watchpoint.exp, gdb.t08/opaque.exp, gdb.t09/corefile.exp,
-	gdb.t10/crossload.exp, gdb.t11/list.exp, gdb.t12/scope.exp,
-	gdb.t13/bitfields.exp, gdb.t15/funcargs.exp, gdb.t16/printcmds.exp,
-	gdb.t17/callfuncs.exp, gdb.t20/misc.exp, gdb.t20/inherit.exp,
-	gdb.t20/classes.exp, gdb.t21/demangle.exp, gdb.t21/cplusfuncs.exp,
-	gdb.t22/virtfunc.exp, gdb.t23/templates.exp, gdb.t30/chexp.exp,
-	gdb.t31/chillvars.exp, lib/gdb.exp:
-	Change place to report bugs from bug-dejagnu@prep.ai.mit.edu to
-	bug-gdb@prep.ai.mit.edu.
-
-Fri May  7 09:15:35 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t17/callfuncs.exp (do_function_calls):  Call t_double_values
-	with 0.0, not integer 0.
-
-Fri Apr 30 13:17:24 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* gdb.t06/break.exp: Update for "Kill the program" message change.
-
-Fri Apr 30 09:42:57 1993  Fred Fish  (fnf@cygnus.com)
-
-	* Makefile.in (GDBFLAGS):  Set to -nx.
-	* Makefile.in (site.exp):  Use GDBFLAGS.
-
-Wed Apr 28 13:19:07 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	* */Makefile.in (CFLAGS): add CFLAGS = -g to all subdirectory
-	  Makefiles.
-	  (check): depend on just-check.
-	  (just-check): added so that tests can be run without a noop
-	  build pass.
-
-Fri Apr 23 18:13:28 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	Switch to using configure's configdirs.
-	* Makefile.in (Makefile): add configure.in dependency.
-	  (SUBDIRS): removed redundant assignment.
-	* configure.in: switch subdirs assignment to configdirs.
-	* gdb.t*/configure.in: new files.
-
-Thu Apr 22 08:27:53 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* gdb.t07/watchpoint.exp: Removed a29k expected failure which now
-	works.
-
-Tue Apr 20 13:38:40 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.{t20,t21,t22,t23}/Makefile.in:  Use $(srcdir) to avoid $<
-	in explicit rules.  Apparently this is not supported by some makes.
-
-Mon Apr 19 01:54:53 1993  John Gilmore  (gnu@cygnus.com)
-
-	* gdb.t31/Makefile.in:  Use $(srcdir) when avoiding $<, sigh.
-
-Fri Apr 16 09:33:46 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* config/unix-gdb.exp:  Add back missing return 0 which mysteriously
-	disappeared.
-
-Thu Apr 15 02:28:24 1993  John Gilmore  (gnu@cacophony.cygnus.com)
-
-	* gdb.t31/Makefile.in:  Avoid $< in explicit rule.
-
-Wed Apr 14 16:38:47 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t07/watchpoint.exp:  Remove setup_xfail for i486
-	watchpoint problem that is now fixed.
-	* gdb.t30/chexp.exp:  Remove setup_xfail for printing
-	uninitialized convenience variables.
-	* gdb.t31/chillvars.exp:  Fix expected patterns for printing
-	structures.
-
-Wed Apr 14 12:55:58 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t00/help.exp: Compensate for bug in mips-*-ultrix* OS
-	which causes expect to get out of sync with gdb on long output
-	from help set.
-	* gdb.t09/corefile.exp: Make expected pattern for core file
-	failing signal and frame output format less sun specific.
-
-Tue Apr 13 23:18:07 1993  Per Bothner  (bothner@cygnus.com)
-
-	* gdb.t31/chillvars.exp:  Add and remove initial dummy
-	breakpoint, so that symbol table is forced in.
-	(Needed at least on Sunos4, though it seems not SVR4.)
-	* gdb.t31/chillvars.exp:  Update for changed output format.
-
-Sun Apr 11 17:21:45 1993  Rob Savoye  (rob at darkstar.cygnus.com)
-
-        * config/unix-gdb.exp: Gracefully exits if $GDB is a bogus path.
-
-Wed Apr  7 21:28:21 1993  Rob Savoye  (rob@cygnus.com)
-
-	* Makefile.in: Added --srcdir when invoking runtest, removed the
-	need for a local config file. (optional now)
-
-Wed Apr  7 14:13:41 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t21/demangle.exp:  Only count real fails (not xfails) for
-	failure count used to force early termination.  Add some more
-	expected failures for gnu style demangling.
-
-Thu Apr  1 09:50:30 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* Makefile.in (CXXFLAGS): Remove -O. It caused the debug info for the
-	pmi variable from gdb.t20/gdbme to get optimized away.
-	* gdb.t00/teststrategy.exp: Added expected failure for mips-*-*.
-	Check for written corefile upon timeout _and_ eof.
-
-Tue Mar 30 09:58:16 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* config/unix-gdb.exp:  Add missing return 0.
-
-Tue Mar 30 08:34:25 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* gdb.t16/printcmds.exp:  Remove misplaced xfail that caused an early
-	test termination.
-
-Mon Mar 29 17:37:25 1993  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in (subdirs):  Put back gdb.t17 which mysteriously
-	disappeared.
-
-Thu Mar 25 21:05:16 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t10/crossload.exp:  Disable the i860-elf test until such
-	time as i860 support works.
-
-	* gdb.t15/funcargs.exp:  Fix expected outputs to include
-	"backtrace 100\r" rather than just "backtrace\r", to match last
-	change.
-
-Thu Mar 25 12:14:28 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* config/udi-gdb.exp (gdb_exit): Remove close command.
-	(gdb_target_udi): New procedure to set the UDI target.
-	(gdb_start): Don't remove *_soc files.  Use gdb_target_udi.
-	* gdb.t00/default.exp: Added expected failures for a29k-*-udi.
-	Added waits for prompts after several question responses.  Added
-	some more responses used by a29k-amd-udi-gdb.
-	* gdb.t01/run.exp, gdb.t06/break.exp: Added a29k-*-udi support:
-	pass different arguments, restart UDI connection after program
-	completion.
-	* gdb.t02/whatis.exp, gdb.t03/ptype.exp, gdb.t07/watchpoint.exp,
-	gdb.t08/opaque.exp, gdb.t11/list.exp, gdb.t12/scope.exp,
-	gdb.t15/funcargs.exp, gdb.t16/printcmds.exp, gdb.t20/misc.exp,
-	gdb.t21/cplusfuncs.exp: Added expected failures for a29k-*-*.
-	* gdb.t04/setvar.exp, gdb.t05/expr.exp, gdb.t07/watchpoint.exp,
-	gdb.t08/opaque.exp, gdb.t12/scope.exp, gdb.t13/bitfields.exp,
-	gdb.t15/funcargs.exp, gdb.t16/printcmds.exp,
-	gdb.t17/callfuncs.exp, gdb.t20/classes.exp, gdb.t20/inherit.exp,
-	gdb.t20/misc.exp, gdb.t22/virtfuncs.exp: Restart UDI connection
-	after program completion.
-	* gdb.t10/crossload.exp: Does not work for a29k-*-*, since BFD is
-	compiled with a SELECT_VECS setting.
-	* gdb.t15/funcargs.exp: Use argument to backtrace to prevent
-	infinite recursion.
-
-	* gdb.t20/classes.exp, gdb.t20/inherit.exp, gdb.t22/virtfuncs.exp:
-	Added checks for COFF results, and made them expected failures for
-	all targets.  It would be better to make them expected failures
-	for COFF targets only.
-
-Wed Mar 24 14:43:38 1993  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
-
-	* Makefile.in: add null dvi target, don't bother to recurse
-	through test directories for info and install-info; rename
-	$(datadir) to be dejagnu instead of deja-gnu
-
-Wed Mar 24 09:48:03 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t31/gdbme.ch:  Re-enable code that previously caused
-	compiler to coredump.
-	* gdb.t31/chillvars.exp:  Re-enable tests that depend on that
-	code.
-
-Tue Mar 23 08:53:42 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t31/gdbme.ch:  Comment out code that causes chill compiler
-	coredump.
-	* gdb.t31/chillvars.exp:  Comment out tests that depend on that
-	code.
-
-Sun Mar 21 17:56:47 1993  Rob Savoye  (rob at darkstar.cygnus.com)
-
-	* gdb.t03/ptype.exp: tests for return code from gdb_test.
-	* gdb.t00/teststrategy.exp: Uses which proc rather than spawning
-	which in a shell. Deletes xgdb when done.
-	* config/unix-gdb.exp: Won't try to spawn $GDB unless it exists.
-	Tests the return from the "set height" or "set width" commands.
-	Added a few return codes where needed.
-
-Wed Mar 17 11:31:01 1993  Fred Fish  (fnf@cygnus.com)
-
-	* Makefile.in (SUBDIRS):  Add gdb.t17.
-	* configure.in (subdirs):  Add gdb.t17.
-	* gdb.t17/{Makefile.in, callfuncs.exp, gdbme.c}:  New test
-	files to test gdb's calling of functions in the inferior with
-	the correct arguments and gdb's ability to retrieve any
-	result returned.
-
-Tue Mar 16 15:37:11 1993  Fred Fish  (fnf@cygnus.com)
-
-	* config/unix-gdb.exp (gdb_exit):  Remove close commands that
-	may be called after gdb goes away.  Previous versions of expect
-	needed these to avoid file descriptor leaks, but they cause
-	errors with the current revision of expect.
-	* gdb.t00/gdbvars.exp:  Use -re on expected output after
-	setting sevenbit-strings.
-	* gdb.t04/setvar.exp, gdb.t13/bitfields.exp:  Make commands
-	to set sevenbit-strings consistent across tests.
-	gdb.t30/chexp.exp, gdb.t31/chillvars.exp:  Make commands to
-	set sevenbit-strings consistent across tests.
-
-Fri Mar 12 08:47:20 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t21/demangle.exp (proc demangle):  Adjust quotes in an
-	expected output to match current "expect" expectations.
-
-Wed Mar 10 18:01:49 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t00/default.exp:  Change expected output for default "source"
-	command, to match new gdb behavior which requires a filename to
-	source.
-
-Tue Mar  9 11:00:56 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t07/watchpoint.exp (test_simple_watchpoint):  Set up
-	expected fail for i486-*-* that misses the marker2 function.
-	* gdb.t10/crossload.exp (bfddefault):  Allow successful
-	recognition of a format to pass even if no symbols are found.
-	Explicitly catch failures where the format is not recognized
-	or is ambiguous, and add the reason to the fail message.
-	* gdb.t10/crossload.exp (bfdexplicit):  Catch failure where
-	the cause is and invalid target and add reason to failure message.
-	* gdb.t10/crossload.exp:  Fix bfd target names for elf32-m68k,
-	elf32-i386, elf32-sparc, and elf32-i860.
-	* gdb.t12/scope.exp (test_at_main, test_at_foo, test_at_bar):
-	Set up expected failure for 'filename'::variable scope resolution,
-	which is now apparently broken on all targets.
-	* gdb.t20/classes.exp, gdb.t20/inherit.exp, gdb.t20/misc.exp,
-	gdb.t21/cplusfuncs.exp, gdb.t22/virtfunc.exp,
-	gdb.t23/templates.exp:   Change failure for missing binfile into
-	just a warning.
-	gdb.t21/demangle.exp:  Change all cfront references to 'arm'
-	references.
-
-Mon Mar  8 19:20:28 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t00/default.exp:  Add expected output for default "source"
-	command, to match new gdb behavior.
-	* gdb.t09/corefile.exp:  Use GDBFLAGS when spawning GDB.
-
-Sun Mar  7 15:14:09 1993  Rob Savoye  (rob@cygnus.com)
-
-	* config/*-gdb.exp: returns an error, rather than exiting on
-	internal errors.
-
-Tue Mar  2 18:09:32 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t03/gdbme.c:  Add pointer to struct variable.
-	* gdb.t03/ptype.exp:  Test equivalence of '.' and '->' for
-	referencing struct members.
-
-Thu Feb 25 10:39:06 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* configure.in (mips-idt-ecoff): New target.
-	* config/mips-gdb.exp: New file for remote board using MIPS remote
-	debugging protocol.
-
-	* Redid configuration scheme.  Removed gdb.t*/configure.in.
-	Renamed gdb.t*/in-gdbme* to gdb.t*/gdbme*.  Changed to use CC, CXX
-	instead of CC_FOR_TARGET, CXX_FOR_TARGET.  Added mostlyclean and
-	distclean targets.  Built executables via .o files.  Adjusted
-	tests to account for source files in $(srcdir) rather than
-	$(objdir).
-	* lib/gdb.exp (runto): Don't expect () after the function name,
-	because it may have arguments.
-
-Wed Feb 24 08:05:38 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* gdb.t00/default.exp, gdb.t01/run.exp, gdb.t02/whatis.exp,
-	gdb.t03/ptype.exp, gdb.t06/break.exp, gdb.t12/scope.exp: Added
-	expected failures for mips-idt-* and mips-sgi-*.
-	* gdb.t00/default.exp (attach): Kill process if requested.
-	* gdb.t00/help.exp (help target core, help target): Accept a gdb
-	that does not read core files.
-	* gdb.t01/run.exp: Removed checks for exit status code.
-	* gdb.t03/in-gdbme.c: Make explicit call to malloc to ensure that
-	it is linked in.
-	* gdb.t03/ptype.exp: Increase timeout when calling malloc.
-	* gdb.t04/setvar.exp, gdb.t05/expr.exp: Use runto function where
-	appropriate, rather than doing it by hand.
-	* gdb.t07/watchpoint.exp: If mips-idt-*, reload file after first
-	execution.
-	* gdb.t10/crossload.exp: Kill existing program if needed.
-	* gdb.t15/funcargs.exp: Use delete_breakpoints function where
-	appropriate, rather than doing it by hand.  Always increase
-	timeout for this test, not just for VxWorks.
-
-Wed Feb 24 08:03:38 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t31/chillvars.exp (test_structs):  New proc to test printing
-	of Chill STRUCT types and STRUCT values.
-	* gdb.t31/chillvars.exp (test_strings):  Expect "CHAR" now, rather
-	than "char".
-	* gdb.t31/in-gdbme.ch (simple_struct, nested_struct, struct1,
-	struct2):  New struct definitions and initializations to test
-	simple Chill STRUCT types.
-
-Tue Feb 23 11:55:06 1993  Fred Fish  (fnf@cygnus.com)
-
-	* gdb.t00/teststrategy.exp:  Track reversion in gdb to not print
-	the null byte at the end of strings.
-	* gdb.t00/default.exp:  Make show version insensitive to copyright
-	date.
-	* gdb.t16/in-gdbme.c (ctable1, ctable2):  Make explicitly unsigned
-	to avoid dependencies on target char signedness.
-	* gdb.t16/printcmds.exp:  Update expected results for explicitly
-	unsigned char.
-	* gdb.t16/printcmds.exp:  Remove setup_xfails for i960 that should
-	now work.
-	* gdb.t21/demangle.exp:  Add many more patterns for template
-	demangling, most of them being expected failures.
-	* gdb.t21/demangle.exp (proc demangle):  Quote the demangled
-	string we are matching for, to match on the whole string.
-	* gdb.t21/demangle.exp:  Add many new test strings to demangle,
-	and fix a whole bunch that had incorrect expected output but were
-	passing anyway because of the bug in "proc demangle".
-	* gdb.t31/chillvars.exp:  Remove setup_xfail for printing string
-	type.
-	* gdb.t31/in-gdbme.ch:  Uncomment string4, now compiles.
-
-Mon Feb 22 07:54:03 1993  Mike Werner  (mtw@poseidon.cygnus.com)
-
-        * gdb/testsuite: made modifications to testcases, etc., to allow
-        them to work properly  given the reorganization of deja-gnu and the
-        relocation of the testcases from deja-gnu to a "tool" subdirectory.
-
-Sun Feb 21 10:55:55 1993  Mike Werner  (mtw@poseidon.cygnus.com)
-
-	* gdb/testsuite: Initial creation of gdb/testsuite.
-	Migrated dejagnu testcases and support files for testing nm to
-	gdb/testsuite from deja-gnu.  These files were moved "as is"
-	with no modifications.  This migration is part of a major overhaul
-	of dejagnu.  The modifications to these testcases, etc., which
-	will allow them to work with the new version of dejagnu will be
-	made in a future update.
-
- For additional changes see gdb.mi/ChangeLog-1999-2003.
-
-;; Local Variables:
-;; mode: change-log
-;; left-margin: 8
-;; fill-column: 74
-;; version-control: never
-;; End:
-
-    Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-    2003, 2004, 2005 Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
deleted file mode 100644
index b92b91686f8..00000000000
--- a/gdb/testsuite/Makefile.in
+++ /dev/null
@@ -1,194 +0,0 @@
-# Makefile for regression testing the GNU debugger.
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2002, 2003, 2004,
-# 2005
-# Free Software Foundation, Inc.
-
-# This file is part of GDB.
-
-# GDB 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.
-
-# GDB 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.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-build_canonical = @build@
-host_canonical = @host@
-target_canonical = @target@
-target_cpu = @gdb_target_cpu@
-
-SHELL = @SHELL@
-EXEEXT = @EXEEXT@
-SUBDIRS = @subdirs@
-RPATH_ENVVAR = @RPATH_ENVVAR@
-ALL_SUBDIRS = gdb.ada gdb.arch gdb.asm gdb.base gdb.cp gdb.disasm \
-	gdb.dwarf2 \
-	gdb.fortran gdb.server gdb.java gdb.mi \
-	gdb.objc gdb.threads gdb.trace \
-	$(SUBDIRS)
-
-EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \
-          echo $${rootme}/../../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = $(RUNTEST_FOR_TARGET)
-
-RUNTESTFLAGS =
-
-RUNTEST_FOR_TARGET = `\
-  if [ -f $${srcdir}/../../dejagnu/runtest ]; then \
-    echo $${srcdir}/../../dejagnu/runtest; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ]; then \
-      echo runtest; \
-    else \
-      t='$(program_transform_name)'; echo runtest | sed -e '' $$t; \
-    fi; \
-  fi`
-
-#### host, target, and site specific Makefile frags come in here.
-
-# The use of $$(x_FOR_TARGET) reduces the command line length by not
-# duplicating the lengthy definition.
-
-TARGET_FLAGS_TO_PASS = \
-        "prefix=$(prefix)" \
-        "exec_prefix=$(exec_prefix)" \
-        "against=$(against)" \
-        'CC=$$(CC_FOR_TARGET)' \
-        "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-        "CFLAGS=$(TESTSUITE_CFLAGS)" \
-        'CXX=$$(CXX_FOR_TARGET)' \
-        "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
-        "CXXFLAGS=$(CXXFLAGS)" \
-        "MAKEINFO=$(MAKEINFO)" \
-        "INSTALL=$(INSTALL)" \
-        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-        "INSTALL_DATA=$(INSTALL_DATA)" \
-        "LDFLAGS=$(LDFLAGS)" \
-        "LIBS=$(LIBS)" \
-        "RUNTEST=$(RUNTEST)" \
-        "RUNTESTFLAGS=$(RUNTESTFLAGS)"
-
-all:
-	@echo "Nothing to be done for all..."
-
-.NOEXPORT:
-INFODIRS=doc
-info:
-install-info:
-dvi:
-html:
-install-html:
-
-install:
-
-uninstall: force
-
-site.exp: ./config.status Makefile
-	@echo "Making a new config file..."
-	-@rm -f ./tmp?
-	@touch site.exp
-	-@mv site.exp site.bak
-	@echo "## these variables are automatically generated by make ##" > ./tmp0
-	@echo "# Do not edit here. If you wish to override these values" >> ./tmp0
-	@echo "# add them to the last section" >> ./tmp0
-	@echo "set host_alias $(host_alias)" >> ./tmp0
-	@echo "set host_triplet ${host_canonical}" >> ./tmp0
-	@echo "set target_alias $(target_alias)" >> ./tmp0
-	@echo "set target_triplet ${target_canonical}" >> ./tmp0
-	@echo "set build_triplet ${build_canonical}" >> ./tmp0
-	@echo "set srcdir ${srcdir}" >> ./tmp0
-	@echo "set tool gdb" >> ./tmp0
-	@echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
-		@cat ./tmp0 > site.exp
-	@cat site.bak | sed \
-			-e '1,/^## All variables above are.*##/ d' >> site.exp
-	-@rm -f ./tmp?
-
-installcheck:
-
-check: site.exp all just-check
-
-just-check:
-	rootme=`pwd`; export rootme; \
-	srcdir=${srcdir} ; export srcdir ; \
-	EXPECT=${EXPECT} ; export EXPECT ; \
-	EXEEXT=${EXEEXT} ; export EXEEXT ; \
-        $(RPATH_ENVVAR)=$$rootme/../../expect:$$rootme/../../libstdc++:$$rootme/../../tk/unix:$$rootme/../../tcl/unix:$$rootme/../../bfd:$$rootme/../../opcodes:$$$(RPATH_ENVVAR); \
-	export $(RPATH_ENVVAR); \
-	if [ -f $${rootme}/../../expect/expect ] ; then  \
-	  TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
-	  export TCL_LIBRARY ; fi ; \
-	$(RUNTEST) $(RUNTESTFLAGS) 
-
-subdir_do: force
-	@for i in $(DODIRS); do \
-		if [ -d ./$$i ] ; then \
-			if (rootme=`pwd`/ ; export rootme ; \
-			    rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-				cd ./$$i; \
-				$(MAKE) $(TARGET_FLAGS_TO_PASS) $(DO)) ; then true ; \
-			else exit 1 ; fi ; \
-		else true ; fi ; \
-	done
-
-force:;
-
-subdirs:
-	for dir in ${ALL_SUBDIRS} ; \
-	do \
-		echo "$$dir:" ; \
-		if [ -d $$dir ] ; then \
-			(rootme=`pwd`/ ; export rootme ; \
-			 rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-			 cd $$dir; $(MAKE) $(TARGET_FLAGS_TO_PASS)); \
-		fi; \
-	done
-
-clean mostlyclean:
-	-rm -f *~ core *.o a.out xgdb *.x *.grt
-	if [ x"${ALL_SUBDIRS}" != x ] ; then \
-	    for dir in ${ALL_SUBDIRS}; \
-	    do \
-		    echo "$$dir:"; \
-		    if [ -d $$dir ]; then \
-			    (cd $$dir; $(MAKE) clean); \
-		    fi; \
-	    done ; \
-	else true; fi
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-	if [ x"${ALL_SUBDIRS}" != x ] ; then \
-	    for dir in ${ALL_SUBDIRS}; \
-	    do \
-		    echo "$$dir:"; \
-		    if [ -d $$dir ]; then \
-			    (cd $$dir; $(MAKE) distclean); \
-		    fi; \
-	    done ; \
-	else true; fi
-
-Makefile : Makefile.in config.status $(host_makefile_frag) $(target_makefile_frag)
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/gdb/testsuite/TODO b/gdb/testsuite/TODO
deleted file mode 100644
index 978991c77cd..00000000000
--- a/gdb/testsuite/TODO
+++ /dev/null
@@ -1,202 +0,0 @@
-The highest priority item is not on this list: Fix bugs in the
-existing testsuite, fix the GDB/compiler/shell/etc bugs which it
-detects (particularly when they are hard to XFAIL), make it run
-reliably without unexpected failures on the "standard" machines, etc.
-This list exists largely as "tests we can add when we are ready to
-risk destabilizing it again".
-
-There are some tests which are only run on some platforms because they
-have not been tested on more platforms.  Enable them and fix any
-problems.  A partial list: recurse.exp, watchpoint.exp
-(test_watchpoint_triggered_in_syscall, test_complex_watchpoint).
-
-Test printing of structures passed by value, for the 7th, 8th, and 9th
-arguments (PR 1714).  Test printing structure arguments of
-2,4,6,8,12,16,and 20 bytes.  Same for structure return of all those
-sizes ("return", "finish", and call function).
-
-Get crossload tests to use --enable-targets and reenable them.
-
-corefile.exp:
-Test ability to run program when there is a core target, then go
-back to the core file when the program exits.
-
-Test handling of floating point variables
-1.  float, double, or long double
-2.  in register or saved register or memory.  Also the case where a
-double is in two float registers and only one of them is saved.
-3.  print them or set them
-4.  (Alpha) integer (32 or 64 bit) in floating point register.
-
-Print registers--"p $r5", "p sizeof ($r5)".  Test that they print
-appropriately (integer registers in decimal, registers which always
-contain addresses (pc, probably sp and fp, maybe others) in hex,
-floating point).
-
-Test completer.  Test that it completes a variety of things correctly
-(see the list of test cases in main.c in the gdb source).  Test TAB,
-M-?, and the "complete" command.
-
-Test "info line" with all kinds of linespecs.  Test that the last line
-of the file works right.
-
-weird.exp--test that unrecognized cross-reference types or
-unrecognized visibility or virtual characters get skipped properly
-(see stabs.texinfo).
-
-Test C++ nested types (especially if PR 1954 is fixed; even if not
-*some* things already should work even in the presence of nested
-types).  Test classes nested more than 9 levels deep (g++ mangles
-these differently) (both a demangle test and some tests which also
-test the compiler).  Test calling a method of a class nested more than
-9 levels (for gdb_mangle_name and demangling).
-
-Test static member functions (C++).  Test that "ptype" shows them
-correctly, both before and after they have been converted from stub
-methods.  Test that we can call them.
-
-Test printing complicated types, including functions, pointers to
-arrays of pointers of functions, functions which return pointers to
-functions, etc.
-
-printcmd.exp--test printing enum values.  Test printing an enum
-variable whose value is out of range.  Test "p (int)enum_var", "p/x
-enum_var".  Test that in something like "enum {FOO, LAST_THING=FOO}"
-we print FOO, not LAST_THING.
-
-Test GDB expressions--test all operators (and overloaded operators for
-C++).  Test integer constants which are signed or unsigned int, long,
-or long long.  Test detection of overflow of an integer constant.
-Here are a few integer constants to test (test they get the right
-types): 5, 5LL, 5LuL, 5L6u (invalid), 5LU.  Maybe things like
-0x12345678, 0x87654321, etc., but their types depend on sizes of int,
-long, etc.
-
-Test that printing const-qualified versions of various types works.
-In particular, on the sparc and probably other machines, "double" is
-handled differently from most types because it requires more alignment
-and thus goes in a different section (there is a gcc 2.4.5 bug with
-"const double" on sparc).
-
-Test that GDB's "source" command works and that things work if stdin
-is redirected (to a file or a pipe).  Test user defined command.  Run
-an inferior each of these ways (to test that inflow.c works).  Test
-that GDB works if the last line of stdin or a source'd file lacks a
-newline.
-
-Test that unmatched single quotes produce error messages, both in
-expressions and linespecs.
-
-Test "cd".  "foo/bar/.." should get simplified to "foo".  "/../.."
-should not get simplified (for Mach).  "/.." should not get simplified
-(for other networked OSes; POSIX.1 section B.2.3.7).  All these
-examples should continue to work with trailing slashes.
-
-Test scoping; here is a start
- 1	int i=2;
- 2	int j=3;
- 3	main()
- 4	{
- 5	    int i;
- 6	    for (i=600; i>0; i--)
- 7		print_line(i);
- 8	}
- 9
-10	print_line(i)
-11	    int i;
-12	{
-13	    h();
-14	    printf("%d\n",i);
-15	}
-16
-17	h()
-18	{
-19	    printf("In h...");
-20	}
-Set a breakpoint in h, and print i, print_line::i, and main::i.  Set a
-breakpoint in main (or don't run the program), and test that
-print_line::i is an error.  But if i were static, "p main::i" should
-work even if the program is not being run.
-
-Write a test for the reentracy bug with rs6000_struct_return_address
-in rs6000-tdep.c.
-
-Test "return" from dummy frames.  Test "return" from non-innermost
-frame.  Test that "return" from a non-innermost frame restores
-registers which are saved not in that frame but in a frame more inner
-(I believe this currently works on few if any architectures).
-
-FORTRAN common blocks (a.out and xcoff--weird.exp has the start of
-one but it is not quite right as of 19 Nov 1993).
-
-Test that "x" command sets $_ and $__.  Test $_ in general.
-
-Test that "p/a" works when given addresses in text, data, and bss
-segments.  Test that it works if program is compiled with or without
--g.  Test that it works if preceding symbol is static or if it is
-extern.
-
-Given `char abc[] = "abc\0def";' test "x/s abc" followed by "x/s"
-(should display "abc" followed by "def").  Test this works with no
-error message even if this is the last thing in the section (tests
-that val_print_string ignores an error if the error occurs after the
-'\0').
-
-Test ability to process NMAGIC a.out files.
-
-Test shared libraries:  "next" over printf, "step" into a function in
-a shared library which has line number info, breakpoint in a function
-in a shared library (either before or after the program is run and the
-shared libraries are loaded--also maybe write a test where the PLT
-will be in an unloaded state even though the shared library is loaded).
-
-If there are two breakpoints in the same place, and exactly one of
-them has its condition true, test that the correct breakpoint gets
-printed.
-
-Test "jump" including jump to a breakpoint (the latter will need an
-xfail for UDI and probably VxWorks (PR 1786 for vxworks; PR 2416
-contains some info for 29k).
-
-Set a watchpoint on a local variable (to be interesting, make a few
-calls, to be more interesting, make a recursive call).  Test that it
-gets disabled when leaving that scope.
-
-Test calling a function, hitting a breakpoint in the called function,
-calling another function, and hitting a breakpoint.  Test backtrace
-works in the presence of multiple dummy frames.  Test that "continue"
-will get you out of the inner called function, and "continue" again
-will get you back to where you were when you called the first one.
-
-Test special longjmp handling in wait_for_inferior (need to figure out
-in detail what the proper behavior in each case is).  Test longjmp to
-a place where there is a breakpoint (such that
-BPSTAT_WHAT_CLEAR_LONGJMP_RESUME_SINGLE happens).  In general, test
-interactions between longjmp and watchpoints, breakpoints, stepping,
-call function, etc.
-
-Test jumping right past a breakpoint (the case where wait_for_inferior
-passes not_a_breakpoint to bpstat_stop_status).  Might already be
-tested by some of the sun3 tests.  Probably want a .s test to avoid
-compiler dependencies.
-
-Test more obscure wait_for_inferior cases, expanding on the tests in
-watchpoint.exp, signals.exp, etc.
-
-Test stepping into functions which are one line long and functions
-which are on line 1 of the source file. (there is a class of bugs in
-which gdb doesn't find the line number information, and thus doesn't
-step into the function).
-
-Test that prologue recognition, backtrace, printing locals, etc.,
-still work in the presence of large frames (the point being that at
-some point immediate fields in RISC instructions will overflow and
-prologues will need to look different.  For sparc, the immediate field
-is 13 bits (signed), so I believe the threshold would be 4K bytes in a
-frame).
-
-
-(this is for editing this file with GNU emacs)
-Local Variables:
-mode: text
-End:
diff --git a/gdb/testsuite/aclocal.m4 b/gdb/testsuite/aclocal.m4
deleted file mode 100644
index c754fdcf2f7..00000000000
--- a/gdb/testsuite/aclocal.m4
+++ /dev/null
@@ -1,583 +0,0 @@
-dnl This file is duplicated in four places:
-dnl * gdb/aclocal.m4
-dnl * gdb/testsuite/aclocal.m4
-dnl * expect/aclocal.m4
-dnl * dejagnu/aclocal.m4
-dnl Consider modifying all copies in parallel.
-dnl written by Rob Savoye <rob@cygnus.com> for Cygnus Support
-dnl CYGNUS LOCAL: This gets the right posix flag for gcc
-AC_DEFUN(CY_AC_TCL_LYNX_POSIX,
-[AC_REQUIRE([AC_PROG_CC])AC_REQUIRE([AC_PROG_CPP])
-AC_MSG_CHECKING([to see if this is LynxOS])
-AC_CACHE_VAL(ac_cv_os_lynx,
-[AC_EGREP_CPP(yes,
-[/*
- * The old Lynx "cc" only defines "Lynx", but the newer one uses "__Lynx__"
- */
-#if defined(__Lynx__) || defined(Lynx)
-yes
-#endif
-], ac_cv_os_lynx=yes, ac_cv_os_lynx=no)])
-#
-if test "$ac_cv_os_lynx" = "yes" ; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(LYNX)
-  AC_MSG_CHECKING([whether -mposix or -X is available])
-  AC_CACHE_VAL(ac_cv_c_posix_flag,
-  [AC_TRY_COMPILE(,[
-  /*
-   * This flag varies depending on how old the compiler is.
-   * -X is for the old "cc" and "gcc" (based on 1.42).
-   * -mposix is for the new gcc (at least 2.5.8).
-   */
-  #if defined(__GNUC__) && __GNUC__ >= 2
-  choke me
-  #endif
-  ], ac_cv_c_posix_flag=" -mposix", ac_cv_c_posix_flag=" -X")])
-  CC="$CC $ac_cv_c_posix_flag"
-  AC_MSG_RESULT($ac_cv_c_posix_flag)
-  else
-  AC_MSG_RESULT(no)
-fi
-])
-
-AC_DEFUN(CY_AC_PATH_TCLH, [
-#
-# Ok, lets find the tcl source trees so we can use the headers
-# Warning: transition of version 9 to 10 will break this algorithm
-# because 10 sorts before 9. We also look for just tcl. We have to
-# be careful that we don't match stuff like tclX by accident.
-# the alternative search directory is involked by --with-tclinclude
-#
-no_tcl=true
-AC_MSG_CHECKING(for Tcl private headers)
-AC_ARG_WITH(tclinclude, [  --with-tclinclude       directory where tcl private headers are], with_tclinclude=${withval})
-AC_CACHE_VAL(ac_cv_c_tclh,[
-# first check to see if --with-tclinclude was specified
-if test x"${with_tclinclude}" != x ; then
-  if test -f ${with_tclinclude}/tclInt.h ; then
-    ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)`
-  else
-    AC_MSG_ERROR([${with_tclinclude} directory doesn't contain private headers])
-  fi
-fi
-# next check in private source directory
-#
-# since ls returns lowest version numbers first, reverse its output
-if test x"${ac_cv_c_tclh}" = x ; then
-  for i in \
-		${srcdir}/../tcl \
-		`ls -dr ${srcdir}/../tcl[[0-9]]* 2>/dev/null` \
-		${srcdir}/../../tcl \
-		`ls -dr ${srcdir}/../../tcl[[0-9]]* 2>/dev/null` \
-		${srcdir}/../../../tcl \
-		`ls -dr ${srcdir}/../../../tcl[[0-9]]* 2>/dev/null ` ; do
-    if test -f $i/tclInt.h ; then
-      ac_cv_c_tclh=`(cd $i; pwd)`
-      break
-    fi
-    # Tcl 7.5 and greater puts headers in subdirectory.
-    if test -f $i/generic/tclInt.h ; then
-      ac_cv_c_tclh=`(cd $i; pwd)`/generic
-      break
-    fi
-  done
-fi
-# finally check in a few common install locations
-#
-# since ls returns lowest version numbers first, reverse its output
-if test x"${ac_cv_c_tclh}" = x ; then
-  for i in \
-		`ls -dr /usr/local/src/tcl[[0-9]]* 2>/dev/null` \
-		`ls -dr /usr/local/lib/tcl[[0-9]]* 2>/dev/null` \
-		/usr/local/src/tcl \
-		/usr/local/lib/tcl \
-		${prefix}/include ; do
-    if test -f $i/tclInt.h ; then
-      ac_cv_c_tclh=`(cd $i; pwd)`
-      break
-    fi
-  done
-fi
-# see if one is installed
-if test x"${ac_cv_c_tclh}" = x ; then
-   AC_HEADER_CHECK(tclInt.h, ac_cv_c_tclh=installed, ac_cv_c_tclh="")
-fi
-])
-if test x"${ac_cv_c_tclh}" = x ; then
-  TCLHDIR="# no Tcl private headers found"
-  AC_MSG_ERROR([Can't find Tcl private headers])
-fi
-if test x"${ac_cv_c_tclh}" != x ; then
-  no_tcl=""
-  if test x"${ac_cv_c_tclh}" = x"installed" ; then
-    AC_MSG_RESULT([is installed])
-    TCLHDIR=""
-  else
-    AC_MSG_RESULT([found in ${ac_cv_c_tclh}])
-    # this hack is cause the TCLHDIR won't print if there is a "-I" in it.
-    TCLHDIR="-I${ac_cv_c_tclh}"
-  fi
-fi
-
-AC_MSG_CHECKING([Tcl version])
-orig_includes="$CPPFLAGS"
-
-if test x"${TCLHDIR}" != x ; then
-  CPPFLAGS="$CPPFLAGS $TCLHDIR"
-fi
-
-# Get major and minor versions of Tcl.  Use funny names to avoid
-# clashes with eg SunOS.
-cat > conftest.c <<'EOF'
-#include "tcl.h"
-MaJor = TCL_MAJOR_VERSION
-MiNor = TCL_MINOR_VERSION
-EOF
-
-tclmajor=
-tclminor=
-if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then
-   # Success.
-   tclmajor=`egrep '^MaJor = ' conftest.out | sed -e 's/^MaJor = *//' -e 's/ *$//'`
-   tclminor=`egrep '^MiNor = ' conftest.out | sed -e 's/^MiNor = *//' -e 's/ *$//'`
-fi
-rm -f conftest.c conftest.out
-
-if test -z "$tclmajor" || test -z "$tclminor"; then
-   AC_MSG_RESULT([fatal error: could not find major or minor version number of Tcl])
-   exit 1
-fi
-AC_MSG_RESULT(${tclmajor}.${tclminor})
-
-CPPFLAGS="${orig_includes}"
-
-AC_PROVIDE([$0])
-AC_SUBST(TCLHDIR)
-])
-AC_DEFUN(CY_AC_PATH_TCLLIB, [
-#
-# Ok, lets find the tcl library
-# First, look for one uninstalled.  
-# the alternative search directory is invoked by --with-tcllib
-#
-
-if test $tclmajor -ge 7 -a $tclminor -ge 4 ; then
-  installedtcllibroot=tcl$tclversion
-else
-  installedtcllibroot=tcl
-fi
-
-if test x"${no_tcl}" = x ; then
-  # we reset no_tcl incase something fails here
-  no_tcl=true
-  AC_ARG_WITH(tcllib, [  --with-tcllib           directory where the tcl library is],
-         with_tcllib=${withval})
-  AC_MSG_CHECKING([for Tcl library])
-  AC_CACHE_VAL(ac_cv_c_tcllib,[
-  # First check to see if --with-tcllib was specified.
-  # This requires checking for both the installed and uninstalled name-styles
-  # since we have no idea if it's installed or not.
-  if test x"${with_tcllib}" != x ; then
-    if test -f "${with_tcllib}/lib$installedtcllibroot.so" ; then
-      ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/lib$installedtcllibroot.so
-    elif test -f "${with_tcllib}/libtcl.so" ; then
-      ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/libtcl.so
-    # then look for a freshly built statically linked library
-    # if Makefile exists we assume its configured and libtcl will be built first.
-    elif test -f "${with_tcllib}/lib$installedtcllibroot.a" ; then
-      ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/lib$installedtcllibroot.a
-    elif test -f "${with_tcllib}/libtcl.a" ; then
-      ac_cv_c_tcllib=`(cd ${with_tcllib}; pwd)`/libtcl.a
-    else
-      AC_MSG_ERROR([${with_tcllib} directory doesn't contain libraries])
-    fi
-  fi
-  # then check for a private Tcl library
-  # Since these are uninstalled, use the simple lib name root.
-  if test x"${ac_cv_c_tcllib}" = x ; then
-    for i in \
-		../tcl \
-		`ls -dr ../tcl[[0-9]]* 2>/dev/null` \
-		../../tcl \
-		`ls -dr ../../tcl[[0-9]]* 2>/dev/null` \
-		../../../tcl \
-		`ls -dr ../../../tcl[[0-9]]* 2>/dev/null` ; do
-      # Tcl 7.5 and greater puts library in subdir.  Look there first.
-      if test -f "$i/unix/libtcl.so" ; then
-	 ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.so
-	 break
-      elif test -f "$i/unix/libtcl.a" -o -f "$i/unix/Makefile"; then
-	 ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.a
-	 break
-      # look for a freshly built dynamically linked library
-      elif test -f "$i/libtcl.so" ; then
-        ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.so
-	break
-
-      # then look for a freshly built statically linked library
-      # if Makefile exists we assume its configured and libtcl will be
-      # built first.
-      elif test -f "$i/libtcl.a" -o -f "$i/Makefile" ; then
-        ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.a
-	break
-      fi
-    done
-  fi
-  # check in a few common install locations
-  if test x"${ac_cv_c_tcllib}" = x ; then
-    for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
-      # first look for a freshly built dynamically linked library
-      if test -f "$i/lib$installedtcllibroot.so" ; then
-        ac_cv_c_tcllib=`(cd $i; pwd)`/lib$installedtcllibroot.so
-	break
-      # then look for a freshly built statically linked library
-      # if Makefile exists we assume its configured and libtcl will be built first.
-      elif test -f "$i/lib$installedtcllibroot.a" -o -f "$i/Makefile" ; then
-        ac_cv_c_tcllib=`(cd $i; pwd)`/lib$installedtcllibroot.a
-	break
-      fi
-    done
-  fi
-  # check in a few other private locations
-  if test x"${ac_cv_c_tcllib}" = x ; then
-    for i in \
-		${srcdir}/../tcl \
-		`ls -dr ${srcdir}/../tcl[[0-9]]* 2>/dev/null` ; do
-      # Tcl 7.5 and greater puts library in subdir.  Look there first.
-      if test -f "$i/unix/libtcl.so" ; then
-	 ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.so
-	 break
-      elif test -f "$i/unix/libtcl.a" -o -f "$i/unix/Makefile"; then
-	 ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtcl.a
-	 break
-      # look for a freshly built dynamically linked library
-      elif test -f "$i/libtcl.so" ; then
-        ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.so
-	break
-
-      # then look for a freshly built statically linked library
-      # if Makefile exists we assume its configured and libtcl will be
-      # built first.
-      elif test -f "$i/libtcl.a" -o -f "$i/Makefile" ; then
-        ac_cv_c_tcllib=`(cd $i; pwd)`/libtcl.a
-	break
-      fi
-    done
-  fi
-
-  # see if one is conveniently installed with the compiler
-  if test x"${ac_cv_c_tcllib}" = x ; then	
-    orig_libs="$LIBS"
-    LIBS="$LIBS -l$installedtcllibroot -lm"    
-    AC_TRY_RUN([
-    Tcl_AppInit()
-    { exit(0); }], ac_cv_c_tcllib="-l$installedtcllibroot", ac_cv_c_tcllib=""
-    , ac_cv_c_tclib="-l$installedtcllibroot")
-    LIBS="${orig_libs}"
-   fi
-  ])
-  if test x"${ac_cv_c_tcllib}" = x ; then
-    TCLLIB="# no Tcl library found"
-    AC_MSG_WARN(Can't find Tcl library)
-  else
-    TCLLIB=${ac_cv_c_tcllib}
-    AC_MSG_RESULT(found $TCLLIB)
-    no_tcl=
-  fi
-fi
-
-AC_PROVIDE([$0])
-AC_SUBST(TCLLIB)
-])
-AC_DEFUN(CY_AC_PATH_TKH, [
-#
-# 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 seperate loops to speed
-# things up.
-# the alternative search directory is invoked by --with-tkinclude
-#
-AC_MSG_CHECKING(for Tk private headers)
-AC_ARG_WITH(tkinclude, [  --with-tkinclude        directory where the tk private headers are],
-            with_tkinclude=${withval})
-no_tk=true
-AC_CACHE_VAL(ac_cv_c_tkh,[
-# first check to see if --with-tkinclude was specified
-if test x"${with_tkinclude}" != x ; then
-  if test -f ${with_tkinclude}/tk.h ; then
-    ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)`
-  else
-    AC_MSG_ERROR([${with_tkinclude} directory doesn't contain private headers])
-  fi
-fi
-# next check in private source directory
-#
-# since ls returns lowest version numbers first, reverse the entire list
-# and search for the worst fit, overwriting it with better fits as we find them
-if test x"${ac_cv_c_tkh}" = x ; then
-  for i in \
-		${srcdir}/../tk \
-		`ls -dr ${srcdir}/../tk[[0-9]]* 2>/dev/null` \
-		${srcdir}/../../tk \
-		`ls -dr ${srcdir}/../../tk[[0-9]]* 2>/dev/null` \
-		${srcdir}/../../../tk \
-		`ls -dr ${srcdir}/../../../tk[[0-9]]* 2>/dev/null ` ; do
-    if test -f $i/tk.h ; then
-      ac_cv_c_tkh=`(cd $i; pwd)`
-      break
-    fi
-    # Tk 4.1 and greater puts this in a subdir.
-    if test -f $i/generic/tk.h; then
-       ac_cv_c_tkh=`(cd $i; pwd)`/generic
-    fi
-  done
-fi
-# finally check in a few common install locations
-#
-# since ls returns lowest version numbers first, reverse the entire list
-# and search for the worst fit, overwriting it with better fits as we find them
-if test x"${ac_cv_c_tkh}" = x ; then
-  for i in \
-		`ls -dr /usr/local/src/tk[[0-9]]* 2>/dev/null` \
-		`ls -dr /usr/local/lib/tk[[0-9]]* 2>/dev/null` \
-		/usr/local/src/tk \
-		/usr/local/lib/tk \
-		${prefix}/include ; do
-    if test -f $i/tk.h ; then
-      ac_cv_c_tkh=`(cd $i; pwd)`
-      break
-    fi
-  done
-fi
-# see if one is installed
-if test x"${ac_cv_c_tkh}" = x ; then
-  AC_HEADER_CHECK(tk.h, ac_cv_c_tkh=installed)
-fi
-])
-if test x"${ac_cv_c_tkh}" != x ; then
-  no_tk=""
-  if test x"${ac_cv_c_tkh}" = x"installed" ; then
-    AC_MSG_RESULT([is installed])
-    TKHDIR=""
-  else
-    AC_MSG_RESULT([found in $ac_cv_c_tkh])
-    # this hack is cause the TKHDIR won't print if there is a "-I" in it.
-    TKHDIR="-I${ac_cv_c_tkh}"
-  fi
-else
-  TKHDIR="# no Tk directory found"
-  AC_MSG_WARN([Can't find Tk private headers])
-  no_tk=true
-fi
-
-# if Tk is installed, extract the major/minor version
-if test x"${no_tk}" = x ; then
-AC_MSG_CHECKING([Tk version])
-orig_includes="$CPPFLAGS"
-
-if test x"${TCLHDIR}" != x ; then
-  CPPFLAGS="$CPPFLAGS $TCLHDIR"
-fi
-if test x"${TKHDIR}" != x ; then
-  CPPFLAGS="$CPPFLAGS $TKHDIR"
-fi
-if test x"${x_includes}" != x -a x"${x_includes}" != xNONE ; then
-  CPPFLAGS="$CPPFLAGS -I$x_includes"
-fi
-
-# Get major and minor versions of Tk.  Use funny names to avoid
-# clashes with eg SunOS.
-cat > conftest.c <<'EOF'
-#include "tk.h"
-MaJor = TK_MAJOR_VERSION
-MiNor = TK_MINOR_VERSION
-EOF
-
-tkmajor=
-tkminor=
-if (eval "$CPP $CPPFLAGS conftest.c") 2>/dev/null >conftest.out; then
-   # Success.
-   tkmajor=`egrep '^MaJor = ' conftest.out | sed -e 's/^MaJor = *//' -e 's/ *$//'`
-   tkminor=`egrep '^MiNor = ' conftest.out | sed -e 's/^MiNor = *//' -e 's/ *$//'`
-fi
-rm -f conftest.c conftest.out
-
-if test -z "$tkmajor" || test -z "$tkminor"; then
-   AC_MSG_RESULT([fatal error: could not find major or minor version number of Tk])
-   exit 1
-fi
-AC_MSG_RESULT(${tkmajor}.${tkminor})
-
-CPPFLAGS="${orig_includes}"
-fi
-
-AC_PROVIDE([$0])
-AC_SUBST(TKHDIR)
-])
-AC_DEFUN(CY_AC_PATH_TKLIB, [
-AC_REQUIRE([CY_AC_PATH_TCL])
-#
-# Ok, lets find the tk library
-# First, look for the latest private (uninstalled) copy
-# Notice that the destinations in backwards priority since the tests have
-# no break.
-# Then we look for either .a, .so, or Makefile.  A Makefile is acceptable
-# is it indicates the target has been configured and will (probably)
-# soon be built.  This allows an entire tree of Tcl software to be
-# configured at once and then built.
-# the alternative search directory is invoked by --with-tklib
-#
-
-if test x"${no_tk}" = x ; then
-  # reset no_tk incase something fails here
-  no_tk="true"
-
-  if test $tkmajor -ge 4 ; then
-    installedtklibroot=tk$tkversion
-  else
-    installedtkllibroot=tk
-  fi
-
-  AC_ARG_WITH(tklib, [  --with-tklib            directory where the tk library is],
-              with_tklib=${withval})
-  AC_MSG_CHECKING([for Tk library])
-  AC_CACHE_VAL(ac_cv_c_tklib,[
-  # first check to see if --with-tklib was specified
-  # This requires checking for both the installed and uninstalled name-styles
-  # since we have no idea if it's installed or not.
-  if test x"${with_tklib}" != x ; then
-    if test -f "${with_tklib}/lib$installedtklibroot.so" ; then
-      ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/lib$installedtklibroot.so
-      no_tk=""
-    elif test -f "${with_tklib}/libtk.so" ; then
-      ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/libtk.so
-      no_tk=""
-    # then look for a freshly built statically linked library
-    # if Makefile exists we assume its configured and libtk will be built
-    elif test -f "${with_tklib}/lib$installedtklibroot.a" ; then
-      ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/lib$installedtklibroot.a
-      no_tk=""
-    elif test -f "${with_tklib}/libtk.a" ; then
-      ac_cv_c_tklib=`(cd ${with_tklib}; pwd)`/libtk.a
-      no_tk=""
-    else
-      AC_MSG_ERROR([${with_tklib} directory doesn't contain libraries])
-    fi
-  fi
-  # then check for a private Tk library
-  # Since these are uninstalled, use the simple lib name root.
-  if test x"${ac_cv_c_tklib}" = x ; then
-    for i in \
-		../tk \
-		`ls -dr ../tk[[0-9]]* 2>/dev/null` \
-		../../tk \
-		`ls -dr ../../tk[[0-9]]* 2>/dev/null` \
-		../../../tk \
-		`ls -dr ../../../tk[[0-9]]* 2>/dev/null` ; do
-      # Tk 4.1 and greater puts things in subdirs.  Check these first.
-      if test -f "$i/unix/libtk.so" ; then
-	 ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.so
-	 no_tk=
-	 break
-      elif test -f "$i/unix/libtk.a" -o -f "$i/unix/Makefile"; then
-	 ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.a
-	 no_tk=
-	 break
-      # look for a freshly built dynamically linked library
-      elif test -f "$i/libtk.so" ; then
-        ac_cv_c_tklib=`(cd $i; pwd)`/libtk.so
-        no_tk=
-	break
-      # then look for a freshly built statically linked library
-      # if Makefile exists we assume its configured and libtk will be built 
-      elif test -f "$i/libtk.a" -o -f "$i/Makefile" ; then
-        ac_cv_c_tklib=`(cd $i; pwd)`/libtk.a
-        no_tk=""
- 	break
-      fi
-    done
-  fi
-  # finally check in a few common install locations
-  if test x"${ac_cv_c_tklib}" = x ; then
-    for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
-      # first look for a freshly built dynamically linked library
-      if test -f "$i/lib$installedtklibroot.so" ; then
-        ac_cv_c_tklib=`(cd $i; pwd)`/lib$installedtklibroot.so
-        no_tk=""
-	break
-      # then look for a freshly built statically linked library
-      # if Makefile exists, we assume it's configured and libtcl will be built 
-      elif test -f "$i/lib$installedtklibroot.a" -o -f "$i/Makefile" ; then
-        ac_cv_c_tklib=`(cd $i; pwd)`/lib$installedtklibroot.a
-        no_tk=""
- 	break
-      fi
-    done
-  fi
-  # check in a few other private locations
-  if test x"${ac_cv_c_tklib}" = x ; then
-    for i in \
-		${srcdir}/../tk \
-		`ls -dr ${srcdir}/../tk[[0-9]]* 2>/dev/null` ; do
-      # Tk 4.1 and greater puts things in subdirs.  Check these first.
-      if test -f "$i/unix/libtk.so" ; then
-	 ac_cv_c_tklib=`(cd $i; pwd)`/unix/libtk.so
-	 no_tk=
-	 break
-      elif test -f "$i/unix/libtk.a" -o -f "$i/unix/Makefile"; then
-	 ac_cv_c_tcllib=`(cd $i; pwd)`/unix/libtk.a
-	 no_tk=
-	 break
-      # look for a freshly built dynamically linked library
-      elif test -f "$i/libtk.so" ; then
-        ac_cv_c_tklib=`(cd $i; pwd)`/libtk.so
-        no_tk=""
-	break
-      # then look for a freshly built statically linked library
-      # if Makefile exists, we assume it's configured and libtcl will be built 
-      elif test -f "$i/libtk.a" -o -f "$i/Makefile" ; then
-        ac_cv_c_tklib=`(cd $i; pwd)`/libtk.a
-        no_tk=""
- 	break
-      fi
-    done
-  fi
-  # see if one is conveniently installed with the compiler
-  if test x"${ac_cv_c_tklib}" = x ; then
-       AC_REQUIRE([AC_PATH_X])
-       orig_libs="$LIBS"
-       LIBS="$LIBS -l$installedtklibroot $x_libraries $ac_cv_c_tcllib -lm"    
-       AC_TRY_RUN([
-       Tcl_AppInit()
-       { exit(0); }], ac_cv_c_tklib="-l$installedtklibroot", ac_cv_c_tklib=""
-       , ac_cv_c_tklib="-l$installedtklibroot")
-       LIBS="${orig_libs}"
-   fi
-  ])
-  if test x"${ac_cv_c_tklib}" = x ; then
-    TKLIB="# no Tk library found"
-    AC_MSG_WARN(Can't find Tk library)
-  else
-    TKLIB=$ac_cv_c_tklib
-    AC_MSG_RESULT(found $TKLIB)
-    no_tk=
-  fi
-fi
-AC_PROVIDE([$0])
-AC_SUBST(TKLIB)
-])
-AC_DEFUN(CY_AC_PATH_TK, [
-  CY_AC_PATH_TKH
-  CY_AC_PATH_TKLIB
-])
-AC_DEFUN(CY_AC_PATH_TCL, [
-  CY_AC_PATH_TCLH
-  CY_AC_PATH_TCLLIB
-])
diff --git a/gdb/testsuite/config/abug.exp b/gdb/testsuite/config/abug.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/abug.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/arm-ice.exp b/gdb/testsuite/config/arm-ice.exp
deleted file mode 100644
index d9842743d94..00000000000
--- a/gdb/testsuite/config/arm-ice.exp
+++ /dev/null
@@ -1 +0,0 @@
-load_lib "../config/monitor.exp";
diff --git a/gdb/testsuite/config/cfdbug.exp b/gdb/testsuite/config/cfdbug.exp
deleted file mode 100644
index edd91e4df76..00000000000
--- a/gdb/testsuite/config/cfdbug.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997, 1999 Free Software Foundation, 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
-
-load_lib "../config/monitor.exp"
diff --git a/gdb/testsuite/config/cpu32bug.exp b/gdb/testsuite/config/cpu32bug.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/cpu32bug.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/cygmon.exp b/gdb/testsuite/config/cygmon.exp
deleted file mode 100644
index d9842743d94..00000000000
--- a/gdb/testsuite/config/cygmon.exp
+++ /dev/null
@@ -1 +0,0 @@
-load_lib "../config/monitor.exp";
diff --git a/gdb/testsuite/config/d10v.exp b/gdb/testsuite/config/d10v.exp
deleted file mode 100644
index 955288c7ff0..00000000000
--- a/gdb/testsuite/config/d10v.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright (C) 1997 Free Software Foundation, 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
-
-load_lib "../config/monitor.exp"
diff --git a/gdb/testsuite/config/dve.exp b/gdb/testsuite/config/dve.exp
deleted file mode 100644
index 4b60b5aa965..00000000000
--- a/gdb/testsuite/config/dve.exp
+++ /dev/null
@@ -1,23 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
-set timeout 1000
-verbose "Timeout is now $timeout seconds" 2
-
diff --git a/gdb/testsuite/config/est.exp b/gdb/testsuite/config/est.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/est.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/gdbserver.exp b/gdb/testsuite/config/gdbserver.exp
deleted file mode 100644
index 9d133cfe722..00000000000
--- a/gdb/testsuite/config/gdbserver.exp
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2000, 2002, 2003, 2004, 2005 Free Software Foundation, 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.  
-
-# Test framework for GDB (remote protocol) using a "gdbserver",
-# ie. a debug agent running as a native process on the same or
-# a different host.
-
-#
-# This module to be used for testing gdb with a "gdbserver" 
-# built either from libremote or from gdb/gdbserver.  
-#
-
-#
-# To be addressed or set in your baseboard config file:
-#
-#   set_board_info gdb_protocol "remote"
-#	Unles you have a gdbserver that uses a different protocol...
-#
-#   set_board_info use_gdb_stub 1
-#	This tells the rest of the test suite not to do things
-#	like "run" which don't work well on remote targets.
-#
-#   set_board_info gdb,do_reload_on_run 1
-#	Unles you have a gdbserver that can handle multiple sessions.
-#
-#   set_board_info noargs 1
-#	At present there is no provision in the remote protocol
-#	for passing arguments.  This test framework does not
-#	address the issue, so it's best to set this variable
-#	in your baseboard configuration file.  
-#	FIXME: there's no reason why the test harness couldn't
-#	pass commandline args when it spawns gdbserver.
-#
-#   set_board_info gdb,noinferiorio 1
-#	Neither the traditional gdbserver nor the one in libremote
-#	can presently capture stdout and relay it to GDB via the
-#	'O' packet.  This means that tests involving printf will
-#	fail unles you set this varibale in your baseboard
-#	configuration file.
-#   
-#   set_board_info gdb,no_hardware_watchpoints 1
-#	Unles you have a gdbserver that supports hardware watchpoints.
-#	FIXME: gdb should detect if the target doesn't support them,
-#	and fall back to using software watchpoints.
-#
-#   set_board_info gdb_server_prog
-#	This will be the path to the gdbserver program you want to test.
-#	Defaults to "gdbserver".
-#
-#   set_board_info sockethost
-#	The name of the host computer whose socket is being used.
-#	Defaults to "localhost".  Note: old gdbserver requires 
-#	that you define this, but libremote/gdbserver does not.
-#
-#   set_board_info gdb,socketport
-#	Port id to use for socket connection.  If not set explicitly,
-#	it will start at "2345" and increment for each use.
-#
-
-# The guts live in gdbserver-support.exp now.
-
-load_lib gdbserver-support.exp
-
-proc gdbserver_gdb_load { arg } {
-    return [gdbserver_spawn $arg ""]
-}
-
-proc gdb_load { arg } {
-    return [gdbserver_load $arg ""]
-}
diff --git a/gdb/testsuite/config/h8300.exp b/gdb/testsuite/config/h8300.exp
deleted file mode 100644
index d9842743d94..00000000000
--- a/gdb/testsuite/config/h8300.exp
+++ /dev/null
@@ -1 +0,0 @@
-load_lib "../config/monitor.exp";
diff --git a/gdb/testsuite/config/hmsirom.exp b/gdb/testsuite/config/hmsirom.exp
deleted file mode 100644
index 0c531096601..00000000000
--- a/gdb/testsuite/config/hmsirom.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-# Support for testing against a Renesas SH3 target rom
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/i386-bozo.exp b/gdb/testsuite/config/i386-bozo.exp
deleted file mode 100644
index 78090937380..00000000000
--- a/gdb/testsuite/config/i386-bozo.exp
+++ /dev/null
@@ -1 +0,0 @@
-load_lib "../config/monitor.exp"
diff --git a/gdb/testsuite/config/i960.exp b/gdb/testsuite/config/i960.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/i960.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/m32r-stub.exp b/gdb/testsuite/config/m32r-stub.exp
deleted file mode 100644
index cd04787ddb6..00000000000
--- a/gdb/testsuite/config/m32r-stub.exp
+++ /dev/null
@@ -1 +0,0 @@
-load_lib "../../testsuite/config/sparclet.exp"
diff --git a/gdb/testsuite/config/m32r.exp b/gdb/testsuite/config/m32r.exp
deleted file mode 100644
index 39688ba8cf9..00000000000
--- a/gdb/testsuite/config/m32r.exp
+++ /dev/null
@@ -1,23 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
-set timeout 120
-verbose "Timeout is now $timeout seconds" 2
-
diff --git a/gdb/testsuite/config/m68k-emc.exp b/gdb/testsuite/config/m68k-emc.exp
deleted file mode 100644
index 70b8f5ef426..00000000000
--- a/gdb/testsuite/config/m68k-emc.exp
+++ /dev/null
@@ -1,17 +0,0 @@
-load_lib gdb.exp
-load_lib "../config/monitor.exp"
-
-proc gdb_emclaptop_command { command } {
-    global board_info;
-    set tname [board_info target name];
-
-    if ![info exists board_info($tname,m68k_connected)] {
-	m68k_emc_board_connect target;
-    }
-    # This is about all we can do for now. *sigh*
-    set dos_host [board_info target dos_host];
-
-    remote_send $dos_host "${command}\n";
-    #remote_expect $dos_host {
-    #}
-}
diff --git a/gdb/testsuite/config/mips-idt.exp b/gdb/testsuite/config/mips-idt.exp
deleted file mode 100644
index ecac87b2de0..00000000000
--- a/gdb/testsuite/config/mips-idt.exp
+++ /dev/null
@@ -1,17 +0,0 @@
-#   Copyright (C) 1993, 1997 Free Software Foundation, 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.  
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/mips.exp b/gdb/testsuite/config/mips.exp
deleted file mode 100644
index ecac87b2de0..00000000000
--- a/gdb/testsuite/config/mips.exp
+++ /dev/null
@@ -1,17 +0,0 @@
-#   Copyright (C) 1993, 1997 Free Software Foundation, 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.  
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/mn10300-eval.exp b/gdb/testsuite/config/mn10300-eval.exp
deleted file mode 100644
index 4b60b5aa965..00000000000
--- a/gdb/testsuite/config/mn10300-eval.exp
+++ /dev/null
@@ -1,23 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
-set timeout 1000
-verbose "Timeout is now $timeout seconds" 2
-
diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp
deleted file mode 100644
index c0fb464fb95..00000000000
--- a/gdb/testsuite/config/monitor.exp
+++ /dev/null
@@ -1,271 +0,0 @@
-# Test Framework Driver for GDB driving a ROM monitor (via monitor.c).
-#   Copyright 1995, 1996, 1997, 1998, 1999, 2000
-#   Free Software Foundation, 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.  
-
-load_lib gdb.exp
-# puts "***** DID USE MONITOR ******"
-
-#
-# gdb_target_cmd
-# Send gdb the "target" command
-#
-proc gdb_target_cmd { targetname serialport } {
-    global gdb_prompt
-
-    for {set i 1} {$i <= 3} {incr i} {
-	send_gdb "target $targetname $serialport\n"
-	gdb_expect 60 {
-	    -re "A program is being debugged already.*ill it.*y or n. $" {
-		send_gdb "y\n";
-		exp_continue;
-	    }
-	    -re "Couldn't establish connection to remote.*$gdb_prompt" {
-		verbose "Connection failed";
-	    }
-	    -re "Remote MIPS debugging.*$gdb_prompt" {
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Remote debugging using .*$serialport.*$gdb_prompt" {
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Remote target $targetname connected to.*$gdb_prompt" {
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Connected to.*$gdb_prompt" { 
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Ending remote.*$gdb_prompt" { }
-	    -re "Connection refused.*$gdb_prompt" {
-		verbose "Connection refused by remote target.  Pausing, and trying again."
-		sleep 30
-		continue
-	    }
-	    -re "Timeout reading from remote system.*$gdb_prompt" {
-		verbose "Got timeout error from gdb.";
-	    }
-	    timeout {
-		send_gdb "";
-		break
-	    }
-	}
-    }
-    return 1
-}
-
-
-
-#
-# gdb_target_monitor
-# Set gdb to target the monitor
-#
-proc gdb_target_monitor { exec_file } {
-    global gdb_prompt
-    global exit_status
-    global timeout
-
-    if [target_info exists gdb_protocol] {
-	set targetname "[target_info gdb_protocol]"
-    } else {
-	perror "No protocol specified for [target_info name].";
-	return -1;
-    }
-    if [target_info exists baud] {
-	gdb_test "set remotebaud [target_info baud]" "" ""
-    }
-    if [target_info exists binarydownload] {
-	gdb_test "set remotebinarydownload [target_info binarydownload]" "" ""
-    }
-    if { [ target_info exists disable_x_packet ] } {
-	gdb_test "set remote X-packet disable" ""
-    }
-    if { [ target_info exists disable_z_packet ] } {
-	gdb_test "set remote Z-packet disable" ""
-    }
-    if [target_info exists gdb_serial] {
-       set serialport "[target_info gdb_serial]";
-    } elseif [target_info exists netport] {
-	set serialport "[target_info netport]"
-    } else {
-	set serialport "[target_info serial]"
-    }
-
-    for {set j 1} {$j <= 2} {incr j} {
-	if [gdb_file_cmd $exec_file] { return -1; }
-
-	if ![gdb_target_cmd $targetname $serialport] { return 0; }
-
-	gdb_target_exec;
-
-	if { $j == 1 && ![reboot_target] } {
-	    break;
-	}
-    }
-
-    perror "Couldn't set target for $targetname, port is $serialport.";
-    return -1;
-}
-
-proc gdb_target_exec { } {
-    gdb_test "target exec" "No executable file now." "" ".*Kill it.*y or n.*" "y"
-    
-}
-#
-# gdb_load -- load a file into the debugger.
-#             return a -1 if anything goes wrong.
-#
-proc gdb_load { arg } {
-    global verbose
-    global loadpath
-    global loadfile
-    global GDB
-    global gdb_prompt
-    global timeout
-    global last_gdb_file;
-
-    if [target_info exists gdb_download_size] {
-	send_gdb "set download-write-size [target_info gdb_download_size]\n";
-	gdb_expect 30 {
-	    -re "$gdb_prompt $" { }
-	    default {
-		perror "Setting download-write-size for target failed";
-		return -1;
-	    }
-	}
-    }
-
-    if { $arg == "" } {
-	if [info exists last_gdb_file] {
-	    set arg $last_gdb_file;
-	} else {
-	    send_gdb "info files\n";
-	    gdb_expect 30 {
-		-re "Symbols from \"(\[^\"\]+)\"" {
-		    set arg $expect_out(1,string);
-		    exp_continue;
-		}
-		-re "Local exec file:\[\r\n\]+\[ \t\]*`(\[^'\]+)'," {
-		    set arg $expect_out(1,string);
-		    exp_continue;
-		}
-		-re "$gdb_prompt $" { }
-	    }
-	}
-    }
-
-    set last_gdb_file $arg;
-
-    for { set j 1; } { $j <= 2 } {incr j; } {
-	if [target_info exists gdb,use_standard_load] {
-	    gdb_target_exec;
-	    if ![target_info exists gdb,no_push_conn] {
-		remote_push_conn host;
-	    }
-	    set state [remote_ld target $arg];
-	    if ![target_info exists gdb,no_push_conn] {
-		remote_close target;
-		remote_pop_conn host;
-	    }
-	    if { $state == "pass" } {
-		if [gdb_target_monitor $arg] { return -1; }
-		gdb_test "list main" ".*" ""
-		verbose "Loaded $arg into $GDB\n";
-		return 0;
-	    }
-	} else {
-
-	    if [gdb_target_monitor $arg] { return -1 }
-
-	    if [is_remote host] {
-		# FIXME: Multiple downloads. bleah.
-		set farg [remote_download host $arg];
-	    } else {
-		set farg $arg;
-	    }
-
-	    if { $arg != "" && [target_info exists gdb_sect_offset] } {
-		set textoff [target_info gdb_sect_offset];
-		send_gdb "sect .text $textoff\n";
-		gdb_expect 30 {
-		    -re "(0x\[0-9a-z]+) - 0x\[0-9a-z\]+ is \\.data" {
-			set dataoff $expect_out(1,string);
-			exp_continue;
-		    }
-		    -re "(0x\[0-9a-z\]+) - 0x\[0-9a-z\]+ is \\.bss" {
-			set bssoff $expect_out(1,string);
-			exp_continue;
-		    }
-		    -re "$gdb_prompt" { }
-		}
-		set dataoff [format 0x%x [expr $dataoff + $textoff]];
-		set bssoff [format 0x%x [expr $bssoff + $textoff]];
-		send_gdb "sect .data $dataoff\n";
-		gdb_expect 30 {
-		    -re "$gdb_prompt" { }
-		}
-		send_gdb "sect .bss $bssoff\n";
-		gdb_expect 30 {
-		    -re "$gdb_prompt" { }
-		}
-	    }
-
-	    verbose "Loading $farg"
-	    if [target_info exists gdb_load_offset] {
-		set command "load $farg [target_info gdb_load_offset]\n";
-	    } else {
-		set command "load $farg\n";
-	    }
-	    if [target_info exists gdb_load_timeout] {
-		set loadtimeout [target_info gdb_load_timeout]
-	    } else {
-		set loadtimeout 1600
-	    }
-
-	    send_gdb $command;
-	    gdb_expect $loadtimeout {
-		-re "\[Ff\]ailed.*$gdb_prompt $" {
-		    verbose "load failed";
-		}
-		-re "Timeout reading from remote.*$gdb_prompt" {
-		}
-		-re "$gdb_prompt $" {
-		    verbose "Loaded $farg into $GDB\n"
-		    return 0;
-		}
-		timeout {
-		    if { $verbose > 1 } {
-			perror "Timed out trying to load $farg."
-		    }
-		}
-	    }
-	}
-
-	# Make sure we don't have an open connection to the target.
-	gdb_target_exec;
-
-	if { $j == 1 } {
-	    if { ![reboot_target] } {
-		break;
-	    }
-	}
-    }
-    perror "Couldn't load file into GDB.";
-    return -1;
-}
diff --git a/gdb/testsuite/config/netware.exp b/gdb/testsuite/config/netware.exp
deleted file mode 100644
index 2538ccf49b6..00000000000
--- a/gdb/testsuite/config/netware.exp
+++ /dev/null
@@ -1,218 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992, 1994, 1997 Free Software Foundation, 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 J.T. Conklin. (jtc@cygnus.com)
-
-load_lib gdb.exp
-load_lib remote.exp
-
-global shell_id
-
-global LD
-if ![info exists LD] then {
-	set LD [findfile "$base_dir/../../ld/ld.new"]
-}
-
-global NLMCONV
-if ![info exists NLMCONV] then {
-	set NLMCONV [findfile "$base_dir/../../binutils/nlmconv"]
-}
-
-#
-# gdb_version -- extract and print the version number of gcc
-#
-proc gdb_version {} {
-    default_gdb_version
-}
-
-#
-# gdb_unload -- unload a file if one is loaded
-#
-
-#
-# gdb_load -- load a file into the debugger.
-#             return a -1 if anything goes wrong.
-#
-proc gdb_load { arg } {
-    global gdb_prompt
-    global LD
-    global NLMCONV
-    global errorCode
-    global shell_id
-
-    # FIXME: this is wrong.
-    set targetname [target_info name];
-
-    set obj [file tail $arg]
-    set nlm "$obj.nlm"
-    set lnk "$obj.lnk"
-
-    # build *.lnk file
-    set fd [open $lnk w]
-    puts $fd "description \"[file tail $nlm]\""
-    puts $fd "screenname \"System Console\""
-    puts $fd "module clib.nlm"
-    puts $fd "module mathlib.nlm"
-    puts $fd "stack 32768"
-#    puts $fd "stack 64512"
-    puts $fd "debug"
-    # FIXME: don't hardcode location of prelude.o
-    puts $fd "input /s1/cygnus/dejagnu/i386-netware/lib/prelude.o"
-    puts $fd "input $arg"
-    puts $fd "output $nlm"
-    close $fd
-
-    # run nlmconv
-    verbose "Executing: $NLMCONV -l$LD -T$lnk" 1
-    catch "exec $NLMCONV -l$LD -T$lnk" output
-    if ![string match "" $output] then {
-	verbose $output 1
-    }
-    if ![string match "NONE" $errorCode] {
-	warning "Can't link $arg"
-
-	return -1
-    }
-    catch "exec rm -f $lnk"
-
-    # download
-    verbose "Downloading $nlm" 1
-    catch "exec cp $nlm /.NetWare/$targetname.nws/sys.nwv/tmp/x.nlm" output
-    if ![string match "" $output] then {
-	verbose $output 1
-	return -1
-    }
-
-    gdb_file_cmd $nlm
-}
-
-proc gdb_run_cmd { } {
-    global shell_id
-    global gdb_prompt
-    global timeout
-
-    set connhost [target_info name];
-    if [board_info $connhost exists serial] {
-	set serialport [board_info $connhost serial];
-    } else {
-	set serialport [board_info $connhost netport];
-    }
-
-    if [board_info $connhost exists baud] {
-	set baud [board_info $connhost baud];
-    } else {
-	set baud 9600;
-    }
-    # FIXME: This is wrong.
-    send "kill\n"
-    gdb_expect {
-	-re ".*Kill the program being debugged.*y or n. $" {
-	    send "y\n"
-	    exp_continue
-	}
-	-re ".*$gdb_prompt $" {}
-    }
-
-    verbose "Starting GDB stub on [target_info name]" 1
-    send -i $shell_id "load nlmstub BAUD=$baud x.nlm\r\n"
-
-    send "set remotebaud $baud\n"
-    gdb_expect {
-	-re "$gdb_prompt" {}
-	timeout {
-	    perror "Couldn't set remote baud rate"
-	    return
-	}
-    }
-
-    set otimeout $timeout
-    set timeout 60
-    verbose "Timeout is now $timeout seconds" 2
-    send "target remote $serialport\n"
-    gdb_expect {
-	-re "Couldn't establish connection to remote target" {
-	    send "target remote $serialport\n"
-	    exp_continue
-	}
-	-re "$gdb_prompt" {}
-	timeout {
-	    set timeout $otimeout
-	    verbose "Timeout restored to $timeout seconds" 2
-	    perror "Couldn't set remote target"
-	    return
-	}
-    }
-    set timeout $otimeout
-    verbose "Timeout restored to $timeout seconds" 2
-
-    send "continue\n"
-    gdb_expect {
-	"Continuing.$" {}
-    }
-
-    return
-}
-
-
-
-#
-# start the remote shell
-#
-
-set shell_prompt "Password:"
-set shell_id [remote_open target]
-
-if $shell_id<0 then {
-    warning "Couldn't connect to target"
-    return -1
-}
-
-if [string match "" $passwd] then {
-    stty -echo
-    send_user "Password: "
-    expect_user -re "(.*)\n"
-    send_user "\n"
-    set passwd "$expect_out(1,string)"
-    stty echo
-}
-
-send -i $shell_id "$passwd\n"
-gdb_expect {
-    -i $shell_id ":" {
-	verbose "Got termtype prompt" 0
-    }
-
-    -i $shell_id timeout {
-	warning "Connection timed out"
-	return -1
-    }
-}
-
-
-# FIXME: this is wrong.
-set shell_prompt "[string toupper [target_info name]]:"
-send -i $shell_id "1\n"
-
-gdb_expect {
-    -i $shell_id -re "$shell_prompt" {}
-    -i $shell_id timeout {
-	warning "Connection timed out"
-	return -1
-    }
-}
diff --git a/gdb/testsuite/config/nind.exp b/gdb/testsuite/config/nind.exp
deleted file mode 100644
index 0f84013b051..00000000000
--- a/gdb/testsuite/config/nind.exp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Test Framework Driver
-#   Copyright (C) 1988, 1990, 1991, 1992, 1997 Free Software Foundation, 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.  
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-load_lib gdb.exp
-
-#
-# gdb_load -- load a file into the debugger.
-#
-proc gdb_load { arg } {
-    global verbose
-    global loadpath
-    global loadfile
-    global gdb_prompt
-    global GDB
-    set loadfile [file tail $arg]
-    set loadpath [file dirname $arg]
-    send_user "Not implememted yet\n" ; return -1
-}
-
-#
-# gdb_start -- start GDB running
-#
-proc gdb_start { } {
-    global GDB
-    global GDBFLAGS
-    global spawn_id
-    global gdb_prompt
-    global verbose
-    send_user "Not implememted yet\n" ; return -1
-}
diff --git a/gdb/testsuite/config/proelf.exp b/gdb/testsuite/config/proelf.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/proelf.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/rom68k.exp b/gdb/testsuite/config/rom68k.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/rom68k.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/sh.exp b/gdb/testsuite/config/sh.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/sh.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/sid.exp b/gdb/testsuite/config/sid.exp
deleted file mode 100644
index 987c9beab12..00000000000
--- a/gdb/testsuite/config/sid.exp
+++ /dev/null
@@ -1,216 +0,0 @@
-# Test Framework Driver for GDB driving an external simulator
-#   Copyright 1999, 2001 Free Software Foundation, 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.  
-
-load_lib gdb.exp
-
-proc sid_start {} {
-    global verbose
-
-    set port [lindex [split [target_info netport] ":"] 1]
-
-    # Set a default endianness
-    case [target_info multilib_flags] in {
-	{ *big-endian* *-EB* *-meb* } { set sidendian "-EB" }
-	{ *little-endian* *-EL* *-mel* } { set sidendian "-EL" }
-	default { 
-	    if {[target_info exists sim,defaultendian]} then {
-		set sidendian [target_info sim,defaultendian] 
-	    } else { 
-                # rely on endianness settings in sid configuration defaults
-                set sidendian ""
-	    }
-	}
-    }
-    case $sidendian in {
-	{ -EB } { set sidendian2 {-e "set cpu endian big"} }
-	{ -EL } { set sidendian2 {-e "set cpu endian little"} }
-	default { set sidendian2 {} }
-    }
-
-    # test to see whether to use use sid in build or install tree
-    set use_build_tree [file exists ../../sid]
-
-    if {$use_build_tree} then {
-	set pre_spawn {
-	    global env
-	    set env(SID_LIBRARY_PATH) [join [glob "../../sid/component/*"] ":"]
-	    set env(SID) "../../sid/main/dynamic/sid"
-	    if {! [file exists $env(SID)]} then { error "Cannot find sid in build tree" }
-	}
-	if { [board_info target sim,protocol] == "sid" } {
-	    set spawncmd "[target_info sim] [target_info sim,options] $sidendian2 -e \"set cpu-gdb-socket sockaddr-local 0.0.0.0:$port\""
-	} elseif { [board_info target sim,protocol] == "rawsid" } {
-	    set spawncmd "[target_info sim] [target_info sim,options] -$sidendian --gdb=$port"
-	} else {
-	    set spawncmd "../../sid/bsp/[target_info sim] $sidendian --gdb=$port [target_info sim,options]"
-	}
-	set post_spawn {
-	    global env
-	    unset env(SID_LIBRARY_PATH)
-	    unset env(SID)
-	}
-    } else {
-	set pre_spawn {}
-	if { [board_info target sim,protocol] == "sid" } {
-	    # FIXME: sim,options may be from the build tree, should find
-	    # it in the install tree.
-	    set spawncmd "sid [target_info sim,options] $sidendian2 -e \"set cpu-gdb-socket sockaddr-local 0.0.0.0:$port\""
-	} elseif { [board_info target sim,protocol] == "rawsid" } {
-	    set spawncmd "[target_info sim] [target_info sim,options] -$sidendian --gdb=$port"
-	} else {
-	    set spawncmd "[target_info sim] $sidendian --gdb=$port [target_info sim,options]"
-	}
-	set post_spawn {}
-    }
-
-    eval $pre_spawn
-    if {[catch [list remote_spawn host $spawncmd] msg]} {
-	perror $msg
-	exit 1
-    }
-    eval $post_spawn
-
-    # Don't do the following any more; it breaks with "runtest ... < /dev/null"
-#    expect_background {
-#	-re \[^\n\]*\n { 
-#	    regsub "\n" $expect_out(buffer) {} msg
-#	    verbose "SID: $msg" 2
-#	}
-#    }
-
-    # There should be no need to sleep to give SID time to start;
-    # GDB would wait for a fair while for the stub to respond.
-    sleep 4
-
-    if ![target_info exists gdb,no_push_conn] {
-        remote_push_conn host;
-    }
-}
-
-#
-# Handle GDB talking to SID
-#
-
-proc gdb_start {} {
-    sid_start
-    return [default_gdb_start]
-}
-
-proc sid_exit {} {
-    if ![target_info exists gdb,no_push_conn] {
-	remote_close host;
-	remote_pop_conn host;
-    }
-}
-
-proc gdb_exit {} {
-    set result [default_gdb_exit]
-    sid_exit
-    return $result
-}
-
-#
-# gdb_target_sid
-# Set gdb to target the simulator
-#
-proc send_target_sid { } {
-    # wait a little while, giving sid time to shut down & restart its
-    # gdb socket
-    sleep 4
-    send_gdb "target [target_info gdb_protocol] [target_info netport]\n"
-}
-
-proc gdb_target_sid { } {
-    global gdb_prompt
-    global exit_status
-
-    send_target_sid
-
-    global timeout
-    set prev_timeout $timeout
-    set timeout 60
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	-re ".*\[Ee\]rror.*$gdb_prompt $" {
-	    perror "Couldn't set target for remote simulator."
-	    cleanup
-	    gdb_exit
-	}
-	-re "Remote debugging using.*$gdb_prompt"	{
-	    verbose "Set target to sid"
-	}
-	timeout { 
-	    perror "Couldn't set target for remote simulator."
-	    cleanup
-	    gdb_exit
-	}
-    }
-    set timeout $prev_timeout
-    verbose "Timeout is now $timeout seconds" 2
-}
-
-#
-# gdb_load -- load a file into the debugger.
-#             return a -1 if anything goes wrong.
-#
-proc gdb_load { arg } {
-    global verbose
-    global loadpath
-    global loadfile
-    global GDB
-    global gdb_prompt
-    global retval
-
-    gdb_unload
-    if [gdb_file_cmd $arg] then { return -1 }
-    gdb_target_sid
-
-    send_gdb "load\n"
-    global timeout
-    set prev_timeout $timeout
-    set timeout 2400
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	-re ".*\[Ee\]rror.*$gdb_prompt $" {
-	    if $verbose>1 then {
-		perror "Error during download."
-	    }
-	    set retval -1;
-	}
-	-re ".*$gdb_prompt $" {
-	    if $verbose>1 then {
-		send_user "Loaded $arg into $GDB\n"
-	    }
-	    set retval 1;
-	}
-	-re "$gdb_prompt $"     {
-	    if $verbose>1 then {
-		perror "GDB couldn't load."
-	    }
-	    set retval -1;
-	}
-	timeout {
-	    if $verbose>1 then {
-		perror "Timed out trying to load $arg."
-	    }
-	    set retval -1;
-	}
-    }
-    set timeout $prev_timeout
-    verbose "Timeout is now $timeout seconds" 2
-    return $retval;
-}
diff --git a/gdb/testsuite/config/sim.exp b/gdb/testsuite/config/sim.exp
deleted file mode 100644
index e7d7c141f5e..00000000000
--- a/gdb/testsuite/config/sim.exp
+++ /dev/null
@@ -1,88 +0,0 @@
-# Test Framework Driver for GDB driving a builtin simulator
-#   Copyright 1994, 1997, 1998, 2004 Free Software Foundation, 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.  
-
-load_lib gdb.exp
-
-#
-# gdb_target_sim
-# Set gdb to target the simulator
-#
-proc gdb_target_sim { } {
-    global gdb_prompt
-    global exit_status
-    
-    set target_sim_options "[board_info target gdb,target_sim_options]";
-
-    send_gdb "target sim $target_sim_options\n"
-    set timeout 60
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	-re "Connected to the simulator.*$gdb_prompt $"	{
-	    verbose "Set target to sim"
-	}
-	timeout { 
-	    perror "Couldn't set target for simulator."
-	    cleanup
-	    exit $exit_status
-	}
-    }
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
-}
-
-#
-# gdb_load -- load a file into the debugger.
-#             return a -1 if anything goes wrong.
-#
-proc gdb_load { arg } {
-    global verbose
-    global loadpath
-    global loadfile
-    global GDB
-    global gdb_prompt
-
-    if { $arg != "" } {
-	if [gdb_file_cmd $arg] then { return -1 }
-    }
-
-    gdb_target_sim
-
-    send_gdb "load\n"
-    set timeout 2400
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	-re ".*$gdb_prompt $" {
-	    if $verbose>1 then {
-		send_user "Loaded $arg into $GDB\n"
-	    }
-	    set timeout 30
-	    verbose "Timeout is now $timeout seconds" 2
-	    return 0
-	}
-	-re "$gdb_prompt $"     {
-	    if $verbose>1 then {
-		perror "GDB couldn't load."
-	    }
-	}
-	timeout {
-	    if $verbose>1 then {
-		perror "Timed out trying to load $arg."
-	    }
-	}
-    }
-    return -1
-}
diff --git a/gdb/testsuite/config/slite.exp b/gdb/testsuite/config/slite.exp
deleted file mode 100644
index b5f44288734..00000000000
--- a/gdb/testsuite/config/slite.exp
+++ /dev/null
@@ -1,180 +0,0 @@
-#   Copyright 1993, 1997, 1998 Free Software Foundation, 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.  
-
-# This file was written by Ian Lance Taylor <ian@cygnus.com>.
-
-# GDB support routines for a board using the MIPS remote debugging
-# protocol.  These are actually pretty generic.
-
-# DejaGnu currently assumes that debugging is being done over the main
-# console port.  It would probably be more convenient for people using
-# IDT boards to permit the debugging port and the connected port to be
-# different, since an IDT board has two ports.  This would require
-# extending some of the tests in a fashion similar to that done for
-# VxWorks, because the test output would appear on the other port,
-# rather than being displayed by gdb.
-
-load_lib remote.exp
-load_lib gdb.exp
-set gdb_prompt "\\(gdb\\)"
-
-#
-# gdb_load -- load a file into the GDB. 
-#             Returns a 0 if there was an error,
-#                       1 if it load successfully.
-#
-proc gdb_load { arg } {
-    global verbose
-    global loadpath
-    global loadfile
-    global gdb_prompt
-    global GDB
-    global expect_out
-
-    set loadfile [file tail $arg]
-    set loadpath [file dirname $arg]
-
-    gdb_file_cmd $arg
-
-    if [target_info exists gdb_protocol] {
-	set protocol [target_info gdb_protocol];
-    } else {
-	set protocol "sparclite"
-    }
-
-    if [target_info exists serial] {
-	set targetname [target_info serial];
-	set command "target $protocol [target_info serial]\n";
-    } else {
-	if ![target_info exists netport] {
-	    perror "Need either netport or gdb_serial entry for [target_info name].";
-	    return -1;
-	}
-	set targetname [target_info netport];
-	set command "target $protocol udp [target_info netport]\n";
-    }
-    set timeout 60
-    verbose "Timeout is now $timeout seconds" 2
-    set try_count 0;
-    send_gdb $command;
-    gdb_expect {
-	 -re "Unknown response.*resetting the board.|remote timeout" {
-	    incr try_count;
-	    if { $try_count > 3 } {
-		set try_count 0;
-		reboot_target;
-		sleep 5;
-	    }
-	    sleep 1;
-	    send_gdb $command;
-	    exp_continue;
-	}
-	 -re "Remote target.*$gdb_prompt $" { }
-	 -re ".*SPARClite appears to be alive.*$gdb_prompt $"	{
-	    if $verbose>1 then {
-		send_user "Set target to $targetname\n"
-	    }
-	}
-	 timeout { 
-	    perror "Couldn't set SLITE target."
-	    set timeout 10
-	    verbose "Timeout is now $timeout seconds" 2
-	    return -1
-	}
-    }
-    
-    if [target_info exists gdb_load_offset] {
-	set offset "[target_info gdb_load_offset]";
-    } else {
-	set offset "";
-    }
-    if { 1 } {
-	if [is_remote host] {
-	    set arg [remote_download host $arg];
-	    if { $arg == "" } {
-		error "download failed"
-		return -1;
-	    }
-	}
-	send_gdb "load $arg $offset\n"
-	verbose "Loading $arg into $GDB" 2
-	set timeout 2400
-	verbose "Timeout is now $timeout seconds" 2
-	gdb_expect {
-	     -re "Loading.*$gdb_prompt $" {
-		verbose "Loaded $arg into $GDB" 1
-		set timeout 30
-		verbose "Timeout is now $timeout seconds" 2
-	    }
-	     -re "$gdb_prompt $"     {
-		if $verbose>1 then {
-		    perror "GDB couldn't load."
-		}
-	    }
-	     timeout {
-		if $verbose>1 then {
-		    perror "Timed out trying to load $arg."
-		}
-	    }
-	}
-    }
-    # Some SPARClite boards automagically do a run after the program is
-    # loaded.
-    if [target_info exists need_monitor_run] {
-	set timeout 10
-	verbose "Timeout is now $timeout seconds, doing monitor run" 2
-	send_gdb "monitor run\n";
-	sleep 2;
-	send_gdb "";
-	gdb_expect {
-	     -re ".*$gdb_prompt $" { verbose "Run command succeded" }
-	     default {
-		perror "error sending monitor run command";
-	    }
-	}
-    } else {
-	sleep 2;
-    }
-
-    if [target_info exists gdb_serial] {
-	set serial [target_info gdb_serial];
-    } else {
-	set serial [target_info serial];
-    }
-    send_gdb "target remote $serial\n"
-    set timeout 60
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	 -re ".*Kill it?.*y or n.*" {
-	    send_gdb "y\n";
-	    exp_continue
-	}
-	 -re ".*$gdb_prompt $"	{
-	    verbose "Set remote target to [target_info serial]" 2
-	}
-	 timeout {
-	    perror "Couldn't set remote target."
-	    set timeout 10
-	    verbose "Timeout is now $timeout seconds" 2
-	    return -1
-	}
-    }
-
-    if [info exists expect_out(buffer)] then {
-	send_log $expect_out(buffer)
-    }
-    return 0
-}
diff --git a/gdb/testsuite/config/unix.exp b/gdb/testsuite/config/unix.exp
deleted file mode 100644
index 321ad542d7a..00000000000
--- a/gdb/testsuite/config/unix.exp
+++ /dev/null
@@ -1,29 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992, 1994, 1997 Free Software Foundation, 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 Rob Savoye. (rob@cygnus.com)
-
-# Set a default timeout to be used for the tests under UNIX, rather than
-# accepting whatever default dejagnu gives us (apparently 10 seconds).
-# When running the tests over NFS, under somewhat heavy load, 10 seconds
-# does not seem to be enough.  Try starting with 60.
-set timeout 60
-verbose "Timeout is now $timeout seconds" 2
-
-load_lib gdb.exp
diff --git a/gdb/testsuite/config/unknown.exp b/gdb/testsuite/config/unknown.exp
deleted file mode 100644
index f61e5af030f..00000000000
--- a/gdb/testsuite/config/unknown.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-perror "Sorry, there is no support for this target"
-exit 1
diff --git a/gdb/testsuite/config/vr4300.exp b/gdb/testsuite/config/vr4300.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/vr4300.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/vr5000.exp b/gdb/testsuite/config/vr5000.exp
deleted file mode 100644
index 99b8a9db1f7..00000000000
--- a/gdb/testsuite/config/vr5000.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/monitor.exp
diff --git a/gdb/testsuite/config/vx.exp b/gdb/testsuite/config/vx.exp
deleted file mode 100644
index 4a457c0b684..00000000000
--- a/gdb/testsuite/config/vx.exp
+++ /dev/null
@@ -1,128 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1995, 1997
-#   Free Software Foundation, 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.  
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-#
-# load support libraries
-#
-load_lib remote.exp
-load_lib gdb.exp
-
-set shell_prompt "->"
-set gdb_prompt "\\(vxgdb\\)"
-
-#
-# gdb_version -- extract and print the version number of gcc
-#
-proc gdb_version {} {
-    default_gdb_version
-}
-
-#
-# gdb_load -- load a file into the debugger.
-# We have to stop and start gdb each time we do this, because when
-# vxgdb loads two files in a row, the symbols in the first file loaded
-# take precedence. Returns -1 on error, else 0.
-#
-proc gdb_load { arg } {
-    set result 0
-
-    if { [remote_ld target $arg] != 0 } {
-	perror "Couldn't load $arg"
-	return -1
-    }
-
-    return [gdb_file_cmd $arg]
-}
-
-#
-# gdb_start -- start gdb running
-#
-proc gdb_start { } {
-    global gdb_prompt
-    global verbose
-    global connectmode
-    global reboot
-
-    # get a connection to the board
-    for { set x 0; } { $x < 3 } { incr x } {
-	set shell_id [remote_open target]
-	if { $shell_id > 0 } {
-	    verbose "Spawn id for remote shell is $shell_id"
-
-	    set timeout 10
-	    verbose "Timeout is now $timeout seconds" 2
-
-	    set state [spawn_vxgdb];
-	    if { $state == "pass" } {
-		return 0;
-	    }
-	    if { $state == "fail" } {
-		return -1;
-	    }
-	}
-	remote_reboot target;
-    }
-}
-
-proc spawn_vxgdb { } {
-    global gdb_prompt
-
-    default_gdb_start
-
-    # set the default arguments to "main", so that "run" with no
-    # arguments will work correctly.
-    send_gdb "set args main\n"
-    gdb_expect -re ".*$gdb_prompt $" {}
-
-    verbose "Setting up target, Please wait..."
-    # set targets hostname
-    send_gdb "target vxworks [target_info hostname]\n"
-    set timeout 60
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	-re "Done\..*$gdb_prompt $"	{
-	    verbose "Set target to [target_info hostname]" 1
-	    set timeout 10;
-	    return "pass";
-	}
-	-re "net_connect: RPC: (Program not registered|.*Timed out).*$" {
-	    warning "Couldn't set GDB to target [target_info netport]."
-	}
-	timeout {
-	    warning "Couldn't set target for vxworks."
-	}
-    }
-    return "retry";
-}
-
-proc gdb_exit { } {
-    remote_close target;
-    catch default_gdb_exit
-}
-
-#expect_after {
-#    "<return>"		   { send "\n"; perror "Window too small." }
-#    -re "\(y or n\) " 	   { send "n\n"; perror "Got interactive prompt." }
-#    buffer_full		   { perror "internal buffer is full." }
-#    eof			   { perror "eof -- pty is hosed." }
-#    timeout			   { perror "timeout." }
-#    "virtual memory exhausted" { perror "virtual memory exhausted." }
-#    "Undefined command"	   { perror "send string probably wrong." }
-#}
-
diff --git a/gdb/testsuite/config/vxworks.exp b/gdb/testsuite/config/vxworks.exp
deleted file mode 100644
index e3434063e4a..00000000000
--- a/gdb/testsuite/config/vxworks.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-#   Copyright 1997 Free Software Foundation, 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
-
-load_lib ../config/vx.exp
diff --git a/gdb/testsuite/config/vxworks29k.exp b/gdb/testsuite/config/vxworks29k.exp
deleted file mode 100644
index b815fe711f9..00000000000
--- a/gdb/testsuite/config/vxworks29k.exp
+++ /dev/null
@@ -1,24 +0,0 @@
-#   Copyright 1995, 1997 Free Software Foundation, 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.  
-
-# This file was written by Brendan Kehoe (brendan@cygnus.com).
-
-# We need this file here because the targetname for the 29k board
-# is `vxworks29k', not `vxworks'.  That way other tools (e.g., gcc)
-# can differentiate between the stuff run on that board and others.
-
-verbose "Loading ${srcdir}/config/vx.exp"
-source ${srcdir}/config/vx.exp
diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
deleted file mode 100755
index fbf77b52994..00000000000
--- a/gdb/testsuite/configure
+++ /dev/null
@@ -1,4192 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="gdb.base"
-ac_subdirs_all="$ac_subdirs_all gdb.hp"
-ac_subdirs_all="$ac_subdirs_all gdb.stabs"
-ac_subdirs_all="$ac_subdirs_all gdb.gdbtk"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os subdirs RPATH_ENVVAR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-gtk            enable gdbtk graphical user interface (GUI)
-  --enable-shared         build shared libraries deault=yes
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-stabs            arrange to use stabs instead of host debug format
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd "$ac_popdir"
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-# Add HP-specific tests when appropriate.
-case $target in
-  hppa*-*-hpux*)
-
-
-subdirs="$subdirs gdb.hp"
- ;;
-esac
-
-# With stabs.
-
-# Check whether --with-stabs or --without-stabs was given.
-if test "${with_stabs+set}" = set; then
-  withval="$with_stabs"
-
-else
-  # We enable stabs tests by default on selected targets.
-case $target in
-   powerpc-*-aix* \
- | rs6000-*-aix*  \
- | *-*-*bsd*      \
- | *-*-go32*      \
- | *-*-linux*     \
- | *-*-lynxos*    \
- | *-sun-*        \
- | hppa*-*-*      \
- | *-*-elf*       \
- )
-    with_stabs=yes ;;
- *)
-    with_stabs=no ;;
-esac
-fi;
-
-# Add stabs tests when appropriate.
-if test $with_stabs = yes; then
-
-
-subdirs="$subdirs gdb.stabs"
-
-fi
-
-# Enable gdbtk.
-# Check whether --enable-gdbtk or --disable-gdbtk was given.
-if test "${enable_gdbtk+set}" = set; then
-  enableval="$enable_gdbtk"
-
-else
-  if test -d $srcdir/gdb.gdbtk; then
-    enable_gdbtk=yes
-  else
-    enable_gdbtk=no
-  fi
-fi;
-# We unconditionally disable gdbtk tests on selected platforms.
-case $host_os in
-  go32* | windows*)
-    enable_gdbtk=no ;;
-esac
-
-# Add gdbtk tests when appropriate.
-if test $enable_gdbtk = yes; then
-
-
-subdirs="$subdirs gdb.gdbtk"
-
-fi
-
-# Enable shared libraries.
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-
-else
-  enable_shared=yes
-fi;
-
-# If we have shared libraries, try to set RPATH_ENVVAR reasonably,
-# such that we can find the shared libraries in the build tree.
-if test $enable_shared = no; then
-  # The variable `RPATH_ENVVAR' itself is not likely to be used on any
-  # platform.
-  RPATH_ENVVAR=RPATH_ENVVAR
-else
-  # The variable `LD_LIBRARY_PATH' is used on most platforms.
-  RPATH_ENVVAR=LD_LIBRARY_PATH
-  # The following exceptions are taken from Libtool 1.4.3.
-  case $host_os in
-    aix*)
-      if test $host_cpu != ia64; then
-        RPATH_ENVVAR=LIBPATH
-      fi ;;
-    darwin* | rhapsody*)
-      RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-    hpux*)
-      RPATH_ENVVAR=SHLIB_PATH ;;
-  esac
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-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 $# != 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
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&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 "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#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);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in pthread.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-                                                                                                                                                      ac_config_files="$ac_config_files Makefile gdb.ada/Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile gdb.mi/Makefile gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "gdb.ada/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.ada/Makefile" ;;
-  "gdb.arch/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.arch/Makefile" ;;
-  "gdb.asm/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.asm/Makefile" ;;
-  "gdb.base/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.base/Makefile" ;;
-  "gdb.cp/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.cp/Makefile" ;;
-  "gdb.disasm/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.disasm/Makefile" ;;
-  "gdb.dwarf2/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.dwarf2/Makefile" ;;
-  "gdb.fortran/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.fortran/Makefile" ;;
-  "gdb.server/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.server/Makefile" ;;
-  "gdb.java/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.java/Makefile" ;;
-  "gdb.mi/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.mi/Makefile" ;;
-  "gdb.objc/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.objc/Makefile" ;;
-  "gdb.threads/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.threads/Makefile" ;;
-  "gdb.trace/Makefile" ) CONFIG_FILES="$CONFIG_FILES gdb.trace/Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@subdirs@,$subdirs,;t t
-s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-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=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d $srcdir/$ac_dir || continue
-
-    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
-echo "$as_me: configuring in $ac_dir" >&6;}
-    { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-    cd $ac_dir
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-    elif test -f $ac_srcdir/configure; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-    elif test -f $ac_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&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_top_builddir$cache_file ;;
-      esac
-
-      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval $ac_sub_configure $ac_sub_configure_args \
-	   --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    cd "$ac_popdir"
-  done
-fi
-
diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac
deleted file mode 100644
index 0c89789df11..00000000000
--- a/gdb/testsuite/configure.ac
+++ /dev/null
@@ -1,117 +0,0 @@
-#                                                       -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-# Copyright 2002, 2003, 2004, 2005
-# Free Software Foundation, 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, 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.
-
-AC_PREREQ(2.59)
-AC_INIT(gdb.base)
-
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-# Add HP-specific tests when appropriate.
-case $target in
-  hppa*-*-hpux*)
-    AC_CONFIG_SUBDIRS(gdb.hp) ;;
-esac
-
-# With stabs.
-AC_ARG_WITH(stabs,
-[  --with-stabs            arrange to use stabs instead of host debug format],,
-[# We enable stabs tests by default on selected targets.
-case $target in
-   powerpc-*-aix* \
- | rs6000-*-aix*  \
- | *-*-*bsd*      \
- | *-*-go32*      \
- | *-*-linux*     \
- | *-*-lynxos*    \
- | *-sun-*        \
- | hppa*-*-*      \
- | *-*-elf*       \
- )
-    with_stabs=yes ;;
- *)
-    with_stabs=no ;;
-esac])
-
-# Add stabs tests when appropriate.
-if test $with_stabs = yes; then
-   AC_CONFIG_SUBDIRS(gdb.stabs)
-fi
-
-# Enable gdbtk.
-AC_ARG_ENABLE(gdbtk,
-[  --enable-gtk            enable gdbtk graphical user interface (GUI)],,
-  [if test -d $srcdir/gdb.gdbtk; then
-    enable_gdbtk=yes
-  else
-    enable_gdbtk=no
-  fi])
-# We unconditionally disable gdbtk tests on selected platforms.
-case $host_os in
-  go32* | windows*)
-    enable_gdbtk=no ;;
-esac
-
-# Add gdbtk tests when appropriate.
-if test $enable_gdbtk = yes; then
-   AC_CONFIG_SUBDIRS(gdb.gdbtk)
-fi
-
-# Enable shared libraries.
-AC_ARG_ENABLE(shared,
-[  --enable-shared         build shared libraries [deault=yes]],,
-  enable_shared=yes)
-
-# If we have shared libraries, try to set RPATH_ENVVAR reasonably,
-# such that we can find the shared libraries in the build tree.
-if test $enable_shared = no; then
-  # The variable `RPATH_ENVVAR' itself is not likely to be used on any
-  # platform.
-  RPATH_ENVVAR=RPATH_ENVVAR
-else
-  # The variable `LD_LIBRARY_PATH' is used on most platforms.
-  RPATH_ENVVAR=LD_LIBRARY_PATH
-  # The following exceptions are taken from Libtool 1.4.3.
-  case $host_os in
-    aix*)
-      if test $host_cpu != ia64; then
-        RPATH_ENVVAR=LIBPATH
-      fi ;;
-    darwin* | rhapsody*)
-      RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-    hpux*)
-      RPATH_ENVVAR=SHLIB_PATH ;;
-  esac
-fi
-AC_SUBST(RPATH_ENVVAR)
-
-AC_CHECK_HEADERS(pthread.h)
-
-AC_EXEEXT
-
-AC_OUTPUT([Makefile \
-  gdb.ada/Makefile \
-  gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-  gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
-  gdb.fortran/Makefile gdb.server/Makefile \
-  gdb.java/Makefile gdb.mi/Makefile \
-  gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile])
diff --git a/gdb/testsuite/gdb.ada/Makefile.in b/gdb/testsuite/gdb.ada/Makefile.in
deleted file mode 100644
index 3d2a99cd42f..00000000000
--- a/gdb/testsuite/gdb.ada/Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = null_record/null_record fixed_points/fixed_points
-
-MISCELLANEOUS =
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-find . -name '*.o' -print | xargs rm -f
-	-find . -name '*.ali' -print | xargs rm -f
-	-find . -name 'b~*.ad[sb]' -print | xargs rm -f
-	-rm -f *~ a.out xgdb *.x *.ci *.tmp
-	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
-	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
-	-rm -f $(MISCELLANEOUS) twice-tmp.c
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status config.log
-	-rm -f *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
diff --git a/gdb/testsuite/gdb.ada/exec_changed.exp b/gdb/testsuite/gdb.ada/exec_changed.exp
deleted file mode 100644
index f9561eadf5d..00000000000
--- a/gdb/testsuite/gdb.ada/exec_changed.exp
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2005 Free Software Foundation, 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.  
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-load_lib "ada.exp"
-
-set testdir "exec_changed"
-file mkdir ${objdir}/${subdir}/${testdir}
-
-# Build the first test program (note that cygwin needs the $EXEEXT).
-set testfile1 "${testdir}/first"
-set srcfile1 ${srcdir}/${subdir}/${testfile1}.adb
-set binfile1 ${objdir}/${subdir}/${testfile1}$EXEEXT
-
-if {[gdb_compile_ada "${srcfile1}" "${binfile1}" executable [list debug ]] != "" } {
-  return -1
-}
-
-# Build the second test program
-set testfile2 "${testdir}/second"
-set srcfile2 ${srcdir}/${subdir}/${testfile2}.adb
-set binfile2 ${objdir}/${subdir}/${testfile2}$EXEEXT
-
-if {[gdb_compile_ada "${srcfile2}" "${binfile2}" executable [list debug ]] != "" } {
-  return -1
-}
-
-# Start with a fresh gdb.
-
-set testfile "${testdir}/common"
-set binfile ${objdir}/${subdir}/${testfile}$EXEEXT
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-# Load the first executable.
-
-gdb_test "shell mv ${binfile1} ${binfile}" "" ""
-gdb_load ${binfile}
-
-# Start the program, we should land in the program main procedure
-gdb_test "start" \
-         "first \\(\\) at .*first.adb.*" \
-         "start first"
-
-# Restore first executable to its original name, and move
-# second executable into its place.  Ensure that the new
-# executable is at least a second newer than the old.
-
-gdb_test "shell mv ${binfile} ${binfile1}" "" ""
-gdb_test "shell mv ${binfile2} ${binfile}" "" ""
-gdb_test "shell sleep 1" "" ""
-gdb_test "shell touch ${binfile}" "" ""
-
-# Stop GDB from asking confirmations. This test will restart the program
-# and we don't need GDB to ask us to confirm that we want to kill the
-# current process.
-gdb_test "set confirm off" "" ""
-
-# Start the program a second time, GDB should land in procedure Second
-# this time.
-
-if [is_remote target] {
-    unsupported "start the program a second time ";
-} else {
-    # Start the program, we should land in the program main procedure
-    gdb_test "start" \
-             "second \\(\\) at .*second.adb.*" \
-             "start second"
-}
-
diff --git a/gdb/testsuite/gdb.ada/exec_changed/first.adb b/gdb/testsuite/gdb.ada/exec_changed/first.adb
deleted file mode 100644
index 1a8b7e28aed..00000000000
--- a/gdb/testsuite/gdb.ada/exec_changed/first.adb
+++ /dev/null
@@ -1,4 +0,0 @@
-procedure First is
-begin
-   null;
-end First;
diff --git a/gdb/testsuite/gdb.ada/exec_changed/second.adb b/gdb/testsuite/gdb.ada/exec_changed/second.adb
deleted file mode 100644
index 60b8574f064..00000000000
--- a/gdb/testsuite/gdb.ada/exec_changed/second.adb
+++ /dev/null
@@ -1,4 +0,0 @@
-procedure Second is
-begin
-   null;
-end Second;
diff --git a/gdb/testsuite/gdb.ada/fixed_points.exp b/gdb/testsuite/gdb.ada/fixed_points.exp
deleted file mode 100644
index 7a4d2fbac1a..00000000000
--- a/gdb/testsuite/gdb.ada/fixed_points.exp
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-load_lib "ada.exp"
-
-set testdir "fixed_points"
-set testfile "${testdir}/fixed_points"
-set srcfile ${srcdir}/${subdir}/${testfile}.adb
-set binfile ${objdir}/${subdir}/${testfile}
-
-file mkdir ${objdir}/${subdir}/${testdir}
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set bp_location [gdb_get_line_number "Set breakpoint here" ${testdir}/fixed_points.adb]
-runto "fixed_points.adb:$bp_location"
-
-gdb_test "print base_object" \
-         ".* = -50" \
-         "p on a fixed point type"
-
-gdb_test "print subtype_object" \
-         ".* = -50" \
-         "p on a subtype fixed point type"
-
-gdb_test "print new_type_object" \
-         ".* = -50" \
-         "p on a new fixed point type"
diff --git a/gdb/testsuite/gdb.ada/fixed_points/fixed_points.adb b/gdb/testsuite/gdb.ada/fixed_points/fixed_points.adb
deleted file mode 100644
index 6438efb11c1..00000000000
--- a/gdb/testsuite/gdb.ada/fixed_points/fixed_points.adb
+++ /dev/null
@@ -1,39 +0,0 @@
---  Copyright 2004 Free Software Foundation, 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.
-
-with System;
-
-procedure Fixed_Points is
-
-   type Base_Fixed_Point_Type is
-     delta 1.0 / 16.0
-       range (System.Min_Int / 2) * 1.0 / 16.0 ..
-       (System.Max_Int / 2) * 1.0 / 16.0;
-
-     subtype Fixed_Point_Subtype is
-       Base_Fixed_Point_Type range -50.0 .. 50.0;
-
-     type New_Fixed_Point_Type is
-       new Base_Fixed_Point_Type range -50.0 .. 50.0;
-
-     Base_Object            : Base_Fixed_Point_Type := -50.0;
-     Subtype_Object         : Fixed_Point_Subtype := -50.0;
-     New_Type_Object        : New_Fixed_Point_Type := -50.0;
-begin
-   Base_Object := 1.0/16.0;   -- Set breakpoint here
-   Subtype_Object := 1.0/16.0;
-   New_Type_Object := 1.0/16.0;
-end Fixed_Points;
diff --git a/gdb/testsuite/gdb.ada/gnat_ada.gpr b/gdb/testsuite/gdb.ada/gnat_ada.gpr
deleted file mode 100644
index 7c01ae27273..00000000000
--- a/gdb/testsuite/gdb.ada/gnat_ada.gpr
+++ /dev/null
@@ -1,26 +0,0 @@
---  Copyright 2004 Free Software Foundation, 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.
-
---  This project file allows us to control the location where the
---  compilation artifacts produced when building the Ada examples
---  are stored.
-
-project Gnat_Ada is
-
-   for Source_Dirs use (external ("SRC"));
-   for Object_Dir use external ("OBJ");
-
-end Gnat_Ada;
diff --git a/gdb/testsuite/gdb.ada/null_record.exp b/gdb/testsuite/gdb.ada/null_record.exp
deleted file mode 100644
index c3cbd9389dd..00000000000
--- a/gdb/testsuite/gdb.ada/null_record.exp
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-load_lib "ada.exp"
-
-set testdir "null_record"
-set testfile "${testdir}/null_record"
-set srcfile ${srcdir}/${subdir}/${testfile}.adb
-set binfile ${objdir}/${subdir}/${testfile}
-
-file mkdir ${objdir}/${subdir}/${testdir}
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "start" \
-         "null_record \\(\\) at .*null_record.adb.*" \
-         "start"
-
-gdb_test "ptype empty" \
-         "type = record null; end record" \
-         "ptype on null record"
diff --git a/gdb/testsuite/gdb.ada/null_record/bar.adb b/gdb/testsuite/gdb.ada/null_record/bar.adb
deleted file mode 100644
index 9c751399cb1..00000000000
--- a/gdb/testsuite/gdb.ada/null_record/bar.adb
+++ /dev/null
@@ -1,24 +0,0 @@
---  Copyright 2004 Free Software Foundation, 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.
-
-package body Bar is
-
-   procedure Do_Nothing is
-   begin
-      null;
-   end Do_Nothing;
-
-end Bar;
diff --git a/gdb/testsuite/gdb.ada/null_record/bar.ads b/gdb/testsuite/gdb.ada/null_record/bar.ads
deleted file mode 100644
index c3ca11b06d3..00000000000
--- a/gdb/testsuite/gdb.ada/null_record/bar.ads
+++ /dev/null
@@ -1,23 +0,0 @@
---  Copyright 2004 Free Software Foundation, 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.
-
-package Bar is
-
-   type Empty is null record;
-
-   procedure Do_Nothing;
-
-end Bar;
diff --git a/gdb/testsuite/gdb.ada/null_record/null_record.adb b/gdb/testsuite/gdb.ada/null_record/null_record.adb
deleted file mode 100644
index 260b3d66097..00000000000
--- a/gdb/testsuite/gdb.ada/null_record/null_record.adb
+++ /dev/null
@@ -1,23 +0,0 @@
---  Copyright 2004 Free Software Foundation, 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.
-
-with Bar; use Bar;
-
-procedure Null_Record is
-begin
-   Do_Nothing;
-end Null_Record;
-
diff --git a/gdb/testsuite/gdb.ada/packed_array.exp b/gdb/testsuite/gdb.ada/packed_array.exp
deleted file mode 100644
index aa75450b51e..00000000000
--- a/gdb/testsuite/gdb.ada/packed_array.exp
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2005 Free Software Foundation, 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.  
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-load_lib "ada.exp"
-
-set testdir "packed_array"
-set testfile "${testdir}/pa"
-set srcfile ${srcdir}/${subdir}/${testfile}.adb
-set binfile ${objdir}/${subdir}/${testfile}
-
-file mkdir ${objdir}/${subdir}/${testdir}
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set bp_location [gdb_get_line_number "STOP" ${testdir}/pa.adb]
-runto "pa.adb:$bp_location"
-
-gdb_test "print var" \
-         ".* = \\(4 => true, false, true, false, true\\)" \
-         "print var"
-
diff --git a/gdb/testsuite/gdb.ada/packed_array/pa.adb b/gdb/testsuite/gdb.ada/packed_array/pa.adb
deleted file mode 100644
index ca439e3cc4a..00000000000
--- a/gdb/testsuite/gdb.ada/packed_array/pa.adb
+++ /dev/null
@@ -1,29 +0,0 @@
---  Copyright 2005 Free Software Foundation, 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.
-
-procedure PA is
-
-   type Packed_Array is array (4 .. 8) of Boolean;
-   pragma pack (Packed_Array);
-
-   Var : Packed_Array;
-
-begin
-
-   Var := (True, False, True, False, True);
-   Var (8) := False;  -- STOP
-
-end PA;
diff --git a/gdb/testsuite/gdb.ada/start.exp b/gdb/testsuite/gdb.ada/start.exp
deleted file mode 100644
index f91e8728b16..00000000000
--- a/gdb/testsuite/gdb.ada/start.exp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2005 Free Software Foundation, 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.  
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-load_lib "ada.exp"
-
-set testdir "start"
-set testfile "${testdir}/dummy"
-set srcfile ${srcdir}/${subdir}/${testfile}.adb
-set binfile ${objdir}/${subdir}/${testfile}
-
-file mkdir ${objdir}/${subdir}/${testdir}
-if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Verify that "start" lands inside the right procedure.
-gdb_test "start" \
-         "dummy \\(\\) at .*dummy.adb.*" \
-         "start"
-
diff --git a/gdb/testsuite/gdb.ada/start/dummy.adb b/gdb/testsuite/gdb.ada/start/dummy.adb
deleted file mode 100644
index 831991038ac..00000000000
--- a/gdb/testsuite/gdb.ada/start/dummy.adb
+++ /dev/null
@@ -1,20 +0,0 @@
---  Copyright 2005 Free Software Foundation, 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.
-
-procedure Dummy is
-begin
-   null;
-end Dummy;
diff --git a/gdb/testsuite/gdb.arch/Makefile.in b/gdb/testsuite/gdb.arch/Makefile.in
deleted file mode 100644
index 4c472724f1f..00000000000
--- a/gdb/testsuite/gdb.arch/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = altivec-abi altivec-regs
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *~ *.o a.out *.x *.ci *.tmp
-	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status config.log
-	-rm -f *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
diff --git a/gdb/testsuite/gdb.arch/alpha-step.c b/gdb/testsuite/gdb.arch/alpha-step.c
deleted file mode 100644
index dc477df7727..00000000000
--- a/gdb/testsuite/gdb.arch/alpha-step.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Copyright 2005 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.  */
-
-void gt (double a);
-
-int
-main (void)
-{
-  gt (360.0);
-  gt (-360.0);
-
-  ge (360.0);
-  ge (-360.0);
-
-  lt (-360.0);
-  lt (360.0);
-
-  le (-360.0);
-  le (360.0);
-
-  eq (0.0);
-  eq (360.0);
-
-  ne (360.0);
-  ne (0.0);
-
-  return 0;
-}
-
-asm ("       .text\n"
-     "       .ent gt\n"
-     "gt:\n"
-     "       .frame $30,0,$26,0\n"
-     "       .prologue 0\n"
-     "       cpys $f31,$f31,$f0\n"
-     "       fbgt $f16,$gt_1\n"      /* stop at this instruction.  */
-     "       cpysn $f16,$f16,$f0\n"
-     "$gt_1:\n"
-     "       ret $31,($26),1\n"
-     "       .end gt\n");
-
-asm ("       .text\n"
-     "       .ent ge\n"
-     "ge:\n"
-     "       .frame $30,0,$26,0\n"
-     "       .prologue 0\n"
-     "       cpys $f31,$f31,$f0\n"
-     "       fbge $f16,$ge_1\n"      /* stop at this instruction.  */
-     "       cpysn $f16,$f16,$f0\n"
-     "$ge_1:\n"
-     "       ret $31,($26),1\n"
-     "       .end ge\n");
-
-asm ("       .text\n"
-     "       .ent lt\n"
-     "lt:\n"
-     "       .frame $30,0,$26,0\n"
-     "       .prologue 0\n"
-     "       cpys $f31,$f31,$f0\n"
-     "       fblt $f16,$lt_1\n"      /* stop at this instruction.  */
-     "       cpysn $f16,$f16,$f0\n"
-     "$lt_1:\n"
-     "       ret $31,($26),1\n"
-     "       .end lt\n");
-
-asm ("       .text\n"
-     "       .ent le\n"
-     "le:\n"
-     "       .frame $30,0,$26,0\n"
-     "       .prologue 0\n"
-     "       cpys $f31,$f31,$f0\n"
-     "       fble $f16,$le_1\n"      /* stop at this instruction.  */
-     "       cpysn $f16,$f16,$f0\n"
-     "$le_1:\n"
-     "       ret $31,($26),1\n"
-     "       .end le\n");
-
-asm ("       .text\n"
-     "       .ent eq\n"
-     "eq:\n"
-     "       .frame $30,0,$26,0\n"
-     "       .prologue 0\n"
-     "       cpys $f31,$f31,$f0\n"
-     "       fbeq $f16,$eq_1\n"      /* stop at this instruction.  */
-     "       cpysn $f16,$f16,$f0\n"
-     "$eq_1:\n"
-     "       ret $31,($26),1\n"
-     "       .end eq\n");
-
-asm ("       .text\n"
-     "       .ent ne\n"
-     "ne:\n"
-     "       .frame $30,0,$26,0\n"
-     "       .prologue 0\n"
-     "       cpys $f31,$f31,$f0\n"
-     "       fbne $f16,$ne_1\n"      /* stop at this instruction.  */
-     "       cpysn $f16,$f16,$f0\n"
-     "$ne_1:\n"
-     "       ret $31,($26),1\n"
-     "       .end ne\n");
-
-
diff --git a/gdb/testsuite/gdb.arch/alpha-step.exp b/gdb/testsuite/gdb.arch/alpha-step.exp
deleted file mode 100644
index 40dcb0bfb96..00000000000
--- a/gdb/testsuite/gdb.arch/alpha-step.exp
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2005 Free Software Foundation, 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.  
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "alpha*-*-*"] then {
-    verbose "Skipping alpha step tests."
-    return
-}
-
-set testfile "alpha-step"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "Testcase compile failed."
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-proc test_stepi {function } {
-    # Restart the program from scratch. If GDB got confused during one
-    # of the previous tests, this makes sure that it doesn't affect
-    # this series of tests.
-    if ![runto_main] then {
-        fail "Can't run to main"
-        return 0
-    }
-
-    # Insert a breakpoint on the FP branch instruction inside FUNCTION.
-    # Since the function has been hand written, we know this instruction
-    # is a "fb$function" located at FUNCTION+4.
-    gdb_test "break *$function+4" \
-             "Breakpoint .* at .*" \
-             "breakpoint on fb$function instruction"
-    
-    gdb_test "continue" \
-             "Breakpoint .*, 0x\[0-9a-fA-F\]+ in $function\(\).*" \
-             "continue to fb$function instruction (first call)"
-    
-    # Extra check to make sure we stopped on the FP branch instruction.
-    
-    gdb_test "x /i \$pc" \
-             "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fb$function\[ \t\]+.*" \
-             "Check breakpoint on fb$function instruction (first call)"
-    
-    # Step test, followed by the check that we landed on the expected
-    # instruction (the testcase should be written in such a way that
-    # the branch is taken on the first call to this function.
-    
-    gdb_test "stepi" \
-             "0x\[0-9a-fA-F\]+.*" \
-             "stepi on fb$function (first call)"
-    
-    gdb_test "x /i \$pc" \
-             "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+ret\[ \t\]+.*" \
-             "Check stepi over fb$function stopped on ret"
-    
-    # Continue again. FUNCTION should be called a second time, this time
-    # with an argument such that the FP branch will not be taken.
-    
-    gdb_test "continue" \
-             "Breakpoint .*, 0x\[0-9a-fA-F\]+ in $function\(\).*" \
-             "continue to fb$function instruction (second call)"
-    
-    # Extra check to make sure we stopped on the FP branch instruction.
-    
-    gdb_test "x /i \$pc" \
-             "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fb$function\[ \t\]+.*" \
-             "Check breakpoint on fb$function instruction (second call)"
-    
-    # Step test, branch should not be taken.
-    
-    gdb_test "stepi" \
-             "0x\[0-9a-fA-F\]+.*" \
-             "stepi on fb$function (branch not taken)"
-    
-    # Extra check to verify that we landed on the instruction we expected.
-    
-    gdb_test "x /i \$pc" \
-             "0x\[0-9a-fA-F\]+ <.*>:\[ \t\]+fneg\[ \t\]+.*" \
-             "Check stepi over fb$function stopped on fneg instruction"
-
-}
-
-test_stepi "gt"
-test_stepi "ge"
-test_stepi "lt"
-test_stepi "le"
-test_stepi "eq"
-test_stepi "ne"
-
diff --git a/gdb/testsuite/gdb.arch/altivec-abi.c b/gdb/testsuite/gdb.arch/altivec-abi.c
deleted file mode 100644
index f68ec255642..00000000000
--- a/gdb/testsuite/gdb.arch/altivec-abi.c
+++ /dev/null
@@ -1,141 +0,0 @@
-#include <altivec.h>
-
-vector short             vshort = {111, 222, 333, 444, 555, 666, 777, 888};
-vector unsigned short   vushort = {100, 200, 300, 400, 500, 600, 700, 800};
-vector int                 vint = {-10, -20, -30, -40};
-vector unsigned int       vuint = {1111, 2222, 3333, 4444};
-vector char               vchar = {'a','b','c','d','e','f','g','h','i','l','m','n','o','p','q','r'};
-vector unsigned char     vuchar = {'A','B','C','D','E','F','G','H','I','L','M','N','O','P','Q','R'};
-vector float             vfloat = {1.25, 3.75, 5.5, 1.25};
-
-vector short             vshort_d = {0,0,0,0,0,0,0,0};
-vector unsigned short   vushort_d = {0,0,0,0,0,0,0,0};
-vector int                 vint_d = {0,0,0,0};
-vector unsigned int       vuint_d = {0,0,0,0};
-vector char               vchar_d = {'z','z','z','z','z','z','z','z','z','z','z','z','z','z','z','z'};
-vector unsigned char     vuchar_d = {'Z','Z','Z','Z','Z','Z','Z','Z','Z','Z','Z','Z','Z','Z','Z','Z'};
-vector float             vfloat_d = {1.0, 1.0, 1.0, 1.0};
-    
-struct test_vec_struct
-{
-   vector signed short vshort1;
-   vector signed short vshort2;
-   vector signed short vshort3;
-   vector signed short vshort4;
-};
-
-static vector signed short test4[4] =
-{
-   (vector signed short) {1, 2, 3, 4, 5, 6, 7, 8},
-   (vector signed short) {11, 12, 13, 14, 15, 16, 17, 18},
-   (vector signed short) {21, 22, 23, 24, 25, 26, 27, 28},
-   (vector signed short) {31, 32, 33, 34, 35, 36, 37, 38}
-};
-
-void
-struct_of_vector_func (struct test_vec_struct vector_struct)
-{
-  vector_struct.vshort1 = vec_add (vector_struct.vshort1, vector_struct.vshort2);
-  vector_struct.vshort3 = vec_add (vector_struct.vshort3, vector_struct.vshort4);
-}
-
-void
-array_of_vector_func (vector signed short *matrix)
-{
-   matrix[0]  = vec_add (matrix[0], matrix[1]);
-   matrix[2]  = vec_add (matrix[2], matrix[3]);
-}
- 
-vector int
-vec_func (vector short vshort_f,             /* goes in v2 */
-          vector unsigned short vushort_f,   /* goes in v3 */
-          vector int vint_f,                 /* goes in v4 */
-          vector unsigned int vuint_f,       /* goes in v5 */
-          vector char vchar_f,               /* goes in v6 */
-          vector unsigned char vuchar_f,     /* goes in v7 */
-          vector float vfloat_f,             /* goes in v8 */
-          vector short x_f,                  /* goes in v9 */
-          vector int y_f,                    /* goes in v10 */
-          vector char a_f,                   /* goes in v11 */
-          vector float b_f,                  /* goes in v12 */
-          vector float c_f,                  /* goes in v13 */
-          vector int intv_on_stack_f)
-{
-
-   vector int vint_res;
-   vector unsigned int vuint_res;
-   vector short vshort_res;
-   vector unsigned short vushort_res;
-   vector char vchar_res;
-   vector float vfloat_res;
-   vector unsigned char vuchar_res;
-
-   vint_res  = vec_add (vint_f, intv_on_stack_f);
-   vint_res  = vec_add (vint_f, y_f);
-   vuint_res  = vec_add (vuint_f, ((vector unsigned int) {5,6,7,8}));
-   vshort_res  = vec_add (vshort_f, x_f);
-   vushort_res  = vec_add (vushort_f,
-                           ((vector unsigned short) {1,2,3,4,5,6,7,8}));
-   vchar_res  = vec_add (vchar_f, a_f);
-   vfloat_res  = vec_add (vfloat_f, b_f);
-   vfloat_res  = vec_add (c_f, ((vector float) {1.1,1.1,1.1,1.1}));
-   vuchar_res  = vec_add (vuchar_f,
-               ((vector unsigned char) {'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a'}));
-
-    return vint_res;
-}
-
-void marker(void) {};
-
-int
-main (void)
-{ 
-  vector int result = {-1,-1,-1,-1};
-  vector short x = {1,2,3,4,5,6,7,8};
-  vector int y = {12, 22, 32, 42};
-  vector int intv_on_stack = {12, 34, 56, 78};
-  vector char a = {'v','e','c','t','o','r',' ','o','f',' ','c','h','a','r','s','.' };
-  vector float b = {5.5, 4.5, 3.75, 2.25};
-  vector float c = {1.25, 3.5, 5.5, 7.75};
-
-  vector short x_d = {0,0,0,0,0,0,0,0};
-  vector int y_d = {0,0,0,0};
-  vector int intv_on_stack_d = {0,0,0,0};
-  vector char a_d = {'q','q','q','q','q','q','q','q','q','q','q','q','q','q','q','q'};
-  vector float b_d = {5.0, 5.0, 5.0, 5.0};
-  vector float c_d = {3.0, 3.0, 3.0, 3.0};
-  
-  int var_int = 44;
-  short var_short = 3;
-  struct test_vec_struct vect_struct;
-  
-  vect_struct.vshort1 = (vector signed short){1, 2, 3, 4, 5, 6, 7, 8};
-  vect_struct.vshort2 = (vector signed short){11, 12, 13, 14, 15, 16, 17, 18};
-  vect_struct.vshort3 = (vector signed short){21, 22, 23, 24, 25, 26, 27, 28};
-  vect_struct.vshort4 = (vector signed short){31, 32, 33, 34, 35, 36, 37, 38};
-
-  marker ();
-#if 0
-  /* This line is useful for cutting and pasting from the gdb command line.  */
-vec_func(vshort,vushort,vint,vuint,vchar,vuchar,vfloat,x,y,a,b,c,intv_on_stack)
-#endif
-  result = vec_func (vshort,    /* goes in v2 */
-                     vushort,   /* goes in v3 */
-                     vint,      /* goes in v4 */
-                     vuint,     /* goes in v5 */
-                     vchar,     /* goes in v6 */
-                     vuchar,    /* goes in v7 */
-                     vfloat,    /* goes in v8 */
-                     x,    /* goes in v9 */
-                     y,    /* goes in v10 */
-                     a,    /* goes in v11 */
-                     b,    /* goes in v12 */
-                     c,    /* goes in v13 */
-                     intv_on_stack);
-
-   struct_of_vector_func (vect_struct);
-   array_of_vector_func (test4);
-
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp
deleted file mode 100644
index 91b625aaf05..00000000000
--- a/gdb/testsuite/gdb.arch/altivec-abi.exp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (C) 2002, 2003 Free Software Foundation, 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
-#
-
-# Tests for Powerpc AltiVec ABI
-
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# This file uses altivec-abi.c for input.
-#
-
-set prms_id 0
-set bug_id 0
-
-if {![istarget "powerpc*"] || [skip_altivec_tests]} then {
-    verbose "Skipping altivec abi tests."
-    verbose -log "Skipping altivec abi tests."
-    return
-}
-
-set testfile "altivec-abi"
-set binfile ${objdir}/${subdir}/${testfile}
-set srcfile ${testfile}.c
-
-set compile_flags {debug additional_flags=-w}
-if [get_compiler_info $binfile] {
-    warning "get_compiler failed"
-    return -1
-}
-
-if [test_compiler_info gcc*] {
-    set compile_flags "$compile_flags additional_flags=-maltivec"
-} elseif [test_compiler_info xlc*] {
-    set compile_flags "$compile_flags additional_flags=-qaltivec"
-} else {
-    warning "unknown compiler"
-    return -1
-}
-
-if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-gdb_test "b marker" "Breakpoint 2 at.*file.*altivec-abi.c, line \[0-9\]+." "break marker"
-gdb_test "continue" "Breakpoint 2.*marker.*altivec-abi.c.*" "continue to marker"
-gdb_test "finish" "Run till exit from .0.*in marker.*at.*altivec-abi.c.*main \\(\\) at.*altivec-abi.c.*result = vec_func \\(vshort,.*goes in v2.*" "back to main (1)"
-
-# now all the arguments of vec_fun are initialized
-
-set pattern "vec_func .vshort_f=.111, 222, 333, 444, 555, 666, 777, 888., vushort_f=.100, 200, 300, 400, 500, 600, 700, 800., vint_f=.-10, -20, -30, -40., vuint_f=.1111, 2222, 3333, 4444., vchar_f=.abcdefghilmnopqr., vuchar_f=.ABCDEFGHILMNOPQR., vfloat_f=.1.25, 3.75, 5.5, 1.25., x_f=.1, 2, 3, 4, 5, 6, 7, 8., y_f=.12, 22, 32, 42., a_f=.vector of chars.., b_f=.5.5, 4.5, 3.75, 2.25., c_f=.1.25, 3.5, 5.5, 7.75., intv_on_stack_f=.12, 34, 56, 78.."
-
-set pattern1 $pattern
-append pattern1 " at.*altivec-abi.c.*vint_res  = vec_add.*vint_f, intv_on_stack_f.;"
-
-# Now let's call the function.  This function has > 12 args,
-# the last one will go on the stack.
-gdb_test "p vec_func(vshort,vushort,vint,vuint,vchar,vuchar,vfloat,x,y,a,b,c,intv_on_stack)" \
-".\[0-9\]+ = .2, 2, 2, 2." "call inferior function with vectors (1) "
-
-# Let's call the function again with dummy arguments.  This is to clean
-# up the contents of the vector registers before the next call.
-gdb_test "p vec_func(vshort_d,vushort_d,vint_d,vuint_d,vchar_d,vuchar_d,vfloat_d,x_d,y_d,a_d,b_d,c_d,intv_on_stack_d)" \
-".\[0-9\]+ = .0, 0, 0, 0." "call inferior function with vectors (2) "
-
-# Let's step into the function, to see if the args are printed correctly.
-gdb_test "step" \
-  $pattern1 \
-  "step into vec_fun"
-
-set pattern2 $pattern
-append pattern2 " at.*altivec-abi.c.*in main.*result = vec_func .vshort,.*goes in v2.*Value returned is.*= .2, 2, 2, 2."
-
-# Let's see if the result is returned correctly.
-gdb_test "finish" \
-  "Run till exit from .0.*$pattern2" \
-  "vector value returned correctly"
-
-# can we print the args correctly for this function?
-gdb_test "break struct_of_vector_func" "" ""
-
-set pattern "struct_of_vector_func .vector_struct=.vshort1 = .1, 2, 3, 4, 5, 6, 7, 8., vshort2 = .11, 12, 13, 14, 15, 16, 17, 18., vshort3 = .21, 22, 23, 24, 25, 26, 27, 28., vshort4 = .31, 32, 33, 34, 35, 36, 37, 38... at.*altivec-abi.c.*"
-
-gdb_test "continue" \
-  "Breakpoint 3, $pattern.*vector_struct.vshort1 = vec_add .vector_struct.vshort1, vector_struct.vshort2.;" \
-  "continue to struct_of_vector_func"
-
-gdb_test "finish" \
-  "Run till exit from .0  $pattern\[ \r\n\]+main.*altivec-abi.c.*array_of_vector_func.*" \
-  "back to main (2)"
-
-gdb_test "step" "" "step into array_of_vector_func"
-gdb_test "p matrix\[0\]" ".*= .1, 2, 3, 4, 5, 6, 7, 8." "print first vector"
-gdb_test "p matrix\[1\]" ".*= .11, 12, 13, 14, 15, 16, 17, 18." "print second vector"
-gdb_test "p matrix\[2\]" ".*= .21, 22, 23, 24, 25, 26, 27, 28." "print third vector"
-gdb_test "p matrix\[3\]" ".*= .31, 32, 33, 34, 35, 36, 37, 38." "print fourth vector"
-
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.c b/gdb/testsuite/gdb.arch/altivec-regs.c
deleted file mode 100644
index 4d4fe3f5dbb..00000000000
--- a/gdb/testsuite/gdb.arch/altivec-regs.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <altivec.h>
-#include <stdio.h>
-
-vector unsigned int
-vector_fun (vector unsigned int a, vector unsigned int b)
-{
-  vector unsigned int c;
-  a = ((vector unsigned int) vec_splat_u8(2));
-  b = ((vector unsigned int) vec_splat_u8(3));
-
-  c = vec_add (a, b);
-  return c;
-}
- 
-int
-main ()
-{
-  vector unsigned int y; 
-  vector unsigned int x; 
-  vector unsigned int z; 
-  int a;
-
-  /* This line may look unnecessary but we do need it, because we want to
-     have a line to do a next over (so that gdb refetches the registers)
-     and we don't want the code to change any vector registers.
-     The splat operations below modify the VRs,i
-     so we don't want to execute them yet.  */
-  a = 9;
-  x = ((vector unsigned int) vec_splat_u8 (-2));
-  y = ((vector unsigned int) vec_splat_u8 (1));
-	
-  z = vector_fun (x, y);
-  x = vec_sld (x,y,2);
-
-  x = vec_add (x, ((vector unsigned int){5,6,7,8}));
-  z = (vector unsigned int) vec_splat_u8 ( -2);
-  y = vec_add (x, z);
-  z = (vector unsigned int) vec_cmpeq (x,y);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp
deleted file mode 100644
index 52833a735d2..00000000000
--- a/gdb/testsuite/gdb.arch/altivec-regs.exp
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright (C) 2002, 2003 Free Software Foundation, 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
-#
-
-# Tests for Powerpc AltiVec register setting and fetching
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# Test the use of registers, especially AltiVec registers, for Powerpc.
-# This file uses altivec-regs.c for input.
-#
-
-set prms_id 0
-set bug_id 0
-
-if {![istarget "powerpc*"] || [skip_altivec_tests]} then {
-    verbose "Skipping altivec register tests."
-    verbose -log "Skipping altivec register tests."
-    return
-}
-
-set testfile "altivec-regs"
-set binfile ${objdir}/${subdir}/${testfile}
-set srcfile ${testfile}.c
-
-set compile_flags {debug additional_flags=-w}
-if [get_compiler_info $binfile] {
-    warning "get_compiler failed"
-    return -1
-}
-
-if [test_compiler_info gcc*] {
-    set compile_flags "$compile_flags additional_flags=-maltivec"
-} elseif [test_compiler_info xlc*] {
-    set compile_flags "$compile_flags additional_flags=-qaltivec"
-} else {
-    warning "unknown compiler"
-    return -1
-}
-
-if  { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $compile_flags] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-# set all the registers integer portions to 1
-for {set i 0} {$i < 32} {incr i 1} {
-        for {set j 0} {$j < 4} {incr j 1} {
-           gdb_test "set \$vr$i.v4_int32\[$j\] = 1" "" "set reg vr$i.v4si.f\[$j\]"
-        }
-}
-
-gdb_test "set \$vscr = 1" "" ""
-gdb_test "set \$vrsave = 1" "" ""
-
-# Now execute some target code, so that GDB's register cache is flushed.
-
-gdb_test "next" "" ""
-
-send_gdb "show endian\n"
-gdb_expect {
-    -re "(The target endianness is set automatically .currently )(big|little)( endian.*)$gdb_prompt $" {
-        pass "endianness"
-	set endianness $expect_out(2,string)
-    }
-    -re ".*$gdb_prompt $" {
-	fail "couldn't get endianness"
-    }
-    timeout		{ fail "(timeout) endianness" }
-}
-
-# And then read the AltiVec registers back, to see that
-# a) the register write above worked, and
-# b) the register read (below) also works.
-
-if {$endianness == "big"} {
-set vector_register ".uint128 = 0x00000001000000010000000100000001, v4_float = .0x0, 0x0, 0x0, 0x0., v4_int32 = .0x1, 0x1, 0x1, 0x1., v8_int16 = .0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x1., v16_int8 = .0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1.."
-} else {
-set vector_register ".uint128 = 0x00000001000000010000000100000001, v4_float = .0x0, 0x0, 0x0, 0x0., v4_int32 = .0x1, 0x1, 0x1, 0x1., v8_int16 = .0x1, 0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x0., v16_int8 = .0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0.."
-}
-
-for {set i 0} {$i < 32} {incr i 1} {
-        gdb_test "info reg vr$i" "vr$i.*$vector_register" "info reg vr$i"
-}
-
-gdb_test "info reg vrsave" "vrsave.*0x1" "info reg vrsave"
-gdb_test "info reg vscr" "vscr.*0x1" "info reg vscr"
-
-# Now redo the same tests, but using the print command.
-# Note: in LE case, the char array is printed WITHOUT the last character.
-# Gdb treats the terminating null char in the array like the terminating
-# null char in a string and doesn't print it. This is not a failure, but
-# the way gdb works.
-
-if {$endianness == "big"} {
-     set decimal_vector ".uint128 = 0x00000001000000010000000100000001, v4_float = .1.*e-45, 1.*e-45, 1.*e-45, 1.*e-45., v4_int32 = .1, 1, 1, 1., v8_int16 = .0, 1, 0, 1, 0, 1, 0, 1., v16_int8 = ..0.0.0.001.0.0.0.001.0.0.0.001.0.0.0.001.."
-} else {
-     set decimal_vector ".uint128 = 0x00000001000000010000000100000001, v4_float = .1.*e-45, 1.*e-45, 1.*e-45, 1.*e-45., v4_int32 = .1, 1, 1, 1., v8_int16 = .1, 0, 1, 0, 1, 0, 1, 0., v16_int8 = ..001.0.0.0.001.0.0.0.001.0.0.0.001.0.0.."
-}
-
-for {set i 0} {$i < 32} {incr i 1} {
-        gdb_test "print \$vr$i" ".* = $decimal_vector" "print vr$i"
-}
-
-gdb_test "print \$vrsave" ".* = 1" "print vrsave"
-gdb_test "print \$vscr" ".* = 1" "print vscr"
-
-for {set i 0} {$i < 32} {incr i 1} {
-         set pattern$i ".*vr$i.*"
-         append pattern$i $vector_register
-}
-
-send_gdb "info powerpc altivec\n"
-gdb_expect_list "info powerpc altivec" ".*$gdb_prompt $" {
-[$pattern0]
-[$pattern1]
-[$pattern2]
-[$pattern3]
-[$pattern4]
-[$pattern5]
-[$pattern6]
-[$pattern7]
-[$pattern8]
-[$pattern9]
-[$pattern10]
-[$pattern11]
-[$pattern12]
-[$pattern13]
-[$pattern14]
-[$pattern15]
-[$pattern16]
-[$pattern17]
-[$pattern18]
-[$pattern19]
-[$pattern20]
-[$pattern21]
-[$pattern22]
-[$pattern23]
-[$pattern24]
-[$pattern25]
-[$pattern26]
-[$pattern27]
-[$pattern28]
-[$pattern29]
-[$pattern30]
-[$pattern31]
-"\[ \t\n\r\]+vscr\[ \t\]+0x1"
-"\[ \t\n\r\]+vrsave\[ \t\]+0x1"
-}
-
-gdb_test "break vector_fun" \
- "Breakpoint 2 at.*altivec-regs.c, line \[0-9\]+\\." \
- "Set breakpoint at vector_fun"
-
-# Actually it is nuch easier to see these results printed in hex.
-gdb_test "set output-radix 16" \
-  "Output radix now set to decimal 16, hex 10, octal 20." \
-  "Set output radix to hex"
-
-gdb_test "continue" \
-  "Breakpoint 2, vector_fun .a=.0xfefefefe, 0xfefefefe, 0xfefefefe, 0xfefefefe., b=.0x1010101, 0x1010101, 0x1010101, 0x1010101.*altivec-regs.c.*vec_splat_u8.2..;" \
-  "continue to vector_fun"
-
-# Do a next over the assignment to vector 'a'. 
-gdb_test "next" ".*b = \\(\\(vector unsigned int\\) vec_splat_u8\\(3\\)\\);" \
-  "next (1)"
-
-# Do a next over the assignment to vector 'b'. 
-gdb_test "next" "c = vec_add \\(a, b\\);" \
-  "next (2)"
-
-# Now 'a' should be '0x02020202...' and 'b' should be '0x03030303...'
-gdb_test "print/x a" \
-  ".*= .0x2020202, 0x2020202, 0x2020202, 0x2020202." \
-  "print vector parameter a"
-
-gdb_test "print/x b" \
-  ".*= .0x3030303, 0x3030303, 0x3030303, 0x3030303." \
-  "print vector parameter b"
-
-# If we do an 'up' now, and print 'x' and 'y' we should see the values they
-# have in main, not the values they have in vector_fun.
-gdb_test "up" ".1.*main \\(\\) at.*altivec-regs.c.*z = vector_fun \\(x, y\\);" \
-  "up to main"
-
-gdb_test "print/x x" \
-  ".*= .0xfefefefe, 0xfefefefe, 0xfefefefe, 0xfefefefe." \
-  "print vector x"
-
-gdb_test "print/x y" \
-  ".*= .0x1010101, 0x1010101, 0x1010101, 0x1010101." \
-  "print vector y"
-
-# now go back to vector_func and do a finish, to see if we can print the return
-# value correctly.
-
-gdb_test "down" \
-  ".0  vector_fun \\(a=.0x2020202, 0x2020202, 0x2020202, 0x2020202., b=.0x3030303, 0x3030303, 0x3030303, 0x3030303.\\) at.*altivec-regs.c.*c = vec_add \\(a, b\\);" \
-  "down to vector_fun"
-
-gdb_test "finish" \
-  "Run till exit from .0  vector_fun \\(a=.0x2020202, 0x2020202, 0x2020202, 0x2020202., b=.0x3030303, 0x3030303, 0x3030303, 0x3030303.\\) at.*altivec-regs.c.*in main \\(\\) at.*altivec-regs.c.*z = vector_fun \\(x, y\\);.*Value returned is.*= .0x5050505, 0x5050505, 0x5050505, 0x5050505." \
-  "finish returned correct value"
-
-
-
diff --git a/gdb/testsuite/gdb.arch/e500-abi.c b/gdb/testsuite/gdb.arch/e500-abi.c
deleted file mode 100644
index e2156124b11..00000000000
--- a/gdb/testsuite/gdb.arch/e500-abi.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include <spe.h>
-
-/* Test PowerPC SPU extensions.  */
-
-#define vector __attribute__((vector_size(8)))
-
-vector unsigned short f_vec;
-vector short g_vec;
-vector float h_vec;
-vector float i_vec;
-vector unsigned int l_vec;
-vector int m_vec;
-vector int n_vec;
-
-/* dummy variables used in the testfile */
-vector unsigned int a_vec_d = {1, 1};
-vector int b_vec_d = {0, 0};
-vector float c_vec_d = {1.0, 1.0};
-vector unsigned int d_vec_d = {0, 0};
-vector int e_vec_d = {1, 1};
-vector unsigned short f_vec_d = {1, 1, 1, 1};
-vector short g_vec_d = {1, 1, 1, 1};
-vector float h_vec_d = {1.0, 1.0};
-vector float i_vec_d = {2.0, 2.0};
-vector unsigned int l_vec_d = {0, 0};
-vector int m_vec_d = {0, 0};
-
-
-vector int
-vec_func (vector unsigned int a_vec_f,
-          vector int b_vec_f,
-          vector float c_vec_f,
-          vector unsigned int d_vec_f,
-          vector int e_vec_f,
-          vector unsigned short f_vec_f,
-          vector short g_vec_f,
-          vector float h_vec_f,
-          vector float i_vec_f,
-          vector unsigned int l_vec_f,
-          vector int m_vec_f) 
-{
-  vector int n_vec;
-
-
-  int x,y,z;
-  x = 2;
-  y = 3;
- 
-  z = x + y;
-  z++;
-  n_vec = __ev_and(a_vec_f, b_vec_f);
-  n_vec = __ev_or(c_vec_f, d_vec_f);
-  n_vec = __ev_or(e_vec_f, f_vec_f);
-  n_vec = __ev_and(g_vec_f, h_vec_f);
-  n_vec = __ev_and(i_vec_f, l_vec_f);
-  n_vec = __ev_or(m_vec_f, a_vec_f);
-
-  return n_vec;
-}
-
-void marker(void) {};
-
-int
-main (void)
-{
-  vector unsigned int a_vec;
-  vector int b_vec;
-  vector float c_vec;
-  vector unsigned int d_vec;
-  vector int e_vec;
-
-  vector int res_vec;
-
-  a_vec = (vector unsigned int)__ev_create_u64 ((uint64_t) 55);
-  b_vec = __ev_create_s64 ((int64_t) 66);
-  c_vec = (vector float) __ev_create_fs (3.14F, 2.18F);
-  d_vec = (vector unsigned int) __ev_create_u32 ((uint32_t) 5, (uint32_t) 4);
-  e_vec = (vector int) __ev_create_s32 ((int32_t) 5, (int32_t) 6);
-  f_vec = (vector unsigned short) __ev_create_u16 ((uint16_t) 6, (uint16_t) 6, (uint16_t) 7, (uint16_t) 1);
-  g_vec = (vector short) __ev_create_s16 ((int16_t) 6, (int16_t) 6, (int16_t) 7, (int16_t) 9);
-  h_vec = (vector float) __ev_create_sfix32_fs (3.0F, 2.0F);
-  i_vec = (vector float) __ev_create_ufix32_fs (3.0F, 2.0F);
-  l_vec = (vector unsigned int) __ev_create_ufix32_u32 (3U, 5U);
-  m_vec = (vector int) __ev_create_sfix32_s32 (6, 9);
-
-  marker ();
-
-#if 0
-/* This line is useful for cut-n-paste from a gdb session. */
-vec_func(a_vec,b_vec,c_vec,d_vec,e_vec,f_vec,g_vec,h_vec,i_vec,l_vec,m_vec)
-#endif
-
-  res_vec = vec_func (a_vec,  /* goes in r3 */
-                      b_vec,  /* goes in r4 */
-                      c_vec,  /* goes in r5 */
-                      d_vec,  /* goes in r6 */
-                      e_vec,  /* goes in r7 */
-                      f_vec,  /* goes in r8 */
-                      g_vec,  /* goes in r9 */
-                      h_vec,  /* goes in r10 */
-                      i_vec,  /* goes in stack */
-                      l_vec,  /* goes in stack */
-                      m_vec);  /* goes in stack */
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.arch/e500-abi.exp b/gdb/testsuite/gdb.arch/e500-abi.exp
deleted file mode 100644
index 0d11ad3e24c..00000000000
--- a/gdb/testsuite/gdb.arch/e500-abi.exp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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
-#
-
-# Tests for Powerpc e500 ABI
-
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# This file uses e500-abi.c for input.
-#
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "powerpc-*eabispe"] then {
-    verbose "Skipping e500 abi tests."
-    return
-}
-
-set testfile "e500-abi"
-set binfile ${objdir}/${subdir}/${testfile}
-
-set src1 ${srcdir}/${subdir}/${testfile}.c
-
-if  { [gdb_compile ${src1} ${binfile} executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-gdb_test "b marker" "Breakpoint 2 at.*file.*e500-abi.c, line \[0-9\]+." "break marker"
-gdb_test "continue" "Breakpoint 2.*marker.*e500-abi.c.*" "continue to marker"
-gdb_test "finish" "Run till exit from .0.*marker.*at.*e500-abi.c.*main \\(\\) at.*e500-abi.c.*res_vec = vec_func \\(a_vec,.*goes in r3.*" "back to main (1)"
-
-# now all the arguments of vec_func are initialized
-
-set pattern "vec_func .a_vec_f=.0, 55., b_vec_f=.0, 66., c_vec_f=.3.14.*2.18.*, d_vec_f=.5, 4., e_vec_f=.5, 6., f_vec_f=.6, 6, 7, 1., g_vec_f=.6, 6, 7, 9., h_vec_f=.3, 2., i_vec_f=.3, 2., l_vec_f=.3, 5., m_vec_f=.6, 9.."
-
-set pattern1 $pattern
-append pattern1 " at.*e500-abi.c.*x = 2;"
-
-# Now let's call the function.  This function has > 8 args,
-# the last ones will go on the stack.
-gdb_test "p vec_func(a_vec,b_vec,c_vec,d_vec,e_vec,f_vec,g_vec,h_vec,i_vec,l_vec,m_vec)" \
-".\[0-9\]+ = .6, 63." "call inferior function with vectors (1) "
-
-# Let's call the function again with dummy arguments.  This is to clean
-# up the contents of the ev registers before the next call.
-gdb_test "p vec_func(a_vec_d,b_vec_d,c_vec_d,d_vec_d,e_vec_d,f_vec_d,g_vec_d,h_vec_d,i_vec_d,l_vec_d,m_vec_d)" \
-".\[0-9\]+ = .1, 1." "call inferior function with vectors (2) "
-
-# Let's step into the function, to see if the args are printed correctly.
-gdb_test "step" \
-  $pattern1 \
-  "step into vec_func"
-
-# Let's see if the result is returned correctly.
-gdb_test "finish" \
-  "Run till exit from .0.* at.*e500-abi.c.*main.*res_vec = vec_func .a_vec,.*goes in r3.*Value returned is.*= .6, 63." \
-  "vector value returned correctly"
diff --git a/gdb/testsuite/gdb.arch/e500-prologue.c b/gdb/testsuite/gdb.arch/e500-prologue.c
deleted file mode 100644
index f9e83dabf8a..00000000000
--- a/gdb/testsuite/gdb.arch/e500-prologue.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.  */
-
-void arg_passing_test2 (void);
-
-int
-main (void)
-{
-  arg_passing_test2 ();
-  return 0;
-}
-
-
-/* Asm for procedure arg_passing_test2.
-
-   The challenge here is getting past the 'mr 0,3' and 'stb'
-   instructions.  */
-
-asm ("	.section	\".text\"\n"
-     "	.align 2\n"
-     "	.globl arg_passing_test2\n"
-     "	.type	arg_passing_test2, @function\n"
-     "arg_passing_test2:\n"
-     "	stwu 1,-64(1)\n"
-     "	stw 31,60(1)\n"
-     "	mr 31,1\n"
-     "	mr 0,3\n"
-     "	evstdd 4,16(31)\n"
-     "	stw 5,24(31)\n"
-     "	stw 7,32(31)\n"
-     "	stw 8,36(31)\n"
-     "	stw 9,40(31)\n"
-     "	stb 0,8(31)\n"
-     "	lwz 11,0(1)\n"
-     "	lwz 31,-4(11)\n"
-     "	mr 1,11\n"
-     "	blr\n"
-     "	.size	arg_passing_test2, .-arg_passing_test2\n");
diff --git a/gdb/testsuite/gdb.arch/e500-prologue.exp b/gdb/testsuite/gdb.arch/e500-prologue.exp
deleted file mode 100644
index 06dec9fb28d..00000000000
--- a/gdb/testsuite/gdb.arch/e500-prologue.exp
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-#
-# This file is part of the gdb testsuite.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-# Test PowerPC E500 prologue analyzer.
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "powerpc-*"] then {
-    verbose "Skipping powerpc E500 prologue tests."
-    return
-}
-
-set testfile "e500-prologue"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "Testcase compile failed."
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Insert a breakpoint in FUNCTION and verifies that the breakpoint was
-# inserted at the expected location.  EXPECTED_LOCATION should be an
-# offset relative to the function start address.
-proc insert_breakpoint {function expected_location} {
-    global gdb_prompt
-    global expect_out
-    global hex
-    
-    set address ""
-
-    # Insert a breakpoint using the given function name, and extract
-    # the breakpoint address for the output.
-    gdb_test_multiple "break $function" "set breakpoint in $function" {
-        -re "Breakpoint 1 at ($hex).*$gdb_prompt $" {
-            set address $expect_out(1,string)
-        }
-        default {
-            fail "set breakpoint in $function"
-        }
-    }
-
-    # If we managed to get the breakpoing address, then check that
-    # we inserted it at the expected location by examining the
-    # instruction at that address (we're not interested in the insn
-    # itself, but rather at the address printed at the begining of
-    # the instruction).
-    if { $address != "" } then {
-       gdb_test "x /i $address" \
-                ".*<$function\\+$expected_location>.*" \
-                "check $function breakpoint address"
-    } else {
-       fail "unable to compute breakpoint address"
-    }
-
-}
-
-insert_breakpoint "arg_passing_test2" 40
diff --git a/gdb/testsuite/gdb.arch/e500-regs.c b/gdb/testsuite/gdb.arch/e500-regs.c
deleted file mode 100644
index bae5f3955b4..00000000000
--- a/gdb/testsuite/gdb.arch/e500-regs.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <spe.h>
-#include <stdio.h>
-
-#define vector __attribute__((vector_size(8)))
-
-
-vector int
-vector_fun (vector int a, vector int b)
-{
-  vector int c;
-  a = (vector int) __ev_create_s32 (2, 2);
-  b = (vector int) __ev_create_s32 (3, 3);
-
-  c = __ev_and (a, b);
-  return c;
-}
- 
-int
-main ()
-{
-  vector int y; 
-  vector int x; 
-  vector int z; 
-  int a;
-
-  /* This line may look unnecessary but we do need it, because we want to
-     have a line to do a next over (so that gdb refetches the registers)
-     and we don't want the code to change any vector registers.
-     The splat operations below modify the VRs,
-     so we don't want to execute them yet.  */
-  a = 9;
-  x = (vector int) __ev_create_s32 (-2, -2);
-  y = (vector int) __ev_create_s32 (1, 1);
-	
-  z = vector_fun (x, y);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.arch/e500-regs.exp b/gdb/testsuite/gdb.arch/e500-regs.exp
deleted file mode 100644
index 30dae0a15f7..00000000000
--- a/gdb/testsuite/gdb.arch/e500-regs.exp
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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
-#
-
-# Tests for Powerpc E500 register setting and fetching
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# Test the use of registers, especially E500 registers, for Powerpc.
-# This file uses e500-regs.c for input.
-#
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "powerpc-*eabispe"] then {
-    verbose "Skipping e500 register tests."
-    return
-}
-
-set testfile "e500-regs"
-set binfile ${objdir}/${subdir}/${testfile}
-set src1 ${srcdir}/${subdir}/${testfile}.c
-
-if  { [gdb_compile ${src1} ${binfile} executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-# set all the registers integer portions to 1
-for {set i 0} {$i < 32} {incr i 1} {
-        for {set j 0} {$j < 2} {incr j 1} {
-           gdb_test "set \$ev$i.v2_int32\[$j\] = 1" "" "set reg ev$i.v4si.f\[$j\]"
-        }
-}
-
-# Now execute some target code, so that GDB's register cache is flushed.
-
-#gdb_test "next" "" ""
-
-send_gdb "show endian\n"
-gdb_expect {
-    -re "(The target endianness is set automatically .currently )(big|little)( endian.*)$gdb_prompt $" {
-        pass "endianness"
-	set endianness $expect_out(2,string)
-    }
-    -re ".*$gdb_prompt $" {
-	fail "couldn't get endianness"
-    }
-    timeout		{ fail "(timeout) endianness" }
-}
-
-# And then read the E500 registers back, to see that
-# a) the register write above worked, and
-# b) the register read (below) also works.
-
-if {$endianness == "big"} {
-set vector_register ".uint64 = 0x100000001, v2_float = .0x0, 0x0., v2_int32 = .0x1, 0x1., v4_int16 = .0x0, 0x1, 0x0, 0x1., v8_int8 = .0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x1.."
-} else {
-set vector_register ".uint64 = 0x100000001, v2_float = .0x0, 0x0., v2_int32 = .0x1, 0x1., v4_int16 = .0x1, 0x0, 0x1, 0x0., v8_int8 = .0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0.."
-}
-
-for {set i 0} {$i < 32} {incr i 1} {
-        gdb_test "info reg ev$i" "ev$i.*$vector_register" "info reg ev$i"
-}
-
-# Test wether the GPRs are updated accordingly. (GPRs are just the lower
-# 32 bits of the EV registers.)
-
-set general_register "0x1\[ \t\]+1"
-
-for {set i 0} {$i < 32} {incr i 1} {
-        gdb_test "info reg r$i" "r$i.*$general_register" "info reg r$i"
-}
-
-# Now redo the same tests, but using the print command.
-# Note: in LE case, the char array is printed WITHOUT the last character.
-# Gdb treats the terminating null char in the array like the terminating
-# null char in a string and doesn't print it. This is not a failure, but
-# the way gdb works.
-
-if {$endianness == "big"} {
-     set decimal_vector ".uint64 = 4294967297, v2_float = .1.*e-45, 1.*e-45., v2_int32 = .1, 1., v4_int16 = .0, 1, 0, 1., v8_int8 = ..000.000.000.001.000.000.000.001.."
-} else {
-     set decimal_vector ".uint64 = 4294967297, v2_float = .1.*e-45, 1.*e-45., v2_int32 = .1, 1., v4_int16 = .1, 0, 1, 0., v8_int8 = ..001.000.000.000.001.000.000.."
-}
-
-for {set i 0} {$i < 32} {incr i 1} {
-        gdb_test "print \$ev$i" ".* = $decimal_vector" "print ev$i"
-}
-
-for {set i 0} {$i < 32} {incr i 1} {
-         set pattern$i ".*ev$i.*"
-         append pattern$i $vector_register
-}
-
-send_gdb "info vector\n"
-gdb_expect_list "info vector" ".*$gdb_prompt $" {
-[$pattern0]
-[$pattern1]
-[$pattern2]
-[$pattern3]
-[$pattern4]
-[$pattern5]
-[$pattern6]
-[$pattern7]
-[$pattern8]
-[$pattern9]
-[$pattern10]
-[$pattern11]
-[$pattern12]
-[$pattern13]
-[$pattern14]
-[$pattern15]
-[$pattern16]
-[$pattern17]
-[$pattern18]
-[$pattern19]
-[$pattern20]
-[$pattern21]
-[$pattern22]
-[$pattern23]
-[$pattern24]
-[$pattern25]
-[$pattern26]
-[$pattern27]
-[$pattern28]
-[$pattern29]
-[$pattern30]
-[$pattern31]
-}
-
-# We must restart everything, because we have set important registers to
-# some unusual values.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-gdb_test "break vector_fun" \
- "Breakpoint 2 at.*e500-regs.c, line \[0-9\]+\\." \
- "Set breakpoint at vector_fun"
-
-# Actually it is nuch easier to see these results printed in hex.
-# gdb_test "set output-radix 16" \
-#   "Output radix now set to decimal 16, hex 10, octal 20." \
-#   "Set output radix to hex"
-
-gdb_test "continue" \
-  "Breakpoint 2, vector_fun .a=.-2, -2., b=.1, 1.*e500-regs.c.*ev_create_s32 .2, 2.;" \
-  "continue to vector_fun"
-
-# Do a next over the assignment to vector 'a'. 
-gdb_test "next" ".*b = \\(vector int\\) __ev_create_s32 \\(3, 3\\);" \
-  "next (1)"
-
-# Do a next over the assignment to vector 'b'. 
-gdb_test "next" "c = __ev_and \\(a, b\\);" \
-  "next (2)"
-
-# Now 'a' should be '0x02020202...' and 'b' should be '0x03030303...'
-gdb_test "print/x a" \
-  ".*= .0x2, 0x2." \
-  "print vector parameter a"
-
-gdb_test "print/x b" \
-  ".*= .0x3, 0x3." \
-  "print vector parameter b"
-
-# If we do an 'up' now, and print 'x' and 'y' we should see the values they
-# have in main, not the values they have in vector_fun.
-gdb_test "up" ".1.*main \\(\\) at.*e500-regs.c.*z = vector_fun \\(x, y\\);" \
-  "up to main"
-
-gdb_test "print x" \
-  ".*= .-2, -2." \
-  "print vector x"
-
-gdb_test "print y" \
-  ".*= .1, 1." \
-  "print vector y"
-
-# now go back to vector_func and do a finish, to see if we can print the return
-# value correctly.
-
-gdb_test "down" \
-  ".0  vector_fun \\(a=.2, 2., b=.3, 3.\\) at.*e500-regs.c.*c = __ev_and \\(a, b\\);" \
-  "down to vector_fun"
-
-gdb_test "finish" \
-  "Run till exit from .0  vector_fun \\(a=.2, 2., b=.3, 3.\\) at.*e500-regs.c.*main \\(\\) at.*e500-regs.c.*z = vector_fun \\(x, y\\);.*Value returned is.*= .2, 2." \
-  "finish returned correct value"
-
-
-
diff --git a/gdb/testsuite/gdb.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp
deleted file mode 100644
index 4264d6c01b8..00000000000
--- a/gdb/testsuite/gdb.arch/gdb1291.exp
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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@gnu.org
-
-# This file is part of the gdb testsuite.
-
-# Tests for PR:1291.  Ensure that backtrace works properly for stack
-# frames greater than 256 bytes.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-# Test SH backtraces with >256 byte frame stack. (PR:1291)
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "sh-*-*"] then {
-    verbose "Skipping SH backtrace tests."
-    return
-}
-
-set testfile "gdb1291"
-set srcfile ${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-gdb_test "b sub1" "Breakpoint 2.*" "set breakpoint"
-gdb_test "c" "Breakpoint 2.* sub1 .*" "get to sub1"
-
-send_gdb "bt\n"
-gdb_expect {
-    -re "#0.* sub1 .*\r\n#1\[ \t\]*$hex in main \\(\\).*\r\n$gdb_prompt $" {
-	pass "backtrace with local variable less than or equal to 256 bytes"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "backtrace with local variable less than or equal to 256 bytes"
-    }
-    timeout {
-	fail "backtrace with local variable less than or equal to 256 bytes (timeout)"
-    }
-}
-
-gdb_test "b sub2" "Breakpoint 3.*" "set breakpoint"
-gdb_test "c" "Breakpoint 3.* sub2 .*" "get to sub2"
-
-send_gdb "bt\n"
-gdb_expect {
-    -re "#0.* sub2 .*\r\n#1\[ \t\]*$hex in main \\(\\).*\r\n$gdb_prompt $" {
-	pass "backtrace with local variable larger than 256 bytes"
-    }
-    -re "#0.* sub2 .*\r\n#1  0x00000000 in \\?\\? \\(\\).*\r\n$gdb_prompt $" {
-	kfail "gdb/1291" "backtrace with local variable larger than 256 bytes"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "backtrace with local variable larger than 256 bytes"
-    }
-    timeout {
-	fail "backtrace with local variable larger than 256 bytes (timeout)"
-    }
-}
diff --git a/gdb/testsuite/gdb.arch/gdb1291.s b/gdb/testsuite/gdb.arch/gdb1291.s
deleted file mode 100644
index 0f40b8f81cd..00000000000
--- a/gdb/testsuite/gdb.arch/gdb1291.s
+++ /dev/null
@@ -1,129 +0,0 @@
-! Copyright 2004 Free Software Foundation, 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@gnu.org
-!
-! This file is part of the gdb testsuite.
-!
-! It was generated using "sh-elf-gcc -S gdb1291.c", using the following
-! source file:
-!
-!	#include <stdio.h>
-!	
-!	main()
-!	{
-!	  printf("hello world\n");
-!	  sub1();
-!	  sub2();
-!	}
-!	sub1()
-!	{
-!	  int buf[64];
-!	
-!	}
-!	
-!	sub2()
-!	{
-!	  int buf[65];
-!	
-!	}
-!
-! We use a pregenerated assembly file as the test input to avoid possible
-! problems with future versions of gcc generating different code.
-
-	.file	"gdb1291.c"
-	.text
-	.section	.rodata
-	.align 2
-.LC0:
-	.string	"hello world\n"
-	.text
-	.align 1
-	.global	_main
-	.type	_main, @function
-_main:
-	mov.l	r14,@-r15
-	sts.l	pr,@-r15
-	mov	r15,r14
-	mov.l	.L2,r1
-	mov	r1,r4
-	mov.l	.L3,r1
-	jsr	@r1
-	nop
-	mov.l	.L4,r1
-	jsr	@r1
-	nop
-	mov.l	.L5,r1
-	jsr	@r1
-	nop
-	mov	r14,r15
-	lds.l	@r15+,pr
-	mov.l	@r15+,r14
-	rts	
-	nop
-.L6:
-	.align 2
-.L2:
-	.long	.LC0
-.L3:
-	.long	_printf
-.L4:
-	.long	_sub1
-.L5:
-	.long	_sub2
-	.size	_main, .-_main
-	.align 1
-	.global	_sub1
-	.type	_sub1, @function
-_sub1:
-	mov.l	r14,@-r15
-	sts.l	pr,@-r15
-	add	#-128,r15
-	add	#-128,r15
-	mov	r15,r14
-	mov.w	.L8,r7
-	add	r7,r14
-	mov	r14,r15
-	lds.l	@r15+,pr
-	mov.l	@r15+,r14
-	rts	
-	nop
-	.align 1
-.L8:
-	.short	256
-	.size	_sub1, .-_sub1
-	.align 1
-	.global	_sub2
-	.type	_sub2, @function
-_sub2:
-	mov.l	r14,@-r15
-	sts.l	pr,@-r15
-	mov.w	.L11,r1
-	sub	r1,r15
-	mov	r15,r14
-	mov.w	.L11,r7
-	add	r7,r14
-	mov	r14,r15
-	lds.l	@r15+,pr
-	mov.l	@r15+,r14
-	rts	
-	nop
-	.align 1
-.L11:
-	.short	260
-	.size	_sub2, .-_sub2
-	.ident	"GCC: (GNU) 3.5.0 20040204 (experimental)"
diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp
deleted file mode 100644
index 697c9f89b2d..00000000000
--- a/gdb/testsuite/gdb.arch/gdb1431.exp
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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@gnu.org
-
-# This file is part of the gdb testsuite.
-
-# Tests for PR:1431.  Catch gdb not continuing to second function properly.
-# Note that originally this bug was reported as a problem with the "until"
-# command, which actually is behaving as currently defined.  What apparently
-# was expected was the behavior of the newer "advance" command.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-# Observe that the until command doesn't go all the way to sub2.
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "sh-*-*"] then {
-    verbose "Skipping SH backtrace tests."
-    return
-}
-
-set testfile "gdb1431"
-set srcfile ${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-gdb_test "advance sub1" "hello world\r\n$hex in sub1 \\(\\)" "get to sub1"
-gdb_test "advance sub2" "$hex in main \\(\\)" "advance returns from sub1 frame"
-gdb_test "advance sub2" "$hex in sub2 \\(\\)" "get to sub2"
diff --git a/gdb/testsuite/gdb.arch/gdb1431.s b/gdb/testsuite/gdb.arch/gdb1431.s
deleted file mode 100644
index 36b43d260f2..00000000000
--- a/gdb/testsuite/gdb.arch/gdb1431.s
+++ /dev/null
@@ -1,129 +0,0 @@
-! Copyright 2004 Free Software Foundation, 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@gnu.org
-!
-! This file is part of the gdb testsuite.
-!
-! It was generated using "sh-elf-gcc -S gdb1431.c", using the following
-! source file:
-!
-!	#include <stdio.h>
-!	
-!	main()
-!	{
-!	  printf("hello world\n");
-!	  sub1();
-!	  sub2();
-!	}
-!	sub1()
-!	{
-!	  int buf[64];
-!	
-!	}
-!	
-!	sub2()
-!	{
-!	  int buf[65];
-!	
-!	}
-!
-! We use a pregenerated assembly file as the test input to avoid possible
-! problems with future versions of gcc generating different code.
-
-	.file	"gdb1431.c"
-	.text
-	.section	.rodata
-	.align 2
-.LC0:
-	.string	"hello world\n"
-	.text
-	.align 1
-	.global	_main
-	.type	_main, @function
-_main:
-	mov.l	r14,@-r15
-	sts.l	pr,@-r15
-	mov	r15,r14
-	mov.l	.L2,r1
-	mov	r1,r4
-	mov.l	.L3,r1
-	jsr	@r1
-	nop
-	mov.l	.L4,r1
-	jsr	@r1
-	nop
-	mov.l	.L5,r1
-	jsr	@r1
-	nop
-	mov	r14,r15
-	lds.l	@r15+,pr
-	mov.l	@r15+,r14
-	rts	
-	nop
-.L6:
-	.align 2
-.L2:
-	.long	.LC0
-.L3:
-	.long	_printf
-.L4:
-	.long	_sub1
-.L5:
-	.long	_sub2
-	.size	_main, .-_main
-	.align 1
-	.global	_sub1
-	.type	_sub1, @function
-_sub1:
-	mov.l	r14,@-r15
-	sts.l	pr,@-r15
-	add	#-128,r15
-	add	#-128,r15
-	mov	r15,r14
-	mov.w	.L8,r7
-	add	r7,r14
-	mov	r14,r15
-	lds.l	@r15+,pr
-	mov.l	@r15+,r14
-	rts	
-	nop
-	.align 1
-.L8:
-	.short	256
-	.size	_sub1, .-_sub1
-	.align 1
-	.global	_sub2
-	.type	_sub2, @function
-_sub2:
-	mov.l	r14,@-r15
-	sts.l	pr,@-r15
-	mov.w	.L11,r1
-	sub	r1,r15
-	mov	r15,r14
-	mov.w	.L11,r7
-	add	r7,r14
-	mov	r14,r15
-	lds.l	@r15+,pr
-	mov.l	@r15+,r14
-	rts	
-	nop
-	.align 1
-.L11:
-	.short	260
-	.size	_sub2, .-_sub2
-	.ident	"GCC: (GNU) 3.5.0 20040204 (experimental)"
diff --git a/gdb/testsuite/gdb.arch/gdb1558.c b/gdb/testsuite/gdb.arch/gdb1558.c
deleted file mode 100644
index d1051cf79a7..00000000000
--- a/gdb/testsuite/gdb.arch/gdb1558.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2004 Free Software Foundation, 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@gnu.org
- 
-   This file is part of the gdb testsuite.  */
-
-sub1 ()
-{
-  printf ("In sub1\n");
-}
-  
-sub2 ()
-{
-  printf ("In sub2\n");
-}
-  
-main ()
-{
-  sub1 ();
-  sub2 ();
-}
diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
deleted file mode 100644
index 1ad21694854..00000000000
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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@gnu.org
-
-# This file is part of the gdb testsuite.
-
-# Tests for PR:1558.  Hits breakpoint at main after function called
-# from main.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "sh-*-*"] then {
-    verbose "Skipping SH breakpoint test."
-    return
-}
-
-set testfile "gdb1558"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-# Note we have to compile WITH optimization and WITHOUT debugging information to expose the bug.
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {"additional_flags=-O2"}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "b main" "Breakpoint 1.*" "set breakpoint at main"
-gdb_test "b sub1" "Breakpoint 2.*" "set breakpoint at sub1"
-gdb_test "b sub2" "Breakpoint 3.*" "set breakpoint at sub2"
-
-# We can't use "runto_main" because that is exactly the problem
-# we are trying to detect, stopping somewhere before main.
-
-gdb_run_cmd
-
-gdb_expect 30 {
-    -re "Breakpoint 1.*main .*$gdb_prompt $" {
-	pass "Hits breakpoint at main after function called from main"
-    }
-    -re "Breakpoint 2.*sub1 .*$gdb_prompt $" {
-	kfail "gdb/1558" "Hits breakpoint at main after function called from main"
-    }
-    -re "$gdb_prompt $" { 
-	fail "Hits breakpoint at main after function called from main"
-    }
-    timeout { 
-	fail "Hits breakpoint at main after function called from main (timeout)"
-    }
-}
diff --git a/gdb/testsuite/gdb.arch/i386-cpuid.h b/gdb/testsuite/gdb.arch/i386-cpuid.h
deleted file mode 100644
index 067b22fa712..00000000000
--- a/gdb/testsuite/gdb.arch/i386-cpuid.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Helper file for i386 platform.  Runtime check for MMX/SSE/SSE2 support.
-
-   Copyright 2004 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.  */
-
-/* Used by 20020523-2.c and i386-sse-6.c, and possibly others.  */
-/* Plagarized from 20020523-2.c.  */
-/* Plagarized from gcc.  */
-
-#define bit_CMOV (1 << 15)
-#define bit_MMX (1 << 23)
-#define bit_SSE (1 << 25)
-#define bit_SSE2 (1 << 26)
-
-#ifndef NOINLINE
-#define NOINLINE __attribute__ ((noinline))
-#endif
-
-unsigned int i386_cpuid (void) NOINLINE;
-
-unsigned int NOINLINE
-i386_cpuid (void)
-{
-  int fl1, fl2;
-
-#ifndef __x86_64__
-  /* See if we can use cpuid.  On AMD64 we always can.  */
-  __asm__ ("pushfl; pushfl; popl %0; movl %0,%1; xorl %2,%0;"
-	   "pushl %0; popfl; pushfl; popl %0; popfl"
-	   : "=&r" (fl1), "=&r" (fl2)
-	   : "i" (0x00200000));
-  if (((fl1 ^ fl2) & 0x00200000) == 0)
-    return (0);
-#endif
-
-  /* Host supports cpuid.  See if cpuid gives capabilities, try
-     CPUID(0).  Preserve %ebx and %ecx; cpuid insn clobbers these, we
-     don't need their CPUID values here, and %ebx may be the PIC
-     register.  */
-#ifdef __x86_64__
-  __asm__ ("pushq %%rcx; pushq %%rbx; cpuid; popq %%rbx; popq %%rcx"
-	   : "=a" (fl1) : "0" (0) : "rdx", "cc");
-#else
-  __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
-	   : "=a" (fl1) : "0" (0) : "edx", "cc");
-#endif
-  if (fl1 == 0)
-    return (0);
-
-  /* Invoke CPUID(1), return %edx; caller can examine bits to
-     determine what's supported.  */
-#ifdef __x86_64__
-  __asm__ ("pushq %%rcx; pushq %%rbx; cpuid; popq %%rbx; popq %%rcx"
-	   : "=d" (fl2), "=a" (fl1) : "1" (1) : "cc");
-#else
-  __asm__ ("pushl %%ecx; pushl %%ebx; cpuid; popl %%ebx; popl %%ecx"
-	   : "=d" (fl2), "=a" (fl1) : "1" (1) : "cc");
-#endif
-
-  return fl2;
-}
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.c b/gdb/testsuite/gdb.arch/i386-prologue.c
deleted file mode 100644
index e6846576fde..00000000000
--- a/gdb/testsuite/gdb.arch/i386-prologue.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Unwinder test program.
-
-   Copyright 2003, 2004 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.  */
-
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str)	SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str)	#str
-#endif
-
-void gdb1253 (void);
-void gdb1718 (void);
-void gdb1338 (void);
-void jump_at_beginning (void);
-
-int
-main (void)
-{
-  standard ();
-  gdb1253 ();
-  gdb1718 ();
-  gdb1338 ();
-  jump_at_beginning ();
-  return 0;
-}
-
-/* A normal prologue.  */
-
-asm(".text\n"
-    "    .align 8\n"
-    SYMBOL (standard) ":\n"
-    "    pushl %ebp\n"
-    "    movl  %esp, %ebp\n"
-    "    pushl %edi\n"
-    "    int   $0x03\n"
-    "    leave\n"
-    "    ret\n");
-
-/* Relevant part of the prologue from symtab/1253.  */
-
-asm(".text\n"
-    "    .align 8\n"
-    SYMBOL (gdb1253) ":\n"
-    "    pushl %ebp\n"
-    "    xorl  %ecx, %ecx\n"
-    "    movl  %esp, %ebp\n"
-    "    pushl %edi\n"
-    "    int   $0x03\n"
-    "    leave\n"
-    "    ret\n");
-
-/* Relevant part of the prologue from backtrace/1718.  */
-
-asm(".text\n"
-    "    .align 8\n"
-    SYMBOL (gdb1718) ":\n"
-    "    pushl %ebp\n"
-    "    movl  $0x11111111, %eax\n"
-    "    movl  %esp, %ebp\n"
-    "    pushl %esi\n"
-    "    movl  $0x22222222, %esi\n"
-    "    pushl %ebx\n"
-    "    int   $0x03\n"
-    "    leave\n"
-    "    ret\n");
-
-/* Relevant part of the prologue from backtrace/1338.  */
-
-asm(".text\n"
-    "    .align 8\n"
-    SYMBOL (gdb1338) ":\n"
-    "    pushl %edi\n"
-    "    pushl %esi\n"
-    "    pushl %ebx\n"
-    "    int   $0x03\n"
-    "    popl  %ebx\n"
-    "    popl  %esi\n"
-    "    popl  %edi\n"
-    "    ret\n");
-
-/* The purpose of this function is to verify that, during prologue
-   skip, GDB does not follow a jump at the beginnning of the "real"
-   code.  */
-
-asm(".text\n"
-    "    .align 8\n"
-    SYMBOL (jump_at_beginning) ":\n"
-    "    pushl %ebp\n"
-    "    movl  %esp,%ebp\n"
-    "    jmp   .gdbjump\n"
-    "    nop\n"
-    ".gdbjump:\n"
-    "    movl  %ebp,%esp\n"
-    "    popl  %ebp\n"
-    "    ret\n");
diff --git a/gdb/testsuite/gdb.arch/i386-prologue.exp b/gdb/testsuite/gdb.arch/i386-prologue.exp
deleted file mode 100644
index 48aad1c13ae..00000000000
--- a/gdb/testsuite/gdb.arch/i386-prologue.exp
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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@gnu.org
-
-# This file is part of the gdb testsuite.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-# Test i386 prologue analyzer.
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "i?86-*-*"] then {
-    verbose "Skipping i386 prologue tests."
-    return
-}
-
-set testfile "i386-prologue"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# some targets have leading underscores on assembly symbols.
-# TODO: detect this automatically
-set additional_flags ""
-if [istarget "i?86-*-cygwin*"] then {
-  set additional_flags "additional_flags=-DSYMBOL_PREFIX=\"_\""
-}   
-
-# Don't use "debug", so that we don't have line information for the assembly
-# fragments.
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list $additional_flags]] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-# The code used by the tests here encodes some breakpoints by using
-# inline assembler.  This will generate a SIGTRAP which will be caught
-# by GDB.  At that point the instruction pointer will point at the
-# next instruction, and execution can continue without any problems.
-# Some systems however (QNX Neutrino, Solaris) will adjust the
-# instruction pointer to point at the breakpoint instruction instead.
-# On these systems we cannot continue unless we skip it.  This
-# procedure takes care of that.
-
-proc skip_breakpoint { msg } {
-    gdb_test "if (*(unsigned char *)\$pc == 0xcc)\nset \$pc = \$pc + 1\nend" \
-	    "" "skip breakpoint in ${msg}"
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-# Testcase for standard prologue.
-
-gdb_test "continue" "Program received signal SIGTRAP.*" "continue to standard"
-
-skip_breakpoint standard
-
-gdb_test "backtrace 10" \
-	"#0\[ \t\]*$hex in standard.*\r\n#1\[ \t\]*$hex in main.*" \
-	"backtrace in standard"
-
-gdb_test "info frame" \
-	".*Saved registers:.*ebp at.*edi at.*eip at.*" \
-	"saved registers in standard"
-
-# Testcase from symtab/1253.
-
-gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1253"
-
-skip_breakpoint gdb1253
-
-gdb_test "backtrace 10" \
-	"#0\[ \t\]*$hex in gdb1253.*\r\n#1\[ \t\]*$hex in main.*" \
-	"backtrace in gdb1253"
-
-gdb_test "info frame" \
-	".*Saved registers:.*ebp at.*edi at.*eip at.*" \
-	"saved registers in gdb1253"
-
-# Testcase from backtrace/1718.
-
-gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1718"
-
-skip_breakpoint gdb1718
-
-gdb_test "backtrace 10" \
-	"#0\[ \t\]*$hex in gdb1718.*\r\n#1\[ \t\]*$hex in main.*" \
-	"backtrace in gdb1718"
-
-setup_kfail *-*-* gdb/1718
-gdb_test "info frame" \
-	".*Saved registers:.*esi at.*ebx at.*eip at.*" \
-	"saved registers in gdb1718"
-
-# Testcase from backtrace/1338.
-
-gdb_test "continue" "Program received signal SIGTRAP.*" "continue to gdb1338"
-
-skip_breakpoint gdb1338
-
-gdb_test "backtrace 10" \
-	"#0\[ \t\]*$hex in gdb1338.*\r\n#1\[ \t\]*$hex in main.*" \
-	"backtrace in gdb1338"
-
-gdb_test "info frame" \
-	".*Saved registers:.*ebx at.*esi at.*edi at.*eip at.*" \
-	"saved registers in gdb1338"
-
-# Testcase jump_at_beginning.
-gdb_test_multiple "break jump_at_beginning" \
-	"set breakpoint in jump_at_beginning" {
-    -re "Breakpoint \[0-9\]* at ($hex).*$gdb_prompt $" {
-	gdb_test "x/i $expect_out(1,string)" \
-		".*<jump_at_beginning.*>:.*jmp.*" \
-		"check jump_at_beginning prologue end"
-    }
-    default {
-        fail "set breakpoint in jump_at_beginning"
-    }
-}
diff --git a/gdb/testsuite/gdb.arch/i386-sse.c b/gdb/testsuite/gdb.arch/i386-sse.c
deleted file mode 100644
index 496721c5e82..00000000000
--- a/gdb/testsuite/gdb.arch/i386-sse.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Test program for SSE registers.
-
-   Copyright 2004 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 <stdio.h>
-#include "i386-cpuid.h"
-
-typedef struct {
-  float f[4];
-} v4sf_t;
-
-
-v4sf_t data[8] =
-  {
-    { {  0.0, 0.25, 0.50, 0.75 } },
-    { {  1.0, 1.25, 1.50, 1.75 } },
-    { {  2.0, 2.25, 2.50, 2.75 } },
-    { {  3.0, 3.25, 3.50, 3.75 } },
-    { {  4.0, 4.25, 4.50, 4.75 } },
-    { {  5.0, 5.25, 5.50, 5.75 } },
-    { {  6.0, 6.25, 6.50, 6.75 } },
-    { {  7.0, 7.25, 7.50, 7.75 } },
-  };
-
-
-int
-have_sse (void)
-{
-  int edx = i386_cpuid ();
-
-  if (edx & bit_SSE)
-    return 1;
-  else
-    return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  if (have_sse ())
-    {
-      asm ("movaps 0(%0), %%xmm0\n\t"
-           "movaps 16(%0), %%xmm1\n\t"
-           "movaps 32(%0), %%xmm2\n\t"
-           "movaps 48(%0), %%xmm3\n\t"
-           "movaps 64(%0), %%xmm4\n\t"
-           "movaps 80(%0), %%xmm5\n\t"
-           "movaps 96(%0), %%xmm6\n\t"
-           "movaps 112(%0), %%xmm7\n\t"
-           : /* no output operands */
-           : "r" (data) 
-           : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
-
-      puts ("Hi!"); /* first breakpoint here */
-
-      asm (
-           "movaps %%xmm0, 0(%0)\n\t"
-           "movaps %%xmm1, 16(%0)\n\t"
-           "movaps %%xmm2, 32(%0)\n\t"
-           "movaps %%xmm3, 48(%0)\n\t"
-           "movaps %%xmm4, 64(%0)\n\t"
-           "movaps %%xmm5, 80(%0)\n\t"
-           "movaps %%xmm6, 96(%0)\n\t"
-           "movaps %%xmm7, 112(%0)\n\t"
-           : /* no output operands */
-           : "r" (data) 
-           : "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7");
-
-      puts ("Bye!"); /* second breakpoint here */
-    }
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
deleted file mode 100644
index 702ee7127a5..00000000000
--- a/gdb/testsuite/gdb.arch/i386-sse.exp
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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@gnu.org
-
-# This file is part of the gdb testsuite.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "i?86-*-*"] then {
-    verbose "Skipping i386 SSE tests."
-    return
-}
-
-set testfile "i386-sse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    unsupported "compiler does not support SSE"
-    return
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-send_gdb "print have_sse ()\r"
-gdb_expect {
-    -re ".. = 1\r\n$gdb_prompt " {
-        pass "check whether processor supports SSE"
-    }
-    -re ".. = 0\r\n$gdb_prompt " {
-        verbose "processor does not support SSE; skipping SSE tests"
-        return
-    }
-    -re ".*$gdb_prompt $" {
-        fail "check whether processor supports SSE"
-    }
-    timeout {
-        fail "check whether processor supports SSE (timeout)"
-    }
-}
-
-gdb_test "break [gdb_get_line_number "first breakpoint here"]" \
-         "Breakpoint .* at .*i386-sse.c.*" \
-         "set breakpoint in main"
-gdb_continue_to_breakpoint "continue to first breakpoint in main"
-
-foreach r {0 1 2 3 4 5 6 7} {
-    gdb_test "print \$xmm$r.v4_float" \
-        ".. = \\{$r, $r.25, $r.5, $r.75\\}.*" \
-        "check contents of %xmm$r"
-}
-
-foreach r {0 1 2 3 4 5 6 7} {
-    gdb_test "set var \$xmm$r.v4_float\[0\] = $r + 10" "" "set %xmm$r"
-}
-
-gdb_test "break [gdb_get_line_number "second breakpoint here"]" \
-         "Breakpoint .* at .*i386-sse.c.*" \
-         "set breakpoint in main"
-gdb_continue_to_breakpoint "continue to second breakpoint in main"
-
-foreach r {0 1 2 3 4 5 6 7} {
-    gdb_test "print data\[$r\]" \
-        ".. = \\{f = \\{[expr $r + 10], $r.25, $r.5, $r.75\\}\\}.*" \
-        "check contents of data\[$r\]"
-}
diff --git a/gdb/testsuite/gdb.arch/i386-unwind.c b/gdb/testsuite/gdb.arch/i386-unwind.c
deleted file mode 100644
index b1fa1df06ee..00000000000
--- a/gdb/testsuite/gdb.arch/i386-unwind.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Unwinder test program.
-
-   Copyright 2003, 2004 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.  */
-
-#ifdef SYMBOL_PREFIX
-#define SYMBOL(str)	SYMBOL_PREFIX #str
-#else
-#define SYMBOL(str)	#str
-#endif
-
-void
-trap (void)
-{
-  asm ("int $0x03");
-}
-
-/* Make sure that main directly follows a function without an
-   epilogue.  */
-
-asm(".text\n"
-    "    .align 8\n"
-    "    .globl gdb1435\n"
-    "gdb1435:\n"
-    "    pushl %ebp\n"
-    "    mov   %esp, %ebp\n"
-    "    call  " SYMBOL (trap) "\n"
-    "    .globl " SYMBOL (main) "\n"
-    SYMBOL (main) ":\n"
-    "    pushl %ebp\n"
-    "    mov   %esp, %ebp\n"
-    "    call  gdb1435\n");
diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp
deleted file mode 100644
index 85fb9da62bc..00000000000
--- a/gdb/testsuite/gdb.arch/i386-unwind.exp
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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@gnu.org
-
-# This file is part of the gdb testsuite.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-# Test i386 unwinder.
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "i?86-*-*"] then {
-    verbose "Skipping i386 unwinder tests."
-    return
-}
-
-set testfile "i386-unwind"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# some targets have leading underscores on assembly symbols.
-# TODO: detect this automatically
-set additional_flags ""
-if [istarget "i?86-*-cygwin*"] then {
-  set additional_flags "additional_flags=-DSYMBOL_PREFIX=\"_\""
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Testcase for backtrace/1435.
-
-# We use gdb_run_cmd so this stands a chance to work for remote
-# targets too.
-gdb_run_cmd
-
-gdb_expect {
-    -re "Program received signal SIGTRAP.*$gdb_prompt $" {
-	pass "run past gdb1435"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "run past gdb1435"
-    }
-    timeout {
-	fail "run past gdb1435 (timeout)"
-    }
-}
-
-gdb_test "backtrace 10" \
-	"#1\[ \t]*$hex in gdb1435.*\r\n#2\[ \t\]*$hex in main.*" \
-	"backtrace past gdb1435"
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.exp b/gdb/testsuite/gdb.arch/pa-nullify.exp
deleted file mode 100644
index 4cf5c725876..00000000000
--- a/gdb/testsuite/gdb.arch/pa-nullify.exp
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-#
-# This file is part of the gdb testsuite.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Test handling of nullified instructions for the pa target.
-
-if ![istarget "hppa*-*-*"] then {
-    verbose "Skipping hppa nullification tests."
-    return
-}
-
-set testfile "pa-nullify"
-set srcfile ${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-set gcorefile ${objdir}/${subdir}/${testfile}.gcore
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "Testcase compile failed."
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# In the first test, we do a "step" on a function whose last instruction 
-# contains a branch-with-nullify.  The instruction in the delay slot belongs
-# to the next function.  We verify that when we step off the first function
-# that we end up back at the caller and not at the second instruction.
-
-gdb_breakpoint foo
-gdb_test "run" "Breakpoint 1, .* in foo.*" "Breakpoint at foo"
-
-set test "stepi till main"
-gdb_test_multiple "stepi" "${test}" {
-  -re ".*in foo.*$gdb_prompt $" {
-    send_gdb "stepi\n"
-    exp_continue -continue_timer
-  }
-  -re ".*in bar.*$gdb_prompt $" {
-    fail $test
-  }
-  -re ".*in main.*$gdb_prompt $" {
-    pass $test
-  }
-}
-
-# In the second test, we verify that we can get a proper backtrace 
-# even when we are in a nullified instruction that belongs to the next function.
-# We also verify that when stepping over a branch-with-nullify insn that we 
-# stay on the same insn for two steps.
-
-proc get_addr_of_sym { sym } {
-  set addr 0
-  global gdb_prompt
-  global hex
-
-  set test "get address of $sym"
-  send_gdb "print $sym\n"
-  gdb_test_multiple "print $sym" $test {
-    -re ".*($hex) <$sym>.*$gdb_prompt $" {
-      set addr $expect_out(1,string)
-      pass $test
-    }
-  }
-
-  return $addr
-}
-
-if { ! [ runto_main ] } then { gdb_suppress_tests; }
-
-set foo [get_addr_of_sym "foo"]
-set bar [get_addr_of_sym "bar"]
-set foo_last [expr $bar - 4]
-
-gdb_breakpoint "*$foo_last"
-
-gdb_test "continue" "Breakpoint \[0-9\]*,.* in foo.*"
-gdb_test "backtrace" "in foo.*in main.*" "Backtrace from last insn in foo"
-gdb_test "stepi" "in foo.*" "stepi to nullified instruction stays in foo"
-gdb_test "backtrace" "in foo.*in main.*" "Backtrace from nullified insn"
-gdb_test "stepi" "in main.*" "stepi to main"
-
-# In the third test, we verify that backtraces from nullified instructions
-# work even in coredumps
-
-proc gen_core { test } {
-  global gcorefile
-  global gdb_prompt
-  set gcore_works 0
-  set escapedfilename [string_to_regexp $gcorefile]
-
-  gdb_test_multiple "gcore $gcorefile" "$test: gcore" {
-    -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
-      pass "$test: gcore"
-      set gcore_works 1
-    }
-    -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
-      fail "$test: gcore"
-    }
-  }
-
-  return $gcore_works
-}
-
-proc test_core_bt { test } {
-  global gcorefile
-
-  gdb_test "core $gcorefile" "Core was generated by.*" \
-    "$test: load core file" "A program is being debugged already.*" "y"
-
-  gdb_test "backtrace" ".*in foo.*in main.*" "$test: backtrace in gcore"
-}
-
-set test "core at last insn in foo"
-if { ! [ runto_main ] } then { gdb_suppress_tests; }
-gdb_breakpoint "*$foo_last"
-gdb_test "continue" "Breakpoint \[0-9\]*,.* in foo.*" "$test: continue to breakpoint"
-if [gen_core $test] {
-  test_core_bt $test
-}
-
-set test "core at nullified insn"
-if { ! [ runto_main ] } then { gdb_suppress_tests; }
-gdb_breakpoint "*$foo_last"
-gdb_test "continue" "Breakpoint \[0-9\]*,.* in foo.*" "$test: continue to breakpoint"
-gdb_test "stepi" ".*in foo.*" "$test: step to nullified instruction"
-if [gen_core $test] {
-  test_core_bt $test
-}
diff --git a/gdb/testsuite/gdb.arch/pa-nullify.s b/gdb/testsuite/gdb.arch/pa-nullify.s
deleted file mode 100644
index 90269b4d7b1..00000000000
--- a/gdb/testsuite/gdb.arch/pa-nullify.s
+++ /dev/null
@@ -1,59 +0,0 @@
-	.LEVEL 1.1
-	.text
-	.align 4
-.globl foo
-	.type	foo, @function
-foo:
-	.PROC
-	.CALLINFO FRAME=64,NO_CALLS,SAVE_SP,ENTRY_GR=3
-	.ENTRY
-	copy %r3,%r1
-	copy %r30,%r3
-	stwm %r1,64(%r30)
-	stw %r26,-36(%r3)
-	ldw -36(%r3),%r19
-	copy %r19,%r28
-	ldo 64(%r3),%r30
-	ldwm -64(%r30),%r3
-	bv,n %r0(%r2)
-	.EXIT
-	.PROCEND
-
-.globl bar
-	.type	bar, @function
-bar:
-	.PROC
-	.CALLINFO FRAME=64,NO_CALLS,SAVE_SP,ENTRY_GR=3
-	.ENTRY
-	copy %r3,%r1
-	copy %r30,%r3
-	stwm %r1,64(%r30)
-	ldo 64(%r3),%r30
-	ldwm -64(%r30),%r3
-	bv,n %r0(%r2)
-	.EXIT
-	.PROCEND
-
-.globl main
-	.type	main, @function
-main:
-	.PROC
-	.CALLINFO FRAME=64,CALLS,SAVE_RP,SAVE_SP,ENTRY_GR=3
-	.ENTRY
-	stw %r2,-20(%r30)
-	copy %r3,%r1
-	copy %r30,%r3
-	stwm %r1,64(%r30)
-	stw %r26,-36(%r3)
-	stw %r25,-40(%r3)
-	ldw -36(%r3),%r26
-	bl foo,%r2
-	nop
-	copy %r28,%r19
-	copy %r19,%r28
-	ldw -20(%r3),%r2
-	ldo 64(%r3),%r30
-	ldwm -64(%r30),%r3
-	bv,n %r0(%r2)
-	.EXIT
-	.PROCEND
diff --git a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.c b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.c
deleted file mode 100644
index ee31b496d3e..00000000000
--- a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.  */
-
-void li_stw (void);
-
-int
-main (void)
-{
-  li_stw ();
-  return 0;
-}
-
-/* Asm for procedure li_stw().
-
-   The purpose of this function is to verify that GDB does not
-   include the li insn as part of the function prologue (only part
-   of the prologue if part of a pair of insns saving vector registers).
-   Similarly, GDB should not include the stw insn following the li insn,
-   because the source register is not used for parameter passing.  */
-
-
-asm ("        .csect .text[PR]\n"
-     "        .align 2\n"
-     "        .lglobl .li_stw\n"
-     "        .csect li_stw[DS]\n"
-     "li_stw:\n"
-     "        .long .li_stw, TOC[tc0], 0\n"
-     "        .csect .text[PR]\n"
-     ".li_stw:\n"
-     "        stw 31,-4(1)\n"
-     "        stwu 1,-48(1)\n"
-     "        mr 31,1\n"
-     "        stw 11,24(31)\n"
-     "        li 0,8765\n"
-     "        stw 0,28(31)\n"
-     "        lwz 1,0(1)\n"
-     "        lwz 31,-4(1)\n"
-     "        blr\n");
-
diff --git a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp b/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
deleted file mode 100644
index 76e3c27cf2e..00000000000
--- a/gdb/testsuite/gdb.arch/powerpc-aix-prologue.exp
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-#
-# This file is part of the gdb testsuite.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-# Test rs6000 prologue analyzer.
-
-set prms_id 0
-set bug_id 0
-
-if ![istarget "powerpc-*-aix*"] then {
-    verbose "Skipping powerpc-aix prologue tests."
-    return
-}
-
-set testfile "powerpc-aix-prologue"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {}] != "" } {
-    unsupported "Testcase compile failed."
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Insert a breakpoint in FUNCTION and verifies that the breakpoint was
-# inserted at the expected location.  EXPECTED_LOCATION should be an
-# offset relative to the function start address.
-proc insert_breakpoint {function expected_location} {
-    global gdb_prompt
-    global expect_out
-    global hex
-    
-    set address ""
-
-    # Insert a breakpoint using the given function name, and extract
-    # the breakpoint address for the output.
-    gdb_test_multiple "break $function" "set breakpoint in $function" {
-        -re "Breakpoint 1 at ($hex).*$gdb_prompt $" {
-            set address $expect_out(1,string)
-        }
-        default {
-            fail "set breakpoint in $function"
-        }
-    }
-
-    # If we managed to get the breakpoing address, then check that
-    # we inserted it at the expected location by examining the
-    # instruction at that address (we're not interested in the insn
-    # itself, but rather at the address printed at the begining of
-    # the instruction).
-    if { $address != "" } then {
-       gdb_test "x /i $address" \
-                ".*<$function\\+$expected_location>.*" \
-                "check $function breakpoint address"
-    } else {
-       fail "unable to compute breakpoint address"
-    }
-
-}
-
-insert_breakpoint "li_stw" 12
diff --git a/gdb/testsuite/gdb.asm/Makefile.in b/gdb/testsuite/gdb.asm/Makefile.in
deleted file mode 100644
index d1c71b434da..00000000000
--- a/gdb/testsuite/gdb.asm/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES =
-MISCELLANEOUS = arch.inc
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *~ *.o a.out *.x *.ci *.tmp
-	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
-	-rm -f $(MISCELLANEOUS)
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status config.log
-	-rm -f *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
diff --git a/gdb/testsuite/gdb.asm/alpha.inc b/gdb/testsuite/gdb.asm/alpha.inc
deleted file mode 100644
index 1569d794404..00000000000
--- a/gdb/testsuite/gdb.asm/alpha.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-	comment "subroutine declare"
-	.purgem gdbasm_declare
-	.macro gdbasm_declare name
-	.ent	\name
-\name:
-	.endm
-
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	.frame	$30, 16, $26, 0
-	.mask	0x04000000, -16
-	ldgp	$gp, 0($27)
-	subq	$sp, 16, $sp
-	stq	$26, 0($sp)
-	.prologue 1
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	ldq	$26, 0($sp)
-	addq	$sp, 16, $sp
-	ret
-	.endm
-
-	comment "subroutine end"
-	.purgem gdbasm_end
-	.macro gdbasm_end name
-	.end	\name
-	.endm
-
-	comment "subroutine call"
-	/* Can't use ldgp here because the finish-frame test expects the
-	   pc to wind up on the next line.  That's ok, we're all local.  */
-	.macro gdbasm_call subr
-	jsr	$26, \subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	lda	$16, 0($31)
-	lda	$0, 1($31)
-	callsys
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	.frame	$31, 0, $31, 0
-	.prologue
-	ldgp	$gp, 0($27)
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/arm.inc b/gdb/testsuite/gdb.asm/arm.inc
deleted file mode 100644
index 65502277bfd..00000000000
--- a/gdb/testsuite/gdb.asm/arm.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	mov ip, sp
-	stmdb sp!, {fp, ip, lr, pc}
-	sub fp, ip, #4
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	ldmea fp, {fp, sp, pc}
-	.endm
-
-	.macro gdbasm_call subr
-	bl \subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	mov r0, #0
-	swi 0x00123456
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	mov fp, #0
-	mov r7, #0
-	.endm
-
diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp
deleted file mode 100644
index 2477e247eaa..00000000000
--- a/gdb/testsuite/gdb.asm/asm-source.exp
+++ /dev/null
@@ -1,421 +0,0 @@
-# Copyright 1998, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, 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 Kendra.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# Test debugging assembly level programs.
-# This file uses asmsrc[12].s for input.
-#
-
-set prms_id 0
-set bug_id 0
-
-set asm-arch ""
-set asm-note "empty"
-set asm-flags ""
-set link-flags "--entry _start"
-set debug-flags ""
-
-switch -glob -- [istarget] {
-    "alpha*-*-*" {
-        set asm-arch alpha
-	# ??? Won't work with ecoff systems like Tru64, but then we also
-	# don't have any other -g flag that creates mdebug output.
-        set asm-flags "-no-mdebug -I${srcdir}/${subdir} -I${objdir}/${subdir}"
-	set debug-flags "-gdwarf-2"
-    }
-    "*arm-*-*" {
-        set asm-arch arm
-    }
-    "xscale-*-*" {
-        set asm-arch arm
-    }
-    "d10v-*-*" {
-        set asm-arch d10v
-    }
-    "frv-*-*" {
-	set asm-arch frv
-    }
-    "s390-*-*" {
-        set asm-arch s390
-    }
-    "s390x-*-*" {
-        set asm-arch s390x
-    }
-    "x86_64-*-*" {
-        set asm-arch x86_64
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
-	set debug-flags "-gdwarf-2"
-    }
-    "i\[3456\]86-*-*" {
-        set asm-arch i386
-    }
-    "m32r*-linux*" {
-        set asm-arch m32r-linux
-    }
-    "m32r*-*" {
-        set asm-arch m32r
-        append link-flags "--whole-archive -lgloss --no-whole-archive"
-    }
-    "m6811-*-*" {
-        set asm-arch m68hc11
-        set asm-flags "-mshort-double -m68hc11 -gdwarf-2 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
-    }
-    "m6812-*-*" {
-        set asm-arch m68hc11
-        set asm-flags "-mshort-double -m68hc12 -gdwarf-2 --no-warn -I${srcdir}/${subdir} -I${objdir}/${subdir}"
-    }
-    "mips*-*" {
-        set asm-arch mips
-    }
-    "powerpc*-*" {
-        set asm-arch powerpc
-    }
-    "sh*-*-*" {
-        set asm-arch sh
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
-	set debug-flags "-gdwarf-2"
-    }
-    "sparc-*-*" {
-        set asm-arch sparc
-    }
-    "sparc64-*-*" {
-        set asm-arch sparc64
-        set asm-flags "-xarch=v9 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
-	set debug-flags "-gdwarf-2"
-    }
-    "xstormy16-*-*" {
-        set asm-arch xstormy16
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
-	set debug-flags "-gdwarf-2"
-    }
-    "v850-*-*" {
-        set asm-arch v850
-        set gdb_wrapper_initialized 1
-    }
-    "m68k-*-*" {
-        set asm-arch m68k
-    }
-    "ia64-*-*" {
-        set asm-arch ia64
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
-	set debug-flags "-gdwarf-2"
-    }
-    "iq2000-*-*" {
-    	set asm-arch iq2000
-    }
-    "hppa*-linux-*" {
-        set asm-arch pa
-        set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
-	set debug-flags "-gdwarf-2"
-    }
-    "h83*-*" {
-	set asm-arch h8300
-	set asm-flags "-gdwarf2 -I${srcdir}/${subdir} -I${objdir}/${subdir}"
-    }
-}
-
-if { "${asm-arch}" == "" } {
-    gdb_suppress_entire_file "Assembly source test -- not implemented for this target."
-}
-
-# On NetBSD/ELF we need a special NetBSD-identifying note section.
-if { [istarget "*-*-netbsdelf*"]
-     || [istarget "mips*-*-netbsd*"]
-     || [istarget "x86_64-*-netbsd*"] } then {
-    set asm-note "netbsd"
-}
-
-# On OpenBSD/ELF we need a similar note section.  We make no attempt
-# of handing a.out here since most OpenBSD/a.out systems use a rather
-# outdated assembler that doesn't assemble this test's code anyway.
-if { [istarget "*-*-openbsd*"] } then {
-    set asm-note "openbsd"
-}
-
-# Watch out, we are invoking the assembler, but the testsuite sets multilib
-# switches according to compiler syntax.  If we pass these options straight
-# to the assembler, they won't always make sense.  If we don't pass them to
-# the assembler, the final link will complain that the object files were
-# built with different defaults.  So no matter what we do, we lose.  We may as
-# well get out of this test sooner rather than later.
-set dest [target_info name]
-if [board_info $dest exists multilib_flags] {
-	set multilib_flags [board_info $dest multilib_flags]
-	if { "${multilib_flags}" != "" } {
-	   gdb_suppress_entire_file "Assembly source test -- multilibs not supported by this test."
-	   return;
-	 }
-}
-
-set testfile "asm-source"
-set binfile ${objdir}/${subdir}/${testfile}
-set srcfile1 asmsrc1.s
-set srcfile2 asmsrc2.s
-
-remote_exec build "rm -f ${subdir}/arch.inc"
-remote_download host ${srcdir}/${subdir}/${asm-arch}.inc ${subdir}/arch.inc
-remote_exec build "rm -f ${subdir}/note.inc"
-remote_download host ${srcdir}/${subdir}/${asm-note}.inc ${subdir}/note.inc
-
-if { "${asm-flags}" == "" } {
-    set asm-flags "-I${srcdir}/${subdir} -I${objdir}/${subdir}"
-    set debug-flags "-gstabs"
-}
-
-# Allow the target board to override the debug flags.
-if { [board_info $dest exists debug_flags] } then {
-    set debug-flags "[board_info $dest debug_flags]"
-}
-
-# The debug flags are in the format that gcc expects:
-# "-gdwarf-2", "-gstabs+", or "-gstabs".  To be compatible with the
-# other languages in the test suite, we accept this input format.
-# So the user can run the test suite with:
-#
-#   runtest --target_board unix/gdb:debug_flags=-gdwarf-2
-#   make check RUNTESTFLAGS="--target_board unix/gdb:debug_flags=-gdwarf-2"
-#
-# However, the GNU assembler has different spellings than gcc.
-# So I adjust the debug flags here.
-
-# The GNU assembler spells "dwarf-2" as "dwarf2".
-regsub "--" "-gdwarf-2" "${debug-flags}" "-gdwarf2" debug-flags
-
-# The GNU assembler before 2.15 did not support "stabs+".
-regsub "--" "-gstabs\[+\]" "${debug-flags}" "-gstabs" debug-flags
-
-# The GNU assembler does not support level options like "-g2" or "-g3".
-regsub "--" "-g\[0-9\]" "${debug-flags}" "" debug-flags
-
-if {[target_assemble ${srcdir}/${subdir}/${srcfile1} asmsrc1.o "${asm-flags} ${debug-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-if {[target_assemble ${srcdir}/${subdir}/${srcfile2} asmsrc2.o "${asm-flags} ${debug-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# We deliberately don't use gdb_compile here to link together the
-# assembled object files.  Using gdb_compile, and therefore the C
-# compiler, is conceptually wrong, since we're testing raw assembler
-# code here that provides its own startup code.  Using target_link
-# also avoids a lot of problems on many systems, most notably on
-# *-*-*bsd* and *-*-solaris2*.
-if {[target_link "asmsrc1.o asmsrc2.o" "${binfile}" ${link-flags}] != "" } then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-remote_exec build "mv asmsrc1.o asmsrc2.o ${objdir}/${subdir}"
-
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-# Execute the `f' command and see if the result includes source info.
-gdb_test "f" "asmsrc1\[.\]s:29.*several_nops" "f at main"
-
-# See if we properly `next' over a macro with several insns.
-gdb_test "n" "33\[ 	\]*.*foo2" "next over macro"
-
-# See if we can properly `step' into a subroutine call.
-gdb_test "s" "8\[ 	\]*.*" "step into foo2"
-
-# Test 'info target', and incidentally capture the entry point address.
-set entry_point 0
-send_gdb "info target\n"
-gdb_expect {
-    -re "Symbols from .*asm-source.*Entry point: 0x(\[01232456789abcdefABCDEF\]+).*$gdb_prompt $" {
-	set entry_point $expect_out(1,string)
-	pass "info target"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "info target"
-    }
-    timeout {
-	fail "info target (timeout)"
-    }
-}
-
-# Capture the start symbol (may be '_start' or 'start')
-set entry_symbol ""
-send_gdb "info symbol 0x$entry_point\n"
-gdb_expect {
-    -re "info symbol 0x$entry_point\[\r\n\]+(\[^\r\n\]*) in section .*$gdb_prompt $" {
-        # We match the echoed `info symbol' command here, to help us
-        # reliably identify the beginning of the start symbol in the
-        # command's output.  You might think we could just use '^' to
-        # start matching at the beginning of the line, but
-        # unfortunately, in Expect, '^' matches the beginning of the
-        # input that hasn't been matched by any expect clause yet.  If
-        # every expect clause consumes a complete line, along with its
-        # terminating CR/LF, this is equivalent to the beginning of a
-        # line.  But expect clauses that end with `.*' will consume as
-        # much as happened to arrive from the TTY --- exactly where
-        # they leave you depends on inter-process timing.  :(
-	set entry_symbol $expect_out(1,string)
-	pass "info symbol"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "info symbol"
-    }
-    timeout {
-	fail "info symbol (timeout)"
-    }
-}
-
-# Now try a 'list' from the other source file.
-gdb_test "list $entry_symbol" ".*gdbasm_startup.*" "list"
-
-# Now try a source file search
-gdb_test "search A routine for foo2 to call" \
-	"40\[ \t\]+comment \"A routine for foo2 to call.\"" "search"
-
-# See if `f' prints the right source file.
-gdb_test "f" ".*asmsrc2\[.\]s:8.*" "f in foo2"
-
-# `next' one insn (or macro) to set up our stackframe (for the following bt).
-gdb_test "n" "12\[ 	\]*.*foo3" "n in foo2"
-
-# See if a simple `bt' prints the right source files and 
-# doesn't fall off the stack.
-
-gdb_test "bt 10" \
-	"\#0.*foo2.*asmsrc2\[.\]s:12.*\#1.*main.*asmsrc1\[.\]s:33" \
-	"bt ALL in foo2"
-
-# See if a capped `bt' prints the right source files.
-gdb_test "bt 2" "\#0.*foo2.*asmsrc2\[.\]s:12.*\#1.*main.*asmsrc1\[.\]s:33.*" "bt 2 in foo2"
-
-# Step into another subroutine which lives back in the first source file.
-gdb_test "s" "" "s 2"
-
-# Next over insns to set up the stack frame.
-gdb_test "n" "" "n 2"
-
-# Now see if a capped `bt' is correct.
-gdb_test "bt 3" "\#0.*foo3.*asmsrc1\[.\]s:45.*\#1.*foo2.*asmsrc2\[.\]s:12.*\#2.*main.*asmsrc1\[.\]s:33.*" "bt 3 in foo3"
-
-# Try 'info source' from asmsrc1.s
-gdb_test "info source" \
-	"Current source file is .*asmsrc1.s.*Source language is asm.*" \
-	"info source asmsrc1.s"
-
-# Try 'finishing' from foo3
-gdb_test "finish" "Run till exit from.*\[\r\n\]13\[ \t\]+gdbasm_call foo3" \
-	"finish from foo3"
-
-# Try 'info source' from asmsrc2.s
-gdb_test "info source" \
-	"Current source file is .*asmsrc2.s.*Source language is asm.*" \
-	"info source asmsrc2.s"
-
-# Try 'info sources'.  This can produce a lot of output on systems
-# with dynamic linking, where the system's shared libc was compiled
-# with debugging info; for example, on Linux, this produces 47kb of
-# output.  So we consume it as we go.
-send_gdb "info sources\n"
-set seen_asmsrc_1 0
-set seen_asmsrc_2 0
-gdb_expect {
-    -re "^\[^,\]*asmsrc1.s(, |\[\r\n\]+)" {
-        set seen_asmsrc_1 1
-        exp_continue
-    }
-    -re "^\[^,\]*asmsrc2.s(, |\[\r\n\]+)" {
-        set seen_asmsrc_2 1
-        exp_continue
-    }
-    -re ", " { 
-        exp_continue
-    }
-    -re "$gdb_prompt $" {
-        if {$seen_asmsrc_1 && $seen_asmsrc_2} {
-            pass "info sources"
-        } else {
-            fail "info sources"
-        }
-    }
-    timeout {
-            fail "info sources (timeout)"
-    }
-}
-        
-
-# Try 'info line'
-gdb_test "info line" \
-	"Line 13 of.*asmsrc2.s.*starts at.*<foo2+.*> and ends at.*<foo2+.*>." \
-	"info line"
-
-# Try 'nexting' over next call to foo3
-gdb_test "next" "17\[ \t\]+gdbasm_leave" "next over foo3"
-
-# Try 'return' from foo2
-gdb_test "return" "\#0  main .*37\[ \t\]+gdbasm_exit0" "return from foo2" \
-	"Make (foo2|selected stack frame) return now\?.*" "y"
-
-# Disassemble something, check the output
-proc test_dis { command var } {
-    global gdb_prompt
-    send_gdb "${command}\n"
-    gdb_expect {
-	-re "${var}.*:.*(Cannot access|Bad address)" {
-	    # The "disassembler" was only accessing the local
-	    # executable and that would cause attempts to disassemble
-	    # variables to fail (memory not valid).
-	    fail "${command} (memory read error)"
-	}
-	-re "${var}.*:.*${gdb_prompt}" {
-	    pass "${command}"
-	}
-	timeout {
-	    fail "${command} (timeout)"
-	}
-    }
-}
-
-# See if we can look at a global variable, three ways
-gdb_test "print globalvar" ".* = 11" "look at global variable"
-test_dis "x/i &globalvar" "globalvar"
-test_dis "disassem &globalvar &globalvar+1" "globalvar"
-
-# See if we can look at a static variable, three ways
-gdb_test "print staticvar" ".* = 5" "look at static variable"
-test_dis "x/i &staticvar" "staticvar"
-test_dis "disassem &staticvar &staticvar+1" "staticvar"
-
-# See if we can look at a static function
-gdb_test "disassem foostatic" ".*<foostatic\\+0>:.*End of assembler dump." \
-	"look at static function"
-
-remote_exec build "rm -f ${subdir}/arch.inc"
-remote_exec build "rm -f ${subdir}/note.inc"
diff --git a/gdb/testsuite/gdb.asm/asmsrc1.s b/gdb/testsuite/gdb.asm/asmsrc1.s
deleted file mode 100644
index 48bfb86d419..00000000000
--- a/gdb/testsuite/gdb.asm/asmsrc1.s
+++ /dev/null
@@ -1,69 +0,0 @@
-	.include "common.inc"
-	.include "arch.inc"
-
-comment "WARNING: asm-source.exp checks for line numbers printed by gdb."
-comment "Be careful about changing this file without also changing"
-comment "asm-source.exp."
-
-	
-comment	"This file is not linked with crt0."
-comment	"Provide very simplistic equivalent."
-	
-	.global _start
-gdbasm_declare _start
-	gdbasm_startup
-	gdbasm_call main
-	gdbasm_exit0
-	gdbasm_end _start
-
-comment "main routine for assembly source debugging test"
-comment "This particular testcase uses macros in <arch>.inc to achieve"
-comment "machine independence."
-
-	.global main
-gdbasm_declare main
-	gdbasm_enter
-
-comment "Call a macro that consists of several lines of assembler code."
-
-	gdbasm_several_nops
-
-comment "Call a subroutine in another file."
-
-	gdbasm_call foo2
-
-comment "All done."
-
-	gdbasm_exit0
-	gdbasm_end main
-
-comment "A routine for foo2 to call."
-
-	.global foo3
-gdbasm_declare foo3
-	gdbasm_enter
-	gdbasm_leave
-	gdbasm_end foo3
-
-	.global exit
-gdbasm_declare exit
-	gdbasm_exit0
-	gdbasm_end exit
-
-comment "A static function"
-
-gdbasm_declare foostatic
-	gdbasm_enter
-	gdbasm_leave
-	gdbasm_end foostatic
-
-comment "A global variable"
-
-	.global globalvar
-gdbasm_datavar	globalvar	11
-
-comment "A static variable"
-
-gdbasm_datavar	staticvar	5
-
-	.include "note.inc"
diff --git a/gdb/testsuite/gdb.asm/asmsrc2.s b/gdb/testsuite/gdb.asm/asmsrc2.s
deleted file mode 100644
index 4366536acbe..00000000000
--- a/gdb/testsuite/gdb.asm/asmsrc2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "common.inc"
-	.include "arch.inc"
-
-comment "Second file in assembly source debugging testcase."
-
-	.global foo2
-gdbasm_declare foo2
-	gdbasm_enter
-
-comment "Call someplace else (several times)."
-
-	gdbasm_call foo3
-	gdbasm_call foo3
-
-comment "All done, return."
-
-	gdbasm_leave
-	gdbasm_end foo2
diff --git a/gdb/testsuite/gdb.asm/common.inc b/gdb/testsuite/gdb.asm/common.inc
deleted file mode 100644
index 04f08ff9cce..00000000000
--- a/gdb/testsuite/gdb.asm/common.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-	.macro comment text
-	.endm
-
-	comment "Can't rely on assembler comment character so do this."
-
-	.macro include arch file
-	.include "\arch\file"
-	.endm
-
-	comment "Declare a data variable"
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.word \value
-	.endm
-
-	comment "Declare a subroutine"
-	.macro gdbasm_declare name
-\name:
-	.endm
-
-	comment "End a subroutine"
-	.macro gdbasm_end name
-	.endm
-
-comment "arch.inc is responsible for defining the following macros:"
-comment "enter - subroutine prologue"
-comment "leave - subroutine epilogue"
-comment "call - call a named subroutine"
-comment "several_nops - execute several (typically 4) nops"
-comment "exit0 - exit (0)"
-
-comment "arch.inc may also override the default definitions of:"
-comment "datavar - define a data variable"
-comment "declare - declare the start of a subroutine"
-comment "end - end a subroutine"
diff --git a/gdb/testsuite/gdb.asm/d10v.inc b/gdb/testsuite/gdb.asm/d10v.inc
deleted file mode 100644
index bd9463fc891..00000000000
--- a/gdb/testsuite/gdb.asm/d10v.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	st r11,@-sp
-	st r13,@-sp
-	mv r11,sp
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	add3 sp,r11,0
-	ld   r13,@sp+
-	ld   r11,@sp+
-	jmp  r13
-	.endm
-
-	.macro gdbasm_call subr
-	bl \subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	ldi r4, 1
-	ldi r0, 0
-	trap 15
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-; R14 always contains memory base address (0)
-
-	ldi     r14,0
-
-; Set the USER and SYSTEM stack pointers.
-
-	ldi     r0, 0           ; zero arguments
-	ldi     r1, 0
-	mvtc    r0, psw         ; select SPI and set it
-	ldi     sp, _stack
-	ldi     r10, 0x8000     ; select SPU/FP and set it
-	mvtc	r10, psw || ldi	r11, 0;  clear stack frame
-	ldi     sp, _stack - 0x200
-	ldi     r13, 0
-
-	st	r11, @-sp
-	st	r13, @-sp
-;	mv	r11, sp
-
-	.endm
diff --git a/gdb/testsuite/gdb.asm/empty.inc b/gdb/testsuite/gdb.asm/empty.inc
deleted file mode 100644
index e786488d9f2..00000000000
--- a/gdb/testsuite/gdb.asm/empty.inc
+++ /dev/null
@@ -1 +0,0 @@
-	comment "empty"
diff --git a/gdb/testsuite/gdb.asm/frv.inc b/gdb/testsuite/gdb.asm/frv.inc
deleted file mode 100644
index 0479ff5ba9f..00000000000
--- a/gdb/testsuite/gdb.asm/frv.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	addi sp,#-16,sp
-	sti fp, @(sp,0)
-	mov sp, fp
-	movsg lr, gr5
-	sti gr5, @(fp,8)
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	ldi @(fp,8), gr5
-	ld @(fp,gr0), fp
-	addi sp,#16,sp
-	jmpl @(gr5,gr0)
-	.endm
-
-	.macro gdbasm_call subr
-	call \subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	comment "Don't know how to exit, but this will certainly halt..."
-	ldi @(gr0,0), gr5
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	call	.Lcall
-.Lcall:	movsg	lr, gr4
-	sethi   #gprelhi(.Lcall), gr5
-	setlo	#gprello(.Lcall), gr5
-	sub	 gr4, gr5, gr16
-
-	sethi	 #gprelhi(_stack), sp
-	setlo    #gprello(_stack), sp
-	setlos   #0, fp
-	add	 sp, gr16, sp
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/h8300.inc b/gdb/testsuite/gdb.asm/h8300.inc
deleted file mode 100644
index 47d2135497f..00000000000
--- a/gdb/testsuite/gdb.asm/h8300.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	mov.w	r6,@-r7
-	mov.w	r7,r6
-	subs	#2,r7
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	adds	#2,r7
-	mov.w	@r7+,r6
-	rts
-	.endm
-
-	.macro gdbasm_call subr
-	jsr @\subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	mov.w #0xdead,r1
-	mov.w #0xbeef,r2
-	mov.w #0,r0
-	sleep
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	.section .stack
-_stack:	.long 1
-	.section .text
-	.global _start
-_start:
-	mov.w	#0,r6
-	mov.w	#_stack,sp	; or mov.l #_stack,sp
-	mov.w	#_edata,r0
-	mov.w	#_end,r1
-	sub.w   r2,r2
-.loop:	mov.w	r2,@r0
-	adds	#2,r0
-	cmp	r1,r0
-	blo	.loop
-	.endm
diff --git a/gdb/testsuite/gdb.asm/i386.inc b/gdb/testsuite/gdb.asm/i386.inc
deleted file mode 100644
index 0964f77fbd4..00000000000
--- a/gdb/testsuite/gdb.asm/i386.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	push	%ebp
-	mov	%esp,%ebp
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	pop	%ebp
-	ret
-	.endm
-
-	.macro gdbasm_call subr
-	call	\subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	hlt
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	xor	%ebp, %ebp
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/ia64.inc b/gdb/testsuite/gdb.asm/ia64.inc
deleted file mode 100644
index c42e398a40b..00000000000
--- a/gdb/testsuite/gdb.asm/ia64.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	alloc r33=ar.pfs,0,2,0,0
-	mov r32=b0
-	nop.i 0
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	nop.m 0
-	mov ar.pfs=r33
-	mov b0=r32
-	nop.m 0
-	nop.f 0
-	br.ret.sptk.many b0
-	.endm
-
-	.macro gdbasm_call subr
-	nop.m 0
-	nop.f 0
-	br.call.sptk.many b0=\subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop.m 0
-	nop.i 0
-	nop.i 0
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	break.m 0x0
-	nop.m 0
-	nop.i 0
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	gdbasm_enter
-	mov r32=r0
-	nop.i 0
-	nop.i 0
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/iq2000.inc b/gdb/testsuite/gdb.asm/iq2000.inc
deleted file mode 100644
index f421ea0080a..00000000000
--- a/gdb/testsuite/gdb.asm/iq2000.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	addiu %29, %29, 0xfffc
-	sw %31,0(%29)
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	lw %31,0(%29)
-	addiu %29, %29, 4
-	jr %31
-	nop
-	.endm
-
-	.macro gdbasm_call subr
-	jal \subr
-	nop
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	ori  %4, %0, 1	# SYS_exit
-	ori  %5, %0, 0	# normal exit code
-	ori  %6, %0, 0
-	ori  %7, %0, 0
-	syscall
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	andi %0, %0, 0
-	addiu %29, %0, 0xffc
-	.endm
-
diff --git a/gdb/testsuite/gdb.asm/m32r-linux.inc b/gdb/testsuite/gdb.asm/m32r-linux.inc
deleted file mode 100644
index 64d65041b5c..00000000000
--- a/gdb/testsuite/gdb.asm/m32r-linux.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	push fp -> push lr
-	addi sp,#-4 -> mv fp,sp
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	addi sp,#4 -> pop lr
-	pop fp -> jmp lr
-	.endm
-
-	.macro gdbasm_call subr
-	bl	\subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	ldi r0,#1 -> ldi r1,#0
-	ldi r2,#0 -> ldi r3,#0
-	trap #0 -> nop
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	ldi fp,#0
-	.endm
diff --git a/gdb/testsuite/gdb.asm/m32r.inc b/gdb/testsuite/gdb.asm/m32r.inc
deleted file mode 100644
index fa104cdeacc..00000000000
--- a/gdb/testsuite/gdb.asm/m32r.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	push fp -> push lr
-	addi sp,#-4 -> mv fp,sp
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	addi sp,#4 -> pop lr
-	pop fp -> jmp lr
-	.endm
-
-	.macro gdbasm_call subr
-	bl	\subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	ldi r0,#1 -> ldi r1,#0
-	ldi r2,#0 -> ldi r3,#0
-	trap #0 -> nop
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	seth sp, #shigh(_stack)
-	add3 sp, sp, #low(_stack)
-	ldi fp,#0
-	.endm
diff --git a/gdb/testsuite/gdb.asm/m68hc11.inc b/gdb/testsuite/gdb.asm/m68hc11.inc
deleted file mode 100644
index 820908b277a..00000000000
--- a/gdb/testsuite/gdb.asm/m68hc11.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-        ldx     _.frame
-	pshx
-	sts     _.frame
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-        pulx
-        stx     _.frame
-	rts
-	.endm
-
-	.macro gdbasm_call subr
-	jsr	\subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-        clra
-        clrb
-        wai
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-        .sect .data
-        .globl _.frame
-_.frame: .word 0
-        .previous
-        lds     #0x2000
-        clr     _.frame
-        clr     _.frame+1
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/m68k.inc b/gdb/testsuite/gdb.asm/m68k.inc
deleted file mode 100644
index f2ff959c981..00000000000
--- a/gdb/testsuite/gdb.asm/m68k.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	link	%a6,#0
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	unlk	%a6
-	rts
-	.endm
-
-	.macro gdbasm_call subr
-	jbsr	\subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	illegal
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	lea	0,%a6
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/mips.inc b/gdb/testsuite/gdb.asm/mips.inc
deleted file mode 100644
index cb0ba1fcdb7..00000000000
--- a/gdb/testsuite/gdb.asm/mips.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-	comment "subroutine declare"
-	.purgem gdbasm_declare
-	.macro gdbasm_declare name
-	.align	2
-	.ent	\name
-	.type	\name,@function
-\name:
-	.endm
-
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	.frame	$fp, 32, $31
-	.mask	0xd0000000,-4
-	.set	noreorder
-	.cpload	$25
-	.set	reorder
-	subu	$sp, $sp, 32
-	.cprestore 16
-	sw	$31, 28($sp)
-	sw	$fp, 24($sp)
-	sw	$28, 20($sp)
-	move	$fp, $sp
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	lw	$31, 28($sp)
-	lw	$fp, 24($sp)
-	.set	noreorder
-	.set	nomacro
-	j	$31
-	addu	$sp, $sp, 32
-	.set	macro
-	.set	reorder
-	.endm
-
-	comment "subroutine end"
-	.purgem gdbasm_end
-	.macro gdbasm_end name
-	.end	\name
-	.endm
-
-	.macro gdbasm_call subr
-	la	$25, \subr
-	jal	$31, $25
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	comment "Don't know how to exit, but this will certainly halt..."
-	lw 	$2, 0($0)
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	move	$fp, $sp
-	.endm
diff --git a/gdb/testsuite/gdb.asm/netbsd.inc b/gdb/testsuite/gdb.asm/netbsd.inc
deleted file mode 100644
index 9446966c334..00000000000
--- a/gdb/testsuite/gdb.asm/netbsd.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-	comment "netbsd .note"
-
-.section	".note.netbsd.ident", "a"
-	.p2align	2
-
-	.long	7
-	.long	4
-	.long	1
-	.ascii	"NetBSD\0\0"
-	.long	105010000
-
-	.p2align	2
diff --git a/gdb/testsuite/gdb.asm/openbsd.inc b/gdb/testsuite/gdb.asm/openbsd.inc
deleted file mode 100644
index 5f5f5187cc7..00000000000
--- a/gdb/testsuite/gdb.asm/openbsd.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-	comment "openbsd .note"
-
-.section	".note.openbsd.ident", "a"
-	.p2align	2
-
-	.long	8
-	.long	4
-	.long	1
-	.ascii	"OpenBSD\0\0"
-	.long	200311
-
-	.p2align	2
diff --git a/gdb/testsuite/gdb.asm/pa.inc b/gdb/testsuite/gdb.asm/pa.inc
deleted file mode 100644
index 1183b7e5c6b..00000000000
--- a/gdb/testsuite/gdb.asm/pa.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	stw %rp, -20(%sp)
-	copy %r3, %r1
-	copy %sp, %r3
-	stwm %r1, 64(%sp)
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	ldw -20(%r3), %rp
-	bv %r0(%rp)
-	ldwm -64(%sp), %r3
-	.endm
-
-	.macro gdbasm_call subr
-	bl	\subr , %rp
-	nop
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	comment "Don't know how to exit, but this will certainly halt..."
-	ldw	0(%r0), %r1
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	.align 4
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/powerpc.inc b/gdb/testsuite/gdb.asm/powerpc.inc
deleted file mode 100644
index a0797bf826b..00000000000
--- a/gdb/testsuite/gdb.asm/powerpc.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	stwu	1, -16(1)
-	stw	31, 8(1)
-	mr	31, 1
-	mflr	0
-	stw	0, 20(1)
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	lwz	0, 20(1)
-	mtlr	0
-	lwz	31, 8(1)
-	lwz	1, 0(1)
-	blr
-	.endm
-
-	.macro gdbasm_call subr
-	bl \subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	comment "Don't know how to exit, but this will certainly halt..."
-	li	0, 0
-	lwz 	0, 0(0)
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	.p2align 2
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long   \value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/s390.inc b/gdb/testsuite/gdb.asm/s390.inc
deleted file mode 100644
index 16f1a7cc4d0..00000000000
--- a/gdb/testsuite/gdb.asm/s390.inc
+++ /dev/null
@@ -1,76 +0,0 @@
-### entry point code
-        .macro gdbasm_startup
-
-        # Align the stack pointer to an 8-byte boundary.
-        lhi %r0,-8
-        nr %r15,%r0
-
-        # Reserve space for the standard stack frame:
-        # back chain, and space for the callee to save its registers.
-        ahi %r15,-104
-        
-        # Zero this frame's back chain pointer.
-        xc 0(4,%r15),0(%r15)
-        .endm
-
-
-### Call a function.
-        .macro gdbasm_call subr
-
-        # Put the address of the constant in %r1, load the constant
-        # (SUBR's address), and jump to it.
-        bras %r1, .Lafterconst\@
-        .long \subr
-.Lafterconst\@:
-        l %r1,0(%r1)
-        basr %r14,%r1
-        .endm
-
-
-### Exit with a zero status.
-        .macro gdbasm_exit0
-        lhi %r2, 0
-        svc 1
-        .endm
-
-### Standard subroutine prologue.
-        .macro gdbasm_enter
-
-        # Save all the callee-saves registers.  What the heck.
-        stm %r6,%r15,24(%r15)
-
-        # Allocate the stack frame, and write the back chain pointer.
-        # Keep the original SP in %r11.
-        lr %r1,%r15
-        ahi %r15,-96
-        st %r1,0(%r15)
-        .endm
-
-
-### Standard subroutine epilogue.
-        .macro gdbasm_leave
-
-        # Restore all our registers.  This also pops the frame, and
-	# restores our return address.
-        lm %r6,%r15,120(%r15)
-
-        # Jump to the return address.
-        br %r14
-
-        .endm
-
-### Several nops.
-        .macro gdbasm_several_nops
-        lr %r0, %r0
-        lr %r0, %r0
-        lr %r0, %r0
-        lr %r0, %r0
-        .endm
-
-### Declare an `int' variable.
-	.purgem gdbasm_datavar
-        .macro gdbasm_datavar name value
-        .data
-\name:
-        .long \value
-        .endm
diff --git a/gdb/testsuite/gdb.asm/s390x.inc b/gdb/testsuite/gdb.asm/s390x.inc
deleted file mode 100644
index 1fe3dec6fdf..00000000000
--- a/gdb/testsuite/gdb.asm/s390x.inc
+++ /dev/null
@@ -1,69 +0,0 @@
-### entry point code
-        .macro gdbasm_startup
-
-        # Align the stack pointer to an 8-byte boundary.
-        lghi %r0,-16
-        ngr %r15,%r0
-
-        # Reserve space for the standard stack frame:
-        # back chain, and space for the callee to save its registers.
-        aghi %r15,-168
-        
-        # Zero this frame's back chain pointer.
-        xc 0(8,%r15),0(%r15)
-        .endm
-
-
-### Call a function.
-        .macro gdbasm_call subr
-        brasl %r14, \subr
-        .endm
-
-
-### Exit with a zero status.
-        .macro gdbasm_exit0
-        lghi %r2, 0
-        svc 1
-        .endm
-
-### Standard subroutine prologue.
-        .macro gdbasm_enter
-
-        # Save all the callee-saves registers.  What the heck.
-        stmg %r6,%r15,48(%r15)
-
-        # Allocate the stack frame, and write the back chain pointer.
-        # Keep the original SP in %r11.
-        lgr %r11,%r15
-        aghi %r15,-168
-        stg %r11,0(%r15)
-        .endm
-
-
-### Standard subroutine epilogue.
-        .macro gdbasm_leave
-
-        # Restore all our registers.  This also pops the frame, and
-	# restores our return address.
-        lmg %r6,%r15,216(%r15)
-
-        # Jump to the return address.
-        br %r14
-
-        .endm
-
-### Several nops.
-        .macro gdbasm_several_nops
-        lr %r0, %r0
-        lr %r0, %r0
-        lr %r0, %r0
-        lr %r0, %r0
-        .endm
-
-### Declare an `int' variable.
-	.purgem gdbasm_datavar
-        .macro gdbasm_datavar name value
-        .data
-\name:
-        .long \value
-        .endm
diff --git a/gdb/testsuite/gdb.asm/sh.inc b/gdb/testsuite/gdb.asm/sh.inc
deleted file mode 100644
index 9ea1b676c04..00000000000
--- a/gdb/testsuite/gdb.asm/sh.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-# You'll find a bunch of nop opcodes in the below macros.  They are
-# there to keep the code correctly aligned.  Be careful to maintain
-# them when changing the code.
-
-	comment "subroutine declare"
-	.purgem gdbasm_declare
-	.macro gdbasm_declare name
-	.align	1
-	.global	\name
-\name:
-	.endm
-
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	mov.l   r14,@-r15
-	sts.l   pr,@-r15
-	mov     r15,r14
-	nop
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	mov     r14,r15
-	lds.l   @r15+,pr
-	mov.l   @r15+,r14
-	rts
-	nop
-	nop
-	.endm
-
-	comment "subroutine end"
-	.purgem gdbasm_end
-	.macro gdbasm_end name
-	.size   \name, .-_foo1
-	.align	1
-	.endm
-
-	comment "subroutine call"
-	.macro gdbasm_call subr
-	mov.l   .Lconst\@,r1
-	bra	.Lafterconst\@
-	nop
-	nop
-.Lconst\@:
-	.align	2
-	.long	\subr
-	.align	1
-.Lafterconst\@:
-	jsr	@r1
-	nop
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	sleep
-	nop
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	mov.l	.stackaddr,r15
-	bra	.afterstackaddr
-	nop
-	nop
-	.align 2
-.stackaddr:
-	.long	196608		! 0x30000
-	.align	1
-.afterstackaddr:
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-	.align 2
-	.type	\name, @object
-	.size	\name, 4
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/sparc.inc b/gdb/testsuite/gdb.asm/sparc.inc
deleted file mode 100644
index 916a9e0e794..00000000000
--- a/gdb/testsuite/gdb.asm/sparc.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	save	%sp, -112, %sp
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	ret
-	restore
-	.endm
-
-	.macro gdbasm_call subr
-	call	\subr
-	nop
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	comment "Don't know how to exit, but this will certainly halt..."
-	ld	[%g0], %i0
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	clr	%fp
-	.endm
-
diff --git a/gdb/testsuite/gdb.asm/sparc64.inc b/gdb/testsuite/gdb.asm/sparc64.inc
deleted file mode 100644
index fb2253e0c39..00000000000
--- a/gdb/testsuite/gdb.asm/sparc64.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	save	%sp, -192, %sp
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	return %i7 + 8
-	nop
-	.endm
-
-	.macro gdbasm_call subr
-	call	\subr
-	nop
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	comment "Don't know how to exit, but this will certainly halt..."
-	ldx	[%g0], %i0
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	clr	%fp
-	.endm
-
diff --git a/gdb/testsuite/gdb.asm/v850.inc b/gdb/testsuite/gdb.asm/v850.inc
deleted file mode 100644
index 87977919f0c..00000000000
--- a/gdb/testsuite/gdb.asm/v850.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	add -8,sp
-	st.w r31,4[sp]
-	st.w r29,0[sp]
-	mov sp,r29
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	mov r29,sp
-	ld.w 0[sp],r29
-	ld.w 4[sp],r31
-	add 8,sp
-	jmp [r31]
-	.endm
-
-	.macro gdbasm_call subr
-	jarl \subr,r31
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	halt
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	movea 255,r0,r20
-	mov r0, r21
-	ori 65535, r0, r21
-	movhi 32, r0, sp
-	.endm
-
diff --git a/gdb/testsuite/gdb.asm/x86_64.inc b/gdb/testsuite/gdb.asm/x86_64.inc
deleted file mode 100644
index b92d9725a42..00000000000
--- a/gdb/testsuite/gdb.asm/x86_64.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	push	%rbp
-	mov	%rsp,%rbp
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	pop	%rbp
-	ret
-	.endm
-
-	.macro gdbasm_call subr
-	call	\subr
-	.endm
-
-	.macro gdbasm_several_nops
-	nop
-	nop
-	nop
-	nop
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	hlt
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	xor	%rbp, %rbp
-	.endm
-
-	comment "Declare a data variable"
-	.purgem gdbasm_datavar
-	.macro gdbasm_datavar name value
-	.data
-\name:
-	.long	\value
-	.endm
diff --git a/gdb/testsuite/gdb.asm/xstormy16.inc b/gdb/testsuite/gdb.asm/xstormy16.inc
deleted file mode 100644
index 22827f3eb1c..00000000000
--- a/gdb/testsuite/gdb.asm/xstormy16.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-	comment "subroutine prologue"
-	.macro gdbasm_enter
-	push r13
-	mov r13,r15
-	.endm
-
-	comment "subroutine epilogue"
-	.macro gdbasm_leave
-	pop r13
-	ret
-	.endm
-
-	.macro gdbasm_call subr
-	callf \subr
-	.endm
-
-	.macro gdbasm_several_nops
-	add r0,#0
-	add r0,#0
-	add r0,#0
-	add r0,#0
-	.endm
-
-	comment "exit (0)"
-	.macro gdbasm_exit0
-	mov.w r2,#0
-	halt
-	.endm
-
-	comment "crt0 startup"
-	.macro gdbasm_startup
-	mov r15,#2
-	.endm
-
diff --git a/gdb/testsuite/gdb.base/Makefile.in b/gdb/testsuite/gdb.base/Makefile.in
deleted file mode 100644
index 9f382db8b5a..00000000000
--- a/gdb/testsuite/gdb.base/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = all-types annota1 bitfields break \
-	call-ar-st call-rt-st call-strs callfuncs callfwmall \
-	chng-syms commands compiler condbreak constvars coremaker \
-	dbx-test display ending-run execd-prog exprs \
-	foll-exec foll-fork foll-vfork funcargs int-type interrupt jump \
-	langs list long_long mips_pro miscexprs nodebug opaque overlays \
-	pointers pointers2 printcmds ptype \
-	recurse reread reread1 restore return run \
-	scope section_command setshow setvar shmain sigall signals \
-	solib solib_sl so-impl-ld so-indr-cl \
-	step-line step-test structs structs2 \
-	twice-tmp varargs vforked-prog watchpoint whatis
-
-MISCELLANEOUS = coremmap.data ../foobar.baz \
-	shr1.sl shr2.sl solib_sl.sl solib1.sl solib2.sl
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
-	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
-	-rm -f $(MISCELLANEOUS) twice-tmp.c
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status config.log
-	-rm -f *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
deleted file mode 100644
index fbc704470cb..00000000000
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ /dev/null
@@ -1,257 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999, 2000
-#   Free Software Foundation, 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 Rob Savoye. (rob@cygnus.com)
-
-# These tests don't work for targets can't take arguments...
-
-if [target_info exists noargs] then {
-    verbose "Skipping a2-run.exp because of noargs."
-    return
-}
-
-# Can't do this test without stdio support.
-if [gdb_skip_stdio_test "a2run.exp"] {
-    return
-}
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "run"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Run with no arguments.
-# On VxWorks this justs make sure the program was run.
-gdb_run_cmd
-
-if [istarget "*-*-vxworks*"] then {
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	 "Program exited normally" {
-	    unresolved "run \"$testfile\" with no args"
-	}
-	 -re "usage:  factorial <number>" {
-	    pass "run \"$testfile\" with no args"
-	}
-	timeout	{
-	    fail "(timeout) run \"$testfile\" with no args"
-	}
-    }
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect -re "$gdb_prompt $" {}
-} else {
-    gdb_expect {
-	-re ".*usage:  factorial <number>.*Program exited with code 01.*$gdb_prompt $" {
-	    pass "run \"$testfile\" with no args"
-	}
-	-re ".*usage:  factorial <number>.* EXIT code 1.*Program exited normally.*$gdb_prompt $" {
-	    pass "run \"$testfile\" with no args (exit wrapper)"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "run \"$testfile\" with no args"
-	    verbose "expect_out is $expect_out(buffer)" 2
-	}
-	timeout	{
-	    fail "(timeout) run \"$testfile\" no args"
-	}
-    }
-}
-# Now run with some arguments
-if [istarget "*-*-vxworks*"] then {
-    send_gdb "run vxmain \"5\"\n"
-    gdb_expect -re "run vxmain \"5\"\r\n" {}
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	 "Program exited normally" {
-	    unresolved "run \"$testfile\" with arg"
-	}
-	 "120" {
-	    pass "run \"$testfile\" with arg"
-	}
-	timeout {
-	    fail "(timeout) run \"$testfile\" with arg"
-	}
-    }
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect -re "$gdb_prompt $" {}
-} else {
-	setup_xfail "mips-idt-*" "arm-*-coff strongarm-*-coff"
-	gdb_run_cmd 5
-	gdb_expect {
-	    -re ".*120.*$gdb_prompt $"\
-				{ pass "run \"$testfile\" with arg" }
-	    -re ".*$gdb_prompt $"	{ fail "run \"$testfile\" with arg" }
-	    timeout		{ fail "(timeout) run \"$testfile\" with arg" }
-	}
-}
-
-# Run again with same arguments.
-setup_xfail "mips-idt-*"
-gdb_run_cmd
-
-if [istarget "*-*-vxworks*"] then {
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	 "Program exited normally" {
-	    unresolved "run \"$testfile\" again with same args"
-	}
-	 "120" { pass "run \"$testfile\" again with same args" }
-	timeout { fail "(timeout) run \"$testfile\" again with same args" }
-    }
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect -re "$gdb_prompt $" {}
-} else {
-    setup_xfail "arm-*-coff strongarm-*-coff"
-    gdb_expect {
-	    -re ".*120.*$gdb_prompt $"\
-				{ pass "run \"$testfile\" again with same args" }
-	    -re ".*$gdb_prompt $"	{ fail "run \"$testfile\" again with same args" }
-	    timeout		{ fail "(timeout) run \"$testfile\" again with same args" }
-	}
-}
-
-# Use "set args" command to specify no arguments as default and run again.
-if [istarget "*-*-vxworks*"] then {
-    send_gdb "set args main\n"
-} else {
-    send_gdb "set args\n"
-}
-gdb_expect -re "$gdb_prompt $"
-
-gdb_run_cmd
-
-if [istarget "*-*-vxworks*"] then {
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	 "Program exited normally" {
-	    unresolved "run after setting args to nil"
-	}
-	 "usage:  factorial <number>" {
-	    pass "run after setting args to nil"
-	}
-	timeout {
-	    fail "(timeout) run after setting args to nil"
-	}
-    }
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect -re "$gdb_prompt $" {}
-} else {
-    gdb_expect {
-	-re ".*usage:  factorial <number>.*$gdb_prompt $" {
-	    pass "run after setting args to nil"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "run after setting args to nil"
-	}
-	timeout {
-	    fail "(timeout) run after setting args to nil"
-	}
-    }
-}
-
-# Use "set args" command to specify an argument and run again.
-setup_xfail "mips-idt-*"
-if [istarget "*-*-vxworks*"] then {
-   send_gdb "set args vxmain \"6\"\n"
-} else {
-	send_gdb "set args 6\n"
-}
-gdb_expect -re "$gdb_prompt $"
-gdb_run_cmd
-
-if [istarget "*-*-vxworks*"] then {
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect {
-	 "Program exited normally" {
-	    unresolved "run \"$testfile\" again after setting args"
-	}
-	 "720" {
-	    pass "run \"$testfile\" again after setting args"
-	}
-	timeout {
-	    fail "(timeout) run \"$testfile\" again after setting args"
-	}
-    }
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
-    gdb_expect -re "$gdb_prompt $" {}
-} else {
-    setup_xfail "arm-*-coff strongarm-*-coff"
-    gdb_expect {
-	    -re ".*720.*$gdb_prompt $" {
-		pass "run \"$testfile\" again after setting args"
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "run \"$testfile\" again after setting args"
-	    }
-	    timeout {
-		fail "(timeout) run \"$testfile\" again after setting args"
-	    }
-	}
-}
-
-# GOAL: Test that shell is being used with "run".  For remote debugging
-# targets, there is no guarantee that a "shell" (whatever that is) is used.
-if ![is_remote target] then {
-    send_gdb "run `echo 8`\n"
-    gdb_expect {
-	-re "Starting program.*40320.*$gdb_prompt $" {
-	    pass "run \"$testfile\" with shell"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "run \"$testfile\" with shell"
-	}
-	timeout	{
-	    fail "(timeout) run \"$testfile\" with shell"
-	}
-    }
-}
-
-# Reset the default arguments for VxWorks
-if [istarget "*-*-vxworks*"] then {
-    send_gdb "set args main\n"
-    gdb_expect -re ".*$gdb_prompt $" {}
-}
diff --git a/gdb/testsuite/gdb.base/advance.c b/gdb/testsuite/gdb.base/advance.c
deleted file mode 100644
index 8066deec421..00000000000
--- a/gdb/testsuite/gdb.base/advance.c
+++ /dev/null
@@ -1,50 +0,0 @@
-
-static int x;
-
-int foo (int a)
-{
-  int b = a + 10;
-  return b;
-}
-
-int bar (int y)
-{
-  int z = y + 20;
-  return z;
-}
-
-void func()
-{
-  x = x + 5;
-  func2 ();
-}
-
-int func2 ()
-{
-  x = 6;
-}
-
-int func3 ()
-{
-  x = 4;
-}
-
-void marker1 ()
-{
-}
-
-int
-main ()
-{
-  int result;
-  int b, c;
-  c = 5;
-  b = 3;    /* advance this location */
-    
-  func (c); /* stop here after leaving current frame */
-  marker1 (); /* stop here after leaving current frame */
-  func3 (); /* break here */
-  result = bar (b + foo (c));
-  return 0; /* advance malformed */
-}
-
diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp
deleted file mode 100644
index e5061d8fbf6..00000000000
--- a/gdb/testsuite/gdb.base/advance.exp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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
-
-# advance.exp -- Expect script to test 'advance' in gdb
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile advance
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-remote_exec build "rm -f ${binfile}"
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    fail "Can't run to main"
-    return 0
-}
-
-# Verify that "advance <location>" works.  (This is really just syntactic
-# sugar for "tbreak <location>; continue".)
-#
-gdb_test "advance [gdb_get_line_number "advance this location"]" \
-	"main .* at .*:.*b = 3.*advance this location.*" \
-	"advance line number"
-
-# Verify that a malformed "advance" is gracefully caught.
-#
-gdb_test "advance [gdb_get_line_number "advance malformed"] then stop" \
-	"Junk at end of arguments." "malformed advance"
-
-# Verify that "advance <funcname>" works.
-#
-gdb_test "advance func" \
-	"func.*at.*x = x \\+ 5." \
-	"advance func"
-
-# Verify that "advance <funcname>" when funcname is NOT called by the current
-# frame, stops at the end of the current frame.
-#
-# gdb can legitimately stop on either the current line or the next line,
-# depending on whether the machine instruction for 'call' on the current
-# line has more instructions after it or not.
-#
-gdb_test "advance func3" \
-	"(in main|).*(func \\(c\\)|marker1 \\(\\)).*stop here after leaving current frame..."\
-	"advance function not called by current frame"
-
-# break at main again
-#
-gdb_test "break [gdb_get_line_number "break here"]" \
-	".*Breakpoint.* at .*" \
-	"set breakpoint at call to func3"
-gdb_test "continue" \
-	".*Breakpoint ${decimal}, main.*func3.*break here.*" \
-	"continue to call to func3 in main"
-
-# Verify that "advance <funcname>" when funcname is called as parameter to 
-# another function works.
-#
-gdb_test "advance foo" \
-	"foo \\(a=5\\).*int b = a \\+ 10;"\
-	"advance function called as param"
-
-# Verify that we get an error if we use 'advance' w/o argument
-#
-gdb_test "advance" \
-	"Argument required \\(a location\\)."\
-	"advance with no argument"
-
diff --git a/gdb/testsuite/gdb.base/all-bin.exp b/gdb/testsuite/gdb.base/all-bin.exp
deleted file mode 100644
index fe6b7558e4c..00000000000
--- a/gdb/testsuite/gdb.base/all-bin.exp
+++ /dev/null
@@ -1,471 +0,0 @@
-# Copyright 1998, 1999 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite
-#
-# tests for arithmetic, logical and relational operators
-# with mixed types
-# 
-
-
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "all-types"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_test "next" "return 0;" "continuing after dummy()"
-
-send_gdb "print v_int+v_char\n"
-gdb_expect {
-    -re ".*71.*$gdb_prompt $" {
-        pass "print value of v_int+v_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_char" }
-    timeout           { fail "(timeout) print value of v_int+v_char" }    
-  }
-
-send_gdb "print v_int+v_short\n"
-gdb_expect {
-    -re ".*9.*$gdb_prompt $" {
-        pass "print value of v_int+v_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_short" }
-    timeout           { fail "(timeout) print value of v_int+v_short" }    
-  }
-
-
-send_gdb "print v_int+v_signed_char\n"
-gdb_expect {
-    -re ".*72.*$gdb_prompt $" {
-        pass "print value of v_int+v_signed_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_signed_char" }
-    timeout           { fail "(timeout) print value of v_int+v_signed_char" }    
-  }
-
-
-send_gdb "print v_int+v_unsigned_char\n"
-gdb_expect {
-    -re ".*73.*$gdb_prompt $" {
-        pass "print value of v_int+v_unsigned_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_unsigned_char" }
-    timeout           { fail "(timeout) print value of v_int+v_unsigned_char" }    
-  }
-
-
-send_gdb "print v_int+v_signed_short\n"
-gdb_expect {
-    -re ".*10.*$gdb_prompt $" {
-        pass "print value of v_int+v_signed_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_signed_short" }
-    timeout           { fail "(timeout) print value of v_int+v_signed_short" }    
-  }
-
-
-send_gdb "print v_int+v_unsigned_short\n"
-gdb_expect {
-    -re ".*11.*$gdb_prompt $" {
-        pass "print value of v_int+v_unsigned_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_unsigned_short" }
-    timeout           { fail "(timeout) print value of v_int+v_unsigned_short" }    
-  }
-
-
-send_gdb "print v_int+v_signed_int\n"
-gdb_expect {
-    -re ".*13.*$gdb_prompt $" {
-        pass "print value of v_int+v_signed_int"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_signed_int" }
-    timeout           { fail "(timeout) print value of v_int+v_signed_int" }    
-  }
-
-
-send_gdb "print v_int+v_unsigned_int\n"
-gdb_expect {
-    -re ".*14.*$gdb_prompt $" {
-        pass "print value of v_int+v_unsigned_int"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_unsigned_int" }
-    timeout           { fail "(timeout) print value of v_int+v_unsigned_int" }    
-  }
-
-
-send_gdb "print v_int+v_long\n"
-gdb_expect {
-    -re ".*15.*$gdb_prompt $" {
-        pass "print value of v_int+v_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_long" }
-    timeout           { fail "(timeout) print value of v_int+v_long" }    
-  }
-
-
-send_gdb "print v_int+v_signed_long\n"
-gdb_expect {
-    -re ".*16.*$gdb_prompt $" {
-        pass "print value of v_int+v_signed_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_signed_long" }
-    timeout           { fail "(timeout) print value of v_int+v_signed_long" }    
-  }
-
-
-send_gdb "print v_int+v_unsigned_long\n"
-gdb_expect {
-    -re ".*17.*$gdb_prompt $" {
-        pass "print value of v_int+v_unsigned_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_unsigned_long" }
-    timeout           { fail "(timeout) print value of v_int+v_unsigned_long" }    
-  }
-
-
-send_gdb "print v_int+v_float\n"
-gdb_expect {
-    -re ".*106.34343.*$gdb_prompt $" {
-        pass "print value of v_int+v_float"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_float" }
-    timeout           { fail "(timeout) print value of v_int+v_float" }    
-  }
-
-
-send_gdb "print v_int+v_double\n"
-gdb_expect {
-    -re ".*206.565.*$gdb_prompt $" {
-        pass "print value of v_int+v_double"
-    }
-    -re ".*$gdb_prompt $" { fail "print value of v_int+v_double" }
-    timeout     { fail "(timeout) print value of v_int+v_double" }
-}
-
-
-#
-# test the relational operators with mixed types
-#
-
-send_gdb "print v_int <= v_char\n"
-gdb_expect {
-    -re ".*1.*$gdb_prompt $" {
-        pass "print value of v_int<=v_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_char" }
-    timeout           { fail "(timeout) print value of v_int<=v_char" }    
-  }
-
-send_gdb "print v_int <= v_short\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of v_int<=v_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_short" }
-    timeout           { fail "(timeout) print value of v_int<=v_short" }    
-  }
-
-
-send_gdb "print v_int <= v_signed_char\n"
-gdb_expect {
-    -re ".*1.*$gdb_prompt $" {
-        pass "print value of v_int<=v_signed_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_signed_char" }
-    timeout           { fail "(timeout) print value of v_int<=v_signed_char" }    
-  }
-
-
-send_gdb "print v_int <= v_unsigned_char\n"
-gdb_expect {
-    -re ".*1.*$gdb_prompt $" {
-        pass "print value of v_int<=v_unsigned_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_unsigned_char" }
-    timeout           { fail "(timeout) print value of v_int<=v_unsigned_char" }    
-  }
-
-
-send_gdb "print v_int <= v_signed_short\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of v_int<=v_signed_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_signed_short" }
-    timeout           { fail "(timeout) print value of v_int<=v_signed_short" }    
-  }
-
-
-send_gdb "print v_int <= v_unsigned_short\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of v_int<=v_unsigned_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_unsigned_short" }
-    timeout           { fail "(timeout) print value of v_int<=v_unsigned_short" }    
-  }
-
-
-send_gdb "print v_int <= v_signed_int\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int<=v_signed_int"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_signed_int" }
-    timeout           { fail "(timeout) print value of v_int<=v_signed_int" }    
-  }
-
-
-send_gdb "print v_int <= v_unsigned_int\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int<=v_unsigned_int"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_unsigned_int" }
-    timeout           { fail "(timeout) print value of v_int<=v_unsigned_int" }    
-  }
-
-
-send_gdb "print v_int <= v_long\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int<=v_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_long" }
-    timeout           { fail "(timeout) print value of v_int<=v_long" }    
-  }
-
-
-send_gdb "print v_int <= v_signed_long\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int<=v_signed_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_signed_long" }
-    timeout           { fail "(timeout) print value of v_int<=v_signed_long" }    
-  }
-
-
-send_gdb "print v_int <= v_unsigned_long\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int<=v_unsigned_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_unsigned_long" }
-    timeout           { fail "(timeout) print value of v_int<=v_unsigned_long" }    
-  }
-
-
-send_gdb "print v_int <= v_float\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int<=v_float"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_float" }
-    timeout           { fail "(timeout) print value of v_int<=v_float" }    
-  }
-
-
-send_gdb "print v_int <= v_double\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int<=v_double"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int<=v_double" }
-    timeout           { fail "(timeout) print value of v_int<=v_double" }    
-  }
-
-
-
-#
-# test the logical operators with mixed types
-#
-
-gdb_test "set variable v_char=0" "" "set v_char=0"
-gdb_test "set variable v_double=0.0" "" "set v_double=0"
-gdb_test "set variable v_unsigned_long=0" "" "set v_unsigned_long=0"
-
-send_gdb "print v_int && v_char\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of v_int&&v_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_char" }
-    timeout           { fail "(timeout) print value of v_int&&v_char" }    
-  }
-
-send_gdb "print v_int && v_short\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_short" }
-    timeout           { fail "(timeout) print value of v_int&&v_short" }    
-  }
-
-
-send_gdb "print v_int && v_signed_char\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_signed_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_signed_char" }
-    timeout           { fail "(timeout) print value of v_int&&v_signed_char" }    
-  }
-
-
-send_gdb "print v_int && v_unsigned_char\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_unsigned_char"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_unsigned_char" }
-    timeout           { fail "(timeout) print value of v_int&&v_unsigned_char" }    
-  }
-
-
-send_gdb "print v_int && v_signed_short\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_signed_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_signed_short" }
-    timeout           { fail "(timeout) print value of v_int&&v_signed_short" }    
-  }
-
-
-send_gdb "print v_int && v_unsigned_short\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_unsigned_short"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_unsigned_short" }
-    timeout           { fail "(timeout) print value of v_int&&v_unsigned_short" }    
-  }
-
-
-send_gdb "print v_int && v_signed_int\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_signed_int"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_signed_int" }
-    timeout           { fail "(timeout) print value of v_int&&v_signed_int" }    
-  }
-
-
-send_gdb "print v_int && v_unsigned_int\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_unsigned_int"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_unsigned_int" }
-    timeout           { fail "(timeout) print value of v_int&&v_unsigned_int" }    
-  }
-
-
-send_gdb "print v_int && v_long\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_long" }
-    timeout           { fail "(timeout) print value of v_int&&v_long" }    
-  }
-
-
-send_gdb "print v_int && v_signed_long\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_signed_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_signed_long" }
-    timeout           { fail "(timeout) print value of v_int&&v_signed_long" }    
-  }
-
-
-send_gdb "print v_int && v_unsigned_long\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of v_int&&v_unsigned_long"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_unsigned_long" }
-    timeout           { fail "(timeout) print value of v_int&&v_unsigned_long" }    
-  }
-
-
-send_gdb "print v_int && v_float\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of v_int&&v_float"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_float" }
-    timeout           { fail "(timeout) print value of v_int&&v_float" }    
-  }
-
-
-send_gdb "print v_int && v_double\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of v_int&&v_double"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of v_int&&v_double" }
-    timeout           { fail "(timeout) print value of v_int&&v_double" }    
-  }
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/all-types.c b/gdb/testsuite/gdb.base/all-types.c
deleted file mode 100644
index 2f3a31f739b..00000000000
--- a/gdb/testsuite/gdb.base/all-types.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *	the basic C types.
- */
-
-#if !defined (__STDC__) && !defined (_AIX)
-#define signed  /**/
-#endif
-
-char		v_char;
-signed char	v_signed_char;
-unsigned char	v_unsigned_char;
-
-short		v_short;
-signed short	v_signed_short;
-unsigned short	v_unsigned_short;
-
-int		v_int;
-signed int	v_signed_int;
-unsigned int	v_unsigned_int;
-
-long		v_long;
-signed long	v_signed_long;
-unsigned long	v_unsigned_long;
-
-float		v_float;
-double		v_double;
-
-int main ()
-{
-    extern void dummy();
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-    dummy();
-    return 0;
-    
-}
-
-void dummy()
-{
-  /* Some linkers (e.g. on AIX) remove unreferenced variables,
-     so make sure to reference them. */
-  v_char = 'A';
-  v_signed_char = 'B';
-  v_unsigned_char = 'C';
-
-  v_short = 3;
-  v_signed_short = 4;
-  v_unsigned_short = 5;    
-
-  v_int = 6;
-  v_signed_int = 7;
-  v_unsigned_int = 8;    
-
-  v_long = 9;
-  v_signed_long = 10;
-  v_unsigned_long = 11;    
-  
-  v_float = 100.343434;
-  v_double = 200.565656;
-}
diff --git a/gdb/testsuite/gdb.base/annota1.c b/gdb/testsuite/gdb.base/annota1.c
deleted file mode 100644
index 6a13ee9d53d..00000000000
--- a/gdb/testsuite/gdb.base/annota1.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <stdio.h>
-#include <signal.h>
-
-#ifdef __sh__
-#define signal(a,b)	/* Signals not supported on this target - make them go away */
-#endif
-
-
-#ifdef PROTOTYPES
-void
-handle_USR1 (int sig)
-{
-}
-#else
-void
-handle_USR1 (sig)
-     int sig;
-{
-}
-#endif
-
-int value;
-
-#ifdef PROTOTYPES
-int
-main (void)
-#else
-int
-main ()
-#endif
-{
-  int my_array[3] = { 1, 2, 3 };
-  
-  value = 7;
-  
-#ifdef SIGUSR1
-  signal (SIGUSR1, handle_USR1);
-#endif
-
-  printf ("value is %d\n", value);
-  printf ("my_array[2] is %d\n", my_array[2]);
-  
-  {
-    int i;
-    for (i = 0; i < 5; i++)
-      value++;
-  }
-
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
deleted file mode 100644
index 2fcd7b52975..00000000000
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-# Foundation, 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.  
-
-# This file was written by Elena Zannoni (ezannoni@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-
-# are we on a target board? If so, don't run these tests.
-# note: this is necessary because we cannot use runto_main (which would
-# work for remote targets too) because of the different prompt we get
-# when using annotation level 2.
-#
-if [is_remote target] then {
-    return 0
-}
-
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "annota1"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# the line at which break main will put the breakpoint
-#
-set main_line 32
-
-# The commands we test here produce many lines of output; disable "press 
-# <return> to continue" prompts.
-send_gdb "set height 0\n"
-gdb_expect -re "$gdb_prompt $"
-
-#
-# break at main
-#
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint main"
-
-
-#
-# NOTE: this prompt is OK only when the annotation level is > 1
-# NOTE: When this prompt is in use the gdb_test procedure cannot be used because
-# it assumes that the last char after the gdb_prompt is a white space. This is not
-# true with this annotated prompt. So we must use send_gdb and gdb_expect.
-#
-
-set old_gdb_prompt $gdb_prompt
-set gdb_prompt "\r\n\032\032pre-prompt\r\n$gdb_prompt \r\n\032\032prompt\r\n"
-
-#
-# Escape all the characters in the path that need it. For instance 
-# the directory name could contain '+'.
-#
-set escapedsrcfile [string_to_regexp ${srcdir}/${subdir}/${srcfile}]
-
-
-#
-# set the annotation level to 2
-#
-# of course, this will test:
-# annotate-pre-prompt
-# annotate-prompt
-# annotate-post-prompt (in the next block)
-#
-send_gdb "set annotate 2\n" 
-gdb_expect {
-    -re "set annotate 2\r\n$gdb_prompt$" { pass "annotation set at level 2" }
-    -re ".*$gdb_prompt$"       { fail "annotation set at level 2" }
-    timeout	            { fail "annotation set at level 2 (timeout)" }
-  }
-
-
-#
-# info break will test:
-# annotate-breakpoints-headers
-# annotate-field
-# annotate-breakpoints-table
-# annotate-record
-# annotate-breakpoints-table-end
-#
-send_gdb "info break\n" 
-gdb_expect {
-    -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType           \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress    +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1   \r\n\032\032field 1\r\nbreakpoint     \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny   \r\n\032\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at ${escapedsrcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \
-	{pass "breakpoint info"}
-    -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType           \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress    +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1   \r\n\032\032field 1\r\nbreakpoint     \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny   \r\n\032\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at .*${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \
-	{ setup_xfail "*-*-*" 1270
-          fail "breakpoint info"}
-   -re ".*$gdb_prompt$" { fail "breakpoint info" }
-   timeout { fail "breakpoint info (timeout)" }
-}
-
-
-#
-# run to a break point will test:
-# annotate-frames-invalid
-# annotate-breakpoints-invalid (a.k.a. breakpoints-changed)
-# annotate-starting
-# annotate-breakpoint
-# annotate-frame-begin
-# annotate-frame-function-name
-# annotate-frame-args
-# annotate-frame-source-begin
-# annotate-frame-source-file
-# annotate-frame-source-file-end
-# annotate-frame-source-line
-# annotate-frame-source-end
-# annotate-source
-# annotate-frame-end
-# annotate-stopped
-#
-#exp_internal 1
-send_gdb "run\n"
-gdb_expect {
-    -re "\r\n\032\032post-prompt\r\nStarting program: $binfile \(\r\n\r\n\032\032frames-invalid\)+\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" {
-	pass "run until main breakpoint" 
-    }
-    -re ".*$gdb_prompt$" { 
-	fail "run until main breakpoint" 
-    }
-    timeout { 
-	fail "run until main breakpoint (timeout)" 
-    }
-  }
-#exp_internal 0
-#exit 0
-
-#
-# Let's do a next, to get to a point where the array is initialized
-# We don't care about the annotated output for this operation, it is the same as
-# the one produced by run above
-#
-send_gdb "next\n" 
-gdb_expect {
-    -re ".*$gdb_prompt$" { pass "go after array init line" }
-    timeout { fail "go after array init line (timeout)" }
-}
-
-
-#
-# printing the array will test:
-# annotate-value-history-begin
-# annotate-value-history-value
-# annotate-array-section-begin
-# annotate-elt
-# FIXME: annotate-elt-rep and annotate-elt-rep-end not tested
-# annotate-array-section-end
-# annotate-value-history-end
-# FIXME: annotate-value-begin and annotate-value-end not tested (the gdb output
-#              command would cause them to be used)
-#
-send_gdb "print my_array\n"
-gdb_expect {
-  -re "\r\n\032\032post-prompt\r\n\r\n\032\032value-history-begin 1 -\r\n.*= \r\n\032\032value-history-value\r\n.\r\n\032\032array-section-begin 0 -\r\n1\r\n\032\032elt\r\n, 2\r\n\032\032elt\r\n, 3\r\n\032\032elt\r\n\r\n\032\032array-section-end\r\n.\r\n\r\n\032\032value-history-end\r\n$gdb_prompt$" \
-	{ pass "print array" }
-  -re ".*$gdb_prompt$"     { fail "print array" }
-  timeout	            { fail "print array (timeout)" }
-}
-
-
-#
-# this should generate an error message, so to test:
-# annotate-error-begin
-# FIXME: annotate-error not tested
-#
-
-#exp_internal 1
-send_gdb "print non_existent_value\n"
-gdb_expect {
-  -re "\r\n\032\032post-prompt\r\n\r\n\032\032error-begin\r\nNo symbol \"non_existent_value\" in current context.\r\n\r\n\032\032error\r\n$gdb_prompt$" \
-	{ pass "print non_existent_value" }
-  -re ".*$gdb_prompt$"     { fail "print non_existent_value" }
-  timeout	            { fail "print non_existent_value (timeout)" }
-}
-
-
-#
-# break at signal handler. So that, once we are in the sig handler, if we do a bt
-# we can test annotate-signal-handler-caller
-#
-send_gdb "break handle_USR1\n"
-gdb_expect {
-  -re  "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex: file.*$srcfile, line.*\r\n$gdb_prompt$" \
-	    { pass "breakpoint handle_USR1" }
-  -re ".*$gdb_prompt$"     { fail "break at handle_USR1" }
-  timeout	            { fail "break at handle_USR1 (timeout)" }
-}
-
-#
-# break at printf. When we are stopped at printf, we can test 
-#
-send_gdb "break printf\n"
-gdb_expect {
-  -re  "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" \
-	    { pass "breakpoint printf" }
-  -re  "\r\n\032\032post-prompt\r\nwarning: Breakpoint address adjusted from $hex to $hex.\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" \
-	    { pass "breakpoint printf"}
-  -re ".*$gdb_prompt$"     { fail "break printf" }
-  timeout	            { fail "break printf (timeout)" }
-}
-
-#
-# get to printf
-#
-send_gdb "continue\n"
-gdb_expect {
-  -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 3\r\n\r\nBreakpoint 3, \r\n\032\032frame-begin 0 $hex\r\n\r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*\032\032frame-function-name\r\nprintf\r\n\032\032frame-args\r\n.*\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-	  { pass "continue to printf" }
-  -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\nwarning: Breakpoint 3 address previously adjusted from $hex to $hex.\r\n\r\n\032\032breakpoint 3\r\n\r\nBreakpoint 3, \r\n\032\032frame-begin 0 $hex\r\n\r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*.*\032\032frame-function-name\r\n.printf\r\n\032\032frame-args\r\n.*\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-	  { pass "continue to printf" }
-
-  -re ".*$gdb_prompt$"     { fail "continue to printf" }
-  timeout	            { fail "continue to printf (timeout)" }
-}
-
-#
-# test:
-# annotate-frame-where
-# annotate-frame-address
-# annotate-frame-address-end
-#
-send_gdb "backtrace\n"
-gdb_expect {
-    -re "\r\n\032\032post-prompt\r\n\r\n\032\032frame-begin 0 $hex\r\n.0  \r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*\032\032frame-function-name\r\nprintf\r\n\032\032frame-args\r\n \\(.*frame-end\r\n\r\n\032\032frame-begin 1 $hex\r\n.1  \r\n\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n${escapedsrcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032frame-end\r\n(\r\n\032\032frame-begin .*\r\n\r\n\032\032frame-end\r\n)*$gdb_prompt$" \
-	  { pass "backtrace from shlibrary" }
-    -re "\r\n\032\032post-prompt\r\n\r\n\032\032frame-begin 0 $hex\r\n.0  \r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*\032\032frame-function-name\r\nprintf\r\n\032\032frame-args\r\n \\(.*frame-end\r\n\r\n\032\032frame-begin 1 $hex\r\n.1  \r\n\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*${srcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032frame-end\r\n(\r\n\032\032frame-begin .*\r\n\r\n\032\032frame-end\r\n)*$gdb_prompt$" \
-	  { setup_xfail "*-*-*" 1270
-            fail "backtrace from shlibrary" }
-  -re ".*$gdb_prompt$"     { fail "backtrace from shlibrary" }
-  timeout	            { fail "backtrace from shlibrary (timeout)" }
-}
-
-
-#
-# test printing a frame with some arguments: 
-# annotate-arg-begin
-# annotate-arg-name-end
-# annotate-arg-value
-# annotate-arg-end
-#
-
-if [target_info exists gdb,nosignals] {
-    unsupported "send SIGUSR1"
-    unsupported "backtrace @ signal handler"
-} else {
-    send_gdb "signal SIGUSR1\n"
-    gdb_expect {
-	-re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n${escapedsrcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-	    { pass "send SIGUSR1" }
-	-re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*${srcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-	    { setup_xfail "*-*-*" 1270
-	      fail "send SIGUSR1" }
-      -re ".*$gdb_prompt$"     { fail "send SIGUSR1" }
-      timeout	            { fail "send SIGUSR1 (timeout)" }
-    }
-
-    #
-    # test:
-    # annotate-signal-handler-caller
-    #
-    verbose "match_max local is: [match_max]"
-    verbose "match_max default is: [match_max -d]"
-    # This is necessary because a 2000 buffer is not enought to get everything
-    # up to the prompt ad the test gets a timeout.
-    match_max 3000
-    verbose "match_max now is: [match_max]"
-    send_gdb "backtrace\n"
-    gdb_expect {
-	-re "frame-begin 0 $hex\r\n#0.*frame-end.*frame-begin 1 $hex\r\n#1.*(\032\032signal-handler-caller\r\n.signal handler called.\r\n\r\n)+\032\032frame-end\r\n\r\n\032\032frame-begin 2 $hex\r\n#2.*(frame-begin 3 $hex\r\n#3.*)*frame-end.*$gdb_prompt$" {
-	    pass "backtrace @ signal handler"
-	}
-	-re ".*$gdb_prompt$"   { fail "backtrace @ signal handler" }
-	timeout                { fail "backtrace @ signal handler (timeout)" }
-    }
-}
-
-#
-# delete all the breakpoints
-#
-send_gdb "delete 1\n"
-gdb_expect {
-     -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" \
-          { pass "delete bp 1" }
-     -re ".*$gdb_prompt$"  { fail "delete bp 1" }
-     timeout { fail "delete bp 1 (timeout)" }
-}
-
-send_gdb "delete 2\n"
-gdb_expect {
-     -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" \
-	     { pass "delete bp 2" }
-     -re ".*$gdb_prompt$"  { fail "delete bp 2 " }
-     timeout { fail "delete bp 2 (timeout)" }
-}
-
-send_gdb "delete 3\n"
-gdb_expect {
-     -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" \
-	     { pass "delete bp 3" }
-     -re ".*$gdb_prompt$"  { fail "delete bp 3" }
-     timeout { fail "delete bp 3 (timeout)" }
-}
-
-#
-# break at main, after value is initialized. This is in preparation
-# to test the annotate output for the display command.
-#
-send_gdb "break main\n"
-gdb_expect {
-    -re "post-prompt.*\032\032breakpoints-invalid.*Breakpoint 4 at $hex: file ${escapedsrcfile}, line $main_line.*$gdb_prompt$" \
-	     { pass "break at 28" }
-    -re "post-prompt.*\032\032breakpoints-invalid.*Breakpoint 4 at $hex: file .*${srcfile}, line $main_line.*$gdb_prompt$" \
-	     { setup_xfail "*-*-*" 1270
-               fail "break at 28" }
-     -re ".*$gdb_prompt$"  { fail "break at 28" }
-     timeout { fail "break at 28 (timeout)" }
-}
-
-#
-# display the value; test:
-# annotate-display-begin
-# annotate-display-number-end
-# annotate-display-format
-# annotate-display-expression
-# annotate-display-expression-end
-# annotate-display-end
-# FIXME: annotate-display-value not tested
-#
-send_gdb "display value\n"
-gdb_expect {
-    -re "post-prompt\r\n\r\n\032\032display-begin\r\n1\r\n\032\032display-number-end\r\n: \r\n\032\032display-format\r\n\r\n\032\032display-expression\r\nvalue\r\n\032\032display-expression-end\r\n = \r\n\032\032display-expression\r\n7\r\n\r\n\032\032display-end\r\n$gdb_prompt$" \
-	     { pass "set up display" }
-     -re ".*$gdb_prompt$"  { fail "set up display" }
-     timeout { fail "set up display (timeout)" }
-}
-
-
-# should ask query. Test annotate-query.
-# we don't care about anything else here, only the query.
-
-send_gdb "run\n"
-gdb_expect {
-  -re "pre-query.*already.*\\(y or n\\).*query\r\n" {
-         send_gdb "y\n"
-         gdb_expect {
-	     -re ".*post-query.*$gdb_prompt$" \
-		     { pass "re-run" }
-	     -re ".*$gdb_prompt$"  { fail "re-run" }
-	     timeout { fail "re-run (timeout)" }
-	 }
-     }
-  -re ".*$gdb_prompt$"  { fail "re-run" }
-  timeout { fail "re-run (timeout)" }
-}
-
-#
-# Test that breakpoints-invalid is issued once and only once for
-# breakpoint ignore count changes, after annotation stopped.
-#
-send_gdb "break 46\n"
-gdb_expect {
-    -re "Breakpoint 5 at $hex: file .*$srcfile, line 46.*$gdb_prompt$" {
-	pass "break at 46"
-    }
-    -re ".*$gdb_prompt$" { fail "break at 46" }
-    timeout { fail "break at 46 (timeout)" }
-}
-
-send_gdb "ignore 5 4\n"
-gdb_expect {
-    -re "Will ignore next 4 crossings of breakpoint 5.*$gdb_prompt$" {
-	pass "ignore 5 4"
-    }
-    -re ".*$gdb_prompt$" { fail "ignore 5 4" }
-    timeout { fail "ignore 5 4 (timeout)" }
-}
-
-send_gdb "continue\n"
-gdb_expect {
-    -re ".*$srcfile:46:.*\032\032stopped\r\n\r\n\032\032breakpoints-invalid\r\n$gdb_prompt$" {
-	pass "annotate ignore count change"
-    }
-    -re ".*$gdb_prompt$" { fail "annotate ignore count change" }
-    timeout { fail "annotate ignore count change (timeout)" }
-}
-
-# check that ignore command is working, or the above can provide
-# misleading assurance ...
-
-send_gdb "next\n"
-gdb_expect {
-    -re "$gdb_prompt$" {}
-    timeout { fail "next to exit loop" }
-}
-
-send_gdb "next\n"
-gdb_expect {
-    -re ".*$srcfile:49:.*$gdb_prompt$" {
-	pass "breakpoint ignore count"
-    }
-    -re ".*$gdb_prompt$" { fail "breakpoint ignore count" }
-    timeout { fail "breakpoint ignore count (timeout)" }
-}
-
-#
-# Send a signal that is not handled; test:
-# annotate-signalled
-# annotate-signal-name
-# annotate-signal-name-end
-# annotate-signal-string
-# annotate-signal-string-end
-# FIXME: annotate-signal not tested (requires that the inferior be 
-#                        stopped by a "random" signal)
-#
-# SIGTRAP signals are dropped before they get to the inferior process
-# on hpux11.  In theory, this behaivor can be controlled by setting
-# TTEO_NORM_SIGTRAP in the inferior, but doing so did not cause
-# the signal to be properly delivered.
-#
-# It has been verified that other signals will be delivered.  However,
-# rather than twiddle the test, I choose to leave it as-is as it
-# exposes an interesting failure on hpux11.
-
-if [target_info exists gdb,nosignals] {
-    unsupported "signal sent"
-} else {
-    setup_xfail hppa*-*-hpux11*
-    send_gdb "signal SIGTRAP\n"
-    gdb_expect {
-      -re ".*\032\032post-prompt\r\nContinuing with signal SIGTRAP.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032signalled\r\n\r\nProgram terminated with signal \r\n\032\032signal-name\r\nSIGTRAP\r\n\032\032signal-name-end\r\n, \r\n\032\032signal-string\r\nTrace.breakpoint trap\r\n\032\032signal-string-end\r\n.\r\nThe program no longer exists.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-	      { pass "signal sent" }
-      -re ".*$gdb_prompt$" { fail "signal sent" }
-      timeout { fail "signal sent (timeout)" }
-    }
-}
-
-
-# Check for production of a core file and remove it!
-
-set exec_output [remote_exec build "ls core"]
-
-set test "cleanup core file"
-if [ regexp "core not found" $exec_output]  {
-    pass "$test (not dumped)"
-} else {
-    if [ regexp "No such file or directory" $exec_output] {
-	pass "$test (not dumped)"
-    } else {
-	remote_exec build "rm -f core"
-	pass "$test (removed)"
-    }
-}
-
-# restore the original prompt for the rest of the testsuite
-
-set gdb_prompt $old_gdb_prompt
diff --git a/gdb/testsuite/gdb.base/annota3.c b/gdb/testsuite/gdb.base/annota3.c
deleted file mode 100644
index 6a13ee9d53d..00000000000
--- a/gdb/testsuite/gdb.base/annota3.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <stdio.h>
-#include <signal.h>
-
-#ifdef __sh__
-#define signal(a,b)	/* Signals not supported on this target - make them go away */
-#endif
-
-
-#ifdef PROTOTYPES
-void
-handle_USR1 (int sig)
-{
-}
-#else
-void
-handle_USR1 (sig)
-     int sig;
-{
-}
-#endif
-
-int value;
-
-#ifdef PROTOTYPES
-int
-main (void)
-#else
-int
-main ()
-#endif
-{
-  int my_array[3] = { 1, 2, 3 };
-  
-  value = 7;
-  
-#ifdef SIGUSR1
-  signal (SIGUSR1, handle_USR1);
-#endif
-
-  printf ("value is %d\n", value);
-  printf ("my_array[2] is %d\n", my_array[2]);
-  
-  {
-    int i;
-    for (i = 0; i < 5; i++)
-      value++;
-  }
-
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
deleted file mode 100644
index ccc16e2bcaf..00000000000
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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.  
-
-# This file was written by Elena Zannoni (ezannoni@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-
-# are we on a target board? If so, don't run these tests.
-# note: this is necessary because we cannot use runto_main (which would
-# work for remote targets too) because of the different prompt we get
-# when using annotation level 2.
-#
-if [is_remote target] then {
-    return 0
-}
-
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "annota3"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# the line at which break main will put the breakpoint
-#
-set main_line 32
-
-# The commands we test here produce many lines of output; disable "press 
-# <return> to continue" prompts.
-send_gdb "set height 0\n"
-gdb_expect -re "$gdb_prompt $"
-
-#
-# break at main
-#
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint main"
-
-
-# NOTE: this prompt is OK only when the annotation level is > 1
-
-# NOTE: When this prompt is in use the gdb_test procedure cannot be
-# used because it assumes that the last char after the gdb_prompt is a
-# white space. This is not true with this annotated prompt. So we must
-# use send_gdb and gdb_expect or gdb_expect_list.
-
-set old_gdb_prompt $gdb_prompt
-set gdb_prompt "\r\n\032\032pre-prompt\r\n$gdb_prompt \r\n\032\032prompt\r\n"
-
-
-
-#
-# set the annotation level to 3
-#
-# of course, this will test:
-# annotate-pre-prompt
-# annotate-prompt
-# annotate-post-prompt (in the next block)
-#
-send_gdb "set annotate 3\n" 
-gdb_expect_list "annotation set at level 3" "\r\n$gdb_prompt$" {
-    "set annotate 3"
-}
-
-
-#
-# info break:
-#
-send_gdb "info break\n" 
-gdb_expect_list "breakpoint info" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "Num Type           Disp Enb Address    +What\r\n"
-    "1   breakpoint     keep y   0x\[0-9a-zA-Z\]+ +in main at .*annota3.c:32\r\n"
-}
-
-
-#
-# run to a break point will test:
-#
-#exp_internal 1
-send_gdb "run\n"
-gdb_expect_list "run until main breakpoint" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "Starting program: .*annota3 \r\n"
-    "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
-    "\r\n\032\032starting\r\n"
-    "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
-    "\r\n\032\032breakpoint 1\r\n"
-    "\r\n"
-    "Breakpoint 1, main \\(\\) at .*annota3.c:32\r\n"
-    "\r\n\032\032source.*annota3.c:32:.*:beg:0x\[0-9a-z\]+\r\n"
-    "\r\n\032\032stopped\r\n"
-}
-#exp_internal 0
-#exit 0
-
-#
-# Let's do a next, to get to a point where the array is initialized
-# We don't care about the annotated output for this operation, it is the same as
-# the one produced by run above
-#
-send_gdb "next\n" 
-gdb_expect_list "go after array init line" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032starting\r\n"
-    "\(\r\n\032\032frames-invalid\r\n\)+"
-    "\r\n\032\032source .*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
-    "\r\n\032\032stopped\r\n"
-}
-
-
-#
-# printing the array:
-#
-send_gdb "print my_array\n"
-gdb_expect_list "print array" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    ".*= .1, 2, 3.\r\n"
-}
-
-
-#
-# this should generate an error message, so to test:
-# annotate-error-begin
-# FIXME: annotate-error not tested
-#
-
-#exp_internal 1
-send_gdb "print non_existent_value\n"
-gdb_expect_list "print non_existent_value" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032error-begin\r\n"
-    "No symbol \"non_existent_value\" in current context.\r\n"
-    "\r\n\032\032error\r\n"
-}
-
-
-#
-# break at signal handler
-#
-send_gdb "break handle_USR1\n"
-gdb_expect_list "breakpoint handle_USR1" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032breakpoints-invalid\r\n"
-    "Breakpoint.*at 0x\[0-9a-z\]+: file.*annota3.c, line.*\r\n"
-}
-
-#
-# break at printf. When we are stopped at printf, we can test 
-#
-send_gdb "break printf\n"
-gdb_expect_list "breakpoint printf" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032breakpoints-invalid\r\n"
-    "Breakpoint.*at 0x\[0-9a-z\]+.*"
-}
-
-#
-# get to printf
-#
-send_gdb "continue\n"
-gdb_expect_list "continue to printf" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "Continuing.\r\n"
-    "\r\n\032\032starting\r\n"
-    "\r\n\032\032frames-invalid\r\n"
-    "\r\n\032\032breakpoint 3\r\n"
-    "\r\n"
-    "Breakpoint 3, \[^\r\n\]*\r\n"
-    "\r\n\032\032stopped\r\n"
-}
-
-send_gdb "backtrace\n"
-gdb_expect_list "backtrace from shlibrary" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "#0 .* printf \[^\r\n\]*\r\n"
-    "#1 .* main \[^\r\n\]*\r\n"
-}
-
-
-#
-# test printing a frame with some arguments: 
-#
-
-if [target_info exists gdb,nosignals] {
-    unsupported "send SIGUSR1"
-    unsupported "backtrace @ signal handler"
-} else {
-    send_gdb "signal SIGUSR1\n"
-    gdb_expect_list "send SIGUSR1" "$gdb_prompt$" {
-	"\r\n\032\032post-prompt\r\n"
-	"Continuing with signal SIGUSR1.\r\n"
-	"\r\n\032\032starting\r\n"
-	"\r\n\032\032frames-invalid\r\n"
-	"\r\n\032\032breakpoint 2\r\n"
-	"Breakpoint 2, handle_USR1 \\(sig=\[0-9\]+\\) at .*annota3.c:\[0-9\]+\r\n"
-	"\r\n\032\032source .*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
-	"\r\n\032\032stopped\r\n"
-    }
-
-    #
-    # test:
-    #
-    verbose "match_max local is: [match_max]"
-    verbose "match_max default is: [match_max -d]"
-    # This is necessary because a 2000 buffer is not enought to get everything
-    # up to the prompt ad the test gets a timeout.
-    match_max 3000
-    verbose "match_max now is: [match_max]"
-    send_gdb "backtrace\n"
-    gdb_expect_list "backtrace @ signal handler" "$gdb_prompt$" {
-	"#0 +handle_USR1 \[^\r\n\]+\r\n"
-	"#1 +.signal handler called.\r\n"
-	"#2 .* printf \[^\r\n\]+\r\n"
-	"#3 .* main \[^\r\n\]+\r\n"
-    }
-}
-
-#
-# delete all the breakpoints
-#
-send_gdb "delete 1\n"
-gdb_expect_list "delete bp 1" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-}
-
-send_gdb "delete 2\n"
-gdb_expect_list "delete bp 2" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-}
-
-send_gdb "delete 3\n"
-gdb_expect_list "delete bp 3" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-}
-
-#
-# break at main, after value is initialized. This is in preparation
-# to test the annotate output for the display command.
-#
-send_gdb "break main\n"
-gdb_expect_list "break at 28" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032breakpoints-invalid\r\n"
-    "Breakpoint 4 at 0x\[0-9a-z\]+: file .*annota3.c, line 32.\r\n"
-}
-
-#
-# display the value
-#
-send_gdb "display value\n"
-gdb_expect_list "set up display" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "1: value = 7\r\n"
-}
-
-
-# should ask query. Test annotate-query.
-# we don't care about anything else here, only the query.
-
-send_gdb "run\n"
-gdb_expect {
-  -re "pre-query.*already.*\\(y or n\\).*query\r\n" {
-         send_gdb "y\n"
-         gdb_expect {
-	     -re ".*post-query.*$gdb_prompt$" \
-		     { pass "re-run" }
-	     -re ".*$gdb_prompt$"  { fail "re-run" }
-	     timeout { fail "re-run (timeout)" }
-	 }
-     }
-  -re ".*$gdb_prompt$"  { fail "re-run" }
-  timeout { fail "re-run (timeout)" }
-}
-
-#
-# Test that breakpoints-invalid is issued once and only once for
-# breakpoint ignore count changes, after annotation stopped.
-#
-send_gdb "break 46\n"
-gdb_expect_list  "break at 46" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032breakpoints-invalid\r\n"
-    "Breakpoint 5 at 0x\[0-9a-z\]+: file .*annota3.c, line 46.\r\n"
-}
-
-send_gdb "ignore 5 4\n"
-gdb_expect_list "ignore 5 4" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "Will ignore next 4 crossings of breakpoint 5"
-    "\r\n\032\032breakpoints-invalid\r\n"
-    "\r\n"
-}
-
-send_gdb "continue\n"
-gdb_expect_list "annotate ignore count change" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\(\r\n\032\032frames-invalid\r\n\)+"
-    "\r\n\032\032breakpoint 5\r\n"
-    "Breakpoint 5, main \\(\\) at .*annota3.c:46\r\n"
-    "\r\n\032\032source .*annota3.c:46:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
-    "1: value = 11\r\n"
-    "\r\n\032\032stopped\r\n"
-    "\r\n\032\032breakpoints-invalid\r\n"
-}
-
-# check that ignore command is working, or the above can provide
-# misleading assurance ...
-
-send_gdb "next\n"
-gdb_expect_list "next to exit loop" "$gdb_prompt$"  {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032starting\r\n"
-    "\(\r\n\032\032frames-invalid\r\n\)+"
-    "\r\n\032\032source.*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
-    "1: value = 12\r\n"
-    "\r\n\032\032stopped\r\n"
-}
-
-send_gdb "next\n"
-gdb_expect_list "breakpoint ignore count" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032starting\r\n"
-    "\(\r\n\032\032frames-invalid\r\n\)+"
-    "\r\n\032\032source.*annota3.c:49:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
-    "1: value = 12\r\n"
-    "\r\n\032\032stopped\r\n"
-}
-
-#
-# Send a signal that is not handled
-#
-# SIGTRAP signals are dropped before they get to the inferior process
-# on hpux11.  In theory, this behaivor can be controlled by setting
-# TTEO_NORM_SIGTRAP in the inferior, but doing so did not cause
-# the signal to be properly delivered.
-#
-# It has been verified that other signals will be delivered.  However,
-# rather than twiddle the test, I choose to leave it as-is as it
-# exposes an interesting failure on hpux11.
-
-if [target_info exists gdb,nosignals] {
-    unsupported "signal sent"
-} else {
-    setup_xfail hppa*-*-hpux11*
-    send_gdb "signal SIGTRAP\n"
-    gdb_expect_list "signal sent" "$gdb_prompt$" {
-	"\r\n\032\032post-prompt\r\n"
-	"Continuing with signal SIGTRAP.\r\n"
-	"\r\n\032\032starting\r\n"
-	"\r\n\032\032frames-invalid\r\n"
-	"\r\n\032\032frames-invalid\r\n"
-	"\r\n\032\032signalled\r\n"
-	"\r\nProgram terminated with signal SIGTRAP, Trace.breakpoint trap.\r\n"
-	"The program no longer exists.\r\n"
-	"\r\n\032\032stopped\r\n"
-    }
-}
-
-
-# Check for production of a core file and remove it!
-
-set exec_output [remote_exec build "ls core"]
-
-set test "cleanup core file"
-if [ regexp "core not found" $exec_output]  {
-    pass "$test (not dumped)"
-} else {
-    if [ regexp "No such file or directory" $exec_output] {
-	pass "$test (not dumped)"
-    } else {
-	remote_exec build "rm -f core"
-	pass "$test (removed)"
-    }
-}
-
-# restore the original prompt for the rest of the testsuite
-
-set gdb_prompt $old_gdb_prompt
diff --git a/gdb/testsuite/gdb.base/args.c b/gdb/testsuite/gdb.base/args.c
deleted file mode 100644
index d564120a607..00000000000
--- a/gdb/testsuite/gdb.base/args.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <stdio.h>
-
-int
-main (int argc, char **argv)
-{
-  int i = 0;
-  printf ("%d\n", argc);
-  while (i < argc)
-    printf ("%s\n", argv[i++]);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp
deleted file mode 100644
index 4f50ef0cff6..00000000000
--- a/gdb/testsuite/gdb.base/args.exp
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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 is a test for the gdb invocation option --args.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-
-global GDBFLAGS
-
-# Skip test if target does not support argument passing.
-if [target_info exists noargs] {
-    return;
-}
-
-# No loading needs to be done when the target is `exec'.  Some targets
-# require that the program be loaded, however.
-proc args_load {} {
-    global binfile
-    if [target_info exists is_simulator] {
-	gdb_load ${binfile}
-    }
-}
-
-set testfile "args"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-#
-# Test that the --args are processed correctly.
-#
-set old_gdbflags $GDBFLAGS
-set GDBFLAGS "--args $binfile 1 3"
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-args_load
-gdb_test "run" \
-	"Starting program.*args(\\.exe)? 1 3.*3\r\n.*args\r\n1\r\n3.*Program exited normally." \
-	"correct args printed"
-
-#
-# Test that the --args are processed correctly even if one of them is empty.
-#
-set GDBFLAGS "--args $binfile 1 '' 3"
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-args_load
-gdb_test "run" \
-	"Starting program.*args(\\.exe)? 1 \\\\'\\\\' 3.*4\r\n.*args\r\n1\r\n''\r\n3.*Program exited normally." \
-	"correct args printed, one empty"
-
-#
-# try with 2 empty args
-#
-set GDBFLAGS "--args $binfile 1 '' '' 3"
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-args_load
-gdb_test "run" \
-	"Starting program.*args(\\.exe)? 1 \\\\'\\\\' \\\\'\\\\' 3.*5\r\n.*args\r\n1\r\n''\r\n''\r\n3.*Program exited normally." \
-	"correct args printed, two empty"
-
-set GDBFLAGS $old_gdbflags
-
diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp
deleted file mode 100644
index 6e7e6852530..00000000000
--- a/gdb/testsuite/gdb.base/arithmet.exp
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1998, 1999, 2001 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-# Rewritten to use gdb_test by Michael Chastain (chastain@redhat.com)
-
-# This file is part of the gdb testsuite
-#
-# tests for correctness of arithmetic operators, associativity and precedence
-# with integer type variables
-# 
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "int-type"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-#
-# test expressions with "int" types
-#
-
-gdb_test "set variable x=14" ""
-gdb_test "set variable y=2"  ""
-gdb_test "set variable z=2"  ""
-gdb_test "set variable w=3"  ""
-
-gdb_test "print x" "14"
-gdb_test "print y"  "2"
-gdb_test "print z"  "2"
-gdb_test "print w"  "3"
- 
-gdb_test "print x+y" "16"
-gdb_test "print x-y" "12"
-gdb_test "print x*y" "28"
-gdb_test "print x/y"  "7"
-gdb_test "print x%y"  "0"
-
-#  x  y  z  w
-# 14  2  2  3
-
-# Test associativity of +, -, *, % ,/
-
-gdb_test "print x+y+z" "18"
-gdb_test "print x-y-z" "10"
-gdb_test "print x*y*z" "56"
-gdb_test "print x/y/z"  "3"
-gdb_test "print x%y%z"  "0"
-
-# test precedence rules on pairs of arithmetic operators
-
-gdb_test "set variable x=10" ""
-gdb_test "set variable y=4"  ""
-
-#  x  y  z  w
-# 10  4  2  3
-
-gdb_test "print x+y-z" "12"
-gdb_test "print x+y*z" "18"
-gdb_test "print x+y%w" "11"
-gdb_test "print x+y/w" "11"
-gdb_test "print x-y*z"  "2"
-gdb_test "print x-y%z" "10"
-gdb_test "print x-y/z"  "8"
-gdb_test "print x*y/z" "20"
-gdb_test "print x*y%w"  "1"
-gdb_test "print x/y%w"  "2"
-
-# test use of parentheses to enforce different order of evaluation
-
-gdb_test "print x-(y+w)"  "3"
-gdb_test "print x/(y*w)"  "0"
-gdb_test "print x-(y/w)"  "9"
-gdb_test "print (x+y)*w" "42"
diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp
deleted file mode 100644
index 4bd15c38e05..00000000000
--- a/gdb/testsuite/gdb.base/assign.exp
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1998, 1999 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite
-#
-# tests for all the assignemnt operators
-# with mixed types and with int type variables
-# 
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "all-types"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_test "next" "return 0;" "continuing after dummy()"
-
-send_gdb "print v_int=57\n"
-gdb_expect {
-    -re ".*57.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*57.*$gdb_prompt $" {
-                pass "v_int=57"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int=57" }
-            timeout           { fail "(timeout) v_int=57" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int=57" }
-    timeout           { fail "(timeout) v_int=57" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-send_gdb "print v_int+=57\n"
-gdb_expect {
-    -re ".*63.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*63.*$gdb_prompt $" {
-                pass "v_int+=57"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=57" }
-            timeout           { fail "(timeout) v_int+=57" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=57" }
-    timeout           { fail "(timeout) v_int+=57" }    
-  }
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-send_gdb "print v_int-=57\n"
-gdb_expect {
-    -re ".*-51.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*-51.*$gdb_prompt $" {
-                pass "v_int-=57"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int-=57" }
-            timeout           { fail "(timeout) v_int-=57" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int-=57" }
-    timeout           { fail "(timeout) v_int-=57" }    
-  }
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-send_gdb "print v_int*=5\n"
-gdb_expect {
-    -re ".*30.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*30.*$gdb_prompt $" {
-                pass "v_int*=5"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int*=5" }
-            timeout           { fail "(timeout) v_int*=5" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int*=5" }
-    timeout           { fail "(timeout) v_int*=5" }    
-  }
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-send_gdb "print v_int/=4\n"
-gdb_expect {
-    -re ".*1.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*1.*$gdb_prompt $" {
-                pass "v_int/=4"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int/=4" }
-            timeout           { fail "(timeout) v_int/=4" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int/=4" }
-    timeout           { fail "(timeout) v_int/=4" }    
-  }
-
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-send_gdb "print v_int%=4\n"
-gdb_expect {
-    -re ".*2.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*2.*$gdb_prompt $" {
-                pass "v_int%=4"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int%=4" }
-            timeout           { fail "(timeout) v_int%=4" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int%=4" }
-    timeout           { fail "(timeout) v_int%=4" }    
-  }
-
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_char\n"
-gdb_expect {
-    -re ".*71.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*71.*$gdb_prompt $" {
-                pass "v_int+=char"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_char" }
-            timeout           { fail "(timeout) v_int+=v_char" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_char" }
-    timeout           { fail "(timeout) v_int+=v_char" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_signed_char\n"
-gdb_expect {
-    -re ".*72.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*72.*$gdb_prompt $" {
-                pass "v_int+=signed_char"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_signed_char" }
-            timeout           { fail "(timeout) v_int+=v_signed_char" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_char" }
-    timeout           { fail "(timeout) v_int+=v_signed_char" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_unsigned_char\n"
-gdb_expect {
-    -re ".*73.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*73.*$gdb_prompt $" {
-                pass "v_int+=unsigned_char"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_char" }
-            timeout           { fail "(timeout) v_int+=v_unsigned_char" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_char" }
-    timeout           { fail "(timeout) v_int+=v_unsigned_char" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_short\n"
-gdb_expect {
-    -re ".*9.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*9.*$gdb_prompt $" {
-                pass "v_int+=short"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_short" }
-            timeout           { fail "(timeout) v_int+=v_short" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_short" }
-    timeout           { fail "(timeout) v_int+=v_short" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_signed_short\n"
-gdb_expect {
-    -re ".*10.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*10.*$gdb_prompt $" {
-                pass "v_int+=signed_short"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_signed_short" }
-            timeout           { fail "(timeout) v_int+=v_signed_short" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_short" }
-    timeout           { fail "(timeout) v_int+=v_signed_short" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_unsigned_short\n"
-gdb_expect {
-    -re ".*11.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*11.*$gdb_prompt $" {
-                pass "v_int=+unsigned_short"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_short" }
-            timeout           { fail "(timeout) v_int+=v_unsigned_short" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_short" }
-    timeout           { fail "(timeout) v_int+=v_unsigned_short" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_signed_int\n"
-gdb_expect {
-    -re ".*13.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*13.*$gdb_prompt $" {
-                pass "v_int+=signed_int"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_signed_int" }
-            timeout           { fail "(timeout) v_int+=v_signed_int" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_int" }
-    timeout           { fail "(timeout) v_int+=v_signed_int" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_unsigned_int\n"
-gdb_expect {
-    -re ".*14.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*14.*$gdb_prompt $" {
-                pass "v_int+=unsigned_int"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_int" }
-            timeout           { fail "(timeout) v_int+=v_unsigned_int" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_int" }
-    timeout           { fail "(timeout) v_int+=v_unsigned_int" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_long\n"
-gdb_expect {
-    -re ".*15.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*15.*$gdb_prompt $" {
-                pass "v_int+=long"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_long" }
-            timeout           { fail "(timeout) v_int+=v_long" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_long" }
-    timeout           { fail "(timeout) v_int+=v_long" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-
-send_gdb "print v_int+=v_signed_long\n"
-gdb_expect {
-    -re ".*16.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*16.*$gdb_prompt $" {
-                pass "v_int+=signed_long"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_signed_long" }
-            timeout           { fail "(timeout) v_int+=v_signed_long" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_long" }
-    timeout           { fail "(timeout) v_int+=v_signed_long" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-send_gdb "print v_int+=v_unsigned_long\n"
-gdb_expect {
-    -re ".*17.*$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*17.*$gdb_prompt $" {
-                pass "v_int+=unsigned_long"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_long" }
-            timeout           { fail "(timeout) v_int+=v_unsigned_long" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_unsigned_long" }
-    timeout           { fail "(timeout) v_int+=v_unsigned_long" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-send_gdb "print v_int+=v_float\n"
-gdb_expect {
-    -re ".*106\r\n$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*106\r\n$gdb_prompt $" {
-                pass "v_int+=v_float"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_float" }
-            timeout           { fail "(timeout) v_int+=v_float" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_float" }
-    timeout           { fail "(timeout) v_int+=v_float" }    
-  }
-
-
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
-
-
-send_gdb "print v_int+=v_double\n"
-gdb_expect {
-    -re ".*206\r\n$gdb_prompt $" {
-        send_gdb "print v_int\n"
-        gdb_expect {
-            -re ".*206\r\n$gdb_prompt $" {
-                pass "v_int+=double"
-              }
-            -re ".*$gdb_prompt $" { fail "v_int+=v_double" }
-            timeout           { fail "(timeout) v_int+=v_double" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "v_int+=v_signed_long" }
-    timeout           { fail "(timeout) v_int+=v_double" }    
-  }
-
-
diff --git a/gdb/testsuite/gdb.base/async.c b/gdb/testsuite/gdb.base/async.c
deleted file mode 100644
index 0d9c8752b70..00000000000
--- a/gdb/testsuite/gdb.base/async.c
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-#ifdef PROTOTYPES
-int
-foo (void)
-#else
-int
-foo ()
-#endif
-{
- int x, y;
-
- x = 5;
- y = 3;
-
- return x + y;
-}
-
-#ifdef PROTOTYPES
-int
-main (void)
-#else
-int
-main ()
-#endif
-{
- int y, z;
- 
- y = 2;
- z = 9;
- y = foo ();
- z = y;
- y = y + 2;
- y = baz ();
- return 0;
-}
-
-
-#ifdef PROTOTYPES
-int
-baz (void)
-#else
-int
-baz ()
-#endif
-{ 
-  return 5;
-}
diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp
deleted file mode 100644
index d135cfdb19d..00000000000
--- a/gdb/testsuite/gdb.base/async.exp
+++ /dev/null
@@ -1,153 +0,0 @@
-#   Copyright 1999
-#   Free Software Foundation, 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
-
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "async"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-########################################
-##
-## Don't do any of these tests until we reach consensus on this file.
-##
-return 0
-########################################
-
-set board [target_info name]
-set current_target [target_info gdb_protocol]
-if { $current_target == "remote" } {
-  unset_board_info "gdb_protocol"
-  set_board_info "gdb_protocol" "async"
-  } else {
-      return 0
-  }
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# set it up at a breakpoint so we can play with it
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_test "break baz" "" ""
-
-#
-# Make sure we get a 'completed' message when the target is done.
-#
-gdb_test "set display-exec-done on" "" ""
-
-
-send_gdb "next&\n" 
-gdb_expect {
-    -re "^next&\r\n$gdb_prompt.*z = 9.*completed\.\r\n" { pass "next &" }
-    -re "$gdb_prompt.*completed\.$" { fail "next &" }
-    timeout  { fail "(timeout) next &" }
-}
-
-send_gdb "step&\n" 
-gdb_expect {
-    -re "^step&\r\n$gdb_prompt.*y = foo \\(\\).*completed\.\r\n" { pass "step &" }
-    -re "$gdb_prompt.*completed\.$" { fail "step &" }
-    timeout  { fail "(timeout) step &" }
-}
-
-send_gdb "step&\n" 
-gdb_expect {
-    -re "^step&\r\n$gdb_prompt foo \\(\\) at .*async.c.*x = 5.*completed\.\r\n" \
-	    { pass "step &" }
-    -re "$gdb_prompt.*completed\.$" { fail "step &" }
-    timeout  { fail "(timeout) step &" }
-}
-
-send_gdb "stepi&\n" 
-gdb_expect {
-    -re "^stepi&\r\n$gdb_prompt.*$hex.*x = 5.*completed\.\r\n" { pass "stepi &" }
-    -re "$gdb_prompt.*completed\.$" { fail "stepi &" }
-    timeout  { fail "(timeout) stepi &" }
-}
-
-send_gdb "nexti&\n" 
-gdb_expect {
-    -re "^nexti&\r\n$gdb_prompt.*y = 3.*completed\.\r\n" { pass "nexti &" }
-    -re "$gdb_prompt.*completed\.$" { fail "nexti &" }
-    timeout  { fail "(timeout) nexti &" }
-}
-
-send_gdb "finish&\n" 
-gdb_expect {
-    -re "^finish&\r\nRun till exit from #0  foo \\(\\) at.*async.c.*\r\n$gdb_prompt.*$hex in main \\(\\) at.*async.c.*y = foo \\(\\).*Value returned is.*= 8.*completed\.\r\n" \
-	    { pass "finish &" }
-    -re "$gdb_prompt.*completed\.$" { fail "finish &" }
-    timeout  { fail "(timeout) finish &" }
-}
-
-send_gdb "jump 33&\n" 
-gdb_expect {
-    -re "^jump 33&.*Continuing at $hex.*$gdb_prompt.*Breakpoint 2, baz \\(\\) at.*async.c.*return 5.*completed\.\r\n" \
-	    { pass "jump &" }
-    -re ".*$gdb_prompt.*completed\.$" { fail "jump &" }
-    timeout  { fail "(timeout) jump &" }
-}
-
-send_gdb "until 35&\n" 
-gdb_expect {
-    -re "^until 35&.*$gdb_prompt.*$hex in main \\(\\) at.*async.c.*y = baz \\(\\).*completed\.\r\n" \
-	    { pass "until &" }
-    -re "$gdb_prompt.*completed\.$" { fail "until &" }
-    timeout  { fail "(timeout) until &" }
-}
-
-gdb_test "set display-exec-done off" "" ""
-
-unset_board_info "gdb_protocol"
-set_board_info "gdb_protocol" "remote"
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/attach.c b/gdb/testsuite/gdb.base/attach.c
deleted file mode 100644
index 0041b4732d2..00000000000
--- a/gdb/testsuite/gdb.base/attach.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This program is intended to be started outside of gdb, and then
-   attached to by gdb.  Thus, it simply spins in a loop.  The loop
-   is exited when & if the variable 'should_exit' is non-zero.  (It
-   is initialized to zero in this program, so the loop will never
-   exit unless/until gdb sets the variable to non-zero.)
-   */
-#include <stdio.h>
-
-int  should_exit = 0;
-
-int main ()
-{
-  int  local_i = 0;
-
-  while (! should_exit)
-    {
-      local_i++;
-    }
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
deleted file mode 100644
index b4aaf9bb1ba..00000000000
--- a/gdb/testsuite/gdb.base/attach.exp
+++ /dev/null
@@ -1,393 +0,0 @@
-# Copyright 1997, 1999, 2002, 2003, 2004 Free Software Foundation, 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.  */
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# On HP-UX 11.0, this test is causing a process running the program
-# "attach" to be left around spinning.  Until we figure out why, I am
-# commenting out the test to avoid polluting tiamat (our 11.0 nightly
-# test machine) with these processes. RT
-#
-# Setting the magic bit in the target app should work.  I added a
-# "kill", and also a test for the R3 register warning.  JB
-if { [istarget "hppa*-*-hpux*"] } {
-    return 0
-}
-
-# are we on a target board
-if [is_remote target] then {
-    return 0
-}
-
-set testfile "attach"
-set srcfile  ${testfile}.c
-set srcfile2 ${testfile}2.c
-set binfile  ${objdir}/${subdir}/${testfile}
-set binfile2 ${objdir}/${subdir}/${testfile}2
-set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
-
-#execute_anywhere "rm -f ${binfile} ${binfile2}"
-remote_exec build "rm -f ${binfile} ${binfile2}"
-# For debugging this test
-#
-#log_user 1
-
-# build the first test case
-#
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Build the in-system-call test
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-proc do_attach_tests {} {
-    global gdb_prompt
-    global binfile
-    global escapedbinfile
-    global srcfile
-    global testfile
-    global objdir
-    global subdir
-    global timeout
-    
-    # Start the program running and then wait for a bit, to be sure
-    # that it can be attached to.
-
-    set testpid [eval exec $binfile &]
-    exec sleep 2
-    if { [istarget "*-*-cygwin*"] } {
-	# testpid is the Cygwin PID, GDB uses the Windows PID, which might be
-	# different due to the way fork/exec works.
-	set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ]
-    }
-
-    # Verify that we cannot attach to nonsense.
-
-    set test "attach to nonsense is prohibited"
-    gdb_test_multiple "attach abc" "$test" {
-	-re "Illegal process-id: abc.*$gdb_prompt $" {
-	    pass "$test"
-	}
-	-re "Attaching to.*, process .*couldn't open /proc file.*$gdb_prompt $" {
-	    # Response expected from /proc-based systems.
-	    pass "$test" 
-	}
-	-re "Can't attach to process..*$gdb_prompt $" {
-	    # Response expected on Cygwin
-	    pass "$test"
-	}
-	-re "Attaching to.*$gdb_prompt $" {
-	    fail "$test (bogus pid allowed)"
-	}
-    }
-
-    # Verify that we cannot attach to what appears to be a valid
-    # process ID, but is a process that doesn't exist.  Traditionally,
-    # most systems didn't have a process with ID 0, so we take that as
-    # the default.  However, there are a few exceptions.
-
-    set boguspid 0
-    if { [istarget "*-*-*bsd*"] } {
-	# In FreeBSD 5.0, PID 0 is used for "swapper".  Use -1 instead
-	# (which should have the desired effect on any version of
-	# FreeBSD, and probably other *BSD's too).
-	set boguspid -1
-    }
-    set test "attach to nonexistent process is prohibited"
-    gdb_test_multiple "attach $boguspid" "$test" {
-	-re "Attaching to.*, process $boguspid.*No such process.*$gdb_prompt $" {
-	    # Response expected on ptrace-based systems (i.e. HP-UX 10.20).
-	    pass "$test"
-	}
-	-re "Attaching to.*, process $boguspid failed.*Hint.*$gdb_prompt $" {
-	    # Response expected on ttrace-based systems (i.e. HP-UX 11.0).
-	    pass "$test"
-	}
-	-re "Attaching to.*, process $boguspid.*denied.*$gdb_prompt $" {
-	    pass "$test"
-	}
-	-re "Attaching to.*, process $boguspid.*not permitted.*$gdb_prompt $" {
-	    pass "$test"
-	}
-	-re "Attaching to.*, process .*couldn't open /proc file.*$gdb_prompt $" {
-	    # Response expected from /proc-based systems.
-	    pass "$test"
-	}
-	-re "Can't attach to process..*$gdb_prompt $" {
-	    # Response expected on Cygwin
-	    pass "$test"
-	}
-    }
-    
-    # Verify that we can attach to the process by first giving its
-    # executable name via the file command, and using attach with the
-    # process ID.
-
-    # (Actually, the test system appears to do this automatically for
-    # us.  So, we must also be prepared to be asked if we want to
-    # discard an existing set of symbols.)
-    
-    set test "set file, before attach1"
-    gdb_test_multiple "file $binfile" "$test" {
-	-re "Load new symbol table from.*y or n. $" {
-	    gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \
-		"$test (re-read)"
-	}
-	-re "Reading symbols from $escapedbinfile\.\.\.*done.*$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-
-    set test "attach1, after setting file"
-    gdb_test_multiple "attach $testpid" "$test" {
-	-re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*main.*at .*$srcfile:.*$gdb_prompt $" {
-	    pass "$test"
-	}
-	-re "Attaching to program.*`?$escapedbinfile\.exe'?, process $testpid.*\[Switching to thread $testpid\..*\].*$gdb_prompt $" {
-	    # Response expected on Cygwin
-	    pass "$test"
-	}
-    }
-
-    # Verify that we can "see" the variable "should_exit" in the
-    # program, and that it is zero.
-   
-    gdb_test "print should_exit" " = 0" "after attach1, print should_exit"
-
-    # Detach the process.
-   
-    gdb_test "detach" \
-	"Detaching from program: .*$escapedbinfile, process $testpid" \
-	"attach1 detach"
-
-    # Wait a bit for gdb to finish detaching
-    
-    exec sleep 5
-
-    # Purge the symbols from gdb's brain.  (We want to be certain the
-    # next attach, which won't be preceded by a "file" command, is
-    # really getting the executable file without our help.)
-    
-    set old_timeout $timeout
-    set timeout 15 
-    set test "attach1, purging symbols after detach"
-    gdb_test_multiple "file" "$test" {
-	-re "No executable file now.*Discard symbol table.*y or n. $" {
-	    gdb_test "y" "No symbol file now." "$test"
-	}
-    }
-    set timeout $old_timeout
-
-    # Verify that we can attach to the process just by giving the
-    # process ID.
-   
-    set test "set file, before attach2"
-    gdb_test_multiple "attach $testpid" "$test" {
-	-re "Attaching to process $testpid.*Load new symbol table from \"$escapedbinfile\.exe\".*y or n. $" {
-	    # On Cygwin, the DLL's symbol tables are loaded prior to the
-	    # executable's symbol table.  This in turn always results in
-	    # asking the user for actually loading the symbol table of the
-	    # executable.
-	    gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \
-		"$test (reset file)"
-	}
-	-re "Attaching to process $testpid.*Reading symbols from $escapedbinfile.*main.*at .*$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-
-    # Verify that we can modify the variable "should_exit" in the
-    # program.
-
-    gdb_test "set should_exit=1" "" "after attach2, set should_exit"
-
-    # Verify that the modification really happened.
-
-    send_gdb "tbreak 19\n"
-    gdb_expect {
-	-re "Breakpoint .*at.*$srcfile, line 19.*$gdb_prompt $" {
-	    pass "after attach2, set tbreak postloop"
-	}
-	-re "$gdb_prompt $" {
-	    fail "after attach2, set tbreak postloop"
-	}
-	timeout {
-	    fail "(timeout) after attach2, set tbreak postloop"
-	}
-    }
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "main.*at.*$srcfile:19.*$gdb_prompt $" {
-	    pass "after attach2, reach tbreak postloop"
-	}
-	-re "$gdb_prompt $" {
-	    fail "after attach2, reach tbreak postloop"
-	}
-	timeout {
-	    fail "(timeout) after attach2, reach tbreak postloop"
-	}
-    }
-
-    # Allow the test process to exit, to cleanup after ourselves.
-
-    gdb_test "continue" "Program exited normally." "after attach2, exit"
-
-    # Make sure we don't leave a process around to confuse
-    # the next test run (and prevent the compile by keeping
-    # the text file busy), in case the "set should_exit" didn't
-    # work.
-   
-    remote_exec build "kill -9 ${testpid}"
-
-    # Start the program running and then wait for a bit, to be sure
-    # that it can be attached to.
-   
-    set testpid [eval exec $binfile &]
-    exec sleep 2
-    if { [istarget "*-*-cygwin*"] } {
-	# testpid is the Cygwin PID, GDB uses the Windows PID, which might be
-	# different due to the way fork/exec works.
-	set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ]
-    }
-
-    # Verify that we can attach to the process, and find its a.out
-    # when we're cd'd to some directory that doesn't contain the
-    # a.out.  (We use the source path set by the "dir" command.)
-    
-    gdb_test "dir ${objdir}/${subdir}" "Source directories searched: .*" \
-	"set source path"
-
-    gdb_test "cd /tmp" "Working directory /tmp." \
-	"cd away from process working directory"
-
-    # Explicitly flush out any knowledge of the previous attachment.
-
-    set test "before attach3, flush symbols"
-    gdb_test_multiple "symbol" "$test" {
-	-re "Discard symbol table from.*y or n. $" {
-	    gdb_test "y" "No symbol file now." \
-		"$test"
-	}
-	-re "No symbol file now.*$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-
-    gdb_test "exec" "No executable file now." \
-	"before attach3, flush exec"
-
-    gdb_test "attach $testpid" \
-	"Attaching to process $testpid.*Reading symbols from $escapedbinfile.*main.*at .*" \
-	"attach when process' a.out not in cwd"
-
-    set test "after attach3, exit"
-    gdb_test_multiple "kill" "$test" {
-	-re "Kill the program being debugged.*y or n. $" {
-	    gdb_test "y" "" "$test"
-	}
-    }
-    
-    # Another "don't leave a process around"
-    remote_exec build "kill -9 ${testpid}"
-}
-
-proc do_call_attach_tests {} {
-    global gdb_prompt
-    global binfile2
-    
-    # Start the program running and then wait for a bit, to be sure
-    # that it can be attached to.
-   
-    set testpid [eval exec $binfile2 &]
-    exec sleep 2
-    if { [istarget "*-*-cygwin*"] } {
-	# testpid is the Cygwin PID, GDB uses the Windows PID, which might be
-	# different due to the way fork/exec works.
-	set testpid [ exec ps -e | gawk "{ if (\$1 == $testpid) print \$4; }" ]
-    }
-
-    # Attach
-   
-    gdb_test "file $binfile2" "" "force switch to gdb64, if necessary"
-    set test "attach call"
-    gdb_test_multiple "attach $testpid" "$test" {
-	-re "warning: reading register.*I.*O error.*$gdb_prompt $" {
-	    fail "$test (read register error)"
-	}
-	-re "Attaching to.*process $testpid.*libc.*$gdb_prompt $" {
-	    pass "$test"
-	}
-	-re "Attaching to.*process $testpid.*\[Switching to thread $testpid\..*\].*$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-
-    # See if other registers are problems
-    
-    set test "info other register"
-    gdb_test_multiple "i r r3" "$test" {
-	-re "warning: reading register.*$gdb_prompt $" {
-	    fail "$test"
-	}
-	-re "r3.*$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-
-    # Get rid of the process
-    
-    gdb_test "p should_exit = 1"
-    gdb_test "c" "Program exited normally."
-   
-    # Be paranoid
-   
-    remote_exec build "kill -9 ${testpid}"
-}
-
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# This is a test of gdb's ability to attach to a running process.
-
-do_attach_tests
-
-# Test attaching when the target is inside a system call
-
-gdb_exit
-gdb_start
-
-gdb_reinitialize_dir $srcdir/$subdir
-do_call_attach_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.base/attach2.c b/gdb/testsuite/gdb.base/attach2.c
deleted file mode 100644
index a78037ed387..00000000000
--- a/gdb/testsuite/gdb.base/attach2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* This program is intended to be started outside of gdb, and then
-   attached to by gdb.  Thus, it simply spins in a loop.  The loop
-   is exited when & if the variable 'should_exit' is non-zero.  (It
-   is initialized to zero in this program, so the loop will never
-   exit unless/until gdb sets the variable to non-zero.)
-   */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-int  should_exit = 0;
-
-int main ()
-{
-  int  local_i = 0;
-
-  sleep( 10 ); /* System call causes register fetch to fail */
-               /* This is a known HPUX "feature"            */
-  while (! should_exit)
-    {
-      local_i++;
-    }
-  return (0);
-}
diff --git a/gdb/testsuite/gdb.base/auxv.c b/gdb/testsuite/gdb.base/auxv.c
deleted file mode 100644
index 7eba5f97cfa..00000000000
--- a/gdb/testsuite/gdb.base/auxv.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 1992, 1993, 1994, 1995, 1996, 1999, 2004
-   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.  */
-
-/* Simple little program that just generates a core dump from inside some
-   nested function calls.  Keep this as self contained as possible, I.E.
-   use no environment resources other than possibly abort(). */
-
-#ifndef __STDC__
-#define	const	/**/
-#endif
-
-#ifndef HAVE_ABORT
-#define HAVE_ABORT 1
-#endif
-
-#if HAVE_ABORT
-#include <stdlib.h>
-#define ABORT abort()
-#else
-#define ABORT {char *invalid = 0; *invalid = 0xFF;}
-#endif
-
-/* Don't make these automatic vars or we will have to walk back up the
-   stack to access them. */
-
-char *buf1;
-char *buf2;
-
-int coremaker_data = 1;	/* In Data section */
-int coremaker_bss;	/* In BSS section */
-
-const int coremaker_ro = 201;	/* In Read-Only Data section */
-
-void
-func2 (int x)
-{
-  int coremaker_local[5];
-  int i;
-  static int y;
-
-  /* Make sure that coremaker_local doesn't get optimized away. */
-  for (i = 0; i < 5; i++)
-    coremaker_local[i] = i;
-  coremaker_bss = 0;
-  for (i = 0; i < 5; i++)
-    coremaker_bss += coremaker_local[i];
-  coremaker_data = coremaker_ro + 1;
-  y = 10 * x;
-  ABORT;
-}
-
-void
-func1 (int x)
-{
-  func2 (x * 2);
-}
-
-int main ()
-{
-  func1 (10);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
deleted file mode 100644
index 5187dd9ed3f..00000000000
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ /dev/null
@@ -1,194 +0,0 @@
-# Test `info auxv' and related functionality.
-
-# Copyright 1992,1993,1994,1995,1996,1997,1998,1999,2000,2004
-#	Free Software Foundation, 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 is based on corefile.exp which was written by Fred
-# Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "auxv"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set corefile ${objdir}/${subdir}/${testfile}.corefile
-set gcorefile ${objdir}/${subdir}/${testfile}.gcore
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
-    return -1
-}
-
-# Use a fresh directory to confine the native core dumps.
-# Make it the working directory for gdb and its child.
-set coredir "${objdir}/${subdir}/coredir.[getpid]"
-file mkdir $coredir
-set core_works [isnative]
-
-# Run GDB on the test program up to where it will dump core.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-gdb_test "set print sevenbit-strings" "" \
-	"set print sevenbit-strings; ${testfile}"
-gdb_test "set width 0" "" \
-	"set width 0; ${testfile}"
-
-if {$core_works} {
-    if {[gdb_test "cd $coredir" ".*Working directory .*" \
-	     "cd to temporary directory for core dumps"]} {
-	set core_works 0
-    }
-}
-
-if { ![runto_main] } then {
-    gdb_suppress_tests;
-}
-set print_core_line [gdb_get_line_number "ABORT;"]
-gdb_test "tbreak $print_core_line"
-gdb_test continue ".*ABORT;.*"
-
-proc fetch_auxv {test} {
-    global gdb_prompt
-
-    set auxv_lines {}
-    set bad -1
-    if {[gdb_test_multiple "info auxv" $test {
-	-re "info auxv\[\r\n\]+" {
-	    exp_continue
-	}
-	-ex "The program has no auxiliary information now" {
-	    set bad 1
-	    exp_continue
-	}
-	-ex "Auxiliary vector is empty" {
-	    set bad 1
-	    exp_continue
-	}
-	-ex "No auxiliary vector found" {
-	    set bad 1
-	    exp_continue
-	}
-	-re "^\[0-9\]+\[ \t\]+(AT_\[^ \t\]+)\[^\r\n\]+\[\r\n\]+" {
-	    lappend auxv_lines $expect_out(0,string)
-	    exp_continue
-	}
-	-re "^\[0-9\]+\[ \t\]+\\?\\?\\?\[^\r\n\]+\[\r\n\]+" {
-	    warning "Unrecognized tag value: $expect_out(0,string)"
-	    set bad 1
-	    lappend auxv_lines $expect_out(0,string)
-	    exp_continue
-	}
-	-re ".*$gdb_prompt $" {
-	    incr bad
-	}
-	-re "^\[^\r\n\]+\[\r\n\]+" {
-	    if {!$bad} {
-		warning "Unrecognized output: $expect_out(0,string)"
-		set bad 1
-	    }
-	    exp_continue
-	}
-    }] != 0} {
-	return {}
-    }
-
-    if {$bad} {
-	fail $test
-	return {}
-    }
-
-    pass $test
-    return $auxv_lines
-}
-
-set live_data [fetch_auxv "info auxv on live process"]
-
-# Now try gcore.
-set gcore_works 0
-set escapedfilename [string_to_regexp $gcorefile]
-gdb_test_multiple "gcore $gcorefile" "gcore" {
-    -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
-	pass "gcore"
-	set gcore_works 1
-    }
-    -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
-	unsupported "gcore"
-    }
-}
-
-# Let the program continue and die.
-gdb_test continue ".*Program received signal.*"
-gdb_test continue ".*Program terminated with signal.*"
-
-# Now collect the core dump it left.
-set test "generate native core dump"
-if {$core_works} {
-    # Find the
-    set names [glob -nocomplain -directory $coredir *core*]
-    if {[llength $names] == 1} {
-	set file [file join $coredir [lindex $names 0]]
-	remote_exec build "mv $file $corefile"
-	pass $test
-    } else {
-	set core_works 0
-	warning "can't generate a core file - core tests suppressed - check ulimit -c"
-	fail $test
-    }
-} else {
-    unsupported $test
-}
-remote_exec build "rm -rf $coredir"
-
-# Now we can examine the core files and check that their data matches what
-# we saw in the process.  Note that the exact data can vary between runs,
-# so it's important that the native core dump file and the gcore-created dump
-# both be from the same run of the program as we examined live.
-
-proc do_core_test {works corefile test1 test2} {
-    if {! $works} {
-	unsupported $test1
-	unsupported $test2
-    } else {
-	gdb_test "core $corefile" "Core was generated by.*" \
-	    "load core file for $test1" \
-	    "A program is being debugged already.*" "y"
-	set core_data [fetch_auxv $test1]
-	global live_data
-	if {$core_data == $live_data} {
-	    pass $test2
-	} else {
-	    fail $test2
-	}
-    }
-}
-
-do_core_test $core_works $corefile \
-    "info auxv on native core dump" "matching auxv data from live and core"
-
-do_core_test $gcore_works $gcorefile \
-    "info auxv on gcore-created dump" "matching auxv data from live and gcore"
diff --git a/gdb/testsuite/gdb.base/average.c b/gdb/testsuite/gdb.base/average.c
deleted file mode 100644
index e1695cea58c..00000000000
--- a/gdb/testsuite/gdb.base/average.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This is a sample program for the HP WDB debugger. */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef PROTOTYPES
-extern int sum(int *, int, int);
-#else
-extern int sum();
-#endif
-
-#define num   10
-
-static int my_list[num] = {3,4,2,0,2,1,8,3,6,7};
-
-#ifdef PROTOTYPES
-void print_average(int *list, int low, int high) 
-#else
-void print_average(list, low, high)
-int *list, low, high;
-#endif
-    {
-        int total = 0, num_elements = 0, average = 0;
-        total = sum(list, low, high);
-        num_elements = high - low;  /* note this is an off-by-one bug */
-
-        average = total / num_elements;
-        printf("%10.d\n", average);
-    }
-
-#ifdef PROTOTYPES
-int main(void)
-#else
-main ()
-#endif
-{
-    char c;
-    int first = 0, last = 0;
-    last = num-1;
-
-    /* Try two test cases. */
-    print_average (my_list, first, last);
-    print_average (my_list, first, last - 3);
-
-    exit(0);
-}
diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp
deleted file mode 100644
index 1e18328613a..00000000000
--- a/gdb/testsuite/gdb.base/bang.exp
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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.
-
-# This is a test that verifies that GDB is able to "run" when the name
-# of the executable file contains a '!'.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile "args"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/bang!
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Verify that we can run the program and that it terminates normally.
-
-gdb_run_cmd
-gdb_expect {
-    -re ".*Program exited normally\.\r\n$gdb_prompt $" {
-        pass "run program"
-    }
-    timeout {
-	fail "run program (timeout)"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/bar.c b/gdb/testsuite/gdb.base/bar.c
deleted file mode 100644
index dd0bf923a3d..00000000000
--- a/gdb/testsuite/gdb.base/bar.c
+++ /dev/null
@@ -1,9 +0,0 @@
-static int barx = 'b' + 'a' + 'r';
-
-int bar (int x)
-{
-  if (x)
-    return barx;
-  else
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.base/baz.c b/gdb/testsuite/gdb.base/baz.c
deleted file mode 100644
index 8da4ffa47a1..00000000000
--- a/gdb/testsuite/gdb.base/baz.c
+++ /dev/null
@@ -1,9 +0,0 @@
-static int bazx = 'b' + 'a' + 'z';
-
-int baz (int x)
-{
-  if (x)
-    return bazx;
-  else
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.base/bigcore.c b/gdb/testsuite/gdb.base/bigcore.c
deleted file mode 100644
index 5d0b4dbcdd3..00000000000
--- a/gdb/testsuite/gdb.base/bigcore.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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  */
-
-/* Get 64-bit stuff if on a GNU system.  */
-#define _GNU_SOURCE
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Print routines:
-
-   The following are so that printf et.al. can be avoided.  Those
-   might try to use malloc() and that, for this code, would be a
-   disaster.  */
-
-#define printf do not use
-
-const char digit[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-
-static void
-print_char (char c)
-{
-  write (1, &c, sizeof (c));
-}
-
-static void
-print_unsigned (unsigned long long u)
-{
-  if (u >= 10)
-    print_unsigned (u / 10);
-  print_char (digit[u % 10]);
-}
-
-static void
-print_hex (unsigned long long u)
-{
-  if (u >= 16)
-    print_hex (u / 16);
-  print_char (digit[u % 16]);
-}
-
-static void
-print_string (const char *s)
-{
-  for (; (*s) != '\0'; s++)
-    print_char ((*s));
-}
-
-static void
-print_address (const void *a)
-{
-  print_string ("0x");
-  print_hex ((unsigned long) a);
-}
-
-static void
-print_byte_count (unsigned long long u)
-{
-  print_unsigned (u);
-  print_string (" (");
-  print_string ("0x");
-  print_hex (u);
-  print_string (") bytes");
-}
-
-/* Print the current values of RESOURCE.  */
-
-static void
-print_rlimit (int resource)
-{
-  struct rlimit rl;
-  getrlimit (resource, &rl);
-  print_string ("cur=0x");
-  print_hex (rl.rlim_cur);
-  print_string (" max=0x");
-  print_hex (rl.rlim_max);
-}
-
-static void
-maximize_rlimit (int resource, const char *prefix)
-{
-  struct rlimit rl;
-  print_string ("  ");
-  print_string (prefix);
-  print_string (": ");
-  print_rlimit (resource);
-  getrlimit (resource, &rl);
-  rl.rlim_cur = rl.rlim_max;
-  setrlimit (resource, &rl);
-  print_string (" -> ");
-  print_rlimit (resource);
-  print_string ("\n");
-}
-
-/* Maintain a doublely linked list.  */
-struct list
-{
-  struct list *next;
-  struct list *prev;
-  size_t size;
-};
-
-/* Put the "heap" in the DATA section.  That way it is more likely
-   that the variable will occur early in the core file (an address
-   before the heap) and hence more likely that GDB will at least get
-   its value right.
-
-   To simplify the list append logic, start the heap out with one
-   entry (that lives in the BSS section).  */
-
-static struct list dummy;
-static struct list heap = { &dummy, &dummy };
-
-static unsigned long bytes_allocated;
-
-#ifdef O_LARGEFILE
-#define large_off_t off64_t
-#define large_lseek lseek64
-#else
-#define large_off_t off_t
-#define O_LARGEFILE 0
-#define large_lseek lseek
-#endif
-
-int
-main ()
-{
-  size_t max_chunk_size;
-  large_off_t max_core_size;
-
-  /* Try to expand all the resource limits beyond the point of sanity
-     - we're after the biggest possible core file.  */
-
-  print_string ("Maximize resource limits ...\n");
-#ifdef RLIMIT_CORE
-  maximize_rlimit (RLIMIT_CORE, "core");
-#endif
-#ifdef RLIMIT_DATA
-  maximize_rlimit (RLIMIT_DATA, "data");
-#endif
-#ifdef RLIMIT_STACK
-  maximize_rlimit (RLIMIT_STACK, "stack");
-#endif
-#ifdef RLIMIT_AS
-  maximize_rlimit (RLIMIT_AS, "stack");
-#endif
-
-  print_string ("Maximize allocation limits ...\n");
-
-  /* Compute the largest possible corefile size.  No point in trying
-     to create a corefile larger than the largest file supported by
-     the file system.  What about 64-bit lseek64?  */
-  {
-    int fd;
-    large_off_t tmp;
-    unlink ("bigcore.corefile");
-    fd = open ("bigcore.corefile", O_RDWR | O_CREAT | O_TRUNC | O_LARGEFILE,
-	       0666);
-    for (tmp = 1; tmp > 0; tmp <<= 1)
-      {
-	if (large_lseek (fd, tmp, SEEK_SET) > 0)
-	  max_core_size = tmp;
-      }
-    close (fd);
-  }
-  
-  /* Compute an initial chunk size.  The math is dodgy but it works
-     for the moment.  Perhaphs there's a constant around somewhere.
-     Limit this to max_core_size bytes - no point in trying to
-     allocate more than can be written to the corefile.  */
-  {
-    size_t tmp;
-    for (tmp = 1; tmp > 0 && tmp < max_core_size; tmp <<= 1)
-      max_chunk_size = tmp;
-  }
-
-  print_string ("  core: ");
-  print_byte_count (max_core_size);
-  print_string ("\n");
-  print_string ("  chunk: ");
-  print_byte_count (max_chunk_size);
-  print_string ("\n");
-  print_string ("  large? ");
-  if (O_LARGEFILE)
-    print_string ("yes\n");
-  else
-    print_string ("no\n");
-
-  /* Allocate as much memory as possible creating a linked list of
-     each section.  The linking ensures that some, but not all, the
-     memory is allocated.  NB: Some kernels handle this efficiently -
-     only allocating and writing out referenced pages leaving holes in
-     the file for unmodified pages - while others handle this poorly -
-     writing out all pages including those that weren't modified.  */
-
-  print_string ("Alocating the entire heap ...\n");
-  {
-    size_t chunk_size;
-    unsigned long chunks_allocated = 0;
-    /* Create a linked list of memory chunks.  Start with
-       MAX_CHUNK_SIZE blocks of memory and then try allocating smaller
-       and smaller amounts until all (well at least most) memory has
-       been allocated.  */
-    for (chunk_size = max_chunk_size;
-	 chunk_size >= sizeof (struct list);
-	 chunk_size >>= 1)
-      {
-	unsigned long count = 0;
-	print_string ("  ");
-	print_byte_count (chunk_size);
-	print_string (" ... ");
-	while (bytes_allocated + (1 + count) * chunk_size
-	       < max_core_size)
-	  {
-	    struct list *chunk = malloc (chunk_size);
-	    if (chunk == NULL)
-	      break;
-	    chunk->size = chunk_size;
-	    /* Link it in.  */
-	    chunk->next = NULL;
-	    chunk->prev = heap.prev;
-	    heap.prev->next = chunk;
-	    heap.prev = chunk;
-	    count++;
-	  }
-	print_unsigned (count);
-	print_string (" chunks\n");
-	chunks_allocated += count;
-	bytes_allocated += chunk_size * count;
-      }
-    print_string ("Total of ");
-    print_byte_count (bytes_allocated);
-    print_string (" bytes ");
-    print_unsigned (chunks_allocated);
-    print_string (" chunks\n");
-  }
-
-  /* Push everything out to disk.  */
-
-  print_string ("Dump core ....\n");
-  *(char*)0 = 0;
-}
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
deleted file mode 100644
index af3098c5f9d..00000000000
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2004
-# Free Software Foundation, 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 is based on corefile.exp which was written by Fred
-# Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Are we on a target board?  As of 2004-02-12, GDB didn't have a
-# mechanism that would let it efficiently access a remote corefile.
-
-if ![isnative] then {
-    untested "Remote system"
-    return
-}
-
-# Can the system run this test (in particular support sparse
-# corefiles)?  On systems that lack sparse corefile support this test
-# consumes too many resources - gigabytes worth of disk space and and
-# I/O bandwith.
-
-if { [istarget "*-*-*bsd*"]
-     || [istarget "*-*-hpux*"]
-     || [istarget "*-*-solaris*"] 
-     || [istarget "*-*-cygwin*"] } {
-    untested "Kernel lacks sparse corefile support (PR gdb/1551)"
-    return
-}
-
-# This testcase causes too much stress (in terms of memory usage)
-# on certain systems...
-if { [istarget "*-*-*irix*"] } {
-    untested "Testcase too stressful for this system"
-    return
-}
-
-set testfile "bigcore"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set corefile ${objdir}/${subdir}/${testfile}.corefile
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Run GDB on the bigcore program up-to where it will dump core.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-gdb_test "set print sevenbit-strings" "" \
-	"set print sevenbit-strings; ${testfile}"
-gdb_test "set width 0" "" \
-	"set width 0; ${testfile}"
-if { ![runto_main] } then {
-    gdb_suppress_tests;
-}
-set print_core_line [gdb_get_line_number "Dump core"]
-gdb_test "tbreak $print_core_line"
-gdb_test continue ".*print_string.*"
-gdb_test next ".*0 = 0.*"
-
-# Traverse part of bigcore's linked list of memory chunks (forward or
-# backward), saving each chunk's address.
-
-proc extract_heap { dir } {
-    global gdb_prompt
-    global expect_out
-    set heap ""
-    set test "extract ${dir} heap"
-    set lim 0
-    gdb_test_multiple "print heap.${dir}" "$test" {
-	-re " = \\(struct list \\*\\) 0x0.*$gdb_prompt $" {
-	    pass "$test"
-	}
-	-re " = \\(struct list \\*\\) (0x\[0-9a-f\]*).*$gdb_prompt $" {
-	    set heap [concat $heap $expect_out(1,string)]
-	    if { $lim >= 50 } {
-		pass "$test (stop at $lim)"
-	    } else {
-		incr lim
-		send_gdb "print \$.${dir}\n"
-		exp_continue
-	    }
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$test (entry $lim)"
-	}
-	timeout {
-	    fail "$test (timeout)"
-	}
-    }
-    return $heap;
-}
-set next_heap [extract_heap next]
-set prev_heap [extract_heap prev]
-
-# Now create a core dump
-
-# Rename the core file to "TESTFILE.corefile" rather than just "core",
-# to avoid problems with sys admin types that like to regularly prune
-# all files named "core" from the system.
-
-# Some systems append "core" to the name of the program; others append
-# the name of the program to "core"; still others (like Linux, as of
-# May 2003) create cores named "core.PID".
-
-# Save the process ID.  Some systems dump the core into core.PID.
-set test "grab pid"
-gdb_test_multiple "info program" $test {
-    -re "child process (\[0-9\]+).*$gdb_prompt $" {
-	set inferior_pid $expect_out(1,string)
-	pass $test
-    }
-    -re "$gdb_prompt $" {
-	set inferior_pid unknown
-	pass $test
-    }
-}
-
-# Dump core using SIGABRT
-set oldtimeout $timeout
-set timeout 600
-gdb_test "signal SIGABRT" "Program terminated with signal SIGABRT, .*"
-
-# Find the corefile
-set file ""
-foreach pat [list core.${inferior_pid} ${testfile}.core core] {
-    set names [glob -nocomplain $pat]
-    if {[llength $names] == 1} {
-	set file [lindex $names 0]
-	remote_exec build "mv $file $corefile"
-	break
-    }
-}
-
-if { $file == "" } {
-    untested "Can't generate a core file"
-    return 0
-}
-
-# Check that the corefile is plausibly large enough.  We're trying to
-# detect the case where the operating system has truncated the file
-# just before signed wraparound.  TCL, unfortunately, has a similar
-# problem - so use catch.  It can handle the "bad" size but not
-# necessarily the "good" one.  And we must use GDB for the comparison,
-# similarly.
-
-if {[catch {file size $corefile} core_size] == 0} {
-    set core_ok 0
-    gdb_test_multiple "print bytes_allocated < $core_size" "check core size" {
-	-re " = 1\r\n$gdb_prompt $" {
-	    pass "check core size"
-	    set core_ok 1
-	}
-    }
-} { 
-    # Probably failed due to the TCL build having problems with very
-    # large values.  Since GDB uses a 64-bit off_t (when possible) it
-    # shouldn't have this problem.  Assume that things are going to
-    # work.  Without this assumption the test is skiped on systems
-    # (such as i386 GNU/Linux with patched kernel) which do pass.
-    pass "check core size"
-    set core_ok 1
-}
-if {! $core_ok} {
-    untested "check core size (system does not support large corefiles)"
-    return 0
-}
-
-# Now load up that core file
-
-set test "load corefile"
-gdb_test_multiple "core $corefile" "$test" {
-    -re "A program is being debugged already.  Kill it. .y or n. " {
-	send_gdb "y\n"
-	exp_continue
-    }
-    -re "Core was generated by.*$gdb_prompt $" {
-	pass "$test"
-    }
-}
-
-# Finally, re-traverse bigcore's linked list, checking each chunk's
-# address against the executable.  Don't use gdb_test_multiple as want
-# only one pass/fail.  Don't use exp_continue as the regular
-# expression involving $heap needs to be re-evaluated for each new
-# response.
-
-proc check_heap { dir heap } {
-    global gdb_prompt
-    set test "check ${dir} heap"
-    set ok 1
-    set lim 0
-    send_gdb "print heap.${dir}\n"
-    while { $ok } {
-	gdb_expect {
-	    -re " = \\(struct list \\*\\) [lindex $heap $lim].*$gdb_prompt $" {
-		if { $lim >= [llength $heap] } {
-		    pass "$test"
-		    set ok 0
-		} else {
-		    incr lim
-		    send_gdb "print \$.${dir}\n"
-		}
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "$test (address [lindex $heap $lim])"
-		set ok 0
-	    }
-	    timeout {
-		fail "$test (timeout)"
-		set ok 0
-	    }
-	}
-    }
-}
-
-check_heap next $next_heap
-check_heap prev $prev_heap
diff --git a/gdb/testsuite/gdb.base/bitfields.c b/gdb/testsuite/gdb.base/bitfields.c
deleted file mode 100644
index bd411f7b647..00000000000
--- a/gdb/testsuite/gdb.base/bitfields.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Test program to test bit field operations */
-
-/* For non-ANSI compilers, use plain ints for the signed bit fields.  However,
-   whether they actually end up signed or not is implementation defined, so
-   this may cause some tests to fail.  But at least we can still compile
-   the test program and run the tests... */
-
-#if !defined(__STDC__) && !defined(__cplusplus)
-#define signed  /**/
-#endif
-
-struct fields
-{
-  unsigned char	uc    ;
-  signed int	s1 : 1;
-  unsigned int	u1 : 1;
-  signed int	s2 : 2;
-  unsigned int	u2 : 2;
-  signed int	s3 : 3;
-  unsigned int	u3 : 3;
-  signed int	s9 : 9;
-  unsigned int  u9 : 9;
-  signed char	sc    ;
-} flags;
-
-void break1 ()
-{
-}
-
-void break2 ()
-{
-}
-
-void break3 ()
-{
-}
-
-void break4 ()
-{
-}
-
-void break5 ()
-{
-}
-
-void break6 ()
-{
-}
-
-void break7 ()
-{
-}
-
-void break8 ()
-{
-}
-
-void break9 ()
-{
-}
-
-void break10 ()
-{
-}
-
-/* This is used by bitfields.exp to determine if the target understands
-   signed bitfields.  */
-int i;
-
-int main ()
-{
-  /* For each member, set that member to 1, allow gdb to verify that the
-     member (and only that member) is 1, and then reset it back to 0. */
-
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  flags.uc = 1;
-  break1 ();
-  flags.uc = 0;
-
-  flags.s1 = -1;
-  break1 ();
-  flags.s1 = 0;
-
-  flags.u1 = 1;
-  break1 ();
-  flags.u1 = 0;
-
-  flags.s2  = 1;
-  break1 ();
-  flags.s2 = 0;
-
-  flags.u2 = 1;
-  break1 ();
-  flags.u2 = 0;
-
-  flags.s3  = 1;
-  break1 ();
-  flags.s3 = 0;
-
-  flags.u3 = 1;
-  break1 ();
-  flags.u3 = 0;
-
-  flags.s9 = 1;
-  break1 ();
-  flags.s9 = 0;
-
-  flags.u9 = 1;
-  break1 ();
-  flags.u9 = 0;
-
-  flags.sc = 1;
-  break1 ();
-  flags.sc = 0;
-
-  /* Fill alternating fields with all 1's and verify that none of the bits
-     "bleed over" to the other fields. */
-
-  flags.uc = 0xFF;
-  flags.u1 = 0x1;
-  flags.u2 = 0x3;
-  flags.u3 = 0x7;
-  flags.u9 = 0x1FF;
-  break2 ();
-  flags.uc = 0;
-  flags.u1 = 0;
-  flags.u2 = 0;
-  flags.u3 = 0;
-  flags.u9 = 0;
-
-  flags.s1 = -1;
-  flags.s2 = -1;
-  flags.s3 = -1;
-  flags.s9 = -1;
-  flags.sc = 0xFF;
-  break2 ();
-  flags.s1 = 0;
-  flags.s2 = 0;
-  flags.s3 = 0;
-  flags.s9 = 0;
-  flags.sc = 0;
-
-  /* Fill the unsigned fields with the maximum positive value and verify
-     that the values are printed correctly. */
-
-  /* Maximum positive values */
-  flags.u1 = 0x1;
-  flags.u2 = 0x3;
-  flags.u3 = 0x7;
-  flags.u9 = 0x1FF;
-  break3 ();
-  flags.u1 = 0;
-  flags.u2 = 0;
-  flags.u3 = 0;
-  flags.u9 = 0;
-
-  /* Fill the signed fields with the maximum positive value, then the maximally
-     negative value, then -1, and verify in each case that the values are
-     printed correctly. */
-
-  /* Maximum positive values */
-  flags.s1 = 0x0;
-  flags.s2 = 0x1;
-  flags.s3 = 0x3;
-  flags.s9 = 0xFF;
-  break4 ();
-
-  /* Maximally negative values */
-  flags.s1 = -0x1;
-  flags.s2 = -0x2;
-  flags.s3 = -0x4;
-  flags.s9 = -0x100;
-  /* Extract bitfield value so that bitfield.exp can check if the target
-     understands signed bitfields.  */
-  i = flags.s9;
-  break4 ();
-
-  /* -1 */
-  flags.s1 = -1;
-  flags.s2 = -1;
-  flags.s3 = -1;
-  flags.s9 = -1;
-  break4 ();
-
-  flags.s1 = 0;
-  flags.s2 = 0;
-  flags.s3 = 0;
-  flags.s9 = 0;
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/bitfields.exp b/gdb/testsuite/gdb.base/bitfields.exp
deleted file mode 100644
index 148eec84cfc..00000000000
--- a/gdb/testsuite/gdb.base/bitfields.exp
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1992, 1994, 1995, 1997 Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "bitfields"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-#
-# Test bitfield locating and uniqueness.
-# For each member, set that member to 1 and verify that the member (and only
-# that member) is 1, then reset it back to 0.
-#
-
-proc bitfield_uniqueness {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-
-    if { ! [runto break1] } {
-	gdb_suppress_tests;
-    }
-	
-    if [gdb_test "print flags" ".*uc = 1 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #1"] {
-	gdb_suppress_tests;
-    }
-    # Note that we check for s1 as either 1 or -1, so that failure to
-    # treat it correctly as a signed 1bit field (values 0 or -1) while
-    # printing its value does not cause a spurious failure.  We do the
-    # signedness preservation test later.
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = (1|-1), u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (s1)"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #2"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 1, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (u1)"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #3"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 1, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (s2)"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #4"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 1, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (u2)"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #5"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 1, u3 = 0, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (s3)"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #6"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 1, s9 = 0, u9 = 0, sc = 0.*" "bitfield uniqueness (u3)"] {
-	gdb_suppress_tests
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #7"] {
-	gdb_suppress_tests
-    }
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 1, u9 = 0, sc = 0.*" "bitfield uniqueness (s9)"] {
-	gdb_suppress_tests
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #8"] {
-	gdb_suppress_tests
-    }
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 1, sc = 0.*" "bitfield uniqueness (u9)"] {
-	gdb_suppress_tests
-    }
-    if [gdb_test "cont" "Break.*break1 \\(\\) at .*$srcfile:$decimal.*" "continuing to break1 #9"] {
-	gdb_suppress_tests
-    }
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 0, s2 = 0, u2 = 0, s3 = 0, u3 = 0, s9 = 0, u9 = 0, sc = 1.*" "bitfield uniqueness (sc)"] {
-	gdb_suppress_tests
-    }
-    # Hmmmm?
-    gdb_stop_suppressing_tests;
-}
-
-
-#
-# Test bitfield containment.
-# Fill alternating fields with all 1's and verify that none of the bits
-# "bleed over" to the other fields.
-#
-
-proc bitfield_containment {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-
-    delete_breakpoints
-
-    if { ![runto break2] } {
-	gdb_suppress_tests
-    }
-
-    if [gdb_test "print/x flags" "= {uc = 0xff, s1 = 0x0, u1 = 0x1, s2 = 0x0, u2 = 0x3, s3 = 0x0, u3 = 0x7, s9 = 0x0, u9 = 0x1ff, sc = 0x0}" "bitfield containment #1"] {
-	gdb_suppress_tests
-    }
-
-    if [gdb_test "cont" "Break.*break2 \\(\\) at .*$srcfile:$decimal.*" "continuing to break2"] {
-	gdb_suppress_tests
-    }
-
-    # If program is compiled with Sun CC, then these print out as their
-    # actual sizes; if compiled with gcc, they print out as 0xffffffff
-    # (which strikes me as bogus, but accept it at least for now).
-    if [gdb_test "print/x flags" "= {uc = 0x0, s1 = 0x(1|f*), u1 = 0x0, s2 = 0x(3|f*), u2 = 0x0, s3 = 0x(7|f*), u3 = 0x0, s9 = 0x(1ff|f*), u9 = 0x0, sc = 0xff}" "bitfield containment #2"] {
-	gdb_suppress_tests
-    }
-    gdb_stop_suppressing_tests;
-}
-
-# Test unsigned bitfields for unsignedness and range.
-# Fill the unsigned fields with the maximum positive value and verify that
-# the values are printed correctly.
-
-proc bitfield_unsignedness {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-
-    delete_breakpoints
-
-    if { ![runto break3] } {
-	gdb_suppress_tests
-    }
-
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = 0, u1 = 1, s2 = 0, u2 = 3, s3 = 0, u3 = 7, s9 = 0, u9 = 511, sc = 0.*" "unsigned bitfield ranges"] {
-	gdb_suppress_tests
-    }
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Test signed bitfields for signedness and range.
-# Fill the signed fields with the maximum positive value, then the maximally
-# negative value, then -1, and verify in each case that the values are
-# printed correctly.
-#
-
-proc bitfield_signedness {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-
-    delete_breakpoints
-
-    if { ! [runto break4] } {
-	gdb_suppress_tests
-    }
-
-    if [gdb_test "print flags" "= {uc = 0 .*, s1 = 0, u1 = 0, s2 = 1, u2 = 0, s3 = 3, u3 = 0, s9 = 255, u9 = 0, sc = 0 .*}" "signed bitfields, max positive values"] {
-	gdb_suppress_tests
-    }
-
-    if [gdb_test "cont" "Break.*break4 \\(\\) at .*$srcfile:$decimal.*" "continuing to break4 #1"] {
-	gdb_suppress_tests
-    }
-
-    # Determine if the target has signed bitfields so we can xfail the
-    # the signed bitfield tests if it doesn't.
-    send_gdb "print i\n"
-    gdb_expect {
-	-re ".* = -256.*$gdb_prompt $" {
-	    pass "determining signed-ness of bitfields"
-	}
-	-re ".* = 256.*$gdb_prompt $" {
-	    pass "determining signed-ness of bitfields"
-	    setup_xfail "*-*-*"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "determining signed-ness of bitfields"
-	    gdb_suppress_tests
-	}
-	default { 
-	    fail "determining signed-ness of bitfields" ;
-	    gdb_suppress_tests;
-	}
-    }
-
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = -1, u1 = 0, s2 = -2, u2 = 0, s3 = -4, u3 = 0, s9 = -256, u9 = 0, sc = 0.*" "signed bitfields, max negative values"] {
-        gdb_suppress_tests
-    }
-
-    if [gdb_test "cont" "Break.*break4 \\(\\) at .*$srcfile:$decimal.*" "continuing to break4 #2"] {
-	gdb_suppress_tests
-    }
-
-    if [gdb_test "print flags" ".*uc = 0 .*, s1 = -1, u1 = 0, s2 = -1, u2 = 0, s3 = -1, u3 = 0, s9 = -1, u9 = 0, sc = 0.*" "signed bitfields with -1"] {
-	gdb_suppress_tests
-    }
-    # Hmmmm???
-    gdb_stop_suppressing_tests;
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-
-bitfield_uniqueness
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-}
-bitfield_containment
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-}
-bitfield_unsignedness
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-}
-bitfield_signedness
diff --git a/gdb/testsuite/gdb.base/bitfields2.c b/gdb/testsuite/gdb.base/bitfields2.c
deleted file mode 100644
index 1958ef0f5e3..00000000000
--- a/gdb/testsuite/gdb.base/bitfields2.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Test program to test bit field operations on bit fields of large
-   integer types.  */
-
-/* This file is expected to fail to compile if the type long long int
-   is not supported, but in that case it is irrelevant.  */
-
-#include <stdlib.h>
-#include <string.h>
-
-#if !defined(__STDC__) && !defined(__cplusplus)
-#define signed  /**/
-#endif
-
-struct fields
-{
-  unsigned long long u1 : 15;
-  unsigned long long u2 : 33;
-  unsigned long long u3 : 16;
-  signed long long   s1 : 15;
-  signed long long   s2 : 33;
-  signed long long   s3 : 16;
-} flags;
-
-void break1 ()
-{
-}
-
-void break2 ()
-{
-}
-
-void break3 ()
-{
-}
-
-void break4 ()
-{
-}
-
-void break5 ()
-{
-}
-
-void break6 ()
-{
-}
-
-void break7 ()
-{
-}
-
-void break8 ()
-{
-}
-
-void break9 ()
-{
-}
-
-void break10 ()
-{
-}
-
-/* This is used by bitfields.exp to determine if the target understands
-   signed bitfields.  */
-int i;
-
-void tester ()
-{
-  memset ((char *) &flags, 0, sizeof (flags));
-
-  /* For each member, set that member to 1, allow gdb to verify that the
-     member (and only that member) is 1, and then reset it back to 0. */
-  flags.s1 = 1;
-  break1 ();
-  flags.s1 = 0;
-
-  flags.u1 = 1;
-  break1 ();
-  flags.u1 = 0;
-
-  flags.s2  = 1;
-  break1 ();
-  flags.s2 = 0;
-
-  flags.u2 = 1;
-  break1 ();
-  flags.u2 = 0;
-
-  flags.s3  = 1;
-  break1 ();
-  flags.s3 = 0;
-
-  flags.u3 = 1;
-  break1 ();
-  flags.u3 = 0;
-
-  /* Fill alternating fields with all 1's and verify that none of the bits
-     "bleed over" to the other fields. */
-
-  flags.u1 = 0x7FFF;
-  flags.u3 = 0xFFFF;
-  flags.s2 = -1LL;
-  break2 ();
-  flags.u1 = 0;
-  flags.u3 = 0;
-  flags.s2 = 0;
-
-  flags.u2 = 0x1FFFFFFFFLL;
-  flags.s1 = -1;
-  flags.s3 = -1;
-  break2 ();
-
-  flags.u2 = 0;
-  flags.s1 = 0;
-  flags.s3 = 0;
-
-  /* Fill the unsigned fields with the maximum positive value and verify
-     that the values are printed correctly. */
-
-  flags.u1 = 0x7FFF;
-  flags.u2 = 0x1FFFFFFFFLL;
-  flags.u3 = 0xFFFF;
-  break3 ();
-  flags.u1 = 0;
-  flags.u2 = 0;
-  flags.u3 = 0;
-
-  /* Fill the signed fields with the maximum positive value, then the maximally
-     negative value, then -1, and verify in each case that the values are
-     printed correctly. */
-
-  /* Maximum positive values */
-  flags.s1 = 0x3FFF;
-  flags.s2 = 0xFFFFFFFFLL;
-  flags.s3 = 0x7FFF;
-  break4 ();
-
-  /* Maximally negative values */
-  flags.s1 = -0x4000;
-  flags.s2 = -0x100000000LL;
-  flags.s3 = -0x8000;
-
-  /* Extract bitfield value so that bitfield.exp can check if the target
-     understands signed bitfields.  */
-  i = flags.s3;
-  break4 ();
-
-  /* -1 */
-  flags.s1 = -1;
-  flags.s2 = -1;
-  flags.s3 = -1;
-  break4 ();
-
-  flags.s1 = 0;
-  flags.s2 = 0;
-  flags.s3 = 0;
-
-  break5 ();
-}
-
-int main () 
-{
-  int i;
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  for (i = 0; i < 5; i += 1)
-    tester ();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp
deleted file mode 100644
index d4f93c74960..00000000000
--- a/gdb/testsuite/gdb.base/bitfields2.exp
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1992, 1994, 1995, 1997, 2004 Free Software Foundation, 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.  
-
-# This file was adapted from bitfields.exp by Paul Hilfinger 
-# (Hilfinger@gnat.com)
-
-#
-# Tests for bit-fields that do not fit in type (unsigned) int, but do fit 
-# in type (unsigned) long long.  We perform essentially the same tests as
-# in bitfields.c, which considers only bit-fields that are <= 9 bits long.
-#
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "bitfields2"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-set has_signed_bitfields 1
-
-#
-# Continue to expected breakpoint at FUNCTION.  Append TAG to make pass/fail 
-# messages (to make them unique).  Suppress tests on failure.
-#
-proc continue_test { function tag } {
-    global decimal
-    global srcfile
-
-    if [gdb_test "cont" "Break.*$function \\(\\) at .*$srcfile:$decimal.*" "continuing to $function $tag"] {
-	gdb_suppress_tests
-    }
-}
-
-#
-# Start next test by running to tester and then to FUNCTION.   Suppresses
-# tests on failure.
-#
-proc start_test { function } {
-    delete_breakpoints
-    if [gdb_test "break tester" "" "break tester prior to $function"] {
-	gdb_suppress_tests
-    }
-    continue_test "tester" "prior to $function"
-    if ![gdb_breakpoint $function] {
-	gdb_suppress_tests
-    }
-    continue_test $function "#0"
-}
-    
-
-#
-# Test bitfield locating and uniqueness.
-# For each member, set that member to 1 and verify that the member (and only
-# that member) is 1, then reset it back to 0.
-#
-
-proc bitfield_uniqueness {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-
-    start_test break1
-	
-    if [gdb_test "print flags" ".*u1 = 0, u2 = 0, u3 = 0, s1 = 1, s2 = 0, s3 = 0.*" "bitfield uniqueness; flags.s1 = 1"] {
-	gdb_suppress_tests;
-    }
-    continue_test break1 "#1"
-    if [gdb_test "print flags" ".*u1 = 1, u2 = 0, u3 = 0, s1 = 0, s2 = 0, s3 = 0.*" "bitfield uniqueness; flags.u1 = 1"] {
-	gdb_suppress_tests;
-    }
-    continue_test break1 "#2"
-    if [gdb_test "print flags" ".*u1 = 0, u2 = 0, u3 = 0, s1 = 0, s2 = 1, s3 = 0.*" "bitfield uniqueness; flags.s2 = 1"] {
-	gdb_suppress_tests;
-    }
-    continue_test break1 "#3"
-    if [gdb_test "print flags" ".*u1 = 0, u2 = 1, u3 = 0, s1 = 0, s2 = 0, s3 = 0.*" "bitfield uniqueness; flags.u2 = 1"] {
-	gdb_suppress_tests;
-    }
-    continue_test break1 "#4"
-    if [gdb_test "print flags" ".*u1 = 0, u2 = 0, u3 = 0, s1 = 0, s2 = 0, s3 = 1.*" "bitfield uniqueness; flags.s3 = 1"] {
-	gdb_suppress_tests;
-    }
-    continue_test break1 "#5"
-    if [gdb_test "print flags" ".*u1 = 0, u2 = 0, u3 = 1, s1 = 0, s2 = 0, s3 = 0.*" "bitfield uniqueness; flags.u3 = 1"] {
-	gdb_suppress_tests
-    }
-    gdb_stop_suppressing_tests;
-}
-
-
-#
-# Test bitfield containment.
-# Fill alternating fields with all 1's and verify that none of the bits
-# "bleed over" to the other fields.
-#
-
-proc bitfield_containment {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-
-    start_test break2
-
-    # If program is compiled with Sun CC, signed fields print out as their
-    # actual sizes; if compiled with gcc, they print out as 0xffffffff.
-    if [gdb_test "print/x flags" "= {u1 = 0x7fff, u2 = 0x0, u3 = 0xffff, s1 = 0x0, s2 = 0x(1ffffffff|f*), s3 = 0x0}" "bitfield containment; flags.u1, flags.u3, and flags.s3 to all 1s"] {
-	gdb_suppress_tests
-    }
-
-    continue_test break2 "#1"
-
-    if [gdb_test "print/x flags" "= {u1 = 0x0, u2 = 0x1ffffffff, u3 = 0x0, s1 = 0x(7fff|f*), s2 = 0x0, s3 = 0xf*}" "bitfield containment; flags.u2, flags.s1, flags.s2 to all 1s"] {
-	gdb_suppress_tests
-    }
-    gdb_stop_suppressing_tests;
-}
-
-# Test unsigned bitfields for unsignedness and range.
-# Fill the unsigned fields with the maximum positive value and verify that
-# the values are printed correctly.
-
-proc bitfield_unsignedness {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-
-    start_test break3
-
-    if [gdb_test "print flags" ".*u1 = 32767, u2 = 8589934591, u3 = 65535, s1 = 0, s2 = 0, s3 = 0.*" "maximum unsigned bitfield values"] {
-	gdb_suppress_tests
-    }
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Test signed bitfields for signedness and range.
-# Fill the signed fields with the maximum positive value, then the maximally
-# negative value, then -1, and verify in each case that the values are
-# printed correctly.
-#
-
-proc bitfield_signedness {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-    global has_signed_bitfields
-
-    start_test break4
-
-    if [gdb_test "print flags" "= {.*u1 = 0, u2 = 0, u3 = 0, s1 = 16383, s2 = 4294967295, s3 = 32767.*}" "maximum signed bitfield values"] {
-	gdb_suppress_tests
-    }
-
-    continue_test break4 "#1"
-
-    # Determine if the target has signed bitfields so we can skip
-    # the signed bitfield tests if it doesn't.
-    set test "determining signed-ness of bitfields"
-    set has_signed_bitfields 0
-    gdb_test_multiple "print i" $test {
-	-re ".* = -32768.*$gdb_prompt $" {
-	    set has_signed_bitfields 1
-	    pass "determining signed-ness of bitfields"
-	}
-	-re ".* = 32768.*$gdb_prompt $" {
-	    pass "determining signed-ness of bitfields"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "determining signed-ness of bitfields"
-	    gdb_suppress_tests
-	}
-    }
-
-    set test "most negative signed bitfield values"
-    if $has_signed_bitfields then {
-        if [gdb_test "print flags" "u1 = 0, u2 = 0, u3 = 0, s1 = -16384, s2 = -4294967296, s3 = -32768.*" $test ] {
-            gdb_suppress_tests
-        }
-    } else {
-	unsupported $test
-    }
-
-    continue_test break4 "#2"
-
-    set test "signed bitfields containing -1"
-    if $has_signed_bitfields then {
-	if [gdb_test "print flags" "u1 = 0, u2 = 0, u3 = 0, s1 = -1, s2 = -1, s3 = -1.*" $test ] {
-	    gdb_suppress_tests
-	}
-    } else {
-	unsupported $test
-    }
-
-    gdb_stop_suppressing_tests;
-}
-
-
-# Test setting of long long bit fields from within GDB.
-
-proc bitfield_set {} {
-    global decimal
-    global hex
-    global gdb_prompt
-    global srcfile
-    global has_signed_bitfields
-
-    start_test break5
-
-    set big_set_failed 0
-    set test "set long long unsigned bitfield"
-    gdb_test_multiple "print flags.u2 = 0x100000000" $test {
-	-re "warning: Value does not fit.*$gdb_prompt $" {
-	    fail "$test"
-	    gdb_suppress_tests
-	}
-	-re "= 4294967296.*$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-
-    set test "set long long signed bitfield positive"
-    gdb_test_multiple "print flags.s2 = 0x80000000" $test {
-	-re "warning: Value does not fit.*$gdb_prompt $" {
-	    fail "$test"
-	    gdb_suppress_tests
-	}
-	-re "= 2147483648.*$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-
-    if [gdb_test "print flags" "u1 = 0, u2 = 4294967296, u3 = 0, s1 = 0, s2 = 2147483648, s3 = 0.*" "long long bitfield values after set"] {
-	gdb_suppress_tests
-    }
-
-    set test "set long long signed bitfield negative"
-    if $has_signed_bitfields then {
-	gdb_test_multiple "print flags.s2 = -1" $test {
-	    -re "warning: Value does not fit.*$gdb_prompt $" {
-		fail "$test"
-		gdb_suppress_tests
-	    }
-	    -re "= -1.*$gdb_prompt $" {
-		pass "$test"
-	    }
-	}
-    } else {
-	unsupported $test
-    }
-
-    set test  "long long bitfield values after set negative"
-    if $has_signed_bitfields then {
-	if [gdb_test "print flags" "u1 = 0, u2 = 4294967296, u3 = 0, s1 = 0, s2 = -1, s3 = 0.*" $test] {
-	    gdb_suppress_tests
-	}
-    } else {
-	unsupported $test
-    }
-
-    gdb_stop_suppressing_tests;
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-runto_main
-
-bitfield_uniqueness
-bitfield_containment
-bitfield_unsignedness
-bitfield_signedness
-bitfield_set
-
diff --git a/gdb/testsuite/gdb.base/bitops.exp b/gdb/testsuite/gdb.base/bitops.exp
deleted file mode 100644
index 607ab7787d8..00000000000
--- a/gdb/testsuite/gdb.base/bitops.exp
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1998, 1999 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite
-#
-# tests expressions with bitwise operators, and some
-# logical operators
-# Does not use a target program
-# 
-
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-
-send_gdb "print !1\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of !1"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !1" }
-    timeout           { fail "(timeout) print value of !1" }
-  }
-
-
-send_gdb "print !0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of !0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !0" }
-    timeout           { fail "(timeout) print value of !0" }
-  }
-
-
-send_gdb "print !100\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of !100"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !100" }
-    timeout           { fail "(timeout) print value of !100" }
-  }
-
-
-send_gdb "print !1000\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of !1000"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !1000" }
-    timeout           { fail "(timeout) print value of !1000" }
-  }
-
-
-send_gdb "print !10\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of !10"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !10" }
-    timeout           { fail "(timeout) print value of !10" }
-  }
-
-
-send_gdb "print !2\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of !2 "
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !2" }
-    timeout           { fail "(timeout) print value of !2" }
-  }
-
-
-send_gdb "print 10 | 5\n"
-gdb_expect {
-    -re ".\[0-9\]* = 15.*$gdb_prompt $" {
-        pass "print value of 10 | 5"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 10 | 5" }
-    timeout           { fail "(timeout) print value of 10 | 5" }
-  }
-
-
-send_gdb "print 10 & 5\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 10 & 5"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 10 & 5" }
-    timeout           { fail "(timeout) print value of 10 & 5" }
-  }
-
-
-send_gdb "print 10 ^ 5\n"
-gdb_expect {
-    -re ".\[0-9\]* = 15.*$gdb_prompt $" {
-        pass "print value of 10 ^ 5"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 10 ^ 5" }
-    timeout           { fail "(timeout) print value of 10 ^ 5" }
-  }
-
-
-send_gdb "print -!0\n"
-gdb_expect {
-    -re ".\[0-9\]* = -1.*$gdb_prompt $" {
-        pass "print value of -!0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of -!0" }
-    timeout           { fail "(timeout) print value of -!0" }
-  }
-
-
-send_gdb "print ~-!0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of ~-!0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ~-!0" }
-    timeout           { fail "(timeout) print value of ~-!0" }
-  }
-
-
-
-send_gdb "print 3 * 2 / 4.0 * 2.0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 3.*$gdb_prompt $" {
-        pass "print value of 3 * 2 / 4.0 * 2.0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3 * 2 / 4.0 * 2.0" }
-    timeout           { fail "(timeout) print value of 3 * 2 / 4.0 * 2.0" }
-  }
-
-
-send_gdb "print 8 << 2 >> 4\n"
-gdb_expect {
-    -re ".\[0-9\]* = 2.*$gdb_prompt $" {
-        pass "print value of 8 << 2 >> 4"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 8 << 2 >> 4" }
-    timeout           { fail "(timeout) print value of 8 << 2 >> 4" }
-  }
-
-
-send_gdb "print -1 < 0 > 1\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of -1 < 0 > 1"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of -1 < 0 > 1" }
-    timeout           { fail "(timeout) print value of -1 < 0 > 1" }
-  }
-
-
-send_gdb "print 15 ^ 10 ^ 5 ^ 7\n"
-gdb_expect {
-    -re ".\[0-9\]* = 7.*$gdb_prompt $" {
-        pass "print value of 15 ^ 10 ^ 5 ^ 7"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 15 ^ 10 ^ 5 ^ 7" }
-    timeout           { fail "(timeout) print value of 15 ^ 10 ^ 5 ^ 7" }
-  }
-
-
-send_gdb "print 3.5 < 4.0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of 3.5 < 4.0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3.5 < 4.0" }
-    timeout           { fail "(timeout) print value of 3.5 < 4.0" }
-  }
-
-
-send_gdb "print 3.5 < -4.0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 3.5 < -4.0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3.5 < -4.0" }
-    timeout           { fail "(timeout) print value of 3.5 < -4.0" }
-  }
-
-
-send_gdb "print 2 > -3\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of 2 > -3"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 2 > -3" }
-    timeout           { fail "(timeout) print value of 2 > -3" }
-  }
-
-
-send_gdb "print -3>4\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of -3>4"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of -3>4" }
-    timeout           { fail "(timeout) print value of -3>4" }
-  }
-
-
-send_gdb "print (-3 > 4)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of (-3 > 4)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (-3 > 4)" }
-    timeout           { fail "(timeout) print value of (-3 > 4)" }
-  }
-
-
-send_gdb "print 3>=2.5\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of 3>=2.5"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3>=2.5" }
-    timeout           { fail "(timeout) print value of 3>=2.5" }
-  }
-
-
-send_gdb "print 3>=4.5\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 3>=4.5"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3>=4.5" }
-    timeout           { fail "(timeout) print value of 3>=4.5" }
-  }
-
-
-send_gdb "print 3==3.0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of 3==3.0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3==3.0" }
-    timeout           { fail "(timeout) print value of 3==3.0" }
-  }
-
-
-send_gdb "print 3==4.0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 3==4.0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3==4.0" }
-    timeout           { fail "(timeout) print value of 3==4.0" }
-  }
-
-
-send_gdb "print 3!=3.0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 3!=3.0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3!=3.0" }
-    timeout           { fail "(timeout) print value of 3!=3.0" }
-  }
-
-
-send_gdb "print 3!=5.0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of 3!=5.0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 3!=5.0" }
-    timeout           { fail "(timeout) print value of 3!=5.0" }
-  }
-
-
-send_gdb "print 0 || 1 && 0 | 0 ^ 0 == 8 > 128 >>1 +2 *2\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 0 || 1 && 0 | 0 ^ 0 == 8 > 128 >>1 +2 *2"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 0 || 1 && 0 | 0 ^ 0 == 8 > 128 >>1 +2 *2" }
-    timeout           { fail "(timeout) print value of 0 || 1 && 0 | 0 ^ 0 == 8 > 128 >>1 +2 *2" }
-  }
-
-
-send_gdb "print 1.0 || 0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of 1.0 || 0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 1.0 || 0" }
-    timeout           { fail "(timeout) print value of 1.0 || 0" }
-  }
-
-
-send_gdb "print 0.0 || 1.0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of 0.0 || 1.0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 0.0 || 1.0" }
-    timeout           { fail "(timeout) print value of 0.0 || 1.0" }
-  }
-
-
-send_gdb "print 0.0 || 0\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 0.0 || 0"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 0.0 || 0" }
-    timeout           { fail "(timeout) print value of 0.0 || 0" }
-  }
-
-
-send_gdb "print 0 || 1 && 0 | 0 ^ 0 == 8\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 0 || 1 && 0 | 0 ^ 0 == 8"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 0 || 1 && 0 | 0 ^ 0 == 8" }
-    timeout           { fail "(timeout) print value of 0 || 1 && 0 | 0 ^ 0 == 8" }
-  }
-
-
-send_gdb "print 0 == 8 > 128 >> 1 + 2 * 2\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of 0 == 8 > 128 >> 1 + 2 * 2"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of 0 == 8 > 128 >> 1 + 2 * 2" }
-    timeout           { fail "(timeout) print value of 0 == 8 > 128 >> 1 + 2 * 2" }
-  }
-
diff --git a/gdb/testsuite/gdb.base/branches.c b/gdb/testsuite/gdb.base/branches.c
deleted file mode 100644
index df3b7c052be..00000000000
--- a/gdb/testsuite/gdb.base/branches.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Tests for single stepping through various branch conditions */
-
-int noscramble(int a)
-{
-  return a ;
-}
-
-int echo(int a)
-{ return noscramble(a) ; }
-
-int equaltest(int a,int b)
-{ int retval ;
-  if (a == b)
-    retval = noscramble(1) ;
-  else retval = noscramble(0) ;
-  return retval ;
-}
-
-int neqtest(int a , int b)
-{ int retval ;
-  if (a != b)
-    retval = echo(1) ;
-  else retval = echo(2) ;
-  return retval ;
-}
-int zerotest(int a )
-{ int retval ;
-  a = echo(a) ;
-  if (a ==0)
-    retval = echo(1) ;
-  else
-    retval = echo(0) ;
-  retval = echo(retval) ;
-  return retval ;
-}
-
-int zerotest2(int a)
-{
-  return (a==0) ;
-}
-
-int nonzerotest(int a)
-{
-  int retval ;
-  if (a != 0)
-    retval = echo(0) ;
-  else retval = echo(1) ;
-  return retval ;
-}
-
-int whiletest(int a)
-{
-  while (a > 0)
-    {
-      a-- ;
-    }
-  return 0 ;
-}
-int whiletest2(int a)
-{
-  while (a > 0)
-    {
-      a = noscramble(a) ;
-      a-- ;
-    }
-  return a ;
-}
-
-int decr(int x) { return x - 1  ; }
-
-int while3(int a)
-{
-  int b = a ;
-  while (a == b)
-    {
-      a = echo(a) ;
-      b = decr(b) ;
-    }
-  return a ;
-}
-
-void done (int x) { } 
-
-int main()
-{
-  int a,b,c,d ;
-  done(1) ;
-  a = echo(123456) ;
-  b = echo(123456) ;
-  c = echo(56789) ;
-  d = echo(0) ;
-#if 1
-  equaltest(a,b) ;
-  done(7) ;
-  equaltest(a,c) ;
-  done(8) ;
-  whiletest(3) ;  /* worked */
-  done(3) ;
-  while3(3) ;
-  done(6) ;
-#endif  
-  neqtest(a,b) ; 
-  neqtest(a,b) ; 
-  neqtest(a,c) ; 
-  zerotest(d) ;
-  zerotest(a) ;
-  done(5) ;
-  nonzerotest(d) ;
-  done(4) ;
-  nonzerotest(a) ;
-  done(111) ;
-  return 1 ;
-}
diff --git a/gdb/testsuite/gdb.base/break.c b/gdb/testsuite/gdb.base/break.c
deleted file mode 100644
index bf398fcca91..00000000000
--- a/gdb/testsuite/gdb.base/break.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1992, 1993, 1994, 1995, 1999, 2002, 2003 Free Software
-   Foundation, 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  */
-
-#ifdef vxworks
-
-#  include <stdio.h>
-
-/* VxWorks does not supply atoi.  */
-static int
-atoi (z)
-     char *z;
-{
-  int i = 0;
-
-  while (*z >= '0' && *z <= '9')
-    i = i * 10 + (*z++ - '0');
-  return i;
-}
-
-/* I don't know of any way to pass an array to VxWorks.  This function
-   can be called directly from gdb.  */
-
-vxmain (arg)
-char *arg;
-{
-  char *argv[2];
-
-  argv[0] = "";
-  argv[1] = arg;
-  main (2, argv, (char **) 0);
-}
-
-#else /* ! vxworks */
-#  include <stdio.h>
-#  include <stdlib.h>
-#endif /* ! vxworks */
-
-#ifdef PROTOTYPES
-extern int marker1 (void);
-extern int marker2 (int a);
-extern void marker3 (char *a, char *b);
-extern void marker4 (long d);
-#else
-extern int marker1 ();
-extern int marker2 ();
-extern void marker3 ();
-extern void marker4 ();
-#endif
-
-/*
- *	This simple classical example of recursion is useful for
- *	testing stack backtraces and such.
- */
-
-#ifdef PROTOTYPES
-int factorial(int);
-
-int
-main (int argc, char **argv, char **envp)
-#else
-int
-main (argc, argv, envp)
-int argc;
-char *argv[], **envp;
-#endif
-{
-#ifdef usestubs
-    set_debug_traps();  /* set breakpoint 5 here */
-    breakpoint();
-#endif
-    if (argc == 12345) {  /* an unlikely value < 2^16, in case uninited */ /* set breakpoint 6 here */
-	fprintf (stderr, "usage:  factorial <number>\n");
-	return 1;
-    }
-    printf ("%d\n", factorial (atoi ("6")));  /* set breakpoint 1 here */
-    /* set breakpoint 12 here */
-    marker1 ();  /* set breakpoint 11 here */
-    marker2 (43); /* set breakpoint 20 here */
-    marker3 ("stack", "trace"); /* set breakpoint 21 here */
-    marker4 (177601976L);
-    argc = (argc == 12345); /* This is silly, but we can step off of it */ /* set breakpoint 2 here */
-    return argc;  /* set breakpoint 10 here */
-}
-
-#ifdef PROTOTYPES
-int factorial (int value)
-#else
-int factorial (value)
-int value;
-#endif
-{
-  if (value > 1) {  /* set breakpoint 7 here */
-	value *= factorial (value - 1);
-    }
-    return (value); /* set breakpoint 19 here */
-}
-
-#ifdef PROTOTYPES
-int multi_line_if_conditional (int a, int b, int c)
-#else
-int multi_line_if_conditional (a, b, c)
-  int a, b, c;
-#endif
-{
-  if (a    /* set breakpoint 3 here */
-      && b
-      && c)
-    return 0;
-  else
-    return 1;
-}
-
-#ifdef PROTOTYPES
-int multi_line_while_conditional (int a, int b, int c)
-#else
-int multi_line_while_conditional (a, b, c)
-  int a, b, c;
-#endif
-{
-  while (a /* set breakpoint 4 here */
-      && b
-      && c)
-    {
-      a--, b--, c--;
-    }
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
deleted file mode 100644
index c425d1439cf..00000000000
--- a/gdb/testsuite/gdb.base/break.exp
+++ /dev/null
@@ -1,971 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2002, 2003
-#   Free Software Foundation, 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 Rob Savoye. (rob@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-#
-# test simple breakpoint setting commands
-#
-
-# Test deleting all breakpoints when there are none installed,
-# GDB should not prompt for confirmation.
-# Note that gdb-init.exp provides a "delete_breakpoints" proc
-# for general use elsewhere.
-
-send_gdb "delete breakpoints\n"
-gdb_expect {
-     -re "Delete all breakpoints.*$" {
-	    send_gdb "y\n"
-	    gdb_expect {
-		-re "$gdb_prompt $" {
-		    fail "Delete all breakpoints when none (unexpected prompt)"
-		}
-		timeout	{ fail "Delete all breakpoints when none (timeout after unexpected prompt)" }
-	    }
-	}
-     -re ".*$gdb_prompt $"       { pass "Delete all breakpoints when none" }
-    timeout	            { fail "Delete all breakpoints when none (timeout)" }
-}
-
-#
-# test break at function
-#
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint function"
-
-#
-# test break at quoted function
-#
-gdb_test "break \"marker2\"" \
-    "Breakpoint.*at.* file .*$srcfile1, line.*" \
-    "breakpoint quoted function"
-
-#
-# test break at function in file
-#
-gdb_test "break $srcfile:factorial" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint function in file"
-
-set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
-
-#
-# test break at line number
-#
-# Note that the default source file is the last one whose source text
-# was printed.  For native debugging, before we've executed the
-# program, this is the file containing main, but for remote debugging,
-# it's wherever the processor was stopped when we connected to the
-# board.  So, to be sure, we do a list command.
-#
-gdb_test "list main" \
-    ".*main \\(argc, argv, envp\\).*" \
-    "use `list' to establish default source file"
-gdb_test "break $bp_location1" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
-    "breakpoint line number"
-
-#
-# test duplicate breakpoint
-#
-gdb_test "break $bp_location1" \
-    "Note: breakpoint \[0-9\]+ also set at pc.*Breakpoint \[0-9\]+ at.* file .*$srcfile, line $bp_location1\\." \
-    "breakpoint duplicate"
-
-set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
-
-#
-# test break at line number in file
-#
-gdb_test "break $srcfile:$bp_location2" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location2\\." \
-    "breakpoint line number in file"
-
-set bp_location3 [gdb_get_line_number "set breakpoint 3 here"]
-set bp_location4 [gdb_get_line_number "set breakpoint 4 here"]
-
-#
-# Test putting a break at the start of a multi-line if conditional.
-# Verify the breakpoint was put at the start of the conditional.
-#
-gdb_test "break multi_line_if_conditional" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location3\\." \
-    "breakpoint at start of multi line if conditional"
-
-gdb_test "break multi_line_while_conditional" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location4\\." \
-    "breakpoint at start of multi line while conditional"
-
-set bp_location5 [gdb_get_line_number "set breakpoint 5 here"]
-set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
-
-#
-# check to see what breakpoints are set
-#
-if [target_info exists gdb_stub] {
-    set main_line $bp_location5
-} else {
-    set main_line $bp_location6
-}
-
-if {$hp_aCC_compiler} {
-    set proto "\\(int\\)"
-} else {
-    set proto ""
-}
-
-set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
-set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
-set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1]
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$main_line.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in marker2 at .*$srcfile1:($bp_location8|$bp_location9).*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in factorial$proto at .*$srcfile:$bp_location7.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location2.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in multi_line_if_conditional at .*$srcfile:$bp_location3.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in multi_line_while_conditional at .*$srcfile:$bp_location4" \
-    "breakpoint info"
-
-# FIXME: The rest of this test doesn't work with anything that can't
-# handle arguments.
-# Huh? There doesn't *appear* to be anything that passes arguments
-# below.
-if [istarget "mips-idt-*"] then {
-    return
-}
-
-#
-# run until the breakpoint at main is hit. For non-stubs-using targets.
-#
-if ![target_info exists use_gdb_stub] {
-  if [istarget "*-*-vxworks*"] then {
-    send_gdb "run vxmain \"2\"\n"
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-  } else {
-	send_gdb "run\n"
-  }
-  gdb_expect {
-    -re "The program .* has been started already.*y or n. $" {
-	send_gdb "y\n"
-	exp_continue
-    }
-    -re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $"\
-	                    { pass "run until function breakpoint" }
-    -re ".*$gdb_prompt $"       { fail "run until function breakpoint" }
-    timeout	            { fail "run until function breakpoint (timeout)" }
-  }
-} else {
-    if ![target_info exists gdb_stub] {
-	gdb_test continue ".*Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.*\{.*" "stub continue"
-    }
-}
-
-#
-# run until the breakpoint at a line number
-#
-gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location1.*$bp_location1\[\t \]+printf.*factorial.*" \
-			"run until breakpoint set at a line number"
-
-#
-# Run until the breakpoint set in a function in a file
-#
-for {set i 6} {$i >= 1} {incr i -1} {
-	gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, factorial \\(value=$i\\) at .*$srcfile:$bp_location7.*$bp_location7\[\t \]+.*if .value > 1. \{.*" \
-			"run until file:function($i) breakpoint"
-}
-
-#
-# Run until the breakpoint set at a quoted function
-#
-gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, (0x\[0-9a-f\]+ in )?marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*" \
-		"run until quoted breakpoint"
-#
-# run until the file:function breakpoint at a line number in a file
-#
-gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location2.*$bp_location2\[\t \]+argc = \\(argc == 12345\\);.*" \
-		"run until file:linenum breakpoint"
-
-# Test break at offset +1
-set bp_location10 [gdb_get_line_number "set breakpoint 10 here"]
-
-gdb_test "break +1" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location10\\." \
-    "breakpoint offset +1"
-
-# Check to see if breakpoint is hit when stepped onto
-
-gdb_test "step" \
-    ".*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location10.*$bp_location10\[\t \]+return argc;.*breakpoint 10 here.*" \
-    "step onto breakpoint"
-
-#
-# delete all breakpoints so we can start over, course this can be a test too
-#
-delete_breakpoints
-
-#
-# test temporary breakpoint at function
-#
-
-gdb_test "tbreak main" "Breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
-
-#
-# test break at function in file
-#
-
-gdb_test "tbreak $srcfile:factorial" "Breakpoint.*at.* file .*$srcfile, line.*" \
-	"Temporary breakpoint function in file"
-
-#
-# test break at line number
-#
-send_gdb "tbreak $bp_location1\n"
-gdb_expect {
-    -re "Breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" { pass "Temporary breakpoint line number #1" }
-	-re ".*$gdb_prompt $"   { pass "Temporary breakpoint line number #1" }
-	timeout	    { fail "breakpoint line number #1 (timeout)" }
-}
-
-gdb_test "tbreak $bp_location6" "Breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "Temporary breakpoint line number #2"
-
-#
-# test break at line number in file
-#
-send_gdb "tbreak $srcfile:$bp_location2\n"
-gdb_expect {
-    -re "Breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" { pass "Temporary breakpoint line number in file #1" }
-	-re ".*$gdb_prompt $"   { pass "Temporary breakpoint line number in file #1" }
-	timeout	    { fail "Temporary breakpoint line number in file #1 (timeout)" }
-}
-
-set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
-gdb_test  "tbreak $srcfile:$bp_location11" "Breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
-
-#
-# check to see what breakpoints are set (temporary this time)
-#
-gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$main_line.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in factorial$proto at .*$srcfile:$bp_location7.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$bp_location1.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$bp_location6.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$bp_location2.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$bp_location11.*" \
-    "Temporary breakpoint info"
-
-
-#***********
-
-# Verify that catchpoints for fork, vfork and exec don't trigger
-# inappropriately.  (There are no calls to those system functions
-# in this test program.)
-#
-if ![runto_main] then { fail "break tests suppressed" }
-
-send_gdb "catch\n"
-gdb_expect {
-  -re "Catch requires an event name.*$gdb_prompt $"\
-          {pass "catch requires an event name"}
-  -re "$gdb_prompt $"\
-          {fail "catch requires an event name"}
-  timeout {fail "(timeout) catch requires an event name"}
-}
-
-
-set name "set catch fork, never expected to trigger"
-send_gdb "catch fork\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .fork..*$gdb_prompt $"
-          {pass $name}
-  -re "Catch of fork not yet implemented.*$gdb_prompt $"
-	  {pass $name}
-  -re "$gdb_prompt $"
-          {fail $name}
-  timeout {fail "(timeout) $name"}
-}
-
-
-set name "set catch vfork, never expected to trigger"
-send_gdb "catch vfork\n"
-
-# If we are on HP-UX 10.20, we expect an error message to be
-# printed if we type "catch vfork" at the gdb gdb_prompt.  This is
-# because on HP-UX 10.20, we cannot catch vfork events.
-
-if [istarget "hppa*-hp-hpux10.20"] then {
-    gdb_expect {
-	-re "Catch of vfork events not supported on HP-UX 10.20..*$gdb_prompt $"
-		{pass $name}
-	-re "$gdb_prompt $"
-		{fail $name}
-	timeout {fail "(timeout) $name"}
-    }
-} else {
-    gdb_expect {
-	-re "Catchpoint \[0-9\]* .vfork..*$gdb_prompt $"
-		{pass $name}
-	-re "Catch of vfork not yet implemented.*$gdb_prompt $"
-		{pass $name}
-	-re "$gdb_prompt $"
-		{fail $name}
-	timeout {fail "(timeout) $name"}
-    }
-}
-
-set name "set catch exec, never expected to trigger"
-send_gdb "catch exec\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .exec..*$gdb_prompt $"
-          {pass $name}
-  -re "Catch of exec not yet implemented.*$gdb_prompt $"
-	  {pass $name}
-  -re "$gdb_prompt $" {fail $name}
-  timeout {fail "(timeout) $name"}
-}
-
-# Verify that GDB responds gracefully when asked to set a breakpoint
-# on a nonexistent source line.
-#
-send_gdb "break 999\n"
-gdb_expect {
-  -re "No line 999 in file .*$gdb_prompt $"\
-          {pass "break on non-existent source line"}
-  -re "$gdb_prompt $"\
-          {fail "break on non-existent source line"}
-  timeout {fail "(timeout) break on non-existent source line"}
-}
-
-# Run to the desired default location. If not positioned here, the
-# tests below don't work.
-#
-gdb_test "until $bp_location1" "main .* at .*:$bp_location1.*" "until bp_location1"
-
-
-# Verify that GDB allows one to just say "break", which is treated
-# as the "default" breakpoint.  Note that GDB gets cute when printing
-# the informational message about other breakpoints at the same
-# location.  We'll hit that bird with this stone too.
-#
-send_gdb "break\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "break on default location, 1st time"}
-  -re "$gdb_prompt $"\
-          {fail "break on default location, 1st time"}
-  timeout {fail "(timeout) break on default location, 1st time"}
-}
-
-send_gdb "break\n"
-gdb_expect {
-  -re "Note: breakpoint \[0-9\]* also set at .*Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "break on default location, 2nd time"}
-  -re "$gdb_prompt $"\
-          {fail "break on default location, 2nd time"}
-  timeout {fail "(timeout) break on default location, 2nd time"}
-}
-
-send_gdb "break\n"
-gdb_expect {
-  -re "Note: breakpoints \[0-9\]* and \[0-9\]* also set at .*Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "break on default location, 3rd time"}
-  -re "$gdb_prompt $"\
-          {fail "break on default location, 3rd time"}
-  timeout {fail "(timeout) break on default location, 3rd time"}
-}
-
-send_gdb "break\n"
-gdb_expect {
-  -re "Note: breakpoints \[0-9\]*, \[0-9\]* and \[0-9\]* also set at .*Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "break on default location, 4th time"}
-  -re "$gdb_prompt $"\
-          {fail "break on default location, 4th time"}
-  timeout {fail "(timeout) break on default location, 4th time"}
-}
-
-# Verify that a "silent" breakpoint can be set, and that GDB is indeed
-# "silent" about its triggering.
-#
-if ![runto_main] then { fail "break tests suppressed" }
-
-send_gdb "break $bp_location1\n"
-gdb_expect {
-  -re "Breakpoint (\[0-9\]*) at .*, line $bp_location1.*$gdb_prompt $"\
-          {pass "set to-be-silent break bp_location1"}
-  -re "$gdb_prompt $"\
-          {fail "set to-be-silent break bp_location1"}
-  timeout {fail "(timeout) set to-be-silent break bp_location1"}
-}
-
-send_gdb "commands $expect_out(1,string)\n"
-send_gdb "silent\n"
-send_gdb "end\n"
-gdb_expect {
-  -re ".*$gdb_prompt $"\
-          {pass "set silent break bp_location1"}
-  timeout {fail "(timeout) set silent break bp_location1"}
-}
-
-send_gdb "info break $expect_out(1,string)\n"
-gdb_expect {
-  -re "\[0-9\]*\[ \t\]*breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*$gdb_prompt $"\
-          {pass "info silent break bp_location1"}
-  -re "$gdb_prompt $"\
-          {fail "info silent break bp_location1"}
-  timeout {fail "(timeout) info silent break bp_location1"}
-}
-send_gdb "continue\n"
-gdb_expect {
-  -re "Continuing.\r\n$gdb_prompt $"\
-          {pass "hit silent break bp_location1"}
-  -re "$gdb_prompt $"\
-          {fail "hit silent break bp_location1"}
-  timeout {fail "(timeout) hit silent break bp_location1"}
-}
-send_gdb "bt\n"
-gdb_expect {
-  -re "#0  main .* at .*:$bp_location1.*$gdb_prompt $"\
-          {pass "stopped for silent break bp_location1"}
-  -re "$gdb_prompt $"\
-          {fail "stopped for silent break bp_location1"}
-  timeout {fail "(timeout) stopped for silent break bp_location1"}
-}
-
-# Verify that GDB can at least parse a breakpoint with the
-# "thread" keyword.  (We won't attempt to test here that a
-# thread-specific breakpoint really triggers appropriately.
-# The gdb.threads subdirectory contains tests for that.)
-#
-set bp_location12 [gdb_get_line_number "set breakpoint 12 here"]
-send_gdb "break $bp_location12 thread 999\n"
-gdb_expect {
-  -re "Unknown thread 999.*$gdb_prompt $"\
-          {pass "thread-specific breakpoint on non-existent thread disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "thread-specific breakpoint on non-existent thread disallowed"}
-  timeout {fail "(timeout) thread-specific breakpoint on non-existent thread disallowed"}
-}
-send_gdb "break $bp_location12 thread foo\n"
-gdb_expect {
-  -re "Junk after thread keyword..*$gdb_prompt $"\
-          {pass "thread-specific breakpoint on bogus thread ID disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "thread-specific breakpoint on bogus thread ID disallowed"}
-  timeout {fail "(timeout) thread-specific breakpoint on bogus thread ID disallowed"}
-}
-
-# Verify that GDB responds gracefully to a breakpoint command with
-# trailing garbage.
-#
-send_gdb "break $bp_location12 foo\n"
-gdb_expect {
-  -re "Junk at end of arguments..*$gdb_prompt $"\
-          {pass "breakpoint with trailing garbage disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "breakpoint with trailing garbage disallowed"}
-  timeout {fail "(timeout) breakpoint with trailing garbage disallowed"}
-}
-
-# Verify that GDB responds gracefully to a "clear" command that has
-# no matching breakpoint.  (First, get us off the current source line,
-# which we know has a breakpoint.)
-#
-send_gdb "next\n"
-gdb_expect {
-  -re ".*$gdb_prompt $"\
-          {pass "step over breakpoint"}
-  timeout {fail "(timeout) step over breakpoint"}
-}
-send_gdb "clear 81\n"
-gdb_expect {
-  -re "No breakpoint at 81..*$gdb_prompt $"\
-          {pass "clear line has no breakpoint disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "clear line has no breakpoint disallowed"}
-  timeout {fail "(timeout) clear line has no breakpoint disallowed"}
-}
-send_gdb "clear\n"
-gdb_expect {
-  -re "No breakpoint at this line..*$gdb_prompt $"\
-          {pass "clear current line has no breakpoint disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "clear current line has no breakpoint disallowed"}
-  timeout {fail "(timeout) clear current line has no breakpoint disallowed"}
-}
-
-# Verify that we can set and clear multiple breakpoints.
-#
-# We don't test that it deletes the correct breakpoints.  We do at
-# least test that it deletes more than one breakpoint.
-#
-gdb_test "break marker3" "Breakpoint.*at.*" "break marker3 #1"
-gdb_test "break marker3" "Breakpoint.*at.*" "break marker3 #2"
-gdb_test "clear marker3" {Deleted breakpoints [0-9]+ [0-9]+.*}
-
-# Verify that a breakpoint can be set via a convenience variable.
-#
-send_gdb "set \$foo=$bp_location11\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "set convenience variable \$foo to bp_location11"}
-  timeout {fail "(timeout) set convenience variable \$foo to bp_location11"}
-}
-send_gdb "break \$foo\n"
-gdb_expect {
-  -re "Breakpoint (\[0-9\]*) at .*, line $bp_location11.*$gdb_prompt $"\
-          {pass "set breakpoint via convenience variable"}
-  -re "$gdb_prompt $"\
-          {fail "set breakpoint via convenience variable"}
-  timeout {fail "(timeout) set breakpoint via convenience variable"}
-}
-
-# Verify that GDB responds gracefully to an attempt to set a
-# breakpoint via a convenience variable whose type is not integer.
-#
-send_gdb "set \$foo=81.5\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "set convenience variable \$foo to 81.5"}
-  timeout {fail "(timeout) set convenience variable \$foo to 81.5"}
-}
-send_gdb "break \$foo\n"
-gdb_expect {
-  -re "Convenience variables used in line specs must have integer values..*$gdb_prompt $"\
-          {pass "set breakpoint via non-integer convenience variable disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "set breakpoint via non-integer convenience variable disallowed"}
-  timeout {fail "(timeout) set breakpoint via non-integer convenience variable disallowed"}
-}
-
-# Verify that we can set and trigger a breakpoint in a user-called function.
-#
-send_gdb "break marker2\n"
-gdb_expect {
-    -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location8|$bp_location9).*$gdb_prompt $"\
-          {pass "set breakpoint on to-be-called function"}
-  -re "$gdb_prompt $"\
-          {fail "set breakpoint on to-be-called function"}
-  timeout {fail "(timeout) set breakpoint on to-be-called function"}
-}
-send_gdb "print marker2(99)\n"
-gdb_expect {
-  -re "The program being debugged stopped while in a function called from GDB.\r\nWhen the function .marker2$proto. is done executing, GDB will silently\r\nstop .instead of continuing to evaluate the expression containing\r\nthe function call...*$gdb_prompt $"\
-          {pass "hit breakpoint on called function"}
-  -re "$gdb_prompt $"\
-          {fail "hit breakpoint on called function"}
-  timeout {fail "(timeout) hit breakpoint on called function"}
-}
-
-# As long as we're stopped (breakpointed) in a called function,
-# verify that we can successfully backtrace & such from here.
-#
-# In this and the following test, the _sr4export check apparently is needed
-# for hppa*-*-hpux.
-#
-send_gdb "bt\n"
-gdb_expect {
-    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*_sr4export.*$gdb_prompt $"\
-            {pass "backtrace while in called function"}
-    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*function called from gdb.*$gdb_prompt $"\
-	    {pass "backtrace while in called function"}
-    -re "$gdb_prompt $"\
-            {fail "backtrace while in called function"}
-    timeout {fail "(timeout) backtrace while in called function"}
-}
-
-# Return from the called function.  For remote targets, it's important to do
-# this before runto_main, which otherwise may silently stop on the dummy
-# breakpoint inserted by GDB at the program's entry point.
-#
-send_gdb "finish\n"
-gdb_expect {
-    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.* in _sr4export.*$gdb_prompt $"\
-            {pass "finish from called function"}
-    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*function called from gdb.*$gdb_prompt $"\
-            {pass "finish from called function"}
-    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*Value returned.*$gdb_prompt $"\
-            {pass "finish from called function"}
-    -re "$gdb_prompt $"\
-            {fail "finish from called function"}
-    timeout {fail "(timeout) finish from called function"}
-}
-
-# Verify that GDB responds gracefully to a "finish" command with
-# arguments.
-#
-if ![runto_main] then { fail "break tests suppressed" }
-
-send_gdb "finish 123\n"
-gdb_expect {
-  -re "The \"finish\" command does not take any arguments.\r\n$gdb_prompt $"\
-          {pass "finish with arguments disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "finish with arguments disallowed"}
-  timeout {fail "(timeout) finish with arguments disallowed"}
-}
-
-# Verify that GDB responds gracefully to a request to "finish" from
-# the outermost frame.  On a stub that never exits, this will just
-# run to the stubs routine, so we don't get this error...  Thus the 
-# second condition.
-#
-
-send_gdb "finish\n"
-gdb_expect {
-  -re "\"finish\" not meaningful in the outermost frame.\r\n$gdb_prompt $"\
-          {pass "finish from outermost frame disallowed"}
-  -re "Run till exit from.*\r\n$gdb_prompt $" {
-     pass "finish from outermost frame disallowed"
-  }
-  -re "$gdb_prompt $"\
-          {fail "finish from outermost frame disallowed"}
-  timeout {fail "(timeout) finish from outermost frame disallowed"}
-}
-
-# Verify that we can explicitly ask GDB to stop on all shared library
-# events, and that it does so.
-#
-if [istarget "hppa*-*-hpux*"] then {
-  if ![runto_main] then { fail "break tests suppressed" }
-
-  send_gdb "set stop-on-solib-events 1\n"
-  gdb_expect {
-    -re "$gdb_prompt $"\
-            {pass "set stop-on-solib-events"}
-    timeout {fail "(timeout) set stop-on-solib-events"}
-  }
-
-  send_gdb "run\n"
-  gdb_expect {
-    -re ".*Start it from the beginning.*y or n. $"\
-            {send_gdb "y\n"
-             gdb_expect {
-               -re ".*Stopped due to shared library event.*$gdb_prompt $"\
-                       {pass "triggered stop-on-solib-events"}
-               -re "$gdb_prompt $"\
-                       {fail "triggered stop-on-solib-events"}
-               timeout {fail "(timeout) triggered stop-on-solib-events"}
-             }
-            }
-    -re "$gdb_prompt $"\
-            {fail "rerun for stop-on-solib-events"}
-    timeout {fail "(timeout) rerun for stop-on-solib-events"}
-  }
-
-  send_gdb "set stop-on-solib-events 0\n"
-  gdb_expect {
-    -re "$gdb_prompt $"\
-            {pass "reset stop-on-solib-events"}
-    timeout {fail "(timeout) reset stop-on-solib-events"}
-  }
-}
-
-# Hardware breakpoints are unsupported on HP-UX.  Verify that GDB
-# gracefully responds to requests to create them.
-#
-if [istarget "hppa*-*-hpux*"] then {
-  if ![runto_main] then { fail "break tests suppressed" }
-
-  send_gdb "hbreak\n"
-  gdb_expect {
-    -re "No hardware breakpoint support in the target.*$gdb_prompt $"\
-            {pass "hw breaks disallowed"}
-    -re "$gdb_prompt $"\
-            {fail "hw breaks disallowed"}
-    timeout {fail "(timeout) hw breaks disallowed"}
-  }
-
-  send_gdb "thbreak\n"
-  gdb_expect {
-    -re "No hardware breakpoint support in the target.*$gdb_prompt $"\
-            {pass "temporary hw breaks disallowed"}
-    -re "$gdb_prompt $"\
-            {fail "temporary hw breaks disallowed"}
-    timeout {fail "(timeout) temporary hw breaks disallowed"}
-  }
-}
-
-#********
-
-
-#
-# Test "next" over recursive function call.
-#
-
-proc test_next_with_recursion {} { 
-    global gdb_prompt
-    global decimal
-    global binfile
-
-    if [target_info exists use_gdb_stub] {
-	# Reload the program.
-	delete_breakpoints
-	gdb_load ${binfile};
-    } else {
-	# FIXME: should be using runto
-	gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
-
-	delete_breakpoints
-    }
-
-    gdb_test "break factorial" "Breakpoint $decimal at .*" "break at factorial"
-
-    # Run until we call factorial with 6
-
-    if [istarget "*-*-vxworks*"] then {
-	send_gdb "run vxmain \"6\"\n"
-    } else {
-	gdb_run_cmd
-    }
-    gdb_expect {
-	-re "Break.* factorial .value=6. .*$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" {
-	    fail "run to factorial(6)";
-	    gdb_suppress_tests;
-	}
-	timeout { fail "run to factorial(6) (timeout)" ; gdb_suppress_tests }
-    }
-
-    # Continue until we call factorial recursively with 5.
-
-    if [gdb_test "continue" \
-	"Continuing.*Break.* factorial .value=5. .*" \
-	"continue to factorial(5)"] then { gdb_suppress_tests }
-
-    # Do a backtrace just to confirm how many levels deep we are.
-
-    if [gdb_test "backtrace" \
-	"#0\[ \t\]+ factorial .value=5..*" \
-	"backtrace from factorial(5)"] then { gdb_suppress_tests }
-
-    # Now a "next" should position us at the recursive call, which
-    # we will be performing with 4.
-
-    if [gdb_test "next" \
-	".* factorial .value - 1.;.*" \
-	"next to recursive call"] then { gdb_suppress_tests }
-
-    # Disable the breakpoint at the entry to factorial by deleting them all.
-    # The "next" should run until we return to the next line from this
-    # recursive call to factorial with 4.
-    # Buggy versions of gdb will stop instead at the innermost frame on
-    # the line where we are trying to "next" to.
-
-    delete_breakpoints
-
-    if [istarget "mips*tx39-*"] {
-	set timeout 60
-    }
-    # We used to set timeout here for all other targets as well.  This
-    # is almost certainly wrong.  The proper timeout depends on the
-    # target system in use, and how we communicate with it, so there
-    # is no single value appropriate for all targets.  The timeout
-    # should be established by the Dejagnu config file(s) for the
-    # board, and respected by the test suite.
-    #
-    # For example, if I'm running GDB over an SSH tunnel talking to a
-    # portmaster in California talking to an ancient 68k board running
-    # a crummy ROM monitor (a situation I can only wish were
-    # hypothetical), then I need a large timeout.  But that's not the
-    # kind of knowledge that belongs in this file.
-
-    gdb_test next "\[0-9\]*\[\t \]+return \\(value\\);.*" \
-	    "next over recursive call"
-
-    # OK, we should be back in the same stack frame we started from.
-    # Do a backtrace just to confirm.
-
-    set result [gdb_test "backtrace" \
-	    "#0\[ \t\]+ factorial .value=120.*\r\n#1\[ \t\]+ \[0-9a-fx\]+ in factorial .value=6..*" \
-	    "backtrace from factorial(5.1)"]
-    if { $result != 0 } { gdb_suppress_tests }
-
-    if [target_info exists gdb,noresults] { gdb_suppress_tests }
-  gdb_continue_to_end "recursive next test"
-   gdb_stop_suppressing_tests;
-}
-
-test_next_with_recursion
-
-
-#********
-
-# build a new file with optimization enabled so that we can try breakpoints
-# on targets with optimized prologues
-
-set binfileo2 ${objdir}/${subdir}/${testfile}o2
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}O0.o" object {debug "additional_flags=-w -O2"}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}O1.o" object {debug "additional_flags=-w -O2"}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}O0.o ${binfile}O1.o" "${binfileo2}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfileo2}] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfileo2}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# test break at function
-#
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint function, optimized file"
-
-#
-# test break at function
-#
-gdb_test "break marker4" \
-    "Breakpoint.*at.* file .*$srcfile1, line.*" \
-    "breakpoint small function, optimized file"
-
-#
-# run until the breakpoint at main is hit. For non-stubs-using targets.
-#
-if ![target_info exists use_gdb_stub] {
-  if [istarget "*-*-vxworks*"] then {
-    send_gdb "run vxmain \"2\"\n"
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-  } else {
-	send_gdb "run\n"
-  }
-  gdb_expect {
-    -re "The program .* has been started already.*y or n. $" {
-	send_gdb "y\n"
-	exp_continue
-    }
-    -re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $"\
-	                    { pass "run until function breakpoint, optimized file" }
-    -re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$gdb_prompt $"\
-	                    { pass "run until function breakpoint, optimized file (code motion)" }
-    -re ".*$gdb_prompt $"       { fail "run until function breakpoint, optimized file" }
-    timeout	            { fail "run until function breakpoint, optimized file (timeout)" }
-  }
-} else {
-    if ![target_info exists gdb_stub] {
-	gdb_test continue ".*Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.*\{.*" "stub continue, optimized file"
-    }
-}
-
-#
-# run until the breakpoint at a small function
-#
-
-#
-# Add a second pass pattern.  The behavior differs here between stabs
-# and dwarf for one-line functions.  Stabs preserves two line symbols
-# (one before the prologue and one after) with the same line number, 
-# but dwarf regards these as duplicates and discards one of them.
-# Therefore the address after the prologue (where the breakpoint is)
-# has no exactly matching line symbol, and GDB reports the breakpoint
-# as if it were in the middle of a line rather than at the beginning.
-
-set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1]
-set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1]
-send_gdb "continue\n"
-gdb_expect {
-    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
-	pass "run until breakpoint set at small function, optimized file"
-    }
-    -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
-	pass "run until breakpoint set at small function, optimized file"
-    }
-    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" {
-        # marker4() is defined at line 46 when compiled with -DPROTOTYPES
-	pass "run until breakpoint set at small function, optimized file (line bp_location14)"
-    }
-    -re ".*$gdb_prompt " {
-	fail "run until breakpoint set at small function, optimized file"
-    }
-    timeout {
-	fail "run until breakpoint set at small function, optimized file (timeout)"
-    }
-}
-
-
-# Reset the default arguments for VxWorks
-if [istarget "*-*-vxworks*"] {
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
-    send_gdb "set args main\n"
-    gdb_expect -re ".*$gdb_prompt $" {}
-}
diff --git a/gdb/testsuite/gdb.base/break1.c b/gdb/testsuite/gdb.base/break1.c
deleted file mode 100644
index 2ed8b2a4a02..00000000000
--- a/gdb/testsuite/gdb.base/break1.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1992, 1993, 1994, 1995, 1999, 2002, 2003 Free Software
-   Foundation, 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  */
-
-/* The code for this file was extracted from the gdb testsuite
-   testcase "break.c". */
-
-/* The following functions do nothing useful.  They are included
-   simply as places to try setting breakpoints at.  They are
-   explicitly "one-line functions" to verify that this case works
-   (some versions of gcc have or have had problems with this).
-  
-   These functions are in a separate source file to prevent an
-   optimizing compiler from inlining them and optimizing them away. */
-
-#ifdef PROTOTYPES
-int marker1 (void) { return (0); }	/* set breakpoint 15 here */
-int marker2 (int a) { return (1); }	/* set breakpoint 8 here */
-void marker3 (char *a, char *b) {}	/* set breakpoint 17 here */
-void marker4 (long d) {}		/* set breakpoint 14 here */
-#else
-int marker1 () { return (0); }		/* set breakpoint 16 here */
-int marker2 (a) int a; { return (1); }	/* set breakpoint 9 here */
-void marker3 (a, b) char *a, *b; {}	/* set breakpoint 18 here */
-void marker4 (d) long d; {}		/* set breakpoint 13 here */
-#endif
diff --git a/gdb/testsuite/gdb.base/call-ar-st.c b/gdb/testsuite/gdb.base/call-ar-st.c
deleted file mode 100644
index d903f0d3f6b..00000000000
--- a/gdb/testsuite/gdb.base/call-ar-st.c
+++ /dev/null
@@ -1,1339 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/**************************************************************************
- * TESTS :
- *   -- function arguments that are enumerated types
- *   -- small structure arguments ( <= 64 bits ) 
- *            -- stored in registers
- *            -- stored on the stack
- *   -- large structure arguments ( > 64 bits )
- *            -- stored in registers
- *            -- stored on the stack
- *   -- array arguments
- *   -- caller is a leaf routine :
- *            -- use the call command from within an init routine (i.e.
- *               init_bit_flags, init_bit_flags_combo, init_array_rep)
- *   -- caller doesn't have enough space for all the function arguments :
- *            -- call print_long_arg_list from inside print_small_structs
- ***************************************************************************/
-
-/* Some enumerated types -- used to test that the structureal data type is
- * retrieved for function arguments with typedef data types.
- */
-typedef int id_int;
-
-typedef enum { 
-	      BLACK,
-	      BLUE,
-	      BROWN,
-	      ECRUE,
-	      GOLD,
-	      GRAY,
-	      GREEN,
-	      IVORY,
-	      MAUVE,
-	      ORANGE,
-	      PINK,
-	      PURPLE,
-	      RED,
-	      SILVER,
-	      TAN,
-	      VIOLET,
-	      WHITE,
-	      YELLOW} colors;
-
-/* A large structure (> 64 bits) used to test passing large structures as
- * parameters
- */
-
-struct array_rep_info_t {
-   int   next_index[10]; 
-   int   values[10];
-   int   head;
-};
-
-/*****************************************************************************
- * Small structures ( <= 64 bits). These are used to test passing small 
- * structures as parameters and test argument size promotion.
- *****************************************************************************/
-
- /* 64 bits
-  */
-struct small_rep_info_t {
-   int   value;
-   int   head;
-};
-
-/* 6 bits : really fits in 8 bits and is promoted to 32 bits
- */
-struct bit_flags_t {
-       unsigned alpha   :1;
-       unsigned beta    :1;
-       unsigned gamma   :1;
-       unsigned delta   :1;
-       unsigned epsilon :1;
-       unsigned omega   :1;
-};
-
-/* 22 bits : really fits in 40 bits and is promoted to 64 bits
- */
-struct bit_flags_combo_t {
-       unsigned alpha   :1;
-       unsigned beta    :1;
-       char     ch1;
-       unsigned gamma   :1;
-       unsigned delta   :1;
-       char     ch2;
-       unsigned epsilon :1;
-       unsigned omega   :1;
-};
-
-/* 64 bits
- */
-struct one_double_t {
-       double double1;
-};
-
-/* 64 bits
- */
-struct two_floats_t {
-       float float1;
-       float float2;
-};
-
-/* 16 bits : promoted to 32 bits
- */
-struct two_char_t {
-       char ch1;
-       char ch2;
-};
-
-/* 24 bits : promoted to 32 bits
- */
-struct three_char_t {
-       char ch1;
-       char ch2;
-       char ch3;
-};
-
-/* 40 bits : promoted to 64 bits
- */
-struct five_char_t {
-       char ch1;
-       char ch2;
-       char ch3;
-       char ch4;
-       char ch5;
-};
-
-/* 40 bits : promoted to 64 bits
- */
-struct int_char_combo_t {
-       int  int1;
-       char ch1;
-};
-
-/*****************************************************************
- * PRINT_STUDENT_ID_SHIRT_COLOR : 
- * IN     id_int student       -- enumerated type
- * IN     colors shirt         -- enumerated type
- *****************************************************************/
-#ifdef PROTOTYPES
-void print_student_id_shirt_color (id_int student, colors shirt)
-#else
-void print_student_id_shirt_color ( student, shirt ) 
- id_int student;
- colors shirt;
-#endif
-{
-
- printf("student id : %d\t", student);
- printf("shirt color : ");
- switch (shirt) {
-   case BLACK :  printf("BLACK\n"); 
-		 break;
-   case BLUE :   printf("BLUE\n");
-		 break;
-   case BROWN :  printf("BROWN\n");
-		 break;
-   case ECRUE :  printf("ECRUE\n");
-		 break;
-   case GOLD :   printf("GOLD\n");
-		 break;
-   case GRAY :   printf("GRAY\n");
-		 break;
-   case GREEN :  printf("GREEN\n");
-		 break;
-   case IVORY :  printf("IVORY\n");
-		 break;
-   case MAUVE :  printf("MAUVE\n");
-		 break;
-   case ORANGE : printf("ORANGE\n");
-		 break;
-   case PINK :   printf("PINK\n");
-		 break;
-   case PURPLE : printf("PURPLE\n");
-		 break;
-   case RED :    printf("RED\n");
-		 break;
-   case SILVER : printf("SILVER\n");
-		 break;
-   case TAN :    printf("TAN\n");
-		 break;
-   case VIOLET : printf("VIOLET\n");
-		 break;
-   case WHITE :  printf("WHITE\n");
-		 break;
-   case YELLOW : printf("YELLOW\n");
-		 break;
- }
-}
-
-/*****************************************************************
- * PRINT_CHAR_ARRAY : 
- * IN     char  array_c[]      -- character array 
- *****************************************************************/
-#ifdef PROTOTYPES
-void print_char_array (char array_c[])
-#else
-void print_char_array ( array_c ) 
-     char    array_c[];
-#endif
-{
-
-  int index;
-
-  printf("array_c :\n");
-  printf("=========\n\n");
-  for (index = 0; index < 120; index++) {
-      printf("%1c", array_c[index]); 
-      if ((index%50) == 0) printf("\n");
-  }
-  printf("\n\n");
-}
-
-/*****************************************************************
- * PRINT_DOUBLE_ARRAY : 
- * IN     double array_d[]      -- array of doubles
- *****************************************************************/
-#ifdef PROTOTYPES
-void print_double_array (double  array_d[])
-#else
-void print_double_array (array_d) 
-     double  array_d[];
-#endif
-{
-
-  int index;
-
-  printf("array_d :\n");
-  printf("=========\n\n");
-  for (index = 0; index < 9; index++) {
-      printf("%f  ", array_d[index]); 
-      if ((index%8) == 0) printf("\n");
-  }
-  printf("\n\n");
-}
-
-/*****************************************************************
- * PRINT_FLOAT_ARRAY: 
- * IN     float array_f[]      -- array of floats 
- *****************************************************************/
-#ifdef PROTOTYPES
-void print_float_array (float array_f[])
-#else
-void print_float_array ( array_f )
-     float array_f[];
-#endif
-{
-
-  int index;
-
-  printf("array_f :\n");
-  printf("=========\n\n");
-  for (index = 0; index < 15; index++) {
-      printf("%f  ", array_f[index]); 
-      if ((index%8) == 0) printf("\n");
-
-  }
-  printf("\n\n");
-}
-
-/*****************************************************************
- * PRINT_INT_ARRAY: 
- * IN     int  array_i[]      -- array of integers 
- *****************************************************************/
-#ifdef PROTOTYPES
-void print_int_array (int array_i[])
-#else
-void print_int_array ( array_i )
-     int array_i[];
-#endif
-{
-
-  int index;
-
-  printf("array_i :\n");
-  printf("=========\n\n");
-  for (index = 0; index < 50; index++) {
-      printf("%d  ", array_i[index]); 
-      if ((index%8) == 0) printf("\n");
-  }
-  printf("\n\n");
-
-}
-
-/*****************************************************************
- * PRINT_ALL_ARRAYS: 
- * IN     int  array_i[]      -- array of integers 
- * IN     char array_c[]      -- array of characters 
- * IN     float array_f[]      -- array of floats 
- * IN     double array_d[]      -- array of doubles 
- *****************************************************************/
-#ifdef PROTOTYPES
-void print_all_arrays(int array_i[], char array_c[], float array_f[], double array_d[])
-#else
-void print_all_arrays( array_i, array_c, array_f, array_d )
-     int array_i[];
-     char array_c[];
-     float array_f[];
-     double array_d[];
-#endif
-{
-  print_int_array(array_i);
-  print_char_array(array_c);
-  print_float_array(array_f);
-  print_double_array(array_d);
-}
-
-/*****************************************************************
- * LOOP_COUNT : 
- * A do nothing function. Used to provide a point at which calls can be made.  
- *****************************************************************/
-void loop_count () {
-
-     int index;
-
-     for (index=0; index<4; index++);
-}
-
-/*****************************************************************
- * COMPUTE_WITH_SMALL_STRUCTS : 
- * A do nothing function. Used to provide a point at which calls can be made.  
- * IN  int seed
- *****************************************************************/
-#ifdef PROTOTYPES
-void compute_with_small_structs (int seed)
-#else
-void compute_with_small_structs ( seed ) 
- int seed;
-#endif
-{
-
-     struct small_rep_info_t array[4];
-     int index;
-
-     for (index = 0; index < 4; index++) {
-         array[index].value = index*seed;
-	 array[index].head = (index+1)*seed;
-     }
-
-     for (index = 1; index < 4; index++) {
-	 array[index].value = array[index].value + array[index-1].value;
-	 array[index].head = array[index].head + array[index-1].head;
-     }
-}
-
-/*****************************************************************
- * INIT_BIT_FLAGS :
- * Initializes a bit_flags_t structure. Can call this function see
- * the call command behavior when integer arguments do not fit into
- * registers and must be placed on the stack.
- * OUT struct bit_flags_t *bit_flags -- structure to be filled
- * IN  unsigned a  -- 0 or 1 
- * IN  unsigned b  -- 0 or 1 
- * IN  unsigned g  -- 0 or 1 
- * IN  unsigned d  -- 0 or 1 
- * IN  unsigned e  -- 0 or 1 
- * IN  unsigned o  -- 0 or 1 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_bit_flags (struct bit_flags_t *bit_flags, unsigned a, unsigned b, unsigned g, unsigned d, unsigned e, unsigned o)
-#else
-void init_bit_flags ( bit_flags, a, b, g, d, e, o )
-struct bit_flags_t *bit_flags;
-unsigned a;
-unsigned b;
-unsigned g;
-unsigned d;
-unsigned e;
-unsigned o; 
-#endif
-{
-
-   bit_flags->alpha = a;
-   bit_flags->beta = b;
-   bit_flags->gamma = g;
-   bit_flags->delta = d;
-   bit_flags->epsilon = e;
-   bit_flags->omega = o;
-}
-
-/*****************************************************************
- * INIT_BIT_FLAGS_COMBO :
- * Initializes a bit_flags_combo_t structure. Can call this function
- * to see the call command behavior when integer and character arguments
- * do not fit into registers and must be placed on the stack.
- * OUT struct bit_flags_combo_t *bit_flags_combo -- structure to fill
- * IN  unsigned a  -- 0 or 1 
- * IN  unsigned b  -- 0 or 1 
- * IN  char     ch1
- * IN  unsigned g  -- 0 or 1 
- * IN  unsigned d  -- 0 or 1 
- * IN  char     ch2
- * IN  unsigned e  -- 0 or 1 
- * IN  unsigned o  -- 0 or 1 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_bit_flags_combo (struct bit_flags_combo_t *bit_flags_combo, unsigned a, unsigned b, char ch1, unsigned g, unsigned d, char ch2, unsigned e, unsigned o)
-#else
-void init_bit_flags_combo ( bit_flags_combo, a, b, ch1, g, d, ch2, e, o )
-     struct bit_flags_combo_t *bit_flags_combo;
-     unsigned a;
-     unsigned b;
-     char     ch1;
-     unsigned g;
-     unsigned d;
-     char     ch2;
-     unsigned e;
-     unsigned o; 
-#endif
-{
-
-   bit_flags_combo->alpha = a;
-   bit_flags_combo->beta = b;
-   bit_flags_combo->ch1 = ch1;
-   bit_flags_combo->gamma = g;
-   bit_flags_combo->delta = d;
-   bit_flags_combo->ch2 = ch2;
-   bit_flags_combo->epsilon = e;
-   bit_flags_combo->omega = o;
-}
-
-
-/*****************************************************************
- * INIT_ONE_DOUBLE : 
- * OUT  struct one_double_t *one_double  -- structure to fill 
- * IN   double init_val
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_one_double (struct one_double_t *one_double, double init_val)
-#else
-void init_one_double ( one_double, init_val )
-     struct one_double_t *one_double;
-     double init_val; 
-#endif
-{
-
-     one_double->double1  = init_val;
-}
-
-/*****************************************************************
- * INIT_TWO_FLOATS : 
- * OUT struct two_floats_t *two_floats -- structure to be filled
- * IN  float init_val1 
- * IN  float init_val2 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_two_floats (struct two_floats_t *two_floats, float init_val1, float init_val2)
-#else
-void init_two_floats ( two_floats, init_val1, init_val2 )
-     struct two_floats_t *two_floats; 
-     float init_val1;
-     float init_val2;
-#endif
-{
-     two_floats->float1 = init_val1;
-     two_floats->float2 = init_val2;
-}
-
-/*****************************************************************
- * INIT_TWO_CHARS : 
- * OUT struct two_char_t *two_char -- structure to be filled
- * IN  char init_val1 
- * IN  char init_val2 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_two_chars (struct two_char_t *two_char, char init_val1, char init_val2)
-#else
-void init_two_chars ( two_char, init_val1, init_val2 )
-     struct two_char_t *two_char;
-     char init_val1;
-     char init_val2; 
-#endif
-{
-
-     two_char->ch1 = init_val1;
-     two_char->ch2 = init_val2;
-}
-
-/*****************************************************************
- * INIT_THREE_CHARS : 
- * OUT struct three_char_t *three_char -- structure to be filled
- * IN  char init_val1 
- * IN  char init_val2 
- * IN  char init_val3 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_three_chars (struct three_char_t *three_char, char init_val1, char init_val2, char init_val3)
-#else
-void init_three_chars ( three_char, init_val1, init_val2, init_val3 )  
-     struct three_char_t *three_char; 
-     char init_val1;
-     char init_val2;
-     char init_val3;
-#endif
-{
-
-     three_char->ch1 = init_val1;
-     three_char->ch2 = init_val2;
-     three_char->ch3 = init_val3;
-}
-
-/*****************************************************************
- * INIT_FIVE_CHARS : 
- * OUT struct five_char_t *five_char -- structure to be filled
- * IN  char init_val1 
- * IN  char init_val2 
- * IN  char init_val3 
- * IN  char init_val4 
- * IN  char init_val5 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_five_chars (struct five_char_t *five_char, char init_val1, char init_val2, char init_val3, char init_val4, char init_val5)
-#else
-void init_five_chars ( five_char, init_val1, init_val2, init_val3,init_val4,init_val5 )
-     struct five_char_t *five_char;
-     char init_val1;
-     char init_val2;
-     char init_val3;
-     char init_val4;
-     char init_val5;
-#endif
-{
-     five_char->ch1 = init_val1;
-     five_char->ch2 = init_val2;
-     five_char->ch3 = init_val3;
-     five_char->ch4 = init_val4;
-     five_char->ch5 = init_val5;
-}
-
-/*****************************************************************
- * INIT_INT_CHAR_COMBO : 
- * OUT struct int_char_combo_t *combo -- structure to be filled
- * IN  int  init_val1 
- * IN  char init_val2 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_int_char_combo (struct int_char_combo_t *combo, int init_val1, char init_val2)
-#else
-void init_int_char_combo ( combo, init_val1, init_val2 )
-     struct int_char_combo_t *combo;
-     int init_val1; 
-     char init_val2; 
-#endif
-{
-
-     combo->int1 = init_val1;
-     combo->ch1 = init_val2;
-}
-
-/*****************************************************************
- * INIT_STRUCT_REP : 
- * OUT struct small_rep_into_t *small_struct -- structure to be filled
- * IN  int  seed 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_struct_rep(struct small_rep_info_t *small_struct, int seed)
-#else
-void init_struct_rep( small_struct, seed )
-     struct small_rep_info_t *small_struct;
-     int    seed;
-#endif
-{
-
-      small_struct->value = 2 + (seed*2); 
-      small_struct->head = 0; 
-}
-
-/*****************************************************************
- * INIT_SMALL_STRUCTS : 
- * Takes all the small structures as input and calls the appropriate
- * initialization routine for each structure
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_small_structs (
-     struct small_rep_info_t  *struct1,
-     struct small_rep_info_t  *struct2,
-     struct small_rep_info_t  *struct3,
-     struct small_rep_info_t  *struct4,
-     struct bit_flags_t       *flags,
-     struct bit_flags_combo_t *flags_combo,
-     struct three_char_t      *three_char,
-     struct five_char_t       *five_char,
-     struct int_char_combo_t  *int_char_combo,
-     struct one_double_t      *d1,
-     struct one_double_t      *d2,
-     struct one_double_t      *d3,
-     struct two_floats_t      *f1,
-     struct two_floats_t      *f2,
-     struct two_floats_t      *f3)
-#else
-void init_small_structs (struct1, struct2, struct3,struct4,flags,flags_combo,
-three_char, five_char,int_char_combo, d1, d2,d3,f1,f2,f3)
-     struct small_rep_info_t  *struct1;
-     struct small_rep_info_t  *struct2;
-     struct small_rep_info_t  *struct3;
-     struct small_rep_info_t  *struct4;
-     struct bit_flags_t       *flags;
-     struct bit_flags_combo_t *flags_combo;
-     struct three_char_t      *three_char;
-     struct five_char_t       *five_char;
-     struct int_char_combo_t  *int_char_combo;
-     struct one_double_t      *d1;
-     struct one_double_t      *d2;
-     struct one_double_t      *d3;
-     struct two_floats_t      *f1;
-     struct two_floats_t      *f2;
-     struct two_floats_t      *f3;
-#endif
-{
-
-     init_bit_flags(flags, (unsigned)1, (unsigned)0, (unsigned)1, 
-		           (unsigned)0, (unsigned)1, (unsigned)0 ); 
-     init_bit_flags_combo(flags_combo, (unsigned)1, (unsigned)0, 'y',
-				       (unsigned)1, (unsigned)0, 'n',
-                    		       (unsigned)1, (unsigned)0 ); 
-     init_three_chars(three_char, 'a', 'b', 'c');
-     init_five_chars(five_char, 'l', 'm', 'n', 'o', 'p');
-     init_int_char_combo(int_char_combo, 123, 'z');
-     init_struct_rep(struct1, 2);
-     init_struct_rep(struct2, 4);
-     init_struct_rep(struct3, 5);
-     init_struct_rep(struct4, 6);
-     init_one_double ( d1, 10.5); 
-     init_one_double ( d2, -3.375); 
-     init_one_double ( d3, 675.09375); 
-     init_two_floats ( f1, 45.234, 43.6); 
-     init_two_floats ( f2, 78.01, 122.10); 
-     init_two_floats ( f3, -1232.345, -199.21); 
-}
-
-/*****************************************************************
- * PRINT_TEN_DOUBLES : 
- * ?????????????????????????????
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_ten_doubles (
-     double d1,
-     double d2,
-     double d3,
-     double d4,
-     double d5,
-     double d6,
-     double d7,
-     double d8,
-     double d9,
-     double d10)
-#else
-void print_ten_doubles ( d1, d2, d3, d4, d5, d6, d7, d8, d9, d10 )
-     double d1;
-     double d2;
-     double d3;
-     double d4;
-     double d5;
-     double d6;
-     double d7;
-     double d8;
-     double d9;
-     double d10; 
-#endif
-{
-
-  printf("Two Doubles : %f\t%f\n", d1, d2);
-  printf("Two Doubles : %f\t%f\n", d3, d4);
-  printf("Two Doubles : %f\t%f\n", d5, d6);
-  printf("Two Doubles : %f\t%f\n", d7, d8);
-  printf("Two Doubles : %f\t%f\n", d9, d10);
-}
-
-/*****************************************************************
- * PRINT_BIT_FLAGS : 
- * IN struct bit_flags_t bit_flags 
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_bit_flags (struct bit_flags_t bit_flags)
-#else
-void print_bit_flags ( bit_flags )
-struct bit_flags_t bit_flags;
-#endif
-{
-
-     if (bit_flags.alpha) printf("alpha\n");
-     if (bit_flags.beta) printf("beta\n");
-     if (bit_flags.gamma) printf("gamma\n");
-     if (bit_flags.delta) printf("delta\n");
-     if (bit_flags.epsilon) printf("epsilon\n");
-     if (bit_flags.omega) printf("omega\n");
-}
-
-/*****************************************************************
- * PRINT_BIT_FLAGS_COMBO : 
- * IN struct bit_flags_combo_t bit_flags_combo 
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_bit_flags_combo (struct bit_flags_combo_t bit_flags_combo)
-#else
-void print_bit_flags_combo ( bit_flags_combo )
-     struct bit_flags_combo_t bit_flags_combo;
-#endif
-{
-
-     if (bit_flags_combo.alpha) printf("alpha\n");
-     if (bit_flags_combo.beta) printf("beta\n");
-     if (bit_flags_combo.gamma) printf("gamma\n");
-     if (bit_flags_combo.delta) printf("delta\n");
-     if (bit_flags_combo.epsilon) printf("epsilon\n");
-     if (bit_flags_combo.omega) printf("omega\n");
-     printf("ch1: %c\tch2: %c\n", bit_flags_combo.ch1, bit_flags_combo.ch2);
-}
-
-/*****************************************************************
- * PRINT_ONE_DOUBLE : 
- * IN struct one_double_t one_double 
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_one_double (struct one_double_t one_double)
-#else
-void print_one_double ( one_double )
-struct one_double_t one_double;
-#endif
-{
-
-     printf("Contents of one_double_t: \n\n");
-     printf("%f\n", one_double.double1);
-}
-
-/*****************************************************************
- * PRINT_TWO_FLOATS : 
- * IN struct two_floats_t two_floats 
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_two_floats (struct two_floats_t two_floats)
-#else
-void print_two_floats ( two_floats )
-struct two_floats_t two_floats; 
-#endif
-{
-
-     printf("Contents of two_floats_t: \n\n");
-     printf("%f\t%f\n", two_floats.float1, two_floats.float2);
-}
-
-/*****************************************************************
- * PRINT_TWO_CHARS : 
- * IN struct two_char_t two_char
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_two_chars (struct two_char_t two_char)
-#else
-void print_two_chars ( two_char )
-struct two_char_t two_char; 
-#endif
-{
-
-     printf("Contents of two_char_t: \n\n");
-     printf("%c\t%c\n", two_char.ch1, two_char.ch2);
-}
-
-/*****************************************************************
- * PRINT_THREE_CHARS : 
- * IN struct three_char_t three_char
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_three_chars (struct three_char_t three_char)
-#else
-void print_three_chars ( three_char )
-struct three_char_t three_char;
-#endif
-{
-
-     printf("Contents of three_char_t: \n\n");
-     printf("%c\t%c\t%c\n", three_char.ch1, three_char.ch2, three_char.ch3);
-}
-
-/*****************************************************************
- * PRINT_FIVE_CHARS : 
- * IN struct five_char_t five_char
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_five_chars (struct five_char_t five_char)
-#else
-void print_five_chars ( five_char ) 
-struct five_char_t five_char; 
-#endif
-{
-
-     printf("Contents of five_char_t: \n\n");
-     printf("%c\t%c\t%c\t%c\t%c\n", five_char.ch1, five_char.ch2, 
-				    five_char.ch3, five_char.ch4, 
-				    five_char.ch5);
-}
-
-/*****************************************************************
- * PRINT_INT_CHAR_COMBO : 
- * IN struct int_char_combo_t int_char_combo
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_int_char_combo (struct int_char_combo_t int_char_combo)
-#else
-void print_int_char_combo ( int_char_combo )
-struct int_char_combo_t int_char_combo;
-#endif
-{
-
-     printf("Contents of int_char_combo_t: \n\n");
-     printf("%d\t%c\n", int_char_combo.int1, int_char_combo.ch1);
-}     
-
-/*****************************************************************
- * PRINT_STRUCT_REP : 
- * The last parameter must go onto the stack rather than into a register.
- * This is a good function to call to test small structures.
- * IN struct small_rep_info_t  struct1
- * IN struct small_rep_info_t  struct2
- * IN struct small_rep_info_t  struct3
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_struct_rep(
-     struct small_rep_info_t struct1,
-     struct small_rep_info_t struct2,
-     struct small_rep_info_t struct3)
-#else
-void print_struct_rep( struct1, struct2, struct3)
-     struct small_rep_info_t struct1;
-     struct small_rep_info_t struct2;
-     struct small_rep_info_t struct3;
-#endif
-{
-
-
-  printf("Contents of struct1: \n\n");
-  printf("%10d%10d\n", struct1.value, struct1.head); 
-  printf("Contents of struct2: \n\n");
-  printf("%10d%10d\n", struct2.value, struct2.head); 
-  printf("Contents of struct3: \n\n");
-  printf("%10d%10d\n", struct3.value, struct3.head); 
-
-}
-
-/*****************************************************************
- * SUM_STRUCT_PRINT : 
- * The last two parameters must go onto the stack rather than into a register.
- * This is a good function to call to test small structures.
- * IN struct small_rep_info_t  struct1
- * IN struct small_rep_info_t  struct2
- * IN struct small_rep_info_t  struct3
- * IN struct small_rep_info_t  struct4
- ****************************************************************/
-#ifdef PROTOTYPES
-void sum_struct_print (
-     int seed,
-     struct small_rep_info_t struct1,
-     struct small_rep_info_t struct2, 
-     struct small_rep_info_t struct3,
-     struct small_rep_info_t struct4)
-#else
-void sum_struct_print ( seed, struct1, struct2, struct3, struct4) 
-     int seed;
-     struct small_rep_info_t struct1;
-     struct small_rep_info_t struct2; 
-     struct small_rep_info_t struct3; 
-     struct small_rep_info_t struct4; 
-#endif
-{
-     int sum;
-
-     printf("Sum of the 4 struct values and seed : \n\n");
-     sum = seed + struct1.value + struct2.value + struct3.value + struct4.value;
-     printf("%10d\n", sum);
-}
-
-/*****************************************************************
- * PRINT_SMALL_STRUCTS : 
- * This is a good function to call to test small structures.
- * All of the small structures of odd sizes (40 bits, 8bits, etc.)
- * are pushed onto the stack.
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_small_structs (
-     struct small_rep_info_t  struct1,
-     struct small_rep_info_t  struct2,
-     struct small_rep_info_t  struct3,
-     struct small_rep_info_t  struct4,
-     struct bit_flags_t       flags,
-     struct bit_flags_combo_t flags_combo,
-     struct three_char_t      three_char,
-     struct five_char_t       five_char,
-     struct int_char_combo_t  int_char_combo,
-     struct one_double_t      d1,
-     struct one_double_t      d2,
-     struct one_double_t      d3,
-     struct two_floats_t      f1,
-     struct two_floats_t      f2,
-     struct two_floats_t      f3)
-#else
-void print_small_structs ( struct1, struct2, struct3,  struct4, flags, 
-flags_combo, three_char, five_char, int_char_combo, d1, d2,d3,f1,f2,f3)
-     struct small_rep_info_t  struct1;
-     struct small_rep_info_t  struct2;
-     struct small_rep_info_t  struct3;
-     struct small_rep_info_t  struct4;
-     struct bit_flags_t       flags;
-     struct bit_flags_combo_t flags_combo;
-     struct three_char_t      three_char;
-     struct five_char_t       five_char;
-     struct int_char_combo_t  int_char_combo;
-     struct one_double_t      d1;
-     struct one_double_t      d2;
-     struct one_double_t      d3;
-     struct two_floats_t      f1;
-     struct two_floats_t      f2;
-     struct two_floats_t      f3;
-#endif
-{
-   print_bit_flags(flags);
-   print_bit_flags_combo(flags_combo);
-   print_three_chars(three_char);
-   print_five_chars(five_char);
-   print_int_char_combo(int_char_combo);
-   sum_struct_print(10, struct1, struct2, struct3, struct4);
-   print_struct_rep(struct1, struct2, struct3);
-   print_one_double(d1);
-   print_one_double(d2);
-   print_one_double(d3);
-   print_two_floats(f1);
-   print_two_floats(f2);
-   print_two_floats(f3);
-}
-
-/*****************************************************************
- * PRINT_LONG_ARG_LIST : 
- * This is a good function to call to test small structures.
- * The first two parameters ( the doubles ) go into registers. The
- * remaining arguments are pushed onto the stack. Depending on where
- * print_long_arg_list is called from, the size of the argument list 
- * may force more space to be pushed onto the stack as part of the callers
- * frame.
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_long_arg_list (
-     double a,
-     double b,
-     int c,
-     int d,
-     int e,
-     int f,
-     struct small_rep_info_t  struct1,
-     struct small_rep_info_t  struct2,
-     struct small_rep_info_t  struct3,
-     struct small_rep_info_t  struct4,
-     struct bit_flags_t       flags,
-     struct bit_flags_combo_t flags_combo,
-     struct three_char_t      three_char,
-     struct five_char_t       five_char,
-     struct int_char_combo_t  int_char_combo,
-     struct one_double_t      d1,
-     struct one_double_t      d2,
-     struct one_double_t      d3,
-     struct two_floats_t      f1,
-     struct two_floats_t      f2,
-     struct two_floats_t      f3)
-#else
-void print_long_arg_list ( a, b, c, d, e, f, struct1, struct2, struct3, 
-struct4, flags, flags_combo, three_char, five_char, int_char_combo, d1,d2,d3,
-f1, f2, f3 )
-     double a;
-     double b;
-     int c;
-     int d;
-     int e;
-     int f;
-     struct small_rep_info_t  struct1;
-     struct small_rep_info_t  struct2;
-     struct small_rep_info_t  struct3;
-     struct small_rep_info_t  struct4;
-     struct bit_flags_t       flags;
-     struct bit_flags_combo_t flags_combo;
-     struct three_char_t      three_char;
-     struct five_char_t       five_char;
-     struct int_char_combo_t  int_char_combo;
-     struct one_double_t      d1;
-     struct one_double_t      d2;
-     struct one_double_t      d3;
-     struct two_floats_t      f1;
-     struct two_floats_t      f2;
-     struct two_floats_t      f3;
-#endif
-{
-    printf("double : %f\n", a);
-    printf("double : %f\n", b);
-    printf("int : %d\n", c);
-    printf("int : %d\n", d);
-    printf("int : %d\n", e);
-    printf("int : %d\n", f);
-    print_small_structs( struct1, struct2, struct3, struct4, flags, flags_combo,
-			 three_char, five_char, int_char_combo, d1, d2, d3, 
-			 f1, f2, f3);
-}
-
-
-#ifdef PROTOTYPES
-void print_one_large_struct (struct array_rep_info_t linked_list1)
-#else
-void print_one_large_struct( linked_list1 )
-     struct array_rep_info_t linked_list1;
-#endif
-{
-
- /* printf("Contents of linked list1: \n\n");
-  printf("Element Value | Index of Next Element\n");
-  printf("-------------------------------------\n");
-  printf("              |                      \n");*/
-  /*for (index = 0; index < 10; index++) {*/
-
-      printf("%10d%10d\n", linked_list1.values[0], 
-			   linked_list1.next_index[0]); 
-  /*}*/
-}
-
-/*****************************************************************
- * PRINT_ARRAY_REP : 
- * The three structure parameters should fit into registers. 
- * IN struct array_rep_info_t linked_list1
- * IN struct array_rep_info_t linked_list2
- * IN struct array_rep_info_t linked_list3
- ****************************************************************/
-#ifdef PROTOTYPES
-void print_array_rep(
-     struct array_rep_info_t linked_list1,
-     struct array_rep_info_t linked_list2,
-     struct array_rep_info_t linked_list3)
-#else
-void print_array_rep( linked_list1, linked_list2, linked_list3 )
-     struct array_rep_info_t linked_list1;
-     struct array_rep_info_t linked_list2;
-     struct array_rep_info_t linked_list3;
-#endif
-{
-
-  int index;
-
-  printf("Contents of linked list1: \n\n");
-  printf("Element Value | Index of Next Element\n");
-  printf("-------------------------------------\n");
-  printf("              |                      \n");
-  for (index = 0; index < 10; index++) {
-
-      printf("%10d%10d\n", linked_list1.values[index], 
-			   linked_list1.next_index[index]); 
-  }
-
-  printf("Contents of linked list2: \n\n");
-  printf("Element Value | Index of Next Element\n");
-  printf("-------------------------------------\n");
-  printf("              |                      \n");
-  for (index = 0; index < 10; index++) {
-
-      printf("%10d%10d\n", linked_list2.values[index], 
-			   linked_list2.next_index[index]); 
-  }
-
-  printf("Contents of linked list3: \n\n");
-  printf("Element Value | Index of Next Element\n");
-  printf("-------------------------------------\n");
-  printf("              |                      \n");
-  for (index = 0; index < 10; index++) {
-
-      printf("%10d%10d\n", linked_list3.values[index], 
-			   linked_list3.next_index[index]); 
-  }
-
-}
-
-/*****************************************************************
- * SUM_ARRAY_PRINT : 
- * The last structure parameter must be pushed onto the stack 
- * IN int    seed
- * IN struct array_rep_info_t linked_list1
- * IN struct array_rep_info_t linked_list2
- * IN struct array_rep_info_t linked_list3
- * IN struct array_rep_info_t linked_list4
- ****************************************************************/
-#ifdef PROTOTYPES
-void sum_array_print (
-     int seed,
-     struct array_rep_info_t linked_list1,
-     struct array_rep_info_t linked_list2,
-     struct array_rep_info_t linked_list3,
-     struct array_rep_info_t linked_list4)
-#else
-void sum_array_print ( seed, linked_list1, linked_list2, linked_list3,linked_list4)
-     int seed;
-     struct array_rep_info_t linked_list1;
-     struct array_rep_info_t linked_list2;
-     struct array_rep_info_t linked_list3;
-     struct array_rep_info_t linked_list4;
-#endif
-{
-     int index;
-     int sum;
-
-     printf("Sum of 4 arrays, by element (add in seed as well): \n\n");
-     printf("Seed: %d\n", seed);
-     printf("Element Index | Sum \n");
-     printf("-------------------------\n");
-     printf("              |          \n");
-
-     for (index = 0; index < 10; index++) {
-
-         sum = seed + linked_list1.values[index] + linked_list2.values[index] +
-	       linked_list3.values[index] + linked_list4.values[index];
-         printf("%10d%10d\n", index, sum);
-     }
-}
-
-/*****************************************************************
- * INIT_ARRAY_REP : 
- * IN struct array_rep_info_t *linked_list
- * IN int    seed
- ****************************************************************/
-#ifdef PROTOTYPES
-void init_array_rep(
-     struct array_rep_info_t *linked_list,
-     int    seed)
-#else
-void init_array_rep( linked_list, seed )
-     struct array_rep_info_t *linked_list;
-     int    seed;
-#endif
-{
-
-  int index;
-
-  for (index = 0; index < 10; index++) {
-
-      linked_list->values[index] = (2*index) + (seed*2); 
-      linked_list->next_index[index] = index + 1;
-  }
-  linked_list->head = 0; 
-}
-
-
-int main ()  {
-
-  /* variables for array and enumerated type testing
-   */
-  static char     char_array[121];
-  static double   double_array[9];
-  static float    float_array[15];
-  static int      integer_array[50]; 
-  static int      index;
-  static id_int   student_id = 23;
-  static colors   my_shirt = YELLOW;
-    
-  /* variables for large structure testing
-   */
-  static int number = 10;
-  static struct array_rep_info_t *list1;
-  static struct array_rep_info_t *list2;
-  static struct array_rep_info_t *list3;
-  static struct array_rep_info_t *list4;
-
-  /* variables for testing a very long argument list
-   */
-   static double                    a;
-   static double                    b;
-   static int                       c;
-   static int                       d;
-   static int                       e;
-   static int                       f;
-
-  /* variables for testing a small structures and a very long argument list
-   */
-   static struct small_rep_info_t  *struct1;
-   static struct small_rep_info_t  *struct2;
-   static struct small_rep_info_t  *struct3;
-   static struct small_rep_info_t  *struct4;
-   static struct bit_flags_t       *flags;
-   static struct bit_flags_combo_t *flags_combo;
-   static struct three_char_t      *three_char;
-   static struct five_char_t       *five_char;
-   static struct int_char_combo_t  *int_char_combo;
-   static struct one_double_t      *d1;
-   static struct one_double_t      *d2;
-   static struct one_double_t      *d3;
-   static struct two_floats_t      *f1;
-   static struct two_floats_t      *f2;
-   static struct two_floats_t      *f3;
-
-  /* Initialize arrays
-   */
-  for (index = 0; index < 120; index++) {
-      if ((index%2) == 0) char_array[index] = 'Z';
-	 else char_array[index] = 'a';
-  }
-  char_array[120] = '\0';
-
-  for (index = 0; index < 9; index++) {
-      double_array[index] = index*23.4567;
-  }
-
-  for (index = 0; index < 15; index++) {
-      float_array[index] = index/7.02;
-  }
-
-  for (index = 0; index < 50; index++) {
-      integer_array[index] = -index;
-  }
-
-  /* Print arrays
-   */
-  print_char_array(char_array);
-  print_double_array(double_array);
-  print_float_array(float_array);
-  print_student_id_shirt_color(student_id, my_shirt); 
-  print_int_array(integer_array);
-  print_all_arrays(integer_array, char_array, float_array, double_array);
-
-  /* Allocate space for large structures 
-   */
-  list1 = (struct array_rep_info_t *)malloc(sizeof(struct array_rep_info_t));
-  list2 = (struct array_rep_info_t *)malloc(sizeof(struct array_rep_info_t));
-  list3 = (struct array_rep_info_t *)malloc(sizeof(struct array_rep_info_t));
-  list4 = (struct array_rep_info_t *)malloc(sizeof(struct array_rep_info_t));
-
-  /* Initialize large structures 
-   */
-  init_array_rep(list1, 2);
-  init_array_rep(list2, 4);
-  init_array_rep(list3, 5);
-  init_array_rep(list4, 10);
-  printf("HELLO WORLD\n");
-  printf("BYE BYE FOR NOW\n");
-  printf("VERY GREEN GRASS\n");
-
-  /* Print large structures 
-   */
-  sum_array_print(10, *list1, *list2, *list3, *list4);
-  print_array_rep(*list1, *list2, *list3);
-  print_one_large_struct(*list1);
-
-  /* Allocate space for small structures 
-   */
-  struct1     = (struct small_rep_info_t  *)malloc(sizeof(struct small_rep_info_t));
-  struct2     = (struct small_rep_info_t  *)malloc(sizeof(struct small_rep_info_t));
-  struct3     = (struct small_rep_info_t  *)malloc(sizeof(struct small_rep_info_t));
-  struct4     = (struct small_rep_info_t  *)malloc(sizeof(struct small_rep_info_t));
-  flags       = (struct bit_flags_t *)malloc(sizeof(struct bit_flags_t));
-  flags_combo = (struct bit_flags_combo_t *)malloc(sizeof(struct bit_flags_combo_t));
-  three_char  = (struct three_char_t *)malloc(sizeof(struct three_char_t));
-  five_char   = (struct five_char_t *)malloc(sizeof(struct five_char_t));
-  int_char_combo = (struct int_char_combo_t *)malloc(sizeof(struct int_char_combo_t));
-
-  d1 = (struct one_double_t *)malloc(sizeof(struct one_double_t));
-  d2 = (struct one_double_t *)malloc(sizeof(struct one_double_t));
-  d3 = (struct one_double_t *)malloc(sizeof(struct one_double_t));
-
-  f1 = (struct two_floats_t *)malloc(sizeof(struct two_floats_t));
-  f2 = (struct two_floats_t *)malloc(sizeof(struct two_floats_t));
-  f3 = (struct two_floats_t *)malloc(sizeof(struct two_floats_t));
-
-  /* Initialize small structures 
-   */
-  init_small_structs ( struct1, struct2, struct3, struct4, flags, 
-		       flags_combo, three_char, five_char, int_char_combo,
-		       d1, d2, d3, f1, f2, f3);
-
-  /* Print small structures 
-   */
-  print_small_structs ( *struct1, *struct2, *struct3, *struct4, *flags, 
-			*flags_combo, *three_char, *five_char, *int_char_combo,
-			*d1, *d2, *d3, *f1, *f2, *f3);
-
-  /* Print a very long arg list 
-   */
-  a = 22.25;
-  b = 33.375;
-  c = 0;
-  d = -25;
-  e = 100;
-  f = 2345;
-
-  print_long_arg_list ( a, b, c, d, e, f, *struct1, *struct2, *struct3, *struct4, 
-			*flags, *flags_combo, *three_char, *five_char, *int_char_combo,
-			*d1, *d2, *d3, *f1, *f2, *f3);
-
-  /* Initialize small structures 
-   */
-  init_one_double ( d1, 1.11111); 
-  init_one_double ( d2, -345.34); 
-  init_one_double ( d3, 546464.2); 
-  init_two_floats ( f1, 0.234, 453.1); 
-  init_two_floats ( f2, 78.345, 23.09); 
-  init_two_floats ( f3, -2.345, 1.0); 
-  init_bit_flags(flags, (unsigned)1, (unsigned)0, (unsigned)1, 
-		 (unsigned)0, (unsigned)1, (unsigned)0 ); 
-  init_bit_flags_combo(flags_combo, (unsigned)1, (unsigned)0, 'y',
-				     (unsigned)1, (unsigned)0, 'n',
-				     (unsigned)1, (unsigned)0 ); 
-  init_three_chars(three_char, 'x', 'y', 'z');
-  init_five_chars(five_char, 'h', 'e', 'l', 'l', 'o');
-  init_int_char_combo(int_char_combo, 13, '!');
-  init_struct_rep(struct1, 10);
-  init_struct_rep(struct2, 20);
-  init_struct_rep(struct3, 30);
-  init_struct_rep(struct4, 40);
-
-  compute_with_small_structs(35);
-  loop_count();
-  printf("HELLO WORLD\n");
-  printf("BYE BYE FOR NOW\n");
-  printf("VERY GREEN GRASS\n");
-
-  /* Print small structures 
-   */
-  print_one_double(*d1);
-  print_one_double(*d2);
-  print_one_double(*d3);
-  print_two_floats(*f1);
-  print_two_floats(*f2);
-  print_two_floats(*f3);
-  print_bit_flags(*flags);
-  print_bit_flags_combo(*flags_combo);
-  print_three_chars(*three_char);
-  print_five_chars(*five_char);
-  print_int_char_combo(*int_char_combo);
-  sum_struct_print(10, *struct1, *struct2, *struct3, *struct4);
-  print_struct_rep(*struct1, *struct2, *struct3);
-
-  return 0;
-}
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
deleted file mode 100644
index 2a5a55b89de..00000000000
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ /dev/null
@@ -1,709 +0,0 @@
-#   Copyright 1998, 1999, 2000, 2001, 2004
-#   Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "call-ar-st"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Test depends on printf, which the sparclet stub doesn't support.  
-if { [istarget "sparclet-*-*"] } {
-    return 0;
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
-    return -1
-}
-
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# Some targets can't call functions, so don't even bother with this
-# test.
-if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*" 2416
-    fail "This target can not call functions"
-    continue
-}
-
-set oldtimeout $timeout
-set timeout [expr "$timeout + 60"]
-
-# Set the current language to C.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_c {} {
-    global gdb_prompt
-
-    send_gdb "set language c\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {}
-	timeout { fail "set language c (timeout)" ; return 0; }
-    }
-
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"c\".*$gdb_prompt $" {
-	    pass "set language to \"c\""
-	    return 1
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "setting language to \"c\""
-	    return 0
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return 0
-	}
-    }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-get_debug_format
-
-#go -until 1209
-gdb_test "tbreak 1209" \
-    "Breakpoint \[0-9\]+.*file.*$srcfile, line 1209.*" \
-    "tbreakpoint line 1209"
-
-gdb_test continue \
-"Continuing\\..*main \\(\\) at.*$srcfile:1209.*" \
-"run until breakpoint set at a line"
-
-
-#call print_double_array(double_array)
-if {![gdb_skip_float_test "print print_double_array(double_array)"] && \
-    ![gdb_skip_stdio_test "print print_double_array(double_array)"] } {
-  send_gdb "print print_double_array(double_array)\n"
-  gdb_expect_list "print print_double_array(double_array)" ".*$gdb_prompt $" {
-	"\[ \t\r\n\]+array_d :"
-	"\[ \t\r\n\]+========="
-	"\[ \t\r\n\]+0.000000"
-	"\[ \t\r\n\]+23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]"
-	"\[ \t\r\n\]+"
-  }
-}
-
-#call print_char_array(char_array)
-
-if ![gdb_skip_stdio_test "print_char_array(char_array)"] {
-    send_gdb "print print_char_array(char_array)\n"
-    gdb_expect_list "print print_char_array(char_array)" ".*$gdb_prompt $" {
-	"\[ \t\r\n\]+array_c :"
-	"\[ \t\r\n\]+========="
-	"\[ \t\r\n\]+\[ \t\r\n\]+Z"
-	"\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ"
-	"\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ"
-	"\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZa\[ \t\r\n\]+\[ \t\r\n\]+"
-    }
-}
-
-
-
-
-#go -until 1216
-gdb_test "tbreak 1216" \
-"Breakpoint.*file.*$srcfile, line 1216.*" \
-"tbreakpoint line 1216"
-
-if ![gdb_skip_stdio_test "continue to 1216"] {
-    send_gdb "continue\n"
-    gdb_expect_list "continue to 1216" ".*$gdb_prompt $" {
-	"\[ \t\r\n\]+array_c :"
-	"\[ \t\r\n\]+========="
-	"\[ \t\r\n\]+\[ \t\r\n\]+Z"
-	"\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ"
-	"\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ"
-	"\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZa"
-	"\[ \t\r\n\]+main.*at.*:1216"
-	"\[ \t\r\n\]+1216.*print_double_array\\(double_array\\)"
-    }
-} else {
-    gdb_test "continue" "" ""
-}
-
-# I am disabling this test, because it takes too long. I verified by
-# hand that it works, feel free to check for yourself. 
-#call print_all_arrays(integer_array, char_array, float_array, double_array)
-#send_gdb "print print_all_arrays(integer_array, char_array, float_array, double_array)\n"
-#gdb_expect {
-#    -re ".*array_i :\[ \t\r\n\]+=========\[ \t\r\n\]+\[ \t\r\n\]+0\[ \t\r\n\]+-1  -2  -3  -4  -5  -6  -7  -8\[ \t\r\n\]+-9  -10  -11  -12  -13  -14  -15  -16\[ \t\r\n\]+-17  -18  -19  -20  -21  -22  -23  -24\[ \t\r\n\]+-25  -26  -27  -28  -29  -30  -31  -32\[ \t\r\n\]+-33  -34  -35  -36  -37  -38  -39  -40\[ \t\r\n\]+-41  -42  -43  -44  -45  -46  -47  -48\[ \t\r\n\]+-49\[ \t\r\n\]+\[ \t\r\n\]+array_c :\[ \t\r\n\]+=========\[ \t\r\n\]+\[ \t\r\n\]+Z\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZ\[ \t\r\n\]+aZaZaZaZaZaZaZaZaZa\[ \t\r\n\]+\[ \t\r\n\]+array_f :\[ \t\r\n\]+=========\[ \t\r\n\]+\[ \t\r\n\]+0.000000\[ \t\r\n\]+0.142450  0.284900  0.427350  0.569801  0.712251  0.854701  0.997151  1.139601\[ \t\r\n\]+1.282051  1.424501  1.566952  1.709402  1.851852  1.994302\[ \t\r\n\]+\[ \t\r\n\]+array_d :\[ \t\r\n\]+=========\[ \t\r\n\]+\[ \t\r\n\]+0.000000\[ \t\r\n\]+23.456700  46.913400  70.370100  93.826800  117.283500  140.740200  164.196900  187.653600\[ \t\r\n\]+211.110300  234.567000  258.023700  281.480400  304.937100  328.393800  351.850500  375.307200\[ \t\r\n\]+398.763900  422.220600  445.677300  469.134000  492.590700  516.047400  539.504100  562.960800\[ \t\r\n\]+586.41750  609.874200  633.330900  656.787600  680.244300  703.701000  727.157700  750.614400\[ \t\r\n\]+774.071100  797.527800  820.984500  844.441200  867.897900  891.354600  914.811300  938.268000\[ \t\r\n\]+961.724700  985.181400  1008.638100  1032.094800  1055.551500  1079.008200  1102.464900  1125.921600\[ \t\r\n\]+1149.378300  1172.835000  1196.291700  1219.748400  1243.205100  1266.661800  1290.118500  1313.575200\[ \t\r\n\]+1337.031900  1360.488600  1383.945300  1407.402000  1430.858700  1454.315400  1477.772100  1501.228800\[ \t\r\n\]+1524.685500  1548.142200  1571.598900  1595.055600  1618.512300  1641.969000  1665.425700  1688.882400\[ \t\r\n\]+1712.339100  1735.795800  1759.252500  1782.709200  1806.165900  1829.622600  1853.079300  1876.536000\[ \t\r\n\]+1899.992700  1923.449400  1946.906100  1970.362800  1993.819500  2017.276200  2040.732900  2064.189600\[ \t\r\n\]+2087.646300  2111.103000  2134.559700  2158.016400  2181.473100  2204.929800  2228.386500  2251.843200\[ \t\r\n\]+2275.299900  2298.756600  2322.213300.*$gdb_prompt $" {
-#        pass "print print_all_arrays(integer_array, char_array, float_array, double_array)"
-#   }
-#    -re ".*$gdb_prompt $" { fail "print print_all_arrays(integer_array, char_array, float_array, double_array)" }
-#    timeout           { fail "(timeout) print print_all_arrays(integer_array, char_array, float_array, double_array)" }
-#  }
-
-#set timeout $oldtimeout
-#go -until 1220
-gdb_test "tbreak 1220" \
-	"Breakpoint.* file .*$srcfile, line 1220.*" \
-	"tbreakpoint line 1220"
-
-if {![gdb_skip_float_test "continuing to breakpoint 1220"] && \
-    ![gdb_skip_stdio_test "continuing to breakpoint 1220"] } {
-    send_gdb "continue\n"
-    gdb_expect_list "continuing to breakpoint 1220" ".*$gdb_prompt $" {
-	"Continuing\\."
-	"\[ \t\r\n\]+array_d :"
-	"\[ \t\r\n\]+========="
-	"\[ \t\r\n\]+0.000000"
-	"\[ \t\r\n\]+23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]*"
-	"\[ \t\r\n\]+"
-	".*array_f :"
-	".*student id :\[\t \]+.*YELLOW"
-	".*array_i :"
-	".*main \\(\\) at .*call-ar-st.c:1220\[ \t\r\n\]+.*print_all_arrays\\(integer_array, char_array, float_array, double_array\\)."
-    }
-} else {
-    gdb_test "continue" "" ""
-}
-
-#step
-send_gdb "step\n"
-gdb_expect {
-    -re "print_all_arrays \\(array_i=, array_c=.ZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZaZa., array_f=, array_d=\\) at .*call-ar-st.c:306\[ \t\r\n\]+306.*print_int_array\\(array_i\\);.*$gdb_prompt $" {pass "step inside print_all_arrays"}
-    -re ".*$gdb_prompt $" { fail "step inside print_all_arrays" }
-    timeout { fail "step inside print_all_arrays (timeout)" }
-}
-
-
-#step -over
-if ![gdb_skip_stdio_test "next over print_int_array in print_all_arrays"] {
-    send_gdb "next\n"
-    gdb_expect {
-	-re "array_i :.*307.*print_char_array.*$gdb_prompt $" {
-	    pass "next over print_int_array in print-all_arrays"
-	}
-	-re ".*$gdb_prompt $" { 
-	    fail "next over print_int_array in print-all_arrays" 
-	}
-	timeout { 
-	    fail "next over print_int_array in print-all_arrays (timeout)"
-	}
-    }
-} else {
-    gdb_test "next" "" ""
-}
-
-#call print_double_array(array_d)
-if {![gdb_skip_float_test "print print_double_array(array_d)"] && \
-    ![gdb_skip_stdio_test "print print_double_array(array_d)"] } {
-    send_gdb "print print_double_array(array_d)\n"
-    gdb_expect_list "print print_double_array(array_d)" ".*$gdb_prompt $" {
-	"array_d :"
-	"\[ \t\r\n\]+========="
-	"\[ \t\r\n\]+\[ \t\r\n\]+0.000000"
-	"\[ \t\r\n\]+23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]*"
-	"\[ \t\r\n\]+"
-    }
-}
-
-#go -until 1236
-gdb_test "tbreak 1236" \
-"Breakpoint.* file .*$srcfile, line 1236.*" \
-"tbreakpoint line 1236"
-
-if {![gdb_skip_float_test "continuing to 1236"] && \
-    ![gdb_skip_stdio_test "continuing to 1236"] } {
-    send_gdb "continue\n"
-    gdb_expect_list "continuing to 1236"  ".*$gdb_prompt $" {
-	"Continuing\\..*array_c"
-	".*array_f"
-	"\[ \t\r\n\]+array_d :"
-	"\[ \t\r\n\]+========="
-	"\[ \t\r\n\]+0.000000"
-	"\[ \t\r\n\]+23.456\[0-9\]*  46.913\[0-9\]*  70.370\[0-9\]*  93.826\[0-9\]*  117.283\[0-9\]*  140.740\[0-9\]*  164.196\[0-9\]*  187.653\[0-9\]*"
-	"\[ \t\r\n\]+.*HELLO WORLD.*main \\(\\) at .*call-ar-st.c:1236.*printf\\(.BYE BYE FOR NOW.n.\\)."
-    }
-} else {
-    gdb_test "continue" "" ""
-}
-
-
-#call sum_array_print(10, *list1, *list2, *list3, *list4)
-
-if ![gdb_skip_stdio_test "print sum_array_print(...)"] {
-    send_gdb "print sum_array_print(10, *list1, *list2, *list3, *list4)\n"
-    gdb_expect {
-	-re ".*Sum of 4 arrays, by element \\(add in seed as well\\):\[ \t\r\n\]+Seed: 10\[ \t\r\n\]+Element Index . Sum\[ \t\r\n\]+-------------------------\[ \t\r\n\]+.*\[ \t\]+0\[ \t\]+52\[ \t\r\n\]+1\[ \t\]+60\[ \t\r\n\]+2\[ \t\]+68\[ \t\r\n\]+3\[ \t\]+76\[ \t\r\n\]+4\[ \t\]+84\[ \t\r\n\]+5\[ \t\]+92\[ \t\r\n\]+6\[ \t\]+100\[ \t\r\n\]+7\[ \t\]+108\[ \t\r\n\]+8\[ \t\]+116\[ \t\r\n\]+9\[ \t\]+124\[ \t\r\n\]+.*$gdb_prompt $" {
-	    pass "print sum_array_print(10, *list1, *list2, *list3, *list4)"
-	}
-	-re ".*$gdb_prompt $" { fail "print sum_array_print(10, *list1, *list2, *list3, *list4)" }
-	timeout           { fail "(timeout) print sum_array_print(10, *list1, *list2, *list3, *list4)" }
-    }
-}
-
-#step over
-if ![gdb_skip_stdio_test "next to 1237"] {
-    send_gdb "next\n"
-    gdb_expect {
-	-re ".*BYE BYE FOR NOW.*1237.*printf\\(.VERY GREEN GRASS.n.\\);.*$gdb_prompt $" { pass "next to 1237"}
-	-re ".*$gdb_prompt $" { fail "next to 1237" }
-	timeout { fail "next to 1237(timeout)" }
-    }
-} else {
-    gdb_test "next" "" ""
-}
-
-#call print_array_rep(\*list1, \*list2, \*list3)
-
-if ![gdb_skip_stdio_test "print print_array_rep(...)"] {
-    send_gdb "print print_array_rep(\*list1, \*list2, \*list3)\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {
-	    pass "print print_array_rep(*list1, *list2, *list3)"
-	}
-	-re ".*$gdb_prompt $" { 
-	    fail "print print_array_rep(*list1, *list2, *list3)" 
-	}
-	timeout               {
-	    fail "(timeout) print print_array_rep(*list1, *list2, *list3)" 
-	}
-    }
-}
-
-#go -until 1241
-gdb_test "tbreak 1241" \
-    "Breakpoint..* file .*$srcfile, line 1241.*" \
-    "tbreakpoint line 1241"
-
-send_gdb  "continue\n"
-gdb_expect {
- -re ".*main \\(\\) at .*call-ar-st.c:1241\r\n1241\[\t \]+sum_array_print\\(10, \\*list1, \\*list2, \\*list3, \\*list4\\);.*$gdb_prompt $" {
-                   pass "continue to 1241"}
- -re ".*$gdb_prompt $" { fail "continue to 1241"}
- timeout           { fail "(timeout) continue to 1241"}
-}
-
-
-
-# Run into sum_array_print, and verify that the arguments were passed
-# accurately.
-#
-# Note that we shouldn't use a `step' here to get into
-# sum_array_print; GCC may emit calls to memcpy to put the arguments
-# in the right place, and a step may end up in memcpy instead.  This
-# may itself be a bug, but it's not the one we're trying to catch
-# here.  I've added something to step-test.exp for this.
-gdb_test "break sum_array_print" \
-	".*Breakpoint ${decimal}: file .*call-ar-st.c, line.*" \
-	"set breakpoint in sum_array_print"
-gdb_test "continue" \
-	".*Breakpoint ${decimal}, sum_array_print \\(seed=10, linked_list1=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .4, 6, 8, 10, 12, 14, 16, 18, 20, 22., head = 0., linked_list2=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .8, 10, 12, 14, 16, 18, 20, 22, 24, 26., head = 0., linked_list3=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .10, 12, 14, 16, 18, 20, 22, 24, 26, 28., head = 0., linked_list4=.next_index = .1, 2, 3, 4, 5, 6, 7, 8, 9, 10., values = .20, 22, 24, 26, 28, 30, 32, 34, 36, 38., head = 0.\\) at .*call-ar-st.c:1105\[ \t\n\r\]+1105.*printf\\(.Sum of 4 arrays, by element \\(add in seed as well\\).*\\);.*" \
-	"check args of sum_array_print"
-
-#call print_array_rep(linked_list1, linked_list2, linked_list3)
-# this calls works from gdb without gdb_expect. But it does seem to hang
-#from within gdb_expect.
-#I comment this out
-#send_gdb "print print_array_rep(linked_list1, linked_list2, linked_list3)\n"
-#gdb_expect {
-#    -re ".*Contents of linked list1:\[ \t\n\r\]+Element Value . Index of Next Element\[ \t\n\r\]+-------------------------------------\[ \t\n\r\]+.*\[ \t\n\r\]+.*4.*1\[ \t\n\r\]+.*6.*2\[ \t\n\r\]+.*8.*3\[ \t\n\r\]+.*10.*4\[ \t\n\r\]+.*12.*5\[ \t\n\r\]+.*14.*6\[ \t\n\r\]+.*16.*7\[ \t\n\r\]+.*18.*8\[ \t\n\r\]+.*20.*9\[ \t\n\r\]+.*22.*10\[ \t\n\r\]+Contents of linked list2:\[ \t\n\r\]+Element Value | Index of Next Element\[ \t\n\r\]+-------------------------------------\[ \t\n\r\]+.*\[ \t\n\r\]+.*8.*1\[ \t\n\r\]+.*10.*2\[ \t\n\r\]+.*12.*3\[ \t\n\r\]+.*14.*4\[ \t\n\r\]+.*16.*5\[ \t\n\r\]+.*18.*6\[ \t\n\r\]+.*20.*7\[ \t\n\r\]+.*22.*8\[ \t\n\r\]+.*24.*9\[ \t\n\r\]+.*26.*10\[ \t\n\r\]+Contents of linked list3:\[ \t\n\r\]+Element Value | Index of Next Element\[ \t\n\r\]+-------------------------------------\[ \t\n\r\]+.*\[ \t\n\r\]+.*10.*1\[ \t\n\r\]+.*12.*2\[ \t\n\r\]+.*14.*3\[ \t\n\r\]+.*16.*4\[ \t\n\r\]+.*18.*5\[ \t\n\r\]+.*20.*6\[ \t\n\r\]+.*22.*7\[ \t\n\r\]+.*24.*8\[ \t\n\r\]+.*26.*9\[ \t\n\r\]+.*28.*10\[ \t\n\r\]+.*$gdb_prompt $" {
-#        pass "print print_array_rep(linked_list1, linked_list2, linked_list3)"
-#      }
-#    -re ".*$gdb_prompt $" { fail "print print_array_rep(linked_list1, linked_list2, linked_list3)" }
-#    timeout           { fail "(timeout) print print_array_rep(linked_list1, linked_list2, linked_list3)" }
-#}
-
-
-#go -until 1281
-gdb_test "tbreak 1281" \
-    "Breakpoint.* file .*call-ar-st.c, line 1281.*" \
-    "tbreakpoint line 1281"
-
-if ![gdb_skip_stdio_test "continuing to 1281"] {
-    send_gdb "continue\n"
-    gdb_expect {
-	-re  "Continuing\\..*Sum of 4 arrays.*Contents of linked list1.*Contents of two_floats_t.*main \\(\\) at .*call-ar-st.c:1281.*c = 0.*$gdb_prompt $" {
-	    pass "continue to 1281"
-	}
-	-re ".*$gdb_prompt $" { fail "continue to 1281"}           
-	timeout           { fail "(timeout) continue to 1281"}
-    }
-} else {
-    gdb_test "continue" "" ""
-}
-
-#call print_small_structs(*struct1, *struct2, *struct3, *struct4, 
-#                         *flags, *flags_combo, *three_char, *five_char, 
-#                         *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)
-
-if {![gdb_skip_float_test "print print_small_structs(...)"] && \
-    ![gdb_skip_stdio_test "print print_small_structs(...)"] } {
-    send_gdb "print print_small_structs(*struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)\n"
-    gdb_expect_list "print print_small_structs" ".*$gdb_prompt $" {
-	"\[\t\r\n \]+alpha"
-	"\[\t\r\n \]+gamma"
-	"\[\t\r\n \]+epsilon"
-	"\[\t\r\n \]+alpha"
-	"\[\t\r\n \]+gamma"
-	"\[\t\r\n \]+epsilon"
-	"\[\t\r\n \]+ch1: y[ \t]*ch2: n"
-	"\[\t\r\n \]+Contents of three_char_t:"
-	"\[\t\r\n \]+a[ \t]*b[ \t]*c"
-	"\[\t\r\n \]+Contents of five_char_t:"
-	"\[\t\r\n \]+l[ \t]*m[ \t]*n[ \t]*o[ \t]*p"
-	"\[\t\r\n \]+Contents of int_char_combo_t:"
-	"\[\t\r\n \]+123[ \t]*z"
-	"\[\t\r\n \]+Sum of the 4 struct values and seed :"
-	"\[\t\r\n \]+52"
-	"\[\t\r\n \]+Contents of struct1:"
-	"\[\t\r\n \]+6[ \t]*0"
-	"\[\t\r\n \]+Contents of struct2:"
-	"\[\t\r\n \]+10[ \t]*0"
-	"\[\t\r\n \]+Contents of struct3:"
-	"\[\t\r\n \]+12[ \t]*0"
-	"\[\t\r\n \]+Contents of one_double_t:"
-	"\[\t\r\n \]+10.500000"
-	"\[\t\r\n \]+Contents of one_double_t:"
-	"\[\t\r\n \]+-3.375000"
-	"\[\t\r\n \]+Contents of one_double_t:"
-	"\[\t\r\n \]+675.093750"
-	"\[\t\r\n \]+Contents of two_floats_t:"
-	"\[\t\r\n \]+45.234001[ \t]*43.599998"
-	"\[\t\r\n \]+Contents of two_floats_t:"
-	"\[\t\r\n \]+78.010002[ \t]*122.099998"
-	"\[\t\r\n \]+Contents of two_floats_t:"
-	"\[\t\r\n \]+-1232.344971[ \t]*-199.210007"
-    }
-}
-
-#call compute_with_small_structs(20)
-send_gdb "print compute_with_small_structs(20)\n"
-gdb_expect {
-    -re ".*\[0-9\]+ =.*$gdb_prompt $" {
-        pass "print compute_with_small_structs(20)"
-      }
-    -re ".*$gdb_prompt $" { fail "print compute_with_small_structs(20)" }
-    timeout           { fail "(timeout) compute_with_small_structs(20)" }
-  }
-
-
-#call print_ten_doubles(123.456, 123.456, -0.12, -1.23, 343434.8, 89.098, 
-#                       3.14, -5678.12345, -0.11111111, 216.97065)
-
-if {![gdb_skip_float_test "print print_ten_doubles(...)"] && \
-    ![gdb_skip_stdio_test "print print_ten_doubles(...)"]} {
-    send_gdb "print print_ten_doubles(123.456, 123.456, -0.12, -1.23, 343434.8, 89.098, 3.14, -5678.12345, -0.11111111, 216.97065)\n"
-    gdb_expect_list "print print_ten_doubles" ".*$gdb_prompt $" {
-	"\[\t\r\n \]+Two Doubles : 123.45\[0-9\]*.*123.45\[0-9\]*"
-	"\[\t\r\n \]+Two Doubles : -0.1200\[0-9\]*.*-1.2300\[0-9\]*"
-	"\[\t\r\n \]+Two Doubles : 343434.\[0-9\]*.*89.09\[0-9\]*"
-	"\[\t\r\n \]+Two Doubles : 3.1400\[0-9\]*.*-5678.123\[0-9\]*"
-	"\[\t\r\n \]+Two Doubles : -0.1111\[0-9\]*.*216.97\[0-9\]*"
-    }
-}
-
-#go -until 1286
-gdb_test "tbreak 1286" \
-    "Breakpoint .* file .*call-ar-st.c, line 1286.*" \
-    "tbreakpoint line 1286"
-
-gdb_test continue "Continuing\\..*main \\(.*\\) at.*call-ar-st.c:1286\[\t\r\n \]+1286.*print_long_arg_list \\( a, b, c, d, e, f, .struct1, .struct2, .struct3, .struct4,.*" "continue to 1286"
-
-if { [istarget "hppa*-*-hpux*"] } {
-    #
-    # NOTE:(FIXME)
-    # the aCC demangler cannot demangle the name of a function with >10 args.
-    # so I added a .* after the name of the function, to match the
-    # incredibly long mangled name 
-    # (getting aCC's libdemangle.a bundled w/ the system?)
-    # DTS CLLbs16994  coulter 990114
-    # 
-    # FIXME: use step for hppa* testing for now
-    # guo 990621
-    #
-    send_gdb "step\n"
-    gdb_expect {
-        -re ".*print_long_arg_list.*\\(a=22.25, b=33.375, c=0, d=-25, e=100, f=2345, struct1=\{value = 6, head = 0\}, struct2=\{value = 10, head = 0\}, struct3=\{value = 12, head = 0\}, struct4=\{value = 14, head = 0\}, flags=\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\}, flags_combo=\{alpha = 1, beta = 0, ch1 = 121 \'y\', gamma = 1, delta = 0, ch2 = 110 \'n\', epsilon = 1, omega = 0\}, three_char=\{ch1 = 97 \'a\', ch2 = 98 \'b\', ch3 = 99 \'c\'\}, five_char=\{ch1 = 108 \'l\', ch2 = 109 \'m\', ch3 = 110 \'n\', ch4 = 111 \'o\', ch5 = 112 \'p\'\}, int_char_combo=\{int1 = 123, ch1 = 122 \'z\'\}, d1=\{double1 = 10.5\}, d2=\{double1 = -3.375\}, d3=\{double1 = 675.09375\}, f1=\{float1 = 45.2340012, float2 = 43.5999985\}, f2=\{float1 = 78.0100021, float2 = 122.099998\}, f3=\{float1 = -1232.34497, float2 = -199.210007\}\\) at .*${srcfile}:992\[\r\n\]+992\[ \t\]+printf\\(\"double :.*\", a\\);.*$gdb_prompt $" {pass "step into print_long_arg_list"}
-        -re ".*$gdb_prompt $" { fail "step into print_long_arg_list" }
-        timeout { fail "step into print_long_arg_list (timeout)" }
-    }
-} else {
-
-    # We can't just assume that a "step" will get us into
-    # print_long_arg_list here,either.
-    gdb_test "tbreak print_long_arg_list" \
-	"Breakpoint .* file .*call-ar-st.c, line .*" \
-	"tbreak in print_long_arg_list after stepping into memcpy"
-    # The short match case below handles cases where a buffer
-    # overflows or something, and expect can't deal with the full
-    # line.  Perhaps a more elegant solution exists... -sts 1999-08-17
-    send_gdb "continue\n"
-    if {![gdb_skip_float_test "step into print_long_arg_list"]} {
-	gdb_expect {
-	    -re ".*print_long_arg_list \\(a=22.25, b=33.375, c=0, d=-25, e=100, f=2345, struct1=\{value = 6, head = 0\}, struct2=\{value = 10, head = 0\}, struct3=\{value = 12, head = 0\}, struct4=\{value = 14, head = 0\}, flags=\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\}, flags_combo=\{alpha = 1, beta = 0, ch1 = 121 \'y\', gamma = 1, delta = 0, ch2 = 110 \'n\', epsilon = 1, omega = 0\}, three_char=\{ch1 = 97 \'a\', ch2 = 98 \'b\', ch3 = 99 \'c\'\}, five_char=\{ch1 = 108 \'l\', ch2 = 109 \'m\', ch3 = 110 \'n\', ch4 = 111 \'o\', ch5 = 112 \'p\'\}, int_char_combo=\{int1 = 123, ch1 = 122 \'z\'\}, d1=\{double1 = 10.5\}, d2=\{double1 = -3.375\}, d3=\{double1 = 675.09375\}, f1=\{float1 = 45.2340012, float2 = 43.5999985\}, f2=\{float1 = 78.0100021, float2 = 122.099998\}, f3=\{float1 = -1232.34497, float2 = -199.210007\}\\) at .*${srcfile}:992\[\r\n\]+992\[ \t\]+printf\\(\"double :.*\", a\\);.*$gdb_prompt $" { pass "step into print_long_arg_list" }
-	    -re ".*print_long_arg_list.*\\(a=22.25, b=33.375, c=0, d=-25, e=100, f=2345, struct1=\{value = 6, head = 0\}, struct2=\{value = 10, head = 0\}, struct3=\{value = 12, head = 0\}, struct4=\{value = 14, head = 0\}, flags=\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\}, flags_combo=\{alpha = 1, beta = 0, ch1 = 121 \'y\', gamma = 1, delta = 0, ch2 = 110 \'n\', epsilon = 1, omega = 0\}, three_char=\{ch1 = 97 \'a\', ch2 = 98 \'b\', ch3 = 99 \'c\'\}.*\\) at .*${srcfile}:992\[\r\n\]+992\[ \t\]+printf\\(\"double :.*\", a\\);.*$gdb_prompt $" {pass "step into print_long_arg_list (short match)"}
-	    -re ".*$gdb_prompt $" { fail "step into print_long_arg_list" }
-	    timeout { fail "step into print_long_arg_list (timeout)" }
-	}
-    } else {
-	# If skipping float tests, don't expect anything in arg list.
-	gdb_expect {
-	    -re ".*print_long_arg_list \\(.*\\).*$gdb_prompt $" { pass "step into print_long_arg_list" }
-	    -re ".*$gdb_prompt $" { fail "step into print_long_arg_list" }
-	    timeout { fail "step into print_long_arg_list (timeout)" }
-	}
-    }
-}
-
-set ws "\[\n\r\t \]+"
-
-#call print_small_structs(struct1, struct2, struct3, struct4, flags, 
-#                         flags_combo, three_char, five_char, int_char_combo, 
-#                         d1, d2, d3, f1, f2, f3)
-
-if {![gdb_skip_float_test "print_small_structs from print_long_arg_list"] && \
-    ![gdb_skip_stdio_test "print_small_structs from print_long_arg_list"] } {
-
-    # On 32-bit SPARC, some of the args are passed by ref, others by
-    # value, and GDB gets confused and says "Invalid cast" because it
-    # thinks it has to cast the structure into a pointer to structure.
-    if { [test_debug_format "stabs"] } then {
-	setup_kfail "gdb/1539" "sparc-*-*"
-    }
-
-    send_gdb "print print_small_structs(struct1, struct2, struct3, struct4, flags, flags_combo, three_char, five_char, int_char_combo, d1, d2, d3, f1, f2, f3)\n"
-    gdb_expect_list "print print_small_structs from print_long_arg_list" ".*$gdb_prompt $" {
-	"\[\t\r\n \]+alpha"
-	"\[\t\r\n \]+gamma"
-	"\[\t\r\n \]+epsilon"
-	"\[\t\r\n \]+alpha"
-	"\[\t\r\n \]+gamma"
-	"\[\t\r\n \]+epsilon"
-	"\[\t\r\n \]+ch1: y[ \t]*ch2: n"
-	"\[\t\r\n \]+Contents of three_char_t:"
-	"\[\t\r\n \]+a\[ \t\]*b\[ \t\]*c"
-	"\[\t\r\n \]+Contents of five_char_t:"
-	"\[\t\r\n \]+l\[ \t\]*m\[ \t\]*n\[ \t\]*o\[ \t\]*p"
-	"\[\t\r\n \]+Contents of int_char_combo_t:"
-	"\[\t\r\n \]+123\[ \t\]*z"
-	"\[\t\r\n \]+Sum of the 4 struct values and seed :"
-	"\[\t\r\n \]+52"
-	"\[\t\r\n \]+Contents of struct1:"
-	"\[\t\r\n \]+6\[ \t\]*0"
-	"\[\t\r\n \]+Contents of struct2:"
-	"\[\t\r\n \]+10\[ \t\]*0"
-	"\[\t\r\n \]+Contents of struct3:"
-	"\[\t\r\n \]+12\[ \t\]*0"
-	"\[\t\r\n \]+Contents of one_double_t:"
-	"\[\t\r\n \]+10.500000"
-	"\[\t\r\n \]+Contents of one_double_t:"
-	"\[\t\r\n \]+-3.375000"
-	"\[\t\r\n \]+Contents of one_double_t:"
-	"\[\t\r\n \]+675.093750"
-	"\[\t\r\n \]+Contents of two_floats_t:"
-	"\[\t\r\n \]+45.234001\[ \t\]*43.599998"
-	"\[\t\r\n \]+Contents of two_floats_t:"
-	"\[\t\r\n \]+78.010002\[ \t\]*122.099998"
-	"\[\t\r\n \]+Contents of two_floats_t:"
-	"\[\t\r\n \]+-1232.344971\[ \t\]*-199.210007"
-    }
-}
-
-
-#go -until 1300
-gdb_test "tbreak 1300" \
-    "Breakpoint.* file .*call-ar-st.c, line 1300.*" \
-    "tbreakpoint line 1300"
-
-if ![gdb_skip_stdio_test "continuing to 1300"] {
-    gdb_test "continue" "Continuing\\..*Contents of two_floats_t:.*main \\(\\) at.*call-ar-st.c:1300.*1300.*init_bit_flags_combo\\(flags_combo, \\(unsigned\\)1, \\(unsigned\\)0, .y.,.*" \
-	    "continue to 1300"
-} else {
-    gdb_test "continue" "" ""
-}
-
-#step
-    send_gdb "step\n"
-    gdb_expect {
-        -re "
-init_bit_flags_combo \\(bit_flags_combo=, a=1, b=0, ch1=121 .y., g=1, d=0, ch2=110 .n., e=1, o=0\\) at .*call-ar-st.c:416\[ \t\n\r\]+416.*bit_flags_combo->alpha = a;.*$gdb_prompt $" {
-                            pass "step into init_bit_flags_combo"}
-        -re ".*$gdb_prompt $" { fail "step into init_bit_flags_combo" }
-        timeout { fail "step into init_bit_flags_combo (timeout)" }
-    }
-
-#call print_bit_flags_combo(*bit_flags_combo)
-if ![gdb_skip_stdio_test "continuing to 1300"] {
-    send_gdb "print print_bit_flags_combo(*bit_flags_combo)\n"
-    gdb_expect {
-	-re ".*alpha.*gamma.*epsilon.*ch1: y.*ch2: n.*$gdb_prompt $" {
-	    pass "print print_bit_flags_combo from init_bit_flags_combo"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "print print_bit_flags_combo from init_bit_flags_combo" 
-	}
-	timeout           {
-	    fail "(timeout) print_bit_flags_combo from init_bit_flags_combo" 
-	}
-    }
-}
-
-
-#go -until 1305
-gdb_test "tbreak 1305" \
-    "Breakpoint.* file .*call-ar-st.c, line 1305.*" \
-    "tbreakpoint line 1305"
-
-gdb_test continue "Continuing\\..*main \\(\\) at .*call-ar-st.c:1305\[\r\n\t \]+1305.*init_int_char_combo\\(int_char_combo, 13, .!.\\);" \
-"continue to 1305"
-
-#call print_long_arg_list(a, b, c, d, e, f, *struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)
-
-# FIXME:
-# HP aCC demangler currently does not handle hp aCC functions with >10 args
-# DTS CLLbs16994  coulter 990114
-
-if {$hp_aCC_compiler} {setup_xfail "hppa*-*-*" CLLbs16994}
-
-if {![gdb_skip_float_test "print print_long_arg_list"] && \
-    ![gdb_skip_stdio_test "print print_long_arg_list"] } {
-    send_gdb "print print_long_arg_list(a, b, c, d, e, f, *struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)\n"
-    gdb_expect_list "print print_long_arg_list" ".*$gdb_prompt $" {
-	"\[ \n\r\t\]+double : 22.250000"
-	"\[ \n\r\t\]+double : 33.375000"
-	"\[ \n\r\t\]+int : 0"
-	"\[ \n\r\t\]+int : -25"
-	"\[ \n\r\t\]+int : 100"
-	"\[ \n\r\t\]+int : 2345"
-	"\[ \n\r\t\]+alpha"
-	"\[ \n\r\t\]+gamma"
-	"\[ \n\r\t\]+epsilon"
-	"\[ \n\r\t\]+ch1: y\[ \t\]+ch2: n"
-	"\[ \n\r\t\]+Contents of three_char_t:"
-	"\[ \n\r\t\]+x\[ \t\]+y\[ \t\]+z"
-	"\[ \n\r\t\]+Contents of five_char_t:"
-	"\[ \n\r\t\]+h\[ \t\]+e\[ \t\]+l\[ \t\]+l\[ \t\]+o"
-	"\[ \n\r\t\]+Contents of int_char_combo_t:"
-	"\[ \n\r\t\]+123\[ \t\]+z"
-	"\[ \n\r\t\]+Sum of the 4 struct values and seed :"
-	"\[ \n\r\t\]+52"
-	"\[ \n\r\t\]+Contents of struct1:"
-	"\[ \n\r\t\]+6\[ \t\]+0"
-	"\[ \n\r\t\]+Contents of struct2:"
-	"\[ \n\r\t\]+10\[ \t\]+0"
-	"\[ \n\r\t\]+Contents of struct3:"
-	"\[ \n\r\t\]+12\[ \t\]+0"
-	"\[ \n\r\t\]+Contents of one_double_t:"
-	"\[ \n\r\t\]+1.111110"
-	"\[ \n\r\t\]+Contents of one_double_t:"
-	"\[ \n\r\t\]+-345.340000"
-	"\[ \n\r\t\]+Contents of one_double_t:"
-	"\[ \n\r\t\]+546464.200000"
-	"\[ \n\r\t\]+Contents of two_floats_t:"
-	"\[ \n\r\t\]+0.234000\[ \t\]+453.100006"
-	"\[ \n\r\t\]+Contents of two_floats_t:"
-	"\[ \n\r\t\]+78.345001\[ \t\]+23.090000"
-	"\[ \n\r\t\]+Contents of two_floats_t:"
-	"\[ \n\r\t\]+-2.345000\[ \t\]+1.000000"
-    }
-}
-
-
-#go -until 1311
-gdb_test "tbreak 1311" \
-    "Breakpoint.* file .*call-ar-st.c, line 1311.*" \
-    "tbreakpoint line 1311"
-
-gdb_test continue "Continuing\\..*main \\(\\) at .*call-ar-st.c:1311\[ \t\n\r\]+1311.*compute_with_small_structs\\(35\\);" \
-"continue to 1311"
-
-
-#call sum_struct_print(10, *struct1, *struct2, *struct3, *struct4)
-if ![gdb_skip_stdio_test "print sum_struct_print(...)"] {
-    send_gdb "print sum_struct_print(10, *struct1, *struct2, *struct3, *struct4)\n"
-    gdb_expect {
-	-re ".*Sum of the 4 struct values and seed :\[ \t\n\r\]+218.*$gdb_prompt $" {
-	    pass "print sum_struct_print(10, *struct1, *struct2, *struct3, *struct4)"
-	}
-	-re ".*$gdb_prompt $" { 
-	    fail "print sum_struct_print(10, *struct1, *struct2, *struct3, *struct4)" 
-	}
-	timeout           { 
-	    fail "(timeout) sum_struct_print(10, *struct1, *struct2, *struct3, *struct4)" 
-	}
-    }
-}
-
-
-#call print_struct_rep(*struct1, *struct2, *struct3)
-if ![gdb_skip_stdio_test "print print_struct_rep(...)"] {
-    send_gdb "print print_struct_rep(*struct1, *struct2, *struct3)\n"
-    gdb_expect_list "print print_struct_rep(*struct1, *struct2, *struct3)" \
-	    ".*$gdb_prompt $" {
-	"\[ \t\n\r\]+Contents of struct1:"
-	"\[ \t\n\r\]+        22         0"
-	"\[ \t\n\r\]+Contents of struct2:"
-	"\[ \t\n\r\]+        42         0"
-	"\[ \t\n\r\]+Contents of struct3:"
-	"\[ \t\n\r\]+        62         0"
-    }
-}
-
-if ![gdb_skip_stdio_test "print print_one_large_struct(...)"] {
-    send_gdb "print print_one_large_struct(*list1)\n"
-    gdb_expect {
-	-re ".*         4         1.*$gdb_prompt $" {
-	    pass "print print_one_large_struct(*list1)"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "print print_one_large_struct(*list1)"
-	}
-	timeout           {
-	    fail "(timeout) print_one_large_struct(*list1)"
-	}
-    }
-}
-
-set timeout $oldtimeout
-return
-
diff --git a/gdb/testsuite/gdb.base/call-rt-st.c b/gdb/testsuite/gdb.base/call-rt-st.c
deleted file mode 100644
index 09dd5bb52a9..00000000000
--- a/gdb/testsuite/gdb.base/call-rt-st.c
+++ /dev/null
@@ -1,793 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/**************************************************************************
- * TESTS :
- * function returning large structures, which go on the stack
- * functions returning varied sized structs which go on in the registers.
- ***************************************************************************/
-
-
-/* A large structure (> 64 bits) used to test passing large structures as
- * parameters
- */
-
-struct array_rep_info_t {
-   int   next_index[10]; 
-   int   values[10];
-   int   head;
-};
-
-/*****************************************************************************
- * Small structures ( <= 64 bits). These are used to test passing small 
- * structures as parameters and test argument size promotion.
- *****************************************************************************/
-
- /* 64 bits
-  */
-struct small_rep_info_t {
-   int   value;
-   int   head;
-};
-
-/* 6 bits : really fits in 8 bits and is promoted to 8 bits
- */
-struct bit_flags_char_t {
-       unsigned char alpha   :1;
-       unsigned char beta    :1;
-       unsigned char gamma   :1;
-       unsigned char delta   :1;
-       unsigned char epsilon :1;
-       unsigned char omega   :1;
-};
-
-/* 6 bits : really fits in 8 bits and is promoted to 16 bits
- */
-struct bit_flags_short_t {
-       unsigned short alpha   :1;
-       unsigned short beta    :1;
-       unsigned short gamma   :1;
-       unsigned short delta   :1;
-       unsigned short epsilon :1;
-       unsigned short omega   :1;
-};
-
-/* 6 bits : really fits in 8 bits and is promoted to 32 bits
- */
-struct bit_flags_t {
-       unsigned alpha   :1;
-       unsigned beta    :1;
-       unsigned gamma   :1;
-       unsigned delta   :1;
-       unsigned epsilon :1;
-       unsigned omega   :1;
-};
-
-/* 22 bits : really fits in 40 bits and is promoted to 64 bits
- */
-struct bit_flags_combo_t {
-       unsigned alpha   :1;
-       unsigned beta    :1;
-       char     ch1;
-       unsigned gamma   :1;
-       unsigned delta   :1;
-       char     ch2;
-       unsigned epsilon :1;
-       unsigned omega   :1;
-};
-
-/* 64 bits
- */
-struct one_double_t {
-       double double1;
-};
-
-/* 64 bits
- */
-struct two_floats_t {
-       float float1;
-       float float2;
-};
-
-
-/* 24 bits : promoted to 32 bits
- */
-struct three_char_t {
-       char ch1;
-       char ch2;
-       char ch3;
-};
-
-/* 40 bits : promoted to 64 bits
- */
-struct five_char_t {
-       char ch1;
-       char ch2;
-       char ch3;
-       char ch4;
-       char ch5;
-};
-
-/* 40 bits : promoted to 64 bits
- */
-struct int_char_combo_t {
-       int  int1;
-       char ch1;
-};
-
-
-/*****************************************************************
- * LOOP_COUNT : 
- * A do nothing function. Used to provide a point at which calls can be made.  
- *****************************************************************/
-void loop_count () {
-
-     int index;
-
-     for (index=0; index<4; index++);
-}
-
-/*****************************************************************
- * INIT_BIT_FLAGS_CHAR :
- * Initializes a bit_flags_char_t structure. Can call this function see
- * the call command behavior when integer arguments do not fit into
- * registers and must be placed on the stack.
- * OUT struct bit_flags_char_t *bit_flags -- structure to be filled
- * IN  unsigned a  -- 0 or 1 
- * IN  unsigned b  -- 0 or 1 
- * IN  unsigned g  -- 0 or 1 
- * IN  unsigned d  -- 0 or 1 
- * IN  unsigned e  -- 0 or 1 
- * IN  unsigned o  -- 0 or 1 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_bit_flags_char (
-struct bit_flags_char_t *bit_flags,
-unsigned a,
-unsigned b,
-unsigned g,
-unsigned d,
-unsigned e,
-unsigned o)
-#else
-void init_bit_flags_char (bit_flags,a,b,g,d,e,o) 
-struct bit_flags_char_t *bit_flags;
-unsigned a;
-unsigned b;
-unsigned g;
-unsigned d;
-unsigned e;
-unsigned o; 
-#endif
-{
-
-   bit_flags->alpha = a;
-   bit_flags->beta = b;
-   bit_flags->gamma = g;
-   bit_flags->delta = d;
-   bit_flags->epsilon = e;
-   bit_flags->omega = o;
-}
-
-/*****************************************************************
- * INIT_BIT_FLAGS_SHORT :
- * Initializes a bit_flags_short_t structure. Can call this function see
- * the call command behavior when integer arguments do not fit into
- * registers and must be placed on the stack.
- * OUT struct bit_flags_short_t *bit_flags -- structure to be filled
- * IN  unsigned a  -- 0 or 1 
- * IN  unsigned b  -- 0 or 1 
- * IN  unsigned g  -- 0 or 1 
- * IN  unsigned d  -- 0 or 1 
- * IN  unsigned e  -- 0 or 1 
- * IN  unsigned o  -- 0 or 1 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_bit_flags_short (
-struct bit_flags_short_t *bit_flags,
-unsigned a,
-unsigned b,
-unsigned g,
-unsigned d,
-unsigned e,
-unsigned o)
-#else
-void init_bit_flags_short (bit_flags,a,b,g,d,e,o) 
-struct bit_flags_short_t *bit_flags;
-unsigned a;
-unsigned b;
-unsigned g;
-unsigned d;
-unsigned e;
-unsigned o; 
-#endif
-{
-
-   bit_flags->alpha = a;
-   bit_flags->beta = b;
-   bit_flags->gamma = g;
-   bit_flags->delta = d;
-   bit_flags->epsilon = e;
-   bit_flags->omega = o;
-}
-
-/*****************************************************************
- * INIT_BIT_FLAGS :
- * Initializes a bit_flags_t structure. Can call this function see
- * the call command behavior when integer arguments do not fit into
- * registers and must be placed on the stack.
- * OUT struct bit_flags_t *bit_flags -- structure to be filled
- * IN  unsigned a  -- 0 or 1 
- * IN  unsigned b  -- 0 or 1 
- * IN  unsigned g  -- 0 or 1 
- * IN  unsigned d  -- 0 or 1 
- * IN  unsigned e  -- 0 or 1 
- * IN  unsigned o  -- 0 or 1 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_bit_flags (
-struct bit_flags_t *bit_flags,
-unsigned a,
-unsigned b,
-unsigned g,
-unsigned d,
-unsigned e,
-unsigned o)
-#else
-void init_bit_flags (bit_flags,a,b,g,d,e,o) 
-struct bit_flags_t *bit_flags;
-unsigned a;
-unsigned b;
-unsigned g;
-unsigned d;
-unsigned e;
-unsigned o; 
-#endif
-{
-
-   bit_flags->alpha = a;
-   bit_flags->beta = b;
-   bit_flags->gamma = g;
-   bit_flags->delta = d;
-   bit_flags->epsilon = e;
-   bit_flags->omega = o;
-}
-
-/*****************************************************************
- * INIT_BIT_FLAGS_COMBO :
- * Initializes a bit_flags_combo_t structure. Can call this function
- * to see the call command behavior when integer and character arguments
- * do not fit into registers and must be placed on the stack.
- * OUT struct bit_flags_combo_t *bit_flags_combo -- structure to fill
- * IN  unsigned a  -- 0 or 1 
- * IN  unsigned b  -- 0 or 1 
- * IN  char     ch1
- * IN  unsigned g  -- 0 or 1 
- * IN  unsigned d  -- 0 or 1 
- * IN  char     ch2
- * IN  unsigned e  -- 0 or 1 
- * IN  unsigned o  -- 0 or 1 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_bit_flags_combo (
-struct bit_flags_combo_t *bit_flags_combo,
-unsigned a,
-unsigned b,
-char ch1,
-unsigned g,
-unsigned d,
-char ch2,
-unsigned e,
-unsigned o)
-#else
-void init_bit_flags_combo (bit_flags_combo, a, b, ch1, g, d, ch2, e, o)
-struct bit_flags_combo_t *bit_flags_combo;
-unsigned a;
-unsigned b;
-char ch1;
-unsigned g;
-unsigned d;
-char ch2;
-unsigned e;
-unsigned o;
-#endif
-{
-
-   bit_flags_combo->alpha = a;
-   bit_flags_combo->beta = b;
-   bit_flags_combo->ch1 = ch1;
-   bit_flags_combo->gamma = g;
-   bit_flags_combo->delta = d;
-   bit_flags_combo->ch2 = ch2;
-   bit_flags_combo->epsilon = e;
-   bit_flags_combo->omega = o;
-}
-
-
-/*****************************************************************
- * INIT_ONE_DOUBLE : 
- * OUT  struct one_double_t *one_double  -- structure to fill 
- * IN   double init_val
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_one_double ( struct one_double_t *one_double, double init_val)
-#else
-void init_one_double (one_double, init_val)
-struct one_double_t *one_double; 
-double init_val;
-#endif
-{
-
-     one_double->double1  = init_val;
-}
-
-/*****************************************************************
- * INIT_TWO_FLOATS : 
- * OUT struct two_floats_t *two_floats -- structure to be filled
- * IN  float init_val1 
- * IN  float init_val2 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_two_floats (
-     struct two_floats_t *two_floats,
-     float init_val1,
-     float init_val2)
-#else
-void init_two_floats (two_floats, init_val1, init_val2)
-struct two_floats_t *two_floats;
-float init_val1;
-float init_val2;
-#endif
-{
-
-     two_floats->float1 = init_val1;
-     two_floats->float2 = init_val2;
-}
-
-/*****************************************************************
- * INIT_THREE_CHARS : 
- * OUT struct three_char_t *three_char -- structure to be filled
- * IN  char init_val1 
- * IN  char init_val2 
- * IN  char init_val3 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_three_chars (
-struct three_char_t *three_char,
-char init_val1,
-char init_val2,
-char init_val3)
-#else
-void init_three_chars ( three_char, init_val1, init_val2, init_val3)
-struct three_char_t *three_char;
-char init_val1;
-char init_val2;
-char init_val3;
-#endif
-{
-
-     three_char->ch1 = init_val1;
-     three_char->ch2 = init_val2;
-     three_char->ch3 = init_val3;
-}
-
-/*****************************************************************
- * INIT_FIVE_CHARS : 
- * OUT struct five_char_t *five_char -- structure to be filled
- * IN  char init_val1 
- * IN  char init_val2 
- * IN  char init_val3 
- * IN  char init_val4 
- * IN  char init_val5 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_five_chars (
-struct five_char_t *five_char,
-char init_val1,
-char init_val2,
-char init_val3,
-char init_val4,
-char init_val5)
-#else
-void init_five_chars ( five_char, init_val1, init_val2, init_val3, init_val4, init_val5)
-struct five_char_t *five_char;
-char init_val1;
-char init_val2;
-char init_val3;
-char init_val4;
-char init_val5;
-#endif
-{
-
-     five_char->ch1 = init_val1;
-     five_char->ch2 = init_val2;
-     five_char->ch3 = init_val3;
-     five_char->ch4 = init_val4;
-     five_char->ch5 = init_val5;
-}
-
-/*****************************************************************
- * INIT_INT_CHAR_COMBO : 
- * OUT struct int_char_combo_t *combo -- structure to be filled
- * IN  int  init_val1 
- * IN  char init_val2 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_int_char_combo (
-struct int_char_combo_t *combo,
-int init_val1,
-char init_val2)
-#else
-void init_int_char_combo ( combo, init_val1, init_val2)
-struct int_char_combo_t *combo;
-int init_val1;
-char init_val2;
-#endif
-{
-
-     combo->int1 = init_val1;
-     combo->ch1 = init_val2;
-}
-
-/*****************************************************************
- * INIT_STRUCT_REP : 
- * OUT struct small_rep_into_t *small_struct -- structure to be filled
- * IN  int  seed 
- *****************************************************************/
-#ifdef PROTOTYPES
-void init_struct_rep(
-     struct small_rep_info_t *small_struct,
-     int seed)
-#else
-void init_struct_rep( small_struct, seed)
-struct small_rep_info_t *small_struct;
-int    seed;
-#endif
-{
-
-      small_struct->value = 2 + (seed*2); 
-      small_struct->head = 0; 
-}
-
-/*****************************************************************
- * PRINT_BIT_FLAGS_CHAR : 
- * IN struct bit_flags_char_t bit_flags 
- ****************************************************************/
-#ifdef PROTOTYPES
-struct bit_flags_char_t print_bit_flags_char (struct bit_flags_char_t bit_flags)
-#else
-struct bit_flags_char_t print_bit_flags_char ( bit_flags)
-struct bit_flags_char_t bit_flags;
-#endif
-{
-
-     if (bit_flags.alpha) printf("alpha\n");
-     if (bit_flags.beta) printf("beta\n");
-     if (bit_flags.gamma) printf("gamma\n");
-     if (bit_flags.delta) printf("delta\n");
-     if (bit_flags.epsilon) printf("epsilon\n");
-     if (bit_flags.omega) printf("omega\n");
-     return bit_flags;
-     
-}
-
-/*****************************************************************
- * PRINT_BIT_FLAGS_SHORT : 
- * IN struct bit_flags_short_t bit_flags 
- ****************************************************************/
-#ifdef PROTOTYPES
-struct bit_flags_short_t print_bit_flags_short (struct bit_flags_short_t bit_flags)
-#else
-struct bit_flags_short_t print_bit_flags_short ( bit_flags)
-struct bit_flags_short_t bit_flags;
-#endif
-{
-
-     if (bit_flags.alpha) printf("alpha\n");
-     if (bit_flags.beta) printf("beta\n");
-     if (bit_flags.gamma) printf("gamma\n");
-     if (bit_flags.delta) printf("delta\n");
-     if (bit_flags.epsilon) printf("epsilon\n");
-     if (bit_flags.omega) printf("omega\n");
-     return bit_flags;
-     
-}
-
-/*****************************************************************
- * PRINT_BIT_FLAGS : 
- * IN struct bit_flags_t bit_flags 
- ****************************************************************/
-#ifdef PROTOTYPES
-struct bit_flags_t print_bit_flags (struct bit_flags_t bit_flags)
-#else
-struct bit_flags_t print_bit_flags ( bit_flags)
-struct bit_flags_t bit_flags;
-#endif
-{
-
-     if (bit_flags.alpha) printf("alpha\n");
-     if (bit_flags.beta) printf("beta\n");
-     if (bit_flags.gamma) printf("gamma\n");
-     if (bit_flags.delta) printf("delta\n");
-     if (bit_flags.epsilon) printf("epsilon\n");
-     if (bit_flags.omega) printf("omega\n");
-     return bit_flags;
-     
-}
-
-/*****************************************************************
- * PRINT_BIT_FLAGS_COMBO : 
- * IN struct bit_flags_combo_t bit_flags_combo 
- ****************************************************************/
-#ifdef PROTOTYPES
-struct bit_flags_combo_t print_bit_flags_combo (struct bit_flags_combo_t bit_flags_combo)
-#else
-struct bit_flags_combo_t print_bit_flags_combo ( bit_flags_combo )
-struct bit_flags_combo_t bit_flags_combo;
-#endif
-{
-
-     if (bit_flags_combo.alpha) printf("alpha\n");
-     if (bit_flags_combo.beta) printf("beta\n");
-     if (bit_flags_combo.gamma) printf("gamma\n");
-     if (bit_flags_combo.delta) printf("delta\n");
-     if (bit_flags_combo.epsilon) printf("epsilon\n");
-     if (bit_flags_combo.omega) printf("omega\n");
-     printf("ch1: %c\tch2: %c\n", bit_flags_combo.ch1, bit_flags_combo.ch2);
-     return bit_flags_combo;
-     
-}
-
-/*****************************************************************
- * PRINT_ONE_DOUBLE : 
- * IN struct one_double_t one_double 
- ****************************************************************/
-#ifdef PROTOTYPES
-struct one_double_t print_one_double (struct one_double_t one_double)
-#else
-struct one_double_t print_one_double ( one_double )
-struct one_double_t one_double;
-#endif
-{
-
-     printf("Contents of one_double_t: \n\n");
-     printf("%f\n", one_double.double1);
-     return one_double;
-     
-}
-
-/*****************************************************************
- * PRINT_TWO_FLOATS : 
- * IN struct two_floats_t two_floats 
- ****************************************************************/
-#ifdef PROTOTYPES
-struct two_floats_t print_two_floats (struct two_floats_t two_floats)
-#else
-struct two_floats_t print_two_floats ( two_floats ) 
-struct two_floats_t two_floats;
-#endif
-{
-
-     printf("Contents of two_floats_t: \n\n");
-     printf("%f\t%f\n", two_floats.float1, two_floats.float2);
-     return two_floats;
-     
-}
-
-/*****************************************************************
- * PRINT_THREE_CHARS : 
- * IN struct three_char_t three_char
- ****************************************************************/
-#ifdef PROTOTYPES
-struct three_char_t print_three_chars (struct three_char_t three_char)
-#else
-struct three_char_t print_three_chars ( three_char ) 
-struct three_char_t three_char;
-#endif
-{
-
-     printf("Contents of three_char_t: \n\n");
-     printf("%c\t%c\t%c\n", three_char.ch1, three_char.ch2, three_char.ch3);
-     return three_char;
-     
-}
-
-/*****************************************************************
- * PRINT_FIVE_CHARS : 
- * IN struct five_char_t five_char
- ****************************************************************/
-#ifdef PROTOTYPES
-struct five_char_t print_five_chars (struct five_char_t five_char)
-#else
-struct five_char_t print_five_chars ( five_char )
-struct five_char_t five_char;
-#endif
-{
-
-     printf("Contents of five_char_t: \n\n");
-     printf("%c\t%c\t%c\t%c\t%c\n", five_char.ch1, five_char.ch2, 
-				    five_char.ch3, five_char.ch4, 
-				    five_char.ch5);
-     return five_char;
-     
-}
-
-/*****************************************************************
- * PRINT_INT_CHAR_COMBO : 
- * IN struct int_char_combo_t int_char_combo
- ****************************************************************/
-#ifdef PROTOTYPES
-struct int_char_combo_t print_int_char_combo (struct int_char_combo_t int_char_combo)
-#else
-struct int_char_combo_t print_int_char_combo ( int_char_combo )
-struct int_char_combo_t int_char_combo;
-#endif
-{
-
-     printf("Contents of int_char_combo_t: \n\n");
-     printf("%d\t%c\n", int_char_combo.int1, int_char_combo.ch1);
-     return int_char_combo;
-     
-}     
-
-/*****************************************************************
- * PRINT_STRUCT_REP : 
- ****************************************************************/
-#ifdef PROTOTYPES
-struct small_rep_info_t print_struct_rep(struct small_rep_info_t struct1)
-#else
-struct small_rep_info_t print_struct_rep( struct1 )
-struct small_rep_info_t struct1;
-#endif
-{
-
-  printf("Contents of struct1: \n\n");
-  printf("%10d%10d\n", struct1.value, struct1.head); 
-  struct1.value =+5;
-  
-  return struct1;
-  
-
-}
-
-
-#ifdef PROTOTYPES
-struct array_rep_info_t print_one_large_struct(struct array_rep_info_t linked_list1)
-#else
-struct array_rep_info_t print_one_large_struct( linked_list1 )
-struct array_rep_info_t linked_list1;
-#endif
-{
-
-
-      printf("%10d%10d\n", linked_list1.values[0], 
-			   linked_list1.next_index[0]); 
- 
-      return linked_list1;
-      
-}
-
-/*****************************************************************
- * INIT_ARRAY_REP :
- * IN struct array_rep_info_t *linked_list
- * IN int    seed
- ****************************************************************/
-#ifdef PROTOTYPES
-void init_array_rep(struct array_rep_info_t *linked_list, int seed)
-#else
-void init_array_rep( linked_list, seed )
-struct array_rep_info_t *linked_list;
-int    seed;
-#endif
-{
-
-  int index;
-
-  for (index = 0; index < 10; index++) {
-
-      linked_list->values[index] = (2*index) + (seed*2);
-      linked_list->next_index[index] = index + 1;
-  }
-  linked_list->head = 0;
-}
-
-
-int main ()  {
-   
-  /* variables for large structure testing
-   */
-  int number = 10;
-  struct array_rep_info_t *list1;
-
-  /* variables for testing a small structures and a very long argument list
-   */
-   struct small_rep_info_t  *struct1;
-   struct bit_flags_char_t  *cflags;
-   struct bit_flags_short_t *sflags;
-   struct bit_flags_t       *flags;
-   struct bit_flags_combo_t *flags_combo;
-   struct three_char_t      *three_char;
-   struct five_char_t       *five_char;
-   struct int_char_combo_t  *int_char_combo;
-   struct one_double_t      *d1;
-   struct two_floats_t      *f3;
-
-
-  /* Allocate space for large structures 
-   */
-  list1 = (struct array_rep_info_t *)malloc(sizeof(struct array_rep_info_t));
-
-  /* Initialize large structures 
-   */
-  init_array_rep(list1, 2);
-
-  /* Print large structures 
-   */
-  print_one_large_struct(*list1);
-
-  /* Allocate space for small structures 
-   */
-  struct1     = (struct small_rep_info_t  *)malloc(sizeof(struct small_rep_info_t));
-  cflags       = (struct bit_flags_char_t *)malloc(sizeof(struct bit_flags_char_t));
-  sflags       = (struct bit_flags_short_t *)malloc(sizeof(struct bit_flags_short_t));
-  flags       = (struct bit_flags_t *)malloc(sizeof(struct bit_flags_t));
-  flags_combo = (struct bit_flags_combo_t *)malloc(sizeof(struct bit_flags_combo_t));
-  three_char  = (struct three_char_t *)malloc(sizeof(struct three_char_t));
-  five_char   = (struct five_char_t *)malloc(sizeof(struct five_char_t));
-  int_char_combo = (struct int_char_combo_t *)malloc(sizeof(struct int_char_combo_t));
-
-  d1 = (struct one_double_t *)malloc(sizeof(struct one_double_t));
-  f3 = (struct two_floats_t *)malloc(sizeof(struct two_floats_t));
-
-  /* Initialize small structures 
-   */
-  init_one_double ( d1, 1.11111); 
-  init_two_floats ( f3, -2.345, 1.0); 
-  init_bit_flags_char(cflags, (unsigned)1, (unsigned)0, (unsigned)1, 
-		      (unsigned)0, (unsigned)1, (unsigned)0 ); 
-  init_bit_flags_short(sflags, (unsigned)1, (unsigned)0, (unsigned)1, 
-		       (unsigned)0, (unsigned)1, (unsigned)0 ); 
-  init_bit_flags(flags, (unsigned)1, (unsigned)0, (unsigned)1, 
-		 (unsigned)0, (unsigned)1, (unsigned)0 ); 
-  init_bit_flags_combo(flags_combo, (unsigned)1, (unsigned)0, 'y',
-				     (unsigned)1, (unsigned)0, 'n',
-				     (unsigned)1, (unsigned)0 ); 
-  init_three_chars(three_char, 'x', 'y', 'z');
-  init_five_chars(five_char, 'h', 'e', 'l', 'l', 'o');
-  init_int_char_combo(int_char_combo, 13, '!');
-  init_struct_rep(struct1, 10);
- 
- 
-  /* Print small structures 
-   */
-  print_one_double(*d1);
-  print_two_floats(*f3);
-  print_bit_flags_char(*cflags);
-  print_bit_flags_short(*sflags);
-  print_bit_flags(*flags);
-  print_bit_flags_combo(*flags_combo);
-  print_three_chars(*three_char);
-  print_five_chars(*five_char);
-  print_int_char_combo(*int_char_combo);
-  print_struct_rep(*struct1);
-
-  loop_count();
-
-  return 0;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
deleted file mode 100644
index 7e94408a53d..00000000000
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# this file tests command line calls with functions returning structures
-# corresponding source file: call_return_struct.c
-
-
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "call-rt-st"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-
-# Test depends on printf, which the sparclet stub doesn't support.  
-if { [istarget "sparclet-*-*"] } {
-    return 0;
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
-    return -1
-}
-
-
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# Some targets can't do function calls, so don't even bother with this
-# test.
-if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*" 2416
-    fail "This target can not call functions"
-    continue
-}
-
-# Set the current language to C.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_c {} {
-    global gdb_prompt
-
-    send_gdb "set language c\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {}
-	timeout { fail "set language c (timeout)" ; return 0; }
-    }
-
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"c\".*$gdb_prompt $" {
-	    pass "set language to \"c\""
-	    return 1
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "setting language to \"c\""
-	    return 0
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return 0
-	}
-    }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-
-gdb_test "break loop_count" \
-    "Breakpoint.* file .*call-rt-st.c, line 128\\." \
-    "breakpoint loop_count"
-
-
-send_gdb "continue\n"
-gdb_expect {
- -re  "Continuing\\..*Breakpoint.*loop_count \\(\\) at.*call-rt-st.c:128\[ \t\r\n\]+128\[\t \]+for \\(index=0; index.4; index..\\);\[\r\n \]+$gdb_prompt $" {
-                 pass "continue to loop_count"}
-      -re ".*$gdb_prompt $" { fail "continue to loop_count"}           
-      timeout           { fail "(timeout) continue to loop_count"}
-}
-
-send_gdb "finish\n"
-gdb_expect {
-    -re  "Run till exit from .0  loop_count \\(\\) at.*call-rt-st.c:128\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:777\[ \t\r\n\]+777\[\t \]+return 0;.*$gdb_prompt $" {
-	pass "finish out from loop_count (line 777)"
-    }
-    -re  "Run till exit from .0  loop_count \\(\\) at.*call-rt-st.c:128\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:775\[ \t\r\n\]+775\[\t \]+loop_count.*$gdb_prompt $" {
-	pass "finish out from loop_count (line 775)"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "finish out from loop_count"
-    }
-    timeout {
-	fail "finish out from loop_count (timeout)"
-    }
-}
-
-# Ask GDB to print the value of EXPR, and expect to see the regexp
-# RESULT in the output.  If we get back the error message "Function
-# return value unknown", call that an `unsupported' test; on some
-# architectures, it's impossible to find structs returned by value
-# reliably.
-proc print_struct_call { expr result } {
-    global gdb_prompt
-
-    set command "print $expr"
-    send_gdb "${command}\n"
-    gdb_expect {
-        -re "$result\[\r\n\]+$gdb_prompt $" {
-            pass "$command"
-        }
-        -re "Function return value unknown.\[\r\n\]+$gdb_prompt $" {
-            unsupported "$command"
-        }
-        -re "$gdb_prompt $" {
-            fail "$command"
-        }
-        timeout {
-            fail "$command (timeout)"
-        }
-    }
-}
-
-
-if ![gdb_skip_stdio_test "print print_struct_rep(*struct1)"] {
-    print_struct_call "print_struct_rep(*struct1)" \
-            ".*Contents of struct1:\[ \t\n\r\]+22\[ \t\]+0\[ \t\n\r\]+.\[0-9\]+ = \\{value = 5, head = 0\\}"
-}
-
-if ![gdb_skip_stdio_test "print print_one_large_struct(...)"] {
-    print_struct_call "print_one_large_struct(*list1)" \
-            ".*\[ \t\]+4\[ \t\]+1\[ \r\n\]+.\[0-9\]+ = \\{next_index = \\{1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\}, values = \\{4, 6, 8, 10, 12, 14, 16, 18, 20, 22\\}, head = 0\\}"
-}
-
-if {![gdb_skip_float_test "print print_one_double(*d1)"] && \
-        ![gdb_skip_stdio_test "print print_one_double(*d1)"] } {
-    print_struct_call "print_one_double(*d1)" \
-	    ".*Contents of one_double_t:\[ \r\n\]+1\\.111110\[ \r\n\]+.\[0-9\]+ = \\{double1 = 1\\.111\[0-9\]*\\}"
-}
-
-if {![gdb_skip_float_test "print print_two_floats(*f3)"] && \
-        ![gdb_skip_stdio_test "print print_two_floats(*f3)"] } {
-    print_struct_call "print_two_floats(*f3)" \
-            ".*Contents of two_floats_t:\[ \r\n\]+-2\\.345000\[ \t]+1\\.000000\[ \r\n\]+.\[0-9\]+ = \\{float1 = -2\\.34500003, float2 = 1\\}"
-}
-
-if ![gdb_skip_stdio_test "print print_bit_flags_char(*cflags)"] {
-    print_struct_call "print_bit_flags_char(*cflags)" \
-            ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+.\[0-9\]+ = \\{alpha = 1 '\\\\001', beta = 0 '\\\\0', gamma = 1 '\\\\001', delta = 0 '\\\\0', epsilon = 1 '\\\\001', omega = 0 '\\\\0'\\}"
-}
-
-if ![gdb_skip_stdio_test "print print_bit_flags_short(*sflags)"] {
-    print_struct_call "print_bit_flags_short(*sflags)" \
-            ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+.\[0-9\]+ = \\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\\}"
-}
-
-if ![gdb_skip_stdio_test "print print_bit_flags(*flags)"] {
-    print_struct_call "print_bit_flags(*flags)" \
-            ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+.\[0-9\]+ = \\{alpha = 1, beta = 0, gamma = 1, delta = 0, epsilon = 1, omega = 0\\}"
-}
-
-if ![gdb_skip_stdio_test "print print_bit_flags_combo(*flags_combo)"] {
-    print_struct_call "print_bit_flags_combo(*flags_combo)" \
-            ".*alpha\[ \r\n\]+gamma\[ \r\n\]+epsilon\[ \r\n\]+ch1: y\[ \t\]+ch2: n\[ \r\n\]+.\[0-9\]+ = \\{alpha = 1, beta = 0, ch1 = 121 'y', gamma = 1, delta = 0, ch2 = 110 'n', epsilon = 1, omega = 0\\}"
-}
-
-if ![gdb_skip_stdio_test "print print_three_chars(*three_chars)"] {
-    print_struct_call "print_three_chars(*three_char)" \
-            ".*Contents of three_char_t:\[ \r\n\]+x\[ \t\]+y\[ \t\]+z\[ \r\n\]+.\[0-9\]+ = \\{ch1 = 120 'x', ch2 = 121 'y', ch3 = 122 'z'\\}"
-}
-
-if ![gdb_skip_stdio_test "print print_five_chars(*five_chars)"] {
-    print_struct_call "print_five_chars(*five_char)" \
-            ".*Contents of five_char_t:\[ \r\n\]+h\[ \t\]+e\[ \t\]+l\[ \t\]+l\[ \t\]+o\[ \r\n\]+.\[0-9\]+ = \\{ch1 = 104 'h', ch2 = 101 'e', ch3 = 108 'l', ch4 = 108 'l', ch5 = 111 'o'\\}"
-}
-
-if ![gdb_skip_stdio_test "print print_int_char_combo(*int_char_combo)"] {
-    print_struct_call "print_int_char_combo(*int_char_combo)" \
-            ".*Contents of int_char_combo_t:\[ \r\n\]+13\[ \t\]+!\[ \r\n\]+.\[0-9\]+ = \\{int1 = 13, ch1 = 33 '!'\\}"
-}
-
-return
diff --git a/gdb/testsuite/gdb.base/call-sc.c b/gdb/testsuite/gdb.base/call-sc.c
deleted file mode 100644
index 70ae87f7991..00000000000
--- a/gdb/testsuite/gdb.base/call-sc.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.
-
-*/
-
-/* Useful abreviations.  */
-typedef void t;
-typedef char tc;
-typedef short ts;
-typedef int ti;
-typedef long tl;
-typedef long long tll;
-typedef float tf;
-typedef double td;
-typedef long double tld;
-typedef enum { e = '1' } te;
-
-/* Force the type of each field.  */
-#ifndef T
-typedef t T;
-#endif
-
-T foo = '1', L;
-
-T fun()
-{
-  return foo;  
-}
-
-#ifdef PROTOTYPES
-void Fun(T foo)
-#else
-void Fun(foo)
-     T foo;
-#endif
-{
-  L = foo;
-}
-
-zed ()
-{
-  L = 'Z';
-}
-
-int main()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  int i;
-
-  Fun(foo);	
-
-  /* An infinite loop that first clears all the variables and then
-     calls the function.  This "hack" is to make re-testing easier -
-     "advance fun" is guaranteed to have always been preceeded by a
-     global variable clearing zed call.  */
-
-  zed ();
-  while (1)
-    {
-      L = fun ();	
-      zed ();
-    }
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
deleted file mode 100644
index 01a9f152097..00000000000
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ /dev/null
@@ -1,500 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2004 Free Software Foundation, 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.  
-
-# Test "return", "finish", and "call" of functions that a scalar (int,
-# float, enum) and/or take a single scalar parameter.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Some targets can't call functions, so don't even bother with this
-# test.
-
-if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*"
-    fail "This target can not call functions"
-    continue
-}
-
-set testfile "call-sc"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the
-# compiler used to compile the test case.
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# Use the file name, compiler and tuples to set up any needed KFAILs.
-
-proc setup_kfails { file tuples bug } {
-    global testfile
-    if [string match $file $testfile] {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
-proc setup_compiler_kfails { file compiler format tuples bug } {
-    global testfile
-    if {[string match $file $testfile] && [test_compiler_info $compiler]  && [test_debug_format $format]} {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
-# Compile a variant of scalars.c using TYPE to specify the type of the
-# parameter and return-type.  Run the compiled program up to "main".
-# Also updates the global "testfile" to reflect the most recent build.
-
-proc start_scalars_test { type } {
-    global testfile
-    global srcfile
-    global binfile
-    global objdir
-    global subdir
-    global srcdir
-    global gdb_prompt
-    global expect_out
-
-    # Create the additional flags
-    set flags "debug additional_flags=-DT=${type}"
-    set testfile "call-sc-${type}"
-
-    set binfile ${objdir}/${subdir}/${testfile}
-    if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags}"] != "" } {
-	# built the second test case since we can't use prototypes
-	warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES"
-	if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags} additional_flags=-DNO_PROTOTYPES"] != "" } {
-	    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-	}
-    }
-
-    # Start with a fresh gdb.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-
-    # Make certain that the output is consistent
-    gdb_test "set print sevenbit-strings" "" \
-	    "set print sevenbit-strings; ${testfile}"
-    gdb_test "set print address off" "" \
-	    "set print address off; ${testfile}"
-    gdb_test "set width 0" "" \
-	    "set width 0; ${testfile}"
-
-    # Advance to main
-    if { ![runto_main] } then {
-	gdb_suppress_tests;
-    }
-
-    # Get the debug format
-    get_debug_format
-
-    # check that type matches what was passed in
-    set test "ptype; ${testfile}"
-    set foo_t "xxx"
-    gdb_test_multiple "ptype ${type}" "${test}" {
-	-re "type = (\[^\r\n\]*)\r\n$gdb_prompt $" {
-	    set foo_t "$expect_out(1,string)"
-	    pass "$test (${foo_t})"
-	}
-    }
-    gdb_test "ptype foo" "type = ${foo_t}" "ptype foo; ${testfile} $expect_out(1,string)"
-}
-
-
-# Given N (0..25), return the corresponding alphabetic letter in lower
-# or upper case.  This is ment to be i18n proof.
-
-proc i2a { n } {
-    return [string range "abcdefghijklmnopqrstuvwxyz" $n $n]
-}
-
-proc I2A { n } {
-    return [string toupper [i2a $n]]
-}
-
-
-# Use the file name, compiler and tuples to set up any needed KFAILs.
-
-proc setup_kfails { file tuples bug } {
-    global testfile
-    if [string match $file $testfile] {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
-proc setup_compiler_kfails { file compiler format tuples bug } {
-    global testfile
-    if {[string match $file $testfile] && [test_compiler_info $compiler]  && [test_debug_format $format]} {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
-# Test GDB's ability to make inferior function calls to functions
-# returning (or passing) in a single scalar.
-
-# start_scalars_test() will have previously built a program with a
-# specified scalar type.  To ensure robustness of the output, "p/c" is
-# used.
-
-# This tests the code paths "which return-value convention?" and
-# "extract return-value from registers" called by "infcall.c".
-
-proc test_scalar_calls { } {
-    global testfile
-    global gdb_prompt
-
-    # Check that GDB can always extract a scalar-return value from an
-    # inferior function call.  Since GDB always knows the location of
-    # an inferior function call's return value these should never fail
-    
-    # Implemented by calling the parameterless function "fun" and then
-    # examining the return value printed by GDB.
-
-    set tests "call ${testfile}"
-
-    # Call fun, checking the printed return-value.
-    gdb_test "p/c fun()" "= 49 '1'" "p/c fun(); ${tests}"
-
-    # Check that GDB can always pass a structure to an inferior function.
-    # This test can never fail.
-
-    # Implemented by calling the one parameter function "Fun" which
-    # stores its parameter in the global variable "L".  GDB then
-    # examining that global to confirm that the value is as expected.
-
-    gdb_test "call Fun(foo)" "" "call Fun(foo); ${tests}"
-    gdb_test "p/c L" " = 49 '1'" "p/c L; ${tests}"
-}
-
-# Test GDB's ability to both return a function (with "return" or
-# "finish") and correctly extract/store any corresponding
-# return-value.
-
-# Check that GDB can consistently extract/store structure return
-# values.  There are two cases - returned in registers and returned in
-# memory.  For the latter case, the return value can't be found and a
-# failure is "expected".  However GDB must still both return the
-# function and display the final source and line information.
-
-# N identifies the number of elements in the struct that will be used
-# for the test case.  FAILS is a list of target tuples that will fail
-# this test.
-
-# This tests the code paths "which return-value convention?", "extract
-# return-value from registers", and "store return-value in registers".
-# Unlike "test struct calls", this test is expected to "fail" when the
-# return-value is in memory (GDB can't find the location).  The test
-# is in three parts: test "return"; test "finish"; check that the two
-# are consistent.  GDB can sometimes work for one command and not the
-# other.
-
-proc test_scalar_returns { } {
-    global gdb_prompt
-    global testfile
-
-    set tests "return ${testfile}"
-
-
-    # Check that "return" works.
-
-    # GDB must always force the return of a function that has
-    # a struct result.  Dependant on the ABI, it may, or may not be
-    # possible to store the return value in a register.
-
-    # The relevant code looks like "L{n} = fun{n}()".  The test forces
-    # "fun{n}" to "return" with an explicit value.  Since that code
-    # snippet will store the the returned value in "L{n}" the return
-    # is tested by examining "L{n}".  This assumes that the
-    # compiler implemented this as fun{n}(&L{n}) and hence that when
-    # the value isn't stored "L{n}" remains unchanged.  Also check for
-    # consistency between this and the "finish" case.
-
-    # Get into a call of fun
-    gdb_test "advance fun" \
-	    "fun .*\[\r\n\]+\[0-9\].*return foo.*" \
-	    "advance to fun for return; ${tests}"
-
-    # Check that the program invalidated the relevant global.
-    gdb_test "p/c L" " = 90 'Z'" "zed L for return; ${tests}"
-
-    # Force the "return".  This checks that the return is always
-    # performed, and that GDB correctly reported this to the user.
-    # GDB 6.0 and earlier, when the return-value's location wasn't
-    # known, both failed to print a final "source and line" and misplaced
-    # the frame ("No frame").
-
-    # The test is writen so that it only reports one FAIL/PASS for the
-    # entire operation.  The value returned is checked further down.
-    # "return_value_unknown", if non-empty, records why GDB realised
-    # that it didn't know where the return value was.
-
-    set test "return foo; ${tests}"
-    set return_value_unknown 0
-    set return_value_unimplemented 0
-    gdb_test_multiple "return foo" "${test}" {
-	-re "The location" {
-	    # Ulgh, a struct return, remember this (still need prompt).
-	    set return_value_unknown 1
-	    exp_continue
-	}
-	-re "A structure or union" {
-	    # Ulgh, a struct return, remember this (still need prompt).
-	    set return_value_unknown 1
-	    # Double ulgh.  Architecture doesn't use return_value and
-	    # hence hasn't implemented small structure return.
-	    set return_value_unimplemented 1
-	    exp_continue
-	}
-	-re "Make fun return now.*y or n. $" {
-	    gdb_test_multiple "y" "${test}" {
-		-re "L *= fun.*${gdb_prompt} $" {
-		    # Need to step off the function call
-		    gdb_test "next" "zed.*" "${test}"
-		}
-		-re "zed \\(\\);.*$gdb_prompt $" {
-		    pass "${test}"
-		}
-	    }
-	}
-    }
-
-    # If the previous test did not work, the program counter might
-    # still be inside foo() rather than main().  Make sure the program
-    # counter is is main().
-    #
-    # This happens on ppc64 GNU/Linux with gcc 3.4.1 and a buggy GDB
-
-    set test "return foo; synchronize pc to main()"
-    for {set loop_count 0} {$loop_count < 2} {incr loop_count} {
-      gdb_test_multiple "backtrace 1" $test {
-        -re "#0.*main \\(\\).*${gdb_prompt} $" {
-          pass $test
-          set loop_count 2
-        }
-        -re "#0.*fun \\(\\).*${gdb_prompt} $" {
-          if {$loop_count < 1} {
-            gdb_test "finish" ".*" ""
-          } else {
-            fail $test
-            set loop_count 2
-          }
-        }
-      }
-    }
-
-    # Check that the return-value is as expected.  At this stage we're
-    # just checking that GDB has returned a value consistent with
-    # "return_value_unknown" set above.
-
-    set test "value foo returned; ${tests}"
-    gdb_test_multiple "p/c L" "${test}" {
-	-re " = 49 '1'.*${gdb_prompt} $" {
-	    if $return_value_unknown {
-		# This contradicts the above claim that GDB didn't
-		# know the location of the return-value.
-		fail "${test}"
-	    } else {
-		pass "${test}"
-	    }
-	}
-	-re " = 90 .*${gdb_prompt} $" {
-	    if $return_value_unknown {
-		# The struct return case.  Since any modification
-		# would be by reference, and that can't happen, the
-		# value should be unmodified and hence Z is expected.
-		# Is this a reasonable assumption?
-		pass "${test}"
-	    } else {
-		# This contradicts the above claim that GDB knew
-		# the location of the return-value.
-		fail "${test}"
-	    }
-	}
-	-re ".*${gdb_prompt} $" {
-	    if $return_value_unimplemented {
-		# What a suprize.  The architecture hasn't implemented
-		# return_value, and hence has to fail.
-		kfail "$test" gdb/1444
-	    } else {
-		fail "$test"
-	    }
-	}
-    }	
-    
-    # Check that a "finish" works.
-
-    # This is almost but not quite the same as "call struct funcs".
-    # Architectures can have subtle differences in the two code paths.
-
-    # The relevant code snippet is "L{n} = fun{n}()".  The program is
-    # advanced into a call to  "fun{n}" and then that function is
-    # finished.  The returned value that GDB prints, reformatted using
-    # "p/c", is checked.
-
-    # Get into "fun()".
-    gdb_test "advance fun" \
-	    "fun .*\[\r\n\]+\[0-9\].*return foo.*" \
-	    "advance to fun for finish; ${tests}"
-
-    # Check that the program invalidated the relevant global.
-    gdb_test "p/c L" " = 90 'Z'" "zed L for finish; ${tests}"
-
-    # Finish the function, set 'finish_value_unknown" to non-empty if the
-    # return-value was not found.
-    set test "finish foo; ${tests}"
-    set finish_value_unknown 0
-    gdb_test_multiple "finish" "${test}" {
-	-re "Value returned is .*${gdb_prompt} $" {
-	    pass "${test}"
-	}
-	-re "Cannot determine contents.*${gdb_prompt} $" {
-	    # Expected bad value.  For the moment this is ok.
-	    set finish_value_unknown 1
-	    pass "${test}"
-	}
-    }
-
-    # Re-print the last (return-value) using the more robust
-    # "p/c".  If no return value was found, the 'Z' from the previous
-    # check that the variable was cleared, is printed.
-    set test "value foo finished; ${tests}"
-    gdb_test_multiple "p/c" "${test}" {
-	-re " = 49 '1'\[\r\n\]+${gdb_prompt} $" {
-	    if $finish_value_unknown {
-		# This contradicts the above claim that GDB didn't
-		# know the location of the return-value.
-		fail "${test}"
-	    } else {
-		pass "${test}"
-	    }
-	}
-	-re " = 90 'Z'\[\r\n\]+${gdb_prompt} $" {
-	    # The value didn't get found.  This is "expected".
-	    if $finish_value_unknown {
-		pass "${test}"
-	    } else {
-		# This contradicts the above claim that GDB did
-		# know the location of the return-value.
-		fail "${test}"
-	    }
-	}
-    }
-
-    # Finally, check that "return" and finish" have consistent
-    # behavior.
-
-    # Since both "return" and "finish" use equivalent "which
-    # return-value convention" logic, both commands should have
-    # identical can/can-not find return-value messages.
-
-    # Note that since "call" and "finish" use common code paths, a
-    # failure here is a strong indicator of problems with "store
-    # return-value" code paths.  Suggest looking at "return_value"
-    # when investigating a fix.
-
-    set test "return and finish use same convention; ${tests}"
-    if {$finish_value_unknown == $return_value_unknown} {
-	pass "${test}"
-    } else {
-	kfail gdb/1444 "${test}"
-    }
-}
-
-# ABIs pass anything >8 or >16 bytes in memory but below that things
-# randomly use register and/and structure conventions.  Check all
-# possible sized char scalars in that range.  But only a restricted
-# range of the other types.
-
-# NetBSD/PPC returns "unnatural" (3, 5, 6, 7) sized scalars in memory.
-
-# d10v is weird. 5/6 byte scalars go in memory.  2 or more char
-# scalars go in memory.  Everything else is in a register!
-
-# Test every single char struct from 1..17 in size.  This is what the
-# original "scalars" test was doing.
-
-start_scalars_test tc
-test_scalar_calls
-test_scalar_returns
-
-
-# Let the fun begin.
-
-# Assuming that any integer struct larger than 8 bytes goes in memory,
-# come up with many and varied combinations of a return struct.  For
-# "struct calls" test just beyond that 8 byte boundary, for "struct
-# returns" test up to that boundary.
-
-# For floats, assumed that up to two struct elements can be stored in
-# floating point registers, regardless of their size.
-
-# The approx size of each structure it is computed assumed that tc=1,
-# ts=2, ti=4, tl=4, tll=8, tf=4, td=8, tld=16, and that all fields are
-# naturally aligned.  Padding being added where needed.  Note that
-# these numbers are just approx, the d10v has ti=2, a 64-bit has has
-# tl=8.
-
-# Approx size: 2, 4, ...
-start_scalars_test ts
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 4, 8, ...
-start_scalars_test ti
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 4, 8, ...
-start_scalars_test tl
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 8, 16, ...
-start_scalars_test tll
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 4, 8, ...
-start_scalars_test tf
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 8, 16, ...
-start_scalars_test td
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 16, 32, ...
-start_scalars_test tld
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 4, 8, ...
-start_scalars_test te
-test_scalar_calls
-test_scalar_returns
-
-return 0
diff --git a/gdb/testsuite/gdb.base/call-strs.c b/gdb/testsuite/gdb.base/call-strs.c
deleted file mode 100644
index f3bc8da9166..00000000000
--- a/gdb/testsuite/gdb.base/call-strs.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-char buf[100];
-char bigbuf[1000];
-char * s;
-
-#ifdef PROTOTYPES
-char * str_func1(char *s1)
-#else
-char * str_func1(s1)
-char *s1;
-#endif
-{
-  printf("first string arg is: %s\n", s1);
-  strcpy(bigbuf, s1);
-  return bigbuf;
-}
-
-#ifdef PROTOTYPES
-char * str_func(
-char * s1, 
-char * s2,
-char * s3,
-char * s4,
-char * s5,
-char * s6,
-char * s7)
-#else
-char * str_func(s1, 
-                s2,
-               s3,
-               s4,
-               s5,
-               s6,
-               s7)
-char * s1; 
-char * s2;
-char * s3;
-char * s4;
-char * s5;
-char * s6;
-char * s7;
-#endif
-{
-  printf("first string arg is: %s\n", s1);
-  printf("second string arg is: %s\n", s2);
-  printf("third string arg is: %s\n", s3);
-  printf("fourth string arg is: %s\n", s4);
-  printf("fifth string arg is: %s\n", s5);
-  printf("sixth string arg is: %s\n", s6);
-  printf("seventh string arg is: %s\n", s7);
-  strcpy(bigbuf, s1);
-  strcat(bigbuf, s2);
-  strcat(bigbuf, s3);
-  strcat(bigbuf, s4);
-  strcat(bigbuf, s5);
-  strcat(bigbuf, s6);
-  strcat(bigbuf, s7);
-  return bigbuf;
-}
-
-char *
-link_malloc ()
-{
-  return (char*) malloc (1);
-}
-
-int main()
-{
-  s = &buf[0];
-  strcpy(buf, "test string");
-  str_func("abcd", "efgh", "ijkl", "mnop", "qrst", "uvwx", "yz12");
-  str_func1("abcd");
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
deleted file mode 100644
index 281ee235512..00000000000
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1998, 1999, 2000 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This test deals with calling functions which have strings as parameters.
-# it plays around with constant strings.
-# the corresponding source file is call-strs.c
-#
-
-#debug strarg
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "call-strs"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Test depends on printf, which the sparclet stub doesn't support.  
-if { [istarget "sparclet-*-*"] } {
-    return 0;
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-
-# Some targets can't call functions, so don't even bother with this
-# test.
-if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*" 2416
-    fail "This target can not call functions"
-    continue
-}
-
-# Set the current language to C.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_c {} {
-    global gdb_prompt
-
-    send_gdb "set language c\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {}
-	timeout { fail "set language c (timeout)" ; return 0; }
-    }
-
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"c\".*$gdb_prompt $" {
-	    pass "set language to \"c\""
-	    return 1
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "setting language to \"c\""
-	    return 0
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return 0
-	}
-    }
-}
-
-
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
-
-set timeout 120
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-#step
-send_gdb "step\n"
-gdb_expect {
-        -re ".*strcpy\\(buf, \"test string\"\\);.*$gdb_prompt $" {pass "step after assignment to s"}
-        -re ".*$gdb_prompt $" { fail "step after assignment to s" }
-        timeout { fail "step after assignment to s (timeout)" }
-    }
-
-
-#next
-send_gdb "next\n"
-gdb_expect {
-        -re ".*str_func\\(\"abcd\", \"efgh\", \"ijkl\", \"mnop\", \"qrst\", \"uvwx\", \"yz12\"\\);.*$gdb_prompt $" {pass "next over strcpy"}
-        -re ".*$gdb_prompt $" { fail "next over strcpy" }
-        timeout { fail "next over strcpy (timeout)" }
-    }
-
-#print buf
-send_gdb "print buf\n"
-gdb_expect {
-    -re ".*\"test string\",.*repeats 88 times.*$gdb_prompt $" {
-        pass "print buf"
-      }
-    -re ".*$gdb_prompt $" { fail "print buf" }
-    timeout           { fail "(timeout) print buf" }
-  }
-
-
-#print s
-send_gdb "print s\n"
-gdb_expect {
-    -re ".*= \"test string\".*$gdb_prompt $" {
-        pass "print s"
-      }
-    -re ".*$gdb_prompt $" { fail "print s" }
-    timeout           { fail "(timeout) print sum_array_print(10, *list1, *list2, *list3, *list4)" }
-  }
-
-
-#print str_func1(s)
-if ![gdb_skip_stdio_test "print str_func1(s)"] {
-    send_gdb "print  str_func1(s)\n"
-    gdb_expect {
-	-re "first string arg is: test string.*\"test string\".*$gdb_prompt $" {
-	    pass "print str_func1(s)"
-	}
-	-re ".*$gdb_prompt $" { fail "print str_func1(s)" }
-	timeout               { fail "(timeout) print str_func1(s)" }
-    }
-}
-
-
-#print str_func1("test string")
-if ![gdb_skip_stdio_test "print str_func1(teststring)"] {
-    send_gdb "print  str_func1(\"test string\")\n"
-    gdb_expect {
-	-re "first string arg is: test string.*\"test string\".*$gdb_prompt $" {
-	    pass "print str_func1(\"test string\")"
-	}
-	-re ".*$gdb_prompt $" { fail "print str_func1(\"test string\")" }
-	timeout     { fail "(timeout) print str_func1(\"test string\")" }
-    }
-}
-
-#call str_func1(s)
-if ![gdb_skip_stdio_test "call str_func1(s)"] {
-    send_gdb "call  str_func1(s)\n"
-    gdb_expect {
-	-re "first string arg is: test string.*\"test string\".*$gdb_prompt $" {
-	    pass "call str_func1(s)"
-	}
-	-re ".*$gdb_prompt $" { fail "call str_func1(s)" }
-	timeout               { fail "(timeout) call str_func1(s)" }
-    }
-}
-
-#call str_func1("test string")
-if ![gdb_skip_stdio_test "call str_func1 (...)"] {
-    send_gdb "call  str_func1(\"test string\")\n"
-    gdb_expect {
-	-re "first string arg is: test string.*\"test string\".*$gdb_prompt $" {
-	    pass "call str_func1(\"test string\")"
-	}
-	-re ".*$gdb_prompt $" { fail "call str_func1(\"test string\")" }
-	timeout     { fail "(timeout) call str_func1(\"test string\")" }
-    }
-}
-
-#print str_func1(buf)
-if ![gdb_skip_stdio_test "print str_func1(buf)"] {
-    send_gdb "print  str_func1(buf)\n"
-    gdb_expect {
-	-re "first string arg is: test string.*\"test string\".*$gdb_prompt $" {
-	    pass "print str_func1(buf)"
-	}
-	-re ".*$gdb_prompt $" { fail "print str_func1(buf)" }
-	timeout               { fail "(timeout) print str_func1(buf)" }
-    }
-}
-
-#call str_func1(buf)
-if ![gdb_skip_stdio_test "call str_func1(buf)"] {
-    send_gdb "call str_func1(buf)\n"
-    gdb_expect {
-	-re "first string arg is: test string.*\"test string\".*$gdb_prompt $" {
-	    pass "call str_func1(buf)"
-	}
-	-re ".*$gdb_prompt $" { fail "call str_func1(buf)" }
-	timeout               { fail "(timeout) call str_func1(buf)" }
-    }
-}
-
-#print str_func("a","b","c","d","e","f","g")
-if ![gdb_skip_stdio_test "print str_func(a,b,c,d,e,f,g)"] {
-    send_gdb "print  str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")\n"
-    gdb_expect {
-	-re "first string arg is: a\[ \t\r\n\]+second string arg is: b\[ \t\r\n\]+third string arg is: c\[ \t\r\n\]+fourth string arg is: d\[ \t\r\n\]+fifth string arg is: e\[ \t\r\n\]+sixth string arg is: f\[ \t\r\n\]+seventh string arg is: g\[ \t\r\n\]+.*= \"abcdefg\".*$gdb_prompt $" {
-	    pass "print str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")"
-	}
-	-re ".*$gdb_prompt $" { fail "print str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" }
-	timeout           { fail "(timeout) print str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" }
-    }
-}
-
-#call str_func("a","b","c","d","e","f","g")
-if ![gdb_skip_stdio_test "call str_func(a,b,c,d,e,f,g)"] {
-    send_gdb "call  str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")\n"
-    gdb_expect {
-	-re "first string arg is: a\[ \t\r\n\]+second string arg is: b\[ \t\r\n\]+third string arg is: c\[ \t\r\n\]+fourth string arg is: d\[ \t\r\n\]+fifth string arg is: e\[ \t\r\n\]+sixth string arg is: f\[ \t\r\n\]+seventh string arg is: g\[ \t\r\n\]+.*= \"abcdefg\".*$gdb_prompt $" {
-	    pass "call str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")"
-	}
-	-re ".*$gdb_prompt $" { fail "call str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" }
-	timeout           { fail "(timeout) call str_func(\"a\",\"b\",\"c\",\"d\",\"e\",\"f\",\"g\")" }
-    }
-}
-
-#print str_func(s,s,s,s,s,s,s)
-if ![gdb_skip_stdio_test "print str_func(s,s,s,s,s,s,s,s)"] {
-    send_gdb "print  str_func(s,s,s,s,s,s,s)\n"
-    gdb_expect {
-	-re "first string arg is: test string\[ \t\r\n\]+second string arg is: test string\[ \t\r\n\]+third string arg is: test string\[ \t\r\n\]+fourth string arg is: test string\[ \t\r\n\]+fifth string arg is: test string\[ \t\r\n\]+sixth string arg is: test string\[ \t\r\n\]+seventh string arg is: test string\[ \t\r\n\]+.*\"test stringtest stringtest stringtest stringtest stringtest stringtest string\".*$gdb_prompt $" {
-	    pass "print str_func(s,s,s,s,s,s,s)"
-	}
-	-re ".*$gdb_prompt $" { fail "print str_func(s,s,s,s,s,s,s)" }
-	timeout     { fail "(timeout) print str_func(s,s,s,s,s,s,s)" }
-    }
-}
-
-#call str_func(s,s,s,s,s,s,s)
-if ![gdb_skip_stdio_test "call str_func(s,s,s,s,s,s,s,s)"] {
-    send_gdb "call  str_func(s,s,s,s,s,s,s)\n"
-    gdb_expect {
-	-re "first string arg is: test string\[ \t\r\n\]+second string arg is: test string\[ \t\r\n\]+third string arg is: test string\[ \t\r\n\]+fourth string arg is: test string\[ \t\r\n\]+fifth string arg is: test string\[ \t\r\n\]+sixth string arg is: test string\[ \t\r\n\]+seventh string arg is: test string\[ \t\r\n\]+.*\"test stringtest stringtest stringtest stringtest stringtest stringtest string\".*$gdb_prompt $" {
-	    pass "call str_func(s,s,s,s,s,s,s)"
-	}
-	-re ".*$gdb_prompt $" { fail "call str_func(s,s,s,s,s,s,s)" }
-	timeout               { fail "(timeout) call str_func(s,s,s,s,s,s,s)" }
-    }
-}
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/callfuncs.c b/gdb/testsuite/gdb.base/callfuncs.c
deleted file mode 100644
index a52b2b138f9..00000000000
--- a/gdb/testsuite/gdb.base/callfuncs.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2004
-   Free Software Foundation, 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  */
-
-/* Support program for testing gdb's ability to call functions
-   in the inferior, pass appropriate arguments to those functions,
-   and get the returned result. */
-
-#ifdef NO_PROTOTYPES
-#define PARAMS(paramlist) ()
-#else
-#define PARAMS(paramlist) paramlist
-#endif
-
-# include <stdlib.h>
-# include <string.h>
-
-char char_val1 = 'a';
-char char_val2 = 'b';
-
-short short_val1 = 10;
-short short_val2 = -23;
-
-int int_val1 = 87;
-int int_val2 = -26;
-
-long long_val1 = 789;
-long long_val2 = -321;
-
-float float_val1 = 3.14159;
-float float_val2 = -2.3765;
-
-double double_val1 = 45.654;
-double double_val2 = -67.66;
-
-#define DELTA (0.001)
-
-char *string_val1 = (char *)"string 1";
-char *string_val2 = (char *)"string 2";
-
-char char_array_val1[] = "carray 1";
-char char_array_val2[] = "carray 2";
-
-struct struct1 {
-  char c;
-  short s;
-  int i;
-  long l;
-  float f;
-  double d;
-  char a[4];
-} struct_val1 = { 'x', 87, 76, 51, 2.1234, 9.876, "foo" };
-
-/* Some functions that can be passed as arguments to other test
-   functions, or called directly. */
-#ifdef PROTOTYPES
-int add (int a, int b)
-#else
-int add (a, b) int a, b;
-#endif
-{
-  return (a + b);
-}
-
-#ifdef PROTOTYPES
-int doubleit (int a)
-#else
-int doubleit (a) int a;
-#endif
-{
-  return (a + a);
-}
-
-int (*func_val1) PARAMS((int,int)) = add;
-int (*func_val2) PARAMS((int)) = doubleit;
-
-/* An enumeration and functions that test for specific values. */
-
-enum enumtype { enumval1, enumval2, enumval3 };
-enum enumtype enum_val1 = enumval1;
-enum enumtype enum_val2 = enumval2;
-enum enumtype enum_val3 = enumval3;
-
-#ifdef PROTOTYPES
-int t_enum_value1 (enum enumtype enum_arg)
-#else
-int t_enum_value1 (enum_arg) enum enumtype enum_arg;
-#endif
-{
-  return (enum_arg == enum_val1);
-}
-
-#ifdef PROTOTYPES
-int t_enum_value2 (enum enumtype enum_arg)
-#else
-int t_enum_value2 (enum_arg) enum enumtype enum_arg;
-#endif
-{
-  return (enum_arg == enum_val2);
-}
-
-#ifdef PROTOTYPES
-int t_enum_value3 (enum enumtype enum_arg)
-#else
-int t_enum_value3 (enum_arg) enum enumtype enum_arg;
-#endif
-{
-  return (enum_arg == enum_val3);
-}
-
-/* A function that takes a vector of integers (along with an explicit
-   count) and returns their sum. */
-
-#ifdef PROTOTYPES
-int sum_args (int argc, int argv[])
-#else
-int sum_args (argc, argv) int argc; int argv[];
-#endif
-{
-  int sumval = 0;
-  int idx;
-
-  for (idx = 0; idx < argc; idx++)
-    {
-      sumval += argv[idx];
-    }
-  return (sumval);
-}
-
-/* Test that we can call functions that take structs and return
-   members from that struct */
-
-#ifdef PROTOTYPES
-char   t_structs_c (struct struct1 tstruct) { return (tstruct.c); }
-short  t_structs_s (struct struct1 tstruct) { return (tstruct.s); }
-int    t_structs_i (struct struct1 tstruct) { return (tstruct.i); }
-long   t_structs_l (struct struct1 tstruct) { return (tstruct.l); }
-float  t_structs_f (struct struct1 tstruct) { return (tstruct.f); }
-double t_structs_d (struct struct1 tstruct) { return (tstruct.d); }
-char  *t_structs_a (struct struct1 tstruct)
-{
-  static char buf[8];
-  strcpy (buf, tstruct.a);
-  return buf;
-}
-#else
-char   t_structs_c (tstruct) struct struct1 tstruct; { return (tstruct.c); }
-short  t_structs_s (tstruct) struct struct1 tstruct; { return (tstruct.s); }
-int    t_structs_i (tstruct) struct struct1 tstruct; { return (tstruct.i); }
-long   t_structs_l (tstruct) struct struct1 tstruct; { return (tstruct.l); }
-float  t_structs_f (tstruct) struct struct1 tstruct; { return (tstruct.f); }
-double t_structs_d (tstruct) struct struct1 tstruct; { return (tstruct.d); }
-char  *t_structs_a (tstruct) struct struct1 tstruct;
-{
-  static char buf[8];
-  strcpy (buf, tstruct.a);
-  return buf;
-}
-#endif
-
-/* Test that calling functions works if there are a lot of arguments.  */
-#ifdef PROTOTYPES
-int
-sum10 (int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9)
-#else
-int
-sum10 (i0, i1, i2, i3, i4, i5, i6, i7, i8, i9)
-     int i0, i1, i2, i3, i4, i5, i6, i7, i8, i9;
-#endif
-{
-  return i0 + i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9;
-}
-
-/* Test that args are passed in the right order. */
-#ifdef PROTOTYPES
-int
-cmp10 (int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9)
-#else
-int
-cmp10 (i0, i1, i2, i3, i4, i5, i6, i7, i8, i9)
-  int i0, i1, i2, i3, i4, i5, i6, i7, i8, i9;
-#endif
-{
-  return
-    (i0 == 0) && (i1 == 1) && (i2 == 2) && (i3 == 3) && (i4 == 4) &&
-    (i5 == 5) && (i6 == 6) && (i7 == 7) && (i8 == 8) && (i9 == 9);
-}
-
-/* Functions that expect specific values to be passed and return 
-   either 0 or 1, depending upon whether the values were
-   passed incorrectly or correctly, respectively. */
-
-#ifdef PROTOTYPES
-int t_char_values (char char_arg1, char char_arg2)
-#else
-int t_char_values (char_arg1, char_arg2)
-char char_arg1, char_arg2;
-#endif
-{
-  return ((char_arg1 == char_val1) && (char_arg2 == char_val2));
-}
-
-int
-#ifdef PROTOTYPES
-t_small_values (char arg1, short arg2, int arg3, char arg4, short arg5,
-		char arg6, short arg7, int arg8, short arg9, short arg10)
-#else
-t_small_values (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10)
-     char arg1;
-     short arg2;
-     int arg3;
-     char arg4;
-     short arg5;
-     char arg6;
-     short arg7;
-     int arg8;
-     short arg9;
-     short arg10;
-#endif
-{
-  return arg1 + arg2 + arg3 + arg4 + arg5 + arg6 + arg7 + arg8 + arg9 + arg10;
-}
-
-#ifdef PROTOTYPES
-int t_short_values (short short_arg1, short short_arg2)
-#else
-int t_short_values (short_arg1, short_arg2)
-     short short_arg1, short_arg2;
-#endif
-{
-  return ((short_arg1 == short_val1) && (short_arg2 == short_val2));
-}
-
-#ifdef PROTOTYPES
-int t_int_values (int int_arg1, int int_arg2)
-#else
-int t_int_values (int_arg1, int_arg2)
-int int_arg1, int_arg2;
-#endif
-{
-  return ((int_arg1 == int_val1) && (int_arg2 == int_val2));
-}
-
-#ifdef PROTOTYPES
-int t_long_values (long long_arg1, long long_arg2)
-#else
-int t_long_values (long_arg1, long_arg2)
-long long_arg1, long_arg2;
-#endif
-{
-  return ((long_arg1 == long_val1) && (long_arg2 == long_val2));
-}
-
-/* NOTE: THIS FUNCTION MUST NOT BE PROTOTYPED!!!!!
-   There must be one version of "t_float_values" (this one)
-   that is not prototyped, and one (if supported) that is (following).
-   That way GDB can be tested against both cases.  */
-   
-int t_float_values (float_arg1, float_arg2)
-float float_arg1, float_arg2;
-{
-  return ((float_arg1 - float_val1) < DELTA
-	  && (float_arg1 - float_val1) > -DELTA
-	  && (float_arg2 - float_val2) < DELTA
-	  && (float_arg2 - float_val2) > -DELTA);
-}
-
-int
-#ifdef NO_PROTOTYPES
-/* In this case we are just duplicating t_float_values, but that is the
-   easiest way to deal with either ANSI or non-ANSI.  */
-t_float_values2 (float_arg1, float_arg2)
-     float float_arg1, float_arg2;
-#else
-t_float_values2 (float float_arg1, float float_arg2)
-#endif
-{
-  return ((float_arg1 - float_val1) < DELTA
-	  && (float_arg1 - float_val1) > -DELTA
-	  && (float_arg2 - float_val2) < DELTA
-	  && (float_arg2 - float_val2) > -DELTA);
-}
-
-#ifdef PROTOTYPES
-int t_double_values (double double_arg1, double double_arg2)
-#else
-int t_double_values (double_arg1, double_arg2)
-double double_arg1, double_arg2;
-#endif
-{
-  return ((double_arg1 - double_val1) < DELTA
-	  && (double_arg1 - double_val1) > -DELTA
-	  && (double_arg2 - double_val2) < DELTA
-	  && (double_arg2 - double_val2) > -DELTA);
-}
-
-#ifdef PROTOTYPES
-int t_string_values (char *string_arg1, char *string_arg2)
-#else
-int t_string_values (string_arg1, string_arg2)
-char *string_arg1, *string_arg2;
-#endif
-{
-  return (!strcmp (string_arg1, string_val1) &&
-	  !strcmp (string_arg2, string_val2));
-}
-
-#ifdef PROTOTYPES
-int t_char_array_values (char char_array_arg1[], char char_array_arg2[])
-#else
-int t_char_array_values (char_array_arg1, char_array_arg2)
-char char_array_arg1[], char_array_arg2[];
-#endif
-{
-  return (!strcmp (char_array_arg1, char_array_val1) &&
-	  !strcmp (char_array_arg2, char_array_val2));
-}
-
-
-/* This used to simply compare the function pointer arguments with
-   known values for func_val1 and func_val2.  Doing so is valid ANSI
-   code, but on some machines (RS6000, HPPA, others?) it may fail when
-   called directly by GDB.
-
-   In a nutshell, it's not possible for GDB to determine when the address
-   of a function or the address of the function's stub/trampoline should
-   be passed.
-
-   So, to avoid GDB lossage in the common case, we perform calls through the
-   various function pointers and compare the return values.  For the HPPA
-   at least, this allows the common case to work.
-
-   If one wants to try something more complicated, pass the address of
-   a function accepting a "double" as one of its first 4 arguments.  Call
-   that function indirectly through the function pointer.  This would fail
-   on the HPPA.  */
-
-#ifdef PROTOTYPES
-int t_func_values (int (*func_arg1)(int, int), int (*func_arg2)(int))
-#else
-int t_func_values (func_arg1, func_arg2)
-int (*func_arg1) PARAMS ((int, int));
-int (*func_arg2) PARAMS ((int));
-#endif
-{
-  return ((*func_arg1) (5,5)  == (*func_val1) (5,5)
-          && (*func_arg2) (6) == (*func_val2) (6));
-}
-
-#ifdef PROTOTYPES
-int t_call_add (int (*func_arg1)(int, int), int a, int b)
-#else
-int t_call_add (func_arg1, a, b)
-int (*func_arg1) PARAMS ((int, int));
-int a, b;
-#endif
-{
-  return ((*func_arg1)(a, b));
-}
-
-
-/* Gotta have a main to be able to generate a linked, runnable
-   executable, and also provide a useful place to set a breakpoint. */
-
-int main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  malloc(1);
-  t_double_values(double_val1, double_val2);
-  t_structs_c(struct_val1);
-  return 0 ;
-}
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
deleted file mode 100644
index a40845c9a97..00000000000
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-# and modified by Bob Manson. (manson@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "callfuncs"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-if {$hp_aCC_compiler} {
-    set prototypes 1
-} else {
-    set prototypes 0
-}
-
-# Some targets can't do function calls, so don't even bother with this
-# test.
-if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*" 2416
-    fail "This target can not call functions"
-    continue
-}
-
-# Set the current language to C.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_c {} {
-    global gdb_prompt
-
-    send_gdb "set language c\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {}
-	timeout { fail "set language c (timeout)" ; return 0; }
-    }
-
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"c\".*$gdb_prompt $" {
-	    pass "set language to \"c\""
-	    return 1
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "setting language to \"c\""
-	    return 0
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return 0
-	}
-    }
-}
-
-# FIXME:  Before calling this proc, we should probably verify that
-# we can call inferior functions and get a valid integral value
-# returned.
-# Note that it is OK to check for 0 or 1 as the returned values, because C
-# specifies that the numeric value of a relational or logical expression
-# (computed in the inferior) is 1 for true and 0 for false.
-
-proc do_function_calls {} {
-    global prototypes
-    global gdb_prompt
-
-    # We need to up this because this can be really slow on some boards.
-    set timeout 60;
-
-    gdb_test "p t_char_values(0,0)" " = 0"
-    gdb_test "p t_char_values('a','b')" " = 1"
-    gdb_test "p t_char_values(char_val1,char_val2)" " = 1"
-    gdb_test "p t_char_values('a',char_val2)" " = 1"
-    gdb_test "p t_char_values(char_val1,'b')" " = 1"
-
-    gdb_test "p t_short_values(0,0)" " = 0"
-    gdb_test "p t_short_values(10,-23)" " = 1"
-    gdb_test "p t_short_values(short_val1,short_val2)" " = 1"
-    gdb_test "p t_short_values(10,short_val2)" " = 1"
-    gdb_test "p t_short_values(short_val1,-23)" " = 1"
-
-    gdb_test "p t_int_values(0,0)" " = 0"
-    gdb_test "p t_int_values(87,-26)" " = 1"
-    gdb_test "p t_int_values(int_val1,int_val2)" " = 1"
-    gdb_test "p t_int_values(87,int_val2)" " = 1"
-    gdb_test "p t_int_values(int_val1,-26)" " = 1"
-
-    gdb_test "p t_long_values(0,0)" " = 0"
-    gdb_test "p t_long_values(789,-321)" " = 1"
-    gdb_test "p t_long_values(long_val1,long_val2)" " = 1"
-    gdb_test "p t_long_values(789,long_val2)" " = 1"
-    gdb_test "p t_long_values(long_val1,-321)" " = 1"
-
-    if ![target_info exists gdb,skip_float_tests] {
-	gdb_test "p t_float_values(0.0,0.0)" " = 0"
-
-	# These next four tests fail on the mn10300.
-	# The first value is passed in regs, the other in memory.
-	# Gcc emits different stabs for the two parameters; the first is
-	# claimed to be a float, the second a double.
-	# dbxout.c in gcc claims this is the desired behavior.
-	setup_xfail "mn10300-*-*"
-	gdb_test "p t_float_values(3.14159,-2.3765)" " = 1"
-	setup_xfail "mn10300-*-*"
-	gdb_test "p t_float_values(float_val1,float_val2)" " = 1"
-	setup_xfail "mn10300-*-*"
-	gdb_test "p t_float_values(3.14159,float_val2)" " = 1"
-	setup_xfail "mn10300-*-*"
-	gdb_test "p t_float_values(float_val1,-2.3765)" " = 1"
-
-	# Test passing of arguments which might not be widened.
-	gdb_test "p t_float_values2(0.0,0.0)" " = 0"
-
-	# Although PR 5318 mentions SunOS specifically, this seems
-	# to be a generic problem on quite a few platforms.
-	if $prototypes then {
-	    setup_xfail "sparc-*-*" "mips*-*-*" 5318
-	    if { ! [test_compiler_info gcc-*-*] } then {
-		setup_xfail "alpha-dec-osf2*" "i*86-*-sysv4*" 5318
-	    }
-	}
-        
-	gdb_test "p t_float_values2(3.14159,float_val2)" " = 1"
-
-	gdb_test "p t_small_values(1,2,3,4,5,6,7,8,9,10)" " = 55"
-
-	gdb_test "p t_double_values(0.0,0.0)" " = 0"
-	gdb_test "p t_double_values(45.654,-67.66)" " = 1"
-	gdb_test "p t_double_values(double_val1,double_val2)" " = 1"
-	gdb_test "p t_double_values(45.654,double_val2)" " = 1"
-	gdb_test "p t_double_values(double_val1,-67.66)" " = 1"
-    }
-
-    gdb_test "p t_string_values(string_val2,string_val1)" " = 0"
-    gdb_test "p t_string_values(string_val1,string_val2)" " = 1"
-    gdb_test "p t_string_values(\"string 1\",\"string 2\")" " = 1"
-    gdb_test "p t_string_values(\"string 1\",string_val2)" " = 1"
-    gdb_test "p t_string_values(string_val1,\"string 2\")" " = 1"
-
-    gdb_test "p t_char_array_values(char_array_val2,char_array_val1)" " = 0"
-    gdb_test "p t_char_array_values(char_array_val1,char_array_val2)" " = 1"
-    gdb_test "p t_char_array_values(\"carray 1\",\"carray 2\")" " = 1"
-    gdb_test "p t_char_array_values(\"carray 1\",char_array_val2)" " = 1"
-    gdb_test "p t_char_array_values(char_array_val1,\"carray 2\")" " = 1"
-
-    gdb_test "p doubleit(4)" " = 8"
-    gdb_test "p add(4,5)" " = 9"
-    gdb_test "p t_func_values(func_val2,func_val1)" " = 0"
-    gdb_test "p t_func_values(func_val1,func_val2)" " = 1"
-
-    # GDB currently screws up the passing of function parameters for
-    # ABIs that use function descriptors.  Instead of passing the
-    # address of te function descriptor, GDB passes the address of the
-    # function body.  This results in the called function treating the
-    # first few instructions of the function proper as a descriptor
-    # and attempting a jump through that (a totally random address).
-    setup_kfail "rs6000*-*-aix*" gdb/1457
-    setup_kfail "powerpc*-*-aix*" gdb/1457
-    setup_kfail hppa*-*-hpux* gdb/1457
-    gdb_test "p t_func_values(add,func_val2)" " = 1"
-    setup_kfail "rs6000*-*-aix*" gdb/1457
-    setup_kfail "powerpc*-*-aix*" gdb/1457
-    setup_kfail hppa*-*-hpux* gdb/1457
-    gdb_test "p t_func_values(func_val1,doubleit)" " = 1"
-    setup_kfail "rs6000*-*-aix*" gdb/1457
-    setup_kfail "powerpc*-*-aix*" gdb/1457
-    setup_kfail hppa*-*-hpux* gdb/1457
-    gdb_test "p t_call_add(add,3,4)" " = 7"
-    gdb_test "p t_call_add(func_val1,3,4)" " = 7"
-
-    gdb_test "p t_enum_value1(enumval1)" " = 1"
-    gdb_test "p t_enum_value1(enum_val1)" " = 1"
-    gdb_test "p t_enum_value1(enum_val2)" " = 0"
-
-    gdb_test "p t_enum_value2(enumval2)" " = 1"
-    gdb_test "p t_enum_value2(enum_val2)" " = 1"
-    gdb_test "p t_enum_value2(enum_val1)" " = 0"
-
-    gdb_test "p sum_args(1,{2})" " = 2"
-    gdb_test "p sum_args(2,{2,3})" " = 5"
-    gdb_test "p sum_args(3,{2,3,4})" " = 9"
-    gdb_test "p sum_args(4,{2,3,4,5})" " = 14"
-
-    gdb_test "p sum10 (1, 2, 3, 4, 5, 6, 7, 8, 9, 10)" " = 55"
-
-    gdb_test "p cmp10 (0, 1, 2, 3, 4, 5, 6, 7, 8, 9)" " = 1"
-
-    gdb_test "p t_structs_c(struct_val1)" "= 120 'x'" \
-	"call inferior func with struct - returns char"
-    gdb_test "p t_structs_s(struct_val1)" "= 87" \
-	"call inferior func with struct - returns short"
-    gdb_test "p t_structs_i(struct_val1)" "= 76" \
-	"call inferior func with struct - returns int"
-    gdb_test "p t_structs_l(struct_val1)" "= 51" \
-	"call inferior func with struct - returns long"
-    gdb_test "p t_structs_f(struct_val1)" "= 2.12.*" \
-       	"call inferior func with struct - returns float"
-    gdb_test "p t_structs_d(struct_val1)" "= 9.87.*" \
-    	"call inferior func with struct - returns double"
-    gdb_test "p t_structs_a(struct_val1)" "= (.unsigned char .. )?\"foo\"" \
-    	"call inferior func with struct - returns char *"
-}
-
-# Procedure to get current content of all registers.
-global all_registers_content
-set all_registers_content ""
-proc do_get_all_registers { } {
-    global gdb_prompt
-    global expect_out
-    global all_registers_content
-
-    set all_registers_content ""
-    send_gdb "info all-registers\n"
-    gdb_expect {
-	-re "info all-registers\r\n(.*)$gdb_prompt $" {
-	    set all_registers_content $expect_out(1,string)
-	}
-	default {}
-    }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set print sevenbit-strings" ""
-gdb_test "set print address off" ""
-gdb_test "set width 0" ""
-
-if { $hp_aCC_compiler } {
-    # Do not set language explicitly to 'C'.  This will cause aCC
-    # tests to fail because promotion rules are different.  Just let
-    # the language be set to the default.
-
-    if { ![runto_main] } {
-	gdb_suppress_tests;
-    }
-
-    # However, turn off overload-resolution for aCC.  Having it on causes
-    # a lot of failures.
-
-    gdb_test "set overload-resolution 0" ".*"
-} else {
-    if { ![set_lang_c] } {
-	gdb_suppress_tests;
-    } else {
-	if { ![runto_main] } {
-	    gdb_suppress_tests;
-	}
-    }
-}
-
-get_debug_format
-
-# Make sure that malloc gets called and that the floating point unit
-# is initialized via a call to t_double_values.
-gdb_test "next" "t_double_values\\(double_val1, double_val2\\);.*" \
-  "next to t_double_values"
-gdb_test "next" "t_structs_c\\(struct_val1\\);.*" \
-  "next to t_structs_c"
-
-# Save all register contents.
-do_get_all_registers
-set old_reg_content $all_registers_content
-
-# Perform function calls.
-do_function_calls
-
-# Check if all registers still have the same value.
-do_get_all_registers
-set new_reg_content $all_registers_content
-if ![string compare $old_reg_content $new_reg_content] then {
-    pass "gdb function calls preserve register contents"
-} else {
-    set old_reg_content $all_registers_content
-    fail "gdb function calls preserve register contents"
-}
-
-# Set breakpoint at a function we will call from gdb.
-gdb_breakpoint add
-
-# Call function (causing a breakpoint hit in the call dummy) and do a continue,
-# make sure we are back at main and still have the same register contents.
-gdb_test "print add(4,5)" \
-	"The program being debugged stopped while.*" \
-	"stop at breakpoint in call dummy function"
-gdb_test "continue" "Continuing.*" "continue from call dummy breakpoint"
-if ![gdb_test "bt 2" \
-	      "#0  main.*" \
-	      "bt after continuing from call dummy breakpoint"] then {
-    do_get_all_registers
-    set new_reg_content $all_registers_content
-    if ![string compare $old_reg_content $new_reg_content] then {
-	pass "continue after stop in call dummy preserves register contents"
-    } else {
-	fail "continue after stop in call dummy preserves register contents"
-    }
-}
-
-# Call function (causing a breakpoint hit in the call dummy) and do a finish,
-# make sure we are back at main and still have the same register contents.
-gdb_test "print add(4,5)" "The program being debugged stopped while.*" \
-	"call function causing a breakpoint then do a finish"
-gdb_test "finish" \
-	 "Value returned is .* = 9" \
-	 "finish from call dummy breakpoint returns correct value"
-if ![gdb_test "bt 2" \
-	      "#0  main.*" \
-	      "bt after finishing from call dummy breakpoint"] then {
-    do_get_all_registers
-    set new_reg_content $all_registers_content
-    if ![string compare $old_reg_content $new_reg_content] then {
-	pass "finish after stop in call dummy preserves register contents"
-    } else {
-	fail "finish after stop in call dummy preserves register contents"
-    }
-}
-
-# Call function (causing a breakpoint hit in the call dummy) and do a return
-# with a value, make sure we are back at main with the same register contents.
-gdb_test "print add(4,5)" "The program being debugged stopped while.*" \
-	"call function causing a breakpoint and then do a return"
-if ![gdb_test "return 7" \
-	      "#0  main.*" \
-	      "back at main after return from call dummy breakpoint" \
-	      "Make add return now. .y or n.*" \
-	      "y"] then {
-    do_get_all_registers
-    set new_reg_content $all_registers_content
-    if ![string compare $old_reg_content $new_reg_content] then {
-	pass "return after stop in call dummy preserves register contents"
-    } else {
-	fail "return after stop in call dummy preserves register contents"
-    }
-}
-
-# Call function (causing a breakpoint hit in the call dummy), and
-# call another function from the call dummy frame (thereby setting up
-# several nested call dummy frames).  Test that backtrace and finish
-# work when several call dummies are nested.
-gdb_breakpoint sum10
-gdb_breakpoint t_small_values
-gdb_test "print add(2,3)" "The program being debugged stopped while.*" \
-	"stop at nested call level 1"
-gdb_test "backtrace" \
-	"\#0  add \\(a=2, b=3\\).*\#1  <function called from gdb>.*\#2  main.*" \
-	"backtrace at nested call level 1"
-gdb_test "print add(4,5)" "The program being debugged stopped while.*" \
-	"stop at nested call level 2"
-gdb_test "backtrace" \
-	"\#0  add \\(a=4, b=5\\).*\#1  <function called from gdb>.*\#2  add \\(a=2, b=3\\).*\#3  <function called from gdb>.*\#4  main.*" \
-	"backtrace at nested call level 2"
-gdb_test "print sum10(2,4,6,8,10,12,14,16,18,20)" \
-	"The program being debugged stopped while.*" \
-	"stop at nested call level 3"
-gdb_test "backtrace" \
-	"\#0  sum10 \\(i0=2, i1=4, i2=6, i3=8, i4=10, i5=12, i6=14, i7=16, i8=18, i9=20\\).*\#1  <function called from gdb>.*\#2  add \\(a=4, b=5\\).*\#3  <function called from gdb>.*\#4  add \\(a=2, b=3\\).*\#5  <function called from gdb>.*\#6  main.*" \
-	"backtrace at nested call level 3"
-gdb_test "print t_small_values(1,3,5,7,9,11,13,15,17,19)" \
-	"The program being debugged stopped while.*" \
-	"stop at nested call level 4"
-gdb_test "backtrace" \
-	"\#0  t_small_values \\(arg1=1 '.001', arg2=3, arg3=5, arg4=7 '.a', arg5=9, arg6=11 '.v', arg7=13, arg8=15, arg9=17, arg10=19\\).*\#2  sum10 \\(i0=2, i1=4, i2=6, i3=8, i4=10, i5=12, i6=14, i7=16, i8=18, i9=20\\).*\#3  <function called from gdb>.*\#4  add \\(a=4, b=5\\).*\#5  <function called from gdb>.*\#6  add \\(a=2, b=3\\).*\#7  <function called from gdb>.*\#8  main.*" \
-	"backtrace at nested call level 4"
-gdb_test "finish" "Value returned is .* = 100" \
-	"Finish from nested call level 4"
-gdb_test "backtrace" \
-	"\#0  sum10 \\(i0=2, i1=4, i2=6, i3=8, i4=10, i5=12, i6=14, i7=16, i8=18, i9=20\\).*\#1  <function called from gdb>.*\#2  add \\(a=4, b=5\\).*\#3  <function called from gdb>.*\#4  add \\(a=2, b=3\\).*\#5  <function called from gdb>.*\#6  main.*" \
-	"backtrace after finish from nested call level 4"
-gdb_test "finish" "Value returned is .* = 110" \
-	"Finish from nested call level 3"
-gdb_test "backtrace" \
-	"\#0  add \\(a=4, b=5\\).*\#1  <function called from gdb>.*\#2  add \\(a=2, b=3\\).*\#3  <function called from gdb>.*\#4  main.*" \
-	"backtrace after finish from nested call level 3"
-gdb_test "finish" "Value returned is .* = 9" \
-	"Finish from nested call level 2"
-gdb_test "backtrace" \
-	"\#0  add \\(a=2, b=3\\).*\#1  <function called from gdb>.*\#2  main.*" \
-	"backtrace after finish from nested call level 2"
-gdb_test "finish" "Value returned is .* = 5" \
-	"Finish from nested call level 1"
-gdb_test "backtrace" "\#0  main .*" \
-	"backtrace after finish from nested call level 1"
-
-do_get_all_registers
-set new_reg_content $all_registers_content
-if ![string compare $old_reg_content $new_reg_content] then {
-    pass "nested call dummies preserve register contents"
-} else {
-    fail "nested call dummies preserve register contents"
-}
-
-return 0
-
diff --git a/gdb/testsuite/gdb.base/charset.c b/gdb/testsuite/gdb.base/charset.c
deleted file mode 100644
index d35c1baa7d4..00000000000
--- a/gdb/testsuite/gdb.base/charset.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2001, 2004 Free Software Foundation, Inc.
-
-   Contributed by Red Hat, originally written by Jim Blandy.
-
-   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@gnu.org  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/* X_string is a null-terminated string in the X charset whose
-   elements are as follows.  X should be the name the `set charset'
-   command uses for the character set, in lower-case, with any
-   non-identifier characters replaced with underscores.  Where a
-   character set doesn't have the given character, the string should
-   contain the character 'x'.
-
-   [0] --- the `alert' character, '\a'
-   [1] --- the `backspace' character, '\b'
-   [2] --- the `form feed' character, '\f'
-   [3] --- the `line feed' character, '\n'
-   [4] --- the `carriage return' character, '\r'
-   [5] --- the `horizontal tab' character, '\t'
-   [6] --- the `vertical tab' character, '\v'
-   [7  .. 32] --- the uppercase letters A-Z
-   [33 .. 58] --- the lowercase letters a-z
-   [59 .. 68] --- the digits 0-9
-   [69] --- the `cent' character
-   [70] --- a control character with no defined backslash escape
-
-   Feel free to extend these as you like.  */
-
-#define NUM_CHARS (71)
-
-char ascii_string[NUM_CHARS];
-char iso_8859_1_string[NUM_CHARS];
-char ebcdic_us_string[NUM_CHARS];
-char ibm1047_string[NUM_CHARS];
-
-
-void
-init_string (char string[],
-             char x,
-             char alert, char backspace, char form_feed,
-             char line_feed, char carriage_return, char horizontal_tab,
-             char vertical_tab, char cent, char misc_ctrl)
-{
-  memset (string, x, NUM_CHARS);
-  string[0] = alert;
-  string[1] = backspace;
-  string[2] = form_feed;
-  string[3] = line_feed;
-  string[4] = carriage_return;
-  string[5] = horizontal_tab;
-  string[6] = vertical_tab;
-  string[69] = cent;
-  string[70] = misc_ctrl;
-}
-
-
-void
-fill_run (char string[], int start, int len, int first)
-{
-  int i;
-
-  for (i = 0; i < len; i++)
-    string[start + i] = first + i;
-}
-
-
-int main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  (void) malloc (1);
-  /* Initialize ascii_string.  */
-  init_string (ascii_string,
-               120,
-               7, 8, 12,
-               10, 13, 9,
-               11, 120, 17);
-  fill_run (ascii_string, 7, 26, 65);
-  fill_run (ascii_string, 33, 26, 97);
-  fill_run (ascii_string, 59, 10, 48);
-
-  /* Initialize iso_8859_1_string.  */
-  init_string (iso_8859_1_string,
-               120,
-               7, 8, 12,
-               10, 13, 9,
-               11, 162, 17);
-  fill_run (iso_8859_1_string, 7, 26, 65);
-  fill_run (iso_8859_1_string, 33, 26, 97);
-  fill_run (iso_8859_1_string, 59, 10, 48);
-
-  /* Initialize ebcdic_us_string.  */
-  init_string (ebcdic_us_string,
-               167,
-               47, 22, 12,
-               37, 13, 5,
-               11, 74, 17);
-  /* In EBCDIC, the upper-case letters are broken into three separate runs.  */
-  fill_run (ebcdic_us_string, 7, 9, 193);
-  fill_run (ebcdic_us_string, 16, 9, 209);
-  fill_run (ebcdic_us_string, 25, 8, 226);
-  /* The lower-case letters are, too.  */
-  fill_run (ebcdic_us_string, 33, 9, 129);
-  fill_run (ebcdic_us_string, 42, 9, 145);
-  fill_run (ebcdic_us_string, 51, 8, 162);
-  /* The digits, at least, are contiguous.  */
-  fill_run (ebcdic_us_string, 59, 10, 240);
-
-  /* Initialize ibm1047_string.  */
-  init_string (ibm1047_string,
-               167,
-               47, 22, 12,
-               37, 13, 5,
-               11, 74, 17);
-  /* In EBCDIC, the upper-case letters are broken into three separate runs.  */
-  fill_run (ibm1047_string, 7, 9, 193);
-  fill_run (ibm1047_string, 16, 9, 209);
-  fill_run (ibm1047_string, 25, 8, 226);
-  /* The lower-case letters are, too.  */
-  fill_run (ibm1047_string, 33, 9, 129);
-  fill_run (ibm1047_string, 42, 9, 145);
-  fill_run (ibm1047_string, 51, 8, 162);
-  /* The digits, at least, are contiguous.  */
-  fill_run (ibm1047_string, 59, 10, 240);
-
-  puts ("All set!");            /* all strings initialized */
-}
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
deleted file mode 100644
index 212f3b3c509..00000000000
--- a/gdb/testsuite/gdb.base/charset.exp
+++ /dev/null
@@ -1,550 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2001, 2004 Free Software Foundation, 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@gnu.org
-
-# Test GDB's character set support.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "charset"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
-    return -1
-}
-
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Parse the output from a `show charset' command.  Return the host
-# and target charset as a two-element list.
-proc parse_show_charset_output {testname} {
-    global gdb_prompt
-
-    gdb_expect {
-        -re "The current host and target character set is `(.*)'\\.\[\r\n\]+$gdb_prompt $" {
-            set host_charset $expect_out(1,string)
-            set target_charset $expect_out(1,string)
-	    set retlist [list $host_charset $target_charset]
-            pass $testname
-        }
-        -re "The current host character set is `(.*)'\\.\[\r\n\]+The current target character set is `(.*)'\\.\[\r\n\]+$gdb_prompt $" {
-            set host_charset $expect_out(1,string)
-            set target_charset $expect_out(2,string)
-	    set retlist [list $host_charset $target_charset]
-            pass $testname
-        }
-        -re "The host character set is \"(.*)\"\\.\[\r\n\]+$gdb_prompt $" {
-            set host_charset $expect_out(1,string)
-	    set retlist [list $host_charset]
-            pass $testname
-        }
-        -re "The target character set is \"(.*)\"\\.\[\r\n\]+$gdb_prompt $" {
-            set target_charset $expect_out(1,string)
-	    set retlist [list $target_charset]
-            pass $testname
-        }
-        -re ".*$gdb_prompt $" {
-            fail $testname
-        }
-        timeout {
-            fail "$testname (timeout)"
-        }
-    }
-
-    return $retlist
-}
-
-
-# Try the various `show charset' commands.  These are all aliases of each
-# other; `show target-charset' and `show host-charset' actually print
-# both the host and target charsets.
-
-send_gdb "show charset\n"
-set show_charset [parse_show_charset_output "show charset"]
-
-send_gdb "show target-charset\n"
-set show_target_charset [parse_show_charset_output "show target-charset"]
-
-if {[lsearch $show_charset $show_target_charset] >= 0} {
-    pass "check `show target-charset' against `show charset'"
-} else {
-    fail "check `show target-charset' against `show charset'"
-}
-
-send_gdb "show host-charset\n"
-set show_host_charset [parse_show_charset_output "show host-charset"]
-
-if {[lsearch $show_charset $show_host_charset] >= 0} {
-    pass "check `show host-charset' against `show charset'"
-} else {
-    fail "check `show host-charset' against `show charset'"
-}
-
-
-# Get the list of supported (host) charsets as possible completions.
-send_gdb "set charset \t\t"
-
-# Check that we can at least use ASCII as a host character set.
-sleep 1
-gdb_expect {
-    -re "^set charset .*\r\nASCII.*\r\n$gdb_prompt set charset " {
-	# We got the output that we wanted, including ASCII as possible
-	# charset. Send a newline to get us back to the prompt. This will
-	# also generate an error message. Let's not check here that the error
-	# message makes sense, we do that below, as a separate testcase.
-        send_gdb "\n"
-        gdb_expect {
-	    -re ".*Requires an argument.*$gdb_prompt $" {
-		pass "get valid character sets"
-	    }
-	    -re ".*$gdb_prompt $" {
-		send_gdb "\n"
-		gdb_expect {
-		    -re ".*$gdb_prompt $" {
-			fail "get valid character sets"
-		    }
-		}
-	    }
-	    timeout {
-		fail "(timeout) get valid character sets"
-	    }
-	}
-    }
-    -re ".*$gdb_prompt $" {
-	# We got some output that ended with a regular prompt
-        fail "get valid character sets"
-    }
-    -re ".*$gdb_prompt set charset.*$" {
-	# We got some other output, send a cntrl-c to gdb to get us back
-        # to the prompt.
-	send_gdb "\003"
-        fail "get valid character sets"
-    }
-    timeout {
-        fail "get valid character sets (timeout)"
-    }
-}
-
-# Try a malformed `set charset'.
-gdb_test "set charset" \
-         "Requires an argument. Valid arguments are.*" \
-         "try malformed `set charset'"
-
-# Try using `set host-charset' on an invalid character set.
-gdb_test "set host-charset my_grandma_bonnie" \
-         "Undefined item: \"my_grandma_bonnie\"." \
-         "try `set host-charset' with invalid charset"
-
-# Try using `set target-charset' on an invalid character set.
-gdb_test "set target-charset my_grandma_bonnie" \
-         "Undefined item: \"my_grandma_bonnie\"." \
-         "try `set target-charset' with invalid charset"
-
-# A Tcl array mapping the names of all the character sets we've seen
-# to "1" if the character set can be used as a host character set, or
-# "0" otherwise.  We can use `array names charsets' just to get a list
-# of all character sets.
-array set charsets {}
-
-proc all_charset_names {} {
-    global charsets
-    return [array names charsets]
-}
-
-proc valid_host_charset {charset} {
-    global charsets
-    return $charsets($charset)
-}
-
-send_gdb "set host-charset\n"
-gdb_expect {
-    -re "Requires an argument. Valid arguments are (\[^ \t\n\r,.\]*)" {
-	#set host_charset_list $expect_out(1,string)
-	set charsets($expect_out(1,string)) 1
-	exp_continue
-	#pass "capture valid host charsets"
-    }
-
-    -re ", (\[^ \t\n\r,.\]*)" {
-	#set host_charset_list $expect_out(1,string)
-	set charsets($expect_out(1,string)) 1
-	exp_continue
-	#pass "capture valid host charsets"
-    }
-
-    -re "\\.\r\n$gdb_prompt $" {
-	#set host_charset_list $expect_out(1,string)
-	pass "capture valid host charsets"
-    }
-
-    -re ".*$gdb_prompt $" {
-	fail "capture valid host charsets"
-    }
-    timeout {
-	fail "(timeout) capture valid host charsets"
-    }
-}
-
-
-send_gdb "set target-charset\n"
-gdb_expect {
-    -re "Requires an argument. Valid arguments are (\[^ \t\n\r,.\]*)" {
-	set target_charset $expect_out(1,string)
-	if {! [info exists charsets($target_charset)]} {
-	    set charsets($target_charset) 0
-	}
-	exp_continue
-    }
-
-    -re ", (\[^ \t\n\r,.\]*)" {
-	set target_charset $expect_out(1,string)
-	if {! [info exists charsets($target_charset)]} {
-	    set charsets($target_charset) 0
-	}
-	exp_continue
-    }
-
-    -re "\\.\r\n$gdb_prompt $" {
-	pass "capture valid target charsets"
-
-    }
-
-    -re ".*$gdb_prompt $" {
-	fail "capture valid target charsets"
-    }
-
-    timeout {
-	fail "(timeout) capture valid target charsets"
-    }
-}
-
-# Make sure that GDB supports every host/target charset combination.
-foreach host_charset [all_charset_names] {
-    if {[valid_host_charset $host_charset]} {
-
-        set testname "try `set host-charset $host_charset'"
-        send_gdb "set host-charset $host_charset\n"
-        gdb_expect {
-            -re "GDB doesn't know of any character set named.*\[\r\n]+${gdb_prompt} $" {
-                # How did it get into `charsets' then?
-                fail "$testname (didn't recognize name)"
-            }
-            -re "GDB can't use `.*' as its host character set\\.\[\r\n]+${gdb_prompt} $" {
-                # Well, then why does its `charsets' entry say it can?
-                fail $testname
-            }
-            -re "${gdb_prompt} $" {
-                pass $testname
-            }
-            timeout {
-                fail "$testname (timeout)"
-            }
-        }
-
-        # Check that the command actually had its intended effect:
-        # $host_charset should now be the host character set.
-        send_gdb "show charset\n"
-        set result [parse_show_charset_output "parse `show charset' after `set host-charset $host_charset'"]
-        if {! [string compare [lindex $result 0] $host_charset]} {
-            pass "check effect of `set host-charset $host_charset'"
-        } else {
-            fail "check effect of `set host-charset $host_charset'"
-        }
-
-        # Now try setting every possible target character set,
-        # given that host charset.
-        foreach target_charset [all_charset_names] {
-            set testname "try `set target-charset $target_charset'"
-            send_gdb "set target-charset $target_charset\n"
-            gdb_expect {
-                -re "GDB doesn't know of any character set named.*\[\r\n]+${gdb_prompt} $" {
-                    fail "$testname (didn't recognize name)"
-                }
-                -re "GDB can't convert from the .* character set to .*\\.\[\r\n\]+${gdb_prompt} $" {
-                    # This is a serious problem.  GDB should be able to convert
-                    # between any arbitrary pair of character sets.
-                    fail "$testname (can't convert)"
-                }
-                -re "${gdb_prompt} $" {
-                    pass $testname
-                }
-                timeout {
-                    fail "$testname (timeout)"
-                }
-            }
-
-            # Check that the command actually had its intended effect:
-            # $target_charset should now be the target charset.
-            send_gdb "show charset\n"
-            set result [parse_show_charset_output "parse `show charset' after `set target-charset $target_charset'"]
-            if {! [string compare $result [list $host_charset $target_charset]]} {
-                pass "check effect of `set target-charset $target_charset'"
-            } else {
-                fail "check effect of `set target-charset $target_charset'"
-            }
-
-            # Test handling of characters in the host charset which
-            # can't be translated into the target charset.  \xA2 is
-            # `cent' in ISO-8859-1, which has no equivalent in ASCII.
-            #
-            # On some systems, the pseudo-tty through which we
-            # communicate with GDB insists on stripping the high bit
-            # from input characters, meaning that `cent' turns into
-            # `"'.  Since ISO-8859-1 and ASCII are identical in the
-            # lower 128 characters, it's tough to see how we can test
-            # this behavior on such systems, so we just xfail it.
-	    #
-	    # Note: the \x16 (Control-V) is an escape to allow \xA2 to
-	    # get past readline.
-            if {! [string compare $host_charset iso-8859-1] && ! [string compare $target_charset ascii]} {
-
-                set testname "untranslatable character in character literal"
-                send_gdb "print '\x16\xA2'\n"
-                gdb_expect {
-                    -re "There is no character corresponding to .* in the target character set .*\\.\[\r\n\]+$gdb_prompt $" {
-                        pass $testname
-                    }
-                    -re " = 34 '\"'\[\r\n\]+$gdb_prompt $" {
-                        xfail "$testname (DejaGNU's pseudo-tty strips eighth bit)"
-                    }
-                    -re "$gdb_prompt $" {
-                        fail $testname
-                    }
-                    timeout {
-                        fail "$testname (timeout)"
-                    }
-                }
-
-                set testname "untranslatable character in string literal"
-                # If the PTTY zeros bit seven, then this turns into
-                #   print """
-                # which gets us a syntax error.  We don't care.
-                send_gdb "print \"\x16\xA2\"\n"
-                gdb_expect {
-                    -re "There is no character corresponding to .* in the target character set .*\\.\[\r\n\]+$gdb_prompt $" {
-                        pass $testname
-                    }
-                    -re "Unterminated string in expression.\[\r\n\]+$gdb_prompt $" {
-                        xfail "$testname (DejaGNU's pseudo-tty strips eighth bit)"
-                    }
-                    -re "$gdb_prompt $" {
-                        fail $testname
-                    }
-                    timeout {
-                        fail "$testname (timeout)"
-                    }
-                }
-
-                set testname "untranslatable characters in backslash escape"
-                send_gdb "print '\\\x16\xA2'\n"
-                gdb_expect {
-                    -re "The escape sequence .* is equivalent to plain .*, which has no equivalent\[\r\n\]+in the .* character set\\.\[\r\n\]+$gdb_prompt $" {
-                        pass $testname
-                    }
-                    -re " = 34 '\"'\[\r\n\]+$gdb_prompt $" {
-                        xfail "$testname (DejaGNU's pseudo-tty strips eighth bit)"
-                    }
-                    -re "$gdb_prompt $" {
-                        fail $testname
-                    }
-                    timeout {
-                        fail "$testname (timeout)"
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-# Set the host character set to plain ASCII, and try actually printing
-# some strings in various target character sets.  We need to run the
-# test program to the point at which the strings have been
-# initialized.
-gdb_test "break [gdb_get_line_number "all strings initialized"]" \
-         ".*Breakpoint.* at .*" \
-         "set breakpoint after all strings have been initialized"
-gdb_run_cmd
-gdb_expect {
-    -re "Breakpoint.*all strings initialized.*$gdb_prompt $" {
-        pass "run until all strings have been initialized"
-    }
-    -re "$gdb_prompt $" {
-        fail "run until all strings have been initialized"
-    }
-    timeout {
-        fail "run until all strings have been initialized (timeout)"
-    }
-}
-
-
-gdb_test "set host-charset ASCII" ""
-foreach target_charset [all_charset_names] {
-    send_gdb "set target-charset $target_charset\n" 
-    gdb_expect {
-        -re "$gdb_prompt $" {
-            pass "set target-charset $target_charset"
-        }
-        timeout {
-            fail "set target-charset $target_charset (timeout)"
-        }
-    }
-
-    # Try printing the null character.  There seems to be a bug in
-    # gdb_test that requires us to use gdb_expect here.
-    send_gdb "print '\\0'\n"
-    gdb_expect {
-        -re "\\\$${decimal} = 0 '\\\\0'\[\r\n\]+$gdb_prompt $" {
-            pass "print the null character in ${target_charset}"
-        }
-        -re "$gdb_prompt $" {
-            fail "print the null character in ${target_charset}"
-        }
-        timeout {
-            fail "print the null character in ${target_charset} (timeout)"
-        }
-    }
-
-    # Compute the name of the variable in the test program that holds
-    # a string in $target_charset.  The variable's name is the
-    # character set's name, in lower-case, with all non-identifier
-    # characters replaced with '_', with "_string" stuck on the end.
-    set var_name [string tolower "${target_charset}_string"]
-    regsub -all -- "\[^a-z0-9_\]" $var_name "_" var_name
-    
-    # Compute a regexp matching the results we expect.  This is static,
-    # but it's easier than writing it out.
-    regsub -all "." "abfnrtv" "(\\\\&|x)" escapes
-    set uppercase "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    set lowercase "abcdefghijklmnopqrstuvwxyz"
-    set digits "0123456789"
-    set octal_escape "\\\\\[0-9\]\[0-9\]\[0-9\]"
-
-    send_gdb "print $var_name\n"
-    # ${escapes}${uppercase}${lowercase}${digits}${octal}${octal}
-    gdb_expect {
-        -re ".* = \"(\\\\a|x)(\\\\b|x)(\\\\f|x)(\\\\n|x)(\\\\r|x)(\\\\t|x)(\\\\v|x)${uppercase}${lowercase}${digits}(\\\\\[0-9\]\[0-9\]\[0-9\]|x)(\\\\\[0-9\]\[0-9\]\[0-9\]|x).*\"\[\r\n\]+$gdb_prompt $" {
-            pass "print string in $target_charset"
-        }
-        -re "$gdb_prompt $" {
-            fail "print string in $target_charset"
-        }
-        timeout {
-            fail "print string in $target_charset (timeout)"
-        }
-    }
-
-    # Try entering a character literal, and see if it comes back unchanged.
-    gdb_test "print 'A'" \
-             " = \[0-9-\]+ 'A'" \
-             "parse character literal in ${target_charset}"
-
-    # Check that the character literal was encoded correctly.
-    gdb_test "print 'A' == $var_name\[7\]" \
-             " = 1" \
-             "check value of parsed character literal in ${target_charset}"
-
-    # Try entering a string literal, and see if it comes back unchanged.
-    gdb_test "print \"abcdefABCDEF012345\"" \
-             " = \"abcdefABCDEF012345\"" \
-             "parse string literal in ${target_charset}"
-
-    # Check that the string literal was encoded correctly.
-    gdb_test "print \"q\"\[0\] == $var_name\[49\]" \
-             " = 1" \
-             "check value of parsed string literal in ${target_charset}"
-
-    # Test handling of characters in the target charset which
-    # can't be translated into the host charset.
-    if {! [string compare $target_charset iso-8859-1]} {
-        gdb_test "print iso_8859_1_string\[69\]" \
-                 " = \[0-9-\]+ '\\\\242'" \
-                 "print character with no equivalent in host character set"
-        gdb_test "print iso_8859_1_string + 70" \
-                 " = ${hex} \"\\\\242.*\"" \
-                 "print string with no equivalent in host character set"
-    }
-
-    # Make sure that we don't apply the ISO-8859-1 `print_literally'
-    # function to ASCII.
-    if {! [string compare $target_charset ascii]} {
-        gdb_test "print iso_8859_1_string\[69\]" \
-                 " = \[0-9-\]+ '\\\\242'" \
-                 "print ASCII unprintable character"
-        gdb_test "print iso_8859_1_string + 70" \
-                 " = ${hex} \"\\\\242.*\"" \
-                 "print ASCII unprintable string"
-    }
-
-    # Try printing characters with backslash escape equivalents.
-    set escapees {a b f n r t v}
-    for {set i 0} {$i < [llength $escapees]} {incr i} {
-        set escape [lindex $escapees $i]
-        send_gdb "print $var_name\[$i\]\n"
-        set have_escape 1
-        gdb_expect {
-            -re "= \[0-9-\]+ '\\\\${escape}'\[\r\n\]+$gdb_prompt $" {
-                pass "try printing '\\${escape}' in ${target_charset}"
-            }
-            -re "= \[0-9-\]+ 'x'\[\r\n\]+$gdb_prompt $" {
-                xfail "try printing '\\${escape}' in ${target_charset} (no such escape)"
-                set have_escape 0
-            }
-            -re "$gdb_prompt $" {
-                fail "try printing '\\${escape}' in ${target_charset}"
-            }
-            timeout {
-                fail "try printing '\\${escape}' in ${target_charset} (timeout)"
-            }
-        }
-
-        if {$have_escape} {
-
-            # Try parsing a backslash escape in a character literal.
-            gdb_test "print '\\${escape}' == $var_name\[$i\]" \
-                     " = 1" \
-                     "check value of '\\${escape}' in ${target_charset}"
-
-            # Try parsing a backslash escape in a string literal.
-            gdb_test "print \"\\${escape}\"\[0\] == $var_name\[$i\]" \
-                     " = 1" \
-                     "check value of \"\\${escape}\" in ${target_charset}"
-        }
-    }
-
-    # Try printing a character escape that doesn't exist.  We should 
-    # get the unescaped character, in the target character set.
-    gdb_test "print '\\q'" " = \[0-9-\]+ 'q'" \
-             "print escape that doesn't exist in $target_charset"
-    gdb_test "print '\\q' == $var_name\[49\]" " = 1" \
-             "check value of escape that doesn't exist in $target_charset"
-}
-
-gdb_exit 
diff --git a/gdb/testsuite/gdb.base/chng-syms.c b/gdb/testsuite/gdb.base/chng-syms.c
deleted file mode 100644
index 3394f5c3897..00000000000
--- a/gdb/testsuite/gdb.base/chng-syms.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *   Test that GDB cleans up properly after errors that result when a 
- * breakpoint is reset. 
- */
-
-/* VARIABLE is a macro defined on the compiler command line. */
-
-#include <stdlib.h>
-
-int VARIABLE = 42;
-
-void stop_here ()
-{
-  VARIABLE *= 2;
-}
-
-int main ()
-{
-  stop_here ();
-  exit (0);
-}
-
diff --git a/gdb/testsuite/gdb.base/chng-syms.exp b/gdb/testsuite/gdb.base/chng-syms.exp
deleted file mode 100644
index b967d21614b..00000000000
--- a/gdb/testsuite/gdb.base/chng-syms.exp
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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
-
-# Author: Paul N. Hilfinger (Hilfinger@gnat.com)
-
-# Test that GDB cleans up properly after errors that result when a 
-# breakpoint is reset. 
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# IDT/SIM apparently doesn't have enough file descriptors to allow the
-# problem checked by this test to occur.
-if [istarget "mips-idt-*"] {
-    return 0;
-}
-
-set testfile "chng-syms"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DVARIABLE=var1}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-set oldtimeout $timeout
-set timeout 10
-verbose "Timeout is now 10 seconds" 2
-
-proc expect_to_stop_here { ident } {
-    global gdb_prompt
-    global decimal
-
-    # the "at foo.c:36" output we get with -g.
-    # the "in func" output we get without -g.
-    gdb_expect {
-	-re "Breakpoint \[0-9\]*, stop_here .*$gdb_prompt $" { 
-	    return 1
-	}
-	-re "$gdb_prompt $" { 
-	    fail "running to stop_here $ident"
-	    return 0
-	}
-	timeout { 
-	    fail "running to stop_here $ident (timeout)"
-	    return 0
-	}
-    }
-    return 1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "break stop_here if (var1 == 42)" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "setting conditional breakpoint on function"
-gdb_run_cmd
-
-expect_to_stop_here "first time"
-    
-gdb_continue_to_end "breakpoint first time through"
-
-# Now we recompile the executable, but without a variable named "var1", first
-# waiting to insure that even on fast machines, the file modification times
-# are distinct. This will force GDB to reload the file on the 
-# next "run" command, causing an error when GDB tries to tries to reset 
-# the breakpoint.
-
-sleep 2
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DVARIABLE=var2}] != "" } {
-
-# Complication: Since GDB generally holds an open file descriptor on the 
-# executable at this point, there are some systems in which the 
-# re-compilation will fail. In such cases, we'll consider the test 
-# (vacuously) passed providing that re-running it succeeds as before.
-
-    gdb_run_cmd
-    expect_to_stop_here "after re-compile fails"
-    gdb_continue_to_end "after re-compile fails"
-
-} else {
-
-    gdb_run_cmd
-    gdb_expect {
-	-re "Error in re-setting .*No symbol .var1..*Program exited normally.*$gdb_prompt $" {
-	    pass "running with invalidated bpt condition after executable changes" 
-	}
-	-re "Error in re-setting .*No symbol .var1..*Breakpoint .*,( 0x.* in)? exit .*$gdb_prompt $" {
-	    pass "running with invalidated bpt condition after executable changes" 
-	}
-	-re "$gdb_prompt $" { 
-	    fail "running with invalidated bpt condition after executable changes" 
-	}
-	timeout {
-	    fail "(timeout) running with invalidated bpt condition after executable changes" 
-	}
-    }
-
-}
-
-set timeout $oldtimeout
-verbose "Timeout is now $timeout seconds" 2
-return 0
diff --git a/gdb/testsuite/gdb.base/code-expr.exp b/gdb/testsuite/gdb.base/code-expr.exp
deleted file mode 100644
index 03cc4effe74..00000000000
--- a/gdb/testsuite/gdb.base/code-expr.exp
+++ /dev/null
@@ -1,395 +0,0 @@
-#   Copyright (C) 2001 Free Software Foundation, 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
-
-# Written by Michael Snyder, Red Hat, Inc., 9/20/2001
-
-# This file is part of the gdb testsuite
-# Tests for type expressions using the new "@code" and "@data" modifiers.
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "cvexpr"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-gdb_test "set print sevenbit-strings" "" ""
-gdb_test "set print address off" "" ""
-gdb_test "set width 0" "" ""
-
-set ws  "\[ \t\]*"
-
-#
-# Test casting a scalar to const
-#
-
-gdb_test "whatis (@code char) v_char" \
-	"type = @code char" \
-	"(@code char)"
-gdb_test "whatis (@code signed char) v_signed_char" \
-	"type = @code signed char" \
-	"(@code signed char)"
-gdb_test "whatis (@code unsigned char) v_unsigned_char" \
-	"type = @code (unsigned char|char)" \
-	"(@code unsigned char)"
-gdb_test "whatis (@code short) v_short" \
-	"type = @code (short|short int)" \
-	"(@code short)"
-gdb_test "whatis (@code signed short) v_signed_short" \
-	"type = @code (short|short int|signed short|signed short int)" \
-	"(@code signed short)"
-gdb_test "whatis (@code unsigned short) v_unsigned_short" \
-	"type = @code (unsigned short|short unsigned int)" \
-	"(@code unsigned short)"
-gdb_test "whatis (@code int) v_int" \
-	"type = @code int" \
-	"(@code int)"
-gdb_test "whatis (@code signed int) v_signed_int" \
-	"type = @code (signed int|int)" \
-	"(@code signed int)"
-gdb_test "whatis (@code unsigned int) v_unsigned_int" \
-	"type = @code unsigned int" \
-	"(@code unsigned int)"
-gdb_test "whatis (@code long) v_long" \
-	"type = @code (long|long int)" \
-	"(@code long)"
-gdb_test "whatis (@code signed long) v_signed_long" \
-	"type = @code (signed |)long( int|)" \
-	"(@code signed long)"
-gdb_test "whatis (@code unsigned long) v_unsigned_long" \
-	"type = @code (unsigned long|long unsigned int)" \
-	"(@code unsigned long)"
-gdb_test "whatis (@code long long) v_long_long" \
-	"type = @code long long( int|)" \
-	"(@code long long)"
-gdb_test "whatis (@code signed long long) v_signed_long_long" \
-	"type = @code (signed |)long long( int|)" \
-	"(@code signed long long)"
-gdb_test "whatis (@code unsigned long long) v_unsigned_long_long" \
-	"type = @code (unsigned long long|long long unsigned int)" \
-	"(@code unsigned long long)"
-gdb_test "whatis (@code float) v_float" \
-	"type = @code float" \
-	"(@code float)"
-gdb_test "whatis (@code double) v_double" \
-	"type = @code double" \
-	"(@code double)"
-
-#
-# Test casting a scalar to @data
-#
-
-gdb_test "whatis (@data char) v_char" \
-	"type = @data char" \
-	"(@data char)"
-gdb_test "whatis (@data signed char) v_signed_char" \
-	"type = @data signed char" \
-	"(@data signed char)"
-gdb_test "whatis (@data unsigned char) v_unsigned_char" \
-	"type = @data (unsigned char|char)" \
-	"(@data unsigned char)"
-gdb_test "whatis (@data short) v_short" \
-	"type = @data (short|short int)" \
-	"(@data short)"
-gdb_test "whatis (@data signed short) v_signed_short" \
-	"type = @data (short|short int|signed short|signed short int)" \
-	"(@data signed short)"
-gdb_test "whatis (@data unsigned short) v_unsigned_short" \
-	"type = @data (unsigned short|short unsigned int)" \
-	"(@data unsigned short)"
-gdb_test "whatis (@data int) v_int" \
-	"type = @data int" \
-	"(@data int)"
-gdb_test "whatis (@data signed int) v_signed_int" \
-	"type = @data (signed int|int)" \
-	"(@data signed int)"
-gdb_test "whatis (@data unsigned int) v_unsigned_int" \
-	"type = @data unsigned int" \
-	"(@data unsigned int)"
-gdb_test "whatis (@data long) v_long" \
-	"type = @data (long|long int)" \
-	"(@data long)"
-gdb_test "whatis (@data signed long) v_signed_long" \
-	"type = @data (signed |)long( int|)" \
-	"(@data signed long)"
-gdb_test "whatis (@data unsigned long) v_unsigned_long" \
-	"type = @data (unsigned long|long unsigned int)" \
-	"(@data unsigned long)"
-gdb_test "whatis (@data long long) v_long_long" \
-	"type = @data long long( int|)" \
-	"(@data long long)"
-gdb_test "whatis (@data signed long long) v_signed_long_long" \
-	"type = @data (signed |)long long( int|)" \
-	"(@data signed long long)"
-gdb_test "whatis (@data unsigned long long) v_unsigned_long_long" \
-	"type = @data (unsigned long long|long long unsigned int)" \
-	"(@data unsigned long long)"
-gdb_test "whatis (@data float) v_float" \
-	"type = @data float" \
-	"(@data float)"
-gdb_test "whatis (@data double) v_double" \
-	"type = @data double" \
-	"(@data double)"
-
-#
-# Now put the '@code' and '@data' keywords after the base type.
-#
-
-gdb_test "whatis (char @code) v_char" \
-	"type = @code char" \
-	"(char @code)"
-gdb_test "whatis (signed char @code) v_signed_char" \
-	"type = @code signed char" \
-	"(signed char @code)"
-gdb_test "whatis (unsigned char @code) v_unsigned_char" \
-	"type = @code (unsigned char|char)" \
-	"(unsigned char @code)"
-gdb_test "whatis (short @code) v_short" \
-	"type = @code (short|short int)" \
-	"(short @code)"
-gdb_test "whatis (signed short @code) v_signed_short" \
-	"type = @code (short|short int|signed short|signed short int)" \
-	"(signed short @code)"
-gdb_test "whatis (unsigned short @code) v_unsigned_short" \
-	"type = @code (unsigned short|short unsigned int)" \
-	"(unsigned short @code)"
-gdb_test "whatis (int @code) v_int" \
-	"type = @code int" \
-	"(int @code)"
-gdb_test "whatis (signed int @code) v_signed_int" \
-	"type = @code (signed int|int)" \
-	"(signed int @code)"
-gdb_test "whatis (unsigned int @code) v_unsigned_int" \
-	"type = @code unsigned int" \
-	"(unsigned int @code)"
-gdb_test "whatis (long @code) v_long" \
-	"type = @code (long|long int)" \
-	"(long @code)"
-gdb_test "whatis (signed long @code) v_signed_long" \
-	"type = @code (signed |)long( int|)" \
-	"(signed long @code)"
-gdb_test "whatis (unsigned long @code) v_unsigned_long" \
-	"type = @code (unsigned long|long unsigned int)" \
-	"(unsigned long @code)"
-gdb_test "whatis (long long @code) v_long_long" \
-	"type = @code long long( int|)" \
-	"(long long @code)"
-gdb_test "whatis (signed long long @code) v_signed_long_long" \
-	"type = @code (signed |)long long( int|)" \
-	"(signed long long @code)"
-gdb_test "whatis (unsigned long long @code) v_unsigned_long_long" \
-	"type = @code (unsigned long long|long long unsigned int)" \
-	"(unsigned long long @code)"
-gdb_test "whatis (float @code) v_float" \
-	"type = @code float" \
-	"(float @code)"
-gdb_test "whatis (double @code) v_double" \
-	"type = @code double" \
-	"(double @code)"
-
-gdb_test "whatis (char @data) v_char" \
-	"type = @data char" \
-	"(char @data)"
-gdb_test "whatis (signed char @data) v_signed_char" \
-	"type = @data signed char" \
-	"(signed char @data)"
-gdb_test "whatis (unsigned char @data) v_unsigned_char" \
-	"type = @data (unsigned char|char)" \
-	"(unsigned char @data)"
-gdb_test "whatis (short @data) v_short" \
-	"type = @data (short|short int)" \
-	"(short @data)"
-gdb_test "whatis (signed short @data) v_signed_short" \
-	"type = @data (short|short int|signed short|signed short int)" \
-	"(signed short @data)"
-gdb_test "whatis (unsigned short @data) v_unsigned_short" \
-	"type = @data (unsigned short|short unsigned int)" \
-	"(unsigned short @data)"
-gdb_test "whatis (int @data) v_int" \
-	"type = @data int" \
-	"(int @data)"
-gdb_test "whatis (signed int @data) v_signed_int" \
-	"type = @data (signed int|int)" \
-	"(signed int @data)"
-gdb_test "whatis (unsigned int @data) v_unsigned_int" \
-	"type = @data unsigned int" \
-	"(unsigned int @data)"
-gdb_test "whatis (long @data) v_long" \
-	"type = @data (long|long int)" \
-	"(long @data)"
-gdb_test "whatis (signed long @data) v_signed_long" \
-	"type = @data (signed |)long( int|)" \
-	"(signed long @data)"
-gdb_test "whatis (unsigned long @data) v_unsigned_long" \
-	"type = @data (unsigned long|long unsigned int)" \
-	"(unsigned long @data)"
-gdb_test "whatis (long long @data) v_long_long" \
-	"type = @data long long( int|)" \
-	"(long long @data)"
-gdb_test "whatis (signed long long @data) v_signed_long_long" \
-	"type = @data (signed |)long long( int|)" \
-	"(signed long long @data)"
-gdb_test "whatis (unsigned long long @data) v_unsigned_long_long" \
-	"type = @data (unsigned long long|long long unsigned int)" \
-	"(unsigned long long @data)"
-gdb_test "whatis (float @data) v_float" \
-	"type = @data float" \
-	"(float @data)"
-gdb_test "whatis (double @data) v_double" \
-	"type = @data double" \
-	"(double @data)"
-
-#
-# enums
-#
-
-gdb_test "whatis (@code enum misordered) v_misordered" \
-	"type = @code enum misordered" \
-	"(@code enum misordered)"
-gdb_test "whatis (enum misordered @code) v_misordered" \
-	"type = @code enum misordered" \
-	"(enum misordered @code)"
-gdb_test "whatis (@data enum misordered) v_misordered" \
-	"type = @data enum misordered" \
-	"(@data enum misordered)"
-gdb_test "whatis (enum misordered @data) v_misordered" \
-	"type = @data enum misordered" \
-	"(enum misordered @data)"
-
-# 
-# Pointers
-#
-
-gdb_test "whatis (@code int *) v_int_pointer" \
-	"type = @code int${ws}\\*" \
-	"(@code int *)"
-gdb_test "whatis (int @code *) v_int_pointer" \
-	"type = @code int${ws}\\*" \
-	"(int @code *)"
-gdb_test "whatis (int * @code) v_int_pointer" \
-	"type = int \\*${ws}@code" \
-	"(int * @code)"
-gdb_test "whatis (@code int * @code) v_int_pointer" \
-	"type = @code int${ws}\\*${ws}@code" \
-	"(@code int * @code)"
-gdb_test "whatis (int @code * @code) v_int_pointer" \
-	"type = @code int${ws}\\*${ws}@code" \
-	"(int @code * @code)"
-
-gdb_test "whatis (@code int **) v_int_pointer_pointer" \
-	"type = @code int${ws}\\*${ws}\\*" \
-	"(@code int **)"
-gdb_test "whatis (int @code **) v_int_pointer_pointer" \
-	"type = @code int${ws}\\*${ws}\\*" \
-	"(int @code **)"
-gdb_test "whatis (int ** @code) v_int_pointer_pointer" \
-	"type = int \\*${ws}\\*${ws}@code" \
-	"(int ** @code)"
-gdb_test "whatis (@code int * @code *) v_int_pointer_pointer" \
-	"type = @code int${ws}\\*${ws}@code${ws}\\*" \
-	"(@code int * @code *)"
-gdb_test "whatis (int @code * @code *) v_int_pointer_pointer" \
-	"type = @code int${ws}\\*${ws}@code${ws}\\*" \
-	"(int @code * @code *)"
-gdb_test "whatis (@code int * @code * @code) v_int_pointer_pointer" \
-	"type = @code int${ws}\\*${ws}@code${ws}\\*${ws}@code" \
-	"(@code int * @code * @code)"
-gdb_test "whatis (int @code * @code * @code) v_int_pointer_pointer" \
-	"type = @code int${ws}\\*${ws}@code${ws}\\*${ws}@code" \
-	"(int @code * @code * @code)"
-
-#
-# Arrays TODO
-#
-
-#
-# Pointers to arrays, arrays of pointers TODO
-#
-
-#
-# Structs and Unions
-#
-
-gdb_test "whatis (@code struct t_struct) v_struct1" \
-	"type = @code struct t_struct" \
-	"(@code struct t_struct)"
-gdb_test "whatis (@code union t_union) v_union" \
-	"type = @code union t_union" \
-	"(@code union t_union)"
-gdb_test "whatis (struct t_struct @code) v_struct1" \
-	"type = @code struct t_struct" \
-	"(struct t_struct @code)"
-gdb_test "whatis (union t_union @code) v_union" \
-	"type = @code union t_union" \
-	"(union t_union @code)"
-gdb_test "whatis (@code struct t_struct *) &v_struct1" \
-	"type = @code struct t_struct${ws}\\*" \
-	"(@code struct t_struct *)"
-gdb_test "whatis (@code union t_union *) &v_union" \
-	"type = @code union t_union${ws}\\*" \
-	"(@code union t_union *)"
-gdb_test "whatis (struct t_struct @code *) &v_struct1" \
-	"type = @code struct t_struct${ws}\\*" \
-	"(struct t_struct @code *)"
-gdb_test "whatis (union t_union @code *) &v_union" \
-	"type = @code union t_union${ws}\\*" \
-	"(union t_union @code *)"
-gdb_test "whatis (struct t_struct * @code) &v_struct1" \
-	"type = struct t_struct${ws}\\*${ws}@code" \
-	"(struct t_struct * @code)"
-gdb_test "whatis (union t_union * @code) &v_union" \
-	"type = union t_union${ws}\\*${ws}@code" \
-	"(union t_union * @code)"
-gdb_test "whatis (@code struct t_struct * @code) &v_struct1" \
-	"type = @code struct t_struct${ws}\\*${ws}@code" \
-	"(@code struct t_struct * @code)"
-gdb_test "whatis (@code union t_union * @code) &v_union" \
-	"type = @code union t_union${ws}\\*${ws}@code" \
-	"(@code union t_union * @code)"
-gdb_test "whatis (struct t_struct @code * @code) &v_struct1" \
-	"type = @code struct t_struct${ws}\\*${ws}@code" \
-	"(struct t_struct @code * @code)"
-gdb_test "whatis (union t_union @code * @code) &v_union" \
-	"type = @code union t_union${ws}\\*${ws}@code" \
-	"(union t_union @code * @code)"
-
-#
-# Function pointers TODO
-#
-
diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp
deleted file mode 100644
index eabf85e442b..00000000000
--- a/gdb/testsuite/gdb.base/commands.exp
+++ /dev/null
@@ -1,581 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1997, 1998, 1999, 2000,
-#   2001, 2002, 2003 Free Software Foundation, 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
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test special commands (if, while, etc)
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "run"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/commands
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-delete_breakpoints
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-proc gdbvar_simple_if_test {} {
-    global gdb_prompt
-
-    gdb_test "set \$foo = 0" "" "set foo in gdbvar_simple_if_test"
-    # All this test should do is print 0xdeadbeef once.
-    gdb_test "if \$foo == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
-	    "\\\$\[0-9\]* = 0xdeadbeef" "gdbvar_simple_if_test #1"
-    # All this test should do is print 0xfeedface once.
-    gdb_test "if \$foo == 0\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
-	    "\\\$\[0-9\]* = 0xfeedface" "gdbvar_simple_if_test #2"
-}
-
-proc gdbvar_simple_while_test {} {
-    global gdb_prompt
-
-    gdb_test "set \$foo = 5" "" "set foo in gdbvar_simple_while_test"
-    # This test should print 0xfeedface five times.
-    gdb_test "while \$foo > 0\np/x 0xfeedface\nset \$foo -= 1\nend" \
-	    "\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
-	    "gdbvar_simple_while_test #1"
-}
-
-proc gdbvar_complex_if_while_test {} {
-    global gdb_prompt
-
-    gdb_test "set \$foo = 4" "" "set foo in gdbvar complex_if_while_test"
-    # This test should alternate between 0xdeadbeef and 0xfeedface two times.
-    gdb_test "while \$foo > 0\nset \$foo -= 1\nif \(\$foo % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend" \
-	    "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
-	    "gdbvar_complex_if_while_test #1"
-}
-
-proc progvar_simple_if_test {} {
-    global gdb_prompt
-
-    if [target_info exists noargs] { 
-        verbose "Skipping progvar_simple_if_test because of noargs."
-        return
-    }
-
-    if { ![runto factorial] } then { gdb_suppress_tests; }
-    # Don't depend upon argument passing, since most simulators don't
-    # currently support it.  Bash value variable to be what we want.
-    gdb_test "p value=5" "" "set value to 5 in progvar_simple_if_test #1"
-    # All this test should do is print 0xdeadbeef once.
-    gdb_test "if value == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
-	    "\\\$\[0-9\]* = 0xdeadbeef" \
-	    "progvar_simple_if_test #1"
-    # All this test should do is print 0xfeedface once.
-    gdb_test "if value == 5\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
-	    "\\\$\[0-9\]* = 0xfeedface" \
-	    "progvar_simple_if_test #2"
-    gdb_stop_suppressing_tests;
-}
-
-proc progvar_simple_while_test {} {
-    global gdb_prompt
-
-    if [target_info exists noargs] { 
-        verbose "Skipping progvar_simple_while_test because of noargs."
-        return
-    }
-
-    gdb_test "set args 5" "" "set args in progvar_simple_while_test"
-    if { ![runto factorial] } then { gdb_suppress_tests }
-    # Don't depend upon argument passing, since most simulators don't
-    # currently support it.  Bash value variable to be what we want.
-    gdb_test "p value=5" "" "set value to 5 in progvar_simple_if_test #2"
-    # This test should print 0xfeedface five times.
-    gdb_test "while value > 0\np/x 0xfeedface\nset value -= 1\nend" \
-	    "\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
-	    "progvar_simple_while_test #1"
-    gdb_stop_suppressing_tests;
-}
-
-proc progvar_complex_if_while_test {} {
-    global gdb_prompt
-
-    if [target_info exists noargs] { 
-        verbose "Skipping progvar_simple_if_while_test because of noargs."
-        return
-    }
-
-    gdb_test "set args 4" "" "set args in progvar_complex_if_while_test"
-    if { ![runto factorial] } then { gdb_suppress_tests }
-    # Don't depend upon argument passing, since most simulators don't
-    # currently support it.  Bash value variable to be what we want.
-    gdb_test "p value=4" "" "set value to 4 in progvar_simple_if_test"
-    # This test should alternate between 0xdeadbeef and 0xfeedface two times.
-    gdb_test "while value > 0\nset value -= 1\nif \(value % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend" \
-	    "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
-	    "progvar_complex_if_while_test #1"
-    gdb_stop_suppressing_tests;
-}
-
-proc if_while_breakpoint_command_test {} {
-    if [target_info exists noargs] { 
-        verbose "Skipping if_while_breakpoint_command_test because of noargs."
-        return
-    }
-
-    gdb_test "set args 5" "" "set args in if_while_breakpoint_command_test"
-    if { ![runto factorial] } then { gdb_suppress_tests }
-    # Don't depend upon argument passing, since most simulators don't
-    # currently support it.  Bash value variable to be what we want.
-    gdb_test "p value=5" "" "set value to 5 in progvar_simple_if_test"
-    delete_breakpoints
-    gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #1"
-
-    send_gdb "commands\n"
-    gdb_expect {
-	-re "End with" {
-	    pass "commands in if_while_breakpoint_command_test"
-	}
-        default {
-	    fail "(timeout or eof) commands in if_while_breakpoint_command_test"
-	}
-    }
-    # This test should alternate between 0xdeadbeef and 0xfeedface two times.
-    gdb_test "while value > 0\nset value -= 1\nif \(value % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend\nend" \
-	    "" \
-	    "commands part 2 in if_while_breakpoint_command_test"
-    gdb_test "continue" \
-	    "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
-	    "if_while_breakpoint_command_test #1"
-   gdb_test "info break" \
-	   "while.*set.*if.*p/x.*else.*p/x.*end.*" \
-	   "info break in if_while_breakpoint_command_test"
-    gdb_stop_suppressing_tests;
-}
-
-# Test that we can run the inferior from breakpoint commands.
-#
-# The expected behavior is that all commands after the first "step"
-# shall be ignored.  See the gdb manual, "Break Commands",
-# subsection "Breakpoint command lists".
-
-proc infrun_breakpoint_command_test {} {
-    if [target_info exists noargs] { 
-        verbose "Skipping infrun_breakpoint_command_test because of noargs."
-        return
-    }
-
-    gdb_test "set args 6" "" "set args in infrun_breakpoint_command_test"
-    if { ![runto factorial] } then { gdb_suppress_tests }
-    # Don't depend upon argument passing, since most simulators don't
-    # currently support it.  Bash value variable to be what we want.
-    gdb_test "p value=6" "" "set value to 6 in progvar_simple_if_test #1"
-    delete_breakpoints
-    gdb_test "break factorial if value == 5" "Breakpoint.*at.*"
-
-# infrun_breakpoint_command_test - This test was broken into two parts 
-# to get around a synchronization problem in expect.
-# part1: issue the gdb command "commands"
-# part2: send the list of commands
-    send_gdb "commands\n"
-    gdb_expect {
-	-re "End with" {
-	    pass "commands in infrun_breakpoint_command_test #1"
-	}
-        default {
-	    fail "(timeout or eof) commands in infrun_breakpoint_command_test"
-	}
-    }
-    gdb_test "step\nstep\nstep\nstep\nend" "" \
-	"commands in infrun_breakpoint_command_test #2"
-
-	gdb_test "continue" \
-		"Continuing.*.*.*Breakpoint \[0-9\]*, factorial \\(value=5\\).*at.*\[0-9\]*\[      \]*if \\(value > 1\\) \{.*\[0-9\]*\[      \]*value \\*= factorial \\(value - 1\\);.*" \
-		"continue in infrun_breakpoint_command_test"
-
-    gdb_stop_suppressing_tests;
-}
-
-proc breakpoint_command_test {} {
-    if [target_info exists noargs] { 
-        verbose "Skipping breakpoint_command_test because of noargs."
-        return
-    }
-
-    gdb_test "set args 6" "" "set args in breakpoint_command_test"
-    if { ![runto factorial] } then { gdb_suppress_tests; }
-    # Don't depend upon argument passing, since most simulators don't
-    # currently support it.  Bash value variable to be what we want.
-    gdb_test "p value=6" "" "set value to 6 in progvar_simple_if_test #2"
-    delete_breakpoints
-    gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #2"
-    gdb_test "commands\nprintf \"Now the value is %d\\n\", value\nend" \
-	"End with.*" "commands in breakpoint_command_test"
-    gdb_test "continue" \
-	    "Breakpoint \[0-9\]*, factorial.*Now the value is 5" \
-	"continue in breakpoint_command_test"
-    gdb_test "print value" " = 5" "print value in breakpoint_command_test"
-    gdb_stop_suppressing_tests;
-}
-
-# Test a simple user defined command (with arguments)
-proc user_defined_command_test {} {
-    global gdb_prompt
-
-    gdb_test "set \$foo = 4" "" "set foo in user_defined_command_test"
-
-    send_gdb "define mycommand\n"
-    gdb_expect {
-	-re "End with"  {
-	    pass "define mycommand in user_defined_command_test"
-	}
-        default {
-	    fail "(timeout or eof) define mycommand in user_defined_command_test"
-	}
-    }
-    # This test should alternate between 0xdeadbeef and 0xfeedface two times.
-    gdb_test "while \$arg0 > 0\nset \$arg0 -= 1\nif \(\$arg0 % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend\nend" \
-	    "" \
-	    "enter commands in user_defined_command_test"
-
-    gdb_test "mycommand \$foo" \
-	    "\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
-	    "execute user defined command in user_defined_command_test"
-   gdb_test "show user mycommand" \
-	"  while \\\$arg0.*set.*    if \\\(\\\$arg0.*p/x.*    else\[^\n\].*p/x.*    end\[^\n\].*  end\[^\n\].*" \
-	   "display user command in user_defined_command_test"
-}
-
-proc watchpoint_command_test {} {
-    global noargs
-    global gdb_prompt
-
-    if [target_info exists noargs] { 
-        verbose "Skipping watchpoint_command_test because of noargs."
-        return
-    }
-
-    gdb_test "set args 6" "" "set args in watchpoint_command_test"
-    if { ![runto factorial] } then { return }
-    delete_breakpoints
-
-    # Verify that we can create a watchpoint, and give it a commands
-    # list that continues the inferior.  We set the watchpoint on a
-    # local variable, too, so that it self-deletes when the watched
-    # data goes out of scope.
-    #
-    # What should happen is: Each time the watchpoint triggers, it
-    # continues the inferior.  Eventually, the watchpoint will self-
-    # delete, when the watched variable is out of scope.  But by that
-    # time, the inferior should have exited.  GDB shouldn't crash or
-    # anything untoward as a result of this.
-    #
-    set wp_id -1
-
-    send_gdb "watch local_var\n"
-    gdb_expect {
-        -re ".*\[Ww\]atchpoint (\[0-9\]*): local_var.*$gdb_prompt $" {
-            set wp_id $expect_out(1,string)
-            pass "watch local_var"
-        }
-        -re "$gdb_prompt $"\
-            {fail "watch local_var"}
-        timeout {fail "(timeout) watch local_var"}
-    }
-
-    if {$wp_id == -1} {return}
-
-    send_gdb "commands $wp_id\n"
-    gdb_expect {
-      -re "Type commands for when breakpoint $wp_id is hit, one per line.*>" {
-	  pass "begin commands on watch"
-      }
-      -re "$gdb_prompt $" {fail "begin commands on watch"}
-      timeout             {fail "(timeout) begin commands on watch"}
-    }
-    send_gdb "print value\n"
-    gdb_expect {
-	-re ">"               {pass "add print command to watch"}
-	-re "$gdb_prompt $"   {fail "add print command to watch"}
-	timeout               {fail "(timeout) add print command to watch"}
-    }
-    send_gdb "continue\n"
-    gdb_expect {
-	-re ">"               {pass "add continue command to watch"}
-	-re "$gdb_prompt $"   {fail "add continue command to watch"}
-	timeout               {fail "(timeout) add continue command to watch"}
-    }
-    send_gdb "end\n"
-    gdb_expect {
-	-re "$gdb_prompt $"   {pass "end commands on watch"}
-	timeout               {fail "(timeout) end commands on watch"}
-    }
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "Continuing.*\[Ww\]atchpoint $wp_id deleted because the program has left the block in.*which its expression is valid.*run.c:(57|82).*$gdb_prompt $" {
-	    pass "continue with watch"
-	}
-	-re "$gdb_prompt $"   {fail "continue with watch"}
-	timeout               {fail "(timeout) continue with watch"}
-    }
-}
-
-proc test_command_prompt_position {} {
-    global gdb_prompt
-
-    if [target_info exists noargs] { 
-        verbose "Skipping test_command_prompt_position because of noargs."
-        return
-    }
-
-    if { ![runto factorial] } then { gdb_suppress_tests; }
-    # Don't depend upon argument passing, since most simulators don't
-    # currently support it.  Bash value variable to be what we want.
-    delete_breakpoints
-    gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #3"
-    gdb_test "p value=5" "" "set value to 5 in test_command_prompt_position"
-    # All this test should do is print 0xdeadbeef once.
-    gdb_test "if value == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
-	    "\\\$\[0-9\]* = 0xdeadbeef" \
-	    "if test in test_command_prompt_position"
-    
-    # Now let's test for the correct position of the '>' in gdb's
-    # prompt for commands.  It should be at the beginning of the line,
-    # and not after one space.
-
-    send_gdb "commands\n"
-    gdb_expect {
-	-re "Type commands.*End with.*\[\r\n\]>$" { 
-	    send_gdb "printf \"Now the value is %d\\n\", value\n"
-	    gdb_expect {
-		-re "^printf.*value\r\n>$" {
-		    send_gdb "end\n"
-		    gdb_expect {
-			-re "^end\r\n$gdb_prompt $" { 
-			    pass "> OK in test_command_prompt_position" 
-			}
-			-re ".*$gdb_prompt $" { 
-			    fail "some other message in test_command_prompt_position" 
-			}
-			timeout  { 
-			    fail "(timeout) 1 in test_command_prompt_position"
-			}
-		    }
-		}
-		-re "^ >$" { fail "> not OK in test_command_prompt_position" }
-		-re ".*$gdb_prompt $"   { 
-		    fail "wrong message in test_command_prompt_position" 
-		}
-		timeout    { 
-		    fail "(timeout) 2 in test_command_prompt_position " 
-		}
-	    }
-	}
-	-re "Type commands.*End with.*\[\r\n\] >$" { 
-	    fail "prompt not OK in test_command_prompt_position" 
-	}
-	-re ".*$gdb_prompt $" { 
-	    fail "commands in test_command_prompt_position" 
-	}
-	timeout { fail "(timeout) 3 commands in test_command_prompt_position" }
-    }
-
-    gdb_stop_suppressing_tests;
-}
-
-
-
-proc deprecated_command_test {} {
-    gdb_test "maintenance deprecate blah" "Can't find command.*" \
-          "tried to deprecate non-existing command"
-
-    gdb_test "maintenance deprecate p \"new_p\"" "" "maintenance deprecate p \"new_p\" /1/"
-    gdb_test "p 5" \
-	    "Warning: 'p', an alias for the command 'print' is deprecated.*Use 'new_p'.*" \
-	    "p deprecated warning, with replacement"
-    gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away /1/"
-
-    gdb_test "maintenance deprecate p \"new_p\"" "" "maintenance deprecate p \"new_p\" /2/"
-    gdb_test "maintenance deprecate print \"new_print\"" ""
-    gdb_test "p 5" \
-	    "Warning: command 'print' \\(p\\) is deprecated.*Use 'new_print'.*" \
-	    "both alias and command are deprecated"
-    gdb_test "p 5" ".\[0-9\]* = 5.*" "Deprecated warning goes away /2/"
-
-    gdb_test "maintenance deprecate set remote memory-read-packet-size \"srm\" " \
-	    "" \
-	    "deprecate long command /1/"
-    gdb_test "set remote memory-read-packet-size" \
-	    "Warning: command 'set remote memory-read-packet-size' is deprecated.*Use 'srm'.*" \
-	    "long command deprecated /1/"
-
-    gdb_test "maintenance deprecate set remote memory-read-packet-size" \
-	    "" \
-	    "deprecate long command /2/"
-    gdb_test "set remote memory-read-packet-size" \
-	    "Warning: command 'set remote memory-read-packet-size' is deprecated.*No alternative known.*" \
-	    "long command deprecated with no alternative /2/"
-
-    gdb_test "maintenance deprecate" \
-	    "\"maintenance deprecate\".*" \
-	    "deprecate with no arguments"
-}
-
-proc bp_deleted_in_command_test {} {
-    global gdb_prompt
-    
-    if [target_info exists noargs] { 
-        verbose "Skipping bp_deleted_in_command_test because of noargs."
-        return
-    }
-
-    gdb_test "set args 1" "" "set args in bp_deleted_in_command_test"
-    delete_breakpoints
-
-    # Create a breakpoint, and associate a command-list to it, with
-    # one command that deletes this breakpoint.
-    gdb_test "break factorial" \
-             "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \
-             "breakpoint in bp_deleted_in_command_test"
-    
-    send_gdb "commands\n"
-    gdb_expect {
-      -re "Type commands for when breakpoint .* is hit, one per line.*>" {
-          pass "begin commands in bp_deleted_in_command_test"
-      }
-      -re "$gdb_prompt $" {fail "begin commands in bp_deleted_in_command_test"}
-      timeout             {fail "(timeout) begin commands bp_deleted_in_command_test"}
-    }
-    send_gdb "silent\n"
-    gdb_expect {
-        -re ">"               {pass "add silent command"}
-        -re "$gdb_prompt $"   {fail "add silent command"}
-        timeout               {fail "(timeout) add silent command"}
-    }
-    send_gdb "clear factorial\n"
-    gdb_expect {
-        -re ">"               {pass "add clear command"}
-        -re "$gdb_prompt $"   {fail "add clear command"}
-        timeout               {fail "(timeout) add clear command"} }
-    send_gdb "printf \"factorial command-list executed\\n\"\n"
-    gdb_expect {
-        -re ">"               {pass "add printf command"}
-        -re "$gdb_prompt $"   {fail "add printf command"}
-        timeout               {fail "(timeout) add printf command"}
-    }
-    send_gdb "cont\n"
-    gdb_expect {
-        -re ">"               {pass "add cont command"}
-        -re "$gdb_prompt $"   {fail "add cont command"}
-        timeout               {fail "(timeout) add cont command"} }
-    send_gdb "end\n"
-    gdb_expect {
-        -re "$gdb_prompt $"   {pass "end commands"}
-        timeout               {fail "(timeout) end commands"}
-    }
-
-    gdb_run_cmd
-    gdb_expect {
-        -re ".*factorial command-list executed.*1.*$gdb_prompt $" {
-	    pass "run factorial until breakpoint"
-        }
-	-re ".*$gdb_prompt $" {
-	    fail "run factorial until breakpoint"
-	}
-	default { fail "(timeout) run factorial until breakpoint" }
-	timeout { fail "(timeout) run factorial until breakpoint" }
-    }
-}
-
-proc temporary_breakpoint_commands {} {
-    global gdb_prompt
-    
-    if [target_info exists noargs] { 
-        verbose "Skipping temporary_breakpoint_commands because of noargs."
-        return
-    }
-
-    gdb_test "set args 1" "" "set args in temporary_breakpoint_commands"
-    delete_breakpoints
-
-    # Create a temporary breakpoint, and associate a commands list to it.
-    # This test will verify that this commands list is executed when the
-    # breakpoint is hit.
-    gdb_test "tbreak factorial" \
-	    "Breakpoint \[0-9\]+ at .*: file .*/run.c, line \[0-9\]+\." \
-	    "breakpoint in temporary_breakpoint_commands"
-    
-    send_gdb "commands\n"
-    gdb_expect {
-	-re "Type commands for when breakpoint .* is hit, one per line.*>" {
-	    pass "begin commands in bp_deleted_in_command_test"
-	}
-	-re "$gdb_prompt $" {fail "begin commands in bp_deleted_in_command_test"}
-	timeout             {fail "(timeout) begin commands bp_deleted_in_command_test"}
-    }
-    send_gdb "silent\n"
-    gdb_expect {
-	-re ">"               {pass "add silent tbreak command"}
-	-re "$gdb_prompt $"   {fail "add silent tbreak command"}
-	timeout               {fail "(timeout) add silent tbreak command"}
-     }
-    send_gdb "printf \"factorial tbreak commands executed\\n\"\n"
-    gdb_expect {
-	-re ">"               {pass "add printf tbreak command"}
-	-re "$gdb_prompt $"   {fail "add printf tbreak command"}
-	timeout               {fail "(timeout) add printf tbreak command"}
-     }
-    send_gdb "cont\n"
-    gdb_expect {
-	-re ">"               {pass "add cont tbreak command"}
-	-re "$gdb_prompt $"   {fail "add cont tbreak command"}
-	timeout               {fail "(timeout) add cont tbreak command"} }
-    send_gdb "end\n"
-    gdb_expect {
-	-re "$gdb_prompt $"   {pass "end tbreak commands"}
-	timeout               {fail "(timeout) end tbreak commands"}
-     }
-
-    gdb_run_cmd
-    gdb_expect {
-	-re ".*factorial tbreak commands executed.*1.*$gdb_prompt $" {
-	    pass "run factorial until temporary breakpoint"
-	}
-	timeout { fail "(timeout) run factorial until temporary breakpoint" }
-    }
-}
-  
-gdbvar_simple_if_test
-gdbvar_simple_while_test
-gdbvar_complex_if_while_test
-progvar_simple_if_test
-progvar_simple_while_test
-progvar_complex_if_while_test
-if_while_breakpoint_command_test
-infrun_breakpoint_command_test
-breakpoint_command_test
-user_defined_command_test
-watchpoint_command_test
-test_command_prompt_position
-deprecated_command_test
-bp_deleted_in_command_test
-temporary_breakpoint_commands
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
deleted file mode 100644
index 1698a3056d3..00000000000
--- a/gdb/testsuite/gdb.base/completion.exp
+++ /dev/null
@@ -1,744 +0,0 @@
-# Copyright 1998, 1999, 2002, 2003, 2004 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite.
-
-#
-# tests for command completion
-#
-# Here are some useful test cases for completion.  
-# They should be tested with both M-? and TAB.
-#
-#   "show output-" "radix"
-#   "show output" "-radix"
-#   "p" ambiguous (commands starting with p--path, print, printf, etc.)
-#   "p "  ambiguous (all symbols)
-#   "info t foo" no completions
-#   "info t " no completions
-#   "info t" ambiguous ("info target", "info terminal", etc.)
-#   "info ajksdlfk" no completions
-#   "info ajksdlfk " no completions
-#   "info" " "
-#   "info " ambiguous (all info commands)
-#   "p \"break1" unambiguous (completes to filename "break1.c")
-#   "p \"break1." unambiguous (should complete to "break1.c" but does not,
-#	due to readline limitations)
-#   "p 'a" ambiguous (all symbols starting with a)
-#   "p b-a" ambiguous (all symbols starting with a)
-#   "p b-" ambiguous (all symbols)
-#   "file Make" "file" (word break hard to screw up here)
-#   "file ../gdb.stabs/we" "ird" (needs to not break word at slash)
-#
-
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-
-global usestubs
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-
-# Don't let a .inputrc file or an existing setting of INPUTRC mess up
-# the test results.  Even if /dev/null doesn't exist on the particular
-# platform, the readline library will use the default setting just by
-# failing to open the file.  OTOH, opening /dev/null successfully will
-# also result in the default settings being used since nothing will be
-# read from this file.
-global env
-if [info exists env(INPUTRC)] {
-    set old_inputrc $env(INPUTRC)
-}
-set env(INPUTRC) "/dev/null"
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-        perror "tests suppressed"
-}
-
-set oldtimeout1 $timeout
-set timeout 30
-
-
-send_gdb "hfgfh\t"
-sleep 1
-gdb_expect  {
-        -re "^hfgfh\\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Undefined command: \"hfgfh\"\\.  Try \"help\"\\..*$gdb_prompt $"\
-                                        { pass "complete 'hfgfh'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'hfgfh'"}
-                      timeout           {fail "(timeout) complete 'hfgfh'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'hfgfh'" }
-        timeout         { fail "(timeout) complete 'hfgfh'" }
-        }
-
-#exp_internal 0
-
-send_gdb "show output\t"
-sleep 1
-gdb_expect  {
-        -re "^show output-radix $"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Default output radix for printing of values is 10\\..*$gdb_prompt $"\
-                                        { pass "complete 'show output'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'show output'"}
-                      timeout           {fail "(timeout) complete 'show output'"}
-                     }
-            }
-        -re "^show output$"\
-            { send_gdb "\n"
-               gdb_expect {
-                      -re "Default output radix for printing of values is 10\\..*$gdb_prompt $"\
-                                        { fail "complete 'show output'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'show output'"}
-                      timeout           { fail "(timeout) complete 'show output'"}
-                     }
-
-             }
-
-        -re ".*$gdb_prompt $"       { fail "complete 'show output'" }
-        timeout         { fail "(timeout) complete 'show output'" }
-        }
-
-
-send_gdb "show output-\t"
-sleep 1
-gdb_expect  {
-        -re "^show output-radix $"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Default output radix for printing of values is 10\\..*$gdb_prompt $"\
-                                        { pass "complete 'show output-'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'show output-'"}
-                      timeout           {fail "(timeout) complete 'show output-'"}
-                     }
-            }
-        -re "^show output-$"\
-            { send_gdb "\n"
-               gdb_expect {
-                      -re "Default output radix for printing of values is 10\\..*$gdb_prompt $"\
-                                        { fail "complete 'show output-'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'show output-'"}
-                      timeout           { fail "(timeout) complete 'show output-'"}
-                     }
-
-             }
-
-        -re ".*$gdb_prompt $"       { fail "complete 'show output-'" }
-        timeout         { fail "(timeout) complete 'show output-'" }
-        }
-
-send_gdb "p\t"
-sleep 1
-gdb_expect  {
-        -re "^p\\\x07$"\
-            { send_gdb "\n"
-	      sleep 1
-              gdb_expect {
-                      -re "The history is empty\\..*$gdb_prompt $"\
-                                        { pass "complete 'p'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'p'"}
-                      timeout           {fail "(timeout) complete 'p' 2"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'p'" }
-        timeout         { fail "(timeout) complete 'p' 1" }
-        }
-
-send_gdb "p \t"
-sleep 3
-gdb_expect  {
-        -re "^p \\\x07$"\
-            { send_gdb "\n"
-	      sleep 1
-              gdb_expect {
-                      -re "The history is empty\\..*$gdb_prompt $"\
-                                        { pass "complete 'p '"}
-                      -re ".*$gdb_prompt $" { fail "complete 'p '"}
-                      timeout           {fail "(timeout) complete 'p ' 1"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'p '" }
-        timeout         { fail "(timeout) complete 'p ' 2" }
-        }
-
-
-send_gdb "info t foo\t"
-sleep 1
-gdb_expect  {
-        -re "^info t foo\\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Ambiguous info command \"t foo\": target, terminal, threads, tp, tracepoints, types\\..*$gdb_prompt $"\
-                                        { pass "complete 'info t foo'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'info t foo'"}
-                      timeout           {fail "(timeout) complete 'info t foo'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'info t foo'" }
-        timeout         { fail "(timeout) complete 'info t foo'" }
-        }
-
-send_gdb "info t\t"
-sleep 1
-gdb_expect  {
-        -re "^info t\\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Ambiguous info command \"t\": target, terminal, threads, tp, tracepoints, types\\..
-*$gdb_prompt $"\
-                                        { pass "complete 'info t'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'info t'"}
-                      timeout           {fail "(timeout) complete 'info t'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'info t'" }
-        timeout         { fail "(timeout) complete 'info t'" }
-        }
-
-
-send_gdb "info t \t"
-sleep 1
-gdb_expect  {
-        -re "^info t \\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Ambiguous info command \"t \": target, terminal, threads, tp, tracepoints, types\\..
-*$gdb_prompt $"\
-                                        { pass "complete 'info t '"}
-                      -re ".*$gdb_prompt $" { fail "complete 'info t '"}
-                      timeout           {fail "(timeout) complete 'info t '"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'info t '" }
-        timeout         { fail "(timeout) complete 'info t '" }
-        }
-
-
-send_gdb "info asdfgh\t"
-sleep 1
-gdb_expect  {
-        -re "^info asdfgh\\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Undefined info command: \"asdfgh\".  Try \"help info\"\\..
-*$gdb_prompt $"\
-                                        { pass "complete 'info asdfgh'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'info asdfgh'"}
-                      timeout           {fail "(timeout) complete 'info asdfgh'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'info asdfgh'" }
-        timeout         { fail "(timeout) complete 'info asdfgh'" }
-        }
-
-
-send_gdb "info asdfgh \t"
-sleep 1
-gdb_expect  {
-        -re "^info asdfgh \\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Undefined info command: \"asdfgh \".  Try \"help info\"\\..
-*$gdb_prompt $"\
-                                        { pass "complete 'info asdfgh '"}
-                      -re ".*$gdb_prompt $" { fail "complete 'info asdfgh '"}
-                      timeout           {fail "(timeout) complete 'info asdfgh '"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'info asdfgh '" }
-        timeout         { fail "(timeout) complete 'info asdfgh '" }
-        }
-
-send_gdb "info\t"
-sleep 1
-gdb_expect  {
-        -re "^info $"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "\"info\" must be followed by the name of an info command\\.\r\nList of info subcommands:\r\n\r\n.*info address.*info watchpoints.*\r\n\r\nType \"help info\" followed by info subcommand name for full documentation.\r\nCommand name abbreviations are allowed if unambiguous\\..*$gdb_prompt $"\
-                                        { pass "complete 'info'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'info'"}
-                      timeout           {fail "(timeout) complete 'info'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'info'" }
-        timeout         { fail "(timeout) complete 'info'" }
-        }
-
-send_gdb "info \t"
-sleep 1
-gdb_expect  {
-        -re "^info \\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "\"info\" must be followed by the name of an info command\\.\r\nList of info subcommands:\r\n\r\n.*info address.*Type \"help info\" followed by info subcommand name for full documentation.\r\nCommand name abbreviations are allowed if unambiguous\\..*$gdb_prompt $"\
-                                        { pass "complete 'info '"}
-                      -re ".*$gdb_prompt $" { fail "complete 'info '"}
-                      timeout           {fail "(timeout) complete 'info '"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'info '" }
-        timeout         { fail "(timeout) complete 'info '" }
-        }
-
-
-send_gdb "info \t"
-sleep 1
-gdb_expect  {
-        -re "^info \\\x07$"\
-            { send_gdb "\t"
-              gdb_expect {
-                      -re "address.*types.*$gdb_prompt info $"\
-                          { send_gdb "\n"
-                            gdb_expect {
-                                     -re "\"info\".*unambiguous\\..*$gdb_prompt $"\
-                                        { pass "complete (2) 'info '"}
-                                     -re ".*$gdb_prompt $" { fail "complete (2) 'info '"}
-                                     timeout           {fail "(timeout) complete (2) 'info '"}
-                                    }
-                           }
-                      -re ".*$gdb_prompt $" { fail "complete (2) 'info '"}
-                      timeout           {fail "(timeout) complete (2) 'info '"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete (2) 'info '" }
-        timeout         { fail "(timeout) complete (2) 'info '" }
-        }
-
-
-send_gdb "p \"break1\t"
-sleep 1
-gdb_expect  {
-        -re "^p \"break1\\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re ".*$gdb_prompt $" { fail "complete 'p \"break1'"}
-                      timeout           {fail "(timeout) complete 'p \"break1'"}
-                     }
-            }
-	-re "^p \"break1\\.c\"$"\
-	    {	send_gdb "\n"
-		gdb_expect {
-		    -re ".*$gdb_prompt $" { pass "complete 'p \"break1'"}
-		    timeout           {fail "(timeout) complete 'p \"break1'"}
-		}
-	    }
-	-re "^p \"break1.*$"
-	    {	send_gdb "\n"
-		gdb_expect {
-		    -re ".*$gdb_prompt $" { fail "complete 'p \"break1'"}
-		    timeout           {fail "(timeout) complete 'p \"break1'"}
-		}
-	    }
-        -re ".*$gdb_prompt $"       { fail "complete 'p \"break1'" }
-        timeout         { fail "(timeout) complete 'p \"break1'" }
-        }
-
-setup_xfail "*-*-*"
-send_gdb "p \"break1.\t"
-sleep 1
-gdb_expect  {
-        -re "^p \"break1\\.\\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re ".*$gdb_prompt $" { fail "complete 'p \"break1.'"}
-                      timeout           {fail "(timeout) complete 'p \"break1.'"}
-                     }
-            }
-	-re "^p \"break1\\.c\"$"\
-	    {	send_gdb "\n"
-		gdb_expect {
-		    -re ".*$gdb_prompt $" { pass "complete 'p \"break1.'"}
-		    timeout           {fail "(timeout) complete 'p \"break1.'"}
-		}
-	    }
-	-re "^p \"break1\\..*$"
-	    {	send_gdb "\n"
-		gdb_expect {
-		    -re ".*$gdb_prompt $" { fail "complete 'p \"break1.'"}
-		    timeout           {fail "(timeout) complete 'p \"break1.'"}
-		}
-	    }
-        -re ".*$gdb_prompt $"       { fail "complete 'p \"break1.'" }
-        timeout         { fail "(timeout) complete 'p \"break1.'" }
-        }
-
-send_gdb "p 'a\t"
-sleep 1
-gdb_expect  {
-        -re "^p 'a\\\x07$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $"\
-                                        { pass "complete 'p \'a'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'p \'a'"}
-                      timeout           {fail "(timeout) complete 'p \'a'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'p \'a'" }
-        timeout         { fail "(timeout) complete 'p \'a'" }
-        }
-
-send_gdb "p 'a\t"
-sleep 1
-gdb_expect {
-    -re "^p 'a\\\x07$" {
-	send_gdb "\t"
-	gdb_expect {
-	    -re ".*argv.*$gdb_prompt p .a$" {
-		send_gdb "\n"
-		gdb_expect {
-		    -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
-			pass "complete (2) 'p \'a'"
-		    }
-		    -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" }
-		    timeout { fail "(timeout) complete (2) 'p \'a'" }
-		}
-	    }
-	    -re "(There are $decimal possibilities\\.  Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
-		send_gdb "n"
-		gdb_expect {
-		    -re "\\(gdb\\) p 'a$" {
-			send_gdb "\n"
-			gdb_expect {
-			    -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
-				pass "complete (2) 'p \'a'"
-			    }
-			    -re ".*$gdb_prompt $" { 
-				fail "complete (2) 'p \'a'"
-			    }
-			    timeout { fail "(timeout) complete (2) 'p \'a'" }
-			}
-		    }
-		    -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" }
-		    timeout { fail "(timeout) complete (2) 'p \'a'" }
-		}
-	    }
-	    -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" }
-	    timeout { fail "(timeout) complete (2) 'p \'a'" }
-	}
-    }
-    -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" }
-    timeout { fail "(timeout) complete (2) 'p \'a'" }
-}
-
-
-# These tests used to try completing the shorter "p b-a".
-# Unfortunately, on some systems, there are .o files in system
-# libraries which declare static variables named `b'.  Of course,
-# those variables aren't really in scope, as far as the compiler is
-# concerned.  But GDB deliberately tries to be more liberal: if you
-# enter an identifier that doesn't have any binding in scope, GDB will
-# search all the program's compilation units for a static variable of
-# the given name.
-#
-# This behavior can help avoid a lot of pedantry, so it's usually a
-# good thing.  But in this test case, it causes GDB to print the value
-# of some random variable, instead of giving us the "No symbol..."
-# error we were expecting.
-#
-# For example, on S/390 linux, the file s_atan.c in libm.a declares a
-# `b', which is a structure containing an int and a float, so GDB says
-# ``Argument to arithmetic operation not a number or boolean'' instead
-# of ``No symbol ...''.
-#
-# So, I'm hoping that there is no system with a static library variable named
-# `no_var_by_this_name'.
-send_gdb "p no_var_named_this-a\t"
-sleep 1
-gdb_expect {
-    -re "^p no_var_named_this-a\\\x07$" {
-        send_gdb "\n"
-        gdb_expect {
-            -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
-                pass "complete 'p no_var_named_this-a'"
-            }
-            -re ".*$gdb_prompt $" {
-                fail "complete 'p no_var_named_this-a'"
-            }
-            timeout {
-                fail "(timeout) complete 'p no_var_named_this-a'"
-            }
-        }
-    }
-    -re ".*$gdb_prompt $" {
-        fail "complete 'p no_var_named_this-a'"
-    }
-    timeout {
-        fail "(timeout) complete 'p no_var_named_this-a'"
-    }
-}
-
-send_gdb "p no_var_named_this-a\t"
-sleep 1
-gdb_expect {
-    -re "^p no_var_named_this-a\\\x07$" {
-	send_gdb "\t"
-	gdb_expect {
-	    -re ".*argv.*$gdb_prompt p no_var_named_this-a$" {
-		send_gdb "\n"
-		gdb_expect {
-		    -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
-			pass "complete (2) 'p no_var_named_this-a'"
-		    }
-		    -re ".*$gdb_prompt $" {
-                        fail "complete (2) 'p no_var_named_this-a'"
-                    }
-		    timeout {
-                        fail "(timeout) complete (2) 'p no_var_named_this-a'"
-                    }
-		}
-	    }
-	    -re "(There are $decimal possibilities\\.  Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
-		send_gdb "n"
-		gdb_expect {
-		    -re "\\(gdb\\) p no_var_named_this-a$" {
-			send_gdb "\n"
-			gdb_expect {
-			    -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
-				pass "complete (2) 'p no_var_named_this-a'"
-			    }
-			    -re ".*$gdb_prompt $" {
-				fail "complete (2) 'p no_var_named_this-a'"
-			    }
-			    timeout {
-                                fail "(timeout) complete (2) 'p no_var_named_this-a'"
-                            }
-			}
-		    }
-		    -re ".*$gdb_prompt $" {
-                        fail "complete (2) 'p no_var_named_this-a'"
-                    }
-		    timeout {
-                        fail "(timeout) complete (2) 'p no_var_named_this-a'"
-                    }
-		}
-	    }
-	    -re ".*$gdb_prompt $" {
-                fail "complete (2) 'p no_var_named_this-a'"
-            }
-	    timeout { fail "(timeout) complete (2) 'p no_var_named_this-a'" }
-        }
-    }
-    -re ".*$gdb_prompt $" { fail "complete (2) 'p no_var_named_this-a'" }
-    timeout { fail "(timeout) complete (2) 'p no_var_named_this-a'" }
-}
-
-send_gdb "p no_var_named_this-\t"
-sleep 1
-gdb_expect  {
-    -re "^p no_var_named_this-\\\x07$" {
-	send_gdb "\t"
-	gdb_expect {
-	    -re "(There are $decimal possibilities\\.  Do you really\r\nwish to see them all.|Display all $decimal possibilities.) \\(y or n\\)$" {
-		send_gdb "n"
-		gdb_expect {
-		    -re "\\(gdb\\) p no_var_named_this-$" {
-			send_gdb "\n"
-			gdb_expect {
-			    -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" {
-				pass "complete (2) 'p no_var_named_this-'"
-			    }
-			    -re ".*$gdb_prompt $" {
-				fail "complete (2) 'p no_var_named_this-'"
-			    }
-			    timeout {
-                                fail "(timeout) complete (2) 'p no_var_named_this-'"
-                            }
-			}
-		    }
-		    -re ".*$gdb_prompt $" {
-                        fail "complete (2) 'p no_var_named_this-'"
-                    }
-		    timeout {
-                        fail "(timeout) complete (2) 'p no_var_named_this-'"
-                    }
-		}
-	    }
-	    -re ".*$gdb_prompt $" {
-                fail "complete (2) 'p no_var_named_this-'"
-            }
-	    timeout { fail "(timeout) complete (2) 'p no_var_named_this-'" }
-	}
-    }
-    -re ".*$gdb_prompt $" { fail "complete (2) 'p no_var_named_this-'" }
-    timeout { fail "(timeout) complete (2) 'p no_var_named_this-'" }
-}
-
-
-# The following tests used to simply try to complete `${objdir}/file',
-# and so on.  The problem is that ${objdir} can be very long; the
-# completed filename may be more than eighty characters wide.  When
-# this happens, readline tries to manage things, producing output that
-# may make sense on the screen, but is rather hard for our script to
-# recognize.
-#
-# In the case that motivated this change, the (gdb) prompt occupied
-# the leftmost six columns, and `${objdir}/' was seventy-four
-# characters long --- eighty in all.  After printing the slash,
-# readline emitted a space, a carriage return, and then `Makefile'
-# (the tab character being received as input after `Make'.
-#
-# Basically, you have to let readline do whatever it's going to do to
-# make the screen look right.  If it happens to use a different
-# strategy on Tuesdays to get the cursor in the right place, that's
-# not something the testsuite should care about.
-#
-# So, we avoid long lines.  We `cd' to ${objdir} first, and then do
-# the completion relative to the current directory.
-
-# ${srcdir} may be a relative path.  We want to make sure we end up
-# in the right directory - so make sure we know where it is.
-set mydir [pwd]
-cd ${srcdir}
-set fullsrcdir [pwd]
-cd ${mydir}
-
-# If the directory name contains a '+' we must escape it, adding a backslash.
-# If not, the test below will fail because it will interpret the '+' as a 
-# regexp operator. We use string_to_regexp for this purpose.
-
-gdb_test "cd ${fullsrcdir}" \
-         "Working directory [string_to_regexp ${fullsrcdir}].*" \
-         "cd to \${srcdir}"
-
-send_gdb "complete file ./gdb.base/compl\n"
-sleep 1
-gdb_expect  {
-    -re "file ./gdb.base/completion\\.exp.*$gdb_prompt $"
-	{ pass "complete-command 'file ./gdb.base/compl'"}
-    -re ".*$gdb_prompt $"       { fail "complete-command 'file ./gdb.base/compl'" }
-    timeout         { fail "(timeout) complete-command 'file ./gdb.base/compl'" }
-}
-
-send_gdb "file ./gdb.base/complet\t"
-sleep 1
-gdb_expect  {
-        -re "^file ./gdb.base/completion\\.exp $"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "\r\nA program is being debugged already\\.  Kill it\\? \\(y or n\\) $"
-                      { send_gdb "n\n"
-                        gdb_expect {
-                                -re "\r\nProgram not killed\\.\r\n$gdb_prompt $"\
-                                        { pass "complete 'file ./gdb.base/complet'"}
-                                -re ".*$gdb_prompt $" { fail "complete 'file ./gdb.base/complet'"}
-                                timeout           {fail "(timeout) complete 'file ./gdb.base/complet'"}
-                               }
-                      }
-                      -re ".*$gdb_prompt $" { fail "complete 'file ./gdb.base/complet'"}
-                      timeout           {fail "(timeout) complete 'file ./gdb.base/complet'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'file ./gdb.base/complet'" }
-        timeout         { fail "(timeout) complete 'file ./gdb.base/complet'" }
-        }
-
-send_gdb "info func marke\t"
-sleep 1
-gdb_expect  {
-        -re "^info func marke.*r$"\
-            {
-	      send_gdb "\t\t"
-              sleep 3
-              gdb_expect {
-                      -re "marker1.*$gdb_prompt info func marker$"\
-                      { send_gdb "\n"
-                        gdb_expect {
-                                -re "All functions matching regular expression \"marker\":.*File.*break1.c:\r\nint marker1\\((void|)\\);\r\nint marker2\\(int\\).*marker3\\(char.*char.*\\).*marker4\\(long int\\);.*$gdb_prompt $"\
-                                                  { pass "complete 'info func marke'"}
-                                -re ".*$gdb_prompt $" { fail "complete 'info func marke'"}
-                                timeout           {fail "(timeout) complete 'info func marke'"}
-                               }
-                      }
-                      -re ".*$gdb_prompt $" { fail "complete 'info func marke'"}
-                      timeout           {fail "(timeout) complete 'info func marke'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'info func marke'" }
-        timeout         { fail "(timeout) complete 'info func marke'" }
-        }
-
-
-send_gdb "set follow-fork-mode \t\t"
-sleep 1
-gdb_expect  {
-        -re "child.*parent.*$gdb_prompt set follow-fork-mode $"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "Requires an argument.*child.*parent.*$gdb_prompt $"\
-                                        { pass "complete 'set follow-fork-mode'"}
-                      -re "Ambiguous item \"\"\\..*$gdb_prompt $"\
-                                        { pass "complete 'set follow-fork-mode'"}
-                      -re ".*$gdb_prompt $" { fail "complete 'set follow-fork-mode'"}
-                      timeout           {fail "(timeout) complete 'set follow-fork-mode'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'set follow-fork-mode'" }
-        timeout         { fail "(timeout) complete 'set follow-fork-mode'" }
-        }
-
-# Restore globals modified in this test...
-if [info exists old_inputrc] {
-    set env(INPUTRC) $old_inputrc
-} else {
-    unset env(INPUTRC)
-}
-set timeout $oldtimeout1
-
-return 0
diff --git a/gdb/testsuite/gdb.base/complex.c b/gdb/testsuite/gdb.base/complex.c
deleted file mode 100644
index dabbdd60595..00000000000
--- a/gdb/testsuite/gdb.base/complex.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2002, 2003, 2004
-   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.  */
-
-/* Test taken from GCC.  Verify that we can print a structure containing
-   a complex number.  */
-
-#include <stdlib.h>
-
-typedef __complex__ float cf;
-struct x { char c; cf f; } __attribute__ ((__packed__));
-struct unpacked_x { char c; cf f; };
-extern void f4 (struct unpacked_x*);
-extern void f3 (void);
-extern void f2 (struct x*);
-extern void f1 (void);
-int
-main (void)
-{
-  f1 ();
-  f3 ();
-  exit (0);
-}
-
-void
-f1 (void)
-{
-  struct x s;
-  s.f = 1;
-  s.c = 42;
-  f2 (&s);
-}
-
-void
-f2 (struct x *y)
-{
-  if (y->f != 1 || y->c != 42)
-    abort ();
-}
-
-void
-f3 (void)
-{
-  struct unpacked_x s;
-  s.f = 1;
-  s.c = 42;
-  f4 (&s);
-}
-
-void
-f4 (struct unpacked_x *y)
-{
-  if (y->f != 1 || y->c != 42)
-    abort ();
-}
diff --git a/gdb/testsuite/gdb.base/complex.exp b/gdb/testsuite/gdb.base/complex.exp
deleted file mode 100644
index fac7f4f45c8..00000000000
--- a/gdb/testsuite/gdb.base/complex.exp
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set bug_id 0
-
-set testfile complex
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set options debug
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $options] != "" } {
-  # No support for __complex__, presumably.
-  unsupported "print complex packed value in C"
-  unsupported "print complex value in C"
-  return 0
-}
-
-# Start with a fresh gdb.
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-if [runto f2] then {
-    get_debug_format
-    if { [test_compiler_info gcc-2-*] && [test_debug_format "DWARF 2"] } then {
-	setup_xfail "*-*-*"
-    }
-    gdb_test "p *y" "\\\$\[0-9\]* = \{c = 42 '\\*', f = 1 \\+ 0 \\* I\}" \
-	    "print complex packed value in C"
-}
-
-if [runto f4] then {
-    gdb_test "p *y" "\\\$\[0-9\]* = \{c = 42 '\\*', f = 1 \\+ 0 \\* I\}" \
-	    "print complex value in C"
-}
-
-return 0
diff --git a/gdb/testsuite/gdb.base/cond-expr.exp b/gdb/testsuite/gdb.base/cond-expr.exp
deleted file mode 100644
index 746873cac8a..00000000000
--- a/gdb/testsuite/gdb.base/cond-expr.exp
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1998, 1999 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite
-
-#
-# test of evaluation of conditional expressions, with constants and 
-# variables. Using the print and the whatis command
-# written with the only purpose in mind to cover the holes in the
-# eval.c file
-#
-# source file "int-type.c"
-#
-
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-# Check to see if we have an executable to test.  If not, then either we
-# haven't tried to compile one, or the compilation failed for some reason.
-# In either case, just notify the user and skip the tests in this file.
-
-set testfile "int-type"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-send_gdb "print (2 ? 3 : 4)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 3.*$gdb_prompt $" {
-        pass "print value of cond expr (const true)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of cond expr (const true)" }
-    timeout           { fail "(timeout) print value of cond expr (const true)" }
-  }
-
-send_gdb "print (0 ? 3 : 4)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 4.*$gdb_prompt $" {
-        pass "print value of cond expr (const false)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of cond expr (const false)" }
-    timeout           { fail "(timeout) print value of cond expr (const false)" }
-  }
-
-gdb_test "set variable x=14" "" "set variable x=14"
-gdb_test "set variable y=2" "" "set variable y=2"
-gdb_test "set variable z=3" "" "set variable z=3"
-
-send_gdb "print (x ? y : z)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 2.*$gdb_prompt $" {
-        pass "print value of cond expr (var true)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of cond expr (var true)" }
-    timeout           { fail "(timeout) print value of cond expr (var true)" }
-  }
-
-gdb_test "set variable x=0" "" "set variable x=0"
-
-send_gdb "print (x ? y : z)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 3.*$gdb_prompt $" {
-        pass "print value of cond expr (var false)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of cond expr (var false)" }
-    timeout           { fail "(timeout) print value of cond expr (var false)" }
-  }
-
-
-send_gdb "whatis (0 ? 3 : 4)\n"
-gdb_expect {
-    -re "type = int.*$gdb_prompt $" {
-        pass "print whatis of cond expr"
-      }
-    -re ".*$gdb_prompt $" { fail "print whatis of cond expr" }
-    timeout           { fail "(timeout) print whatis of cond expr" }
-  }
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
deleted file mode 100644
index dc4df21fc0c..00000000000
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1997, 1998, 1999, 2000, 2001, 2003 Free Software Foundation, 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 test was written by Rich Title. 
-# Purpose is to test conditional breakpoints.
-# Modeled after "break.exp".
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-global usestubs
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-set bp_location1  [gdb_get_line_number "set breakpoint 1 here"]
-set bp_location6  [gdb_get_line_number "set breakpoint 6 here"]
-set bp_location8  [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
-set bp_location9  [gdb_get_line_number "set breakpoint 9 here" $srcfile1]
-set bp_location15 [gdb_get_line_number "set breakpoint 15 here" $srcfile1]
-set bp_location16 [gdb_get_line_number "set breakpoint 16 here" $srcfile1]
-
-#
-# test break at function
-#
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint function"
-
-# 
-# test conditional break at function
-#
-gdb_test "break marker1 if 1==1" \
-    "Breakpoint.*at.* file .*$srcfile1, line.*"
-
-gdb_test "delete 2" ""
-
-#
-# test conditional break at line number
-#
-gdb_test "break $srcfile:$bp_location1 if 1==1" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location1\\."
-
-gdb_test "delete 3" ""
-
-# 
-# test conditional break at function
-#
-gdb_test "break marker1 if (1==1)" \
-    "Breakpoint.*at.* file .*$srcfile1, line.*"
-
-#
-# test conditional break at line number
-#
-gdb_test "break $srcfile:$bp_location1 if (1==1)" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location1\\."
-
-gdb_test "break marker2 if (a==43)" \
-    "Breakpoint.*at.* file .*$srcfile1, line.*"
-
-#
-# check to see what breakpoints are set
-#
-
-if {$hp_aCC_compiler} {
-    set marker1_proto "\\(void\\)"
-    set marker2_proto "\\(int\\)"
-} else {
-    set marker1_proto ""
-    set marker2_proto ""
-}
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location6.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in marker1$marker1_proto at .*$srcfile1:($bp_location15|$bp_location16).*
-\[\t \]+stop only if 1 == 1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location1.*
-\[\t \]+stop only if 1 == 1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in marker2$marker2_proto at .*$srcfile1:($bp_location8|$bp_location9).*
-\[\t \]+stop only if a == 43.*" \
-    "breakpoint info"
-
-
-#
-# run until the breakpoint at main is hit.
-#
-
-
-rerun_to_main
-
-#
-# run until the breakpoint at a line number
-#
-gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location1.*$bp_location1\[\t \]+printf.*factorial.*" \
-			"run until breakpoint set at a line number"
-
-#
-# run until the breakpoint at marker1
-#
-# If the inferior stops at the first instruction of a source line, GDB
-# won't print the actual PC value; the source line is enough to
-# exactly specify the PC.  But if the inferior is instead stopped in
-# the midst of a source line, GDB will include the PC in the
-# breakpoint hit message.  This way, GDB always provides the exact
-# stop location, but avoids clutter when possible.
-#
-# Suppose you have a function written completely on one source line, like:
-#    int foo (int x) { return 0; }
-# Setting a breakpoint at `foo' actually places the breakpoint after
-# foo's prologue.
-#
-# GCC's STABS writer always emits a line entry attributing the
-# prologue instructions to the line containing the function's open
-# brace, even if the first user instruction is also on that line.
-# This means that, in the case of a one-line function, you will get
-# two line entries in the debug info for the same line: one at the
-# function's entry point, and another at the first user instruction.
-# GDB preserves these duplicated line entries, and prefers the later
-# one; thus, when the program stops after the prologue, at the first
-# user instruction, GDB's search finds the second line entry, decides
-# that the PC is indeed at the beginning of a source line, and doesn't
-# print an address in the breakpoint hit message.
-# 
-# GCC's Dwarf2 writer, on the other hand, squeezes out duplicate line
-# entries, so GDB considers the source line to begin at the start of
-# the function's prologue.  Thus, if the program stops at the
-# breakpoint, GDB will decide that the PC is not at the beginning of a
-# source line, and will print an address.
-#
-# I think the Dwarf2 writer's behavior is arguably correct, but not
-# helpful.  If the user sets a breakpoint at that source line, they
-# want that breakpoint to fall after the prologue.  Identifying the
-# prologue's code with the opening brace is nice, but it shouldn't
-# take precedence over real code.
-#
-# Until the Dwarf2 writer gets fixed, I'm going to XFAIL its behavior.
-send_gdb "continue\n"
-gdb_expect {
-    -re  "Continuing\\..*Breakpoint \[0-9\]+, marker1 \\(\\) at .*$srcfile1:($bp_location15|$bp_location16).*($bp_location15|$bp_location16)\[\t \]+.*$gdb_prompt $" {
-	pass "run until breakpoint at marker1"
-    }
-    -re  "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker1 \\(\\) at .*$srcfile1:($bp_location15|$bp_location16).*($bp_location15|$bp_location16)\[\t \]+.*$gdb_prompt $" {
-	xfail "run until breakpoint at marker1"
-    }
-    -re "$gdb_prompt $" {
-	fail "run until breakpoint at marker1"
-    }
-    timeout {
-	fail "(timeout) run until breakpoint at marker1"
-    }
-}
-
-# run until the breakpoint at marker2
-# Same issues here as above.
-setup_xfail hppa2.0w-*-* 11512CLLbs
-send_gdb "continue\n"
-gdb_expect {
-    -re "Continuing\\..*Breakpoint \[0-9\]+, marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*($bp_location8|$bp_location9)\[\t \]+.*" {
-	pass "run until breakpoint at marker2"
-    }
-    -re "Continuing\\..*Breakpoint \[0-9\]+, $hex in marker2 \\(a=43\\) at .*$srcfile1:($bp_location8|$bp_location9).*($bp_location8|$bp_location9)\[\t \]+.*" {
-	xfail "run until breakpoint at marker2"
-    }
-    -re "$gdb_prompt $" {
-	fail "run until breakpoint at marker2"
-    }
-    timeout {
-	fail "(timeout) run until breakpoint at marker2"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/consecutive.c b/gdb/testsuite/gdb.base/consecutive.c
deleted file mode 100644
index bfea4296aec..00000000000
--- a/gdb/testsuite/gdb.base/consecutive.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 
-   Purpose of this test:  to test breakpoints on consecutive instructions.
-*/
-
-int a[7] = {1, 2, 3, 4, 5, 6, 7};
-
-/* assert: first line of foo has more than one instruction. */
-int foo ()
-{
-  return a[0] + a[1] + a[2] + a[3] + a[4] + a[5] + a[6];
-}
-
-main()
-{
-#ifdef usestubs
-    set_debug_traps ();
-    breakpoint ();
-#endif
-  foo ();
-}
diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp
deleted file mode 100644
index b04ae5ae9b8..00000000000
--- a/gdb/testsuite/gdb.base/consecutive.exp
+++ /dev/null
@@ -1,111 +0,0 @@
-#   Copyright 2001
-#   Free Software Foundation, 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 Michael Snyder. (msnyder@redhat.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# Test breakpoints at consecutive instruction addresses.
-#
-
-set prms_id 0
-set bug_id 0
-
-set testfile "consecutive"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-set nl "\[\r\n\]+"
-
-gdb_breakpoint foo
-gdb_test "continue" "Breakpoint $decimal, foo .*" \
-	"continue to breakpoint in foo"
-
-set bp_addr 0
-set stop_addr 0
-
-send_gdb "x /2i \$pc\n"
-gdb_expect {
-    global hex
-    global nl
-    global bp_addr
-    global gdb_prompt
-
-    -re "$hex.*${nl}($hex).*$gdb_prompt $" {
-	set bp_addr $expect_out(1,string)
-	pass "get breakpoint address for foo"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "get breakpoint address for foo"
-	return 0;
-    }
-    timeout {
-	fail "get breakpoint address for foo (timeout)"
-	return 0;
-    }
-}
-
-gdb_test "break \*$bp_addr" "Breakpoint $decimal at $bp_addr: file .*" \
-	"set bp, 2nd instr"
-
-send_gdb "step\n"
-gdb_expect {
-    -re "Breakpoint $decimal, ($hex) in foo.*$gdb_prompt $" {
-	set stop_addr $expect_out(1,string)
-	if [eval expr "$bp_addr == $stop_addr"] then {
-	    pass "stopped at bp, 2nd instr"
-	} else {
-	    fail "stopped at bp, 2nd instr (wrong address)"
-	}
-    }
-    -re ".*$gdb_prompt $" {
-	fail "stopped at bp, 2nd instr"
-    }
-    timeout {
-	fail "stopped at bp, 2nd instr (timeout)"
-
-    }
-}
-
diff --git a/gdb/testsuite/gdb.base/constvars.c b/gdb/testsuite/gdb.base/constvars.c
deleted file mode 100644
index 16025770e35..00000000000
--- a/gdb/testsuite/gdb.base/constvars.c
+++ /dev/null
@@ -1,188 +0,0 @@
-void marker1 (void)
-{
-}
-
-/* misc. function params */
-
-int
-qux1 (const char cc, const char /*&*/ccr, const char *ccp, char *const cpc)
-{
-  return 33;
-}
-
-int
-qux2 (volatile unsigned char vuc, const volatile int cvi,
-      volatile short /*&*/vsr, volatile long *vlp, float *volatile fpv,
-      const volatile signed char *const volatile cvscpcv)
-{
-  return 400;
-}
-
-int
-main (void)
-{
-  char lave = 'B';
-  unsigned char lavish = 10;
-  short lax = 20;
-  unsigned short lecherous = 30;
-  long lechery = 40;
-  unsigned long lectern = 50;
-  float leeway = 60;
-  double legacy = 70;
-  signed char lemonade = 35;
-
-  const char            laconic = 'A';
-  const unsigned char   laggard = 1;
-  const short           lagoon = 2;
-  const unsigned short  laity = 3;
-  const long            lambent = 4;
-  const unsigned long   laminated = 5;
-  const float           lampoon = 6;
-  const double          languid = 7;
-
-  /* pointers to constant variables */
-
-  const char           *legend      = &lave;
-  const unsigned char  *legerdemain = &lavish;
-  const short          *leniency    = &lax;
-  const unsigned short *leonine     = &lecherous;
-  const long           *lesion      = &lechery;
-  const unsigned long  *lethal      = &lectern;
-  const float          *lethargic   = &leeway;
-  const double         *levity      = &legacy;
-
-  /* constant pointers to constant variables */
-
-  const char           *const lewd          = &laconic;
-  const unsigned char  *const lexicographer = &laggard;
-  const short          *const lexicon       = &lagoon;
-  const unsigned short *const liaison       = &laity;
-  const long           *const libation      = &lambent;
-  const unsigned long  *const libelous      = &laminated;
-  const float          *const libertine     = &lampoon;
-  const double         *const libidinous    = &languid;
-
-  /* this is the same as const char * legend .... */
-
-  char           const *languish   = &laconic;
-  unsigned char  const *languor    = &laggard;
-  short          const *lank       = &lagoon;
-  unsigned short const *lapidary   = &laity;
-  long           const *larceny    = &lambent;
-  unsigned long  const *largess    = &laminated;
-  float          const *lascivious = &lampoon;
-  double         const *lassitude  = &languid;
-
-  /* constant pointers to variable */
-
-  char           *const   lamprey   = &lave;
-  unsigned char  *const   lariat    = &lavish;
-  short          *const   laudanum  = &lax;
-  unsigned short *const   lecithin  = &lecherous;
-  long           *const   leviathan = &lechery;
-  unsigned long  *const   libretto  = &lectern;
-  float          *const   lissome   = &leeway;
-  double         *const   locust    = &legacy;
-
-  /* volatile variables */
-
-  volatile char vox = 'X';
-  volatile unsigned char victuals = 13;
-  volatile short vixen = 200;
-  volatile unsigned short vitriol = 300;
-  volatile long vellum = 1000;
-  volatile unsigned long valve = 2000;
-  volatile float vacuity = 3.0;
-  volatile double vertigo = 10.3;
-    
-  /* pointers to volatile variables */
-
-  volatile char           * vampire = &vox;
-  volatile unsigned char  * viper  = &victuals;
-  volatile short          * vigour = &vixen;
-  volatile unsigned short * vapour = &vitriol;
-  volatile long           * ventricle = &vellum;
-  volatile unsigned long  * vigintillion = &valve;
-  volatile float          * vocation = &vacuity;
-  volatile double         * veracity = &vertigo;
-
-  /* volatile pointers to volatile variables */
-
-  volatile char           * volatile vapidity = &vox;
-  volatile unsigned char  * volatile velocity = &victuals;
-  volatile short          * volatile veneer = &vixen;
-  volatile unsigned short * volatile video = &vitriol;
-  volatile long           * volatile vacuum = &vellum;
-  volatile unsigned long  * volatile veniality = &valve;
-  volatile float          * volatile vitality = &vacuity;
-  volatile double         * volatile voracity = &vertigo;
-
-  /* const volatile vars */
-
-  const volatile char           victor = 'Y';
-  const volatile unsigned char  vicar = 11;
-
-  /* pointers to const volatiles */
-
-  const volatile char              * victory = &victor;
-  const volatile unsigned char     * vicarage = &vicar;
-
-  /* const pointers to volatile vars */
-
-  volatile char                    * const vein = &vox;
-  volatile unsigned char           * const vogue = &victuals;
-
-  /* const pointers to const volatile vars */
-
-  const volatile char              * const cavern = &victor;
-  const volatile unsigned char     * const coverlet = &vicar;
-
-  /* volatile pointers to const vars */
-
-  const char                       * volatile caveat = &laconic;
-  const unsigned char              * volatile covenant = &laggard;
-
-  /* volatile pointers to const volatile vars */
-
-  const volatile char              * volatile vizier = &victor;
-  const volatile unsigned char     * volatile vanadium = &vicar;
-
-  /* const volatile pointers */
-
-  char                             * const volatile vane = &lave;
-  unsigned char                    * const volatile veldt = &lavish;
-
-  /* const volatile pointers to const vars */
-
-  const char                       * const volatile cove = &laconic;
-  const unsigned char              * const volatile cavity = &laggard;
-    
-  /* const volatile pointers to volatile vars */
-
-  volatile char                    * const volatile vagus = &vox;
-  volatile unsigned char           * const volatile vagrancy = &victuals;
-    
-  /* const volatile pointers to const volatile */
-
-  const volatile char              * const volatile vagary = &victor;
-  const volatile unsigned char     * const volatile vendor = &vicar;
-  
-  /* various structs with const members */
-
-  struct crass { char * const ptr; } crass;
-  struct crisp { char * const *ptr; } crisp;
-
-  /* misc. references */
-  /*
-  const char           & radiation = laconic;
-  volatile signed char & remuneration = lemonade;
-  */
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-  marker1 ();
-    
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
deleted file mode 100644
index 25f7434e53c..00000000000
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ /dev/null
@@ -1,290 +0,0 @@
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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.  */
-
-# written by Elena Zannoni (elz@apollo.hp.com)
-#
-# This file is part of the gdb testsuite
-#
-# tests for const variables
-#           const pointers to vars
-#           pointers to const variables
-#           const pointers to const vars
-# with mixed types
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "constvars"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-get_debug_format
-
-# Many tests xfail with gcc 2 -gstabs+.
-# TODO: check out the hp side of this.
-
-proc local_compiler_xfail_check { } {
-    if { [test_compiler_info gcc-2-*] } then {
-	if { ![test_debug_format "HP"] \
-		&& ![test_debug_format "DWARF 2"] } then {
-	    setup_xfail "*-*-*" 
-	}
-    }
-
-    global hp_cc_compiler
-    if { $hp_cc_compiler } {
-	setup_xfail "hppa*-*-hpux*"
-    }
-}
-
-# A few tests still xfail with gcc 3 -gstabs+ and gcc 4 -gstabs+.
-
-proc local_compiler_xfail_check_2 { } {
-    if { [test_compiler_info gcc-3-*] || [test_compiler_info gcc-4-*] } {
-	if { [test_debug_format "stabs" ] } {
-	    setup_xfail "*-*-*"
-	}
-    }
-}
-
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
-            send_gdb "up\n"
-            gdb_expect {
-		-re ".*main.*$gdb_prompt $" {
-		    pass "up from marker1"
-		}
-                -re ".*$gdb_prompt $" {
-		    fail "up from marker1"
-		}
-                timeout { fail "up from marker1 (timeout)" }
-            }
-        }
-        -re "Break.* marker1__.* \\(\\) at .*:$decimal.*$gdb_prompt $" {
-	    fail "continue to marker1 (demangling)"
-            send_gdb "up\n"
-            gdb_expect {
-		-re ".*main.*$gdb_prompt $" {
-		    pass "up from marker1"
-		}
-                -re ".*$gdb_prompt $" {
-		    fail "up from marker1"
-		}
-                timeout { fail "up from marker1 (timeout)" }
-            }
-        }
-        -re "$gdb_prompt $" { fail "continue to marker1"  }
-        timeout { fail "(timeout) continue to marker1"  }
-    }
-
-# test function parameters
-
-local_compiler_xfail_check
-local_compiler_xfail_check_2
-
-send_gdb "ptype qux1\n"
-gdb_expect {
-    -re "type = int \\(const char, const char, const char \\*, char \\* const\\).*$gdb_prompt $" {
-        pass "ptype qux1"
-    }
-    -re ".*$gdb_prompt $" { fail "ptype qux1" }
-    timeout           { fail "(timeout) ptype qux1" }
-}   
-
-# test vars and pointers
-
-proc do_constvar_tests {} {
-    gdb_test "print lave" " = 66 'B'"
-    gdb_test "ptype lave" "type = char"
-    gdb_test "print lavish" " = 10 '\\\\n'"
-    gdb_test "ptype lavish" "type = unsigned char"
-    gdb_test "print lax" " = 20"
-    gdb_test "ptype lax" "type = short.*"
-    gdb_test "print lecherous" " = 30"
-    gdb_test "ptype lecherous" "type = (unsigned short|short unsigned)( int)?"
-    gdb_test "print lechery" " = 40"
-    gdb_test "ptype lechery" "type = long.*"
-    gdb_test "print lectern" " = 50"
-    gdb_test "ptype lectern" "type = (unsigned long|long unsigned)( int)?"
-    gdb_test "print leeway" " = 60"
-    gdb_test "ptype leeway" "type = float"
-    gdb_test "print legacy" " = 70"
-    gdb_test "ptype legacy" "type = double"
-    gdb_test "print laconic" " = 65 'A'"
-    local_compiler_xfail_check
-    gdb_test "ptype laconic" "type = const char"
-    gdb_test "print laggard" " = 1 '.001'"
-    local_compiler_xfail_check
-    gdb_test "ptype laggard" "type = const unsigned char"
-    gdb_test "print lagoon" " = 2"
-    local_compiler_xfail_check
-    gdb_test "ptype lagoon" "type = const short( int)?"
-    gdb_test "print laity" " = 3"
-    local_compiler_xfail_check
-    gdb_test "ptype laity" "type = const (unsigned short|short unsigned)( int)?"
-    gdb_test "print lambent" " = 4"
-    local_compiler_xfail_check
-    gdb_test "ptype lambent" "type = const long( int)?"
-    gdb_test "print laminated" " = 5"
-    local_compiler_xfail_check
-    gdb_test "ptype laminated" "type = const (unsigned long|long unsigned)( int)?"
-    gdb_test "print lampoon" " = 6"
-    local_compiler_xfail_check
-    gdb_test "ptype lampoon" "type = const float"
-    gdb_test "print languid" " = 7"
-    local_compiler_xfail_check
-    gdb_test "ptype languid" "type = const double"
-    gdb_test "print *legend" " = 66 'B'"
-    local_compiler_xfail_check
-    gdb_test "ptype legend" "type = const char \\*"
-    gdb_test "print *legerdemain" " = 10 '\\\\n'"
-    local_compiler_xfail_check
-    gdb_test "ptype legerdemain" "type = const unsigned char \\*"
-    gdb_test "print *leniency" " = 20"
-    local_compiler_xfail_check
-    gdb_test "ptype leniency" "type = const short( int)? \\*"
-    gdb_test "print *leonine" " = 30"
-    local_compiler_xfail_check
-    gdb_test "ptype leonine" "type = const (unsigned short|short unsigned)( int)? \\*"
-    gdb_test "print *lesion" " = 40"
-    local_compiler_xfail_check
-    gdb_test "ptype lesion" "type = const long( int)? \\*"
-    gdb_test "print *lethal" " = 50"
-    local_compiler_xfail_check
-    gdb_test "ptype lethal" "type = const (unsigned long|long unsigned)( int)? \\*"
-    gdb_test "print *lethargic" " = 60"
-    local_compiler_xfail_check
-    gdb_test "ptype lethargic" "type = const float \\*"
-    gdb_test "print *levity" " = 70"
-    local_compiler_xfail_check
-    gdb_test "ptype levity" "type = const double \\*"
-    gdb_test "print *lewd" " = 65 'A'"
-    local_compiler_xfail_check
-    gdb_test "ptype lewd" "type = const char \\* const"
-    gdb_test "print *lexicographer" " = 1 '.001'"
-    local_compiler_xfail_check
-    gdb_test "ptype lexicographer" "type = const unsigned char \\* const"
-    gdb_test "print *lexicon" " = 2"
-    local_compiler_xfail_check
-    gdb_test "ptype lexicon" "type = const short( int)? \\* const"
-    gdb_test "print *liaison" " = 3"
-    local_compiler_xfail_check
-    gdb_test "ptype liaison" "type = const (unsigned short|short unsigned)( int)? \\* const"
-    gdb_test "print *libation" " = 4"
-    local_compiler_xfail_check
-    gdb_test "ptype libation" "type = const long( int)? \\* const"
-    gdb_test "print *libelous" " = 5"
-    local_compiler_xfail_check
-    gdb_test "ptype libelous" "type = const (unsigned long|long unsigned)( int)? \\* const"
-    gdb_test "print *libertine" " = 6"
-    local_compiler_xfail_check
-    gdb_test "ptype libertine" "type = const float \\* const"
-    gdb_test "print *libidinous" " = 7"
-    local_compiler_xfail_check
-    gdb_test "ptype libidinous" "type = const double \\* const"
-    gdb_test "print *languish" " = 65 'A'"
-    local_compiler_xfail_check
-    gdb_test "ptype languish" "type = const char \\*"
-    gdb_test "print *languor" " = 1 '.001'"
-    local_compiler_xfail_check
-    gdb_test "ptype languor" "type = const unsigned char \\*"
-    gdb_test "print *lank" " = 2"
-    local_compiler_xfail_check
-    gdb_test "ptype lank" "type = const short( int)? \\*"
-    gdb_test "print *lapidary" " = 3"
-    local_compiler_xfail_check
-    gdb_test "ptype lapidary" "type = const (unsigned short|short unsigned)( int)? \\*"
-    gdb_test "print *larceny" " = 4"
-    local_compiler_xfail_check
-    gdb_test "ptype larceny" "type = const long( int)? \\*"
-    gdb_test "print *largess" " = 5"
-    local_compiler_xfail_check
-    gdb_test "ptype largess" "type = const (unsigned long|long unsigned)( int)? \\*"
-    gdb_test "print *lascivious" " = 6"
-    local_compiler_xfail_check
-
-    gdb_test "ptype lascivious" "type = const float \\*"
-    gdb_test "print *lassitude" " = 7"
-    local_compiler_xfail_check
-    gdb_test "ptype lassitude" "type = const double \\*"
-    gdb_test "print *lamprey" " = 66 'B'"
-    local_compiler_xfail_check
-    gdb_test "ptype lamprey" "type = char \\* const"
-    gdb_test "print *lariat" " = 10 '\\\\n'"
-    local_compiler_xfail_check
-    gdb_test "ptype lariat" "type = unsigned char \\* const"
-    gdb_test "print *laudanum" " = 20"
-    local_compiler_xfail_check
-    gdb_test "ptype laudanum" "type = short( int)? \\* const"
-    gdb_test "print *lecithin" " = 30"
-    local_compiler_xfail_check
-    gdb_test "ptype lecithin" "type = (unsigned short|short unsigned)( int)? \\* const"
-    gdb_test "print *leviathan" " = 40"
-    local_compiler_xfail_check
-    gdb_test "ptype leviathan" "type = long( int)? \\* const"
-    gdb_test "print *libretto" " = 50"
-    local_compiler_xfail_check
-    gdb_test "ptype libretto" "type = (unsigned long|long unsigned)( int)? \\* const"
-    gdb_test "print *lissome" " = 60"
-    local_compiler_xfail_check
-    gdb_test "ptype lissome" "type = float \\* const"
-    gdb_test "print *locust" " = 70"
-    local_compiler_xfail_check
-    gdb_test "ptype locust" "type = double \\* const"
-
-    local_compiler_xfail_check
-    local_compiler_xfail_check_2
-    gdb_test "ptype crass" "type = struct crass \{\[\r\n\]+\[\ \t\]+char \\* const ptr;\[\r\n\]+\}"
-    local_compiler_xfail_check
-    gdb_test "ptype crisp" "type = struct crisp \{\[\r\n\]+\[\ \t\]+char \\* const \\*ptr;\[\r\n\]+\}"
-}
-
-do_constvar_tests
diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp
deleted file mode 100644
index eb58ed259d3..00000000000
--- a/gdb/testsuite/gdb.base/corefile.exp
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if ![isnative] then {
-    return
-}
-
-set testfile "coremaker"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# Create a core file named "corefile" rather than just "core", to
-# avoid problems with sys admin types that like to regularly prune all
-# files named "core" from the system.
-#
-# Arbitrarily try setting the core size limit to "unlimited" since
-# this does not hurt on systems where the command does not work and
-# allows us to generate a core on systems where it does.
-#
-# Some systems append "core" to the name of the program; others append
-# the name of the program to "core"; still others (like Linux, as of
-# May 2003) create cores named "core.PID".  In the latter case, we
-# could have many core files lying around, and it may be difficult to
-# tell which one is ours, so let's run the program in a subdirectory.
-set found 0
-set coredir "${objdir}/${subdir}/coredir.[getpid]"
-file mkdir $coredir
-catch "system \"(cd ${coredir}; ulimit -c unlimited; ${binfile}; true) >/dev/null 2>&1\""
-#      remote_exec host "${binfile}"
-foreach i "${coredir}/core ${coredir}/core.coremaker.c ${binfile}.core" {
-    if [remote_file build exists $i] {
-	remote_exec build "mv $i ${objdir}/${subdir}/corefile"
-	set found 1
-    }
-}
-# Check for "core.PID".
-if { $found == 0 } {
-    set names [glob -nocomplain -directory $coredir core.*]
-    if {[llength $names] == 1} {
-        set corefile [file join $coredir [lindex $names 0]]
-        remote_exec build "mv $corefile ${objdir}/${subdir}/corefile"
-        set found 1
-    }
-}
-if { $found == 0 } {
-    # The braindamaged HPUX shell quits after the ulimit -c above
-    # without executing ${binfile}.  So we try again without the
-    # ulimit here if we didn't find a core file above.
-    # Oh, I should mention that any "braindamaged" non-Unix system has
-    # the same problem. I like the cd bit too, it's really neat'n stuff.
-    catch "system \"(cd ${objdir}/${subdir}; ${binfile}; true) >/dev/null 2>&1\""
-    foreach i "${objdir}/${subdir}/core ${objdir}/${subdir}/core.coremaker.c ${binfile}.core" {
-	if [remote_file build exists $i] {
-	    remote_exec build "mv $i ${objdir}/${subdir}/corefile"
-	    set found 1
-	}
-    }
-}
-
-# Try to clean up after ourselves. 
-remote_file build delete [file join $coredir coremmap.data]
-remote_exec build "rmdir $coredir"
-    
-if { $found == 0  } {
-    warning "can't generate a core file - core tests suppressed - check ulimit -c"
-    return 0
-}
-
-#
-# Test that we can simply startup with a "-core=corefile" command line arg
-# and recognize that the core file is a valid, usable core file.
-# To do this, we must shutdown the currently running gdb and restart
-# with the -core args.  We can't use gdb_start because it looks for
-# the first gdb prompt, and the message we are looking for occurs
-# before the first prompt.  Also, we can't include GDBFLAGS because
-# if it is empty, this confuses gdb with an empty argument that it
-# grumbles about (said grumbling currently being ignored in gdb_start).
-# **FIXME**
-#
-# Another problem is that on some systems (solaris for example), there
-# is apparently a limit on the length of a fully specified path to 
-# the coremaker executable, at about 80 chars.  For this case, consider
-# it a pass, but note that the program name is bad.
-
-gdb_exit
-if $verbose>1 then {
-    send_user "Spawning $GDB -nw $GDBFLAGS -core=$objdir/$subdir/corefile\n"
-}
-
-set oldtimeout $timeout
-set timeout [expr "$timeout + 60"]
-verbose "Timeout is now $timeout seconds" 2
-eval "spawn $GDB -nw $GDBFLAGS -core=$objdir/$subdir/corefile"
-expect {
-    -re "Couldn't find .* registers in core file.*$gdb_prompt $" {
-        fail "args: -core=corefile (couldn't find regs)"
-    }
-    -re "Core was generated by .*coremaker.*\r\n\#0  .*\(\).*\r\n$gdb_prompt $" {
-	pass "args: -core=corefile"
-    }
-    -re "Core was generated by .*\r\n\#0  .*\(\).*\r\n$gdb_prompt $" {
-	pass "args: -core=corefile (with bad program name)"
-    }
-    -re ".*registers from core file: File in wrong format.* $" {
-	fail "args: -core=corefile (could not read registers from core file)"
-    }
-    -re ".*$gdb_prompt $"	{ fail "args: -core=corefile" }
-    timeout 		{ fail "(timeout) starting with -core" }
-}
-
-
-#
-# Test that startup with both an executable file and -core argument.
-# See previous comments above, they are still applicable.
-#
-
-close;
-
-if $verbose>1 then {
-    send_user "Spawning $GDB -nw $GDBFLAGS $binfile -core=$objdir/$subdir/corefile\n"
-}
-
-
-eval "spawn $GDB -nw $GDBFLAGS $binfile -core=$objdir/$subdir/corefile";
-expect {
-    -re "Core was generated by .*coremaker.*\r\n\#0  .*\(\).*\r\n$gdb_prompt $" {
-	pass "args: execfile -core=corefile"
-    }
-    -re "Core was generated by .*\r\n\#0  .*\(\).*\r\n$gdb_prompt $"	 {
-	pass "args: execfile -core=corefile (with bad program name)"
-    }
-    -re ".*registers from core file: File in wrong format.* $" {
-	fail "args: execfile -core=corefile (could not read registers from core file)"
-    }
-    -re ".*$gdb_prompt $"	{ fail "args: execfile -core=corefile" }
-    timeout 		{ fail "(timeout) starting with -core" }
-}
-set timeout $oldtimeout
-verbose "Timeout is now $timeout seconds" 2
-
-close;
-
-# Now restart normally.
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Test basic corefile recognition via core-file command.
-
-send_gdb "core-file $objdir/$subdir/corefile\n"
-gdb_expect {
-    -re ".* program is being debugged already.*y or n. $" {
-	# gdb_load may connect us to a gdbserver.
-	send_gdb "y\n"
-	exp_continue;
-    }
-    -re "Core was generated by .*coremaker.*\r\n\#0  .*\(\).*\r\n$gdb_prompt $" {
-	pass "core-file command"
-    }
-    -re "Core was generated by .*\r\n\#0  .*\(\).*\r\n$gdb_prompt $" {
-	pass "core-file command (with bad program name)"
-    }
-    -re ".*registers from core file: File in wrong format.* $" {
-	fail "core-file command (could not read registers from core file)"
-    }
-    -re ".*$gdb_prompt $"	{ fail "core-file command" }
-    timeout 		{ fail "(timeout) core-file command" }
-}
-
-# Test correct mapping of corefile sections by printing some variables.
-
-gdb_test "print coremaker_data" "\\\$$decimal = 202"
-gdb_test "print coremaker_bss" "\\\$$decimal = 10"
-gdb_test "print coremaker_ro" "\\\$$decimal = 201"
-
-gdb_test "print func2::coremaker_local" "\\\$$decimal = \\{0, 1, 2, 3, 4\\}"
-
-# Somehow we better test the ability to read the registers out of the core
-# file correctly.  I don't think the other tests do this.
-
-gdb_test "bt" "abort.*func2.*func1.*main.*" "backtrace in corefile.exp"
-gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(.*\\).*" "up in corefile.exp"
-
-# Test ability to read mmap'd data
-
-gdb_test "x/8bd buf1" ".*:.*0.*1.*2.*3.*4.*5.*6.*7" "accessing original mmap data in core file"
-setup_xfail "*-*-sunos*" "*-*-ultrix*" "*-*-aix*"
-set test "accessing mmapped data in core file"
-gdb_test_multiple "x/8bd buf2" "$test" {
-    -re ".*:.*0.*1.*2.*3.*4.*5.*6.*7.*$gdb_prompt $" {
-	pass "$test"
-    }
-    -re "0x\[f\]*:.*Cannot access memory at address 0x\[f\]*.*$gdb_prompt $" {
-	fail "$test (mapping failed at runtime)"
-    }
-    -re "0x.*:.*Cannot access memory at address 0x.*$gdb_prompt $" {
-	fail "$test (mapping address not found in core file)"
-    }
-}
-
-# test reinit_frame_cache
-
-gdb_load ${binfile}
-gdb_test "up" "#\[0-9\]* *\[0-9xa-fH'\]* in .* \\(\\).*" "up in corefile.exp (reinit)"
-
-gdb_test "core" "No core file now."
diff --git a/gdb/testsuite/gdb.base/coremaker.c b/gdb/testsuite/gdb.base/coremaker.c
deleted file mode 100644
index a7fbd94141a..00000000000
--- a/gdb/testsuite/gdb.base/coremaker.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 1992, 1993, 1994, 1995, 1996, 1999
-   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.  */
-
-/* Simple little program that just generates a core dump from inside some
-   nested function calls. */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifndef __STDC__
-#define	const	/**/
-#endif
-
-#define MAPSIZE (8 * 1024)
-
-/* Don't make these automatic vars or we will have to walk back up the
-   stack to access them. */
-
-char *buf1;
-char *buf2;
-
-int coremaker_data = 1;	/* In Data section */
-int coremaker_bss;	/* In BSS section */
-
-const int coremaker_ro = 201;	/* In Read-Only Data section */
-
-/* Note that if the mapping fails for any reason, we set buf2
-   to -1 and the testsuite notices this and reports it as
-   a failure due to a mapping error.  This way we don't have
-   to test for specific errors when running the core maker. */
-
-void
-mmapdata ()
-{
-  int j, fd;
-
-  /* Allocate and initialize a buffer that will be used to write
-     the file that is later mapped in. */
-
-  buf1 = (char *) malloc (MAPSIZE);
-  for (j = 0; j < MAPSIZE; ++j)
-    {
-      buf1[j] = j;
-    }
-
-  /* Write the file to map in */
-
-  fd = open ("coremmap.data", O_CREAT | O_RDWR, 0666);
-  if (fd == -1)
-    {
-      perror ("coremmap.data open failed");
-      buf2 = (char *) -1;
-      return;
-    }
-  write (fd, buf1, MAPSIZE);
-
-  /* Now map the file into our address space as buf2 */
-
-  buf2 = (char *) mmap (0, MAPSIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-  if (buf2 == (char *) -1)
-    {
-      perror ("mmap failed");
-      return;
-    }
-
-  /* Verify that the original data and the mapped data are identical.
-     If not, we'd rather fail now than when trying to access the mapped
-     data from the core file. */
-
-  for (j = 0; j < MAPSIZE; ++j)
-    {
-      if (buf1[j] != buf2[j])
-	{
-	  fprintf (stderr, "mapped data is incorrect");
-	  buf2 = (char *) -1;
-	  return;
-	}
-    }
-}
-
-void
-func2 ()
-{
-  int coremaker_local[5];
-  int i;
-
-#ifdef SA_FULLDUMP
-  /* Force a corefile that includes the data section for AIX.  */
-  {
-    struct sigaction sa;
-
-    sigaction (SIGABRT, (struct sigaction *)0, &sa);
-    sa.sa_flags |= SA_FULLDUMP;
-    sigaction (SIGABRT, &sa, (struct sigaction *)0);
-  }
-#endif
-
-  /* Make sure that coremaker_local doesn't get optimized away. */
-  for (i = 0; i < 5; i++)
-    coremaker_local[i] = i;
-  coremaker_bss = 0;
-  for (i = 0; i < 5; i++)
-    coremaker_bss += coremaker_local[i];
-  coremaker_data = coremaker_ro + 1;
-  abort ();
-}
-
-void
-func1 ()
-{
-  func2 ();
-}
-
-int main ()
-{
-  mmapdata ();
-  func1 ();
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.base/coremaker2.c b/gdb/testsuite/gdb.base/coremaker2.c
deleted file mode 100644
index 470c6d491f1..00000000000
--- a/gdb/testsuite/gdb.base/coremaker2.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 1992, 1993, 1994, 1995, 1996, 1999
-   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.  */
-
-/* Simple little program that just generates a core dump from inside some
-   nested function calls.  Keep this as self contained as possible, I.E.
-   use no environment resources other than possibly abort(). */
-
-#ifndef __STDC__
-#define	const	/**/
-#endif
-
-#ifndef HAVE_ABORT
-#define HAVE_ABORT 1
-#endif
-
-#if HAVE_ABORT
-#define ABORT abort()
-#else
-#define ABORT {char *invalid = 0; *invalid = 0xFF;}
-#endif
-
-/* Don't make these automatic vars or we will have to walk back up the
-   stack to access them. */
-
-char *buf1;
-char *buf2;
-
-int coremaker_data = 1;	/* In Data section */
-int coremaker_bss;	/* In BSS section */
-
-const int coremaker_ro = 201;	/* In Read-Only Data section */
-
-void
-func2 (int x)
-{
-  int coremaker_local[5];
-  int i;
-  static int y;
-
-  /* Make sure that coremaker_local doesn't get optimized away. */
-  for (i = 0; i < 5; i++)
-    coremaker_local[i] = i;
-  coremaker_bss = 0;
-  for (i = 0; i < 5; i++)
-    coremaker_bss += coremaker_local[i];
-  coremaker_data = coremaker_ro + 1;
-  y = 10 * x;
-  ABORT;
-}
-
-void
-func1 (int x)
-{
-  func2 (x * 2);
-}
-
-int main ()
-{
-  func1 (10);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/cursal.c b/gdb/testsuite/gdb.base/cursal.c
deleted file mode 100644
index b9d28c6ef0f..00000000000
--- a/gdb/testsuite/gdb.base/cursal.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2004 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.  */
-
-
-void
-func2 ()
-{
-  int v2 = 2;
-}
-
-void
-func1 ()
-{
-  func2 ();
-}
-
-
-int
-main ()
-{
-  int v0 = 0;
-  func1 ();
-}
diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
deleted file mode 100644
index c3ddc554349..00000000000
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "cursal"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
-    untested "Couldn't compile $srcfile"
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set listsize 1" \
-    ".*"
-
-# initial sal should be first statement in main
-gdb_test "list" \
-    "v0 = 0;" \
-    "list before run"
-
-if {! [runto_main]} {
-    return -1
-}
-
-gdb_test "list" \
-    "v0 = 0;" \
-    "list in main"
-
-if {! [runto "func2"]} {
-    return -1
-}
-
-gdb_test "list" \
-    "v2 = 2;" \
-    "list in func2"
-
-# make sure backtrace doesn't change current source location.
-gdb_test "backtrace" \
-    ".*"
-gdb_test "list -1" \
-    "v2 = 2;" \
-    "list after backtrace"
-
-# check the window
-gdb_test "set listsize 3" \
-    ".*"
-if {! [runto_main]} {
-    return -1
-}
-gdb_test "list" \
-    "func1 \\(\\);" \
-    "list size 3"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/cvexpr.c b/gdb/testsuite/gdb.base/cvexpr.c
deleted file mode 100644
index afbcd3172c3..00000000000
--- a/gdb/testsuite/gdb.base/cvexpr.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/* Copyright (C) 2001, 2004 Free Software Foundation, 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  */
-
-
-/*
- * Initial set of typed variables borrowed from ptype.c
- */
-
-#if !defined (__STDC__) && !defined (_AIX)
-#define signed  /**/
-#endif
-
-char		v_char;
-signed char	v_signed_char;
-unsigned char	v_unsigned_char;
-
-short		v_short;
-signed short	v_signed_short;
-unsigned short	v_unsigned_short;
-
-int		v_int;
-signed int	v_signed_int;
-unsigned int	v_unsigned_int;
-
-long		v_long;
-signed long	v_signed_long;
-unsigned long	v_unsigned_long;
-
-long long	   v_long_long;
-signed long long   v_signed_long_long;
-unsigned long long v_unsigned_long_long;
-
-float		v_float;
-double		v_double;
-
-/*
- *	Now some derived types, which are arrays, functions-returning,
- *	pointers, structures, unions, and enumerations.
- */
-
-/**** arrays *******/
-
-char		v_char_array[2];
-signed char	v_signed_char_array[2];
-unsigned char	v_unsigned_char_array[2];
-
-short		v_short_array[2];
-signed short	v_signed_short_array[2];
-unsigned short	v_unsigned_short_array[2];
-
-int		v_int_array[2];
-signed int	v_signed_int_array[2];
-unsigned int	v_unsigned_int_array[2];
-
-long		v_long_array[2];
-signed long	v_signed_long_array[2];
-unsigned long	v_unsigned_long_array[2];
-
-float		v_float_array[2];
-double		v_double_array[2];
-
-/* PR 3742 */
-typedef char t_char_array[];
-
-/**** pointers *******/
-
-char		*v_char_pointer;
-signed char	*v_signed_char_pointer;
-unsigned char	*v_unsigned_char_pointer;
-
-short		*v_short_pointer;
-signed short	*v_signed_short_pointer;
-unsigned short	*v_unsigned_short_pointer;
-
-int		*v_int_pointer;
-signed int	*v_signed_int_pointer;
-unsigned int	*v_unsigned_int_pointer;
-
-long		*v_long_pointer;
-signed long	*v_signed_long_pointer;
-unsigned long	*v_unsigned_long_pointer;
-
-float		*v_float_pointer;
-double		*v_double_pointer;
-
-char		**v_char_pointer_pointer;
-signed char	**v_signed_char_pointer_pointer;
-unsigned char	**v_unsigned_char_pointer_pointer;
-
-short		**v_short_pointer_pointer;
-signed short	**v_signed_short_pointer_pointer;
-unsigned short	**v_unsigned_short_pointer_pointer;
-
-int		**v_int_pointer_pointer;
-signed int	**v_signed_int_pointer_pointer;
-unsigned int	**v_unsigned_int_pointer_pointer;
-
-long		**v_long_pointer_pointer;
-signed long	**v_signed_long_pointer_pointer;
-unsigned long	**v_unsigned_long_pointer_pointer;
-
-float		**v_float_pointer_pointer;
-double		**v_double_pointer_pointer;
-
-/**** pointers to arrays, arrays of pointers *******/
-
-char		*v_char_array_pointer[2];
-signed char	*v_signed_char_array_pointer[2];
-unsigned char	*v_unsigned_char_array_pointer[2];
-
-short		*v_short_array_pointer[2];
-signed short	*v_signed_short_array_pointer[2];
-unsigned short	*v_unsigned_short_array_pointer[2];
-
-int		*v_int_array_pointer[2];
-signed int	*v_signed_int_array_pointer[2];
-unsigned int	*v_unsigned_int_array_pointer[2];
-
-long		*v_long_array_pointer[2];
-signed long	*v_signed_long_array_pointer[2];
-unsigned long	*v_unsigned_long_array_pointer[2];
-
-float		*v_float_array_pointer[2];
-double		*v_double_array_pointer[2];
-
-char		(*v_char_pointer_array)[2];
-signed char	(*v_signed_char_pointer_array)[2];
-unsigned char	(*v_unsigned_char_pointer_array)[2];
-
-short		(*v_short_pointer_array)[2];
-signed short	(*v_signed_short_pointer_array)[2];
-unsigned short	(*v_unsigned_short_pointer_array)[2];
-
-int		(*v_int_pointer_array)[2];
-signed int	(*v_signed_int_pointer_array)[2];
-unsigned int	(*v_unsigned_int_pointer_array)[2];
-
-long		(*v_long_pointer_array)[2];
-signed long	(*v_signed_long_pointer_array)[2];
-unsigned long	(*v_unsigned_long_pointer_array)[2];
-
-float		(*v_float_pointer_array)[2];
-double		(*v_double_pointer_array)[2];
-
-
-/**** structs *******/
-
-struct t_struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct1;
-
-struct t_struct *v_t_struct_p;
-
-struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct2;
-
-/* typedef'd struct without a tag.  */
-typedef struct {
-  double v_double_member;
-  int v_int_member;
-} t_struct3;
-/* GCC seems to want a variable of this type, or else it won't put out
-   a symbol.  */
-t_struct3 v_struct3;
-
-/**** unions *******/
-
-union t_union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union;
-
-union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union2;
-
-/* typedef'd union without a tag.  */
-typedef union {
-  double v_double_member;
-  int v_int_member;
-} t_union3;
-/* GCC seems to want a variable of this type, or else it won't put out
-   a symbol.  */
-t_union3 v_union3;
-
-/**** Enumerations *******/
-
-enum 
-/* Work around the bug for compilers which don't put out the right stabs.  */
-#if __GNUC__ < 2 && !defined (_AIX)
-primary1_tag
-#endif
-{red1, green1, blue1} primary1;
-
-enum {red, green, blue} primary;
-enum colors {yellow, purple, pink} nonprimary;
-
-enum {chevy, ford} clunker;
-enum cars {bmw, porsche} sportscar;
-
-#undef FALSE
-#undef TRUE
-typedef enum {FALSE, TRUE} boolean;
-boolean v_boolean;
-/*note: aCC has bool type predefined with 'false' and 'true'*/
-typedef enum bvals {my_false, my_true} boolean2;
-boolean2 v_boolean2;
-
-enum misordered {two = 2, one = 1, zero = 0, three = 3};
-
-/* Seems like we need a variable of this type to get the type to be put
-   in the executable, at least for AIX xlc.  */
-enum misordered v_misordered = three;
-
-/**** Function pointers *******/
-
-char		(*v_char_func) (int, int*);
-signed char	(*v_signed_char_func) (int, int*);
-unsigned char	(*v_unsigned_char_func) (int, int*);
-
-short		(*v_short_func) (int, int*);
-signed short	(*v_signed_short_func) (int, int*);
-unsigned short	(*v_unsigned_short_func) (int, int*);
-
-int		(*v_int_func) (int, int*);
-signed int	(*v_signed_int_func) (int, int*);
-unsigned int	(*v_unsigned_int_func) (int, int*);
-
-long		(*v_long_func) (int, int*);
-signed long	(*v_signed_long_func) (int, int*);
-unsigned long	(*v_unsigned_long_func) (int, int*);
-
-long long		(*v_long_long_func) (int, int*);
-signed long long	(*v_signed_long_long_func) (int, int*);
-unsigned long long	(*v_unsigned_long_long_func) (int, int*);
-
-float		(*v_float_func) (int, int*);
-double		(*v_double_func) (int, int*);
-
-void use (void *p)
-{
-}
-
-int main ()
-{
-  use (&v_char);
-  use (&v_signed_char);
-  use (&v_unsigned_char);
-
-  use (&v_short);
-  use (&v_signed_short);
-  use (&v_unsigned_short);
-
-  use (&v_int);
-  use (&v_signed_int);
-  use (&v_unsigned_int);
-
-  use (&v_long);
-  use (&v_signed_long);
-  use (&v_unsigned_long);
-
-  use (&v_long_long);
-  use (&v_signed_long_long);
-  use (&v_unsigned_long_long);
-
-  use (&v_float);
-  use (&v_double);
-
-  use (v_char_array);
-  use (v_signed_char_array);
-  use (v_unsigned_char_array);
-
-  use (v_short_array);
-  use (v_signed_short_array);
-  use (v_unsigned_short_array);
-
-  use (v_int_array);
-  use (v_signed_int_array);
-  use (v_unsigned_int_array);
-
-  use (v_long_array);
-  use (v_signed_long_array);
-  use (v_unsigned_long_array);
-
-  use (v_float_array);
-  use (v_double_array);
-
-  use (v_char_pointer);
-  use (v_signed_char_pointer);
-  use (v_unsigned_char_pointer);
-
-  use (v_short_pointer);
-  use (v_signed_short_pointer);
-  use (v_unsigned_short_pointer);
-
-  use (v_int_pointer);
-  use (v_signed_int_pointer);
-  use (v_unsigned_int_pointer);
-
-  use (v_long_pointer);
-  use (v_signed_long_pointer);
-  use (v_unsigned_long_pointer);
-
-  use (v_float_pointer);
-  use (v_double_pointer);
-
-  use (v_char_pointer_pointer);
-  use (v_signed_char_pointer_pointer);
-  use (v_unsigned_char_pointer_pointer);
-
-  use (v_short_pointer_pointer);
-  use (v_signed_short_pointer_pointer);
-  use (v_unsigned_short_pointer_pointer);
-
-  use (v_int_pointer_pointer);
-  use (v_signed_int_pointer_pointer);
-  use (v_unsigned_int_pointer_pointer);
-
-  use (v_long_pointer_pointer);
-  use (v_signed_long_pointer_pointer);
-  use (v_unsigned_long_pointer_pointer);
-
-  use (v_float_pointer_pointer);
-  use (v_double_pointer_pointer);
-
-  use (v_char_array_pointer);
-  use (v_signed_char_array_pointer);
-  use (v_unsigned_char_array_pointer);
-
-  use (v_short_array_pointer);
-  use (v_signed_short_array_pointer);
-  use (v_unsigned_short_array_pointer);
-
-  use (v_int_array_pointer);
-  use (v_signed_int_array_pointer);
-  use (v_unsigned_int_array_pointer);
-
-  use (v_long_array_pointer);
-  use (v_signed_long_array_pointer);
-  use (v_unsigned_long_array_pointer);
-
-  use (v_float_array_pointer);
-  use (v_double_array_pointer);
-
-  use (v_char_pointer_array);
-  use (v_signed_char_pointer_array);
-  use (v_unsigned_char_pointer_array);
-
-  use (v_short_pointer_array);
-  use (v_signed_short_pointer_array);
-  use (v_unsigned_short_pointer_array);
-
-  use (v_int_pointer_array);
-  use (v_signed_int_pointer_array);
-  use (v_unsigned_int_pointer_array);
-
-  use (v_long_pointer_array);
-  use (v_signed_long_pointer_array);
-  use (v_unsigned_long_pointer_array);
-
-  use (v_float_pointer_array);
-  use (v_double_pointer_array);
-
-  use (&v_struct1);
-  use (&v_struct2);
-  use (&v_struct3);
-
-  use (&v_union);
-  use (&v_union2);
-  use (&v_union3);
-
-  use (&v_boolean);
-  use (&v_boolean2);
-  use (&v_misordered);
-
-  use (&v_char_func);
-  use (&v_signed_char_func);
-  use (&v_unsigned_char_func);
-
-  use (&v_short_func);
-  use (&v_signed_short_func);
-  use (&v_unsigned_short_func);
-
-  use (&v_int_func);
-  use (&v_signed_int_func);
-  use (&v_unsigned_int_func);
-
-  use (&v_long_func);
-  use (&v_signed_long_func);
-  use (&v_unsigned_long_func);
-
-  use (&v_long_long_func);
-  use (&v_signed_long_long_func);
-  use (&v_unsigned_long_long_func);
-
-  use (&v_float_func);
-  use (&v_double_func);
-}
diff --git a/gdb/testsuite/gdb.base/cvexpr.exp b/gdb/testsuite/gdb.base/cvexpr.exp
deleted file mode 100644
index 56afb9dd229..00000000000
--- a/gdb/testsuite/gdb.base/cvexpr.exp
+++ /dev/null
@@ -1,510 +0,0 @@
-#   Copyright (C) 2001 Free Software Foundation, 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
-
-# Written by Michael Snyder, Red Hat, Inc., 9/20/2001
-
-# This file is part of the gdb testsuite
-# Tests for type expressions using const and volatile keywords.
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "cvexpr"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-gdb_test "set print sevenbit-strings" "" ""
-gdb_test "set print address off" "" ""
-gdb_test "set width 0" "" ""
-
-set ws  "\[ \t\]*"
-
-#
-# Test casting a scalar to const
-#
-
-gdb_test "whatis (const char) v_char" \
-	"type = const char" \
-	"(const char)"
-gdb_test "whatis (const signed char) v_signed_char" \
-	"type = const signed char" \
-	"(const signed char)"
-gdb_test "whatis (const unsigned char) v_unsigned_char" \
-	"type = const (unsigned char|char)" \
-	"(const unsigned char)"
-gdb_test "whatis (const short) v_short" \
-	"type = const (short|short int)" \
-	"(const short)"
-gdb_test "whatis (const signed short) v_signed_short" \
-	"type = const (short|short int|signed short|signed short int)" \
-	"(const signed short)"
-gdb_test "whatis (const unsigned short) v_unsigned_short" \
-	"type = const (unsigned short|short unsigned int)" \
-	"(const unsigned short)"
-gdb_test "whatis (const int) v_int" \
-	"type = const int" \
-	"(const int)"
-gdb_test "whatis (const signed int) v_signed_int" \
-	"type = const (signed int|int)" \
-	"(const signed int)"
-gdb_test "whatis (const unsigned int) v_unsigned_int" \
-	"type = const unsigned int" \
-	"(const unsigned int)"
-gdb_test "whatis (const long) v_long" \
-	"type = const (long|long int)" \
-	"(const long)"
-gdb_test "whatis (const signed long) v_signed_long" \
-	"type = const (signed |)long( int|)" \
-	"(const signed long)"
-gdb_test "whatis (const unsigned long) v_unsigned_long" \
-	"type = const (unsigned long|long unsigned int)" \
-	"(const unsigned long)"
-gdb_test "whatis (const long long) v_long_long" \
-	"type = const long long( int|)" \
-	"(const long long)"
-gdb_test "whatis (const signed long long) v_signed_long_long" \
-	"type = const (signed |)long long( int|)" \
-	"(const signed long long)"
-gdb_test "whatis (const unsigned long long) v_unsigned_long_long" \
-	"type = const (unsigned long long|long long unsigned int)" \
-	"(const unsigned long long)"
-gdb_test "whatis (const float) v_float" \
-	"type = const float" \
-	"(const float)"
-gdb_test "whatis (const double) v_double" \
-	"type = const double" \
-	"(const double)"
-
-#
-# Test casting a scalar to volatile
-#
-
-gdb_test "whatis (volatile char) v_char" \
-	"type = volatile char" \
-	"(volatile char)"
-gdb_test "whatis (volatile signed char) v_signed_char" \
-	"type = volatile signed char" \
-	"(volatile signed char)"
-gdb_test "whatis (volatile unsigned char) v_unsigned_char" \
-	"type = volatile (unsigned char|char)" \
-	"(volatile unsigned char)"
-gdb_test "whatis (volatile short) v_short" \
-	"type = volatile (short|short int)" \
-	"(volatile short)"
-gdb_test "whatis (volatile signed short) v_signed_short" \
-	"type = volatile (short|short int|signed short|signed short int)" \
-	"(volatile signed short)"
-gdb_test "whatis (volatile unsigned short) v_unsigned_short" \
-	"type = volatile (unsigned short|short unsigned int)" \
-	"(volatile unsigned short)"
-gdb_test "whatis (volatile int) v_int" \
-	"type = volatile int" \
-	"(volatile int)"
-gdb_test "whatis (volatile signed int) v_signed_int" \
-	"type = volatile (signed int|int)" \
-	"(volatile signed int)"
-gdb_test "whatis (volatile unsigned int) v_unsigned_int" \
-	"type = volatile unsigned int" \
-	"(volatile unsigned int)"
-gdb_test "whatis (volatile long) v_long" \
-	"type = volatile (long|long int)" \
-	"(volatile long)"
-gdb_test "whatis (volatile signed long) v_signed_long" \
-	"type = volatile (signed |)long( int|)" \
-	"(volatile signed long)"
-gdb_test "whatis (volatile unsigned long) v_unsigned_long" \
-	"type = volatile (unsigned long|long unsigned int)" \
-	"(volatile unsigned long)"
-gdb_test "whatis (volatile long long) v_long_long" \
-	"type = volatile long long( int|)" \
-	"(volatile long long)"
-gdb_test "whatis (volatile signed long long) v_signed_long_long" \
-	"type = volatile (signed |)long long( int|)" \
-	"(volatile signed long long)"
-gdb_test "whatis (volatile unsigned long long) v_unsigned_long_long" \
-	"type = volatile (unsigned long long|long long unsigned int)" \
-	"(volatile unsigned long long)"
-gdb_test "whatis (volatile float) v_float" \
-	"type = volatile float" \
-	"(volatile float)"
-gdb_test "whatis (volatile double) v_double" \
-	"type = volatile double" \
-	"(volatile double)"
-
-#
-# Combine const and volatile
-#
-
-gdb_test "whatis (const volatile int) v_int" \
-	"type = const volatile int" \
-	"(const volatile int)"
-gdb_test "whatis (volatile const int) v_int" \
-	"type = const volatile int" \
-	"(volatile const int)"
-gdb_test "whatis (const int volatile) v_int" \
-	"type = const volatile int" \
-	"(const int volatile)"
-gdb_test "whatis (volatile int const) v_int" \
-	"type = const volatile int" \
-	"(volatile int const)"
-gdb_test "whatis (int const volatile) v_int" \
-	"type = const volatile int" \
-	"(int const volatile)"
-gdb_test "whatis (int volatile const) v_int" \
-	"type = const volatile int" \
-	"(int volatile const)"
-
-gdb_test "whatis (const volatile int *) v_int_pointer" \
-	"type = const volatile int${ws}\\*" \
-	"(const volatile int *)"
-gdb_test "whatis (volatile const int *) v_int_pointer" \
-	"type = const volatile int${ws}\\*" \
-	"(volatile const int *)"
-gdb_test "whatis (const int volatile *) v_int_pointer" \
-	"type = const volatile int${ws}\\*" \
-	"(const int volatile)"
-gdb_test "whatis (volatile int const *) v_int_pointer" \
-	"type = const volatile int${ws}\\*" \
-	"(volatile int const *)"
-gdb_test "whatis (int const volatile *) v_int_pointer" \
-	"type = const volatile int${ws}\\*" \
-	"(int const volatile *)"
-gdb_test "whatis (int volatile const *) v_int_pointer" \
-	"type = const volatile int${ws}\\*" \
-	"(int volatile const *)"
-gdb_test "whatis (int * const volatile) v_int_pointer" \
-	"type = int${ws}\\*${ws}const volatile" \
-	"(int * const volatile)"
-gdb_test "whatis (int * volatile const) v_int_pointer" \
-	"type = int${ws}\\*${ws}const volatile" \
-	"(int * volatile const)"
-
-
-#
-# Put 'signed' and 'unsigned' before const/volatile (FIXME)
-#
-
-#gdb_test "whatis (signed const char) v_signed_char" \
-#	"type = const char" \
-#	"(signed const char)"
-#gdb_test "whatis (unsigned const char) v_unsigned_char" \
-#	"type = const (unsigned char|char)" \
-#	"(unsigned const char)"
-#gdb_test "whatis (signed const short) v_signed_short" \
-#	"type = const (short|short int|signed short|signed short int)" \
-#	"(signed const short)"
-#gdb_test "whatis (unsigned const short) v_unsigned_short" \
-#	"type = const (unsigned short|short unsigned int)" \
-#	"(unsigned const short)"
-#gdb_test "whatis (signed const int) v_signed_int" \
-#	"type = const (signed int|int)" \
-#	"(signed const int)"
-#gdb_test "whatis (unsigned const int) v_unsigned_int" \
-#	"type = const unsigned int" \
-#	"(unsigned const int)"
-#gdb_test "whatis (signed const long) v_signed_long" \
-#	"type = const (signed |)long( int|)" \
-#	"(signed const long)"
-#gdb_test "whatis (unsigned const long) v_unsigned_long" \
-#	"type = const (unsigned long|long unsigned int)" \
-#	"(unsigned const long)"
-#gdb_test "whatis (signed const long long) v_signed_long_long" \
-#	"type = const (signed |)long long( int|)" \
-#	"(signed const long long)"
-#gdb_test "whatis (unsigned const long long) v_unsigned_long_long" \
-#	"type = const (unsigned long long|long long unsigned int)" \
-#	"(const unsigned long long)"
-
-#gdb_test "whatis (signed volatile char) v_signed_char" \
-#	"type = volatile char" \
-#	"(signed volatile char)"
-#gdb_test "whatis (unsigned volatile char) v_unsigned_char" \
-#	"type = volatile (unsigned char|char)" \
-#	"(unsigned volatile char)"
-#gdb_test "whatis (signed volatile short) v_signed_short" \
-#	"type = volatile (short|short int|signed short|signed short int)" \
-#	"(signed volatile short)"
-#gdb_test "whatis (unsigned volatile short) v_unsigned_short" \
-#	"type = volatile (unsigned short|short unsigned int)" \
-#	"(unsigned volatile short)"
-#gdb_test "whatis (signed volatile int) v_signed_int" \
-#	"type = volatile (signed int|int)" \
-#	"(signed volatile int)"
-#gdb_test "whatis (unsigned volatile int) v_unsigned_int" \
-#	"type = volatile unsigned int" \
-#	"(unsigned volatile int)"
-#gdb_test "whatis (signed volatile long) v_signed_long" \
-#	"type = volatile (signed |)long( int|)" \
-#	"(signed volatile long)"
-#gdb_test "whatis (unsigned volatile long) v_unsigned_long" \
-#	"type = volatile (unsigned long|long unsigned int)" \
-#	"(unsigned volatile long)"
-#gdb_test "whatis (signed volatile long long) v_signed_long_long" \
-#	"type = volatile (signed |)long long( int|)" \
-#	"(signed volatile long long)"
-#gdb_test "whatis (unsigned volatile long long) v_unsigned_long_long" \
-#	"type = volatile (unsigned long long|long long unsigned int)" \
-#	"(unsigned volatile long long)"
-
-#
-# Now put the 'const' and 'volatile' keywords after the base type.
-#
-
-gdb_test "whatis (char const) v_char" \
-	"type = const char" \
-	"(char const)"
-gdb_test "whatis (signed char const) v_signed_char" \
-	"type = const signed char" \
-	"(signed char const)"
-gdb_test "whatis (unsigned char const) v_unsigned_char" \
-	"type = const (unsigned char|char)" \
-	"(unsigned char const)"
-gdb_test "whatis (short const) v_short" \
-	"type = const (short|short int)" \
-	"(short const)"
-gdb_test "whatis (signed short const) v_signed_short" \
-	"type = const (short|short int|signed short|signed short int)" \
-	"(signed short const)"
-gdb_test "whatis (unsigned short const) v_unsigned_short" \
-	"type = const (unsigned short|short unsigned int)" \
-	"(unsigned short const)"
-gdb_test "whatis (int const) v_int" \
-	"type = const int" \
-	"(int const)"
-gdb_test "whatis (signed int const) v_signed_int" \
-	"type = const (signed int|int)" \
-	"(signed int const)"
-gdb_test "whatis (unsigned int const) v_unsigned_int" \
-	"type = const unsigned int" \
-	"(unsigned int const)"
-gdb_test "whatis (long const) v_long" \
-	"type = const (long|long int)" \
-	"(long const)"
-gdb_test "whatis (signed long const) v_signed_long" \
-	"type = const (signed |)long( int|)" \
-	"(signed long const)"
-gdb_test "whatis (unsigned long const) v_unsigned_long" \
-	"type = const (unsigned long|long unsigned int)" \
-	"(unsigned long const)"
-gdb_test "whatis (long long const) v_long_long" \
-	"type = const long long( int|)" \
-	"(long long const)"
-gdb_test "whatis (signed long long const) v_signed_long_long" \
-	"type = const (signed |)long long( int|)" \
-	"(signed long long const)"
-gdb_test "whatis (unsigned long long const) v_unsigned_long_long" \
-	"type = const (unsigned long long|long long unsigned int)" \
-	"(unsigned long long const)"
-gdb_test "whatis (float const) v_float" \
-	"type = const float" \
-	"(float const)"
-gdb_test "whatis (double const) v_double" \
-	"type = const double" \
-	"(double const)"
-
-gdb_test "whatis (char volatile) v_char" \
-	"type = volatile char" \
-	"(char volatile)"
-gdb_test "whatis (signed char volatile) v_signed_char" \
-	"type = volatile signed char" \
-	"(signed char volatile)"
-gdb_test "whatis (unsigned char volatile) v_unsigned_char" \
-	"type = volatile (unsigned char|char)" \
-	"(unsigned char volatile)"
-gdb_test "whatis (short volatile) v_short" \
-	"type = volatile (short|short int)" \
-	"(short volatile)"
-gdb_test "whatis (signed short volatile) v_signed_short" \
-	"type = volatile (short|short int|signed short|signed short int)" \
-	"(signed short volatile)"
-gdb_test "whatis (unsigned short volatile) v_unsigned_short" \
-	"type = volatile (unsigned short|short unsigned int)" \
-	"(unsigned short volatile)"
-gdb_test "whatis (int volatile) v_int" \
-	"type = volatile int" \
-	"(int volatile)"
-gdb_test "whatis (signed int volatile) v_signed_int" \
-	"type = volatile (signed int|int)" \
-	"(signed int volatile)"
-gdb_test "whatis (unsigned int volatile) v_unsigned_int" \
-	"type = volatile unsigned int" \
-	"(unsigned int volatile)"
-gdb_test "whatis (long volatile) v_long" \
-	"type = volatile (long|long int)" \
-	"(long volatile)"
-gdb_test "whatis (signed long volatile) v_signed_long" \
-	"type = volatile (signed |)long( int|)" \
-	"(signed long volatile)"
-gdb_test "whatis (unsigned long volatile) v_unsigned_long" \
-	"type = volatile (unsigned long|long unsigned int)" \
-	"(unsigned long volatile)"
-gdb_test "whatis (long long volatile) v_long_long" \
-	"type = volatile long long( int|)" \
-	"(long long volatile)"
-gdb_test "whatis (signed long long volatile) v_signed_long_long" \
-	"type = volatile (signed |)long long( int|)" \
-	"(signed long long volatile)"
-gdb_test "whatis (unsigned long long volatile) v_unsigned_long_long" \
-	"type = volatile (unsigned long long|long long unsigned int)" \
-	"(unsigned long long volatile)"
-gdb_test "whatis (float volatile) v_float" \
-	"type = volatile float" \
-	"(float volatile)"
-gdb_test "whatis (double volatile) v_double" \
-	"type = volatile double" \
-	"(double volatile)"
-
-#
-# enums
-#
-
-gdb_test "whatis (const enum misordered) v_misordered" \
-	"type = const enum misordered" \
-	"(const enum misordered)"
-gdb_test "whatis (enum misordered const) v_misordered" \
-	"type = const enum misordered" \
-	"(enum misordered const)"
-gdb_test "whatis (volatile enum misordered) v_misordered" \
-	"type = volatile enum misordered" \
-	"(volatile enum misordered)"
-gdb_test "whatis (enum misordered volatile) v_misordered" \
-	"type = volatile enum misordered" \
-	"(enum misordered volatile)"
-
-# 
-# Pointers
-#
-
-gdb_test "whatis (const int *) v_int_pointer" \
-	"type = const int${ws}\\*" \
-	"(const int *)"
-gdb_test "whatis (int const *) v_int_pointer" \
-	"type = const int${ws}\\*" \
-	"(int const *)"
-gdb_test "whatis (int * const) v_int_pointer" \
-	"type = int \\*${ws}const" \
-	"(int * const)"
-gdb_test "whatis (const int * const) v_int_pointer" \
-	"type = const int${ws}\\*${ws}const" \
-	"(const int * const)"
-gdb_test "whatis (int const * const) v_int_pointer" \
-	"type = const int${ws}\\*${ws}const" \
-	"(int const * const)"
-
-gdb_test "whatis (const int **) v_int_pointer_pointer" \
-	"type = const int${ws}\\*${ws}\\*" \
-	"(const int **)"
-gdb_test "whatis (int const **) v_int_pointer_pointer" \
-	"type = const int${ws}\\*${ws}\\*" \
-	"(int const **)"
-gdb_test "whatis (int ** const) v_int_pointer_pointer" \
-	"type = int \\*${ws}\\*${ws}const" \
-	"(int ** const)"
-gdb_test "whatis (const int * const *) v_int_pointer_pointer" \
-	"type = const int${ws}\\*${ws}const${ws}\\*" \
-	"(const int * const *)"
-gdb_test "whatis (int const * const *) v_int_pointer_pointer" \
-	"type = const int${ws}\\*${ws}const${ws}\\*" \
-	"(int const * const *)"
-gdb_test "whatis (const int * const * const) v_int_pointer_pointer" \
-	"type = const int${ws}\\*${ws}const${ws}\\*${ws}const" \
-	"(const int * const * const)"
-gdb_test "whatis (int const * const * const) v_int_pointer_pointer" \
-	"type = const int${ws}\\*${ws}const${ws}\\*${ws}const" \
-	"(int const * const * const)"
-
-#
-# Arrays TODO
-#
-
-#
-# Pointers to arrays, arrays of pointers TODO
-#
-
-#
-# Structs and Unions
-#
-
-gdb_test "whatis (const struct t_struct) v_struct1" \
-	"type = const struct t_struct" \
-	"(const struct t_struct)"
-gdb_test "whatis (const union t_union) v_union" \
-	"type = const union t_union" \
-	"(const union t_union)"
-gdb_test "whatis (struct t_struct const) v_struct1" \
-	"type = const struct t_struct" \
-	"(struct t_struct const)"
-gdb_test "whatis (union t_union const) v_union" \
-	"type = const union t_union" \
-	"(union t_union const)"
-gdb_test "whatis (const struct t_struct *) &v_struct1" \
-	"type = const struct t_struct${ws}\\*" \
-	"(const struct t_struct *)"
-gdb_test "whatis (const union t_union *) &v_union" \
-	"type = const union t_union${ws}\\*" \
-	"(const union t_union *)"
-gdb_test "whatis (struct t_struct const *) &v_struct1" \
-	"type = const struct t_struct${ws}\\*" \
-	"(struct t_struct const *)"
-gdb_test "whatis (union t_union const *) &v_union" \
-	"type = const union t_union${ws}\\*" \
-	"(union t_union const *)"
-gdb_test "whatis (struct t_struct * const) &v_struct1" \
-	"type = struct t_struct${ws}\\*${ws}const" \
-	"(struct t_struct * const)"
-gdb_test "whatis (union t_union * const) &v_union" \
-	"type = union t_union${ws}\\*${ws}const" \
-	"(union t_union * const)"
-gdb_test "whatis (const struct t_struct * const) &v_struct1" \
-	"type = const struct t_struct${ws}\\*${ws}const" \
-	"(const struct t_struct * const)"
-gdb_test "whatis (const union t_union * const) &v_union" \
-	"type = const union t_union${ws}\\*${ws}const" \
-	"(const union t_union * const)"
-gdb_test "whatis (struct t_struct const * const) &v_struct1" \
-	"type = const struct t_struct${ws}\\*${ws}const" \
-	"(struct t_struct const * const)"
-gdb_test "whatis (union t_union const * const) &v_union" \
-	"type = const union t_union${ws}\\*${ws}const" \
-	"(union t_union const * const)"
-
-#
-# Function pointers TODO
-#
-
diff --git a/gdb/testsuite/gdb.base/d10v.ld b/gdb/testsuite/gdb.base/d10v.ld
deleted file mode 100644
index 41f085b1ed7..00000000000
--- a/gdb/testsuite/gdb.base/d10v.ld
+++ /dev/null
@@ -1,193 +0,0 @@
-OUTPUT_FORMAT("elf32-d10v", "elf32-d10v",
-	      "elf32-d10v")
-OUTPUT_ARCH(d10v)
-ENTRY(_start)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-
-MEMORY
-{
-  UNIFIED : org = 0,         len = 0x1000000
-  INSN    : org = 0x1014000, len = 0x40000
-  DATA    : org = 0x2000004, len = 0x7FFC
-  STACK   : org = 0x200BFFE, len = 4
-}
-
-SECTIONS
-{
-  /* Overlay sections: */
-  .ovly0  0x1001000 : AT (0x8000) { foo.o(.text)  }
-  .ovly1  0x1001000 : AT (0x9000) { bar.o(.text)  }
-  .ovly2  0x1002000 : AT (0xa000) { baz.o(.text)  }
-  .ovly3  0x1002000 : AT (0xb000) { grbx.o(.text) }
-  .data00 0x2001000 : AT (0xc000) { foo.o(.data)  }
-  .data01 0x2001000 : AT (0xd000) { bar.o(.data)  }
-  .data02 0x2002000 : AT (0xe000) { baz.o(.data)  }
-  .data03 0x2002000 : AT (0xf000) { grbx.o(.data) }
-
-  .text :
-  {
-    KEEP (*(.init))
-    KEEP (*(.init.*))
-    KEEP (*(.fini))
-    KEEP (*(.fini.*))
-    *(.text)
-    *(.text.*)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-    _etext = .;
-    PROVIDE (etext = .);
-  } >INSN =0
-  .rodata    : {
-    *(.rodata) 
-    *(.gnu.linkonce.r*)
-    *(.rodata.*) 
-  } >DATA
-  .rodata1   : { 
-    *(.rodata1)
-    *(.rodata1.*)
-  } >DATA
-
-  .data    :
-  {
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d*)
-    _ovly_table = .; 
-	LONG(ABSOLUTE(ADDR(.ovly0)));
-	LONG(SIZEOF(.ovly0));
-	LONG(LOADADDR(.ovly0));
-	LONG(0);
-	LONG(ABSOLUTE(ADDR(.ovly1)));
-	LONG(SIZEOF(.ovly1));
-	LONG(LOADADDR(.ovly1));
-	LONG(0);
-	LONG(ABSOLUTE(ADDR(.ovly2)));
-	LONG(SIZEOF(.ovly2));
-	LONG(LOADADDR(.ovly2));
-	LONG(0);
-	LONG(ABSOLUTE(ADDR(.ovly3)));
-	LONG(SIZEOF(.ovly3));
-	LONG(LOADADDR(.ovly3));
-	LONG(0);
-	LONG(ABSOLUTE(ADDR(.data00)));
-	LONG(SIZEOF(.data00));
-	LONG(LOADADDR(.data00));
-	LONG(0);
-	LONG(ABSOLUTE(ADDR(.data01)));
-	LONG(SIZEOF(.data01));
-	LONG(LOADADDR(.data01));
-	LONG(0);
-	LONG(ABSOLUTE(ADDR(.data02)));
-	LONG(SIZEOF(.data02));
-	LONG(LOADADDR(.data02));
-	LONG(0);
-	LONG(ABSOLUTE(ADDR(.data03)));
-	LONG(SIZEOF(.data03));
-	LONG(LOADADDR(.data03));
-	LONG(0);
-    _novlys = .;
-	LONG((_novlys - _ovly_table) / 16);
-    CONSTRUCTORS
-  } >DATA
-  .data1   : {
-    *(.data1)
-    *(.data1.*)
-  } >DATA
-  .ctors         :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-
-    KEEP (*crtbegin.o(.ctors))
-
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >DATA
-  .dtors         :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >DATA
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : {
-    *(.sdata)
-    *(.sdata.*)
-  } >DATA
-  _edata  =  .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .sbss      : { *(.sbss) *(.scommon) } >DATA
-  .bss       :
-  {
-   *(.dynbss)
-   *(.dynbss.*)
-   *(.bss)
-   *(.bss.*)
-   *(COMMON)
-  } >DATA
-
-  _end = . ;
-  PROVIDE (end = .);
-
-  .stack : { _stack = .; *(.stack) } >STACK
-
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-
-  .comment 0 : { *(.comment) }
-
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-}
diff --git a/gdb/testsuite/gdb.base/d10vovly.c b/gdb/testsuite/gdb.base/d10vovly.c
deleted file mode 100644
index bdb90feae6b..00000000000
--- a/gdb/testsuite/gdb.base/d10vovly.c
+++ /dev/null
@@ -1,225 +0,0 @@
-
-/*
- * Ovlymgr.c -- Runtime Overlay Manager for the GDB testsuite.
- */
-
-#include "ovlymgr.h"
-
-/* Local functions and data: */
-
-extern unsigned long _ovly_table[][4];
-extern unsigned long _novlys __attribute__ ((section (".data")));
-enum ovly_index { VMA, SIZE, LMA, MAPPED};
-
-static void ovly_copy (unsigned long dst, unsigned long src, long size);
-
-/* Flush the data and instruction caches at address START for SIZE bytes.
-   Support for each new port must be added here.  */
-/* FIXME: Might be better to have a standard libgloss function that
-   ports provide that we can then use.  Use libgloss instead of newlib
-   since libgloss is the one intended to handle low level system issues.
-   I would suggest something like _flush_cache to avoid the user's namespace
-   but not be completely obscure as other things may need this facility.  */
- 
-static void
-FlushCache (void)
-{
-#ifdef __M32R__
-  volatile char *mspr = (char *) 0xfffffff7;
-  *mspr = 1;
-#endif
-}
-
-/* OverlayLoad:
- * Copy the overlay into its runtime region,
- * and mark the overlay as "mapped".
- */
-
-bool
-OverlayLoad (unsigned long ovlyno)
-{
-  unsigned long i;
-
-  if (ovlyno < 0 || ovlyno >= _novlys)
-    exit (-1);	/* fail, bad ovly number */
-
-  if (_ovly_table[ovlyno][MAPPED])
-    return TRUE;	/* this overlay already mapped -- nothing to do! */
-
-  for (i = 0; i < _novlys; i++)
-    if (i == ovlyno)
-      _ovly_table[i][MAPPED] = 1;	/* this one now mapped */
-    else if (_ovly_table[i][VMA] == _ovly_table[ovlyno][VMA])
-      _ovly_table[i][MAPPED] = 0;	/* this one now un-mapped */
-
-  ovly_copy (_ovly_table[ovlyno][VMA], 
-	     _ovly_table[ovlyno][LMA], 
-	     _ovly_table[ovlyno][SIZE]);
-
-  FlushCache ();
-
-  return TRUE;
-}
-
-/* OverlayUnload:
- * Copy the overlay back into its "load" region.
- * Does NOT mark overlay as "unmapped", therefore may be called
- * more than once for the same mapped overlay.
- */
- 
-bool
-OverlayUnload (unsigned long ovlyno)
-{
-  if (ovlyno < 0 || ovlyno >= _novlys)
-    exit (-1);  /* fail, bad ovly number */
- 
-  if (!_ovly_table[ovlyno][MAPPED])
-    exit (-1);  /* error, can't copy out a segment that's not "in" */
- 
-  ovly_copy (_ovly_table[ovlyno][LMA], 
-	     _ovly_table[ovlyno][VMA],
-	     _ovly_table[ovlyno][SIZE]);
-
-  return TRUE;
-}
-
-#ifdef __D10V__
-#define IMAP0       (*(short *)(0xff00))
-#define IMAP1       (*(short *)(0xff02))
-#define DMAP        (*(short *)(0xff04))
-
-static void
-D10VTranslate (unsigned long logical,
-	       short *dmap,
-	       unsigned long **addr)
-{
-  unsigned long physical;
-  unsigned long seg;
-  unsigned long off;
-
-  /* to access data, we use the following mapping 
-     0x00xxxxxx: Logical data address segment        (DMAP translated memory)
-     0x01xxxxxx: Logical instruction address segment (IMAP translated memory)
-     0x10xxxxxx: Physical data memory segment        (On-chip data memory)
-     0x11xxxxxx: Physical instruction memory segment (On-chip insn memory)
-     0x12xxxxxx: Phisical unified memory segment     (Unified memory)
-     */
-
-  /* Addresses must be correctly aligned */
-  if (logical & (sizeof (**addr) - 1))
-    exit (-1);
-
-  /* If the address is in one of the two logical address spaces, it is
-     first translated into a physical address */
-  seg = (logical >> 24);
-  off = (logical & 0xffffffL);
-  switch (seg) 
-      {
-      case 0x00: /* in logical data address segment */
-	if (off <= 0x7fffL)
-	  physical = (0x10L << 24) + off;
-	else
-	  /* Logical address out side of on-chip segment, not
-             supported */
-	  exit (-1);
-	break;
-      case 0x01: /* in logical instruction address segment */
-	{
-	  short map;
-	  if (off <= 0x1ffffL)
-	    map = IMAP0;
-	  else if (off <= 0x3ffffL)
-	    map = IMAP1;
-	  else
-	    /* Logical address outside of IMAP[01] segment, not
-	       supported */
-	    exit (-1);
-	  if (map & 0x1000L)
-	    {
-	    /* Instruction memory */
-	      physical = (0x11L << 24) | off;
-	    }
-	  else
-	    {
-	    /* Unified memory */
-	      physical = ((map & 0x7fL) << 17) + (off & 0x1ffffL);
-	      if (physical > 0xffffffL)
-		/* Address outside of unified address segment */
-		exit (-1);
-	      physical |= (0x12L << 24);
-	    }
-	  break;
-	}
-      case 0x10:
-      case 0x11:
-      case 0x12:
-	physical = logical;
-	break;
-      default:
-	exit (-1);	/* error */
-      }
-
-  seg = (physical >> 24);
-  off = (physical & 0xffffffL);
-  switch (seg) 
-    {
-    case 0x10:	/* dst is a 15 bit offset into the on-chip memory */
-      *dmap = 0;
-      *addr = (long *) (0x0000 + ((short)off & 0x7fff));
-      break;
-    case 0x11:	/* dst is an 18-bit offset into the on-chip
-		   instruction memory */
-      *dmap = 0x1000L | ((off & 0x3ffffL) >> 14);
-      *addr = (long *) (0x8000 + ((short)off & 0x3fff));
-      break;
-    case 0x12:	/* dst is a 24-bit offset into unified memory */
-      *dmap = off >> 14;
-      *addr = (long *) (0x8000 + ((short)off & 0x3fff));
-      break;
-    default:
-      exit (-1);	/* error */
-    }
-}
-#endif /* __D10V__ */
-
-static void
-ovly_copy (unsigned long dst, unsigned long src, long size)
-{
-#ifdef  __M32R__
-  memcpy ((void *) dst, (void *) src, size);
-  return;
-#endif /* M32R */
-
-#ifdef  __D10V__
-  unsigned long *s, *d, tmp;
-  short dmap_src, dmap_dst;
-  short dmap_save;
-
-  /* all section sizes should by multiples of 4 bytes */
-  dmap_save = DMAP;
-
-  D10VTranslate (src, &dmap_src, &s);
-  D10VTranslate (dst, &dmap_dst, &d);
-
-  while (size > 0)
-    {
-      /* NB: Transfer 4 byte (long) quantites, problems occure
-	 when only two bytes are transfered */
-      DMAP = dmap_src;
-      tmp = *s;
-      DMAP = dmap_dst;
-      *d = tmp; 
-      d++;
-      s++;
-      size -= sizeof (tmp);
-      src += sizeof (tmp);
-      dst += sizeof (tmp);
-      if ((src & 0x3fff) == 0)
-	D10VTranslate (src, &dmap_src, &s);
-      if ((dst & 0x3fff) == 0)
-	D10VTranslate (dst, &dmap_dst, &d);
-    }
-  DMAP = dmap_save;
-#endif /* D10V */
-}
-
diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp
deleted file mode 100644
index 161333c8ea3..00000000000
--- a/gdb/testsuite/gdb.base/dbx.exp
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1998, 1999, 2001 Free Software Foundation, 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
-
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set testfile1 "average"
-set testfile2 "sum"
-set testfile "dbx-test"
-set binfile1 ${objdir}/${subdir}/${testfile1}
-set binfile2 ${objdir}/${subdir}/${testfile2}
-set binfile ${objdir}/${subdir}/${testfile}
-
-
-
-if  { [gdb_compile "${srcdir}/${subdir}/average.c" "${binfile1}.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/sum.c" "${binfile2}.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-#
-# start gdb -- start gdb running, default procedure
-#
-proc dbx_gdb_start { } {
-    global verbose
-    global GDB
-    global GDBFLAGS
-    global prompt
-    global spawn_id
-    global timeout
-    verbose "Spawning $GDB -nw $GDBFLAGS"
-
-    if { [which $GDB] == 0 } then {
-        perror "$GDB does not exist."
-        exit 1
-    }
-
-    set oldtimeout $timeout
-    set timeout [expr "$timeout + 60"]
-    eval "spawn $GDB -nw -dbx $GDBFLAGS"
-    gdb_expect {
-        -re ".*\r\n$gdb_prompt $" {
-            verbose "GDB initialized."
-        }
-        -re "$prompt $" {
-            perror "GDB never initialized."
-            return -1
-        }
-        timeout         {
-            perror "(timeout) GDB never initialized."
-            return -1
-        }
-    }
-    set timeout $oldtimeout
-    # force the height to "unlimited", so no pagers get used
-    send_gdb "set height 0\n"
-    gdb_expect {
-        -re ".*$prompt $" {
-            verbose "Setting height to 0." 2
-        }
-        timeout {
-            warning "Couldn't set the height to 0."
-        }
-    }
-    # force the width to "unlimited", so no wraparound occurs
-    send_gdb "set width 0\n"
-    gdb_expect {
-        -re ".*$prompt $" {
-            verbose "Setting width to 0." 2
-        }
-        timeout {
-            warning "Couldn't set the width to 0."
-        }
-    }
-}
-
-
-proc dbx_reinitialize_dir { subdir } {
-    global gdb_prompt
-
-   send_gdb "use\n"
-    gdb_expect {
-        -re "Reinitialize source path to empty.*y or n. " {
-            send_gdb "y\n"
-            gdb_expect {
-                -re "Source directories searched.*$gdb_prompt $" {
-                    send_gdb "use $subdir\n"
-                    gdb_expect {
-                        -re "Source directories searched.*$gdb_prompt $" {
-                            verbose "Dir set to $subdir"
-                        }
-                        -re ".*$gdb_prompt $" {
-                            perror "Dir \"$subdir\" failed."
-                        }
-                    }
-                }
-                -re ".*$gdb_prompt $" {
-                    perror "Dir \"$subdir\" failed."
-                }
-            }
-        }
-        -re ".*$gdb_prompt $" {
-            perror "Dir \"$subdir\" failed."
-        }
-    }
-}
-
-# In "testsuite/config/unix-gdb.exp", the routine "gdb_load"
-# is defined as "gdb_file_cmd".  The binding of "gdb_file_cmd"
-# is done at invocation time.  Before this file is processed,
-# it binds to the definition in "testsuite/lib/gdb.exp"; after
-# this file is processed, it binds to this definition.
-# TCL lets us overrides a previous routine definition without a
-# warning (isn't that special?).
-#
-# This means that tests before use "file" to load a target, and
-# tests afterwards use the pair "symbol-file" "exec-file".
-#
-# I'm leaving it as it is for now because at the moment it
-# is the only test we have of the use of the combination of
-# "symbol-file" and "exec-file" to load a debugging target (the
-# other definition uses "file". 
-#
-# Symbol-file and exec-file should be tested explicitly, not
-# as a side effect of running a particular test (in this case,
-# "testsuite/gdb.compat/dbx.exp").
-#
-# CM: Renamed the procedure so it does not override the orginal file name.
-#     Having the test suite change behavior depending on the tests run makes
-#     it extremely difficult to reproduce errors. I've also added a
-#     "dbx_gdb_load" procedure.  This and only this test will call these
-#     procedures now. I also added an "expect" to the "send exec-file" line.
-#     The "expect" waits for a prompt to appear. Otherwise, if the tests run
-#     too quickly, the caller could send another command before the prompt
-#     of this command returns, causing the test to get out of sync and fail
-#     seemingly randomly or only on a loaded system.
-#
-# Problem is, though, that the testsuite config files can override the definition of
-# gdb_load (without notice, as was mentioned above). Unfortunately, the gdb_load proc
-# that was copied into this test was a copy of the unix native version.
-#
-# The real problem that we're attempting to solve is how to load an exec and symbol
-# file into gdb for a dbx session. So why not just override gdb_file_cmd with the
-# right sequence of events, allowing gdb_load to do its normal thing? This way
-# remotes and simulators will work, too.
-#
-# [drow 2002-03-30]: We can restore the old gdb_file_cmd afterwards, though.
-set old_gdb_file_cmd_args [info args gdb_file_cmd]
-set old_gdb_file_cmd_body [info body gdb_file_cmd]
-
-proc gdb_file_cmd {arg} {
-    global verbose
-    global loadpath
-    global loadfile
-    global GDB
-    global gdb_prompt
-    global spawn_id
-    upvar timeout timeout
-
-    if [is_remote host] {
-        set arg [remote_download host $arg];
-        if { $arg == "" } {
-            error "download failed"
-            return -1;
-        }
-    }
-
-    send_gdb "symbol-file $arg\n"
-    gdb_expect {
-	-re "Detected 64-bit symbol file.\r\nInvoking.*gdb64.*$gdb_prompt $" {
-            verbose "\t\tLoaded $arg into the $GDB"
-            send_gdb "exec-file $arg\n" 
-            gdb_expect {
-                -re ".*$gdb_prompt $" {
-                    verbose "\t\tLoaded $arg with new symbol table into $GDB"
-                    return 0
-                }
-                timeout {
-                    perror "(timeout) Couldn't load $arg"
-                    return -1
-                }
-            }
-            return 0
-        }
-        -re "Reading symbols from.*done.*$gdb_prompt $" {
-            verbose "\t\tLoaded $arg into the $GDB"
-            send_gdb "exec-file $arg\n" 
-            gdb_expect {
-	        -re "A program is being debugged already.*Kill it.*y or n. $" {
-	            send_gdb "y\n"
-	                verbose "\t\tKilling previous program being debugged"
-	            exp_continue
-	        }
-                -re ".*$gdb_prompt $" {
-                    verbose "\t\tLoaded $arg with new symbol table into $GDB"
-                    return 0
-                }
-                timeout {
-                    perror "(timeout) Couldn't load $arg"
-                    return -1
-                }
-            }
-            return 0
-        }
-        -re "has no symbol-table.*$gdb_prompt $" {
-            perror "$arg wasn't compiled with \"-g\""
-            return -1
-        }
-        -re "Load new symbol table from \".*\".*y or n. $" {
-            send_gdb "y\n"
-	    exp_continue
-        }
-        -re ".*No such file or directory.*$gdb_prompt $" {
-            perror "($arg) No such file or directory\n"
-            return -1
-        }
-        -re "$gdb_prompt $" {
-            perror "couldn't load $arg into $GDB."
-            return -1
-            }
-        timeout {
-            perror "couldn't load $arg into $GDB (timed out)."
-            return -1
-        }
-        eof {
-            # This is an attempt to detect a core dump, but seems not to
-            # work.  Perhaps we need to match .* followed by eof, in which
-            # expect does not seem to have a way to do that.
-            perror "couldn't load $arg into $GDB (end of file)."
-            return -1
-        }
-    }
-}
-
-#
-#test_breakpoints
-#
-proc test_breakpoints { } {
-    gdb_test "stop in main" "Breakpoint.*at.*: file.*average\.c, line 38\."
-    gdb_test "status" "Num.*Type.*Disp.*Enb.*Address.*What\r\n1\[ \r\]+breakpoint\[ \r\]+keep y.*in main at.*average\.c:38.*"
-    gdb_test "stop at 43" "Breakpoint.*at.*: file.*average\.c, line 43.*"
-    gdb_test "stop in 43" "Usage: stop in <function . address>"
-    gdb_test "stop at main" "Usage: stop at <line>"
-}
-
-#
-#test_assign
-#
-proc test_assign { } {
-    global decimal
-    global gdb_prompt
-
-    gdb_run_cmd
-    gdb_expect 30 {
-        -re "Break.* at .*:$decimal.*$gdb_prompt $" { pass "running to main" }
-        -re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in .*$gdb_prompt $" { pass "running to main"  }
-        -re "$gdb_prompt $" { fail "running to main" }
-        timeout { fail "running to main (timeout)" }
-    }
-    send_gdb "assign first=1\n"
-    gdb_expect {
-      -re "No symbol \"first\" in current context.*$" { fail "assign first" }
-      "$gdb_prompt $" { pass "assign first" }
-      timeout { fail "assign first (timeout)" }
-    }
-    gdb_test "print first" ".1 = 1"
-}
-
-#
-#test_whereis
-#
-proc test_whereis { } {
-    gdb_test "whereis my_list" "All variables matching regular expression \"my_list\":\r\n\r\nFile.*average\.c:\r\nstatic int my_list\\\[10\\\];"
-}
-
-#
-#test_func
-#
-proc test_func { } {
-    gdb_test "cont" "" "cont 1"
-    gdb_test "step" ""
-    # This always fails, but it's not clear why. -sts 1999-08-17
-    setup_xfail "*-*-*"
-    gdb_test "func sum" "'sum' not within current stack frame\."
-    gdb_test "stop in sum" "Breakpoint.*at.*: file.*sum\.c, line 11\."
-    gdb_test "cont" "" "cont 2"
-    # This always fails, but it's not clear why. -sts 1999-08-17
-    setup_xfail "*-*-*"
-    gdb_test "func print_average" ".*in print_average.*\\(list=.*, low=0, high=6\\).*at.*average\.c:24\r\n24\[ \t\]+total = sum\\(list, low, high\\);"
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-global GDBFLAGS
-set saved_gdbflags $GDBFLAGS
-
-set GDBFLAGS "$GDBFLAGS --dbx"
-gdb_start
-dbx_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-test_breakpoints
-test_assign
-test_whereis
-gdb_test "file average.c:1" "1\[ \t\]+/. This is a sample program.*"
-test_func
-
-#exit and cleanup
-gdb_exit
-
-set GDBFLAGS $saved_gdbflags
-eval proc gdb_file_cmd {$old_gdb_file_cmd_args} {$old_gdb_file_cmd_body}
-
-return 0
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
deleted file mode 100644
index 9179a53a39c..00000000000
--- a/gdb/testsuite/gdb.base/default.exp
+++ /dev/null
@@ -1,818 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003
-#   Free Software Foundation, 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
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-
-set timeout 60
-
-#
-# test default actions of gdb commands
-#
-
-#load_lib gdb.exp
-
-gdb_test "add-symbol-file" "add-symbol-file takes a file name and an address" "add-symbol-file"
-
-# test append
-gdb_test "append" "\"append\" must be followed by a subcommand\.\[\r\n\]+List of append subcommands:.*" 
-gdb_test "append binary" "\"append binary\" must be followed by a subcommand\.\[\r\n\]+List of append binary subcommands:.*" 
-gdb_test "append memory" "Missing filename\." 
-gdb_test "append value"  "Missing filename\." 
-gdb_test "append binary memory" "Missing filename\." 
-gdb_test "append binary value"  "Missing filename\." 
-
-setup_xfail "mips-idt-*"
-send_gdb "attach\n"
-gdb_expect {
-    -re "Argument required .(process-id|program) to attach.*$gdb_prompt $"\
-			{ pass "attach" }
-    -re "You can't do that when your target is `None'.*$gdb_prompt $"\
-			{ pass "attach" }
-    -re "You can't do that without a process to debug.*$gdb_prompt $"\
-			{ pass "attach" }
-    -re "Don't know how to attach.  Try \"help target\"..*$gdb_prompt $"\
-			{ pass "attach" }
-    -re "Kill it. .y or n." {
-	send_gdb "y\n"
-	exp_continue
-    }
-    -re "$gdb_prompt $" { fail "attach" }
-    timeout { fail "(timeout) attach" }
-}
-
-if ![target_info exists use_gdb_stub] {
-    gdb_test "break" "No default breakpoint address now." "break"
-    foreach i "b br bre brea" {
-	gdb_test $i "No default breakpoint address now." "break \"$i\" abbreviation"
-    }
-
-    
-    setup_xfail "mips-idt-*"
-    gdb_test "backtrace" "No stack."
-
-    # ba and bac are no longer unique command prefixes. So these tests
-    # elict an error from GDB.
-    # GDB needs to be fixed to map unique alias here for ba bac.
-    #
-    foreach i "bt ba bac" {
-	setup_xfail "mips-idt-*"
-	gdb_test $i "No stack." "backtrace \"$i\" abbreviation"
-    }
-} else {
-    warning "Skipping backtrace and break tests because of GDB stub."
-}
-
-# This works on the MIPS IDT board, but confuses future tests.
-if ![istarget "mips-idt-*"] then {
-    gdb_test "continue" "The program is not being run." "continue"
-    gdb_test "c" "The program is not being run." "continue \"c\" abbreviation"
-}
-
-#test call
-gdb_test "call" "The history is empty..*" "call"
-
-
-#test catch
-gdb_test "catch" "Catch requires an event name..*" "catch"
-
-#test cd
-gdb_test "cd" "Argument required .new working directory.*" "cd"
-
-#test clear
-gdb_test "clear" "No source file specified..*" "clear"
-
-#test commands
-gdb_test "commands" "No breakpoint number 0..*" "commands"
-
-#test condition
-gdb_test "condition" "Argument required .breakpoint number.*" "condition"
-
-#test core-file
-gdb_test "core-file" "No core file now.|GDB can't read core files on this machine." "core-file"
-#test delete "d" abbreviation
-gdb_test "d" "" "delete \"d\" abbreviation"
-#test delete
-gdb_test "delete" "" "delete"
-#test define
-gdb_test "define" "Argument required \[(\]name of command to define\[)\]." "define"
-#test delete breakpoints
-gdb_test "delete breakpoints" "" "delete breakpoints"
-#test delete display
-# FIXME -- need to dump full output to detailed log
-send_gdb "delete display\n"
-gdb_expect {
-    -re "Delete all auto-display expressions.*y or n. $" {
-	send_gdb "y\n"
-	gdb_expect {
-	    -re "$gdb_prompt $"     { pass "delete display prompt" }
-	    timeout		{ fail "(timeout) delete display prompt" }
-	}
-    }
-    timeout		{ fail "(timeout) delete display prompt" }
-
-}
-
-#test detach
-gdb_test "detach" "" "detach"
-
-if [istarget "h8300-*-hms"] then {
-    gdb_exit
-    gdb_start
-}
-
-#test directory
-# FIXME -- need to dump full output to detailed log
-
-send_gdb "directory\n"
-gdb_expect {
-    -re "Reinitialize source path to empty.*y or n. $"  {
-	send_gdb "y\n"
-	gdb_expect {
-	    -re "Source directories searched: .cdir:.cwd.*$gdb_prompt $"\
-		    { pass "directory prompt" }
-	    timeout		{ fail "(timeout) directory prompt" }
-	}
-    }
-}
-
-#test disable "dis" abbreviation
-gdb_test "dis" "" "disable \"dis\" abbreviation"
-#test disable "disa" abbreviation
-gdb_test "disa" "" "disable \"disa\" abbreviation"
-#test disable
-gdb_test "disable" "" "disable"
-#test disable breakpoints
-gdb_test "disable breakpoints" "" "disable breakpoints"
-#test disable display
-gdb_test "disable display" "" "disable display"
-#test disassemble
-gdb_test "disassemble" "No frame selected." "disassemble"
-#test display
-gdb_test "display" "" "display"
-#test do
-gdb_test "do" "No stack." "do"
-#test document
-gdb_test "document" "Argument required .name of command to define.*" "document"
-#test down
-gdb_test "down" "No stack.*" "down"
-#test down-silently
-gdb_test "down-silently" "No stack." "down-silently"
-# test dump
-gdb_test "dump" "\"dump\" must be followed by a subcommand\.\[\r\n\]+List of dump subcommands:.*" 
-gdb_test "dump binary" "\"dump binary\" must be followed by a subcommand\.\[\r\n\]+List of dump binary subcommands:.*" 
-gdb_test "dump ihex" "\"dump ihex\" must be followed by a subcommand\.\[\r\n\]+List of dump ihex subcommands:.*" 
-gdb_test "dump memory" "Missing filename\." 
-gdb_test "dump srec" "\"dump srec\" must be followed by a subcommand\.\[\r\n\]+List of dump srec subcommands:.*" 
-gdb_test "dump tekhex" "\"dump tekhex\" must be followed by a subcommand\.\[\r\n\]+List of dump tekhex subcommands:.*" 
-gdb_test "dump value" "Missing filename\." 
-gdb_test "dump binary memory" "Missing filename\." 
-gdb_test "dump binary value"  "Missing filename\." 
-gdb_test "dump ihex memory" "Missing filename\." 
-gdb_test "dump ihex value"  "Missing filename\." 
-gdb_test "dump srec memory" "Missing filename\." 
-gdb_test "dump srec value"  "Missing filename\." 
-gdb_test "dump tekhex memory" "Missing filename\." 
-gdb_test "dump tekhex value"  "Missing filename\." 
-#test echo
-gdb_test "echo" "" "echo"
-#test enable breakpoints delete
-gdb_test "enable breakpoints delete" "Argument required .one or more breakpoint numbers.*" "enable breakpoints delete"
-#test enable breakpoints once
-gdb_test "enable breakpoints once" "Argument required .one or more breakpoint numbers.*" "enable breakpoints once"
-#test enable breakpoints
-gdb_test "enable breakpoints" "" "enable breakpoints"
-#test enable delete
-gdb_test "enable delete" "Argument required .one or more breakpoint numbers.*" "enable delete"
-#test enable display
-gdb_test "enable display" "" "enable display"
-#test enable once
-gdb_test "enable once" "Argument required .one or more breakpoint numbers.*" "enable once"
-#test enable
-gdb_test "enable" "" "enable"
-#test exec-file
-send_gdb "exec-file\n"
-gdb_expect {
-    -re "No executable file now..*$gdb_prompt $" {
-	pass "exec-file"
-    }
-    -re "exec-file.*A program is being debugged already.  Kill it. .y or n.*$" {
-	send_gdb "n\n"
-	if $verbose>1 then {
-	    send_user "\tDidn't kill program being debugged\n"
-	}
-	gdb_expect -re "$gdb_prompt $" { }
-	pass "exec-file"
-    }
-    -re "$gdb_prompt $"	{ fail "exec-file" }
-    timeout		{ fail "(timeout) exec-file" }
-}
-
-#test frame "f" abbreviation
-gdb_test "f" "No stack." "frame \"f\" abbreviation"
-#test frame
-gdb_test "frame" "No stack." "frame"
-#test fg
-gdb_test "fg" "The program is not being run." "fg"
-# FIXME: fg kills the udi connection
-#test file
-send_gdb "file\n"
-gdb_expect {
-    -re "No executable file now..*$gdb_prompt $"\
-	    { pass "file" }
-    -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
-	send_gdb "n\n"
-	if $verbose>1 then {
-	    send_user "\t\tDidn't kill program being debugged\n"
-	}
-	gdb_expect -re "$gdb_prompt $" { }
-	pass "file"
-    }
-    -re ".*$gdb_prompt $"	{ fail "file" }
-    timeout		{ fail "(timeout) file" }
-}
-
-#test finish
-gdb_test "finish" "The program is not running." "finish"
-#test forward-search
-# The message here comes from the regexp library, not gdb, and so can
-# vary on different systems.
-gdb_test "forward-search" "No previous regular expression.*|There is no previous regular expression.*" "forward-search"
-#test gcore
-send_gdb "gcore\n"
-gdb_expect {
-    -re "You can\'t do that without a process to debug.*$gdb_prompt $" {
-	pass "gcore"
-    }
-    -re "Undefined command: .*$gdb_prompt $" {
-	pass "gcore"
-    }
-    default { fail "gcore" }
-}
-send_gdb "generate-core-file\n"
-gdb_expect {
-    -re "You can\'t do that without a process to debug.*$gdb_prompt $" {
-	pass "generate-core-file"
-    }
-    -re "Undefined command: .*$gdb_prompt $" {
-	pass "generate-core-file"
-    }
-    default { fail "generate-core-file" }
-}
-#test help "h" abbreviation
-gdb_test "h" "List of classes of commands:(\[^\r\n\]*\[\r\n\])+aliases -- Aliases of other commands(\[^\r\n\]*\[\r\n\])+breakpoints -- Making program stop at certain points(\[^\r\n\]*\[\r\n\])+data -- Examining data(\[^\r\n\]*\[\r\n\])+files -- Specifying and examining files(\[^\r\n\]*\[\r\n\])+obscure -- Obscure features(\[^\r\n\]*\[\r\n\])+running -- Running the program(\[^\r\n\]*\[\r\n\])+stack -- Examining the stack(\[^\r\n\]*\[\r\n\])+status -- Status inquiries(\[^\r\n\]*\[\r\n\])+support -- Support facilities(\[^\r\n\]*\[\r\n\])+user-defined -- User-defined commands(\[^\r\n\]*\[\r\n\])+Type \"help\" followed by a class name for a list of commands in that class.(\[^\r\n\]*\[\r\n\])+Type \"help\" followed by command name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "help \"h\" abbreviation"
-#test help
-gdb_test "help" "List of classes of commands:(\[^\r\n\]*\[\r\n\])+aliases -- Aliases of other commands(\[^\r\n\]*\[\r\n\])+breakpoints -- Making program stop at certain points(\[^\r\n\]*\[\r\n\])+data -- Examining data(\[^\r\n\]*\[\r\n\])+files -- Specifying and examining files(\[^\r\n\]*\[\r\n\])+obscure -- Obscure features(\[^\r\n\]*\[\r\n\])+running -- Running the program(\[^\r\n\]*\[\r\n\])+stack -- Examining the stack(\[^\r\n\]*\[\r\n\])+status -- Status inquiries(\[^\r\n\]*\[\r\n\])+support -- Support facilities(\[^\r\n\]*\[\r\n\])+user-defined -- User-defined commands(\[^\r\n\]*\[\r\n\])+Type \"help\" followed by a class name for a list of commands in that class.(\[^\r\n\]*\[\r\n\])+Type \"help\" followed by command name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "help"
-#test handle
-gdb_test "handle" "Argument required .signal to handle.*" "handle"
-#test info "i" abbreviation 
-gdb_test "i" "\"info\" must be followed by the name of an info command.(\[^\r\n\]*\[\r\n\])+List of info subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help info\" followed by info subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "info \"i\" abbreviation"
-#test info
-gdb_test "info" "\"info\" must be followed by the name of an info command.(\[^\r\n\]*\[\r\n\])+List of info subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help info\" followed by info subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "info"
-#test ignore
-gdb_test "ignore" "Argument required .a breakpoint number.*" "ignore"
-#test info address
-gdb_test "info address" "Argument required." "info address"
-#test info all-registers
-gdb_test "info all-registers" "The program has no registers now." "info all-registers"
-#test info args
-gdb_test "info args" "No frame selected." "info args"
-#test info bogus-gdb-command
-gdb_test "info bogus-gdb-command" "Undefined info command: \"bogus-gdb-command\".  Try \"help info\".*" "info bogus-gdb-command"
-#test info breakpoints
-gdb_test "info breakpoints" "No breakpoints or watchpoints." "info breakpoints"
-#test info catch
-gdb_test "info catch" "You can't do that without a process to debug." "info catch"
-#test info copying
-# FIXME -- doesn't work worth a shit
-#send_gdb "info copying"
-#	-re "GNU GENERAL PUBLIC LICENSE.*#of preserving the free status of all derivatives of our free software and.*#of promoting the sharing and reuse of software generally."# 
-gdb_test "info copying"
-#	}
-#
-#
-#test info display
-gdb_test "info display" "There are no auto-display expressions now." "info display"
-#test info frame "f" abbreviation
-gdb_test "info f" "No stack.*|No selected frame.*" "info frame \"f\" abbreviation"
-#test info frame
-gdb_test "info frame" "No stack.|No selected frame." "info frame"
-#test info files
-gdb_test "info files" "" "info files"
-#test info float
-gdb_test "info float" "The program has no registers now." "info float"
-#test info functions
-gdb_test "info functions" "All defined functions:" "info functions"
-#test info locals
-gdb_test "info locals" "No frame selected." "info locals"
-#test info program
-gdb_test "info program" "The program being debugged is not being run." "info program"
-#test info registers
-gdb_test "info registers" "The program has no registers now." "info registers"
-#test info stack "s" abbreviation
-gdb_test "info s" "No stack." "info stack \"s\" abbreviation"
-#test info stack
-gdb_test "info stack" "No stack." "info stack"
-#test info set
-# FIXME -- needs to match the entire output
-# FIXME -- on native solaris 2.8, this test fails due to this line:
-#  prompt:  Gdb's prompt is "(gdb) ".^M
-gdb_test "info set" "confirm:  Whether to confirm potentially dangerous operations is o\[a-z\]*.(\[^\r\n\]*\[\r\n\])+history filename:  The filename in which to record the command history is (\[^\r\n\]*\[\r\n\])+listsize:  Number of source lines gdb will list by default is 10.*" "info set"
-gdb_test "info symbol" "Argument required .address.."
-#test info source
-gdb_test  "info source" "No current source file..*" "info source"
-#test info sources
-gdb_test "info sources" "No symbol table is loaded.  Use the \"file\" command.*" "info sources"
-#test info target
-gdb_test "info target" "" "info target"
-#test info terminal
-gdb_test "info terminal" "No saved terminal information." "info terminal"
-#test info types
-gdb_test "info types" "All defined types:" "info types"
-#test info variables
-gdb_test "info variables" "All defined variables:" "info variables"
-#test info vector
-gdb_test "info vector" "The program has no registers now." "info vector"
-#test info warranty
-gdb_test "info warranty" "NO WARRANTY(\[^\r\n\]*\[\r\n\])+  *11.  *BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY(\[^\r\n\]*\[\r\n\])+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN(\[^\r\n\]*\[\r\n\])+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES(\[^\r\n\]*\[\r\n\])+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED(\[^\r\n\]*\[\r\n\])+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF(\[^\r\n\]*\[\r\n\])+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS(\[^\r\n\]*\[\r\n\])+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE(\[^\r\n\]*\[\r\n\])+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,(\[^\r\n\]*\[\r\n\])+REPAIR OR CORRECTION.(\[^\r\n\]*\[\r\n\])+  *12.  *IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING(\[^\r\n\]*\[\r\n\])+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR(\[^\r\n\]*\[\r\n\])+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,(\[^\r\n\]*\[\r\n\])+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING(\[^\r\n\]*\[\r\n\])+OUT OF THE USE OR INABILITY TO USE THE PROGRAM .INCLUDING BUT NOT LIMITED(\[^\r\n\]*\[\r\n\])+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY(\[^\r\n\]*\[\r\n\])+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER(\[^\r\n\]*\[\r\n\])+PROGRAMS., EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE(\[^\r\n\]*\[\r\n\])+POSSIBILITY OF SUCH DAMAGES.*" "info warranty"
-#test info watchpoints
-gdb_test "info watchpoints" "No breakpoints or watchpoints." "info watchpoints"
-#test inspect
-gdb_test "inspect" "The history is empty." "inspect"
-#test jump
-gdb_test "jump" "The program is not being run." "jump"
-#test kill
-gdb_test "kill" "The program is not being run." "kill"
-#test list "l" abbreviation
-gdb_test "l" "No symbol table is loaded.  Use the \"file\" command.*" "list \"l\" abbreviation"
-#test list
-gdb_test "list" "No symbol table is loaded.  Use the \"file\" command.*" "list"
-#test load
-# The ``takes a file name'' case is for vxgdb.
-# The ``Use the "file" command'' case is for newer GDB versions which try
-# to deduce the filename from the exec file.
-gdb_test "load" "You can't do that when your target is `None'.*|The load command takes a file name.*|Must specify at least a file name with the load command.*|.*Use the .file. or .exec-file. command.*" "load"
-#test next "n" abbreviation
-gdb_test "n" "The program is not being run." "next \"n\" abbreviation"
-#test next
-gdb_test "next" "The program is not being run." "next"
-#test nexti "ni" abbreviation
-gdb_test "ni" "The program is not being run." "nexti \"ni\" abbreviation"
-#test nexti
-gdb_test "nexti" "The program is not being run." "nexti"
-#test output
-gdb_test "output" "Argument required .expression to compute.*" "output"
-
-#test overlay
-gdb_test "overlay" "\"overlay\" must be followed by the name of .*"
-#test a non-existant overlay subcommand
-gdb_test "overlay on"     "Undefined overlay command.* Try \"help overlay\"."
-gdb_test "overlay manual" "" "overlay manual #1"
-gdb_test "overlay auto"   ""
-gdb_test "overlay off"    ""
-gdb_test "overlay list"   "No sections are mapped."
-gdb_test "overlay map"    "Overlay debugging not enabled.*" "overlay map #1"
-gdb_test "overlay unmap"  "Overlay debugging not enabled.*" "overlay unmap #1"
-gdb_test "overlay manual" "" "overlay manual #2"
-gdb_test "overlay map"    "Argument required: name of an overlay section." "overlay map #2"
-gdb_test "overlay unmap"  "Argument required: name of an overlay section." "overlay unmap #2"
-
-#test print "p" abbreviation
-gdb_test "p" "The history is empty." "print \"p\" abbreviation"
-#test print
-gdb_test "print" "The history is empty." "print"
-#test printf
-gdb_test "printf" "Argument required .format-control string and values to print.*" "printf"
-#test ptype
-gdb_test "ptype" "The history is empty." "ptype"
-#test pwd
-gdb_test "pwd" "Working directory .*" "pwd"
-
-#test run "r" abbreviation
-if [istarget "*-*-vxworks*"] then {
-    gdb_test "set args" "" "" 
-
-    gdb_test "r" "Starting program: .*
-You must specify a function name to run, and arguments if any"\
-		"run \"r\" abbreviation"
-    gdb_test "set args main" "" "" 
-
-} else {
-    send_gdb "r\n"
-    gdb_expect {
-	    -re "Starting program:  .*
-You can't do that when your target is `None'.*$gdb_prompt $"\
-			{ pass "run \"r\" abbreviation" }
-	    -re "Starting program:  .*
-No executable file specified.*
-Use the \"file\" or \"exec-file\" command.*$gdb_prompt $"\
-			{ pass "run \"r\" abbreviation" }
-	    -re "Starting program:  .*
-No executable specified, use .target exec.\\..*$gdb_prompt $"\
-			{ pass "run \"r\" abbreviation" }
-	    -re "Starting program:  .*
-No image loaded into target.*$gdb_prompt $"\
-			{ pass "run \"r\" abbreviation" }
-	    -re "Starting program:  .*
-No program loaded.*$gdb_prompt $"\
-			{ pass "run \"r\" abbreviation" }
-	    -re "Don't know how to run.  Try \"help target\"..*$gdb_prompt $"\
-			{ pass "run \"r\" abbreviation" }
-	    -re ".*$gdb_prompt $"	{ fail "run \"r\" abbreviation" }
-	    timeout		{ fail "(timeout) run \"r\" abbreviation" }
-	}
-}
-
-#test run
-if [istarget "*-*-vxworks*"] then {
-    gdb_test "set args" "" "" 
-
-    gdb_test "run" "Starting program: .*
-You must specify a function name to run, and arguments if any"
-    gdb_test "set args main" "" "" 
-
-} else {
-    send_gdb "run\n"
-    gdb_expect {
-	    -re "Starting program:.*You can't do that when your target is `None'.*$gdb_prompt $" { pass "run" }
-	    -re "Starting program:  .*
-No executable file specified.*
-Use the \"file\" or \"exec-file\" command.*$gdb_prompt $"\
-			{ pass "run" }
-	    -re "Starting program:  .*
-No executable specified, use .target exec.\\..*$gdb_prompt $"\
-			{ pass "run" }
-	    -re "Starting program:  .*
-No image loaded into target.*$gdb_prompt $"\
-			{ pass "run" }
-	    -re "Starting program:  .*
-No program loaded.*$gdb_prompt $"\
-			{ pass "run \"r\" abbreviation" }
-	    -re "Don't know how to run.  Try \"help target\"..*$gdb_prompt $"\
-			{ pass "run" }
-	    -re ".*$gdb_prompt $"	{ fail "run" }
-	    timeout		{ fail "(timeout) run" }
-	}
-}
-
-#test rbreak
-gdb_test "rbreak" "" "rbreak"
-
-# test restore
-gdb_test "restore" "You can't do that without a process to debug\."
-
-#test return
-# The middle case accomodated the obsolete a29k, where doing the "ni"
-# above causes an initial stack to be created.
-gdb_test "return" "No selected frame..*" "return"  "Make .* return now.*y or n. $" "y"
-
-
-#test reverse-search
-gdb_test "reverse-search" "No previous regular expression.*|There is no previous regular expression.*" "reverse-search"
-#test step "s" abbreviation
-gdb_test "s" "The program is not being run." "step \"s\" abbreviation #1"
-#test step
-gdb_test "step" "The program is not being run." "step #1"
-#test search
-gdb_test "search" "No previous regular expression.*|There is no previous regular expression.*" "search"
-#test section
-gdb_test "section" "Must specify section name and its virtual address.*" "section"
-#test set annotate
-gdb_test "set annotate" "Argument required .integer to set it to.*" "set annotate"
-#test set args
-gdb_test "set args" "" "set args"
-#test set check "c" abbreviation
-gdb_test "set c" "\"set check\" must be followed by the name of a check subcommand.(\[^\r\n\]*\[\r\n\])+List of set check subcommands:(\[^\r\n\]*\[\r\n\])+set check range -- Set range checking(\[^\r\n\]*\[\r\n\])+set check type -- Set type checking(\[^\r\n\]*\[\r\n\])+Type \"help set check\" followed by set check subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set check \"c\" abbreviation"
-#test set check "ch" abbreviation
-gdb_test "set ch" "\"set check\" must be followed by the name of a check subcommand.(\[^\r\n\]*\[\r\n\])+List of set check subcommands:(\[^\r\n\]*\[\r\n\])+set check range -- Set range checking(\[^\r\n\]*\[\r\n\])+set check type -- Set type checking(\[^\r\n\]*\[\r\n\])+Type \"help set check\" followed by set check subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set check \"ch\" abbreviation"
-#test set check
-gdb_test "set check" "\"set check\" must be followed by the name of a check subcommand.(\[^\r\n\]*\[\r\n\])+List of set check subcommands:(\[^\r\n\]*\[\r\n\])+set check range -- Set range checking(\[^\r\n\]*\[\r\n\])+set check type -- Set type checking(\[^\r\n\]*\[\r\n\])+Type \"help set check\" followed by set check subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set check"
-#test set check range
-gdb_test "set check range" "" "set check range"
-#test set check type
-gdb_test "set check type" "" "set check type"
-#test set complaints
-gdb_test "set complaints" "Argument required .integer to set it to.*" "set complaints"
-#test set confirm
-gdb_test "set confirm" "" "set confirm"
-# Don't test set editing. What if we're talking to a gdb that
-# won't do editing correctly while we're talking to it?
-# gdb_test "set editing" "" "set editing"
-
-#test set environment
-gdb_test "set environment" "Argument required .environment variable and value.*" "set environment"
-#test set height
-gdb_test "set height" "Argument required .integer to set it to.*" "set height"
-#test set history expansion
-gdb_test "set history expansion" "" "set history expansion"
-#test set history filename
-gdb_test "set history filename" "Argument required .filename to set it to.*" "set history filename"
-#test set history save
-gdb_test "set history save" "" "set history save"
-#test set history size
-gdb_test "set history size" "Argument required .integer to set it to.*" "set history size"
-#test set history
-gdb_test "set history" "\"set history\" must be followed by the name of a history subcommand.(\[^\r\n\]*\[\r\n\])+List of set history subcommands:(\[^\r\n\]*\[\r\n\])+set history expansion -- Set history expansion on command input(\[^\r\n\]*\[\r\n\])+set history filename -- Set the filename in which to record the command history(\[^\r\n\]*\[\r\n\])+set history save -- Set saving of the history record on exit(\[^\r\n\]*\[\r\n\])+set history size -- Set the size of the command history(\[^\r\n\]*\[\r\n\])+Type \"help set history\" followed by set history subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set history"
-#test set language
-gdb_test "set language" "The currently understood settings are:(\[^\r\n\]*\[\r\n\])+local or auto  *Automatic setting based on source file(\[^\r\n\]*\[\r\n\])+c  *Use the C language(\[^\r\n\]*\[\r\n\])+c\[+\]+  *Use the C\[+\]+ language(\[^\r\n\]*\[\r\n\])+modula-2  *Use the Modula-2 language.*" "set language"
-#test set listsize
-gdb_test "set listsize" "Argument required .integer to set it to.*" "set listsize"
-#test set print "p" abbreviation
-gdb_test "set p" "\"set print\" must be followed by the name of a print subcommand.(\[^\r\n\]*\[\r\n\])+List of set print subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help set print\" followed by set print subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set print \"p\" abbreviation"
-#test set print "pr" abbreviation
-gdb_test "set pr" "\"set print\" must be followed by the name of a print subcommand.(\[^\r\n\]*\[\r\n\])+List of set print subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help set print\" followed by set print subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set print \"pr\" abbreviation"
-#test set print
-gdb_test "set print" "\"set print\" must be followed by the name of a print subcommand.(\[^\r\n\]*\[\r\n\])+List of set print subcommands:(\[^\r\n\]*\[\r\n\])+Type \"help set print\" followed by set print subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "set print"
-#test set print address
-gdb_test "set print address" "" "set print address"
-#test set print array
-gdb_test "set print array" "" "set print array"
-#test set print asm-demangle
-gdb_test "set print asm-demangle" "" "set print asm-demangle"
-#test set print demangle
-gdb_test "set print demangle" "" "set print demangle"
-#test set print elements
-gdb_test "set print elements" "Argument required .integer to set it to.*" "set print elements"
-#test set print object
-gdb_test "set print object" "" "set print object"
-#test set print pretty
-gdb_test "set print pretty" "" "set print pretty"
-#test set print sevenbit-strings
-gdb_test "set print sevenbit-strings" "" "set print sevenbit-strings"
-#test set print union
-gdb_test "set print union" "" "set print union"
-#test set print vtbl
-gdb_test "set print vtbl" "" "set print vtbl"
-# FIXME -- need a test for "set prompt"
-#test set radix
-gdb_test "set radix" "Input and output radices now set to decimal 10, hex a, octal 12.*" "set radix"
-#test set symbol-reloading
-gdb_test "set symbol-reloading" "" "set symbol-reloading"
-#test set variable
-gdb_test "set variable" "Argument required .expression to compute.*" "set variable"
-#test set verbose
-gdb_test "set verbose" "" "set verbose"
-#test set width
-gdb_test "set width" "Argument required .integer to set it to.*" "set width"
-#test set write
-# This is only supported on targets which use exec.o.
-gdb_test "set write" "" "set write"
-#test set
-gdb_test "set" "Argument required .expression to compute.*" "set"
-#test shell echo Hi dad!
-gdb_test "shell echo Hi dad!" "Hi dad!" "shell echo Hi dad!"
-#test show annotate
-gdb_test "show annotate" "Annotation_level is 0." 	 "show annotate"
-#test show args
-gdb_test "show args" "Argument list to give program being debugged when it is started is \"\"." "show args"
-#test show check "c" abbreviation
-gdb_test "show c" "range:  *Range checking is \"auto; currently off\".(\[^\r\n\]*\[\r\n\])+type:  *Type checking is \"auto; currently off\".*" "show check \"c\" abbreviation"
-#test show check "ch" abbreviation
-gdb_test "show ch" "range: *Range checking is \"auto; currently off\".(\[^\r\n\]*\[\r\n\])+type:  *Type checking is \"auto; currently off\"." "show check \"ch\" abbreviation"
-#test show check
-gdb_test "show check" "range:  *Range checking is \"auto; currently off\".(\[^\r\n\]*\[\r\n\])+type:  *Type checking is \"auto; currently off\"." "show check"
-#test show check range
-gdb_test "show check range" "Range checking is \"auto; currently off\"." "show check range"
-#test show check type
-gdb_test "show check type" "Type checking is \"auto; currently off\"." "show check type"
-#test show commands
-gdb_test "show commands" "" "show commands"
-#test show complaints
-gdb_test "show complaints" "Max number of complaints about incorrect symbols is 0." "show complaints"
-#test show confirm
-gdb_test "show confirm" "Whether to confirm potentially dangerous operations is o\[a-z\]*." "show confirm"
-#test show convenience
-gdb_test "show convenience" "No debugger convenience variables now defined.(\[^\r\n\]*\[\r\n\])+Convenience variables have names starting with \".\";(\[^\r\n\]*\[\r\n\])+use \"set\" as in \"set .foo = 5\" to define them." "show convenience"
-#test show directories
-gdb_test "show directories" "Source directories searched: .cdir:.cwd" "show directories"
-#test show editing
-gdb_test "show editing" "Editing of command lines as they are typed is o\[a-z\]*." "show editing"
-#test show height
-gdb_test "show height" "Number of lines gdb thinks are in a page is.*" "show height"
-#test show history expansion
-gdb_test "show history expansion" "History expansion on command input is o\[a-z\]*.*" "show history expansion"
-#test show history filename
-gdb_test "show history filename" "The filename in which to record the command history is.*.gdb_history.*" "show history filename"
-#test show history save
-gdb_test "show history save" "Saving of the history record on exit is on." "show history save"
-#test show history size
-gdb_test "show history size" "The size of the command history is.*" "show history size"
-#test show history
-gdb_test "show history" "expansion:  *History expansion on command input is o(\[^\r\n\]*\[\r\n\])+filename:  *The filename in which to record the command history is.*.gdb_history(\[^\r\n\]*\[\r\n\])+save: *Saving of the history record on exit is o(\[^\r\n\]*\[\r\n\])+size: * The size of the command history is.*" "show history"
-#test show language
-gdb_test "show language" "The current source language is \"auto; currently c\"." "show language"
-#test show listsize
-gdb_test "show listsize" "Number of source lines gdb will list by default is 10." "show listsize"
-#test show print "p" abbreviation
-gdb_test "show p" ".*" "show p"
-#test show print "pr" abbreviation
-gdb_test "show pr" ".*" "show pr"
-#test show print
-gdb_test "show print" "" "show print"
-#test show paths
-gdb_test "show paths" "Executable and object file path:.*" "show paths"
-#test show print address
-gdb_test "show print address" "Printing of addresses is on." "show print address"
-#test show print array
-gdb_test "show print array" "Prettyprinting of arrays is on." "show print array"
-#test show print asm-demangle
-gdb_test "show print asm-demangle" "Demangling of C\[+\]+/ObjC names in disassembly listings is on." "show print asm-demangle"
-#test show print demangle
-gdb_test "show print demangle" "Demangling of encoded C\[+\]+/ObjC names when displaying symbols is on." "show print demangle"
-#test show print elements
-gdb_test "show print elements" "Limit on string chars or array elements to print is 200." "show print elements"
-#test show print object
-gdb_test "show print object" "Printing of object's derived type based on vtable info is on." "show print object"
-#test show print pretty
-gdb_test "show print pretty" "Prettyprinting of structures is on." "show print pretty"
-#test show print sevenbit-strings
-gdb_test "show print sevenbit-strings" "Printing of 8-bit characters in strings as .nnn is on." "show print sevenbit-strings"
-#test show print union
-gdb_test "show print union" "Printing of unions interior to structures is on." "show print union"
-#test show print vtbl
-gdb_test "show print vtbl" "Printing of C\[+\]+ virtual function tables is on." "show print vtbl"
-#test show prompt
-# In the FAIL case, can't just look for $gdb_prompt because that will match
-# the output, rather than the prompt. So look for $gdb_prompt at the start
-# of a line.
-gdb_test "show prompt" "Gdb's prompt is \"$gdb_prompt \".*" "show prompt"
-#test show radix
-gdb_test "show radix" "Input and output radices set to decimal 10, hex a, octal 12." "show radix"
-#test show symbol-reloading
-gdb_test "show symbol-reloading" "Dynamic symbol table reloading multiple times in one run is on." "show symbol-reloading"
-#test show user
-gdb_test "show user" "" "show user"
-#test show values
-gdb_test "show values" "" "show values"
-#test show verbose
-gdb_test "show verbose" "Verbose printing of informational messages is o.*|Verbosity is off.*" "show verbose"
-#test show version
-gdb_test "show version" "GNU gdb \[0-9\.\]*(\[^\r\n\]*\[\r\n\])+Copyright \[0-9\]* Free Software Foundation, Inc(\[^\r\n\]*\[\r\n\])+GDB is free software, covered by the GNU General Public License, and you are(\[^\r\n\]*\[\r\n\])+welcome to change it and/or distribute copies of it under certain conditions(\[^\r\n\]*\[\r\n\])+Type \"show copying\" to see the conditions(\[^\r\n\]*\[\r\n\])+There is absolutely no warranty for GDB.  Type \"show warranty\" for details(\[^\r\n\]*\[\r\n\])+This GDB was configured as .*|GDB is free software and you are welcome to distribute copies of it(\[^\r\n\]*\[\r\n\])+ under certain conditions; type \"show copying\" to see the conditions.(\[^\r\n\]*\[\r\n\])+There is absolutely no warranty for GDB; type \"show warranty\" for details.(\[^\r\n\]*\[\r\n\])+GDB.*Copyright \[0-9\]* Free Software Foundation, Inc.*" "show version"
-#test show width
-gdb_test "show width" "Number of characters gdb thinks are in a line is.*" "show width"
-#test show write
-# This is only supported on targets which use exec.o.
-gdb_test "show write" "Writing into executable and core files is o.*" "show write"
-#test show
-gdb_test "show" "confirm:  *Whether to confirm potentially dangerous operations is on.(\[^\r\n\]*\[\r\n\])+history filename:  *The filename in which to record the command history is (\[^\r\n\]*\[\r\n\])+history save:  *Saving of the history record on exit is on.(\[^\r\n\]*\[\r\n\])+history size:  *The size of the command history is(\[^\r\n\]*\[\r\n\])+listsize:  *Number of source lines gdb will list by default is 10(\[^\r\n]*\[\r\n\])+print elements:  *Limit on string chars or array elements to print is 200..*" "show"
-#test stepi "si" abbreviation
-gdb_test  "si" "The program is not being run." "stepi \"si\" abbreviation"
-#test stepi
-gdb_test "stepi" "The program is not being run." "stepi"
-#test signal
-gdb_test "signal" "The program is not being run." "signal"
-#test source
-gdb_test "source" "source command requires pathname of file to source..*|No such file or directory.*" "source"
-#test step "s" abbreviation
-gdb_test "s" "The program is not being run." "step \"s\" abbreviation #2"
-#test step
-gdb_test "step" "The program is not being run." "step #2"
-#test symbol-file
-gdb_test "symbol-file" "" "symbol-file"
-
-#test target child
-gdb_test "target child" "Use the \"run\" command to start a Unix child process.*|Undefined target command: \"child\".  *Try \"help target\".*" "target child"
-
-#test target procfs
-gdb_test "target procfs" "Use the \"run\" command to start a Unix child process.*|Undefined target command: \"procfs\".  *Try \"help target\".*" "target procfs"
-
-#test target core
-send_gdb "target core\n"
-gdb_expect {
-    -re "No core file specified..*$gdb_prompt $" { pass "target core" }
-    -re ".*A program is being debugged already.  Kill it. .y or n.*$" {
-	send_gdb "n\n"
-	if $verbose>1 then {
-	    send_user "\t\tDidn't kill program being debugged\n"
-	}
-	gdb_expect -re "$gdb_prompt $" { }
-	pass "target core"
-    }
-    -re "Undefined target command: \"core\".  Try \"help target\"..*$gdb_prompt $" { pass "target core" }
-    -re ".*$gdb_prompt $"	{ fail "target core" }
-    timeout		{ fail "(timeout) target core" }
-}
-
-#test target exec
-send_gdb "target exec\n"
-gdb_expect {
-	-re "No executable file now..*$gdb_prompt $"\
-			{ pass "target exec" }
-	-re ".*A program is being debugged already.  Kill it. .y or n.*$" {
-	    send_gdb "n\n"
-	    if $verbose>1 then {
-		send_user "\t\tDidn't kill program being debugged\n"
-	    }
-	    gdb_expect -re "$gdb_prompt $" { }
-	    pass "target exec"
-	}
-	-re ".*$gdb_prompt $"	{ fail "target exec" }
-	timeout		{ fail "(timeout) target exec" }
-	}
-
-#test target remote
-if ![istarget "*-*-udi*"] then {
-    send_gdb "target remote\n"
-    gdb_expect {
-	-re "To open a remote debug connection, you need to specify what.*serial.*device is attached to the remote system.*.e.g. .*$gdb_prompt $"\
-			{ pass "target remote" }
-	-re ".*A program is being debugged already.  Kill it. .y or n.*$" {
-	    send_gdb "n\n"
-	    if $verbose>1 then {
-		send_user "\t\tDidn't kill program being debugged\n"
-	    }
-	    gdb_expect -re "$gdb_prompt $" { }
-	    pass "target remote"
-	}
-	-re ".*$gdb_prompt $"	{ fail "target remote" }
-	timeout		{ fail "(timeout) target remote" }
-    }
-}
-
-#test target
-gdb_test "target" "Argument required .target name.*" "target"
-#test tbreak
-gdb_test "tbreak" "No default breakpoint address now." "tbreak"
-#test tty
-gdb_test "tty" "Argument required .terminal name for running target process.*" "tty"
-#test until "u" abbreviation
-gdb_test "u" "The program is not running." "until \"u\" abbreviation"
-#test until
-gdb_test "until" "The program is not running." "until"
-#test undisplay
-# FIXME -- need to dump full output to detailed log
-send_gdb "undisplay\n"
-gdb_expect {
-    -re "Delete all auto-display expressions.*y or n. $" {
-	send_gdb "y\n"
-	gdb_expect {
-	    -re "$gdb_prompt $" { pass "undisplay prompt" }
-	    timeout { fail "(timeout) (timeout) undisplay prompt"    }
-	}
-    }
-    timeout		{ fail "(timeout) (timeout) undisplay prompt" }
-}
-
-#test unset environment
-send_gdb "unset environment\n"
-gdb_expect {
-    -re "Delete all environment variables?.*y or n. $" { 
-	send_gdb "y\n"
-	gdb_expect {
-	    -re "$gdb_prompt $" { pass "unset environmentprompt" }
-	    timeout {
-		fail "(timeout) (timeout) unset environment prompt"
-	    }
-	}
-    }
-    timeout { 
-	fail "(timeout) (timeout) unset environment prompt"
-    }
-}
-
-#test unset
-gdb_test "unset" "\"unset\" must be followed by the name of an unset subcommand.(\[^\r\n\]*\[\r\n\])+List of unset subcommands:(\[^\r\n\]*\[\r\n\])+unset environment -- Cancel environment variable VAR for the program(\[^\r\n\]*\[\r\n\])+Type \"help unset\" followed by unset subcommand name for full documentation.(\[^\r\n\]*\[\r\n\])+Command name abbreviations are allowed if unambiguous." "unset"
-#test up
-#test up-silently
-gdb_test "up-silently" "No stack." "up-silently"
-#test watch
-gdb_test "watch" "Argument required .expression to compute.*" "watch"
-#test whatis
-gdb_test "whatis" "The history is empty." "whatis"
-#test where
-gdb_test "where" "No stack." "where"
-#test x
-#The case in which it prints a number is for vxgdb.
-send_gdb "x\n"
-gdb_expect {
-    -re "0x0:.*Cannot access memory at address 0x0..*$gdb_prompt $" {
-        pass "x"
-    }
-    -re "0x0:.*Error accessing memory address 0x0:.*$gdb_prompt $" {
-        pass "x"
-    }
-    -re ".*$gdb_prompt $" { fail "x" }
-    timeout { fail "(timeout) x" }
-}
-
-gdb_exit
diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp
deleted file mode 100644
index 74682feee3b..00000000000
--- a/gdb/testsuite/gdb.base/define.exp
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1998, 1999, 2001, 2003, 2004 Free Software Foundation, 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 Elena Zannoni. (ezannoni@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-global usestubs
-
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
-set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
-
-if ![runto_main] then { fail "define tests suppressed" }
-
-# Verify that GDB allows a user to define their very own commands.
-#
-send_gdb "define nextwhere\n"
-gdb_expect {
-  -re "Type commands for definition of \"nextwhere\".\r\nEnd with a line saying just \"end\".\r\n>$"\
-          {send_gdb "next\nbt\nend\n"
-           gdb_expect {
-             -re "$gdb_prompt $"\
-                     {pass "define user command: nextwhere"}
-             timeout {fail "(timeout) define user command: nextwhere"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "define user command: nextwhere"}
-  timeout {fail "(timeout) define user command: nextwhere"}
-}
-
-# Verify that those commands work as gdb_expected.
-#
-send_gdb "nextwhere\n"
-gdb_expect {
-  -re ".*$bp_location1\[ \t\]*printf.*#0\[ \t\]*main.*:$bp_location1.*$gdb_prompt $"\
-          {pass "use user command: nextwhere"}
-  -re "$gdb_prompt $"\
-          {fail "use user command: nextwhere"}
-  timeout {fail "(timeout) use user command: nextwhere"}
-}
-
-# Verify that a user can define a command whose spelling is a
-# proper substring of another user-defined command.
-#
-send_gdb "define nextwh\n"
-gdb_expect {
-  -re "Type commands for definition of \"nextwh\".\r\nEnd with a line saying just \"end\".\r\n>$"\
-          {send_gdb "next 2\nbt\nend\n"
-           gdb_expect {
-             -re "$gdb_prompt $"\
-                     {pass "define user command: nextwh"}
-             timeout {fail "(timeout) define user command: nextwh"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "define user command: nextwh"}
-  timeout {fail "(timeout) define user command: nextwh"}
-}
-
-# Verify that a user can redefine their commands.  (Test both the
-# confirmed and unconfirmed cases.)
-#
-send_gdb "define nextwhere\n"
-gdb_expect {
-  -re "Redefine command \"nextwhere\".*y or n. $"\
-          {send_gdb "n\n"
-           gdb_expect {
-             -re "Command \"nextwhere\" not redefined.*$gdb_prompt $"\
-                     {pass "redefine user command aborted: nextwhere"}
-             -re "$gdb_prompt $"\
-                     {fail "redefine user command aborted: nextwhere"}
-             timeout {fail "(timeout) redefine user command aborted: nextwhere"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "redefine user command aborted: nextwhere"}
-  timeout {fail "(timeout) redefine user command aborted: nextwhere"}
-}
-
-send_gdb "define nextwhere\n"
-gdb_expect {
-  -re "Redefine command \"nextwhere\".*y or n. $"\
-          {send_gdb "y\n"
-           gdb_expect {
-             -re "Type commands for definition of \"nextwhere\".\r\nEnd with a line saying just \"end\".\r\n>$"\
-                     {send_gdb "bt\nnext\nend\n"
-                      gdb_expect {
-                        -re "$gdb_prompt $"\
-                                {pass "redefine user command: nextwhere"}
-                        timeout {fail "(timeout) redefine user command: nextwhere"}
-                      }
-                     }
-             timeout {fail "(timeout) redefine user command: nextwhere"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "redefine user command: nextwhere"}
-  timeout {fail "(timeout) redefine user command: nextwhere"}
-}
-
-# Verify that GDB gracefully handles an attempt to redefine the
-# help text for a builtin command.
-#
-send_gdb "document step\n"
-gdb_expect {
-  -re "Command \"step\" is built-in..*$gdb_prompt $"\
-          {pass "redocumenting builtin command disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "redocumenting builtin command disallowed"}
-  timeout {fail "(timeout) redocumenting builtin command disallowed"}
-}
-
-# Verify that a user can document their own commands.  (And redocument
-# them.)
-#
-send_gdb "document nextwhere\n"
-gdb_expect {
-  -re "Type documentation for \"nextwhere\".\r\nEnd with a line saying just \"end\".\r\n>$"\
-          {send_gdb "A next command that frist shows you where you're stepping from.\nend\n"
-           gdb_expect {
-             -re "$gdb_prompt $"\
-                     {pass "document user command: nextwhere"}
-             timeout {fail "(timeout) document user command: nextwhere"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "document user command: nextwhere"}
-  timeout {fail "(timeout) document user command: nextwhere"}
-}
-
-send_gdb "document nextwhere\n"
-gdb_expect {
-  -re "Type documentation for \"nextwhere\".\r\nEnd with a line saying just \"end\".\r\n>$"\
-          {send_gdb "A next command that first shows you where you're stepping from.\nend\n"
-           gdb_expect {
-             -re "$gdb_prompt $"\
-                     {pass "re-document user command: nextwhere"}
-             timeout {fail "(timeout) re-document user command: nextwhere"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "re-document user command: nextwhere"}
-  timeout {fail "(timeout) re-document user command: nextwhere"}
-}
-
-send_gdb "help nextwhere\n"
-gdb_expect {
-  -re "A next command that first shows you where you're stepping from.\r\n$gdb_prompt $"\
-          {pass "help user command: nextwhere"}
-  -re "$gdb_prompt $"\
-          {fail "help user command: nextwhere"}
-  timeout {fail "(timeout) help user command: nextwhere"}
-}
-
-# Verify that the command parser doesn't require a space after an 'if'
-# command in a user defined function.
-#
-gdb_test_multiple "define ifnospace" "define user command: ifnospace" \
-{
-  -re "Type commands for definition of \"ifnospace\".\r\nEnd with a line saying just \"end\".\r\n>$" \
-    {
-      gdb_test_multiple "if(3<4)\nprint \"hi there\\n\"\nend\nend" "send body of ifnospace"  \
-        {
-         -re "$gdb_prompt $"\
-                 {pass "define user command: ifnospace"}
-        }
-    }
-}
-
-gdb_test "ifnospace" ".*hi there.*" "test ifnospace is parsed correctly"
-
-# Verify that the command parser doesn't require a space after an 'while'
-# command in a user defined function.
-#
-gdb_test_multiple "define whilenospace" "define user command: whilenospace" \
-{
-  -re "Type commands for definition of \"whilenospace\".\r\nEnd with a line saying just \"end\".\r\n>$" \
-    {
-      gdb_test_multiple "set \$i=1\nwhile(\$i<2)\nset \$i=2\nprint \"hi there\\n\"\nend\nend" "send body of whilenospace" \
-         {
-           -re "$gdb_prompt $" \
-                   {pass "define user command: whilenospace"}
-         }
-    }
-}
-
-gdb_test "whilenospace" ".*hi there.*" "test whilenospace is parsed correctly"
-
-# Verify that the user can "hook" a builtin command.  We choose to
-# hook the "stop" pseudo command, and we'll define it to use a user-
-# define command.
-#
-send_gdb "define user-bt\n"
-gdb_expect {
-  -re "Type commands for definition of \"user-bt\".\r\nEnd with a line saying just \"end\".\r\n>$"\
-          {send_gdb "bt\nend\n"
-           gdb_expect {
-             -re "$gdb_prompt $"\
-                       {pass "define user command: user-bt"}
-             timeout {fail "(timeout) define user command: user-bt"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "define user command: user-bt"}
-  timeout {fail "(timeout) define user command: user-bt"}
-}
-
-send_gdb "define hook-stop\n"
-gdb_expect {
-  -re "Type commands for definition of \"hook-stop\".\r\nEnd with a line saying just \"end\".\r\n>$"\
-          {send_gdb "user-b\nend\n"
-           gdb_expect {
-             -re "$gdb_prompt $"\
-                       {pass "define hook-stop command"}
-             timeout {fail "(timeout) define hook-stop command"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "define hook-stop command"}
-  timeout {fail "(timeout) define hook-stop command"}
-}
-
-send_gdb "next\n"
-gdb_expect {
-  -re "#0\[ \t\]*main.*:$bp_location11.*$gdb_prompt $"\
-          {pass "use hook-stop command"}
-  -re "$gdb_prompt $"\
-          {fail "use hook-stop command"}
-  timeout {fail "(timeout) use hook-stop command"}
-}
-
-# Verify that GDB responds gracefully to an attempt to define a "hook
-# command" which doesn't exist.  (Test both the confirmed and unconfirmed
-# cases.)
-#
-send_gdb "define hook-bar\n"
-gdb_expect {
-  -re "warning: Your new `hook-bar' command does not hook any existing command.\r\nProceed.*y or n. $"\
-          {send_gdb "n\n"
-           gdb_expect {
-             -re "Not confirmed.*$gdb_prompt $"\
-                     {pass "define hook undefined command aborted: bar"}
-             -re "$gdb_prompt $"\
-                     {fail "define hook undefined command aborted: bar"}
-             timeout {fail "(timeout) define hook undefined command aborted: bar"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "define hook undefined command aborted: bar"}
-  timeout {fail "(timeout) define hook undefined command aborted: bar"}
-}
-
-send_gdb "define hook-bar\n"
-gdb_expect {
-  -re "warning: Your new `hook-bar' command does not hook any existing command.\r\nProceed.*y or n. $"\
-          {send_gdb "y\n"
-           gdb_expect {
-             -re "Type commands for definition of \"hook-bar\".\r\nEnd with a line saying just \"end\".\r\n>$"\
-                     {send_gdb "nextwhere\nend\n"
-                      gdb_expect {
-                        -re "$gdb_prompt $"\
-                                {pass "define hook undefined command: bar"}
-                        timeout {fail "(timeout) define hook undefined command: bar"}
-                      }
-                     }
-             -re "$gdb_prompt $"\
-                     {fail "define hook undefined command: bar"}
-             timeout {fail "(timeout) define hook undefined command: bar"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "define hook undefined command: bar"}
-  timeout {fail "(timeout) define hook undefined command: bar"}
-}
-
-# This is a quasi-define command: Verify that the user can redefine
-# GDB's gdb_prompt.
-#
-send_gdb "set prompt \\(blah\\) \n"
-gdb_expect {
-  -re "\\(blah\\) $"\
-          {pass "set gdb_prompt"}
-  -re "$gdb_prompt $"\
-          {fail "set gdb_prompt"}
-  timeout {fail "(timeout) set gdb_prompt"}
-}
-
-send_gdb "set prompt \\(gdb\\) \n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "reset gdb_prompt"}
-  timeout {fail "(timeout) reset gdb_prompt"}
-}
-
-gdb_exit
-return 0
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/detach.exp b/gdb/testsuite/gdb.base/detach.exp
deleted file mode 100644
index 1f86fecfca1..00000000000
--- a/gdb/testsuite/gdb.base/detach.exp
+++ /dev/null
@@ -1,77 +0,0 @@
-#   Copyright 2003 Free Software Foundation, 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
-
-# Test running a program from the GDB prompt and then detaching it.
-# NOTE: This test could be much more thorough.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Only GNU/Linux is known to support this.
-if { ! [istarget "*-*-linux*"] } {
-  return 0
-}
-
-# Are we on a target board?
-if [is_remote target] then {
-    return 0
-}
-
-set testfile "attach"
-set srcfile  ${testfile}.c
-set binfile  ${objdir}/${subdir}/${testfile}
-set escapedbinfile  [string_to_regexp ${objdir}/${subdir}/${testfile}]
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc do_detach_tests {} {
-  global srcdir
-  global binfile
-  global escapedbinfile
-  global subdir
-  global pass
-
-  runto_main
-  gdb_test "set should_exit = 1" "" "set should_exit, $pass"
-  gdb_test "detach" "Detaching from program: .*$escapedbinfile, .*" "detach, $pass"
-}
-
-# Start with a fresh gdb
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-global pass
-set pass "one"
-do_detach_tests
-
-# Wait a moment and do it again.
-exec sleep 1
-
-set pass "two"
-do_detach_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.base/display.c b/gdb/testsuite/gdb.base/display.c
deleted file mode 100644
index 365240922d1..00000000000
--- a/gdb/testsuite/gdb.base/display.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Loop and vars for tests of display commands
-*/
-#include <stdio.h>
-#define LOOP 10
-
-int sum = 0;
-
-int do_loops()
-{
-    int i=0;
-    int k=0;
-    int j=0;
-    float f=3.1415;
-    for( i = 0; i < LOOP; i++ ) {
-        for( j = 0; j < LOOP; j++ ) {
-            for( k = 0; k < LOOP; k++ ) {
-                sum++; f++;
-            }
-        }
-    } 
-    return i;
-}
-
-int do_vars()
-{
-    int       j;
-    int       i = 9;
-    float     f = 1.234;
-    char      c = 'Q';
-    int    *p_i = &i;
-    float  *p_f = &f;
-    char   *p_c = "rubarb and fries";
-
-    /* Need some code here to set breaks on.
-     */
-    for( j = 0; j < LOOP; j++ ) {
-        if( p_c[j] == c ) {
-            j++;
-        } 
-        else {
-            i++;
-        }
-    }
-
-    return *p_i;
-}
-
-main()
-{
-    do_loops();
-    do_vars();    
-}
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
deleted file mode 100644
index c39ee366169..00000000000
--- a/gdb/testsuite/gdb.base/display.exp
+++ /dev/null
@@ -1,215 +0,0 @@
-#   Copyright 1997, 1998, 1999, 2000, 2001, 2003
-#   Free Software Foundation, 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
-
-# display.exp   Test display commands
-#               Also do some printing stuff for coverage's sake.
-#
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile display
-set srcfile  ${testfile}.c
-set binfile  ${objdir}/${subdir}/${testfile}
-
-
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-# Preserve the old timeout, and set a new one that should be
-# sufficient to avoid timing out during this test.
-set oldtimeout $timeout
-set timeout [expr "$timeout + 60"]
-verbose "Timeout is now $timeout seconds" 2
-
-# use this to debug:
-#log_user 1
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Some coverage stuff
-#
-if ![target_info exists use_gdb_stub] {
-    gdb_test "kill" ".*The program is not being run.*"
-    gdb_test "detach" ".*"
-    gdb_test "run" ".*"
-
-    gdb_load ${binfile}
-    gdb_test "kill" ".*" "kill again"
-    gdb_test "detach" ".*" "detach again"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-}
-
-# Ok, on to real life
-#
-if ![runto_main] then {
-    fail "Could not run to main - other tests will fail."
-    continue
-}
-
-# Disable hardware watchpoints if necessary.
-if [target_info exists gdb,no_hardware_watchpoints] {
-    gdb_test "set can-use-hw-watchpoints 0" "" ""
-}
-
-gdb_test "break 14" ".*Breakpoint 2.*"           "break  do_loops"
-gdb_test "cont"     ".*Breakpoint 2, do_loops.*" "get to do_loops"
-
-# Create stopping points.
-#
-gdb_test "watch sum"    ".*\[Ww\]atchpoint 3: sum.*" "set watch"
-gdb_test "break 19"     ".*Breakpoint 4.*" "break 19"
-
-# Create displays for those points
-#
-gdb_test "info disp" ".*There are no auto-display expressions now..*" "inf disp"
-gdb_test "disp i" ".*1: i = 0.*" "display i"
-gdb_test "disp/x j" ".*2: /x j = 0x0.*" "display j"
-gdb_test "disp/i &k" ".*3: x/i &k  $hex:.*" "display &k"
-gdb_test "disp/f f" ".*4: /f f = 3.1415*" "display/f f"
-gdb_test "disp/s &sum" ".*5: x/s &sum  $hex.*sum.:.*" "display/s &sum"
-
-# Hit the displays
-#
-gdb_test "cont" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f f = 3.1415\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0\r\n\[1-9\]*: i = 0.*" "first disp"
-gdb_test "cont" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f f = 4.1415\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0.*\[1-9\]*: i = 0.*" "second disp"
-
-gdb_test "enab  disp 6" ".*No display number 6..*" "catch err"
-gdb_test "disab disp 1" ".*" "disab disp 1"
-gdb_test "disab disp 2" ".*" "disab disp 2"
-gdb_test "enab disp 1"  ".*" "re-enab"
-gdb_test "enab disp 1"  ".*" "re-enab of enab"
-gdb_test "undisp 5"     ".*" "undisp"
-gdb_test "info disp"    ".*Auto-display expressions now in effect.*y  /f f.*y  /1bi &k.*n  /x j.*y  i.*" "info disp"
-
-gdb_test "cont" ".*\[Ww\]atch.*5.1415.*.*i = 0.*" "next hit"
-
-send_gdb "undisp\n"
-gdb_expect {
-    -re ".*Delete all auto-display expressions.*y or n. $" {
-        send_gdb "y\n"
-        gdb_expect {
-            -re "y\r\n$gdb_prompt $" {
-                pass "undisp all"
-            }
-            -re ".*$gdb_prompt $" {
-                fail "some un-helpful response"
-            }
-            -re ".*Delete all.*$" {
-                fail "re-ask question"
-            }
-            timeout { fail "timeout" }
-        }
-    }
-    -re ".*$gdb_prompt $" {
-        fail "undisp all"
-    }
-    timeout { fail "timeout" }
-}
-
-gdb_test "disab 3" ".*.*" "disab 3"
-gdb_test "cont" ".*Breakpoint 4.*" "watch off"
-
-# Now the printf tests
-#
-# The "finish" command may leave us mid-line in the caller on some
-# targets, including but not limited to the m68k, i386 & PA.  So we
-# have to arrange to step until we hit the line with the call to
-# "do_vars".
-send_gdb "finish\n"
-gdb_expect {
-    -re ".*do_loops\\(\\);.*$gdb_prompt $" {
-	send_gdb "step\n"
-	exp_continue
-    }
-    -re ".*do_vars.*$gdb_prompt $" {
-	pass "finish"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "finish"
-	gdb_suppress_tests
-    }
-    timeout  {
-	fail "(timeout) finish"
-	gdb_suppress_tests
-    }
-}
-
-gdb_test "step"      ".*do_vars.*.*27.*"
-gdb_test "tbreak 37" ".*Breakpoint 5 a.*"
-gdb_test "cont"      ".*do_vars.*37.*37.*"
-
-# Beat on printf a bit
-#
-gdb_test "printf" ".*Argument required.*"
-gdb_test "printf %d" ".*Bad format string, missing.*"
-gdb_test "printf \"%d" ".*Bad format string, non-terminated.*"
-gdb_test "printf \"%d%d\",i" ".*Wrong number of arguments.*"
-gdb_test "printf \"\\\\!\\a\\f\\r\\t\\v\\b\\n\"" ".*!.*"
-gdb_test "printf \"\"" ".*" "re-set term"
-gdb_test "printf \"\\w\"" ".*Unrecognized escape character.*"
-gdb_test "printf \"%d\" j" ".*Invalid argument syntax.*"
-
-# play with "print", too
-#
-gdb_test "print/r j" ".*Undefined output format.*"
-gdb_test "print j"   ".*" "debug test output"
-
-# x/0 j doesn't produce any output and terminates PA64 process when testing
-if [istarget "hppa2.0w-hp-hpux11*"] {
-    xfail "'x/0 j' terminates PA64 process - skipped test point"
-} else {
-    gdb_test "x/0 j" ".*"
-}
-if [istarget "hppa*-hp-hpux*"] {
-    # on HP-UX you could access the first page without getting an error
-    gdb_test "x/rx j" ".*(Cannot access|Error accessing) memory.*|.*0xa:\[ \t\]*\[0-9\]+.*"
-}
-gdb_test "print/0 j" ".*Item count other than 1 is meaningless.*" "print/0 j"
-gdb_test "print/s sum" ".*Format letter.*is meaningless.*" " no s"
-gdb_test "print/i sum" ".*Format letter.*is meaningless.*.*" "no i"
-gdb_test "print/a &sum" ".*= $hex.*<sum>.*"
-# If the constant below is larger than the length of main, then
-# this test will (incorrectly) fail.  So use a small number.
-gdb_test "print/a main+4" ".*= $hex.*<.*>.*"
-gdb_test "print/a \$pc" ".*= $hex.*<do_vars+.*>.*"
-gdb_test "print/a &&j" ".*A .* error in expression.*"
-
-# Done!
-#
-gdb_exit
-
-# Restore the preserved old timeout value.
-set timeout $oldtimeout
-verbose "Timeout is now $timeout seconds" 2
-
-return 0
diff --git a/gdb/testsuite/gdb.base/dump.c b/gdb/testsuite/gdb.base/dump.c
deleted file mode 100644
index bc68778ee7a..00000000000
--- a/gdb/testsuite/gdb.base/dump.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <string.h>
-
-#define ARRSIZE 32
-int intarray[ARRSIZE], intarray2[ARRSIZE];
-
-struct teststruct {
-  int a;
-  int b;
-  int c;
-  int d;
-  int e;
-  int f;
-  int g;
-} intstruct, intstruct2;
-
-void checkpoint1 ()
-{
-  /* intarray and teststruct have been initialized. */
-}
-
-void
-zero_all ()
-{
-  memset ((char *) &intarray,   0, sizeof (intarray));
-  memset ((char *) &intarray2,  0, sizeof (intarray2));
-  memset ((char *) &intstruct,  0, sizeof (intstruct));
-  memset ((char *) &intstruct2, 0, sizeof (intstruct2));
-}
-
-main()
-{
-  int i;
-
-  for (i = 0; i < ARRSIZE; i++)
-    intarray[i] = i+1;
-
-  intstruct.a = 12 * 1;
-  intstruct.b = 12 * 2;
-  intstruct.c = 12 * 3;
-  intstruct.d = 12 * 4;
-  intstruct.e = 12 * 5;
-  intstruct.f = 12 * 6;
-  intstruct.g = 12 * 7;
-
-  checkpoint1 ();
-}
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
deleted file mode 100644
index a55dc50932b..00000000000
--- a/gdb/testsuite/gdb.base/dump.exp
+++ /dev/null
@@ -1,481 +0,0 @@
-# Copyright 2002, 2004 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-# This is a test for the gdb command "dump".
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "dump"
-
-set srcfile  ${testfile}.c
-set binfile  ${objdir}/${subdir}/${testfile}
-set options  {debug}
-
-set is64bitonly "no"
-
-if [istarget "alpha*-*-*"] then {
-    # SREC etc cannot handle 64-bit addresses.  Force the test
-    # program into the low 31 bits of the address space.
-    lappend options "additional_flags=-Wl,-taso"
-}
-
-if [istarget "ia64*-*-*"] then {
-    set is64bitonly "yes"
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${options}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Clean up any stale output files from previous test runs
-
-remote_exec build "rm -f intarr1.bin intarr1b.bin intarr1.ihex intarr1.srec intarr1.tekhex intarr2.bin intarr2b.bin intarr2.ihex intarr2.srec intarr2.tekhex intstr1.bin intstr1b.bin intstr1.ihex intstr1.srec intstr1.tekhex intstr2.bin intstr2b.bin intstr2.ihex intstr2.srec intstr2.tekhex intarr3.srec"
-
-# Test help (FIXME:)
-
-# Run target program until data structs are initialized.
-
-if { ! [ runto checkpoint1 ] } then {
-    gdb_suppress_entire_file "Program failed to run, so all tests in this file will automatically fail."
-}
-
-# Now generate some dump files.
-
-proc make_dump_file { command msg } {
-  global gdb_prompt
-
-    send_gdb "${command}\n"
-    gdb_expect {
-	-re ".*\[Ee\]rror.*$gdb_prompt $"      { fail $msg }
-	-re ".*\[Ww\]arning.*$gdb_prompt $"    { fail $msg }
-	-re ".*\[Uu\]ndefined .*$gdb_prompt $" { fail $msg }
-	-re ".*$gdb_prompt $" { pass $msg }
-	timeout                                { fail "$msg (timeout)" }
-    }
-}
-
-make_dump_file "dump val intarr1.bin intarray" \
-	"dump array as value, default"
-
-make_dump_file "dump val intstr1.bin intstruct" \
-	"dump struct as value, default"
-
-make_dump_file "dump bin val intarr1b.bin intarray" \
-	"dump array as value, binary"
-
-make_dump_file "dump bin val intstr1b.bin intstruct" \
-	"dump struct as value, binary"
-
-make_dump_file "dump srec val intarr1.srec intarray" \
-	"dump array as value, srec"
-
-make_dump_file "dump srec val intstr1.srec intstruct" \
-	"dump struct as value, srec"
-
-make_dump_file "dump ihex val intarr1.ihex intarray" \
-	"dump array as value, intel hex"
-
-make_dump_file "dump ihex val intstr1.ihex intstruct" \
-	"dump struct as value, intel hex"
-
-make_dump_file "dump tekhex val intarr1.tekhex intarray" \
-	"dump array as value, tekhex"
-
-make_dump_file "dump tekhex val intstr1.tekhex intstruct" \
-	"dump struct as value, tekhex"
-
-proc capture_value { expression args } {
-    global gdb_prompt
-    global expect_out
-
-    set output_string ""
-    if {[llength $args] > 0} {
-	# Convert $args into a simple string.
-	set test "[join $args]; capture $expression"
-    } {
-	set test "capture $expression"
-    }
-    gdb_test_multiple "print ${expression}" "$test" {
-	-re "\\$\[0-9\]+ = (\[^\r\n\]+).*$gdb_prompt $" {
-	    set output_string "$expect_out(1,string)"
-	    pass "$test"
-	}
-	-re "(Cannot access memory at address \[^\r\n\]+).*$gdb_prompt $" {
-	    # Even a failed value is valid
-	    set output_string "$expect_out(1,string)"
-	    pass "$test"
-	}
-    }
-    return $output_string
-}
-
-set array_start  [capture_value "/x &intarray\[0\]"]
-set array_end    [capture_value "/x &intarray\[32\]"]
-set struct_start [capture_value "/x &intstruct"]
-set struct_end   [capture_value "/x &intstruct + 1"]
-
-set array_val    [capture_value "intarray"]
-set struct_val   [capture_value "intstruct"]
-
-make_dump_file "dump mem intarr2.bin $array_start $array_end" \
-	"dump array as memory, default"
-
-make_dump_file "dump  mem intstr2.bin $struct_start $struct_end" \
-	"dump struct as memory, default"
-
-make_dump_file "dump bin mem intarr2b.bin $array_start $array_end" \
-	"dump array as memory, binary"
-
-make_dump_file "dump bin mem intstr2b.bin $struct_start $struct_end" \
-	"dump struct as memory, binary"
-
-make_dump_file "dump srec mem intarr2.srec $array_start $array_end" \
-	"dump array as memory, srec"
-
-make_dump_file "dump srec mem intstr2.srec $struct_start $struct_end" \
-	"dump struct as memory, srec"
-
-make_dump_file "dump ihex mem intarr2.ihex $array_start $array_end" \
-	"dump array as memory, ihex"
-
-make_dump_file "dump ihex mem intstr2.ihex $struct_start $struct_end" \
-	"dump struct as memory, ihex"
-
-make_dump_file "dump tekhex mem intarr2.tekhex $array_start $array_end" \
-	"dump array as memory, tekhex"
-
-make_dump_file "dump tekhex mem intstr2.tekhex $struct_start $struct_end" \
-	"dump struct as memory, tekhex"
-
-# test complex expressions
-make_dump_file \
-	"dump srec mem intarr3.srec &intarray \(char *\) &intarray + sizeof intarray" \
-	"dump array as mem, srec, expressions"
-
-
-# Now start a fresh gdb session, and reload the saved value files.
-
-gdb_exit
-gdb_start
-gdb_file_cmd ${binfile}
-
-# Reload saved values one by one, and compare.
-
-if { ![string compare $array_val \
-	   [capture_value "intarray" "file binfile"]] } then {
-    fail "start with intarray un-initialized"
-} else {
-    pass "start with intarray un-initialized"
-}
-
-if { ![string compare $struct_val \
-	   [capture_value "intstruct" "file binfile"]] } then {
-    fail "start with intstruct un-initialized"
-} else {
-    pass "start with intstruct un-initialized"
-}
-
-proc test_reload_saved_value { filename msg oldval newval } {
-    global gdb_prompt
-    
-    gdb_file_cmd $filename
-    if { ![string compare $oldval \
-	       [capture_value $newval "$msg"]] } then { 
-	pass "$msg; value restored ok"
-    } else {
-	fail "$msg; value restored ok"
-    }
-}
-
-proc test_restore_saved_value { restore_args msg oldval newval } {
-    global gdb_prompt
-    
-    gdb_test "restore $restore_args" \
-	"Restoring .*" \
-	"$msg; file restored ok"
-    if { ![string compare $oldval \
-	       [capture_value $newval "$msg"]] } then { 
-	pass "$msg; value restored ok"
-    } else {
-	fail "$msg; value restored ok"
-    }
-}
-
-# srec format can not be loaded for 64-bit-only platforms
-if ![string compare $is64bitonly "no"] then {
-  test_reload_saved_value "intarr1.srec" "reload array as value, srec" \
-	$array_val "intarray"
-  test_reload_saved_value "intstr1.srec" "reload struct as value, srec" \
-	$struct_val "intstruct"
-  test_reload_saved_value "intarr2.srec" "reload array as memory, srec" \
-	$array_val "intarray"
-  test_reload_saved_value "intstr2.srec" "reload struct as memory, srec" \
-	$struct_val "intstruct"
-}
-
-# ihex format can not be loaded for 64-bit-only platforms
-if ![string compare $is64bitonly "no"] then {
-
-  test_reload_saved_value "intarr1.ihex" "reload array as value, intel hex" \
-	$array_val "intarray"
-  test_reload_saved_value "intstr1.ihex" "reload struct as value, intel hex" \
-	$struct_val "intstruct"
-  test_reload_saved_value "intarr2.ihex" "reload array as memory, intel hex" \
-	$array_val "intarray"
-  test_reload_saved_value "intstr2.ihex" "reload struct as memory, intel hex" \
-	$struct_val "intstruct"
-}
-
-# tekhex format can not be loaded for 64-bit-only platforms
-if ![string compare $is64bitonly "no"] then {
-  test_reload_saved_value "intarr1.tekhex" "reload array as value, tekhex" \
-	$array_val "intarray"
-  test_reload_saved_value "intstr1.tekhex" "reload struct as value, tekhex" \
-	$struct_val "intstruct"
-  test_reload_saved_value "intarr2.tekhex" "reload array as memory, tekhex" \
-	$array_val "intarray"
-  test_reload_saved_value "intstr2.tekhex" "reload struct as memory, tekhex" \
-	$struct_val "intstruct"
-}
-
-# Start a fresh gdb session
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Run to main.
-if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Program failed to run, so remaining tests in this file will automatically fail."
-}
-
-if { ![string compare $array_val \
-	   [capture_value "intarray" "load binfile"]] } then {
-    fail "start with intarray un-initialized, runto main"
-} else {
-    pass "start with intarray un-initialized, runto main"
-}
-
-if { ![string compare $struct_val \
-	   [capture_value "intstruct" "load binfile"]] } then {
-    fail "start with intstruct un-initialized, runto main"
-} else {
-    pass "start with intstruct un-initialized, runto main"
-}
-
-if ![string compare $is64bitonly "no"] then {
-  test_restore_saved_value "intarr1.srec" "array as value, srec" \
-	$array_val "intarray"
-
-  test_restore_saved_value "intstr1.srec" "struct as value, srec" \
-	$struct_val "intstruct"
-
-  gdb_test "print zero_all ()" "void" "zero all"
-
-  test_restore_saved_value "intarr2.srec" "array as memory, srec" \
-	$array_val "intarray"
-
-  test_restore_saved_value "intstr2.srec" "struct as memory, srec" \
-	$struct_val "intstruct"
-
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr1.ihex" "array as value, ihex" \
-	$array_val "intarray"
-
-  test_restore_saved_value "intstr1.ihex" "struct as value, ihex" \
-	$struct_val "intstruct"
-
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr2.ihex" "array as memory, ihex" \
-	$array_val "intarray"
-
-  test_restore_saved_value "intstr2.ihex" "struct as memory, ihex" \
-	$struct_val "intstruct"
-
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr1.tekhex" "array as value, tekhex" \
-	$array_val "intarray"
-
-  test_restore_saved_value "intstr1.tekhex" "struct as value, tekhex" \
-	$struct_val "intstruct"
-
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr2.tekhex" "array as memory, tekhex" \
-	$array_val "intarray"
-
-  test_restore_saved_value "intstr2.tekhex" "struct as memory, tekhex" \
-	$struct_val "intstruct"
-}
-
-gdb_test "print zero_all ()" ""
-
-test_restore_saved_value "intarr1.bin binary $array_start" \
-	"array as value, binary" \
-	$array_val "intarray"
-
-test_restore_saved_value "intstr1.bin binary $struct_start" \
-	"struct as value, binary" \
-	$struct_val "intstruct"
-
-gdb_test "print zero_all ()" ""
-
-test_restore_saved_value "intarr2.bin binary $array_start" \
-	"array as memory, binary" \
-	$array_val "intarray"
-
-test_restore_saved_value "intstr2.bin binary $struct_start" \
-	"struct as memory, binary" \
-	$struct_val "intstruct"
-
-# test restore with offset.
-
-set array2_start   [capture_value "/x &intarray2\[0\]"]
-set struct2_start  [capture_value "/x &intstruct2"]
-set array2_offset  \
-	[capture_value "(char *) &intarray2 - (char *) &intarray"]
-set struct2_offset \
-	[capture_value "(char *) &intstruct2 - (char *) &intstruct"]
-
-gdb_test "print zero_all ()" ""
-
-
-if ![string compare $is64bitonly "no"] then {
-  test_restore_saved_value "intarr1.srec $array2_offset" \
-	"array copy, srec" \
-	$array_val "intarray2"
-
-  test_restore_saved_value "intstr1.srec $struct2_offset" \
-	"struct copy, srec" \
-	$struct_val "intstruct2"
-
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr1.ihex $array2_offset" \
-	"array copy, ihex" \
-	$array_val "intarray2"
-
-  test_restore_saved_value "intstr1.ihex $struct2_offset" \
-	"struct copy, ihex" \
-	$struct_val "intstruct2"
-
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr1.tekhex $array2_offset" \
-	"array copy, tekhex" \
-	$array_val "intarray2"
-
-  test_restore_saved_value "intstr1.tekhex $struct2_offset" \
-	"struct copy, tekhex" \
-	$struct_val "intstruct2"
-}
-
-gdb_test "print zero_all ()" ""
-
-test_restore_saved_value "intarr1.bin binary $array2_start" \
-	"array copy, binary" \
-	$array_val "intarray2"
-
-test_restore_saved_value "intstr1.bin binary $struct2_start" \
-	"struct copy, binary" \
-	$struct_val "intstruct2"
-
-#
-# test restore with start/stop addresses.
-#
-# For this purpose, we will restore just the third element of the array, 
-# and check to see that adjacent elements are not modified.
-#
-# We will need the address and offset of the third and fourth elements.
-#
-
-set element3_start  [capture_value "/x &intarray\[3\]"]
-set element4_start  [capture_value "/x &intarray\[4\]"]
-set element3_offset \
-	[capture_value "/x (char *) &intarray\[3\] - (char *) &intarray\[0\]"]
-set element4_offset \
-	[capture_value "/x (char *) &intarray\[4\] - (char *) &intarray\[0\]"]
-
-if ![string compare $is64bitonly "no"] then {
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr1.srec 0 $element3_start $element4_start" \
-	"array partial, srec" 4 "intarray\[3\]"
-
-  gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 1"
-  gdb_test "print intarray\[4\] == 0" " = 1" "element 4 not changed - 1"
-
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr1.ihex 0 $element3_start $element4_start" \
-	"array partial, ihex" 4 "intarray\[3\]"
-
-  gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 2"
-  gdb_test "print intarray\[4\] == 0" " = 1" "element 4 not changed - 2"
-
-  gdb_test "print zero_all ()" ""
-
-  test_restore_saved_value "intarr1.tekhex 0 $element3_start $element4_start" \
-	"array partial, tekhex" 4 "intarray\[3\]"
-
-  gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 3"
-  gdb_test "print intarray\[4\] == 0" " = 1" "element 4 not changed - 3"
-}
-
-gdb_test "print zero_all ()" ""
-
-test_restore_saved_value \
-    "intarr1.bin binary $array_start $element3_offset $element4_offset" \
-    "array partial, binary" 4 "intarray\[3\]"
-
-gdb_test "print intarray\[2\] == 0" " = 1" "element 2 not changed - 4"
-gdb_test "print intarray\[4\] == 0" " = 1" "element 4 not changed - 4"
-
-if ![string compare $is64bitonly "no"] then {
-  gdb_test "print zero_all ()" "" ""
-
-  # restore with expressions 
-  test_restore_saved_value \
-	"intarr3.srec ${array2_start}-${array_start} &intarray\[3\] &intarray\[4\]" \
-	"array partial with expressions" 4 "intarray2\[3\]"
-
-  gdb_test "print intarray2\[2\] == 0" " = 1" "element 2 not changed, == 4"
-  gdb_test "print intarray2\[4\] == 0" " = 1" "element 4 not changed, == 4"
-}
-
-# clean up files
-
-remote_exec build "rm -f intarr1.bin intarr1b.bin intarr1.ihex intarr1.srec intarr1.tekhex intarr2.bin intarr2b.bin intarr2.ihex intarr2.srec intarr2.tekhex intstr1.bin intstr1b.bin intstr1.ihex intstr1.srec intstr1.tekhex intstr2.bin intstr2b.bin intstr2.ihex intstr2.srec intstr2.tekhex intarr3.srec"
diff --git a/gdb/testsuite/gdb.base/echo.exp b/gdb/testsuite/gdb.base/echo.exp
deleted file mode 100644
index c8220ff2d65..00000000000
--- a/gdb/testsuite/gdb.base/echo.exp
+++ /dev/null
@@ -1,44 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992, 1997 Free Software Foundation, 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 Rob Savoye. (rob@cygnus.com)
-
-# Crank up gdb.
-gdb_start
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test the echo command
-#
-
-# this sets the prms id number.  This is the number that will appear
-# on all the output logs.
-#	ex: set prms_id 643
-set prms_id 0
-
-# this sets the bug id id.  This is the number that will appear
-# on all the output logs. This is optional and if it is not set
-# it will appear on all output logs as a 0.
-#	ex: set bug_id 12
-set bug_id 0
-
-gdb_test "echo Hello world!\\n" "Hello world!" "Echo test"
diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp
deleted file mode 100644
index 8d9ef60e752..00000000000
--- a/gdb/testsuite/gdb.base/ena-dis-br.exp
+++ /dev/null
@@ -1,304 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1997, 1998, 1999, 2003, 2004 Free Software Foundation,
-# 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.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-global usestubs
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
-set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
-set bp_location9 [gdb_get_line_number "set breakpoint 9 here" $srcfile1]
-set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
-set bp_location13 [gdb_get_line_number "set breakpoint 13 here" $srcfile1]
-set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1]
-set bp_location15 [gdb_get_line_number "set breakpoint 15 here" $srcfile1]
-set bp_location16 [gdb_get_line_number "set breakpoint 16 here" $srcfile1]
-set bp_location17 [gdb_get_line_number "set breakpoint 17 here" $srcfile1]
-set bp_location18 [gdb_get_line_number "set breakpoint 18 here" $srcfile1]
-
-if ![runto_main] then { fail "enable/disable break tests suppressed" }
-
-# Verify that we can set a breakpoint (the location is irrelevant),
-# then enable it (yes, it's already enabled by default), then hit it.
-
-proc break_at { breakpoint where } {
-    global gdb_prompt
-    global expect_out
-
-    set test "break $breakpoint"
-    set bp 0
-    gdb_test_multiple "$test" "$test" {
-	-re "Breakpoint (\[0-9\]*) at .*$where.*$gdb_prompt $" {
-	    set bp $expect_out(1,string)
-	    pass "$test"
-	}
-    }
-    return $bp
-}
-
-set bp [break_at "marker1" " line ($bp_location15|$bp_location16)"]
-
-gdb_test "enable $bp" "" "enable break marker1"
-
-gdb_test "info break $bp" \
-    "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y.*" \
-    "info break marker1"
-
-# See the comments in condbreak.exp for "run until breakpoint at
-# marker1" for an explanation of the xfail below.
-set test "continue to break marker1"
-gdb_test_multiple "continue" "$test" {
-    -re "Breakpoint \[0-9\]*, marker1.*$gdb_prompt $" {
-	pass "$test"
-    }
-    -re "Breakpoint \[0-9\]*, $hex in marker1.*$gdb_prompt $" {
-	xfail "$test"
-    }
-}
-
-gdb_test "delete $bp" "" "delete break marker1"
-
-# Verify that we can set a breakpoint to be self-disabling after the
-# first time it triggers.
-set bp [break_at "marker2" " line ($bp_location8|$bp_location9)"]
-
-gdb_test "enable once $bp" "" "enable once break marker2"
-
-gdb_test "info break $bp" \
-    "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+dis\[ \t\]+y.*" \
-    "info auto-disabled break marker2"
-
-# See the comments in condbreak.exp for "run until breakpoint at
-# marker1" for an explanation of the xfail below.
-set test "continue to auto-disabled break marker2"
-gdb_test_multiple "continue" "$test" {
-    -re "Breakpoint \[0-9\]*, marker2.*$gdb_prompt $" {
-	pass "$test"
-    }
-    -re "Breakpoint \[0-9\]*, $hex in marker2.*$gdb_prompt $" {
-	xfail "$test"
-    }
-}
-
-gdb_test "info break $bp" \
-    "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+dis\[ \t\]+n.*" \
-    "info auto-disabled break marker2"
-
-# Verify that we don't stop at a disabled breakpoint.
-gdb_continue_to_end "no stop"
-rerun_to_main
-gdb_continue_to_end "no stop at auto-disabled break marker2"
-
-# Verify that we can set a breakpoint to be self-deleting after the
-# first time it triggers.
-if ![runto_main] then {
-    fail "enable/disable break tests suppressed"
-}
-
-set bp [break_at "marker3" " line ($bp_location17|$bp_location18)"]
-
-gdb_test "enable del $bp" "" "enable del break marker3"
-
-gdb_test "info break $bp" \
-    "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+del\[ \t\]+y.*" \
-    "info auto-deleted break marker2"
-
-gdb_test "continue" \
-    ".*marker3 .*:($bp_location17|$bp_location18).*" \
-    "continue to auto-deleted break marker3"
-
-gdb_test "info break $bp" \
-    ".*No breakpoint or watchpoint number.*" \
-    "info auto-deleted break marker3"
-
-# Verify that we can set a breakpoint and manually disable it (we've
-# already proven that disabled bp's don't trigger).
-
-set bp [break_at "marker4" " line ($bp_location14|$bp_location13).*"]
-
-gdb_test "disable $bp" "" "disable break marker4"
-
-gdb_test "info break $bp" \
-    "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+n.*" \
-    "info break marker4"
-
-# Verify that we can set a breakpoint with an ignore count N, which
-# should cause the next N triggers of the bp to be ignored.  (This is
-# a flavor of enablement/disablement, after all.)
-
-if ![runto_main] then {
-    fail "enable/disable break tests suppressed"
-}
-
-set bp [break_at "marker1" " line ($bp_location15|$bp_location16).*"]
-
-# Verify that an ignore of a non-existent breakpoint is gracefully
-# handled.
-
-gdb_test "ignore 999 2" \
-    "No breakpoint number 999..*" \
-    "ignore non-existent break"
-
-# Verify that a missing ignore count is gracefully handled.
-
-gdb_test "ignore $bp" \
-    "Second argument .specified ignore-count. is missing..*" \
-    "ignore break with missing ignore count"
-
-# Verify that a negative or zero ignore count is handled gracefully
-# (they both are treated the same).
-
-gdb_test "ignore $bp -1" \
-    "Will stop next time breakpoint \[0-9\]* is reached..*" \
-    "ignore break marker1 -1"
-
-gdb_test "ignore $bp 0" \
-    "Will stop next time breakpoint \[0-9\]* is reached..*" \
-    "ignore break marker1 0"
-
-gdb_test "ignore $bp 1" \
-    "Will ignore next crossing of breakpoint \[0-9\]*.*" \
-    "ignore break marker1"
-
-gdb_test "info break $bp" \
-    "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y.*ignore next 1 hits.*" \
-    "info ignored break marker1"
-
-gdb_continue_to_end "no stop at ignored break marker1"
-rerun_to_main
-
-# See the comments in condbreak.exp for "run until breakpoint at marker1" 
-# for an explanation of the xfail below.
-set test "continue to break marker1, 2nd time"
-gdb_test_multiple "continue" "$test" {
-    -re "Breakpoint \[0-9\]*, marker1.*$gdb_prompt $" {
-	pass "continue to break marker1, 2nd time"
-    }
-    -re "Breakpoint \[0-9\]*, $hex in marker1.*$gdb_prompt $" {
-	xfail "continue to break marker1, 2nd time"
-    }
-}
-
-# Verify that we can specify both an ignore count and an auto-delete.
-
-if ![runto_main] then {
-    fail "enable/disable break tests suppressed"
-}
-
-set bp [break_at marker1 " line ($bp_location15|$bp_location16).*"]
-
-gdb_test "ignore $bp 1" \
-    "Will ignore next crossing of breakpoint \[0-9\]*.*" \
-    "ignore break marker1"
-
-gdb_test "enable del $bp" "" "enable del break marker1"
-
-gdb_test "info break $bp" \
-    "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+del\[ \t\]+y.*ignore next 1 hits.*" \
-    "info break marker1"
-
-gdb_continue_to_end "no stop at ignored & auto-deleted break marker1"
-rerun_to_main
-
-gdb_test "continue" \
-    ".*marker1 .*:($bp_location15|$bp_location16).*" \
-    "continue to ignored & auto-deleted break marker1"
-
-# Verify that a disabled breakpoint's ignore count isn't updated when
-# the bp is encountered.
-
-if ![runto_main] then {
-    fail "enable/disable break tests suppressed"
-}
-
-set bp [break_at marker1 " line ($bp_location15|$bp_location16)"]
-
-gdb_test "ignore $bp 10" \
-    "Will ignore next 10 crossings of breakpoint \[0-9\]*.*" \
-    "ignore break marker1"
-
-gdb_test "disable $bp" "" "disable break marker1"
-
-gdb_continue_to_end "no stop at ignored & disabled break marker1"
-rerun_to_main
-
-gdb_test "info break $bp" \
-    "\[0-9\]*\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+n.*ignore next 10 hits.*" \
-    "info ignored & disabled break marker1"
-
-# Verify that GDB correctly handles the "continue" command with an argument,
-# which is an ignore count to set on the currently stopped-at breakpoint.
-# (Also verify that GDB gracefully handles the case where the inferior
-# isn't stopped at a breakpoint.)
-#
-if ![runto_main] then { fail "enable/disable break tests suppressed" }
-
-gdb_test "break $bp_location1" \
-    "Breakpoint \[0-9\]*.*, line $bp_location1.*" \
-    "prepare to continue with ignore count"
-
-gdb_test "continue 2" \
-    "Will ignore next crossing of breakpoint \[0-9\]*.  Continuing..*" \
-    "continue with ignore count"
-
-gdb_test "next" ".*$bp_location11\[ \t\]*marker1.*" \
-    step after continue with ignore count"
-
-set test "continue with ignore count, not stopped at bpt"
-gdb_test_multiple "continue 2" "$test" {
-    -re "Not stopped at any breakpoint; argument ignored.*$gdb_prompt $" {
-	pass "$test"
-    }
-    -re "No breakpoint number -1.*$gdb_prompt $" {
-	kfail gdb/1689 "$test"
-    }
-}
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/ending-run.c b/gdb/testsuite/gdb.base/ending-run.c
deleted file mode 100644
index 8c67706fbe9..00000000000
--- a/gdb/testsuite/gdb.base/ending-run.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Test program for <next-at-end> and
- * <leaves-core-file-on-quit> bugs.
- */
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef PROTOTYPES
-int callee (int x)
-#else
-int callee( x )
-int x;
-#endif
-{
-    int y = x * x;
-    return (y - 2);
-}
-
-int main()
-{
-
-    int *p;
-    int i;
-
-    p = (int *) malloc( 4 );
-
-    for (i = 1; i < 10; i++)
-        {
-            printf( "%d ", callee( i ));
-            fflush (stdout);
-        }
-    printf( " Goodbye!\n" ); fflush (stdout);
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
deleted file mode 100644
index 1363a000ca4..00000000000
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ /dev/null
@@ -1,330 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
-# Software Foundation, 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.
-
-# use this to debug:
-#
-#log_user 1
-
-# ending-run.exp -- Expect script to test ending a test run in gdb
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile ending-run
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-remote_exec build "rm -f ${binfile}"
-remote_exec build "rm -f core"
-
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# CHFts23469: Test that you can "clear" a bp set at
-# a line _before_ the routine (which will default to the
-# first line in the routine, which turns out to correspond
-# to the prolog--that's another bug...)
-#
-
-gdb_test "b ending-run.c:1" ".*Breakpoint.*ending-run.c, line 1.*" \
-	"bpt at line before routine"
-
-gdb_test "b ending-run.c:13" \
-	".*Note.*also.*Breakpoint 2.*ending-run.c, line 13.*" \
-	"b ending-run.c:13, one"
-
-# Set up to go to the next-to-last line of the program
-#
-gdb_test "b ending-run.c:31" ".*Breakpoint 3.*ending-run.c, line 31.*"
-
-# Expect to hit the bp at line "1", but symbolize this
-# as line "13".  Then try to clear it--this should work.
-#
-if [target_info exists use_gdb_stub] {
-  gdb_test "continue" ".*Breakpoint.*1.*callee.*13.*"
-} else {
-  gdb_test "r" ".*Breakpoint.*1.*callee.*13.*"
-}
-gdb_test "cle" ".*Deleted breakpoints 2 1.*" "clear worked"
-send_gdb "i b\n"
-gdb_expect {
-    -re ".* breakpoint .* breakpoint .*$gdb_prompt $" { 
-	fail "cleared bp at line before routine" 
-    }
-    -re ".*3.*main.*31.*$gdb_prompt $" { 
-	pass "cleared bp at line before routine" 
-    }
-    -re ".*$gdb_prompt $" { 
-	fail "cleared bp at line before routine (info b)" 
-    }
-}
-
-# Test some other "clear" combinations
-#
-gdb_test "b ending-run.c:1" ".*Breakpoint.*4.*"
-gdb_test "b ending-run.c:13" ".*Note.*also.*Breakpoint.*5.*" "b ending-run.c:13, two"
-gdb_test "cle ending-run.c:13" \
-	".*Deleted breakpoint 5.*" "Only cleared 1 by line"
-
-send_gdb "inf line ending-run.c:13\n"
-gdb_expect {
-    -re ".*address (0x\[0-9a-fA-F]*).*$gdb_prompt $" {
-        set line_eight $expect_out(1,string)
-        gdb_test "b 13" ".*Breakpoint.*6.*"
-        gdb_test "cle *$line_eight" ".*Deleted breakpoints 6 4.*" "Clear 2 by address"
-    }
-    -re ".*$gdb_prompt $" {
-        fail "need to fix test for new compile outcome"
-    }
-}
-
-send_gdb "inf line ending-run.c:14\n"
-gdb_expect {
-    -re ".*address (0x\[0-9a-fA-F]*).*$gdb_prompt $" {
-        set line_nine $expect_out(1,string)
-        gdb_test "b ending-run.c:14" ".*Breakpoint 7.*ending-run.c, line 14.*"
-        gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 8.*" "Breakpoint 7 at *ending-run.c:14"
-        gdb_test "c" ".*Breakpoint.*7.*callee.*14.*"
-        gdb_test "cle" ".*Deleted breakpoints 8 7.*" "Clear 2 by default"
-    }
-    -re ".*$gdb_prompt $" {
-        fail "need to fix test for new compile outcome"
-    }
-}
-
-send_gdb "i b\n"
-gdb_expect {
-    -re ".* breakpoint .* breakpoint .*$gdb_prompt $" {
-        fail "all set to continue (didn't clear bps)" 
-    }
-    -re ".*3.*main.*31.*$gdb_prompt $" {
-        pass "all set to continue"
-    }
-    -re ".*$gdb_prompt $" {
-        fail "all set to continue (missing bp at end)"
-    }
-}
-
-
-# See if we can step out with control.  The "1 2 3" stuff
-# is output from the program.
-#
-if ![gdb_skip_stdio_test "cont"] {
-    gdb_test "cont" ".*1 2 7 14 23 34 47 62 79.*Breakpoint.*31.*"
-} else {
-    gdb_test "cont" ".*Breakpoint.*31.*"
-}
-
-if ![gdb_skip_stdio_test "Step to return"] {
-    gdb_test "next" ".*Goodbye!.*32.*" \
-	    "Step to return"
-} else {
-    gdb_test "next" "" ""
-}
-
-set old_timeout $timeout
-set timeout 50
-set program_exited 0
-send_gdb "next\n"
-gdb_expect {
-    -re "33.*$gdb_prompt $" {
-	# sometimes we stop at the closing brace, if so, do another next
-	send_gdb "next\n"
-	gdb_expect {
-	    -re ".*Unable to find return pc for this frame.*$gdb_prompt $" {
-		fail "step out of main (Old bug came back!)"
-		gdb_test "n" ".*" ""
-	    }
-	    -re ".*in.*start.*$gdb_prompt $" { 
-		pass "step out of main"
-	    }
-	    -re ".*in.*bsp_trap.*$gdb_prompt $" { 
-		pass "step out of main"
-	    }
-	    -re ".*in.*init.*$gdb_prompt $" { 
-		# This is what happens on sparc64-elf ultra.
-		pass "step out of main"
-	    }
-	    -re ".*in.*dll_crt0_1.*$gdb_prompt $" {
-		# This is what happens on Cygwin.
-	        pass "step out of main"
-	    }
-	    -re ".*Program exited normally.*$gdb_prompt $" {
-		# This is what happens on Linux i86 (and I would expect others)
-		set program_exited 1
-		pass "step out of main"
-	    }
-	    -re ".*in .nope ().*$gdb_prompt $" {
-		# This is what happens on Solaris currently -sts 1999-08-25
-		pass "step out of main (on Solaris)"
-	    }
-	    -re ".*in _int_reset ().*$gdb_prompt $" {
-		# This is what happens on Sanyo XStormy16
-		pass "step out of main"
-	    }
-	    -re ".*init ().*$gdb_prompt $" {
-		# This is what happens on many Mips targets
-		pass "step out of main"
-	    }
-	    -re ".*in ..change.mode ().*$gdb_prompt $" {
-		# This is what happens on ARM in thumb mode -fn 2000-02-01
-		pass "step out of main (on ARM thumb)"
-	    }
-	    -re ".*in.*\\\$START\\\$.*from.*dld.sl.*$gdb_prompt $" { 
-		pass "step out of main"
-	    }
-	    -re ".*in __wrap__?main ().*$gdb_prompt $" {
-		pass "step out of main (status wrapper)"
-	    }
-	    -re "__setup_argv_for_main (.*).*$gdb_prompt $" {
-		# On sh, another wrapper function (start_l) exists, so
-		# another `next' is necessary.
-		gdb_test "next" ".*in start_l ().*" "step out of main (on sh)"
-	    }
-            -re ".*$gdb_prompt $" { fail "step out of main (at end 2)" }
-	    timeout { 
-		fail "step out of main (hang or timeout on step at end 2)" 
-	    }
-	}
-    }
-    -re ".*Unable to find return pc for this frame.*$gdb_prompt $" {
-        fail "Old bug came back!"
-        gdb_test "n" ".*" ""
-    }
-    -re ".*in.*start.*$gdb_prompt $" { 
-        pass "step out of main"
-    }
-    -re ".*in.*\\\$START\\\$.*from.*dld.sl.*$gdb_prompt $"  {
-        pass "step out of main (2)"
-    }
-    -re ".*Program exited normally.*$gdb_prompt $" {
-	# This is what happens on Linux i86 (and I would expect others)
-	set program_exited 1
-	pass "step out of main"
-    }
-    -re ".*in.*currently asm.*$gdb_prompt $" { 
-        pass "step out of main (into assembler)"
-    }
-    -re ".*Program received signal SIGTRAP.*$gdb_prompt $" {
-        pass "Cygmon stopped in ending trap."
-    }
-    -re ".*$gdb_prompt $" { fail "step out of main (at end 1)" }
-    timeout { fail "step out of main (hang or timeout on step at end 1)" }
-}
-
-# When we're talking to a program running on a real stand-alone board,
-# every BSP's exit function behaves differently, so there's no single
-# way to tell whether we've exited gracefully or not.  So don't run
-# these tests when use_gdb_stub is set, or when we're running under Cygmon.
-set program_exited_normally 0
-set program_not_exited 0
-set program_in_exit 0
-if {! [target_info exists use_gdb_stub]
-    && (! [target_info exists use_cygmon] || ! [target_info use_cygmon])} {
-    global program_exited;
-    if {[eval expr $program_exited == 0]} {
-	send_gdb "n\n"
-	gdb_expect {
-	    -re "Program exited normally.*$gdb_prompt $" {
-		# If we actually have debug info for the start function,
-		# then we won't get the "Single-stepping until function
-		# exit" message.
-		pass "step to end of run"
-		set program_exited_normally 1
-	    }
-	    -re "Single.*EXIT code 0\r\n.*Program exited normally.*$gdb_prompt $" {
-		pass "step to end of run (status wrapper)"
-		set program_exited_normally 1
-	    }
-	    -re "Single.*EXIT code 0\r\n.*$gdb_prompt $" {
-		pass "step to end of run (status wrapper)"
-	    }
-	    -re ".*Single.*Program exited.*$gdb_prompt $" {
-		pass "step to end of run"
-		set program_exited_normally 1
-	    }
-	    -re ".*Single.*in exit.*from.*dld.sl.*$gdb_prompt $" {
-		pass "step to end of run" 
-		set program_in_exit 1
-	    }
-	    -re ".*Single.*_int_reset.*$gdb_prompt $" {
-	        pass "step to end of run"
-		if {![istarget "xstormy16-*-*"]} {
-		    set program_exited_normally 1
-		}
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "step to end of run"
-		set program_not_exited 1
-	    }
-	    timeout { 
-		fail "(timeout) step to end of run" 
-		set program_not_exited 1
-	    }
-	}   
-    }
-
-    if {$program_in_exit} {
-	if {[gdb_test "c" ".*" "continue after exit"] == 0} {
-	    set program_exited_normally 1
-	}
-    } else {
-	unsupported "continue after exit"
-    }
-
-    set timeout $old_timeout
-
-    if {$program_exited_normally} {
-        gdb_test "n" ".*The program is not being run.*" "don't step after run"
-    } elseif {$program_not_exited} {
-	unresolved "don't step after run"
-    } else {
-	unsupported "don't step after run"
-    }
-
-    set exec_output [remote_exec host "ls core"]
-
-    if [ regexp "core not found" $exec_output]  {
-	pass "No core dumped on quit"
-    } else {
-	if [ regexp "No such file or directory" $exec_output] {
-	    pass "ls: core (No core dumped on quit)"
-	} else {
-	    remote_exec build "rm -f core"
-	    fail "ls: core (Core dumped on quit)"
-	}
-    }
-}
-
-#remote_exec build "rm -f ${binfile}"
-return 0
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/environ.exp b/gdb/testsuite/gdb.base/environ.exp
deleted file mode 100644
index b00052ba00d..00000000000
--- a/gdb/testsuite/gdb.base/environ.exp
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1997, 1998, 1999, 2003 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-global usestubs
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-# This test exists solely to exercise the "environment" commands for
-# code-coverage on HP-UX.
-#
-if ![istarget "hppa*-*-hpux*"] then {
-  return
-}
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then { fail "environment command tests suppressed" }
-
-# (No, this is not really related to the environment commands.  But it's
-# a convenient place to verify that this command works.)
-#
-send_gdb "info program\n"
-gdb_expect {
-  -re ".*Using the running image of child process \[0-9\]*.\r\nProgram stopped at 0x\[0-9a-fA-F\]*.\r\nIt stopped at breakpoint 1..*$gdb_prompt $"\
-          {pass "info program"}
-  -re "$gdb_prompt $"\
-          {fail "info program"}
-  timeout {fail "(timeout) info program"}
-}
-
-# We don't really care where this step lands, so long as it gets
-# the inferior pushed off the breakpoint it's currently on...
-#
-send_gdb "next\n"
-gdb_expect {
-  -re ".*$gdb_prompt $"\
-          {pass "step before info program"}
-  timeout {fail "(timeout) step before info program"}
-}
-send_gdb "info program\n"
-gdb_expect {
-  -re ".*Using the running image of child process \[0-9\]*.\r\nProgram stopped at 0x\[0-9a-fA-F\]*.\r\nIt stopped after being stepped..*$gdb_prompt $"\
-          {pass "info program after step"}
-  -re "$gdb_prompt $"\
-          {fail "info program after step"}
-  timeout {fail "(timeout) info program after step"}
-}
-
-if ![runto_main] then { fail "environment command tests suppressed" }
-
-send_gdb "delete\n"
-gdb_expect {
-  -re ".*y or n. $"\
-          {send_gdb "y\n"
-           gdb_expect {
-             -re ".*$gdb_prompt $"\
-                     {pass "delete breakpoint before info program"}
-             timeout {fail "(timeout) delete breakpoint before info program"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "delete breakpoint before info program"}
-  timeout {fail "(timeout) delete breakpoint before info program"}
-}
-send_gdb "info program\n"
-gdb_expect {
-  -re ".*Using the running image of child process \[0-9\]*.\r\nProgram stopped at 0x\[0-9a-fA-F\]*.\r\nIt stopped at a breakpoint that has since been deleted..*$gdb_prompt $"\
-          {pass "info program after deleted breakpoint"}
-  -re "$gdb_prompt $"\
-          {fail "info program after deleted breakpoint"}
-  timeout {fail "(timeout) info program after deleted breakpoint"}
-}
-
-# Verify that we can show all currently-set environment variables.
-# (It's a bit hacky, but nonetheless probably safe to check for at
-# least the SHELL variable.)
-#
-# need to increase timeout because of very long output
-set oldtimeout $timeout
-set timeout [expr "$timeout + 300"]
-
-send_gdb "show environment\n"
-gdb_expect {
-  -re ".*SHELL=(\[a-zA-Z0-9\]*).*$gdb_prompt $"\
-          {pass "show environment"}
-  -re "$gdb_prompt $"\
-          {fail "show environment"}
-  timeout {fail "(timeout) show environment"}
-}
-set timeout $oldtimeout
-
-# Verify that we can unset a specific environment variable.
-#
-send_gdb "unset environment EDITOR\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "issue unset environment"}
-  timeout {fail "(timeout) issue unset environment"}
-}
-send_gdb "show environment EDITOR\n"
-gdb_expect {
-  -re "Environment variable \"EDITOR\" not defined.\r\n$gdb_prompt $"\
-          {pass "unset environment"}
-  -re "$gdb_prompt $"\
-          {fail "unset environment"}
-  timeout {fail "(timeout) unset environment"}
-}
-
-# Verify that we can unset all environment variables.
-#
-send_gdb "unset environment\n"
-gdb_expect {
-  -re "Delete all environment variables.*y or n. $"\
-          {send_gdb "y\n"
-           gdb_expect {
-             -re "$gdb_prompt $"\
-                     {pass "unset entire environment"}
-             timeout {fail "(timeout) unset entire environment"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "unset entire environment"}
-  timeout {fail "(timeout) unset entire environment"}
-}
-
-# Verify that we can set a specific environment variable.
-#
-send_gdb "set environment EDITOR emacs\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "issue set environment"}
-  timeout {fail "(timeout) issue set environment"}
-}
-send_gdb "show environment EDITOR\n"
-gdb_expect {
-  -re "EDITOR = emacs\r\n$gdb_prompt $"\
-          {pass "set environment"}
-  -re "$gdb_prompt $"\
-          {fail "set environment"}
-  timeout {fail "(timeout) set environment"}
-}
-
-# Verify that GDB responds gracefully to a request to set environment,
-# with no variable name.
-#
-send_gdb "set environment\n"
-gdb_expect {
-  -re "Argument required .environment variable and value..*$gdb_prompt $"\
-          {pass "set environment without variable disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "set environment without variable disallowed"}
-  timeout {fail "(timeout) set environment without variable disallowed"}
-}
-
-# I'm not sure just what GDB has in mind in explicitly checking
-# for this variant, but since GDB handles it, test it.
-#
-send_gdb "set environment =\n"
-gdb_expect {
-  -re "Argument required .environment variable to set..*$gdb_prompt $"\
-          {pass "set environment equals without variable disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "set environment equals without variable disallowed"}
-  timeout {fail "(timeout) set environment equals without variable disallowed"}
-}
-
-# Setting an environment variable without a value sets it to a NULL
-# value.
-#
-send_gdb "set environment EDITOR\n"
-gdb_expect {
-  -re "Setting environment variable \"EDITOR\" to null value..*$gdb_prompt $"\
-          {pass "issue set environment without variable value"}
-  -re "$gdb_prompt $"\
-          {fail "issue set environment without variable value"}
-  timeout {fail "(timeout) issue set environment without variable value"}
-}
-send_gdb "show environment EDITOR\n"
-gdb_expect {
-  -re "EDITOR = \r\n$gdb_prompt $"\
-          {pass "set environment without variable value"}
-  -re "$gdb_prompt $"\
-          {fail "set environment without variable value"}
-  timeout {fail "(timeout) set environment without variable value"}
-}
-
-# Verify that GDB responds gracefully to an attempt to show a
-# non-existent environment variable.  (We hope this variable is
-# undefined!)
-#
-send_gdb "show environment FOOBARBAZGRUNGESPAZBALL\n"
-gdb_expect {
-  -re "Environment variable \"FOOBARBAZGRUNGESPAZBALL\" not defined..*$gdb_prompt $"\
-          {pass "show non-existent environment variable disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "show non-existent environment variable disallowed"}
-  timeout {fail "(timeout) show non-existent environment variable disallowed"}
-}
-
-# Verify that GDB can set an environment variable hitherto undefined.
-#
-send_gdb "set environment FOOBARBAZGRUNGESPAZBALL t\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "issue set environment for previously undefined variable"}
-  timeout {fail "(timeout) issue set environment for previously undefined variable"}
-}
-send_gdb "show environment FOOBARBAZGRUNGESPAZBALL\n"
-gdb_expect {
-  -re "FOOBARBAZGRUNGESPAZBALL = t\r\n$gdb_prompt $"\
-          {pass "set environment for previously undefined variable"}
-  -re "$gdb_prompt $"\
-          {fail "set environment for previously undefined variable"}
-  timeout {fail "(timeout) set environment for previously undefined variable"}
-}
-
-# Verify that GDB can also set an environment variable using the "="
-# syntax.
-#
-send_gdb "set environment FOOBARBAZGRUNGESPAZBALL = t\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "issue set environment with equals"}
-  timeout {fail "(timeout) issue set environment with equals"}
-}
-send_gdb "show environment FOOBARBAZGRUNGESPAZBALL\n"
-gdb_expect {
-  -re "FOOBARBAZGRUNGESPAZBALL = t\r\n$gdb_prompt $"\
-          {pass "set environment with equals"}
-  -re "$gdb_prompt $"\
-          {fail "set environment with equals"}
-  timeout {fail "(timeout) set environment with equals"}
-}
-
-# Verify that GDB can set an environment variable to a value that has
-# an embedded (trailing, in this case) equals.
-#
-send_gdb "set environment FOOBARBAZGRUNGESPAZBALL t=\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "issue set environment with trailing equals"}
-  timeout {fail "(timeout) issue set environment with trailing equals"}
-}
-send_gdb "show environment FOOBARBAZGRUNGESPAZBALL\n"
-gdb_expect {
-  -re "FOOBARBAZGRUNGESPAZBALL = t=\r\n$gdb_prompt $"\
-          {pass "set environment with trailing equals"}
-  -re "$gdb_prompt $"\
-          {fail "set environment with trailing equals"}
-  timeout {fail "(timeout) set environment with trailing equals"}
-}
-
-# Verify that GDB can set an environment variable to a value preceded
-# by whitespace, and that such whitespace is ignored (not included
-# in the set value).
-#
-send_gdb "set environment FOOBARBAZGRUNGESPAZBALL =     foo\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "issue set environment with preceding whitespace"}
-  timeout {fail "(timeout) issue set environment with preceding whitespace"}
-}
-send_gdb "show environment FOOBARBAZGRUNGESPAZBALL\n"
-gdb_expect {
-  -re "FOOBARBAZGRUNGESPAZBALL = foo\r\n$gdb_prompt $"\
-          {pass "set environment with preceding whitespace"}
-  -re "$gdb_prompt $"\
-          {fail "set environment with preceding whitespace"}
-  timeout {fail "(timeout) set environment with preceding whitespace"}
-}
-
-# Verify that GDB can manipulate the distinguished PATH variable.
-#
-send_gdb "path /tmp/FOOBARBAZGRUNGESPAZBALL\n"
-gdb_expect {
-  -re ".*Executable and object file path: /tmp/FOOBARBAZGRUNGESPAZBALL.*$gdb_prompt $"\
-          {pass "issue path"}
-  -re "$gdb_prompt $"\
-          {fail "issue path"}
-  timeout {fail "(timeout) issue path"}
-}
-send_gdb "show paths\n"
-gdb_expect {
-  -re "Executable and object file path: /tmp/FOOBARBAZGRUNGESPAZBALL.*$gdb_prompt $"\
-          {pass "show paths"}
-  -re "$gdb_prompt $"\
-          {fail "show paths"}
-  timeout {fail "(timeout) show paths"}
-}
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/eval-skip.exp b/gdb/testsuite/gdb.base/eval-skip.exp
deleted file mode 100644
index a2ab25cdaf7..00000000000
--- a/gdb/testsuite/gdb.base/eval-skip.exp
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1998, 1999 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite
-
-#
-# tests to cover evaluate_subexp_standard with the EVAL_SKIP flag set.
-# this happens for instance when there is short circuit evaluation in the && and ||
-# operators, or in the non returned part of a (x ? y: z) expression.
-# the part that is not evaluated is parsed and evaluated anyway, but with
-# the EVAL_SKIP flag set
-# 
-# source file "int-type.c"
-#
-
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-# Check to see if we have an executable to test.  If not, then either we
-# haven't tried to compile one, or the compilation failed for some reason.
-# In either case, just notify the user and skip the tests in this file.
-
-set testfile "int-type"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-if [get_compiler_info $binfile] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_test "set variable x=14" "" "set variable x=14"
-gdb_test "set variable y=2" "" "set variable y=2"
-gdb_test "set variable z=2" "" "set variable z=2"
-gdb_test "set variable w=3" "" "set variable w=3"
-
-send_gdb "print (0 && (x+y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x+y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x+y))" }
-    timeout           { fail "(timeout) print value of (0 && (x+y))" }
-  }
-
-
-send_gdb "print (0 && (x-y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x-y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x-y))" }
-    timeout           { fail "(timeout) print value of (0 && (x-y))" }
-  }
-
-
-send_gdb "print (0 && (x*y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x*y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x*y))" }
-    timeout           { fail "(timeout) print value of (0 && (x*y))" }
-  }
-
-
-
-send_gdb "print (0 && (x/y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x/y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x/y))" }
-    timeout           { fail "(timeout) print value of (0 && (x/y))" }
-  }
-
-
-send_gdb "print (0 && (x%y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x%y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x%y))" }
-    timeout           { fail "(timeout) print value of (0 && (x%y))" }
-  }
-
-
-send_gdb "print (0 && (x&&y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x&&y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x&&y))" }
-    timeout           { fail "(timeout) print value of (0 && (x&&y))" }
-  }
-
-
-
-send_gdb "print (0 && (x||y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x||y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x||y))" }
-    timeout           { fail "(timeout) print value of (0 && (x||y))" }
-  }
-
-
-
-send_gdb "print (0 && (x&y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x&y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x&y))" }
-    timeout           { fail "(timeout) print value of (0 && (x&y))" }
-  }
-
-
-send_gdb "print (0 && (x|y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x|y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x|y))" }
-    timeout           { fail "(timeout) print value of (0 && (x|y))" }
-  }
-
-
-send_gdb "print (0 && (x^y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x^y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x^y))" }
-    timeout           { fail "(timeout) print value of (0 && (x^y))" }
-  }
-
-
-
-send_gdb "print (0 && (x < y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x < y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x < y))" }
-    timeout           { fail "(timeout) print value of (0 && (x < y))" }
-  }
-
-
-send_gdb "print (0 && (x <= y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x <= y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x <= y))" }
-    timeout           { fail "(timeout) print value of (0 && (x <= y))" }
-  }
-
-
-
-send_gdb "print (0 && (x>y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x>y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x>y))" }
-    timeout           { fail "(timeout) print value of (0 && (x>y))" }
-  }
-
-
-send_gdb "print (0 && (x>=y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x>=y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x>=y))" }
-    timeout           { fail "(timeout) print value of (0 && (x>=y))" }
-  }
-
-
-
-send_gdb "print (0 && (x==y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x==y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x==y))" }
-    timeout           { fail "(timeout) print value of (0 && (x==y))" }
-  }
-
-
-send_gdb "print (0 && (x!=y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x!=y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x!=y))" }
-    timeout           { fail "(timeout) print value of (0 && (x!=y))" }
-  }
-
-
-send_gdb "print (0 && (x<<31))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x<<31))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x<<31))" }
-    timeout           { fail "(timeout) print value of (0 && (x<<31))" }
-  }
-
-
-send_gdb "print (0 && (x>>31))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x>>31))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x>>31))" }
-    timeout           { fail "(timeout) print value of (0 && (x>>31))" }
-  }
-
-
-
-send_gdb "print (0 && (!x))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (!x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (!x))" }
-    timeout           { fail "(timeout) print value of (0 && (!x))" }
-  }
-
-
-send_gdb "print (0 && (~x))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (~x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (~x))" }
-    timeout           { fail "(timeout) print value of (0 && (~x))" }
-  }
-
-send_gdb "print (0 && (-x))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (-x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (-x))" }
-    timeout           { fail "(timeout) print value of (0 && (-x))" }
-  }
-
-
-send_gdb "print (0 && (x++))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x++))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x++))" }
-    timeout           { fail "(timeout) print value of (0 && (x++))" }
-  }
-
-
-send_gdb "print (0 && (++x))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (++x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (++x))" }
-    timeout           { fail "(timeout) print value of (0 && (++x))" }
-  }
-
-
-send_gdb "print (0 && (x--))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x--))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x--))" }
-    timeout           { fail "(timeout) print value of (0 && (x--))" }
-  }
-
-
-send_gdb "print (0 && (--x))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (--x))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (--x))" }
-    timeout           { fail "(timeout) print value of (0 && (--x))" }
-  }
-
-send_gdb "print (0 && (x+=7))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x+=7))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x+=7))" }
-    timeout           { fail "(timeout) print value of (0 && (x+=7))" }
-  }
-
-send_gdb "print (0 && (x=y))\n"
-gdb_expect {
-    -re ".$decimal = $false\r\n$gdb_prompt $" {
-        pass "print value of (0 && (x=y))"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (0 && (x=y))" }
-    timeout           { fail "(timeout) print value of (0 && (x=y))" }
-  }
-
-gdb_exit
-return 0
-
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/execd-prog.c b/gdb/testsuite/gdb.base/execd-prog.c
deleted file mode 100644
index 5469f656c0c..00000000000
--- a/gdb/testsuite/gdb.base/execd-prog.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-/* There is a global_i in foll-exec, which exec's us.  We
-   should not be able to see that other definition of global_i
-   after we are exec'd.
-   */
-int  global_i = 0;
-
-#ifdef PROTOTYPES
-int main (int argc, char **argv)
-#else
-main (argc, argv)
-  int  argc;
-  char *  argv[];
-#endif
-{
-  /* There is a local_j in foll-exec, which exec's us.  We
-     should not be able to see that other definition of local_j
-     after we are exec'd.
-     */
-  int  local_j = argc;
-  char *  s;
-
-  printf ("Hello from execd-prog...\n");
-  if (argc != 2)
-    {
-      printf ("expected one string argument\n");
-      exit (-1);
-    }
-  s = argv[1];
-  printf ("argument received: %s\n", s);
-}
diff --git a/gdb/testsuite/gdb.base/exprs.c b/gdb/testsuite/gdb.base/exprs.c
deleted file mode 100644
index b35c3a58d25..00000000000
--- a/gdb/testsuite/gdb.base/exprs.c
+++ /dev/null
@@ -1,254 +0,0 @@
-#ifdef PROTOTYPES
-int main (int argc, char **argv, char **envp)
-#else
-main (argc, argv, envp)
-     int argc;
-     char **argv;
-     char **envp;
-#endif
-{
-    extern void dummy();
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-    dummy();
-    return 0;
-    
-}
-
-/* We put main() right up front so its line number doesn't keep changing.  */
-
-/*
- *	Test file with lots of different types, for testing the
- *	"whatis" command.
- */
-
-/*
- *	First the basic C types.
- */
-
-#if !defined (__STDC__) && !defined (_AIX)
-#define signed  /**/
-#endif
-
-char		v_char;
-signed char	v_signed_char;
-unsigned char	v_unsigned_char;
-
-short		v_short;
-signed short	v_signed_short;
-unsigned short	v_unsigned_short;
-
-int		v_int;
-signed int	v_signed_int;
-unsigned int	v_unsigned_int;
-
-long		v_long;
-signed long	v_signed_long;
-unsigned long	v_unsigned_long;
-
-float		v_float;
-double		v_double;
-/*
- *	Now some derived types, which are arrays, functions-returning,
- *	pointers, structures, unions, and enumerations.
- */
-
-/**** arrays *******/
-
-char		v_char_array[2];
-signed char	v_signed_char_array[2];
-unsigned char	v_unsigned_char_array[2];
-
-short		v_short_array[2];
-signed short	v_signed_short_array[2];
-unsigned short	v_unsigned_short_array[2];
-
-int		v_int_array[2];
-signed int	v_signed_int_array[2];
-unsigned int	v_unsigned_int_array[2];
-
-long		v_long_array[2];
-signed long	v_signed_long_array[2];
-unsigned long	v_unsigned_long_array[2];
-
-float		v_float_array[2];
-double		v_double_array[2];
-/**** pointers *******/
-
-char		*v_char_pointer;
-signed char	*v_signed_char_pointer;
-unsigned char	*v_unsigned_char_pointer;
-
-short		*v_short_pointer;
-signed short	*v_signed_short_pointer;
-unsigned short	*v_unsigned_short_pointer;
-
-int		*v_int_pointer;
-signed int	*v_signed_int_pointer;
-unsigned int	*v_unsigned_int_pointer;
-
-long		*v_long_pointer;
-signed long	*v_signed_long_pointer;
-unsigned long	*v_unsigned_long_pointer;
-
-float		*v_float_pointer;
-double		*v_double_pointer;
-
-/**** structs *******/
-
-struct t_struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct1;
-
-struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct2;
-
-/**** unions *******/
-
-union t_union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union;
-
-union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union2;
-
-/*** Functions returning type ********/
-
-char		v_char_func () { return(0); }
-signed char	v_signed_char_func () { return (0); }
-unsigned char	v_unsigned_char_func () { return (0); }
-
-short		v_short_func () { return (0); }
-signed short	v_signed_short_func () { return (0); }
-unsigned short	v_unsigned_short_func () { return (0); }
-
-int		v_int_func () { return (0); }
-signed int	v_signed_int_func () { return (0); }
-unsigned int	v_unsigned_int_func () { return (0); }
-
-long		v_long_func () { return (0); }
-signed long	v_signed_long_func () { return (0); }
-unsigned long	v_unsigned_long_func () { return (0); }
-
-float		v_float_func () { return (0.0); }
-double		v_double_func () { return (0.0); }
-
-/**** Some misc more complicated things *******/
-
-struct link {
-	struct link *next;
-#ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
-#else
-	struct link *(*linkfunc) ();
-#endif
-	struct t_struct stuff[1][2][3];
-} *s_link;
-
-union tu_link {
-	struct link *next;
-#ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
-#else
-	struct link *(*linkfunc) ();
-#endif
-	struct t_struct stuff[1][2][3];
-} u_link;
-
-/**** Enumerations *******/
-
-enum colors {red, green, blue} color;
-enum cars {chevy, ford, porsche} clunker;
-
-
-void dummy()
-{
-  /* Some linkers (e.g. on AIX) remove unreferenced variables,
-     so make sure to reference them. */
-  v_char = 0;
-  v_signed_char = 1;
-  v_unsigned_char = 2;
-
-  v_short = 3;
-  v_signed_short = 4;
-  v_unsigned_short = 5;    
-
-  v_int = 6;
-  v_signed_int = 7;
-  v_unsigned_int = 8;    
-
-  v_long = 9;
-  v_signed_long = 10;
-  v_unsigned_long = 11;    
-  
-  v_float = 100.0;
-  v_double = 200.0;
-  v_char_array[0] = v_char;
-  v_signed_char_array[0] = v_signed_char;
-  v_unsigned_char_array[0] = v_unsigned_char;
-
-  v_short_array[0] = v_short;
-  v_signed_short_array[0] = v_signed_short;
-  v_unsigned_short_array[0] = v_unsigned_short;
-
-  v_int_array[0] = v_int;
-  v_signed_int_array[0] = v_signed_int;
-  v_unsigned_int_array[0] = v_unsigned_int;
-
-  v_long_array[0] = v_long;
-  v_signed_long_array[0] = v_signed_long;
-  v_unsigned_long_array[0] = v_unsigned_long;
-
-  v_float_array[0] = v_float;
-  v_double_array[0] = v_double;
-  v_char_pointer = &v_char;
-  v_signed_char_pointer = &v_signed_char;
-  v_unsigned_char_pointer = &v_unsigned_char;
-
-  v_short_pointer = &v_short;
-  v_signed_short_pointer = &v_signed_short;
-  v_unsigned_short_pointer = &v_unsigned_short;
-
-  v_int_pointer = &v_int;
-  v_signed_int_pointer = &v_signed_int;
-  v_unsigned_int_pointer = &v_unsigned_int;
-
-  v_long_pointer = &v_long;
-  v_signed_long_pointer = &v_signed_long;
-  v_unsigned_long_pointer = &v_unsigned_long;
-
-  v_float_pointer = &v_float;
-  v_double_pointer = &v_double;
-
-  color = red;
-  clunker = porsche;
-
-  u_link.next = s_link;
-
-  v_struct2.v_int_member = v_struct1.v_int_member;
-  v_union2.v_short_member = v_union.v_short_member;
-}
diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp
deleted file mode 100644
index f6ce7194a8c..00000000000
--- a/gdb/testsuite/gdb.base/exprs.exp
+++ /dev/null
@@ -1,253 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 2000,
-#   2001, 2003 Free Software Foundation, 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 Rob Savoye. (rob@cygnus.com)
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "exprs"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-proc test_expr { args } {
-    if { [llength $args] % 2 } {
-	warning "an even # of arguments should be passed to test_expr"
-    }
-    set last_ent [expr [llength $args] - 1];
-    set testname [lindex $args $last_ent];
-    if [gdb_test [lindex $args 0] "" "$testname (setup)"] {
-	gdb_suppress_tests;
-    }
-    for {set x 1} {$x < $last_ent} {set x [expr $x + 2]} {
-	if [gdb_test [lindex $args $x] [lindex $args [expr $x + 1]] "$testname ([lindex $args $x])"] {
-	    gdb_suppress_tests;
-	}
-    }
-    gdb_stop_suppressing_tests;
-}
-#
-# test expressions with "char" types
-#
-test_expr "set variable v_char=127" "print v_char == 0" "\\$\[0-9\]* = $false"  "print v_char == 127" "\\$\[0-9\]* = $true"  "print char =="
-test_expr "set variable v_char=127" "print v_char != 0" "\\$\[0-9\]* = $true"  "print v_char != 127" "\\$\[0-9\]* = $false"  "print char !="
-test_expr "set variable v_char=127" "print v_char < 0" "\\$\[0-9\]* = $false"  "print v_char < 127" "\\$\[0-9\]* = $false"  "print char <"
-test_expr "set variable v_char=127" "print v_char > 0" "\\$\[0-9\]* = $true"  "print v_char > 127" "\\$\[0-9\]* = $false"  "print char >"
-#
-# test expressions with "signed char" types
-#
-test_expr "set variable v_signed_char=127" "print v_signed_char == 0" "\\$\[0-9\]* = $false"  "print v_signed_char == 127" "\\$\[0-9\]* = $true"  "print signed char =="
-test_expr "set variable v_signed_char=127" "print v_signed_char != 0" "\\$\[0-9\]* = $true"  "print v_signed_char != 127" "\\$\[0-9\]* = $false"  "print signed char !="
-test_expr "set variable v_signed_char=127" "print v_signed_char < 0" "\\$\[0-9\]* = $false"  "print v_signed_char < 127" "\\$\[0-9\]* = $false"  "print signed char <"
-test_expr "set variable v_signed_char=127" "print v_signed_char > 0" "\\$\[0-9\]* = $true"  "print v_signed_char > 127" "\\$\[0-9\]* = $false"  "print signed char >"
-# make char a minus
-test_expr "set variable v_signed_char=-1" "print v_signed_char == 0" "\\$\[0-9\]* = $false"  "print v_signed_char == -1" "\\$\[0-9\]* = $true"  "print signed char == (minus)"
-test_expr "set variable v_signed_char=-1" "print v_signed_char != 0" "\\$\[0-9\]* = $true"  "print v_signed_char != -1" "\\$\[0-9\]* = $false"  "print signed char != (minus)"
-test_expr "set variable v_signed_char=-1" "print v_signed_char < 0" "\\$\[0-9\]* = $true"  "print v_signed_char < 127" "\\$\[0-9\]* = $true"  "print signed char < (minus)"
-test_expr "set variable v_signed_char=-1" "print v_signed_char > 0" "\\$\[0-9\]* = $false"  "print v_signed_char > 127" "\\$\[0-9\]* = $false"  "print signed char > (minus)"
-#
-# test expressions with "unsigned char" types
-#
-test_expr "set variable v_unsigned_char=127" "print v_unsigned_char == 0" "\\$\[0-9\]* = $false"  "print v_unsigned_char == 127" "\\$\[0-9\]* = $true"  "print unsigned char =="
-test_expr "set variable v_unsigned_char=127" "print v_unsigned_char != 0" "\\$\[0-9\]* = $true"  "print v_unsigned_char != 127" "\\$\[0-9\]* = $false"  "print unsigned char !="
-test_expr "set variable v_unsigned_char=127" "print v_unsigned_char < 0" "\\$\[0-9\]* = $false"  "print v_unsigned_char < 127" "\\$\[0-9\]* = $false"  "print unsigned char <"
-test_expr "set variable v_unsigned_char=127" "print v_unsigned_char > 0" "\\$\[0-9\]* = $true"  "print v_unsigned_char > 127" "\\$\[0-9\]* = $false"  "print unsigned char >"
-# make char a minus
-test_expr "set variable v_unsigned_char=~0" "print v_unsigned_char == 0" "\\$\[0-9\]* = $false"  "print v_unsigned_char == ~0" "\\$\[0-9\]* = $false"  "print v_unsigned_char == (unsigned char)~0" "\\$\[0-9\]* = $true" "print unsigned char == (~0)"
-test_expr "set variable v_unsigned_char=~0" "print v_unsigned_char != 0" "\\$\[0-9\]* = $true"  "print v_unsigned_char != (unsigned char)~0" "\\$\[0-9\]* = $false"  "print v_unsigned_char != ~0" "\\$\[0-9\]* = $true" "print unsigned char != (~0)"
-test_expr "set variable v_unsigned_char=~0" "print v_unsigned_char < 0" "\\$\[0-9\]* = $false"  "print v_unsigned_char < 127" "\\$\[0-9\]* = $false"  "print unsigned char < (~0)"
-test_expr "set variable v_unsigned_char=~0" "print v_unsigned_char > 0" "\\$\[0-9\]* = $true"  "print v_unsigned_char > 127" "\\$\[0-9\]* = $true"  "print unsigned char > (~0)"
-#
-# test expressions with "short" types
-#
-test_expr "set variable v_short=0x7FFF" "print v_short == 0" "\\$\[0-9\]* = $false"  "print v_short == 0x7FFF" "\\$\[0-9\]* = $true"  "print signed short =="
-test_expr "set variable v_short=0x7FFF" "print v_short != 0" "\\$\[0-9\]* = $true"  "print v_short != 0x7FFF" "\\$\[0-9\]* = $false"  "print signed short !="
-test_expr "set variable v_short=0x7FFF" "print v_short < 0" "\\$\[0-9\]* = $false"  "print v_short < 0x7FFF" "\\$\[0-9\]* = $false"  "print signed short <"
-test_expr "set variable v_short=0x7FFF" "print v_short > 0" "\\$\[0-9\]* = $true"  "print v_short > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed short >"
-# make short a minus
-test_expr "set variable v_short=-1" "print v_short == 0" "\\$\[0-9\]* = $false"  "print v_short == -1" "\\$\[0-9\]* = $true"  "print signed short == (minus)"
-test_expr "set variable v_short=-1" "print v_short != 0" "\\$\[0-9\]* = $true"  "print v_short != -1" "\\$\[0-9\]* = $false"  "print signed short != (minus)"
-test_expr "set variable v_short=-1" "print v_short < 0" "\\$\[0-9\]* = $true"  "print v_short < 0x7FFF" "\\$\[0-9\]* = $true"  "print signed short < (minus)"
-test_expr "set variable v_short=-1" "print v_short > 0" "\\$\[0-9\]* = $false"  "print v_short > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed short > (minus)"
-#
-# test expressions with "signed short" types
-#
-test_expr "set variable v_signed_short=0x7FFF" "print v_signed_short == 0" "\\$\[0-9\]* = $false"  "print v_signed_short == 0x7FFF" "\\$\[0-9\]* = $true"  "print signed signed short =="
-test_expr "set variable v_signed_short=0x7FFF" "print v_signed_short != 0" "\\$\[0-9\]* = $true"  "print v_signed_short != 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed short !="
-test_expr "set variable v_signed_short=0x7FFF" "print v_signed_short < 0" "\\$\[0-9\]* = $false"  "print v_signed_short < 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed short <"
-test_expr "set variable v_signed_short=0x7FFF" "print v_signed_short > 0" "\\$\[0-9\]* = $true"  "print v_signed_short > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed short >"
-# make short a minus
-test_expr "set variable v_signed_short=-1" "print v_signed_short == 0" "\\$\[0-9\]* = $false"  "print v_signed_short == -1" "\\$\[0-9\]* = $true"  "print signed signed short == (minus)"
-test_expr "set variable v_signed_short=-1" "print v_signed_short != 0" "\\$\[0-9\]* = $true"  "print v_signed_short != -1" "\\$\[0-9\]* = $false"  "print signed signed short != (minus)"
-test_expr "set variable v_signed_short=-1" "print v_signed_short < 0" "\\$\[0-9\]* = $true"  "print v_signed_short < 0x7FFF" "\\$\[0-9\]* = $true"  "print signed signed short < (minus)"
-test_expr "set variable v_signed_short=-1" "print v_signed_short > 0" "\\$\[0-9\]* = $false"  "print v_signed_short > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed short > (minus)"
-#
-# test expressions with "unsigned short" types
-#
-test_expr "set variable v_unsigned_short=0x7FFF" "print v_unsigned_short == 0" "\\$\[0-9\]* = $false"  "print v_unsigned_short == 0x7FFF" "\\$\[0-9\]* = $true"  "print unsigned short =="
-test_expr "set variable v_unsigned_short=0x7FFF" "print v_unsigned_short != 0" "\\$\[0-9\]* = $true"  "print v_unsigned_short != 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned short !="
-test_expr "set variable v_unsigned_short=0x7FFF" "print v_unsigned_short < 0" "\\$\[0-9\]* = $false"  "print v_unsigned_short < 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned short <"
-test_expr "set variable v_unsigned_short=0x7FFF" "print v_unsigned_short > 0" "\\$\[0-9\]* = $true"  "print v_unsigned_short > 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned short >"
-# make short a minus
-test_expr "set variable v_unsigned_short=~0" "print v_unsigned_short == 0" "\\$\[0-9\]* = $false"  "print sizeof (v_unsigned_short) < sizeof (~0) && v_unsigned_short == ~0" "\\$\[0-9\]* = $false"  "print v_unsigned_short == (unsigned short)~0" "\\$\[0-9\]* = $true"  "print unsigned short == (~0)"
-test_expr "set variable v_unsigned_short=~0" "print v_unsigned_short != 0" "\\$\[0-9\]* = $true"  "print v_unsigned_short != (unsigned short)~0" "\\$\[0-9\]* = $false"  "print unsigned short != (~0)"
-test_expr "set variable v_unsigned_short=~0" "print v_unsigned_short < 0" "\\$\[0-9\]* = $false"  "print v_unsigned_short < 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned short < (~0)"
-test_expr "set variable v_unsigned_short=~0" "print v_unsigned_short > 0" "\\$\[0-9\]* = $true"  "print v_unsigned_short > 0x7FFF" "\\$\[0-9\]* = $true"  "print unsigned short > (~0)"
-#
-# test expressions with "int" types
-#
-test_expr "set variable v_int=0x7FFF" "print v_int == 0" "\\$\[0-9\]* = $false"  "print v_int == 0x7FFF" "\\$\[0-9\]* = $true"  "print signed int =="
-test_expr "set variable v_int=0x7FFF" "print v_int != 0" "\\$\[0-9\]* = $true"  "print v_int != 0x7FFF" "\\$\[0-9\]* = $false"  "print signed int !="
-test_expr "set variable v_int=0x7FFF" "print v_int < 0" "\\$\[0-9\]* = $false"  "print v_int < 0x7FFF" "\\$\[0-9\]* = $false"  "print signed int <"
-test_expr "set variable v_int=0x7FFF" "print v_int > 0" "\\$\[0-9\]* = $true"  "print v_int > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed int >"
-# make int a minus
-test_expr "set variable v_int=-1" "print v_int == 0" "\\$\[0-9\]* = $false"  "print v_int == -1" "\\$\[0-9\]* = $true"  "print signed int == (minus)"
-test_expr "set variable v_int=-1" "print v_int != 0" "\\$\[0-9\]* = $true"  "print v_int != -1" "\\$\[0-9\]* = $false"  "print signed int != (minus)"
-test_expr "set variable v_int=-1" "print v_int < 0" "\\$\[0-9\]* = $true"  "print v_int < 0x7FFF" "\\$\[0-9\]* = $true"  "print signed int < (minus)"
-test_expr "set variable v_int=-1" "print v_int > 0" "\\$\[0-9\]* = $false"  "print v_int > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed int > (minus)"
-#
-# test expressions with "signed int" types
-#
-test_expr "set variable v_signed_int=0x7FFF" "print v_signed_int == 0" "\\$\[0-9\]* = $false"  "print v_signed_int == 0x7FFF" "\\$\[0-9\]* = $true"  "print signed signed int =="
-test_expr "set variable v_signed_int=0x7FFF" "print v_signed_int != 0" "\\$\[0-9\]* = $true"  "print v_signed_int != 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed int !="
-test_expr "set variable v_signed_int=0x7FFF" "print v_signed_int < 0" "\\$\[0-9\]* = $false"  "print v_signed_int < 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed int <"
-test_expr "set variable v_signed_int=0x7FFF" "print v_signed_int > 0" "\\$\[0-9\]* = $true"  "print v_signed_int > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed int >"
-# make int a minus
-test_expr "set variable v_signed_int=-1" "print v_signed_int == 0" "\\$\[0-9\]* = $false"  "print v_signed_int == -1" "\\$\[0-9\]* = $true"  "print signed signed int == (minus)"
-test_expr "set variable v_signed_int=-1" "print v_signed_int != 0" "\\$\[0-9\]* = $true"  "print v_signed_int != -1" "\\$\[0-9\]* = $false"  "print signed signed int != (minus)"
-test_expr "set variable v_signed_int=-1" "print v_signed_int < 0" "\\$\[0-9\]* = $true"  "print v_signed_int < 0x7FFF" "\\$\[0-9\]* = $true"  "print signed signed int < (minus)"
-test_expr "set variable v_signed_int=-1" "print v_signed_int > 0" "\\$\[0-9\]* = $false"  "print v_signed_int > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed int > (minus)"
-#
-# test expressions with "unsigned int" types
-#
-test_expr "set variable v_unsigned_int=0x7FFF" "print v_unsigned_int == 0" "\\$\[0-9\]* = $false"  "print v_unsigned_int == 0x7FFF" "\\$\[0-9\]* = $true"  "print unsigned int =="
-test_expr "set variable v_unsigned_int=0x7FFF" "print v_unsigned_int != 0" "\\$\[0-9\]* = $true"  "print v_unsigned_int != 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned int !="
-test_expr "set variable v_unsigned_int=0x7FFF" "print v_unsigned_int < 0" "\\$\[0-9\]* = $false"  "print v_unsigned_int < 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned int <"
-test_expr "set variable v_unsigned_int=0x7FFF" "print v_unsigned_int > 0" "\\$\[0-9\]* = $true"  "print v_unsigned_int > 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned int >"
-# make int a minus
-test_expr "set variable v_unsigned_int=~0" "print v_unsigned_int == 0" "\\$\[0-9\]* = $false"  "print v_unsigned_int == ~0" "\\$\[0-9\]* = $true"  "print v_unsigned_int == (unsigned int)~0" "\\$\[0-9\]* = $true"  "print unsigned int == (~0)"
-test_expr "set variable v_unsigned_int=~0" "print v_unsigned_int != 0" "\\$\[0-9\]* = $true"  "print v_unsigned_int != (unsigned int)~0" "\\$\[0-9\]* = $false"  "print unsigned int != (~0)"
-test_expr "set variable v_unsigned_int=~0" "print v_unsigned_int < 0" "\\$\[0-9\]* = $false"  "print v_unsigned_int < 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned int < (~0)"
-test_expr "set variable v_unsigned_int=~0" "print v_unsigned_int > 0" "\\$\[0-9\]* = $true"  "print v_unsigned_int > 0x7FFF" "\\$\[0-9\]* = $true"  "print unsigned int > (~0)"
-#
-# test expressions with "long" types
-#
-test_expr "set variable v_long=0x7FFF" "print v_long == 0" "\\$\[0-9\]* = $false"  "print v_long == 0x7FFF" "\\$\[0-9\]* = $true"  "print signed long =="
-test_expr "set variable v_long=0x7FFF" "print v_long != 0" "\\$\[0-9\]* = $true"  "print v_long != 0x7FFF" "\\$\[0-9\]* = $false"  "print signed long !="
-test_expr "set variable v_long=0x7FFF" "print v_long < 0" "\\$\[0-9\]* = $false"  "print v_long < 0x7FFF" "\\$\[0-9\]* = $false"  "print signed long <"
-test_expr "set variable v_long=0x7FFF" "print v_long > 0" "\\$\[0-9\]* = $true"  "print v_long > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed long >"
-# make long a minus
-test_expr "set variable v_long=-1" "print v_long == 0" "\\$\[0-9\]* = $false"  "print v_long == -1" "\\$\[0-9\]* = $true"  "print signed long == (minus)"
-test_expr "set variable v_long=-1" "print v_long != 0" "\\$\[0-9\]* = $true"  "print v_long != -1" "\\$\[0-9\]* = $false"  "print signed long != (minus)"
-test_expr "set variable v_long=-1" "print v_long < 0" "\\$\[0-9\]* = $true"  "print v_long < 0x7FFF" "\\$\[0-9\]* = $true"  "print signed long < (minus)"
-test_expr "set variable v_long=-1" "print v_long > 0" "\\$\[0-9\]* = $false"  "print v_long > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed long > (minus)"
-#
-# test expressions with "signed long" types
-#
-test_expr "set variable v_signed_long=0x7FFF" "print v_signed_long == 0" "\\$\[0-9\]* = $false"  "print v_signed_long == 0x7FFF" "\\$\[0-9\]* = $true"  "print signed signed long =="
-test_expr "set variable v_signed_long=0x7FFF" "print v_signed_long != 0" "\\$\[0-9\]* = $true"  "print v_signed_long != 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed long !="
-test_expr "set variable v_signed_long=0x7FFF" "print v_signed_long < 0" "\\$\[0-9\]* = $false"  "print v_signed_long < 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed long <"
-test_expr "set variable v_signed_long=0x7FFF" "print v_signed_long > 0" "\\$\[0-9\]* = $true"  "print v_signed_long > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed long >"
-# make long a minus
-test_expr "set variable v_signed_long=-1" "print v_signed_long == 0" "\\$\[0-9\]* = $false"  "print v_signed_long == -1" "\\$\[0-9\]* = $true"  "print signed signed long == (minus)"
-test_expr "set variable v_signed_long=-1" "print v_signed_long != 0" "\\$\[0-9\]* = $true"  "print v_signed_long != -1" "\\$\[0-9\]* = $false"  "print signed signed long != (minus)"
-test_expr "set variable v_signed_long=-1" "print v_signed_long < 0" "\\$\[0-9\]* = $true"  "print v_signed_long < 0x7FFF" "\\$\[0-9\]* = $true"  "print signed signed long < (minus)"
-test_expr "set variable v_signed_long=-1" "print v_signed_long > 0" "\\$\[0-9\]* = $false"  "print v_signed_long > 0x7FFF" "\\$\[0-9\]* = $false"  "print signed signed long > (minus)"
-#
-# test expressions with "unsigned long" types
-#
-test_expr "set variable v_unsigned_long=0x7FFF" "print v_unsigned_long == 0" "\\$\[0-9\]* = $false"  "print v_unsigned_long == 0x7FFF" "\\$\[0-9\]* = $true"  "print unsigned long =="
-test_expr "set variable v_unsigned_long=0x7FFF" "print v_unsigned_long != 0" "\\$\[0-9\]* = $true"  "print v_unsigned_long != 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned long !="
-test_expr "set variable v_unsigned_long=0x7FFF" "print v_unsigned_long < 0" "\\$\[0-9\]* = $false"  "print v_unsigned_long < 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned long <"
-test_expr "set variable v_unsigned_long=0x7FFF" "print v_unsigned_long > 0" "\\$\[0-9\]* = $true"  "print v_unsigned_long > 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned long >"
-# make long a minus
-test_expr "set variable v_unsigned_long=~0" "print v_unsigned_long == 0" "\\$\[0-9\]* = $false"  "print v_unsigned_long == ~0" "\\$\[0-9\]* = $true"  "print v_unsigned_long == (unsigned long)~0" "\\$\[0-9\]* = $true"  "print unsigned long == (~0)"
-test_expr "set variable v_unsigned_long=~0" "print v_unsigned_long != 0" "\\$\[0-9\]* = $true"  "print v_unsigned_long != (unsigned long)~0" "\\$\[0-9\]* = $false"  "print unsigned long != (~0)"
-test_expr "set variable v_unsigned_long=~0" "print v_unsigned_long < 0" "\\$\[0-9\]* = $false"  "print v_unsigned_long < 0x7FFF" "\\$\[0-9\]* = $false"  "print unsigned long < (~0)"
-test_expr "set variable v_unsigned_long=~0" "print v_unsigned_long > 0" "\\$\[0-9\]* = $true"  "print v_unsigned_long > 0x7FFF" "\\$\[0-9\]* = $true"  "print unsigned long > (~0)"
-#
-# Test expressions with casts to a pointer.
-# NB: Some architectures convert a ``NULL'' pointer into
-#     something else. Don't simply test for 0.
-#
-test_expr "set variable v_signed_char = 0" "print (void*)v_signed_char" "\\$\[0-9\]* = .void \\*. $hex" "print (void*)v_signed_char"
-test_expr "set variable v_signed_short = 0" "print (void*)v_signed_short" "\\$\[0-9\]* = .void \\*. $hex" "print (void*)v_signed_short"
-test_expr "set variable v_signed_int = 0" "print (void*)v_signed_int" "\\$\[0-9\]* = .void \\*. $hex" "print (void*)v_signed_int"
-test_expr "set variable v_signed_long = 0" "print (void*)v_signed_long" "\\$\[0-9\]* = .void \\*. $hex" "print (void*)v_signed_long"
-test_expr "set variable v_unsigned_char = 0" "print (void*)v_unsigned_char" "\\$\[0-9\]* = .void \\*. $hex" "print (void*)v_unsigned_char"
-test_expr "set variable v_unsigned_short = 0" "print (void*)v_unsigned_short" "\\$\[0-9\]* = .void \\*. $hex" "print (void*)v_unsigned_short"
-test_expr "set variable v_unsigned_int = 0" "print (void*)v_unsigned_int" "\\$\[0-9\]* = .void \\*. $hex" "print (void*)v_unsigned_int"
-test_expr "set variable v_unsigned_long = 0" "print (void*)v_unsigned_long" "\\$\[0-9\]* = .void \\*. $hex" "print (void*)v_unsigned_long"
-#
-# Test expressions with pointers out of range
-#
-# NB: For some architectures, all of sizeof(long),
-#     sizeof(long long) and sizeof(void*) are
-#     the same size so this test can not work.
-#
-send_gdb "print sizeof (long long) > sizeof (long)\n"
-gdb_expect {
-    -re "\\$\[0-9\]* = $true.*$gdb_prompt" {
-	set ok 1
-	pass "sizeof (long long) > sizeof (long) (true)"
-    }
-    -re "\\$\[0-9\]* = $false.*$gdb_prompt" {
-	set ok 0
-	pass "sizeof (long long) > sizeof (long) (false)"
-    }
-    timeout {
-	set ok 0
-	fail "sizeof (long long) > sizeof (long) (timeout)"
-    }
-}
-if [expr ! $ok] { setup_xfail "*-*-*" }
-gdb_test "print (void*) ((long long) (unsigned long) -1 + 1)" \
-	"warning: value truncated.*" "truncate (void*) 0x00000000ffffffff + 1"
-if [expr ! $ok] { setup_xfail "*-*-*" }
-gdb_test "print (void*) (~((long long)(unsigned long) -1) - 1)" \
-	"warning: value truncated.*" "truncate (void*) 0xffffffff00000000 - 1"
diff --git a/gdb/testsuite/gdb.base/fileio.c b/gdb/testsuite/gdb.base/fileio.c
deleted file mode 100644
index 69b51a28d5c..00000000000
--- a/gdb/testsuite/gdb.base/fileio.c
+++ /dev/null
@@ -1,506 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <unistd.h>
-/* TESTS :
- * - open(const char *pathname, int flags, mode_t mode);
-1) Attempt to create file that already exists - EEXIST
-2) Attempt to open a directory for writing - EISDIR
-3) Pathname does not exist - ENOENT
-4) Open for write but no write permission - EACCES   
-
-read(int fd, void *buf, size_t count);
-1) Read using invalid file descriptor - EBADF
-
-write(int fd, const void *buf, size_t count);
-1) Write using invalid file descriptor - EBADF
-2) Attempt to write to read-only file - EBADF
-
-lseek(int fildes, off_t offset, int whence);
-1) Seeking on an invalid file descriptor - EBADF
-2) Invalid "whence" (3rd param) value -  EINVAL
-
-close(int fd);
-1) Attempt to close an invalid file descriptor - EBADF
-
-stat(const char *file_name, struct stat *buf);
-1) Pathname is a null string -  ENOENT
-2) Pathname does not exist - ENOENT
-
-fstat(int filedes, struct stat *buf);
-1) Attempt to stat using an invalid file descriptor - EBADF
-
-isatty (int desc);
-Not applicable. We will test that it returns 1 when expected and a case
-where it should return 0.
-
-rename(const char *oldpath, const char *newpath);
-1) newpath is an existing directory, but oldpath is not a directory. - EISDIR
-2) newpath is a non-empty directory. - ENOTEMPTY or EEXIST
-3) newpath is a subdirectory of old path. - EINVAL
-4) oldpath does not exist. - ENOENT
-
-unlink(const char *pathname);
-1) pathname does not have write access. - EACCES
-2) pathname does not exist. - ENOENT
-
-time(time_t *t);
-Not applicable.
-
-system (const char * string);
-1) Invalid string/command. -  returns 127.  */
-static const char *strerrno (int err);
-
-#define FILENAME    "foo.fileio.test"
-#define RENAMED     "bar.fileio.test"
-#define NONEXISTANT "nofoo.fileio.test"
-#define NOWRITE     "nowrt.fileio.test"
-#define TESTDIR1     "dir1.fileio.test"
-#define TESTDIR2     "dir2.fileio.test"
-#define TESTSUBDIR   "dir1.fileio.test/subdir.fileio.test"
-
-#define STRING      "Hello World"
-
-int
-test_open ()
-{
-  int ret;
-
-  /* Test opening */
-  errno = 0;
-  ret = open (FILENAME, O_CREAT | O_TRUNC | O_RDWR, S_IWUSR | S_IRUSR);
-  printf ("open 1: ret = %d, errno = %d %s\n", ret, errno,
-	  ret >= 0 ? "OK" : "");
-  if (ret >= 0)
-    close (ret);
-  /* Creating an already existing file (created by fileio.exp) */
-  errno = 0;
-  ret = open (FILENAME, O_CREAT | O_EXCL | O_WRONLY, S_IWUSR | S_IRUSR);
-  printf ("open 2: ret = %d, errno = %d %s\n", ret, errno,
-	  strerrno (errno));
-  if (ret >= 0)
-    close (ret);
-  /* Open directory (for writing) */
-  errno = 0;
-  ret = open (".", O_WRONLY);
-  printf ("open 3: ret = %d, errno = %d %s\n", ret, errno,
-	  strerrno (errno));
-  if (ret >= 0)
-    close (ret);
-  /* Opening nonexistant file */
-  errno = 0;
-  ret = open (NONEXISTANT, O_RDONLY);
-  printf ("open 4: ret = %d, errno = %d %s\n", ret, errno,
-	  strerrno (errno));
-  if (ret >= 0)
-    close (ret);
-  /* Open for write but no write permission */
-  errno = 0;
-  ret = open (NOWRITE, O_CREAT | O_RDONLY, S_IRUSR);
-  if (ret >= 0)
-    {
-      close (ret);
-      errno = 0;
-      ret = open (NOWRITE, O_WRONLY);
-      printf ("open 5: ret = %d, errno = %d %s\n", ret, errno,
-	      strerrno (errno));
-      if (ret >= 0)
-	close (ret);
-    }
-  else
-    printf ("open 5: ret = %d, errno = %d\n", ret, errno);
-}
-
-int
-test_write ()
-{
-  int fd, ret;
-
-  /* Test writing */
-  errno = 0;
-  fd = open (FILENAME, O_WRONLY);
-  if (fd >= 0)
-    {
-      errno = 0;
-      ret = write (fd, STRING, strlen (STRING));
-      printf ("write 1: ret = %d, errno = %d %s\n", ret, errno,
-              ret == strlen (STRING) ? "OK" : "");
-      close (fd);
-    }
-  else
-    printf ("write 1: ret = %d, errno = %d\n", ret, errno);
-  /* Write using invalid file descriptor */
-  errno = 0;
-  ret = write (999, STRING, strlen (STRING));
-  printf ("write 2: ret = %d, errno = %d, %s\n", ret, errno,
-	  strerrno (errno));
-  /* Write to a read-only file */
-  errno = 0;
-  fd = open (FILENAME, O_RDONLY);
-  if (fd >= 0)
-    {
-      errno = 0;
-      ret = write (fd, STRING, strlen (STRING));
-      printf ("write 3: ret = %d, errno = %d %s\n", ret, errno,
-	      strerrno (errno));
-    }
-  else
-    printf ("write 3: ret = %d, errno = %d\n", ret, errno);
-}
-
-int
-test_read ()
-{
-  int fd, ret;
-  char buf[16];
-
-  /* Test reading */
-  errno = 0;
-  fd = open (FILENAME, O_RDONLY);
-  if (fd >= 0)
-    {
-      memset (buf, 0, 16);
-      errno = 0;
-      ret = read (fd, buf, 16);
-      buf[15] = '\0'; /* Don't trust anybody... */
-      if (ret == strlen (STRING))
-        printf ("read 1: %s %s\n", buf, !strcmp (buf, STRING) ? "OK" : "");
-      else
-	printf ("read 1: ret = %d, errno = %d\n", ret, errno);
-      close (fd);
-    }
-  else
-    printf ("read 1: ret = %d, errno = %d\n", ret, errno);
-  /* Read using invalid file descriptor */
-  errno = 0;
-  ret = read (999, buf, 16);
-  printf ("read 2: ret = %d, errno = %d %s\n", ret, errno,
-	  strerrno (errno));
-}
-
-int
-test_lseek ()
-{
-  int fd;
-  off_t ret = 0;
-
-  /* Test seeking */
-  errno = 0;
-  fd = open (FILENAME, O_RDONLY);
-  if (fd >= 0)
-    {
-      errno = 0;
-      ret = lseek (fd, 0, SEEK_CUR);
-      printf ("lseek 1: ret = %ld, errno = %d, %s\n", (long) ret, errno,
-              ret == 0 ? "OK" : "");
-      errno = 0;
-      ret = lseek (fd, 0, SEEK_END);
-      printf ("lseek 2: ret = %ld, errno = %d, %s\n", (long) ret, errno,
-              ret == 11 ? "OK" : "");
-      errno = 0;
-      ret = lseek (fd, 3, SEEK_SET);
-      printf ("lseek 3: ret = %ld, errno = %d, %s\n", (long) ret, errno,
-              ret == 3 ? "OK" : "");
-      close (fd);
-    }
-  else
-    {
-      printf ("lseek 1: ret = %d, errno = %d\n", ret, errno);
-      printf ("lseek 2: ret = %d, errno = %d\n", ret, errno);
-      printf ("lseek 3: ret = %d, errno = %d\n", ret, errno);
-    }
-  /* Seeking on an invalid file descriptor */
-
-}
-
-int
-test_close ()
-{
-  int fd, ret;
-
-  /* Test close */
-  errno = 0;
-  fd = open (FILENAME, O_RDONLY);
-  if (fd >= 0)
-    {
-      errno = 0;
-      ret = close (fd);
-      printf ("close 1: ret = %d, errno = %d, %s\n", ret, errno,
-              ret == 0 ? "OK" : "");
-    }
-  else
-    printf ("close 1: ret = %d, errno = %d\n", ret, errno);
-  /* Close an invalid file descriptor */
-  errno = 0;
-  ret = close (999);
-  printf ("close 2: ret = %d, errno = %d, %s\n", ret, errno,
-  	  strerrno (errno));
-}
-
-int
-test_stat ()
-{
-  int ret;
-  struct stat st;
-
-  /* Test stat */
-  errno = 0;
-  ret = stat (FILENAME, &st);
-  if (!ret)
-    printf ("stat 1: ret = %d, errno = %d %s\n", ret, errno,
-	    st.st_size == 11 ? "OK" : "");
-  else
-    printf ("stat 1: ret = %d, errno = %d\n", ret, errno);
-  /* NULL pathname */
-  errno = 0;
-  ret = stat (NULL, &st);
-  printf ("stat 2: ret = %d, errno = %d %s\n", ret, errno,
-  	  strerrno (errno));
-  /* Empty pathname */
-  errno = 0;
-  ret = stat ("", &st);
-  printf ("stat 3: ret = %d, errno = %d %s\n", ret, errno,
-  	  strerrno (errno));
-  /* Nonexistant file */
-  errno = 0;
-  ret = stat (NONEXISTANT, &st);
-  printf ("stat 4: ret = %d, errno = %d %s\n", ret, errno,
-  	  strerrno (errno));
-}
-
-int
-test_fstat ()
-{
-  int fd, ret;
-  struct stat st;
-
-  /* Test fstat */
-  errno = 0;
-  fd = open (FILENAME, O_RDONLY);
-  if (fd >= 0)
-    {
-      errno = 0;
-      ret = fstat (fd, &st);
-      if (!ret)
-	printf ("fstat 1: ret = %d, errno = %d %s\n", ret, errno,
-		st.st_size == 11 ? "OK" : "");
-      else
-	printf ("fstat 1: ret = %d, errno = %d\n", ret, errno);
-      close (fd);
-    }
-  else
-    printf ("fstat 1: ret = %d, errno = %d\n", ret, errno);
-  /* Fstat using invalid file descriptor */
-  errno = 0;
-  ret = fstat (999, &st);
-  printf ("fstat 2: ret = %d, errno = %d %s\n", ret, errno,
-  	  strerrno (errno));
-}
-
-int
-test_isatty ()
-{
-  int fd;
-
-  /* Check std I/O */
-  printf ("isatty 1: stdin %s\n", isatty (0) ? "yes OK" : "no");
-  printf ("isatty 2: stdout %s\n", isatty (1) ? "yes OK" : "no");
-  printf ("isatty 3: stderr %s\n", isatty (2) ? "yes OK" : "no");
-  /* Check invalid fd */
-  printf ("isatty 4: invalid %s\n", isatty (999) ? "yes" : "no OK");
-  /* Check open file */
-  fd = open (FILENAME, O_RDONLY);
-  if (fd >= 0)
-    {
-      printf ("isatty 5: file %s\n", isatty (fd) ? "yes" : "no OK");
-      close (fd);
-    }
-  else
-    printf ("isatty 5: file couldn't open\n");
-}
-
-
-int
-test_system ()
-{
-  /*
-   * Requires test framework to switch on "set remote system-call-allowed 1"
-   */
-  int ret;
-  char sys[512];
-
-  /* This test prepares the directory for test_rename() */
-  sprintf (sys, "mkdir -p %s %s", TESTSUBDIR, TESTDIR2);
-  ret = system (sys);
-  if (ret == 127)
-    printf ("system 1: ret = %d /bin/sh unavailable???\n", ret);
-  else
-    printf ("system 1: ret = %d %s\n", ret, ret == 0 ? "OK" : "");
-  /* Invalid command (just guessing ;-) ) */
-  ret = system ("wrtzlpfrmpft");
-  printf ("system 2: ret = %d %s\n", ret, WEXITSTATUS (ret) == 127 ? "OK" : "");
-}
-
-int
-test_rename ()
-{
-  int ret;
-  struct stat st;
-
-  /* Test rename */
-  errno = 0;
-  ret = rename (FILENAME, RENAMED);
-  if (!ret)
-    {
-      errno = 0;
-      ret = stat (FILENAME, &st);
-      if (ret && errno == ENOENT)
-        {
-	  errno = 0;
-	  ret = stat (RENAMED, &st);
-	  printf ("rename 1: ret = %d, errno = %d %s\n", ret, errno,
-		  strerrno (errno));
-	  errno = 0;
-	}
-      else
-	printf ("rename 1: ret = %d, errno = %d\n", ret, errno);
-    }
-  else
-    printf ("rename 1: ret = %d, errno = %d\n", ret, errno);
-  /* newpath is existing directory, oldpath is not a directory */
-  errno = 0;
-  ret = rename (RENAMED, TESTDIR2);
-  printf ("rename 2: ret = %d, errno = %d %s\n", ret, errno,
-	  strerrno (errno));
-  /* newpath is a non-empty directory */
-  errno = 0;
-  ret = rename (TESTDIR2, TESTDIR1);
-  printf ("rename 3: ret = %d, errno = %d %s\n", ret, errno,
-          strerrno (errno));
-  /* newpath is a subdirectory of old path */
-  errno = 0;
-  ret = rename (TESTDIR1, TESTSUBDIR);
-  printf ("rename 4: ret = %d, errno = %d %s\n", ret, errno,
-	  strerrno (errno));
-  /* oldpath does not exist */
-  errno = 0;
-  ret = rename (NONEXISTANT, FILENAME);
-  printf ("rename 5: ret = %d, errno = %d %s\n", ret, errno,
-	  strerrno (errno));
-}
-
-int
-test_unlink ()
-{
-  int ret;
-  char name[256];
-  char sys[512];
-
-  /* Test unlink */
-  errno = 0;
-  ret = unlink (RENAMED);
-  printf ("unlink 1: ret = %d, errno = %d %s\n", ret, errno,
-	  strerrno (errno));
-  /* No write access */
-  sprintf (name, "%s/%s", TESTDIR2, FILENAME);
-  errno = 0;
-  ret = open (name, O_CREAT | O_RDONLY, S_IRUSR | S_IWUSR);
-  if (ret >= 0)
-    {
-      sprintf (sys, "chmod -w %s", TESTDIR2);
-      ret = system (sys);
-      if (!ret)
-        {
-	  errno = 0;
-	  ret = unlink (name);
-	  printf ("unlink 2: ret = %d, errno = %d %s\n", ret, errno,
-		  strerrno (errno));
-        }
-      else
-	printf ("unlink 2: ret = %d chmod failed\n", ret, errno);
-    }
-  else
-    printf ("unlink 2: ret = %d, errno = %d\n", ret, errno);
-  /* pathname doesn't exist */
-  errno = 0;
-  ret = unlink (NONEXISTANT);
-  printf ("unlink 3: ret = %d, errno = %d %s\n", ret, errno,
-          strerrno (errno));
-}
-
-int
-test_time ()
-{
-  time_t ret, t;
-
-  errno = 0;
-  ret = time (&t);
-  printf ("time 1: ret = %ld, errno = %d, t = %ld %s\n", (long) ret, errno, (long) t, ret == t ? "OK" : "");
-  errno = 0;
-  ret = time (NULL);
-  printf ("time 2: ret = %ld, errno = %d, t = %ld %s\n",
-	  (long) ret, errno, (long) t, ret >= t && ret < t + 10 ? "OK" : "");
-}
-
-static const char *
-strerrno (int err)
-{
-  switch (err)
-    {
-    case 0: return "OK";
-#ifdef EACCES
-    case EACCES: return "EACCES";
-#endif
-#ifdef EBADF
-    case EBADF: return "EBADF";
-#endif
-#ifdef EEXIST
-    case EEXIST: return "EEXIST";
-#endif
-#ifdef EFAULT
-    case EFAULT: return "EFAULT";
-#endif
-#ifdef EINVAL
-    case EINVAL: return "EINVAL";
-#endif
-#ifdef EISDIR
-    case EISDIR: return "EISDIR";
-#endif
-#ifdef ENOENT
-    case ENOENT: return "ENOENT";
-#endif
-#ifdef ENOTEMPTY
-    case ENOTEMPTY: return "ENOTEMPTY";
-#endif
-#ifdef EBUSY
-    case EBUSY: return "EBUSY";
-#endif
-    default: return "E??";
-    }
-}
-
-int
-main ()
-{
-  /* Don't change the order of the calls.  They partly depend on each other */
-  test_open ();
-  test_write ();
-  test_read ();
-  test_lseek ();
-  test_close ();
-  test_stat ();
-  test_fstat ();
-  test_isatty ();
-  test_system ();
-  test_rename ();
-  test_unlink ();
-  test_time ();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
deleted file mode 100644
index 2a717bff182..00000000000
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ /dev/null
@@ -1,281 +0,0 @@
-#   Copyright 2002, 2003, 2004
-#   Free Software Foundation, 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 Corinna Vinschen <vinschen@redhat.com>
-
-if [target_info exists gdb,nofileio] {
-    verbose "Skipping fileio.exp because of no fileio capabilities."
-    continue
-}
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "fileio"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
-remote_exec build {sh -xc rm\ -rf\ *.fileio.test}
-
-set oldtimeout $timeout
-set timeout [expr "$timeout + 60"]
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-send_gdb "tbreak 81\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*open 1:.*OK.*test_open \\(\\) at.*$srcfile:81.*" \
-"Open a file"
-
-send_gdb "tbreak 88\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*open 2:.*EEXIST.*test_open \\(\\) at.*$srcfile:88.*" \
-"Creating already existing file returns EEXIST"
-
-send_gdb "tbreak 95\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*open 3:.*EISDIR.*test_open \\(\\) at.*$srcfile:95.*" \
-"Open directory for writing returns EISDIR"
-
-send_gdb "tbreak 102\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*open 4:.*ENOENT.*test_open \\(\\) at.*$srcfile:102.*" \
-"Opening nonexistant file returns ENOENT"
-
-send_gdb "tbreak 109\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "continue\n" ; gdb_expect -re "$gdb_prompt $"
-catch "system \"chmod -f -w nowrt.fileio.test\""
-
-send_gdb "tbreak 119\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*open 5:.*EACCES.*test_open \\(\\) at.*$srcfile:119.*" \
-"Open for write but no write permission returns EACCES"
-
-send_gdb "tbreak 140\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*write 1:.*OK.*test_write \\(\\) at.*$srcfile:140.*" \
-"Writing to a file"
-
-send_gdb "tbreak 145\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*write 2:.*EBADF.*test_write \\(\\) at.*$srcfile:145.*" \
-"Write using invalid file descriptor returns EBADF"
-
-send_gdb "tbreak 156\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*write 3:.*EBADF.*test_write \\(\\) at.*$srcfile:156.*" \
-"Writing to a read-only file returns EBADF"
-
-send_gdb "tbreak 182\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*read 1:.*OK.*test_read \\(\\) at.*$srcfile:182.*" \
-"Reading from a file"
-
-send_gdb "tbreak 186\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*read 2:.*EBADF.*test_read \\(\\) at.*$srcfile:186.*" \
-"Read using invalid file descriptor returns EBADF"
-
-send_gdb "tbreak 221\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*lseek 1:.*OK.*lseek 2:.*OK.*lseek 3:.*OK.*test_lseek \\(\\) at.*$srcfile:221.*" \
-"Lseeking a file"
-
-send_gdb "tbreak 241\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*close 1:.*OK.*test_close \\(\\) at.*$srcfile:241.*" \
-"Closing a file"
-
-send_gdb "tbreak 245\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*close 2:.*EBADF.*test_close \\(\\) at.*$srcfile:245.*" \
-"Closing an invalid file descriptor returns EBADF"
-
-send_gdb "tbreak 262\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*stat 1:.*OK.*test_stat \\(\\) at.*$srcfile:262.*" \
-"Stat a file"
-
-send_gdb "tbreak 267\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-	"Continuing\\..*stat 2:.*(ENOENT|EFAULT).*test_stat \\(\\) at.*$srcfile:267.*" \
-"Stat a NULL pathname returns ENOENT or EFAULT"
-
-send_gdb "tbreak 272\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*stat 3:.*ENOENT.*test_stat \\(\\) at.*$srcfile:272.*" \
-"Stat an empty pathname returns ENOENT"
-
-send_gdb "tbreak 276\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*stat 4:.*ENOENT.*test_stat \\(\\) at.*$srcfile:276.*" \
-"Stat a nonexistant file returns ENOENT"
-
-send_gdb "tbreak 301\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*fstat 1:.*OK.*test_fstat \\(\\) at.*$srcfile:301.*" \
-"Fstat an open file"
-
-send_gdb "tbreak 305\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*fstat 2:.*EBADF.*test_fstat \\(\\) at.*$srcfile:305.*" \
-"Fstat an invalid file descriptor returns EBADF"
-
-send_gdb "tbreak 314\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*isatty 1:.*OK.*test_isatty \\(\\) at.*$srcfile:314.*" \
-"Isatty (stdin)"
-
-send_gdb "tbreak 315\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*isatty 2:.*OK.*test_isatty \\(\\) at.*$srcfile:315.*" \
-"Isatty (stdout)"
-
-send_gdb "tbreak 317\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*isatty 3:.*OK.*test_isatty \\(\\) at.*$srcfile:317.*" \
-"Isatty (stderr)"
-
-send_gdb "tbreak 319\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*isatty 4:.*OK.*test_isatty \\(\\) at.*$srcfile:319.*" \
-"Isatty (invalid fd)"
-
-send_gdb "tbreak 327\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*isatty 5:.*OK.*test_isatty \\(\\) at.*$srcfile:327.*" \
-"Isatty (open file)"
-
-send_gdb "set remote system-call-allowed 1\n"; gdb_expect -re ".*$gdb_prompt $"
-send_gdb "tbreak 347\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*system 1:.*OK.*test_system \\(\\) at.*$srcfile:347.*" \
-"System(3) call"
-
-# Is this ok?  POSIX says system returns a waitpid status?
-send_gdb "tbreak 349\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*system 2:.*OK.*test_system \\(\\) at.*$srcfile:349.*" \
-"System with invalid command returns 127"
-
-send_gdb "tbreak 378\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*rename 1:.*OK.*test_rename \\(\\) at.*$srcfile:378.*" \
-"Rename a file"
-
-send_gdb "tbreak 383\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*rename 2:.*EISDIR.*test_rename \\(\\) at.*$srcfile:383.*" \
-"Renaming a file to existing directory returns EISDIR"
-
-send_gdb "tbreak 388\n" ; gdb_expect -re "$gdb_prompt $"
-set test "Renaming a directory to a non-empty directory returns ENOTEMPTY or EEXIST"
-gdb_test_multiple continue "${test}" {
-    -re "Continuing\\..*rename 3:.*(ENOTEMPTY|EEXIST).*test_rename \\(\\) at.*$srcfile:388.*$gdb_prompt $" {
-	pass "${test}"
-    }
-    -re "Continuing\\..*rename 3:.*EBUSY.*test_rename \\(\\) at.*$srcfile:388.*$gdb_prompt $" {
-	# At least version <= 2.6/2004-01-08 of the Linux Kernel gets
-	# this wrong (reporting EBUSY) when the file system is NFS
-	# mounted.
-	setup_xfail *-*-*linux* gdb/1502
-	fail "${test}"
-    }
-}
-
-send_gdb "tbreak 393\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*rename 4:.*EINVAL.*test_rename \\(\\) at.*$srcfile:393.*" \
-"Renaming a directory to a subdir of itself returns EINVAL"
-
-send_gdb "tbreak 397\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*rename 5:.*ENOENT.*test_rename \\(\\) at.*$srcfile:397.*" \
-"Renaming a nonexistant file returns ENOENT"
-
-send_gdb "tbreak 412\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*unlink 1:.*OK.*test_unlink \\(\\) at.*$srcfile:412.*" \
-"Unlink a file"
-
-send_gdb "tbreak 432\n" ; gdb_expect -re "$gdb_prompt $"
-# This test fails on Cygwin because unlink() succeeds on Win32 systems
-# in that situation.
-if [ishost *cygwin*] {
-    setup_xfail "*-*-*"
-}
-gdb_test continue \
-"Continuing\\..*unlink 2:.*EACCES.*test_unlink \\(\\) at.*$srcfile:432.*" \
-"Unlinking a file in a directory w/o write access returns EACCES"
-
-send_gdb "tbreak 436\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*unlink 3:.*ENOENT.*test_unlink \\(\\) at.*$srcfile:436.*" \
-"Unlinking a nonexistant file returns ENOENT"
-
-send_gdb "tbreak 446\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*time 1:.*OK.*test_time \\(\\) at.*$srcfile:446.*" \
-"Time(2) call returns the same value as in parameter"
-
-sleep 2
-send_gdb "tbreak 450\n" ; gdb_expect -re "$gdb_prompt $"
-gdb_test continue \
-"Continuing\\..*time 2:.*OK.*test_time \\(\\) at.*$srcfile:450.*" \
-"Time(2) returns feasible values"
-
-send_gdb "quit\n"
-send_gdb "y\n"
-
-remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
-remote_exec build {sh -xc rm\ -rf\ *.fileio.test}
-
-set timeout $oldtimeout
-return 0
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
deleted file mode 100644
index 88182333395..00000000000
--- a/gdb/testsuite/gdb.base/finish.exp
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2000, 2004 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# re-use the program from the "return2" test.
-set testfile "return2"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc finish_1 { type } {
-    global gdb_prompt
-
-    gdb_test "break ${type}_func" "Breakpoint \[0123456789\].*" \
-	    "set break on ${type}_func"
-    gdb_test "continue" "Breakpoint.* ${type}_func.*" \
-	    "continue to ${type}_func"
-    send_gdb "finish\n"
-    gdb_expect {
-	-re ".*Value returned is .* = 49 '1'\r\n$gdb_prompt $" {
-	    if { $type == "char" } {
-		pass "finish from char_func"
-	    } else {
-		fail "finish from ${type}_func"
-	    }
-	}
-	-re ".*Value returned is .* = \[0123456789\]* '1'\r\n$gdb_prompt $" {
-	    if { $type == "char" } {
-		pass "finish from char_func (non-ASCII char set?)"
-	    } else {
-		fail "finish from ${type}_func"
-	    }
-	}
-	-re ".*Value returned is .* = 1\r\n$gdb_prompt $" {
-	    pass "finish from ${type}_func"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "finish from ${type}_func"
-	}
-	timeout {
-	    fail "finish from ${type}_func (timeout)"
-	}
-    }
-}
-
-proc finish_void { } {
-    global gdb_prompt
-
-    gdb_test "break void_func" "Breakpoint \[0123456789\].*" \
-	    "set break on void_func"
-    gdb_test "continue" "Breakpoint.* void_func.*" \
-	    "continue to void_func"
-    send_gdb "finish\n"
-    # Some architectures will have one or more instructions after the
-    # call instruction which still is part of the call sequence, so we
-    # must be prepared for a "finish" to show us the void_func call
-    # again as well as the statement after.
-    gdb_expect {
-	-re ".*void_checkpoint.*$gdb_prompt $" {
-	    pass "finish from void_func"
-	}
-	-re "0x\[0-9a-fA-F\]+ in main.*call to void_func.*$gdb_prompt $" {
-	    pass "finish from void_func"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "finish from void_func"
-	}
-	timeout {
-	    fail "finish from void_func (timeout)"
-	}
-    }
-}
-
-proc finish_tests { } {
-    global gdb_prompt
-
-    if { ! [ runto_main ] } then {
-	gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
-    }
-
-    finish_void
-    finish_1 "char"
-    finish_1 "short"
-    finish_1 "int"
-    finish_1 "long"
-    finish_1 "long_long"
-    finish_1 "float"
-    finish_1 "double"
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set timeout 30
-finish_tests
diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp
deleted file mode 100644
index a814d57d934..00000000000
--- a/gdb/testsuite/gdb.base/float.exp
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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@gnu.org
-
-# This file is part of the gdb testsuite.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-#
-# Test floating-point related functionality.
-#
-
-set prms_id 0
-set bug_id 0
-
-set testfile "run"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Set it up at a breakpoint so we have its registers.
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# Test "info float".
-
-if { [istarget "alpha*-*-*"] } then {
-    gdb_test "info float" "f0.*" "info float"
-} elseif { [istarget "arm*-*-*"] || \
-	[istarget "xscale*-*-*"] || \
-	[istarget "strongarm*-*-*"] } then {
-    gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float"
-} elseif { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } then {
-    gdb_test "info float" "R7:.*Status Word:.*Opcode:.*" "info float"
-} elseif [istarget "ia64-*-*"] then {
-    gdb_test "info float" "f0.*f1.*f127.*" "info float"
-} elseif [istarget "m68k-*-*"] then {
-    gdb_test "info float" "fp0.*fp1.*fp7.*" "info float"
-} elseif [istarget "mips*-*-*"] then {
-    gdb_test "info float" "f0:.*flt:.*dbl:.*" "info float"
-} elseif [istarget "powerpc*-*-*"] then {
-    gdb_test "info float" "f0.*f1.*f31.*fpscr.*" "info float"
-} elseif [istarget "s390*-*-*"] then {
-    gdb_test "info float" "fpc.*f0.*f1.*f15.*" "info float"
-} elseif [istarget "sh*-*"] then {
-    # SH may or may not have an FPU
-    gdb_test_multiple "info float" "info float" {
-	-re "fpul.*fr0.*fr1.*fr15.*$gdb_prompt $" {
-	      pass "info float (with FPU)"
-	  }
-	-re "No floating.point info available for this processor.*" {
-	      pass "info float (without FPU)"
-	}
-    }
-} elseif [istarget "hppa*-*"] then {
-    gdb_test "info float" "fr4.*fr4R.*fr31R.*" "info float"
-} else {
-    gdb_test "info float" "No floating.point info available for this processor." "info float (unknown target)"
-}
diff --git a/gdb/testsuite/gdb.base/foll-exec.c b/gdb/testsuite/gdb.base/foll-exec.c
deleted file mode 100644
index 1b760903dd7..00000000000
--- a/gdb/testsuite/gdb.base/foll-exec.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-
-int  global_i = 100;
-
-#ifdef PROTOTYPES
-int main (void)
-#else
-main ()
-#endif
-{
-  int  local_j = global_i+1;
-  int  local_k = local_j+1;
-
-  printf ("foll-exec is about to execlp(execd-prog)...\n");
-
-  execlp ("gdb.base/execd-prog",
-          "gdb.base/execd-prog",
-          "execlp arg1 from foll-exec",
-          (char *)0);
-
-  printf ("foll-exec is about to execl(execd-prog)...\n");
-
-  execl ("gdb.base/execd-prog",
-         "gdb.base/execd-prog",
-         "execl arg1 from foll-exec",
-         "execl arg2 from foll-exec",
-         (char *)0);
-
-  {
-    static char * argv[] = {
-      (char *)"gdb.base/execd-prog",
-      (char *)"execv arg1 from foll-exec",
-      (char *)0};
-
-    printf ("foll-exec is about to execv(execd-prog)...\n");
-
-    execv ("gdb.base/execd-prog", argv);
-  }
-}
diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp
deleted file mode 100644
index 482a0df3c3d..00000000000
--- a/gdb/testsuite/gdb.base/foll-exec.exp
+++ /dev/null
@@ -1,400 +0,0 @@
-#   Copyright 1997, 1999 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-if { ![isnative] } then {
-    continue
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "foll-exec"
-set testfile2 "execd-prog"
-set srcfile ${testfile}.c
-set srcfile2 ${testfile2}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set binfile2 ${objdir}/${subdir}/${testfile2}
-
-# build the first test case
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-# Until "catch exec" is implemented on other targets...
-#
-if ![istarget "hppa*-hp-hpux*"] then {
-    continue
-}
-
-proc zap_session {} {
-   global gdb_prompt
-   global binfile
-
-   send_gdb "kill\n"
-   gdb_expect {
-     -re ".*Kill the program being debugged.*y or n. $" {
-       send_gdb "y\n"
-       send_gdb "file $binfile\n"
-       gdb_expect {
-         -re ".*Load new symbol table from.*y or n. $" {
-           send_gdb "y\n"
-           gdb_expect {
-             -re "Reading symbols from.*$gdb_prompt $" {}
-             timeout { fail "loading symbols (timeout)"; return }
-           }
-         }
-         -re ".*gdb_prompt $" {}
-         timeout { fail "loading symbols (timeout)"; return }
-       }
-    }
-    -re ".*$gdb_prompt $" {}
-    timeout { fail "killing inferior (timeout)" ; return }
-   }
-}
-
-proc do_exec_tests {} {
-   global gdb_prompt
-   global binfile
-   global srcfile
-   global srcfile2
-   global testfile
-   global testfile2
-
-   # Start the program running, and stop at main.
-   #
-   if ![runto_main] then {
-     perror "Couldn't run ${testfile}"
-     return
-   }
-
-   # Verify that we can see various global and local variables
-   # in this program, and that they have expected values.  Some
-   # of these variables are also declared in the program we'll
-   # exec in a moment.
-   #
-   send_gdb "next 3\n"
-   gdb_expect {
-     -re "20.*execlp.*$gdb_prompt $"\
-                     {pass "step to exec call"}
-     -re "$gdb_prompt $" {fail "step to exec call"}
-     timeout         {fail "(timeout) step to exec call"}
-   }
-   send_gdb "print global_i\n"
-   gdb_expect {
-     -re ".* = 100.*$gdb_prompt $"\
-                     {pass "print follow-exec/global_i"}
-     -re "$gdb_prompt $" {fail "print follow-exec/global_i"}
-     timeout         {fail "(timeout) print follow-exec/global_i"}
-   }
-   send_gdb "print local_j\n"
-   gdb_expect {
-     -re ".* = 101.*$gdb_prompt $"\
-                     {pass "print follow-exec/local_j"}
-     -re "$gdb_prompt $" {fail "print follow-exec/local_j"}
-     timeout         {fail "(timeout) print follow-exec/local_j"}
-   }
-   send_gdb "print local_k\n"
-   gdb_expect {
-     -re ".* = 102.*$gdb_prompt $"\
-                     {pass "print follow-exec/local_k"}
-     -re "$gdb_prompt $" {fail "print follow-exec/local_k"}
-     timeout         {fail "(timeout) print follow-exec/local_k"}
-   }
-
-   # Try stepping through an execlp call, without catching it.
-   # We should stop in execd-program, at its first statement.
-   #
-   send_gdb "next\n"
-   gdb_expect {
-     -re "Executing new program: .*${testfile2}.*${srcfile2}:23.*int  local_j = argc;.*$gdb_prompt $"\
-                     {pass "step through execlp call"}
-     -re "$gdb_prompt $" {fail "step through execlp call"}
-     timeout         {fail "(timeout) step through execlp call"}
-   }
-
-   # Verify that we can see the variables defined in the newly-exec'd
-   # program, and CANNOT see those defined in the exec'ing program.
-   #
-   send_gdb "next\n"
-   gdb_expect {
-     -re "26.*printf.*$gdb_prompt $"\
-                     {pass "step after execlp call"}
-     -re "$gdb_prompt $" {fail "step after execlp call"}
-     timeout         {fail "(timeout) step after execlp call"}
-   }
-   send_gdb "print global_i\n"
-   gdb_expect {
-     -re ".* = 0.*$gdb_prompt $"\
-                     {pass "print execd-program/global_i (after execlp)"}
-     -re "$gdb_prompt $" {fail "print execd-program/global_i (after execlp)"}
-     timeout         {fail "(timeout) print execd-program/global_i (after execlp)"}
-   }
-   send_gdb "print local_j\n"
-   gdb_expect {
-     -re ".* = 2.*$gdb_prompt $"\
-                     {pass "print execd-program/local_j (after execlp)"}
-     -re "$gdb_prompt $" {fail "print execd-program/local_j (after execlp)"}
-     timeout         {fail "(timeout) print execd-program/local_j (after execlp)"}
-   }
-   send_gdb "print local_k\n"
-   gdb_expect {
-     -re "No symbol \"local_k\" in current context.*$gdb_prompt $"\
-                     {pass "print follow-exec/local_k (after execlp)"}
-     -re "$gdb_prompt $" {fail "print follow-exec/local_k (after execlp)"}
-     timeout         {fail "(timeout) print follow-exec/local_k (after execlp)"}
-   }
-
-   # Explicitly kill this program, or a subsequent rerun actually runs
-   # the exec'd program, not the original program...
-   zap_session
-
-   # Start the program running, and stop at main.
-   #
-   if ![runto_main] then {
-     perror "Couldn't run ${testfile} (2nd try)"
-     return
-   }
-
-   # Verify that we can catch an exec event, and then continue
-   # to follow through the exec.  (Since there's a breakpoint on
-   # "main", it'll also be transferred to the exec'd program,
-   # and we expect to stop there.)
-   #
-   send_gdb "catch exec\n"
-   gdb_expect {
-     -re "Catchpoint .*(exec).*$gdb_prompt $"\
-                     {pass "set catch exec"}
-     -re "$gdb_prompt $" {fail "set catch exec"}
-     timeout         {fail "(timeout) set catch exec"}
-   }
-
-   # Verify that the catchpoint is mentioned in an "info breakpoints",
-   # and further that the catchpoint mentions no program name.
-   #
-   send_gdb "info breakpoints\n"
-   gdb_expect {
-     -re ".*catch exec.*keep y.*$gdb_prompt $"\
-                     {pass "info shows catchpoint without exec pathname"}
-     -re ".*catch exec.*program \"\".*$gdb_prompt $"\
-                     {fail "info shows catchpoint without exec pathname"}
-     -re "$gdb_prompt $" {fail "info shows catchpoint without exec pathname"}
-     timeout         {fail "(timeout) info shows catchpoint without exec pathname"}
-   }
-
-   # DTS CLLbs16760
-   # PA64 doesn't know about $START$ in dld.sl at this point.  It should.
-   # - Michael Coulter
-   setup_xfail hppa2.0w-hp-hpux* CLLbs16760
-   send_gdb "continue\n"
-   gdb_expect {
-     -re ".*Executing new program:.*${testfile2}.*Catchpoint .*(exec\'d .*${testfile2}).*in .START..*$gdb_prompt $"\
-                     {pass "hit catch exec"}
-     -re "$gdb_prompt $" {fail "hit catch exec"}
-     timeout         {fail "(timeout) hit catch exec"}
-   }
-
-   # DTS CLLbs16760
-   # test gets out of sync if previous test fails.
-   gdb_test "bt" ".*" "sync up after possible failure 1"
-   gdb_test "bt" "#0.*" "sync up after possible failure 2"
-
-   # Verify that the catchpoint is mentioned in an "info breakpoints",
-   # and further that the catchpoint managed to capture the exec'd
-   # program's name.
-   #
-   send_gdb "info breakpoints\n"
-   gdb_expect {
-     -re ".*catch exec .*program \".*${testfile2}\".*$gdb_prompt $"\
-                     {pass "info shows catchpoint exec pathname"}
-     -re "$gdb_prompt $" {fail "info shows catchpoint exec pathname"}
-     timeout         {fail "(timeout) info shows catchpoint exec pathname"}
-   }
-
-   # Verify that we can continue from the catchpoint, and land in the
-   # main of the newly-exec'd program.
-   #
-   send_gdb "continue\n"
-   gdb_expect {
-     -re ".*${srcfile2}:23.*$gdb_prompt $"\
-                     {pass "continue after hit catch exec"}
-     -re "$gdb_prompt $" {fail "continue after hit catch exec"}
-     timeout         {fail "(timeout) continue after hit catch exec"}
-   }
-
-   # Explicitly kill this program, or a subsequent rerun actually runs
-   # the exec'd program, not the original program...
-   zap_session
-
-   # Start the program running, and stop at main.
-   #
-   if ![runto_main] then {
-     perror "Couldn't run ${testfile} (3rd try)"
-     return
-   }
-
-   # Verify that we can follow through follow an execl()
-   # call.  (We must jump around earlier exec* calls.)
-   #
-   send_gdb "tbreak 27\n"
-   gdb_expect {
-     -re "Breakpoint .*file .*${srcfile}, line 27.*$gdb_prompt $"\
-                     {pass "prepare to jump to execl call"}
-     -re "$gdb_prompt $" {fail "prepare to jump to execl call"}
-     timeout         {fail "(timeout) prepare to jump to execl call"}
-   }
-   send_gdb "jump 27\n"
-   gdb_expect {
-     -re "main.* at .*${srcfile}:27.*$gdb_prompt $"\
-                     {pass "jump to execl call"}
-     -re "$gdb_prompt $" {fail "jump to execl call"}
-     timeout         {fail "(timeout) jump to execl call"}
-   }
-   # Note that stepping through an exec call causes the step-count
-   # to be reset to zero.  I.e.: you may specify "next 2" at the
-   # call, but you'll actually stop at the first breakpoint set in
-   # the newly-exec'd program, not after the remaining step-count
-   # reaches zero.
-   #
-   send_gdb "next 2\n"
-   gdb_expect {
-     -re "Executing new program: .*${testfile2}.*${srcfile2}:23.*int  local_j = argc;.*$gdb_prompt $"\
-                     {pass "step through execl call"}
-     -re "$gdb_prompt $" {fail "step through execl call"}
-     timeout         {fail "(timeout) step through execl call"}
-   }
-   send_gdb "next\n"
-   gdb_expect {
-     -re "26.*printf.*$gdb_prompt $"\
-                     {pass "step after execl call"}
-     -re "$gdb_prompt $" {fail "step after execl call"}
-     timeout         {fail "(timeout) step after execl call"}
-   }
-
-   # Verify that we can print a local variable (which happens to be
-   # assigned the value of main's argc).
-   #
-   send_gdb "print local_j\n"
-   gdb_expect {
-     -re ".* = 3.*$gdb_prompt $"\
-                     {pass "print execd-program/local_j (after execl)"}
-     -re "$gdb_prompt $" {fail "print execd-program/local_j (after execl)"}
-     timeout         {fail "(timeout) print execd-program/local_j (after execl)"}
-   }
-
-   # Explicitly kill this program, or a subsequent rerun actually runs
-   # the exec'd program, not the original program...
-   zap_session
-
-   # Start the program running, and stop at main.
-   #
-   if ![runto_main] then {
-     perror "Couldn't run ${testfile} (4th try)"
-     return
-   }
-
-   # Verify that we can follow through follow an execv()
-   # call.  (We must jump around earlier exec* calls.)
-   #
-   send_gdb "tbreak 41\n"
-   gdb_expect {
-     -re "Breakpoint .*file .*${srcfile}, line 41.*$gdb_prompt $"\
-                     {pass "prepare to jump to execv call"}
-     -re "$gdb_prompt $" {fail "prepare to jump to execv call"}
-     timeout         {fail "(timeout) prepare to jump to execv call"}
-   }
-   send_gdb "jump 41\n"
-   gdb_expect {
-     -re "main.* at .*${srcfile}:41.*$gdb_prompt $"\
-                     {pass "jump to execv call"}
-     -re "$gdb_prompt $" {fail "jump to execv call"}
-     timeout         {fail "(timeout) jump to execv call"}
-   }
-   send_gdb "next\n"
-   gdb_expect {
-     -re "Executing new program: .*${testfile2}.*${srcfile2}:23.*int  local_j = argc;.*$gdb_prompt $"\
-                     {pass "step through execv call"}
-     -re "$gdb_prompt $" {fail "step through execv call"}
-     timeout         {fail "(timeout) step through execv call"}
-   }
-   send_gdb "next\n"
-   gdb_expect {
-     -re "26.*printf.*$gdb_prompt $"\
-                     {pass "step after execv call"}
-     -re "$gdb_prompt $" {fail "step after execv call"}
-     timeout         {fail "(timeout) step after execv call"}
-   }
-
-   # Verify that we can print a local variable (which happens to be
-   # assigned the value of main's argc).
-   #
-   send_gdb "print local_j\n"
-   gdb_expect {
-     -re ".* = 2.*$gdb_prompt $"\
-                     {pass "print execd-program/local_j (after execv)"}
-     -re "$gdb_prompt $" {fail "print execd-program/local_j (after execv)"}
-     timeout         {fail "(timeout) print execd-program/local_j (after execv)"}
-   }
-
-   # Explicitly kill this program, or a subsequent rerun actually runs
-   # the exec'd program, not the original program...
-   zap_session
-
-   # Start the program running, and stop at main.
-   #
-   if ![runto_main] then {
-     perror "Couldn't run ${testfile} (5th try)"
-     return
-   }
-
-   # Verify that we can just continue and thereby follow through an
-   # exec call.  (Since the breakpoint on "main" is reset, we should
-   # just stop in main of the newly-exec'd program.)
-   #
-   send_gdb "continue\n"
-   gdb_expect {
-     -re "Executing new program: .*${testfile2}.*${srcfile2}:23.*int  local_j = argc;.*$gdb_prompt $"\
-                     {pass "continue through exec"}
-     -re "$gdb_prompt $" {fail "continue through exec"}
-     timeout         {fail "(timeout) continue through exec"}
-   }
-}
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-# This is a test of gdb's ability to follow a process through a
-# Unix exec() system call.
-#
-do_exec_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.base/foll-fork.c b/gdb/testsuite/gdb.base/foll-fork.c
deleted file mode 100644
index 841258f147c..00000000000
--- a/gdb/testsuite/gdb.base/foll-fork.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-
-#ifdef PROTOTYPES
-void callee (int i)
-#else
-void callee (i)
-  int  i;
-#endif
-{
-  printf("callee: %d\n", i);
-}
-
-#ifdef PROTOTYPES
-int main (void)
-#else
-main ()
-#endif
-{
-  int  pid;
-  int  v = 5;
-
-  pid = fork ();
-  if (pid == 0)
-    {
-      v++;
-      /* printf ("I'm the child!\n"); */
-    }
-  else
-    {
-      v--;
-      /* printf ("I'm the proud parent of child #%d!\n", pid); */
-    }
-}
diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp
deleted file mode 100644
index 2ef3a4a0ad7..00000000000
--- a/gdb/testsuite/gdb.base/foll-fork.exp
+++ /dev/null
@@ -1,366 +0,0 @@
-#   Copyright 1997, 1999 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-if { ![isnative] } then {
-    continue
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "foll-fork"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-
-# Until "set follow-fork-mode" and "catch fork" are implemented on
-# other targets...
-#
-if ![istarget "hppa*-hp-hpux*"] then {
-    continue
-}
-
-proc default_fork_parent_follow {} {
-   global gdb_prompt
-
-   send_gdb "show follow\n"
-   gdb_expect {
-      -re "Debugger response to a program call of fork or vfork is \"parent\"..*$gdb_prompt $"\
-                      {pass "default show parent follow, no catchpoints"}
-      -re "$gdb_prompt $" {fail "default show parent follow, no catchpoints"}
-      timeout         {fail "(timeout) default show parent follow, no catchpoints"}
-   }
-   send_gdb "next 2\n"
-   gdb_expect {
-      -re "Detaching after fork from.*$gdb_prompt $"\
-                      {pass "default parent follow, no catchpoints"}
-      -re "$gdb_prompt $" {fail "default parent follow, no catchpoints"}
-      timeout         {fail "(timeout) default parent follow, no catchpoints" }
-   }
-   # The child has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-}
-
-proc explicit_fork_parent_follow {} {
-   global gdb_prompt
-
-   send_gdb "set follow parent\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow parent"}
-      timeout         {fail "(timeout) set follow parent"}
-   }
-   send_gdb "show follow\n"
-   gdb_expect {
-      -re "Debugger response to a program call of fork or vfork is \"parent\"..*$gdb_prompt $"\
-                      {pass "explicit show parent follow, no catchpoints"}
-      -re "$gdb_prompt $" {fail "explicit show parent follow, no catchpoints"}
-      timeout         {fail "(timeout) explicit show parent follow, no catchpoints"}
-   }
-   send_gdb "next 2\n"
-   gdb_expect {
-      -re "Detaching after fork from.*$gdb_prompt $"\
-                      {pass "explicit parent follow, no catchpoints"}
-      -re "$gdb_prompt $" {fail "explicit parent follow, no catchpoints"}
-      timeout         {fail "(timeout) explicit parent follow, no catchpoints"}
-   }
-   # The child has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-}
-
-proc explicit_fork_child_follow {} {
-   global gdb_prompt
-
-   send_gdb "set follow child\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow child"}
-      timeout         {fail "(timeout) set follow child"}
-   }
-   send_gdb "show follow\n"
-   gdb_expect {
-      -re "Debugger response to a program call of fork or vfork is \"child\"..*$gdb_prompt $"\
-                      {pass "explicit show child follow, no catchpoints"}
-      -re "$gdb_prompt $" {fail "explicit show child follow, no catchpoints"}
-      timeout         {fail "(timeout) explicit show child follow, no catchpoints"}
-   }
-   send_gdb "next 2\n"
-   gdb_expect {
-      -re "Detaching from program:.*Attaching after fork to.*$gdb_prompt $"\
-                      {pass "explicit child follow, no catchpoints"}
-      -re "$gdb_prompt $" {fail "explicit child follow, no catchpoints"}
-      timeout         {fail "(timeout) explicit child follow, no catchpoints"}
-   }
-   # The child has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any gdb_expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-}
-
-proc catch_fork_child_follow {} {
-   global gdb_prompt
-
-   send_gdb "catch fork\n"
-   gdb_expect {
-      -re "Catchpoint .*(fork).*$gdb_prompt $"\
-                      {pass "explicit child follow, set catch fork"}
-      -re "$gdb_prompt $" {fail "explicit child follow, set catch fork"}
-      timeout         {fail "(timeout) explicit child follow, set catch fork"}
-   }
-
-   # Verify that the catchpoint is mentioned in an "info breakpoints",
-   # and further that the catchpoint mentions no process id.
-   #
-   send_gdb "info breakpoints\n"
-   gdb_expect {
-     -re ".*catch fork.*keep y.*$gdb_prompt $"\
-                     {pass "info shows catchpoint without pid"}
-     -re ".*catch fork.*process .*$gdb_prompt $"\
-                     {fail "info shows catchpoint without pid"}
-     -re "$gdb_prompt $" {fail "info shows catchpoint without pid"}
-     timeout         {fail "(timeout) info shows catchpoint without pid"}
-   }
-
-   send_gdb "continue\n"
-   gdb_expect {
-      -re "Catchpoint.*(forked process.*),.*in _fork_sys.*$gdb_prompt $"\
-                      {pass "explicit child follow, catch fork"}
-      -re "$gdb_prompt $" {fail "explicit child follow, catch fork"}
-      timeout         {fail "(timeout) explicit child follow, catch fork"}
-   }
-
-   # Verify that the catchpoint is mentioned in an "info breakpoints",
-   # and further that the catchpoint managed to capture a process id.
-   #
-   send_gdb "info breakpoints\n"
-   gdb_expect {
-     -re ".*catch fork .*process \[0-9\]+.*$gdb_prompt $"\
-                     {pass "info shows catchpoint pid"}
-     -re "$gdb_prompt $" {fail "info shows catchpoint pid"}
-     timeout         {fail "(timeout) info shows catchpoint pid"}
-   }
-
-   send_gdb "set follow child\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow child"}
-      timeout         {fail "(timeout) set follow child"}
-   }
-   send_gdb "tbreak 24\n"
-   gdb_expect {
-      -re "Breakpoint.*, line 24.*$gdb_prompt $"\
-                      {pass "set follow child, tbreak"}
-      -re "$gdb_prompt $" {fail "set follow child, tbreak"}
-      timeout         {fail "(timeout) set follow child, tbreak"}
-   }
-   send_gdb "continue\n"
-   gdb_expect {
-      -re ".*Detaching from program:.*Attaching after fork to.* at .*24.*$gdb_prompt $"\
-                      {pass "set follow child, hit tbreak"}
-      -re "$gdb_prompt $" {fail "set follow child, hit tbreak"}
-      timeout         {fail "(timeout) set follow child, hit tbreak"}
-   }
-   # The child has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-   send_gdb "delete breakpoints\n"
-   gdb_expect {
-      -re "Delete all breakpoints.*$" {
-         send_gdb "y\n"
-         gdb_expect {
-            -re "$gdb_prompt $"\
-                    {pass "set follow child, cleanup"}
-            timeout {fail "(timeout) set follow child, cleanup"}
-         }
-      }
-      -re "$gdb_prompt $" {fail "set follow child, cleanup"}
-      timeout         {fail "(timeout) set follow child, cleanup"}
-   }
-}
-
-proc tcatch_fork_parent_follow {} {
-   global gdb_prompt
-
-   send_gdb "catch fork\n"
-   gdb_expect {
-      -re "Catchpoint .*(fork).*$gdb_prompt $"\
-                      {pass "explicit parent follow, set tcatch fork"}
-      -re "$gdb_prompt $" {fail "explicit parent follow, set tcatch fork"}
-      timeout         {fail "(timeout) explicit parent follow, set tcatch fork"}
-   }
-# ??rehrauer: I don't yet know how to get the id of the tcatch
-# via this script, so that I can add a -do list to it.  For now,
-# do the follow stuff after the catch happens.
-
-   send_gdb "continue\n"
-   gdb_expect {
-      -re ".*in _fork_sys.*$gdb_prompt $"\
-                      {pass "explicit parent follow, tcatch fork"}
-      -re "$gdb_prompt $" {fail "explicit parent follow, tcatch fork"}
-      timeout         {fail "(timeout) explicit parent follow, tcatch fork"}
-   }
-   send_gdb "set follow parent\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow parent"}
-      timeout         {fail "(timeout) set follow parent"}
-   }
-   send_gdb "tbreak 24\n"
-   gdb_expect {
-      -re "Breakpoint.*, line 24.*$gdb_prompt $"\
-                      {pass "set follow parent, tbreak"}
-      -re "$gdb_prompt $" {fail "set follow parent, tbreak"}
-      timeout         {fail "(timeout) set follow child, tbreak"}
-   }
-   send_gdb "continue\n"
-   gdb_expect {
-      -re ".*Detaching after fork from.* at .*24.*$gdb_prompt $"\
-                      {pass "set follow parent, hit tbreak"}
-      -re "$gdb_prompt $" {fail "set follow parent, hit tbreak"}
-      timeout         {fail "(timeout) set follow parent, hit tbreak"}
-   }
-   # The child has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-   send_gdb "delete breakpoints\n"
-   gdb_expect {
-      -re "Delete all breakpoints.*$" {
-         send_gdb "y\n"
-         gdb_expect {
-            -re "$gdb_prompt $"\
-                    {pass "set follow parent, cleanup"}
-            timeout {fail "(timeout) set follow parent, cleanup"}
-         }
-      }
-      -re "$gdb_prompt $" {fail "set follow parent, cleanup"}
-      timeout         {fail "(timeout) set follow parent, cleanup"}
-   }
-}
-
-proc do_fork_tests {} {
-   global gdb_prompt
-
-   # Verify that help is available for "set follow-fork-mode".
-   #
-   send_gdb "help set follow-fork-mode\n"
-   gdb_expect {
-      -re "Set debugger response to a program call of fork or vfork..*
-A fork or vfork creates a new process.  follow-fork-mode can be:.*
-.*parent  - the original process is debugged after a fork.*
-.*child   - the new process is debugged after a fork.*
-The unfollowed process will continue to run..*
-By default, the debugger will follow the parent process..*$gdb_prompt $"\
-                      { pass "help set follow" }
-      -re "$gdb_prompt $" { fail "help set follow" }
-      timeout         { fail "(timeout) help set follow" }
-   }
-
-   # Verify that we can set follow-fork-mode, using an abbreviation
-   # for both the flag and its value.
-   #
-   send_gdb "set follow ch\n"
-   send_gdb "show fol\n"
-   gdb_expect {
-     -re "Debugger response to a program call of fork or vfork is \"child\".*$gdb_prompt $"\
-             {pass "set follow, using abbreviations"}
-     timeout {fail "(timeout) set follow, using abbreviations"}
-   }
-
-   # Verify that we cannot set follow-fork-mode to nonsense.
-   #
-   send_gdb "set follow chork\n"
-   gdb_expect {
-     -re "Undefined item: \"chork\".*$gdb_prompt $"\
-                     {pass "set follow to nonsense is prohibited"}
-     -re "$gdb_prompt $" {fail "set follow to nonsense is prohibited"}
-     timeout         {fail "(timeout) set follow to nonsense is prohibited"}
-   }
-   send_gdb "set follow parent\n"
-   gdb_expect {
-     -re "$gdb_prompt $" {pass "set follow to nonsense is prohibited (reset parent)"}
-     timeout         {fail "set follow to nonsense is prohibited (reset parent)"}
-   }
-
-   # Test the default behaviour, which is to follow the parent of a
-   # fork, and detach from the child.  Do this without catchpoints.
-   #
-   if [runto_main] then { default_fork_parent_follow }
-
-   # Test the ability to explicitly follow the parent of a fork, and
-   # detach from the child.  Do this without catchpoints.
-   #
-   if [runto_main] then { explicit_fork_parent_follow }
-
-   # Test the ability to follow the child of a fork, and detach from
-   # the parent.  Do this without catchpoints.
-   #
-   if [runto_main] then { explicit_fork_child_follow }
-
-   # Test the ability to follow both child and parent of a fork.  Do
-   # this without catchpoints.
-   # ??rehrauer: NYI.  Will add testpoints here when implemented.
-   #
-
-   # Test the ability to have the debugger ask the user at fork-time
-   # whether to follow the parent, child or both.  Do this without
-   # catchpoints.
-   # ??rehrauer: NYI.  Will add testpoints here when implemented.
-   #
-
-   # Test the ability to catch a fork, specify that the child be
-   # followed, and continue.  Make the catchpoint permanent.
-   #
-   if [runto_main] then { catch_fork_child_follow }
-
-   # Test the ability to catch a fork, specify via a -do clause that
-   # the parent be followed, and continue.  Make the catchpoint temporary.
-   #
-   if [runto_main] then { tcatch_fork_parent_follow }
-}
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-# This is a test of gdb's ability to follow the parent, child or both
-# parent and child of a Unix fork() system call.
-#
-do_fork_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.base/foll-vfork.c b/gdb/testsuite/gdb.base/foll-vfork.c
deleted file mode 100644
index 3c7fab573fa..00000000000
--- a/gdb/testsuite/gdb.base/foll-vfork.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-
-#ifdef PROTOTYPES
-int main (void)
-#else
-main ()
-#endif
-{
-  int  pid;
-
-  pid = vfork ();
-  if (pid == 0) {
-    printf ("I'm the child!\n");
-    execlp ("gdb.base/vforked-prog", "gdb.base/vforked-prog", (char *)0);
-  }
-  else {
-    printf ("I'm the proud parent of child #%d!\n", pid);
-  }
-}
diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp
deleted file mode 100644
index 86a1ce9fcfa..00000000000
--- a/gdb/testsuite/gdb.base/foll-vfork.exp
+++ /dev/null
@@ -1,372 +0,0 @@
-#   Copyright 1997, 1999 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-if { ![isnative] } then {
-    continue
-}
-
-set prms_id 0
-set bug_id 0
-
-# NOTE drow/2002-12-06: I don't know what the referenced kernel problem
-# is, but it appears to be fixed in recent HP/UX versions.
-
-##if [istarget "hppa2.0w-hp-hpux*"] {
-##  warning "Don't run gdb.base/foll-vfork.exp until JAGaa43495 kernel problem is fixed."
-##  return 0
-##}
-
-set testfile "foll-vfork"
-set testfile2 "vforked-prog"
-set srcfile ${testfile}.c
-set srcfile2 ${testfile2}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set binfile2 ${objdir}/${subdir}/${testfile2}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-# Until "set follow-fork-mode" and "catch vfork" are implemented on
-# other targets...
-#
-if ![istarget "hppa*-hp-hpux*"] then {
-    continue
-}
-
-# Test to see if we are on an HP-UX 10.20 and if so,
-# do not run these tests as catching vfork is disabled for
-# 10.20.
-
-if [istarget "hppa*-hp-hpux10.20"] then {
-    return 0
-}
-
-# A few of these tests require a little more time than the standard
-# timeout allows.
-set oldtimeout $timeout
-set timeout [expr "$timeout + 10"]
-
-proc vfork_parent_follow_through_step {} {
-   global gdb_prompt
-
-   send_gdb "set follow parent\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow parent, vfork through step"}
-      timeout         {fail "set follow parent, vfork through step"}
-   }
-   send_gdb "next\n"
-   gdb_expect {
-      -re "Detaching after fork from.*13.*$gdb_prompt "\
-                      {pass "vfork parent follow, through step"}
-      -re "$gdb_prompt $" {fail "vfork parent follow, through step"}
-      timeout         {fail "(timeout) vfork parent follow, through step" }
-   }
-   # The child has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any gdb_expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-}
-
-proc vfork_parent_follow_to_bp {} {
-   global gdb_prompt
-
-   send_gdb "set follow parent\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow parent, vfork to bp"}
-      timeout         {fail "set follow parent, vfork to bp"}
-   }
-   send_gdb "break 18\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "break, vfork to bp"}
-      timeout         {fail "break, vfork to bp"}
-   }
-   send_gdb "continue\n"
-   gdb_expect {
-      -re ".*Detaching after fork from process.*Breakpoint.*18.*$gdb_prompt "\
-                      {pass "vfork parent follow, to bp"}
-      -re "$gdb_prompt $" {fail "vfork parent follow, to bp"}
-      timeout         {fail "(timeout) vfork parent follow, to bp" }
-   }
-   # The child has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-}
-
-proc vfork_and_exec_child_follow_to_main_bp {} {
-   global gdb_prompt
-   global binfile
-
-   send_gdb "set follow child\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow child, vfork and exec to main bp"}
-      timeout         {fail "set follow child, vfork and exec to main bp"}
-   }
-   send_gdb "continue\n"
-   gdb_expect {
-      -re "Detaching from program.*Attaching after fork to.*Executing new program.*Breakpoint.*vforked-prog.c:9.*$gdb_prompt "\
-                      {pass "vfork and exec child follow, to main bp"}
-      -re "$gdb_prompt $" {fail "vfork and exec child follow, to main bp"}
-      timeout         {fail "(timeout) vfork and exec child follow, to main bp" }
-   }
-   # The parent has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any gdb_expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-
-   # Explicitly kill this child, or a subsequent rerun actually runs
-   # the exec'd child, not the original program...
-   send_gdb "kill\n"
-   gdb_expect {
-      -re ".*Kill the program being debugged.*y or n. $" {
-         send_gdb "y\n"
-         send_gdb "file $binfile\n"
-         gdb_expect {
-            -re ".*Load new symbol table from.*y or n. $" {
-               send_gdb "y\n"
-               gdb_expect {
-                  -re "Reading symbols from.*$gdb_prompt $" {}
-                  timeout { fail "loading symbols (timeout)"; return }
-               }
-            }
-            -re ".*gdb_prompt $" {}
-            timeout { fail "loading symbols (timeout)"; return }
-          }
-      }
-      -re ".*$gdb_prompt $" {}
-      timeout { fail "killing inferior (timeout)" ; return }
-    }
-}
-
-proc vfork_and_exec_child_follow_through_step {} {
-   global gdb_prompt
-   global binfile
-
-# This test cannot be performed prior to HP-UX 10.30, because ptrace-based
-# debugging of a vforking program basically doesn't allow the child to do
-# things like hit a breakpoint between a vfork and exec.  This means that
-# saying "set follow child; next" at a vfork() call won't work, because
-# the implementation of "next" sets a "step resume" breakpoint at the
-# return from the vfork(), which the child will hit on its way to exec'ing.
-#
-   if { ![istarget "hppa*-*-hpux11.*"] } {
-      verbose "vfork child-following next test ignored for non-hppa or pre-HP/UX-10.30 targets."
-      return 0
-   }
-
-   send_gdb "set follow child\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow child, vfork and exec through step"}
-      timeout         {fail "set follow child, vfork and exec through step"}
-   }
-   send_gdb "next\n"
-   gdb_expect {
-      -re "Detaching from program.*Attaching after fork to.*Executing new program.*Breakpoint.*vforked-prog.c:9.*$gdb_prompt "\
-                      {pass "vfork and exec child follow, through step"}
-      -re "$gdb_prompt $" {fail "vfork and exec child follow, through step"}
-      timeout         {fail "(timeout) vfork and exec child follow, through step" }
-   }
-   # The parent has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-
-   # Explicitly kill this child, or a subsequent rerun actually runs
-   # the exec'd child, not the original program...
-   send_gdb "kill\n"
-   gdb_expect {
-      -re ".*Kill the program being debugged.*y or n. $" {
-         send_gdb "y\n"
-         send_gdb "file $binfile\n"
-         gdb_expect {
-            -re ".*Load new symbol table from.*y or n. $" {
-               send_gdb "y\n"
-               gdb_expect {
-                  -re "Reading symbols from.*$gdb_prompt $" {}
-                  timeout { fail "loading symbols (timeout)"; return }
-               }
-            }
-            -re ".*gdb_prompt $" {}
-            timeout { fail "loading symbols (timeout)"; return }
-          }
-      }
-      -re ".*$gdb_prompt $" {}
-      timeout { fail "killing inferior (timeout)" ; return }
-    }
-}
-
-proc tcatch_vfork_then_parent_follow {} {
-   global gdb_prompt
-   global srcfile
-
-   send_gdb "set follow parent\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow parent, tcatch vfork"}
-      timeout         {fail "set follow parent, tcatch vfork"}
-   }
-   send_gdb "tcatch vfork\n"
-   gdb_expect {
-      -re "Catchpoint .*(vfork).*$gdb_prompt $"\
-                      {pass "vfork parent follow, set tcatch vfork"}
-      -re "$gdb_prompt $" {fail "vfork parent follow, set tcatch vfork"}
-      timeout         {fail "(timeout) vfork parent follow, set tcatch vfork"}
-   }
-   send_gdb "continue\n"
-# HP-UX 10.20 seems to stop you in "vfork", while more recent HP-UXs
-# stop you in "_vfork".
-   gdb_expect {
-      -re "0x\[0-9a-fA-F\]*.*vfork.*$gdb_prompt "\
-                      {pass "vfork parent follow, tcatch vfork"}
-      -re "0x\[0-9a-fA-F\]*.*_vfork.*$gdb_prompt "\
-                      {pass "vfork parent follow, tcatch vfork"}
-      -re "$gdb_prompt $" {fail "vfork parent follow, tcatch vfork"}
-      timeout         {fail "(timeout) vfork parent follow, tcatch vfork"}
-   }
-   send_gdb "finish\n"
-   gdb_expect {
-      -re "Run till exit from.*vfork.*0x\[0-9a-fA-F\]* in main .* at .*${srcfile}:12.*$gdb_prompt "\
-                      {pass "vfork parent follow, finish after tcatch vfork"}
-      -re "$gdb_prompt $" {fail "vfork parent follow, finish after tcatch vfork"}
-      timeout         {fail "(timeout) vfork parent follow, finish after tcatch vfork" }
-   }
-   # The child has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-}
-
-proc tcatch_vfork_then_child_follow {} {
-   global gdb_prompt
-   global srcfile2
-
-   send_gdb "set follow child\n"
-   gdb_expect {
-      -re "$gdb_prompt $" {pass "set follow child, tcatch vfork"}
-      timeout         {fail "set follow child, tcatch vfork"}
-   }
-   send_gdb "tcatch vfork\n"
-   gdb_expect {
-      -re "Catchpoint .*(vfork).*$gdb_prompt $"\
-                      {pass "vfork child follow, set tcatch vfork"}
-      -re "$gdb_prompt $" {fail "vfork child follow, set tcatch vfork"}
-      timeout         {fail "(timeout) vfork child follow, set tcatch vfork"}
-   }
-   send_gdb "continue\n"
-# HP-UX 10.20 seems to stop you in "vfork", while more recent HP-UXs
-# stop you in "_vfork".
-   gdb_expect {
-      -re "0x\[0-9a-fA-F\]*.*vfork.*$gdb_prompt "\
-                      {pass "vfork child follow, tcatch vfork"}
-      -re "0x\[0-9a-fA-F\]*.*_vfork.*$gdb_prompt "\
-                      {pass "vfork child follow, tcatch vfork"}
-      -re "$gdb_prompt $" {fail "vfork child follow, tcatch vfork"}
-      timeout         {fail "(timeout) vfork child follow, tcatch vfork"}
-   }
-   send_gdb "finish\n"
-   gdb_expect {
-      -re "Run till exit from.*vfork.*${srcfile2}:9.*$gdb_prompt "\
-                      {pass "vfork child follow, finish after tcatch vfork"}
-      -re "$gdb_prompt $" {fail "vfork child follow, finish after tcatch vfork"}
-      timeout         {fail "(timeout) vfork child follow, finish after tcatch vfork" }
-   }
-   # The parent has been detached; allow time for any output it might
-   # generate to arrive, so that output doesn't get confused with
-   # any expected debugger output from a subsequent testpoint.
-   #
-   exec sleep 1
-}
-
-proc do_vfork_and_exec_tests {} {
-   global gdb_prompt
-
-   # Try following the parent process by stepping through a call to
-   # vfork.  Do this without catchpoints.
-   if [runto_main] then { vfork_parent_follow_through_step }
-
-   # Try following the parent process by setting a breakpoint on the
-   # other side of a vfork, and running to that point.  Do this
-   # without catchpoints.
-   if [runto_main] then { vfork_parent_follow_to_bp }
-
-   # Try following the child process by just continuing through the
-   # vfork, and letting the parent's breakpoint on "main" be auto-
-   # magically reset in the child.
-   #
-   if [runto_main] then { vfork_and_exec_child_follow_to_main_bp }
-
-   # Try following the child process by stepping through a call to
-   # vfork.  The child also executes an exec.  Since the child cannot
-   # be debugged until after it has exec'd, and since there's a bp on
-   # "main" in the parent, and since the bp's for the parent are
-   # recomputed in the exec'd child, the step through a vfork should
-   # land us in the "main" for the exec'd child, too.
-   #
-   if [runto_main] then { vfork_and_exec_child_follow_through_step }
-
-   # Try catching a vfork, and stepping out to the parent.
-   #
-   if [runto_main] then { tcatch_vfork_then_parent_follow }
-
-   # Try catching a vfork, and stepping out to the child.
-   #
-   if [runto_main] then { tcatch_vfork_then_child_follow }
-
-   # Test the ability to follow both child and parent of a vfork.  Do
-   # this without catchpoints.
-   # ??rehrauer: NYI.  Will add testpoints here when implemented.
-   #
-
-   # Test the ability to have the debugger ask the user at vfork-time
-   # whether to follow the parent, child or both.  Do this without
-   # catchpoints.
-   # ??rehrauer: NYI.  Will add testpoints here when implemented.
-   #
-}
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-# This is a test of gdb's ability to follow the parent or child
-# of a Unix vfork() system call.  (The child will subsequently
-# call a variant of a Unix exec() system call.)
-#
-do_vfork_and_exec_tests
-
-set timeout $oldtimeout
-return 0
diff --git a/gdb/testsuite/gdb.base/foo.c b/gdb/testsuite/gdb.base/foo.c
deleted file mode 100644
index 2553607d5ec..00000000000
--- a/gdb/testsuite/gdb.base/foo.c
+++ /dev/null
@@ -1,9 +0,0 @@
-static int foox = 'f' + 'o' + 'o';
-
-int foo (int x)
-{
-  if (x)
-    return foox;
-  else
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.base/freebpcmd.c b/gdb/testsuite/gdb.base/freebpcmd.c
deleted file mode 100644
index 36cbcbea29d..00000000000
--- a/gdb/testsuite/gdb.base/freebpcmd.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Test program for GDB crashes while doing bp commands that continue inferior.
-   Copyright 2003, 2004 Free Software Foundation, Inc.
-
-   This file is part of the gdb testsuite.
-
-   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 <stdio.h>
-
-int
-main (int argc, char **argv)
-{
-  int i;
-
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-
-  for (i = 0; i < 100; i++)
-    printf (">>> %d\n", i); /* euphonium */
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/freebpcmd.exp b/gdb/testsuite/gdb.base/freebpcmd.exp
deleted file mode 100644
index fed067f1d8d..00000000000
--- a/gdb/testsuite/gdb.base/freebpcmd.exp
+++ /dev/null
@@ -1,121 +0,0 @@
-#   Copyright 2003 Free Software Foundation, 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.  
-
-
-# This is a regression test for the following bug, as of 2003-12-12:
-#
-# Set a breakpoint which will be hit many times.  Attach a complex set
-# of commands to it, including a "continue" command.  Run the program,
-# so that the breakpoint is hit, its commands get executed, and the
-# program continues and hits the breakpoint again.  You will see
-# messages like "warning: Invalid control type in command structure.",
-# or maybe GDB will crash.
-#
-# When the breakpoint is hit, bpstat_stop_status copies the
-# breakpoint's command tree to the bpstat.  bpstat_do_actions then
-# calls execute_control_command to run the commands.  The 'continue'
-# command invokes the following chain of calls:
-#
-#   continue_command
-#     -> clear_proceed_status
-#       -> bpstat_clear
-#         -> free_command_lines
-#            -> frees the commands we are currently running.
-#
-# When control does eventually return to execute_control_command, GDB
-# continues to walk the tree of freed command nodes, resulting in the
-# error messages and / or crashes.
-#
-# Since this bug depends on storage being reused between the time that
-# we continue and the time that we fall back to bpstat_do_actions, the
-# reproduction recipe is more delicate than I would like.  I welcome
-# suggestions for improving this.
-
-set prms_id 0
-set bug_id 0
-
-set testfile "freebpcmd"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "break [gdb_get_line_number "euphonium"]" "" "set breakpoint"
-
-# The goal of all this is to make sure that there's plenty of memory
-# churn, and different amounts of it each time the inferior stops;
-# this seems to make GDB crash more reliably.
-set lines {{if (i%2) == 0}
-           {echo "even "}
-           {print i}
-           {else}
-           {echo "odd "}
-           {print i}
-           {end}
-           {set variable $foo = 0}
-           {set variable $j = 0}
-           {while $j < i}
-           {set variable $foo += $j}
-           {set variable $j++}
-           {end}
-           {print $foo}
-           {if i != 40}
-           {c}
-           {end}
-           {end}}
-
-send_gdb "commands\n"
-for {set i 0} {$i < [llength $lines]} {incr i} {
-    gdb_expect {
-        -re ".*>" {
-            send_gdb "[lindex $lines $i]\n"
-        }
-        -re "$gdb_prompt $" {
-            set reason "got top-level prompt early"
-            break
-        }
-        timeout {
-            set reason "timeout"
-            break
-        }
-    }
-}
-if {$i >= [llength $lines]} {
-    pass "send breakpoint commands"
-} else {
-    fail "send breakpoint commands ($reason)"
-}
-
-gdb_run_cmd
-gdb_test_multiple "" "run program with breakpoint commands" {
-    -re "warning: Invalid control type in command structure" {
-        kfail "gdb/1489" "run program with breakpoint commands"
-    }
-    -re "$gdb_prompt $" {
-        pass "run program with breakpoint commands"
-    }
-    eof {
-        kfail "gdb/1489" "run program with breakpoint commands (GDB died)"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/funcargs.c b/gdb/testsuite/gdb.base/funcargs.c
deleted file mode 100644
index f7dfc649676..00000000000
--- a/gdb/testsuite/gdb.base/funcargs.c
+++ /dev/null
@@ -1,792 +0,0 @@
-/*  Test passing of arguments to functions.  Use various sorts of arguments,
-    including basic types, pointers to those types, structures, lots of
-    args, etc, in various combinations. */
-
-/* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
-#  define alloca __builtin_alloca
-#  define HAVE_STACK_ALLOCA 1
-#else /* not __GNUC__ */
-#  ifdef _AIX
-     #pragma alloca
-#    define HAVE_STACK_ALLOCA 1
-#  else /* Not AIX */
-#    ifdef sparc
-#      include <alloca.h>
-#      define HAVE_STACK_ALLOCA 1
-#      ifdef __STDC__
-         void *alloca ();
-#      else
-         char *alloca ();
-#      endif /* __STDC__ */
-#    endif /* sparc */
-#  endif /* Not AIX */
-#endif /* not __GNUC__ */
-
-char c = 'a';
-char *cp = &c;
-
-unsigned char uc = 'b';
-unsigned char *ucp = &uc;
-
-short s = 1;
-short *sp = &s;
-
-unsigned short us = 6;
-unsigned short *usp = &us;
-
-int i = 2;
-int *ip = &i;
-
-unsigned int ui = 7;
-unsigned int *uip = &ui;
-
-long l = 3;
-long *lp = &l;
-
-unsigned long ul = 8;
-unsigned long *ulp = &ul;
-
-float f = 4.0;
-float *fp = &f;
-
-double d = 5.0;
-double *dp = &d;
-
-struct stag {
-    int s1;
-    int s2;
-} st = { 101, 102 };
-struct stag *stp = &st;
-
-union utag {
-    int u1;
-    long u2;
-} un;
-union utag *unp = &un;
-
-char carray[] = {'a', 'n', ' ', 'a', 'r', 'r', 'a', 'y', '\0'};
-
-
-/* Test various permutations and interleaving of integral arguments */
-
-
-#ifdef PROTOTYPES
-void call0a (char c, short s, int i, long l)
-#else
-call0a (c, s, i, l)
-char c; short s; int i; long l;
-#endif
-{
-  c = 'a';
-  s = 5;
-  i = 6;
-  l = 7;
-}
-
-#ifdef PROTOTYPES
-void call0b (short s, int i, long l, char c)
-#else
-call0b (s, i, l, c)
-short s; int i; long l; char c;
-#endif
-{
-  s = 6; i = 7; l = 8; c = 'j';
-}
-
-#ifdef PROTOTYPES
-void call0c (int i, long l, char c, short s)
-#else
-call0c (i, l, c, s)
-int i; long l; char c; short s;
-#endif
-{
-  i = 3; l = 4; c = 'k'; s = 5;
-}
-
-#ifdef PROTOTYPES
-void call0d (long l, char c, short s, int i)
-#else
-call0d (l, c, s, i)
-long l; char c; short s; int i;
-#endif
-{
-  l = 7; c = 'z'; s = 8; i = 9;
-}
-
-#ifdef PROTOTYPES
-void call0e (char c1, long l, char c2, int i, char c3, short s, char c4, char c5)
-#else
-call0e (c1, l, c2, i, c3, s, c4, c5)
-char c1; long l; char c2; int i; char c3; short s; char c4; char c5;
-#endif
-{
-  c1 = 'a'; l = 5; c2 = 'b'; i = 7; c3 = 'c'; s = 7; c4 = 'f'; c5 = 'g';
-}
-
-
-/* Test various permutations and interleaving of unsigned integral arguments */
-
-
-#ifdef PROTOTYPES
-void call1a (unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call1a (uc, us, ui, ul)
-unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  uc = 5; us = 6; ui = 7; ul = 8;
-}
-
-#ifdef PROTOTYPES
-void call1b (unsigned short us, unsigned int ui, unsigned long ul, unsigned char uc)
-#else
-call1b (us, ui, ul, uc)
-unsigned short us; unsigned int ui; unsigned long ul; unsigned char uc;
-#endif
-{
-  uc = 5; us = 6; ui = 7; ul = 8;
-}
-
-#ifdef PROTOTYPES
-void call1c (unsigned int ui, unsigned long ul, unsigned char uc, unsigned short us)
-#else
-call1c (ui, ul, uc, us)
-unsigned int ui; unsigned long ul; unsigned char uc; unsigned short us;
-#endif
-{
-  uc = 5; us = 6; ui = 7; ul = 8;
-}
-
-#ifdef PROTOTYPES
-void call1d (unsigned long ul, unsigned char uc, unsigned short us, unsigned int ui)
-#else
-call1d (ul, uc, us, ui)
-unsigned long ul; unsigned char uc; unsigned short us; unsigned int ui;
-#endif
-{
-  uc = 5; us = 6; ui = 7; ul = 8;
-}
-
-#ifdef PROTOTYPES
-void call1e (unsigned char uc1, unsigned long ul, unsigned char uc2, unsigned int ui, unsigned char uc3, unsigned short us, unsigned char uc4, unsigned char uc5)
-#else
-call1e (uc1, ul, uc2, ui, uc3, us, uc4, uc5)
-unsigned char uc1; unsigned long ul; unsigned char uc2; unsigned int ui;
-unsigned char uc3; unsigned short us; unsigned char uc4; unsigned char uc5;
-#endif
-{
-  uc1 = 5; ul = 7; uc2 = 8; ui = 9; uc3 = 10; us = 11; uc4 = 12; uc5 = 55;
-}
-
-/* Test various permutations and interleaving of integral arguments with
-   floating point arguments. */
-
-
-#ifdef PROTOTYPES
-void call2a (char c, float f1, short s, double d1, int i, float f2, long l, double d2)
-#else
-call2a (c, f1, s, d1, i, f2, l, d2)
-char c; float f1; short s; double d1; int i; float f2; long l; double d2;
-#endif
-{
-  c = 'a'; f1 = 0.0; s = 5; d1 = 0.0; i = 6; f2 = 0.1; l = 7; d2 = 0.2;
-}
-
-#ifdef PROTOTYPES
-void call2b (float f1, short s, double d1, int i, float f2, long l, double d2, char c)
-#else
-call2b (f1, s, d1, i, f2, l, d2, c)
-float f1; short s; double d1; int i; float f2; long l; double d2; char c;
-#endif
-{
-  c = 'a'; f1 = 0.0; s = 5; d1 = 0.0; i = 6; f2 = 0.1; l = 7; d2 = 0.2;
-}
-
-#ifdef PROTOTYPES
-void call2c (short s, double d1, int i, float f2, long l, double d2, char c, float f1)
-#else
-call2c (s, d1, i, f2, l, d2, c, f1)
-short s; double d1; int i; float f2; long l; double d2; char c; float f1;
-#endif
-{
-  c = 'a'; f1 = 0.0; s = 5; d1 = 0.0; i = 6; f2 = 0.1; l = 7; d2 = 0.2;
-}
-
-#ifdef PROTOTYPES
-void call2d (double d1, int i, float f2, long l, double d2, char c, float f1, short s)
-#else
-call2d (d1, i, f2, l, d2, c, f1, s)
-double d1; int i; float f2; long l; double d2; char c; float f1; short s;
-#endif
-{
-  c = 'a'; f1 = 0.0; s = 5; d1 = 0.0; i = 6; f2 = 0.1; l = 7; d2 = 0.2;
-}
-
-#ifdef PROTOTYPES
-void call2e (int i, float f2, long l, double d2, char c, float f1, short s, double d1)
-#else
-call2e (i, f2, l, d2, c, f1, s, d1)
-int i; float f2; long l; double d2; char c; float f1; short s; double d1;
-#endif
-{
-  c = 'a'; f1 = 0.0; s = 5; d1 = 0.0; i = 6; f2 = 0.1; l = 7; d2 = 0.2;
-}
-
-#ifdef PROTOTYPES
-void call2f (float f2, long l, double d2, char c, float f1, short s, double d1, int i)
-#else
-call2f (f2, l, d2, c, f1, s, d1, i)
-float f2; long l; double d2; char c; float f1; short s; double d1; int i;
-#endif
-{
-  c = 'a'; f1 = 0.0; s = 5; d1 = 0.0; i = 6; f2 = 0.1; l = 7; d2 = 0.2;
-}
-
-#ifdef PROTOTYPES
-void call2g (long l, double d2, char c, float f1, short s, double d1, int i, float f2)
-#else
-call2g (l, d2, c, f1, s, d1, i, f2)
-long l; double d2; char c; float f1; short s; double d1; int i; float f2;
-#endif
-{
-  c = 'a'; f1 = 0.0; s = 5; d1 = 0.0; i = 6; f2 = 0.1; l = 7; d2 = 0.2;
-}
-
-#ifdef PROTOTYPES
-void call2h (double d2, char c, float f1, short s, double d1, int i, float f2, long l)
-#else
-call2h (d2, c, f1, s, d1, i, f2, l)
-double d2; char c; float f1; short s; double d1; int i; float f2; long l;
-#endif
-{
-  c = 'a'; f1 = 0.0; s = 5; d1 = 0.0; i = 6; f2 = 0.1; l = 7; d2 = 0.2;
-}
-
-#ifdef PROTOTYPES
-void call2i (char c1, float f1, char c2, char c3, double d1, char c4, char c5, char c6, float f2, short s, char c7, double d2)
-#else
-call2i (c1, f1, c2, c3, d1, c4, c5, c6, f2, s, c7, d2)
-char c1; float f1; char c2; char c3; double d1; char c4; char c5; char c6;
-float f2; short s; char c7; double d2;
-#endif
-{
-  c1 = 'a'; f1 = 0.0; c2 = 5; d1 = 0.0; c3 = 6; f2 = 0.1; c4 = 7; d2 = 0.2;
-  c5 = 's'; c6 = 'f'; c7 = 'z'; s = 77;
-}
-
-
-/* Test pointers to various integral and floating types. */
-
-
-#ifdef PROTOTYPES
-void call3a (char *cp, short *sp, int *ip, long *lp)
-#else
-call3a (cp, sp, ip, lp)
-char *cp; short *sp; int *ip; long *lp;
-#endif
-{
-  cp = 0; sp = 0; ip = 0; lp = 0;
-}
-
-#ifdef PROTOTYPES
-void call3b (unsigned char *ucp, unsigned short *usp, unsigned int *uip, unsigned long *ulp)
-#else
-call3b (ucp, usp, uip, ulp)
-unsigned char *ucp; unsigned short *usp; unsigned int *uip;
-unsigned long *ulp;
-#endif
-{
-  ucp = 0; usp = 0; uip = 0; ulp = 0;
-}
-
-#ifdef PROTOTYPES
-void call3c (float *fp, double *dp)
-#else
-call3c (fp, dp)
-float *fp; double *dp;
-#endif
-{
-  fp = 0; dp = 0;
-}
-
-
-/* Test passing structures and unions by reference. */
-
-
-#ifdef PROTOTYPES
-void call4a (struct stag *stp)
-#else
-call4a (stp)
-struct stag *stp;
-#endif
-{stp = 0;}
-
-#ifdef PROTOTYPES
-void call4b (union utag *unp)
-#else
-call4b (unp)
-union utag *unp;
-#endif
-{
-  unp = 0;
-}
-
-
-/* Test passing structures and unions by value. */
-
-
-#ifdef PROTOTYPES
-void call5a (struct stag st)
-#else
-call5a (st)
-struct stag st;
-#endif
-{st.s1 = 5;}
-
-#ifdef PROTOTYPES
-void call5b (union utag un)
-#else
-call5b (un)
-union utag un;
-#endif
-{un.u1 = 7;}
-
-
-/* Test shuffling of args */
-
-
-void call6k ()
-{
-}
-
-#ifdef PROTOTYPES
-void call6j (unsigned long ul)
-#else
-call6j (ul)
-unsigned long ul;
-#endif
-{
-  ul = ul;
-    call6k ();
-}
-
-#ifdef PROTOTYPES
-void call6i (unsigned int ui, unsigned long ul)
-#else
-call6i (ui, ul)
-unsigned int ui; unsigned long ul;
-#endif
-{
-  ui = ui;
-    call6j (ul);
-}
-
-#ifdef PROTOTYPES
-void call6h (unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call6h (us, ui, ul)
-unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  us = us;
-    call6i (ui, ul);
-}
-
-#ifdef PROTOTYPES
-void call6g (unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call6g (uc, us, ui, ul)
-unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  uc = uc;
-    call6h (us, ui, ul);
-}
-
-#ifdef PROTOTYPES
-void call6f (double d, unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call6f (d, uc, us, ui, ul)
-double d;
-unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  d = d;
-    call6g (uc, us, ui, ul);
-}
-
-#ifdef PROTOTYPES
-void call6e (float f, double d, unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call6e (f, d, uc, us, ui, ul)
-float f; double d;
-unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  f = f;
-    call6f (d, uc, us, ui, ul);
-}
-
-#ifdef PROTOTYPES
-void call6d (long l, float f, double d, unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call6d (l, f, d, uc, us, ui, ul)
-long l; float f; double d;
-unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  l = l;
-    call6e (f, d, uc, us, ui, ul);
-}
-
-#ifdef PROTOTYPES
-void call6c (int i, long l, float f, double d, unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call6c (i, l, f, d, uc, us, ui, ul)
-int i; long l; float f; double d;
-unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  i = i;
-    call6d (l, f, d, uc, us, ui, ul);
-}
-
-#ifdef PROTOTYPES
-void call6b (short s, int i, long l, float f, double d, unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call6b (s, i, l, f, d, uc, us, ui, ul)
-short s; int i; long l; float f; double d;
-unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  s = s;
-    call6c (i, l, f, d, uc, us, ui, ul);
-}
-
-#ifdef PROTOTYPES
-void call6a (char c, short s, int i, long l, float f, double d, unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-call6a (c, s, i, l, f, d, uc, us, ui, ul)
-char c; short s; int i; long l; float f; double d;
-unsigned char uc; unsigned short us; unsigned int ui; unsigned long ul;
-#endif
-{
-  c = c;
-    call6b (s, i, l, f, d, uc, us, ui, ul);
-}
-
-/*  Test shuffling of args, round robin */
-
-
-#ifdef PROTOTYPES
-void call7k (char c, int i, short s, long l, float f, unsigned char uc, double d, unsigned short us, unsigned long ul, unsigned int ui)
-#else
-call7k (c, i, s, l, f, uc, d, us, ul, ui)
-char c; int i; short s; long l; float f; unsigned char uc; double d; unsigned short us; unsigned long ul; unsigned int ui;
-#endif
-{
-  c = 'a'; i = 7; s = 8; l = 7; f = 0.3; uc = 44; d = 0.44; us = 77;
-  ul = 43; ui = 33;
-}
-
-#ifdef PROTOTYPES
-void call7j (unsigned int ui, char c, int i, short s, long l, float f, unsigned char uc, double d, unsigned short us, unsigned long ul)
-#else
-call7j (ui, c, i, s, l, f, uc, d, us, ul)
-unsigned int ui; char c; int i; short s; long l; float f; unsigned char uc; double d; unsigned short us; unsigned long ul;
-#endif
-{
-    call7k (c, i, s, l, f, uc, d, us, ul, ui);
-}
-
-#ifdef PROTOTYPES
-void call7i (unsigned long ul, unsigned int ui, char c, int i, short s, long l, float f, unsigned char uc, double d, unsigned short us)
-#else
-call7i (ul, ui, c, i, s, l, f, uc, d, us)
-unsigned long ul; unsigned int ui; char c; int i; short s; long l; float f; unsigned char uc; double d; unsigned short us;
-#endif
-{
-    call7j (ui, c, i, s, l, f, uc, d, us, ul);
-}
-
-#ifdef PROTOTYPES
-void call7h (unsigned short us, unsigned long ul, unsigned int ui, char c, int i, short s, long l, float f, unsigned char uc, double d)
-#else
-call7h (us, ul, ui, c, i, s, l, f, uc, d)
-unsigned short us; unsigned long ul; unsigned int ui; char c; int i; short s; long l; float f; unsigned char uc; double d;
-#endif
-{
-    call7i (ul, ui, c, i, s, l, f, uc, d, us);
-}
-
-#ifdef PROTOTYPES
-void call7g (double d, unsigned short us, unsigned long ul, unsigned int ui, char c, int i, short s, long l, float f, unsigned char uc)
-#else
-call7g (d, us, ul, ui, c, i, s, l, f, uc)
-double d; unsigned short us; unsigned long ul; unsigned int ui; char c; int i; short s; long l; float f; unsigned char uc;
-#endif
-{
-    call7h (us, ul, ui, c, i, s, l, f, uc, d);
-}
-
-#ifdef PROTOTYPES
-void call7f (unsigned char uc, double d, unsigned short us, unsigned long ul, unsigned int ui, char c, int i, short s, long l, float f)
-#else
-call7f (uc, d, us, ul, ui, c, i, s, l, f)
-unsigned char uc; double d; unsigned short us; unsigned long ul; unsigned int ui; char c; int i; short s; long l; float f;
-#endif
-{
-    call7g (d, us, ul, ui, c, i, s, l, f, uc);
-}
-
-#ifdef PROTOTYPES
-void call7e (float f, unsigned char uc, double d, unsigned short us, unsigned long ul, unsigned int ui, char c, int i, short s, long l)
-#else
-call7e (f, uc, d, us, ul, ui, c, i, s, l)
-float f; unsigned char uc; double d; unsigned short us; unsigned long ul; unsigned int ui; char c; int i; short s; long l;
-#endif
-{
-    call7f (uc, d, us, ul, ui, c, i, s, l, f);
-}
-
-#ifdef PROTOTYPES
-void call7d (long l, float f, unsigned char uc, double d, unsigned short us, unsigned long ul, unsigned int ui, char c, int i, short s)
-#else
-call7d (l, f, uc, d, us, ul, ui, c, i, s)
-long l; float f; unsigned char uc; double d; unsigned short us; unsigned long ul; unsigned int ui; char c; int i; short s;
-#endif
-{
-    call7e (f, uc, d, us, ul, ui, c, i, s, l);
-}
-
-#ifdef PROTOTYPES
-void call7c (short s, long l, float f, unsigned char uc, double d, unsigned short us, unsigned long ul, unsigned int ui, char c, int i)
-#else
-call7c (s, l, f, uc, d, us, ul, ui, c, i)
-short s; long l; float f; unsigned char uc; double d; unsigned short us; unsigned long ul; unsigned int ui; char c; int i;
-#endif
-{
-    call7d (l, f, uc, d, us, ul, ui, c, i, s);
-}
-
-#ifdef PROTOTYPES
-void call7b (int i, short s, long l, float f, unsigned char uc, double d, unsigned short us, unsigned long ul, unsigned int ui, char c)
-#else
-call7b (i, s, l, f, uc, d, us, ul, ui, c)
-int i; short s; long l; float f; unsigned char uc; double d; unsigned short us; unsigned long ul; unsigned int ui; char c;
-#endif
-{
-    call7c (s, l, f, uc, d, us, ul, ui, c, i);
-}
-
-#ifdef PROTOTYPES
-void call7a (char c, int i, short s, long l, float f, unsigned char uc, double d, unsigned short us, unsigned long ul, unsigned int ui)
-#else
-call7a (c, i, s, l, f, uc, d, us, ul, ui)
-char c; int i; short s; long l; float f; unsigned char uc; double d; unsigned short us; unsigned long ul; unsigned int ui;
-#endif
-{
-    call7b (i, s, l, f, uc, d, us, ul, ui, c);
-}
-
-
-/*  Test printing of structures passed as arguments to recursive functions. */
-
-
-typedef struct s
-{
-  short s;
-  int i;
-  long l;
-} SVAL;	
-
-void hitbottom ()
-{
-}
-
-#ifdef PROTOTYPES
-void recurse (SVAL a, int depth)
-#else
-void recurse (a, depth)
-SVAL a;
-int depth;
-#endif
-{
-  a.s = a.i = a.l = --depth;
-  if (depth == 0)
-    hitbottom ();
-  else
-    recurse (a, depth);
-}
-
-void test_struct_args ()
-{
-  SVAL s; s.s = 5; s.i = 5; s.l = 5;
-
-  recurse (s, 5);
-}
-
-/* On various machines (pa, 29k, and rs/6000, at least), a function which
-   calls alloca may do things differently with respect to frames.  So give
-   it a try.  */
-
-#ifdef PROTOTYPES
-void localvars_after_alloca (char c, short s, int i, long l)
-#else
-void
-localvars_after_alloca (c, s, i, l)
-     char c;
-     short s;
-     int i;
-     long l;
-#endif
-{
-#ifdef HAVE_STACK_ALLOCA
-  /* No need to use the alloca.c alloca-on-top-of-malloc; it doesn't
-     test what we are looking for, so if we don't have an alloca which
-     allocates on the stack, just don't bother to call alloca at all.  */
-
-  char *z = alloca (s + 50);
-#endif
-  c = 'a';
-  s = 5;
-  i = 6;
-  l = 7;
-}
-
-#ifdef PROTOTYPES
-void call_after_alloca_subr (char c, short s, int i, long l, unsigned char uc, unsigned short us, unsigned int ui, unsigned long ul)
-#else
-void
-call_after_alloca_subr (c, s, i, l, uc, us, ui, ul)
-char c; int i; short s; long l; unsigned char uc; unsigned short us; unsigned long ul; unsigned int ui;
-#endif
-{
-  c = 'a';
-  i = 7; s = 8; l = 7; uc = 44; us = 77;
-  ul = 43; ui = 33;
-}
-
-#ifdef PROTOTYPES
-void call_after_alloca (char c, short s, int i, long l)
-#else
-void
-call_after_alloca (c, s, i, l)
-     char c;
-     short s;
-     int i;
-     long l;
-#endif
-{
-#ifdef HAVE_STACK_ALLOCA
-  /* No need to use the alloca.c alloca-on-top-of-malloc; it doesn't
-     test what we are looking for, so if we don't have an alloca which
-     allocates on the stack, just don't bother to call alloca at all.  */
-
-  char *z = alloca (s + 50);
-#endif
-  call_after_alloca_subr (c, s, i, l, 'b', 11, 12, (unsigned long)13);
-}
-
-
-
-/* The point behind this test is the PA will call this indirectly
-   through dyncall.  Unlike the indirect calls to call0a, this test
-   will require a trampoline between dyncall and this function on the
-   call path, then another trampoline on between this function and main
-   on the return path.  */
-#ifdef PROTOTYPES
-double call_with_trampolines (double d1)
-#else
-double
-call_with_trampolines (d1)
-double d1;
-#endif
-{
-  return d1;
-} /* End of call_with_trampolines, this comment is needed by funcargs.exp */
-
-/* Dummy functions which the testsuite can use to run to, etc.  */
-
-void
-marker_indirect_call () {}
-
-void
-marker_call_with_trampolines () {}
-
-int main ()
-{
-  void (*pointer_to_call0a) (char, short, int, long) = (void (*)(char, short, int, long))call0a;
-  double (*pointer_to_call_with_trampolines) (double) = call_with_trampolines;
-
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  /* Test calling with basic integer types */
-  call0a (c, s, i, l);
-  call0b (s, i, l, c);
-  call0c (i, l, c, s);
-  call0d (l, c, s, i);
-  call0e (c, l, c, i, c, s, c, c);
-
-  /* Test calling with unsigned integer types */
-  call1a (uc, us, ui, ul);
-  call1b (us, ui, ul, uc);
-  call1c (ui, ul, uc, us);
-  call1d (ul, uc, us, ui);
-  call1e (uc, ul, uc, ui, uc, us, uc, uc);
-
-  /* Test calling with integral types mixed with floating point types */
-  call2a (c, f, s, d, i, f, l, d);
-  call2b (f, s, d, i, f, l, d, c);
-  call2c (s, d, i, f, l, d, c, f);
-  call2d (d, i, f, l, d, c, f, s);
-  call2e (i, f, l, d, c, f, s, d);
-  call2f (f, l, d, c, f, s, d, i);
-  call2g (l, d, c, f, s, d, i, f);
-  call2h (d, c, f, s, d, i, f, l);
-  call2i (c, f, c, c, d, c, c, c, f, s, c, d);
-
-  /* Test dereferencing pointers to various integral and floating types */
-
-  call3a (cp, sp, ip, lp);
-  call3b (ucp, usp, uip, ulp);
-  call3c (fp, dp);
-
-  /* Test dereferencing pointers to structs and unions */
-
-  call4a (stp);
-  un.u1 = 1;
-  call4b (unp);
-
-  /* Test calling with structures and unions. */
-
-  call5a (st);
-  un.u1 = 2;
-  call5b (un);
-
-  /* Test shuffling of args */
-
-  call6a (c, s, i, l, f, d, uc, us, ui, ul);
-  call7a (c, i, s, l, f, uc, d, us, ul, ui);
-  
-  /* Test passing structures recursively. */
-
-  test_struct_args ();
-
-  localvars_after_alloca (c, s, i, l);
-
-  call_after_alloca (c, s, i, l);
-
-  /* This is for localvars_in_indirect_call.  */
-  marker_indirect_call ();
-  /* The comment on the following two lines is used by funcargs.exp,
-     don't change it.  */
-  (*pointer_to_call0a) (c, s, i, l);	/* First step into call0a.  */
-  (*pointer_to_call0a) (c, s, i, l);	/* Second step into call0a.  */
-  marker_call_with_trampolines ();
-  (*pointer_to_call_with_trampolines) (d); /* Test multiple trampolines.  */
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
deleted file mode 100644
index f3284c01b95..00000000000
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ /dev/null
@@ -1,1226 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003,
-# 2004 Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "funcargs"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-#
-# Locate actual args; integral types.
-#
-
-proc integral_args {} {
-    global gdb_prompt
-    global det_file
-    global gcc_compiled
-
-    delete_breakpoints
-
-    gdb_breakpoint call0a
-    gdb_breakpoint call0b
-    gdb_breakpoint call0c
-    gdb_breakpoint call0d
-    gdb_breakpoint call0e
-
-    # Run; should stop at call0a and print actual arguments.
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".* call0a \\(c=97 'a', s=1, i=2, l=3\\) .*$gdb_prompt $" {
-	    pass "run to call0a"
-	}
-	 -re "$gdb_prompt $"  { fail "run to call0a" ; gdb_suppress_tests }
-	 timeout { fail "(timeout) run to call0a" ; gdb_suppress_tests }
-    }
-
-    # Print each arg as a double check to see if we can print
-    # them here as well as with backtrace.
-    gdb_test "print c" ".* = 97 'a'" "print c after run to call0a" 
-    gdb_test "print s" ".* = 1" "print s after run to call0a"
-    gdb_test "print i" ".* = 2" "print i after run to call0a"
-    gdb_test "print l " ".* = 3" "print l after run to call0a"
-
-    # Continue; should stop at call0b and print actual arguments.
-    if [gdb_test "cont" ".* call0b \\(s=1, i=2, l=3, c=97 'a'\\) .*" "continue to call0b"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call0c and print actual arguments.
-    if [gdb_test "cont" ".* call0c \\(i=2, l=3, c=97 'a', s=1\\) .*" "continue to call0c"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call0d and print actual arguments.
-    if [gdb_test "cont" ".* call0d \\(l=3, c=97 'a', s=1, i=2\\) .*" "continue to call0d";] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call0e and print actual arguments.
-    if [gdb_test "cont" ".* call0e \\(c1=97 'a', l=3, c2=97 'a', i=2, c3=97 'a', s=1, c4=97 'a', c5=97 'a'\\) .*" "continue to call0e" ] {
-	gdb_suppress_tests;
-    }
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Locate actual args; unsigned integral types.
-#
-
-proc unsigned_integral_args {} {
-    global gdb_prompt
-    global det_file
-    global gcc_compiled
-
-    delete_breakpoints
-
-    gdb_breakpoint call1a;
-    gdb_breakpoint call1b;
-    gdb_breakpoint call1c;
-    gdb_breakpoint call1d;
-    gdb_breakpoint call1e;
-
-    # Run; should stop at call1a and print actual arguments.
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".* call1a \\(uc=98 'b', us=6, ui=7, ul=8\\) .*$gdb_prompt $" {
-	    pass "run to call1a"
-	}
-	 -re "$gdb_prompt $" { fail "run to call1a" ; gdb_suppress_tests; }
-	 timeout { fail "(timeout) run to call1a" ; gdb_suppress_tests; }
-    }
-
-    # Print each arg as a double check to see if we can print
-    # them here as well as with backtrace.
-    gdb_test "print uc" ".* = 98 'b'"
-    gdb_test "print us" ".* = 6"
-    gdb_test "print ui" ".* = 7"
-    gdb_test "print ul" ".* = 8"
-    
-    # Continue; should stop at call1b and print actual arguments.
-    if [gdb_test "cont" ".* call1b \\(us=6, ui=7, ul=8, uc=98 'b'\\) .*" "continue to call1b"] {
-	gdb_suppress_tests; 
-    }
-
-    # Continue; should stop at call1c and print actual arguments.
-    if [gdb_test "cont" ".* call1c \\(ui=7, ul=8, uc=98 'b', us=6\\) .*" "continue to call1c"] {
-	gdb_suppress_tests; 
-    }
-
-    # Continue; should stop at call1d and print actual arguments.
-    if [gdb_test "cont" ".* call1d \\(ul=8, uc=98 'b', us=6, ui=7\\) .*" "continue to call1d"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call1e and print actual arguments.
-    if [gdb_test "cont" ".* call1e \\(uc1=98 'b', ul=8, uc2=98 'b', ui=7, uc3=98 'b', us=6, uc4=98 'b', uc5=98 'b'\\) .*" "continue to call1e"] {
-	gdb_suppress_tests;
-    }
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Locate actual args; integrals mixed with floating point.
-#
-
-proc float_and_integral_args {} {
-    global gdb_prompt
-    global det_file
-    global gcc_compiled
-
-    delete_breakpoints
-
-    gdb_breakpoint call2a
-    gdb_breakpoint call2b
-    gdb_breakpoint call2c
-    gdb_breakpoint call2d
-    gdb_breakpoint call2e
-    gdb_breakpoint call2f
-    gdb_breakpoint call2g
-    gdb_breakpoint call2h
-
-    # Run; should stop at call2a and print actual arguments.
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" "mips-sgi-irix5*" }
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".* call2a \\(c=97 'a', f1=4, s=1, d1=5, i=2, f2=4, l=3, d2=5\\) .*$gdb_prompt $" { pass "run to call2a" }
-	 -re ".* call2a \\(c=97 'a', f1=.*, s=1, d1=5, i=2, f2=4, l=3, d2=5\\) .*$gdb_prompt $" { xfail "run to call2a" }
-	 -re "$gdb_prompt $" { fail "run to call2a" ; gdb_suppress_tests; }
-	 timeout { fail "(timeout) run to call2a" ; gdb_suppress_tests; }
-    }
-
-    # Print each arg as a double check to see if we can print
-    gdb_test "print c" ".* = 97 'a'" "print c after run to call2a"
-    gdb_test "print f1" ".* = 4" "print f1 after run to call2a"
-    gdb_test "print s" ".* = 1" "print s after run to call2a"
-    gdb_test "print d1" ".* = 5" "print d1 after run to call2a"
-    gdb_test "print i" ".* = 2" "print i after run to call2a"
-    gdb_test "print f2" ".* = 4" "print f2 after run to call2a"
-    gdb_test "print l" ".* = 3" "print l after run to call2a"
-    gdb_test "print d2" ".* = 5" "print d2 after run to call2a"
-
-    setup_xfail "rs6000-*-*"
-    if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix*" }
-    # Continue; should stop at call2b and print actual arguments.
-    if [gdb_test "cont" ".* call2b \\(f1=4, s=1, d1=5, i=2, f2=4, l=3, d2=5, c=97 'a'\\) .*" "continue to call2b"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call2c and print actual arguments.
-    if [gdb_test "cont" ".* call2c \\(s=1, d1=5, i=2, f2=4, l=3, d2=5, c=97 'a', f1=4\\) .*" "continue to call2c"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call2d and print actual arguments.
-    if [gdb_test "cont" ".* call2d \\(d1=5, i=2, f2=4, l=3, d2=5, c=97 'a', f1=4, s=1\\) .*" "continue to call2d"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call2e and print actual arguments.
-    if [gdb_test "cont" ".* call2e \\(i=2, f2=4, l=3, d2=5, c=97 'a', f1=4, s=1, d1=5\\) .*" "continue to call2e"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call2f and print actual arguments.
-    if [gdb_test "cont" ".* call2f \\(f2=4, l=3, d2=5, c=97 'a', f1=4, s=1, d1=5, i=2\\) .*" "continue to call2f"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call2g and print actual arguments.
-    if [gdb_test "cont" ".* call2g \\(l=3, d2=5, c=97 'a', f1=4, s=1, d1=5, i=2, f2=4\\) .*" "continue to call2g"] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call2h and print actual arguments.
-    if [gdb_test "cont" ".* call2h \\(d2=5, c=97 'a', f1=4, s=1, d1=5, i=2, f2=4, l=3\\) .*" "continue to call2h"] {
-	gdb_suppress_tests;
-    }
-
-    # monitor only allows 8 breakpoints; w89k board allows 10, so
-    # break them up into two groups.
-    delete_breakpoints
-    gdb_breakpoint call2i
-
-    # Continue; should stop at call2i and print actual arguments.
-    if [gdb_test "cont" ".* call2i \\(c1=97 'a', f1=4, c2=97 'a', c3=97 'a', d1=5, c4=97 'a', c5=97 'a', c6=97 'a', f2=4, s=1, c7=97 'a', d2=5\\) .*" "continue to call2i"] {
-	gdb_suppress_tests;
-    }
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Locate actual args; dereference pointers to ints and floats.
-#
-
-proc pointer_args {} {
-    global gdb_prompt
-    global hex
-    global det_file
-
-    delete_breakpoints
-
-    gdb_breakpoint call3a
-    gdb_breakpoint call3b
-    gdb_breakpoint call3c
-
-    # Run; should stop at call3a and print actual arguments.
-    # Try dereferencing the arguments.
-
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".* call3a \\(cp=$hex \"a.*\", sp=$hex, ip=$hex, lp=$hex\\) .*$gdb_prompt $" { pass "run to call3a" }
-	 -re "$gdb_prompt $" { fail "run to call3a" ; gdb_suppress_tests; }
-	 timeout { fail "(timeout) run to call3a" ; gdb_suppress_tests; }
-    }
-
-    gdb_test "print *cp" ".* = 97 'a'"
-    gdb_test "print *sp" ".* = 1"
-    gdb_test "print *ip" ".* = 2"
-    gdb_test "print *lp" ".* = 3"
-
-    # Continue; should stop at call3b and print actual arguments.
-    # Try dereferencing the arguments.
-    if [gdb_test "cont" ".* call3b \\(ucp=$hex \"b.*\", usp=$hex, uip=$hex, ulp=$hex\\) .*" "continue to call3b"] {
-	gdb_suppress_tests;
-    }
-
-    gdb_test "print *ucp" ".* = 98 'b'"
-    gdb_test "print *usp" ".* = 6"
-    gdb_test "print *uip" ".* = 7"
-    gdb_test "print *ulp" ".* = 8"
-
-    # Continue; should stop at call3c and print actual arguments.
-    # Try dereferencing the arguments.
-    if [gdb_test "cont" ".* call3c \\(fp=$hex, dp=$hex\\) .*" "continue to call3c"] {
-	gdb_suppress_tests;
-    }
-
-    gdb_test "print *fp" ".* = 4"
-    gdb_test "print *dp" ".* = 5"
-
-#    pass "locate actual args, pointer types"
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Locate actual args; structures and unions passed by reference.
-#
-
-proc structs_by_reference {} {
-    global gdb_prompt
-    global hex
-    global det_file
-    global target_sizeof_int
-    global target_sizeof_long
-    global target_bigendian_p
-
-    delete_breakpoints
-
-    gdb_breakpoint call4a
-    gdb_breakpoint call4b
-
-    # Run; should stop at call4a and print actual arguments.
-    # Try dereferencing the arguments.
-
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".* call4a \\(stp=$hex\\) .*$gdb_prompt $" {
-	    pass "run to call4a"
-	}
-	 -re "$gdb_prompt $" { fail "run to call4a" ; gdb_suppress_tests; }
-	 timeout { fail "(timeout) run to call4a" ; gdb_suppress_tests; }
-    }
-
-    gdb_test "print *stp" ".* = \{s1 = 101, s2 = 102\}"
-
-    # Continue; should stop at call4b and print actual arguments.
-
-    gdb_test "cont" ".* call4b \\(unp=$hex\\) .*" "continue to call4b"
-
-    # Try dereferencing the arguments.
-    if { $target_sizeof_long == $target_sizeof_int } {
-	gdb_test "print *unp" ".* = \{u1 = 1, u2 = 1\}" \
-		"print *unp (sizeof long == sizeof int)"
-    } elseif { ! $target_bigendian_p } {
-	gdb_test "print *unp" ".* = \{u1 = 1, u2 = 1\}" \
-		"print *unp (little-endian, sizeof long != sizeof int)"
-    } elseif { $target_sizeof_long == 8 && $target_sizeof_int == 4 } {
-	gdb_test "print *unp" ".* = \{u1 = 1, u2 = 4294967296\}" \
-		"print *unp (big-endian, sizeof long == 8, sizeof int = 4)"
-    } elseif { $target_sizeof_long == 4 && $target_sizeof_int == 2 } {
-	gdb_test "print *unp" ".* = \{u1 = 1, u2 = 65536\}" \
-		"print *unp (big-endian, sizeof long == 4, sizeof int = 2)"
-    } else {
-	fail "print *unp (unknown case)"
-    }
-
-    pass "locate actual args, structs/unions passed by reference"
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Locate actual args; structures and unions passed by value.
-#
-
-proc structs_by_value {} {
-    global gdb_prompt
-    global hex
-    global det_file
-    global target_sizeof_int
-    global target_sizeof_long
-    global target_bigendian_p
-
-    delete_breakpoints
-
-    gdb_breakpoint call5a
-    gdb_breakpoint call5b
-
-    # Run; should stop at call5a and print actual arguments.
-    # Try dereferencing the arguments.
-
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".* call5a \\(st=\{s1 = 101, s2 = 102\}\\) .*$gdb_prompt $" {
-	    pass "run to call5a"
-	}
-	 -re "$gdb_prompt $" { fail "run to call5a" ; gdb_suppress_tests; }
-	 timeout { fail "(timeout) run to call5a" ; gdb_suppress_tests; }
-    }
-
-    gdb_test "print st" ".* = \{s1 = 101, s2 = 102\}"
-
-    # Continue; should stop at call5b and print actual arguments.
-    if { $target_sizeof_long == $target_sizeof_int } {
-	gdb_test "cont" ".* call5b \\(un=\{u1 = 2, u2 = 2\}\\) .*" \
-		"continue to call5b (sizeof long == sizeof int)"
-    } elseif { ! $target_bigendian_p } {
-	gdb_test "cont" ".* call5b \\(un=\{u1 = 2, u2 = 2\}\\) .*" \
-		"continue to call5b (little-endian, sizeof long != sizeof int)"
-    } elseif { $target_sizeof_long == 8 && $target_sizeof_int == 4 } {
-	gdb_test "cont" ".* call5b \\(un=\{u1 = 2, u2 = 8589934592\}\\) .*" \
-		"continue to call5b (big-endian, sizeof long == 8, sizeof int = 4)"
-    } elseif { $target_sizeof_long == 4 && $target_sizeof_int == 2 } {
-	gdb_test "cont" ".* call5b \\(un=\{u1 = 2, u2 = 131072\}\\) .*" \
-		"continue to call5b (big-endian, sizeof long == 4, sizeof int = 2)"
-    } else {
-	fail "continue to call5b (unknown case)"
-    }
-
-    # Try dereferencing the arguments.
-    if { $target_sizeof_long == $target_sizeof_int } {
-	gdb_test "print un" ".* = \{u1 = 2, u2 = 2\}" \
-		"print un (sizeof long == sizeof int)"
-    } elseif { ! $target_bigendian_p } {
-	gdb_test "print un" ".* = \{u1 = 2, u2 = 2\}" \
-		"print un (little-endian, sizeof long != sizeof int)"
-    } elseif { $target_sizeof_long == 8 && $target_sizeof_int == 4 } {
-	gdb_test "print un" ".* = \{u1 = 2, u2 = 8589934592\}" \
-		"print un (big-endian, sizeof long == 8, sizeof int = 4)"
-    } elseif { $target_sizeof_long == 4 && $target_sizeof_int == 2 } {
-	gdb_test "print un" ".* = \{u1 = 2, u2 = 131072\}" \
-		"print un (big-endian, sizeof long == 4, sizeof int = 2)"
-    } else {
-	fail "print un (unknown case)"
-    }
-
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Locate actual args; discard, shuffle, and call
-#
-
-proc discard_and_shuffle {} {
-    global gdb_prompt
-    global hex
-    global decimal
-    global det_file
-    global gcc_compiled
-
-    delete_breakpoints
-
-    gdb_breakpoint call6a
-    gdb_breakpoint call6b
-    gdb_breakpoint call6c
-    gdb_breakpoint call6d
-    gdb_breakpoint call6e
-    gdb_breakpoint call6f
-    gdb_breakpoint call6g
-    gdb_breakpoint call6h
-
-    # Run; should stop at call6a and print actual arguments.
-    # Print backtrace.
-
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".*Breakpoint $decimal, call6a .*$gdb_prompt $" { pass "run to call6a" }
-	 -re "$gdb_prompt $" { fail "run to call6a" ; gdb_suppress_tests; }
-	 timeout { fail "(timeout) run to call6a" ; gdb_suppress_tests; }
-    }
-
-    setup_xfail "rs6000-*-*"
-
-    if {!$gcc_compiled} {
-	setup_xfail "mips-sgi-irix5*"
-    }
-
-    send_gdb "backtrace 100\n"
-    gdb_expect {
-	-re "backtrace 100\[\r\n\]+
-.* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) .*\r
-.* main \\(.*\\) .*\r
-$gdb_prompt $" {
-	    pass "backtrace from call6a"
-	}
-	-re "backtrace 100\[\r\n\]+
-.* call6a \\(c=97 'a', s=1, i=2, l=3, f=.*, d=5, uc=98 'b', us=6, ui=7, ul=8\\) .*\r
-.* main \\(.*\\) .*\r
-$gdb_prompt $" {
-	    xfail "backtrace from call6a"
-	}
-	-re "$gdb_prompt $" {
-	    fail "backtrace from call6a"
-	    gdb_suppress_tests
-	}
-	timeout {
-	    fail "(timeout) backtrace from call6a"
-	    gdb_suppress_tests
-	}
-    }
-
-    # Continue; should stop at call6b and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6b
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6b" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#1 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* main \\(.*\\) " 
-    } ] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call6c and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6c
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6c" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#1 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-    # Continue; should stop at call6d and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6d
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6d" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6d \\(l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#1 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#4 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call6e and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6e
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6e" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6e \\(f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#1 .* call6d \\(l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#4 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#5 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call6f and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6f
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6f" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6f \\(d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#1 .* call6e \\(f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* call6d \\(l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#4 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#5 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#6 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call6g and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6g
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6g" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6g \\(uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#1 .* call6f \\(d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* call6e \\(f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* call6d \\(l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#4 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#5 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#6 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#7 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call6h and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6h
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6h" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6h \\(us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#1 .* call6g \\(uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* call6f \\(d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* call6e \\(f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#4 .* call6d \\(l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#5 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#6 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#7 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#8 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-
-    # monitor only allows 8 breakpoints; w89k board allows 10, so
-    # break them up into two groups.
-    delete_breakpoints
-    gdb_breakpoint call6i
-    gdb_breakpoint call6j
-    gdb_breakpoint call6k
-
-    # Continue; should stop at call6i and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6i
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6i" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6i \\(ui=7, ul=8\\) "
-	".*\[\r\n\]#1 .* call6h \\(us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* call6g \\(uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* call6f \\(d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#4 .* call6e \\(f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#5 .* call6d \\(l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#6 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#7 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#8 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#9 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call6j and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call6j
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6j" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6j \\(ul=8\\) "
-	".*\[\r\n\]#1 .* call6i \\(ui=7, ul=8\\) "
-	".*\[\r\n\]#2 .* call6h \\(us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* call6g \\(uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#4 .* call6f \\(d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#5 .* call6e \\(f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#6 .* call6d \\(l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#7 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#8 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#9 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#10 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-
-    # Continue; should stop at call6k and print actual arguments.
-    # Print backtrace.
-    gdb_continue call6k
-
-    send_gdb "backtrace 100\n"
-    if [gdb_expect_list "backtrace from call6k" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call6k \\(\\) "
-	".*\[\r\n\]#1 .* call6j \\(ul=8\\) "
-	".*\[\r\n\]#2 .* call6i \\(ui=7, ul=8\\) "
-	".*\[\r\n\]#3 .* call6h \\(us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#4 .* call6g \\(uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#5 .* call6f \\(d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#6 .* call6e \\(f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#7 .* call6d \\(l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#8 .* call6c \\(i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#9 .* call6b \\(s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#10 .* call6a \\(c=97 'a', s=1, i=2, l=3, f=4, d=5, uc=98 'b', us=6, ui=7, ul=8\\) "
-	".*\[\r\n\]#11 .* main \\(.*\\) "
-    } ] {
-	gdb_suppress_tests;
-    }
-    gdb_stop_suppressing_tests;
-}
-
-
-#
-# Locate actual args; shuffle round robin and call
-#
-
-proc shuffle_round_robin {} {
-    global gdb_prompt
-    global hex
-    global decimal
-    global det_file
-    global gcc_compiled
-
-    delete_breakpoints
-
-    gdb_breakpoint call7a
-    gdb_breakpoint call7b
-    gdb_breakpoint call7c
-    gdb_breakpoint call7d
-    gdb_breakpoint call7e
-    gdb_breakpoint call7f
-    gdb_breakpoint call7g
-    gdb_breakpoint call7h
-
-    # Run; should stop at call7a and print actual arguments.
-    # Print backtrace.
-
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".*Breakpoint $decimal, call7a .*$gdb_prompt $" {
-	    pass "run to call7a"
-	}
-	 -re "$gdb_prompt $" { fail "run to call7a" ; gdb_suppress_tests; }
-	 timeout { fail "(timeout) run to call7a" ; gdb_suppress_tests; }
-    }
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" "mips-sgi-irix5*" }
-    send_gdb "backtrace 100\n"
-    gdb_expect {
-	-re "backtrace 100\[\r\n\]+
-.* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) .*\r
-.* main \\(.*\\) .*\r
-$gdb_prompt $" {
-	    pass "backtrace from call7a"
-	}
-	-re "backtrace 100\[\r\n\]+
-.* call7a \\(c=97 'a', i=2, s=1, l=3, f=.*, uc=98 'b', d=5, us=6, ul=8, ui=7\\) .*\r
-.* main \\(.*\\) .*\r
-$gdb_prompt $" {
-	    xfail "backtrace from call7a"
-	}
-	-re "$gdb_prompt $" { fail "backtrace from call7a" ; return }
-	timeout { fail "(timeout) backtrace from call7a" ; return }
-    }
-
-    # Continue; should stop at call7b and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call7b
-
-    if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7b" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#1 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#2 .* main \\(.*\\) "
-    }
-
-    # Continue; should stop at call7c and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call7c
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7c" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#1 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#2 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#3 .* main \\(.*\\) "
-    }
-
-    # Continue; should stop at call7d and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call7d
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7d" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7d \\(l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1\\) "
-	".*\[\r\n\]#1 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#2 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#3 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#4 .* main \\(.*\\) "
-    }
-
-    gdb_continue call7e
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7e" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7e \\(f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3\\) "
-	".*\[\r\n\]#1 .* call7d \\(l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1\\) "
-	".*\[\r\n\]#2 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#3 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#4 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#5 .* main \\(.*\\) "
-    }
-
-    # Continue; should stop at call7f and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call7f
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7f" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7f \\(uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4\\) "
-	".*\[\r\n\]#1 .* call7e \\(f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3\\) "
-	".*\[\r\n\]#2 .* call7d \\(l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1\\) "
-	".*\[\r\n\]#3 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#4 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#5 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#6 .* main \\(.*\\) "
-    }
-
-    # Continue; should stop at call7g and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call7g
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7g" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7g \\(d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b'\\) "
-	".*\[\r\n\]#1 .* call7f \\(uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4\\) "
-	".*\[\r\n\]#2 .* call7e \\(f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3\\) "
-	".*\[\r\n\]#3 .* call7d \\(l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1\\) "
-	".*\[\r\n\]#4 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#5 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#6 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#7 .* main \\(.*\\) "
-    }
-
-    gdb_continue call7h
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7h" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7h \\(us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5\\) "
-	".*\[\r\n\]#1 .* call7g \\(d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b'\\) "
-	".*\[\r\n\]#2 .* call7f \\(uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4\\) "
-	".*\[\r\n\]#3 .* call7e \\(f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3\\) "
-	".*\[\r\n\]#4 .* call7d \\(l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1\\) "
-	".*\[\r\n\]#5 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#6 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#7 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#8 .* main \\(.*\\) "
-    }
-
-    # monitor only allows 8 breakpoints; w89k board allows 10, so
-    # break them up into two groups.
-    delete_breakpoints
-    gdb_breakpoint call7i
-    gdb_breakpoint call7j
-    gdb_breakpoint call7k
-
-    # Continue; should stop at call7i and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call7i
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7i" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7i \\(ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6\\) "
-	".*\[\r\n\]#1 .* call7h \\(us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5\\) "
-	".*\[\r\n\]#2 .* call7g \\(d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b'\\) "
-	".*\[\r\n\]#3 .* call7f \\(uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4\\) "
-	".*\[\r\n\]#4 .* call7e \\(f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3\\) "
-	".*\[\r\n\]#5 .* call7d \\(l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1\\) "
-	".*\[\r\n\]#6 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#7 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#8 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#9 .* main \\(.*\\) "
-    }
-
-    # Continue; should stop at call7j and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call7j
-
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7j" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7j \\(ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8\\) "
-	".*\[\r\n\]#1 .* call7i \\(ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6\\) "
-	".*\[\r\n\]#2 .* call7h \\(us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5\\) "
-	".*\[\r\n\]#3 .* call7g \\(d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b'\\) "
-	".*\[\r\n\]#4 .* call7f \\(uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4\\) "
-	".*\[\r\n\]#5 .* call7e \\(f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3\\) "
-	".*\[\r\n\]#6 .* call7d \\(l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1\\) "
-	".*\[\r\n\]#7 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#8 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#9 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#10 .* main \\(.*\\) "
-    }
-
-    # Continue; should stop at call7k and print actual arguments.
-    # Print backtrace.
-
-    gdb_continue call7k
-
-    if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix*" }
-    send_gdb "backtrace 100\n"
-    gdb_expect_list "backtrace from call7k" ".*$gdb_prompt $" {
-	".*\[\r\n\]#0 .* call7k \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#1 .* call7j \\(ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8\\) "
-	".*\[\r\n\]#2 .* call7i \\(ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6\\) "
-	".*\[\r\n\]#3 .* call7h \\(us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5\\) "
-	".*\[\r\n\]#4 .* call7g \\(d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b'\\) "
-	".*\[\r\n\]#5 .* call7f \\(uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3, f=4\\) "
-	".*\[\r\n\]#6 .* call7e \\(f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1, l=3\\) "
-	".*\[\r\n\]#7 .* call7d \\(l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2, s=1\\) "
-	".*\[\r\n\]#8 .* call7c \\(s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a', i=2\\) "
-	".*\[\r\n\]#9 .* call7b \\(i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7, c=97 'a'\\) "
-	".*\[\r\n\]#10 .* call7a \\(c=97 'a', i=2, s=1, l=3, f=4, uc=98 'b', d=5, us=6, ul=8, ui=7\\) "
-	".*\[\r\n\]#11 .* main \\(.*\\) "
-    }
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Locate actual args; recursive passing of structs by value
-#
-
-proc recursive_structs_by_value {} {
-    global gdb_prompt
-    global hex
-    global decimal
-    global det_file
-
-    delete_breakpoints
-
-    gdb_breakpoint hitbottom
-
-    # Run; should stop at hitbottom and print actual arguments.
-    # Print backtrace.
-    gdb_run_cmd
-    gdb_expect {
-	 -re ".*Breakpoint $decimal, hitbottom .*$gdb_prompt $" { pass "run to hitbottom" }
-	 -re "$gdb_prompt $" { fail "run to hitbottom" ; gdb_suppress_tests; }
-	 timeout { fail "(timeout) run to hitbottom" ; gdb_suppress_tests; }
-    }
-
-    if ![istarget sparclet-*-*] {
-	send_gdb "backtrace 100\n"
-	gdb_expect_list "recursive passing of structs by value" ".*$gdb_prompt $" {
-	    ".*\[\r\n\]#0 .* hitbottom \\(\\) "
-	    ".*\[\r\n\]#1 .* recurse \\(a=\{s = 0, i = 0, l = 0\}, depth=0\\) "
-	    ".*\[\r\n\]#2 .* recurse \\(a=\{s = 1, i = 1, l = 1\}, depth=1\\) "
-	    ".*\[\r\n\]#3 .* recurse \\(a=\{s = 2, i = 2, l = 2\}, depth=2\\) "
-	    ".*\[\r\n\]#4 .* recurse \\(a=\{s = 3, i = 3, l = 3\}, depth=3\\) "
-	    ".*\[\r\n\]#5 .* recurse \\(a=\{s = 4, i = 4, l = 4\}, depth=4\\) "
-	    ".*\[\r\n\]#6 .* test_struct_args \\(\\) "
-	    ".*\[\r\n\]#7 .* main \\(.*\\) "
-	}
-    } else {
-	fail "recursive passing of structs by value (sparclet)"
-    }
-    gdb_stop_suppressing_tests;
-}
-
-proc funcargs_reload { } {
-    global objdir
-    global subdir
-    global binfile
-    global srcdir
-
-    if [istarget "mips-idt-*"] {
-	# Restart because IDT/SIM runs out of file descriptors.
-	gdb_exit
-	gdb_start
-	gdb_reinitialize_dir $srcdir/$subdir
-	gdb_load ${binfile}
-    }
-}
-
-#
-# Test for accessing local stack variables in functions which call alloca
-#
-proc localvars_after_alloca { } {
-    global gdb_prompt
-    global hex
-    global decimal
-    global gcc_compiled
-
-    if { ! [ runto localvars_after_alloca ] } then { gdb_suppress_tests; }
-
-    # Print each arg as a double check to see if we can print
-    # them here as well as with backtrace.
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "print c" " = 97 'a'" "print c after runto localvars_after_alloca"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "print s" " = 1" "print s after runto localvars_after_alloca"
-    gdb_test "print i" " = 2" "print i after runto localvars_after_alloca"
-    gdb_test "print l" " = 3" "print l after runto localvars_after_alloca"
-
-    # Lame regexp.
-    gdb_test "next" ".*" "next in localvars_after_alloca()"
-
-    # Print each arg as a double check to see if we can print
-    # them here as well as with backtrace.
-
-    gdb_test "print c" " = 97 'a'" "print c in localvars_after_alloca"
-    gdb_test "print s" " = 1" "print s in localvars_after_alloca"
-    gdb_test "print i" " = 2" "print i in localvars_after_alloca"
-    gdb_test "print l" " = 3" "print l in localvars_after_alloca"
-
-    gdb_test "backtrace 8" "#0.*localvars_after_alloca \\(c=97 'a', s=1, i=2, l=3\\).*#1.*main.*" "backtrace after alloca"
-    gdb_stop_suppressing_tests;
-}
-
-proc call_after_alloca { } {
-    global gdb_prompt
-    global hex
-    global decimal
-    global gcc_compiled
-
-    if { ! [ runto call_after_alloca_subr ] } then { gdb_suppress_tests; }
-
-    # Print each arg as a double check to see if we can print
-    # them here as well as with backtrace.
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "print c" " = 97 'a'" "print c in call_after_alloca"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "print s" " = 1" "print s in call_after_alloca"
-    gdb_test "print i" " = 2" "print i in call_after_alloca"
-    gdb_test "print l" " = 3" "print l in call_after_alloca"
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "backtrace 8" "#0.*call_after_alloca_subr \\(c=97 'a', s=1, i=2, l=3, uc=98 'b', us=11, ui=12, ul=13\\).*#1.*call_after_alloca \\(c=97 'a', s=1, i=2, l=3\\).*#2.*main.*" "backtrace from call_after_alloca_subr"
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Test for accessing local stack variables, backtraces, finish,
-# and finally stepping into indirect calls.  The point is that on the PA
-# these use a funky `dyncall' mechanism which GDB needs to know about.
-#
-proc localvars_in_indirect_call { } {
-    global gdb_prompt
-    global hex
-    global decimal
-    global gcc_compiled
-
-    # Can not use "runto call0a" as call0a is called several times
-    # during single run.  Instead stop in a marker function and
-    # take control from there.
-    if { ! [ runto marker_indirect_call ] } then { gdb_suppress_tests; }
-
-    # break on the next call to call0a, then delete all the breakpoints
-    # and start testing.
-    gdb_breakpoint call0a
-    gdb_continue call0a
-    delete_breakpoints
-    
-    # Print each arg as a double check to see if we can print
-    # them here as well as with backtrace.
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "print c" " = 97 'a'" "print c in localvars_in_indirect_call"
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "print s" " = 1" "print s in localvars_in_indirect_call"
-    gdb_test "print i" " = 2" "print i in localvars_in_indirect_call"
-    gdb_test "print l" " = 3" "print l in localvars_in_indirect_call"
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "backtrace 8" \
-	"#0.*call0a \\(c=97 'a', s=1, i=2, l=3\\).*#1.*main.*" \
-	"backtrace in indirectly called function"
-
-    # 
-    # "finish" brings us back to main.  We then will try to step through
-    # the second indirect call.  
-    # On some targets (e.g. m68k) gdb will stop from the finish in midline
-    # of the first indirect call. This is due to stack adjustment instructions
-    # after the indirect call. In these cases we will step till we hit the
-    # second indirect call.
-    #
-
-    send_gdb "finish\n"
-    gdb_expect {
-	 -re "\\(\\*pointer_to_call0a\\) \\(c, s, i, l\\);.*First.*$gdb_prompt $" {
-#On hppa2.0w-hp-hpux11.00, gdb finishes at one line earlier than 
-#hppa1.1-hp-hpux11.00. Therefore, an extra "step" is necessary to continue the test.
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	 -re ".*\\(\\*pointer_to_call0a\\) \\(c, s, i, l\\);.*Second.*$gdb_prompt $" {
-	    pass "finish from indirectly called function"
-	}
-	 -re ".*$gdb_prompt $" {
-	    fail "finish from indirectly called function"
-	    gdb_suppress_tests;
-	}
-	 default { fail "finish from indirectly called function" ; gdb_suppress_tests; }
-    }
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "step" "call0a \\(c=97 'a', s=1, i=2, l=3\\).*" \
-	"stepping into indirectly called function"
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Test for stepping into indirect calls which may have trampolines (possibly
-# cascaded) on both the call path and the gdb_suppress_tests; path.
-# to handle trampolines.
-#
-proc test_stepping_over_trampolines { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    # Stop in a marker function and take control from there.
-    if { ! [ runto marker_call_with_trampolines ] } then { gdb_suppress_tests; }
-
-    # Cater for gdb stopping in midline, see comment for finish above.
-    send_gdb "finish\n"
-    gdb_expect {
-	 -re "marker_call_with_trampolines ..;.*$gdb_prompt $" {
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	 -re "pointer_to_call_with_trampolines.*$gdb_prompt $" {
-	    pass "finish from marker_call_with_trampolines"
-	}
-	 -re ".*$gdb_prompt $" {
-	    fail "finish from marker_call_with_trampolines"
-	}
-	 default { fail "finish from marker_call_with_trampolines" ; gdb_suppress_tests; }
-    }
-
-    # Try to step into the target function.
-    gdb_test "step" "call_with_trampolines \\(d1=5\\).*" \
-	"stepping into function called with trampolines"
-
-    # Make we can backtrace and the argument looks correct.  */
-    gdb_test "backtrace 8" "#0.*call_with_trampolines \\(d1=5\\).*1.*main.*" \
-	"backtrace through call with trampolines"
-
-    # Make sure we can get back to main.
-    # Stepping back to main might stop again after the gdb_suppress_tests; statement
-    # or immediately transfer control back to main if optimizations
-    # are performed.
-    send_gdb "step\n"
-    gdb_expect {
-	 -re "main .* at.*$gdb_prompt $" {
-	     pass "stepping back to main from function called with trampolines" ;
-	     gdb_suppress_tests
-	}
-	 -re "\}.*End of call_with_trampolines.*$gdb_prompt $" {
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	 -re ".*$gdb_prompt $" {
-	    fail "stepping back to main from function called with trampolines"
-	}
-	 default { fail "stepping back to main from function called with trampolines" ; gdb_suppress_tests; }
-    }
-    gdb_stop_suppressing_tests;
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [istarget "mips*tx39-*"] {
-    set timeout 300
-} else {
-    set timeout 60
-}
-
-# Determine expected output for unsigned long variables,
-# the output varies with sizeof (unsigned long).
-
-set target_sizeof_long 4
-send_gdb "print sizeof (long)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 4.*$gdb_prompt $" { }
-    -re ".\[0-9\]* = 8.*$gdb_prompt $" { set target_sizeof_long 8 } 
-    -re ".*$gdb_prompt $" {
-	 fail "getting sizeof long"
-    }
-    default	{ fail "(timeout) getting sizeof long" }
-}
-
-set target_sizeof_int 4
-send_gdb "print sizeof (int)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 2.*$gdb_prompt $" { set target_sizeof_int 2 }
-    -re ".\[0-9\]* = 4.*$gdb_prompt $" { }
-    -re ".\[0-9\]* = 8.*$gdb_prompt $" { set target_sizeof_int 8 } 
-    -re ".*$gdb_prompt $" {
-	 fail "getting sizeof unsigned long"
-    }
-    default	{ fail "(timeout) getting sizeof int" }
-}
-
-set target_bigendian_p 1
-send_gdb "show endian\n"
-gdb_expect {
-    -re ".*little endian.*$gdb_prompt $" { set target_bigendian_p 0 }
-    -re ".*big endian.*$gdb_prompt $" { }
-    -re ".*$gdb_prompt $" {
-	 fail "getting target endian"
-    }
-    default	{ fail "(timeout) getting target endian" }
-}
-
-# Perform tests
-
-integral_args
-funcargs_reload
-unsigned_integral_args
-funcargs_reload
-if {![target_info exists gdb,skip_float_tests]} {
-  float_and_integral_args
-}
-funcargs_reload
-pointer_args
-funcargs_reload
-structs_by_reference
-funcargs_reload
-structs_by_value
-funcargs_reload
-discard_and_shuffle
-funcargs_reload
-shuffle_round_robin
-funcargs_reload
-recursive_structs_by_value
-funcargs_reload
-localvars_after_alloca
-funcargs_reload
-call_after_alloca
-funcargs_reload
-localvars_in_indirect_call
-funcargs_reload
-test_stepping_over_trampolines
diff --git a/gdb/testsuite/gdb.base/gcore.c b/gdb/testsuite/gdb.base/gcore.c
deleted file mode 100644
index 24de8c7eb2f..00000000000
--- a/gdb/testsuite/gdb.base/gcore.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2002, 2004 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.  */
-
-/*
- * Test GDB's ability to save and reload a corefile.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-int extern_array[4] = {1, 2, 3, 4};
-static int static_array[4] = {5, 6, 7, 8};
-static int un_initialized_array[4];
-static char *heap_string;
-
-void 
-terminal_func ()
-{
-  return;
-}
-
-void
-array_func ()
-{
-  int local_array[4];
-  int i;
-
-  heap_string = (char *) malloc (80);
-  strcpy (heap_string, "I'm a little teapot, short and stout...");
-  for (i = 0; i < 4; i++)
-    {
-      un_initialized_array[i] = extern_array[i] + 8;
-      local_array[i] = extern_array[i] + 12;
-    }
-  terminal_func ();
-}
-
-#ifdef PROTOTYPES
-int factorial_func (int value)
-#else
-int factorial_func (value)
-     int value;
-#endif
-{
-  if (value > 1) {
-    value *= factorial_func (value - 1);
-  }
-  array_func ();
-  return (value);
-}
-
-main()
-{
-  factorial_func (6);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
deleted file mode 100644
index 29239ef87fd..00000000000
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-# This is a test for the gdb command "generate-core-file".
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "gcore"
-set srcfile  ${testfile}.c
-set binfile  ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Does this gdb support gcore?
-send_gdb "help gcore\n"
-gdb_expect {
-    -re "Undefined command: .gcore.*$gdb_prompt $" {
-	# gcore command not supported -- nothing to test here.
-	unsupported "gdb does not support gcore on this target"
-	return -1;
-    }
-    -re "Save a core file .*$gdb_prompt $" {
-	pass "help gcore"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "help gcore"
-    }
-    timeout {
-	fail "help gcore (timeout)"
-    }
-}
-
-if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
-}
-
-proc capture_command_output { command prefix } {
-    global gdb_prompt
-    global expect_out
-
-    set output_string ""
-    send_gdb "$command\n"
-    gdb_expect {
-	-re "${command}\[\r\n\]+${prefix}(.*)\[\r\n\]+$gdb_prompt $" {
-	    set output_string $expect_out(1,string)
-	}
-	default {
-	    fail "capture_command_output failed on $command."
-	}
-    }
-    return $output_string
-}
-
-gdb_test "break terminal_func" "Breakpoint .* at .*${srcfile}, line .*" \
-	"set breakpoint at terminal_func"
-
-gdb_test "continue" "Breakpoint .* terminal_func.*" \
-	"continue to terminal_func"
-
-set print_prefix ".\[0123456789\]* = "
-
-set pre_corefile_backtrace [capture_command_output "backtrace" ""]
-set pre_corefile_regs [capture_command_output "info registers" ""]
-set pre_corefile_allregs [capture_command_output "info all-reg" ""]
-set pre_corefile_static_array \
-	[capture_command_output "print static_array" "$print_prefix"]
-set pre_corefile_uninit_array \
-	[capture_command_output "print un_initialized_array" "$print_prefix"]
-set pre_corefile_heap_string \
-	[capture_command_output "print heap_string" "$print_prefix"]
-set pre_corefile_local_array \
-	[capture_command_output "print array_func::local_array" "$print_prefix"]
-set pre_corefile_extern_array \
-	[capture_command_output "print extern_array" "$print_prefix"]
-
-set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test]
-
-gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \
-	"save a corefile" \
-{
-  -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
-    pass "save a corefile"
-    global core_supported
-    set core_supported 1
-  }
-  -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
-    unsupported "save a corefile"
-    global core_supported
-    set core_supported 0
-  }
-}
-
-global core_supported
-if {!$core_supported} {
-  return -1
-}
-
-# Now restart gdb and load the corefile.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-send_gdb "core ${objdir}/${subdir}/gcore.test\n"
-gdb_expect {
-    -re ".* is not a core dump:.*$gdb_prompt $" {
-	fail "re-load generated corefile (bad file format)"
-	# No use proceeding from here.
-	return;	
-    }
-    -re ".*: No such file or directory.*$gdb_prompt $" {
-	fail "re-load generated corefile (file not found)"
-	# No use proceeding from here.
-	return;	
-    }
-    -re ".*Couldn't find .* registers in core file.*$gdb_prompt $" {
-	fail "re-load generated corefile (incomplete note section)"
-    }
-    -re "Core was generated by .*$gdb_prompt $" {
-	pass "re-load generated corefile"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "re-load generated corefile"
-    }
-    timeout {
-	fail "re-load generated corefile (timeout)"
-    }
-}
-
-send_gdb "where\n"
-gdb_expect_list "where in corefile" ".*$gdb_prompt $" {
-    ".*\[\r\n\]+#0 .* terminal_func \\(\\) at "
-    ".*\[\r\n\]+#1 .* array_func \\(\\) at "
-    ".*\[\r\n\]+#2 .* factorial_func \\(value=1\\) at "
-    ".*\[\r\n\]+#3 .* factorial_func \\(value=2\\) at "
-    ".*\[\r\n\]+#4 .* factorial_func \\(value=3\\) at "
-    ".*\[\r\n\]+#5 .* factorial_func \\(value=4\\) at "
-    ".*\[\r\n\]+#6 .* factorial_func \\(value=5\\) at "
-    ".*\[\r\n\]+#7 .* factorial_func \\(value=6\\) at "
-    ".*\[\r\n\]+#8 .* main \\(.*\\) at "
-}
-
-set post_corefile_regs [capture_command_output "info registers" ""]
-if ![string compare $pre_corefile_regs $post_corefile_regs] then {
-    pass "corefile restored general registers"
-} else {
-    fail "corefile restored general registers"
-}
-
-set post_corefile_allregs [capture_command_output "info all-reg" ""]
-if ![string compare $pre_corefile_allregs $post_corefile_allregs] then {
-    pass "corefile restored all registers"
-} else {
-    fail "corefile restored all registers"
-}
-
-set post_corefile_extern_array \
-	[capture_command_output "print extern_array" "$print_prefix"]
-if ![string compare $pre_corefile_extern_array $post_corefile_extern_array]  {
-    pass "corefile restored extern array"
-} else {
-    fail "corefile restored extern array"
-}
-
-set post_corefile_static_array \
-	[capture_command_output "print static_array" "$print_prefix"]
-if ![string compare $pre_corefile_static_array $post_corefile_static_array]  {
-    pass "corefile restored static array"
-} else {
-    fail "corefile restored static array"
-}
-
-set post_corefile_uninit_array \
-	[capture_command_output "print un_initialized_array" "$print_prefix"]
-if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array]  {
-    pass "corefile restored un-initialized array"
-} else {
-    fail "corefile restored un-initialized array"
-}
-
-set post_corefile_heap_string \
-	[capture_command_output "print heap_string" "$print_prefix"]
-if ![string compare $pre_corefile_heap_string $post_corefile_heap_string]  {
-    pass "corefile restored heap array"
-} else {
-    fail "corefile restored heap array"
-}
-
-set post_corefile_local_array \
-	[capture_command_output "print array_func::local_array" "$print_prefix"]
-if ![string compare $pre_corefile_local_array $post_corefile_local_array]  {
-    pass "corefile restored stack array"
-} else {
-    fail "corefile restored stack array"
-}
-
-set post_corefile_backtrace [capture_command_output "backtrace" ""]
-if ![string compare $pre_corefile_backtrace $post_corefile_backtrace]  {
-    pass "corefile restored backtrace"
-} else {
-    fail "corefile restored backtrace"
-}
diff --git a/gdb/testsuite/gdb.base/gdb1056.exp b/gdb/testsuite/gdb.base/gdb1056.exp
deleted file mode 100644
index 623f8370838..00000000000
--- a/gdb/testsuite/gdb.base/gdb1056.exp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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.  
-
-# Test for PR gdb/1056.
-# 2003-10-18  Michael Chastain <mec@shout.net>
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-# test SIGFPE (such as division by 0) inside gdb itself
-
-set prms_id 0
-set bug_id 0
-
-gdb_start
-
-# When SIGFPE happens, the operating system may restart the
-# offending instruction after the signal handler returns,
-# rather than proceeding to the next instruction.  This happens
-# on i686-pc-linux-gnu with a linux kernel.  If gdb has a naive
-# signal handler that just returns, then it will restart the
-# broken instruction and gdb gets an endless stream of SIGFPE's
-# and makes no progress.
-#
-# On a broken gdb this test will just time out.
-
-gdb_test_multiple "print 1/0" "" {
-    -re ".*$gdb_prompt $" {
-	pass "print 1/0"
-    }
-    timeout {
-	kfail "gdb/1056" "print 1/0"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/gdb1090.c b/gdb/testsuite/gdb.base/gdb1090.c
deleted file mode 100644
index cd9e2cdecbd..00000000000
--- a/gdb/testsuite/gdb.base/gdb1090.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Test program for multi-register variable.
-   Copyright 2003 Free Software Foundation, Inc.
-
-   This file is part of the gdb testsuite.
-
-   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.
- 
-   This file was written by Michael Elizabeth Chastain (mec@shout.net).  */
-
-struct s_2_by_4
-{
-  int field_0;
-  int field_1;
-};
-
-void marker (struct s_2_by_4 s_whatever)
-{
-  s_whatever = s_whatever;
-  return;
-}
-
-void foo ()
-{
-  /* I want this variable in a register but I can't really force it */
-  register struct s_2_by_4 s24;
-  s24.field_0 = 1170;
-  s24.field_1 = 64701;
-  marker (s24);
-  return;
-}
-
-int main ()
-{
-  foo ();
-}
diff --git a/gdb/testsuite/gdb.base/gdb1090.exp b/gdb/testsuite/gdb.base/gdb1090.exp
deleted file mode 100644
index 20da3b12839..00000000000
--- a/gdb/testsuite/gdb.base/gdb1090.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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.  
-
-# Tests for PR gdb/1090.
-# 2003-02-23  Michael Chastain <mec@shout.net>
-
-# This file is part of the gdb testsuite.
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "gdb1090"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto marker] then {
-    perror "couldn't run to breakpoint"
-    continue
-} 
-gdb_test "up" ".*foo.*" "up from marker"
-
-send_gdb "print s24\n"
-gdb_expect {
-    -re "\\\$\[0-9\]* = \\{field_0 = 1170, field_1 = 64701\\}\r\n$gdb_prompt $" {
-	pass "print s24"
-    }
-    -re "\\\$\[0-9\]* = \\{field_0 = 1170, field_1 = .*\\}\r\n$gdb_prompt $" {
-	# happens with gcc 2.95.3, which actually puts s24 in registers.
-	# gdb cannot find the second register and prints garbage.
-	kfail "gdb/1090" "print s24"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "print s24"
-    }
-    timeout {
-	fail "print s24 (timeout)"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/gdb1250.c b/gdb/testsuite/gdb.base/gdb1250.c
deleted file mode 100644
index 0af58d92fcb..00000000000
--- a/gdb/testsuite/gdb.base/gdb1250.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Test program for stack trace through noreturn function.
-
-   Copyright 2003 Free Software Foundation, Inc.
-
-   This file is part of the gdb testsuite.
-
-   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.
- 
-   This file was written by Michael Elizabeth Chastain (mec@shout.net).  */
-
-#include <stdlib.h>
-
-int global = 0;
-
-/* Foo, gcc thinks 'gamma' is a reserved identifier.
-   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12213
-   I am not interested in testing that point so just avoid the word.
-   -- chastain 2003-09-08. */
-void my_gamma (int *parray)
-{
-  return;
-}
-
-void beta ()
-{
-  int array [4];
-  array [0] = global++;
-  array [1] = global++;
-  array [2] = global++;
-  array [3] = global++;
-  my_gamma (array);
-  abort ();
-}
-
-int alpha ()
-{
-  global++;
-  beta ();
-  return 0;
-}
-
-int main ()
-{
-  int i;
-  global++;
-  i = alpha ();
-  return i;
-}
diff --git a/gdb/testsuite/gdb.base/gdb1250.exp b/gdb/testsuite/gdb.base/gdb1250.exp
deleted file mode 100644
index 4ffdf2baffc..00000000000
--- a/gdb/testsuite/gdb.base/gdb1250.exp
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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.  
-
-# Tests for PR gdb/1250.
-# 2003-07-15  Michael Chastain <mec@shout.net>
-
-# This file is part of the gdb testsuite.
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "gdb1250"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto abort {allow-pending}] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# See http://sources.redhat.com/gdb/bugs/1250
-#
-# In a nutshell: the function 'beta' ends with a call to 'abort', which
-# is a noreturn function.  So the last instruction of 'beta' is a call
-# to 'abort'.  When gdb looks for information about the caller of
-# 'beta', it looks at the instruction after the call to 'abort' -- which
-# is the first instruction of 'alpha'!  So gdb uses the wrong frame
-# information.  It thinks that the test program is in 'alpha' and that
-# the prologue "push %ebp / mov %esp,%ebp" has not been executed yet,
-# and grabs the wrong values.
-#
-# By the nature of the bug, it could pass if the C compiler is not smart
-# enough to implement 'abort' as a noreturn function.  This is okay.
-# The real point is that users often put breakpoints on noreturn
-# functions such as 'abort' or some kind of exitting function, and those
-# breakpoints should work.
-
-gdb_test_multiple "backtrace" "backtrace from abort" {
-    -re "#0.*abort.*\r\n#1.*beta.*\r\n#2.*alpha.*\r\n#3.*main.*\r\n$gdb_prompt $" {
-	pass "backtrace from abort"
-    }
-    -re "#0.*abort.*\r\n#1.*beta.*\r\n$gdb_prompt $" {
-	# This happens with gdb HEAD as of 2003-07-13, with gcc 3.3,
-	# binutils 2.14, either -gdwarf-2 or -gstabs+, on native
-	# i686-pc-linux-gnu.
-	#
-	# gdb gets 'abort' and 'beta' right and then goes into the
-	# weeds.
-	kfail "gdb/1250" "backtrace from abort"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/gdb1555-main.c b/gdb/testsuite/gdb.base/gdb1555-main.c
deleted file mode 100644
index de054f7c935..00000000000
--- a/gdb/testsuite/gdb.base/gdb1555-main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Test step/next in a shared library
-
-   Copyright 2004, 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.  */
-
-extern int hithere2 ();
-
-int
-main()
-{
-  hithere2();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/gdb1555.c b/gdb/testsuite/gdb.base/gdb1555.c
deleted file mode 100644
index 62082615ceb..00000000000
--- a/gdb/testsuite/gdb.base/gdb1555.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Test step/next in a shared library
-
-   Copyright 2004, 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.  */
-
-int hithere2()
-{
-  int a;
-  a = 21;
-  return a;
-}
-
diff --git a/gdb/testsuite/gdb.base/gdb1555.exp b/gdb/testsuite/gdb.base/gdb1555.exp
deleted file mode 100644
index 8bea6329160..00000000000
--- a/gdb/testsuite/gdb.base/gdb1555.exp
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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
-
-# Test stepping into and continuing on from a function in
-# a shared library (PR gdb/1555, was PR shlib/1280, shlib/1237).
-# Tested on ppc-yellowdog-linux (Yellow Dog Linux 3.0 3.2.2-2a)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile gdb1555-main
-set libfile gdb1555
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-remote_exec build "rm -f ${binfile}"
-
-# get the value of gcc_compiled
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}.o" object {debug}] != "" } {
-    return -1
-}
-
-# Build the shared libraries this test case needs.
-#
-
-if {$gcc_compiled == 0} {
-    if [istarget "hppa*-hp-hpux*"] then {
-        set additional_flags "additional_flags=+z"
-    } elseif { [istarget "mips-sgi-irix*"] } {
-        # Disable SGI compiler's implicit -Dsgi
-        set additional_flags "additional_flags=-Usgi"
-    } else {
-        # don't know what the compiler is...
-        set additional_flags ""
-    }
-} else {
-    if { ([istarget "powerpc*-*-aix*"]
-    || [istarget "rs6000*-*-aix*"]) } {
-        set additional_flags ""
-    } else {
-        set additional_flags "additional_flags=-fpic"
-    }
-}
-
-set additional_flags "$additional_flags -shared"
-if {[gdb_compile "${srcdir}/${subdir}/${libfile}.c" "${objdir}/${subdir}/${libfile}.so" executable [list debug $additional_flags "incdir=${objdir}"]] != ""} {
-    return -1
-}
-
-if { ($gcc_compiled 
-&&  ([istarget "powerpc*-*-aix*"]
-|| [istarget "rs6000*-*-aix*"] )) } {
-    set additional_flags "additional_flags=-L${objdir}/${subdir}"
-} elseif { [istarget "mips-sgi-irix*"] } {
-    set additional_flags "additional_flags=-rpath ${objdir}/${subdir}"
-} else {
-    set additional_flags ""
-}
-
-if {[gdb_compile "${objdir}/${subdir}/${testfile}.o ${objdir}/${subdir}/${libfile}.so" "${binfile}" executable [list debug $additional_flags]] != ""} {
-    return -1
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    fail "Can't run to main"
-    return 0
-}
-
-# PR/1555 (was shlib 1280)
-set name "Step into shared lib function"
-gdb_test_multiple "s" $name \
-{
-    -re "hithere2 \\(\\) at.*${libfile}.c:25\r\n25.*a = 21;.*$gdb_prompt $"  {
-	pass $name
-    }
-    -re "0x\[0-9a-f\]+ in .* \\(\\) from /lib/ld.so.1.*$gdb_prompt $" { 
-	kfail "gdb/1555" $name 
-    }
-}
-
-# PR/1555 (was shlib 1237)
-set name "Next while in a shared lib function"
-gdb_test_multiple "n" $name \
-{
-    -re "26.*return a;.*$gdb_prompt $" {
-	pass $name
-    }
-    -re "Single stepping until exit from function .*, \r\nwhich has no line number information.\r\n\r\nProgram exited normally.*$gdb_prompt $" { 
-	kfail "gdb/1555" $name 
-    }
-}
-
diff --git a/gdb/testsuite/gdb.base/gdb1821.c b/gdb/testsuite/gdb.base/gdb1821.c
deleted file mode 100644
index a4def6ecb0a..00000000000
--- a/gdb/testsuite/gdb.base/gdb1821.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Test printing of structure member names in gdb. PR exp/1821
-
-   Copyright 2005, 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.  */
-
-struct foo { double x__0, y__0, z__1; } bar;
-
-
-int main(void) { return 0; }
diff --git a/gdb/testsuite/gdb.base/gdb1821.exp b/gdb/testsuite/gdb.base/gdb1821.exp
deleted file mode 100644
index b2066fc26f4..00000000000
--- a/gdb/testsuite/gdb.base/gdb1821.exp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2005 Free Software Foundation, 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.  
-
-# Tests for PR gdb/1821.
-# 2004-12-06  Ramana Radhakrishnan <ramana.radhakrishnan@codito.com>
-
-# This file is part of the gdb testsuite.
-
-#
-# test running programs
-#
-
-set testfile "gdb1821"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     return -1
-}
-
-gdb_exit
-gdb_start
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-} 
-gdb_test "print /x bar" "{x__0 = 0x0, y__0 = 0x0, z__1 = 0x0}" 
-
diff --git a/gdb/testsuite/gdb.base/gdb_history b/gdb/testsuite/gdb.base/gdb_history
deleted file mode 100644
index cc22f69c2cf..00000000000
--- a/gdb/testsuite/gdb.base/gdb_history
+++ /dev/null
@@ -1,256 +0,0 @@
-add-symbol-file
-append
-append binary
-append memory
-append value
-append binary memory
-append binary value
-attach
-break
-b
-br
-bre
-brea
-backtrace
-bt
-ba
-bac
-continue
-c
-call
-catch
-cd
-clear
-commands
-condition
-core-file
-d
-delete
-define
-delete breakpoints
-delete display
-detach
-directory
-dis
-disa
-disable
-disable breakpoints
-disable display
-disassemble
-display
-do
-document
-down
-down-silently
-dump
-dump binary
-dump ihex
-dump memory
-dump srec
-dump tekhex
-dump value
-dump binary memory
-dump binary value
-dump ihex memory
-dump ihex value
-dump srec memory
-dump srec value
-dump tekhex memory
-dump tekhex value
-echo
-enable breakpoints delete
-enable breakpoints once
-enable breakpoints
-enable delete
-enable display
-enable once
-enable
-exec-file
-f
-frame
-fg
-file
-finish
-forward-search
-gcore
-generate-core-file
-h
-help
-handle
-i
-info
-ignore
-info address
-info all-registers
-info args
-info bogus-gdb-command
-info breakpoints
-info catch
-info copying
-info display
-info f
-info frame
-info files
-info float
-info functions
-info locals
-info program
-info registers
-info s
-info stack
-info set
-info symbol
-info source
-info sources
-info target
-info terminal
-info types
-info variables
-info warranty
-info watchpoints
-inspect
-jump
-kill
-l
-list
-load
-n
-next
-ni
-nexti
-output
-overlay
-overlay on
-overlay manual
-overlay auto
-overlay off
-overlay list
-overlay map
-overlay unmap
-overlay manual
-overlay map
-overlay unmap
-p
-print
-printf
-ptype
-pwd
-r
-run
-rbreak
-restore
-return
-reverse-search
-s
-step
-search
-section
-set annotate
-set args
-set c
-set ch
-set check
-set check range
-set check type
-set complaints
-set confirm
-set environment
-set height
-set history expansion
-set history filename
-set history save
-set history size
-set history
-set language
-set listsize
-set p
-set pr
-set print
-set print address
-set print array
-set print asm-demangle
-set print demangle
-set print elements
-set print object
-set print pretty
-set print sevenbit-strings
-set print union
-set print vtbl
-set radix
-set symbol-reloading
-set variable
-set verbose
-set width
-set write
-set
-shell echo Hi dad!
-show annotate
-show args
-show c
-show ch
-show check
-show check range
-show check type
-show commands
-show complaints
-show confirm
-show convenience
-show directories
-show editing
-show height
-show history expansion
-show history filename
-show history save
-show history size
-show history
-show language
-show listsize
-show p
-show pr
-show print
-show paths
-show print address
-show print array
-show print asm-demangle
-show print demangle
-show print elements
-show print object
-show print pretty
-show print sevenbit-strings
-show print union
-show print vtbl
-show prompt
-show radix
-show symbol-reloading
-show user
-show values
-show verbose
-show version
-show width
-show write
-show
-si
-stepi
-signal
-source
-s
-step
-symbol-file
-target child
-target procfs
-target core
-target exec
-target remote
-target
-tbreak
-tty
-u
-until
-undisplay
-unset environment
-unset
-up-silently
-watch
-whatis
-where
-x
diff --git a/gdb/testsuite/gdb.base/gdbvars.exp b/gdb/testsuite/gdb.base/gdbvars.exp
deleted file mode 100644
index 9678df6bb6e..00000000000
--- a/gdb/testsuite/gdb.base/gdbvars.exp
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (C) 1992, 1997 Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-proc test_convenience_variables {} {
-    global gdb_prompt
-
-    gdb_test "set \$foo = 101"	"" \
-	"Set a new convenience variable"
-
-    gdb_test "print \$foo"		" = 101" \
-	"Print contents of new convenience variable"
-
-    gdb_test "set \$foo = 301"	"" \
-	"Set convenience variable to a new value"
-
-    gdb_test "print \$foo"		" = 301" \
-	"Print new contents of convenience variable"
-
-    gdb_test "set \$_ = 11"		"" \
-	"Set convenience variable \$_"
-
-    gdb_test "print \$_"		" = 11" \
-	"Print contents of convenience variable \$_"
-
-    gdb_test "print \$foo + 10"	" = 311" \
-	"Use convenience variable in arithmetic expression"
-
-    gdb_test "print (\$foo = 32) + 4"	" = 36" \
-	"Use convenience variable assignment in arithmetic expression"
-
-    gdb_test "print \$bar"		" = void" \
-	"Print contents of uninitialized convenience variable"
-}
-
-proc test_value_history {} {
-    global gdb_prompt
-
-    gdb_test "print 101"	"\\\$1 = 101" \
-	"Set value-history\[1\] using \$1"
-
-    gdb_test "print 102" 	"\\\$2 = 102" \
-	"Set value-history\[2\] using \$2"
-
-    gdb_test "print 103"	"\\\$3 = 103" \
-	"Set value-history\[3\] using \$3"
-
-    gdb_test "print \$\$"	"\\\$4 = 102" \
-	"Print value-history\[MAX-1\] using inplicit index \$\$"
-
-    gdb_test "print \$\$"	"\\\$5 = 103" \
-	"Print value-history\[MAX-1\] again using implicit index \$\$"
-
-    gdb_test "print \$"	"\\\$6 = 103" \
-	"Print value-history\[MAX\] using implicit index \$"
-
-    gdb_test "print \$\$2"	"\\\$7 = 102" \
-	"Print value-history\[MAX-2\] using explicit index \$\$2"
-
-    gdb_test "print \$0"	"\\\$8 = 102" \
-	"Print value-history\[MAX\] using explicit index \$0"
-
-    gdb_test "print 108"	"\\\$9 = 108"
-
-    gdb_test "print \$\$0"	"\\\$10 = 108" \
-	"Print value-history\[MAX\] using explicit index \$\$0"
-
-    gdb_test "print \$1"	"\\\$11 = 101" \
-	"Print value-history\[1\] using explicit index \$1"
-
-    gdb_test "print \$2"	"\\\$12 = 102" \
-	"Print value-history\[2\] using explicit index \$2"
-
-    gdb_test "print \$3"	"\\\$13 = 103" \
-	"Print value-history\[3\] using explicit index \$3"
-
-    gdb_test "print \$-3"	"\\\$14 = 100" \
-	"Print (value-history\[MAX\] - 3) using implicit index \$"
-
-    gdb_test "print \$1 + 3"	"\\\$15 = 104" \
-	"Use value-history element in arithmetic expression"
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re ".*$gdb_prompt $"
-
-test_value_history
-test_convenience_variables
diff --git a/gdb/testsuite/gdb.base/grbx.c b/gdb/testsuite/gdb.base/grbx.c
deleted file mode 100644
index 58034bbbaae..00000000000
--- a/gdb/testsuite/gdb.base/grbx.c
+++ /dev/null
@@ -1,10 +0,0 @@
-static int grbxx = 'g' + 'r' + 'b' + 'x';
-
-int grbx (int x)
-{
-  if (x)
-    return grbxx;
-  else
-    return 0;
-}
-
diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp
deleted file mode 100644
index 2eed1dca842..00000000000
--- a/gdb/testsuite/gdb.base/help.exp
+++ /dev/null
@@ -1,599 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2002
-#   Free Software Foundation, 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 Rob Savoye. (rob@cygnus.com)
-
-#
-# test gdb help commands
-#
-
-set prms_id 0
-set bug_id 0
-
-gdb_start
-
-# force the height of the debugger to be pretty large so no pagers getused
-gdb_test "set height 400" "" "test set height"
-
-# use a larger expect input buffer for long help outputs.
-# test help add-symbol-file
-gdb_test "help add-symbol-file" "Usage: add-symbol-file FILE ADDR \\\[-s <SECT> <SECT_ADDR> -s <SECT> <SECT_ADDR> \.\.\.\\\]\[\r\n\]+Load the symbols from FILE, assuming FILE has been dynamically loaded\.\[\r\n\]+ADDR is the starting address of the file's text\.\[\r\n\]+The optional arguments are section-name section-address pairs and\[\r\n\]+should be specified if the data and bss segments are not contiguous\[\r\n\]+with the text\.  SECT is a section name to be loaded at SECT_ADDR\." "help add-symbol-file"
-# test help advance
-gdb_test "help advance" "Continue the program up to the given location \\(same form as args for break command\\)\.\[\r\n]+Execution will also stop upon exit from the current stack frame\." "help advance"
-# test help aliases
-gdb_test "help aliases" "Aliases of other commands\.\[\r\n\]+List of commands\:.*\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help aliases"
-# test help append
-gdb_test "help append" "Append target code/data to a local file\.\[\r\n\]+List of append subcommands:.*" 
-gdb_test "help append binary" "Append target code/data to a raw binary file\.\[\r\n\]+List of append binary subcommands:.*" 
-gdb_test "help append memory" "Append contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\.  Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specifed FILE in raw target ordered bytes\." 
-gdb_test "help append value" "Append the value of an expression to a raw binary file\.\[\r\n\]+Arguments are FILE EXPRESSION\.  Writes the value of EXPRESSION to\[\r\n\]+the specified FILE in raw target ordered bytes\." 
-gdb_test "help append binary memory" "Append contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\.  Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specifed FILE in raw target ordered bytes\." 
-gdb_test "help append binary value" "Append the value of an expression to a raw binary file\.\[\r\n\]+Arguments are FILE EXPRESSION\.  Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in raw target ordered bytes\." 
-# test help attach
-gdb_test "help attach" "Attach to a process or file outside of GDB\.\[\r\n\]+This command attaches to another target, of the same type as your last\[\r\n\]+\"target\" command \\(\"info files\" will show your target stack\\)\.\[\r\n\]+The command may take as argument a process id or a device file\.\[\r\n\]+For a process id, you must have permission to send the process a signal,\[\r\n\]+and it must have the same effective uid as the debugger\.\[\r\n\]+When using \"attach\" with a process id, the debugger finds the\[\r\n\]+program running in the process, looking first in the current working\[\r\n\]+directory, or \\(if not found there\\) using the source file search path\[\r\n\]+\\(see the \"directory\" command\\)\.  You can also use the \"file\" command\[\r\n\]+to specify the program, and to load its symbol table\." "help attach"
-# test help breakpoint "b" abbreviation
-gdb_test "help b" "Set breakpoint at specified line or function\.\[\r\n\]+Argument may be line number, function name, or \"\[*\]\" and an address\.\[\r\n\]+If line number is specified, break at start of code for that line\.\[\r\n\]+If function is specified, break at start of code for that function\.\[\r\n\]+If an address is specified, break at that exact address\.\[\r\n\]+With no arg, uses current execution address of selected stack frame\.\[\r\n\]+This is useful for breaking on return to a stack frame\.\[\r\n\]+Multiple breakpoints at one place are permitted, and useful if conditional\.\[\r\n\]+Do \"help breakpoints\" for info on other commands dealing with breakpoints\." "help breakpoint \"b\" abbreviation"
-# test help breakpoint "br" abbreviation
-gdb_test "help br" "Set breakpoint at specified line or function\.\[\r\n\]+Argument may be line number, function name, or \"\[*\]\" and an address\.\[\r\n\]+If line number is specified, break at start of code for that line\.\[\r\n\]+If function is specified, break at start of code for that function\.\[\r\n\]+If an address is specified, break at that exact address\.\[\r\n\]+With no arg, uses current execution address of selected stack frame\.\[\r\n\]+This is useful for breaking on return to a stack frame\.\[\r\n\]+Multiple breakpoints at one place are permitted, and useful if conditional\.\[\r\n\]+Do \"help breakpoints\" for info on other commands dealing with breakpoints\." "help breakpoint \"br\" abbreviation"
-# test help breakpoint "bre" abbreviation
-gdb_test "help bre" "Set breakpoint at specified line or function\.\[\r\n\]+Argument may be line number, function name, or \"\[*\]\" and an address\.\[\r\n\]+If line number is specified, break at start of code for that line\.\[\r\n\]+If function is specified, break at start of code for that function\.\[\r\n\]+If an address is specified, break at that exact address\.\[\r\n\]+With no arg, uses current execution address of selected stack frame\.\[\r\n\]+This is useful for breaking on return to a stack frame\.\[\r\n\]+Multiple breakpoints at one place are permitted, and useful if conditional\.\[\r\n\]+Do \"help breakpoints\" for info on other commands dealing with breakpoints\." "help breakpoint \"bre\" abbreviation"
-# test help breakpoint "brea" abbreviation
-gdb_test "help brea" "Set breakpoint at specified line or function\.\[\r\n\]+Argument may be line number, function name, or \"\[*\]\" and an address\.\[\r\n\]+If line number is specified, break at start of code for that line\.\[\r\n\]+If function is specified, break at start of code for that function\.\[\r\n\]+If an address is specified, break at that exact address\.\[\r\n\]+With no arg, uses current execution address of selected stack frame\.\[\r\n\]+This is useful for breaking on return to a stack frame\.\[\r\n\]+Multiple breakpoints at one place are permitted, and useful if conditional\.\[\r\n\]+Do \"help breakpoints\" for info on other commands dealing with breakpoints\." "help breakpoint \"brea\" abbreviation"
-# test help breakpoint "break" abbreviation
-gdb_test "help break" "Set breakpoint at specified line or function\.\[\r\n\]+Argument may be line number, function name, or \"\[*\]\" and an address\.\[\r\n\]+If line number is specified, break at start of code for that line\.\[\r\n\]+If function is specified, break at start of code for that function\.\[\r\n\]+If an address is specified, break at that exact address\.\[\r\n\]+With no arg, uses current execution address of selected stack frame\.\[\r\n\]+This is useful for breaking on return to a stack frame\.\[\r\n\]+Multiple breakpoints at one place are permitted, and useful if conditional\.\[\r\n\]+Do \"help breakpoints\" for info on other commands dealing with breakpoints\." "help breakpoint \"break\" abbreviation"
-# test help breakpoints
-gdb_test "help breakpoints" "Making program stop at certain points\.\[\r\n\]+List of commands:\[\r\n\]+awatch -- Set a watchpoint for an expression\[\r\n\]+break -- Set breakpoint at specified line or function\[\r\n\]+catch -- Set catchpoints to catch events\[\r\n\]+clear -- Clear breakpoint at specified line or function\[\r\n\]+commands -- Set commands to be executed when a breakpoint is hit\[\r\n\]+condition -- Specify breakpoint number N to break only if COND is true\[\r\n\]+delete -- Delete some breakpoints or auto-display expressions\[\r\n\]+disable -- Disable some breakpoints\[\r\n\]+enable -- Enable some breakpoints\[\r\n\]+hbreak -- Set a hardware assisted  breakpoint\[\r\n\]+ignore -- Set ignore-count of breakpoint number N to COUNT\[\r\n\]+rbreak -- Set a breakpoint for all functions matching REGEXP\[\r\n\]+rwatch -- Set a read watchpoint for an expression\[\r\n\]+tbreak -- Set a temporary breakpoint\[\r\n\]+tcatch -- Set temporary catchpoints to catch events\[\r\n\]+thbreak -- Set a temporary hardware assisted breakpoint\[\r\n\]+watch -- Set a watchpoint for an expression\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help breakpoints"
-# test help backtrace "bt" abbreviation
-gdb_test "help bt" "Print backtrace of all stack frames, or innermost COUNT frames\.\[\r\n\]+With a negative argument, print outermost -COUNT frames\.\[\r\n\]+Use of the 'full' qualifier also prints the values of the local variables\." "help backtrace \"bt\" abbreviation"
-# test help backtrace
-gdb_test "help backtrace" "Print backtrace of all stack frames, or innermost COUNT frames\.\[\r\n\]+With a negative argument, print outermost -COUNT frames\.\[\r\n\]+Use of the 'full' qualifier also prints the values of the local variables\." "help backtrace"
-# test help continue "c" abbreviation
-gdb_test "help c" "Continue program being debugged.*" "help continue \"c\" abbreviation"
-# test help continue
-gdb_test "help continue" "Continue program being debugged.*" "help continue"
-# test help call
-gdb_test "help call" "Call a function.*" "help call"
-# test help catch
-gdb_test "help catch" "Set catchpoints to catch events.*Raised signals may be caught:.*catch signal.*all signals.*catch signal.*signame.*a particular signal.*Raised exceptions may be caught:.*catch throw.*all exceptions, when thrown.*catch throw.*exceptname.*a particular exception, when thrown.*catch catch.*all exceptions, when caught.*catch catch.*exceptname.*a particular exception, when caught.*Thread or process events may be caught:.*catch thread_start.*any threads, just after creation.*catch thread_exit.*any threads, just before expiration.*catch thread_join.*any threads, just after joins.*catch start.*any processes, just after creation.*catch exit.*any processes, just before expiration.*catch fork.*calls to fork.*catch vfork.*calls to vfork.*catch exec.*calls to exec.*Dynamically.linked library events may be caught:.*catch load.*loads of any library.*catch load.*libname.*loads of a particular library.*catch unload.*unloads of any library.*catch unload.*libname.*unloads of a particular library.*The act of your program's execution stopping may also be caught:.*catch stop.*Do.*help set follow-fork-mode.*for info on debugging your program.*after a fork or vfork is caught.*Do.*help breakpoints.*for info on other commands dealing with breakpoints." "help catch"
-# test help cd
-gdb_test "help cd" "Set working directory to DIR for debugger and program being debugged\.\[\r\n\]+The change does not take effect for the program being debugged\[\r\n\]+until the next time it is started\." "help cd"
-# test help clear
-gdb_test "help clear" "Clear breakpoint at specified line or function\.\[\r\n\]+Argument may be line number, function name, or \"\\*\" and an address\.\[\r\n\]+If line number is specified, all breakpoints in that line are cleared\.\[\r\n\]+If function is specified, breakpoints at beginning of function are cleared\.\[\r\n\]+If an address is specified, breakpoints at that address are cleared\.\[\r\n\]+With no argument, clears all breakpoints in the line that the selected frame\[\r\n\]+is executing in\.\[\r\n\]+See also the \"delete\" command which clears breakpoints by number\." "help clear"
-# test help commands
-gdb_test "help commands" "Set commands to be executed when a breakpoint is hit\.\[\r\n\]+Give breakpoint number as argument after \"commands\"\.\[\r\n\]+With no argument, the targeted breakpoint is the last one set\.\[\r\n\]+The commands themselves follow starting on the next line\.\[\r\n\]+Type a line containing \"end\" to indicate the end of them\.\[\r\n\]+Give \"silent\" as the first line to make the breakpoint silent;\[\r\n\]+then no output is printed when it is hit, except what the commands print\." "help commands"
-# test help condition
-gdb_test "help condition" "Specify breakpoint number N to break only if COND is true\.\[\r\n\]+Usage is `condition N COND', where N is an integer and COND is an\[\r\n\]+expression to be evaluated whenever breakpoint N is reached." "help condition"
-# test help core-file
-gdb_test "help core-file" "Use FILE as core dump for examining memory and registers\.\[\r\n\]+No arg means have no core file\.  This command has been superseded by the\[\r\n\]+`target core' and `detach' commands\." "help core-file"
-# test help delete "d" abbreviation
-gdb_test "help d" "Delete some breakpoints or auto-display expressions\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To delete all breakpoints, give no argument\.\[\r\n\]+Also a prefix command for deletion of other GDB objects\.\[\r\n\]+The \"unset\" command is also an alias for \"delete\"\.\[\r\n\]+List of delete subcommands:\[\r\n\]+delete breakpoints -- Delete some breakpoints or auto-display expressions\[\r\n\]+delete display -- Cancel some expressions to be displayed when program stops\[\r\n\]+delete mem -- Delete memory region\[\r\n\]+delete tracepoints -- Delete specified tracepoints\[\r\n\]+Type \"help delete\" followed by delete subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help delete \"d\" abbreviation"
-# test help delete
-gdb_test "help delete" "Delete some breakpoints or auto-display expressions\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To delete all breakpoints, give no argument\.\[\r\n\]+Also a prefix command for deletion of other GDB objects\.\[\r\n\]+The \"unset\" command is also an alias for \"delete\"\.\[\r\n\]+List of delete subcommands:\[\r\n\]+delete breakpoints -- Delete some breakpoints or auto-display expressions\[\r\n\]+delete display -- Cancel some expressions to be displayed when program stops\[\r\n\]+delete mem -- Delete memory region\[\r\n\]+delete tracepoints -- Delete specified tracepoints\[\r\n\]+Type \"help delete\" followed by delete subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help delete"
-# test help data
-gdb_test "help data" "Examining data\.\[\r\n\]+List of commands:.*\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help data"
-# test help define
-gdb_test "help define" "Define a new command.*" "help define"
-# test help delete breakpoints
-gdb_test "help delete breakpoints" "Delete some breakpoints or auto-display expressions\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To delete all breakpoints, give no argument\.\[\r\n\]+This command may be abbreviated \"delete\"\." "help delete breakpoints"
-# test help delete display
-gdb_test "help delete display" "Cancel some expressions to be displayed when program stops\.\[\r\n\]+Arguments are the code numbers of the expressions to stop displaying\.\[\r\n\]+No argument means cancel all automatic-display expressions\.\[\r\n\]+Do \"info display\" to see current list of code numbers\." "help delete display"
-# test help detach
-gdb_test "help detach" "Detach a process or file previously attached\.\[\r\n\]+If a process, it is no longer traced, and it continues its execution\.\[ \r\n\]+If\[ \r\n\]+you were debugging a file, the file is closed and gdb no longer accesses it\." "help detach"
-# test help directory
-gdb_test "help directory" "Add directory DIR to beginning of search path for source files\.\[\r\n\]+Forget cached info on source file locations and line positions\.\[\r\n\]+DIR can also be \\\$cwd for the current working directory, or \\\$cdir for the\[\r\n\]+directory in which the source file was compiled into object code\.\[\r\n\]+With no argument, reset the search path to \\\$cdir:\\\$cwd, the default\." "help directory"
-# test help disable "dis" abbreviation
-gdb_test "help dis" "Disable some breakpoints\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To disable all breakpoints, give no argument\.\[\r\n\]+A disabled breakpoint is not forgotten, but has no effect until reenabled\.\[\r\n\]+List of disable subcommands:\[\r\n\]+disable breakpoints -- Disable some breakpoints\[\r\n\]+disable display -- Disable some expressions to be displayed when program stops\[\r\n\]+disable mem -- Disable memory region\[\r\n\]+disable tracepoints -- Disable specified tracepoints\[\r\n\]+Type \"help disable\" followed by disable subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help disable \"dis\" abbreviation"
-# test help disable "disa" abbreviation
-gdb_test "help disa" "Disable some breakpoints\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To disable all breakpoints, give no argument\.\[\r\n\]+A disabled breakpoint is not forgotten, but has no effect until reenabled\.\[\r\n\]+List of disable subcommands:\[\r\n\]+disable breakpoints -- Disable some breakpoints\[\r\n\]+disable display -- Disable some expressions to be displayed when program stops\[\r\n\]+disable mem -- Disable memory region\[\r\n\]+disable tracepoints -- Disable specified tracepoints\[\r\n\]+Type \"help disable\" followed by disable subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help disable \"disa\" abbreviation"
-# test help disable
-gdb_test "help disable" "Disable some breakpoints\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To disable all breakpoints, give no argument\.\[\r\n\]+A disabled breakpoint is not forgotten, but has no effect until reenabled\.\[\r\n\]+List of disable subcommands:\[\r\n\]+disable breakpoints -- Disable some breakpoints\[\r\n\]+disable display -- Disable some expressions to be displayed when program stops\[\r\n\]+disable mem -- Disable memory region\[\r\n\]+disable tracepoints -- Disable specified tracepoints\[\r\n\]+Type \"help disable\" followed by disable subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help disable"
-# test help disable breakpoints
-gdb_test "help disable breakpoints" "Disable some breakpoints\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To disable all breakpoints, give no argument\.\[\r\n\]+A disabled breakpoint is not forgotten, but has no effect until reenabled\.\[\r\n\]+This command may be abbreviated \"disable\"." "help disable breakpoints"
-# test help disable display
-gdb_test "help disable display" "Disable some expressions to be displayed when program stops\.\[\r\n\]+Arguments are the code numbers of the expressions to stop displaying\.\[\r\n\]+No argument means disable all automatic-display expressions\.\[\r\n\]+Do \"info display\" to see current list of code numbers\." "help disable display"
-# test help disassemble
-gdb_test "help disassemble" "Disassemble a specified section of memory\.\[\r\n\]+Default is the function surrounding the pc of the selected frame\.\[\r\n\]+With a single argument, the function surrounding that address is dumped\.\[\r\n\]+Two arguments are taken as a range of memory to dump\." "help disassemble"
-# test help display
-gdb_test "help display" "Print value of expression EXP each time the program stops\.\[\r\n\]+/FMT may be used before EXP as in the \"print\" command\.\[\r\n\]+/FMT \"i\" or \"s\" or including a size-letter is allowed,\[\r\n\]+as in the \"x\" command, and then EXP is used to get the address to examine\[\r\n\]+and examining is done as in the \"x\" command\.\[\r\n\]+With no argument, display all currently requested auto-display expressions\.\[\r\n\]+Use \"undisplay\" to cancel display requests previously made\." "help display"
-# test help do
-gdb_test "help do" "Select and print stack frame called by this one\.\[\r\n\]+An argument says how many frames down to go\." "help do"
-# test help document
-gdb_test "help document" "Document a user-defined command\.\[\r\n\]+Give command name as argument\.  Give documentation on following lines\.\[\r\n\]+End with a line of just \"end\"\." "help document"
-# test help down
-gdb_test "help down" "Select and print stack frame called by this one\.\[\r\n\]+An argument says how many frames down to go\." "help down"
-# test help down-silently
-gdb_test "help down-silently" "Same as the `down' command, but does not print anything\.\[\r\n\]+This is useful in command scripts\." "help down-silently"
-# test help dump 
-gdb_test "help dump" "Dump target code/data to a local file\.\[\r\n\]+List of dump subcommands:.*" 
-gdb_test "help dump binary" "Write target code/data to a raw binary file\.\[\r\n\]+List of dump binary subcommands:.*" 
-gdb_test "help dump ihex" "Write target code/data to an intel hex file\.\[\r\n\]+List of dump ihex subcommands:.*" 
-gdb_test "help dump memory" "Write contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\.  Writes the contents of memory within the\[\r\n\]+range \\\[START \.\. STOP\\) to the specifed FILE in raw target ordered bytes\." 
-gdb_test "help dump srec" "Write target code/data to an srec file\.\[\r\n\]+List of dump srec subcommands:.*" 
-gdb_test "help dump tekhex" "Write target code/data to a tekhex file\.\[\r\n\]+List of dump tekhex subcommands:.*" 
-gdb_test "help dump value" "Write the value of an expression to a raw binary file\.\[\r\n\]+Arguments are FILE EXPRESSION\.  Writes the value of EXPRESSION to\[\r\n\]+the specified FILE in raw target ordered bytes\." 
-gdb_test "help dump binary memory" "Write contents of memory to a raw binary file\.\[\r\n\]+Arguments are FILE START STOP\.  Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specifed FILE in binary format\." 
-gdb_test "help dump binary value" "Write the value of an expression to a raw binary file\.\[\r\n\]+Arguments are FILE EXPRESSION\.  Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in raw target ordered bytes\." "help dump binary value"
-gdb_test "help dump ihex memory" "Write contents of memory to an ihex file\.\[\r\n\]+Arguments are FILE START STOP\.  Writes the contents of memory within\[\r\n\]+the range \\\[START \.\. STOP\\) to the specifed FILE in intel hex format\." 
-gdb_test "help dump ihex value" "Write the value of an expression to an ihex file\.\[\r\n\]+Arguments are FILE EXPRESSION\.  Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in intel hex format\." 
-gdb_test "help dump srec memory" "Write contents of memory to an srec file\.\[\r\n\]+Arguments are FILE START STOP\.  Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specifed FILE in srec format\." 
-gdb_test "help dump srec value" "Write the value of an expression to an srec file\.\[\r\n\]+Arguments are FILE EXPRESSION\.  Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in srec format\." 
-gdb_test "help dump tekhex memory" "Write contents of memory to a tekhex file\.\[\r\n\]+Arguments are FILE START STOP\.  Writes the contents of memory\[\r\n\]+within the range \\\[START \.\. STOP\\) to the specifed FILE in tekhex format\." 
-gdb_test "help dump tekhex value" "Write the value of an expression to a tekhex file\.\[\r\n\]+Arguments are FILE EXPRESSION\.  Writes the value of EXPRESSION\[\r\n\]+to the specified FILE in tekhex format\." 
-# this command was removed from GDB 4.5.8
-# test help dump-me
-#send_gdb "help dump-me"
-# -re "Get fatal error; make debugger dump its core\."
-# 
-# }
-# test help echo
-gdb_test "help echo" "Print a constant string\.  Give string as argument\.\[\r\n\]+C escape sequences may be used in the argument\.\[\r\n\]+No newline is added at the end of the argument;\[\r\n\]+use \"\\\\n\" if you want a newline to be printed\.\[\r\n\]+Since leading and trailing whitespace are ignored in command arguments,\[\r\n\]+if you want to print some you must use \"\\\\\" before leading whitespace\[\r\n\]+to be printed or after trailing whitespace\." "help echo"
-# test help enable breakpoints delete
-gdb_test "help enable breakpoints delete" "Enable breakpoints and delete when hit\.  Give breakpoint numbers\.\[\r\n\]+If a breakpoint is hit while enabled in this fashion, it is deleted\." "help enable breakpoints delete"
-# test help enable breakpoints once
-gdb_test "help enable breakpoints once" "Enable breakpoints for one hit.*" "help enable breakpoints once"
-# test help enable breakpoints
-gdb_test "help enable breakpoints" "Enable some breakpoints\.\[\r\n\]+Give breakpoint numbers \\(separated by spaces\\) as arguments\.\[\r\n\]+This is used to cancel the effect of the \"disable\" command\.\[\r\n\]+May be abbreviated to simply \"enable\"\.\[\r\n\]+List of enable breakpoints subcommands:\[\r\n\]+enable breakpoints delete -- Enable breakpoints and delete when hit\[\r\n\]+enable breakpoints once -- Enable breakpoints for one hit\[\r\n\]+Type \"help enable breakpoints\" followed by enable breakpoints subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help enable breakpoints"
-# test help enable delete
-gdb_test "help enable delete" "Enable breakpoints and delete when hit\.  Give breakpoint numbers\.\[\r\n\]+If a breakpoint is hit while enabled in this fashion, it is deleted\." "help enable delete"
-# test help enable display
-gdb_test "help enable display" "Enable some expressions to be displayed when program stops\.\[\r\n\]+Arguments are the code numbers of the expressions to resume displaying\.\[\r\n\]+No argument means enable all automatic-display expressions\.\[\r\n\]+Do \"info display\" to see current list of code numbers\." "help enable display"
-# test help enable once
-gdb_test "help enable once" "Enable breakpoints for one hit.*" "help enable once"
-# test help enable
-gdb_test "help enable" "Enable some breakpoints\.\[\r\n\]+Give breakpoint numbers \\(separated by spaces\\) as arguments\.\[\r\n\]+With no subcommand, breakpoints are enabled until you command otherwise\.\[\r\n\]+This is used to cancel the effect of the \"disable\" command\.\[\r\n\]+With a subcommand you can enable temporarily\.\[\r\n\]+List of enable subcommands:\[\r\n\]+enable delete -- Enable breakpoints and delete when hit\[\r\n\]+enable display -- Enable some expressions to be displayed when program stops\[\r\n\]+enable mem -- Enable memory region\[\r\n\]+enable once -- Enable breakpoints for one hit\[\r\n\]+enable tracepoints -- Enable specified tracepoints\[\r\n\]+Type \"help enable\" followed by enable subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help enable"
-# test help exec-file
-gdb_test "help exec-file" "Use FILE as program for getting contents of pure memory\.\[\r\n\]+If FILE cannot be found as specified, your execution directory path\[\r\n\]+is searched for a command of that name\.\[\r\n\]+No arg means have no executable file\." "help exec-file"
-# test help frame "f" abbreviation
-gdb_test "help f" "Select and print a stack frame\.\[\r\n\]+With no argument, print the selected stack frame\.  \\(See also \"info frame\"\\)\.\[\r\n\]+An argument specifies the frame to select\.\[\r\n\]+It can be a stack frame number or the address of the frame\.\[\r\n\]+With argument, nothing is printed if input is coming from\[\r\n\]+a command file or a user-defined command\." "help frame \"f\" abbreviation"
-# test help frame
-gdb_test "help frame" "Select and print a stack frame\.\[\r\n\]+With no argument, print the selected stack frame\.  \\(See also \"info frame\"\\)\.\[\r\n\]+An argument specifies the frame to select\.\[\r\n\]+It can be a stack frame number or the address of the frame\.\[\r\n\]+With argument, nothing is printed if input is coming from\[\r\n\]+a command file or a user-defined command\." "help frame"
-# test help fg
-gdb_test "help fg" "Continue program being debugged.*" "help fg"
-# test help file
-gdb_test "help file" "Use FILE as program to be debugged\.\[\r\n\]+It is read for its symbols, for getting the contents of pure memory,\[\r\n\]+and it is the program executed when you use the `run' command\.\[\r\n\]+If FILE cannot be found as specified, your execution directory path\[\r\n\]+\\(\\\$PATH\\) is searched for a command of that name\.\[\r\n\]+No arg means to have no executable file and no symbols\." "help file"
-# test help files
-gdb_test "help files" "Specifying.*" "help files"
-# test help finish
-gdb_test "help finish" "Execute until selected stack frame returns\.\[\r\n\]+Upon return, the value returned is printed and put in the value history\." "help finish"
-# test help forward-search
-gdb_test "help forward-search" "Search for regular expression \\(see regex\\(3\\)\\) from last line listed.*" "help forward-search"
-# test help gcore
-send_gdb "help gcore\n"
-gdb_expect {
-    -re "Undefined command: \"gcore\"\.  Try \"help\".*$gdb_prompt $" {
-	pass "help gcore"
-    }
-    -re "Save a core file with the current state of the debugged process\.\[\r\n\]+Argument is optional filename\.  Default filename is 'core\.<process_id>'.*$gdb_prompt $" {
-	pass "help gcore"
-    }
-    default { fail "help gcore" }
-}
-send_gdb "help generate-core-file\n"
-gdb_expect {
-    -re "Undefined command: \"generate-core-file\"\.  Try \"help\".*$gdb_prompt $" {
-	pass "help gcore"
-    }
-    -re "Save a core file with the current state of the debugged process\.\[\r\n\]+Argument is optional filename\.  Default filename is 'core\.<process_id>'.*$gdb_prompt $" {
-	pass "help gcore"
-    }
-    default { fail "help gcore" }
-}
-# test help help "h" abbreviation 
-gdb_test "help h" "Print list of commands\." "help help \"h\" abbreviation"
-# test help help
-gdb_test "help help" "Print list of commands\." "help help"
-# test help handle
-gdb_test "help handle" "Specify how to handle a signal\..*" "help handle"
-# test help info "i" abbreviation
-gdb_test "help i" "Generic command for showing things about the program being debugged\.\[\r\n\]+List of info subcommands:.*\[\r\n\]+Type \"help info\" followed by info subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help info \"i\" abbreviation"
-# test help info
-gdb_test "help info" "Generic command for showing things about the program being debugged\.\[\r\n\]+List of info subcommands:.*\[\r\n\]+Type \"help info\" followed by info subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help info"
-# test help ignore
-gdb_test "help ignore" "Set ignore-count of breakpoint number N to COUNT\.\[\r\n\]+Usage is `ignore N COUNT'\." "help ignore"
-# test help info address
-gdb_test "help info address" "Describe where symbol SYM is stored\." "help info address"
-# test help info all-registers
-gdb_test "help info all-registers" "List of all registers and their contents, for selected stack frame\.\[\r\n\]+Register name as argument means describe only that register\." "help info all-registers"
-# test help info args
-gdb_test "help info args" "Argument variables of current stack frame\." "help info args"
-# test help info breakpoints
-gdb_test "help info breakpoints" "Status of user-settable breakpoints, or breakpoint number NUMBER\..*\[\r\n\]+breakpoint set\." "help info breakpoints"
-# test help info catch
-gdb_test "help info catch" "Exceptions that can be caught in the current stack frame\." "help info catch"
-# test help info copying
-gdb_test "help info copying" "Conditions for redistributing copies of GDB\." "help info copying"
-# test help info display
-gdb_test "help info display" "Expressions to display when program stops, with code numbers\." "help info display"
-# test help info frame "f" abbreviation
-gdb_test "help info f" "All about selected stack frame, or frame at ADDR\." "help info frame \"f\" abbreviation"
-# test help info frame
-gdb_test "help info frame" "All about selected stack frame, or frame at ADDR\." "help info frame"
-# test help info files
-gdb_test "help info files" "Names of targets and files being debugged\.\[\r\n\]+Shows the entire stack of targets currently in use \\(including the exec-file,\[\r\n\]+core-file, and process, if any\\), as well as the symbol file name\." "help info files"
-# test help info float
-gdb_test "help info float" "Print the status of the floating point unit" "help info float"
-# test help info functions
-gdb_test "help info functions" "All function names, or those matching REGEXP\." "help info functions"
-# test help info line
-gdb_test "help info line" "Core addresses of the code for a source line\.\[\r\n\]+Line can be specified as\[\r\n\]+  LINENUM, to list around that line in current file,\[\r\n\]+  FILE:LINENUM, to list around that line in that file,\[\r\n\]+  FUNCTION, to list around beginning of that function,\[\r\n\]+  FILE:FUNCTION, to distinguish among like-named static functions\.\[\r\n\]+Default is to describe the last source line that was listed\.\[\r\n\]+This sets the default address for \"x\" to the line's first instruction\[\r\n\]+so that \"x/i\" suffices to start examining the machine code\.\[\r\n\]+The address is also stored as the value of \"\\\$_\"\." "help info line"
-# test help info locals
-gdb_test "help info locals" "Local variables of current stack frame\." "help info locals"
-# test help info program
-gdb_test "help info program" "Execution status of the program\." "help info program"
-# test help info registers
-gdb_test "help info registers" "List of integer registers and their contents, for selected stack frame\.\[\r\n\]+Register name as argument means describe only that register\." "help info registers"
-# test help info stack "s" abbreviation
-gdb_test "help info s" "Backtrace of the stack, or innermost COUNT frames\." "help info stack \"s\" abbreviation"
-# test help info stack
-gdb_test "help info stack" "Backtrace of the stack, or innermost COUNT frames\." "help info stack"
-# test help info set
-gdb_test "help info set" "Show all GDB settings\." "help info set"
-# test help info signals
-gdb_test "help info signals" "What debugger does when program gets various signals.*" "help info signals"
-# test help info source
-gdb_test "help info source" "Information about the current source file\." "help info source"
-# test help info sources
-gdb_test "help info sources" "Source files in the program\." "help info sources"
-# test help info symbol
-gdb_test "help info symbol" "Describe what symbol is at location ADDR.*"
-# test help info target
-gdb_test "help info target" "Names of targets and files being debugged\.\[\r\n\]+Shows the entire stack of targets currently in use \\(including the exec-file,\[\r\n\]+core-file, and process, if any\\), as well as the symbol file name\." "help info target"
-# test help info terminal
-gdb_test "help info terminal" "Print inferior's saved terminal status\." "help info terminal"
-# test help info types
-gdb_test "help info types" "All type names, or those matching REGEXP\." "help info types"
-# test help info variables
-gdb_test "help info variables" "All global and static variable names, or those matching REGEXP\." "help info variables"
-# test help info warranty
-gdb_test "help info warranty" "Various kinds of warranty you do not have\." "help info warranty"
-# test help info watchpoints
-gdb_test "help info watchpoints" "Synonym for ``info breakpoints''\." "help info watchpoints"
-# test help inspect
-gdb_test "help inspect" "Same as \"print\" command, except that if you are running in the epoch\[\r\n\]+environment, the value is printed in its own window\." "help inspect"
-# test help jump
-gdb_test "help jump" "Continue program being debugged at specified line or address\.\[\r\n\]+Give as argument either LINENUM or \[*\]+ADDR, where ADDR is an expression\[\r\n\]+for an address to start at\." "help jump"
-# test help kill
-gdb_test "help kill" "Kill execution of program being debugged\." "help kill"
-# test help list "l" abbreviation
-gdb_test "help l" "List specified function or line\.\[\r\n\]+With no argument, lists ten more lines after or around previous listing\.\[\r\n\]+\"list -\" lists the ten lines before a previous ten-line listing\.\[\r\n\]+One argument specifies a line, and ten lines are listed around that line\.\[\r\n\]+Two arguments with comma between specify starting and ending lines to list\.\[\r\n\]+Lines can be specified in these ways:\[\r\n\]+  LINENUM, to list around that line in current file,\[\r\n\]+  FILE:LINENUM, to list around that line in that file,\[\r\n\]+  FUNCTION, to list around beginning of that function,\[\r\n\]+  FILE:FUNCTION, to distinguish among like-named static functions\.\[\r\n\]+  \[*\]ADDRESS, to list around the line containing that address\.\[\r\n\]+With two args if one is empty it stands for ten lines away from the other arg\." "help list \"l\" abbreviation"
-# test help list
-gdb_test "help list" "List specified function or line\.\[\r\n\]+With no argument, lists ten more lines after or around previous listing\.\[\r\n\]+\"list -\" lists the ten lines before a previous ten-line listing\.\[\r\n\]+One argument specifies a line, and ten lines are listed around that line\.\[\r\n\]+Two arguments with comma between specify starting and ending lines to list\.\[\r\n\]+Lines can be specified in these ways:\[\r\n\]+  LINENUM, to list around that line in current file,\[\r\n\]+  FILE:LINENUM, to list around that line in that file,\[\r\n\]+  FUNCTION, to list around beginning of that function,\[\r\n\]+  FILE:FUNCTION, to distinguish among like-named static functions\.\[\r\n\]+  \[*\]ADDRESS, to list around the line containing that address\.\[\r\n\]+With two args if one is empty it stands for ten lines away from the other arg\." "help list"
-# test help load
-gdb_test "help load" "Dynamically load FILE into the running program, and record its symbols\[\r\n\]+for access from GDB\." "help load"
-# test help make
-gdb_test "help make" "Run the ``make'' program using the rest of the line as arguments\." "help make"
-# test help next "n" abbreviation
-gdb_test "help n" "Step program, proceeding through subroutine calls\.\[\r\n\]+Like the \"step\" command as long as subroutine calls do not happen;\[\r\n\]+when they do, the call is treated as one instruction\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another reason\\)\." "help next \"n\" abbreviation"
-# test help next
-gdb_test "help next" "Step program, proceeding through subroutine calls\.\[\r\n\]+Like the \"step\" command as long as subroutine calls do not happen;\[\r\n\]+when they do, the call is treated as one instruction\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another reason\\)\." "help next"
-# test help nexti
-gdb_test "help ni" "Step one instruction, but proceed through subroutine calls\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another reason\\)\." "help nexti"
-# all the commands that used to be here are now in "maintainance" instead
-# test help obscure
-gdb_test "help obscure" "Obscure features\.\[\r\n\]+List of commands:.*\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help obscure"
-# test help output
-gdb_test "help output" "Like \"print\" but don't put in value history and don't print newline\.\[\r\n\]+This is useful in user-defined commands\." "help output"
-# test help overlay
-gdb_test "help overlay"       "Commands for debugging overlays.*"
-gdb_test "help overlay off"   "Disable overlay debugging\."
-gdb_test "help overlay manual" "Enable overlay debugging\."
-gdb_test "help overlay auto"  "Enable automatic overlay debugging\."
-gdb_test "help overlay list"  "List mappings of overlay sections\."
-gdb_test "help overlay map"   "Assert that an overlay section is mapped\."
-gdb_test "help overlay unmap" "Assert that an overlay section is unmapped\."
-gdb_test "help overlay load"  "Read the overlay mapping state from the target\."
-# test help print "p" abbreviation
-gdb_test "help p" "Print value of expression EXP\.\[\r\n\]+Variables accessible are those of the lexical environment of the selected.*\[\r\n\]+EXP may be preceded with /FMT, where FMT is a format letter\[\r\n\]+but no count or size letter \\(see \"x\" command\\)\." "help print \"p\" abbreviation"
-# test help print
-gdb_test "help print" "Print value of expression EXP\.\[\r\n\]+Variables accessible are those of the lexical environment of the selected.*\[\r\n\]+EXP may be preceded with /FMT, where FMT is a format letter\[\r\n\]+but no count or size letter \\(see \"x\" command\\)\." "help print"
-# test help path
-gdb_test "help path" "Add directory DIR\\(s\\) to beginning of search path for object files\.\[\r\n\]+\\\$cwd in the path means the current working directory\.\[\r\n\]+This path is equivalent to the \\\$PATH shell variable\.  It is a list of\[\r\n\]+directories, separated by colons\.  These directories are searched to find\[\r\n\]+fully linked executable files and separately compiled object files as needed\." "help path"
-# test help printcmds
-gdb_test "help printcmds" "Undefined command: \"printcmds\"\.  Try \"help\"\." "help printcmds"
-# test help printf
-gdb_test "help printf" "printf \"printf format string\", arg1, arg2, arg3, \.\.\., argn\[\r\n\]+This is useful for formatted output in user-defined commands\." "help printf"
-# test help ptype
-gdb_test "help ptype" "Print definition of type.*" "help ptype"
-# test help pwd
-gdb_test "help pwd" "Print working directory\.  This is used for your program as well\." "help pwd"
-# test help quit "q" abbreviation
-gdb_test "help q" "Exit gdb\." "help quit \"q\" abbreviation"
-# test help quit
-gdb_test "help quit" "Exit gdb\." "help quit"
-# test help run "r" abbreviation
-gdb_test "help r" "Start debugged program\.  You may specify arguments to give it\.\[\r\n\]+Args may include \"\\*\", or \"\\\[\.\.\.\\\]\"; they are expanded using \"sh\"\.\[\r\n\]+Input and output redirection with \">\", \"<\", or \">>\" are also allowed\.\[\r\n\]+With no arguments, uses arguments last specified \\(with \"run\" or \"set args\"\\)\.\[\r\n\]+To cancel previous arguments and run with no arguments,\[\r\n\]+use \"set args\" without arguments\." "help run \"r\" abbreviation"
-# test help run
-gdb_test "help run" "Start debugged program\.  You may specify arguments to give it\.\[\r\n\]+Args may include \"\\*\", or \"\\\[\.\.\.\\\]\"; they are expanded using \"sh\"\.\[\r\n\]+Input and output redirection with \">\", \"<\", or \">>\" are also allowed\.\[\r\n\]+With no arguments, uses arguments last specified \\(with \"run\" or \"set args\"\\)\.\[\r\n\]+To cancel previous arguments and run with no arguments,\[\r\n\]+use \"set args\" without arguments\." "help run"
-# test help rbreak
-gdb_test "help rbreak" "Set a breakpoint for all functions matching REGEXP\." "help rbreak"
-# test help restore
-gdb_test "help restore" "Restore the contents of FILE to target memory\.\[\r\n\]+Arguments are FILE OFFSET START END where all except FILE are optional\.\[\r\n\]+OFFSET will be added to the base address of the file \\(default zero\\)\.\[\r\n\]+If START and END are given, only the file contents within that range\[\r\n\]+\\(file relative\\) will be restored to target memory\."
-# test help return
-gdb_test "help return" "Make selected stack frame return to its caller\.\[\r\n\]+Control remains in the debugger, but when you continue\[\r\n\]+execution will resume in the frame above the one now selected\.\[\r\n\]+If an argument is given, it is an expression for the value to return\." "help return"
-# test help reverse-search
-gdb_test "help reverse-search" "Search backward for regular expression \\(see regex\\(3\\)\\) from last line listed\..*" "help reverse-search"
-# test help running
-gdb_test "help running" "Running the program\.\[\r\n\]+List of commands:.*\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help running"
-# test help step "s" abbreviation
-gdb_test "help s" "Step program until it reaches a different source line\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another reason\\)\." "help step \"s\" abbreviation"
-# test help step
-gdb_test "help step" "Step program until it reaches a different source line\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another reason\\)\." "help step #1"
-# test help search
-gdb_test "help search" "Search for regular expression \\(see regex\\(3\\)\\) from last line listed\..*" "help search"
-# test help section
-gdb_test "help section" "Change the base address of section SECTION of the exec file to ADDR\.\[\r\n\]+This can be used if the exec file does not contain section addresses,\[\r\n\]+\\(such as in the a\.out format\\), or when the addresses specified in the\[\r\n\]+file itself are wrong\.  Each section must be changed separately\.  The\[\r\n\]+``info files'' command lists all the sections and their addresses\." "help section"
-#test help set annotate
-gdb_test "help set annotate" "Set annotation_level\.\[\r\n\]+0 == normal;     1 == fullname \\(for use when running under emacs\\)\[\r\n\]+2 == output annotated suitably for use by programs that control GDB\." "help set annotate"
-# test help set args
-gdb_test "help set args" "Set argument list to give program being debugged when it is started\.\[\r\n\]+Follow this command with any number of args, to be passed to the program\."
-# test help set check "c" abbreviation
-gdb_test "help set c" "Set the status of the type/range checker\.\[\r\n\]+List of set check subcommands:\[\r\n\]+set check range -- Set range checking\[\r\n\]+set check type -- Set type checking\[\r\n\]+Type \"help set check\" followed by set check subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help set check \"c\" abbreviation"
-# test help set check "ch" abbreviation
-gdb_test "help set ch" "Set the status of the type/range checker\.\[\r\n\]+List of set check subcommands:\[\r\n\]+set check range -- Set range checking\[\r\n\]+set check type -- Set type checking\[\r\n\]+Type \"help set check\" followed by set check subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help set check \"ch\" abbreviation"
-# test help set check
-gdb_test "help set check" "Set the status of the type/range checker\.\[\r\n\]+List of set check subcommands:\[\r\n\]+set check range -- Set range checking\[\r\n\]+set check type -- Set type checking\[\r\n\]+Type \"help set check\" followed by set check subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help set check"
-# test help set check range
-gdb_test "help set check range" "Set range checking\.  \\(on/warn/off/auto\\)" "help set check range"
-# test help set check type
-gdb_test "help set check type" "Set type checking\.  \\(on/warn/off/auto\\)." "help set check type"
-# test help set complaints
-gdb_test "help set complaints" "Set max number of complaints about incorrect symbols\." "help set complaints"
-# test help set confirm
-gdb_test "help set confirm" "Set whether to confirm potentially dangerous operations\." "help set confirm"
-# test help set editing
-gdb_test "help set editing" "Set editing of command lines as they are typed\.\[\r\n\]+Use \"on\" to enable the editing, and \"off\" to disable it\.\[\r\n\]+Without an argument, command line editing is enabled\.  To edit, use\[\r\n\]+EMACS-like or VI-like commands like control-P or ESC\." "help set editing"
-# test help set environment
-gdb_test "help set environment" "Set environment variable value to give the program\.\[\r\n\]+Arguments are VAR VALUE where VAR is variable name and VALUE is value\.\[\r\n\]+VALUES of environment variables are uninterpreted strings\.\[\r\n\]+This does not affect the program until the next \"run\" command\." "help set environment"
-# test help set height
-gdb_test "help set height" "Set number of lines gdb thinks are in a page\." "help set height"
-# test help set history expansion
-gdb_test "help set history expansion" "Set history expansion on command input\.\[\r\n\]+Without an argument, history expansion is enabled\." "help set history expansion"
-# test help set history filename
-gdb_test "help set history filename" "Set the filename in which to record the command history\[\r\n\]+\\(the list of previous commands of which a record is kept\\)\." "help set history filename"
-# test help set history save
-gdb_test "help set history save" "Set saving of the history record on exit\.\[\r\n\]+Use \"on\" to enable the saving, and \"off\" to disable it\.\[\r\n\]+Without an argument, saving is enabled\." "help set history save"
-# test help set history size
-gdb_test "help set history size" "Set the size of the command history,\[\r\n\]+ie\. the number of previous commands to keep a record of\." "help set history size"
-# test help set history
-gdb_test "help set history" "Generic command for setting command history parameters\.\[\r\n\]+List of set history subcommands:\[\r\n\]+set history expansion -- Set history expansion on command input\[\r\n\]+set history filename -- Set the filename in which to record the command history\[\r\n\]+set history save -- Set saving of the history record on exit\[\r\n\]+set history size -- Set the size of the command history\[\r\n\]+Type \"help set history\" followed by set history subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help set history"
-# test help set language
-gdb_test "help set language" "Set the current source language\." "help set language"
-# test help set listsize
-gdb_test "help set listsize" "Set number of source lines gdb will list by default\." "help set listsize"
-# test help set print "p" abbreviation
-# FIXME -- Ultrix hangs randomly on this very long output from gdb and
-# continues with its output only if something is sent to gdb.
-# Also, if the system is slow, it may time out because the output is large.
-gdb_test "help set p" "Generic command for setting how things print\.\[\r\n\]+List of set print subcommands:.*\[\r\n\]+Type \"help set print\" followed by set print subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help set print \"p\" abbreviation"
-# test help set print "pr" abbreviation
-gdb_test "help set pr" "Generic command for setting how things print\.\[\r\n\]+List of set print subcommands:.*\[\r\n\]+Type \"help set print\" followed by set print subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help set print \"pr\" abbreviation"
-# test help set print
-gdb_test "help set print" "Generic command for setting how things print\.\[\r\n\]+List of set print subcommands:.*\[\r\n\]+Type \"help set print\" followed by set print subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help set print"
-# test help set print address
-gdb_test "help set print address" "Set printing of addresses\." "help set print address"
-# test help set print array
-gdb_test "help set print array" "Set prettyprinting of arrays\." "help set print array"
-# test help set print asm-demangle
-gdb_test "help set print asm-demangle" "Set demangling of C\[+\]+/ObjC names in disassembly listings\." "help set print asm-demangle"
-# test help set print demangle
-gdb_test "help set print demangle" "Set demangling of encoded C\[+\]+/ObjC names when displaying symbols\." "help set print demangle"
-# test help set print elements
-gdb_test "help set print elements" "Set limit on string chars or array elements to print\.\[\r\n\]+\"set print elements 0\" causes there to be no limit\." "help set print elements"
-# test help set print object
-gdb_test "help set print object" "Set printing of object's derived type based on vtable info\." "help set print object"
-# test help set print pretty
-gdb_test "help set print pretty" "Set prettyprinting of structures\." "help set print pretty"
-# test help set print sevenbit-strings
-gdb_test "help set print sevenbit-strings" "Set printing of 8-bit characters in strings as \\\\nnn\." "help set print sevenbit-strings"
-# test help set print union
-gdb_test "help set print union" "Set printing of unions interior to structures\." "help set print union"
-# test help set print vtbl
-gdb_test "help set print vtbl" "Set printing of C\[+\]+ virtual function tables\." "help set print vtbl"
-# test help set prompt
-gdb_test "help set prompt" "Set gdb's prompt" "help set prompt"
-# test help set radix
-gdb_test "help set radix" "Set default input and output number radices\.\[\r\n\]+Use \'set input-radix\' or \'set output-radix\' to independently set each\.\[\r\n\]+Without an argument, sets both radices back to the default value of 10\." "help set radix"
-# test help set symbol-reloading
-gdb_test "help set symbol-reloading" "Set dynamic symbol table reloading multiple times in one run\." "help set symbol-reloading"
-# test help set variable
-gdb_test "help set variable" "Evaluate expression EXP and assign result to variable VAR, using assignment\[\r\n\]+syntax appropriate for the current language \\(VAR = EXP or VAR := EXP for\[\r\n\]+example\\)\.  VAR may be a debugger \"convenience\" variable \\(names starting\[\r\n\]+with \\\$\\), a register \\(a few standard names starting with \\\$\\), or an actual\[\r\n\]+variable in the program being debugged\.  EXP is any valid expression\.\[\r\n\]+This may usually be abbreviated to simply \"set\"\." "help set variable"
-# test help set verbose
-gdb_test "help set verbose" "Set verbosity\." "help set verbose"
-#test help set width
-gdb_test "help set width" "Set number of characters gdb thinks are in a line\." "help set width"
-# test help set write
-# This is only supported on targets which use exec.o.
-gdb_test "help set write" "Set writing into executable and core files\." "help set write"
-# test help set
-# FIXME -- Ultrix hangs randomly on this very long output from gdb and
-# continues with its output only if something is sent to gdb.
-# Also, if the system is slow, it may time out because the output is large.
-gdb_test "help set" "Evaluate expression EXP and assign result to variable VAR, using assignment\[\r\n\]+syntax appropriate for the current language \\(VAR = EXP or VAR := EXP for\[\r\n\]+example\\)\.  VAR may be a debugger \"convenience\" variable \\(names starting\[\r\n\]+with \\\$\\), a register \\(a few standard names starting with \\\$\\), or an actual\[\r\n\]+variable in the program being debugged\.  EXP is any valid expression.*\[\r\n\]+set listsize -- Set number of source lines gdb will list by default.*\[\r\n\]+Type \"help set\" followed by set subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous..*\[\r\n\]+" "help set"
-# test help shell
-gdb_test "help shell" "Execute the rest of the line as a shell command\.\[\r\n\]+With no arguments, run an inferior shell\." "help shell"
-#test help show annotate
-gdb_test "help show annotate" "Show annotation_level\.\[\r\n\]+0 == normal;     1 == fullname \\(for use when running under emacs\\)\[\r\n\]+2 == output annotated suitably for use by programs that control GDB\." "help show annotate"
-# test help show args
-gdb_test "help show args" "Show argument list to give program being debugged when it is started\.\[\r\n\]+Follow this command with any number of args, to be passed to the program\."
-# test help show check "c" abbreviation
-gdb_test "help show c" "Show the status of the type/range checker\.\[\r\n\]+List of show check subcommands:\[\r\n\]+show check range -- Show range checking\[\r\n\]+show check type -- Show type checking\[\r\n\]+Type \"help show check\" followed by show check subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help show check \"c\" abbreviation"
-# test help show check
-gdb_test "help show check" "Show the status of the type/range checker\.\[\r\n\]+List of show check subcommands:\[\r\n\]+show check range -- Show range checking\[\r\n\]+show check type -- Show type checking\[\r\n\]+Type \"help show check\" followed by show check subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help show check"
-# test help show check range
-gdb_test "help show check range" "Show range checking\.  \\(on/warn/off/auto\\)" "help show check range"
-# test help show check type
-gdb_test "help show check type" "Show type checking\.  \\(on/warn/off/auto\\)" "help show check type"
-# test help show commands
-gdb_test "help show commands" "Show the history of commands you typed\.\[\r\n\]+You can supply a command number to start with, or a `\[+\]' to start after\[\r\n\]+the previous command number shown\." "help show commands"
-# test help show complaints
-gdb_test "help show complaints" "Show max number of complaints about incorrect symbols\." "help show complaints"
-# test help show confirm
-gdb_test "help show confirm" "Show whether to confirm potentially dangerous operations\." "help show confirm"
-# test help show convenience
-gdb_test "help show convenience" "Debugger convenience \\(\"\\\$foo\"\\) variables\.\[\r\n\]+These variables are created when you assign them values;\[\r\n\]+thus, \"print \\\$foo=1\" gives \"\\\$foo\" the value 1\.  Values may be any type\.\[\r\n\]+A few convenience variables are given values automatically:\[\r\n\]+\"\\\$_\"holds the last address examined with \"x\" or \"info lines\",\[\r\n\]+\"\\\$__\" holds the contents of the last address examined with \"x\"\." "help show convenience"
-# test help show directories
-gdb_test "help show directories" "Current search path for finding source files\.\[\r\n\]+\\\$cwd in the path means the current working directory\.\[\r\n\]+\\\$cdir in the path means the compilation directory of the source file\." "help show directories"
-# test help show editing
-gdb_test "help show editing" "Show editing of command lines as they are typed\.\[\r\n\]+Use \"on\" to enable the editing, and \"off\" to disable it\.\[\r\n\]+Without an argument, command line editing is enabled\.  To edit, use\[\r\n\]+EMACS-like or VI-like commands like control-P or ESC\." "help show editing"
-# test help show environment
-gdb_test "help show environment" "The environment to give the program, or one variable's value\.\[\r\n\]+With an argument VAR, prints the value of environment variable VAR to\[\r\n\]+give the program being debugged\.  With no arguments, prints the entire\[\r\n\]+environment to be given to the program\." "help show environment"
-# test help show height
-gdb_test "help show height" "Show number of lines gdb thinks are in a page\." "help show height"
-# test help show history expansion
-gdb_test "help show history expansion" "Show history expansion on command input\.\[\r\n\]+Without an argument, history expansion is enabled\." "help show history expansion"
-# test help show history filename
-gdb_test "help show history filename" "Show the filename in which to record the command history\[\r\n\]+\\(the list of previous commands of which a record is kept\\)\." "help show history filename"
-# test help show history save
-gdb_test "help show history save" "Show saving of the history record on exit\.\[\r\n\]+Use \"on\" to enable the saving, and \"off\" to disable it\.\[\r\n\]+Without an argument, saving is enabled\." "help show history save"
-# test help show history size
-gdb_test "help show history size" "Show the size of the command history,\[\r\n\]+ie\. the number of previous commands to keep a record of\." "help show history size"
-# test help show history
-gdb_test "help show history" "Generic command for showing command history parameters\.\[\r\n\]+List of show history subcommands:\[\r\n\]+show history expansion -- Show history expansion on command input\[\r\n\]+show history filename -- Show the filename in which to record the command history\[\r\n\]+show history save -- Show saving of the history record on exit\[\r\n\]+show history size -- Show the size of the command history\[\r\n\]+Type \"help show history\" followed by show history subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help show history"
-# test help show language
-gdb_test "help show language" "Show the current source language\." "help show language"
-# test help show listsize
-gdb_test "help show listsize" "Show number of source lines gdb will list by default\." "help show listsize"
-# test help show print "p" abbreviation
-gdb_test "help show p" "Generic command for showing print settings\.\[\r\n\]+List of show print subcommands:.*\[\r\n\]+Type \"help show print\" followed by show print subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help show print \"p\" abbreviation"
-# test help show print "pr" abbreviation
-gdb_test "help show pr" "Generic command for showing print settings\.\[\r\n\]+List of show print subcommands:.*\[\r\n\]+Type \"help show print\" followed by show print subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help show print \"pr\" abbreviation"
-# test help show print
-gdb_test "help show print" "Generic command for showing print settings\.\[\r\n\]+List of show print subcommands:.*\[\r\n\]+Type \"help show print\" followed by show print subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help show print"
-# test help show paths
-gdb_test "help show paths" "Current search path for finding object files\.\[\r\n\]+\\\$cwd in the path means the current working directory\.\[\r\n\]+This path is equivalent to the \\\$PATH shell variable\.  It is a list of\[\r\n\]+directories, separated by colons\.  These directories are searched to find\[\r\n\]+fully linked executable files and separately compiled object files as needed\." "help show paths"
-# test help show print address
-gdb_test "help show print address" "Show printing of addresses\." "help show print address"
-# test help show print array
-gdb_test "help show print array" "Show prettyprinting of arrays\." "help show print array"
-# test help show print asm-demangle
-gdb_test "help show print asm-demangle" "Show demangling of C\[+\]+/ObjC names in disassembly listings\." "help show print asm-demangle"
-# test help show print demangle
-gdb_test "help show print demangle" "Show demangling of encoded C\[+\]+/ObjC names when displaying symbols\." "help show print demangle"
-# test help show print elements
-gdb_test "help show print elements" "Show limit on string chars or array elements to print\.\[\r\n\]+\"set print elements 0\" causes there to be no limit\." "help show print elements"
-# test help show print object
-gdb_test "help show print object" "Show printing of object's derived type based on vtable info\." "help show print object"
-# test help show print pretty
-gdb_test "help show print pretty" "Show prettyprinting of structures\." "help show print pretty"
-# test help show print sevenbit-strings
-gdb_test "help show print sevenbit-strings" "Show printing of 8-bit characters in strings as \\\\nnn\." "help show print sevenbit-strings"
-# test help show print union
-gdb_test "help show print union" "Show printing of unions interior to structures\." "help show print union"
-# test help show print vtbl
-gdb_test "help show print vtbl" "Show printing of C\[+\]+ virtual function tables\." "help show print vtbl"
-# test help show prompt
-gdb_test "help show prompt" "Show gdb's prompt" "help show prompt"
-# test help show radix
-gdb_test "help show radix" "Show the default input and output number radices\.\[\r\n\]+Use \'show input-radix\' or \'show output-radix\' to independently show each\." "help show radix"
-# test help show symbol-reloading
-gdb_test "help show symbol-reloading" "Show dynamic symbol table reloading multiple times in one run\." "help show symbol-reloading"
-# test help show user
-gdb_test "help show user" "Show definitions of user defined commands\.\[\r\n\]+Argument is the name of the user defined command\.\[\r\n\]+With no argument, show definitions of all user defined commands\." "help show user"
-# test help show values
-gdb_test "help show values" "Elements of value history around item number IDX \\(or last ten\\)\." "help show values"
-# test help show verbose
-gdb_test "help show verbose" "Show verbosity\." "help show verbose"
-# test help show version
-gdb_test "help show version" "Show what version of GDB this is\." "help show version"
-# test help show width
-gdb_test "help show width" "Show number of characters gdb thinks are in a line\." "help show width"
-# test help show write
-# This is only supported on targets which use exec.o.
-gdb_test "help show write" "Show writing into executable and core files\." "help show write"
-# test help show
-# FIXME -- Ultrix hangs randomly on this very long output from gdb and
-# continues with its output only if something is sent to gdb.
-# Also, if the system is slow, it may time out because the output is large.
-gdb_test "help show" "Generic command for showing things about the debugger\.\[\r\n\]+List of show subcommands:.*\[\r\n\]+show directories -- Current search path for finding source files.*\[\r\n\]+show listsize -- Show number of source lines gdb will list by default.*\[\r\n\]+Type \"help show\" followed by show subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help show"
-# test help step
-gdb_test "help step" "Step program until it reaches a different source line\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another reason\\)\." "help step #2"
-# test help stepi "si" abbreviation
-gdb_test "help si" "Step one instruction exactly\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another reason\\)\." "help stepi \"si\" abbreviation"
-# test help stepi
-gdb_test "help stepi" "Step one instruction exactly\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another reason\\)\." "help stepi"
-# test help signal
-gdb_test "help signal" "Continue program giving it signal.*" "help signal"
-# test help source
-# vxgdb reads .vxgdbinit
-gdb_test "help source" "Read commands from a file named FILE\.\[\r\n\]+Note that the file \"\[^\"\]*\" is read automatically in this way\[\r\n\]+when gdb is started\." "help source"
-# test help stack
-gdb_test "help stack" "Examining the stack\..*\[\r\n\]+When the program being debugged stops, gdb selects the innermost frame\.\[\r\n\]+The commands below can be used to select other frames by number or address\.\[\r\n\]+List of commands:\[\r\n\]+backtrace -- Print backtrace of all stack frames\[\r\n\]+bt -- Print backtrace of all stack frames\[\r\n\]+down -- Select and print stack frame called by this one\[\r\n\]+frame -- Select and print a stack frame\[\r\n\]+return -- Make selected stack frame return to its caller\[\r\n\]+select-frame -- Select a stack frame without printing anything\[\r\n\]+up -- Select and print stack frame that called this one\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help stack"
-# test help status
-gdb_test "help status" "Status inquiries\.\[\r\n\]+List of commands:\[\r\n\]+info -- Generic command for showing things about the program being debugged.*\[\r\n\]+show -- Generic command for showing things about the debugger\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help status"
-
-# test help support
-# FIXME -- Ultrix hangs randomly on this very long output from gdb and
-# continues with its output only if something is sent to gdb.
-# Also, if the system is slow, it may time out because the output is large.
-gdb_test "help support" "Support facilities\.\[\r\n\]+List of commands:.*\[\r\n\]+show confirm -- Show whether to confirm potentially dangerous operations.*\[\r\n\]+show history -- Generic command for showing command history parameters.*\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help support"
-# test help symbol-file
-gdb_test "help symbol-file" "Load symbol table from executable file FILE\.\[\r\n\]+The `file' command can also load symbol tables, as well as setting the file\[\r\n\]+to execute\." "help symbol-file"
-# test help target child
-gdb_test "help target child" "(Unix|Win32) child process \\(started by the \"run\" command\\)\.|Undefined target command: \"child\"\.  Try \"help target\"\." "help target child"
-# test help target procfs
-gdb_test "help target procfs" "Unix /proc child process \\(started by the \"run\" command\\)\.|Undefined target command: \"procfs\"\.  Try \"help target\"\." "help target procfs (procfs version)"
-# test help target core
-gdb_test "help target core" "Use a core file as a target\.  Specify the filename of the core file\.|(Undefined target command: \"core\"\.  Try \"help target\"\.)" "help target core"
-# test help target exec
-gdb_test "help target exec" "Use an executable file as a target\.\[\r\n\]+Specify the filename of the executable file\." "help target exec"
-# test help target remote
-gdb_test "help target remote" "Use a remote computer via a serial line, using a gdb-specific protocol\.\[\r\n\]+Specify the serial device it is connected to\[\r\n\]+\\(e.g. .*" "help target remote"
-# test help target
-# the child process target may be "target child" or "target procfs"
-gdb_test "help target" "Connect to a target machine or process\.\[\r\n\]+The first argument is the type or protocol of the target machine\.\[\r\n\]+Remaining arguments are interpreted by the target protocol\.  For more\[\r\n\]+information on the arguments for a particular protocol, type\[\r\n\]+`help target ' followed by the protocol name\.\[\r\n\]+List of target subcommands:.*\[\r\n\]+target exec -- Use an executable file as a target.*\[\r\n\]+Type \"help target\" followed by target subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help target"
-# test help tbreak
-gdb_test "help tbreak" "Set a temporary breakpoint.*" "help tbreak"
-# test help tty
-gdb_test "help tty" "Set terminal for future runs of program being debugged\." "help tty"
-# test help until "u" abbreviation
-gdb_test "help u" "Execute until the program reaches a source line greater than the current\[\r\n\]+or a specified location \\(same args as break command\\) within the current frame\." "help until \"u\" abbreviation"
-# test help until
-gdb_test "help until" "Execute until the program reaches a source line greater than the current\[\r\n\]+or a specified location \\(same args as break command\\) within the current frame\." "help until"
-# test help undisplay
-gdb_test "help undisplay" "Cancel some expressions to be displayed when program stops\.\[\r\n\]+Arguments are the code numbers of the expressions to stop displaying\.\[\r\n\]+No argument means cancel all automatic-display expressions\.\[\r\n\]+\"delete display\" has the same effect as this command\.\[\r\n\]+Do \"info display\" to see current list of code numbers\." "help undisplay"
-# test help unset environment
-gdb_test "help unset environment" "Cancel environment variable VAR for the program\.\[\r\n\]+This does not affect the program until the next \"run\" command\." "help unset environment"
-# test help unset
-gdb_test "help unset" "Complement to certain \"set\" commands\.\[\r\n\]+List of unset subcommands:\[\r\n\]+unset environment -- Cancel environment variable VAR for the program\[\r\n\]+Type \"help unset\" followed by unset subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help unset"
-# test help up
-gdb_test "help up" "Select and print stack frame that called this one\.\[\r\n\]+An argument says how many frames up to go\." "help up"
-# test help up-silently
-gdb_test "help up-silently" "Same as the `up' command, but does not print anything\.\[\r\n\]+This is useful in command scripts\." "help up-silently"
-# test help user-defined
-gdb_test "help user-defined" "User-defined commands\.\[\r\n\]+The commands in this class are those defined by the user\.\[\r\n\]+Use the \"define\" command to define a command\.\[\r\n\]+List of commands:.*\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help user-defined"
-# test help watch
-gdb_test "help watch" "Set a watchpoint for an expression\.\[\r\n\]+A watchpoint stops execution of your program whenever the value of\[\r\n\]+an expression changes\." "help watch"
-# test help whatis
-gdb_test "help whatis" "Print data type of expression EXP\." "help whatis"
-# test help where
-gdb_test "help where" "Print backtrace of all stack frames, or innermost COUNT frames\.\[\r\n\]+With a negative argument, print outermost -COUNT frames\.\[\r\n\]+Use of the 'full' qualifier also prints the values of the local variables\." "help where"
-# test help x
-gdb_test "help x" "Examine memory: x/FMT ADDRESS\.\[\r\n\]+ADDRESS is an expression for the memory address to examine\.\[\r\n\]+FMT is a repeat count followed by a format letter and a size letter\..*\[\r\n\]+Defaults for format and size letters are those previously used\.\[\r\n\]+Default count is 1\.  Default address is following last thing printed\[\r\n\]+with this command or \"print\"\." "help x"
-# test help info bogus-gdb-command
-gdb_test "help info bogus-gdb-command" "Undefined info command: \"bogus-gdb-command\"\.  Try \"help info\"\." "help info bogus-gdb-command"
-# test help gotcha
-gdb_test "help gotcha" "Undefined command: \"gotcha\"\.  Try \"help\"\." "help gotcha"
-# test apropos regex
-gdb_test "apropos \\\(print\[\^ bsiedf\\\".-\]\\\)" "handle -- Specify how to handle a signal"
-# test apropos >1 word string
-gdb_test "apropos handle a signal" "handle -- Specify how to handle a signal"
-# test apropos apropos
-gdb_test "apropos apropos" "apropos -- Search for commands matching a REGEXP"
diff --git a/gdb/testsuite/gdb.base/huge.c b/gdb/testsuite/gdb.base/huge.c
deleted file mode 100644
index 446bb180371..00000000000
--- a/gdb/testsuite/gdb.base/huge.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Test GDB's ability to read a very large data object from target memory.
- */
-
-#include <string.h>
-
-/* A value that will produce a target data object large enough to
-   crash GDB.  0x200000 is big enough on GNU/Linux, other systems may
-   need a larger number.  */
-
-#define CRASH_GDB 0x200000
-
-static int a[CRASH_GDB], b[CRASH_GDB];
-
-main()
-{
-  memcpy (a, b, sizeof (a));
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp
deleted file mode 100644
index 733ddeee7a3..00000000000
--- a/gdb/testsuite/gdb.base/huge.exp
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2001, 2004 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Define if you want to skip this test
-# (could be very time-consuming on remote targets with slow connection).
-#
-if [target_info exists gdb,skip_huge_test] {
-    return;
-}
-
-set testfile "huge"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set timeout 30
-
-if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
-}
-
-gdb_test "print a" ".1 = .0 .repeats \[0123456789\]+ times.." "print a very large data object"
-
diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp
deleted file mode 100644
index fc68601621c..00000000000
--- a/gdb/testsuite/gdb.base/info-proc.exp
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-# This is a test for the gdb command "info proc"
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set ws "\[ \t\]+"
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Does this gdb support info proc?
-send_gdb "help info proc\n"
-gdb_expect {
-    -re "Undefined info command: .proc..  Try .help info.*$gdb_prompt $" {
-	# info proc command not supported -- nothing to test here.
-	unsupported "gdb does not support info proc on this target"
-	return -1;
-    }
-    -re "Show /proc process information about .*$gdb_prompt $" {
-	pass "help info proc"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "help info proc"
-    }
-    timeout {
-	fail "help info proc (timeout)"
-    }
-}
-
-gdb_test "info proc" "No current process.*" "info proc without a process"
-
-if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
-}
-
-gdb_test "info proc" "process ${decimal}.*" "info proc with process"
-
-gdb_test "info proc mapping" \
-	".*Mapped address spaces:.*${hex}${ws}${hex}${ws}${hex}${ws}${hex}.*" \
-	"info proc mapping"
diff --git a/gdb/testsuite/gdb.base/int-type.c b/gdb/testsuite/gdb.base/int-type.c
deleted file mode 100644
index 548ca9c36bb..00000000000
--- a/gdb/testsuite/gdb.base/int-type.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-int x;
-int y;
-int z;
-int w;
-
-
-
-int main ()
-{
-   
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-
-    x = 14;
-    y = 3;
-    z = 2;
-    w = 2;
-
-    return 0;
-    
-}
-
diff --git a/gdb/testsuite/gdb.base/interp.exp b/gdb/testsuite/gdb.base/interp.exp
deleted file mode 100644
index fa99642d685..00000000000
--- a/gdb/testsuite/gdb.base/interp.exp
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2004, 2005 Free Software Foundation, 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.  
-
-# interp.exp   Test interpreter-exec command
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-gdb_start
-
-gdb_test "interpreter-exec mi \"-var-update *\"" "\\^done,changelist=[].*"
-gdb_test "interpreter-exec console \"show version\"" "GNU gdb .*"
-
-gdb_exit
diff --git a/gdb/testsuite/gdb.base/interrupt.c b/gdb/testsuite/gdb.base/interrupt.c
deleted file mode 100644
index a895d4b7d81..00000000000
--- a/gdb/testsuite/gdb.base/interrupt.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-int
-main ()
-{
-  char x;
-  int nbytes;
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  printf ("talk to me baby\n");
-  while (1)
-    {
-      nbytes = read (0, &x, 1);
-      if (nbytes < 0)
-	{
-#ifdef EINTR
-	  if (errno != EINTR)
-#endif
-	    perror ("");
-	}
-      else if (nbytes == 0)
-	{
-	  printf ("end of file\n");
-	  exit (0);
-	}
-      else
-	write (1, &x, 1);
-    }
-  return 0;
-}
-
-int
-func1 ()
-{
-  return 4;
-}
diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp
deleted file mode 100644
index 83e9630ef30..00000000000
--- a/gdb/testsuite/gdb.base/interrupt.exp
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, 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
-
-if [target_info exists gdb,nointerrupts] {
-    verbose "Skipping interrupt.exp because of nointerrupts."
-    continue
-}
-
-if [target_info exists gdb,noinferiorio] {
-    verbose "Skipping interrupt.exp because of noinferiorio."
-    return
-}
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile interrupt
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-
-
-if ![file exists $binfile] then {
-    perror "$binfile does not exist."
-    return 0
-} else {
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-    # Hope this is unix :-)
-    gdb_test "shell stty intr '^C'" "" \
-	"set interrupt character in interrupt.exp"
-    if [runto_main] then {
-	send_gdb "continue\n"
-	gdb_expect {
-	    -re "\r\ntalk to me baby\r\n$" {
-		pass "child process is alive"
-	    }
-	    timeout { fail "run (timeout)" }
-	    eof { fail "run (eof)" }
-	}
-	# This should appear twice, once for the echo and once for the
-	# program's output.  Under dejagnu (but not interactively) for
-	# SunOS4, it only appears once.  Don't worry about it, I imagine
-	# dejagnu has just done something to the tty modes.
-	send_gdb "a\n"
-	gdb_expect {
-	    -re "^a\r\n(|a\r\n)$" {
-		pass "child process ate our char"
-	    }
-	    timeout { fail "echo a (timeout)" }
-	    eof { fail "echo a (eof)" }
-	}
-	# Wait until the program is in the read system call again.
-	sleep 2
-
-	# Cntrl-c may fail for simulator targets running on a BSD host.
-	# This is the result of a combination of the read syscall
-	# being restarted and gdb capturing the cntrl-c signal.
-
-	# Cntrl-c may fail for simulator targets on slow hosts.
-	# This is because there is a race condition between entering
-	# the read and delivering the cntrl-c.
-
-	send_gdb "\003"
-	gdb_expect {
-	    -re "Program received signal SIGINT.*$gdb_prompt $" {
-		pass "send_gdb control C"
-	    }
-	    -re ".*$gdb_prompt $" { fail "send_gdb control C" }
-	    timeout { fail "send_gdb control C (timeout)" }
-	    eof { fail "send_gdb control C (eof)" }
-	}
-
-	send_gdb "p func1 ()\n"
-	gdb_expect {
-	    -re " = 4.*$gdb_prompt $" { pass "call function when asleep" }
-	    -re ".*Program received signal SIG(SEGV|ILL).*$gdb_prompt $" {
-		setup_xfail "i*86-pc-linux*-gnu*"
-		fail "child died when we called func1, skipped rest of tests"
-		return
-	    }
-	    -re "$gdb_prompt $" {
-		# On HPUX-11.0 'send "p func1 ()"' above
-		# terminates the program. A defect is pending on this
-		# issue [defect #DTS CHFts24203]. Hence calling setup_xfail
-		# below.
-	        setup_xfail "hppa*-*-*11*" CHFts24203
-		fail "call function when asleep (wrong output)"
-	    }
-	    default {
-
-		# This fail probably happens whenever we use /proc (we
-		# don't use PRSABORT), but apparently also happens on
-		# other machines as well.
-
-		setup_xfail "sparc*-*-solaris2*"
-		setup_xfail "mips-*-ultrix*"
-		setup_xfail "i*86-*-solaris2*"
-		setup_xfail "*-*-sysv4*"
-		setup_xfail "vax-*-*"
-		setup_xfail "alpha-*-*"
-		setup_xfail "*-*-*bsd*"
-		setup_xfail "*-*-irix*"
-		setup_xfail "*-*-hpux*"
-		setup_xfail "*-*-*lynx*"
-		fail "call function when asleep (stays asleep)"
-		# Send_Gdb a newline to wake it up
-		send_gdb "\n"
-		gdb_test "" " = 4" "call function after waking it"
-	    }
-#	    eof { fail "call function when asleep (eof)" }
-	}
-
-	# Now try calling the function again.
-	gdb_test "p func1 ()" " = 4" "call function a second time"
-
-	# And the program should still be doing the same thing.
-	# The optional trailing \r\n is in case we sent a newline above
-	# to wake the program, in which case the program now sends it
-	# back.  We check for it either here or in the next gdb_expect
-	# command, because which one it ends up in is timing dependent.
-	send_gdb "continue\n"
-	# For some reason, i386-*-sysv4 gdb fails to issue the Continuing
-	# message, but otherwise appears normal (FIXME).
-	gdb_expect {
-	    -re "^continue\r\nContinuing.\r\n(\r\n|)$" { pass "continue" }
-	    -re "^continue\r\n\r\n" { fail "continue (missing Continuing.)" }
-	    -re "$gdb_prompt $" { fail "continue" }
-	    timeout { fail "continue (timeout)" }
-	    eof { fail "continue (eof)" }
-	}
-
-	send_gdb "data\n"
-	# The optional leading \r\n is in case we sent a newline above
-	# to wake the program, in which case the program now sends it
-	# back.
-        # FIXME: The pattern below leads to an expected success on HPUX-11.0
-        # but the success is spurious. Need to provide the right reg.expr.
-        # here.
-	gdb_expect {
-	    -re "^(\r\n|)data\r\n(|data\r\n)$" { pass "echo data" }
-	    timeout { fail "echo data (timeout)" }
-	    eof { fail "echo data (eof)" }
-	}
-
-	setup_xfail "i*86-pc-linux*-gnu*"
-	send_gdb "\004"
-	gdb_expect {
-	    -re "end of file.*Program exited normally.*$gdb_prompt $" {
-		pass "send end of file"
-	    }
-	    -re "$gdb_prompt $" { fail "send end of file" }
-	    timeout { fail "send end of file (timeout)" }
-	    eof { fail "send end of file (eof)" }
-	}
-    }
-}
-return 0
diff --git a/gdb/testsuite/gdb.base/jump.c b/gdb/testsuite/gdb.base/jump.c
deleted file mode 100644
index aae94f7e85a..00000000000
--- a/gdb/testsuite/gdb.base/jump.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* This program is used to test the "jump" command.  There's nothing
-   particularly deep about the functionality nor names in here.
-   */
-
-#ifdef PROTOTYPES
-static int square (int x)
-#else
-static int square (x)
-  int  x;
-#endif
-{
-  return x*x;
-}
-
-
-int main ()
-{
-  int i = 99;
-
-  i++;
-  i = square (i);
-  i--;
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/jump.exp b/gdb/testsuite/gdb.base/jump.exp
deleted file mode 100644
index a2c53ee7788..00000000000
--- a/gdb/testsuite/gdb.base/jump.exp
+++ /dev/null
@@ -1,187 +0,0 @@
-#   Copyright 1998, 1999 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-set prms_id 0
-set bug_id 0
-
-clear_xfail "*-*-*"
-
-set testfile "jump"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Build the test case
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-  perror "Couldn't run to main"
-  return -1
-}
-
-# Set a breakpoint on the statement that we're about to jump to.
-# The statement doesn't contain a function call.
-#
-send_gdb "break 22\n"
-set bp_on_non_call 0
-gdb_expect {
-  -re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 22.*$gdb_prompt $"\
-          {set bp_on_non_call $expect_out(1,string)
-           pass "break before jump to non-call"}
-  -re "$gdb_prompt $"\
-          {fail "break before jump to non-call"}
-  timeout {fail "(timeout) break before jump to non-call"}
-}
-
-# Can we jump to the statement?  Do we stop there?
-#
-send_gdb "jump 22\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*, .*${srcfile}:22.*$gdb_prompt $"\
-          {pass "jump to non-call"}
-  -re "$gdb_prompt $"\
-          {fail "jump to non-call"}
-  timeout {fail "(timeout) jump to non-call"}
-}
-
-# Set a breakpoint on the statement that we're about to jump to.
-# The statement does contain a function call.
-#
-send_gdb "break 21\n"
-set bp_on_call 0
-gdb_expect {
-  -re "\[Bb\]reakpoint (\[0-9\]*) at 0x\[0-9a-fA-F\]*: file .*${srcfile}, line 21.*$gdb_prompt $"\
-          {set bp_on_call $expect_out(1,string)
-           pass "break before jump to call"}
-  -re "$gdb_prompt $"\
-          {fail "break before jump to call"}
-  timeout {fail "(timeout) break before jump to call"}
-}
-
-# Can we jump to the statement?  Do we stop there?
-#
-send_gdb "jump 21\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*, .*${srcfile}:21.*$gdb_prompt $"\
-          {pass "jump to call"}
-  -re "$gdb_prompt $"\
-          {fail "jump to call"}
-  timeout {fail "(timeout) jump to call"}
-}
-
-# If we disable the breakpoint at the function call, and then
-# if we jump to that statement, do we not stop there, but at
-# the following breakpoint?
-#
-send_gdb "disable $bp_on_call\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "disable breakpoint on call"}
-  timeout {fail "(timeout) disable breakpoint on call"}
-}
-
-send_gdb "jump 21\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*, .*${srcfile}:22.*$gdb_prompt $"\
-          {pass "jump to call with disabled breakpoint"}
-  -re "$gdb_prompt $"\
-          {fail "jump to call with disabled breakpoint"}
-  timeout {fail "(timeout) jump to call with disabled breakpoint"}
-}
-
-# Verify that GDB responds gracefully to the "jump" command without
-# an argument.
-#
-send_gdb "jump\n"
-gdb_expect {
-  -re "Argument required .starting address..*$gdb_prompt $"\
-          {pass "jump without argument disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "jump without argument disallowed"}
-  timeout {fail "(timeout) jump without argument disallowed"}
-}
-
-# Verify that GDB responds gracefully to the "jump" command with
-# trailing junk.
-#
-send_gdb "jump 21 100\n"
-gdb_expect {
-  -re "Junk at end of line specification: 100.*$gdb_prompt $"\
-          {pass "jump with trailing argument junk"}
-  -re "$gdb_prompt $"\
-          {fail "jump with trailing argument junk"}
-  timeout {fail "(timeout) jump with trailing argument junk"}
-}
-
-# Verify that GDB responds gracefully to a request to jump out of
-# the current function.  (Note that this will very likely cause the
-# inferior to die.  Be prepared to rerun the inferior, if further
-# testing is desired.)
-#
-# Try it both ways: confirming and not confirming the jump.
-#
-send_gdb "jump 12\n"
-gdb_expect {
-  -re "Line 12 is not in `main'.  Jump anyway.*y or n. $"\
-          {send_gdb "n\n"
-           gdb_expect {
-             -re "Not confirmed.*$gdb_prompt $"\
-                     {pass "aborted jump out of current function"}
-             -re "$gdb_prompt $"\
-                     {fail "aborted jump out of current function"}
-             timeout {fail "(timeout) aborted jump out of current function"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "aborted jump out of current function"}
-  timeout {fail "(timeout) aborted jump out of current function"}
-}
-
-send_gdb "jump 12\n"
-gdb_expect {
-  -re "Line 12 is not in `main'.  Jump anyway.*y or n. $"\
-          {send_gdb "y\n"
-           gdb_expect {
-             -re "Continuing at.*$gdb_prompt $"\
-                     {pass "jump out of current function"}
-             -re "$gdb_prompt $"\
-                     {fail "jump out of current function"}
-             timeout {fail "(timeout) jump out of current function"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "jump out of current function"}
-  timeout {fail "(timeout) jump out of current function"}
-}
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/langs.exp b/gdb/testsuite/gdb.base/langs.exp
deleted file mode 100644
index 49b9c5d5adf..00000000000
--- a/gdb/testsuite/gdb.base/langs.exp
+++ /dev/null
@@ -1,171 +0,0 @@
-#   Copyright (C) 1997, 1998 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile langs
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [is_remote host] {
-    remote_download host ${srcdir}/${subdir}/langs1.f
-    remote_download host ${srcdir}/${subdir}/langs2.cxx
-}
-
-
-if  { [gdb_compile "${srcdir}/${subdir}/langs0.c" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/langs1.c" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/langs2.c" "${binfile}2.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o ${binfile}2.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-set oldtimeout $timeout
-set timeout 10
-
-
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test_multiple "b langs0" "break on nonexistent function in langs.exp" {
-	-re "Function \"langs0\" not defined\..*Make breakpoint pending on future shared library load.*y or .n.. $" {
-
-		gdb_test "n" "" "break on nonexistent function in langs.exp"
-	}
-	-re "Breakpoint .* (deferred).*$gdb_prompt $" {
-		pass "break on nonexistent function in langs.exp"
-	}
-}
-
-if {$hp_aCC_compiler} {
-    set isfixed 1
-    set lang c\\+\\+
-    set ext cxx
-    set foo_func foo__Fi__Fi
-    set do_func do::langs0
-} else {
-    if {$hp_cc_compiler} {
-        set isfixed 1
-        set lang c
-        set ext c
-    } else {
-        set isfixed 0
-    }
-    set foo_func foo__Fi
-    set do_func langs0__2do
-}
-
-if [runto csub] then {
-
-    if { !$isfixed } { set lang c }
-    gdb_test "show language" "currently $lang\".*" \
-	"show language at csub in langs.exp"
-    # On some machines, foo doesn't get demangled because the N_SOL for
-    # langs2.cxx is seen only after the function stab for foo.  So
-    # the following regexps are kludged to accept foo__Fi as well as foo,
-    # even though only the latter is correct.  I haven't tried to xfail it
-    # because it depends on details of the compiler.
-    
-    # Take out xfail. This test has been passing for some time now.
-    #if {!$gcc_compiled} then { setup_xfail "hppa*-*-hpux*" }
-    gdb_test "bt" "#0.*csub.*#1.*(foo|$foo_func) \\(.*#2.*cppsub_ .*#3.*fsub.*#4.*$do_func \\(.*#5  \[0-9a-fx\]* in main.*" "backtrace in langs.exp"
-
-    if { !$isfixed } { set lang c\\+\\+; set ext cxx }
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "up" ".* in (foo|$foo_func).* at langs2\\.$ext.*return csub \\(.*" \
-	"up to foo in langs.exp"
-    gdb_test "show language" "currently $lang.*" \
-	"show language at foo in langs.exp"
-
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "up" ".* in cppsub_ .* at langs2\\.$ext.*return foo \\(.*" \
-	"up to cppsub_ in langs.exp"
-    gdb_test "show language" "currently $lang.*" \
-	"show language at cppsub_ in langs.exp"
-
-    if { !$isfixed } { set lang fortran }
-    if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-    gdb_test "up" ".* in fsub.* at langs1\\.f.*" \
-	"up to fsub in langs.exp"
-    gdb_test "show language" "currently $lang.*" \
-	"show language at fsub in langs.exp"
-
-    # Take out xfail. This test has been passing for sometime now.
-    #if {!$gcc_compiled} then { setup_xfail "hppa*-*-hpux*" }
-    if { !$isfixed } { set lang c }
-    gdb_test "up" ".* in $do_func .* at .*langs0\\.c.*return fsub.*" \
-	"up to langs0__2do in langs.exp"
-    gdb_test "show language" "currently $lang\".*" \
-	"show language at langs0__2do in langs.exp"
-
-    gdb_test "up" ".* in main .* at .*langs0\\.c.*if \\(langs0__2do \\(.*" \
-	"up to main in langs.exp"
-    gdb_test "show language" "currently $lang\".*" \
-	"show language at main in langs.exp"
-
-    if [target_info exists gdb,noresults] { return }
-
-    if [target_info exists use_gdb_stub] {
-	gdb_breakpoint "exit"
-	gdb_test "cont" "Breakpoint .*exit.*" "continue to exit in langs.exp"
-    } else {
-	gdb_test "cont" "Program exited normally\\..*" \
-		"continue to exit in langs.exp"
-    }
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-# Try exercising the "minimal" language a bit...
-
-if [runto csub] then {
-    gdb_test "set lang minimal" \
-             "Warning: the current language does not match this frame." \
-             "set lang to minimal"
-    
-    gdb_test "print x" " = 5000" "print parameter value"
-}
-
-set timeout $oldtimeout
-return 0
diff --git a/gdb/testsuite/gdb.base/langs0.c b/gdb/testsuite/gdb.base/langs0.c
deleted file mode 100644
index 1477a324f91..00000000000
--- a/gdb/testsuite/gdb.base/langs0.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This file is actually in C, it is not supposed to simulate something
-   translated from another language or anything like that.  */
-#ifdef PROTOTYPES
-extern  int fsub_();
-
-int csub (int x)
-#else
-int
-csub (x)
-     int x;
-#endif
-{
-  return x + 1;
-}
-
-int
-langs0__2do ()
-{
-  return fsub_ () + 2;
-}
-
-int
-main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  if (langs0__2do () == 5003)
-    /* Success.  */
-    return 0;
-  else
-    return 1;
-}
diff --git a/gdb/testsuite/gdb.base/langs1.c b/gdb/testsuite/gdb.base/langs1.c
deleted file mode 100644
index 8ffd13f0840..00000000000
--- a/gdb/testsuite/gdb.base/langs1.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* langs1.f -- translated by f2c (version of 5 May 1990  1:12:08).  */
-
-/* f2c output hacked as follows for GDB testsuite:
-   1.  Change commented out "#" lines to #line directives.
-       I don't know why this behavior isn't the default for f2c -g.
-   2.  Remove include of f2c.h and put in just a typedef for "integer".
-   Additional notes:
-   3.  f2c was called as "f2c -g langs1.f".
-   4.  We don't need to use the fortran libraries.  */
-
-typedef int integer;
-
-/* Table of constant values */
-
-static integer c__10000 = 10000;
-
-/* I am not sure whether there is a way to have a fortran program without */
-/* a MAIN, but it does not really harm us to have one. */
-#ifdef PROTOTYPES
-/* Main program */ void MAIN__()
-#else
-/* Main program */ MAIN__()
-#endif
-{
-} /* MAIN__ */
-
-#line 4 "langs1.f"
-/* Subroutine */ int fsub_()
-{
-#ifdef PROTOTYPES
-    extern integer cppsub_(int*);
-#else
-    extern integer cppsub_();
-#endif
-
-#line 5 "langs1.f"
-#line 6 "langs1.f"
-    return cppsub_(&c__10000);
-#line 7 "langs1.f"
-} /* fsub_ */
-
diff --git a/gdb/testsuite/gdb.base/langs1.f b/gdb/testsuite/gdb.base/langs1.f
deleted file mode 100644
index 35ce6911472..00000000000
--- a/gdb/testsuite/gdb.base/langs1.f
+++ /dev/null
@@ -1,7 +0,0 @@
-c I am not sure whether there is a way to have a fortran program without
-c a MAIN, but it does not really harm us to have one.
-      end
-      subroutine fsub
-        integer*4 cppsub
-        return (cppsub (10000))
-      end
diff --git a/gdb/testsuite/gdb.base/langs2.c b/gdb/testsuite/gdb.base/langs2.c
deleted file mode 100644
index 502b80063f0..00000000000
--- a/gdb/testsuite/gdb.base/langs2.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* This is intended to be a vague simulation of cfront output.  */
-#ifdef PROTOTYPES
-#line 1 "langs2.cxx"
-extern int csub (int);
-int
-foo__Fi (int x)
-{
-  return csub (x / 2);
-}
-
-extern int cppsub_ (int *y);
-int
-cppsub_ (int * y)
-{
-  return foo__Fi (*y);
-}
-#else 
-#line 1 "langs2.cxx"
-extern int csub ();
-int
-foo__Fi (x) int x;
-{
-  return csub (x / 2);
-}
-
-extern int cppsub_ ();
-int
-cppsub_ (y) int *y;
-{
-  return foo__Fi (*y);
-}
-#endif
diff --git a/gdb/testsuite/gdb.base/langs2.cxx b/gdb/testsuite/gdb.base/langs2.cxx
deleted file mode 100644
index 5a2ca8a1568..00000000000
--- a/gdb/testsuite/gdb.base/langs2.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
-extern "C" int csub (int);
-int
-foo (int x)
-{
-  return csub (x / 2);
-}
-
-extern "C" int cppsub_ (int *);
-int
-cppsub_ (int *y)
-{
-  return foo (*y);
-}
diff --git a/gdb/testsuite/gdb.base/lineinc.c b/gdb/testsuite/gdb.base/lineinc.c
deleted file mode 100644
index 91784e7d2b3..00000000000
--- a/gdb/testsuite/gdb.base/lineinc.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* The following is written to tickle a specific bug in the macro
-   table code (now hopefully fixed), which doesn't insert new included
-   files in the #including file's list in the proper place.  They
-   should be sorted by the number of the line which #included them, in
-   increasing order, but the sense of the comparison was reversed, so
-   the list ends up being built backwards.  This isn't a problem by
-   itself, but the code to pick new, non-conflicting line numbers for
-   headers alleged to be #included at the same line as some other
-   header assumes that the list's line numbers are in ascending order.
-
-   So, given the following input, lineinc1.h gets added to lineinc.c's
-   #inclusion list first, at line 10.  When the debug info reader
-   tries to add lineinc2.h at line 10 as well, the code will notice the
-   duplication --- since there's only one extant element in the list,
-   it'll find it --- and insert it after lineinc1.h, with line 11.
-   Since the code is putting the list in order of descending
-   #inclusion line number, the list is now out of order.  When we try
-   to #include lineinc3.h at line 11, we won't notice the duplication.  */
-
-#line 10
-#include "lineinc1.h"
-#line 10
-#include "lineinc2.h"
-#line 11
-#include "lineinc3.h"
-
-int
-main (int argc, char **argv)
-{
-}
diff --git a/gdb/testsuite/gdb.base/lineinc.exp b/gdb/testsuite/gdb.base/lineinc.exp
deleted file mode 100644
index 4707ce516e1..00000000000
--- a/gdb/testsuite/gdb.base/lineinc.exp
+++ /dev/null
@@ -1,126 +0,0 @@
-# Test macro handling of #included files.
-# Copyright 2003 Free Software Foundation, 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
-
-# The test program lineinc.c contains a mix of #line directives and
-# #include directives that will cause the compiler to attribute more
-# than one #inclusion to the same source line.  You can get similar
-# effects using things like GCC's '-imacros' flag.
-#
-# Compiling lineinc.c with Dwarf 2 macro information will produce
-# something like this:
-# 
-#     $ gcc -g3 lineinc.c -o lineinc
-#     $ readelf -wml lineinc
-#     ...
-#      The File Name Table:
-#       Entry	Dir	Time	Size	Name
-#       1	0	0	0	lineinc.c
-#       2	0	0	0	lineinc1.h
-#       3	0	0	0	lineinc2.h
-#       4	0	0	0	lineinc3.h
-#     ...
-#     Contents of the .debug_macinfo section:
-#     
-#      DW_MACINFO_start_file - lineno: 0 filenum: 1
-#      DW_MACINFO_define - lineno : 1 macro : __VERSION__ "3.2 20020903 (Red Hat Linux 8.0 3.2-7)"
-#      DW_MACINFO_define - lineno : 2 macro : __USER_LABEL_PREFIX__ 
-#     ...
-#      DW_MACINFO_define - lineno : 1 macro : __i386__ 1
-#      DW_MACINFO_define - lineno : 1 macro : __tune_i386__ 1
-#      DW_MACINFO_start_file - lineno: 10 filenum: 2
-#      DW_MACINFO_define - lineno : 1 macro : FOO 1
-#      DW_MACINFO_end_file
-#      DW_MACINFO_start_file - lineno: 10 filenum: 3
-#      DW_MACINFO_undef - lineno : 1 macro : FOO
-#      DW_MACINFO_define - lineno : 2 macro : FOO 2
-#      DW_MACINFO_end_file
-#      DW_MACINFO_start_file - lineno: 11 filenum: 4
-#      DW_MACINFO_undef - lineno : 1 macro : FOO
-#      DW_MACINFO_define - lineno : 2 macro : FOO 3
-#      DW_MACINFO_end_file
-#      DW_MACINFO_end_file
-#     $   
-#
-# Note how the inclusions of lineinc1.h and lineinc2.h are both
-# attributed to line 10 of lineinc.c, and the #inclusion of lineinc3.h
-# is attributed to line 11.  This is all correct, given the #line
-# directives in lineinc.c.
-#
-# Dwarf 2 macro information doesn't contain enough information to
-# allow GDB to figure out what's really going on here --- it makes no
-# mention of the #line directives --- so we just try to cope as best
-# we can.  If the macro table were to attribute more than one
-# #inclusion to the same source line, then GDB wouldn't be able to
-# tell which #included file's #definitions and #undefinitions come
-# first, so it can't tell which #definitions are in scope following
-# all the #inclusions.  To cope with this, GDB puts all the files
-# #included by a given source file in a list sorted by the line at
-# which they were #included; this gives GDB the chance to detect
-# multiple #inclusions at the same line, complain, and assign
-# distinct, albiet incorrect, line numbers to each #inclusion.
-#
-# However, at one point GDB was sorting the list in reverse order,
-# while the code to assign new, distinct line numbers assumed it was
-# sorted in ascending order; GDB would get an internal error trying to
-# read the above debugging info.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "lineinc"
-set binfile ${objdir}/${subdir}/${testfile}
-
-
-if {[gdb_compile "${srcdir}/${subdir}/${testfile}.c" ${binfile} executable {debug}] != ""} {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Any command that causes GDB to read the debugging info for the
-# lineinc.c compilation unit will do here.
-set test_name "tolerate macro info with multiple #inclusions per line"
-gdb_test_multiple "break main" $test_name {
-    -re "Breakpoint 1 at 0x.*: file .*lineinc.c.*\\.\r\n${gdb_prompt}" {
-        pass $test_name
-    }
-    -re ".*internal-error:.*.y or n. " {
-        fail $test_name
-        send_gdb "y\n"
-        gdb_expect {
-            -re ".*.y or n. " {
-                send_gdb "n\n"
-                exp_continue
-            }
-            -re "$gdb_prompt" {
-            }                
-            timeout {
-                fail "$test_name (timeout)"
-            }
-        }
-    }
-}
diff --git a/gdb/testsuite/gdb.base/lineinc1.h b/gdb/testsuite/gdb.base/lineinc1.h
deleted file mode 100644
index 8523d58b330..00000000000
--- a/gdb/testsuite/gdb.base/lineinc1.h
+++ /dev/null
@@ -1 +0,0 @@
-#define FOO 1
diff --git a/gdb/testsuite/gdb.base/lineinc2.h b/gdb/testsuite/gdb.base/lineinc2.h
deleted file mode 100644
index ee800ba72e8..00000000000
--- a/gdb/testsuite/gdb.base/lineinc2.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#undef FOO
-#define FOO 2
diff --git a/gdb/testsuite/gdb.base/lineinc3.h b/gdb/testsuite/gdb.base/lineinc3.h
deleted file mode 100644
index be3bb54506a..00000000000
--- a/gdb/testsuite/gdb.base/lineinc3.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#undef FOO
-#define FOO 3
diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
deleted file mode 100644
index 5494c28acdd..00000000000
--- a/gdb/testsuite/gdb.base/list.exp
+++ /dev/null
@@ -1,547 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003
-# Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "list"
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Need to download the header to the host.
-remote_download host ${srcdir}/${subdir}/list0.h list0.h
-
-
-if  { [gdb_compile "${srcdir}/${subdir}/list0.c" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/list1.c" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-#
-# Local utility proc just to set and verify listsize
-# Return 1 if success, 0 if fail.
-#
-
-set set_listsize_count 0;
-
-proc set_listsize { arg } {
-    global gdb_prompt
-    global set_listsize_count;
-
-    incr set_listsize_count;
-    if [gdb_test "set listsize $arg" "" "setting listsize to $arg #$set_listsize_count"] {
-	return 0;
-    }
-    if { $arg <= 0 } {
-	set arg "unlimited";
-    }
-
-    if [gdb_test "show listsize" "Number of source lines.* is ${arg}.*" "show listsize $arg #$set_listsize_count"] {
-	return 0;
-    }
-    return 1
-}
-
-#
-# Test display of listsize lines around a given line number.
-#
-
-proc test_listsize {} {
-    global gdb_prompt
-    global hp_cc_compiler
-    global hp_aCC_compiler
-
-    # Show default size
-
-    gdb_test "show listsize" "Number of source lines gdb will list by default is 10.*" "show default list size"
-    
-    # Show the default lines
-    # Note that remote targets that have debugging info for _start available will
-    # list the lines there instead of main, so we skip this test for remote targets.
-    # The second case is for optimized code, it is still correct.
-    
-    if [is_remote target] {
-	runto_main;
-	unsupported "list default lines around main";
-    } else {
-	gdb_test "list" "(1\[ \t\]+#include \"list0.h\".*10\[ \t\]+x = 0;|2.*11\[ \t\]+foo .x\[+)\]+;)" "list default lines around main"
-    }
-
-    # Ensure we can limit printouts to one line
-
-    if [set_listsize 1] {
-	gdb_test "list 1" "1\[ \t\]+#include \"list0.h\"" "list line 1 with listsize 1"
-	gdb_test "list 2" "2\[ \t\]+" "list line 2 with listsize 1"
-    }    
-
-    # Try just two lines
-    
-    if [ set_listsize 2 ] {
-	gdb_test "list 1" "1\[ \t\]+#include \"list0.h\"\r\n2\[ \t\]+" "list line 1 with listsize 2"
-	gdb_test "list 2" "1\[ \t\]+#include \"list0.h\"\r\n2\[ \t\]+" "list line 2 with listsize 2"
-	gdb_test "list 3" "2\[ \t\]+\r\n3\[ \t\]+int main \[)(\]+" "list line 3 with listsize 2"
-    }
-
-    # Try small listsize > 1 that is an odd number
-
-    if [ set_listsize 3 ] {
-	gdb_test "list 1" "1\[ \t\]+#include \"list0.h\".*3\[ \t\]+int main \[)(\]+" "list line 1 with listsize 3"
-	gdb_test "list 2" "1\[ \t\]+#include \"list0.h\".*3\[ \t\]+int main \[)(\]+" "list line 2 with listsize 3"
-	gdb_test "list 3" "2\[ \t\]+\r\n3\[ \t\]+int main \[(\]+\[)\]+\r\n4\[ \t\]+\{" "list line 3 with listsize 3"
-    }
-
-    # Try small listsize > 2 that is an even number.
-
-    if [ set_listsize 4 ] then {
-	gdb_test "list 1" "1\[ \t\]+#include \"list0.h\".*4\[ \t\]+\{" "list line 1 with listsize 4"
-	gdb_test "list 2" "1\[ \t\]+#include \"list0.h\".*4\[ \t\]+\{" "list line 2 with listsize 4"
-	
-	gdb_test "list 3" "1\[ \t\]+#include \"list0.h\".*4\[ \t\]+\{" "list line 3 with listsize 4"
-	gdb_test "list 4" "2\[ \t\]+\r\n.*5\[ \t\]+int x;.*" "list line 4 with listsize 4"
-    }
-
-    # Try a size larger than the entire file.
-
-    if [ set_listsize 100 ] then {
-	gdb_test "list 1" "1\[ \t\]+#include \"list0.h\".*\r\n4\[23\]\[ \t\]+\}" "list line 1 with listsize 100"
-	
-	gdb_test "list 10" "1\[ \t\]+#include \"list0.h\".*\r\n4\[23\]\[ \t\]+\}" "list line 10 with listsize 100"
-    }
-
-    # Try listsize of 0 which suppresses printing.
-
-    set_listsize 0
-    gdb_test "list 1" "" "listsize of 0 suppresses output"
-
-    # Try listsize of -1 which is special, and means unlimited.
-
-    set_listsize -1
-    setup_xfail "*-*-*"
-    gdb_test "list 1" "1\[ \t\]+#include .*\r\n39\[ \t\]+\}" "list line 1 with unlimited listsize"
-}
-
-#
-# Test "list filename:number" for C include file
-#
-
-proc test_list_include_file {} {
-    global gdb_prompt
-
-    setup_xfail_format "COFF"
-    gdb_test "list list0.h:1" "1\[ \t\]+/\[*\]+ An include file .*10\[ \t\]+bar \\(x\\+\\+\\);" "list line 1 in include file"
-
-    setup_xfail_format "COFF"
-    gdb_test "list list0.h:100" "Line number 95 out of range; .*list0.h has 3\[67\] lines." "list message for lines past EOF"
-}
-
-#
-# Test "list filename:number" for C source file
-#
-
-proc test_list_filename_and_number {} {
-    global gdb_prompt
-
-    set testcnt 0
-
-    send_gdb "list list0.c:1\n"
-    gdb_expect {
-	-re "1\[ \t\]+#include \"list0.h\".*10\[ \t]+x = 0;\r\n$gdb_prompt $" {
-	    incr testcnt 
-	}
-	-re ".*$gdb_prompt $" { fail "list list0.c:1" ; gdb_suppress_tests }
-	timeout { fail "list list0.c:1 (timeout)" ; gdb_suppress_tests }
-    }
-    send_gdb "list list0.c:10\n"
-    gdb_expect {
-	-re "5\[ \t\]+int x;.*14\[ \t\]+foo .x\[+)\]+;\r\n$gdb_prompt $" {
-	    incr testcnt 
-	}
-	-re ".*$gdb_prompt $" { fail "list list.c:10" ; gdb_suppress_tests }
-	timeout { fail "list list.c:10 (timeout)" ; gdb_suppress_tests }
-    }
-    send_gdb "list list1.c:1\n"
-    gdb_expect {
-	-re "1\[ \t\]+\#include.*4\[ \t\]+.*int oof\[ \t\]*\(.*\);\r\n.*$gdb_prompt $" {
-	    incr testcnt 
-	}
-	-re ".*$gdb_prompt $" { fail "list list1.c:1" ; gdb_suppress_tests }
-	timeout { fail "list list1.c:1 (timeout)" ; gdb_suppress_tests }
-    }
-    send_gdb "list list1.c:12\n"
-    gdb_expect {
-	-re "12\[ \t\]+long_line \[(\]+.*\[)\]+;.*13\[ \t\]+\}\r\n.*$gdb_prompt $" {
-	    incr testcnt 
-	}
-	-re ".*$gdb_prompt $" { fail "list list1.c:12" ; gdb_suppress_tests }
-	timeout { fail "list list1.c:12 (timeout)" ; gdb_suppress_tests }
-    }
-    pass "list filename:number ($testcnt tests)"
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Test "list function" for C source file
-#
-
-proc test_list_function {} {
-    global gdb_prompt
-
-    # gcc appears to generate incorrect debugging information for code
-    # in include files, which breaks this test.
-    # SunPRO cc is the second case below, it's also correct.
-    gdb_test "list main" "(5\[ \t\]+int x;.*14\[ \t\]+foo \[(\]+.*\[)\]+;|1\[ \t\]+#include .*10\[ \t\]+x = 0;)" "list function in source file 1"
-
-    # Ultrix gdb takes the second case below; it's also correct.
-    # SunPRO cc is the third case.
-    gdb_test "list bar" "(4\[ \t\]+void.*\[ \t\]*long_line.*;.*bar.*9\[ \t\]*.*|1\[ \t\]+void.*8\[ \t\]+\}|1\[ \t\]+void.*7\[ \t\]*long_line ..;|7\[ \t\]+void.*14\[ \t\]+\})" "list function in source file 2"
-
-    # Test "list function" for C include file
-    # Ultrix gdb is the second case, still correct.
-    # SunPRO cc is the third case.
-    gdb_test "list foo" "(3\[ \t\]+.*12\[ \t\]+bar \[(\]+.*\[)\]+;|2\[ \t\]+including file.*11\[ \t\]+bar \[(\]+.*\[)\]+;|1\[ \t\]+/. An include file.*10\[ \t\]+bar \[(\]+.*\[)\]+;)" "list function in include file"
-}
-
-proc test_list_forward {} {
-    global gdb_prompt
-
-    set testcnt 0
-
-    send_gdb "list list0.c:10\n"
-    gdb_expect {
-	-re "5\[ \t\]+int x;.*14\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list list0.c:10" ; gdb_suppress_tests }
-	timeout { fail "list list0.c:10 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "list\n"
-    gdb_expect {
-	-re "15\[ \t\]+foo \[(\]+.*\[)\]+;.*24\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 15-24" ; gdb_suppress_tests }
-	timeout { fail "list 15-24 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "list\n"
-    gdb_expect {
-	-re "25\[ \t\]+foo \[(\]+.*\[)\]+;.*34\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 25-34" ; gdb_suppress_tests }
-	timeout { fail "list 25-34 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "list\n"
-    gdb_expect {
-	-re "35\[ \t\]+foo \\(.*\\);.*42\[ \t\]+.*\}\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 35-42" ; gdb_suppress_tests }
-	timeout { fail "list 35-42 (timeout)" ; gdb_suppress_tests }
-    }
-
-    pass "successive list commands to page forward ($testcnt tests)"
-    gdb_stop_suppressing_tests;
-}
-
-# Test that repeating the list linenum command doesn't print the same
-# lines over again.  Note that this test makes sure that the argument
-# linenum is dropped, when we repeat the previous command. 'x/5i $pc'
-# works the same way.  
-
-proc test_repeat_list_command {} {
-    global gdb_prompt
-
-    set testcnt 0
-
-    send_gdb "list list0.c:10\n"
-    gdb_expect {
-	-re "5\[ \t\]+int x;.*14\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list list0.c:10" ; gdb_suppress_tests }
-	timeout { fail "list list0.c:10 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "\n"
-    gdb_expect {
-	-re "15\[ \t\]+foo \[(\]+.*\[)\]+;.*24\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 15-24" ; gdb_suppress_tests }
-	timeout { fail "list 15-24 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "\n"
-    gdb_expect {
-	-re "25\[ \t\]+foo \[(\]+.*\[)\]+;.*34\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 25-34" ; gdb_suppress_tests }
-	timeout { fail "list 25-34 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "\n"
-    gdb_expect {
-	-re "35\[ \t\]+foo \\(.*\\);.*42\[ \t\]+.*\}\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 35-42" ; gdb_suppress_tests }
-	timeout { fail "list 35-42 (timeout)" ; gdb_suppress_tests }
-    }
-
-    pass "repeat list commands to page forward using 'return' ($testcnt tests)"
-    gdb_stop_suppressing_tests;
-}
-
-proc test_list_backwards {} {
-    global gdb_prompt
-
-    set testcnt 0
-
-    send_gdb "list list0.c:33\n"
-    gdb_expect {
-	-re "28\[ \t\]+foo \\(.*\\);.*37\[ \t\]+\}\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list list0.c:33" ; gdb_suppress_tests }
-	timeout { fail "list list0.c:33 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "list -\n"
-    gdb_expect {
-	-re "18\[ \t\]+foo \[(\]+.*\[)\]+;.*27\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 18-27" ; gdb_suppress_tests }
-	timeout { fail "list 18-27 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "list -\n"
-    gdb_expect {
-	-re "8\[ \t\]+breakpoint\[(\]\[)\];.*17\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 8-17" ; gdb_suppress_tests }
-	timeout { fail "list 8-17 (timeout)" ; gdb_suppress_tests }
-    }
-
-    send_gdb "list -\n"
-    gdb_expect {
-	-re "1\[ \t\]+#include .*7\[ \t\]+set_debug_traps\[(\]\[)\]+;\r\n$gdb_prompt $" { incr testcnt }
-	-re ".*$gdb_prompt $" { fail "list 1-7" ; gdb_suppress_tests }
-	timeout { fail "list 1-7 (timeout)" ; gdb_suppress_tests }
-    }
-
-    pass "$testcnt successive \"list -\" commands to page backwards"
-    gdb_stop_suppressing_tests;
-}
-
-#
-# Test "list first,last"
-#
-
-proc test_list_range {} {
-    global gdb_prompt
-
-    gdb_test "list list0.c:2,list0.c:5" "2\[ \t\]+\r\n3\[ \t\]+int main \[)(\]+.*5\[ \t\]+int x;" "list range; filename:line1,filename:line2"
-
-    gdb_test "list 2,5" "2\[ \t\]+\r\n3\[ \t\]+int main \[)(\]+.*5\[ \t\]+int x;" "list range; line1,line2"
-
-#    gdb_test     "list -1,6" 	"Line number 0 out of range; .*list0.c has 39 lines." "list range; lower bound negative"
-
-#    gdb_test     "list -100,-40" 	"Line number -60 out of range; .*list0.c has 39 lines." "list range; both bounds negative"
-
-    gdb_test "list 30,45" "30\[ \t\]+foo \(.*\);.*43\[ \t\]+\}" "list range; upper bound past EOF"
-
-    gdb_test "list 45,100" "Line number 45 out of range; .*list0.c has 43 lines." "list range; both bounds past EOF"
-
-    gdb_test "list list0.c:2,list1.c:17" "Specified start and end are in different files." "list range, must be same files"
-}
-
-#
-# Test "list filename:function"
-#
-
-proc test_list_filename_and_function {} {
-    global gdb_prompt
-
-    set testcnt 0
-
-    # gcc appears to generate incorrect debugging information for code
-    # in include files, which breaks this test.
-    # SunPRO cc is the second case below, it's also correct.
-    send_gdb "list list0.c:main\n"
-    gdb_expect {
-	-re "1\[ \t\]+#include .*10\[ \t\]+x = 0;\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re "5\[ \t\]+int x;.*14\[ \t\]+foo \[(\]+.*\[)\]+;\r\n$gdb_prompt $" {
-	    pass "list function in source file 1"
-	}
-	-re ".*$gdb_prompt $" { fail "list list0.c:main" }
-	timeout { fail "list list0.c:main (timeout)" }
-    }
-
-    # Not sure what the point of having this function be unused is.
-    # AIX is legitimately removing it.
-    setup_xfail "rs6000-*-aix*"
-    send_gdb "list list0.c:unused\n"
-    gdb_expect {
-	-re "40\[ \t\]+unused.*43\[ \t\]+\}\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re "37.*42\[ \t\]+\}\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re ".*$gdb_prompt $" { fail "list list0.c:unused" }
-	timeout { fail "list list0.c:unused (timeout)" }
-    }
-    clear_xfail "rs6000-*-aix*"
-
-    # gcc appears to generate incorrect debugging information for code
-    # in include files, which breaks this test.
-    # Ultrix gdb is the second case, one line different but still correct.
-    # SunPRO cc is the third case.
-    setup_xfail "rs6000-*-*" 1804
-    setup_xfail_format "COFF"
-    send_gdb "list list0.h:foo\n"
-    gdb_expect {
-	-re "2\[ \t\]+including file.  This.*11\[ \t\]+bar \[(\]+.*\[)\]+;\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re "1\[ \t\]+/. An include file.*10\[ \t\]+bar \[(\]+.*\[)\]+;\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re "3\[ \t\]+.*12\[ \t\]+bar \[(\]+.*\[)\]+;\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re "No source file named list0.h.\r\n$gdb_prompt $" {
-	    fail "list list0.h:foo"
-	}
-	-re ".*$gdb_prompt $" { fail "list list0.h:foo" }
-	timeout { fail "list list0.h:foo (timeout)" }
-    }
-
-    # Ultrix gdb is the second case.
-    send_gdb "list list1.c:bar\n"
-    gdb_expect {
-	-re "4\[ \t\]+void.*13\[ \t\]+\}\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re "4\[ \t\]+void.*12\[ \t\]*long_line ..;\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re "4\[ \t\]+void.*11\[ \t\]*\r\n$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re ".*$gdb_prompt $" { fail "list list1.c:bar" }
-	timeout { fail "list list1.c:bar (timeout)" }
-    }
-
-    # Not sure what the point of having this function be unused is.
-    # AIX is legitimately removing it.
-    setup_xfail "rs6000-*-aix*"
-    send_gdb "list list1.c:unused\n"
-    gdb_expect {
-	-re "12\[ \t\]+long_line \[(\]\[)\];.*13\[ \t\]+\}\r\n.*$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re "14.*19\[ \t\]+\}\r\n.*$gdb_prompt $" {
-	    incr testcnt
-	}
-	-re ".*$gdb_prompt $" { fail "list list1.c:unused" }
-	timeout { fail "list list1.c:unused (timeout)" }
-    }
-    clear_xfail "rs6000-*-aix*"
-
-    pass "list filename:function ($testcnt tests)"
-
-    # Test some invalid specs
-    # The following test takes the FIXME result on most systems using
-    # DWARF.  It fails to notice that main() is not in the file requested.
-   
-    setup_xfail "*-*-*"
-
-# Does this actually work ANYWHERE?  I believe not, as this is an `aspect' of
-# lookup_symbol(), where, when it is given a specific symtab which does not
-# contain the requested symbol, it will subsequently search all of the symtabs
-# for the requested symbol.
-
-    gdb_test "list list0.c:foo" "Function \"foo\" not defined in .*list0.c" "list filename:function; wrong filename rejected"
-
-    gdb_test "list foobar.c:main" "No source file named foobar.c.|Location not found" "list filename:function; nonexistant file"
-
-    gdb_test "list list0.h:foobar" "Function \"foobar\" not defined.|Location not found" "list filename:function; nonexistant function"
-
-}
-
-proc test_forward_search {} {
-	global timeout
-
-	gdb_test "set listsize 4" ""
-	# On SunOS4, this gives us lines 19-22.  On AIX, it gives us
-	# lines 20-23.  This depends on whether the line number of a function
-	# is considered to be the openbrace or the first statement--either one
-	# is acceptable.
-	gdb_test "list long_line" "24\[ \t\]+long_line .*"
-
-	gdb_test "search 4321" " not found"
-
-	gdb_test "search 6789" "28\[ \t\]+oof .6789.;"
-
-	# Test that GDB won't crash if the line being searched is extremely long.
-
-	set oldtimeout $timeout
-	set timeout [expr "$timeout + 300"]
-	verbose "Timeout is now $timeout seconds" 2
-	gdb_test "search 1234" ".*1234.*" "search extremely long line (> 5000 chars)"
-	set timeout $oldtimeout
-	verbose "Timeout is now $timeout seconds" 2
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-gdb_test "set width 0" "" "set width 0"
-
-test_listsize
-get_debug_format
-if [ set_listsize 10 ] then {
-    test_list_include_file
-    test_list_filename_and_number
-    test_list_function
-    test_list_forward
-    test_list_backwards
-    test_repeat_list_command
-    test_list_range
-    test_list_filename_and_function
-    test_forward_search
-}
-
-remote_exec build "rm -f list0.h"
diff --git a/gdb/testsuite/gdb.base/list0.c b/gdb/testsuite/gdb.base/list0.c
deleted file mode 100644
index b50fdd4323d..00000000000
--- a/gdb/testsuite/gdb.base/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.base/list0.h b/gdb/testsuite/gdb.base/list0.h
deleted file mode 100644
index d46833060e5..00000000000
--- a/gdb/testsuite/gdb.base/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.base/list1.c b/gdb/testsuite/gdb.base/list1.c
deleted file mode 100644
index 6094104b9cd..00000000000
--- a/gdb/testsuite/gdb.base/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.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp
deleted file mode 100644
index 231f8ae01cf..00000000000
--- a/gdb/testsuite/gdb.base/logical.exp
+++ /dev/null
@@ -1,132 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1998, 1999, 2004 Free Software Foundation, 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.  
-
-# This file was written by Elena Zannoni (ezannoni@cygnus.com)
-
-# Tests for correctenss of logical operators, associativity and
-# precedence with integer type variables
-
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "int-type"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-proc evaluate { vars ops } {
-    for {set vari 0} {$vari < [llength $vars]} {incr vari} {
-	set var [lindex $vars $vari]
-	for {set opi 0} {$opi < [llength $ops]} {incr opi} {
-	    set op [lindex [lindex $ops $opi] 0]
-	    set val [lindex [lindex $ops $opi] [expr $vari + 1]]
-	    gdb_test "print $var, $op" " = $val" "evaluate $op; variables $var; expecting $val"
-	}
-    }
-}
-
-# Unary
-
-evaluate {
-    {x = 0} {x = 1}
-} {
-    { {x}   0 1 }
-    { {!x}  1 0 }
-    { {!!x} 0 1 }
-}
-
-# Binary (with unary)
-
-evaluate {
-    {x = 0, y = 0} {x = 0, y = 1} {x = 1, y = 0} {x = 1, y = 1}
-} {
-    { {x && y}   0 0 0 1 }
-    { {!x && y}  0 1 0 0 }
-    { {x && !y}  0 0 1 0 }
-    { {!x && !y} 1 0 0 0 }
-
-    { {x || y}   0 1 1 1 }
-    { {!x || y}  1 1 0 1 }
-    { {x || !y}  1 0 1 1 }
-    { {!x || !y} 1 1 1 0 }
-
-    { {x < y}    0 1 0 0 }
-    { {x <= y}   1 1 0 1 }
-    { {x == y}   1 0 0 1 }
-    { {x != y}   0 1 1 0 }
-    { {x >= y}   1 0 1 1 }
-    { {x > y}    0 0 1 0 }
-}
-
-# Full table of &&, || combinations, followed by random mix of unary ops
-
-evaluate {
-    {x = 0, y = 0, z = 0} {x = 0, y = 0, z = 1} {x = 0, y = 1, z = 0} {x = 0, y = 1, z = 1}
-    {x = 1, y = 0, z = 0} {x = 1, y = 0, z = 1} {x = 1, y = 1, z = 0} {x = 1, y = 1, z = 1}
-} {
-    { {x && y && z}    0 0 0 0  0 0 0 1 }
-    { {x || y && z}    0 0 0 1  1 1 1 1 }
-    { {x && y || z}    0 1 0 1  0 1 1 1 }
-    { {x || y || z}    0 1 1 1  1 1 1 1 }
-
-    { {x || !y && z}   0 1 0 0  1 1 1 1 }
-    { {!x || y && z}   1 1 1 1  0 0 0 1 }
-    { {!x || y && !z}  1 1 1 1  0 0 1 0 }
-}
-
-# More complex operations
-
-evaluate {
-    {x = 1, y = 2, w = 3, z = 3}
-    {x = 1, y = 2, w = 1, z = 3}
-    {x = 2, y = 2, w = 2, z = 3}
-} {
-    { {x > y || w == z}   1 0 0 }
-    { {x >= y && w != z}  0 0 1 }
-    { {! x > y || w + z}  1 1 1 }
-}
diff --git a/gdb/testsuite/gdb.base/long_long.c b/gdb/testsuite/gdb.base/long_long.c
deleted file mode 100644
index a55cb248227..00000000000
--- a/gdb/testsuite/gdb.base/long_long.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 1999, 2004,
-   Free Software Foundation, 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.
-   */
-
-/* Test long long expression; test printing in general.
- *
- * /CLO/BUILD_ENV/Exports/cc -g +e -o long_long long_long.c
- *
- * or
- *
- * cc +e +DA2.0 -g -o long_long long_long.c
- */
-
-#include <string.h>
-
-enum { MAX_BYTES = 16 };
-
-void
-pack (unsigned char b[MAX_BYTES], int size, int nr)
-{
-  static long long val[] = { 0x123456789abcdefLL, 01234567123456701234567LL, 12345678901234567890ULL};
-  volatile static int e = 1;
-  int i;
-  for (i = 0; i < nr; i++)
-    {
-      int offset;
-      if (*(char *)&e)
-	/* Little endian.  */
-	offset = sizeof (long long) - size;
-      else
-	/* Big endian endian.  */
-	offset = 0;
-      memcpy (b + size * i, (char *) val + sizeof (long long) * i + offset, size);
-    }
-}
-
-unsigned char b[MAX_BYTES];
-unsigned char h[MAX_BYTES];
-unsigned char w[MAX_BYTES];
-unsigned char g[MAX_BYTES];
-
-unsigned char c[MAX_BYTES];
-unsigned char s[MAX_BYTES];
-unsigned char i[MAX_BYTES];
-unsigned char l[MAX_BYTES];
-unsigned char ll[MAX_BYTES];
-
-int known_types()
-{
-  /* A union is used here as, hopefully it has well defined packing
-     rules.  */
-  struct {
-    long long bin, oct, dec, hex;    
-  } val;
-  memset (&val, 0, sizeof val);
-
-  /* Known values, filling the full 64 bits.  */
-  val.bin = 0x123456789abcdefLL; /* 64 bits = 16 hex digits */
-  val.oct = 01234567123456701234567LL; /*  = 21+ octal digits */
-  val.dec = 12345678901234567890ULL;    /*  = 19+ decimal digits */
-
-  /* Stop here and look!  */
-  val.hex = val.bin - val.dec | val.oct;
-
-  return 0;
-}
-
-int main() {
-
-   /* Pack Byte, Half, Word and Giant arrays with byte-orderd values.
-      That way "(gdb) x" gives the same output on different
-      architectures.  */
-   pack (b, 1, 2);
-   pack (h, 2, 2);
-   pack (w, 4, 2);
-   pack (g, 8, 2);
-   pack (c, sizeof (char), 2);
-   pack (s, sizeof (short), 2);
-   pack (i, sizeof (int), 2);
-   pack (l, sizeof (long), 2);
-   pack (ll, sizeof (long long), 2);
-
-   known_types();
-   
-   return 0;
-}
diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp
deleted file mode 100644
index b36b30b32b2..00000000000
--- a/gdb/testsuite/gdb.base/long_long.exp
+++ /dev/null
@@ -1,338 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
-# Software Foundation, 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.  */
-
-# long_long.exp   Test printing of 64-bit things in 32-bit gdb.
-#                 Also test differnet kinds of formats.
-#
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if [target_info exists no_long_long] {
-    return 0
-}
-
-set testfile long_long
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# What compiler are we using?
-#
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if {$hp_cc_compiler} {
-    set flag "+e"
-} else {
-    set flag ""
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug "additional_flags=$flag -w"]] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# use this to debug:
-#log_user 1
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if { ![runto known_types] } then { 
-   fail "run to known_types" 
-   return 
-}
-
-set target_bigendian_p 1
-send_gdb "show endian\n"
-gdb_expect {
-    -re "little endian.*$gdb_prompt $" { set target_bigendian_p 0 }
-    -re "big endian.*$gdb_prompt $" { }
-    -re "$gdb_prompt $" {
-	 fail "getting target endian"
-    }
-    default	{ fail "(timeout) getting target endian" }
-}
-
-# Detect the size of the target's basic types.
-
-proc get_valueof { fmt exp default } {
-    global gdb_prompt
-    send_gdb "print${fmt} ${exp}\n"
-    gdb_expect {
-	-re "\\$\[0-9\]* = (\[-\]*\[0-9\]*).*$gdb_prompt $" {
-	    set val $expect_out(1,string)
-	    pass "get value of ${exp} ($val)"
-	}
-	timeout {
-	    set size ${default}
-	    fail "get value of ${exp} (timeout)"
-	}
-    }
-    return ${val}
-}
-
-proc get_sizeof { type default } {
-    return [get_valueof "/d" "sizeof (${type})" $default]
-}
-
-set sizeof_char [get_sizeof "char" 1]
-set sizeof_short [get_sizeof "short" 2]
-set sizeof_int [get_sizeof "int" 4]
-set sizeof_long [get_sizeof "long" 4]
-set sizeof_long_long [get_sizeof "long long" 8]
-set sizeof_data_ptr [get_sizeof "void *" 4]
-set sizeof_double [get_sizeof "double" 8]
-set sizeof_long_double [get_sizeof "long double" 8]
-
-# Tests to handle ISA/ABI variants
-
-proc pat2 { n pats } {
-    set i 0
-    while { $n > 1 } {
-	set n [expr $n / 2]
-	incr i
-    }
-    return [lindex $pats $i]
-}
-
-proc gdb_test_xxx { test pat name } {
-    if { $pat == "" } {
-	setup_kfail *-*-* gdb/1672
-	gdb_test $test "xxx" $name
-    } else {
-	gdb_test $test $pat $name
-    }
-}
-
-proc gdb_test_bi { test be le } {
-    global target_bigendian_p
-
-    if { $target_bigendian_p } {
-	gdb_test_xxx $test $be $test
-    } else {
-	gdb_test_xxx $test $le $test
-    }
-}
-
-proc gdb_test_ptr { test args } {
-    global sizeof_data_ptr
-
-    gdb_test_xxx $test [pat2 $sizeof_data_ptr $args] $test
-}
-
-proc gdb_test_xptr { examine args } {
-    global sizeof_data_ptr
-    set x [pat2 $sizeof_data_ptr $args]
-    # X is of the form { VARIABLE PATTERN }
-    gdb_test_xxx "$examine [lindex $x 0]" [lindex $x 1] "$examine"
-}
-
-proc gdb_test_char { test args } {
-    global sizeof_char
-    gdb_test_xxx $test [pat2 $sizeof_char $args] $test
-}
-
-proc gdb_test_short { test args } {
-    global sizeof_short
-    gdb_test_xxx $test [pat2 $sizeof_short $args] $test
-}
-
-proc gdb_test_int { test args } {
-    global sizeof_int
-    gdb_test_xxx $test [pat2 $sizeof_int $args] $test
-}
-
-proc gdb_test_long { test args } {
-    global sizeof_long
-    gdb_test_xxx $test [pat2 $sizeof_long $args] $test
-}
-
-proc gdb_test_long_long { test args } {
-    global sizeof_long_long
-    gdb_test_xxx $test [pat2 $sizeof_long_long $args] $test
-}
-
-gdb_breakpoint [gdb_get_line_number "Stop here and look"]
-gdb_continue_to_breakpoint "Stop here and look"
-
-# Check the hack for long long prints.
-#
-gdb_test "p/x val.hex" "0x0*0" "hex print p/x"
-gdb_test "p/x val.dec" "0xab54a98ceb1f0ad2" "decimal print p/x"
-# see if 'p/<code>' is handled same as 'p /<code>'
-#
-gdb_test "p /x val.dec" "0xab54a98ceb1f0ad2" "default print val.dec"
-gdb_test "p /x val.bin" "0x123456789abcdef" "default print val.bin"
-gdb_test "p /x val.oct" "0xa72ee53977053977" "default print val.oct"
-gdb_test "p val.hex" "= 0" "default print hex"
-
-gdb_test "p/u val.dec" "12345678901234567890" "decimal print p/u"
-gdb_test "p/t val.bin" "100100011010001010110011110001001101010111100110111101111" "binary print"
-gdb_test "p/o val.oct" "01234567123456701234567" "octal print"
-gdb_test "p /d val.bin" "81985529216486895" "print +ve long long"
-gdb_test "p/d val.dec" "-6101065172474983726" "decimal print p/d"
-
-# Try all the combinations to bump up coverage.
-#
-gdb_test "p/d val.oct" "-6399925985474168457"
-gdb_test "p/u val.oct" "12046818088235383159"
-gdb_test "p/o val.oct" ""
-gdb_test "p/t val.oct" "1010011100101110111001010011100101110111000001010011100101110111"
-gdb_test_ptr "p/a val.oct" "" "" "0x77053977" "0xa72ee53977053977"
-gdb_test "p/c val.oct" "'w'"
-
-if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
-    # ARM floating point numbers are not strictly little endian or big endian,
-    # but a hybrid.  They are in little endian format with the two words
-    # swapped in big endian format.
-
-    if { [istarget "arm*-*-*"] || \
-	    [istarget "xscale*-*-*"] || \
-	    [istarget "strongarm*-*-*"] } then {
-	# assume the long long represents a floating point double in ARM format
-	gdb_test "p/f val.oct" "2.1386676354387559e\\+265"
-    } else {
-	# assume the long long represents a floating point double in little
-	# endian format
-	gdb_test "p/f val.oct" "-5.9822653797615723e-120"
-    }
-} else {
-    gdb_test "p/f val.oct" "-2.42716126e-15"
-}
-
-gdb_test_char "p/x *(char *)c" "0x1"
-gdb_test_char "p/d *(char *)c" "1"
-gdb_test_char "p/u *(char *)c" "1"
-gdb_test_char "p/o *(char *)c" "01"
-gdb_test_char "p/t *(char *)c" "1"
-gdb_test_char "p/a *(char *)c" "0x1"
-gdb_test_char "p/f *(char *)c" "1"
-gdb_test_char "p/c *(char *)c" "1 '.001'"
-
-gdb_test_short "p/x *(short *)s" "" "0x123" ""
-gdb_test_short "p/d *(short *)s" "" "291" ""
-gdb_test_short "p/u *(short *)s" "" "291" ""
-gdb_test_short "p/o *(short *)s" "" "0443" ""
-gdb_test_short "p/t *(short *)s" "" "100100011" ""
-gdb_test_short "p/a *(short *)s" "" "0x123" ""
-gdb_test_short "p/f *(short *)s" "" "291" ""
-gdb_test_short "p/c *(short *)s" "" "35 '.'" ""
-
-gdb_test_int "p/x *(int *)i" "" "0x123" "0x1234567" ""
-gdb_test_int "p/d *(int *)i" "" "291" "19088743" ""
-gdb_test_int "p/u *(int *)i" "" "291" "19088743" ""
-gdb_test_int "p/o *(int *)i" "" "0443" "0110642547" ""
-gdb_test_int "p/t *(int *)i" "" "100100011" "1001000110100010101100111" ""
-gdb_test_int "p/a *(int *)i" "" "" "0x1234567" ""
-gdb_test_int "p/f *(int *)i" "" "291" "2.99881655e-38" ""
-gdb_test_int "p/c *(int *)i" "" "35 '.'" "103 'g'" ""
-
-gdb_test_long "p/x *(long *)l" "" "0x123" "0x1234567" "0x123456789abcdef"
-gdb_test_long "p/d *(long *)l" "" "291" "19088743" "81985529216486895"
-gdb_test_long "p/u *(long *)l" "" "291" "19088743" "81985529216486895"
-gdb_test_long "p/o *(long *)l" "" "0443" "0110642547" "04432126361152746757"
-gdb_test_long "p/t *(long *)l" "" "100100011" "1001000110100010101100111" "100100011010001010110011110001001101010111100110111101111"
-gdb_test_ptr "p/a *(long *)l" "" "" "0x1234567" "0x123456789abcdef"
-gdb_test_long "p/f *(long *)l" "" "291" "2.99881655e-38" "3.5127005640885037e-303"
-gdb_test_long "p/c *(long *)l" "" "35 '.'" "103 'g'" "-17 '.*'"
-
-gdb_test_long_long "p/x *(long long *)ll" "" "" "" "0x123456789abcdef"
-gdb_test_long_long "p/d *(long long *)ll" "" "" "" "81985529216486895"
-gdb_test_long_long "p/u *(long long *)ll" "" "" "" "81985529216486895"
-gdb_test_long_long "p/o *(long long *)ll" "" "" "" "04432126361152746757"
-gdb_test_long_long "p/t *(long long *)ll" "" "" "" "100100011010001010110011110001001101010111100110111101111"
-gdb_test_ptr "p/a *(long long *)ll" "" "" "0x89abcdef" "0x123456789abcdef"
-gdb_test_long_long "p/f *(long long *)ll" "" "" "" "3.5127005640885037e-303"
-gdb_test_long_long "p/c *(long long *)ll" "" "" "" "-17 '.*'"
-
-# Implict Word size (except for a, c, and f)
-
-gdb_test "x/w w" "" "set examine size to w"
-gdb_test "x/x w" "0x01234567"
-gdb_test "x/d w" "19088743"
-gdb_test "x/u w" "19088743"
-gdb_test "x/o w" "0110642547"
-gdb_test "x/t w" "00000001001000110100010101100111"
-gdb_test_xptr "x/a" { b "" } { h "" } { w "0x1234567" } { g "0x123456789abcdef" }
-gdb_test "x/c b" "1 '.001'"
-if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
-    gdb_test "x/f &val.oct" "-5.9822653797615723e-120"
-} else {
-    gdb_test "x/f &val.oct" "-2.42716126e-15"
-}
-
-# Implict Giant size (except for a, c, and f)
-
-gdb_test "x/g g" "" "set examine size to g"
-gdb_test "x/2x g" "0x0123456789abcdef.*0xa72ee53977053977"
-gdb_test "x/2d g" "81985529216486895.*-6399925985474168457"
-gdb_test "x/2u g" "81985529216486895.*12046818088235383159"
-gdb_test "x/2o g" "04432126361152746757.*01234567123456701234567"
-gdb_test "x/2t g" "0000000100100011010001010110011110001001101010111100110111101111.*1010011100101110111001010011100101110111000001010011100101110111"
-gdb_test_xptr "x/2a" { b "" } { h "" } { w "0x1234567.*0xa72ee539" } { g "0x123456789abcdef.*0xa72ee53977053977" }
-gdb_test "x/2c b" "1 '.001'.*-89 '.'"
-if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
-    gdb_test "x/2f &val.oct" "-5.9822653797615723e-120.*-5.9041889495880968e-100"
-} else {
-    gdb_test "x/2f &val.oct" "-2.42716126e-15"
-}
-
-# Explicit sizes, and two memory locations ...
-
-gdb_test "x/2bx b" "0x01.*0xa7"
-gdb_test "x/2bd b" "1.*-89"
-gdb_test "x/2bu b" "1.*167"
-gdb_test "x/2bo b" "01.*0247"
-gdb_test "x/2bt b" "00000001.*10100111"
-gdb_test_ptr "x/2ba b" "" "" "0x1.*0xffffffa7" "0x1.*0xffffffffffffffa7"
-gdb_test "x/2bc b" "1 '.001'.*-89 '.'"
-gdb_test "x/2bf b" "1.*-89"
-
-gdb_test "x/2hx h" "0x0123.*0xa72e"
-gdb_test "x/2hd h" "291.*-22738"
-gdb_test "x/2hu h" "291.*42798"
-gdb_test "x/2ho h" "0443.*0123456"
-gdb_test "x/2ht h" "0000000100100011.*1010011100101110"
-gdb_test_ptr "x/2ha h" "" ""  "0x123.*0xffffa72e" "0x123.*0xffffffffffffa72e"
-gdb_test "x/2hc h" "35 '.'.*46 '.'"
-gdb_test "x/2hf h" "291.*-22738"
-
-gdb_test "x/2wx w" "0x01234567.*0xa72ee539"
-gdb_test "x/2wd w" "19088743.*-1490098887"
-gdb_test "x/2wu w" "19088743.*2804868409"
-gdb_test "x/2wo w" "0110642547.*024713562471"
-gdb_test "x/2wt w" "00000001001000110100010101100111.*10100111001011101110010100111001"
-gdb_test_ptr "x/2wa w" "" ""  "0x1234567.*0xa72ee539" "0x1234567.*0xffffffffa72ee539"
-gdb_test "x/2wc w" "103 'g'.*57 '9'"
-gdb_test "x/2wf w" "2.99881655e-38.*-2.42716126e-15"
-
-gdb_test "x/2gx g" "0x0123456789abcdef.*0xa72ee53977053977"
-gdb_test "x/2gd g" "81985529216486895.*-6399925985474168457"
-gdb_test "x/2gu g" "81985529216486895.*12046818088235383159"
-gdb_test "x/2go g" "04432126361152746757.*01234567123456701234567"
-gdb_test "x/2gt g" "0000000100100011010001010110011110001001101010111100110111101111.*1010011100101110111001010011100101110111000001010011100101110111"
-gdb_test_ptr "x/2ga g" "" "" "0x89abcdef.*0x77053977" "0x123456789abcdef.*0xa72ee53977053977"
-gdb_test "x/2gc g" "-17 '.'.*119 'w'"
-gdb_test "x/2gf g" "3.5127005640885037e-303.*-5.9822653797615723e-120"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/m32r.ld b/gdb/testsuite/gdb.base/m32r.ld
deleted file mode 100644
index b96077adb6a..00000000000
--- a/gdb/testsuite/gdb.base/m32r.ld
+++ /dev/null
@@ -1,160 +0,0 @@
-OUTPUT_FORMAT("elf32-m32r", "elf32-m32r",
-	      "elf32-m32r")
-OUTPUT_ARCH(m32r)
-ENTRY(_start)
- SEARCH_DIR(/usr/cygnus/m32r-961018/H-sparc-sun-sunos4.1//lib);
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-SECTIONS
-{
-     OVERLAY 0x300000 : AT (0x400000)
-        {
-          .ovly0 { foo.o(.text) }
-          .ovly1 { bar.o(.text) }
-        }
-     OVERLAY 0x380000 : AT (0x480000)
-        {
-          .ovly2 { baz.o(.text) }
-          .ovly3 { grbx.o(.text) }
-        }
-     OVERLAY 0x340000 : AT (0x440000)
-        {
-          .data00 { foo.o(.data) }
-          .data01 { bar.o(.data) }
-        }
-     OVERLAY 0x3C0000 : AT (0x4C0000)
-        {
-          .data02 { baz.o(.data) }
-          .data03 { grbx.o(.data) }
-        }
-
-  /* Read-only sections, merged into text segment: */
-  . = 0x208000;
-  .interp        : { *(.interp) 	}
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .rel.text      : { *(.rel.text)	}
-  .rela.text     : { *(.rela.text) 	}
-  .rel.data      : { *(.rel.data)	}
-  .rela.data     : { *(.rela.data) 	}
-  .rel.rodata    : { *(.rel.rodata) 	}
-  .rela.rodata   : { *(.rela.rodata) 	}
-  .rel.got       : { *(.rel.got)	}
-  .rela.got      : { *(.rela.got)	}
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.init      : { *(.rel.init)	}
-  .rela.init     : { *(.rela.init)	}
-  .rel.fini      : { *(.rel.fini)	}
-  .rela.fini     : { *(.rela.fini)	}
-  .rel.bss       : { *(.rel.bss)	}
-  .rela.bss      : { *(.rela.bss)	}
-  .rel.plt       : { *(.rel.plt)	}
-  .rela.plt      : { *(.rela.plt)	}
-  .init          : { *(.init)		} =0
-  .plt           : { *(.plt)		}
-  .text          :
-  {
-    *(.text)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-  } =0
-  _etext = .;
-  PROVIDE (etext = .);
-  .fini          : { *(.fini)		} =0
-  .rodata        : { *(.rodata) *(.gnu.linkonce.r*) }
-  .rodata1       : { *(.rodata1)	}
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(32) + (ALIGN(8) & (32 - 1));
-  .data          :
-  {
-    *(.data)
-    *(.gnu.linkonce.d*)
-    _ovly_table = .; 
-      _ovly0_entry = .;
-	LONG(ABSOLUTE(ADDR(.ovly0)));
-	LONG(SIZEOF(.ovly0));
-	LONG(LOADADDR(.ovly0));
-	LONG(0);
-      _ovly1_entry = .;
-	LONG(ABSOLUTE(ADDR(.ovly1)));
-	LONG(SIZEOF(.ovly1));
-	LONG(LOADADDR(.ovly1));
-	LONG(0);
-      _ovly2_entry = .;
-	LONG(ABSOLUTE(ADDR(.ovly2)));
-	LONG(SIZEOF(.ovly2));
-	LONG(LOADADDR(.ovly2));
-	LONG(0);
-      _ovly3_entry = .;
-	LONG(ABSOLUTE(ADDR(.ovly3)));
-	LONG(SIZEOF(.ovly3));
-	LONG(LOADADDR(.ovly3));
-	LONG(0);
-      _data00_entry = .;
-	LONG(ABSOLUTE(ADDR(.data00)));
-	LONG(SIZEOF(.data00));
-	LONG(LOADADDR(.data00));
-	LONG(0);
-      _data01_entry = .;
-	LONG(ABSOLUTE(ADDR(.data01)));
-	LONG(SIZEOF(.data01));
-	LONG(LOADADDR(.data01));
-	LONG(0);
-      _data02_entry = .;
-	LONG(ABSOLUTE(ADDR(.data02)));
-	LONG(SIZEOF(.data02));
-	LONG(LOADADDR(.data02));
-	LONG(0);
-      _data03_entry = .;
-	LONG(ABSOLUTE(ADDR(.data03)));
-	LONG(SIZEOF(.data03));
-	LONG(LOADADDR(.data03));
-	LONG(0);
-    _novlys = .;
-	LONG((_novlys - _ovly_table) / 16);
-
-    CONSTRUCTORS
-  }
-  .data1         : { *(.data1)		}
-  .ctors         : { *(.ctors)		}
-  .dtors         : { *(.dtors)		}
-  .got           : { *(.got.plt) *(.got)}
-  .dynamic       : { *(.dynamic)	}
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata         : { *(.sdata)		}
-  _edata  =  .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .sbss          : { *(.sbss) *(.scommon) }
-  .bss           : { *(.dynbss) *(.bss) *(COMMON) }
-  _end = . ;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0        : { *(.stab)		}
-  .stabstr 0     : { *(.stabstr)	}
-  .stab.excl 0   : { *(.stab.excl)	}
-  .stab.exclstr 0 : { *(.stab.exclstr)	}
-  .stab.index 0  : { *(.stab.index)	}
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0     : { *(.comment)	}
-  /* DWARF debug sections.
-     Symbols in the .debug DWARF section are relative to the beginning of the
-     section so we begin .debug at 0.  It's not clear yet what needs to happen
-     for the others.   */
-  .debug          0 : { *(.debug) 	  }
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  .line           0 : { *(.line)	  }
-  .stack   0x5ffffc : { _stack = .; *(.stack) }
-  /* These must appear regardless of  .  */
-}
diff --git a/gdb/testsuite/gdb.base/m32rovly.c b/gdb/testsuite/gdb.base/m32rovly.c
deleted file mode 100644
index bdb90feae6b..00000000000
--- a/gdb/testsuite/gdb.base/m32rovly.c
+++ /dev/null
@@ -1,225 +0,0 @@
-
-/*
- * Ovlymgr.c -- Runtime Overlay Manager for the GDB testsuite.
- */
-
-#include "ovlymgr.h"
-
-/* Local functions and data: */
-
-extern unsigned long _ovly_table[][4];
-extern unsigned long _novlys __attribute__ ((section (".data")));
-enum ovly_index { VMA, SIZE, LMA, MAPPED};
-
-static void ovly_copy (unsigned long dst, unsigned long src, long size);
-
-/* Flush the data and instruction caches at address START for SIZE bytes.
-   Support for each new port must be added here.  */
-/* FIXME: Might be better to have a standard libgloss function that
-   ports provide that we can then use.  Use libgloss instead of newlib
-   since libgloss is the one intended to handle low level system issues.
-   I would suggest something like _flush_cache to avoid the user's namespace
-   but not be completely obscure as other things may need this facility.  */
- 
-static void
-FlushCache (void)
-{
-#ifdef __M32R__
-  volatile char *mspr = (char *) 0xfffffff7;
-  *mspr = 1;
-#endif
-}
-
-/* OverlayLoad:
- * Copy the overlay into its runtime region,
- * and mark the overlay as "mapped".
- */
-
-bool
-OverlayLoad (unsigned long ovlyno)
-{
-  unsigned long i;
-
-  if (ovlyno < 0 || ovlyno >= _novlys)
-    exit (-1);	/* fail, bad ovly number */
-
-  if (_ovly_table[ovlyno][MAPPED])
-    return TRUE;	/* this overlay already mapped -- nothing to do! */
-
-  for (i = 0; i < _novlys; i++)
-    if (i == ovlyno)
-      _ovly_table[i][MAPPED] = 1;	/* this one now mapped */
-    else if (_ovly_table[i][VMA] == _ovly_table[ovlyno][VMA])
-      _ovly_table[i][MAPPED] = 0;	/* this one now un-mapped */
-
-  ovly_copy (_ovly_table[ovlyno][VMA], 
-	     _ovly_table[ovlyno][LMA], 
-	     _ovly_table[ovlyno][SIZE]);
-
-  FlushCache ();
-
-  return TRUE;
-}
-
-/* OverlayUnload:
- * Copy the overlay back into its "load" region.
- * Does NOT mark overlay as "unmapped", therefore may be called
- * more than once for the same mapped overlay.
- */
- 
-bool
-OverlayUnload (unsigned long ovlyno)
-{
-  if (ovlyno < 0 || ovlyno >= _novlys)
-    exit (-1);  /* fail, bad ovly number */
- 
-  if (!_ovly_table[ovlyno][MAPPED])
-    exit (-1);  /* error, can't copy out a segment that's not "in" */
- 
-  ovly_copy (_ovly_table[ovlyno][LMA], 
-	     _ovly_table[ovlyno][VMA],
-	     _ovly_table[ovlyno][SIZE]);
-
-  return TRUE;
-}
-
-#ifdef __D10V__
-#define IMAP0       (*(short *)(0xff00))
-#define IMAP1       (*(short *)(0xff02))
-#define DMAP        (*(short *)(0xff04))
-
-static void
-D10VTranslate (unsigned long logical,
-	       short *dmap,
-	       unsigned long **addr)
-{
-  unsigned long physical;
-  unsigned long seg;
-  unsigned long off;
-
-  /* to access data, we use the following mapping 
-     0x00xxxxxx: Logical data address segment        (DMAP translated memory)
-     0x01xxxxxx: Logical instruction address segment (IMAP translated memory)
-     0x10xxxxxx: Physical data memory segment        (On-chip data memory)
-     0x11xxxxxx: Physical instruction memory segment (On-chip insn memory)
-     0x12xxxxxx: Phisical unified memory segment     (Unified memory)
-     */
-
-  /* Addresses must be correctly aligned */
-  if (logical & (sizeof (**addr) - 1))
-    exit (-1);
-
-  /* If the address is in one of the two logical address spaces, it is
-     first translated into a physical address */
-  seg = (logical >> 24);
-  off = (logical & 0xffffffL);
-  switch (seg) 
-      {
-      case 0x00: /* in logical data address segment */
-	if (off <= 0x7fffL)
-	  physical = (0x10L << 24) + off;
-	else
-	  /* Logical address out side of on-chip segment, not
-             supported */
-	  exit (-1);
-	break;
-      case 0x01: /* in logical instruction address segment */
-	{
-	  short map;
-	  if (off <= 0x1ffffL)
-	    map = IMAP0;
-	  else if (off <= 0x3ffffL)
-	    map = IMAP1;
-	  else
-	    /* Logical address outside of IMAP[01] segment, not
-	       supported */
-	    exit (-1);
-	  if (map & 0x1000L)
-	    {
-	    /* Instruction memory */
-	      physical = (0x11L << 24) | off;
-	    }
-	  else
-	    {
-	    /* Unified memory */
-	      physical = ((map & 0x7fL) << 17) + (off & 0x1ffffL);
-	      if (physical > 0xffffffL)
-		/* Address outside of unified address segment */
-		exit (-1);
-	      physical |= (0x12L << 24);
-	    }
-	  break;
-	}
-      case 0x10:
-      case 0x11:
-      case 0x12:
-	physical = logical;
-	break;
-      default:
-	exit (-1);	/* error */
-      }
-
-  seg = (physical >> 24);
-  off = (physical & 0xffffffL);
-  switch (seg) 
-    {
-    case 0x10:	/* dst is a 15 bit offset into the on-chip memory */
-      *dmap = 0;
-      *addr = (long *) (0x0000 + ((short)off & 0x7fff));
-      break;
-    case 0x11:	/* dst is an 18-bit offset into the on-chip
-		   instruction memory */
-      *dmap = 0x1000L | ((off & 0x3ffffL) >> 14);
-      *addr = (long *) (0x8000 + ((short)off & 0x3fff));
-      break;
-    case 0x12:	/* dst is a 24-bit offset into unified memory */
-      *dmap = off >> 14;
-      *addr = (long *) (0x8000 + ((short)off & 0x3fff));
-      break;
-    default:
-      exit (-1);	/* error */
-    }
-}
-#endif /* __D10V__ */
-
-static void
-ovly_copy (unsigned long dst, unsigned long src, long size)
-{
-#ifdef  __M32R__
-  memcpy ((void *) dst, (void *) src, size);
-  return;
-#endif /* M32R */
-
-#ifdef  __D10V__
-  unsigned long *s, *d, tmp;
-  short dmap_src, dmap_dst;
-  short dmap_save;
-
-  /* all section sizes should by multiples of 4 bytes */
-  dmap_save = DMAP;
-
-  D10VTranslate (src, &dmap_src, &s);
-  D10VTranslate (dst, &dmap_dst, &d);
-
-  while (size > 0)
-    {
-      /* NB: Transfer 4 byte (long) quantites, problems occure
-	 when only two bytes are transfered */
-      DMAP = dmap_src;
-      tmp = *s;
-      DMAP = dmap_dst;
-      *d = tmp; 
-      d++;
-      s++;
-      size -= sizeof (tmp);
-      src += sizeof (tmp);
-      dst += sizeof (tmp);
-      if ((src & 0x3fff) == 0)
-	D10VTranslate (src, &dmap_src, &s);
-      if ((dst & 0x3fff) == 0)
-	D10VTranslate (dst, &dmap_dst, &d);
-    }
-  DMAP = dmap_save;
-#endif /* D10V */
-}
-
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
deleted file mode 100644
index 283fe844573..00000000000
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ /dev/null
@@ -1,403 +0,0 @@
-# Test macro scoping.
-# Copyright 2002 Free Software Foundation, 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
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "macscp"
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-# Ask GDB to show the current definition of MACRO, and return a list
-# describing the result.
-#
-# The return value has the form {FILE1 FILE2 ... DEF}, which means
-# that MACRO has the definition `DEF', and was defined in `FILE1',
-# which was included from `FILE2', included from ... .
-#
-# If GDB says that MACRO has no definition, return the string `undefined'.
-#
-# If GDB complains that it doesn't have any information about
-# preprocessor macro definitions, return the string `no-macro-info'.
-# 
-# If expect times out waiting for GDB, we return the string `timeout'.
-#
-# If GDB's output doesn't otherwise match what we're expecting, we
-# return the empty string.
-
-proc info_macro {macro} {
-    global gdb_prompt
-    global decimal
-
-    set filepat {macscp[0-9]+\.[ch]}
-    set definition {}
-    set location {}
-
-    send_gdb "info macro ${macro}\n"
-
-    set debug_me 0
-
-    if {$debug_me} {exp_internal 1}
-    gdb_expect {
-        -re "Defined at \[^\r\n\]*(${filepat}):${decimal}\[\r\n\]" {
-            # `location' and `definition' should be empty when we see
-            # this message.
-            if {[llength $location] == 0 && [llength $definition] == 0} {
-                set location $expect_out(1,string)
-                exp_continue
-            } else {
-                # Exit this expect loop, with a result indicating failure.
-                set definition {}
-            }
-        }
-        -re "The symbol `${macro}' has no definition as a C/C\\+\\+ preprocessor macro\[^\r\n\]*\[\r\n\]" {
-            # `location' and `definition' should be empty when we see
-            # this message.
-            if {[llength $location] == 0 && [llength $definition] == 0} {
-                set definition undefined
-                exp_continue
-            } else {
-                # Exit this expect loop, with a result indicating failure.
-                set definition {}
-            }
-        }
-        -re "^\[\r\n\]*  included at \[^\r\n\]*(${filepat}):${decimal}\[\r\n\]" {
-            # `location' should *not* be empty when we see this
-            # message.  It should have recorded at least the initial
-            # `Defined at ' message (for definitions) or ` at' message
-            # (for undefined symbols).
-            if {[llength $location] != 0} {
-                lappend location $expect_out(1,string)
-                exp_continue
-            } else {
-                # Exit this expect loop, with a result indicating failure.
-                set definition {}
-            }
-        }
-        -re "^\[\r\n\]*at \[^\r\n\]*(${filepat}):${decimal}\[\r\n\]" {
-            # This appears after a `has no definition' message.
-            # `location' should be empty when we see it.
-            if {[string compare $definition undefined] == 0 \
-                    && [llength $location] == 0} {
-                set location $expect_out(1,string)
-                exp_continue
-            } else {
-                # Exit this expect loop, with a result indicating failure.
-                set definition {}
-            }
-        }
-        -re "#define ${macro} (\[^\r\n\]*)\[\r\n\]" {
-            # `definition' should be empty when we see this message.
-            if {[string compare $definition ""] == 0} {
-                set definition $expect_out(1,string)
-                exp_continue
-            } else {
-                # Exit this expect loop, with a result indicating failure.
-                set definition {}
-            }
-        }
-        -re "has no preprocessor macro information.*$gdb_prompt $" {
-            set definition no-macro-info
-        }
-        -re "$gdb_prompt $" {
-            # Exit the expect loop; let the existing value of `definition'
-            # indicate failure or success.
-        }
-        timeout {
-            set definition timeout
-        }
-    }
-    if {$debug_me} {exp_internal 0}
-
-    switch -exact -- $definition {
-        no-macro-info { return no-macro-info }
-        timeout { return timeout }
-        undefined -
-        default {
-            if {[llength $location] >= 1} {
-                return [concat $location [list $definition]]
-            } else {
-                return {}
-            }
-        }
-    }
-}
-
-
-# Call info_macro to show the definition of MACRO.  Expect a result of
-# EXPECTED.  Use WHERE in pass/fail messages to identify the context.
-# Return non-zero if we should abort the entire test file, or zero if
-# we can continue.
-proc check_macro {macro expected where} {
-    set func_def [info_macro $macro]
-    if {[string compare $func_def $expected] == 0} {
-        pass "info macro $macro $where"
-    } else {
-        switch -exact -- $func_def {
-            no-macro-info {
-                xfail "executable includes no macro debugging information"
-                return 1
-            }
-            timeout {
-                fail "info macro $macro $where (timeout)"
-            }
-            default {
-                fail "info macro $macro $where"
-            }
-        }
-    }
-    return 0
-}
-    
-
-# List the function FUNC, and then show the definition of MACRO,
-# expecting the result EXPECTED.
-proc list_and_check_macro {func macro expected} {
-    gdb_test "list $func" ".*${func}.*"
-    return [check_macro $macro $expected "after `list $func'"]
-}
-
-
-if {[list_and_check_macro main WHERE {macscp1.c {before macscp1_3}}]} {
-    return 0
-}
-list_and_check_macro macscp2_2 WHERE {macscp2.h macscp1.c {before macscp2_2}}
-list_and_check_macro macscp3_2 WHERE {macscp3.h macscp1.c {before macscp3_2}}
-
-
-# Although GDB's macro table structures distinguish between multiple
-# #inclusions of the same file, GDB's other structures don't.  So the
-# `list' command here doesn't reliably select one #inclusion or the
-# other, even though it could.  It would be nice to eventually change
-# GDB's structures to handle this correctly.
-gdb_test "list macscp4_2_from_macscp2" ".*macscp4_2_, MACSCP4_INCLUSION.*"
-switch -exact -- [info_macro WHERE] {
-    {macscp4.h macscp2.h macscp1.c {before macscp4_2_..., from macscp2.h}} {
-        pass "info macro WHERE after `list macscp_4_2_from_macscp2'"
-    }
-    {macscp4.h macscp3.h macscp1.c {before macscp4_2_..., from macscp3.h}} {
-        # setup_kfail "gdb/555"
-        fail "info macro WHERE after `list macscp_4_2_from_macscp2' (gdb/555)"
-    }
-    timeout { 
-        fail "info macro WHERE after `list macscp_4_2_from_macscp2' (timeout)"
-    }
-    default { fail "info macro WHERE after `list macscp_4_2_from_macscp2'" }
-}
-
-gdb_test "list macscp4_2_from_macscp3" ".*macscp4_2_, MACSCP4_INCLUSION.*"
-switch -exact -- [info_macro WHERE] {
-    {macscp4.h macscp3.h macscp1.c {before macscp4_2_..., from macscp3.h}} {
-        pass "info macro WHERE after `list macscp_4_2_from_macscp3'"
-    }
-    {macscp4.h macscp2.h macscp1.c {before macscp4_2_..., from macscp2.h}} {
-        # setup_kfail "gdb/555"
-        fail "info macro WHERE after `list macscp_4_2_from_macscp3' (gdb/555)"
-    }
-    timeout {
-        fail "info macro WHERE after `list macscp_4_2_from_macscp3' (timeout)"
-    }
-    default { fail "info macro WHERE after `list macscp_4_2_from_macscp3'" }
-}
-
-
-#### Test the selection of the macro scope by the current frame.
-
-### A table of functions, in the order they will be reached, which is
-### also the order they appear in the preprocessed output.  Each entry
-### has the form {FUNCNAME WHERE KFAILWHERE}, where:
-### - FUNCNAME is the name of the function,
-### - WHERE is the definition we expect to see for the macro `WHERE', as
-###   returned by `info_macro', and
-### - KFAILWHERE is an alternate definition which should be reported
-###   as a `known failure', due to GDB's inability to distinguish multiple
-###   #inclusions of the same file.
-### KFAILWHERE may be omitted.
-
-set funcs {
-    {
-        macscp1_1
-        {macscp1.c {before macscp1_1}}
-    }
-    {
-        macscp2_1
-        {macscp2.h macscp1.c {before macscp2_1}}
-    }
-    {
-        macscp4_1_from_macscp2
-        {macscp4.h macscp2.h macscp1.c {before macscp4_1_..., from macscp2.h}}
-        {macscp4.h macscp3.h macscp1.c {before macscp4_1_..., from macscp3.h}}
-    }
-    {
-        macscp4_2_from_macscp2
-        {macscp4.h macscp2.h macscp1.c {before macscp4_2_..., from macscp2.h}}
-        {macscp4.h macscp3.h macscp1.c {before macscp4_2_..., from macscp3.h}}
-    }
-    {
-        macscp2_2
-        {macscp2.h macscp1.c {before macscp2_2}}
-    }
-    {
-        macscp1_2
-        {macscp1.c {before macscp1_2}}
-    }
-    {
-        macscp3_1
-        {macscp3.h macscp1.c {before macscp3_1}}
-    }
-    {
-        macscp4_1_from_macscp3
-        {macscp4.h macscp3.h macscp1.c {before macscp4_1_..., from macscp3.h}}
-        {macscp4.h macscp2.h macscp1.c {before macscp4_1_..., from macscp2.h}}
-    }
-    {
-        macscp4_2_from_macscp3
-        {macscp4.h macscp3.h macscp1.c {before macscp4_2_..., from macscp3.h}}
-        {macscp4.h macscp2.h macscp1.c {before macscp4_2_..., from macscp2.h}}
-    }
-    {
-        macscp3_2
-        {macscp3.h macscp1.c {before macscp3_2}}
-    }
-    {
-        macscp1_3
-        {macscp1.c {before macscp1_3}}
-    }
-}
-
-
-# Start the program running.
-if {! [runto_main]} {
-    fail "macro tests suppressed: couldn't run to main"
-    return 0
-}
-
-# Set a breakpoint on each of the functions.
-foreach func_entry $funcs {
-    set func [lindex $func_entry 0]
-    gdb_test "break $func" "Breakpoint.*"
-}
-
-# Run to each of the breakpoints and check the definition (or lack
-# thereof) of each macro.
-for {set i 0} {$i < [llength $funcs]} {incr i} {
-    set func_entry [lindex $funcs $i]
-    set func [lindex $func_entry 0]
-    set expected [lindex $func_entry 1]
-    set kfail_expected [lindex $func_entry 2]
-
-    # Run to the breakpoint for $func.
-    gdb_test "continue" "Breakpoint $decimal, $func .*" "continue to $func"
-
-    # Check the macro WHERE.
-    set result [info_macro WHERE]
-    if {[string compare $result $expected] == 0} {
-        pass "info macro WHERE stopped in $func"
-    } elseif {[string compare $result $kfail_expected] == 0} {
-        # setup_kfail "gdb/555"
-        fail "info macro WHERE stopped in $func (gdb/555)"
-    } elseif {[string compare $result timeout] == 0} {
-        fail "info macro WHERE stopped in $func (timeout)"
-    } else {
-        fail "info macro WHERE stopped in $func"
-    }
-
-    # Check that the BEFORE_<func> macros for all prior functions are
-    # #defined, and that those for all subsequent functions are not.
-    for {set j 0} {$j < [llength $funcs]} {incr j} {
-        if {$j != $i} {
-            set func_j_entry [lindex $funcs $j]
-            set func_j [lindex $func_j_entry 0]
-
-            set before_macro "BEFORE_[string toupper $func_j]"
-            set test_name \
-                    "$before_macro defined/undefined when stopped at $func"
-            set result [info_macro $before_macro]
-
-            # We can't get the right scope info when we're stopped in
-            # the macro4_ functions.
-            if {[string match macscp4_* $func]} {
-                # setup_kfail "gdb/555"
-                set test_name "$test_name (gdb/555)"
-            }
-            if {$j < $i} {
-                if {[llength $result] >= 2 && \
-                        [string compare [lindex $result end] {}] == 0} {
-                    pass $test_name
-                } elseif {[string compare $result timeout] == 0} {
-                    fail "$test_name (timeout)"
-                } else {
-                    fail "$test_name"
-                }
-            } elseif {$j > $i} {
-                switch -- [lindex $result end] {
-                    undefined { pass $test_name }
-                    timeout { fail "$test_name (timeout)" }
-                    default { 
-                        fail "$test_name"
-                    }
-                }
-            }
-
-            set until_macro "UNTIL_[string toupper $func_j]"
-            set test_name \
-                    "$until_macro defined/undefined when stopped at $func"
-            set result [info_macro $until_macro]
-
-            # We can't get the right scope info when we're stopped in
-            # the macro4_ functions.
-            if {[string match macscp4_* $func]} {
-                # setup_kfail "gdb/555"
-                set test_name "$test_name (gdb/555)"
-            }
-            if {$j <= $i} {
-                switch -- [lindex $result end] {
-                    undefined { pass $test_name }
-                    timeout { fail "$test_name (timeout)" }
-                    default { 
-                        fail "$test_name"
-                    }
-                }
-            } elseif {$j > $i} {
-                if {[llength $result] >= 2 && \
-                        [string compare [lindex $result end] {}] == 0} {
-                    pass $test_name
-                } elseif {[string compare $result timeout] == 0} {
-                    fail "$test_name (timeout)"
-                } else {
-                    fail "$test_name"
-                }
-            }
-        }
-    }
-}
diff --git a/gdb/testsuite/gdb.base/macscp1.c b/gdb/testsuite/gdb.base/macscp1.c
deleted file mode 100644
index 89a1b07d1e6..00000000000
--- a/gdb/testsuite/gdb.base/macscp1.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <stdio.h>
-
-#define SPLICE(a, b) INNER_SPLICE(a, b)
-#define INNER_SPLICE(a, b) a ## b
-#define STRINGIFY(a) INNER_STRINGIFY(a)
-#define INNER_STRINGIFY(a) #a
-
-/* A macro named UNTIL_<func> is #defined until just before the
-   definition of the function <func>.
-
-   A macro named BEFORE_<func> is not #defined until just before the
-   definition of <func>.
-
-   The macro WHERE is redefined before each function <func> to the
-   token list ``before <func>''.
-
-   The macscp IN_MACSCP2_H and IN_MACSCP3_H are defined while
-   processing those header files; macscp4.h uses them to choose
-   appropriate function names, output strings, and macro definitions.  */
-
-#define UNTIL_MACSCP1_1
-#define UNTIL_MACSCP2_1
-#define UNTIL_MACSCP4_1_FROM_MACSCP2
-#define UNTIL_MACSCP4_2_FROM_MACSCP2
-#define UNTIL_MACSCP2_2
-#define UNTIL_MACSCP1_2
-#define UNTIL_MACSCP3_1
-#define UNTIL_MACSCP4_1_FROM_MACSCP3
-#define UNTIL_MACSCP4_2_FROM_MACSCP3
-#define UNTIL_MACSCP3_2
-#define UNTIL_MACSCP1_3
-
-#define WHERE before macscp1_1
-#define BEFORE_MACSCP1_1
-#undef UNTIL_MACSCP1_1
-void
-macscp1_1 ()
-{
-  puts ("macscp1_1");
-}
-
-#include "macscp2.h"
-
-#undef WHERE
-#define WHERE before macscp1_2
-#define BEFORE_MACSCP1_2
-#undef UNTIL_MACSCP1_2
-void
-macscp1_2 ()
-{
-  puts ("macscp1_2");
-}
-
-#include "macscp3.h"
-
-#undef WHERE
-#define WHERE before macscp1_3
-#define BEFORE_MACSCP1_3
-#undef UNTIL_MACSCP1_3
-void
-macscp1_3 ()
-{
-  puts ("macscp1_3");
-}
-
-int
-main (int argc, char **argv)
-{
-  macscp1_1 ();
-  macscp2_1 ();
-  macscp4_1_from_macscp2 ();
-  macscp4_2_from_macscp2 ();
-  macscp2_2 ();
-  macscp1_2 ();
-  macscp3_1 ();
-  macscp4_1_from_macscp3 ();
-  macscp4_2_from_macscp3 ();
-  macscp3_2 ();
-  macscp1_3 ();
-}
diff --git a/gdb/testsuite/gdb.base/macscp2.h b/gdb/testsuite/gdb.base/macscp2.h
deleted file mode 100644
index ef0feaac5a5..00000000000
--- a/gdb/testsuite/gdb.base/macscp2.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#define IN_MACSCP2_H
-
-#undef WHERE
-#define WHERE before macscp2_1
-#define BEFORE_MACSCP2_1
-#undef UNTIL_MACSCP2_1
-void
-macscp2_1 ()
-{
-  puts ("macscp2_1");
-}
-
-#include "macscp4.h"
-
-#undef WHERE
-#define WHERE before macscp2_2
-#define BEFORE_MACSCP2_2
-#undef UNTIL_MACSCP2_2
-void
-macscp2_2 ()
-{
-  puts ("macscp2_2");
-}
-
-#undef IN_MACSCP2_H
diff --git a/gdb/testsuite/gdb.base/macscp3.h b/gdb/testsuite/gdb.base/macscp3.h
deleted file mode 100644
index ebfcc6e1930..00000000000
--- a/gdb/testsuite/gdb.base/macscp3.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#define IN_MACSCP3_H
-
-#undef WHERE
-#define WHERE before macscp3_1
-#define BEFORE_MACSCP3_1
-#undef UNTIL_MACSCP3_1
-void
-macscp3_1 ()
-{
-  puts ("macscp3_1");
-}
-
-#include "macscp4.h"
-
-#undef WHERE
-#define WHERE before macscp3_2
-#define BEFORE_MACSCP3_2
-#undef UNTIL_MACSCP3_2
-void
-macscp3_2 ()
-{
-  puts ("macscp3_2");
-}
-
-#undef IN_MACSCP3_H
diff --git a/gdb/testsuite/gdb.base/macscp4.h b/gdb/testsuite/gdb.base/macscp4.h
deleted file mode 100644
index 5302d8d3c47..00000000000
--- a/gdb/testsuite/gdb.base/macscp4.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Put together a macro we can use as part of function names.  */
-#undef MACSCP4_INCLUSION
-#ifdef IN_MACSCP2_H
-#define MACSCP4_INCLUSION from_macscp2
-#endif
-#ifdef IN_MACSCP3_H
-#define MACSCP4_INCLUSION from_macscp3
-#endif
-
-#undef WHERE
-#ifdef IN_MACSCP2_H
-#define WHERE before macscp4_1_..., from macscp2.h
-#define BEFORE_MACSCP4_1_FROM_MACSCP2
-#undef UNTIL_MACSCP4_1_FROM_MACSCP2
-#endif
-#ifdef IN_MACSCP3_H
-#define WHERE before macscp4_1_..., from macscp3.h
-#define BEFORE_MACSCP4_1_FROM_MACSCP3
-#undef UNTIL_MACSCP4_1_FROM_MACSCP3
-#endif
-void
-SPLICE (macscp4_1_, MACSCP4_INCLUSION) ()
-{
-  puts ("macscp4_1_" STRINGIFY(MACSCP4_INCLUSION));
-}
-
-#undef WHERE
-#ifdef IN_MACSCP2_H
-#define WHERE before macscp4_2_..., from macscp2.h
-#define BEFORE_MACSCP4_2_FROM_MACSCP2
-#undef UNTIL_MACSCP4_2_FROM_MACSCP2
-#endif
-#ifdef IN_MACSCP3_H
-#define WHERE before macscp4_2_..., from macscp3.h
-#define BEFORE_MACSCP4_2_FROM_MACSCP3
-#undef UNTIL_MACSCP4_2_FROM_MACSCP3
-#endif
-void
-SPLICE (macscp4_2_, MACSCP4_INCLUSION) ()
-{
-  puts ("macscp4_2_" STRINGIFY(MACSCP4_INCLUSION));
-}
-
-#define DEFINED_IN_MACSCP4 this was defined in macscp4.h.
diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
deleted file mode 100644
index 679f90f1391..00000000000
--- a/gdb/testsuite/gdb.base/maint.exp
+++ /dev/null
@@ -1,735 +0,0 @@
-# Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# this file tests maintenance commands and help on those.
-
-# source file used is break.c
-
-
-#maintenance check-symtabs -- Check consistency of psymtabs and symtabs
-#maintenance space -- Set the display of space usage
-#maintenance set -- Set GDB internal variables used by the GDB maintainer
-#maintenance show -- Show GDB internal variables used by the GDB maintainer
-#maintenance time -- Set the display of time usage
-#maintenance demangle -- Demangle a C++ mangled name
-#maintenance dump-me -- Get fatal error; make debugger dump its core
-#maintenance print -- Maintenance command for printing GDB internal state
-#maintenance info -- Commands for showing internal info about the program being debugged
-#maintenance internal-error -- Give GDB an internal error.
-#
-#maintenance print dummy-frames -- Print the dummy frame stack
-#maintenance print statistics -- Print statistics about internal gdb state
-#maintenance print objfiles -- Print dump of current object file definitions
-#maintenance print psymbols -- Print dump of current partial symbol definitions
-#maintenance print msymbols -- Print dump of current minimal symbol definitions
-#maintenance print symbols -- Print dump of current symbol definitions
-#maintenance print type -- Print a type chain for a given symbol
-#maintenance print unwind -- Print unwind table entry at given address
-#
-#
-#maintenance info sections -- List the BFD sections of the exec and core files
-#maintenance info breakpoints -- Status of all breakpoints
-#
-
-
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-global usestubs
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-        perror "tests suppressed"
-}
-
-
-# The commands we test here produce many lines of output; disable "press 
-# <return> to continue" prompts.
-send_gdb "set height 0\n"
-gdb_expect -re "$gdb_prompt $"
-
-# use a larger expect input buffer for long help outputs.
-match_max 6000
-
-#
-# this command does not produce any output
-# unless there is some problem with the symtabs and psymtabs
-# so that branch will really never be covered in this tests here!!
-#
-
-# guo: on linux this command output is huge.  for some reason splitting up
-# the regexp checks works.
-#
-send_gdb "maint check-symtabs\n"
-gdb_expect  {
-        -re "^maint check-symtabs" {
-	    gdb_expect {
-		-re "$gdb_prompt $" \
-                          { pass "maint check-symtabs" }
-		timeout { fail "(timeout) maint check-symtabs" }
-	    }
-	}
-        -re ".*$gdb_prompt $"       { fail "maint check-symtabs" }
-        timeout         { fail "(timeout) maint check-symtabs" }
-        }
-
-send_gdb "maint space\n"
-gdb_expect  {
-        -re "\"maintenance space\" takes a numeric argument\\..*$gdb_prompt $"\
-                        { pass "maint space" }
-        -re ".*$gdb_prompt $"       { fail "maint space" }
-        timeout         { fail "(timeout) maint space" }
-        }
-
-send_gdb "maint space 1\n"
-gdb_expect  {
-        -re "Space used: $decimal \\(\\+$decimal for this command\\).*$gdb_prompt $"\
-                        { pass "maint space 1" }
-        -re ".*$gdb_prompt $"       { fail "maint space 1" }
-        timeout         { fail "(timeout) maint space 1" }
-        }
-
-
-send_gdb "maint time\n"
-gdb_expect  {
-        -re "\"maintenance time\" takes a numeric argument\\..*Space used: $decimal \\(\\+$decimal for this command\\).*$gdb_prompt $"\
-                        { pass "maint time" }
-        -re ".*$gdb_prompt $"       { fail "maint time" }
-        timeout         { fail "(timeout) maint time" }
-        }
-
-send_gdb "maint time 1\n"
-gdb_expect  {
-        -re "Command execution time: $decimal.*Space used: $decimal \\(\\+$decimal for this command\\).*$gdb_prompt $"\
-                        { pass "maint time 1" }
-        -re ".*$gdb_prompt $"       { fail "maint time 1" }
-        timeout         { fail "(timeout) maint time 1" }
-        }
-
-send_gdb "maint time 0\n"
-gdb_expect  {
-        -re "Space used: $decimal \\(\\+$decimal for this command\\).*$gdb_prompt $"\
-                        { pass "maint time 0" }
-        -re ".*$gdb_prompt $"       { fail "maint time 0" }
-        timeout         { fail "(timeout) maint time 0" }
-        }
-
-
-send_gdb "maint space 0\n"
-gdb_expect  {
-        -re "maint space 0\r\n$gdb_prompt $"\
-                        { pass "maint space 0" }
-        -re ".*$gdb_prompt $"       { fail "maint space 0" }
-        timeout         { fail "(timeout) maint space 0" }
-        }
-
-send_gdb "maint demangle\n"
-gdb_expect  {
-        -re "\"maintenance demangle\" takes an argument to demangle\\..*$gdb_prompt $"\
-                        { pass "maint demangle" }
-        -re ".*$gdb_prompt $"       { fail "maint demangle" }
-        timeout         { fail "(timeout) maint demangle" }
-        }
-
-send_gdb "maint demangle main\n"
-gdb_expect  {
-        -re "Can't demangle \"main\".*$gdb_prompt $"\
-                        { pass "maint demangle" }
-        -re ".*$gdb_prompt $"       { fail "maint demangle" }
-        timeout         { fail "(timeout) maint demangle" }
-        }
-
-# The timeout value is raised, because printing all the symbols and
-# statistical information about Cygwin and Windows libraries takes a lot
-# of time.
-if [istarget "*-*-cygwin*"] {
-	set oldtimeout $timeout
-	set timeout [expr $timeout + 500]
-}
-
-send_gdb "maint print statistics\n"
-gdb_expect  {
-        -re "Statistics for.*break.*Number of \"minimal\" symbols read.*Number of \"partial\" symbols read.*Number of \"types\" defined.*Number of psym tables \\(not yet expanded\\).*Number of symbol tables.*Number of symbol tables with line tables.*Number of symbol tables with blockvectors.*Total memory used for psymbol obstack.*Total memory used for psymbol cache.*Total memory used for symbol obstack.*Total memory used for type obstack.*$gdb_prompt $"\
-                        { 
-			    # Old output for gdb 6.0 and earlier
-			    pass "maint print statistics" 
-			}
-        -re "Statistics for.*break.*Number of \"minimal\" symbols read.*Number of \"partial\" symbols read.*Number of \"types\" defined.*Number of psym tables \\(not yet expanded\\).*Number of symbol tables.*Number of symbol tables with line tables.*Number of symbol tables with blockvectors.*Total memory used for objfile obstack.*Total memory used for psymbol cache.*Total memory used for macro cache.*$gdb_prompt $"\
-                        { pass "maint print statistics" }
-        -re ".*$gdb_prompt $"       { fail "maint print statistics" }
-        timeout         { fail "(timeout) maint print statistics" }
-        }
-
-# There aren't any ...
-gdb_test "maint print dummy-frames" ""
-
-send_gdb "maint print objfiles\n"
-
-# To avoid timeouts, we avoid expects with many .* patterns that match
-# many lines.  Instead, we keep track of which milestones we've seen
-# in the output, and stop when we've seen all of them.
-
-set header 0
-set psymtabs 0
-set symtabs 0
-set keep_looking 1
-
-while {$keep_looking} {
-    gdb_expect  {
-
-	-re ".*Object file.*break($EXEEXT)?:  Objfile at $hex, bfd at $hex, \[0-9\]* minsyms\[\r\t \]+\n" { set header 1 }
-	-re ".*Psymtabs:\[\r\t \]+\n" { set psymtabs 1 }
-	-re ".*Symtabs:\[\r\t \]+\n" { set symtabs 1 }
-
-	-re ".*$gdb_prompt $" { 
-	    set keep_looking 0
-	}
-	timeout { 
-	    fail "(timeout) maint print objfiles" 
-	    set keep_looking 0
-	}
-    }
-}
-
-proc maint_pass_if {val name} {
-    if $val { pass $name } else { fail $name }
-}
-
-maint_pass_if $header   "maint print objfiles: header"
-maint_pass_if $psymtabs "maint print objfiles: psymtabs"
-maint_pass_if $symtabs  "maint print objfiles: symtabs"
-
-send_gdb "maint print psymbols\n"
-gdb_expect  {
-        -re "print-psymbols takes an output file name and optional symbol file name.*$gdb_prompt $"\
-                        { pass "maint print psymbols w/o args" }
-        -re ".*$gdb_prompt $"       { fail "maint print psymbols w/o args" }
-        timeout         { fail "(timeout) maint print psymbols w/o args" }
-        }
-
-send_gdb "maint print psymbols psymbols_output ${srcdir}/${subdir}/${srcfile}\n"
-gdb_expect  {
-        -re "^maint print psymbols psymbols_output \[^\n\]*\r\n$gdb_prompt $"\
-         {
-          send_gdb "shell ls psymbols_output\n"
-          gdb_expect {
-                -re "psymbols_output\r\n$gdb_prompt $"\
-                 {
-	          # We want this grep to be as specific as possible,
-	          # so it's less likely to match symbol file names in
-	          # psymbols_output.  Yes, this actually happened;
-	          # poor expect got tons of output, and timed out
-	          # trying to match it.   --- Jim Blandy <jimb@cygnus.com>
-                  send_gdb "shell grep 'main.*function' psymbols_output\n"
-                  gdb_expect {
-                        -re ".main., function, $hex.*$gdb_prompt $"\
-                                               { pass "maint print psymbols 1" }
-                        -re ".*main.  .., function, $hex.*$gdb_prompt $"\
-                                               { pass "maint print psymbols 2" }
-                        -re ".*$gdb_prompt $"       { fail "maint print psymbols" }
-                         timeout         { fail "(timeout) maint print psymbols" }
-                         }
-                  gdb_test "shell rm -f psymbols_output" ""
-                   
-                  }
-                 -re ".*$gdb_prompt $"       { fail "maint print psymbols" }
-                  timeout         { fail "(timeout) maint print psymbols" }
-                  }
-         }
-        -re ".*$gdb_prompt $"       { fail "maint print psymbols" }
-        timeout         { fail "(timeout) maint print psymbols" }
-        }
-
-
-send_gdb  "maint print msymbols\n"
-gdb_expect  {
-        -re "print-msymbols takes an output file name and optional symbol file name.*$gdb_prompt $"\
-                        { pass "maint print msymbols w/o args" }
-        -re ".*$gdb_prompt $"       { fail "maint print msymbols w/o args" }
-        timeout         { fail "(timeout) maint print msymbols w/o args" }
-        }
-
-send_gdb "maint print msymbols msymbols_output ${binfile}\n"
-gdb_expect  {
-        -re "^maint print msymbols msymbols_output \[^\n\]*\r\n$gdb_prompt $"\
-         {
-          send_gdb "shell ls msymbols_output\n"
-          gdb_expect {
-                -re "msymbols_output\r\n$gdb_prompt $"\
-                 {
-                  send_gdb "shell grep factorial msymbols_output\n"
-                  gdb_expect {
-                        -re "\\\[ *$decimal\\\] T\[ \t\]+$hex factorial.*$gdb_prompt $"\
-                                               { pass "maint print msymbols" }
-                        -re ".*$gdb_prompt $"       { fail "maint print msymbols" }
-                         timeout         { fail "(timeout) maint print msymbols" }
-                         }
-                  gdb_test "shell rm -f msymbols_output" ""
-
-                  }
-                 -re ".*$gdb_prompt $"       { fail "maint print msymbols" }
-                  timeout         { fail "(timeout) maint print msymbols" }
-                  }
-         }
-        -re ".*$gdb_prompt $"       { fail "maint print msymbols" }
-        timeout         { fail "(timeout) maint print msymbols" }
-        }
-
-# Check that maint print msymbols allows relative pathnames
-set mydir [pwd]
-gdb_test "cd ${objdir}" "Working directory ${objdir}\..*"
-gdb_test_multiple "maint print msymbols msymbols_output2 ${subdir}/${testfile}" "maint print msymbols" {
-    -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n$gdb_prompt $" {
-    	gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" {
-	    -re "msymbols_output2\r\n$gdb_prompt $" {
-	    	gdb_test_multiple "shell grep factorial msymbols_output2" "maint print msymbols" {
-		    -re "\\\[ *$decimal\\\] T\[ \t\]+$hex factorial.*$gdb_prompt $" {
-		    	pass "maint print msymbols"
-		    }
-		    -re ".*$gdb_prompt $" {
-		        fail "maint print msymbols"
-		    }
-		    timeout {
-		        fail "(timeout) maint print msymbols"
-		    }
-		}
-		gdb_test "shell rm -f msymbols_output2" ""
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "maint print msymbols"
-	    }
-	    timeout {
-	    	fail "(timeout) maint print msymbols"
-	    }
-	}
-    }
-    -re ".*$gdb_prompt $" {
-	fail "maint print msymbols"
-    }
-    timeout {
-	fail "(timeout) maint print msymbols"
-    }
-}
-gdb_test "cd ${mydir}" "Working directory ${mydir}\..*"
-
-send_gdb "maint print symbols\n"
-gdb_expect  {
-        -re "Arguments missing: an output file name and an optional symbol file name.*$gdb_prompt $"\
-                        { pass "maint print symbols w/o args" }
-        -re ".*$gdb_prompt $"       { fail "maint print symbols w/o args" }
-        timeout         { fail "(timeout) maint print symbols w/o args" }
-        }
-
-# Request symbols for one particular source file so that we don't try to
-# dump the symbol information for the entire C library - over 500MB nowadays
-# for GNU libc.
-
-send_gdb "maint print symbols symbols_output ${srcdir}/${subdir}/${srcfile}\n"
-gdb_expect  {
-        -re "^maint print symbols symbols_output \[^\n\]*\r\n$gdb_prompt $"\
-         {
-          send_gdb "shell ls symbols_output\n"
-          gdb_expect {
-                -re "symbols_output\r\n$gdb_prompt $"\
-                 {
-	          # See comments for `maint print psymbols'.
-                  send_gdb "shell grep 'main(.*block' symbols_output\n"
-                  gdb_expect {
-                        -re "int main\\(int, char \\*\\*, char \\*\\*\\); block.*$gdb_prompt $"\
-                                               { pass "maint print symbols" }
-                        -re ".*$gdb_prompt $"       { fail "maint print symbols" }
-                         timeout         { fail "(timeout) maint print symbols" }
-                         }
-                  gdb_test "shell rm -f symbols_output" ""
-
-                  }
-                 -re ".*$gdb_prompt $"       { fail "maint print symbols" }
-                  timeout         { fail "(timeout) maint print symbols" }
-                  }
-         }
-        -re ".*$gdb_prompt $"       { fail "maint print symbols" }
-        timeout         { fail "(timeout) maint print symbols" }
-        }
-
-send_gdb "maint print type argc\n"
-gdb_expect  {
-        -re "type node $hex\r\nname .int. \\($hex\\)\r\ntagname .<NULL>. \\($hex\\)\r\ncode $hex \\(TYPE_CODE_INT\\)\r\nlength \[24\]\r\nupper_bound_type $hex \\(BOUND_SIMPLE\\)\r\nlower_bound_type $hex \\(BOUND_SIMPLE\\)\r\nobjfile $hex\r\ntarget_type $hex\r\npointer_type $hex\r\nreference_type $hex\r\ntype_chain $hex\r\ninstance_flags $hex\r\nflags $hex\r\nnfields 0 $hex\r\nvptr_basetype $hex\r\nvptr_fieldno -1\r\ntype_specific $hex\r\n$gdb_prompt $"\
-                        { pass "maint print type" }
-        -re ".*$gdb_prompt $"       { fail "maint print type" }
-        timeout         { fail "(timeout) maint print type" }
-        }
-
-if [istarget "hppa*-*-11*"] {
-    setup_xfail hppa*-*-*11* CLLbs14860
-    send "maint print unwind &main\n"
-    expect  {
-        -re ".*unwind_table_entry \\($hex\\):\r\n\tregion_start = $hex <main>\r\n\tregion_end = $hex <main\\+\[0-9\]*>\r\n\tflags = Args_stored Save_RP\r\n\tRegion_description = $hex\r\n\tEntry_FR = $hex\r\n\tEntry_GR = $hex\r\n\tTotal_frame_size = $hex\r\n$gdb_prompt $"\
-	    { pass "maint print unwind" }
-        -re ".*unwind_table_entry \\($hex\\):\r\n\tregion_start = $hex <main>\r\n\tregion_end = $hex <main\\+\[0-9\]*>\r\n\tflags = Args_stored Save_RP\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n\tFLD = $hex\r\n$gdb_prompt $"\
-	    { xfail "maint print unwind" }
-        -re ".*$gdb_prompt $"       { xfail "maint info unwind" }
-        timeout         { fail "(timeout) maint print unwind" }
-    }
-}
-
-set oldtimeout $timeout
-set timeout [expr $timeout + 300]
-
-# It'd be nice to check for every possible section.  However, that's
-# problematic, since the relative ordering wanders from release to
-# release of the compilers.  Instead, we'll just check for two
-# sections which appear to always come out in the same relative
-# order.  (If that changes, then we should just check for one
-# section.)
-#
-# And by the way: This testpoint will break for PA64, where a.out's
-# are ELF files.
-#
-send_gdb "maint info sections\n"
-gdb_expect  {
-        -re "Exec file:\r\n.*break($EXEEXT)?., file type.*$gdb_prompt $"\
-                        { pass "maint info sections" }
-        -re ".*$gdb_prompt $"       { fail "maint info sections" }
-        timeout         { fail "(timeout) maint info sections" }
-        }
-
-# Test for new option: maint info sections <section name>
-# If you don't have a .text section, this will require tweaking.
-send_gdb "maint info sections .text\n"
-gdb_expect {
-    -re ".*bss.*$gdb_prompt $"      { fail "maint info sections .text" }
-    -re ".*data.*$gdb_prompt $"     { fail "maint info sections .text" }
-    -re ".* .text .*$gdb_prompt $"  { pass "maint info sections .text" }
-    -re ".*$gdb_prompt $"           { fail "maint info sections .text" }
-    timeout               { fail "(timeout) maint info sections .text" }
-}
-
-# Test for new option: CODE section flag
-# If your data section is tagged CODE, xfail this test.
-send_gdb "maint info sections CODE\n"
-gdb_expect {
-    -re ".* .data .*$gdb_prompt $" { fail "maint info sections CODE" }
-    -re ".* .text .*$gdb_prompt $" { pass "maint info sections CODE" }
-    -re ".*$gdb_prompt $"          { fail "maint info sections CODE" }
-    timeout              { fail "(timeout) maint info sections CODE" }
-}
-
-# Test for new option: DATA section flag
-# If your text section is tagged DATA, xfail this test.
-#
-# The "maint info sections DATA" test is marked for XFAIL on Cygwin,
-# because Windows has text sections marked DATA.
-setup_xfail "*-*-*cygwin*"
-send_gdb "maint info sections DATA\n"
-gdb_expect {
-    -re ".* .text .*$gdb_prompt $" { fail "maint info sections DATA" }
-    -re ".* .data .*$gdb_prompt $" { pass "maint info sections DATA" }
-    -re ".*$gdb_prompt $"          { fail "maint info sections DATA" }
-    timeout              { fail "(timeout) maint info sections DATA" }
-}
-
-set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
-
-send_gdb "maint info breakpoints\n"
-gdb_expect {
-    -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex\[ \t\]+in main at.*break.c:$bp_location6\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\
-		{ pass "maint info breakpoints" }
-	-re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:$bp_location6\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $"\
-		{ pass "maint info breakpoints (with shlib events)" }
-	-re ".*$gdb_prompt $"       { fail "maint info breakpoints" }
-	timeout         { fail "(timeout) maint info breakpoints" }
-}
-
-send_gdb "maint print\n"
-gdb_expect  {
-        -re "\"maintenance print\" must be followed by the name of a print command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\
-                        { pass "maint print w/o args" }
-        -re ".*$gdb_prompt $"       { fail "maint print w/o args" }
-        timeout         { fail "(timeout) maint print w/o args" }
-        }
-
-send_gdb "maint info\n"
-gdb_expect  {
-        -re "\"maintenance info\" must be followed by the name of an info command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\
-                        { pass "maint info w/o args" }
-        -re ".*$gdb_prompt $"       { fail "maint info w/o args" }
-        timeout         { fail "(timeout) maint info w/o args" }
-        }
-
-send_gdb "maint\n"
-gdb_expect  {
-        -re "\"maintenance\" must be followed by the name of a maintenance command\\.\r\nList.*unambiguous\\..*$gdb_prompt $"\
-                        { pass "maint w/o args" }
-        -re ".*$gdb_prompt $"       { fail "maint w/o args" }
-        timeout         { fail "(timeout) maint w/o args" }
-        }
-
-
-set timeout $oldtimeout
-
-#============test help on maint commands
-
-send_gdb "help maint\n"
-gdb_expect  {
-        -re "Commands for use by GDB maintainers\\..*Includes commands to dump specific internal GDB structures in.*a human readable form, to cause GDB to deliberately dump core,.*to test internal functions such as the C../ObjC demangler, etc\\..*List of maintenance subcommands:.*maintenance check-symtabs.*maintenance demangle.*(maintenance dump-me.*)?maintenance info.*maintenance internal-error.*maintenance print.*maintenance set.*maintenance show.*maintenance space.*maintenance time.*Type.*help maintenance.*followed by maintenance subcommand name for full documentation\\..*Command name abbreviations are allowed if unambiguous\\..*$gdb_prompt $"\
- { pass "help maint" }
-        -re ".*$gdb_prompt $"       { fail "help maint" }
-        timeout         { fail "(timeout) help maint" }
-        }
-
-
-send_gdb "help maint check-symtabs\n"
-gdb_expect  {
-        -re "Check consistency of psymtabs and symtabs\\..*$gdb_prompt $"\
-                        { pass "help maint check-symtabs" }
-        -re ".*$gdb_prompt $"       { fail "help maint check-symtabs" }
-        timeout         { fail "(timeout) help maint check-symtabs" }
-        }
-
-send_gdb "help maint space\n"
-gdb_expect  {
-        -re "Set the display of space usage\\.\r\nIf nonzero, will cause the execution space for each command to be\r\ndisplayed, following the command's output\\..*$gdb_prompt $"\
-                        { pass "help maint space" }
-        -re ".*$gdb_prompt $"       { fail "help maint space" }
-        timeout         { fail "(timeout) help maint space" }
-        }
-
-send_gdb "help maint time\n"
-gdb_expect  {
-        -re "Set the display of time usage\\.\r\nIf nonzero, will cause the execution time for each command to be\r\ndisplayed, following the command's output\\..*$gdb_prompt $"\
-                        { pass "help maint time" }
-        -re ".*$gdb_prompt $"       { fail "help maint time" }
-        timeout         { fail "(timeout) help maint time" }
-        }
-
-send_gdb "help maint demangle\n"
-gdb_expect  {
-        -re "Demangle a C\\+\\+/ObjC mangled name\\.\r\nCall internal GDB demangler routine to demangle a C\\+\\+ link name\r\nand prints the result\\..*$gdb_prompt $"\
-                        { pass "help maint demangle" }
-        -re ".*$gdb_prompt $"       { fail "help maint demangle" }
-        timeout         { fail "(timeout) help maint demangle" }
-        }
-
-send_gdb "help maint dump-me\n"
-gdb_expect  {
-        -re "Get fatal error; make debugger dump its core\\.\r\nGDB sets its handling of SIGQUIT back to SIG_DFL and then sends\r\nitself a SIGQUIT signal\\..*$gdb_prompt $"\
-                        { pass "help maint dump-me" }
-        -re ".*$gdb_prompt $"       { fail "help maint dump-me" }
-        timeout         { fail "(timeout) help maint dump-me" }
-        }
-
-send_gdb "help maint internal-error\n"
-gdb_expect  {
-        -re "Give GDB an internal error\\.\r\nCause GDB to behave as if an internal error was detected\\..*$gdb_prompt $"\
-                        { pass "help maint internal-error" }
-        -re ".*$gdb_prompt $"       { fail "help maint internal-error" }
-        timeout         { fail "(timeout) help maint internal-error" }
-        }
-
-send_gdb "help maint internal-warning\n"
-gdb_expect  {
-        -re "Give GDB an internal warning\\.\r\nCause GDB to behave as if an internal warning was reported\\..*$gdb_prompt $"\
-                        { pass "help maint internal-warning" }
-        -re ".*$gdb_prompt $"       { fail "help maint internal-warning" }
-        timeout         { fail "(timeout) help maint internal-warning" }
-        }
-
-send_gdb "help maint print statistics\n"
-gdb_expect  {
-        -re "Print statistics about internal gdb state\\..*$gdb_prompt $"\
-                        { pass "help maint print statistics" }
-        -re ".*$gdb_prompt $"       { fail "help maint print statistics" }
-        timeout         { fail "(timeout) help maint print statistics" }
-        }
-
-gdb_test "help maint print dummy-frames" \
-	"Print the contents of the internal dummy-frame stack."
-
-send_gdb "help maint print objfiles\n"
-gdb_expect  {
-        -re "Print dump of current object file definitions\\..*$gdb_prompt $"\
-                        { pass "help maint print objfiles" }
-        -re ".*$gdb_prompt $"       { fail "help maint print objfiles" }
-        timeout         { fail "(timeout) help maint print objfiles" }
-        }
-
-send_gdb "help maint print psymbols\n"
-gdb_expect  {
-        -re "Print dump of current partial symbol definitions\\.\r\nEntries in the partial symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's partial symbols\\..*$gdb_prompt $"\
-                        { pass "help maint print psymbols" }
-        -re ".*$gdb_prompt $"       { fail "help maint print psymbols" }
-        timeout         { fail "(timeout) help maint print psymbols" }
-        }
-
-send_gdb "help maint print msymbols\n"
-gdb_expect  {
-        -re "Print dump of current minimal symbol definitions\\.\r\nEntries in the minimal symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's minimal symbols\\..*$gdb_prompt $"\
-                        { pass "help maint print msymbols" }
-        -re ".*$gdb_prompt $"       { fail "help maint print msymbols" }
-        timeout         { fail "(timeout) help maint print msymbols" }
-        }
-
-send_gdb "help maint print symbols\n"
-gdb_expect  {
-        -re "Print dump of current symbol definitions\\.\r\nEntries in the full symbol table are dumped to file OUTFILE\\.\r\nIf a SOURCE file is specified, dump only that file's symbols\\..*$gdb_prompt $"\
-                        { pass "help maint print symbols" }
-        -re ".*$gdb_prompt $"       { fail "help maint print symbols" }
-        timeout         { fail "(timeout) help maint print symbols" }
-        }
-
-
-send_gdb "help maint print type\n"
-gdb_expect  {
-        -re "Print a type chain for a given symbol\\.\r\nFor each node in a type chain, print the raw data for each member of\r\nthe type structure, and the interpretation of the data\\..*$gdb_prompt $"\
-                        { pass "help maint print type" }
-        -re ".*$gdb_prompt $"       { fail "help maint print type" }
-        timeout         { fail "(timeout) help maint print type" }
-        }
-
-if [istarget "hppa*-*-*"] {
-    send_gdb "help maint print unwind\n"
-    gdb_expect  {
-        -re "Print unwind table entry at given address\\..*$gdb_prompt $"\
-	    { pass "help maint print unwind" }
-        -re ".*$gdb_prompt $"       { fail "help maint print unwind" }
-        timeout         { fail "(timeout) help maint print unwind" }
-    }
-}
-
-send_gdb "help maint info sections\n"
-gdb_expect  {
-        -re "List the BFD sections of the exec and core files\\..*$gdb_prompt $"\
-                        { pass "help maint info sections" }
-        -re ".*$gdb_prompt $"       { fail "help maint info sections" }
-        timeout         { fail "(timeout) help maint info sections" }
-        }
-
-
-send_gdb "help maint info breakpoints\n"
-gdb_expect  {
--re "Status of all breakpoints, or breakpoint number NUMBER.*$gdb_prompt $" { pass "help maint info breakpoints" }
-        -re ".*$gdb_prompt $"       { fail "help maint info breakpoints" }
-        timeout         { fail "(timeout) help maint info breakpoints" }
-        }
-
-#send_gdb "help maint info breakpoints\n"
-#expect  {
-#        -re "Status of all breakpoints, or breakpoint number NUMBER\\.\[ \r\n\t\]+The \"Type\" column indicates one of:\[ \r\n\t\]+breakpoint\[ \t\]+- normal breakpoint\[ \r\n\t\]+watchpoint\[ \t\]+- watchpoint\[ \r\n\t\]+longjmp\[ \t\]+- internal breakpoint used to step through longjmp\\(\\)\[ \r\n\t\]+longjmp resume - internal breakpoint at the target of longjmp\\(\\)\[ \r\n\t\]+until\[ \t\]+- internal breakpoint used by the \"until\" command\[ \r\n\t\]+finish\[ \t\]+- internal breakpoint used by the \"finish\" command\[ \r\n\t\]+The \"Disp\" column contains one of \"keep\", \"del\", or \"dis\" to indicate\[ \r\n\t\]+the disposition of the breakpoint after it gets hit\\.  \"dis\" means that the\[ \r\n\t\]+breakpoint will be disabled\\.  The \"Address\" and \"What\" columns indicate the\[ \r\n\t\]+address and file.line number respectively\\.\[ \r\n\t\]+Convenience variable \".*\" and default examine address for \"x\"\[ \r\n\t\]+are set to the address of the last breakpoint listed\\.\[ \r\n\t\]+Convenience variable \".bpnum\" contains the number of the last\[ \r\n\t\]+breakpoint set\\..*$gdb_prompt $"\
-#                        { pass "help maint info breakpoints" }
-#        -re ".*$gdb_prompt $"       { fail "help maint info breakpoints" }
-#        timeout         { fail "(timeout) help maint info breakpoints" }
-#        }
-
-send_gdb "help maint info\n"
-gdb_expect  {
-        -re "Commands for showing internal info about the program being debugged.*unambiguous\\..*$gdb_prompt $"\
-                        { pass "help maint info" }
-        -re ".*$gdb_prompt $"       { fail "help maint info" }
-        timeout         { fail "(timeout) help maint info" }
-        }
-
-send_gdb "help maint print\n"
-gdb_expect  {
-        -re "Maintenance command for printing GDB internal state\\.\[\r\n\]+List of maintenance print subcommands:\[\r\n\]+maintenance print architecture -- Print the internal architecture configuration.*maintenance print msymbols -- Print dump of current minimal symbol definitions.*maintenance print objfiles -- Print dump of current object file definitions.*maintenance print psymbols -- Print dump of current partial symbol definitions.*maintenance print statistics -- Print statistics about internal gdb state.*maintenance print symbols -- Print dump of current symbol definitions.*maintenance print type -- Print a type chain for a given symbol.*Type .help maintenance print. followed by maintenance print subcommand name for full documentation\\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\\..*$gdb_prompt $"\
-                        { pass "help maint print" }
-        -re ".*$gdb_prompt $"       { fail "help maint print" }
-        timeout         { fail "(timeout) help maint print" }
-        }
-
-send_gdb "help maint\n"
-gdb_expect  {
-        -re "Commands for use by GDB maintainers\\.\[\r\n\]+Includes commands to dump specific internal GDB structures in\[\r\n\]+a human readable form, to cause GDB to deliberately dump core,\[\r\n\]+to test internal functions such as the C\\+\\+/ObjC demangler, etc\\..*Type.*help maintenance.*followed by maintenance subcommand name for full documentation\\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\\..*$gdb_prompt $"\
-                        { pass "help maint" }
-        -re ".*$gdb_prompt $"       { fail "help maint" }
-        timeout         { fail "(timeout) help maint" }
-        }
-
-#set oldtimeout $timeout
-#set timeout [expr $timeout + 300]
-
-send_gdb "maint dump-me\n"
-gdb_expect  {
-        -re "Should GDB dump core.*\\(y or n\\) $"\
-          { send_gdb "n\n"
-            gdb_expect {
-                    -re ".*$gdb_prompt $"       { pass "maint dump-me" }
-                    timeout         { fail "(timeout)  maint dump-me" }
-                   }
-          }
-        -re ".*$gdb_prompt $"       { fail "maint dump-me" }
-        timeout         { fail "(timeout) maint dump-me" }
-        }
-
-send_gdb "maint internal-error\n"
-gdb_expect {
-    -re "A problem internal to GDB has been detected" {
-	pass "maint internal-error"
-	if [gdb_internal_error_resync] {
-	    pass "internal-error resync"
-	} else {
-	    fail "internal-error resync"
-	}
-    }
-    -re ".*$gdb_prompt $" {
-	fail "maint internal-error"
-	untested "internal-error resync"
-    }
-    timeout {
-	fail "maint internal-error (timeout)"
-	untested "internal-error resync"
-    }
-}
-
-#set timeout $oldtimeout
-
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/mips_pro.c b/gdb/testsuite/gdb.base/mips_pro.c
deleted file mode 100644
index b659d82ded2..00000000000
--- a/gdb/testsuite/gdb.base/mips_pro.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Tests regarding examination of prologues.  */
-
-#ifdef PROTOTYPES
-int
-inner (int z)
-#else
-int
-inner (z)
-     int z;
-#endif
-{
-  return 2 * z;
-}
-
-#ifdef PROTOTYPES
-int
-middle (int x)
-#else
-int
-middle (x)
-     int x;
-#endif
-{
-  if (x == 0)
-    return inner (5);
-  else
-    return inner (6);
-}
-
-#ifdef PROTOTYPES
-int
-top (int y)
-#else
-int
-top (y)
-     int y;
-#endif
-{
-  return middle (y + 1);
-}
-
-#ifdef PROTOTYPES
-int
-main (int argc, char **argv)
-#else
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-#endif
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  return top (-1) + top (1);
-}
diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp
deleted file mode 100644
index 53ea9fdee21..00000000000
--- a/gdb/testsuite/gdb.base/mips_pro.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1997, 1999, 2000, 2001, 2003 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile mips_pro
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-
-# This test must be compiled with -O2 if using gcc.
-
-if { [test_compiler_info gcc-*-*] } then {
-    if  { [gdb_compile "${srcdir}/$subdir/${srcfile}" "${binfile}" executable {debug additional_flags=-O2}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-} else {
-    if  { [gdb_compile "${srcdir}/$subdir/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [runto middle] then {
-    # PR 3016
-    #   warning: Hit heuristic-fence-post without finding
-    #   warning: enclosing function for pc 0x1006ead0
-    if { [test_compiler_info gcc-*-*] } then {
-	setup_xfail "mips*-sgi-irix4*" "mips64*-*-elf"
-    }
-    # The call chain is main -> top -> middle.  But gcc can optimize a tail
-    # call to a jump, so the stack may contain either main -> top -> middle
-    # or main -> middle.
-    gdb_test "backtrace" "#0.*middle.*#\[12\].*main.*"
-}
-return 0
diff --git a/gdb/testsuite/gdb.base/miscexprs.c b/gdb/testsuite/gdb.base/miscexprs.c
deleted file mode 100644
index fe88fb2f8e8..00000000000
--- a/gdb/testsuite/gdb.base/miscexprs.c
+++ /dev/null
@@ -1,49 +0,0 @@
-void
-marker1 ()
-{
-   
-}
-
-int
-main ()
-{
-  STORAGE struct {
-    char c[100];
-  } cbig;
-
-  STORAGE struct {
-    int i[800];
-  } ibig;
-
-  STORAGE struct {
-    long l[900];
-  } lbig;
-
-  STORAGE struct {
-    float f[200];
-  } fbig;
-
-  STORAGE struct {
-    double d[300];
-  } dbig;
-
-  STORAGE struct {
-    short s[400];
-  } sbig;
-
-  ibig.i[100] = 5;
-  cbig.c[0] = '\0';
-  cbig.c[99] = 'A';
-  fbig.f[100] = 11.99999;
-  dbig.d[202] = 9.99999999;
-  sbig.s[90] = 255;
-  lbig.l[333] = 999999999;
-    
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-
-  marker1 ();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
deleted file mode 100644
index ad8e11d837f..00000000000
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1998, 1999, 2000 Free Software Foundation, 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 is part of the gdb testsuite
-# file written by Elena Zannoni (ezannoni@cygnus.com)
-
-#
-# tests for expressions with struct/array elements and mixed operator types
-# with elementary types
-# 
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-# By default, the datastructures are allocated on the stack.  For targets
-# with very small stack, that will not work.  In that case, just set
-# storage to `-DSTORAGE=static' which changes the datastructures to be
-# allocated in data segment.
-set storage "-DSTORAGE="
-if [target_info exists gdb,small_stack_section] {
-    set storage "-DSTORAGE=static"
-}
-
-set additional_flags "additional_flags=-w ${storage}"
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "miscexprs"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ${additional_flags}]] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
-            send_gdb "up\n"
-            gdb_expect {
-		-re ".*main.*$gdb_prompt $" {
-		    pass "up from marker1"
-		}
-                -re ".*$gdb_prompt $" {
-		    fail "up from marker1"
-		}
-                timeout { fail "up from marker1 (timeout)" }
-            }
-        }
-        -re "$gdb_prompt $" { fail "continue to marker1"  }
-        timeout { fail "(timeout) continue to marker1"  }
-    }
-
-global hex
-
-send_gdb "print &ibig.i\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(int \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &ibig.i\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of &ibig.i\[0\]" }
-    timeout           { fail "(timeout) print value of &ibig.i\[0\]" }
-  }
-
-send_gdb "print &cbig.c\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $hex \"\".*$gdb_prompt $" {
-        pass "print value of &cbig.c\[0\]"
-      }
-    -re ".\[0-9\]* = $hex \"*\".*$gdb_prompt $" {
-        pass "print value of &cbig.c\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of &cbig.c\[0\]" }
-    timeout           { fail "(timeout) print value of &cbig.c\[0\]" }
-  }
-
-send_gdb "print &fbig.f\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(float \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &fbig.f\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of &fbig.f\[0\]" }
-    timeout           { fail "(timeout) print value of &fbig.f\[0\]" }
-  }
-
-send_gdb "print &dbig.d\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(double \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &dbig.d\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of &dbig.d\[0\]" }
-    timeout           { fail "(timeout) print value of &dbig.d\[0\]" }
-  }
-
-send_gdb "print &sbig.s\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(short \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &sbig.s\[0\]"
-    }
-    -re ".\[0-9\]* = \\(short int \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &sbig.s\[0\]"
-    }
-    -re ".*$gdb_prompt $" { fail "print value of &sbig.s\[0\]" }
-    timeout           { fail "(timeout) print value of &sbig.s\[0\]" }
-  }
-
-send_gdb "print &lbig.l\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(long \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &lbig.l\[0\]"
-    }
-    -re ".\[0-9\]* = \\(long int \\*\\) $hex.*$gdb_prompt $" {
-        pass "print value of &lbig.l\[0\]"
-    }
-    -re ".*$gdb_prompt $" { fail "print value of &lbig.l\[0\]" }
-    timeout           { fail "(timeout) print value of &lbig.l\[0\]" }
-  }
-
-
-send_gdb "print ibig.i\[100\] | 1\n"
-gdb_expect {
-    -re ".\[0-9\]* = 5.*$gdb_prompt $" {
-        pass "print value of ibig.i\[100\] | 1"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] | 1" }
-    timeout           { fail "(timeout) print value of ibig.i\[100\] | 1" }
-  }
-
-
-send_gdb "print sbig.s\[90\] & 127\n"
-gdb_expect {
-    -re ".\[0-9\]* = 127.*$gdb_prompt $" {
-        pass "print value of sbig.s\[90\] & 127"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sbig.s\[90\] & 127" }
-    timeout           { fail "(timeout) print value of sbig.s\[90\] & 127" }
-  }
-
-send_gdb "print !ibig.i\[100\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !ibig.i\[100\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" }
-    timeout           { fail "(timeout) print value of !ibig.i\[100\]" }
-  }
-
-send_gdb "print !sbig.s\[90\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !sbig.s\[90\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !sbig.s\[90\]" }
-    timeout           { fail "(timeout) print value of !sbig.s\[90\]" }
-  }
-
-
-send_gdb "print !fbig.f\[100\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !ibig.i\[100\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" }
-    timeout           { fail "(timeout) print value of !ibig.i\[100\]" }
-  }
-
-send_gdb "print !dbig.d\[202\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !ibig.i\[100\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !ibig.i\[100\]" }
-    timeout           { fail "(timeout) print value of !ibig.i\[100\]" }
-  }
-
-
-
-send_gdb "print sbig.s\[90\] * 10\n"
-gdb_expect {
-    -re ".\[0-9\]* = 2550.*$gdb_prompt $" {
-        pass "print value of !sbig.s\[90\] * 10"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !sbig.s\[90\] * 10" }
-    timeout           { fail "(timeout) print value of !sbig.s\[90\] * 10" }
-  }
-
-send_gdb "print ibig.i\[100\] * sbig.s\[90\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1275.*$gdb_prompt $" {
-        pass "print value of ibig.i\[100\] * sbig.s\[90\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] * sbig.s\[90\]" }
-    timeout           { fail "(timeout) print value of ibig.i\[100\] * sbig.s\[90\]" }
-  }
-
-send_gdb "print fbig.f\[100\] * dbig.d\[202\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 119.99\[0-9\]*.*$gdb_prompt $" {
-        pass "print value of fbig.f\[100\] * dbig.d\[202\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of fbig.f\[100\] * dbig.d\[202\]" }
-    timeout           { fail "(timeout) print value of fbig.f\[100\] * dbig.d\[202\]" }
-  }
-
-send_gdb "print !(sbig.s\[90\] * 2)\n"
-gdb_expect {
-    -re ".\[0-9\]* = $false.*$gdb_prompt $" {
-        pass "print value of !(sbig.s\[90\] * 2)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of !(sbig.s\[90\] * 2)" }
-    timeout           { fail "(timeout) print value of !(sbig.s\[90\] * 2)" }
-  }
-
-
-send_gdb "print sizeof(sbig)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 800.*$gdb_prompt $" {
-        pass "print value of sizeof(sbig)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sizeof(sbig)" }
-    timeout           { fail "(timeout) print value of sizeof(sbig)" }
-  }
-
-
-send_gdb "print sizeof(cbig)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 100.*$gdb_prompt $" {
-        pass "print value of sizeof(cbig)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sizeof(cbig)" }
-    timeout           { fail "(timeout) print value of sizeof(cbig)" }
-  }
-
-
-send_gdb "print sizeof(lbig)/sizeof(long)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 900.*$gdb_prompt $" {
-        pass "print value of sizeof(lbig)/sizeof(long)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sizeof(lbig)/sizeof(long)" }
-    timeout     { fail "(timeout) print value of sizeof(lbig)/sizeof(long)" }
-  }
-
-send_gdb "print ibig.i\[100\] << 2\n"
-gdb_expect {
-    -re ".\[0-9\]* = 20.*$gdb_prompt $" {
-        pass "print value of ibig.i\[100\] << 2"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ibig.i\[100\] << 2" }
-    timeout           { fail "(timeout) print value of ibig.i\[100\] << 2" }
-  }
-
-send_gdb "print sbig.s\[90\] >> 4\n"
-gdb_expect {
-    -re ".\[0-9\]* = 15.*$gdb_prompt $" {
-        pass "print value of sbig.s\[90\] >> 4"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of sbig.s\[90\] >> 4" }
-    timeout           { fail "(timeout) print value of sbig.s\[90\] >> 4" }
-  }
-
-send_gdb "print lbig.l\[333\] >> 6\n"
-gdb_expect {
-    -re ".\[0-9\]* = 15624999.*$gdb_prompt $" {
-        pass "print value of lbig.l\[333\] >> 6"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of lbig.l\[333\] >> 6" }
-    timeout           { fail "(timeout) print value of lbig.l\[333\] >> 6" }
-  }
diff --git a/gdb/testsuite/gdb.base/nodebug.c b/gdb/testsuite/gdb.base/nodebug.c
deleted file mode 100644
index 3e0a4ce7862..00000000000
--- a/gdb/testsuite/gdb.base/nodebug.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <stdlib.h>
-/* Test that things still (sort of) work when compiled without -g.  */
-
-int dataglobal = 3;			/* Should go in global data */
-static int datalocal = 4;		/* Should go in local data */
-int bssglobal;				/* Should go in global bss */
-static int bsslocal;			/* Should go in local bss */
-
-#ifdef PROTOTYPES
-int
-inner (int x)
-#else
-int
-inner (x)
-     int x;
-#endif
-{
-  return x + dataglobal + datalocal + bssglobal + bsslocal;
-}
-
-#ifdef PROTOTYPES
-static short
-middle (int x)
-#else
-static short
-middle (x)
-     int x;
-#endif
-{
-  return 2 * inner (x);
-}
-
-#ifdef PROTOTYPES
-short
-top (int x)
-#else
-short
-top (x)
-     int x;
-#endif
-{
-  return 2 * middle (x);
-}
-
-#ifdef PROTOTYPES
-int
-main (int argc, char **argv)
-#else
-int 
-main (argc, argv)
-     int argc;
-     char **argv;
-#endif
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  return top (argc);
-}
-
-int *x;
-
-#ifdef PROTOTYPES
-int array_index (char *arr, int i)
-#else
-int
-array_index (arr, i)
-     char *arr;
-     int i;
-#endif
-{
-  /* The basic concept is just "return arr[i];".  But call malloc so that gdb
-     will be able to call functions.  */
-  char retval;
-  x = (int *) malloc (sizeof (int));
-  *x = i;
-  retval = arr[*x];
-  free (x);
-  return retval;
-}
diff --git a/gdb/testsuite/gdb.base/nodebug.exp b/gdb/testsuite/gdb.base/nodebug.exp
deleted file mode 100644
index 451f8a648d3..00000000000
--- a/gdb/testsuite/gdb.base/nodebug.exp
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1997, 1999, 2004, 2005 Free Software Foundation, 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
-
-# Test that things still (sort of) work when compiled without -g.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile nodebug
-set srcfile $srcdir/$subdir/$testfile.c
-set binfile $objdir/$subdir/$testfile
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-if [test_compiler_info "xlc-*"] {
-    # By default, IBM'x xlc compiler doesn't add static variables into the symtab.
-    # Use "-qstatsym" to do so. 
-    set exec_opts additional_flags=-qstatsym
-} else {
-    set exec_opts ""
-}
-
-if  { [gdb_compile $srcfile $binfile executable $exec_opts] != "" } {
-    untested "Couldn't compile $srcfile."
-    return -1
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-if [runto inner] then {
-    
-    # Expect to find global/local symbols in each of text/data/bss.
-    
-    # The exact format for some of this output is not necessarily
-    # ideal, particularly interpreting "p top" requires a fair bit of
-    # savvy about gdb's workings and the meaning of the "{}"
-    # construct.  So the details maybe could be tweaked.  But the
-    # basic purpose should be maintained, which is (a) users should be
-    # able to interact with these variables with some care (they have
-    # to know how to interpret them according to their real type,
-    # since gdb doesn't know the type), but (b) users should be able
-    # to detect that gdb does not know the type, rather than just
-    # being told they are ints or functions returning int like old
-    # versions of gdb used to do.
-    
-    # On alpha (and other ecoff systems) the native compilers put
-    # out debugging info for non-aggregate return values of functions
-    # even without -g, which should be accepted.
-    # Irix5, even though it is ELF, counts as "ecoff" because it
-    # encapsulates ecoff debugging info in a .mdebug section.
-    # Irix6 gcc emits no debug info at all for static functions and
-    # variables, so all tests involving statics fail.
-    
-    if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix5*" "mips-sgi-irix6*" }
-    gdb_test "p top" \
-	"\{(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))\} \[0-9a-fx]* <top(\\(int\\)|)>"
-    if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix5*" "mips-sgi-irix6*" }
-    gdb_test "whatis top" \
-	"(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))"
-    if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix6*" }
-    gdb_test "ptype top" "(short|int) \\((|void|int|<non-float parameter>|<non-float parameter>, <non-float parameter>)\\)"
-    
-    if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix5*" }
-    setup_xfail "mips-sgi-irix6*"
-    gdb_test "p middle" \
-	"\{(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))\} \[0-9a-fx]* <middle(\\(int\\)|)>"
-    if {![test_compiler_info "gcc-*"]} then { setup_xfail "mips-sgi-irix5*" }
-    setup_xfail "mips-sgi-irix6*"
-    gdb_test "whatis middle" \
-	"(<(text variable|function), no debug info>|short \\(int\\)|short \\(\\))"
-    setup_xfail "mips-sgi-irix6*"
-    gdb_test "ptype middle" "(short|int) \\((|void|int|<non-float parameter>|<non-float parameter>, <non-float parameter>)\\)"
-    
-    gdb_test "p dataglobal" "= 3"
-    gdb_test "whatis dataglobal" \
-	"<(data variable|variable), no debug info>|int"
-    gdb_test "ptype dataglobal" "<(data variable|variable), no debug info>|int"
-    
-    # The only symbol xcoff puts out for statics is for the TOC entry.
-    # Possible, but hairy, for gdb to deal.  Right now it doesn't, it
-    # doesn't know the variables exist at all.
-    setup_xfail "rs6000*-*-aix*"
-    setup_xfail "powerpc*-*-aix*"
-    if [test_compiler_info "gcc-*"] {
-        setup_xfail "mips-sgi-irix6*"
-    } else {
-        setup_xfail "hppa*-*-hpux*"
-    }
-
-    gdb_test "p datalocal" "= 4"
-
-    setup_xfail "rs6000*-*-aix*"
-    setup_xfail "powerpc*-*-aix*"
-    if [test_compiler_info "gcc-*"] {
-        setup_xfail "mips-sgi-irix6*"
-    } else {
-        setup_xfail "hppa*-*-hpux*"
-    }
-
-    gdb_test "whatis datalocal" "<(data variable|variable), no debug info>"
-
-    setup_xfail "rs6000*-*-aix*"
-    setup_xfail "powerpc*-*-aix*"
-    if [test_compiler_info "gcc-*"] {
-        setup_xfail "mips-sgi-irix6*"
-    } else {
-        setup_xfail "hppa*-*-hpux*"
-    }
-
-    gdb_test "ptype datalocal" "<(data variable|variable), no debug info>"
-    gdb_test "p bssglobal" "= 0"
-    gdb_test "whatis bssglobal" "<(data variable|variable), no debug info>|int"
-    gdb_test "ptype bssglobal" "<(data variable|variable), no debug info>|int"
-    
-    setup_xfail "rs6000*-*-aix*"
-    setup_xfail "powerpc*-*-aix*"
-    if [test_compiler_info "gcc-*"] {
-        setup_xfail "mips-sgi-irix6*"
-    } else {
-        setup_xfail "hppa*-*-hpux*"
-    }
-
-    gdb_test "p bsslocal" "= 0"
-
-    setup_xfail "rs6000*-*-aix*"
-    setup_xfail "powerpc*-*-aix*"
-    if [test_compiler_info "gcc-*"] {
-        setup_xfail "mips-sgi-irix6*"
-    } else {
-        setup_xfail "hppa*-*-hpux*"
-    }
-
-    gdb_test "whatis bsslocal" "<(data variable|variable), no debug info>"
-
-    setup_xfail "rs6000*-*-aix*"
-    setup_xfail "powerpc*-*-aix*"
-    if [test_compiler_info "gcc-*"] {
-        setup_xfail "mips-sgi-irix6*"
-    } else {
-        setup_xfail "hppa*-*-hpux*"
-    }
-    gdb_test "ptype bsslocal" "<(data variable|variable), no debug info>"
-    
-    if [test_compiler_info "gcc-*"] {
-        setup_xfail "mips-sgi-irix6*" 
-    }
-
-    gdb_test "backtrace 10" "#0.*inner.*#1.*middle.*#2.*top.*#3.*main.*" \
-	"backtrace from inner in nodebug.exp"
-    # Or if that doesn't work, at least hope for the external symbols
-    # Commented out because if we aren't going to xfail the above test
-    # ever, why bother with a weaker test?
-    #gdb_test "backtrace 10" "#0.*inner.*#1.*#2.*top.*#3.*main.*" \
-	#    "backtrace from inner in nodebug.exp for externals"
-    
-    # This test is not as obscure as it might look.  `p getenv ("TERM")'
-    # is a real-world example, at least on many systems.
-    if { ! [test_compiler_info "gcc-*"]} {
-        setup_xfail "mips-sgi-irix6*" 
-    }
-    if [target_info exists gdb,cannot_call_functions] {
-	setup_xfail "*-*-*" 2416
-	fail "p/c array_index(\"abcdef\",2)"
-    } else {
-	#
-	# On HP-UX, a support function (__d_plt_call) necessary to
-	# implement an inferior call is normally only available when
-	# the inferior was compiled with -g.  Thus, we expect this
-	# testpoint to fail on HP-UX.
-	if { [istarget "hppa*-hpux*"] } {
-	    send_gdb "p/c array_index(\"abcdef\",2)\n"
-	    gdb_expect {
-		-re ".*Suggest linking executable with -g.*$gdb_prompt $" { pass "p/c array_index(\"abcdef\",2)" }
-		-re ".*Cannot find __wdb_call_dummy in.*end.o.*" { pass "p/c array_index(\"abcdef\",2)" }
-		-re ".*99 'c'.*" { pass "p/c array_index(\"abcdef\",2)" }
-		timeout { fail "(timeout) p/c array_index" }
-	    }
-	} else {
-	    # We need to up this because this can be really slow on some boards.
-	    # (malloc() is called as part of the test).
-	    set timeout 60;    
-	    gdb_test {p/c array_index("abcdef",2)} " = 99 'c'"
-	}
-    }
-    
-    # Now, try that we can give names of file-local symbols which happen
-    # to be unique, and have it still work
-    if [test_compiler_info "gcc-*"] {
-        setup_xfail "mips-sgi-irix6*"
-    }
-    if [runto middle] then {
-	gdb_test "backtrace 10" "#0.*middle.*#1.*top.*#2.*main.*" \
-	    "backtrace from middle in nodebug.exp"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/opaque.exp b/gdb/testsuite/gdb.base/opaque.exp
deleted file mode 100644
index 4030b4f528a..00000000000
--- a/gdb/testsuite/gdb.base/opaque.exp
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2002 Free Software
-# Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "opaque"
-set binfile ${objdir}/${subdir}/opaque
-
-#if  { [gdb_compile "${srcdir}/${subdir}/opaque0.c ${srcdir}/${subdir}/opaque1.c" "${binfile}" executable {debug}] != "" } {
-#     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-#}
-
-if  { [gdb_compile "${srcdir}/${subdir}/opaque0.c" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/opaque1.c" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Test basic opaque structure handling (statically).
-# The ordering of the tests is significant.  We first try the things that
-# might fail if gdb fails to connect the uses of opaque structures to
-# the actual opaque structure definition.
-
-# When we start up, gdb sets the file containing main() as the current
-# source file.  The actual structure foo is defined in a different file.
-# A pointer (foop) to an instance of the opaque struct is defined in the same
-# source file as main().  Ensure that gdb correctly "connected" the definition
-# in the other file with the pointer to the opaque struct in the file containing
-# "foop".
-
-# Define a procedure to set up an xfail for all targets that do not support
-# this sort of cross reference.
-# Any target gcc that has a DBX_NO_XREFS definition in its config file will
-# not support it (FIXME: Is this still true; I suspect maybe not).
-
-# Native alpha ecoff doesn't support it either.
-# I don't think this type of cross reference works for any COFF target
-# either.
-
-proc setup_xfail_on_opaque_pointer {} {
-	global gcc_compiled
-
-	setup_xfail "vax-*-*" "i*86-sequent-bsd*"
-	if {!$gcc_compiled} then {
-		setup_xfail "alpha-*-*" "mips-sgi-irix5*"
-	}
-}
-
-# This seems easier than trying to track different versions of xlc; I'm
-# not sure there is much rhyme or reason regarding which tests it fails
-# and which ones it passes.
-if {[istarget "rs6000-*-aix*"] && !$gcc_compiled} then {
-    warning "xfails in opaque.exp may not be set up correctly for xlc"
-}
-
-setup_xfail_on_opaque_pointer
-gdb_test "whatis foop" \
-    "type = struct foo \[*\]+" \
-    "whatis on opaque struct pointer (statically)"
-
-
-# Ensure that we know the form of the structure that foop points to.
-
-setup_xfail_on_opaque_pointer
-if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-gdb_test "ptype foop" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\} \[*\]+" \
-    "ptype on opaque struct pointer (statically)"
-
-
-# An instance of the opaque structure (afoo) is defined in a different file.
-# Ensure that we can locate afoo and the structure definition.
-
-gdb_test "whatis afoo" \
-    "type = struct foo" \
-    "whatis on opaque struct instance (statically)"
-
-
-# Ensure that we know the form of "afoo".
-
-gdb_test "ptype afoo" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\}" \
-    "ptype on opaque struct instance (statically)"
-
-
-# Ensure that we know what a struct foo looks like.
-
-gdb_test "ptype struct foo" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\}" \
-    "ptype on opaque struct tagname (statically)"
-
-
-#
-# Done with static tests, now test dynamic opaque structure handling.
-# We reload the symbol table so we forget about anything we might
-# have learned during the static tests.
-#
-
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-}
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Run to main, where struct foo is incomplete.
-if ![runto_main] {
-    perror "cannot run to breakpoint at main"
-}
-
-
-# The current source file is now the one containing main().  The structure foo
-# is defined in a different file, but we have a pointer to an instance of
-# the opaque structure in the current file.  Ensure we know it's type.
-
-setup_xfail_on_opaque_pointer
-gdb_test "whatis foop" \
-    "type = struct foo \[*\]+" \
-    "whatis on opaque struct pointer (dynamically)"
-
-
-# Ensure that we know the form of the thing foop points to.
-
-setup_xfail_on_opaque_pointer
-if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-gdb_test "ptype foop" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\} \[*\]+" \
-    "ptype on opaque struct pointer (dynamically) 1"
-
-gdb_test "whatis afoo" \
-    "type = struct foo" \
-    "whatis on opaque struct instance (dynamically) 1"
-
-
-# Ensure that we know the form of afoo, an instance of a struct foo.
-
-gdb_test "ptype afoo" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\}" \
-    "ptype on opaque struct instance (dynamically) xyz 1"
-
-
-# Ensure that we know the form of an explicit struct foo.
-
-if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-gdb_test "ptype struct foo" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\}" \
-    "ptype on opaque struct tagname (dynamically) 1"
-
-
-# Now reload the symbols again so we forget about anything we might
-# have learned reading the symbols during the previous tests.
-
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-}
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Run to getfoo, where struct foo is complete.
-if ![runto getfoo] {
-    perror "cannot run to breakpoint at getfoo"
-}
-
-
-# Ensure that we know what foop is.
-
-setup_xfail_on_opaque_pointer
-gdb_test "whatis foop" \
-    "type = struct foo \[*\]+" \
-    "whatis on opaque struct pointer (dynamically) 1"
-
-
-# Ensure that we know the form of the thing foop points to.
-
-setup_xfail_on_opaque_pointer
-if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
-gdb_test "ptype foop" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\} \[*\]+" \
-    "ptype on opaque struct pointer (dynamically) 2"
-
-gdb_test "whatis afoo" \
-    "type = struct foo" \
-    "whatis on opaque struct instance (dynamically) 1"
-
-
-# Ensure that we know the form of afoo, an instance of a struct foo.
-
-gdb_test "ptype afoo" \
-    "type = struct foo \{\r\n    int a;\r\n    int b;\r\n\}" \
-    "ptype on opaque struct instance (dynamically) 1"
-
-gdb_test "ptype afoo" \
-    "type = struct foo \{\[\r\n\]*.*int a;\[\r\n\]*.*int b;\[\r\n\]*}\[\r\n\]*" \
-    "ptype on opaque struct instance (dynamically) pqr 1"
-
-
-# Ensure that we know the form of an explicit struct foo.
-
-gdb_test "ptype foop" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\} \[*\]+" \
-    "ptype on opaque struct pointer (dynamically) 2"
-
-gdb_test "whatis afoo" \
-    "type = struct foo" \
-    "whatis on opaque struct instance (dynamically) 2"
-
-
-# Ensure that we know the form of afoo, an instance of a struct foo.
-
-gdb_test "ptype afoo" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\}" \
-    "ptype on opaque struct instance (dynamically) 2"
-
-
-# Ensure that we know the form of an explicit struct foo.
-
-gdb_test "ptype struct foo" \
-    "type = struct foo \{\[\r\n\]+    int a;\[\r\n\]+    int b;\[\r\n\]+\}" \
-    "ptype on opaque struct tagname (dynamically) 2"
diff --git a/gdb/testsuite/gdb.base/opaque0.c b/gdb/testsuite/gdb.base/opaque0.c
deleted file mode 100644
index 5ec4a2aa082..00000000000
--- a/gdb/testsuite/gdb.base/opaque0.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Note that struct foo is opaque (never defined) in this file.  This
-    is allowed by C since this file does not reference any members of
-    the structure.  The debugger needs to be able to associate this
-    opaque structure definition with the full definition in another
-    file.
-*/
-
-struct foo *foop;
-extern struct foo *getfoo ();
-#ifdef PROTOTYPES
-extern void putfoo (struct foo *foop);
-#endif
-
-int main ()
-{
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-    foop = getfoo ();
-    putfoo (foop);
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.base/opaque1.c b/gdb/testsuite/gdb.base/opaque1.c
deleted file mode 100644
index c34f7aaaae1..00000000000
--- a/gdb/testsuite/gdb.base/opaque1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-struct foo {
-    int a;
-    int b;
-} afoo = { 1, 2};
-
-struct foo *getfoo ()
-{
-    return (&afoo);
-}
-
-#ifdef PROTOTYPES
-void putfoo (struct foo *foop)
-#else
-void putfoo (foop)
-     struct foo *foop;
-#endif
-{
-}
diff --git a/gdb/testsuite/gdb.base/overlays.c b/gdb/testsuite/gdb.base/overlays.c
deleted file mode 100644
index d02ed707cd1..00000000000
--- a/gdb/testsuite/gdb.base/overlays.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Support program for testing gdb's ability to debug overlays
-   in the inferior.  */
-
-#include "ovlymgr.h"
-
-extern int foo PARAMS((int));
-extern int bar PARAMS((int));
-extern int baz PARAMS((int));
-extern int grbx PARAMS((int));
-
-int main ()
-{
-  int a, b, c, d, e;
-
-  OverlayLoad (0);
-  OverlayLoad (4);
-  a = foo (1);
-  OverlayLoad (1);
-  OverlayLoad (5);
-  b = bar (1);
-  OverlayLoad (2);
-  OverlayLoad (6);
-  c = baz (1);
-  OverlayLoad (3);
-  OverlayLoad (7);
-  d = grbx (1);
-  e = a + b + c + d;
-  return (e != ('f' + 'o' +'o'
-		+ 'b' + 'a' + 'r'
-		+ 'b' + 'a' + 'z'
-		+ 'g' + 'r' + 'b' + 'x'));
-
-}
-
diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp
deleted file mode 100644
index 671eab5cfd9..00000000000
--- a/gdb/testsuite/gdb.base/overlays.exp
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1997, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-
-set prms_id 0
-set bug_id 0
-
-if [istarget "d10v-*-*"] then {
-    set linker_script "${srcdir}/${subdir}/d10v.ld";
-} elseif [istarget "m32r-*-*"] then {
-    set linker_script "${srcdir}/${subdir}/m32r.ld";
-} else {
-    verbose "Skipping overlay test -- not implemented for this target."
-    return 
-}
-
-if [istarget "*-*-linux*"] then {
-    verbose "Skipping overlay test -- Linux doesn't support overlayed programs."
-    return 
-}
-
-set testfile "overlays"
-set binfile ${objdir}/${subdir}/${testfile}
-set srcfile ${testfile}.c
-
-if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${testfile}.o" object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-if {[gdb_compile "${srcdir}/${subdir}/ovlymgr.c" ovlymgr.o object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-if {[gdb_compile "${srcdir}/${subdir}/foo.c" foo.o object {debug} ] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if {[gdb_compile "${srcdir}/${subdir}/bar.c" bar.o object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-if {[gdb_compile "${srcdir}/${subdir}/baz.c" baz.o object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-if {[gdb_compile "${srcdir}/${subdir}/grbx.c" grbx.o object {debug}] != ""} then {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-if  {[gdb_compile "${testfile}.o ovlymgr.o foo.o bar.o baz.o grbx.o" ${binfile} executable "ldscript=-Wl,-T$linker_script"] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-remote_exec build "mv ${testfile}.o foo.o bar.o baz.o grbx.o ovlymgr.o ${objdir}/${subdir}"
-
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests;
-}
-
-# couple of convenience variables
-set fptrcast [string_to_regexp "{int (int)}"]
-set iptrcast [string_to_regexp "(int *)"]
-set hexx "0x\[0-9abcdefABCDEF\]+"
-
-gdb_test "overlay manual" "" 
-gdb_test "overlay list" "No sections are mapped." "List with none mapped"
-
-# capture the LMA addresses of [foo bar baz grbx foox barx bazx grbxx]
-
-proc get_func_address { func func_sym msg } {
-    global gdb_prompt
-    global fptrcast
-    global hexx
-
-    set func_addr 0
-    send_gdb "print $func\n" 
-    gdb_expect {
-	-re "\\$\[0-9\]+ = $fptrcast (${hexx}) <$func_sym>.*$gdb_prompt $" {
-	    set func_addr $expect_out(1,string)
-	    pass "get $msg"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "get $msg"
-	}
-	default {
-	    fail "get $msg (timeout)"
-	}
-    }
-    return $func_addr
-}
-
-set foo_lma  [get_func_address "foo"  "\\*foo\\*"  "foo  load address"]
-set bar_lma  [get_func_address "bar"  "\\*bar\\*"  "bar  load address"]
-set baz_lma  [get_func_address "baz"  "\\*baz\\*"  "baz  load address"]
-set grbx_lma [get_func_address "grbx" "\\*grbx\\*" "grbx load address"]
-
-gdb_test "print \$foox_lma = &foox" \
-	".* $iptrcast 0x.*"  "foox load addr"
-gdb_test "print \$barx_lma = &barx" \
-	".* $iptrcast 0x.*"  "barx load addr"
-gdb_test "print \$bazx_lma = &bazx" \
-	".* $iptrcast 0x.*"  "bazx load addr"
-gdb_test "print \$grbxx_lma = &grbxx" \
-	".* $iptrcast 0x.*" "grbxx load addr"
-
-# map each overlay successively, and
-# capture the VMA addresses of [foo bar baz grbx foox barx bazx grbxx]
-
-gdb_test "overlay map .ovly0" "" 
-gdb_test "overlay list" "Section .ovly0, loaded at.*, mapped at.*" "List ovly0"
-set foo_vma [get_func_address "foo"  "foo"  "foo  runtime address"]
-
-gdb_test "overlay map .ovly1" "" 
-gdb_test "overlay list" "Section .ovly1, loaded at.*, mapped at.*" "List ovly1"
-set bar_vma [get_func_address "bar"  "bar"  "bar  runtime address"]
-
-gdb_test "overlay map .ovly2" "" 
-gdb_test "overlay list" "Section .ovly2, loaded at.*, mapped at.*" "List ovly2"
-set baz_vma [get_func_address "baz"  "baz"  "baz  runtime address"]
-
-gdb_test "overlay map .ovly3" "" 
-gdb_test "overlay list" "Section .ovly3, loaded at.*, mapped at.*" "List ovly3"
-set grbx_vma [get_func_address "grbx" "grbx" "grbx runtime address"]
-
-gdb_test "overlay map .data00" "" 
-gdb_test "overlay list" "Section .data00, loaded .*, mapped .*" "List data00"
-gdb_test "print \$foox_vma = &foox" \
-	".* $iptrcast 0x.*"  "foox runtime addr"
-
-gdb_test "overlay map .data01" "" 
-gdb_test "overlay list" "Section .data01, loaded .*, mapped .*" "List data01"
-gdb_test "print \$barx_vma = &barx" \
-	".* $iptrcast 0x.*"  "barx runtime addr"
-
-gdb_test "overlay map .data02" "" 
-gdb_test "overlay list" "Section .data02, loaded .*, mapped .*" "List data02"
-gdb_test "print \$bazx_vma = &bazx" \
-	".* $iptrcast 0x.*"  "bazx runtime addr"
-
-gdb_test "overlay map .data03" "" 
-gdb_test "overlay list" "Section .data03, loaded .*, mapped .*" "List data03"
-gdb_test "print \$grbxx_vma = &grbxx" \
-	".* $iptrcast 0x.*"  "grbxx runtime addr"
-
-# Verify that LMA != VMA
-
-gdb_test "print $foo_lma   != $foo_vma" ".* = 1"   "foo's LMA   != VMA"
-gdb_test "print $bar_lma   != $bar_vma" ".* = 1"   "bar's LMA   != VMA"
-gdb_test "print $baz_lma   != $baz_vma" ".* = 1"   "baz's LMA   != VMA"
-gdb_test "print $grbx_lma  != $grbx_vma" ".* = 1"  "grbx's LMA  != VMA"
-gdb_test "print \$foox_lma  != \$foox_vma" ".* = 1"  "foox's LMA  != VMA"
-gdb_test "print \$barx_lma  != \$barx_vma" ".* = 1"  "barx's LMA  != VMA"
-gdb_test "print \$bazx_lma  != \$bazx_vma" ".* = 1"  "bazx's LMA  != VMA"
-gdb_test "print \$grbxx_lma != \$grbxx_vma" ".* = 1" "grbxx's LMA != VMA"
-
-# Verify that early-mapped overlays have been bumped out 
-# by later-mapped overlays layed over in the same VMA range.
-
-send_gdb "overlay list\n"
-gdb_expect {
-    -re ".*ovly0, " 		{ fail ".ovly0  not unmapped by .ovly1"  }
-    -re ".*ovly2, "	 	{ fail ".ovly2  not unmapped by .ovly3"  }
-    -re ".*data00,"		{ fail ".data00 not unmapped by .data01" }
-    -re ".*data02,"		{ fail ".data02 not unmapped by .data03" }
-    -re ".*$gdb_prompt $"	{ pass "Automatic unmapping"             }
-    timeout			{ fail "(timeout) Automatic unmapping"   }
-}
-
-# Verify that both sec1 and sec2 can be loaded simultaneously.
-proc simultaneous_pair { sec1 sec2 } {
-    global gdb_prompt
-
-    set pairname "$sec1 and $sec2 mapped simultaneously"
-    gdb_test "overlay map $sec1" "" "$pairname: map $sec1"
-    gdb_test "overlay map $sec2" "" "$pairname: map $sec2"
-
-    set seen_sec1 0
-    set seen_sec2 0
-
-    send_gdb "overlay list\n"
-    gdb_expect {
-        -re ".*[string_to_regexp $sec1], " { set seen_sec1 1; exp_continue }
-        -re ".*[string_to_regexp $sec2], " { set seen_sec2 1; exp_continue }
-        -re ".*$gdb_prompt $" {
-            if {$seen_sec1 && $seen_sec2} {
-                pass "$pairname"
-            } else {
-                fail "$pairname"
-            }
-        }
-        timeout { fail "(timeout) $pairname" }
-    }
-}
-
-simultaneous_pair .ovly0 .ovly2
-simultaneous_pair .ovly0 .ovly3
-simultaneous_pair .ovly1 .ovly2
-simultaneous_pair .ovly1 .ovly3
-
-simultaneous_pair .data00 .data02
-simultaneous_pair .data00 .data03
-simultaneous_pair .data01 .data02
-simultaneous_pair .data01 .data03
-
-# test automatic mode
-
-gdb_test "overlay auto" ""
-gdb_test "overlay list" "No sections are mapped." "List none mapped (auto)"
-gdb_test "break foo"  "Breakpoint .*at .*file .*foo.c.*"  "break foo"
-gdb_test "break bar"  "Breakpoint .*at .*file .*bar.c.*"  "break bar"
-gdb_test "break baz"  "Breakpoint .*at .*file .*baz.c.*"  "break baz"
-gdb_test "break grbx" "Breakpoint .*at .*file .*grbx.c.*" "break grbx"
-
-send_gdb "continue\n"
-gdb_expect {
-    -re "Breakpoint .* foo .x=1. at .*$gdb_prompt $" { pass   "hit foo" }
-    -re ".*$gdb_prompt $"			     { fail   "hit foo" }
-    timeout				     { fail "(timeout) hit foo" }
-}
-
-send_gdb "backtrace\n"
-gdb_expect {
-    -re "#0 .*foo .*#1 .*main .*$gdb_prompt $"       { pass   "BT foo" }
-    -re ".*$gdb_prompt $"			     { fail   "BT foo" }
-    timeout				     { fail "(timeout) BT foo" }
-}
-
-
-send_gdb "continue\n"
-gdb_expect {
-    -re "Breakpoint .* bar .x=1. at .*$gdb_prompt $" { pass   "hit bar" }
-    -re ".*$gdb_prompt $"			     { fail   "hit bar" }
-    timeout				     { fail "(timeout) hit bar" }
-}
-
-send_gdb "backtrace\n"
-gdb_expect {
-    -re "#0 .*bar .*#1 .*main .*$gdb_prompt $"       { pass   "BT bar" }
-    -re ".*$gdb_prompt $"			     { fail   "BT bar" }
-    timeout				     { fail "(timeout) BT bar" }
-}
-
-send_gdb "continue\n"
-gdb_expect {
-    -re "Breakpoint .* baz .x=1. at .*$gdb_prompt $" { pass   "hit baz" }
-    -re ".*$gdb_prompt $"			     { fail   "hit baz" }
-    timeout				     { fail "(timeout) hit baz" }
-}
-
-send_gdb "backtrace\n"
-gdb_expect {
-    -re "#0 .*baz .*#1 .*main .*$gdb_prompt $"       { pass   "BT baz" }
-    -re ".*$gdb_prompt $"			     { fail   "BT baz" }
-    timeout				     { fail "(timeout) BT baz" }
-}
-
-send_gdb "continue\n"
-gdb_expect {
-    -re "Breakpoint .* grbx .x=1. at .*$gdb_prompt $" { pass   "hit grbx" }
-    -re ".*$gdb_prompt $"			      { fail   "hit grbx" }
-    timeout				      { fail "(timeout) hit grbx" }
-}
-
-send_gdb "backtrace\n"
-gdb_expect {
-    -re "#0 .*grbx .*#1 .*main .*$gdb_prompt $"      { pass   "BT grbx" }
-    -re ".*$gdb_prompt $"			     { fail   "BT grbx" }
-    timeout				     { fail "(timeout) BT grbx" }
-}
-
diff --git a/gdb/testsuite/gdb.base/ovlymgr.c b/gdb/testsuite/gdb.base/ovlymgr.c
deleted file mode 100644
index f4958ed14a3..00000000000
--- a/gdb/testsuite/gdb.base/ovlymgr.c
+++ /dev/null
@@ -1,233 +0,0 @@
-
-/*
- * Ovlymgr.c -- Runtime Overlay Manager for the GDB testsuite.
- */
-
-#include "ovlymgr.h"
-
-/* Local functions and data: */
-
-extern unsigned long _ovly_table[][4];
-extern unsigned long _novlys __attribute__ ((section (".data")));
-enum ovly_index { VMA, SIZE, LMA, MAPPED};
-
-static void ovly_copy (unsigned long dst, unsigned long src, long size);
-
-/* Flush the data and instruction caches at address START for SIZE bytes.
-   Support for each new port must be added here.  */
-/* FIXME: Might be better to have a standard libgloss function that
-   ports provide that we can then use.  Use libgloss instead of newlib
-   since libgloss is the one intended to handle low level system issues.
-   I would suggest something like _flush_cache to avoid the user's namespace
-   but not be completely obscure as other things may need this facility.  */
- 
-static void
-FlushCache (void)
-{
-#ifdef __M32R__
-  volatile char *mspr = (char *) 0xfffffff7;
-  *mspr = 1;
-#endif
-}
-
-/* _ovly_debug_event:
- * Debuggers may set a breakpoint here, to be notified 
- * when the overlay table has been modified.
- */
-static void
-_ovly_debug_event (void)
-{
-}
-
-/* OverlayLoad:
- * Copy the overlay into its runtime region,
- * and mark the overlay as "mapped".
- */
-
-bool
-OverlayLoad (unsigned long ovlyno)
-{
-  unsigned long i;
-
-  if (ovlyno < 0 || ovlyno >= _novlys)
-    exit (-1);	/* fail, bad ovly number */
-
-  if (_ovly_table[ovlyno][MAPPED])
-    return TRUE;	/* this overlay already mapped -- nothing to do! */
-
-  for (i = 0; i < _novlys; i++)
-    if (i == ovlyno)
-      _ovly_table[i][MAPPED] = 1;	/* this one now mapped */
-    else if (_ovly_table[i][VMA] == _ovly_table[ovlyno][VMA])
-      _ovly_table[i][MAPPED] = 0;	/* this one now un-mapped */
-
-  ovly_copy (_ovly_table[ovlyno][VMA], 
-	     _ovly_table[ovlyno][LMA], 
-	     _ovly_table[ovlyno][SIZE]);
-
-  FlushCache ();
-  _ovly_debug_event ();
-  return TRUE;
-}
-
-/* OverlayUnload:
- * Copy the overlay back into its "load" region.
- * Does NOT mark overlay as "unmapped", therefore may be called
- * more than once for the same mapped overlay.
- */
- 
-bool
-OverlayUnload (unsigned long ovlyno)
-{
-  if (ovlyno < 0 || ovlyno >= _novlys)
-    exit (-1);  /* fail, bad ovly number */
- 
-  if (!_ovly_table[ovlyno][MAPPED])
-    exit (-1);  /* error, can't copy out a segment that's not "in" */
- 
-  ovly_copy (_ovly_table[ovlyno][LMA], 
-	     _ovly_table[ovlyno][VMA],
-	     _ovly_table[ovlyno][SIZE]);
-
-  _ovly_debug_event ();
-  return TRUE;
-}
-
-#ifdef __D10V__
-#define IMAP0       (*(short *)(0xff00))
-#define IMAP1       (*(short *)(0xff02))
-#define DMAP        (*(short *)(0xff04))
-
-static void
-D10VTranslate (unsigned long logical,
-	       short *dmap,
-	       unsigned long **addr)
-{
-  unsigned long physical;
-  unsigned long seg;
-  unsigned long off;
-
-  /* to access data, we use the following mapping 
-     0x00xxxxxx: Logical data address segment        (DMAP translated memory)
-     0x01xxxxxx: Logical instruction address segment (IMAP translated memory)
-     0x10xxxxxx: Physical data memory segment        (On-chip data memory)
-     0x11xxxxxx: Physical instruction memory segment (On-chip insn memory)
-     0x12xxxxxx: Phisical unified memory segment     (Unified memory)
-     */
-
-  /* Addresses must be correctly aligned */
-  if (logical & (sizeof (**addr) - 1))
-    exit (-1);
-
-  /* If the address is in one of the two logical address spaces, it is
-     first translated into a physical address */
-  seg = (logical >> 24);
-  off = (logical & 0xffffffL);
-  switch (seg) 
-      {
-      case 0x00: /* in logical data address segment */
-	if (off <= 0x7fffL)
-	  physical = (0x10L << 24) + off;
-	else
-	  /* Logical address out side of on-chip segment, not
-             supported */
-	  exit (-1);
-	break;
-      case 0x01: /* in logical instruction address segment */
-	{
-	  short map;
-	  if (off <= 0x1ffffL)
-	    map = IMAP0;
-	  else if (off <= 0x3ffffL)
-	    map = IMAP1;
-	  else
-	    /* Logical address outside of IMAP[01] segment, not
-	       supported */
-	    exit (-1);
-	  if (map & 0x1000L)
-	    {
-	    /* Instruction memory */
-	      physical = (0x11L << 24) | off;
-	    }
-	  else
-	    {
-	    /* Unified memory */
-	      physical = ((map & 0x7fL) << 17) + (off & 0x1ffffL);
-	      if (physical > 0xffffffL)
-		/* Address outside of unified address segment */
-		exit (-1);
-	      physical |= (0x12L << 24);
-	    }
-	  break;
-	}
-      case 0x10:
-      case 0x11:
-      case 0x12:
-	physical = logical;
-	break;
-      default:
-	exit (-1);	/* error */
-      }
-
-  seg = (physical >> 24);
-  off = (physical & 0xffffffL);
-  switch (seg) 
-    {
-    case 0x10:	/* dst is a 15 bit offset into the on-chip memory */
-      *dmap = 0;
-      *addr = (long *) (0x0000 + ((short)off & 0x7fff));
-      break;
-    case 0x11:	/* dst is an 18-bit offset into the on-chip
-		   instruction memory */
-      *dmap = 0x1000L | ((off & 0x3ffffL) >> 14);
-      *addr = (long *) (0x8000 + ((short)off & 0x3fff));
-      break;
-    case 0x12:	/* dst is a 24-bit offset into unified memory */
-      *dmap = off >> 14;
-      *addr = (long *) (0x8000 + ((short)off & 0x3fff));
-      break;
-    default:
-      exit (-1);	/* error */
-    }
-}
-#endif /* __D10V__ */
-
-static void
-ovly_copy (unsigned long dst, unsigned long src, long size)
-{
-#ifdef  __D10V__
-  unsigned long *s, *d, tmp;
-  short dmap_src, dmap_dst;
-  short dmap_save;
-
-  /* all section sizes should by multiples of 4 bytes */
-  dmap_save = DMAP;
-
-  D10VTranslate (src, &dmap_src, &s);
-  D10VTranslate (dst, &dmap_dst, &d);
-
-  while (size > 0)
-    {
-      /* NB: Transfer 4 byte (long) quantites, problems occure
-	 when only two bytes are transfered */
-      DMAP = dmap_src;
-      tmp = *s;
-      DMAP = dmap_dst;
-      *d = tmp; 
-      d++;
-      s++;
-      size -= sizeof (tmp);
-      src += sizeof (tmp);
-      dst += sizeof (tmp);
-      if ((src & 0x3fff) == 0)
-	D10VTranslate (src, &dmap_src, &s);
-      if ((dst & 0x3fff) == 0)
-	D10VTranslate (dst, &dmap_dst, &d);
-    }
-  DMAP = dmap_save;
-#else
-  memcpy ((void *) dst, (void *) src, size);
-#endif /* D10V */
-  return;
-}
-
diff --git a/gdb/testsuite/gdb.base/ovlymgr.h b/gdb/testsuite/gdb.base/ovlymgr.h
deleted file mode 100644
index bd0d40a2640..00000000000
--- a/gdb/testsuite/gdb.base/ovlymgr.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Sample runtime overlay manager.
- */
-
-#ifdef NO_PROTOTYPES
-#define PARAMS(paramlist) ()
-#else
-#define PARAMS(paramlist) paramlist
-#endif
-
-typedef enum { FALSE, TRUE } bool;
-
-/* Entry Points: */
-
-bool OverlayLoad   PARAMS((unsigned long ovlyno));
-bool OverlayUnload PARAMS((unsigned long ovlyno));
-
diff --git a/gdb/testsuite/gdb.base/page.exp b/gdb/testsuite/gdb.base/page.exp
deleted file mode 100644
index c757ca2b563..00000000000
--- a/gdb/testsuite/gdb.base/page.exp
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1992, 1994, 1995, 1999, 2002 Free Software Foundation,
-# 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-global message
-global timeout
-
-set timeout 200
-
-gdb_exit
-gdb_start
-
-gdb_test "set pagination off" ""
-gdb_test "show pagination" "State of pagination is off.*" "pagination is off"
-send_gdb "help\n"
-gdb_expect_list "unpaged help" ".*$gdb_prompt $" {
-    "List of classes of commands:"
-    ""
-    "aliases -- Aliases of other commands"
-    "breakpoints -- Making program stop at certain points"
-    "data -- Examining data"
-    "files -- Specifying and examining files"
-    "internals -- Maintenance commands"
-    "obscure -- Obscure features"
-    "running -- Running the program"
-    "stack -- Examining the stack"
-    "status -- Status inquiries"
-    "support -- Support facilities"
-    "tracepoints -- Tracing of program execution without stopping the program"
-    "user-defined -- User-defined commands"
-    ""
-    "Type .help. followed by a class name for a list of commands in that class."
-    "Type .help. followed by command name for full documentation."
-    "Command name abbreviations are allowed if unambiguous."
-}
-
-
-gdb_test "set pagination on" ""
-gdb_test "show pagination" "State of pagination is on.*" "pagination is on"
-gdb_test "set height 10" ""
-send_gdb "help\n"
-gdb_expect_list "paged help" \
-	".*---Type <return> to continue, or q <return> to quit---" {
-    "List of classes of commands:"
-    ""
-    "aliases -- Aliases of other commands"
-    "breakpoints -- Making program stop at certain points"
-    "data -- Examining data"
-    "files -- Specifying and examining files"
-    "internals -- Maintenance commands"
-    "obscure -- Obscure features"
-    "running -- Running the program"
-}
-gdb_test "q"
-
-
-gdb_exit
-return 0
-
diff --git a/gdb/testsuite/gdb.base/pc-fp.c b/gdb/testsuite/gdb.base/pc-fp.c
deleted file mode 100644
index 8c89a0f0b81..00000000000
--- a/gdb/testsuite/gdb.base/pc-fp.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdio.h>
-
-void
-foo (int i)
-{
-  i++;
-  printf ("In foo %d\n", i);
-}
-
-int
-main ()
-{
-  foo (1);
-}
diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp
deleted file mode 100644
index c7daf6f08a4..00000000000
--- a/gdb/testsuite/gdb.base/pc-fp.exp
+++ /dev/null
@@ -1,94 +0,0 @@
-#   Copyright 2002, 2004 Free Software Foundation, 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
-
-# The doco makes reference to built-in registers -- $pc and $fp.  If
-# the ISA contains registers by that name then they should be
-# displayed.  If the ISA contains registers identified as being
-# equivalent, but have different names, then GDB will provide these as
-# aliases.  If the ISA doesn't provide any equivalent registers, then
-# GDB will provide registers that map onto the frame's PC and FP.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "pc-fp"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-proc get_valueofx { fmt exp default } {
-    global gdb_prompt
-    send_gdb "print${fmt} ${exp}\n"
-    gdb_expect {
-	-re "\\$\[0-9\]* = (0x\[0-9a-zA-Z\]+).*$gdb_prompt $" {
-	    set val $expect_out(1,string)
-	    pass "get value of ${exp} ($val)"
-	}
-	timeout {
-	    set val ${default}
-	    fail "get value of ${exp} (timeout)"
-	}
-    }
-    return ${val}
-}
-
-# Get the value of PC and FP
-
-set valueof_pc [get_valueofx "/x" "\$pc" "0"]
-set valueof_fp [get_valueofx "/x" "\$fp" "0"]
-
-# Check that the sequence $REGNAME -> REGNUM -> $REGNAME works.  Use
-# display since that encodes and then decodes the expression parameter
-# (and hence uses the mechanisms we're trying to test).
-
-gdb_test "display/i \$pc" "1: x/i +\\\$pc +${valueof_pc}.*"
-gdb_test "display/w \$fp" "2: x/xw +\\\$fp +${valueof_fp}.*"
-
-# FIXME: cagney/2002-09-04: Should also check that ``info registers
-# $pc'' et.al.'' come back with the same value as the above displays
-# and a print --- assuming that is that people agree to such behavour.
-# Need to re-write default_print_registers_info() for it to work (and
-# such a rewrite is on the reggroups branch).
-
-# gdb_test "info registers \$pc" "${valueof_pc}"
-# gdb_test "info registers \$fp" "${valueof_fp}"
diff --git a/gdb/testsuite/gdb.base/pending.c b/gdb/testsuite/gdb.base/pending.c
deleted file mode 100644
index a83a451b94e..00000000000
--- a/gdb/testsuite/gdb.base/pending.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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  */
-
-#include <stdio.h>
-
-int k = 0;
-
-extern void pendfunc (int x);
-
-int main()
-{
-  pendfunc (3); /* break main here */
-  pendfunc (4);
-  k = 1;
-  pendfunc (3);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/pending.exp b/gdb/testsuite/gdb.base/pending.exp
deleted file mode 100644
index 7a898587957..00000000000
--- a/gdb/testsuite/gdb.base/pending.exp
+++ /dev/null
@@ -1,261 +0,0 @@
-#   Copyright 2003, 2004, 2005
-#   Free Software Foundation, 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.  
-
-# This file was created by Jeff Johnston. (jjohnstn@redhat.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-# are we on a target board?
-if ![isnative] then {
-    return 0
-}
-
-set testfile "pending"
-set libfile "pendshr"
-set srcfile $testfile.c
-set libsrc  $srcdir/$subdir/$libfile.c
-set binfile $objdir/$subdir/$testfile
-set lib_sl  $objdir/$subdir/$libfile.sl
-
-set lib_opts  debug
-set exec_opts [list debug shlib=$lib_sl]
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
-     || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not compile either $libsrc or $srcdir/$subdir/$srcfile."
-    return -1
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-#
-# Test setting, querying, and modifying pending breakpoints
-#
-
-gdb_test_multiple "break pendfunc1" "set pending breakpoint" {
-     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
-	    gdb_test "y" "Breakpoint.*pendfunc1.*pending." "set pending breakpoint"
-     }
-}
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y.*PENDING.*pendfunc1.*" \
-"single pending breakpoint info"
-
-#
-# Test breaking at existing function
-#
-
-set mainline [gdb_get_line_number "break main here"]
-
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line $mainline.*" \
-    "breakpoint function"
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y.*PENDING.*pendfunc1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$mainline" \
-"pending plus real breakpoint info"
-
-
-# 
-# Test not setting a pending breakpoint 
-#
-gdb_test_multiple "break pendfunc2" "Don't set pending breakpoint" {
-     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
-	    gdb_test "n" "" "Don't set pending breakpoint"
-     }
-}
-
-#
-# Add condition to pending breakpoint 
-#
-
-gdb_test "condition 1 k == 1" ""
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y.*PENDING.*pendfunc1.*
-\[\t \]+stop only if k == 1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$mainline" \
-"pending plus condition"
-
-#
-# Disable pending breakpoint
-#
-
-gdb_test "disable 1" ""
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep n.*PENDING.*pendfunc1.*
-\[\t \]+stop only if k == 1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$mainline" \
-"pending disabled"
-
-#
-# Add commands to pending breakpoint
-#
-gdb_test "commands 1\nprint k\nend" "" \
-        "Set commands for pending breakpoint"
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep n.*PENDING.*pendfunc1.*
-\[\t \]+stop only if k == 1.*
-\[\t \]+print k.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$mainline" \
-"pending disabled plus commands"
-
-#
-# Try a pending break for a line in a source file with a condition
-#
-
-gdb_test_multiple "break pendshr.c:26 if x > 3" "Set pending breakpoint 2" {
-     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
-	    gdb_test "y" "Breakpoint.*pendshr.c:26.*pending." \
-		"Set pending breakpoint 2"
-     }
-}
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep n.*PENDING.*pendfunc1.*
-\[\t \]+stop only if k == 1.*
-\[\t \]+print k.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$mainline.*
-\[0-9\]+\[\t \]+breakpoint     keep y.*PENDING.*pendshr.c:26 if x > 3.*" \
-"multiple pending breakpoints"
-
-
-#
-# Try a pending break for a line in a source file with ignore count:
-#
-
-gdb_test_multiple "break pendshr.c:27" "Set pending breakpoint 3" {
-     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
-	    gdb_test "y" "Breakpoint.*pendshr.c:27.*pending." \
-		"Set pending breakpoint 3"
-     }
-}
-
-gdb_test {ignore $bpnum 2} "Will ignore next 2 crossings of breakpoint .*" \
-    "set ignore count on pending breakpoint 3"
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep n.*PENDING.*pendfunc1.*
-\[\t \]+stop only if k == 1.*
-\[\t \]+print k.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$mainline.*
-\[0-9\]+\[\t \]+breakpoint     keep y.*PENDING.*pendshr.c:26 if x > 3.*
-\[0-9\]+\[\t \]+breakpoint     keep y.*PENDING.*pendshr.c:27.*ignore next 2 hits.*" \
-"multiple pending breakpoints 2"
-
-#
-# Run to main which should resolve a pending breakpoint
-#
-
-gdb_test "run" \
-"Breakpoint.*at.*
-Pending breakpoint \"pendshr.c:26 if x > 3\" resolved.*
-Breakpoint.*, main.*$mainline.*" \
-"running to main"
-
-#
-# Re-enable the first pending breakpoint which should resolve
-#
-
-gdb_test "enable 1" \
-"Breakpoint.*at.*
-Pending breakpoint \"pendfunc1.* resolved.*" \
-"re-enabling pending breakpoint that can resolve instantly"
-
-#
-# Continue to verify conditionals and commands for breakpoints are honored
-#
-
-gdb_test "continue" \
-".*Breakpoint.*pendfunc1.*at.*pendshr.c:26.*4;" \
-"continue to resolved breakpoint 2"
-
-gdb_test "continue" \
-".*Breakpoint.*pendfunc1.*at.*pendshr.c:26.*
-\[$\]1 = 1." \
-"continue to resolved breakpoint 1"
-
-#
-# Disable the other two breakpoints, and continue to the one with
-# the ignore count.  Make sure you hit it the third time, x should
-# be 3 then.
-#
-
-gdb_test "disable 7" "" "Disable other breakpoints"
-gdb_test "disable 5" "" "Disable other breakpoints"
-
-gdb_test "continue" \
-	{.*Breakpoint.*pendfunc1.*\(x=3\) at.*pendshr.c:27.*printf.*;} \
-"continue to resolved breakpoint 3"
-
-delete_breakpoints
-
-gdb_breakpoint "main"
-
-#
-# Set non-existent pending breakpoint
-#
-gdb_test_multiple "break imaginary" "set imaginary pending breakpoint" {
-     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
-	    gdb_test "y" "Breakpoint.*imaginary.*pending." \
-		"set imaginary pending breakpoint"
-     }
-}
-
-#
-# rerun program and make sure that any pending breakpoint remains and no
-# error messages are issued for the missing function
-#
-
-rerun_to_main
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$mainline.*
-\[0-9\]+\[\t \]+breakpoint     keep y.*PENDING.*imaginary.*" \
-"verify pending breakpoint after restart"
diff --git a/gdb/testsuite/gdb.base/pendshr.c b/gdb/testsuite/gdb.base/pendshr.c
deleted file mode 100644
index 672fe8ab7ee..00000000000
--- a/gdb/testsuite/gdb.base/pendshr.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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  */
-
-#include <stdio.h>
-
-void pendfunc1 (int x)
-{
-  int y = x + 4;
-  printf ("in pendfunc1, x is %d\n", x);
-}
-
-void pendfunc (int x)
-{
-  pendfunc1 (x);
-}
diff --git a/gdb/testsuite/gdb.base/pointers.c b/gdb/testsuite/gdb.base/pointers.c
deleted file mode 100644
index 85bfdc98917..00000000000
--- a/gdb/testsuite/gdb.base/pointers.c
+++ /dev/null
@@ -1,216 +0,0 @@
-
-#if !defined (__STDC__) && !defined (_AIX)
-#define signed  /**/
-#endif
-
-char		v_char;
-signed char	v_signed_char;
-unsigned char	v_unsigned_char;
-
-short		v_short;
-signed short	v_signed_short;
-unsigned short	v_unsigned_short;
-
-int		v_int;
-signed int	v_signed_int;
-unsigned int	v_unsigned_int;
-
-long		v_long;
-signed long	v_signed_long;
-unsigned long	v_unsigned_long;
-
-float		v_float;
-double		v_double;
-
-
-
-char		*v_char_pointer;
-signed char	*v_signed_char_pointer;
-unsigned char	*v_unsigned_char_pointer;
-
-short		*v_short_pointer;
-signed short	*v_signed_short_pointer;
-unsigned short	*v_unsigned_short_pointer;
-
-int		*v_int_pointer;
-int             *v_int_pointer2;
-signed int	*v_signed_int_pointer;
-unsigned int	*v_unsigned_int_pointer;
-
-long		*v_long_pointer;
-signed long	*v_signed_long_pointer;
-unsigned long	*v_unsigned_long_pointer;
-
-float		*v_float_pointer;
-double		*v_double_pointer;
-
-
-char		v_char_array[2];
-signed char	v_signed_char_array[2];
-unsigned char	v_unsigned_char_array[2];
-
-short		v_short_array[2];
-signed short	v_signed_short_array[2];
-unsigned short	v_unsigned_short_array[2];
-
-int		v_int_array[2];
-signed int	v_signed_int_array[2];
-unsigned int	v_unsigned_int_array[2];
-
-long		v_long_array[2];
-signed long	v_signed_long_array[2];
-unsigned long	v_unsigned_long_array[2];
-
-float		v_float_array[2];
-double		v_double_array[2];
-
-int matrix[2][3] = { { 0, 1, 2}, {3, 4, 5}};
-int (*rptr)[3] = matrix;
-
-float ** ptr_to_ptr_to_float;
-
-int y;
-
-/* Do nothing function used for forcing some of the above variables to
-   be referenced by the program source.  If the variables are not
-   referenced, some linkers will remove the symbol from the symbol
-   table making it impossible to refer to the variable in gdb.  */
-void usevar (void *var) {}
-
-int main ()
-{
-  void dummy();
-  int more_code();
-  
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  dummy();
-
-  more_code ();
-
-  usevar (&v_int_pointer2);
-  usevar (&rptr);
-  usevar (&y);
-
-  return 0;
-  
-}
-
-void dummy()
-{
-    
-  
-  v_char = 0;
-  v_signed_char = 1;
-  v_unsigned_char = 2;
-
-  v_short = 3;
-  v_signed_short = 4;
-  v_unsigned_short = 5;    
-
-  v_int = 6;
-  v_signed_int = 7;
-  v_unsigned_int = 8;    
-
-  v_long = 9;
-  v_signed_long = 10;
-  v_unsigned_long = 11;    
-  
-  v_float = 100.0;
-  v_double = 200.0;
-
-
-
-  v_char_pointer = &v_char;
-  v_signed_char_pointer = &v_signed_char;
-  v_unsigned_char_pointer = &v_unsigned_char;
-
-  v_short_pointer = &v_short;
-  v_signed_short_pointer = &v_signed_short;
-  v_unsigned_short_pointer = &v_unsigned_short;
-
-  v_int_pointer = &v_int;
-  v_signed_int_pointer = &v_signed_int;
-  v_unsigned_int_pointer = &v_unsigned_int;
-
-  v_long_pointer = &v_long;
-  v_signed_long_pointer = &v_signed_long;
-  v_unsigned_long_pointer = &v_unsigned_long;
-
-  v_float_pointer = &v_float;
-  v_double_pointer = &v_double;
-
-  ptr_to_ptr_to_float = &v_float_pointer;
-  
-  
-  v_char_array[0] = v_char;
-  v_signed_char_array[0] = v_signed_char;
-  v_unsigned_char_array[0] = v_unsigned_char;
-
-  v_short_array[0] = v_short;
-  v_signed_short_array[0] = v_signed_short;
-  v_unsigned_short_array[0] = v_unsigned_short;
-
-  v_int_array[0] = v_int;
-  v_int_array[1] = v_int * 3;
-  
-  v_signed_int_array[0] = v_signed_int;
-  v_unsigned_int_array[0] = v_unsigned_int;
-
-  v_long_array[0] = v_long;
-  v_signed_long_array[0] = v_signed_long;
-  v_unsigned_long_array[0] = v_unsigned_long;
-
-  v_float_array[0] = v_float;
-  v_double_array[0] = v_double;
-
-}
-
-void marker1 ()
-{
-}
-
-int more_code()
-{
-    char C, *pC, **ppC, ***pppC, ****ppppC, *****pppppC, ******ppppppC;
-    unsigned char UC, *pUC;
-    short S, *pS;
-    unsigned short US, *pUS;
-    int I, *pI;
-    unsigned int UI, *pUI;
-    long L, *pL;
-    unsigned long UL, *pUL;
-    float F, *pF;
-    double D, *pD;
-
-    C = 'A';
-    UC = 21;
-    S = -14;
-    US = 7;
-    I = 102;
-    UI = 1002;
-    L = -234;
-    UL = 234;
-    F = 1.25E10;
-    D = -1.25E-37;
-    pC = &C;
-    ppC = &pC;
-    pppC = &ppC;
-    ppppC = &pppC;
-    pppppC = &ppppC;
-    ppppppC = &pppppC;
-    pUC = &UC;
-    pS = &S;
-    pUS = &US;
-    pI = &I;
-    pUI = &UI;
-    pL = &L;
-    pUL = &UL;
-    pF = &F;
-    pD = &D;
-    
-    marker1();
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
deleted file mode 100644
index a10a7f3b4cc..00000000000
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ /dev/null
@@ -1,601 +0,0 @@
-# Copyright 1998, 1999, 2000 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite
-#
-# tests for pointer arithmetic and pointer dereferencing
-# with integer type variables and pointers to integers
-# 
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "pointers"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_test "next " "more_code.*;" "continuing after dummy()"
-
-
-#
-# let's see if gdb catches some illegal operations on pointers
-#
-# I must comment these out because strict type checking is not
-# supported in this version of GDB. I do not really know
-# what the expected gdb reply is.
-#
-
-#send_gdb "print v_int_pointer2 = &v_int_pointer\n"
-#gdb_expect {
-#    -re ".*.*$gdb_prompt $" {
-#        pass "illegal pointer assignment rejected"
-#      }
-#    -re ".*$gdb_prompt $" { fail "illegal pointer assignment rejected" }
-#    timeout           { fail "(timeout) illegal pointer assignment rejected" }    
-#  }
-
-
-#send_gdb "print v_unsigned_int_pointer = &v_int\n"
-#gdb_expect {
-#    -re ".*.*$gdb_prompt $" {
-#        pass "illegal pointer assignment rejected"
-#      }
-#    -re ".*$gdb_prompt $" { fail "illegal pointer assignment rejected" }
-#    timeout           { fail "(timeout) ilegal pointer assignment rejected" }    
-#  }
-
-#send_gdb "print v_unsigned_int_pointer == v_double_pointer\n"
-#gdb_expect {
-#    -re ".*.*$gdb_prompt $" {
-#        pass "illegal pointer operation (+) rejected"
-#      }
-#    -re ".*$gdb_prompt $" { fail "illegal pointer operation (+) rejected" }
-#    timeout           { fail "(timeout) illegal pointer operation (+) rejected" }    
-#  }
-
-
-#send_gdb "print v_unsigned_int_pointer * v_double_pointer\n"
-#gdb_expect {
-#    -re ".*Argument to arithmetic operation not a number or boolean.*$gdb_prompt $" {
-#        pass "illegal pointer operation (*) rejected"
-#      }
-#    -re ".*$gdb_prompt $" { fail "illegal pointer operation (*) rejected" }
-#    timeout           { fail "(timeout) illegal pointer operation (*) rejected" }    
-#  }
-
-
-#send_gdb "print v_unsigned_int_pointer = v_double_pointer\n"
-#gdb_expect {
-#    -re ".*.*$gdb_prompt $" {
-#        pass "ilegal pointer assignment rejected"
-#      }
-#    -re ".*$gdb_prompt $" { fail "illegal pointer assignment rejected" }
-#    timeout           { fail "(timeout) illegal pointer assignment rejected" }    
-#  }
-
-
-#send_gdb "print v_unsigned_int_pointer = v_unsigned_int\n"
-#gdb_expect {
-#    -re ".*.*$gdb_prompt $" {
-#        pass "illegal pointer assignment rejected"
-#      }
-#    -re ".*$gdb_prompt $" { fail "illegal pointer assignment rejected" }
-#    timeout           { fail "(timeout) illegal pointer assignment rejected" }    
-#  }
-
-gdb_test "set variable v_int_pointer=&v_int_array\[0\]" "" "set pointer to beginning of array"
-gdb_test "set variable v_int_pointer2=&v_int_array\[1\]" "" "set pointer to end of array"
-
-
-send_gdb "print *v_int_pointer\n"
-gdb_expect {
-    -re ".*= 6.*$gdb_prompt $" {
-        pass "print object pointed to"
-      }
-    -re ".*$gdb_prompt $" { fail "print object pointed to" }
-    timeout           { fail "(timeout) print object pointed to" }    
-  }
-  
-send_gdb "print *v_int_pointer2\n"
-gdb_expect {
-    -re ".*= 18.*$gdb_prompt $" {
-        pass "print object pointed to"
-      }
-    -re ".*$gdb_prompt $" { fail "print object pointed to" }
-    timeout           { fail "(timeout) print object pointed to" }    
-  }
-
-
-send_gdb "print v_int_pointer == v_int_pointer2\n"
-gdb_expect {
-    -re ".*= $false.*$gdb_prompt $" {
-        pass "pointer1==pointer2"
-      }
-    -re ".*$gdb_prompt $" { fail "pointer1==pointer2" }
-    timeout           { fail "(timeout) pointer1==pointer2" }    
-  }
-
-send_gdb "print v_int_pointer != v_int_pointer2\n"
-gdb_expect {
-    -re ".*= $true.*$gdb_prompt $" {
-        pass "pointer1!=pointer2"
-      }
-    -re ".*$gdb_prompt $" { fail "pointer1!=pointer2" }
-    timeout           { fail "(timeout) pointer1!=pointer2" }    
-  }
-
-
-send_gdb "print v_int_pointer <= v_int_pointer2\n"
-gdb_expect {
-    -re ".*= $true.*$gdb_prompt $" {
-        pass "pointer1<=pointer2"
-      }
-    -re ".*$gdb_prompt $" { fail "pointer1<=pointer2" }
-    timeout           { fail "(timeout) pointer1<=pointer2" }    
-  }
-
-
-send_gdb "print v_int_pointer >= v_int_pointer2\n"
-gdb_expect {
-    -re ".*= $false.*$gdb_prompt $" {
-        pass "pointer1>=pointer2"
-      }
-    -re ".*$gdb_prompt $" { fail "pointer1>=pointer2" }
-    timeout           { fail "(timeout) pointer1>=pointer2" }    
-  }
-
-
-send_gdb "print v_int_pointer < v_int_pointer2\n"
-gdb_expect {
-    -re ".*= $true.*$gdb_prompt $" {
-        pass "pointer1<pointer2"
-      }
-    -re ".*$gdb_prompt $" { fail "pointer1<pointer2" }
-    timeout           { fail "(timeout) pointer1<pointer2" }    
-  }
-
-send_gdb "print v_int_pointer > v_int_pointer2\n"
-gdb_expect {
-    -re ".*= $false.*$gdb_prompt $" {
-        pass "pointer1>pointer2"
-      }
-    -re ".*$gdb_prompt $" { fail "pointer1>pointer2" }
-    timeout           { fail "(timeout) pointer1>pointer2" }    
-  }
-
-
-gdb_test "set variable y = *v_int_pointer++" "" "set y = *v_int_pointer++"
-send_gdb "print y\n"
-gdb_expect {
-    -re ".*= 6.*$gdb_prompt $" {
-        send_gdb "print *v_int_pointer\n"
-        gdb_expect {
-             -re ".*= 18.*$gdb_prompt $" {
-                 pass "pointer assignment and increment"
-               }
-             -re ".*$gdb_prompt $" { fail "pointer assignment and increment" }
-             timeout           { fail "(timeout) pointer assignment and increment" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "pointer assignment and increment" }
-    timeout           { fail "(timeout) pointer assignment and increment" }    
-  }
-
-
-
-
-gdb_test "set variable y = *--v_int_pointer2" "" "set y = *--v_int_pointer2"
-send_gdb "print y\n"
-gdb_expect {
-    -re ".*= 6.*$gdb_prompt $" {
-        send_gdb "print *v_int_pointer2\n"
-        gdb_expect {
-             -re ".*= 6.*$gdb_prompt $" {
-                 pass "pointer decrement and assignment"
-               }
-             -re ".*$gdb_prompt $" { fail "pointer decrement and assignment" }
-             timeout           { fail "(timeout) pointer decrement and assignment" }    
-         }
-         }
-    -re ".*$gdb_prompt $" { fail "pointer decrement and assignment" }
-    timeout           { fail "(timeout) pointer decrement and assignment" }    
-  }
-
-gdb_test "set variable y =v_int_pointer-v_int_pointer2" "" "set y =v_int_pointer-v_int_pointer2"
-send_gdb "print y\n"
-gdb_expect {
-    -re ".*= 1.*$gdb_prompt $" {
-        pass "pointer1-pointer2"
-      }
-    -re ".*$gdb_prompt $" { fail "pointer1-pointer2" }
-    timeout           { fail "(timeout) pointer1-pointer2" }    
-  }
-
-gdb_test "set variable v_int_pointer=v_int_array" "" "set v_int_pointer=v_int_array"
-send_gdb "print *v_int_pointer\n"
-gdb_expect {
-    -re ".*= 6.*$gdb_prompt $" {
-        pass "print array element through pointer"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element through pointer" }
-    timeout           { fail "(timeout) print array element through pointer" }    
-  }
-
-
-send_gdb "print *(v_int_pointer+1)\n"
-gdb_expect {
-    -re ".*= 18.*$gdb_prompt $" {
-        pass "print array element through pointer"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element through pointer" }
-    timeout           { fail "(timeout) print array element through pointer" }    
-  }
-
-# test print elements of array through pointers
-
-send_gdb "print (*rptr)\[0\]\n"
-gdb_expect {
-    -re ".*= 0.*$gdb_prompt $" {
-        pass "print array element through pointer"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element through pointer" }
-    timeout           { fail "(timeout) print array element through pointer" }    
-  }
-
-send_gdb "print (*rptr)\[1\]\n"
-gdb_expect {
-    -re ".*= 1.*$gdb_prompt $" {
-        pass "print array element through pointer"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element through pointer" }
-    timeout           { fail "(timeout) print array element through pointer" }    
-  }
-
-
-send_gdb "print (*rptr)\[2\]\n"
-gdb_expect {
-    -re ".*= 2.*$gdb_prompt $" {
-        pass "print array element through pointer"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element through pointer" }
-    timeout           { fail "(timeout) print array element through pointer" }    
-  }
-
-gdb_test "set variable rptr = rptr+1" "" "increment rptr"
-
-send_gdb "print (*rptr)\[0\]\n"
-gdb_expect {
-    -re ".*= 3.*$gdb_prompt $" {
-        pass "print array element through pointer"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element through pointer" }
-    timeout           { fail "(timeout) print array element through pointer" }    
-  }
-
-
-send_gdb "print (*rptr)\[1\]\n"
-gdb_expect {
-    -re ".*= 4.*$gdb_prompt $" {
-        pass "print array element through pointer"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element through pointer" }
-    timeout           { fail "(timeout) print array element through pointer" }    
-  }
-
-
-send_gdb "print (*rptr)\[2\]\n"
-gdb_expect {
-    -re ".*= 5.*$gdb_prompt $" {
-        pass "print array element through pointer"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element through pointer" }
-    timeout           { fail "(timeout) print array element through pointer" }    
-  }
-
-
-send_gdb "print *( *(matrix+1) +2)\n"
-gdb_expect {
-    -re ".*= 5.*$gdb_prompt $" {
-        pass "print array element w/ pointer arithmetic"
-      }
-    -re ".*$gdb_prompt $" { fail "print array element w/ pointer arithemtic" }
-    timeout           { fail "(timeout) print array element w/ pointer arithmetic" }    
-  }
-
-
-send_gdb "print **ptr_to_ptr_to_float\n"
-gdb_expect {
-    -re ".*= 100.*$gdb_prompt $" {
-        pass "print through ptr to ptr"
-      }
-    -re ".*$gdb_prompt $" { fail "print through ptr to ptr" }
-    timeout           { fail "(timeout) print through ptr to ptr" }    
-  }
-
-# tests for pointers 
-# with elementary type variables and pointers.
-# 
-
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-
-send_gdb "cont\n"
-gdb_expect {
-    -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
-	pass "continue to marker1"
-	send_gdb "up\n"
-	gdb_expect {
-	    -re ".*more_code.*$gdb_prompt $" {
-		pass "up from marker1"
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "up from marker1"
-	    }
-	    timeout { fail "up from marker1 (timeout)" }
-	}
-    }
-    -re "$gdb_prompt $" {
-	fail "continue to marker1"
-    }
-    timeout {
-	fail "continue to marker1 (timeout)"
-    }
-}
-
-
-send_gdb "print *pUC\n"
-gdb_expect {
-    -re ".\[0-9\]* = 21 \'.025\'.*$gdb_prompt $" {
-        pass "print value of *pUC"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pUC" }
-    timeout           { fail "(timeout) print value of *pUC" }
-  }
-
-
-send_gdb "ptype pUC\n"
-gdb_expect {
-    -re "type = unsigned char \\*.*$gdb_prompt $"  { pass "ptype pUC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pUC" }
-    timeout             { fail "(timeout) ptype pUC" }
-}
-
-send_gdb "print *pS\n"
-gdb_expect {
-    -re ".\[0-9\]* = -14.*$gdb_prompt $" {
-        pass "print value of *pS"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pS" }
-    timeout           { fail "(timeout) print value of *pS" }
-  }
-
-
-send_gdb "ptype pS\n"
-gdb_expect {
-    -re "type = short \\*.*$gdb_prompt $"  { pass "ptype pS" }
-    -re "type = short int \\*.*$gdb_prompt $"  { pass "ptype pS" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pS" }
-    timeout             { fail "(timeout) ptype pS" }
-}
-
-send_gdb "print *pUS\n"
-gdb_expect {
-    -re ".\[0-9\]* = 7.*$gdb_prompt $" {
-        pass "print value of *pUS"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pUS" }
-    timeout           { fail "(timeout) print value of *pUS" }
-  }
-
-
-send_gdb "ptype pUS\n"
-gdb_expect {
-    -re "type = unsigned short \\*.*$gdb_prompt $"  { pass "ptype pUS" }
-    -re "type = short unsigned int \\*.*$gdb_prompt $"  { pass "ptype pUS" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pUS" }
-    timeout             { fail "(timeout) ptype pUS" }
-}
-
-send_gdb "print *pI\n"
-gdb_expect {
-    -re ".\[0-9\]* = 102.*$gdb_prompt $" {
-        pass "print value of *pI"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pI" }
-    timeout           { fail "(timeout) print value of *pI" }
-  }
-
-
-send_gdb "ptype pI\n"
-gdb_expect {
-    -re "type = int \\*.*$gdb_prompt $"  { pass "ptype pI" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pI" }
-    timeout             { fail "(timeout) ptype pI" }
-}
-
-send_gdb "print *pUI\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1002.*$gdb_prompt $" {
-        pass "print value of *pUI"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pUI" }
-    timeout           { fail "(timeout) print value of *pUI" }
-  }
-
-
-send_gdb "ptype pUI\n"
-gdb_expect {
-    -re "type = unsigned int \\*.*$gdb_prompt $"  { pass "ptype pUI" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pUI" }
-    timeout             { fail "(timeout) ptype pUI" }
-}
-
-send_gdb "print *pL\n"
-gdb_expect {
-    -re ".\[0-9\]* = -234.*$gdb_prompt $" {
-        pass "print value of *pL"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pL" }
-    timeout           { fail "(timeout) print value of *pL" }
-  }
-
-
-send_gdb "ptype pL\n"
-gdb_expect {
-    -re "type = long \\*.*$gdb_prompt $"  { pass "ptype pL" }
-    -re "type = long int \\*.*$gdb_prompt $"  { pass "ptype pL" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pL" }
-    timeout             { fail "(timeout) ptype pL" }
-}
-
-send_gdb "print *pUL\n"
-gdb_expect {
-    -re ".\[0-9\]* = 234.*$gdb_prompt $" {
-        pass "print value of *pUL"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pUL" }
-    timeout           { fail "(timeout) print value of *pUL" }
-  }
-
-
-send_gdb "ptype pUL\n"
-gdb_expect {
-    -re "type = unsigned long \\*.*$gdb_prompt $"  { pass "ptype pUL" }
-    -re "type = long unsigned int \\*.*$gdb_prompt $"  { pass "ptype pUL" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pUL" }
-    timeout             { fail "(timeout) ptype pUL" }
-}
-
-send_gdb "print *pF\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.2\[0-9\]*e\\+10.*$gdb_prompt $" {
-        pass "print value of *pF"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pF" }
-    timeout           { fail "(timeout) print value of *pF" }
-  }
-
-
-send_gdb "ptype pF\n"
-gdb_expect {
-    -re "type = float \\*.*$gdb_prompt $"  { pass "ptype pF" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pF" }
-    timeout             { fail "(timeout) ptype pF" }
-}
-
-send_gdb "print *pD\n"
-gdb_expect {
-    -re ".\[0-9\]* = -1.2\[0-9\]*e\\-37.*$gdb_prompt $" {
-        pass "print value of *pD"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *pD" }
-    timeout           { fail "(timeout) print value of *pD" }
-  }
-
-
-send_gdb "ptype pD\n"
-gdb_expect {
-    -re "type = double \\*.*$gdb_prompt $"  { pass "ptype pD" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pD" }
-    timeout             { fail "(timeout) ptype pD" }
-}
-
-send_gdb "print ******ppppppC\n"
-gdb_expect {
-    -re ".\[0-9\]* = 65 \'A\'.*$gdb_prompt $" {
-        pass "print value of ******ppppppC"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ******ppppppC" }
-    timeout           { fail "(timeout) print value of ******ppppppC" }
-  }
-
-
-send_gdb "ptype pC\n"
-gdb_expect {
-    -re "type = char \\*.*$gdb_prompt $"  { pass "ptype pC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pC" }
-    timeout             { fail "(timeout) ptype pC" }
-}
-
-send_gdb "ptype ppC\n"
-gdb_expect {
-    -re "type = char \\*\\*.*$gdb_prompt $"  { pass "ptype ppC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype ppC" }
-    timeout             { fail "(timeout) ptype ppC" }
-}
-
-send_gdb "ptype pppC\n"
-gdb_expect {
-    -re "type = char \\*\\*\\*.*$gdb_prompt $"  { pass "ptype pppC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pppC" }
-    timeout             { fail "(timeout) ptype pppC" }
-}
-
-send_gdb "ptype ppppC\n"
-gdb_expect {
-    -re "type = char \\*\\*\\*\\*.*$gdb_prompt $"  { pass "ptype ppppC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype ppppC" }
-    timeout             { fail "(timeout) ptype ppppC" }
-}
-
-send_gdb "ptype pppppC\n"
-gdb_expect {
-    -re "type = char \\*\\*\\*\\*\\*.*$gdb_prompt $"  { pass "ptype pppppC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype pppppC" }
-    timeout             { fail "(timeout) ptype pppppC" }
-}
-
-send_gdb "ptype ppppppC\n"
-gdb_expect {
-    -re "type = char \\*\\*\\*\\*\\*\\*.*$gdb_prompt $"  { pass "ptype ppppppC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype ppppppC" }
-    timeout             { fail "(timeout) ptype ppppppC" }
-}
-
diff --git a/gdb/testsuite/gdb.base/printcmds.c b/gdb/testsuite/gdb.base/printcmds.c
deleted file mode 100644
index 8eddeeeccf8..00000000000
--- a/gdb/testsuite/gdb.base/printcmds.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* This table is used as a source for every ascii character.
-   It is explicitly unsigned to avoid differences due to native characters
-   being either signed or unsigned. */
-#include <stdlib.h>
-unsigned char ctable1[256] = {
-  0000, 0001, 0002, 0003, 0004, 0005, 0006, 0007,
-  0010, 0011, 0012, 0013, 0014, 0015, 0016, 0017,
-  0020, 0021, 0022, 0023, 0024, 0025, 0026, 0027,
-  0030, 0031, 0032, 0033, 0034, 0035, 0036, 0037,
-  0040, 0041, 0042, 0043, 0044, 0045, 0046, 0047,
-  0050, 0051, 0052, 0053, 0054, 0055, 0056, 0057,
-  0060, 0061, 0062, 0063, 0064, 0065, 0066, 0067,
-  0070, 0071, 0072, 0073, 0074, 0075, 0076, 0077,
-  0100, 0101, 0102, 0103, 0104, 0105, 0106, 0107,
-  0110, 0111, 0112, 0113, 0114, 0115, 0116, 0117,
-  0120, 0121, 0122, 0123, 0124, 0125, 0126, 0127,
-  0130, 0131, 0132, 0133, 0134, 0135, 0136, 0137,
-  0140, 0141, 0142, 0143, 0144, 0145, 0146, 0147,
-  0150, 0151, 0152, 0153, 0154, 0155, 0156, 0157,
-  0160, 0161, 0162, 0163, 0164, 0165, 0166, 0167,
-  0170, 0171, 0172, 0173, 0174, 0175, 0176, 0177,
-  0200, 0201, 0202, 0203, 0204, 0205, 0206, 0207,
-  0210, 0211, 0212, 0213, 0214, 0215, 0216, 0217,
-  0220, 0221, 0222, 0223, 0224, 0225, 0226, 0227,
-  0230, 0231, 0232, 0233, 0234, 0235, 0236, 0237,
-  0240, 0241, 0242, 0243, 0244, 0245, 0246, 0247,
-  0250, 0251, 0252, 0253, 0254, 0255, 0256, 0257,
-  0260, 0261, 0262, 0263, 0264, 0265, 0266, 0267,
-  0270, 0271, 0272, 0273, 0274, 0275, 0276, 0277,
-  0300, 0301, 0302, 0303, 0304, 0305, 0306, 0307,
-  0310, 0311, 0312, 0313, 0314, 0315, 0316, 0317,
-  0320, 0321, 0322, 0323, 0324, 0325, 0326, 0327,
-  0330, 0331, 0332, 0333, 0334, 0335, 0336, 0337,
-  0340, 0341, 0342, 0343, 0344, 0345, 0346, 0347,
-  0350, 0351, 0352, 0353, 0354, 0355, 0356, 0357,
-  0360, 0361, 0362, 0363, 0364, 0365, 0366, 0367,
-  0370, 0371, 0372, 0373, 0374, 0375, 0376, 0377
-};
-
-unsigned char ctable2[] = {
-  'a','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X',
-  'a','a','X','X','X','X','X','X','X','X','X','X','X','X','X','X',
-  'a','a','a','X','X','X','X','X','X','X','X','X','X','X','X','X',
-  'a','a','a','a','X','X','X','X','X','X','X','X','X','X','X','X',
-  'a','a','a','a','a','X','X','X','X','X','X','X','X','X','X','X',
-  'a','a','a','a','a','a','X','X','X','X','X','X','X','X','X','X',
-  'a','a','a','a','a','a','a','X','X','X','X','X','X','X','X','X',
-  'a','a','a','a','a','a','a','a','X','X','X','X','X','X','X','X',
-  'a','a','a','a','a','a','a','a','a','X','X','X','X','X','X','X',
-  'a','a','a','a','a','a','a','a','a','a','X','X','X','X','X','X',
-  'a','a','a','a','a','a','a','a','a','a','a','X','X','X','X','X',
-  'a','a','a','a','a','a','a','a','a','a','a','a','X','X','X','X',
-  'a','a','a','a','a','a','a','a','a','a','a','a','a','X','X','X',
-  'a','a','a','a','a','a','a','a','a','a','a','a','a','a','X','X',
-  'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','X',
-  'a','a','a','a','a','a','a','a','a','a','a','a','a','a','a','a', 0
-};
-
-/* Single and multidimensional arrays to test access and printing of array
-   members. */
-
-typedef int ArrayInt [10];
-ArrayInt a1 = {2,4,6,8,10,12,14,16,18,20};
-
-typedef char ArrayChar [5];
-ArrayChar a2 = {'a','b','c','d','\0'};
-
-int int1dim[12] = {0,1,2,3,4,5,6,7,8,9,10,11};
-int int2dim[3][4] = {{0,1,2,3},{4,5,6,7},{8,9,10,11}};
-int int3dim[2][3][2] = {{{0,1},{2,3},{4,5}},{{6,7},{8,9},{10,11}}};
-int int4dim[1][2][3][2] = {{{{0,1},{2,3},{4,5}},{{6,7},{8,9},{10,11}}}};
-
-char *teststring = (char*)"teststring contents";
-
-/* Test printing of a struct containing character arrays. */
-
-struct some_arrays {
-    unsigned char array1[4];
-    unsigned char array2[1];
-    unsigned char array3[1];
-    unsigned char array4[2];
-    unsigned char array5[4];
-} arrays = {
-  {'a', 'b', 'c', '\0'},
-  {'d'},
-  {'e'},
-  {'f', 'g' },
-  {'h', 'i', 'j', '\0'}
-};
-
-struct some_arrays *parrays = &arrays;
-
-/* -- */
-
-int main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  malloc(1);
-
-  /* Prevent AIX linker from removing variables.  */
-  return ctable1[0] + ctable2[0] + int1dim[0] + int2dim[0][0]
-    + int3dim[0][0][0] + int4dim[0][0][0][0] + teststring[0] +
-      *parrays -> array1 + a1[0] + a2[0];
-}
diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
deleted file mode 100644
index e532d71de09..00000000000
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ /dev/null
@@ -1,717 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004
-# Free Software Foundation, 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@gnu.org
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "printcmds"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Set the current language to C.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_c {} {
-    global gdb_prompt
-
-    if [gdb_test "set language c" "" "set language c"] {
-	return 0
-    }
-
-    if [gdb_test "show language" ".* source language is \"c\".*"] {
-	return 0
-    }
-    return 1;
-}
-
-proc test_integer_literals_accepted {} {
-    global gdb_prompt
-
-    # Test various decimal values.
-
-    gdb_test "p 123" " = 123"
-    gdb_test "p -123" " = -123"
-    gdb_test "p/d 123" " = 123"
-
-    # Test various octal values.
-
-    gdb_test "p 0123" " = 83"
-    gdb_test "p 00123" " = 83"
-    gdb_test "p -0123" " = -83"
-    gdb_test "p/o 0123" " = 0123"
-
-    # Test various hexadecimal values.
-
-    gdb_test "p 0x123" " = 291"
-    gdb_test "p -0x123" " = -291"
-    gdb_test "p 0x0123" " = 291"
-    gdb_test "p -0x0123" " = -291"
-    gdb_test "p 0xABCDEF" " = 11259375"
-    gdb_test "p 0xabcdef" " = 11259375"
-    gdb_test "p 0xAbCdEf" " = 11259375"
-    gdb_test "p/x 0x123" " = 0x123"
-}
-
-proc test_character_literals_accepted {} {
-    global gdb_prompt
-
-    gdb_test "p 'a'" " = 97 'a'"
-    gdb_test "p/c 'a'" " = 97 'a'"
-    gdb_test "p/x 'a'" " = 0x61"
-    gdb_test "p/d 'a'" " = 97"
-    gdb_test "p/t 'a'" " = 1100001"
-    gdb_test "p '\\141'" " = 97 'a'"
-    gdb_test "p/x '\\377'" " = 0xff"
-    # Note "p '\''" => "= 39 '\''"
-    gdb_test "p '\\''" " = 39 '\\\\''"
-    # Note "p '\\'" => "= 92 '\\'"
-    gdb_test "p '\\\\'" " = 92 '\\\\\\\\'"
-}
-
-proc test_integer_literals_rejected {} {
-    global gdb_prompt
-
-    test_print_reject "p 0x" 
-    gdb_test "p ''" "(Empty character constant\\.|A character constant must contain at least one character\\.)"
-    gdb_test "p '''" "(Empty character constant\\.|A character constant must contain at least one character\\.)"
-    test_print_reject "p '\\'"
-
-    # Note that this turns into "p '\\\'" at gdb's input.
-    test_print_reject "p '\\\\\\'"
-
-    # Test various decimal values.
-
-    test_print_reject "p DEADBEEF"
-
-    # Gdb currently fails this test for all configurations.  The C
-    # lexer thinks that 123DEADBEEF is a floating point number, but
-    # then fails to notice that atof() only eats the 123 part.
-    # FIXME:  This should be put into PRMS.
-    # Fixed, 4/25/97, by Bob Manson.
-
-    test_print_reject "p 123DEADBEEF"
-    test_print_reject "p 123foobar.bazfoo3"
-    test_print_reject "p 123EEEEEEEEEEEEEEEEE33333k333"
-    gdb_test "p 123.4+56.7" "180.(099\[0-9]*|100\[0-9\]*)" "check for floating addition"
-
-    # Test various octal values.
-
-    test_print_reject "p 09" 
-    test_print_reject "p 079" 
-
-    # Test various hexadecimal values.
-
-    test_print_reject "p 0xG" 
-    test_print_reject "p 0xAG" 
-}
-
-proc test_print_all_chars {} {
-    global gdb_prompt
-
-    gdb_test "p ctable1\[0\]"   " = 0 '\\\\0'"
-    gdb_test "p ctable1\[1\]"   " = 1 '\\\\001'"
-    gdb_test "p ctable1\[2\]"   " = 2 '\\\\002'"
-    gdb_test "p ctable1\[3\]"   " = 3 '\\\\003'"
-    gdb_test "p ctable1\[4\]"   " = 4 '\\\\004'"
-    gdb_test "p ctable1\[5\]"   " = 5 '\\\\005'"
-    gdb_test "p ctable1\[6\]"   " = 6 '\\\\006'"
-    gdb_test "p ctable1\[7\]"   " = 7 '\\\\a'"
-    gdb_test "p ctable1\[8\]"   " = 8 '\\\\b'"
-    gdb_test "p ctable1\[9\]"   " = 9 '\\\\t'"
-    gdb_test "p ctable1\[10\]"  " = 10 '\\\\n'"
-    gdb_test "p ctable1\[11\]"  " = 11 '\\\\v'"
-    gdb_test "p ctable1\[12\]"  " = 12 '\\\\f'"
-    gdb_test "p ctable1\[13\]"  " = 13 '\\\\r'"
-    gdb_test "p ctable1\[14\]"  " = 14 '\\\\016'"
-    gdb_test "p ctable1\[15\]"  " = 15 '\\\\017'"
-    gdb_test "p ctable1\[16\]"  " = 16 '\\\\020'"
-    gdb_test "p ctable1\[17\]"  " = 17 '\\\\021'"
-    gdb_test "p ctable1\[18\]"  " = 18 '\\\\022'"
-    gdb_test "p ctable1\[19\]"  " = 19 '\\\\023'"
-    gdb_test "p ctable1\[20\]"  " = 20 '\\\\024'"
-    gdb_test "p ctable1\[21\]"  " = 21 '\\\\025'"
-    gdb_test "p ctable1\[22\]"  " = 22 '\\\\026'"
-    gdb_test "p ctable1\[23\]"  " = 23 '\\\\027'"
-    gdb_test "p ctable1\[24\]"  " = 24 '\\\\030'"
-    gdb_test "p ctable1\[25\]"  " = 25 '\\\\031'"
-    gdb_test "p ctable1\[26\]"  " = 26 '\\\\032'"
-    gdb_test "p ctable1\[27\]"  " = 27 '\\\\033'"
-    gdb_test "p ctable1\[28\]"  " = 28 '\\\\034'"
-    gdb_test "p ctable1\[29\]"  " = 29 '\\\\035'"
-    gdb_test "p ctable1\[30\]"  " = 30 '\\\\036'"
-    gdb_test "p ctable1\[31\]"  " = 31 '\\\\037'"
-    gdb_test "p ctable1\[32\]"  " = 32 ' '"
-    gdb_test "p ctable1\[33\]"  " = 33 '!'"
-    gdb_test "p ctable1\[34\]"  " = 34 '\"'"
-    gdb_test "p ctable1\[35\]"  " = 35 '#'"
-    gdb_test "p ctable1\[36\]"  " = 36 '\\\$'"
-    gdb_test "p ctable1\[37\]"  " = 37 '%'"
-    gdb_test "p ctable1\[38\]"  " = 38 '&'"
-    gdb_test "p ctable1\[39\]"  " = 39 '\\\\''"
-    gdb_test "p ctable1\[40\]"  " = 40 '\\('"
-    gdb_test "p ctable1\[41\]"  " = 41 '\\)'"
-    gdb_test "p ctable1\[42\]"  " = 42 '\\*'"
-    gdb_test "p ctable1\[43\]"  " = 43 '\\+'"
-    gdb_test "p ctable1\[44\]"  " = 44 ','"
-    gdb_test "p ctable1\[45\]"  " = 45 '-'"
-    gdb_test "p ctable1\[46\]"  " = 46 '.'"
-    gdb_test "p ctable1\[47\]"  " = 47 '/'"
-    gdb_test "p ctable1\[48\]"  " = 48 '0'"
-    gdb_test "p ctable1\[49\]"  " = 49 '1'"
-    gdb_test "p ctable1\[50\]"  " = 50 '2'"
-    gdb_test "p ctable1\[51\]"  " = 51 '3'"
-    gdb_test "p ctable1\[52\]"  " = 52 '4'"
-    gdb_test "p ctable1\[53\]"  " = 53 '5'"
-    gdb_test "p ctable1\[54\]"  " = 54 '6'"
-    gdb_test "p ctable1\[55\]"  " = 55 '7'"
-    gdb_test "p ctable1\[56\]"  " = 56 '8'"
-    gdb_test "p ctable1\[57\]"  " = 57 '9'"
-    gdb_test "p ctable1\[58\]"  " = 58 ':'"
-    gdb_test "p ctable1\[59\]"  " = 59 ';'"
-    gdb_test "p ctable1\[60\]"  " = 60 '<'"
-    gdb_test "p ctable1\[61\]"  " = 61 '='"
-    gdb_test "p ctable1\[62\]"  " = 62 '>'"
-    gdb_test "p ctable1\[63\]"  " = 63 '\\?'"
-    gdb_test "p ctable1\[64\]"  " = 64 '@'"
-    gdb_test "p ctable1\[65\]"  " = 65 'A'"
-    gdb_test "p ctable1\[66\]"  " = 66 'B'"
-    gdb_test "p ctable1\[67\]"  " = 67 'C'"
-    gdb_test "p ctable1\[68\]"  " = 68 'D'"
-    gdb_test "p ctable1\[69\]"  " = 69 'E'"
-    gdb_test "p ctable1\[70\]"  " = 70 'F'"
-    gdb_test "p ctable1\[71\]"  " = 71 'G'"
-    gdb_test "p ctable1\[72\]"  " = 72 'H'"
-    gdb_test "p ctable1\[73\]"  " = 73 'I'"
-    gdb_test "p ctable1\[74\]"  " = 74 'J'"
-    gdb_test "p ctable1\[75\]"  " = 75 'K'"
-    gdb_test "p ctable1\[76\]"  " = 76 'L'"
-    gdb_test "p ctable1\[77\]"  " = 77 'M'"
-    gdb_test "p ctable1\[78\]"  " = 78 'N'"
-    gdb_test "p ctable1\[79\]"  " = 79 'O'"
-    gdb_test "p ctable1\[80\]"  " = 80 'P'"
-    gdb_test "p ctable1\[81\]"  " = 81 'Q'"
-    gdb_test "p ctable1\[82\]"  " = 82 'R'"
-    gdb_test "p ctable1\[83\]"  " = 83 'S'"
-    gdb_test "p ctable1\[84\]"  " = 84 'T'"
-    gdb_test "p ctable1\[85\]"  " = 85 'U'"
-    gdb_test "p ctable1\[86\]"  " = 86 'V'"
-    gdb_test "p ctable1\[87\]"  " = 87 'W'"
-    gdb_test "p ctable1\[88\]"  " = 88 'X'"
-    gdb_test "p ctable1\[89\]"  " = 89 'Y'"
-    gdb_test "p ctable1\[90\]"  " = 90 'Z'"
-    gdb_test "p ctable1\[91\]"  " = 91 '\\\['"
-    gdb_test "p ctable1\[92\]"  " = 92 '\\\\\\\\'"
-    gdb_test "p ctable1\[93\]"  " = 93 '\\\]'"
-    gdb_test "p ctable1\[94\]"  " = 94 '\\^'"
-    gdb_test "p ctable1\[95\]"  " = 95 '_'"
-    gdb_test "p ctable1\[96\]"  " = 96 '`'"
-    gdb_test "p ctable1\[97\]"  " = 97 'a'"
-    gdb_test "p ctable1\[98\]"  " = 98 'b'"
-    gdb_test "p ctable1\[99\]"  " = 99 'c'"
-    gdb_test "p ctable1\[100\]" " = 100 'd'"
-    gdb_test "p ctable1\[101\]" " = 101 'e'"
-    gdb_test "p ctable1\[102\]" " = 102 'f'"
-    gdb_test "p ctable1\[103\]" " = 103 'g'"
-    gdb_test "p ctable1\[104\]" " = 104 'h'"
-    gdb_test "p ctable1\[105\]" " = 105 'i'"
-    gdb_test "p ctable1\[106\]" " = 106 'j'"
-    gdb_test "p ctable1\[107\]" " = 107 'k'"
-    gdb_test "p ctable1\[108\]" " = 108 'l'"
-    gdb_test "p ctable1\[109\]" " = 109 'm'"
-    gdb_test "p ctable1\[110\]" " = 110 'n'"
-    gdb_test "p ctable1\[111\]" " = 111 'o'"
-    gdb_test "p ctable1\[112\]" " = 112 'p'"
-    gdb_test "p ctable1\[113\]" " = 113 'q'"
-    gdb_test "p ctable1\[114\]" " = 114 'r'"
-    gdb_test "p ctable1\[115\]" " = 115 's'"
-    gdb_test "p ctable1\[116\]" " = 116 't'"
-    gdb_test "p ctable1\[117\]" " = 117 'u'"
-    gdb_test "p ctable1\[118\]" " = 118 'v'"
-    gdb_test "p ctable1\[119\]" " = 119 'w'"
-    gdb_test "p ctable1\[120\]" " = 120 'x'"
-    gdb_test "p ctable1\[121\]" " = 121 'y'"
-    gdb_test "p ctable1\[122\]" " = 122 'z'"
-    gdb_test "p ctable1\[123\]" " = 123 '\[{\]+'"
-    gdb_test "p ctable1\[124\]" " = 124 '\[|\]+'"
-    gdb_test "p ctable1\[125\]" " = 125 '\[}\]+'"
-    gdb_test "p ctable1\[126\]" " = 126 '\[~\]'"
-    gdb_test "p ctable1\[127\]" " = 127 '\\\\177'"
-    gdb_test "p ctable1\[128\]" " = 128 '\\\\200'"
-    gdb_test "p ctable1\[129\]" " = 129 '\\\\201'"
-    gdb_test "p ctable1\[130\]" " = 130 '\\\\202'"
-    gdb_test "p ctable1\[131\]" " = 131 '\\\\203'"
-    gdb_test "p ctable1\[132\]" " = 132 '\\\\204'"
-    gdb_test "p ctable1\[133\]" " = 133 '\\\\205'"
-    gdb_test "p ctable1\[134\]" " = 134 '\\\\206'"
-    gdb_test "p ctable1\[135\]" " = 135 '\\\\207'"
-    gdb_test "p ctable1\[136\]" " = 136 '\\\\210'"
-    gdb_test "p ctable1\[137\]" " = 137 '\\\\211'"
-    gdb_test "p ctable1\[138\]" " = 138 '\\\\212'"
-    gdb_test "p ctable1\[139\]" " = 139 '\\\\213'"
-    gdb_test "p ctable1\[140\]" " = 140 '\\\\214'"
-    gdb_test "p ctable1\[141\]" " = 141 '\\\\215'"
-    gdb_test "p ctable1\[142\]" " = 142 '\\\\216'"
-    gdb_test "p ctable1\[143\]" " = 143 '\\\\217'"
-    gdb_test "p ctable1\[144\]" " = 144 '\\\\220'"
-    gdb_test "p ctable1\[145\]" " = 145 '\\\\221'"
-    gdb_test "p ctable1\[146\]" " = 146 '\\\\222'"
-    gdb_test "p ctable1\[147\]" " = 147 '\\\\223'"
-    gdb_test "p ctable1\[148\]" " = 148 '\\\\224'"
-    gdb_test "p ctable1\[149\]" " = 149 '\\\\225'"
-    gdb_test "p ctable1\[150\]" " = 150 '\\\\226'"
-    gdb_test "p ctable1\[151\]" " = 151 '\\\\227'"
-    gdb_test "p ctable1\[152\]" " = 152 '\\\\230'"
-    gdb_test "p ctable1\[153\]" " = 153 '\\\\231'"
-    gdb_test "p ctable1\[154\]" " = 154 '\\\\232'"
-    gdb_test "p ctable1\[155\]" " = 155 '\\\\233'"
-    gdb_test "p ctable1\[156\]" " = 156 '\\\\234'"
-    gdb_test "p ctable1\[157\]" " = 157 '\\\\235'"
-    gdb_test "p ctable1\[158\]" " = 158 '\\\\236'"
-    gdb_test "p ctable1\[159\]" " = 159 '\\\\237'"
-    gdb_test "p ctable1\[160\]" " = 160 '\\\\240'"
-    gdb_test "p ctable1\[161\]" " = 161 '\\\\241'"
-    gdb_test "p ctable1\[162\]" " = 162 '\\\\242'"
-    gdb_test "p ctable1\[163\]" " = 163 '\\\\243'"
-    gdb_test "p ctable1\[164\]" " = 164 '\\\\244'"
-    gdb_test "p ctable1\[165\]" " = 165 '\\\\245'"
-    gdb_test "p ctable1\[166\]" " = 166 '\\\\246'"
-    gdb_test "p ctable1\[167\]" " = 167 '\\\\247'"
-    gdb_test "p ctable1\[168\]" " = 168 '\\\\250'"
-    gdb_test "p ctable1\[169\]" " = 169 '\\\\251'"
-    gdb_test "p ctable1\[170\]" " = 170 '\\\\252'"
-    gdb_test "p ctable1\[171\]" " = 171 '\\\\253'"
-    gdb_test "p ctable1\[172\]" " = 172 '\\\\254'"
-    gdb_test "p ctable1\[173\]" " = 173 '\\\\255'"
-    gdb_test "p ctable1\[174\]" " = 174 '\\\\256'"
-    gdb_test "p ctable1\[175\]" " = 175 '\\\\257'"
-    gdb_test "p ctable1\[176\]" " = 176 '\\\\260'"
-    gdb_test "p ctable1\[177\]" " = 177 '\\\\261'"
-    gdb_test "p ctable1\[178\]" " = 178 '\\\\262'"
-    gdb_test "p ctable1\[179\]" " = 179 '\\\\263'"
-    gdb_test "p ctable1\[180\]" " = 180 '\\\\264'"
-    gdb_test "p ctable1\[181\]" " = 181 '\\\\265'"
-    gdb_test "p ctable1\[182\]" " = 182 '\\\\266'"
-    gdb_test "p ctable1\[183\]" " = 183 '\\\\267'"
-    gdb_test "p ctable1\[184\]" " = 184 '\\\\270'"
-    gdb_test "p ctable1\[185\]" " = 185 '\\\\271'"
-    gdb_test "p ctable1\[186\]" " = 186 '\\\\272'"
-    gdb_test "p ctable1\[187\]" " = 187 '\\\\273'"
-    gdb_test "p ctable1\[188\]" " = 188 '\\\\274'"
-    gdb_test "p ctable1\[189\]" " = 189 '\\\\275'"
-    gdb_test "p ctable1\[190\]" " = 190 '\\\\276'"
-    gdb_test "p ctable1\[191\]" " = 191 '\\\\277'"
-    gdb_test "p ctable1\[192\]" " = 192 '\\\\300'"
-    gdb_test "p ctable1\[193\]" " = 193 '\\\\301'"
-    gdb_test "p ctable1\[194\]" " = 194 '\\\\302'"
-    gdb_test "p ctable1\[195\]" " = 195 '\\\\303'"
-    gdb_test "p ctable1\[196\]" " = 196 '\\\\304'"
-    gdb_test "p ctable1\[197\]" " = 197 '\\\\305'"
-    gdb_test "p ctable1\[198\]" " = 198 '\\\\306'"
-    gdb_test "p ctable1\[199\]" " = 199 '\\\\307'"
-    gdb_test "p ctable1\[200\]" " = 200 '\\\\310'"
-    gdb_test "p ctable1\[201\]" " = 201 '\\\\311'"
-    gdb_test "p ctable1\[202\]" " = 202 '\\\\312'"
-    gdb_test "p ctable1\[203\]" " = 203 '\\\\313'"
-    gdb_test "p ctable1\[204\]" " = 204 '\\\\314'"
-    gdb_test "p ctable1\[205\]" " = 205 '\\\\315'"
-    gdb_test "p ctable1\[206\]" " = 206 '\\\\316'"
-    gdb_test "p ctable1\[207\]" " = 207 '\\\\317'"
-    gdb_test "p ctable1\[208\]" " = 208 '\\\\320'"
-    gdb_test "p ctable1\[209\]" " = 209 '\\\\321'"
-    gdb_test "p ctable1\[210\]" " = 210 '\\\\322'"
-    gdb_test "p ctable1\[211\]" " = 211 '\\\\323'"
-    gdb_test "p ctable1\[212\]" " = 212 '\\\\324'"
-    gdb_test "p ctable1\[213\]" " = 213 '\\\\325'"
-    gdb_test "p ctable1\[214\]" " = 214 '\\\\326'"
-    gdb_test "p ctable1\[215\]" " = 215 '\\\\327'"
-    gdb_test "p ctable1\[216\]" " = 216 '\\\\330'"
-    gdb_test "p ctable1\[217\]" " = 217 '\\\\331'"
-    gdb_test "p ctable1\[218\]" " = 218 '\\\\332'"
-    gdb_test "p ctable1\[219\]" " = 219 '\\\\333'"
-    gdb_test "p ctable1\[220\]" " = 220 '\\\\334'"
-    gdb_test "p ctable1\[221\]" " = 221 '\\\\335'"
-    gdb_test "p ctable1\[222\]" " = 222 '\\\\336'"
-    gdb_test "p ctable1\[223\]" " = 223 '\\\\337'"
-    gdb_test "p ctable1\[224\]" " = 224 '\\\\340'"
-    gdb_test "p ctable1\[225\]" " = 225 '\\\\341'"
-    gdb_test "p ctable1\[226\]" " = 226 '\\\\342'"
-    gdb_test "p ctable1\[227\]" " = 227 '\\\\343'"
-    gdb_test "p ctable1\[228\]" " = 228 '\\\\344'"
-    gdb_test "p ctable1\[229\]" " = 229 '\\\\345'"
-    gdb_test "p ctable1\[230\]" " = 230 '\\\\346'"
-    gdb_test "p ctable1\[231\]" " = 231 '\\\\347'"
-    gdb_test "p ctable1\[232\]" " = 232 '\\\\350'"
-    gdb_test "p ctable1\[233\]" " = 233 '\\\\351'"
-    gdb_test "p ctable1\[234\]" " = 234 '\\\\352'"
-    gdb_test "p ctable1\[235\]" " = 235 '\\\\353'"
-    gdb_test "p ctable1\[236\]" " = 236 '\\\\354'"
-    gdb_test "p ctable1\[237\]" " = 237 '\\\\355'"
-    gdb_test "p ctable1\[238\]" " = 238 '\\\\356'"
-    gdb_test "p ctable1\[239\]" " = 239 '\\\\357'"
-    gdb_test "p ctable1\[240\]" " = 240 '\\\\360'"
-    gdb_test "p ctable1\[241\]" " = 241 '\\\\361'"
-    gdb_test "p ctable1\[242\]" " = 242 '\\\\362'"
-    gdb_test "p ctable1\[243\]" " = 243 '\\\\363'"
-    gdb_test "p ctable1\[244\]" " = 244 '\\\\364'"
-    gdb_test "p ctable1\[245\]" " = 245 '\\\\365'"
-    gdb_test "p ctable1\[246\]" " = 246 '\\\\366'"
-    gdb_test "p ctable1\[247\]" " = 247 '\\\\367'"
-    gdb_test "p ctable1\[248\]" " = 248 '\\\\370'"
-    gdb_test "p ctable1\[249\]" " = 249 '\\\\371'"
-    gdb_test "p ctable1\[250\]" " = 250 '\\\\372'"
-    gdb_test "p ctable1\[251\]" " = 251 '\\\\373'"
-    gdb_test "p ctable1\[252\]" " = 252 '\\\\374'"
-    gdb_test "p ctable1\[253\]" " = 253 '\\\\375'"
-    gdb_test "p ctable1\[254\]" " = 254 '\\\\376'"
-    gdb_test "p ctable1\[255\]" " = 255 '\\\\377'"
-}
-
-# Test interaction of the number of print elements to print and the
-# repeat count, set to the default of 10.
-
-proc test_print_repeats_10 {} {
-    global gdb_prompt
-
-    for { set x 1; } { $x <= 16 } { incr x; } {
-	gdb_test "set print elements $x" ""
-	for { set e 1; } { $e <= 16 } {incr e; } {
-	    set v [expr $e - 1];
-	    set command "p &ctable2\[${v}*16\]"
-	    if { $x < $e } {
-		set aval $x;
-	    } else {
-		set aval $e;
-	    }
-	    set xval [expr $x - $e];
-	    if { $xval < 0 } {
-		set xval 0;
-	    }
-	    if { $aval > 10 } {
-		set a "'a' <repeats $aval times>";
-		if { $xval > 0 } {
-		    set a "${a}, \\\"";
-		}
-	    } else {
-		set a "\\\"[string range "aaaaaaaaaaaaaaaa" 1 $aval]";
-		if { $xval > 10 } {
-		    set a "$a\\\", ";
-		}
-	    }
-	    set xstr "";
-	    if { $xval > 10 } {
-		set xstr "'X' <repeats $xval times>";
-	    } else {
-		if { $xval > 0 } {
-		    set xstr "[string range "XXXXXXXXXXXXXXXX" 1 $xval]\\\"";
-		} else {
-		    if { $aval <= 10 } {
-			set xstr "\\\"";
-		    }
-		}
-	    }
-	    if { $aval < 16 } {
-		set xstr "${xstr}\[.\]\[.\]\[.\]"
-	    }
-	    set string " = \[(\]unsigned char \[*\]\[)\] ${a}${xstr}";
-	    gdb_test "$command" "$string" "$command with print elements set to $x";
-	}
-    }
-}
-
-proc test_print_strings {} {
-    global gdb_prompt
-
-    # We accept "(unsigned char *) " before the string.  char vs. unsigned char
-    # is already tested elsewhere.
-
-    # Test that setting print elements unlimited doesn't completely suppress
-    # printing; this was a bug in older gdb's.
-    gdb_test "set print elements 0" ""
-    gdb_test "p teststring" \
-	" = (.unsigned char .. )?\"teststring contents\"" "p teststring with elements set to 0"
-    gdb_test "set print elements 1" ""
-    gdb_test "p teststring" \
-	" = (.unsigned char .. )?\"t\"\\.\\.\\." "p teststring with elements set to 1"
-    gdb_test "set print elements 5" ""
-    gdb_test "p teststring" \
-	" = (.unsigned char .. )?\"tests\"\\.\\.\\." "p teststring with elements set to 5"
-    gdb_test "set print elements 19" ""
-    gdb_test "p teststring" \
-	" = (.unsigned char .. )?\"teststring contents\"" "p teststring with elements set to 19"
-    gdb_test "set print elements 20" ""
-    gdb_test "p teststring" \
-	" = (.unsigned char .. )?\"teststring contents\"" "p teststring with elements set to 20"
-
-    gdb_test "set print elements 8" ""
-
-    gdb_test "p &ctable1\[0\]" \
-	" = \\(unsigned char \\*\\) \"\""
-    gdb_test "p &ctable1\[1\]" \
-	" = \\(unsigned char \\*\\) \"\\\\001\\\\002\\\\003\\\\004\\\\005\\\\006\\\\a\\\\b\"..."
-    gdb_test "p &ctable1\[1*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\b\\\\t\\\\n\\\\v\\\\f\\\\r\\\\016\\\\017\"..."
-    gdb_test "p &ctable1\[2*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\020\\\\021\\\\022\\\\023\\\\024\\\\025\\\\026\\\\027\"..."
-    gdb_test "p &ctable1\[3*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\030\\\\031\\\\032\\\\033\\\\034\\\\035\\\\036\\\\037\"..."
-    gdb_test "p &ctable1\[4*8\]" \
-	" = \\(unsigned char \\*\\) \" !\\\\\"#\\\$%&'\"..."
-    gdb_test "p &ctable1\[5*8\]" \
-	" = \\(unsigned char \\*\\) \"\\(\\)\\*\\+,-./\"..."
-    gdb_test "p &ctable1\[6*8\]" \
-	" = \\(unsigned char \\*\\) \"01234567\"..."
-    gdb_test "p &ctable1\[7*8\]" \
-	" = \\(unsigned char \\*\\) \"89:;<=>\\?\"..."
-    gdb_test "p &ctable1\[8*8\]" \
-	" = \\(unsigned char \\*\\) \"@ABCDEFG\"..."
-    gdb_test "p &ctable1\[9*8\]" \
-	" = \\(unsigned char \\*\\) \"HIJKLMNO\"..."
-    gdb_test "p &ctable1\[10*8\]" \
-	" = \\(unsigned char \\*\\) \"PQRSTUVW\"..."
-    gdb_test "p &ctable1\[11*8\]" \
-	" = \\(unsigned char \\*\\) \"XYZ\\\[\\\\\\\\\\\]\\^_\"..."
-    gdb_test "p &ctable1\[12*8\]" \
-	" = \\(unsigned char \\*\\) \"`abcdefg\"..."
-    gdb_test "p &ctable1\[13*8\]" \
-	" = \\(unsigned char \\*\\) \"hijklmno\"..."
-    gdb_test "p &ctable1\[14*8\]" \
-	" = \\(unsigned char \\*\\) \"pqrstuvw\"..."
-    gdb_test "p &ctable1\[15*8\]" \
-	" = \\(unsigned char \\*\\) \"xyz\[{|}\]+\\~\\\\177\"..."
-    gdb_test "p &ctable1\[16*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\200\\\\201\\\\202\\\\203\\\\204\\\\205\\\\206\\\\207\"..."
-    gdb_test "p &ctable1\[17*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\210\\\\211\\\\212\\\\213\\\\214\\\\215\\\\216\\\\217\"..."
-    gdb_test "p &ctable1\[18*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\220\\\\221\\\\222\\\\223\\\\224\\\\225\\\\226\\\\227\"..."
-    gdb_test "p &ctable1\[19*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\230\\\\231\\\\232\\\\233\\\\234\\\\235\\\\236\\\\237\"..."
-    gdb_test "p &ctable1\[20*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\240\\\\241\\\\242\\\\243\\\\244\\\\245\\\\246\\\\247\"..."
-    gdb_test "p &ctable1\[21*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\250\\\\251\\\\252\\\\253\\\\254\\\\255\\\\256\\\\257\"..."
-    gdb_test "p &ctable1\[22*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\260\\\\261\\\\262\\\\263\\\\264\\\\265\\\\266\\\\267\"..."
-    gdb_test "p &ctable1\[23*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\270\\\\271\\\\272\\\\273\\\\274\\\\275\\\\276\\\\277\"..."
-    gdb_test "p &ctable1\[24*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\300\\\\301\\\\302\\\\303\\\\304\\\\305\\\\306\\\\307\"..."
-    gdb_test "p &ctable1\[25*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\310\\\\311\\\\312\\\\313\\\\314\\\\315\\\\316\\\\317\"..."
-    gdb_test "p &ctable1\[26*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\320\\\\321\\\\322\\\\323\\\\324\\\\325\\\\326\\\\327\"..."
-    gdb_test "p &ctable1\[27*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\330\\\\331\\\\332\\\\333\\\\334\\\\335\\\\336\\\\337\"..."
-    gdb_test "p &ctable1\[28*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\340\\\\341\\\\342\\\\343\\\\344\\\\345\\\\346\\\\347\"..."
-    gdb_test "p &ctable1\[29*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\350\\\\351\\\\352\\\\353\\\\354\\\\355\\\\356\\\\357\"..."
-    gdb_test "p &ctable1\[30*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\360\\\\361\\\\362\\\\363\\\\364\\\\365\\\\366\\\\367\"..."
-    gdb_test "p &ctable1\[31*8\]" \
-	" = \\(unsigned char \\*\\) \"\\\\370\\\\371\\\\372\\\\373\\\\374\\\\375\\\\376\\\\377\"..."
-}
-
-proc test_print_int_arrays {} {
-    global gdb_prompt
-
-    gdb_test "set print elements 24" ""
-
-    gdb_test_escape_braces "p int1dim" \
-	" = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}"
-    gdb_test_escape_braces "p int2dim" \
-	" = {{0, 1, 2, 3}, {4, 5, 6, 7}, {8, 9, 10, 11}}"
-    gdb_test_escape_braces "p int3dim" \
-	" = {{{0, 1}, {2, 3}, {4, 5}}, {{6, 7}, {8, 9}, {10, 11}}}"
-    gdb_test_escape_braces "p int4dim" \
-	" = {{{{0, 1}, {2, 3}, {4, 5}}, {{6, 7}, {8, 9}, {10, 11}}}}"
-}
-
-proc test_print_typedef_arrays {} {
-    global gdb_prompt
-
-    gdb_test "set print elements 24" ""
-
-    gdb_test_escape_braces "p a1" \
-	" = {2, 4, 6, 8, 10, 12, 14, 16, 18, 20}"
-    gdb_test "p a1\[0\]" " = 2"
-    gdb_test "p a1\[9\]" " = 20"
-
-    gdb_test "p a2" \
-	" = \"abcd\""
-    gdb_test "p a2\[0\]" " = 97 'a'"
-    gdb_test "p a2\[3\]" " = 100 'd'"
-}
-
-proc test_artificial_arrays {} {
-    # Send \026@ instead of just @ in case the kill character is @.
-    gdb_test_escape_braces "p int1dim\[0\]\026@2" " = {0, 1}" {p int1dim[0]@2}
-    gdb_test_escape_braces "p int1dim\[0\]\026@2\026@3" \
-	"({{0, 1}, {2, 3}, {4, 5}}|\[Cc\]annot.*)" \
-	{p int1dim[0]@2@3}
-    gdb_test_escape_braces {p/x (short [])0x12345678} \
-	" = ({0x1234, 0x5678}|{0x5678, 0x1234})"
-}
-
-proc test_print_char_arrays {} {
-    global gdb_prompt
-    global hex
-
-    gdb_test "set print elements 24" ""
-    gdb_test "set print address on" ""
-
-    gdb_test "p arrays" \
-	" = {array1 = \"abc\", array2 = \"d\", array3 = \"e\", array4 = \"fg\", array5 = \"hij\"}"
-
-    gdb_test "p parrays"		" = \\(struct some_arrays \\*\\) $hex"
-    gdb_test "p parrays->array1"	" = \"abc\""
-    gdb_test "p &parrays->array1"	" = \\(unsigned char \\(\\*\\)\\\[4\\\]\\) $hex"
-    gdb_test "p parrays->array2"	" = \"d\""
-    gdb_test "p &parrays->array2"	" = \\(unsigned char \\(\\*\\)\\\[1\\\]\\) $hex"
-    gdb_test "p parrays->array3"	" = \"e\""
-    gdb_test "p &parrays->array3"	" = \\(unsigned char \\(\\*\\)\\\[1\\\]\\) $hex"
-    gdb_test "p parrays->array4"	" = \"fg\""
-    gdb_test "p &parrays->array4"	" = \\(unsigned char \\(\\*\\)\\\[2\\\]\\) $hex"
-    gdb_test "p parrays->array5"	" = \"hij\""
-    gdb_test "p &parrays->array5"	" = \\(unsigned char \\(\\*\\)\\\[4\\\]\\) $hex"
-
-    gdb_test "set print address off" ""
-}
-
-proc test_print_string_constants {} {
-    global gdb_prompt
-
-    gdb_test "set print elements 50" ""
-
-    if [target_info exists gdb,cannot_call_functions] {
-	setup_xfail "*-*-*" 2416
-	fail "This target can not call functions"
-	return
-    }
-
-    # We need to up this because this can be really slow on some boards.
-    # (Test may involve inferior malloc() calls).
-    set timeout 60;
-
-    gdb_test "p \"a string\""		" = \"a string\""
-    gdb_test "p \"embedded \\000 null\"" " = \"embedded \\\\000 null\""
-    gdb_test "p \"abcd\"\[2\]"	" = 99 'c'"
-    gdb_test "p sizeof (\"abcdef\")"	" = 7"
-    gdb_test "ptype \"foo\""		" = char \\\[4\\\]"
-    gdb_test "p *\"foo\""		" = 102 'f'"
-    gdb_test "ptype *\"foo\""		" = char"
-    gdb_test "p &*\"foo\""		" = \"foo\""
-    setup_kfail "gdb/538" *-*-*
-    gdb_test "ptype &*\"foo\""	"type = char \\*"
-    gdb_test "p (char *)\"foo\""	" = \"foo\""
-}
-
-proc test_print_array_constants {} {
-
-    if [target_info exists gdb,cannot_call_functions] {
-	setup_xfail "*-*-*" 2416
-	fail "This target can not call functions"
-	return
-    }
-
-    # We need to up this because this can be really slow on some boards.
-    # (Test may involve inferior malloc() calls).
-    set timeout 60;
-
-    gdb_test "print {'a','b','c'}"	" = \"abc\""
-    gdb_test_escape_braces "print {0,1,2}"    " = {0, 1, 2}"
-    gdb_test_escape_braces "print {(long)0,(long)1,(long)2}"  " = {0, 1, 2}"
-    gdb_test_escape_braces "print {{0,1,2},{3,4,5}}"  " = {{0, 1, 2}, {3, 4, 5}}"
-    gdb_test "print {4,5,6}\[2\]"	" = 6"
-    gdb_test "print *&{4,5,6}\[1\]"	" = 5"
-}
-
-proc test_printf {} {
-    gdb_test "printf \"x=%d,y=%d,z=%d\\n\", 5, 6, 7" "x=5,y=6,z=7"
-    gdb_test "printf \"string=%.4sxx\\n\", teststring" "string=testxx"
-    gdb_test "printf \"string=%sxx\\n\", teststring" \
-	"string=teststring contentsxx"
-
-    gdb_test "printf \"%f is fun\\n\", 1.0" "1\.0+ is fun"
-
-    # Test mixing args of different sizes.
-    gdb_test "printf \"x=%d,y=%f,z=%d\\n\", 5, 6.0, 7" "x=5,y=6\.0+,z=7"
-    gdb_test "printf \"%x %f, %c %x, %x, %f\\n\", 0xbad, -99.541, 'z',\
-0xfeedface, 0xdeadbeef, 5.0" "bad -99.54\[0-9\]+, z feedface, deadbeef, 5.0+"
-}
-
-# Escape a left curly brace to prevent it from being interpreted as 
-# the beginning of a bound
-proc gdb_test_escape_braces { args } {
-
-    set pattern [lindex $args 1]
-    regsub -all {\{[0-9]} $pattern {\\&} esc_pattern
-    gdb_test [lindex $args 0] $esc_pattern [lindex $args 2]
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "print \$pc" "No registers\\."
-# FIXME: should also test "print $pc" when there is an execfile but no
-# remote debugging target, process or corefile.
-
-gdb_load ${binfile}
-
-gdb_test "set print sevenbit-strings" ""
-gdb_test "set print address off" ""
-gdb_test "set width 0" ""
-
-if [set_lang_c] then {
-    gdb_test "p ctable1\[120\]" "120 'x'" "p ctable1\[120\] #1"
-
-    if [runto_main] then {
-	test_integer_literals_accepted
-	test_integer_literals_rejected
-	test_character_literals_accepted
-	test_print_all_chars
-	test_print_repeats_10
-	test_print_strings
-	test_print_int_arrays
-	test_print_typedef_arrays
-	test_artificial_arrays
-	test_print_char_arrays
-# We used to do the runto main here.
-	test_print_string_constants
-	test_print_array_constants
-	test_printf
-    }
-} else {
-    fail "C print command tests suppressed"
-}
diff --git a/gdb/testsuite/gdb.base/psymtab.exp b/gdb/testsuite/gdb.base/psymtab.exp
deleted file mode 100644
index 8c2abffa345..00000000000
--- a/gdb/testsuite/gdb.base/psymtab.exp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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 is part of the gdb testsuite
-
-# This is intended to be a repository for tests that partial symbols
-# are working properly.  If multiple tests are added, make sure that
-# you exit and restart GDB between tests.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "psymtab"
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${testfile}1.c" "${testfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${testfile}2.c" "${testfile}2.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${testfile}1.o ${testfile}2.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# This test is looking for a bug that manifested itself when GDB was
-# looking for a partial symbol such that there wasn't such a partial
-# symbol in the psymtab, but such that the last psym in the psymtab
-# had the right name but the wrong namespace.  Here, searching for
-# zzz::dummy currently causes a search for 'zzz' in STRUCT_NAMESPACE
-# without a preceding search for 'zzz' in VAR_NAMESPACE.
-
-gdb_test "break zzz::dummy" "Can't find member of namespace, class, struct, or union named \"zzz::dummy\"\r\n.*" "Don't search past end of psymtab."
diff --git a/gdb/testsuite/gdb.base/psymtab1.c b/gdb/testsuite/gdb.base/psymtab1.c
deleted file mode 100644
index 1482f27e53c..00000000000
--- a/gdb/testsuite/gdb.base/psymtab1.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int main ()
-{
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/psymtab2.c b/gdb/testsuite/gdb.base/psymtab2.c
deleted file mode 100644
index eeaa5eda55d..00000000000
--- a/gdb/testsuite/gdb.base/psymtab2.c
+++ /dev/null
@@ -1,3 +0,0 @@
-extern int zzz;
-
-int zzz = 123;
diff --git a/gdb/testsuite/gdb.base/ptr-typedef.c b/gdb/testsuite/gdb.base/ptr-typedef.c
deleted file mode 100644
index 6cf2fd43c4f..00000000000
--- a/gdb/testsuite/gdb.base/ptr-typedef.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2005
-   Free Software Foundation, 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.  */
-
-struct foo {
-  int x;
-};
-
-typedef struct foo *foz;
-
-struct foo *foo_ptr;
-foz foz_ptr;
-
-int
-marker1 (void)
-{
-  return foo_ptr == foz_ptr;
-}
-
-int
-main (void)
-{
-  struct foo the_foo;
-  foo_ptr = &the_foo;
-  foz_ptr = &the_foo;
-
-  return marker1 ();
-}
diff --git a/gdb/testsuite/gdb.base/ptr-typedef.exp b/gdb/testsuite/gdb.base/ptr-typedef.exp
deleted file mode 100644
index c91c23c6fe8..00000000000
--- a/gdb/testsuite/gdb.base/ptr-typedef.exp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2005 Free Software Foundation, 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.  
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile ptr-typedef
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile test program"
-    return -1
-}
-
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto marker1] {
-    untested "Couldn't run to marker1"
-}
-
-gdb_test "print foo_ptr" "\\\$$decimal = \\\(struct foo \\\*\\\) $hex"
-gdb_test "print foz_ptr" "\\\$$decimal = \\\(foz\\\) $hex"
diff --git a/gdb/testsuite/gdb.base/ptype.c b/gdb/testsuite/gdb.base/ptype.c
deleted file mode 100644
index 397a714692b..00000000000
--- a/gdb/testsuite/gdb.base/ptype.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- *	Test file with lots of different types, for testing the
- *	"ptype" command.
- */
-
-/*
- *	First the basic C types.
- */
-#include <stdlib.h>
-
-#if !defined (__STDC__) && !defined (_AIX)
-#define signed  /**/
-#endif
-
-char		v_char;
-signed char	v_signed_char;
-unsigned char	v_unsigned_char;
-
-short		v_short;
-signed short	v_signed_short;
-unsigned short	v_unsigned_short;
-
-int		v_int;
-signed int	v_signed_int;
-unsigned int	v_unsigned_int;
-
-long		v_long;
-signed long	v_signed_long;
-unsigned long	v_unsigned_long;
-
-float		v_float;
-double		v_double;
-
-/*
- *	Now some derived types, which are arrays, functions-returning,
- *	pointers, structures, unions, and enumerations.
- */
-
-/**** arrays *******/
-
-char		v_char_array[2];
-signed char	v_signed_char_array[2];
-unsigned char	v_unsigned_char_array[2];
-
-short		v_short_array[2];
-signed short	v_signed_short_array[2];
-unsigned short	v_unsigned_short_array[2];
-
-int		v_int_array[2];
-signed int	v_signed_int_array[2];
-unsigned int	v_unsigned_int_array[2];
-
-long		v_long_array[2];
-signed long	v_signed_long_array[2];
-unsigned long	v_unsigned_long_array[2];
-
-float		v_float_array[2];
-double		v_double_array[2];
-
-/* PR 3742 */
-typedef char t_char_array[];
-t_char_array *pv_char_array;
-
-/**** pointers *******/
-
-char		*v_char_pointer;
-signed char	*v_signed_char_pointer;
-unsigned char	*v_unsigned_char_pointer;
-
-short		*v_short_pointer;
-signed short	*v_signed_short_pointer;
-unsigned short	*v_unsigned_short_pointer;
-
-int		*v_int_pointer;
-signed int	*v_signed_int_pointer;
-unsigned int	*v_unsigned_int_pointer;
-
-long		*v_long_pointer;
-signed long	*v_signed_long_pointer;
-unsigned long	*v_unsigned_long_pointer;
-
-float		*v_float_pointer;
-double		*v_double_pointer;
-
-/**** structs *******/
-
-struct t_struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct1;
-
-struct t_struct *v_t_struct_p;
-
-struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct2;
-
-/* typedef'd struct without a tag.  */
-typedef struct {
-  double v_double_member;
-  int v_int_member;
-} t_struct3;
-/* GCC seems to want a variable of this type, or else it won't put out
-   a symbol.  */
-t_struct3 v_struct3;
-
-/**** unions *******/
-
-union t_union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union;
-
-union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union2;
-
-/* typedef'd union without a tag.  */
-typedef union {
-  double v_double_member;
-  int v_int_member;
-} t_union3;
-/* GCC seems to want a variable of this type, or else it won't put out
-   a symbol.  */
-t_union3 v_union3;
-
-/*** Functions returning type ********/
-
-char		v_char_func () { return(0); }
-signed char	v_signed_char_func () { return (0); }
-unsigned char	v_unsigned_char_func () { return (0); }
-
-short		v_short_func () { return (0); }
-signed short	v_signed_short_func () { return (0); }
-unsigned short	v_unsigned_short_func () { return (0); }
-
-int		v_int_func () { return (0); }
-signed int	v_signed_int_func () { return (0); }
-unsigned int	v_unsigned_int_func () { return (0); }
-
-long		v_long_func () { return (0); }
-signed long	v_signed_long_func () { return (0); }
-unsigned long	v_unsigned_long_func () { return (0); }
-
-float		v_float_func () { return (0.0); }
-double		v_double_func () { return (0.0); }
-
-/**** Some misc more complicated things *******/
-
-struct link {
-	struct link *next;
-#ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
-#else
-	struct link *(*linkfunc) ();
-#endif
-	struct t_struct stuff[1][2][3];
-} *s_link;
-
-union tu_link {
-	struct link *next;
-#ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
-#else
-	struct link *(*linkfunc) ();
-#endif
-	struct t_struct stuff[1][2][3];
-} u_link;
-
-struct outer_struct {
-	int outer_int;
-	struct inner_struct {
-		int inner_int;
-		long inner_long;
-	}inner_struct_instance;
-	union inner_union {
-		int inner_union_int;
-		long inner_union_long;
-	}inner_union_instance;
-	long outer_long;
-} nested_su;
-
-/**** Enumerations *******/
-
-enum 
-/* Work around the bug for compilers which don't put out the right stabs.  */
-#if __GNUC__ < 2 && !defined (_AIX)
-primary1_tag
-#endif
-{red1, green1, blue1} primary1;
-
-enum {red, green, blue} primary;
-enum colors {yellow, purple, pink} nonprimary;
-
-enum {chevy, ford} clunker;
-enum cars {bmw, porsche} sportscar;
-
-#undef FALSE
-#undef TRUE
-typedef enum {FALSE, TRUE} boolean;
-boolean v_boolean;
-/*note: aCC has bool type predefined with 'false' and 'true'*/
-typedef enum bvals {my_false, my_true} boolean2;
-boolean2 v_boolean2;
-
-enum misordered {two = 2, one = 1, zero = 0, three = 3};
-
-/* Seems like we need a variable of this type to get the type to be put
-   in the executable, at least for AIX xlc.  */
-enum misordered v_misordered = three;
-
-/**** Pointers to functions *******/
-
-typedef int (*func_type) (int (*) (int, float), float);
-double (*old_fptr) ();
-double (*new_fptr) (void);
-int (*fptr) (int, float);
-int *(*fptr2) (int (*) (int, float), float);
-int (*xptr) (int (*) (), int (*) (void), int);
-int (*(*ffptr) (char)) (short);
-int (*(*(*fffptr) (char)) (short)) (long);
-
-func_type v_func_type;
-
-/* Here are the sort of stabs we expect to see for the above:
-
-   .stabs "func_type:t(0,100)=*(0,101)=g(0,1)(0,102)=*(0,103)=g(0,1)(0,1)(0,14)#(0,14)#",128,0,234,0
-   .stabs "old_fptr:G(0,110)=*(0,111)=f(0,15)",32,0,231,0
-   .stabs "new_fptr:G(0,120)=*(0,121)=g(0,15)(0,122)=(0,122)#",32,0,232,0
-   .stabs "fptr:G(0,130)=*(0,103)#",32,0,233,0
-   .stabs "fptr2:G(0,140)=*(0,141)=g(0,142)=*(0,1)(0,102)(0,14)#",32,0,235,0
-   .stabs "xptr:G(0,150)=*(0,151)=g(0,1)(0,152)=*(0,153)=f(0,1)(0,154)=*(0,155)=g(0,1)(0,122)#(0,1)#",32,0,236,0
-   .stabs "ffptr:G(0,160)=*(0,161)=g(0,162)=*(0,163)=g(0,1)(0,8)#(0,2)#",32,0,237,0\
-   .stabs "fffptr:G(0,170)=*(0,171)=g(0,172)=*(0,173)=g(0,174)=*(0,175)=g(0,1)(0,3)#(0,8)#(0,2)#",32,0,237,0
-
-   Most of these use Sun's extension for prototyped function types ---
-   the 'g' type descriptor.  As of around 9 Feb 2002, GCC didn't emit
-   those, but GDB can read them, so the related tests in ptype.exp
-   will all xfail.  */
-
-
-/***********/
-
-int main ()
-{
-  /* Ensure that malloc is a pointer type; avoid use of "void" and any include files. */
-/*  extern char *malloc();*/
-
-  /* Some of the tests in ptype.exp require invoking malloc, so make
-     sure it is linked in to this program.  */
-  v_char_pointer = (char *) malloc (1);
-
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  /* Some linkers (e.g. on AIX) remove unreferenced variables,
-     so make sure to reference them. */
-  primary = blue;
-  primary1 = blue1;
-  nonprimary = pink;
-  sportscar = porsche;
-  clunker = ford;
-  v_struct1.v_int_member = 5;
-  v_struct2.v_int_member = 6;
-  v_struct3.v_int_member = 7;
-
-  v_char = 0;
-  v_signed_char = 0;
-  v_unsigned_char = 0;
-
-  v_short = 0;
-  v_signed_short = 0;
-  v_unsigned_short = 0;
-
-  v_int = 0;
-  v_signed_int = 0;
-  v_unsigned_int = 0;
-
-  v_long = 0;
-  v_signed_long = 0;
-  v_unsigned_long = 0;
-
-  v_float = 0;
-  v_double = 0;
-
-  v_char_array[0] = 0;
-  v_signed_char_array[0] = 0;
-  v_unsigned_char_array[0] = 0;
-
-  v_short_array[0] = 0;
-  v_signed_short_array[0] = 0;
-  v_unsigned_short_array[0] = 0;
-
-  v_int_array[0] = 0;
-  v_signed_int_array[0] = 0;
-  v_unsigned_int_array[0] = 0;
-
-  v_long_array[0] = 0;
-  v_signed_long_array[0] = 0;
-  v_unsigned_long_array[0] = 0;
-
-  v_float_array[0] = 0;
-  v_double_array[0] = 0;
-
-  v_char_pointer = 0;
-  v_signed_char_pointer = 0;
-  v_unsigned_char_pointer = 0;
-
-  v_short_pointer = 0;
-  v_signed_short_pointer = 0;
-  v_unsigned_short_pointer = 0;
-
-  v_int_pointer = 0;
-  v_signed_int_pointer = 0;
-  v_unsigned_int_pointer = 0;
-
-  v_long_pointer = 0;
-  v_signed_long_pointer = 0;
-  v_unsigned_long_pointer = 0;
-
-  v_float_pointer = 0;
-  v_double_pointer = 0;
-
-  nested_su.outer_int = 0;
-  v_t_struct_p = 0;
-
-  v_boolean = FALSE;
-  v_boolean2 = my_false;
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp
deleted file mode 100644
index 6580b43c427..00000000000
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ /dev/null
@@ -1,604 +0,0 @@
-# Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999,
-# 2000, 2002, 2003 Free Software Foundation, 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 Rob Savoye. (rob@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "ptype"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Test ptype of unnamed enumeration members before any action causes
-# the partial symbol table to be expanded to full symbols.  This fails
-# with stabs compilers which fail to use a nameless stab (such as
-# pre-2.4.5 versions of gcc and most non-gcc compilers).
-
-send_gdb "ptype red1\n"
-gdb_expect {
-    -re "type = enum primary1_tag \{red1, green1, blue1\}.*$gdb_prompt $"\
-	{
-	    # The workaround is in effect.  As this is a compiler, not GDB,
-	    # bug, we'll make it a PASS but perhaps it should be an XFAIL.
-	    pass "ptype unnamed enumeration member (worked around)"
-	}
-    -re "type = enum \{red1, green1, blue1\}.*$gdb_prompt $"\
-			{ pass "ptype unnamed enumeration member" }
-    -re ".*$gdb_prompt $"	{ fail "ptype unnamed enumeration member" }
-    timeout		{ fail "(timeout) ptype unnamed enumeration member" }
-}
-
-#
-# test ptype command with structures
-#
-# Here and elsewhere, we accept
-# "long", "long int", or "int" for long variables (whatis.exp already
-# has an XFAIL for "int" (Sun cc bug), so no need to fail it here).
-gdb_test "ptype struct t_struct" "type = struct t_struct \{.*\[\r\n\]    (unsigned |)char v_char_member;.*\[\r\n\]    (short|short int) v_short_member;.*\[\r\n\]    int v_int_member;.*\[\r\n\]    (long|long int|int) v_long_member;.*\[\r\n\]    float v_float_member;.*\[\r\n\]    double v_double_member;.*\[\r\n\]\}.*" "ptype structure" 
-
-
-# Test the equivalence between '.' and '->' for struct member references.
-
-if [gdb_test "ptype v_struct1.v_float_member"	"type = float"]<0 then {
-    return -1
-}
-if [gdb_test "ptype v_struct1->v_float_member"	"type = float"]<0 then {
-    return -1
-}
-if [gdb_test "ptype v_t_struct_p.v_float_member"	"type = float"]<0 then {
-    return -1
-}
-if [gdb_test "ptype v_t_struct_p->v_float_member"	"type = float"]<0 then {
-    return -1
-}
-
-
-# IBM's xlc puts out bogus stabs--the stuff field is type 42,
-# which isn't defined.
-
-gdb_test "ptype struct link" "type = struct link \{\[\r\n\]+\[ \t\]+struct link \\*next;\[\r\n\]+\[ \t\]+struct link \\*\\(\\*linkfunc\\)\\((struct link \\*, int|void|)\\);\[\r\n\]+\[ \t\]+struct t_struct stuff.1..2..3.;\[\r\n\]+\}.*" "ptype linked list structure" 
-
-#
-# test ptype command with unions
-#
-gdb_test "ptype union t_union" "type = union t_union \{.*\[\r\n\]    (unsigned |)char v_char_member;.*\[\r\n\]    (short|short int) v_short_member;.*\[\r\n\]    int v_int_member;.*\[\r\n\]    (long|long int|int) v_long_member;.*\[\r\n\]    float v_float_member;.*\[\r\n\]    double v_double_member;.*\[\r\n\]\}.*" "ptype union" 
-
-# IBM's xlc puts out bogus stabs--the stuff field is type 42,
-# which isn't defined.
-gdb_test "ptype union tu_link" "type = union tu_link \{\[\r\n\]+\[ \t\]+struct link \\*next;\[\r\n\]+\[ \t\]+struct link \\*\\(\\*linkfunc\\)\\((struct link \\*, int|void|)\\);\[\r\n\]+\[ \t\]+struct t_struct stuff.1..2..3.;\[\r\n\]+\}.*" "ptype linked list union" 
-
-#
-# test ptype command with enums
-#
-
-gdb_test "ptype primary" "type = enum .red, green, blue.*" "ptype unnamed enumeration" 
-
-gdb_test "ptype enum colors" "type = enum colors \{yellow, purple, pink\}.*" "ptype named enumeration" 
-
-
-#
-# test ptype command with enums as typedef
-#
-gdb_test "ptype boolean" "type = enum (boolean |)\{FALSE, TRUE\}.*" "ptype unnamed typedef'd enumeration" 
-
-# And check that whatis shows the name, not "enum {...}".
-# This probably fails for all DWARF 1 cases, so assume so for now. -fnf
-# The problem with xlc is that the stabs look like
-#   :t51=eFALSE:0,TRUE:1,;
-#   boolean:t55=51
-#   v_boolean:G51
-# GDB's behavior is correct; the type which the variable is defined
-# as (51) doesn't have a name.  Only 55 has a name.
-
-if {!$gcc_compiled && !$hp_aCC_compiler} {
-    setup_xfail "rs6000-*-*" "i*86-*-sysv4*"
-    setup_xfail "hppa*-*-*" CLLbs14773
-}
-
-# For get_debug_format to do its job, we need to have a current source file.
-gdb_test "list main" ""
-get_debug_format
-gdb_test "whatis v_boolean" "type = (enum |)boolean" \
-  "whatis unnamed typedef'd enum (compiler bug in IBM's xlc)"
-
-# Same thing with struct and union.
-gdb_test "ptype t_struct3" "type = struct (t_struct3 |)\{.*
- *double v_double_member;.*
- *int v_int_member;.*\}" "printing typedef'd struct"
-
-gdb_test "ptype t_union3" "type = union (t_union3 |)\{.*
- *double v_double_member;.*
- *int v_int_member;.*\}" "printing typedef'd union"
-
-gdb_test "ptype enum bvals" "type = enum bvals \{my_false, my_true\}.*" "ptype named typedef'd enumf'd enum"
-
-#
-# test ptype command with out-of-order enum values
-#
-gdb_test "ptype enum misordered" "type = enum misordered \{two = 2, one = 1, zero = 0, three = 3\}.*" "ptype misordered enumeration" 
-
-#
-# test ptype command with a named enum's value
-#
-gdb_test "ptype three" "type = enum misordered \{two = 2, one = 1, zero = 0, three = 3\}.*" "ptype named enumeration member" 
-
-gdb_test "ptype red" "type = enum \{red, green, blue\}.*" "ptype unnamed enumeration member #2" 
-
-#
-# test ptype command with basic C types
-#
-# I've commented most of this out because it duplicates tests in whatis.exp.
-# I've just left in a token test or 2 which is designed to test that ptype 
-# acts like whatis for basic types.  If it is thought to be necessary to
-# test both whatis and ptype for all the types, the tests should be
-# merged into whatis.exp, or else maintenance will be a royal pain -kingdon
-#setup_xfail "mips-idt-*" "mips-sgi-*"
-#send "ptype v_char\n"
-#gdb_expect {
-#    -re "type = char.*$gdb_prompt $"	{ pass "ptype char" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype char" }
-#    timeout		{ fail "(timeout) ptype char" }
-#}
-#
-#
-#setup_xfail "mips-*-*"
-#send "ptype v_signed_char\n"
-#gdb_expect {
-#    -re "type = signed char.*$gdb_prompt $"	{ pass "ptype signed char" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed char" }
-#    timeout		{ fail "(timeout) ptype signed char" }
-#}
-#
-#
-#send "ptype v_unsigned_char\n"
-#gdb_expect {
-#    -re "type = unsigned char.*$gdb_prompt $"	{ pass "ptype unsigned char" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned char" }
-#    timeout		{ fail "(timeout) ptype unsigned char" }
-#}
-
-gdb_test "ptype v_short" "type = short(| int).*" "ptype short" 
-
-#send "ptype v_signed_short\n"
-#gdb_expect {
-#    -re "type = short.*$gdb_prompt $"	{ pass "ptype signed short" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed short" }
-#    timeout		{ fail "(timeout) ptype signed short" }
-#}
-#
-#
-#send "ptype v_unsigned_short\n"
-#gdb_expect {
-#    -re "type = unsigned short.*$gdb_prompt $"	{ pass "ptype unsigned short" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned short" }
-#    timeout		{ fail "(timeout) ptype unsigned short" }
-#}
-
-
-gdb_test "ptype v_int" "type = int.*" "ptype int" 
-
-#send "ptype v_signed_int\n"
-#gdb_expect {
-#    -re "type = int.*$gdb_prompt $"	{ pass "ptype signed int" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed int" }
-#    timeout		{ fail "(timeout) ptype signed int" }
-#}
-#
-#
-#send "ptype v_unsigned_int\n"
-#gdb_expect {
-#    -re "type = unsigned int.*$gdb_prompt $"	{ pass "ptype unsigned int" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned int" }
-#    timeout		{ fail "(timeout) ptype unsigned int" }
-#}
-#
-#
-#send "ptype v_long\n"
-#gdb_expect {
-#    -re "type = long.*$gdb_prompt $"	{ pass "ptype long" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype long" }
-#    timeout		{ fail "(timeout) ptype long" }
-#}
-#
-#
-#send "ptype v_signed_long\n"
-#gdb_expect {
-#    -re "type = long.*$gdb_prompt $"	{ pass "ptype signed long" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed long" }
-#    timeout		{ fail "(timeout) ptype signed long" }
-#}
-#
-#
-#send "ptype v_unsigned_long\n"
-#gdb_expect {
-#    -re "type = unsigned long.*$gdb_prompt $"	{ pass "ptype unsigned long" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned long" }
-#    timeout		{ fail "(timeout) ptype unsigned long" }
-#}
-#
-#
-#send "ptype v_float\n"
-#gdb_expect {
-#    -re "type = float.*$gdb_prompt $"	{ pass "ptype float" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype float" }
-#    timeout		{ fail "(timeout) ptype float" }
-#}
-#
-#
-#send "ptype v_double\n"
-#gdb_expect {
-#    -re "type = double.*$gdb_prompt $"	{ pass "ptype double" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype double" }
-#    timeout		{ fail "(timeout) ptype double" }
-#}
-
-
-#
-# test ptype command with arrays
-#
-#setup_xfail "mips-idt-*" "mips-sgi-*"
-#send "ptype v_char_array\n"
-#gdb_expect {
-#    -re "type = char .2..*$gdb_prompt $"	{ pass "ptype char array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype char array" }
-#    timeout		{ fail "(timeout) ptype char array" }
-#}
-#
-#
-#setup_xfail "mips-*-*"
-#send "ptype v_signed_char_array\n"
-#gdb_expect {
-#    -re "type = (|signed )char .2..*$gdb_prompt $"	{ pass "ptype signed char array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed char array" }
-#    timeout		{ fail "(timeout) ptype signed char array" }
-#}
-#
-#
-#send "ptype v_unsigned_char_array\n"
-#gdb_expect {
-#    -re "type = unsigned char .2..*$gdb_prompt $"	{ pass "ptype unsigned char array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned char array" }
-#    timeout		{ fail "(timeout) ptype unsigned char array" }
-#}
-#
-#
-#
-#send "ptype v_int_array\n"
-#gdb_expect {
-#    -re "type = int .2..*$gdb_prompt $"	{ pass "ptype int array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype int array" }
-#    timeout		{ fail "(timeout) ptype int array" }
-#}
-#
-#
-#send "ptype v_signed_int_array\n"
-#gdb_expect {
-#    -re "type = int .2..*$gdb_prompt $"	{ pass "ptype signed int array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed int array" }
-#    timeout		{ fail "(timeout) ptype signed int array" }
-#}
-#
-#
-#send "ptype v_unsigned_int_array\n"
-#gdb_expect {
-#    -re "type = unsigned int .2..*$gdb_prompt $"	{ pass "ptype unsigned int array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned int array" }
-#    timeout		{ fail "(timeout) ptype unsigned int array" }
-#}
-#
-#
-#send "ptype v_long_array\n"
-#gdb_expect {
-#    -re "type = (long|int|long int) .2..*$gdb_prompt $"	{ 
-#	pass "ptype long array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype long array" }
-#    timeout		{ fail "(timeout) ptype long array" }
-#}
-#
-#
-#send "ptype v_signed_long_array\n"
-#gdb_expect {
-#    -re "type = (long|int|long int) .2..*$gdb_prompt $"	{ 
-#	pass "ptype signed long array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed long array" }
-#    timeout		{ fail "(timeout) ptype signed long array" }
-#}
-#
-#
-#send "ptype v_unsigned_long_array\n"
-#gdb_expect {
-#    -re "type = unsigned long .2..*$gdb_prompt $"	{ pass "ptype unsigned long array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned long array" }
-#    timeout		{ fail "(timeout) ptype unsigned long array" }
-#}
-#
-#
-#send "ptype v_float_array\n"
-#gdb_expect {
-#    -re "type = float .2..*$gdb_prompt $"	{ pass "ptype float array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype float array" }
-#    timeout		{ fail "(timeout) ptype float array" }
-#}
-#
-#
-#send "ptype v_double_array\n"
-#gdb_expect {
-#    -re "type = double .2..*$gdb_prompt $"	{ pass "ptype double array" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype double array" }
-#    timeout		{ fail "(timeout) ptype double array" }
-#}
-#
-
-if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" "i*86-*-sysv4*" }
-if {$hp_aCC_compiler} {setup_xfail "hppa*-*-*"}
-gdb_test "ptype t_char_array" "type = (|unsigned )char \\\[0?\\\]"
-
-#
-##
-## test ptype command with pointers
-##
-#setup_xfail "mips-idt-*" "mips-sgi-*"
-#send "ptype v_char_pointer\n"
-#gdb_expect {
-#    -re "type = char \*.*$gdb_prompt $"	{ pass "ptype char pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype char pointer" }
-#    timeout		{ fail "(timeout) ptype char pointer" }
-#}
-#
-#
-#setup_xfail "mips-*-*"
-#send "ptype v_signed_char_pointer\n"
-#gdb_expect {
-#    -re "type = (|signed )char \*.*$gdb_prompt $"
-#	{ pass "ptype signed char pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed char pointer" }
-#    timeout		{ fail "(timeout) ptype signed char pointer" }
-#}
-#
-#
-#send "ptype v_unsigned_char_pointer\n"
-#gdb_expect {
-#    -re "type = unsigned char \*.*$gdb_prompt $"	{ pass "ptype unsigned char pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned char pointer" }
-#    timeout		{ fail "(timeout) ptype unsigned char pointer" }
-#}
-#
-#
-#send "ptype v_short_pointer\n"
-#gdb_expect {
-#    -re "type = (short|short int) \*.*$gdb_prompt $"	{ pass "ptype short pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype short pointer" }
-#    timeout		{ fail "(timeout) ptype short pointer" }
-#}
-#
-#
-#send "ptype v_signed_short_pointer\n"
-#gdb_expect {
-#    -re "type = short \*.*$gdb_prompt $"	{ pass "ptype signed short pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed short pointer" }
-#    timeout		{ fail "(timeout) ptype signed short pointer" }
-#}
-#
-#
-#send "ptype v_unsigned_short_pointer\n"
-#gdb_expect {
-#    -re "type = unsigned short \*.*$gdb_prompt $"	{ pass "ptype unsigned short pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned short pointer" }
-#    timeout		{ fail "(timeout) ptype unsigned short pointer" }
-#}
-#
-#
-#send "ptype v_int_pointer\n"
-#gdb_expect {
-#    -re "type = int \*.*$gdb_prompt $"	{ pass "ptype int pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype int pointer" }
-#    timeout		{ fail "(timeout) ptype int pointer" }
-#}
-#
-#
-#send "ptype v_signed_int_pointer\n"
-#gdb_expect {
-#    -re "type = int \*.*$gdb_prompt $"	{ pass "ptype signed int pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed int pointer" }
-#    timeout		{ fail "(timeout) ptype signed int pointer" }
-#}
-#
-#
-#send "ptype v_unsigned_int_pointer\n"
-#gdb_expect {
-#    -re "type = unsigned int \*.*$gdb_prompt $"	{ pass "ptype unsigned int pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned int pointer" }
-#    timeout		{ fail "(timeout) ptype unsigned int pointer" }
-#}
-#
-#
-#send "ptype v_long_pointer\n"
-#gdb_expect {
-#    -re "type = long \*.*$gdb_prompt $"	{ pass "ptype long pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype long pointer" }
-#    timeout		{ fail "(timeout) ptype long pointer" }
-#}
-#
-#
-#send "ptype v_signed_long_pointer\n"
-#gdb_expect {
-#    -re "type = long \*.*$gdb_prompt $"	{ pass "ptype signed long pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype signed long pointer" }
-#    timeout		{ fail "(timeout) ptype signed long pointer" }
-#}
-#
-#
-#send "ptype v_unsigned_long_pointer\n"
-#gdb_expect {
-#    -re "type = unsigned long \*.*$gdb_prompt $"	{ pass "ptype unsigned long pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype unsigned long pointer" }
-#    timeout		{ fail "(timeout) ptype unsigned long pointer" }
-#}
-#
-#
-#send "ptype v_float_pointer\n"
-#gdb_expect {
-#    -re "type = float \*.*$gdb_prompt $"	{ pass "ptype float pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype float pointer" }
-#    timeout		{ fail "(timeout) ptype float pointer" }
-#}
-#
-#
-#send "ptype v_double_pointer\n"
-#gdb_expect {
-#    -re "type = double \*.*$gdb_prompt $"	{ pass "ptype double pointer" }
-#    -re ".*$gdb_prompt $"	{ fail "ptype double pointer" }
-#    timeout		{ fail "(timeout) ptype double pointer" }
-#}
-
-#
-# test ptype command with nested structure and union
-#
-if {$hp_aCC_compiler} {
-    set outer "outer_struct::"
-    set struct ""
-    set union ""
-} else {
-    set outer ""
-    set struct "struct"
-    set union "union"
-}
-gdb_test "ptype struct outer_struct" "type = struct outer_struct \{.*\[\r\n\]+\
-.*int outer_int;.*\[\r\n\]+\
-.*(struct|) ${outer}inner_struct inner_struct_instance;.*\[\r\n\]+\
-.*(union|) ${outer}inner_union inner_union_instance;.*\[\r\n\]+\
-.*(long|long int|int) outer_long;.*\[\r\n\]\}.*" "ptype outer structure" 
-
-gdb_test "ptype ${struct} ${outer}inner_struct" "type = struct ${outer}inner_struct \{.*\[\r\n\]    int inner_int;.*\[\r\n\]    (long|long int|int) inner_long;.*\[\r\n\]\}.*" "ptype inner structure" 
-
-gdb_test "ptype ${union} ${outer}inner_union" "type = union ${outer}inner_union \{.*\[\r\n\]    int inner_union_int;.*\[\r\n\]    (long|long int|int) inner_union_long;.*\[\r\n\]\}.*" "ptype inner union" 
-
-gdb_test "ptype nested_su" "type = struct outer_struct \{.*\[\r\n\]    int outer_int;.*\[\r\n\]    (struct |)${outer}inner_struct inner_struct_instance;.*\[\r\n\]    (union |)${outer}inner_union inner_union_instance;.*\[\r\n\]    (long|long int|int) outer_long;.*\[\r\n\]\}.*" "ptype nested structure" 
-
-gdb_test "ptype nested_su.outer_int" "type = int.*" "ptype outer int" 
-
-gdb_test "ptype nested_su.inner_struct_instance" "type = struct ${outer}inner_struct \{.*\[\r\n\]    int inner_int;.*\[\r\n\]    (long|long int|int) inner_long;.*\[\r\n\]\}.*" "ptype nested structure #2" 
-
-gdb_test "ptype nested_su.inner_struct_instance.inner_int" "type = int.*" "ptype inner int" 
-
-gdb_test "ptype nested_su.inner_union_instance" "type = union ${outer}inner_union \{.*\[\r\n\]    int inner_union_int;.*\[\r\n\]    (long|long int|int) inner_union_long;.*\[\r\n\]\}.*" "ptype nested union" 
-
-
-get_debug_format
-
-# Print the type of the identifier ID, and check the response:
-# - Expect to see PROTOTYPED as the type.  PROTOTYPED is not a regular
-#   expression; it's a literal string.
-# - If we instead see the unprototyped type PLAIN, and we're using STABS
-#   generated by GCC, that's an xfail; as of 9 Feb 2002, GCC never emits
-#   prototyped function types in STABS.  Like PROTOTYPED, PLAIN is a
-#   literal string, not a regular expression.
-# - Otherwise, it's a failure.
-proc ptype_maybe_prototyped { id prototyped plain } {
-    global gdb_prompt
-    global gcc_compiled
-
-    # Turn `prototyped' and `plain', which are literal strings, into
-    # regular expressions by quoting any special characters they contain.
-    regsub -all "\[\]\[*()\]" $prototyped "\\\\&" prototyped
-    regsub -all "\[\]\[*()\]" $plain "\\\\&" plain
-
-    send_gdb "ptype $id\n"
-    gdb_expect {
-        -re "type = $prototyped\[\r\n\]+$gdb_prompt $" {
-            pass "ptype $id"
-        }
-        -re "type = $plain\[\r\n\]+$gdb_prompt $" {
-            if {$gcc_compiled} { setup_xfail_format "stabs" }
-            fail "ptype $id (compiler doesn't emit prototyped types)"
-        }
-        -re "$gdb_prompt $" {
-            fail "ptype $id"
-        }
-        timeout {
-            fail "ptype $id (timeout)"
-        }
-    }
-}
-
-ptype_maybe_prototyped "func_type" "int (*)(int (*)(int, float), float)" \
-                                   "int (*)()"
-ptype_maybe_prototyped "old_fptr" "double (*)()" "double (*)()"
-ptype_maybe_prototyped "new_fptr" "double (*)(void)" "double (*)()"
-ptype_maybe_prototyped "fptr" "int (*)(int, float)" "int (*)()"
-ptype_maybe_prototyped "fptr2" "int *(*)(int (*)(int, float), float)" \
-                               "int *(*)()"
-ptype_maybe_prototyped "xptr" "int (*)(int (*)(), int (*)(void), int)" \
-                              "int (*)()"
-ptype_maybe_prototyped "ffptr" "int (*(*)(char))(short int)" \
-                               "int (*(*)())()"
-ptype_maybe_prototyped "fffptr" "int (*(*(*)(char))(short int))(long int)" \
-                                "int (*(*(*)())())()"
-
-# Test printing type of string constants and array constants, but
-# requires a running process.  These call malloc, and can take a long
-# time to execute over a slow serial link, so increase the timeout.
-
-# UDI can't do this (PR 2416).  XFAIL is not suitable, because attempting
-# the operation causes a slow painful death rather than a nice simple failure.
-
-if [runto_main] then {
-
-  if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*" 2416
-    fail "This target can not call functions"
-    continue
-  }
-
-  # We need to up this because this can be really slow on some boards.
-  # (malloc() is called as part of the test).
-  set timeout 60;
-
-  gdb_test "ptype \"abc\""	"type = char \\\[4\\\]"
-  gdb_test "ptype {'a','b','c'}"	"type = char \\\[3\\\]"
-  gdb_test "ptype {0,1,2}"		"type = int \\\[3\\\]"
-  gdb_test "ptype {(long)0,(long)1,(long)2}"	  "type = long \\\[3\\\]"
-  gdb_test "ptype {(float)0,(float)1,(float)2}" "type = float \\\[3\\\]"
-  gdb_test "ptype {{0,1,2},{3,4,5}}"	"type = int \\\[2\\\]\\\[3\\\]"
-  gdb_test "ptype {4,5,6}\[2\]"	"type = int"
-  gdb_test "ptype *&{4,5,6}\[1\]"	"type = int"
-}
diff --git a/gdb/testsuite/gdb.base/radix.exp b/gdb/testsuite/gdb.base/radix.exp
deleted file mode 100644
index 7ca03c8a1ea..00000000000
--- a/gdb/testsuite/gdb.base/radix.exp
+++ /dev/null
@@ -1,157 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-# Copyright 1993, 1997, 2004 Free Software Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-# And rewritten by Michael Chastain (mec.gnu@mindspring.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-
-# Test input radices.
-
-proc test_one_input { iradix input output } {
-    gdb_test "print $input" "$output" \
-	"print $input; expect $output; input radix $iradix"
-}
-
-proc test_input_radix { iradix iradixhex iradixoctal } {
-    # set input-radix = $iradix, output-radix = ten
-    gdb_test "set radix" \
-	"Input and output radices now set to decimal 10, hex a, octal 12." \
-	"initialize radix, input radix $iradix"
-    gdb_test "set input-radix $iradix" \
-	"Input radix now set to decimal $iradix, hex $iradixhex, octal $iradixoctal."
-    if { $iradix == 10 } then {
-	gdb_test "show radix" \
-	    "Input and output radices set to decimal 10, hex a, octal 12." \
-	    "show radix, input radix $iradix"
-    } else {
-	gdb_test "show radix" \
-	    "Input radix set to decimal $iradix, hex $iradixhex, octal $iradixoctal.\r\nOutput radix set to decimal 10, hex a, octal 12." \
-	    "show radix, input radix $iradix"
-    }
-
-    # test constants with specific bases that do not use $iradix
-    test_one_input $iradix  "010"        "8"
-    test_one_input $iradix  "20."        "20"
-    test_one_input $iradix  "(int) 20."  "20"
-    test_one_input $iradix  "0xf"        "15"
-
-    # test simple one-digit constants
-    test_one_input $iradix  "0"          "0"
-    test_one_input $iradix  "1"          "1"
-    test_one_input $iradix  "-1"          "-1"
-
-    # test simple two-digit constants
-    test_one_input $iradix "10"          [expr $iradix]
-    test_one_input $iradix "11"          [expr $iradix + 1]
-    test_one_input $iradix "-10"         [expr 0 - $iradix]
-    test_one_input $iradix "-11"         [expr 0 - $iradix - 1]
-
-    # test simple three-digit constants
-    test_one_input $iradix "100"         [expr $iradix * $iradix]
-    test_one_input $iradix "101"         [expr $iradix * $iradix + 1]
-    test_one_input $iradix "-100"        [expr 0 - $iradix * $iradix]
-    test_one_input $iradix "-101"        [expr 0 - $iradix * $iradix - 1]
-
-    # test a five-digit constant
-    test_one_input $iradix  "10101"      \
-	[expr $iradix * $iradix * $iradix * $iradix + $iradix * $iradix + 1]
-}
-
-test_input_radix 2 "2" "2"
-    test_one_input 2  "4"   "Invalid number \"4\"\\."
-    test_one_input 2  "-2"  "Invalid number \"2\"\\."
-
-test_input_radix 3 "3" "3"
-    test_one_input 3  "2"   "2"
-    test_one_input 3  "20"  "6"
-    test_one_input 3  "3"   "Invalid number \"3\"\\."
-    test_one_input 2  "30"  "Invalid number \"30\"\\."
-
-test_input_radix 8 "8" "10"
-    test_one_input 8  "20"  "16"
-    test_one_input 8  "-20" "-16"
-    test_one_input 8  "8"   "Invalid number \"8\"."
-    test_one_input 8  "-9"  "Invalid number \"9\"."
-
-test_input_radix 10 "a" "12"
-    test_one_input 10 "-12"  "-12"
-
-test_input_radix 16 "10" "20"
-
-# Test output radices.
-
-proc test_one_output { oradix input output } {
-    gdb_test "print $input" "$output" \
-	"print $input; expect $output; output radix $oradix"
-}
-
-proc test_output_radix { oradix oradixhex oradixoctal } {
-    # set input-radix = ten, output-radix = $oradix
-    gdb_test "set radix" \
-	"Input and output radices now set to decimal 10, hex a, octal 12." \
-	"initialize radix, output radix $oradix"
-    gdb_test "set output-radix $oradix" \
-	"Output radix now set to decimal $oradix, hex $oradixhex, octal $oradixoctal."
-    if { $oradix == 10 } then {
-	gdb_test "show radix" \
-	    "Input and output radices set to decimal 10, hex a, octal 12." \
-	    "show radix, output radix $oradix"
-    } else {
-	gdb_test "show radix" \
-	    "Input radix set to decimal 10, hex a, octal 12.\r\nOutput radix set to decimal $oradix, hex $oradixhex, octal $oradixoctal." \
-	    "show radix, output radix $oradix"
-    }
-
-    # no standard tests for output radix
-}
-
-test_output_radix 8 "8" "10"
-    test_one_output 8  "010"        "010"
-    test_one_output 8  "0xf"        "17"
-    test_one_output 8  "10"         "12"
-    test_one_output 8  "100"        "144"
-    setup_kfail *-*-* "gdb/1715"
-    test_one_output 8  "20."        "24"
-    test_one_output 8  "(int) 20."  "24"
-
-test_output_radix 10 "a" "12"
-    test_one_output 10 "010"        "8"
-    test_one_output 10 "0xf"        "15"
-    test_one_output 10 "10"         "10"
-    test_one_output 10 "100"        "100"
-    test_one_output 10 "20."        "20"
-    test_one_output 10 "(int) 20."  "20"
-
-test_output_radix 16 "10" "20"
-    test_one_output 16 "010"        "8"
-    test_one_output 16 "0xf"        "f"
-    test_one_output 16 "10"         "a"
-    test_one_output 16 "100"        "64"
-    setup_kfail *-*-* "gdb/1715"
-    test_one_output 16 "20."        "14"
-    test_one_output 16 "(int) 20."  "14"
diff --git a/gdb/testsuite/gdb.base/readline.exp b/gdb/testsuite/gdb.base/readline.exp
deleted file mode 100644
index 511cb6ba2e5..00000000000
--- a/gdb/testsuite/gdb.base/readline.exp
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 2002 Free Software Foundation, 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 Tom Tromey <tromey@redhat.com>
-
-# This file is part of the gdb testsuite.
-
-#
-# Tests for readline operations.
-#
-
-# This function is used to test operate-and-get-next.
-# NAME is the name of the test.
-# ARGS is a list of alternating commands and expected results.
-proc operate_and_get_next {name args} {
-  global gdb_prompt
-
-  set my_gdb_prompt "($gdb_prompt| >)"
-
-  set reverse {}
-  foreach {item result} $args {
-    verbose "sending $item"
-    sleep 1
-
-    # We can't use gdb_test here because we might see a " >" prompt.
-    set status 0
-    send_gdb "$item\n"
-    gdb_expect {
-      -re "$item" {
-	# Ok
-      }
-      timeout {
-	set status 1
-      }
-    }
-
-    if {! $status} {
-      gdb_expect {
-	-re "$result" {
-	  # Ok.
-	}
-	timeout {
-	  set status 1
-	}
-      }
-    }
-
-    if {$status} {
-      fail "$name - send $item"
-      return 0
-    }
-    pass "$name - send $item"
-
-    set reverse [linsert $reverse 0 $item $result]
-  }
-
-  # Now use C-p to go back to the start.
-  foreach {item result} $reverse {
-    # Actually send C-p followed by C-l.  This lets us recognize the
-    # command when gdb prints it again.
-    send_gdb "\x10\x0c"
-    set status 0
-    gdb_expect {
-      -re "$item" {
-	# Ok
-      }
-      timeout {
-	set status 1
-      }
-    }
-    if {$status} {
-      fail "$name - C-p to $item"
-      return 0
-    }
-    pass "$name - C-p to $item"
-  }
-
-  # Now C-o through the list.  Don't send the command, since it is
-  # already there.  Strip off the first command from the list so we
-  # can see the next command inside the loop.
-  set count 0
-  foreach {item result} $args {
-    set status 0
-
-    # If this isn't the first item, make sure we see the command at
-    # the prompt.
-    if {$count > 0} {
-      gdb_expect {
-	-re ".*$item" {
-	  # Ok
-	}
-	timeout {
-	  set status 1
-	}
-      }
-    }
-
-    if {! $status} {
-      # For the last item, send a simple \n instead of C-o.
-      if {$count == [llength $args] - 2} {
-	send_gdb "\n"
-      } else {
-	# 15 is C-o.
-	send_gdb [format %c 15]
-      }
-      set status 0
-      gdb_expect {
-	-re "$result" {
-	  # Ok
-	}
-	timeout {
-	  set status 1
-	}
-      }
-    }
-
-    if {$status} {
-      fail "$name - C-o for $item"
-      return 0
-    }
-    pass "$name - C-o for $item"
-
-    set count [expr {$count + 2}]
-  }
-
-  return 1
-}
-
-
-if $tracelevel {
-  strace $tracelevel
-}
-
-# Don't let a .inputrc file or an existing setting of INPUTRC mess up
-# the test results.  Even if /dev/null doesn't exist on the particular
-# platform, the readline library will use the default setting just by
-# failing to open the file.  OTOH, opening /dev/null successfully will
-# also result in the default settings being used since nothing will be
-# read from this file.
-global env
-if [info exists env(INPUTRC)] {
-    set old_inputrc $env(INPUTRC)
-}
-set env(INPUTRC) "/dev/null"
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-set oldtimeout1 $timeout
-set timeout 30
-
-
-# A simple test of operate-and-get-next.
-operate_and_get_next "Simple operate-and-get-next" \
-  "p 1" ".* = 1" \
-  "p 2" ".* = 2" \
-  "p 3" ".* = 3"
-
-# Test operate-and-get-next with a secondary prompt.
-operate_and_get_next "operate-and-get-next with secondary prompt" \
-  "if 1 > 0" "" \
-  "p 5" "" \
-  "end" ".* = 5"
-
-
-# Now repeat the first test with a history file that fills the entire
-# history list.
-
-if [info exists env(GDBHISTFILE)] {
-    set old_gdbhistfile $env(GDBHISTFILE)
-}
-if [info exists env(HISTSIZE)] {
-    set old_histsize $env(HISTSIZE)
-}
-set env(GDBHISTFILE) "${srcdir}/${subdir}/gdb_history"
-set env(HISTSIZE) "10"
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-operate_and_get_next "Simple operate-and-get-next" \
-  "p 7" ".* = 7" \
-  "p 8" ".* = 8" \
-  "p 9" ".* = 9"
-
-
-# Restore globals modified in this test...
-if [info exists old_inputrc] {
-    set env(INPUTRC) $old_inputrc
-} else {
-    unset env(INPUTRC)
-}
-if [info exists old_gdbhistfile] {
-    set env(GDBHISTFILE) $old_gdbhistfile
-} else {
-    unset env(GDBHISTFILE)
-}
-if [info exists old_histsize] {
-    set env(HISTSIZE) $old_histsize
-} else {
-    unset env(HISTSIZE)
-}
-set timeout $oldtimeout1
-
-return 0
diff --git a/gdb/testsuite/gdb.base/recurse.c b/gdb/testsuite/gdb.base/recurse.c
deleted file mode 100644
index 798177888c9..00000000000
--- a/gdb/testsuite/gdb.base/recurse.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Trivial code used to test watchpoints in recursive code and 
-   auto-deletion of watchpoints as they go out of scope.  */
-
-#ifdef PROTOTYPES
-static int
-recurse (int a)
-#else
-static int 
-recurse (a)
-     int a;
-#endif
-{
-  int b = 0;
-
-  if (a == 1)
-    return 1;
-
-  b = a;
-  b *= recurse (a - 1);
-  return b;
-}
-
-int main()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  recurse (10);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp
deleted file mode 100644
index bd1ecee60d9..00000000000
--- a/gdb/testsuite/gdb.base/recurse.exp
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000
-# Free Software Foundation, 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 Jeff Law. (law@cs.utah.edu)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "recurse"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-proc recurse_tests {} {
-
-    # Disable hardware watchpoints if necessary.
-    if [target_info exists gdb,no_hardware_watchpoints] {
-	gdb_test "set can-use-hw-watchpoints 0" "" ""
-    }
-
-    if [runto recurse] then {
-	# First we need to step over the assignment of b, so it has a known
-	# value.
-	gdb_test "next" "if \\(a == 1\\)" "next over b = 0 in first instance"
-	gdb_test "watch b" ".*\[Ww\]atchpoint \[0-9]*: b" \
-	    "set first instance watchpoint"
-
-	# Continue until initial set of b.
-	if [gdb_test "continue" \
-	    "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 0.*New value = 10.*" \
-	    "continue to first instance watchpoint, first time"] then {
-	    gdb_suppress_tests;
-	}
-
-	# Continue inward for a few iterations
-	gdb_test "continue" "Breakpoint.* recurse \\(a=9\\).*" \
-	    "continue to recurse (a = 9)"
-	gdb_test "continue" "Breakpoint.* recurse \\(a=8\\).*" \
-	    "continue to recurse (a = 8)"
-	gdb_test "continue" "Breakpoint.* recurse \\(a=7\\).*" \
-	    "continue to recurse (a = 7)"
-	gdb_test "continue" "Breakpoint.* recurse \\(a=6\\).*" \
-	    "continue to recurse (a = 6)"
-	gdb_test "continue" "Breakpoint.* recurse \\(a=5\\).*" \
-	    "continue to recurse (a = 5)"
-
-	# Put a watchpoint on another instance of b
-	# First we need to step over the assignment of b, so it has a known
-	# value.
-	gdb_test "next" "if \\(a == 1\\)" "next over b = 0 in second instance"
-	gdb_test "watch b" ".*\[Ww\]atchpoint \[0-9]*: b" \
-	    "set second instance watchpoint"
-
-	# Continue until initial set of b (second instance).
-	if [gdb_test "continue" \
-	    "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 0.*New value = 5.*"\
-	    "continue to second instance watchpoint, first time"] then {
-	gdb_suppress_tests;
-	}
-
-	# Continue inward for a few iterations
-	gdb_test "continue" "Breakpoint.* recurse \\(a=4\\).*" \
-	    "continue to recurse (a = 4)"
-	gdb_test "continue" "Breakpoint.* recurse \\(a=3\\).*" \
-	    "continue to recurse (a = 3)"
-	gdb_test "continue" "Breakpoint.* recurse \\(a=2\\).*" \
-	    "continue to recurse (a = 2)"
-	gdb_test "continue" "Breakpoint.* recurse \\(a=1\\).*" \
-	    "continue to recurse (a = 1)"
-
-	# Continue until second set of b (second instance).
-	if [gdb_test "continue" \
-	    "Continuing.*\[Ww\]atchpoint.*: b.*Old value = 5.*New value = 120.*return.*" \
-	    "continue to second instance watchpoint, second time"] then { 
-	    gdb_suppress_tests;
-	}
-
-	# Continue again.  We should have a watchpoint go out of scope now
-	if [gdb_test "continue" \
-	    "Continuing.*\[Ww\]atchpoint.*deleted.*recurse \\(a=6\\) .*" \
-	    "second instance watchpoint deleted when leaving scope"] then {
-	    gdb_suppress_tests;
-	}
-
-	# Continue until second set of b (first instance).
-	# 24320 is allowed as the final value for b as that's the value
-	# b would have on systems with 16bit integers.
-	#
-	# We could fix the test program to deal with this too.
-	if [gdb_test "continue" \
-	    "Continuing.*\[Ww\]atchpoint.*b.*Old value = 10.*New value = \(3628800|24320\).*return.*" \
-	    "continue to first instance watchpoint, second time"] then {
-	    gdb_suppress_tests
-	}
-
-	# Continue again.  We should have a watchpoint go out of scope now.
-	#
-	# The former version expected the test to return to main().
-	# Now it expects the test to return to main or to stop in the
-	# function's epilogue.
-	# 
-	# The problem is that gdb needs to (but doesn't) understand
-	# function epilogues in the same way as for prologues.
-	# 
-	# If there is no hardware watchpoint (such as a x86 debug register),
-	# then watchpoints are done "the hard way" by single-stepping the
-	# target until the value of the watched variable changes.  If you
-	# are single-stepping, you will eventually step into an epilogue.
-	# When you do that, the "top" stack frame may become partially
-	# deconstructed (as when you pop the frame pointer, for instance),
-	# and from that point on, GDB can no longer make sense of the stack.
-	# 
-	# A test which stops in the epilogue is trying to determine when GDB
-	# leaves the stack frame in which the watchpoint was created.  It does
-	# this basically by watching for the frame pointer to change.  When
-	# the frame pointer changes, the test expects to be back in main, but
-	# instead it is still in the epilogue of the callee.
-	if [gdb_test "continue" \
-	    "Continuing.*\[Ww\]atchpoint.*deleted.*\(main \\(\\) \|21.*\}\).*" \
-	    "first instance watchpoint deleted when leaving scope"] then {
-	    gdb_suppress_tests;
-	}
-    }
-    gdb_stop_suppressing_tests;
-}
-
-# Preserve the old timeout, and set a new one that should be
-# sufficient to avoid timing out during this test.
-set oldtimeout $timeout
-set timeout [expr "$timeout + 60"]
-verbose "Timeout is now $timeout seconds" 2
-
-recurse_tests
-
-# Restore the preserved old timeout value.
-set timeout $oldtimeout
-verbose "Timeout is now $timeout seconds" 2
-
diff --git a/gdb/testsuite/gdb.base/regs.exp b/gdb/testsuite/gdb.base/regs.exp
deleted file mode 100644
index 93ee35a989e..00000000000
--- a/gdb/testsuite/gdb.base/regs.exp
+++ /dev/null
@@ -1,86 +0,0 @@
-# Tests of register displays for GDB.
-#   Copyright 1994, 1995 Free Software Foundation, 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 Stan Shebs. (shebs@cygnus.com)
-
-# This does not (yet) have an associated executable, since the IDT board
-# will display registers even without a program being loaded.
-# A more comprehensive register test would actually test reading
-# and writing of registers in a real program, although some care
-# would be required in the writing of the tests.
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-# These tests exercise IDT-specific MIPS registers for several
-# different processor models.
-
-# This should detect the actual processor in use and change
-# the expected results appropriately.  FIXME
-
-proc idt_register_tests { } {
-	# Test the generic IDT chip.
-	gdb_test "info registers" ".*"
-	gdb_test "info register zero" "zero(r0): 0x0;"
-	# FIXME access each generic register individually
-	# Test the 3041.
-	gdb_test "set processor r3041" ".*"
-	gdb_test "info registers" ".*"
-	gdb_test "info register bus"  "bus.*0x.*"
-	gdb_test "info register ccfg" "ccfg.*0x.*"
-	gdb_test "info register port" "port.*0x.*"
-	gdb_test "info register cmp"  "cmp.*0x.*"
-	gdb_test "info register elo"  "elo: invalid register"
-	gdb_test "info register ehi"  "ehi: invalid register"
-	gdb_test "info register cfg"  "cfg: invalid register"
-	gdb_test "info register ctxt" "ctxt: invalid register"
-	# Test the 3051.
-	gdb_test "set processor r3051" ".*"
-	gdb_test "info registers" ".*"
-	gdb_test "info register bus"  "bus: invalid register"
-	gdb_test "info register ccfg" "ccfg: invalid register"
-	gdb_test "info register port" "port: invalid register"
-	gdb_test "info register cmp"  "cmp: invalid register"
-	gdb_test "info register elo"  "elo.*0x.*"
-	gdb_test "info register ehi"  "ehi.*0x.*"
-	gdb_test "info register cfg"  "cfg: invalid register"
-	gdb_test "info register ctxt" "ctxt: invalid register"
-	# Test the 3071.
-	gdb_test "set processor r3071" ".*"
-	gdb_test "info registers" ".*"
-	gdb_test "info register bus"  "bus: invalid register"
-	gdb_test "info register ccfg" "ccfg: invalid register"
-	gdb_test "info register port" "port: invalid register"
-	gdb_test "info register cmp"  "cmp: invalid register"
-	gdb_test "info register elo"  "elo.*0x.*"
-	gdb_test "info register ehi"  "ehi.*0x.*"
-	gdb_test "info register cfg"  "cfg.*0x.*"
-	gdb_test "info register ctxt" "ctxt.*0x.*"
-}
-
-if [istarget "mips*-idt-*"] then {
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    idt_register_tests
-} else {
-    verbose "regs.exp tests ignored for this target"
-}
diff --git a/gdb/testsuite/gdb.base/relational.exp b/gdb/testsuite/gdb.base/relational.exp
deleted file mode 100644
index 562a6fc3dce..00000000000
--- a/gdb/testsuite/gdb.base/relational.exp
+++ /dev/null
@@ -1,484 +0,0 @@
-# Copyright 1998, 1999 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite
-#
-# tests for correctenss of relational operators, associativity and precedence
-# with integer type variables
-# 
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "int-type"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-#
-# test expressions with "int" types
-#
-
-gdb_test "set variable x=14" "" "set variable x=14"
-gdb_test "set variable y=2" "" "set variable y=2"
-gdb_test "set variable z=2" "" "set variable z=2"
-gdb_test "set variable w=3" "" "set variable w=3"
-
-send_gdb "print x\n"
-gdb_expect {
-    -re ".*14.*$gdb_prompt $" {
-        pass "print value of x"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x" }
-    timeout           { fail "(timeout) print value of x" }    
-  }
-
-
-send_gdb "print y\n"
-gdb_expect {
-    -re ".*2.*$gdb_prompt $" {
-        pass "print value of y"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of y" }
-    timeout           { fail "(timeout) print value of y" }    
-  }
-
-send_gdb "print z\n"
-gdb_expect {
-    -re ".*2.*$gdb_prompt $" {
-        pass "print value of z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of z" }
-    timeout           { fail "(timeout) print value of z" }    
-  }
-
-send_gdb "print w\n"
-gdb_expect {
-    -re ".*3.*$gdb_prompt $" {
-        pass "print value of w"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of w" }
-    timeout           { fail "(timeout) print value of w" }    
-  }
-
-
-
-send_gdb "print x < y\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of x<y"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<y" }
-    timeout           { fail "(timeout) print value of x<y" }    
-  }
-
-send_gdb "print x <= y\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of x<=y"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<=y" }
-    timeout           { fail "(timeout) print value of x<=y" }    
-  }
-
-send_gdb "print x > y\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x>y"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>y" }
-    timeout           { fail "(timeout) print value of x>y" }    
-  }
-
-send_gdb "print x >= y\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x>=y"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>=y" }
-    timeout           { fail "(timeout) print value of x>=y" }    
-  }
-
-send_gdb "print x == y\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of x==y"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x==y" }
-    timeout           { fail "(timeout) print value of x==y" }    
-  }
-
-send_gdb "print x != y\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x!=y"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x!=y" }
-    timeout           { fail "(timeout) print value of x!=y" }    
-  }
-
-
-
-# Test associativity of <, >, <=, >=, ==, !=
-
-gdb_test "set variable x=3" "" "set variable x"
-gdb_test "set variable y=5" ""  "set variable y"
-gdb_test "set variable z=2" ""  "set variable z"
-
-
-
-send_gdb "print x < y < z\n"
-gdb_expect {
-    -re ".*$true.*\r\n$gdb_prompt $" {
-        pass "print value of x<y<z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<y<z" }
-    timeout           { fail "(timeout) print value of x<y<z" }    
-  }
-
-send_gdb "print x <= y <= z\n"
-gdb_expect {
-    -re ".*$true\r\n$gdb_prompt $" {
-        pass "print value of x<=y<=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<=y<=z" }
-    timeout           { fail "(timeout) print value of x<=y<=z" }    
-  }
-
-send_gdb "print x > y > z\n"
-gdb_expect {
-    -re ".*$false.*\r\n$gdb_prompt $" {
-        pass "print value of x>y>z"
-      }
-    -re 8".*$gdb_prompt $" { fail "print value of x>y>z" }
-    timeout           { fail "(timeout) print value of x>y>z" }    
-  }
-
-send_gdb "print x >= y >= z\n"
-gdb_expect {
-    -re ".*$false.*\r\n$gdb_prompt $" {
-        pass "print value of x>=y>=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>=y>=z" }
-    timeout           { fail "(timeout) print value of x>=y>=z" }    
-  }
-
-gdb_test "set variable x=2" "" "set variable x"
-gdb_test "set variable y=2" ""  "set variable y"
-gdb_test "set variable z=1" ""  "set variable z"
-
-
-send_gdb "print x == y == z\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x==y==z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x==y==z" }
-    timeout           { fail "(timeout) print value of x==y==z" }    
-  }
-
-gdb_test "set variable z=0" ""  "set variable z"
-
-
-send_gdb "print x != y != z\n"
-gdb_expect {
-    -re ".*$false\r\n$gdb_prompt $" {
-        pass "print value of x!=y!=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x!=y!=z" }
-    timeout           { fail "(timeout) print value of x!=y!=z" }    
-  }
-
-
-# test precedence rules on pairs of relational operators
-
-gdb_test "set variable x=0" "" "set variable x"
-gdb_test "set variable y=2" ""  "set variable y"
-gdb_test "set variable z=2" ""  "set variable z"
-
-
-send_gdb "print x < y == z\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of x<y==z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<y==z" }
-    timeout           { fail "(timeout) print value of x<y==z" }    
-  }
-
-# 0  2  2
-send_gdb "print x < y != z\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x<y!=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<y!=z" }
-    timeout           { fail "(timeout) print value of x<y!=z" }    
-  }
-
-gdb_test "set variable x=2" "" "set variable x"
-gdb_test "set variable y=3" ""  "set variable y"
-gdb_test "set variable z=1" ""  "set variable z"
-
-
-# 2 3 1
-send_gdb "print x < y <= z\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x<y<=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<y<=z" }
-    timeout           { fail "(timeout) print value of x<y<=z" }    
-  }
-
-
-# 2 3 1
-send_gdb "print x < y >= z\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x<y>=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<y>=z" }
-    timeout           { fail "(timeout) print value of x<y>=z" }    
-  }
-
-
-gdb_test "set variable z=0" "" " set variable z"
-
-
-# 2 3 0
-send_gdb "print x < y > z\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x<y>z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<y>z" }
-    timeout           { fail "(timeout) print value of x<y>z" }    
-  }
-
-
-gdb_test "set variable x=1" "" " set variable x"
-
-# 1 3 0
-send_gdb "print x > y >= z\n"
-gdb_expect {
-    -re ".*$true.*$gdb_prompt $" {
-        pass "print value of x>y>=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>y>=z" }
-    timeout           { fail "(timeout) print value of x>y>=z" }    
-  }
-
-
-gdb_test "set variable z=2" "" " set variable z"
-
-# 1 3 2
-send_gdb "print x > y == z\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of x>y==z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>y==z" }
-    timeout           { fail "(timeout) print value of x>y==z" }    
-  }
-
-
-gdb_test "set variable x=2" "" " set variable x"
-gdb_test "set variable z=0" "" " set variable z"
-
-# 2 3 0
-send_gdb "print x > y != z\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of x>y!=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>y!=z" }
-    timeout           { fail "(timeout) print value of x>y!=z" }    
-  }
-
-
-gdb_test "set variable x=4" "" "set x to 4"
-
-# 4 3 0
-send_gdb "print x > y <= z\n"
-gdb_expect {
-    -re ".*$false.*$gdb_prompt $" {
-        pass "print value of x>y<=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>y<=z" }
-    timeout           { fail "(timeout) print value of x>y<=z" }    
-  }
-
-# 4 3 0
-send_gdb "print x >= y == z\n"
-gdb_expect {
-    -re ".*$false\r\n$gdb_prompt $" {
-        pass "print value of x>=y==z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>=y==z" }
-    timeout           { fail "(timeout) print value of x>=y==z" }    
-  }
-
-
-gdb_test "set variable x=2" "" " set variable x"
-
-# 2 3 0
-send_gdb "print x >= y != z\n"
-gdb_expect {
-    -re ".*$false\r\n$gdb_prompt $" {
-        pass "print value of x>=y!=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>=y!=z" }
-    timeout           { fail "(timeout) print value of x>=y!=z" }    
-  }
-
-
-gdb_test "set variable x=0" "" " set variable x"
-gdb_test "set variable z=4" "" " set variable z"
-
-# 0 3 4 
-send_gdb "print x >= y <= z\n"
-gdb_expect {
-    -re ".*$true\r\n$gdb_prompt $" {
-        pass "print value of x>=y<=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>=y<=z" }
-    timeout           { fail "(timeout) print value of x>=y<=z" }    
-  }
-
-# 0 3 4
-send_gdb "print x <= y == z\n"
-gdb_expect {
-    -re ".*$false\r\n$gdb_prompt $" {
-        pass "print value of x<=y==z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<=y==z" }
-    timeout           { fail "(timeout) print value of x<=y==z" }    
-  }
-
-gdb_test "set variable x=2" "" " set variable x"
-
-# 2 3 4
-send_gdb "print x <= y != z\n"
-gdb_expect {
-    -re ".*$true\r\n$gdb_prompt $" {
-        pass "print value of x<=y!=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x<=y!=z" }
-    timeout           { fail "(timeout) print value of x<=y!=z" }    
-  }
-
-
-# 2 3 4
-send_gdb "print x == y != z\n"
-gdb_expect {
-    -re ".*$true\r\n$gdb_prompt $" {
-        pass "print value of x==y!=z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x==y!=z" }
-    timeout           { fail "(timeout) print value of x==y!=z" }    
-  }
-
-        
-
-# test use of parenthesis to enforce different order of evaluation
-
-
-gdb_test "set variable z=0" "" " set variable z"
-
-# 2 3 0
-send_gdb "print x >= (y < z)\n"
-gdb_expect {
-    -re ".*$true\r\n$gdb_prompt $" {
-        pass "print value of x>=(y<z)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>=(y<z)" }
-    timeout           { fail "(timeout) print value of x>=(y<z)" }    
-  }
-
-
-# 2 3 0
-send_gdb "print x >= (y != z)\n"
-gdb_expect {
-    -re ".*$true\r\n$gdb_prompt $" {
-        pass "print value of x>=(y!=z)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x>=(y*!=z)" }
-    timeout           { fail "(timeout) print value of x>=(y!=z)" }    
-  }
-
-# 2 3 0
-send_gdb "print x == (y == z)\n"
-gdb_expect {
-    -re ".*$false\r\n$gdb_prompt $" {
-        pass "print value of x==(y==z)"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x==(y==z)" }
-    timeout           { fail "(timeout) print value of x==(y==z)" }    
-  }
-
-
-gdb_test "set variable x=1" "" " set variable x"
-gdb_test "set variable z=4" "" " set variable z"
-
-# 1 3 4
-send_gdb "print (x == y) < z\n"
-gdb_expect {
-    -re ".*$true\r\n$gdb_prompt $" {
-        pass "print value of (x==y)<z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of (x==y)<z" }
-    timeout           { fail "(timeout) print value of (x==y)<z" }    
-  }
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/relocate.c b/gdb/testsuite/gdb.base/relocate.c
deleted file mode 100644
index 90e70ffe8b6..00000000000
--- a/gdb/testsuite/gdb.base/relocate.c
+++ /dev/null
@@ -1,21 +0,0 @@
-static int static_foo = 1;
-static int static_bar = 2;
-
-/* This padding is just for the benefit of the test harness.  It
-   causes the globals to have different addresses than the functions.  */
-int dummy[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-
-int global_foo = 3;
-int global_bar = 4;
-
-int
-function_foo ()
-{
-  return 5;
-}
-
-int
-function_bar ()
-{
-  return 6;
-}
diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp
deleted file mode 100644
index 916ce1ce41c..00000000000
--- a/gdb/testsuite/gdb.base/relocate.exp
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2002, 2003 Free Software Foundation, 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
-
-# relocate.exp -- Expect script to test loading symbols from unrelocated
-#		  object files.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile relocate
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}.o
-
-remote_exec build "rm -f ${binfile}"
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc get_var_address { var } {
-  global gdb_prompt hex
-
-  send_gdb "print &${var}\n"
-  # Match output like:
-  # $1 = (int *) 0x0
-  # $5 = (int (*)()) 0
-  # $6 = (int (*)()) 0x24 <function_bar>
-  gdb_expect {
-    -re "\\\$\[0-9\]+ = \\(.*\\) (0|$hex)( <${var}>)?\[\r\n\]+${gdb_prompt} $"
-	{
-	  pass "get address of ${var}"
-	  if { $expect_out(1,string) == "0" } {
-	    return "0x0"
-	  } else {
-	    return $expect_out(1,string)
-	  }
-	}
-    -re "${gdb_prompt} $"
-	{ fail "get address of ${var} (unknown output)" }
-    timeout
-	{ fail "get address of ${var} (timeout)" }
-  }
-  return ""
-}
-
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-# Load the object file.
-gdb_test "add-symbol-file ${binfile} 0" \
-	"Reading symbols from .*${testfile}\\.o\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
-	"add-symbol-file ${testfile}.o 0" \
-	"add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = 0x0\[\r\n\]+\\(y or n\\) " \
-	"y"
-
-# Print the addresses of static variables.
-set static_foo_addr [get_var_address static_foo]
-set static_bar_addr [get_var_address static_bar]
-
-# Make sure they have different addresses.
-if { "${static_foo_addr}" == "${static_bar_addr}" } {
-  fail "static variables have different addresses"
-} else {
-  pass "static variables have different addresses"
-}
-
-# Print the addresses of global variables.
-set global_foo_addr [get_var_address global_foo]
-set global_bar_addr [get_var_address global_bar]
-
-# Make sure they have different addresses.
-if { "${global_foo_addr}" == "${global_bar_addr}" } {
-  fail "global variables have different addresses"
-} else {
-  pass "global variables have different addresses"
-}
-
-# Print the addresses of functions.
-set function_foo_addr [get_var_address function_foo]
-set function_bar_addr [get_var_address function_bar]
-
-# Make sure they have different addresses.
-if { "${function_foo_addr}" == "${function_bar_addr}" } {
-  fail "functions have different addresses"
-} else {
-  pass "functions have different addresses"
-}
-
-# Now use a variable as an offset to add-symbol-file, and check that
-# the functions' addresses change.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "set \$offset = 0x10000" ""
-
-# Load the object file.
-gdb_test "add-symbol-file ${binfile} \$offset" \
-	"Reading symbols from .*${testfile}\\.o\\.\\.\\.done\\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)" \
-	"add-symbol-file ${testfile}.o \$offset" \
-	"add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = 0x10000\[\r\n\]+\\(y or n\\) " \
-	"y"
-
-# Print the addresses of functions.
-set new_function_foo_addr [get_var_address function_foo]
-
-# Make sure they have different addresses.
-if { "${function_foo_addr}" == "${new_function_foo_addr}" } {
-  fail "function foo has a different address"
-} else {
-  pass "function foo has a different address"
-}
-
-return 0
diff --git a/gdb/testsuite/gdb.base/remote.c b/gdb/testsuite/gdb.base/remote.c
deleted file mode 100644
index a43c40bc9d8..00000000000
--- a/gdb/testsuite/gdb.base/remote.c
+++ /dev/null
@@ -1,6194 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-/************************************************************************** 
- * TESTS :
- *   -- downloading of a rather large executable
- ***************************************************************************/ 
-
-
-/* A large array in .data.  If RLE compression becomes available during
-   downloads, this would have to become a bunch of real random data.  
-   Here's a quick way of generating such a bunch:
-
-awk < /dev/null '
-BEGIN {
-  for (i = 0; i < 3; i++) {
-    for (j = 0; j < 16384; j++) {
-      printf ("%4d,", rand()*256);
-      if (j % 8 == 7) print;
-    }
-  }
-}'
-
-*/
-
-#include <limits.h>
-/* For targets with 16bit int, use a 1k buffer. */
-#if INT_MAX < 32768
-# define RANDOM_DATA_SIZE (1024)
-#else
-/* Use a character buffer to avoid byte order problems. 48k is
-   chosen so that the buffer required at least 3 16k packets but
-   targets often have no more than 64k of data. */
-/* If you change this data, you will also have to change the checks
-   for the data in remote.c */
-# define RANDOM_DATA_SIZE (3 * 2048 * 8)
-# define BIG_RANDOM_DATA
-#endif
-
-unsigned char random_data[RANDOM_DATA_SIZE] = {
-  60,  74, 216,  38, 149,  49, 207,  44,
- 124,  38,  93, 125, 232,  67, 228,  56,
- 161, 146,  85,  26, 128, 145, 218,  10,
-  27, 163,   3, 184,  26, 123,  65, 173,
- 229, 194, 184, 232, 237,  96, 230, 199,
-  83,  49, 254,  41, 181, 128, 239, 183,
-  26,  53, 143, 180,  20, 130,  50,  70,
- 163, 114,  10, 119,  19,   9,  40, 101,
- 176, 136, 175,  69, 119,  70, 115, 239,
-  22, 116, 242, 219,  30,   3,  60, 221,
- 111, 197, 223,  96, 241, 204, 214, 242,
- 150, 153,  81, 107, 231,  40, 213, 187,
- 125,  54,  30,  12, 109,  83,  26, 109,
- 159, 158, 199, 124, 253, 237, 164, 191,
- 244, 132,  56,  76, 207,   1,  71, 235,
-  94, 104, 223, 243, 253,  38, 140,  60,
- 197, 117, 187,  50, 121, 236, 219, 242,
- 102,  88,  51,  82,  86, 146, 111, 223,
- 164, 132, 229, 214, 163, 121, 108,   2,
- 155, 237,  89,  64, 105,  63, 250, 120,
- 174, 205, 217,  70, 154, 180,  34, 194,
-  96,  40, 165, 162, 143,  52, 243, 232,
- 108, 165, 241, 193, 194,  10, 245,  83,
- 188, 156, 143, 141, 179,  64, 124,  66,
- 183, 115, 165,  30,  11, 231, 217,  63,
- 152, 203,  30, 116,   6, 118,  85, 250,
- 127, 100,  59, 222,  88, 196, 199,  98,
-  80, 169, 234,  83, 146, 141,   5, 180,
- 129,  91, 161,  60, 241,  19, 214,  54,
-  95,   4, 167,  54, 106,  94,  70, 178,
-  87,  73,  10, 205, 215, 205,  33, 221,
- 122,   9, 151,  75, 139,   8,  74,   2,
- 117,  27,  58,  69,  45,   6,  70, 222,
- 169, 199,  60,  66, 184,  14,   8, 136,
- 236,  39,   6,  94,  35, 234,  77, 157,
-  70,  49, 132,  23, 164, 169,  93, 222,
-  58, 219,  23,   9,  28, 243,  41, 137,
- 141,  52, 107, 214,  52, 122,  45, 133,
- 206, 217, 167, 126,  76, 110,  76, 198,
- 208, 103, 178,  62,  70, 145, 148,  10,
-  37,  96, 166, 211, 217,  32, 254, 168,
- 112, 172, 238, 166, 181, 189,  70,  50,
-  90,  96, 191, 226, 205,  26, 183, 254,
-  47, 180, 203, 111,  24, 118,  85, 143,
- 106, 130, 139, 168, 155, 197,  78, 220,
-  16, 124,  82, 135,   1,  47, 181, 132,
-  93,   4, 131, 208,  63, 139,  82,  35,
- 138,  61, 124, 194,  84, 232, 242,  24,
- 121,  31, 242, 204, 237, 235, 148,   4,
- 177, 159,  70, 251, 185, 255,  50, 140,
- 237, 172, 143,  93, 119,  47,  46,  94,
-  18, 221,  76, 101, 219,  48, 191,  42,
- 173,  57, 226, 126,  67, 146, 110, 127,
- 252,  78, 213, 215,   7, 188,  64, 158,
- 162,  38, 247,  54, 194,  20,  55, 194,
-   0, 124,  63, 148, 124, 111, 136,   1,
-  33,  19, 224, 205, 185,  77,  82,   3,
- 163, 234, 230, 160, 160, 210,  95,  77,
- 249, 137, 230,  94, 141, 188,  26,  44,
-   9,  86, 188, 151, 200, 135, 178,  96,
- 153, 124, 250,  62, 208,  63, 191, 187,
-  10, 224, 184, 191, 124, 188,  90, 253,
-  36,  27,  81,  19,  40,  95,  34,  34,
- 159, 223, 115, 239,  95, 232, 233,  10,
-  30, 255, 205, 134, 212,  38,  42, 205,
- 184, 158,  63, 223, 178,  17,  94,  88,
- 226, 201,  39, 181, 113, 139, 184, 194,
-  24, 212, 108,  52, 188, 110, 207, 104,
- 228, 222,  29, 238,  45, 237, 169, 180,
- 148,  76,  12, 136,  69, 159, 157, 193,
- 220,  45,  65, 105, 200, 235,  13, 173,
- 140, 255, 239,  79,  55,  33,  44,  75,
-  74,  24, 158, 115, 153, 196, 146,  74,
- 233,  40,   8, 186, 204,  42, 131, 102,
-  47,  87,  12, 126,  10, 194, 132, 157,
- 114, 222,  18, 207,  62,  13, 118,  90,
-  57,  86,  69, 114,  96,  10, 190,  82,
- 159, 172,  53, 122,  26, 183, 120,  85,
- 131, 196,  45, 246, 225, 239, 157,  41,
-  41,  25, 104, 160, 193, 237,  57, 131,
- 155,  58, 173,  71,  11, 158, 232, 209,
- 250,   2, 188, 136, 179,  55, 157, 205,
-  36,  49, 175, 186, 124,   1, 158,  16,
- 239,   1, 209,  15,  28, 146, 237,  39,
- 126, 195,  54, 150, 160,  94, 177,  81,
- 254,  51, 173, 199, 127, 247,  77, 208,
- 148, 194, 184, 154, 138,  39,  81, 122,
- 147, 252, 156,  93,  75, 132,   8, 164,
- 223, 141, 213, 224, 127, 103,  57,  51,
-  54, 243, 123,  47, 103,   5, 210, 247,
-  40, 216, 146,  15,  16, 175, 192, 175,
- 177, 130, 145, 174,  65,  47,  86, 212,
- 151, 206, 100,   5, 100,  22, 103, 102,
- 153,  70,  14, 141, 133, 210, 162,  55,
- 249, 178,  77, 215, 254,  80, 202,  94,
-  90, 247,  84, 160,  37,  46, 210, 177,
-  62,  19, 244, 115, 219,  20,  72, 126,
- 113, 237,  29, 132, 138,  92,  83, 124,
-  84, 231, 246,   7, 182, 119,  38, 215,
-  90, 236, 154, 220,  11,  98,  54, 206,
- 156,   1,   6, 107, 129, 233,  79, 232,
-  47,  61, 202,  80,  34, 197, 252, 246,
- 169, 246, 205, 204,  28, 231,  69, 160,
- 151, 236, 141, 178, 224, 179, 101, 164,
- 184, 172,  32, 252,  17,  89, 216,  73,
-  55,  84, 217,  99, 192,  20, 144, 229,
- 204, 194, 202, 129, 248,  30, 246,  80,
-  61, 215, 180, 192,  34,  89,  39, 196,
- 197, 204,  55, 185, 162, 241, 218,   9,
-  70,  17,  97, 132,  73,  70,  60, 229,
- 220, 170, 118, 147, 123, 193,  97, 249,
- 230, 115,  38,   7, 187,  32, 196, 124,
-  41,  74,  70,  87, 177, 137, 211,  10,
-  95,  56, 156,  92, 112,   1, 230, 178,
- 117,  63, 193, 185, 216, 206,  31,  92,
-  52, 233, 169, 203,  36,  76,  16, 214,
- 162, 218, 147,  53,  39,   1,  11,  81,
-  99, 197,  73, 147, 217,  22, 252, 216,
- 130, 249, 141,   8, 201,  43,  37,  11,
- 127, 166, 174, 105, 138,  78, 203, 244,
-  63, 133, 221, 143,  24, 235, 246,  85,
- 142,  42, 135, 248, 249, 224, 146,   8,
-  72,   9, 194, 154, 105, 137, 229,  26,
-   3, 172, 120, 156, 232, 248, 206, 113,
-  75, 223,  21,  60,  62,  73, 155, 254,
- 196,  13, 161, 122, 145, 141, 102, 233,
- 227, 112, 121,  67, 111, 148, 160,  32,
- 199, 117, 223, 105, 184, 131, 119, 182,
-#ifdef BIG_RANDOM_DATA
-  60,  26, 169, 194, 173, 164, 249, 135,
- 178,  57,  50,  44,  12, 159, 167, 240,
- 249, 188,  86, 192,  73,  47,  74,  77,
- 250, 114,  15, 247, 240, 191,  49, 125,
-  92, 113, 173, 235,  52, 208, 206, 146,
- 160,  65, 188,  78, 220,  66,  44,  15,
- 128, 250,  61, 172,  65, 225,   2, 201,
-  62,  30, 136,  64, 195,  59, 242,  47,
-  73, 243, 181,  99,   7,   1, 136,  59,
- 117, 167, 211, 224, 127,  38,  22,  16,
- 204,  35, 228,  46,  93, 168, 246, 240,
-  99, 114, 106,  91,  26,  75, 200,  37,
- 150,  68,  48, 101,  53,   3, 150,  55,
- 121,  54, 132,  96, 163, 207, 223,  96,
-  90, 152,  68, 133, 103, 105,  51, 114,
- 144,  24,  88,  28,  87,  74, 121, 194,
- 181, 107, 206, 214, 215,  96, 155,  17,
- 184, 140, 108, 235,  18,  41,  58,   6,
-  42,  14,  60, 154,  66,  56,  41, 140,
- 255, 106, 197, 223,  43, 244,  25, 176,
- 244,  36, 137, 190, 194,  89, 145,  11,
-  65, 197,  38, 202, 154, 121, 218,  52,
- 204,  17, 151, 255, 105, 156,  14, 159,
- 183,  16,  44, 132, 206,  72,  10, 192,
-  44, 250, 209, 168,   8, 164, 181, 110,
- 251, 103,  83, 102, 144, 202, 208, 250,
-   8,  69, 223,  33,  89, 130,  15,  15,
- 121,  62,  30,  73,  62,  87,   8, 252,
-  33, 170, 105,  44, 134,  24,  35, 100,
-  42,  80,  27, 181,  46,   9,  61,  10,
-  28, 179, 178,  27, 184, 198, 101,  29,
-  46,  91, 224, 174, 246,   1, 194, 239,
- 234, 187,  99, 108,  17, 198,  53,  48,
- 151, 235,  81, 225, 171, 124, 119, 128,
- 197, 164, 197,  31, 162, 177, 193,  58,
- 120, 151, 224,  31, 119, 127, 123, 157,
-  71, 177, 222, 101, 125, 160,   4,  47,
- 128, 155,  80, 127, 136, 198, 208, 236,
- 160,  83, 111,  39, 237,  83, 113, 159,
- 250, 218, 137, 128, 130,  69,  52,  30,
- 218,  61, 170, 187, 130, 183, 232, 128,
- 107, 189, 159,  75, 199,  63, 191, 132,
-  40, 238,  13, 176,  98,  35,  94, 214,
- 110,  79, 110, 229, 100, 224, 125, 197,
- 118,  85, 187,  56, 216, 221,  12, 140,
-  39, 120, 247, 127,  69,  22,   3, 164,
- 247, 102, 141, 123, 207,  64, 223, 218,
- 181,  63, 192,  66, 136, 188, 219, 181,
- 243, 158,  89, 220, 148, 124, 252, 104,
-  38, 197,  17, 217,  24, 215,  92, 133,
- 115, 129,  50, 148, 183,  21, 236,  90,
- 169,  23, 253,  97,  65, 190, 131, 250,
-  80,  11,  67,  28, 250,   6, 147, 187,
-  51,  43, 170, 240,   7,  10, 174, 166,
-  12, 153,  21, 228,  36,   4, 223, 148,
- 212, 148, 215,  95,  28, 247, 173, 161,
-  63, 153, 117,  10, 135, 132, 236,  18,
- 216, 233, 194, 219, 178,  15, 148,   8,
- 138, 188,  80,   8,  29,  10, 101,  15,
-  38,  35, 133, 198, 133,   9,   3,  84,
-  95, 163, 191, 185, 192,  84,  16,  67,
- 111,  25,  10,  17,  28, 203, 113, 125,
-  23,  44,  17,  53,  58,  25, 174, 130,
-  22, 238,  77, 105,  97,  15, 176, 240,
- 137, 255,   9, 145,  21,   1,  20, 237,
- 215, 154, 117,  40,  55, 203, 212,  94,
-  26, 107, 115, 145, 155,   1,  16,  55,
-  91, 224, 167,  44,  53,  57, 141, 236,
- 143,  79,   9, 202,  30,  47, 114, 226,
- 251,   6,  24,  52, 255, 113, 239,   6,
-  51,  68, 122, 180, 205, 123, 254,  21,
-   3,  81, 186,  28,  44, 221, 205,  86,
-  86,  96, 241,   6,   8,  29,  10, 226,
- 124, 242,  26,  81,  29, 242,  80, 107,
- 215,  75, 220, 120, 121, 137, 192,  27,
- 251, 163, 207,   5,  62, 203, 184,  72,
- 151, 161, 107, 138, 185,  44,  14,  10,
-  17,  41,  93,  93, 207, 190, 196, 248,
-  60, 183, 107,  56, 180, 179, 200, 203,
-  28, 215, 244,  33, 254, 203,  34, 120,
- 217, 202, 209, 217, 246,   1, 228,  96,
-  82, 109, 190, 220, 206,  31, 139,  99,
- 174, 138,   2, 124,   5, 198, 226, 222,
- 129,  80,  86, 148,  96,  24,  96, 248,
- 153,   5, 144,  74, 119, 134, 145, 162,
- 204,  41, 135,  86,  21, 217, 210,  15,
- 198,  49, 106,  31, 210, 155, 103, 132,
-  92,  81, 114, 112,  59,  94, 215, 176,
- 122,  75,  37,  28,  30,   2,  99, 182,
-  35, 226, 191, 142, 173,  57, 156,  74,
- 213, 215,  84,  89,  32,   2, 224,  97,
- 178,   8, 157, 253,  22, 119, 111,   9,
-  15, 160, 235,  98, 233, 123,  29, 233,
-  19, 155, 242,   7, 225, 179, 195, 137,
- 187,  38,  69,  24, 180,  27, 159, 252,
-  77, 191,  47, 107, 201, 160,  81, 203,
-  23,  60,  89, 119, 121, 221, 147, 182,
- 153,  88, 230, 148, 206, 106, 181, 138,
-  97, 182,  15,  48,  50,  19, 116,  39,
-  48, 205, 203, 225,  88, 200, 209, 224,
- 129, 108, 206, 184,  51,  81,  59,  79,
- 235, 221, 229, 198, 122,  61, 199, 130,
- 168, 238,   7, 187, 214, 118, 114, 191,
- 126, 174,  25, 227, 132, 213, 161, 184,
- 245,  78, 198,  63,  28, 176, 103,   0,
-  89,  63, 212, 162,  12, 193,  76, 173,
-  99, 115, 164, 215, 234,  95, 134, 182,
- 132,  79,  49, 137,  82,  35,   4, 133,
- 242, 192, 121, 173, 254,  58, 137, 116,
-  82,  55, 254, 120, 182, 125,   0, 169,
- 151, 159,  90,  49, 168,  26, 218,  89,
-   7,  33,   5, 137,  95,   0, 185, 175,
- 253, 195,   3,  32, 208,  55,  56, 145,
- 209, 165,  71,  84,  22,  98,  16, 116,
- 232, 140,  99,  77, 172,  51, 234, 111,
- 190, 240, 122, 204, 239, 244, 122, 108,
-  45, 166,  83,  82, 140,  22, 138, 220,
-  20,  18, 138,  65, 191, 191, 104,   0,
- 159, 250,  43, 211, 238, 201,  34,  42,
-  76,  81, 219,  58,  59, 245, 164, 162,
- 102, 106, 138,  91, 147, 203,  93,  46,
- 211,  27, 111, 133, 232, 248, 108,  84,
- 224,  67, 145,  62, 114,  92, 203, 138,
- 122, 244, 193, 176, 165,  31, 139, 185,
-  96, 179,   6, 146, 168,  51,  16,  36,
-  54, 193,   2, 193, 129, 233, 234, 138,
- 132, 176, 132, 115,  60,  95, 137, 213,
-  39,   2,  61, 121, 110,  19, 181,  28,
- 134,  17, 109,   0, 204,  41,  88,  43,
-  70, 182,  60,  36,  28, 136, 221, 189,
-   1, 147, 209,  67, 160, 107, 246, 113,
- 102,  39, 216, 125, 157,  41, 226,  66,
- 246, 252, 143,  56, 108, 124, 161, 215,
- 153, 155,  93, 222, 200, 179,  61, 194,
- 115, 248, 107, 168,   7, 145, 102, 142,
- 145, 206,  72, 183, 202, 128, 157,  36,
-  53, 162, 163, 112, 153, 241,  29, 100,
-  26,  86, 122, 151,  31, 252, 186, 188,
-  79,  33, 101,   5, 113, 103, 216,  62,
- 102,  62, 188,  89, 130, 101, 167, 158,
- 155,  43,  99, 208,  76, 237, 197,  94,
- 250,  87,  54, 254, 177, 239, 177,  37,
-  29, 137,  49,  56, 201,  48, 191,  80,
-  31, 103,  30, 233, 106,   7,  43,  97,
-   4, 167,  23, 177, 163, 193,  37,  64,
- 151,  18, 169, 201, 198, 128,  60, 140,
- 173,  18,  24, 137, 241, 201,   8, 111,
- 173, 105, 194,  69, 171,  82, 241, 140,
- 183,  27, 235,  56,  38, 235,  74,  68,
- 156, 211, 209, 131, 115,  37,  74, 103,
- 240,  34,  91,  36,  85,  20, 100, 132,
- 235,  10, 244,  94, 102, 146, 243, 247,
- 159, 183, 104,  12, 205, 243,  52, 203,
- 222, 135,  81,  23, 152, 213,  97,  15,
-  34,  58, 195, 180, 126, 135, 246, 163,
-  13, 208,  22, 193,  20,   5, 146,  73,
- 101,  81, 137, 175, 155, 230,  43, 200,
- 155, 108, 240,  99, 137, 211,  59,  44,
-  78, 169, 206,  36,  57, 158,  34,  14,
-  24,  13, 108, 211, 101,  88,  80, 239,
- 166,  15,  28, 234, 222,  18, 222, 188,
-  68, 149, 173,  69,  26, 124, 139, 174,
- 232, 172,  97, 224, 103,  94,   2,  15,
- 224, 246, 183, 203, 209,  99, 173,  18,
-  99, 237, 157,  57,  31,  75,  19, 174,
-  27,  11, 111, 248, 204,   8,  52, 131,
-  45, 251,  32,  89, 247,  25,  40,  65,
-  78, 187, 142, 243,  76, 156, 140,  51,
-  67,  95,  73,  39,  58,  24, 213,  25,
- 175,  92, 161, 188,  56, 196, 115,  91,
-   8, 105,  73, 177,  15,  17,  32,   0,
- 247, 174, 122,  75, 174,  92, 111, 211,
- 192,  93, 151, 182,   1,  20, 195, 222,
- 234,  89,  82,  31,  39,  92, 223,  12,
-   8,  41, 130, 122, 148, 188, 253,  76,
-   7, 149, 136, 212, 113, 253,  49, 116,
- 211,  29,  69, 127, 152, 109, 135,  54,
- 147,  53, 241,  42, 239,  98, 189, 197,
-  47, 120,  41,  57,  74, 107, 108,  99,
-  17, 140, 215, 134, 226,  82,  37, 229,
-  67, 218, 145, 147, 168, 107,  73,  51,
- 141, 224, 255,  39, 131,  99, 112, 121,
- 162,  37, 160,  52, 241, 238,  58,  66,
- 215,  96,  53, 166, 164, 213,  73,  29,
-  58, 128,   0, 152,   6, 141, 196,  87,
- 140, 126, 168, 151, 249, 183, 125, 172,
-  37,  79, 136, 210,  61, 170,  13,  31,
- 171, 131,   9, 236,  62, 100,  74, 141,
- 104, 249, 140,  52, 159, 233,  28, 170,
- 138, 138, 178,  54, 153,  10, 132,  39,
-  76, 237,  33,  18,   1,  60, 126,  86,
- 182, 236, 147,  55,  13,  87, 116, 175,
-  48,  48, 200, 206,  92,  32, 120,   4,
- 130,  43, 194, 188, 115, 241, 158, 195,
-  19, 155, 110, 172,  86,  99, 131,  47,
- 178, 188, 168, 231,  75, 149,  35, 139,
- 133,  18,  71, 231, 208, 237, 151,  34,
- 172,  95, 149,  47,  57, 189, 229,  49,
-  31,  64,  83,  84, 145,  16, 102,  29,
-   9, 157, 213, 226,  57, 174,  94, 142,
- 190, 135,  86, 178, 211,  75,  80, 210,
- 254, 192, 125, 241, 226, 128,  68,  87,
- 243,  97,  13, 100, 200,  75, 122,  44,
- 233, 145, 121, 197,  91, 126,  10, 144,
- 163, 234, 209, 162, 144,  39,  74, 247,
-  86, 235,  26,  84,  18, 247,  41,  72,
- 137, 220,  49, 194, 211,  57,  87,  97,
- 254, 211, 182, 240, 158, 253, 140,  75,
- 211,  41, 220, 175, 250,  74,  29,  27,
- 220,  89,  74,  45, 173, 242,  73,  60,
- 158, 171,  16, 216,  36, 158, 203, 180,
-  70, 192, 133, 225,  96, 106, 251, 158,
- 137,  91, 253, 141, 181, 255, 246,  77,
-  56,  83, 167, 186, 177, 219,  36, 173,
- 137, 187, 126,  81, 139, 226,  67,  66,
-  22, 204, 188,  91,  88, 229,  48,   3,
-  45,   9, 184, 179, 254,  28,  55,  20,
- 110, 185, 230, 148, 134, 208,  12, 171,
-  87, 103,  63,  99,   2, 206, 131, 201,
- 138,  15, 240,  80, 187, 183,  85, 222,
-  57,  55, 197, 122, 122, 113, 190, 246,
-  74, 241, 172,  94,  57,  93,  11, 148,
-  80, 206,  32, 171, 142, 210,  20,  42,
- 247, 179,  14, 103,  77, 125, 129, 175,
- 184, 112,  36,  34,  62, 118, 139, 249,
- 178, 153,  45, 180, 132, 145,  60, 147,
- 251,  58, 158, 161, 111, 242, 188,  70,
-  86,  70, 151,  83,  10,  96,  62, 120,
- 176, 117, 240, 106, 219, 153, 144, 218,
- 204, 120, 214,  16, 110, 121,  14,  94,
-  45,  77, 249, 135,  89, 109, 152, 143,
-  67,  81, 185,   6, 132,   6, 181, 110,
- 222,   3,  37, 100, 218, 101,  95,  18,
- 171, 217, 141,  18, 163, 224, 116, 111,
- 169,  72, 233,  88,  75,   7,  78, 164,
- 235, 130, 213, 224,  64, 127, 248, 168,
-  30,  14, 120,  83, 237, 125,  87,  35,
- 156, 114, 131, 241, 107, 121, 216,   6,
-  83,  76, 212,  45, 155,  51, 195,   6,
-  88,  18,  25, 158, 165,  90, 200, 167,
- 170, 208,  52,  15, 117, 213, 231, 147,
- 108, 249,  12, 175, 144,   4, 115,  28,
- 101,  78, 166, 242, 249,  72, 236, 215,
-  90,  48,  16,  81, 208, 200, 113, 143,
- 157,  21, 105,  87, 212,  44,  79, 235,
-  94, 226, 211,  63, 185, 145, 151, 235,
-  56,  12,  57, 213,   9, 204, 211,  44,
-  63,  88, 247, 156, 247, 192, 104,  19,
- 227,  24,  40, 157, 114,  90, 237,  89,
-  83,  95,  15, 159, 163,  22,  51, 152,
- 231, 142, 128, 122, 194, 175, 134, 225,
-  18,  35, 116,  68,  13, 126,  13, 171,
- 193,  42, 130,  86, 130, 210, 190,  28,
- 254, 210,  18, 203,  93, 245, 224,  25,
-  37,  95,  52,  61,  10, 222,  10,  74,
- 163, 154,  54,  46, 238,  87, 106,  78,
- 102, 143,  45, 159, 250, 231,  65, 149,
- 245,   5, 164,  72,  95, 146,  43,  19,
- 161,  33, 155,  94,  13, 148, 117, 135,
- 171,  31, 100, 113, 240, 254, 169, 106,
- 149,  23, 109, 240, 194, 128, 157, 156,
- 110, 128,  75, 169, 158, 127, 152, 190,
-  29,  82, 143, 154, 120, 131, 205, 113,
-  11,  66, 112,  95, 183,  33, 111, 214,
- 102, 147,  51,  45,  21,  87, 236, 226,
- 231, 140, 212,  51, 198, 242,   5, 166,
- 200,  99, 194, 207,  99, 217,  96,  11,
-  43, 143,   1, 241, 239, 152,   2, 152,
- 175,  28,  13, 207,  80, 238, 138, 248,
- 121, 197, 110,  12, 139,  36, 226, 255,
-  82, 226, 124, 245, 120,  70, 183, 195,
-   5, 118, 214, 141, 175,  31, 245,  91,
- 239,  34,  79, 100, 188, 168, 139, 114,
- 254, 210,   6, 205, 191, 196, 107,  51,
- 151,  89,  40, 139, 100, 197, 209, 252,
- 140, 141, 127, 110,   7,  10, 162,  81,
- 110, 123,  75, 156, 138,  20,  13, 134,
-  75, 186, 199,  83, 119,  89,  89, 171,
- 141,  10, 255, 120, 190, 118,  57,  63,
- 182, 140,  26, 201, 232, 222,  58,  41,
-  75, 155,   0, 188, 101, 240,  98,  97,
-  52,  58,   7, 199, 140, 247,  42, 193,
-  26,  66, 206,  51, 248, 202, 198,  83,
- 224,  96, 206, 214, 224, 130, 212,  67,
- 190,  10, 166,  48,  69,  82, 216,  36,
- 223, 166, 249, 113, 203,  37, 208,  94,
- 105, 105, 225, 160,  22,  80, 144,  70,
- 210, 236, 182, 158, 124, 182, 224,  43,
- 198, 198, 130, 231, 216,  58, 156, 208,
-  11,  19, 218, 102,  94, 136,  74, 100,
- 167, 117, 168, 161, 107,  50, 133, 102,
- 198, 149, 107,  76, 206, 163, 230, 165,
- 175,  85, 134, 203,  29, 246,  27, 250,
- 161, 155,  13, 216, 253, 206,  45, 150,
- 255, 225, 129, 152, 232, 121, 191, 145,
- 126,  52, 211,  80,   7, 231,  18, 217,
- 160,  35,  11, 227,  30, 186, 139, 150,
- 170, 133, 235,  73, 210,  28, 129,  40,
- 158,  71, 233,  84, 135,  13, 116,  58,
- 208,  60, 136,  87, 250, 225, 134,  53,
- 139,  18, 221, 251, 242,  13,   8, 170,
-  70,  83,  43,  40, 247,  36, 187, 186,
- 155,  29, 181, 158,  23, 214, 104, 231,
-  28, 239,  64,  71,  46,  65,  27, 187,
- 222, 233, 204, 235, 165,  48, 199, 113,
- 246, 226,  44, 255,  27, 157, 198, 100,
- 172, 149, 234, 113, 127, 243,  46, 254,
-  58, 195,  26,  21, 246, 124, 178,  62,
-  80,  46,  41,  27,  41,  50, 220,  34,
- 118, 161, 202, 193, 230, 161,  91, 247,
-  21, 202, 105, 128,  87, 192, 167, 196,
- 179, 243,  59, 105, 171, 198, 129,  96,
-  73,  22,   1, 167, 216, 159,  17,   8,
- 235,  24,  23,  51, 208, 150, 251, 168,
-  61,  40, 154,  25,  12,  58,  57, 116,
-  55,  81, 102,  92, 217, 140, 202,  27,
-  73, 114, 142, 184, 234, 199, 234,  96,
-   2, 204, 142, 116,  21, 113, 105, 126,
-  72, 177,  50, 138,  74, 242, 182, 106,
-  94, 153,   3, 174, 116, 246,  86, 160,
- 182, 184,  95,  55, 215, 233, 241, 221,
- 245,  12,  64,  17, 167, 163,  75, 137,
- 178,  76, 102, 114, 173, 231,  91, 147,
- 228,  75, 168, 130,  14, 217, 244,  61,
- 176,  63, 248, 226, 170, 148, 245, 247,
- 196,  82, 198, 219,  77, 182,  52, 125,
-  46,  97, 236,  54,  40, 222,  73, 167,
-  64,  67, 242, 102,  93, 179,  83,  10,
- 194,  34,  90,  49,  26,  12, 233, 222,
- 235,  44,  61, 229, 136, 212,  94,  16,
-  93, 195,  54, 228, 203,  39, 186, 158,
- 234, 146,  20,  35, 252, 241,  47, 224,
-  31,  23, 250, 165,  58,  47,  39, 235,
-  62,   4, 224,  45, 227,  23, 148, 195,
-  37,  17,  72, 112,  79, 153,  64, 129,
- 197, 183,  29, 123,  46, 130, 141,  80,
- 114, 204, 254,  25,  37,  15, 238, 217,
-   6,  67,  40, 177, 133, 228, 245,  82,
-  22,  76,  49, 252,  35, 222, 125, 103,
- 250,  14,  50,  46,  31,  79,  47,  79,
- 103,  97,   6,  65, 112, 152, 131, 193,
- 198, 166, 212, 184, 207, 100,  40,  78,
-  96, 168,  25, 105,   2,  66, 196, 137,
-  64,  94, 217,   7, 138,  23, 103, 218,
- 166, 165, 190, 227, 242, 225, 186, 192,
-   4,  44, 221,  99,  71,  60, 143, 165,
- 242,  36,  32,  68,  35, 160,   7,   1,
-  16,  66, 113, 145, 224,  15,  95, 198,
-  39,  46, 111, 224, 120, 252, 190, 132,
-  43, 255, 183, 135, 236,  21, 100, 196,
- 108, 133, 239, 241,  52, 248, 129, 193,
-  31, 248,   0, 138, 162,   9, 227, 138,
-  48, 238, 210, 197, 166,  97,  34,  38,
-  83,  48, 148, 219,  24, 168,  78,  65,
- 101, 133, 202, 237, 141, 149, 151, 168,
- 235,  92, 238, 206, 222,  61,   3,  43,
-  90, 202, 171,  35,  32, 222,  98, 142,
- 141,  69, 205, 186, 207,  52, 248, 100,
- 234, 217, 203, 255, 248, 121,  59,  90,
-  83,  84, 222, 129, 138, 110, 249,  42,
-  24, 235, 177,  87, 185, 219,   2,  85,
- 133,  25, 245,  14, 182,   5,  70, 171,
-  49, 252, 233, 119,  13, 165,  77,  57,
- 150, 132,  83,  50, 112, 115, 159, 250,
- 196, 111, 147, 179, 145, 244, 130,  16,
-  86,  35, 222, 173, 226, 218,  63,  41,
-   3, 207, 207, 199,  64, 124, 214,  42,
- 126,  93, 222, 105, 216, 210, 252,  21,
-   0, 177,   9, 194, 157, 160, 245, 122,
- 148, 138, 152,  79,  84, 154,  70, 119,
- 115,  93, 213, 226, 136, 214,  15, 165,
-  42, 125, 175,  31, 147,  51,  45, 242,
-  97, 245, 168,  58,  47, 177, 194,  24,
-  59,  25, 199, 169, 132, 195, 236, 240,
- 191, 142,  86, 151,  19, 233,  20, 147,
- 240, 207,  56,  17, 227, 224, 245, 246,
- 167, 177, 115,  17, 177, 166,  33, 182,
-  64, 217,  40, 125,  24,  94, 214,  73,
- 167, 125,  96, 232, 190, 205, 115, 157,
-  26, 202, 234, 125, 176, 222, 208,  50,
-  39, 208,  11,  58, 236, 174, 198,   2,
-  28, 227, 141,  17, 212, 193, 178, 114,
-   1,  87, 238,   1, 235, 255, 146, 131,
-  82, 139, 156, 128,  96,  85,  75, 243,
- 165,  24,  42, 220, 131, 165,  91, 156,
- 118, 159,  28,  52, 147, 105, 179,  91,
- 216,  56,  32, 222, 172,  31, 188, 215,
- 161, 139,   9, 186, 152, 105, 155, 195,
- 147, 159, 217, 198, 116,  58,  61,  89,
-  60, 202, 220, 176, 114,  36, 150, 151,
- 239, 221, 223, 202, 202,  93, 225,  51,
- 191,  92, 220,  60, 146, 222, 210, 119,
- 144, 187, 151,  26, 192,  27, 184,  46,
- 206, 234,  31, 179,  28, 208,  43,   3,
-  59,  92,  58, 231,   7, 196, 155,  61,
- 201, 211, 141,  38, 143,  43, 238, 129,
-  33, 250, 192,  53, 112, 173,   6,  67,
-  13, 234, 154,  13,  50, 201,  97,  80,
-  45,  13, 215, 162, 255, 224,  20, 211,
-  47,  12,  73, 220, 186, 141,   5, 149,
-  81, 232,   3, 195, 223, 152, 199, 149,
- 128, 160,  83, 112,  64, 107, 110, 170,
-   6,  65,  41,  48, 244, 144, 206, 151,
- 106, 248,  31, 174, 217, 199,  73, 107,
- 101,  38,  92, 204, 121, 127, 195, 209,
- 187,  86,  99, 150,  95, 192,  16,  62,
-  75,  35, 197, 197, 166, 187, 143, 191,
- 203,  20, 240, 171,  56,  62, 212,  37,
-  14,  17, 213, 181,  78,  21, 171,  44,
- 204,  32, 144, 208,  60, 171,  85,  92,
- 157, 198, 247, 235, 124,  74, 225,  76,
-  69, 100,  19, 237, 181, 255, 106, 208,
- 247,  83,  31, 152,  24, 220, 173, 104,
- 191,  35, 185,  24, 216, 233,  39, 115,
- 151,  93,  35, 201, 133,  20, 211, 159,
- 180, 164,  80, 137, 199, 155, 192, 207,
- 224, 182, 108, 186, 208, 123, 167, 116,
- 148,  36, 245,  50, 221,  51, 143,  45,
- 244, 235, 215,  84, 158, 128, 205,  19,
- 119, 139, 121,  46,  46, 152, 104,  95,
- 178, 210, 107, 132,  96,  14, 118,  54,
-  89,  18,  42,   3, 236,  20, 136,  32,
- 125, 160, 106, 239,   4, 216, 119,  43,
- 208,  33, 170, 114,  13, 206, 157, 126,
-  53, 161,  91,  43, 167,  78, 195,  87,
- 124, 114, 164, 130, 181,  69, 114, 103,
-  83,  43, 127,  30, 158, 108, 127, 247,
- 130, 252,  42,  88, 241,  89, 185, 108,
-  63, 170,  46, 143, 157,  20,  74, 164,
- 182, 225, 228, 209, 230, 111, 143,  12,
- 173,  23,   7,  12, 228,  92, 136,  89,
- 122,  37, 151, 165, 115,  17, 144, 197,
- 102, 194, 238, 149, 228, 167, 255, 124,
- 238, 147,  21, 203,  16, 131, 235,  62,
- 106, 233,   8, 166,  18, 145, 137,  11,
-   7,  50, 139, 124, 214, 144, 253,  60,
- 231,  22, 165,  67,  87, 162,  70, 253,
- 222, 195, 149, 124, 235, 122, 135,  53,
-  77,  84,  97,  70, 163,  43, 133, 255,
-  37, 188,  97, 213, 231, 119,  61, 164,
- 103,  85, 235, 207, 119, 118, 242, 225,
- 116, 138,  85, 102, 234, 213,  20, 126,
- 104, 112,  23,  42, 188,  69,  81,  89,
- 139,  22, 147, 106, 250, 247,  52,  27,
-  49, 215,  26, 114,  21,  92,  89,  56,
- 251, 145,  13, 248, 115, 251,  48, 125,
- 210,  51, 122,  29,  73, 206, 206, 243,
- 176,  18, 231, 207,  71, 132,  41, 144,
- 229, 208, 160,  24, 142, 129,  99, 216,
-  98, 184,  30,   8, 222, 242, 113, 218,
-  74,  98, 140,  72, 141, 223,  56, 195,
- 218, 110, 216, 211, 202, 255,  26,  76,
-  35,  62, 176, 198,  34, 123, 179, 175,
-  64,  78,  71, 186, 182, 230, 100,  54,
- 106, 229,   2,  76,  26, 233, 221, 141,
- 160, 135,  87, 158,  35,  76, 220, 194,
- 146,  51,  75, 218,  92, 191, 151, 250,
- 178, 209, 218, 184, 171,  29, 247,  65,
- 164,  48, 121,   7, 230,  30, 226, 189,
-  43,   4, 215, 162, 161, 188,   8,  44,
- 106,  27, 226,   4, 127,  51, 227,  36,
- 114, 185, 116,  42,  17, 117, 172,  23,
- 252, 255,  75, 102,  79,  45, 187,  91,
- 227,  58, 216, 252,  72,  36, 230, 121,
- 173, 248, 211,  47, 239, 135, 129,  52,
-   5, 223, 152,  67,  96,  88, 153,  62,
- 111, 232, 240, 214, 245, 216, 149, 193,
- 197, 156,  63, 225, 157, 166, 211,  62,
-  90,  60,  64, 192, 244, 215, 251, 110,
-  39, 155, 198, 215,  77, 250,  18,  15,
-  14,  90, 193,  17,  62, 249,  84,  55,
- 114,  75,  71, 143, 180, 154,  20, 193,
- 186, 141, 189, 172,  52, 181, 233, 239,
- 207, 103, 171,  12, 100, 254,  60, 171,
- 148, 132,  91,  80,  40, 189, 127,  68,
- 225,  33,   2, 160,  70,  26,  88, 178,
- 239,  47, 240, 228, 188, 184,  38,  77,
- 233, 175, 135, 212, 207, 225, 240, 255,
-  90,  27,  45, 107, 101, 186, 241, 100,
- 175, 246, 133,  57, 212, 232, 169, 100,
- 241, 174,  91, 143,  69,  47,  30, 237,
-  85,   0,  13, 113, 111, 172,  87, 235,
- 112, 203,  27,  68,   2, 129, 197, 167,
- 200, 202, 107, 178, 204,  37, 215, 199,
- 246, 231, 203, 136,  64, 102, 180, 157,
-  77, 212, 169, 120,  89,  74,  73, 164,
- 192, 237,  88, 189, 120, 105, 205, 125,
- 115, 248,  50,   6, 239, 153, 253, 238,
- 157, 249, 136, 206, 253,  28,  10,  95,
-  96, 109, 222,  78, 250,  81,  61, 173,
- 120, 148, 216, 218,  92,  34, 201, 146,
-  93, 200, 122,  70, 107,  67,  10,   1,
- 232, 180,  61, 125, 228, 152,  54, 132,
-  88,   1, 122, 211,  30, 103,  12, 204,
- 185,  18, 207,  71, 177, 127, 252, 112,
- 104, 155, 162, 145,  42,  39,  22, 180,
- 173,  53,   3,   1,  29,  39, 135, 231,
-  85,  51, 129, 124, 205,  11, 185,  50,
- 198, 159, 122, 214, 249, 195,  85, 179,
- 123, 246,  61, 169, 237, 248, 250, 227,
- 151, 213,  82,  54, 207,   6, 138, 227,
- 229,  95,  51,  81, 185, 197, 146,  75,
-  93,  45, 117,  39, 167, 164,  20, 125,
-  24, 186,  76, 118, 158, 180, 104,  21,
-  75,  79,  81, 111, 150,  30,   6,  91,
- 142,  16, 140,  90, 102,  31,  82,  24,
- 184,  51,   9,   3, 198,  27, 206,  74,
-  65, 126,  40,  21,  13,   7, 235, 131,
-  88, 170, 225, 177, 183,  66,  38,  11,
- 107, 158, 240, 169, 111,   1,  76, 170,
- 215,  76, 116,  27, 191, 211,  81, 105,
-  36, 112, 231, 133,  58, 162, 184,   4,
-  84, 165,  20, 171, 201, 207,  43, 186,
- 202,  87, 178,  24,  56, 138, 163,  92,
- 143, 153, 156,  98, 126,  77, 152, 217,
-  88, 128, 149, 163, 171, 150,  25, 113,
-  28, 253, 174, 102, 169, 207, 219,  70,
- 229, 213, 127, 238, 240,  60, 230, 190,
-  11, 127, 155,  90,  46, 127, 233,  13,
- 126, 101, 234,  36, 199, 128, 132, 217,
- 126, 147,  62,   8, 216,   3, 189, 136,
- 224, 147, 172, 228, 111,  19, 111, 254,
- 152,  52, 150,  21,  98, 250, 212,  44,
- 172,  65, 229, 144,  38,  63, 177, 205,
- 202, 121, 224, 138,  89,  53, 124,  98,
-  55, 183, 165, 149, 210, 185, 120, 131,
-   3, 159, 249,  40, 168, 145, 159,  30,
- 131, 110, 147,  90, 219,  96,  57, 184,
-  75, 138, 147, 108, 112,  45, 182, 151,
-  42, 214, 187,  43,  62, 173, 172,  68,
- 120,  15,  37, 135, 130,  86, 130,  46,
- 112,  85, 230,  12,  76, 254, 203, 150,
-  16, 240, 122, 212,  10, 134, 232,  32,
- 215, 125,  19, 230, 159,  24, 156, 159,
-  62,  56,  97,   9, 155,  59,  89, 221,
-  76, 223,  58,  21, 118, 175, 104, 180,
-  62, 210,  62, 174, 220, 147,  42,  85,
-  43, 231,  18,  80, 254, 171, 239, 104,
- 120, 157,  37, 167, 254, 128, 175,  32,
- 118,  92, 105, 182, 180, 127,  22,  38,
-  23, 146, 102, 113, 247, 224,   0, 216,
-  86, 105,  80, 240,   8, 164,  68, 131,
- 188,  29,  39, 195, 254,  88,  54, 130,
-  97, 156, 178,  40, 216,  64, 244,  51,
-   5,  68, 243, 208,  99, 142, 227,  15,
- 246,   8,  89,  87,   2, 242,  90, 211,
- 113, 150,  62,  60, 189, 109, 141,   3,
-  96, 201, 127,  51, 179, 201, 239,   6,
- 152, 255, 112, 104,  72,  73,  34, 120,
- 226,  50,  34,  43, 207,  20, 151,  84,
- 114, 153,  92,  91, 180, 234, 108, 206,
- 106,  28,  68,  28,  93,  81, 133, 139,
- 207, 195, 147, 246, 132, 104, 119, 110,
- 118, 208,  39,  42,  28, 119,  75, 188,
-  82, 144, 205, 138, 247, 132, 136, 232,
- 177,  49, 100,  23, 224, 208, 215, 112,
- 112, 225,  73, 146, 220, 254, 119,  90,
- 140, 175, 218, 170, 191,  87, 171,  29,
- 183,  20, 112,  36,  14, 123,  73, 180,
- 208,  21,  50, 143, 225, 102, 242, 193,
- 132,  23,  14, 147, 251, 115, 225,  88,
-  40,  80, 122, 151,  15,  90,  22, 105,
- 250, 199,  81,  73, 206,  86,  63, 241,
-  34, 134, 158, 127,  79,  39, 151,   7,
- 232,  50, 196, 161, 160,  24, 114, 255,
- 174, 137,  52, 244,  75, 246,  20, 203,
- 224,  80, 116, 130, 254,  71, 251, 204,
- 226,  20, 164, 134, 237, 223, 160,  37,
-  61,  76, 223, 219,  79,  48, 137, 178,
-   2, 125,  21,  36, 127, 149, 255, 249,
- 192,  18,  92,  42, 129, 192, 177, 212,
-  90, 249, 120, 200, 239, 135, 143, 119,
- 170, 110,  16, 176, 200,  59,  58, 233,
- 115, 168, 156, 231, 222, 242, 190, 158,
- 238,  98, 229, 227,  43,  39, 243, 213,
- 234, 142,  20,   1, 225, 130, 167, 229,
-  49,  17, 237,  60, 109, 246, 168, 171,
-  40,  61,  98, 225, 119, 118, 112,  49,
-  68, 160, 203,  76,  13, 191, 147, 238,
- 231,  95,  40,  24, 159,  46, 166,  80,
- 191, 207, 128,  73, 132, 190, 167,  27,
- 195,  95,  70,  36,  23, 214, 116,  99,
- 197, 171, 143, 186, 226, 214, 171, 150,
-  36,  57,  59,  28, 158,  70,  44,  93,
- 111,  92, 153,   6, 253, 166,  82, 123,
- 184,  27, 252, 116, 235,  91, 141, 209,
- 114,  61, 138, 151,  86, 234, 216, 191,
-  31,  71,  96, 255,  46, 212,  36, 227,
- 179,  51, 124,   1, 191, 103, 130,  69,
- 164, 235,  16,  40, 254, 114, 213, 155,
-  71, 214, 145, 115,  73, 245, 139, 176,
- 234,  37,  66, 224,  39,  83, 177,  32,
- 125,  23,  30,  27, 194,  21, 144,  73,
- 100,  97, 213, 193,  29, 170, 124, 238,
-  44, 182,  78, 165, 143, 103,  39,  71,
- 143, 239, 238,  28, 241,  22, 249, 173,
- 225,  94,  95,  31, 134,   9,  78, 243,
- 223, 239,  23,  21, 136,  93, 249,  64,
-  22, 168,  28, 101,  91, 231, 151, 129,
- 167, 233, 202, 241,  68, 246,  22, 148,
- 171, 201, 229, 168, 189,  77, 151, 251,
-  92,  50, 244,  17, 188,  56,  39,  83,
-   9,  87, 252, 140, 244,  27,  99, 242,
- 225, 208, 237, 222, 244, 238, 156, 125,
- 219,  59,  90, 225, 234,  57,  45,  12,
- 252,  19,  41, 177,  15,   9,  73,  96,
-   9,  37, 139, 230, 205, 101, 230, 141,
- 118,  64,  50, 119, 109, 132,  24, 196,
- 141, 115,  28, 217,  39, 190, 186,  23,
-  74,  62,  79,  11,  68, 107, 190, 200,
-  32,  29, 169, 157, 185,  29,  15, 240,
- 193, 174, 140, 129, 112,  12, 137, 101,
- 160, 250, 220, 198,   0,  45,  57,  54,
-  73, 115,  37,  52,  61, 135, 232, 241,
-  22, 161, 136,  86, 187, 162,  47, 166,
- 231,  25, 144, 254, 130, 154,  95, 237,
-  96, 124,  86, 126,  60, 247,  14,  88,
- 150, 230, 242,  54, 162,  96,  41,  73,
- 102,  15, 173, 103, 132, 148, 133,  70,
- 244, 129,   3, 115, 127,   8, 109,  14,
-   8, 228, 171, 171, 217,  19,  73, 147,
-   6,  43,  96, 158,  37,  14, 255,  22,
- 184,  65, 151,  82, 244,  36, 203, 178,
- 204,  93,  91, 221, 120, 215, 196,  37,
- 162, 248, 119, 180, 171, 185,  17, 168,
- 143, 129, 184,  90, 187, 228,  46, 148,
- 164,  82, 185,  62, 210,  87, 158, 146,
-  20,  23, 139,  10,  19, 129, 143, 152,
- 125,  40, 212, 174, 193,  10, 157, 163,
- 207,  47, 205, 243,   1,   0,  23, 207,
-  16, 168, 250, 239,  20, 223, 146,  94,
- 187,  23, 245, 109,  69,  10,  47, 210,
- 203,  66, 246, 161,  90, 108,  21, 164,
-  38, 222,  57, 245, 218,   8, 156,  65,
- 147,  77, 139,  94, 182,  84, 231, 252,
-  20, 159, 169, 188,  62, 205, 101, 226,
-  11, 224, 142,  79,  90, 248, 156, 107,
- 154, 103,  90,  92,  92, 116,  67,  84,
- 252, 247, 230, 251, 218, 108, 203, 134,
- 158, 147,   0,  70,  81, 128,  83,  30,
-  96,  86, 247,  82, 191, 212, 120, 158,
- 125, 183, 172, 134, 143,  44, 109,   0,
-  77, 217,  55, 238,  66,  42,  38,  59,
- 218, 132,  65, 127,  76, 178, 148, 160,
- 129,  15,  95, 186, 178,  78, 185,  84,
- 188,  22, 114, 207,  67, 135, 219, 215,
- 206, 181, 177, 140, 249, 196,  75, 233,
- 124, 125, 196,  21, 150, 233,   7, 104,
- 190, 182,   8, 200, 156,  20, 179,  48,
- 232, 148,  27, 170, 215,  68,  68, 146,
- 107, 163, 146, 213, 255,  38,  97,  60,
- 192,   1, 128, 204, 127,  20, 180,  53,
-  69, 165,  95,  18,  96,  26, 110,  42,
-  65, 180, 132, 200,  79,  43,   2, 209,
- 135,  56, 197, 190, 130, 206, 184,  53,
- 178, 119, 140,  35,  13,  20, 124,  59,
- 241, 250, 194,  95, 115,  39,  88,  64,
- 213, 240, 155, 114, 183, 252, 142, 250,
- 158,  48,   5,   5,  44, 141, 201, 138,
- 139,  11, 216,  87, 108,  32,  86, 156,
-  65, 161, 179,  20,  46, 157, 200,   9,
- 190,  67,  11,  91, 134, 137,  91, 227,
-  28, 225, 159,  34, 240, 169, 222, 145,
-   8, 149, 185, 198, 218,  87, 147, 133,
- 127,  66, 161,  21,  60, 149, 213, 170,
- 155,  54, 169,  97,  93, 236, 230, 133,
- 182, 187, 193, 237, 122,  68, 207,  90,
- 102,  63, 151,   3,  36, 122,  23,  89,
- 250, 174, 194, 241, 142,  86,  96,  31,
-  98, 110, 201,  79, 217,  52,  23,  51,
-  20, 180, 214, 199, 113,  79, 224, 233,
- 126,  55, 253, 216,  48, 195,  72, 200,
-  11, 172, 194, 255, 148, 105,  20, 175,
- 230, 144, 241,  78,  58,  33, 167,  93,
-  24, 217, 199,  66, 134,  86, 176,  23,
-  86, 237, 241,  21, 144, 167,   1, 252,
- 170, 108,  94, 236,  67, 164, 195,  38,
- 148,  93, 173, 135, 187, 211,   6,  27,
- 208, 167, 111, 224,  47,  15, 248, 119,
- 175, 173, 133, 182, 121, 194, 138, 149,
-  66,   5,   4, 152,   2,  23, 198, 173,
-  61,  47, 126, 185, 218, 129, 223, 247,
- 209, 153, 219,  98, 184, 104, 127, 214,
- 196, 181, 203,  91,   3,   4,   0, 171,
-  24, 118,  99, 166,  74,  14,  52, 200,
-  38, 212,  91,  22, 234, 241,  12, 221,
- 132, 243, 211,   2,  18,  11, 130,  49,
- 223, 100,  27, 148,  87, 225, 119, 186,
- 191, 195,  92,  95, 118,  60, 234,  40,
-  87, 213, 143, 105, 235, 202, 194, 148,
-  45,   9, 107,  35, 139,  11, 226, 166,
-  92,  39, 131, 135, 140, 141,  56,  80,
- 199,  42, 208,  27,  41,  94,  39,  77,
-  33, 125, 148, 126, 111, 124,  89, 221,
- 208, 164, 167, 185, 196,  71, 121,  88,
- 189, 216, 109, 196, 166,  29, 216, 151,
-  90, 183,  22, 140, 201, 179, 219,  51,
-   9, 152,   2, 237, 184, 123,  16,  62,
-  71, 178, 213,  97, 109,  79, 246,  82,
- 122, 253, 132,  16, 157, 213,  38, 237,
-  24, 233,   4,  46, 140, 179,   1,  35,
- 160,  52, 179,  34, 159, 248, 214, 167,
-  75, 242, 172, 113, 184,  50, 139,  73,
-  33, 143,  83, 250,  23, 239, 135, 226,
- 153, 175,  60,   5, 184, 148, 199, 208,
- 105, 107,  89,  17, 141, 157, 219,  34,
- 213, 170,  12, 121, 200, 190,  17, 139,
- 136,  13,  29, 187, 145, 184, 165, 190,
- 167, 171, 218, 103,  26,  28,  63, 224,
-  21, 200, 234, 138, 130,  88, 255,  74,
-  61, 233,  91,  19,  70, 210,  27,  61,
- 204,  32,  26,  50,  34, 169, 139,  37,
- 212,  16,  22, 206,  99,  42, 251, 100,
- 208,  41,  58, 200, 101,  65, 100,  57,
- 228, 240, 105,  49, 240,   1, 141,  21,
-  35,  65, 252, 142,  70, 235, 169,  81,
- 252, 215,  62,  88, 117, 180, 148, 169,
- 114,  93, 231, 105, 194, 193,  12,  74,
-  52, 143, 163, 233, 188, 215,  20, 225,
-   2,  28,  79, 113,  27, 166, 204, 160,
- 177, 199, 150, 249,  36,  31, 132,  84,
- 125, 184, 128, 230,  39, 139, 197, 169,
- 153,   2,  52,  37,  39, 180, 202, 237,
-  46,  43, 185, 255, 235, 149, 230, 227,
- 186, 248,  81, 198, 122,  15, 185,  44,
- 137, 112, 218, 156,  94, 107, 181, 233,
- 121,  28,   6, 194, 153, 174, 144, 146,
- 174, 253, 111, 138,  49, 253, 158,  80,
-  23, 174, 167, 203, 235, 112, 196,  66,
- 251, 123,  97, 137,  21, 218, 131,  28,
-  31,  83, 121, 160,  84,  31,  13,  60,
- 103,  33,  32,  12, 161, 136, 107,  38,
-  30, 111,  53, 176, 192, 122, 166,  47,
- 160, 122,  22, 117, 224, 150, 128, 249,
-  21,  27, 222, 119,  38, 182,  73, 248,
- 246, 101, 240,  33,  30, 189,  13,  37,
- 211, 123,  70,  50, 163, 104, 170, 166,
-  33, 131,  13,  34, 252, 127, 156, 187,
-  14, 135,  40, 125, 156, 169, 229,  77,
- 110, 143, 155,  61, 198,  49,  87, 118,
- 229,  27, 204, 141,   7, 174, 222, 126,
- 248,  15, 132, 101, 251, 123, 117, 138,
- 166, 132, 252,  35, 218,  35,  27,  17,
- 119, 103, 136, 167, 101, 114, 151, 106,
- 229,  44,  95,   2, 106,  21, 187, 221,
-  97, 110, 144, 140,  12, 168,  99, 114,
- 250,  34, 159,  60, 229, 203,  25, 135,
-  23, 179, 240, 182, 232,  64, 182, 156,
- 183, 132,  17,  25, 199, 165,  36,  28,
-  44, 177,  23,  18, 142,   4, 142,  53,
- 186, 182, 218, 180, 215, 243,   5, 124,
- 227, 108,  20, 121, 235, 131, 237, 211,
-   0,  95,  97, 204, 225, 156, 122, 219,
-  73, 217, 102, 114,  27, 126, 241, 235,
-  14, 173, 234, 208, 155, 181,  60,  84,
-   7, 247, 174, 151, 215, 141,  41, 225,
- 101, 119, 145,  89, 255,  35,  64, 108,
-  30,  53,  72, 215, 219, 106, 160,  90,
-  17, 235, 159, 119, 107, 112, 236, 208,
-  61,  81, 203, 182,  58,  39, 251, 251,
-  90, 188, 137, 106,   7, 129,  92, 166,
- 127, 230,  89, 116, 243, 228, 208, 222,
- 140, 118,  71, 226, 152, 213,  41,  48,
-  40, 215, 110,  69, 211, 252, 222,  68,
- 187,  77, 166, 165, 201,   9, 118, 149,
- 203,  19, 235, 199,  50, 210,  44,  62,
-  41, 201,  65, 173,  29,  10, 219,  24,
- 106,  53, 235,  37,  77,  73,  68, 159,
-  92, 229,  80,  87, 217,  53, 219,  91,
-  66, 155,  16,   3, 232, 184, 151,  36,
- 155, 226, 197,  93,  50,  91, 140, 180,
- 140, 250,  63,  18,  15, 237,  49, 237,
-  58, 225, 135,  81,  90, 209, 103,  50,
-  70,  49, 248,  42, 253,  42, 104, 146,
-  92, 157,  75, 104, 115,  78, 102, 209,
-   6, 242,  24, 101, 175, 243, 147, 239,
- 213,  37, 124,  85, 139, 103, 195,   5,
- 161, 177, 180, 157,  86, 237,  18, 173,
- 143,  84, 177, 228,  63, 203, 128,  12,
-   7,  71,  90, 105,  87, 137, 118, 177,
- 147,  27, 108, 199, 152,   0,  50, 120,
- 170, 163, 206, 203, 245,  94, 240,  76,
- 234,  53, 158,  17,  95, 198, 151, 157,
- 144, 168,  14, 189, 176,  68,  52,   9,
-  46, 171,   1, 141, 245, 184, 190,  95,
-  16, 197,  99, 185, 167, 185, 102, 245,
-  74, 252, 224,  32, 236, 108, 121, 129,
- 200,  34, 140, 228, 109, 228, 150,  41,
-  68, 177, 120,  17,  17,  68, 188, 103,
-  10, 216, 164, 154, 248, 232,  53,  31,
-  85, 243,   4, 100,  43, 195,  96, 240,
- 153, 167, 100,  21,  89, 141, 151, 197,
- 113, 114,   0, 245, 173, 108, 203, 220,
- 162,   5, 191, 102,  31, 133, 123, 198,
- 194, 163, 195, 175,  28, 150,  23, 224,
-   2, 143, 115, 225, 197,  91, 133, 202,
- 123, 244,   5,  23,  91,  24, 127, 138,
-  99,   7, 161, 153, 130, 183, 214,  43,
-  30,  35, 136, 179, 118, 215, 200,  97,
-   8, 108, 129, 219, 105,   0, 198,  55,
- 170, 170, 159,  77, 185, 133,  98,   4,
-  10, 202,  48,  79, 213,  80,  23, 217,
- 124,  64, 239,  12, 162, 186, 154, 157,
-  44, 160, 129,  70, 162,  40, 242, 110,
-  99, 104, 127, 219, 243, 114, 253,  96,
- 103,   9, 162,  36, 219, 178, 222, 253,
-  32, 168,  91, 210, 169, 113, 210, 219,
-  71, 201, 164,  13,  13, 212,  11, 181,
-  95, 255,  76,   5, 139, 237, 242, 253,
- 199, 247,  71,  28, 109, 132,  94, 219,
-  27,  10,  22, 185, 115,  13, 170, 215,
- 119, 249,  64, 226,  11, 254, 109, 208,
-  56, 184, 147, 134, 249, 246,  86, 190,
- 199, 106, 143, 107,  29, 251, 248,  25,
- 194,  30, 240, 153,  11, 222, 185,   1,
- 202, 111, 125, 138,  95, 106,  32, 128,
- 127, 203, 209,  93,  74,  60,  57,   1,
- 248,  64,  92, 202,  79, 173, 136, 163,
- 174, 197, 126, 241, 254, 169, 128, 248,
- 241,  49,  20,  31,  29, 139,  91, 147,
-  76, 223, 102,  96,  87, 173, 108,  51,
- 158,  45, 152, 182, 178, 170, 196, 134,
- 165, 149,  47,  59,  25, 211, 212, 159,
-  14, 139,  22, 117, 224,   0, 128,   0,
- 203, 157, 250,  69, 129, 187, 189, 181,
- 246,  83,  29, 109,  26, 163,  71, 246,
- 187,  58,  43,  42, 211,  84,  76,  62,
- 112, 132, 164, 194,  77, 168,  60, 136,
- 104, 207,  48, 135,  52, 161, 213, 115,
- 161,  57, 240, 162,  77,  17, 152,  61,
- 211,   2,  62,  87,  43, 255, 159, 174,
-  58,  81, 199, 167, 168,  40,  41, 244,
- 146, 141, 210,  84,  15, 205, 130, 121,
- 204, 233,  86, 113,  21,  93,  83,  15,
-  73, 117, 159, 115, 200,  21,  83, 195,
-  72, 236, 174, 252, 164, 225, 106, 211,
- 162, 210,  89, 142,  47,   4, 120,  25,
-  83,  68, 230,  51,  69, 222,  28, 239,
- 242,  49, 136, 180, 180,  83,   1,  60,
- 141,  84, 252, 164, 205, 246, 235, 126,
-  11, 221,  49,  65,  14, 145,  10, 214,
- 192,  23, 137, 159, 252,  80,  95, 169,
-  30, 189,  49, 249,  14,  98,  37, 110,
-  90,   9,   5, 170, 139, 245, 200, 107,
-  62, 151,  38,  86,  91, 211, 237,  65,
- 133, 108, 160, 230, 196, 225, 209, 196,
- 245, 126,  50, 230,  57,  59, 120,   5,
-  90,  87, 251, 201, 192, 171,  41,  53,
-  18,  68, 134, 148,  38,  49,   7, 200,
- 224, 105,   8,   5,  85, 181,  95, 125,
-  59, 109, 102, 117, 215, 253, 107, 198,
- 208, 213, 128,  11,   1, 202,  54, 116,
-  12,  50, 137, 228, 184, 166, 231, 109,
- 217, 122,  96,  37,   6, 215, 156, 145,
-  15,  66,  40,  98, 158,  22,  28, 118,
- 205, 201, 147,  83, 254,  40,  93, 112,
- 180,  58, 207, 245,  38,  46, 247, 215,
-  65,  74,  79, 165,  91, 186,  56, 115,
- 224,  71, 188, 148, 145, 253, 196, 148,
- 106, 234, 246, 248, 194, 248, 109, 121,
- 172,  53,  26, 210, 121,  97, 206, 168,
-  34, 130, 168, 174, 134,  34, 180, 195,
-   5,  46, 144,  47,  69,  98, 217, 166,
- 112,   3,  86,  85, 126, 220,  76,   1,
-  60,  12,   1,  40,  87,  78,  38, 103,
- 177,   1, 166,   1, 188, 244, 104,  73,
- 144,  77, 225, 115, 112,  53, 201,  51,
-  29,  20,  12, 207, 200,  53, 175,  91,
- 145, 171, 126, 248,  89,  39, 208, 243,
- 118,  30, 204,  83, 117,  41, 237, 243,
-  34, 179, 226,  40, 138,  99,  10, 122,
- 126, 212,  42, 168, 132, 209, 211,  15,
-  27,  29,  70, 157, 236,  19, 122,  44,
-  45, 211, 213, 146, 134, 239,  56, 200,
-  21, 247, 106, 219,  16, 217,  13,  43,
-  63,  76,  27, 227,  25, 200,  36, 181,
-  97, 224, 216,  49,  89,  41,  29, 147,
- 177, 126, 209,  71, 112,  94,  82, 116,
-  39,  10,  50, 188,  32,  42, 165,  35,
- 248,  35, 203,  80,  34, 245,   5,  32,
-  62, 133,  34,  15,  34, 157, 201, 246,
- 202, 159,  50, 184, 167, 223, 168, 190,
- 181,  32, 251,  11, 229, 243,  30,  94,
- 170, 198, 170, 195, 140, 176, 102, 200,
- 168, 128, 178,  11,  53,  82, 230, 151,
-  21, 231,  46, 159, 254,  80, 197, 236,
- 246,  41, 229,   6,  48, 214, 249, 242,
-  21, 225,  50,  84,  74,  79, 112, 174,
-  51,  86, 102, 137,  38, 239, 230, 176,
-  80, 130,  58, 226, 194, 107,  41, 223,
- 255, 250,   6, 236, 223, 254,  93,   8,
- 206, 121,  61, 201, 122, 224, 168,  81,
- 210, 132, 144, 198,  25, 255, 151, 173,
- 148, 195,  98,  97, 177, 118,  99,  90,
- 131, 105, 111, 160, 118, 112,  99, 120,
-  90, 140, 224,  42, 122, 234, 152, 204,
-  35, 137,  18,  57,  40,  14, 191,  15,
- 145, 204, 175, 114, 221,   7, 230, 229,
- 224, 231, 211, 179, 178,  15,  24, 231,
-  96, 157, 102, 224, 193, 106, 187, 142,
-  18, 163, 105, 131, 131,  26, 199,  92,
-  31, 130, 227, 148,  11, 111, 201,  76,
- 182,  37, 198,  61, 173,  16, 137, 227,
- 111,  80, 123, 245, 223, 120,  68, 104,
- 242,   4,  62, 102, 117,  53,  68, 214,
- 163,  83, 197, 162, 170, 144, 118,  86,
-  61,  17, 197, 119, 135, 159, 134, 231,
- 132, 235, 204, 141, 248, 180,  66,  85,
- 248,  98, 229, 104, 131,  74, 166, 198,
-  72,  43, 192, 204,  59,   4,  81,   7,
-  45, 243,  48, 222, 239, 120,  92, 203,
-  27, 151, 140, 107, 227,  40, 145, 131,
- 136, 198,  45, 163, 216,  29, 243, 151,
- 234, 176,  83, 253, 141,   3,  90, 151,
- 169, 110, 229, 108,  12, 147, 122, 254,
- 234, 182,  68,  60, 240,  50, 135, 128,
- 226, 200,  49, 180, 255, 166, 108, 181,
- 225, 162, 110, 169, 174,   0,   7,  53,
-  40,  89,  56,  39, 160, 252, 199, 227,
- 122,   7, 114,  86, 127,  16, 147,  27,
- 226,  15, 178, 139, 168, 156,  51,  30,
- 206,  33,  30, 172, 175,   9, 161,  74,
- 184, 158,  11,  23, 171,  37,  36,  14,
- 196,   8,  69,  53, 104, 240, 112,  83,
-  28,  77,   2,   2, 169,  22, 203, 172,
-  78, 189, 103,  21,  22,  29,  82, 123,
- 213,  13,  53, 213, 209, 153, 124, 247,
- 254, 113, 200,  71,  88, 235,   7, 233,
- 249, 172,  55, 223, 123, 174, 205, 155,
- 188, 219, 135,  55,  64, 226,  44, 229,
- 131, 143, 166,  81, 119, 155, 170, 110,
- 119, 188, 242,  90,  74, 187,  14,  43,
- 121, 123, 126,  39,  61,   9, 181,   4,
- 194,  41,  63,  85, 115, 198,  66,  23,
-  37,  90,  47,   1, 154,  23,  15,  14,
- 127,  72, 144, 232, 212, 220, 198, 191,
- 107, 162, 130, 253, 172, 121,  21, 209,
- 173,  52, 107, 172, 142, 187, 161,  37,
- 180,  91, 173,  36, 192, 106, 216,  80,
-  12, 254,  89, 164,  95, 110, 154,  19,
- 143,  13,  53, 114, 123,  49,  54, 249,
-  34,  98, 184,  43, 242,  52,  75, 113,
- 203, 251, 252, 150, 174, 189, 203,  75,
- 147,  35,  11, 224, 188, 130,  66, 173,
-  80, 211, 208, 125, 247,  12, 222, 139,
- 192,  43, 216, 103,  35, 196, 233, 158,
- 249, 166, 203, 139, 245, 206,  30,  43,
-  42, 132,  40, 136, 247, 145, 164,  51,
-  65, 118, 233, 100, 150, 205, 198, 233,
-  75,   3,  47,  33,  86, 161,  19, 222,
- 218, 215, 110,  28, 217, 164, 240, 131,
- 166, 178, 147,  79, 210,  20, 194,  19,
- 230, 183,  53,  44,  56,  23, 162,  98,
- 142, 102, 205, 240, 181, 159,  61,  54,
- 221, 168,  51,  41, 247,  22,  66, 109,
- 241,  26, 162, 153,  42, 207,   2,  68,
- 186, 163,   8, 158, 108,  50,  27, 102,
- 106, 154, 188,  18, 180, 199, 166, 128,
-  87, 197, 226, 187,  96,  80, 212, 123,
-  45, 193,  16, 226, 247, 186, 205, 180,
- 107, 160, 205,   6,  29, 191,  34, 176,
-  23, 229, 213, 139,  42, 103, 158, 123,
-  36,  87, 128, 120, 143, 209,  63,  48,
-  74, 237, 134, 177, 129, 132, 200, 130,
-  38,  46, 205,  57, 108, 135, 238,  89,
- 243, 175, 194, 118,  61, 228, 100, 188,
- 130, 101,  32, 129, 210, 166,  33,  79,
-  16,  33,   4, 251, 181, 131,  55, 162,
-  67,  16,  22,  52, 243,  22, 199, 222,
- 195, 153,  36,  79, 183,  85, 209, 245,
-  77, 206,  70, 214, 168, 231,  24,  99,
-  80, 215, 137,  10, 142,  86, 217,   0,
-  46, 252,  54, 162,  42,  25, 114, 102,
-  22, 216,  79, 140, 113, 214, 146,  21,
- 122, 155,  29, 240, 150, 184,   8,  25,
-  58,  62,  58, 240, 115, 171,  77, 145,
- 162, 185, 237, 224, 247, 190, 156,  96,
- 249,  30, 109,  36, 122,  76,  65, 143,
-  93, 164, 123,  35,  11,  35, 134, 215,
- 174,  55,  65, 207,  38,   0,   0,  47,
-  43,  98,   5,  47,  73, 188,  34,  57,
-  18,  97, 238,  95,  53, 200, 222,  89,
- 244,  18,   2, 153,  82,  90, 115, 174,
- 237,  39,  24, 139,  54, 132,  22, 184,
- 113,  94,  63,  55, 245, 146, 242, 235,
-   9, 119, 155,  22,  98, 164,  51, 145,
-  53, 177, 212, 223,   3, 137,  96,  15,
-  70, 136,  87, 126, 126, 126, 173, 217,
-  59,  65, 113, 186, 118, 153, 210, 229,
-  70,  53, 148, 202, 147, 113, 202, 191,
- 210, 212, 110, 192,  27, 143,  61,  42,
-  81, 106, 245,  44, 177, 200, 128, 242,
-  81, 145, 200, 189,  79,  65,  45,  55,
- 174,  74,  96, 194, 102, 154,  43,  97,
-  18, 230, 198, 201,  83, 180, 195,   9,
- 145, 233, 104, 230, 101,  19, 236,  40,
- 106, 219, 149,  12, 165, 120,  93, 163,
- 216, 109,  56, 203,  60,   7, 198, 153,
- 109, 220, 156, 184,  71, 132, 174,   0,
- 106,  96, 141,  63,   7, 136, 122, 203,
-  93,  37, 227,  51, 116, 162, 217, 136,
- 210,  50, 244,  91, 245,  32, 130, 148,
- 123,  65,  11,  94,  19, 214, 224, 114,
-  92, 196, 171,  17,  36,  17,  58, 164,
- 127,  21,  33, 198,  62, 155,  63,  24,
- 134, 190, 137, 198, 205, 148,  45, 155,
- 119,  20, 205,  20, 153,  71,  72, 179,
-  20, 162, 225, 233, 113, 235, 183,  20,
-  58,  29,  80, 197, 103,  65, 201, 155,
- 206, 194,  30,  19,  52, 182,  74, 197,
-   7,  18, 113, 133,  91,  60, 175,  11,
- 208, 123, 140, 177, 194, 253, 161,  33,
-  54,  88,  31,  93, 249,  57,  81, 216,
- 150,  32, 230, 180,  73, 119,  19, 139,
- 160, 109, 129,  26,  98, 171,  95, 116,
-  22, 248, 225,  82,  62, 246,  11,  69,
-  98, 179, 120, 224,  34, 236, 135,  85,
-  24,  54,  73, 125,  52, 126,  68,  75,
-  94, 208,  85, 177, 237, 156, 168, 120,
- 244, 129,  50, 245, 242, 148, 181, 236,
-  68,  99, 193, 187, 244,  70,  30, 181,
- 213, 188, 113, 186,  50,  69, 208, 112,
- 221,  95, 122, 221, 137, 232,  92, 115,
- 107,  77, 160, 222, 213, 224,  37, 136,
-  60, 180, 149, 184, 164,  43, 129, 154,
- 208,  26, 152, 204,  75, 143, 219,  57,
-  10,  95,  17, 255, 156,  68, 189, 177,
-  51, 102,  91,  78, 227, 153, 133, 202,
-  46, 239, 171, 160, 231,   5, 187, 144,
-  77, 190, 120, 170, 239, 192,  48,  13,
- 109, 231, 196,  77,  54, 146,   6, 113,
- 190,  94,  61,  18, 243,  24, 161, 221,
- 146,  40, 224, 132, 176,  49, 204, 157,
- 184,  80,  29, 105, 248, 212,  14,  24,
- 120, 137, 137,  37, 105,  38, 216,  11,
- 113, 205,  28, 255, 152,  30, 232,  22,
-   6, 177,  82,  57,  63, 250, 139, 216,
- 150,  15, 186, 170, 106, 154, 168,  21,
- 252, 193,  15,  69, 216, 222,  80,  14,
- 109, 171, 190, 177, 202, 108,  73, 220,
-   4, 228, 104,  24,  74,  22, 179, 107,
- 188, 218,  68,  61,  17,  31,  56, 176,
-  58, 195, 233,  82, 121,  82,  93, 207,
- 156, 184, 184,  81, 111,  87, 110, 116,
-  38, 121, 178, 241, 236, 119,  80, 230,
- 246, 176,  91, 197,  96,   8,  30,  27,
- 220, 236,  49,   9, 231,  55,  70, 180,
-  96,  30, 208, 155,   7,  81,  45,  49,
-  22, 126, 151, 225, 248, 172,  23, 212,
- 175, 243,  48,  65,  97, 153,  74, 133,
-  72,  50, 132, 254,  80, 174, 126,  26,
- 211, 140, 221,  76, 164,  18, 135, 174,
-  39, 217, 203, 183,  47, 128, 103,  93,
-  14, 105,  47, 143, 152, 182, 210, 175,
- 155, 204, 214, 190, 246,  60, 241,  82,
- 113,  65, 220, 228,  53,  98, 148, 170,
-  41, 192, 162, 155,  71,  95,  51, 227,
- 214,   7,  73, 170,  68, 142,  19,  92,
- 142,  19,  18,  98,  17, 143, 170, 126,
-  10, 231,  52, 216, 234, 114,  32,  71,
-  32, 235, 163, 211,  83, 187,  24,  39,
- 144, 191,  79, 231, 158, 112,  31, 186,
- 135,  93,  27,  17,  78,  64, 146,   3,
-  68,  33,   5,  59, 157,  50, 220,   6,
- 198, 105,   4,  75, 170, 222, 193, 152,
- 159, 232, 147, 215, 101, 121, 214, 100,
- 119, 137, 236, 254, 142,  56, 182, 193,
- 169, 221, 181, 160,  18,  50, 121, 154,
- 134,  41, 253,  81,  12,  37,  76, 220,
- 156, 235, 211, 113, 226,   1, 188,  67,
- 160, 187, 204,  27,  91, 237, 240,  53,
-  87,  93, 152,  54, 104,  69,  75,  18,
- 124, 128, 204, 119,  86,  24, 176,  80,
-  57, 204, 164,   9, 131,  89, 190,  54,
- 192, 172, 171,  57, 113,  40, 234, 147,
- 112,  37, 198, 216,  10, 132,  30, 164,
- 206, 204,  29,  42,  79, 156, 121,  21,
-   1, 212,  70,  40,  42, 230,  41, 202,
- 133,  82, 109, 200, 182, 166, 220,  52,
- 145,  42,  96, 201,  15,  90, 109, 234,
- 106,  55, 175,   6,  30, 207,  32,  89,
-  37, 201, 211,  87, 176, 111, 165, 101,
-  18, 189, 246, 104, 145, 123,  14, 127,
- 164, 107,  67,  78, 211, 241, 150, 101,
-  49,  79, 122, 202, 102, 223, 244, 246,
- 203,  17,  58, 100,  75, 116,  63, 196,
-  23, 133,  78,   4, 171, 136, 188,  77,
- 119, 216, 161, 176,  11, 121,  99, 206,
-   6, 181, 187, 218, 169, 201,  35,  72,
-  18, 230,  61, 238,  93,   3, 104, 122,
-  55,  46, 151,  40, 164, 178,  49, 214,
-  65, 133, 212, 167, 153,  47, 149, 198,
-  22, 144,  90, 192, 159, 148, 138,  85,
- 103, 161,   6,  81, 198,   5, 202, 225,
- 103, 181, 185, 101, 237, 169, 247, 110,
-  70, 232, 153, 164,  30, 129,  79,  85,
-  11, 199, 161,  75,  20,  55, 128, 147,
- 122, 184, 166,   4,   8, 112, 234,  34,
-  81, 232,  16, 181, 103, 153, 112, 177,
-  55,  12, 179,  77, 125,  18, 216, 239,
- 127, 217, 154,  58, 207,  89, 175,  23,
- 185, 191,  17, 215, 221, 167, 137, 240,
- 166,  96, 197, 178,  92,  83, 193,   8,
- 241, 138,  46,  76, 206,  29, 115, 126,
-  69, 231,  50,  71, 127, 255, 147,  13,
- 197, 108, 113, 121, 234, 212, 247,  72,
-  49,  65, 247,  94, 248, 104,  26,  81,
-  93,  17,  94, 219, 237, 198, 181,  53,
-  14, 169, 227, 178,  12, 188, 212, 141,
-  76,  94,  53,  19, 187,  68,  53, 220,
-  60,   1, 180,  16,  99,  37,  45,  31,
- 169, 216,  37, 243,  17, 132,   3,  73,
-  49,  99, 170,  42,  42, 189, 203, 144,
- 253, 111, 232, 210, 167, 159, 232,  25,
-  91,  82, 176, 169,  17,  43, 125, 219,
- 236,  75,  38,  20, 219, 144, 197, 212,
- 126,  98,  21,  34, 223, 179,  64, 141,
- 235,  33,  52, 239,  52, 106,  70, 130,
- 132,  56,  72, 172, 209, 255,  30, 199,
- 160, 197, 184, 201,  78,  82, 156, 205,
-  48, 219,   5,  47, 237, 184,  73,  70,
- 181, 158, 113,  25, 184, 161, 186,  21,
- 103,  24, 193, 211, 254, 124,  87,  68,
- 143, 182, 203, 166,  55, 252, 209,  80,
- 178, 199, 233, 200, 124, 188,  74,  53,
-  86, 139, 123, 175,  25,  95, 226, 102,
- 158, 231, 148, 101, 101, 131,  75, 235,
- 176, 105,  51, 130, 212, 112,  61, 110,
-  74,  79, 127, 108,  37, 110, 181, 107,
-   9, 123, 148,  77, 238, 168, 190,  37,
-  62,   0, 211, 210,  78, 165, 233, 120,
-  47, 250, 160, 215, 212, 166, 246, 169,
- 112,  90,  35, 159,  92, 166, 220,  51,
- 190,  57, 233,   3,  99,  69, 171,  74,
-  50, 198,  44, 145,  21,  97,  77, 254,
- 103, 155,  29, 241,  98, 160,  14,  88,
- 168,  40, 149, 186,  41, 222,  73,  83,
- 206,  98, 175, 158,  70,   4,  42, 104,
- 105,  60,  14,  92,   1, 235, 100, 147,
- 141,  46,   5, 218, 128, 119,  32, 145,
- 236,  16, 176,  12, 179, 143, 194, 129,
- 187, 165, 168,  11,  81, 253,  71, 122,
-  64, 109, 254,  20, 117, 195, 193,  41,
- 196, 226, 211,  54, 214, 229,  62, 231,
-  15, 165,  95, 136, 103, 177,   4, 210,
-  53, 229, 131, 202, 207, 250,  98, 204,
-   8,  22, 115, 117,  96, 196,  88, 229,
-  20,  25, 244, 117, 236,  13, 158, 138,
- 154,  74,  87,  10, 154,  93, 222, 154,
-  63, 231, 243,  68,  65, 137,   3,  68,
- 178, 177, 197,  59, 254, 192, 233, 174,
- 144, 100, 154, 113,  87, 149, 124, 140,
-  49, 145,  26, 129,  50,  55,   9,  63,
-  36, 168, 114,  65,  59, 158, 107, 115,
- 138, 253, 115, 211, 152, 241, 214, 235,
-   4, 249, 110,  90, 103,   6, 144,  43,
- 118, 205, 216, 114, 207, 174,  72, 135,
- 111,  98, 166, 232, 113, 117, 186, 108,
-  30, 227,  31,  30, 222, 200, 119,   7,
- 107,   6, 120, 207, 100, 225, 110, 159,
-  48,  74, 204, 255,  54,  64, 127, 163,
-  75, 190,   0,  60, 218,  69, 185,  67,
-  65, 180, 136,  33,  18, 233, 212, 217,
- 210,  65, 155,   3,   9, 154, 198,  60,
-   9, 226,  84,  36, 210,  27, 162,  18,
- 116,  27,   3, 117, 235, 166,  19,  49,
-  21,  52,  82,  49, 249, 112, 120, 228,
- 235,  99,  50, 151, 121, 231, 134, 183,
-   2, 206, 205,   4,  68, 195, 102, 178,
- 112, 112, 172, 135, 205, 135, 202,  12,
- 193,  74, 107, 126, 103,  60,  21, 232,
-  41, 197, 201, 210, 109,  51, 111, 121,
-  91, 176, 213, 167, 195, 102, 120, 236,
-   8,  12, 130, 110,  20,  40,  89, 110,
- 163, 246,  39,  33, 146,  10, 239, 218,
-  62, 112,   8, 129, 105, 240, 167, 169,
- 120,  70,  74, 143,  82, 185, 108, 220,
-  77, 250, 129,  79, 214, 161, 173, 111,
- 185,  37, 163,  11,  71,  93,  70, 112,
-  53, 254, 209,  63, 115, 227,  92, 184,
- 105,  62, 230, 169,  15, 135, 116, 125,
- 138,  12, 122, 143, 183,  16, 127,  34,
-  24,  64,  97, 243, 254, 237, 200,   6,
- 119, 128,   1, 107,  91,   2, 172,  37,
- 108, 182,  70, 152,  82, 190, 155, 232,
- 227, 101, 180, 139,  44, 218,  73,   3,
-  40, 204, 215,  31, 125, 195,  51, 105,
- 104,  58, 122, 237, 208,  45, 229,  79,
- 141, 116,  29,  45, 181,  42, 167,  49,
-  61, 184,  71, 254,  15, 142, 177, 202,
-  10, 107,  95,  94,  76,  20,  27, 146,
-  18,  20, 127, 218, 221, 138, 175,  27,
- 210,  24, 177,   3, 194,  93,  70,  42,
- 143,  67, 207, 251, 214,  32,  35,  76,
-  24, 240,  15, 140,  80, 132, 238,  86,
- 145,  11, 248, 200, 245, 219,  42, 184,
-  44,  74, 119,  44,  86, 254,  47, 109,
-  38, 110, 108, 124,  11, 188, 135, 145,
- 253,  92, 187,   7,  28,  55, 202, 221,
- 241, 113,  76,  42, 180, 100, 128,  83,
- 108,  29,  33, 228,  66, 136, 178,  66,
- 133,  85,  80,  38,  70, 106, 182, 207,
- 191, 207,  92, 172,  48,  31, 117,   6,
-  17,  10, 210, 200, 164, 207, 135, 180,
- 254, 118, 163, 250, 248,  40, 150, 188,
-  42, 151,  20,  31, 220,  99, 244, 241,
-  78,   9,  17,  45, 100,  47,  12, 253,
- 111, 187, 229, 154, 255, 127, 210,  62,
-  92, 126,  98, 164,  45, 224,  34, 168,
- 253,  78, 117, 188,  39, 221, 173, 108,
-  59, 151,  68, 117, 148,   9,  16,  34,
-  45,   0, 200, 109,  60, 196, 120, 119,
- 238, 145, 140, 133, 173,  68,   1,  44,
- 195, 216, 247, 211,  54,  43,  28, 107,
- 117, 134, 179,  24,  71,  83,  81, 193,
- 124,  98, 253, 252, 124,  78, 141, 234,
- 105, 203, 112, 158, 127, 162,  74,  72,
- 151,  13, 201, 240, 206, 123, 231,  35,
- 187, 255, 116,   9,  19,  35,  70, 115,
- 115,  60, 169, 230, 170,  35, 155, 137,
-  27, 167,  44, 218,  30,  32,  76,  16,
- 232, 223, 179, 233,  20,  49, 156,  18,
- 152,  76, 101, 173,   0,  82,  19, 144,
- 243, 240, 237, 105, 184,  70,  48, 153,
- 101, 214, 117, 244, 150, 225,  42, 194,
- 207, 152, 137,  87, 210, 186, 222, 153,
- 152,  13,  22,  41,  77, 147,   7, 123,
- 184,  98,  72, 243,  22, 177,  59,  87,
- 254,  43,   6,  37,  69, 145, 162, 138,
- 106,  29,   6,  27,  77, 233, 252, 148,
- 225,  70, 243, 244,  70,  90, 235, 222,
- 207, 188,  37, 221,  36,  84, 238,  84,
-  43, 160, 149,  44,  14,  57, 251, 202,
-  99, 236,  68,  23, 209, 176,  73, 226,
- 239,   6,  47, 125,  16,  24, 148,  76,
- 174, 247, 234,   1, 179, 238,  70,  68,
- 112, 118, 155, 224, 114,  20, 159,   9,
-  38,  45,  72, 149, 127, 123,  16, 241,
-  56,  43,  32, 103, 193, 172, 139,  90,
-  22,  60,  26,  62, 147, 130, 214,   2,
- 163,  56, 101, 115, 173, 168, 115, 214,
- 195,   7,  30, 240, 160, 234, 204, 187,
- 194, 241, 110, 127, 152,  44, 121,  39,
-  31,  10,  11, 191, 174, 244,  56, 169,
-  31, 187, 156,  15,  35, 194, 203, 242,
-  31, 104, 253, 125, 249,  10, 252,  52,
-  96, 128, 231, 169,  85, 224,  59,  81,
- 142, 168, 230, 121, 252, 210, 213, 120,
- 177,  22, 138,  55, 224,  83,  41, 237,
- 244,  19,   3, 164, 142,  90,  22, 216,
- 202,  56, 184,  80, 125, 246,  30,  61,
-  71,  83,  18, 192, 180, 237, 150, 182,
- 113,  14,  29,  65,   3, 207, 193, 225,
-  73,  71, 197, 190, 201, 197, 249,  89,
- 218, 193, 106, 192, 161, 220,  46, 188,
- 100,  75, 197, 193, 148, 105, 226, 147,
- 170,  53, 109,  77, 161, 203, 184, 172,
- 191, 195, 103, 246,  80, 103,  63,   9,
-  66, 250,  75, 200, 191, 221,  27,  98,
- 182, 200, 137,  61,  42, 193, 119, 233,
- 248,  21,  86,  90,  42, 236, 205,  22,
-  94,  35, 226, 171, 112, 106, 196, 158,
-  95, 202, 138,  43,   8,  54, 242,  87,
- 162, 104,  41, 189,  39,   9, 157,  71,
- 124, 234,  56, 217, 164,  92,   9, 200,
- 140, 244, 234,  59, 162, 225, 235,  46,
-  40, 116,  61, 252, 218, 245,  88,  14,
- 215,  96, 158, 201, 138,   2, 236, 228,
- 250,  80, 171, 214, 194, 143, 166,   4,
-  40,  10, 181,  38, 144,  84, 242,  82,
-  28, 166, 210, 219,  17,   4,  92, 254,
- 103, 144,  78, 117, 127,  28,  99, 224,
- 203,   3, 220, 128, 221, 230, 175,  59,
-  48,  26,  85, 247, 217, 196, 242,  27,
- 144, 206, 202, 165, 155, 243,   2, 218,
-  59, 217, 162,  45,  47,  27,   0, 250,
-  75, 246, 204, 143,  30, 197, 202, 242,
- 252, 178, 216, 104, 189, 175,   2,  30,
- 197, 152, 115, 133, 137, 230, 229,  76,
- 220,  43, 160,  32,  60, 160, 129,  76,
-  80,  44, 173, 138, 113,  33,  93, 141,
- 167, 252, 244, 205, 146, 133, 161,  49,
- 255, 202, 112,  11, 255,   2, 220,  24,
- 241, 148, 193, 240,  12,  12,   6,  82,
-  72,  21, 164, 195, 137,  83,  69,  66,
- 244, 204,  53, 242, 162, 165, 195, 137,
-  34, 150,  27, 165, 139, 112, 188, 153,
- 196, 101, 134, 194,  99, 228,  49, 129,
- 174,  91, 230,  87, 121, 214,  99,  10,
-   7, 252, 202,  92, 226, 131, 181, 180,
- 127, 239, 251, 250, 252, 217, 242, 227,
- 120,  57,  42,  55,  68,  75, 157, 229,
- 251, 160, 100, 237,  64, 134, 201, 189,
- 138, 192, 178,  85, 250, 190,  72, 106,
-   0,  28, 193,  77, 189, 122,  20, 217,
-  63, 197, 136, 235, 207,   1, 130,  48,
- 140, 114, 202,  67,  25, 124, 135, 143,
- 139,  85, 178, 148,  24, 205, 130,   2,
- 241, 237, 231, 228, 190, 176, 148,  13,
-  70, 113, 169, 237,  56, 213, 187, 183,
-  87, 187, 169, 234, 112,  57, 247, 130,
-  66, 245,  74,  68,   3,  75, 181, 182,
- 210, 148, 225, 159,  26,  46,   8,  72,
-  13, 149, 129,  80,  82, 212,   5, 145,
-   4, 206,  18,  43, 168,  48, 192,  76,
- 162,  84, 233,   2, 207,  82,  84,  70,
-  51,  27,   0, 190, 111,   4,  17,  88,
- 202, 115,  97, 153, 111,  42, 225,  57,
- 245, 158, 136, 248,  50,  42, 172, 239,
- 228,  46, 115, 118, 194, 120,  46,   1,
- 149, 118,  21,  48,  94, 103, 175, 189,
-  83, 212,  37, 119,  76,  82, 227, 231,
- 182, 200, 244, 156, 205, 141, 217, 123,
- 208, 186, 188, 140, 222,  51, 122, 173,
- 201, 201, 136, 248, 252,  14, 103,  50,
- 165,   6, 160,  15,  58,  28,  85,  74,
- 232, 113, 106, 156, 199, 116,  99,  71,
- 118, 234,  96,  35, 155, 201, 202,  96,
- 214, 236,  28, 123, 226, 146,  80, 163,
- 120, 157,  21,  98, 180, 152, 127,  54,
- 254, 242, 143,  93, 235, 196,  64,  17,
- 203, 135,  20, 243,  38, 160,  78,  24,
- 225, 106,  98,  95, 110, 214,   8, 174,
- 181,  85, 101, 159, 188,  17,  92,  69,
- 182,  32, 189, 133, 249,  92, 164,  26,
-   4, 101, 136,  36, 237, 184,  24, 239,
- 219, 247, 115,  86, 232,  56, 220,  84,
- 242,   8, 106,  30, 182,  54, 108, 107,
-  94, 238,  75,  55, 251,  60,  77,  25,
- 160, 181, 168, 206, 111, 190, 214, 184,
-  34, 133, 229,  84,  42,  50, 224, 149,
- 235,  80, 240, 173, 191,  27,  97,  24,
-  56, 246, 123, 116, 209, 117, 144, 149,
- 251, 132, 168, 150,  79, 103,  87,  50,
-  42, 157, 243, 220,  21, 241,  70,  57,
-  65, 171, 202, 128, 183,  36, 143, 238,
- 220,  40,  95,  91, 151, 229, 254, 159,
-  84, 252, 203,  58, 248, 206, 135, 169,
-  47,  20, 105, 147, 198, 166,  60,  39,
- 120, 105,  22, 213, 241,  82, 106, 163,
- 154,  21, 138,  91, 209,  98, 248, 243,
- 120,  32, 183,   6, 110, 197, 248,  34,
- 192, 179, 144, 165, 151, 221,  22,  87,
-   3, 205,  78,   5,  41, 185, 167, 131,
- 172,  11, 103, 255, 228, 227, 131, 215,
- 212, 159, 218, 211, 162,  41, 211,   2,
-  23, 128,  20, 218, 129, 190, 230,  94,
- 200, 222, 180, 165, 248,  99,   6, 161,
- 182,  65, 157, 110, 209, 201, 188,  52,
-  85,  12,  19, 129,  71,  63,  98,  34,
- 214, 103,  12, 163, 129, 152, 239, 243,
- 192,  15,  20,  62, 247, 158,  34, 207,
- 218,  66,  65,  38,   9, 141, 100,  57,
- 216, 179, 134,  40,  81,  36,  39,  62,
- 191, 212, 174,  48, 238, 213,  51, 252,
- 218, 142,  52,  44, 143, 150,  56, 238,
-  48, 205,  59,  12, 213, 146, 199,  28,
-  41,  60, 190,   6,  69, 168, 203, 161,
-   9,  21, 185,  58, 211, 194, 182, 119,
- 134, 155, 217, 209, 112, 146,  97,  60,
- 126, 191, 230, 240, 125, 225,  27, 244,
- 167,  45,  86, 168, 205, 244,  51, 243,
- 199, 117, 166, 149, 106, 158, 154, 116,
-   3,  56, 101, 245, 140, 196, 179, 227,
- 176, 236, 249, 206,  97,  40,  68, 110,
- 170, 105, 111, 181,  93,  40, 202, 211,
- 233, 163, 222, 177, 115,  42, 161,  39,
- 194, 156, 109, 221, 112, 210,  14, 141,
-  77,  51,  35, 160, 130, 157, 145,  56,
- 102, 189, 101,  50,  38,  90,  77,  20,
- 138,  48, 197,  47, 206, 104, 220, 224,
-  25, 126, 115, 255, 195, 118,  89,  10,
- 246, 239, 190,  31,  72, 141, 251, 165,
-  15, 126,  52, 145, 186, 133,  89,  66,
- 229, 196, 117, 233,  19, 180, 220, 158,
-  59, 168, 133, 245, 199, 214,  99, 177,
- 228,   8, 168,  43, 200,  90, 147, 250,
- 183,  28,  78, 117, 207,  28,  48, 186,
- 235, 177, 225, 175,  23, 244, 213, 238,
- 108, 223, 222, 162,  24, 114, 124, 114,
-  98,  33,  64, 137,  22,  17, 183, 198,
-  69, 121,  11, 197,  75, 164, 231, 205,
- 145,   6, 239,   2, 183, 147,  50, 109,
-  21, 155, 145,  89,  47, 147,  68,  41,
-  49, 218,   6, 206,  41, 188, 182, 109,
- 138, 217,  78,  30,  59, 107,  38,  18,
- 195, 164,  83, 107,  95,  52,  34, 142,
- 110,  76, 238,   7, 121, 246, 105, 203,
- 236,  45, 182, 204, 222, 149,  91, 161,
-  26,  37, 235,  54, 218, 194, 143,  32,
-  38,  21,  24, 207,  98, 149,   2,  24,
- 179,  69, 158, 206,  98, 167, 208,   2,
- 221, 227, 178, 219, 152,  79, 189,  71,
-  32, 111, 141, 200,  52,  91, 110,  49,
- 214,  42, 149, 244,  40,  75, 217,  72,
- 149, 132, 139,   5, 251, 100,  48,  28,
-  74,   1, 205, 171,  65, 157,  62,  88,
- 126, 106, 160, 123,  61, 204, 237,  19,
-  41,  65,  17, 116,   9,  11,  35, 215,
-  28, 186, 137, 235, 146,  99, 102,  68,
-  39, 218, 181,  78, 157,  90, 162, 194,
-  50, 192, 137, 190,  26, 136, 186, 144,
- 186,  79,  68, 109, 184, 146, 218, 111,
- 243, 127, 132, 128, 228,  20,  49, 124,
- 125,  75, 247,  56, 213,  20, 109, 235,
-  86, 246, 114, 176, 125, 106, 125, 167,
- 233, 250, 110, 119, 131, 166, 126, 154,
-  85, 222, 202,  93, 192,  39, 107, 147,
- 109,  35, 113,  15, 105,  11, 206,   1,
- 193,  75,   9,  35, 172, 102, 246, 177,
-   1,  70, 179, 108, 254, 217,  73,  61,
- 188,  65, 193, 165, 186, 236, 105, 230,
-  50,  41,  98,  56,  76, 185, 165, 251,
- 242, 101,  21, 146, 252, 122,  33,  11,
-   5, 116, 236, 111,  22, 148,  46, 132,
-  98,  45, 138,  75, 114, 222, 114, 223,
-   3, 117, 132, 237, 249, 200, 201, 139,
- 214, 224,   3, 176,  22,  13, 191, 192,
-   7, 186,  38,  37, 254,  71, 133,  65,
- 130,  67, 233, 164, 144, 250, 224,  19,
-  60, 159, 215,  36, 221, 131, 126, 113,
- 214, 235, 125, 122, 244,  22,  34,  40,
- 156, 137, 248,  14, 163, 210,  86, 185,
- 230, 112, 187,  46,  13, 127,  95,  98,
- 216,  92,  74,  67,  12, 213,  97,  56,
-  24,  28, 204, 226, 240, 175, 112, 119,
-  49,  88, 125, 124, 196,  73, 138,  13,
-  81,  58, 223, 112, 106,  74,  93, 154,
-  58,  17,  53,  19, 150,  21, 134,  92,
-  72, 198,  64,  53,  76, 111, 151,  52,
- 189, 181, 196, 104,  58, 144,  73,  48,
- 160,  92, 139, 152,  24, 120, 219, 179,
-  15,  89, 157, 169, 127, 224,  24,  49,
-  77,  25, 252, 237, 156,  12, 132, 182,
-  14, 140,   8, 204,  22, 160, 174, 255,
-  58,  25, 137, 243,  62, 156,  55, 113,
- 131, 185, 204,  99, 120, 255,  92, 164,
- 107, 172, 226,  47, 158,  53, 106,  39,
- 221, 162,  10,  68, 213,  31,  79, 239,
-  76, 215, 112, 137,   1, 220, 144, 159,
- 249, 150,  64, 191, 160, 185, 234,  55,
-  81,  78,  59, 215, 228, 104,  30,  45,
- 185, 193, 142, 164,  69, 243, 243,  45,
-  71, 208, 196,   2, 159, 214,  72, 203,
- 132,  81, 181,  46,  45, 138,  47, 154,
-  70,  41,  88, 247,  45, 151, 191, 156,
-  63,  74, 142, 100, 131, 210, 194,  15,
- 231,  87, 225, 227, 192,  80, 240, 233,
- 128, 192, 128,  33, 219, 197, 253,  79,
- 157, 216, 176, 149, 253,  28,  74,   3,
- 197,  84, 248,  62,  50,  37,  82, 153,
- 106,  46,  49, 208, 167, 239, 187,  64,
- 146,  71, 117, 163,  45,  92, 246,  61,
- 103, 191, 182, 227, 123,  58, 215,  22,
-  96, 239,  84, 215, 170, 109, 124,  99,
- 187, 156, 127,  63, 144, 128, 105, 234,
- 171,  44,  77,  40, 238, 236,  59, 216,
- 177,  97, 247, 245,  17,  91,  95,  36,
- 120, 113, 175, 225,   7,  90, 244,  94,
- 141, 190, 143,  54,  38, 226,  34, 180,
- 251, 113,  20,  66, 158, 149, 211,  58,
- 250, 177, 148,  16,  74,  33,  56, 153,
- 137, 221, 180,  95, 204,  72, 171, 102,
-   3, 131, 195,  83, 211,  61,  40, 211,
-   0,  78, 119, 101,  81, 140, 101,  22,
- 120, 111, 101, 119, 210,  50,  87, 207,
-  65, 241, 211, 218,  52,  40, 134,  20,
- 210,  98, 153, 192, 162, 196, 121, 117,
- 230, 251,  61, 220, 113,  68, 127, 121,
-  42, 191, 207,  26,  60, 116,  14, 151,
- 116,  41, 136,  85, 157,  73, 176, 180,
-  55, 251,  78,  34,  96, 136,  92,  93,
- 171,  34, 136, 218, 103, 204, 227,  92,
- 204,  49, 168, 123, 173,   4, 212,  22,
-   7, 218, 180, 232,  17, 152, 172, 127,
- 225, 122,  58, 221, 161,  27, 144, 119,
- 115, 176, 140, 254,  66, 193,  59, 101,
-  36, 244,  14,  74, 191, 205, 101, 217,
-   3, 140, 225, 127, 201, 122,  46, 102,
-  97, 175, 210,  51, 188,  24, 118,  33,
-  68, 204, 167,  14, 218, 190,  26, 231,
-  24, 192,  60, 234, 239, 195, 217, 224,
- 187, 111,  88, 105,   1, 174,  45,  15,
- 138, 197, 162,  67,  95, 240, 103, 218,
- 139,  24,  22,  89,  27,  86, 188, 224,
- 212, 227,  46, 237, 187,  32, 250, 253,
- 138, 107, 235, 180,  46,  93, 195,  36,
- 212, 167, 218, 150, 175,  37,  71, 139,
-  88, 255,  13, 232, 167, 193, 169, 193,
- 130, 190, 169, 152,  92,  53,  22, 210,
-  65, 154,   3,   5, 180, 226, 241, 123,
-  64, 226,  38, 134, 118, 221, 184,  68,
-  92, 115, 204, 232,  62, 250, 219, 176,
- 147, 193, 175, 107, 139, 134, 131,  14,
- 121, 100,  25,  72, 165, 104, 141,  98,
-   9, 227, 122,  41,  78, 150,  33, 121,
- 121, 135, 111,  22, 216, 129,  67, 197,
- 132,  45, 198,  34,  88, 111,  65, 130,
-  28,  32,  38, 218, 188, 174,  41, 106,
-  77, 116, 250, 112,  78,   6,  75, 168,
-  27, 232, 208,  14,   9, 228, 149,  40,
- 234, 154,   5, 145,  23, 155, 169,  35,
- 136, 161, 233, 143, 248, 133, 231, 241,
- 212,  78, 120, 199,  93, 127, 248, 114,
- 249, 104, 127,  88, 218,  29, 227, 104,
- 150,  92, 127, 215,  70, 135,  10,  39,
-  72, 110,  73,   6, 180, 222,  73, 150,
-  10,   5, 117, 195, 202,  21, 189, 217,
- 193, 145, 160, 169, 141,  35,  75,  54,
- 209, 214, 103, 127,  26, 196, 231, 111,
-  17, 251, 138, 130,   7, 239, 224, 181,
-   4, 124,  68, 161,  32,  25, 139, 132,
- 237, 109, 198, 160, 190, 162,  11, 161,
- 254, 125,  85, 155,  35,  45,  84, 156,
-  11,  84,  91,  16, 239,  56, 207, 218,
- 223,  84,  24, 226, 248, 182, 143,  81,
- 226, 130,  43, 185, 221,  40,  95,  48,
-   7, 111, 238,   9, 205, 181,  36,  54,
-  49, 187,  61,  69,  53,  21, 202, 207,
-  75, 143,  49,  81, 107, 246, 123, 105,
- 214, 157,  61, 252, 159, 170,  76,  74,
- 200,  29, 185, 220,   9,  94, 251,   6,
-  91, 182, 198, 181, 238, 189, 151, 118,
- 203, 228, 199, 191, 118,   6,  87,  58,
- 189, 233, 163, 128, 169,   8,  57,  64,
- 175, 158, 167, 117,  43,  80, 134, 183,
- 115, 177, 247,  44,  65,  12, 220,  39,
- 183, 233,  58, 166, 156,  24, 129,  88,
- 245,  51,  48, 207, 122, 198,  17, 218,
- 248, 177, 141, 151, 246, 241, 247,  82,
-   9, 208, 134, 116,  49, 201,  64,  11,
- 239, 183, 118, 237, 244,  76, 134,  67,
-  45, 208,  80, 249,   2,  59, 124,  43,
- 202, 114, 232,  19,  99, 233, 161,  20,
- 198, 189, 233,  43,  56,  20,  60, 244,
- 221,  24, 190,  91, 115, 244,  77,  66,
- 118, 166, 117, 240, 182, 200, 162, 154,
-  76, 218, 114, 104,  89,  81, 163, 173,
- 125,   3, 119, 169, 115, 179, 191, 175,
- 102, 221, 202, 191,  11, 145, 213,   2,
- 211,  35,  29,  31,  90, 214,   2, 204,
-  62,  38,  58, 157, 135,  41,  61,   3,
- 192, 170, 213,  13,  34,  94,  82,  47,
-  72,   6,  97, 212, 201,  23,  89, 207,
- 118, 236, 220, 147,  91, 254, 153, 229,
- 192,  50, 154, 244,  69, 233, 150,  20,
-  23, 143,  57, 172,  95,  30, 205,  52,
-  17, 220, 155, 166,  56,  14,  16, 227,
-   7,  36,  67, 158, 116, 119,  67, 130,
- 169, 227, 129,   9,  50, 112, 116,  53,
- 223, 180, 194, 228,  66, 149, 197,  13,
-  19, 116,  73,  19,  42, 132,  84, 202,
- 182, 147,  38, 130, 128,  26,   0, 192,
- 243, 142, 130, 199, 176,  71,  91, 115,
-   2,  59, 231,  71, 101,  51, 103, 121,
-  85, 241, 151, 207, 221, 238, 210, 218,
- 254,  65, 224,  84, 204,  15, 146,  60,
-  32, 161, 171, 221,  77, 193, 246, 213,
- 138,  76,  49, 115,   9, 206, 219, 238,
-  99, 173, 193, 236, 112, 197, 144,  71,
- 218,   1, 131,   4,  30,  30, 222, 210,
-  96, 226, 170,  91, 162, 254, 113, 115,
- 175, 150, 221,  67, 119, 223,  88, 174,
- 159,  55,   7, 229, 211, 166, 128, 127,
- 193, 161, 246, 194, 210, 100, 161, 193,
-  99,  14, 235,  57, 251, 241, 199,  82,
- 159, 208,  68,  77,  27, 247, 230,  74,
- 247, 185, 165,  22, 220, 108, 179, 142,
- 143,  19,  23,  53,  83,  50,   4, 101,
-  71, 241,  77, 239, 237,  95, 210, 129,
-  24, 246,  58, 177, 144, 233, 152,  55,
- 111, 118,  91,  47, 214,  86, 213, 151,
-  56,  46, 240, 194,  39, 200, 137, 237,
- 251, 231,  32,  27,  13, 213,  39, 199,
- 151, 219,  41,  69,  60,  34, 108, 100,
-  29, 195, 218, 182,  34, 214, 100, 243,
-   6,  30,  83, 167, 218, 223,  68, 140,
- 125, 203, 186, 168,   7, 218,  92, 116,
- 107, 165,  87, 232, 210, 106, 162,  17,
- 136, 227,  19, 233,  64,  22, 173, 229,
-  20,   4, 199, 239, 183,  65,  46,  42,
-  17,  49,  77,  90,  48,  87,  30, 182,
- 146, 187,   0,  61,  95, 204,  48,  78,
-  18, 236, 162, 196, 154, 255, 243, 250,
-  24, 108,  19, 238, 205,  18, 158,  28,
- 231, 162,  74,  82,  44, 136, 253, 105,
-  15, 102,  79,  33, 140,  46,  64, 201,
- 173, 192, 170, 235,   1, 175, 149, 169,
- 174, 117, 100,  28,  94, 140, 182, 200,
- 249,  71, 161, 210,  41,  72, 255, 145,
-  77,  78, 139, 234, 183, 232,  54,  73,
-  53, 215, 156,  55,  55,  42,  36,  61,
- 169, 188, 171, 121, 139,  42,  70,  46,
- 208,  27, 109, 154,  35,  33, 138, 154,
-   1,  80, 114, 254,  45, 110,  55, 228,
- 164,  79,  58,  59, 235, 128,  41, 215,
-  77, 178, 207,  45, 186, 113,  57,  51,
- 122,  28, 238,  24,  97,  96, 242,  63,
- 141,  25,   4, 187, 163, 218,  35,  89,
-  48, 205,   5,  60, 102, 139, 200, 113,
-  46, 217,  83, 222,   8,  79, 125,  78,
- 105, 215, 113, 148, 182,  64, 219, 220,
-  45, 159, 158, 204,  58, 113,  86, 250,
-  74, 132, 192, 171,  43,  85,  45, 122,
-  45, 252,  41, 227,  84, 142, 193,  59,
-  87,  70,  94, 191,  32,  18,  82, 224,
- 249, 253, 185,  92,  55,  90, 179, 228,
- 178, 184, 244,  91, 230, 175,  32,  79,
-  41, 124,  90,  99, 178,  48, 126, 231,
- 190,  48, 196, 123, 187, 151, 115, 160,
-  64, 223, 171, 229,  87, 173, 168, 242,
- 119,  55, 227,  14, 100, 145,  11,  57,
-  53,  94,  66, 151,  38, 231,  35, 123,
- 193,  31, 222, 254,  17,  99,  67,  61,
-  59, 244,  80, 135, 226, 150, 123,  46,
- 230, 218,  54,  28, 203, 236,  59, 101,
- 225,  60, 159,  82, 130,   0, 231, 166,
- 214, 155,  22, 210, 105, 221, 126, 190,
- 157,  72,  46, 133,  50, 219, 205,  68,
- 124,  95, 110, 210, 100, 111, 168, 222,
-  61, 127,  23,  61,  37,  72, 195, 132,
- 164, 130, 129, 147, 246,  58, 119, 179,
- 167, 248, 128,  98, 249, 116, 163, 137,
-  99, 153, 182, 130, 111, 171,  16, 241,
-  45, 205,  31, 161, 161, 137,  48,   6,
- 161, 184, 138, 243, 209,  79,  13, 171,
- 244,  34, 168, 219, 182, 132, 201,  69,
- 165,  20, 231,  75, 186,  99,  66, 127,
- 255,  22,  84, 121, 194, 134,  10, 175,
-  50, 179,  70,  61, 120, 240, 163,  74,
-  66, 194,  37,  31, 148,  55, 192,  36,
- 190, 116, 247, 102,  17,  33,  19,  64,
-  13,  45, 206, 112, 249,  41,  48, 210,
- 138,  20,   8, 217,  41,  54, 226, 214,
- 249, 161, 124,  51, 183, 128, 198, 108,
- 128, 103, 178, 109, 209,  19, 147, 146,
- 169, 253, 119,  58, 192, 203, 122, 172,
-  96, 166, 228,  92,  76, 240,  58, 125,
-  64, 101, 133,  25,  80,  16,  53, 243,
- 104,  95, 198, 215, 249,  12,  77,  91,
- 136,  86, 199, 192, 234,  27, 237, 120,
- 140, 149, 111, 152, 207, 178, 136, 130,
-  35, 160, 212, 139,  12, 211,  64, 192,
-  40, 218,  72,  25,  45, 192,  83, 252,
- 250, 114, 172, 108,  56, 178,  94, 190,
- 101,  74, 166, 243, 227,  30, 155, 219,
-  65, 198, 223,  48,  65, 118, 106, 210,
-  50, 248, 208, 202, 214,  36, 128,   8,
-  95,  38, 231, 210, 237, 219,  83, 224,
- 118, 230, 126,  78,   0, 137,  11,  47,
- 208, 164,  48,  61,  17,  81,  18,  58,
-  21,  93, 119, 164, 101, 184, 181, 175,
-  34, 206,  59, 115,  38, 132,  67, 169,
- 243, 154, 142, 114, 144,  44,   8,  74,
-  16, 240,  33,  98, 217,  67,  22,  72,
-  65,  17, 220, 179, 215,  87,  96, 192,
- 231, 207, 161, 143, 107, 190, 158,  21,
- 251, 122, 200, 201,  83,  95, 143,  96,
-   4,  53, 115, 132, 214, 232,  34,  55,
- 149,  12, 177,  23, 208, 133,  53,  87,
-  38,  98, 214, 252, 129, 196, 110,  97,
- 252, 138, 253, 142, 186, 195,  13,  30,
-  15,  48, 146, 107, 175, 197,  14,  79,
-  97,  61, 240, 200,  32, 129,  65,  41,
- 248, 153,  41, 148,  83, 241,   7,   2,
- 124,  69,  15,  99, 194,  82, 178, 183,
- 236,  96, 228, 187, 163, 198, 254, 147,
- 160,  81, 104,  57, 190, 243,  75, 113,
- 211, 169, 166,  39, 236,  91, 188, 185,
-  68,  65, 207, 138,  77,  91, 121, 136,
- 185,  75, 183, 103,  44,  59, 138, 236,
-  42,  27, 227,   4, 133, 199, 240, 233,
- 131, 172,  65, 148, 134, 141, 144,  12,
-  82,  97, 196, 135, 217, 139,  66,  47,
- 143, 116,  47, 210, 153, 151,  42, 202,
-  28, 133, 190, 125, 113, 188,  46,   1,
- 171,  82, 122, 102, 193, 126,  56, 124,
- 190, 142,  24, 102, 194,  59, 196, 125,
- 201, 129, 232,  21,  81, 219, 200, 242,
-  14, 242, 246, 124,  68,  53,  30, 162,
-  78, 144,  36, 171,  56, 200, 213,  39,
- 136,  77, 212, 173,  57, 123, 170,  57,
- 173, 221, 175,  72, 224,  11, 214, 242,
- 120,  55, 180,  37, 225,  16,  17, 189,
-  16, 138, 240, 178,  49, 105, 230, 164,
-  50,  75, 177, 115, 175, 116, 242, 188,
-  61,  38,  60, 141, 105,  50,  37,  51,
-  37,  28, 152, 221,  18,  49, 211,  34,
- 178, 215, 130, 187, 131,  89, 128,   9,
-  86,  43, 216,  17, 141,  56, 114,  32,
- 253, 172, 245, 214, 225, 183, 170,  35,
-  90,  14,  52,  22,  38,  56, 246,   6,
- 144, 129,  52, 101, 207, 181,  90, 140,
- 216, 137, 253, 173,  33,  20, 208,  14,
-  53, 113, 255, 105, 155, 192, 244,  25,
-  53, 206, 172, 191, 240, 196, 231, 154,
- 113, 244, 175,  51, 140,  13,  22, 109,
- 152, 112, 130,  15,  72, 186, 218, 215,
- 132, 122,  80,  49, 233, 147, 182,  17,
-  32,  84, 107, 145, 202, 192, 198,  87,
- 217,  14, 115,  67, 249,  83, 224, 185,
-  67,  64, 238,  16,  36, 244,   3,  56,
- 170, 169,  18, 174, 110,  98, 124, 178,
- 129,  45, 236, 221, 162, 137,  35, 149,
- 137,  56, 108, 248,   6,  28, 137,  34,
- 146,  21,  37, 109,  39,   1, 217,  93,
- 215,  39,  89,  66, 214, 141, 158, 190,
-  19, 126,  16, 218, 154,  97, 185, 147,
- 161,  21,  88,  82, 166, 135,  64, 131,
- 196, 178, 195, 231, 220, 223,  23, 194,
- 107, 126,  44, 155, 254, 122,  44, 174,
- 219, 200, 166,  73, 211, 246, 140,  22,
-  79, 187, 180, 186, 215,  96, 131,  21,
-  43,  81, 190, 230, 232, 193,  30, 245,
-  29, 118, 184, 143,  28, 187, 122, 141,
-  12,  29, 247, 146, 244, 174,  65, 226,
- 247,  80, 162,  72, 207,  16, 147,  88,
-  11, 206, 182, 146, 114, 138,  76, 184,
-  54,  98, 253, 251, 118, 163,  81,  44,
- 245, 156, 229, 184, 175,  59,  81, 160,
-  92,  16, 202, 161,   2, 133, 155, 199,
-  24, 214, 189, 165, 102, 133, 122, 151,
-  14, 198,  86, 114,  46, 168,  54,  66,
-  96,  87, 234, 222, 140, 205, 176, 167,
- 247, 153, 226, 178, 194,  86, 175, 186,
- 136,  63, 210,  68, 207,  27, 211,  10,
- 108, 106, 102, 221, 128, 209, 254, 243,
- 143, 117,  45, 220,  24, 106,  10, 103,
- 119,  66, 227, 230, 108,   7, 207, 231,
- 190, 123,  33, 136,  13, 136,  32,  46,
- 245,  75, 190, 236, 148, 202,  13, 109,
- 197, 175, 142,  27, 233, 153,  64,  56,
- 210, 180, 103,  42, 128,  48, 234, 115,
- 178, 132, 201, 152, 180, 136, 146, 255,
- 106, 209, 174,  46,   0, 254, 242, 130,
- 247,  36,   1,  25, 131, 142, 245, 109,
- 175, 147, 121, 229, 237, 188, 164,  98,
- 222, 255, 136, 149,  29,  61, 108,  97,
- 173, 107,  87, 236, 183, 197,  51, 248,
- 168,  55,  82,  59, 212,  21,  77,  31,
- 212,  59, 101, 230,  22,   1, 116,  39,
- 171, 117,  13, 194,  74, 220, 219,  69,
-  23, 197, 244, 244, 243, 230, 104,  96,
- 133, 134, 160,  36, 178, 168,  21, 196,
-  87, 209, 183, 165,  98,   6, 105,  71,
-  71, 207, 101, 131, 193,  45, 143,  60,
- 167, 255, 235, 162, 104, 155, 148,  60,
- 115, 198,   1, 214, 235,  56,  87,  44,
- 103, 205, 179, 202, 203,  63, 103,  18,
- 136, 150,  88, 162, 126,  90, 160, 183,
- 125, 113, 102,  90,  64, 169,  10, 143,
-  22, 183, 219, 142,  54,  76,  17, 105,
-  58, 242, 151, 249,   0, 106, 178, 249,
- 201,  47, 178, 115, 161,  48, 108,  19,
-  18, 254, 161,   9, 164,  56, 117, 233,
- 175, 177, 135, 115, 171,   3,  47, 151,
- 100,  24, 226, 173, 237,  84, 103, 239,
- 133, 221, 128, 255,  90, 250, 178,  47,
- 161,   7,  98, 163,  76,  87, 230, 253,
- 180, 143,  30,  85, 161, 179,  28,  87,
-  73, 225, 219, 219,  69, 248, 242, 188,
- 235, 157,  17, 178, 226,  78,  98, 117,
- 115,  21,  30, 195, 252, 114,  92,  11,
- 189,  69, 184, 100, 104, 152,  47, 148,
- 172, 142,  60,  41, 125, 228, 212,  89,
-  55, 184, 183,  17,  12, 191, 239, 144,
- 152, 250, 157, 234,  65,  40,  37, 218,
- 106, 136, 221, 127,  51,  79, 166, 239,
- 209, 172, 135, 205, 197, 184, 116,  95,
- 253,  14, 192, 163, 241,  84, 201,  60,
-  82, 113,  52,  49, 164,   0,  12, 201,
-  15, 199,  44, 149,  45,  93, 242, 158,
-  45, 105, 146,  15, 244, 200,  34,  90,
-  18, 202, 220, 232, 168, 151,  39, 192,
- 187,  89,  68, 134, 174, 212, 175,  25,
- 162, 128,   0,  51, 130,  41,  25, 234,
- 150,  29, 235, 177, 105, 221,  61,  58,
-  72,   9, 172, 158, 242, 187, 248,  74,
- 187, 240,  34, 198, 199, 211, 157, 172,
- 116, 160,  54,  99, 193, 179,  82, 127,
- 232, 123, 139, 128,  72, 107, 197, 215,
- 161, 126, 102,  15, 166, 206, 142,  74,
- 163, 231, 110,  28, 241, 160, 185,  92,
- 220, 220,  15, 146, 187, 212, 190,  84,
- 114,  94,  15, 121,  87, 148, 206,  23,
-  32, 205, 107,  94,  26,  19,  94,  26,
-  10,  45, 244, 187, 142,  44, 216,  76,
- 237,  35, 135,  73, 253,  79, 207, 184,
-  51, 190,  62, 135, 242, 184, 143,  49,
- 175,  22,  37, 204, 154,  41, 115,  23,
- 255, 109, 138, 123,  28, 214,  50,  14,
- 235, 250, 141,  72,  28, 218,  47, 161,
- 255,  15, 136, 224, 116,  67,  90, 123,
-  73, 181,  19,  45,  65, 159, 185, 196,
- 241, 230, 161,  48,  92,  52, 129, 111,
- 147,  26, 100,  97, 176, 127,  55, 107,
-  42, 105, 240, 227, 155,  43,  93,  13,
-  36,  74,  22, 177, 218,  78, 102, 101,
- 211,  93, 217, 245, 203, 253,  12, 247,
- 242, 127, 200, 228, 191, 238, 143, 143,
- 158,  39,   7, 124, 192,  26, 150, 223,
- 148, 168, 214,  23, 182, 111,  51,  37,
-  11, 172, 221,  57, 110, 240,  95, 242,
-  13, 113, 210, 131,   3,  59, 166, 209,
-  58,  43,  15, 171, 215,  52,  66, 102,
- 177, 199, 120,  83, 161,   7, 109,  64,
- 158, 119, 109,  56,  54,  66,  58,  45,
- 173, 117,  90,  25,   7, 151,  38, 196,
- 236, 243, 112,  48,  75, 226, 193,  86,
- 254, 212, 235, 161,  16,  68, 105, 116,
-  33, 254,  56, 167, 151, 246, 232, 246,
- 103,  57, 189, 192, 252, 162, 116, 174,
- 218, 233, 148, 107, 160, 227,  73, 251,
- 194,  59, 142,  48,  56, 165, 230, 132,
- 252, 105, 161, 216,  26,  85, 131,  48,
- 166,   0,  26,  33, 184, 223, 163, 143,
- 131, 244,  36, 112,  82,  20, 106, 104,
-  61,  40, 202, 219,  31, 137, 253,  31,
-  30,  87, 254, 149, 140, 117, 107, 211,
-  12, 202, 138, 135,  41, 158,  76,  39,
-  16, 165,  17, 178, 149, 223, 218, 157,
- 216, 103, 151, 207, 117,  91, 223, 219,
-  69, 230, 190, 217,  47, 178, 227, 138,
- 139, 165, 198, 127,  94,   2, 146,  21,
-  10,  47, 159, 242,   6, 113, 218,  23,
-  64,  10, 229,   4, 141, 139, 171, 202,
-  33,  32, 181,  66, 184,  36, 247,   3,
- 206,  89, 224,  10, 168, 245,  28,  44,
- 210, 227, 149,  42,  10, 228, 129,  90,
- 193,  89,  40, 158, 249, 217, 181, 250,
- 225, 160, 121, 169,  92,  64, 202,  85,
- 250, 193,  64, 159, 161,  51,  73,  83,
- 130,  34,  21,  28, 141, 104, 127, 192,
- 202, 176, 180,  66, 206, 122,  68, 101,
- 133,  59, 126,  54,  90,  81,  85,  36,
- 125,  93, 103,  15,   5,  33,  77,  32,
-   3, 153, 196, 206, 178,  52, 142,  79,
- 168, 209, 112, 105,  67, 248, 243, 212,
- 116, 238, 152, 244,  52, 255,  85,  79,
-  17,  82, 241, 147, 199,  16, 100, 231,
-  10,  31,  59, 201,  49, 176, 112,  59,
- 235, 160, 227, 178,  44, 113, 215,  93,
- 152,  23,  78, 169, 251,  81, 117, 242,
-  79, 183, 199, 204, 237,  59,  91,  95,
- 248, 188, 139,  61, 114,   0,  80, 249,
- 203,  59, 165, 232, 225, 212, 169,  29,
-  12, 165, 153, 206, 206,  35, 115, 132,
- 214, 200,  91,  34,  51, 152, 128, 138,
- 169, 229, 174, 223, 144,   1,  60,  39,
- 200, 171,  93, 138, 251, 210,  47, 200,
- 223,  46, 215, 210,  35, 152, 139, 219,
- 146,  90,  39,  21,  80, 172,  11,   4,
- 193,  76, 138, 252, 253,  77,  70,  18,
-  77, 242, 219, 188, 144,  57,  87, 100,
-   9, 163, 114,  64, 100, 215,  91,  50,
- 250,  85, 120, 172,  68, 196,  79, 249,
- 222, 141, 108, 252, 253,  58,  97,  41,
- 213,  50, 188, 183, 137, 184, 129,  96,
- 142, 102,  56,  92, 245, 128,  91, 238,
-  73, 112, 134, 214, 131, 143, 147,  84,
- 161,  43,  39,  37, 114, 185, 203,  25,
-  12, 231, 164,  52, 110, 198,  42,  52,
- 215,  74, 139, 239, 198,  34,  84,  78,
- 164,  28, 201,  13, 210,  34,  27, 249,
- 134, 243, 240, 237,  39, 137, 179, 136,
- 187, 119,  47, 185, 114, 243,  83, 226,
-  72, 129, 221, 211,  83, 175, 158, 232,
-  89, 223, 182,  57, 200,  92, 177,  82,
- 126, 166, 203,  62, 247, 195, 221, 233,
- 209, 117, 170,  25, 223,  10,  62,  22,
-  96, 235, 218, 161, 196,  24, 103,  11,
-  40, 241, 255, 210, 244,  15,   9, 144,
- 131, 115,  97, 137,  19, 198,  79,  10,
- 130, 178, 107, 221, 209,  36,   7,  80,
- 210, 175, 131, 215, 135,  37,  14, 103,
-  70, 252,  54, 255,  91,  13,  96, 222,
- 132,  80, 142, 133,  73,  38,  16, 226,
-  88,   3,  28, 251,   5,  68,  90, 187,
- 166, 129,  35, 231, 255, 103, 115, 155,
- 141, 141,  96,  84, 100, 110, 254, 130,
- 246,  87, 225, 244, 187,  10,  21, 151,
-  73, 181, 147, 100, 137, 144, 225, 179,
-  99, 230, 189,  69, 107, 121, 224,  39,
-  36,  91,  90, 182, 195,  36,   2, 135,
- 216, 102, 236,  53,  92, 109,  79, 168,
- 171, 199, 195, 201,  13, 104,  35, 201,
-  75, 110,  86,  86, 189,  48, 204,  90,
- 231,  72, 156,   1, 111, 110, 240, 230,
-  62,  32,  20, 208, 219, 240, 136, 210,
- 135,  26, 127,   8, 153, 122,  45, 144,
- 119,  53, 122, 229,  94,  63, 103, 139,
- 231,  65, 248, 188, 224, 227, 106,  66,
- 169, 149, 203,  40, 149, 229, 142,  57,
-   1, 196, 142, 155,   3,  39, 240,  60,
- 171,   1,  87,  20,  69,  17, 107,  83,
- 155,  56,  57, 169,  23,   7, 238,  45,
-  77,  98,  50,  13, 254, 134,  88, 224,
- 251, 122, 130,  27, 150, 195,  84, 204,
-   1, 123,  97, 192, 255, 102, 242, 218,
-  27,  20, 208, 176, 147, 254,  65, 235,
- 128,  76, 116,  10, 240, 126, 184, 185,
- 126,  12, 168, 171, 210, 195,   0, 171,
- 172,   3,  24,  93, 111, 218,  46, 202,
-   2,  60, 229, 252,   4, 242,  32, 110,
- 208,   3,  17,  16, 150, 239, 208, 204,
-  70, 201, 229, 124,  63, 148,  96,  98,
- 222,  63, 255, 255, 102,  89,  51,  79,
-  99,  51, 228, 119, 118, 184, 163,  35,
- 112, 229, 239, 224,  95,  24, 209,  80,
-  92,   4, 176, 131,  71,  71, 242, 159,
- 163, 187,  25, 136,  99, 145,  91,  94,
- 154, 127, 124, 128, 115, 147,   1, 210,
- 214, 232, 248, 143, 127,  79,  27,  98,
-  44,  18, 142, 206,  98, 195,  38,   4,
-  68,  68,  67, 169,   3,  54, 133, 233,
-  28,   0, 120, 239, 167,  74, 110, 222,
- 196, 180, 148, 244,  12, 222,  46, 139,
- 143,  64, 196,  11,  83,  70, 229, 136,
-  68,  93, 229,  73, 218,  54, 149,  47,
- 175,  43, 171,  31, 178, 180, 135,  93,
-  70,  62, 205,  76, 156, 184,  27,  71,
-  90, 232, 182,  25, 221,   3,   8,  76,
- 144, 212, 126, 129, 184,  62,  39,  67,
-  68, 189, 172,  83, 158,  12, 235, 175,
-  99, 248, 236, 249, 215,   6, 145,  33,
-  97,  37,  49, 132, 202, 175,  56, 124,
- 218, 192,   9, 228,  26, 175, 223, 142,
- 185, 101, 133,  56, 236, 116, 210,  24,
-  86,  36, 112,  13, 197, 224,  40, 130,
- 106,  33,  58,  24,  27,  35, 111,   0,
- 212,  82, 211, 139, 201, 241,  53, 121,
-  54, 226,  54, 212, 225, 204, 124, 224,
- 216, 197, 190, 150, 156,  45,  78, 176,
- 214,   7, 139,  86,   6,  62, 187, 149,
-  85,  94,  66,  93,  13, 236, 123,  53,
- 155,  32,  88,  69, 185, 139, 163, 249,
-  29, 142, 155,  97,  66, 106, 237,  88,
- 121, 180, 204, 231,  11, 123, 124,  80,
- 163, 119,   2, 204, 190, 243, 108, 163,
- 134, 188, 145, 114,  63, 188, 156, 116,
-  58, 248, 142,  42,  88, 167,  87,  45,
-  52, 192,  22,  28,  91,  22, 172,   1,
-  96, 163,   0,  13, 250, 117, 170,  69,
- 101, 190,   3, 188,  71, 234, 228,   2,
- 145,  45, 142, 208,  59,  40, 128, 250,
- 174, 123,  99, 110, 234, 102, 182,  90,
- 209, 212, 161,  95,  82, 191,  98, 233,
- 166,  56, 170, 234, 167,  67, 184, 242,
- 235, 121, 164, 252, 164, 251,  41,  94,
-  30,  53,  82, 173, 196, 112, 114, 210,
- 117, 118, 132, 126, 244, 159, 228,  74,
-   9,  12, 200,  16, 251, 223, 226, 115,
- 160,  47,   0,  59, 100, 229, 223, 141,
-   8, 107, 218, 196,  42, 225,  59,  12,
- 224, 130, 225,  51, 243,  85,  63, 229,
-  29, 200, 179,  90, 158,  86,  73,  52,
- 174,  83,  79, 244, 239,  24, 118, 149,
- 202,  29, 202, 143,   0, 114,  69, 187,
-  50, 182,  53,  41, 200, 173, 248,   1,
-  14, 214, 231, 226, 194, 164,  24, 185,
- 232, 232,  36, 136, 109,  76, 218, 227,
-  79,  41, 238,  25, 251,  54,  67,  36,
- 166, 136, 187, 174,   4,  68,  41,  71,
-  16, 195,  30, 188,  19,  93, 146,  64,
- 147, 227, 215, 199, 223,  86, 235, 182,
- 211, 158,  46,  46, 161, 231, 163, 213,
- 140, 193, 235, 180,  98,  90,  92, 106,
-  65,  40,  11, 205, 114, 138,  67,  43,
-  20,  56, 192,  46, 123,  86,  57, 137,
- 179, 161, 187, 182, 237,  49,  85, 252,
- 132,  64, 239, 244,  56,  98, 170, 186,
- 126, 156,  89, 109, 203,  93, 157,  49,
-  21, 236, 180, 148, 234, 214, 141,  97,
-   0,  46,  93, 254, 230, 137,  95, 236,
- 174, 154,  78, 176,  11, 104, 211,  21,
-  61,  72,  22, 136,  18,  86, 130, 150,
- 207, 144, 190,  58, 144, 201,  83,   6,
- 167,  98,  25,   6,  55, 141, 137,  14,
-  79,  63,  52, 109, 207, 122,  53, 179,
-  80, 170,  24, 227,  64, 222,  15,  36,
-  17, 197,  89,  68,  27, 168,   9,  10,
-  56, 149, 148, 123,   4, 100,  81, 255,
- 153, 232, 152, 164,  13, 224, 245,  51,
- 124, 146,  26,  45, 132,   6, 157, 108,
- 252, 187, 245, 133,  79, 162, 168,  80,
- 178, 203, 210,   9, 150,  32,  47, 126,
- 190, 242,  95,  47, 169, 222, 146, 227,
- 142, 166, 137, 202, 168, 184, 221, 238,
- 180,  14,  83, 110,  23,  33,  43, 100,
- 249, 142,   9,  14, 115, 196, 195,  93,
-  69, 221, 130, 144, 113, 103, 154,  23,
- 169, 196, 241, 117, 124,  25, 133, 130,
-  61,  50, 183,   6, 168,  80, 160,  83,
-  31, 241, 251, 145, 178, 225,  95,  29,
-  15, 111, 158,  72,  39, 185, 157,  43,
- 209,  91,  37, 205, 133,  98,  81,   6,
-  21, 105, 215, 239,  16,  60, 160, 154,
-  40,  49,  64, 179, 119,  59, 152, 221,
- 187,  62, 206,  63, 166,  65,  88,   2,
- 198, 184,  46, 171, 196,  74, 204,   9,
-  59, 242, 249, 161, 242, 146, 230,   5,
- 247, 242, 132,  54,  23, 119, 149, 165,
-  20, 178, 250,  33, 219, 120, 164, 117,
- 208, 245, 195,  72, 171, 252,   3,  24,
- 129,  89,  73,  90, 150,  54, 208, 249,
-  43, 107,  31, 151, 210, 106,  72,   3,
-  65,  16,  80, 247,  57, 146, 148,  91,
-  20,  66, 237, 178, 252, 200, 210,  13,
-   0, 249, 155, 141,  32,   7,  12,   4,
- 247, 123, 177, 201,  64, 213, 122, 143,
-  65,  60,  94,  58, 178,  86, 204, 156,
- 146,  85, 158,  73,  70,  73,  98, 228,
-  62, 135, 225, 120, 174, 127, 121, 164,
-  16,  47, 199, 153,   4,  76,  80, 146,
- 162, 243, 234,  35, 181,  74, 166, 186,
- 253, 235, 157, 153,  98,  53,  66,  67,
-  61, 216, 102, 135, 142, 155, 159, 150,
-  17, 195, 140, 205, 162,  29, 173, 239,
-  43, 138, 196, 119, 206, 154,  55, 201,
-  31, 189,   7,  77, 151, 250, 222,  29,
- 164, 134, 254, 173,  44, 166,  74,  91,
- 139,  82, 236, 240,  61, 141,  31, 194,
- 182, 160, 196, 122, 197, 107,  37,  34,
-  13, 170,  68, 167, 220,  31,  99, 160,
- 121, 223, 103, 245, 144,  47, 198, 216,
- 156,  40, 246, 152, 182,  99,  82, 126,
-   8, 205,  68,  18, 172, 228, 174, 205,
- 139, 147, 224, 120, 114,  81, 110,  18,
- 152, 151,  68, 113,  23,  98, 190,  73,
- 156, 136, 120, 181,  67,  99,  37, 220,
- 124,  65, 187, 129, 236,  17,  51,  65,
- 236,  49, 216, 181, 212,  56, 216,  81,
-  49, 152, 142,  30,  78,  21, 237, 137,
- 178, 168,  65, 248,  92, 175,  45,  54,
-   4,  72,  91,   8, 236, 154, 104, 244,
- 135, 104, 224,  83, 164,  18,  37, 190,
-  85, 153,  10,  34, 132,  66, 140,  40,
- 176,  41, 223,  34, 133, 171, 135,   4,
-  69,   1, 130, 110, 128, 180, 245, 226,
-  19, 236, 161, 118, 174, 135, 216,  10,
- 163,  49,  80, 159, 180, 162,  44, 222,
- 135, 201, 193,  29, 204, 250,  49,  53,
- 126, 217, 226, 206, 105, 209, 198,  77,
- 181, 150, 233, 142, 160, 197, 132, 217,
- 115, 126, 160,  37, 104, 244,  28, 205,
- 247, 214, 248, 126,  41, 176, 180, 250,
- 252, 126, 237, 109,  34,  24, 250,  13,
- 249, 155,  17, 192,  71,  31,  42, 206,
-   0,  80, 239, 164,  70, 114,  81, 216,
- 161,  99, 129,  78,  72, 122, 176,  47,
-   9, 235, 185,  35, 244, 187,   8, 190,
-  85,  63, 205, 110,  52, 184, 145,   4,
- 130,  35,  72, 176, 165, 194, 143, 135,
-  93,  85, 212, 253, 174,  99,  93,  89,
- 216, 198,  51,  86, 110, 104, 118, 111,
-  10,  28, 220,  35,  67, 110,  60,  60,
- 141, 124,  33, 103, 218,  43,   4, 166,
-  10, 139, 217,  34, 156,  77, 124, 133,
- 112,  42,  77,  66, 253,   6, 197,  26,
-  89,  39, 149, 201, 130,  20,  24, 155,
- 191,   8, 184,  94,  32, 176,  55, 148,
- 234, 190, 188, 106, 205,  43, 133,  93,
-  35,  87, 173,  28, 132, 251, 106, 117,
- 146, 110, 146, 214,  68, 128, 189,  74,
- 199, 232,  79,  42,  86,  91,   1,  11,
- 151, 112, 146,  47, 124, 248, 126, 239,
-  25, 103, 169, 166, 173, 114, 141, 230,
-  14, 164, 109, 240,   4,  29, 185, 120,
- 128,  57, 151, 183, 104, 159,  52,  30,
- 221, 153,   4, 209, 252, 130, 223,   3,
-  91,   8,  37, 170, 165,  16, 133,  24,
- 134,  25, 239,  51, 180, 113, 187, 130,
- 106, 186, 229,  59, 150, 152, 163,  59,
- 171,  61, 108, 233, 225,  96,  79, 105,
- 208, 121,  32, 206,  64, 205, 180, 194,
- 102, 212, 196, 200, 230, 159,  23, 152,
- 209, 105,  33, 137,  41,  93, 124,  89,
- 243, 247, 201, 198,  72,  40,  43, 134,
- 143, 180,  94,   4,  20, 154, 178,  57,
-  82,  66, 117,  42, 155,  87, 218,  69,
- 255, 228,  32, 182,  78, 242,  45, 216,
-  22, 130, 107,  77, 174, 253, 102,  55,
- 176, 209, 159, 224, 173,  98,  37, 139,
-  96,  37, 238, 212, 115, 139,  35, 245,
-  94, 127,   9,  50, 143,  12, 101,  89,
-  81,  26, 225,  41,  81, 125,   3, 146,
-  71, 166, 170, 191,  90,  12,  70, 153,
- 219,  81, 123,  22, 109,  71, 140, 140,
- 113, 145,  71, 150, 136, 182, 143, 165,
-  40, 148, 226, 144, 142, 245,  44, 221,
- 175,  78,  47, 221,  63, 100, 240,  80,
- 118, 100,  56, 172,  55,  90,  79, 174,
-  46,  55, 106, 249,   5, 107, 197,  23,
-  49,  19,  60, 142,  11,  15, 162, 234,
- 144,  59, 251,  85,  97, 168,  65,  28,
- 109, 232, 255, 109, 181,  66, 206,  64,
- 209,  25, 176,  57, 239, 126,  36,  76,
- 225, 195,  83, 225, 215,   3, 224, 143,
- 222,  14, 235,  42, 143, 127, 208,  70,
- 170, 227, 143, 198,  33, 113,  31,  78,
- 134, 240, 234, 240,  92,  33,  57, 107,
- 126, 187,  73,  85, 101,   7, 241, 130,
- 189, 184,  14, 112,  24,  89, 118, 227,
- 204, 203,  56, 237,  47, 254,  63,  17,
-  43, 219,  20,   4, 131, 167, 244, 213,
- 153, 237, 207, 166, 169, 138,  26, 249,
-   7, 242,  29, 172,  44, 252,  67, 238,
- 209,  97,  39,  73, 186, 218,  40, 175,
- 159, 137, 122, 214, 248,  49, 156,  26,
- 213,  31, 117, 218, 226, 211,  85,  19,
- 204, 218,  74,  98, 188,  50,  21, 226,
- 173, 230, 212,   4,   3,  66,  83, 126,
-  90, 111, 115, 247, 159, 148, 106,   3,
- 240, 191, 101,  15, 153, 180, 173, 180,
- 167, 196, 113, 157, 154, 222, 204, 158,
- 255,  39, 112,  43,   5,  46, 221, 125,
-   7, 129,  87,  80, 129,  30,  56,  14,
-  46, 164, 126,  97,  52, 138, 157, 106,
-  68, 143, 242, 174, 224, 246, 217, 135,
- 109,  66,  71,  74, 141, 225,  95, 186,
-  41, 157, 149,  52, 200,  50,  54,  39,
- 231,  77,  92, 246, 170,  88,  12, 179,
- 120, 233, 134,  33, 255, 203, 105, 105,
- 145,   2,  45,  51,  98,  63, 189, 196,
-  69, 157, 237, 111, 141, 198, 212,   3,
- 167,  38, 135, 188,  70, 228,  78, 147,
-  35,  21, 196, 164, 155, 116, 251, 105,
- 171, 242,  61, 202, 171,  11, 198, 239,
- 141,  34,  87,  31,  82, 137, 176, 151,
- 228,  65,  55, 226,  58,  70, 250, 114,
-  91, 226,   3,   2, 205,  55, 161,  50,
-  52,  98, 149, 247,  55, 244, 184, 254,
- 155, 137, 248, 134,  76,  32,  36, 203,
- 241, 121,  53, 123,  96, 175,  67, 102,
- 124,  64, 229, 128, 244, 240,  89,   5,
- 248,  53,   0, 172, 184, 126, 110, 252,
-  30, 117, 149, 232, 113,  34, 185, 158,
- 223,  23, 249,  52, 123, 117, 232,  67,
-  37,  41,  43, 249,  48, 210,   4,  57,
- 155,  49,  40,  96,  84,  13,  11, 167,
-  49,  41, 175, 251,  28,  64,  12, 254,
- 119, 172,  40, 136,  56, 123, 226,  94,
- 158, 131,   4, 249, 233,  67,  72,  65,
- 119, 119,  36, 221,  91, 202, 198, 229,
-  91, 241, 217,  75, 110,  39, 198, 165,
- 189, 182, 234, 101, 219, 195,   7,  45,
-  86, 129, 122, 171, 125, 130, 188,  87,
- 137, 178,  18, 103, 116, 128,  40,  89,
- 131,  50,  46,  75, 140, 153, 151,  15,
- 188, 228, 109, 165,  33,   3,  97,   0,
- 131, 135, 128, 106, 173, 246,  55, 175,
-  39,  75,  40, 132,  78,  21, 251,  86,
-  72,  34, 110, 220,   3, 202, 112,  45,
- 228, 207,  53,  16, 212, 219,   8,  94,
- 224,  91,   6, 132,   7, 195,  27, 164,
-  86, 105, 208,  69, 198, 238,  71, 203,
- 254,  44, 120,   5, 158,  54,  69,   1,
- 230,  84, 250,  27,  31, 128, 128,   4,
- 140,  13, 119,  36,  27,  83,   2,  41,
- 117, 157,  34, 113, 134, 129, 216,  33,
-  67, 177, 141, 145,  91, 203, 249, 221,
- 172, 225, 241, 197, 161, 169,   8, 233,
-  68,  75, 207, 214, 154, 181,  90, 177,
-  26, 235,  49, 247, 229,  45, 248, 246,
-  35, 156, 162,  64, 119, 188, 190, 165,
- 249, 244,  16,  47, 176,  48,  53, 193,
- 206,  70, 107, 134, 217, 220,   5, 122,
-  24,  58, 171,  50, 180, 141, 174, 241,
- 163,  49, 194,  30, 233, 226, 192, 108,
-  77,  63,   5, 166,  80,  89,  66, 134,
- 209, 161, 120,  18, 200,  34, 212, 239,
- 218,  12,   3, 233,  23,  16,   6,  42,
- 199, 105, 170,  33, 222, 157,  66,  60,
-  48,  64, 112,  32,  81, 134,  72,  23,
-  93, 201,  79,  41,   6,  11, 134, 159,
- 217, 133, 183, 108, 249, 167, 153,  61,
- 110,  48,  78,  56,  27, 219,  72, 149,
- 213, 218, 129, 210,  43, 109, 244, 197,
- 103, 223, 242, 186, 221, 178, 161, 124,
- 136, 140, 117, 140, 156, 163, 206, 149,
- 255, 169, 202, 169,  70, 137, 198, 246,
-  55, 168, 200,  25, 160, 232,   0,  94,
-  39, 119, 161, 167, 179,  57, 216, 178,
-  55, 239,  91,  84, 252, 149, 210,  65,
- 113, 192, 249,  20, 240,  57, 206, 164,
- 127,   0, 210, 254, 107,  95,  37, 140,
- 108,  94,  25, 247, 169,  75, 199,  80,
- 220,  82, 222, 123,  31, 238, 132, 131,
-  44, 247, 160, 231, 112,  54,  45, 101,
-  13, 213, 239, 143, 119, 120, 214, 253,
- 116,  21, 188, 111, 169, 130,  52, 108,
-  91, 182,  11,   7, 157, 112, 177,  35,
- 227, 220, 241, 226,  27, 234, 143,  14,
-  15, 226, 224,  75, 171, 208,  93, 201,
-  40,  66,  57, 227,  46, 246,  70,  34,
- 117,  84, 207, 239, 222,  98, 229,  18,
-   9, 170, 145,   2,  57, 103, 204, 218,
- 176, 159,  46, 166,  30, 245, 242, 103,
- 124,  57, 169,  83, 213,   9, 117, 209,
- 136, 147, 155,  57, 169,  91, 126,  98,
-  63,  49,  20,  47,  26, 170, 184, 199,
- 170, 138, 214, 129,  82, 175, 121, 162,
- 228,  29,   1,  47,  37, 108, 143,   4,
-  88,  40,  24, 246,  88,  61,  80,  89,
-   4, 149, 152, 209,  56,   5, 223, 144,
-  47,  94,   5,  36,  25,  11, 115, 240,
-  41, 211,  38, 251,   5, 123,  77, 213,
- 105,   5,  62, 232,  68, 194,  37, 100,
- 149, 169, 217, 244, 158,  86,  30, 201,
-  83,  41, 171, 254, 174,  39, 202, 174,
- 204, 205, 252,  34, 143,  30,  35, 123,
- 164, 188, 178,  10,  72, 152, 242, 246,
- 140,  37, 246,  47,  53,  21, 165, 213,
-  51,  57,  93, 118, 130, 246, 230,  16,
- 227,  10,   6,  12, 135, 212, 170,  20,
-  25,  88,  65, 133,  72, 109, 209, 103,
-  16, 234, 223, 125, 212, 243, 188,  16,
-  58, 229, 227, 145, 185, 131,  50, 254,
- 203, 200, 235, 122, 153, 188,  55, 219,
- 152,  74,  85, 157,  54,  40,  31, 171,
- 208, 199, 247,  44,  65, 231, 188, 240,
-  41, 134, 253, 128, 118,  93, 109,  80,
-  91,  97, 109, 245, 202, 117, 137, 163,
- 251,  60, 194,  10, 119,  72, 176, 193,
- 171, 138,   8, 220, 208, 140, 157, 215,
- 188, 160,  50, 236, 112, 162, 161, 108,
-  53,  33, 155,  53, 241,  41,   5, 157,
- 231,  61, 218,  17,  58,  89,   5, 214,
- 157, 149, 193,   3, 234, 166, 150, 192,
-  71,  69, 197,  60, 153,   7,  88, 179,
-  21, 130, 120,  67, 184,  65, 228, 224,
-  29, 223, 234,  97, 170,  90,  27, 199,
-  82,  90,  55,   7, 148,  49,   8, 197,
- 101, 152, 132, 244, 151,  56, 165, 219,
- 252, 152, 205, 191, 232, 237, 139, 115,
- 176, 139, 156, 214,  48,  53,  12, 169,
-  63,   0,   4, 238, 149,  44, 236,  51,
- 120,  62, 123,  21,  28, 116,  39,  61,
- 192,  56, 123,  51, 117,  90,  59,  88,
-  56,  34, 132,  47, 137, 165, 108, 191,
-  25,  81,  89, 237,  31,  40, 237,  83,
- 236, 112, 101, 253,  53, 219, 182, 179,
-  75,  24, 216, 192, 174,  57, 172,  92,
- 232, 132,  91, 139, 193, 205, 119, 182,
- 183, 187, 170,  64, 108,  89, 141,   6,
-  68, 192, 213, 241, 102, 142, 203, 139,
- 195,  63, 115, 233,  67, 127, 216,  16,
-  51, 184, 231, 112,  22, 131,  66,  92,
- 173,   6, 244,  20,  60,  42, 126, 106,
- 219,  65,  62, 116,  80,   6, 185,   5,
-  29, 246, 182, 101, 159,  75, 168, 144,
-  21, 113, 252, 190, 140,   3, 186, 114,
-  46, 217,  25, 134, 223, 108, 114, 183,
- 119,  77,  63, 165,  51, 254, 138,  77,
- 141,   1, 234,  46, 173, 133, 150, 201,
- 130, 105, 218, 240, 115, 181,  18, 191,
- 198, 187, 207,  12,  54, 180,  31, 250,
-  59, 122, 238,  62,  69, 255,   4,  34,
-  24, 206,  52, 211,  31, 200,  89, 110,
- 224, 221, 155,  40,  44, 230,  88, 135,
-  96, 121,   0, 223,  76, 190, 118, 238,
-  59, 122,  31,  83,  82, 220,  42, 183,
- 184, 163, 209, 127,   4, 154, 100, 230,
-  79,  42,  26, 142,  68,  86,  22, 220,
- 151, 103, 115, 170,  95, 126, 120, 180,
-  46,  29,  92, 161, 160, 164, 199, 223,
- 174, 226, 182, 213, 157, 247, 102,  70,
-  35, 191, 231,  19, 249,  82, 218,  58,
- 180, 180, 147, 224, 159,  21,   3,  62,
- 185, 216,  44, 126,  90, 132,  59, 244,
- 152, 105, 232, 237, 136, 236, 211,  35,
-  77, 104, 246,  58, 144, 167, 131,  27,
- 130, 246, 160, 255, 125, 246, 171, 217,
- 247,  83, 245, 149,  58,   1, 225, 143,
- 113,  39, 253, 155, 146, 248,  62,  98,
-  33,   8,  27,  21, 104,  66, 124,  48,
- 228, 120,  88, 247,  13,  16,  79,   8,
- 225,  13, 139, 230, 106, 166, 155,  51,
- 157, 133, 115, 251, 232, 187, 223,  45,
- 149, 140, 198,  87, 254, 130, 157,  32,
-  23, 183, 183,  52,  43, 214, 176, 167,
- 250, 239, 133, 192, 194, 163,  50, 164,
- 204, 202, 101, 248, 240,  47, 146, 179,
- 187, 215, 236,  84, 150,  19,  68,  40,
- 161, 250, 241, 254,  15,  95, 103,  73,
-  87, 227, 201,  51, 218, 117, 169,  70,
- 204,  63,  58,  34, 222, 190, 235, 129,
-  13, 211,  43,  41, 172,  73, 106, 129,
-  57, 240,  37,  80,  39, 215, 127, 122,
- 105, 239, 176, 114,  21,  72, 237, 185,
- 131, 233, 225, 210,   2, 148,  71,   3,
- 218, 199,  28, 179, 198,  10,  51, 213,
- 207, 193, 192, 207,  46, 150, 223,  54,
-  26, 227,  23, 241, 103,  16,  86,  34,
-  97, 156, 191, 157,  92,  71, 200, 214,
- 169, 213, 254, 170, 244,  95, 224,  26,
-  10,  47, 128, 168, 127, 255, 121, 227,
- 210, 130, 245,  11,  84,  65, 251, 127,
- 104,  74,  28,  31, 179, 251, 254, 217,
- 161, 189, 112,  55,  66, 118,  75,  27,
- 220, 156, 108, 154,  49,  16,  71,  97,
-  69,  92,  77, 181, 197,  27,  62, 160,
-  60, 251, 153, 245,  61,   6, 220, 134,
-  91,  90,   5, 250,  89,  58,  84,  95,
- 142,  15, 183,  55,  54, 175, 146, 101,
- 232, 222, 233,  61, 126, 122, 249,  98,
- 172, 201, 232, 155, 150, 149, 111,  16,
- 206,  63, 118, 184,  47, 122, 150, 114,
-  15, 123,  22,  71,  87, 159,   1,  70,
- 163, 241, 166, 107, 135, 198, 102, 162,
- 158,  56,  45, 107, 113,  78, 213,  48,
- 139, 144, 139, 229,  31, 116, 211,  98,
- 113,  41,  96, 151,  71, 218,  63,  40,
-   6, 240,  45, 172,  39,  32, 130,  46,
- 247, 224, 123,  18, 168,  23,  40, 246,
-  53, 172, 101, 148,  15, 165,  23,  39,
- 162, 184, 255,  87, 247, 248,  63, 226,
- 211, 121, 229, 108,  50, 153,  59, 218,
-  18,  64, 171,  29, 108,  65, 114, 253,
- 142,  25, 254,  30, 146, 102, 200,  58,
- 100, 197,  92, 163, 126, 189, 230, 237,
- 221,  11, 184, 223, 255, 130, 177, 169,
- 137,   4,  23, 191, 215, 255, 246,  44,
- 216,  62, 210, 226, 135, 159, 198, 104,
-  33,  32, 120, 111, 103, 166, 137,  92,
- 214, 187,  40,  91, 244,  48,  10,  28,
-  92,   8,  38, 146, 211,  69,  66, 209,
- 234, 233,   7, 154,   0, 201,   4, 104,
-  45, 138,  46, 172, 106,  80,  61,  27,
-  38, 222, 190, 189,  64, 241, 155,  36,
-  41,  65,   0, 215, 215, 205, 249, 210,
-  16, 227, 198,  77, 237, 180,  29,  62,
-  95, 215,  70, 174,  85, 222,  59,  17,
- 205, 245,  80,  68, 116, 127, 156, 249,
-   1,  39, 185, 141, 210,  21, 230, 209,
- 186, 194,  92,  92,  38,  42, 147, 192,
-  75, 121,  38, 144, 225,  31,  58,  97,
-  63, 253, 187, 252, 238, 137, 174, 215,
-  25,  25, 241, 200, 150, 144,  98, 115,
-  87,  29, 107,  89,  13,  43, 105, 201,
- 160, 230, 149, 234, 201,   4,  21, 226,
- 216,  40, 109, 226,  97, 253, 246, 248,
-  31, 217, 102,  57,  79,  54,   7, 194,
- 132, 224,  61, 100, 142,  33, 226,  45,
- 167, 206,  95,  64,  96, 155, 252,  60,
-  58, 245, 242, 224, 105,  24, 240,   9,
-  34,  20, 220, 114,   2, 101, 217,  49,
-  79, 187,  20,  34,  77, 183, 128,  32,
-   7, 156, 135,  80,  84, 106,  77,  37,
-  77, 186, 156, 254, 251, 242, 234,   9,
- 227,  74, 132, 211,   9,  16, 210,  87,
-  55, 117, 217, 104, 137, 108, 154,  65,
-  16, 111, 176,  16, 171, 167, 228,  30,
-  20,   6, 230,  80, 104,  88,  98, 133,
- 153, 117, 232, 235,  81,  43,  92, 171,
- 103, 123, 157, 235, 162,  34,  67,  74,
- 231, 110, 190,  18, 125, 202, 239,  61,
- 248, 149, 147, 143, 129, 107, 117,  88,
- 162,  39, 250,   3,  20, 231,  62, 118,
- 236, 198,  46, 184,  36, 191,   1,  17,
- 128,  48,  64, 236, 148, 120, 150, 170,
- 176, 151, 232,  80, 169,  11, 145,  42,
- 160, 136, 116, 197, 241,  77, 249,  96,
- 220, 122, 101,   8,  42, 109, 184, 159,
-  14, 204, 223,  92,  39,  22,  84,  76,
- 225, 117,   4, 133, 240, 101, 190,  97,
- 136, 130, 134, 155, 131, 194,  56,  37,
- 235,  26, 210, 247, 182, 183, 200,  73,
- 121, 186, 166,  58, 179,  74, 244, 165,
-  61,  37, 118,  31,  43, 188, 231, 135,
-  15, 132,  73,  58, 136, 130, 226, 191,
-  57, 158, 166, 209,  63, 247, 151, 165,
- 114,  81, 174, 213, 236,  64, 141, 110,
- 228, 232, 109,  94, 195, 130, 227, 108,
- 238, 117,  17, 148,  86, 143, 180, 160,
- 186, 141, 133,  59, 243, 188,   5, 126,
-  57, 223,  26, 206,  24,  13, 178, 240,
-  21, 139, 171, 215, 148, 123,   2,  18,
- 150, 224,  27, 163,  37,   8, 200,   1,
- 160,  71,  24,  88,  79, 231, 140, 254,
-  80, 255, 213, 193,   2, 143, 254, 226,
- 203,  56, 150,  90, 221, 192,  44,  27,
- 145, 162,  55, 141,  28, 209, 114,  45,
- 186,  63, 123, 111,  43,  49, 176, 233,
- 200, 227, 177, 201, 214, 137, 121, 143,
-  26, 198, 157,  49, 172, 175, 193,  87,
-  55,  82, 246,  28,  37, 237, 238, 143,
- 214, 239,  71, 151, 126,  11,   9,  90,
-  89,  46, 240, 243, 131, 130, 100,  48,
- 104, 255,  90,  55, 248,  36,  64, 210,
- 116, 171,  57,  86,  40, 154, 199, 130,
- 194,  62, 173, 217,  11, 187, 164, 109,
-  80,   2, 203, 162,  44, 165,  53,  80,
-  22, 180, 229, 146,  66,   3,  90, 146,
- 229, 219, 247,  29,  10, 249, 136,  95,
-  78, 150,  45, 172, 183, 193,  27, 117,
- 163, 148, 135,  10, 140, 241,  33, 138,
- 137, 228,  27,  19,  56, 121,  75, 191,
- 107, 164, 251,  35, 189, 133,   8, 203,
-   9, 183, 145, 156,  88, 252, 106, 186,
- 189, 137,  43,  87, 253,  50, 130, 153,
-  77,  51, 197,   8,  11, 102, 248, 221,
- 185, 177, 206, 217, 210,  91, 186,   9,
- 160, 205, 122,  49, 242,  14, 131,  39,
- 187,  66,  77, 217, 202, 236, 118,   0,
- 228,   0,  20,  76, 198,  17, 209,  60,
- 225, 220,   0, 189,  67,  76,  23,  33,
- 217, 107,   8,  96,  92, 199, 129,  63,
- 200, 243,  75,  72, 123, 254, 151, 228,
-  23, 221, 229, 240,  87,  79,  45, 230,
- 151, 101,  62,  17, 109,  39,  49, 209,
- 159,  25,  75,  62,  77, 208, 248, 179,
- 246,  67,  29, 232, 212,  74,  75,  48,
-  48,  68, 145,  87, 105,  58, 119,  88,
-  53,  53, 243,  55, 131, 155, 189, 150,
-   2,  10, 106, 199, 142,  16,  79,  24,
-  11,  87, 160,  27,  25, 176, 149, 172,
- 137, 111,  96, 183,   6,  52,  26, 177,
-  23,  86, 104, 213, 253,  46,   0, 160,
- 186,   6,  68, 146,  98,  91,  14,   5,
-  73, 102,  78,  34, 109, 185, 233,  26,
-  95, 240,  72, 177, 236,  99, 187, 241,
-  38,  26,  81, 213, 112,  46, 196, 199,
- 209,  60,   3, 146, 163, 242,  11,  22,
- 110,  14,  42,  67, 244, 137,  54, 192,
-  47, 144,  71,  78, 130, 156,  78, 101,
- 188,  36, 249, 247,  38,  38, 199, 129,
- 135, 204,  94, 193,  28,  43,  48, 121,
- 223,  46,  80, 190, 119,  97, 123, 218,
- 203,  20, 197, 177,  21, 208, 194, 233,
-   3,  85,  42, 155, 201, 142,  85,  38,
-  98, 102, 249, 156, 143, 154, 177,  31,
-  45,  87, 155, 143,  25,  79,  15,  63,
- 207,  23, 101, 231, 132, 210,  56, 245,
-  25,  19,  10,  49,  87,  30, 160,  39,
- 243,  81,  19,  47,  90, 138,   4, 228,
-  18,  99,  33, 153, 251, 118,  81,  28,
-  48, 246, 168, 189, 142,  80,  57,  61,
- 146, 188,  87,  33, 175,   4,  43, 142,
- 244, 238, 138,  25, 180, 101, 132, 178,
-  10, 165,  53,  79, 158, 174, 238, 190,
- 213,  58,  34, 167, 121, 178, 167, 193,
- 213, 224,  17, 105, 136,  40,  79,  67,
- 149, 168, 215,  50, 189, 193, 165, 184,
-  27,  61, 215, 210,  73, 154, 183, 232,
- 223, 135,  69, 212,  37,  95, 156,  46,
- 235,  67, 100,  19,  24,  67, 210, 199,
- 181,  63,  89,  13, 115, 247, 170, 180,
-  90, 143, 223, 126,  45,  27, 218, 175,
- 234,  13, 180,  46, 224, 136,  74,  31,
-   0,  17, 122,   3,  43, 123, 190,  84,
- 253, 213,   7, 196, 134,  44, 228, 255,
-  61,  20, 231,  48, 203, 130, 106,  74,
- 209,  23, 236,  17, 112,  12,  59,  38,
- 105, 206, 226, 250,  62,  16, 215, 141,
- 204,  38,  52, 167, 159,  74, 254,  89,
- 232, 200,  70, 115, 142, 104,  24,   2,
-  15, 196, 242, 210,  91, 165, 197, 197,
- 215,  82,  85, 128, 251, 186,  14,  11,
- 224, 232, 172,  50,  95,  67,  67, 128,
- 149, 125, 173, 121, 251, 102, 177, 130,
- 154, 134, 152,   8,  21,  81, 119, 225,
- 176, 146, 141, 203, 220, 180,  65,  14,
-  52, 105,  17, 176, 251, 249,  82,  59,
-   4,  74, 189,  76, 181, 205, 208, 224,
- 164, 150, 105, 196, 106,  47, 245, 204,
-  30, 115, 243, 239, 169, 184, 195, 164,
- 140,  57, 108, 203,  14,  82, 211, 104,
- 230, 147,  13,   9, 111,  32, 163,  62,
- 197,  93, 102, 124, 205,  68,  38, 214,
- 105, 246, 194, 158,  83, 148, 162, 215,
-  64,  81,   2, 253, 247,  74, 134, 138,
- 212, 146, 222, 148,  97,  50,  19, 183,
-  78, 184, 125, 231,  23,  12, 216, 247,
- 106,  94,  78, 247, 175, 115,  24, 164,
- 222,  74,  22,  37, 119,  74, 179, 153,
-  45,  58,  67, 179, 212, 120, 183, 124,
- 218,  64, 188, 137, 206, 245, 204,  53,
-  44, 238, 141, 224, 116,  23, 239,  47,
- 129, 132, 130, 122, 197,  75, 214, 171,
-  61,  27, 176,  17,  68,  87,  15,  94,
-  22, 147, 123, 147, 159, 120, 112, 219,
-  57, 135, 127,  47, 163, 187,  96,  62,
- 136, 158, 196,  59, 134,  57, 211,   1,
-  59, 127,  51,   7, 128,  55, 179, 141,
- 206, 139,  21, 228, 217, 166, 220,   8,
- 247, 132, 101, 218, 242, 225,  17, 146,
-  23, 154,  20, 217,  37, 251, 166, 228,
-   0, 176, 194,   6,  94, 110, 204, 227,
- 119, 243, 134,  37, 158,  14, 233,  35,
- 171,  43,  90, 253, 184,  24,  86, 223,
- 126,  66, 126,   4,  62,  18,  19,  79,
- 207,   2,   9, 137, 193, 116,   2, 209,
-  92, 114,  86,  48, 214, 178, 187, 178,
-  55, 156, 119, 105,  74,  91, 238,   6,
- 160, 181, 143, 180, 176,  87,  59,  60,
- 236, 174, 181,  19, 130,  78,  50, 169,
- 156,  35,  72, 231, 245, 223,   3, 174,
- 217,  51,  49, 234,   2,  89,  57, 184,
- 251, 121, 126, 189, 207, 227,  50,   1,
-   3,  13, 151,  88, 205, 207, 160, 253,
- 111, 198, 246, 205, 128,  59, 238,  38,
- 195,  58, 163, 238,  73,  56,  62, 223,
- 148,  35, 216, 137, 224,  28,  89,  69,
- 244, 169, 189,  63, 142, 192, 106,   7,
-  42, 115,  90,  80,  48,  51, 225, 187,
- 239,  32,  10,  13, 102, 160,  89,  84,
- 206,  77,  10, 218, 189, 240, 242, 246,
-   3, 155, 244, 193, 145,  50,  48, 159,
- 102,  92,  42, 170, 230, 213, 251, 190,
- 249, 157, 139, 213,  14,  76,  44, 192,
- 228, 189,  70,  39,  68, 157, 227, 215,
- 128,  62, 125,  12, 204,  55,  63, 105,
- 221,  56, 136, 184, 236, 205, 136, 120,
- 152, 163, 176,  23, 183,  16, 101,  51,
- 129, 139, 101,  35,  19,   5, 252,   0,
- 155, 143,  81, 227,  21,  69, 229,  75,
- 168, 210, 125, 100,  57,  52, 243, 236,
- 137,  21, 235, 249,  69, 113,  50,  23,
- 212,  27,  67, 135,  37,   8, 223,  96,
- 158,  28,  40, 245,  44, 107, 213, 179,
- 235, 115,  44,  24, 230, 111, 231, 128,
-  35, 211, 235, 163, 180,  25,  77, 206,
-  89, 191, 227, 247, 252, 249, 249, 148,
-  36, 118,  89, 111, 181, 154, 230, 143,
-  98, 224,  68, 125, 178, 165, 146,  28,
-  49,  28,  21,  91, 205,   0,  23, 236,
-   7,  74, 210, 247,   0, 224,  64, 223,
- 251,  35,  24,  69, 177, 134,  57,  36,
- 152, 197, 222, 197,  52,  28, 156, 192,
- 148, 127,  34, 214, 240,  61,  11, 101,
-  37,   8, 255, 252, 245, 238, 131, 168,
-  30, 120, 231, 156,  55,  30, 173,  16,
- 240,  52, 178, 100,  10, 156, 184, 234,
-   6,  28, 120,  69,  70,  93,  73,  81,
- 155, 110, 102, 102,  71, 135, 102,  98,
- 133, 157, 227, 148,  27,  85, 121,  18,
- 216, 182, 123, 176, 204, 105,  42, 190,
-  61,  96,  54,  38, 100, 112, 214, 251,
-   4,   4,   0, 246, 229, 105,  17,  48,
- 168, 144,  44, 100, 130,  48,  65,  49,
- 102,  24, 124, 134,  35, 219, 198, 204,
- 233,  97, 167, 237,  75, 148, 229, 129,
- 239,  86, 189,   4, 139, 242,  84, 218,
- 120,  91, 239,  10,  95, 217, 236, 196,
- 123, 247, 167, 116, 222,   8, 198,   4,
- 100, 155, 194,  38, 150, 108, 104, 108,
- 112, 113, 104,  77, 183, 200, 249, 162,
-  50,  95, 195,  70, 118, 183, 233,  79,
- 103, 228, 107, 142, 105,  47, 252, 230,
-  72, 239, 221,  40, 189, 163,  37,  21,
- 107,  40,  44, 184, 171, 255, 217,  82,
- 173, 157, 168,   8, 226, 207, 147,  15,
-   6, 174,  35,   1,  10, 208, 212,  57,
- 212, 150, 189,  83, 192,  40, 149,   5,
- 119, 223,  45, 228, 173, 167,  73, 123,
- 218, 157, 227,  90,  18, 252,  75, 179,
- 151,   2, 145, 251,  42,  39,  14,  86,
-  70,  36,  77,  10, 174, 211, 232,  84,
- 124, 169,  97,  12,  12, 230,  56, 230,
- 131,  43,  52,  22, 229, 121, 137, 143,
-  62,  97,  99, 109,  62,  19,  76,  33,
- 183, 116, 200, 137, 178,  71,  77, 196,
- 164, 210, 182, 100,  11,  85, 208, 171,
-  73,  45, 135, 154, 150, 226, 149,  45,
-  48, 193, 188, 231,  15,  29, 115, 186,
- 222,  43,  54, 228, 184, 161, 245, 113,
-  27, 124, 137, 149, 123, 180, 154,  30,
-  74, 126, 149, 122, 244, 125,  13,  75,
- 173,  16, 126, 188, 207,  27,  60, 244,
- 105,  50, 187, 109, 181,   2, 199, 108,
-  62, 245,  90, 101, 187, 139,  55, 128,
- 173,  52, 207, 101,  71, 221,  10,  58,
- 252, 184, 159, 174, 204,  64, 250, 217,
-   4,  59,  32, 216, 121, 111, 225, 252,
- 120,   1, 151,  19, 199,  98, 128, 203,
-  73, 222,  89,  77, 202, 216,  35, 209,
- 226,  96,  28, 236,   8,  69,  57, 163,
- 213, 145, 254, 179, 182, 126, 234,  40,
-  30, 120, 222, 153,  36,  91, 220, 137,
- 189, 141, 242,  58,  23,  34,  93,  89,
-  17, 177,  96,  45, 109, 104,  65,  70,
- 129, 161, 122, 243,  98,  67,  64, 184,
- 186,  82, 101,  45, 144,  17, 220,  37,
-   4,  93, 170, 117,  77, 113,  66,  37,
- 133, 162, 142, 150, 219,  21, 184, 142,
-  31,  30, 210, 136,   6, 241,  25,  55,
- 176, 142,  39,  76, 168, 132,  13, 203,
-  88,  75, 133, 157, 191,  29, 118, 136,
-  58, 155, 200,  53, 158, 223,  37, 167,
-  72, 194, 182,  25,  93, 157,  86,  17,
-  99, 201, 246, 134, 151, 116, 153, 157,
- 251, 166,  27, 105, 219,  30,  67, 200,
- 107, 249, 144, 108, 129,  58, 201, 232,
-   6, 216,  97, 103,  88, 114, 170,  90,
- 232,  16,  92,   4, 136, 149,  97, 185,
-   4, 138,  40, 232,   5, 124,   4,  63,
- 218, 162, 216, 118,  86, 124,  35, 108,
-  47, 230, 255,  93, 250,  81,  98, 197,
- 142, 133,  12, 164,  24, 178,  79,  75,
- 241,  13, 118,  82, 112, 179, 124, 231,
- 225, 113, 222,  96, 155, 100,  76,  83,
-  43, 140, 244,  77, 192, 107, 197, 174,
- 190,  27,  31, 168,  62, 159,  88,  93,
- 232,  16, 248, 253, 121, 126, 189, 151,
-  58,  19, 137, 223,  92, 127, 235,  27,
-   1,   0,  93,  88, 169,  12, 210,  96,
- 230, 242, 151, 175,  97, 177, 252, 237,
- 250, 113, 196,  52, 232, 100,  76,  45,
- 159, 125, 221, 121, 221,  41, 125, 168,
-  53,  42, 120,  56, 163, 105,  23, 214,
- 242,  17, 186, 248, 151, 240,  77,  54,
-  70,  62,  60, 182,  52, 242, 138, 197,
- 216,  98,  66, 158,  29,   9,  36,  37,
-  38, 132, 221, 135, 147, 101, 198, 173,
- 159,  54, 230,  71, 249, 245, 227, 222,
-  79,  19,  72,  48, 149, 225,  14, 173,
-  43,   9, 130,  95, 137,   6, 175, 229,
-  15, 136, 192,  99, 205, 229, 187, 173,
- 191, 121, 113,   9, 249,  71, 125, 196,
-   2,  63, 245,  42,  28, 167, 108,  68,
- 166, 232, 135, 164, 174, 210, 248,  31,
- 164, 130,   9, 157,   3, 202, 119,  23,
-  78,  52, 124, 117, 106,  77,  44, 124,
- 144, 216,   9, 158, 127, 141,  59, 103,
- 112, 243,  83, 220, 227, 146, 120, 136,
-  16, 208,  52,   1, 231, 163,  80,  16,
- 138, 252,   5, 255,  71, 197, 137, 140,
- 203, 193, 235,   8, 176,  28,  97,   8,
- 241, 120,  29, 203, 158, 151, 183,  92,
- 222, 232, 133, 136,  82, 202, 225,  47,
-  99, 223,  84, 191,  13,  57, 181,  70,
-  30,  39, 197,  68, 210,  14, 117, 230,
- 217,  44,   9, 236, 127, 248, 128, 144,
-  97, 149, 151, 126,  33, 114, 131,  13,
-  10,  15,  15,  86,  28, 165,  49, 253,
- 190, 170, 178,  99, 128, 225, 234, 220,
-  85, 114,  62, 220, 116,  44, 136, 102,
-  78, 211,  92, 175, 121,  90, 137, 237,
- 204,  33, 225, 239,  41, 223,  37,  67,
- 107,  48, 117,  72,  86, 204, 178, 140,
- 185, 195, 175,  47,  39, 167,  56, 153,
-  47, 198,  69, 103, 217,  93, 106, 117,
- 132, 148, 235,   7, 172, 222, 219, 154,
-  68, 247,  90, 218, 188, 166, 130, 215,
-  74, 136, 101, 218,   6, 142, 244,  67,
-  23, 115,  35, 156, 247, 129, 110,  59,
-  93,  62,  45,  87,  54,  91, 158,  10,
-  58, 176, 248,  79,  27, 206,  91,  20,
- 215, 135, 182, 222, 134, 190,  88, 135,
-  78, 147, 250, 212,  49, 156,  17, 150,
-  42,  22,  29, 202, 169, 132,  30,  99,
-  90, 180, 143,  75, 241, 116,  76, 151,
-  32, 133,  96, 102, 244, 233,  44,  68,
- 183, 219, 120, 111, 241,  95, 155, 248,
-  54, 100, 187, 242,  77, 236, 246,  49,
- 225, 218,  41,  69,  19, 110, 130,  90,
- 225, 152, 119, 253, 188,  20, 155, 234,
- 125, 120,  76, 126,  26,  44, 194, 237,
-   4,  33, 236, 149,  26,  57, 156, 246,
- 171,  58, 134, 120, 236,  57, 209, 241,
- 119, 215,  61,  50,  28,  73, 141,  69,
-  32, 152,   8, 249,  89, 244, 236,  35,
- 136,  68,  54, 132, 112, 102, 151, 121,
-  83, 124, 193, 213,  67, 198,  33,   3,
- 155,  19,  16, 205, 226, 126, 104, 229,
-  93, 170,  40,  67, 111,  50,  31,  36,
-  70,  50, 200, 227,  28, 185, 176,  91,
- 150,  28, 148, 129, 187, 140, 126, 245,
- 204,  10,  61,  89, 162,  48, 117, 150,
-  47,  55,  49, 139, 128, 108, 144,  25,
-  93, 148,  24, 137, 239, 135,   0,  83,
- 208, 146, 104, 171, 114, 147, 150,  50,
-  69,  86,  36,   6, 132, 236, 210,  47,
- 218,   2,  70, 181, 231,   7,  43, 114,
- 164, 109,  80, 109,  38, 214,  50, 201,
- 229, 122, 252, 183,  68, 194, 184, 133,
- 144, 205,  39, 202, 250, 111,   6,  53,
- 109, 158,  42, 170,  23, 168, 193,  31,
- 180, 204,  86,  69, 205, 205,  33, 242,
- 133, 237, 153,  11, 159,  54, 104, 174,
-   5,  41,  47, 180, 160, 114, 162, 125,
- 128, 198, 124, 100, 108, 152,  10, 174,
-  28, 108, 217,   0, 214,   9, 210, 184,
-  50,  47, 231,  43, 238, 167,  44, 188,
- 137, 177, 123, 117, 229, 235,  32, 141,
-  44,  87,   1,  24, 192, 130, 161,  85,
-  34, 120, 190, 139,  89, 123, 109, 242,
- 223, 121, 132,  36,  90, 195, 113, 119,
- 160, 208, 132,  37, 152,  58, 184,  56,
- 254, 123, 223,  75, 227, 237, 156, 184,
-  37, 255, 255, 214, 223, 178, 106, 157,
- 204, 179, 223, 205, 116, 161,  93, 231,
- 152,  19, 137, 110,  90, 123,   9,  53,
- 140, 142, 167, 104, 234, 140, 226,   4,
- 125,  60, 200,  33, 156,  10, 253, 221,
-  86, 218, 255,  89,  28, 142,   5, 166,
- 118, 250,  31, 183, 242, 170, 227, 226,
-  93,  60, 136, 107,  89, 245, 174, 212,
- 211, 211, 169, 137,  59, 165,  66,  15,
- 194, 161, 111, 228, 134, 227, 203, 100,
- 119,   1, 112, 202,  69,  79, 133,  18,
- 160,  71, 176, 154,  38,   8,  13, 139,
- 199, 144, 177,  78,  88,  85,  50, 136,
-  99,  98, 188, 216, 103, 109,  19, 137,
- 131, 163,  91,  77, 248, 219, 190,  27,
-  88, 224,  76, 166, 155,  74,  30, 241,
- 196, 110, 247,  51, 216,  27,  42, 237,
- 143, 255, 227, 105,  77,  25, 125, 245,
- 246, 102,  49, 119, 198,  75,  93, 253,
-  69, 245, 144, 183, 192, 206,  89,  33,
- 177,  99, 177,  10,  95, 146,  27, 127,
- 225, 157, 118, 221,  74,  94, 231, 107,
-  14, 105, 183, 175, 139,  73, 101, 190,
- 159, 235, 145,  45, 120, 150, 136,  77,
- 188, 179, 230, 191, 219,   5, 243, 130,
- 129, 101, 207,  28,  54, 179, 168, 158,
-   5,  54, 174, 116, 191,  29,  27,  96,
-  86, 231, 158,  95,  45, 135, 168,  90,
- 189, 111, 121, 217, 108, 135,   7, 232,
- 134, 252, 218,  37, 131, 107, 214, 228,
-  78,   5, 181,  64, 138, 240, 174,  77,
-  57, 203, 249, 113,   8, 145, 222, 155,
-  78,  53, 245, 208, 214, 201,  75, 205,
-  50,   2,  30,  84,   8, 176,  79,  84,
- 139,  57, 174, 109, 139, 166,   7,  93,
-  69, 227,  67, 112, 247, 160, 250, 184,
-  40, 162, 124, 233, 113, 120,  96, 231,
- 228, 190, 228, 104, 212, 170, 143, 221,
- 226, 152, 216,  99,  83,   1,  79, 136,
-  84,  77, 191, 200,  89,  56, 211,  34,
-  88,  77,  30, 244, 190,  10, 215,  10,
-  12,  43, 128, 136,  56, 136, 221, 104,
- 162,  80, 190,  73, 239, 246,  84, 153,
- 125, 192,  49,  40, 200, 195, 124, 165,
-  71, 196, 173,  30, 150, 247, 222, 194,
- 129, 102, 207, 163,  77, 220, 186, 157,
-  53,  13, 112, 195, 197,  20, 157, 241,
-  63, 255, 199,  33,  89,  45,  79, 167,
- 245,  20,   9, 199, 209, 169, 180, 192,
- 236, 108, 244,  45, 182, 147, 252, 158,
- 238, 172, 246, 229, 220,  48, 202,  71,
-   8,  57,  97,  42, 238, 107,  16,  88,
-  28, 201, 232, 126, 117,  84,  22, 151,
- 253, 204, 112, 189, 154,  84, 241,  39,
-  52, 165, 105,  47,  67, 225, 211,  19,
-  18, 218, 251,  85, 130, 210, 122, 111,
- 132, 141,  84,  38, 207, 131,  68,  48,
- 156, 145, 191, 118,   9,   5, 164, 146,
-  63,  53,  27, 247,  39, 242,  57,  66,
- 123, 221,   8, 247,  98, 114, 202, 231,
- 177, 153,  23, 141, 225, 247, 143, 141,
-  90, 202, 135,  34, 118, 104, 143, 196,
- 106, 212,   3,  71,  40, 252,  15,  34,
- 252, 248,  77, 208, 162,  28, 140,  16,
- 157, 242,  24, 232, 108, 176, 225, 126,
-  16, 208,  70,  79,  85, 249, 140, 204,
-   2,  29,  21,  61,  47, 105, 171,  39,
-   5,  13,   4, 103, 218, 165, 140,  61,
- 214, 238, 123,  93,  85, 228, 114, 204,
- 150,  30,  64, 183,  32, 176, 116, 223,
- 179, 183, 254,  39,  35,  50,  84,  81,
-  73, 151, 104,  10,  39, 180, 196,  98,
-  85, 109,  86, 194, 115,  84, 210, 226,
- 179, 249,  73, 158, 152,  36, 241, 243,
-  17,  38,  99, 146, 251, 166, 206, 211,
- 224, 229,  76,  38, 203,  88, 149, 108,
-  90, 214,  51, 136, 109, 223, 171,  66,
-  97, 162,  90, 122,  42, 159, 126,  50,
- 233, 231,  15,  50, 101, 186,  11,  85,
- 237,  85,  96, 135,  60,   1, 100, 185,
-  39, 125,  64, 179,   8, 219, 189, 113,
- 106, 179,  82, 234,  15,   0, 244,   5,
-  43, 142,  33,  28, 195, 145, 100,  69,
-  43, 120, 158, 106, 195,  89, 197,  31,
- 246,  42, 178,  32, 255, 171, 237,  79,
- 241,  75, 197, 240, 144,  14,  65,  42,
-  18,  33,  84, 185, 115, 127, 212, 194,
-  23, 119, 255,  60,  61, 161,  91, 130,
-   0,  64, 244, 252, 215, 149,   6, 112,
-  36, 118,  97, 112, 113, 101, 107, 150,
-  37,  71,  99,  39, 185,  29,  99, 142,
-   6, 165,  16, 211,  44, 242,  18,   8,
-  50, 229,   5,   5, 176, 158, 237, 222,
-  41, 239, 224, 112, 127, 192, 235, 253,
-  30, 114,  44, 160,  31, 244, 182, 206,
-  70,  70, 130, 192,  98, 189,  63,  63,
- 128, 116, 112,  71, 221, 227,  84, 120,
- 238,  80, 192,  49, 151,   2, 153, 191,
-   6, 106, 146,  75, 105, 204,  91,  97,
-   7,  24, 235,  24,  10,  29,  37,  88,
-  61,  66,  71, 248, 150, 131,  98, 140,
- 123,  92, 204,  76,  12, 247, 245,  20,
- 135, 179,  84, 115, 104,  31, 238,  52,
- 123, 254, 190,  32, 221,  29,  92, 220,
-  80, 193,   9, 230, 201,  30, 150, 133,
- 213, 150, 200,  95,  98, 252, 187, 194,
-  44, 190,  10, 115,  64, 155, 253,   5,
-  29,   9,  34,  45,  74, 111, 199,   5,
-  72, 144, 136,  30, 162,   4, 145,  12,
- 105,  53, 130, 142, 134, 124, 144,  23,
- 203,  31, 147, 252,  27,   9,  62, 185,
- 183, 118, 150, 116, 145, 237, 202,  27,
- 220, 229, 203, 149, 179,  74, 207, 165,
-  59,   3,  99, 198, 194, 126,  64, 108,
-  43,  53, 168, 232, 132, 130, 135, 164,
- 173, 207, 253,  71, 183, 126, 132, 204,
-  92, 228,   3, 166, 170,  60,  73, 178,
- 232, 106, 249, 127, 252, 140, 164, 112,
- 144,  35,  32,  59,  69, 131,  61, 245,
- 107,   1, 117,   6, 244, 191, 218, 182,
- 156, 103, 253, 177, 251, 203, 113, 172,
- 176,  20, 218, 157,  27,  91, 200, 243,
-  40, 208, 185,  62, 192,  71, 236, 154,
- 106, 103, 174, 101, 228, 104,  52, 144,
- 117, 120,  30, 201,   6,  79,   1, 233,
-  83,  77, 205, 201,  86, 250, 107, 251,
-  31,  63, 123, 192,  68, 130, 119, 226,
- 227,  89,  96,  85,  20, 238, 164,  65,
- 168, 166,  87,  83,  31, 144,  61, 237,
-   2, 221, 122, 150, 241, 185, 173, 213,
- 166,  96, 158,  94, 166, 146,  44, 150,
- 253, 172,  17, 245,  94, 146,  35, 153,
-  18,  49, 251,   1,  80,  81,  59, 143,
- 220, 169, 114, 200, 195,  46,  42,  73,
- 137,   4, 197,  10, 140,   3, 229, 201,
-  35, 131, 216, 237, 219, 128, 193, 106,
-  16, 104, 188, 219, 107, 169, 151, 153,
- 119, 241, 136, 122,  51, 224, 182,  92,
- 188,  91, 185,  96, 242,  31, 182, 180,
-  96, 114, 104, 198,  89, 125,  22,  40,
-  89,  84,  85, 166, 247,  50, 193, 157,
-  71, 185, 130,  70, 116, 159, 232, 114,
- 119,  60,  71, 211, 215, 188, 134, 169,
-  44,   5, 242, 206,  78,  15, 122, 139,
- 244, 176, 140, 247, 160,  55, 209,  72,
-  58, 194,  60, 112,  81,   7, 100,  32,
- 123,  53, 150, 136, 168,  94,  19, 116,
- 230,  79,  22, 111, 237,   3,  44, 134,
- 219,  49, 215, 206,   1, 194,  96, 167,
-  97, 228,  42, 158,  61,  38, 152,  15,
-  76, 147, 103,  62, 251, 129,  42,  87,
-  92,  79,  29, 108, 124, 246, 130, 118,
-  38, 178, 170,  75, 131,  85, 157, 216,
- 154, 215,  71, 153, 160,   4,  37, 161,
- 215, 109, 246, 158, 253,  17, 133, 108,
- 187, 209,  65,  46,  50,  95, 229, 193,
- 242, 202, 152, 154,  93, 189, 101, 198,
- 170, 212, 115, 177, 216, 113, 129, 205,
-  97, 201,   7,   2, 131, 174,   5,  98,
- 177, 207,  59, 184, 174,  48, 166, 205,
- 128,  43, 118, 250,  79, 237, 197,  96,
-  55, 127,  24, 185, 190, 228, 133,  93,
- 202, 193,  95,  93, 111, 244,  96,  28,
- 237,  47,  93, 144, 239, 213, 151, 138,
-  84, 237, 135, 228, 161,   7, 205, 120,
-  77, 193, 114,  75, 188,  61,  11, 109,
-  54,  62,  64, 196, 114, 119, 217, 139,
-  91, 151,  79, 254,  47, 214, 164,  36,
-  79, 198, 193,  16, 253, 195,  35,  90,
- 218, 242, 172, 106,  78, 212,  49, 252,
- 189,  29, 122, 233, 222,  63,  91,  72,
- 119, 213, 102,  86,  43, 195,  77, 161,
- 142,  21, 250, 155, 163, 112, 233,  54,
- 248, 106, 181, 114, 176, 188,  41,  96,
- 158, 222, 162,  20, 140, 102, 242,  78,
- 229,  53,  52,  99,  57, 222,   2,  82,
-  25, 218, 234, 232, 171, 206,  41,   3,
- 246, 162,  13,  91,  47,  96,  93,  26,
-  55, 178, 156, 122, 185,  20,  93, 213,
- 171,  17, 103, 147,  86, 164,  69, 212,
- 233, 227, 127,  34, 147, 125, 180, 172,
-  23, 205,  63, 240, 172, 213,  53, 212,
- 178,  85, 106, 247,  93,  80, 158, 132,
- 185, 237,  81, 139, 105, 107, 190, 215,
- 177, 156, 133,  49,   0,  41,  45,  36,
- 198, 212,  47,  95, 192,  29,  55, 110,
-  32, 188,  55, 240,   5,  99,  56, 227,
- 245,  92, 240,  70, 235,  48,   4, 238,
- 210,  81, 116,   8, 133,  58, 230, 253,
- 203,  10, 251, 167, 124, 178, 135,  58,
- 143, 250, 241,  79, 159,  61, 193, 123,
- 105, 186,  69, 175,  27, 217, 177,  99,
- 255, 133, 182, 182, 223,  13,  49, 248,
- 204, 252,  91,  27,  56, 112, 222, 255,
- 188, 244, 228, 234,  77, 134, 105,  95,
- 187, 171, 242, 221,  14,  18,   1, 211,
-  37, 153, 162,  40,  98,  73,  71,  18,
-  29,  24, 191,  60, 239, 118, 176,  64,
-  58,  44, 123,  27,  88,  26, 150, 255,
- 186,   0, 175, 202, 164,  85, 184, 184,
-  61, 243, 169, 137, 150, 200, 193, 142,
- 138, 229,   1,  58, 170, 136, 136,  69,
-  57,  30,   8,  86, 220,  70, 165,  97,
-  13, 255, 221, 235, 254,   0, 211, 248,
- 146,  53,  93, 192,   9,  80,  98, 128,
- 152,  88, 149, 132, 251, 171, 236,  38,
-  83, 206, 233,  66,  93, 244, 243, 174,
- 174,  94,  41, 205,  34, 219, 147, 208,
- 196, 110, 247, 142,  87,  24, 166,  49,
-  23,  24,  82, 252, 133,  14,  83, 140,
- 170, 179,  10, 231,  45, 211,  52,  65,
-  65,  31,  11,   9,  10, 221, 214, 105,
- 158, 252, 188, 197,  21, 120, 249, 146,
- 234, 127,   4, 255, 171, 151, 190,  17,
- 224, 201,  12, 106,  94,  82,   0, 175,
-  14,  55,   4,  39,   3, 150, 103,  43,
- 153, 145,  31, 119, 143,  54, 103, 126,
- 151, 234, 230, 108, 122, 205,  90,   5,
- 185, 195, 170, 216, 171, 224,  33,  99,
- 130, 141, 151, 162, 127,  86, 191,  94,
-  90,  22, 220, 242, 107, 100, 246, 225,
-  96, 100, 100,  15, 167, 101, 119,  87,
-  33,  45, 152, 246,  72,  73, 249,   8,
-  63,  68, 108, 111,   5, 109, 153,  51,
- 196, 228,  91, 235,  34, 138,   9, 160,
- 138, 113, 221,  88,  38, 128, 134,  63,
-   3, 173, 133,  49,  17,  51, 151,  26,
- 167,  63, 225,  97, 184, 120, 214,  49,
-  72,  36,  23, 130, 230, 221, 190,  30,
- 131, 232, 248, 159,   5, 124, 211, 244,
-  34, 187, 177, 250,  68,  62,  70, 133,
- 202,  54, 166, 172,  25, 178, 230, 171,
- 144, 235, 215, 250, 132, 141,  46, 185,
-  43,   8,  97, 135,   7, 141, 205, 208,
- 126,   3,  53,  71, 122,  18,  44, 212,
-  20, 245,  87,  16, 136,  95, 144, 216,
- 253,  20, 150, 125,  90,  24,  55, 187,
- 163, 155,  58,  63, 187, 143, 132, 167,
-  98,  20,  15,  83, 145, 215,  93,  40,
-  94,   5, 177, 202, 125, 100,  15, 159,
- 139,  99,  93, 226, 111, 158,  88, 131,
- 140, 237, 116, 124,  10, 215, 167,  37,
-  41,  95, 166,  33,  51,  95,  52,  72,
-  62, 149, 165,  46, 141,  29, 246, 244,
-   8, 159,  29, 119, 143, 198, 129,  37,
- 192, 251,  58, 246, 134,  10, 178,  20,
-  41,  56, 139,  29, 245,  82, 122, 217,
- 223, 144,  91, 216,  61,  76, 235, 119,
- 218,  55,  25, 137,  40, 128,   4, 144,
- 125, 242, 111, 121,  81, 249,  31,  73,
- 168,  79, 112, 164,   4,  56, 128, 191,
-  85, 251,  41, 182, 212, 202, 191, 200,
- 103, 132, 252, 139,  82, 212, 250, 186,
- 181, 240, 231, 109, 120,  42,  63, 104,
- 161,  44,  74,  63, 146,  13, 230, 198,
-  86, 177, 138, 199,  20,   0, 119,  81,
- 137, 163,  45,  86, 214, 219, 107, 233,
- 220,  75, 196,  21,  14,  46, 119,  31,
- 110, 223, 132, 137, 194,  67,   2,  87,
-  82, 123,  50,   6, 209, 144,  88, 192,
-  69,  65, 205,  32, 244, 239, 169,  95,
-  80,  55, 165,  30,  73, 136, 241, 146,
- 191,  10,  73, 219, 232, 207, 149, 235,
- 157,  40, 239,   4,   4, 123, 205,  87,
- 250,  40, 126,  85,  48, 156, 133,  97,
- 173, 113, 135, 150, 196,  59,  91, 202,
- 170,  46, 183, 121, 189, 191,  22, 104,
- 228,  22,  28, 237, 126, 214, 151, 220,
-  29, 234,  11,   0, 239, 152, 248,  73,
- 129,  38,  69, 142,  23,   8, 155,  91,
- 101, 175, 138, 115,  66, 216, 196,  97,
- 137, 121, 125, 129, 253, 202,  34,  29,
-  69, 196,  25,  74, 230, 108, 206, 123,
- 237, 116,  11, 207,  11, 102,  49, 219,
-  10, 194,  60, 249, 184, 206,  55,  27,
-  49,  78,  59, 185, 144,  39,   3,  33,
-  12,  23,  23,   7, 159, 152, 225,  98,
- 137, 206,  92, 115, 124,  24, 116, 218,
- 137,  19, 135, 201, 162, 102, 200,  82,
- 204,  73, 203, 201, 148, 182, 211,  25,
- 221, 247,  65,  40, 149, 100, 223, 204,
-  65,  76,  28,  40, 143, 192, 156, 166,
- 104, 164, 157,  85,  36,  91, 118, 168,
- 246,  49, 235, 124, 163, 167, 201, 213,
- 237,   5,  12, 172,  69,  38, 137,  18,
- 225,  62, 178,  46,  71, 187, 149,  30,
-  50, 185, 131,  37, 140,  85, 167, 115,
- 189, 137,  83, 231, 157, 113, 138, 103,
-  94, 160, 201,  94, 194, 162, 111, 176,
- 253,  26,  66, 210, 146,  46, 213,  61,
- 225, 126, 212, 248,  83, 202, 114, 104,
- 154, 133,   2, 166,  78,  23, 237, 219,
- 224, 237, 153, 222,   5, 142, 161, 131,
- 193, 115, 162, 233, 165,  58,  89, 140,
-  70, 201, 239, 124, 209, 121, 237, 171,
-  52, 135, 111,  12, 125,   7, 111, 205,
- 110,  55, 149,  88, 250, 106,  26,  24,
-  50, 117,  71, 218,   9, 222,  28, 253,
- 124,  81,  73, 157, 103, 218,  66, 220,
-  98, 101,  11,  89, 113,  94,  58,  26,
-   8, 161, 128, 134,  21, 183,  58, 251,
- 110,  17, 250, 159, 218,  52, 192,   7,
- 208, 192,  61,  15, 136, 117,  32,  85,
- 221,  76,  89, 214, 222,  77,  27, 137,
- 192,  86, 175, 169,  20,  46,  71, 122,
- 240,  55,  18,  28, 251,  23,  21, 146,
- 227,  45, 202,  50,  12,  79,  44, 142,
- 244, 255,  89, 202,  41,  99, 125, 134,
-  40, 168,  47,  68, 252,  54,  50, 161,
- 178, 172,  76,  39,  91,  28,  35, 244,
- 181, 242,   1, 138, 255,  32, 117,  83,
- 159, 248, 207, 174, 251,  23, 160,  97,
- 183, 102,  16,  36,  83, 154,  21,   5,
-  61,  79, 108, 103, 127, 148,  38,   9,
-  54,   1,  52,  64, 144, 188,  75,  63,
-  62, 151,  98, 139, 238, 108, 242,  26,
- 195, 242,  55,  51, 105, 156,  61, 239,
- 156, 233,  16, 108, 136, 171, 160,  85,
-  72,  73, 212, 211, 244, 105, 189,  92,
-  85,  36, 211, 206, 230, 134, 231, 159,
-   5,  22,  58, 142,  41,  62,  67, 129,
- 209,  61, 165,  36, 184, 222, 232,  31,
-  33,  85, 150,  38, 226,  45, 109, 171,
-  67, 165,  49,  31, 139, 125, 152,  91,
-  77, 132, 184,  34, 190, 251, 235, 135,
- 112, 129, 237, 118,  34, 194,  23,  96,
- 170, 126,  82,  70, 176, 109, 201,  30,
-  67,  22, 229, 203,  82,  58, 217, 223,
- 245,  48, 190, 232,  38, 106, 235, 188,
- 250, 159, 195, 124,  90,  67,  99, 132,
- 217, 112, 150, 121, 167,  20, 192,   4,
- 170, 219, 250, 134,   4, 156, 247,  68,
- 201, 130, 164,  99,  95,  74, 210,  67,
- 196, 178,  40,  74,  12,  36, 132,  46,
- 173, 255,  69, 245,  98,  43,  74, 142,
- 165, 138,  86, 169, 227, 188, 156, 145,
- 194, 129, 105, 143, 250, 230, 163, 157,
-  61,   1, 125, 215,  27, 126,   2, 220,
-  76, 227,  92,   3,  23, 216, 220, 134,
-  98,  93, 227, 231, 131, 123, 192, 138,
-  12, 177,  20, 115, 190, 144, 211, 152,
-  74, 115, 189, 202, 239, 116, 162,  80,
-  79, 148, 137, 235,  23,  98, 241, 150,
-  33, 119,  33,   4, 193,  93, 239, 177,
-  50, 155,  43,  38,  12, 176,  78, 139,
- 140,   9, 225, 252, 123, 126,  90, 167,
- 138, 230, 234,   2, 218, 183,  62, 160,
- 253, 225, 200,  76, 199, 136,  18,  30,
- 208, 228,  88,  23, 167, 123,  20,  95,
- 210, 144,  91,  74, 190,  97, 177,   0,
- 149,  30,  10,  34, 133, 118,  13,  46,
- 166, 199, 203, 141, 234, 218, 139, 190,
-  90, 134, 172, 185, 106, 184,  67, 207,
- 217, 186, 183,  50, 176,  11, 178,  60,
-  35,  13,  16, 234, 162, 224, 128, 126,
-  95,  40, 117,  60, 197, 215, 246, 198,
- 171,   4,  27, 194,  62,  82, 177, 132,
-  20, 111, 186, 120, 218, 139, 140,  33,
-  64,  75, 110, 243, 106, 119, 165,  75,
-  19, 222, 107,  86,  48, 188, 123, 213,
-  91,   8, 194,  44, 229,  40, 248, 209,
- 140,  68, 119,  39,  51, 229,  34,  70,
-  84, 100,  78, 240, 209,  81, 208,  47,
-  88, 205,  10, 207, 166, 156,  99,  14,
-  18,  46, 241,  47, 130,  51, 183, 204,
-  60, 246, 111,  73, 213,  97, 131, 196,
-  16, 126, 114, 221,  84, 250,  70,  89,
-  56, 164, 251,  44, 232,  99,  57, 149,
- 158,  96, 141, 114, 155, 147, 101, 242,
-  55, 174, 214,   9, 239,  17,  87, 171,
-  16,  94,  79,  32, 114,  66, 114, 202,
- 151, 161, 112,  22, 179,  23,  37,  56,
- 102,  88, 135,   9,  61, 245, 193, 253,
- 243,  98, 172, 129, 227, 102,  43,  59,
- 186,  45,  10,  95,  90, 160, 250,  51,
- 216, 212,   0, 233,  77, 134,  28, 186,
-  27, 169,  27, 183,  75, 177, 163, 218,
- 136,  95, 104,  87, 105, 193, 109, 125,
- 219,  43,  76, 190,   1, 115,  61, 212,
- 118, 230, 253, 177, 200, 238,  39, 142,
- 230, 109, 119, 180, 169, 106, 104,  92,
- 191, 107, 237, 208,  55,  98, 158,  88,
- 134, 144, 240,  74, 235, 230,  26, 242,
- 198, 199, 176, 253, 132, 160,  90, 117,
-  30,  58, 242,  61, 238, 146, 109, 246,
-  85, 189,  20, 126,  63, 172,  41,   5,
-  49, 125,  60,  61, 176, 238, 194,  57,
-  31,  29, 206, 151, 133, 172,  58,  32,
- 142,   5, 186,  99, 206,  55, 147,  83,
- 191, 172, 124, 179,  22, 180,  13, 148,
-  36,  21,  95,  75,  49,  75,  62,   4,
- 204, 124, 121, 253, 158, 248, 110, 141,
- 200, 186, 247, 229, 120, 229, 219,  48,
- 237,   2, 128, 191, 108, 149, 155, 204,
-  74, 134, 195, 115,  98,  36,  94, 125,
- 154, 105,   0, 133,  50, 109, 141,  28,
-  34, 220,  64,  15,  70, 218,  46, 237,
- 153,  22, 201, 224, 149, 162,  54,  91,
- 112, 208,  27,  77, 152, 214, 219, 167,
-  36, 158, 156,  58,  50, 161,  46, 247,
- 177, 168, 142,   6, 236, 199, 247, 229,
- 231, 104,  39, 148,  42, 197, 146, 221,
-  99,  38, 154, 252,  33, 127, 253, 152,
-   1,   2, 136, 186,  39, 181, 210, 244,
- 209,  17,  32, 103,  66, 112,  93, 247,
-  13, 215, 183,  76, 239,  38, 130, 243,
- 195, 223,  44, 197, 156, 120,  32,  68,
- 226, 126, 184, 235, 141, 188, 179, 100,
-  13, 156, 163, 143,  86,  78,  51,  27,
- 131, 171,  63, 105,  47, 194, 159,   2,
-  41, 196, 193, 227,  99,  96, 249, 251,
- 253, 134,  65, 105,  31, 241, 229, 183,
- 200, 233,  80, 146,   3,  96,  88, 101,
-  60, 244,  64,  48,  86, 217, 204, 144,
- 111, 156,  97, 253, 118, 150, 218, 189,
-  60, 244, 224, 109,  42, 221,  66,  79,
- 236, 143,  31, 118, 196, 248,  19, 150,
-  65, 128, 234,  25, 219, 122, 125, 167,
- 108,  45,  17, 116, 213, 206, 202, 199,
-  78, 143, 248,  23,   9, 239, 166, 110,
-  88, 168,  59,  63, 159, 248,  93, 154,
- 142, 207,   0,  87,  48, 252, 140, 251,
- 152, 249, 247, 109,   4, 223, 156, 216,
- 205, 174,  28,  70,  36, 102, 182, 162,
-  50,  81, 199, 140, 132, 151,  46, 111,
- 239, 217, 243, 206,  73, 199, 110, 218,
-   8,  25, 141,  99,  50, 252, 196,  18,
- 161, 154, 178, 188, 171,  81, 192,  24,
- 193, 253,  60, 220, 212,  50, 204,  91,
-  43,  43, 130, 178, 174,  59,  55, 207,
- 200, 192,  46,  50,  17, 174, 135,  85,
-   4,  32, 103, 139, 241, 167,  73, 124,
- 205, 149,  34, 167,  62, 109, 220, 204,
- 166, 153, 104, 178, 121, 232, 194, 203,
- 228, 114, 213,   7,   4, 200, 218, 124,
-  23, 202, 134,  49, 131,  67,  92,  30,
-  27,  88,  52,   9,  59,   7,  99, 142,
- 186,  60, 239, 158, 217,  16, 224, 168,
- 105, 151, 202, 220, 138,  18, 104, 108,
- 140, 243, 126, 112,  23,  97, 221, 171,
-  65,  99,  10,  73, 182, 147,  95,   5,
- 159,   8, 186,  51,  28, 223, 170, 142,
-   1, 215, 223, 227, 171, 134,   3,  26,
- 229, 107, 157,  32, 100, 193, 223, 251,
-  83, 136, 145, 204, 212,  55, 197, 128,
- 188, 172,  75,  36,  53,  21, 190,  39,
- 191, 137, 101, 240,   3, 107, 215, 100,
-  87, 214,  71,  94, 192, 158,  73, 139,
- 238, 249,  66, 249, 140, 235, 241, 144,
- 153,  83, 135, 163, 130,  44, 187, 189,
- 148, 115,  87,   3, 137, 141, 167, 141,
- 248, 149, 182,  26, 219, 187, 182,   9,
- 145,  35, 239, 195, 250, 192,  64, 253,
- 170, 245,  26,  80, 102,  37,  77,  12,
- 150, 251, 236, 239,  90,  50, 150, 238,
- 197,  12, 107,  43, 202,  19, 158, 141,
- 134, 201, 194,  79,  58,  44, 189,  86,
- 169,  49, 212,  87, 131,  63, 252, 145,
-   5,  92,  96, 233, 119,  31, 172, 164,
-  58, 240,  11, 230, 161,  88,  97, 243,
-  22,   6, 201, 196, 133, 198, 196, 110,
- 100, 126, 207,  53,  90, 167, 179,  73,
-  69,  49,  33, 123, 173,  68,  50, 247,
-   4, 111, 155, 101, 121,  24, 165,  44,
- 246, 185,   8,  67, 111,  44, 131,  44,
-  93,  50, 137,  13,  76,  73, 218, 223,
-  60, 156, 134, 253,  28, 201, 109, 168,
- 152, 163, 138,  44, 132, 230, 217, 240,
- 246, 192, 133,  10, 209, 149,   4, 104,
- 231, 182, 235,  69, 237, 161, 235,  48,
-  98, 131, 255, 173, 241,  36,  27,  32,
- 143,  42, 144,   9,  33, 199, 244, 234,
- 163, 171, 238,  94, 138,  13,  58, 152,
- 202,  84,  97, 174, 247, 210, 177, 238,
- 139,  18,  15,  44, 246,  99,  12, 164,
-  72, 211, 255, 131, 105,  67,  51,  42,
- 235, 112, 123,  76, 226, 230,  79,  54,
- 236, 216,  30,  11, 172, 152, 200,  43,
- 175, 174,  92,  77, 114, 141, 174,  61,
- 104, 248,   2,  36, 235, 224, 202, 110,
-  26,   9, 103, 242,   0,  58, 211, 158,
- 242,  84,   2, 249, 203, 125, 108, 247,
-   9,  25,  70,  60, 160, 172,  81, 154,
- 109, 108, 240,  90, 157, 209, 252, 231,
-  88, 211,  32,   3, 233,  57, 111,  92,
-  52,  82,  94,  10, 162, 107, 151,  70,
- 245,  81, 159,  17, 159,  77, 139, 244,
- 236, 239,  19, 255, 223, 170,  25,  51,
-  60, 163, 150, 150, 209, 164,  67,  53,
- 138, 140, 133,  81, 207,  59,  51,  60,
-  86, 157, 217, 122,  38, 120,  18, 128,
- 237, 221,  55, 213, 167, 163, 139, 227,
- 183, 215, 218, 196, 253, 109, 201, 253,
-  80, 174, 185,  92, 200,  95, 166, 155,
- 237, 141, 159,  63, 141,  24,  12, 249,
- 232, 252, 251, 219, 134, 159, 211,  15,
- 179,  73, 223, 177,  85, 152, 206,  88,
- 229, 107, 188, 139, 199, 250,  55, 141,
-  42,   4, 126, 165,  29,  48, 176, 157,
- 123, 179, 136,  48, 212,  95,  67, 250,
- 210, 173, 113, 111, 220, 166, 164, 244,
- 163,  92, 185, 129, 224, 135,  34,  16,
- 158,  61, 124,  10,  34,  47,  41,  18,
-  14,  10, 229, 108,  11, 222, 238, 161,
- 235, 203, 124, 210, 107,  57, 146, 120,
- 227, 159,  43, 242, 236,  35, 177, 219,
- 223,  93,   2,  32,  80,   1, 158,  26,
- 205,  86, 134,  91, 186, 254, 248, 202,
- 120, 234,  89,  54, 221, 129, 118,  25,
- 118,  47, 177, 145,  25,  59,  76, 234,
-  40, 165, 175, 210,   2,  43,  62,  76,
-  87,  61, 169, 181, 147, 130,  36,  15,
- 219,  87,  42, 149, 207,  98, 218, 189,
-  92, 136, 122, 103, 138,  59,  23, 246,
-  84,  87, 120, 200, 202, 105, 131,  80,
- 167,  45, 136,  67,  65,  58,   5, 125,
- 103, 193, 247, 212,  86, 204, 230,  92,
- 140,  61, 207, 232,  36, 113,  92, 132,
-  42, 217, 172, 174, 217,  24, 101, 188,
- 249, 163,  88, 236, 111, 147, 163, 126,
- 214,   0, 149, 101, 199, 161,  94, 187,
-  67, 190,  37, 176, 235,   3, 250,  78,
- 166,  30, 231, 177,  26, 158, 239, 150,
- 196,  77, 144, 210,  13,  18, 143, 247,
- 184, 176, 133, 219, 168, 142, 235, 119,
- 181, 132, 109, 146,   3,  95, 228,  15,
- 232, 148,  67,  29,  53, 154,  86,  80,
- 244,  76,  57, 168,  60, 223,  94,  53,
-  54, 204,  49, 248, 153, 248, 179, 247,
- 182, 219, 139, 119, 122, 116, 195, 105,
- 136, 111,  33,  60, 218, 201,  96,  36,
- 113,   2, 213, 226, 244, 132, 123,  51,
- 227, 105,  68, 236, 122, 102, 221, 146,
-  23, 133,  23,  27, 123,  96, 111,  88,
- 237,  48,  77, 131,  29, 116, 196, 185,
-   6,  63, 232,  37,   4,  99, 152, 207,
- 155, 204, 196,  94,  86,  10,   1, 183,
- 147,  31, 150,  17, 134,  74, 180,  60,
- 172, 205,  10, 228, 174,  14,  50, 164,
- 166, 123,  94,  82, 214,  82, 134, 106,
- 211,  23,   4, 127, 229, 194,  85, 109,
- 243,  11,  38, 162,   2, 114, 202, 183,
- 231,  53, 184, 213,  74,  14, 199, 206,
-  13, 246,  27,  32, 131,  28, 235, 135,
-  83,  23, 118, 204, 214, 216, 144,  35,
-  66, 217, 235, 114, 188, 113, 174,  90,
-  40,  50,  23, 197, 212,   7, 171,  82,
- 206,  44, 126,  85, 167,  45, 152, 107,
- 130, 135,   6, 235, 174,   4, 114, 101,
- 112, 151,  57,  60, 174, 120,  48,  24,
-  77,   6, 220,  38,  53, 253, 203, 217,
- 207, 235,  11, 143, 172, 152,  31, 114,
- 138,   0, 205, 163, 124,  12,  47, 114,
-  75,  55, 169, 102, 216, 134, 225,   9,
-  60,  83,  25, 238, 245, 161, 243, 193,
- 237, 108, 193, 105, 151,  47, 154,  29,
- 164, 171, 150,  69,  73, 187,  33, 145,
-  40,  98, 159,  77, 198, 247,  15,  93,
-  99,  64, 102, 156, 153, 101,  62,  14,
- 249,   5, 149,  66, 218, 250, 109, 248,
- 248, 198, 105, 229, 242,  33, 147, 223,
-  23, 193,  39, 255, 134, 103, 112, 173,
-   1,  27,   9, 255, 160, 147,  85,  66,
- 174, 112, 217, 113, 160,  59,  89, 253,
- 169,  64, 133, 207, 139, 172,  61, 102,
- 201, 104, 181, 124, 115, 130, 223,  67,
- 131, 234, 134,  32, 133, 196, 211, 204,
- 210, 103, 169, 132, 127, 236, 228, 221,
- 163,  12, 242, 228,   6, 154, 122, 145,
-  82, 122, 121,   0, 103, 216, 133, 134,
- 162, 171, 171,  75, 223,  52, 118,  37,
- 149, 111, 224, 129, 188,  21,  19, 188,
- 252, 130,  81, 220, 137, 198,  45, 246,
-  94,  20, 144,   3, 134, 102, 170,  45,
-  24, 159, 191,  69,  10, 221, 170, 124,
- 228, 142,  19, 146, 126,  98,  63, 226,
- 239, 226, 199, 205, 103, 226, 115, 197,
-  63, 185, 185,  32, 248, 126,   5, 167,
-  83, 254,  73,  40,  93, 212, 249, 143,
- 254, 223,  96,  29,  51,  70,   3,   0,
- 130, 212, 177,  58,   1,  46,  36, 131,
- 151,  39,  43, 177,  24, 194, 240,   8,
- 167, 103, 173, 184, 149,  64, 188, 161,
-  48,  67, 214,  84, 183, 247, 218, 202,
- 173, 116,  66, 170, 140, 255, 197,   4,
- 190, 120, 153, 146,  16,  21, 189,  16,
-  14,  88, 129, 222, 178, 172,  59,  58,
-  26, 122, 152, 203,  18,  21,  22, 152,
- 109,  30,  89,  90, 136, 173,  48, 199,
- 238,  26, 204, 228, 166, 150, 159,  71,
- 175,  92,  21, 171, 235, 168,  73, 122,
- 190, 148, 232, 160, 152, 114,  61, 234,
-  94, 160,  74, 214, 213, 155, 159,  94,
- 214, 111,   2,  18,  40, 230, 246,   5,
-  93, 222, 188, 111,  27,  87, 145, 171,
-  38, 191, 138, 156, 178, 200,  97, 206,
- 237,  70, 160,  40, 214,   6, 205, 188,
- 214, 162, 134,  45, 195,  99, 170,  89,
- 182, 203, 118,  98,  10,  84, 206, 140,
-  32,   9, 170,  66, 181, 242, 220,  58,
- 219,  37, 252, 210, 109,  13, 107,  66,
- 178, 180, 199, 240, 214, 204, 209,  47,
-  13, 202,  58,  85, 173,  63, 234,  17,
- 208,  91, 248, 171, 115, 213, 164, 145,
- 216, 120, 161, 119, 125,  75,   7, 221,
- 128,   7,  52, 248,  91,   5,  95,  21,
- 225,  88, 186, 196,  24, 231, 116, 148,
- 158,  72, 139,  64,  50,  14,  73,  36,
-  74,  70,  24, 134, 147, 255,  65, 244,
- 168, 112,  96,  54,   3, 213,   4,  17,
- 220,  22, 108,  25,  88,  67,  85,  38,
- 129, 122,  37, 153, 110,  18, 164, 124,
- 245, 150,  14, 140, 215, 222, 188,  60,
-  67, 119, 112, 203, 209,  48,  70,  40,
- 128,  58, 255,  24, 255, 115,   8, 167,
- 240, 123, 188, 238, 253,  71, 108, 182,
- 253,  22, 156,  47,  46, 112, 100,  13,
- 125, 222,  20,  24, 237, 241,   3, 223,
- 246,  98, 124, 212,  24, 109, 148,  22,
- 144, 181,  79, 189, 208, 116, 241, 230,
- 125, 140,  24, 240, 206, 139, 199,  11,
- 131, 243, 191, 145, 194,   8,  48, 177,
- 235, 234,   2,   2, 118, 126,  37,  21,
- 145,  77,  60,  58, 129, 238, 164, 162,
- 184,  84, 132, 179,  36, 137, 150,  20,
- 242,   7,  31,  12, 253,   0, 224, 215,
-  57, 182, 139, 163,  17, 165, 187,  76,
-   2,  81,  14, 223,  84,  69,  44, 170,
-  54,  79,  63,  14, 153,  97, 109, 240,
- 228, 163,  52, 247, 255,  48, 225, 205,
- 184, 186, 189,  51, 177, 215, 237, 127,
- 204,   9,  67, 197, 179,  88, 250, 178,
-   7, 140,  64, 100, 237, 132, 152, 139,
- 147, 178, 190, 188, 189, 158, 117, 175,
- 101, 240, 148, 166,  75,   7,  84,  86,
- 167, 181, 149, 233,  46,  91,   5,  60,
- 140, 203, 218, 116, 214,  67,  52,  24,
- 188, 241, 232, 232,  24, 250, 199, 128,
-  58, 248,  43, 221, 181, 163,  34, 238,
- 248,  59,   1, 180,  12,   6, 185, 192,
-  77, 141, 241, 223, 100, 253, 136,  27,
- 206, 141,  73,   7, 165,  27, 202,  47,
-  32, 180,  90, 166, 174,   2,  89,   0,
- 182,  75,  52,  99, 190, 196,   0, 140,
-  88,  50, 167, 125, 193, 245,  14, 202,
- 188, 165, 141, 166, 161, 105, 233,  36,
-  28,  72,  37, 219, 126, 160, 143, 135,
- 195, 196, 121, 133, 140,  69,   6,  83,
- 224, 210, 178,  22,  19, 155, 183, 133,
-  19,  92, 100,  10,  37, 239,  31,  63,
- 244,  79, 246, 165, 168,   1,   1, 183,
-   2,  55, 154,  88,  28,  29, 169,   1,
-  52, 219,  89,  26,  15,  30, 232, 165,
-  74, 216, 126,  31, 137, 114, 150, 179,
- 251,  33, 252, 122,  27, 171,  51, 246,
- 187,  52, 186,  70, 140, 146, 229, 198,
- 152,  74,  97, 116,  16, 200,  78,  97,
- 189,  34,  44,  81,  64,  96, 160, 149,
- 229, 219, 129,  41,  43,  44, 228, 231,
-  30, 185,  17,  46,  75, 245, 247,  44,
-   8,  97, 123, 139, 169, 146,  55, 130,
-  90, 217, 249, 130, 244, 139,  62,  57,
-  90,  87, 210, 237, 153, 204, 195, 126,
- 179, 109, 180,  64, 210, 184, 126,  23,
-  98, 195,  55,  72,  16,  94, 191, 125,
- 160, 204,  29,  94, 191,  95, 244, 217,
- 181,  55,  97, 140, 185, 157, 133, 163,
-  93, 110, 157, 232, 222, 213,   1,   9,
- 107, 230, 114,  28, 175, 231, 105, 196,
- 157, 150,  25,  13, 153, 215,  16, 107,
- 194, 148, 130,  27, 232, 171,  41, 221,
-  74, 255,  63,  18, 202,  73,  96, 194,
- 134, 190,   6,  23, 118,  54, 179,  83,
-  32,  61, 156,  91, 187, 175, 137,  63,
- 119, 216, 100,  29, 187,  64, 228,  65,
- 176,  77,  54,  20, 234, 235, 245,  96,
-  71, 186, 214, 134, 109, 214, 155,  56,
- 207, 232, 246, 143, 102, 119, 226, 165,
-  58, 189, 217, 193, 108, 150, 115, 190,
- 189, 253,  15, 218,  35, 132,  71, 205,
- 140, 147, 170,  32,  86,  10,  94, 127,
- 188,  89, 181, 112,  32, 170, 234,  97,
-  57, 158, 188, 119, 184, 156, 222, 143,
- 220,  19,  39,  18, 253, 243,  83, 155,
-  85,  44, 178,  31, 246, 145, 202, 153,
- 130, 120,   7, 110, 230, 201, 110, 169,
- 102,  64,   1, 110,   4, 120,  55, 244,
- 242,   2, 220,   0, 132, 204, 153,  38,
- 185,  99, 132, 219, 230,  69, 196, 129,
- 219, 144,   0,  33, 203, 181,  22,  80,
- 238, 170,  34, 218, 119,  86, 229, 193,
- 212, 252,  14,  12,   0,  84, 239,  69,
- 113,  36,  68,  59, 204, 150,  48, 178,
-  42,  50, 161, 135,  80, 190, 104, 207,
-  15,  16, 127, 132, 252,  51,  40,  26,
-  29, 250, 250, 127,  75, 229,  11, 196,
-  40, 173, 137, 111, 181, 121, 251, 214,
- 102, 103, 136,  83,   9,  31, 112,  95,
-   9,  44,   6, 125, 212, 185, 122,  79,
-  76,  91, 104, 104, 188, 171, 241,  99,
- 135, 204,   7, 211, 106, 155,  77, 120,
- 171,  76, 211,  35, 226,  74,  26,  41,
-  58, 185,  61,  58, 109, 149, 176, 206,
- 200, 195,  67, 143, 116, 128,  68, 109,
-  26, 163,  19, 201,  66,  62,  20, 123,
- 226, 107, 191, 200, 232,  88, 183, 193,
- 237, 244, 114,  70, 255, 122, 202,  22,
- 113, 217,  66, 254, 169, 154, 253, 133,
-  81,  88,  44, 151,  50, 128, 249, 164,
- 240, 196, 232, 202,  21,  47,  88, 147,
-  76, 138, 196,  49, 199, 120,  71,  15,
- 211,  22, 165,  26, 154, 223,  76, 103,
-  11,  31, 232,  43, 105, 125, 249, 220,
-  71,   6, 206, 183,  15, 199, 137, 118,
- 106, 220,  34,  34, 156, 102, 124, 238,
- 200,  10,   9, 178,  77,  75, 209,  34,
- 123, 168,  64, 115, 244, 237, 146, 130,
-  71,  47, 249,  15,  62, 151,  43, 119,
-   2, 198, 248, 192,  57, 128, 144,  99,
- 122,  32,  59, 213, 180,   1, 105, 116,
- 147, 123, 166,  16, 142, 135,  99, 171,
- 177, 128,  55,  71,  15, 152,  14, 121,
-  86, 121, 155,  55, 158,  26,   9, 210,
- 221, 230, 153, 231,  50,   4,  39, 162,
-  75, 139, 255, 243, 224, 114, 245,  61,
- 108, 102, 117, 180,  76, 119, 239, 241,
- 184, 177, 113, 171,  44, 188,  32, 155,
- 187, 247, 204, 129, 131, 236,  96, 244,
- 112,  22,  38, 181,  60, 159,  74, 252,
- 125, 180, 252,  11, 163, 178,  44, 130,
- 252, 151, 207, 109, 136, 146, 100,  65,
-  40, 193, 168, 219, 223,   6, 169, 245,
- 129, 128, 116,  84, 199, 189, 250, 103,
- 205,  67, 248,  68, 188, 171, 157,  85,
-   7, 121,  36,  80,  13,  45, 200, 132,
- 124,  72, 202,  78,  58, 155, 143, 255,
-  22,  61, 242,  47, 206,  25,  22, 147,
-  72,  68,  79, 243, 166, 210,  85,  81,
- 233, 185,  38, 174,  64, 165, 231,  15,
- 208, 121,  85,  52,  59, 228, 218,  91,
- 219,  79, 164, 108,  42,  37, 140,  90,
- 158, 150, 219, 152,  67, 224,  54,  61,
- 182, 219,  43,  56, 102,  47, 180,  48,
- 121,  68, 146, 204, 104, 247, 247,  14,
-  75,  62, 109,  60,  86, 109,   0,  72,
- 141, 220, 208, 118,  73, 159, 240, 218,
- 147, 186, 104, 169,  78,  54,  69,  22,
- 143, 229,  25,  84,  57,  19, 111,  75,
- 154,  63, 172, 214, 252, 137, 228, 130,
-  25, 245, 141, 209, 178, 232,  38, 221,
- 184, 228,  29, 131, 179, 103, 152,  18,
-  86, 232, 181,  29,  21,  12,  26, 102,
- 165,  19,  79, 166,  19,  20,  92, 233,
- 198, 151,  13,  87, 246, 231, 193,  85,
-  15, 120,  33, 112, 167, 236,   3, 147,
- 120, 145, 230,  32,  52, 163, 238, 137,
- 201, 117,  76,  73, 210, 183,  57,  83,
-  73, 214, 168,  90,  67, 105,  70, 254,
- 227,   0, 132,  55, 159,  56,  74, 160,
- 137,  62,  91, 112, 125, 152, 255, 164,
- 183,   7, 173, 193, 213,  50,  27, 226,
- 121, 135, 223, 213, 189, 126, 212, 227,
-  92, 126, 239, 150, 131, 134,  25, 145,
-  35,  10,  42,  95,   2, 241, 123,  69,
- 186,   7,  80,  35, 218,  20, 104, 177,
- 136,  48, 139, 206,  55, 126, 125,  96,
-  96, 228,  28, 187, 243,  62, 222, 103,
- 166,   1, 114, 240, 136, 135,  43, 227,
- 235, 153,  90,  47,  98, 126,  96, 218,
-  98,  65,  23, 212,  83,  39,  11, 103,
- 229, 213, 107, 238, 116, 142,  31,  66,
-  76, 119, 214, 217, 203,  70, 139,  70,
-  78, 159, 195, 157, 178,  27, 204,  85,
- 134,  17, 223,  23, 149,  18, 114, 211,
- 184, 212, 143, 131, 193, 160,   7, 174,
- 176,  34,  18, 154,  34,  78,  49,  28,
- 181,  16,  64, 162,  32, 128,  91, 189,
- 255,  22, 234,  61, 100, 112, 216, 190,
- 147, 254, 237,  98, 240,  15,  82, 159,
-  22, 237, 198, 146, 216, 100, 171, 250,
- 153,  92, 250, 173, 200, 149, 234, 112,
- 130,  97, 120,  14,  32, 147, 102,  30,
- 243, 130,   6, 200, 104, 112,  30, 206,
- 241,   3, 158, 193,  15,  64,  93,  19,
-  35,  99,   5,  37, 166,   1, 191, 190,
- 212, 190, 252,  97, 209, 169, 103, 250,
- 249, 230,  73,  57,  73, 155,  59,  81,
-  62,   5, 151, 112, 213, 129, 123,  20,
- 113, 108,  25, 226, 119,  97, 210,  85,
- 182,  47,  62,  94, 242,  89, 120, 107,
- 238, 244, 189,  37, 149, 179, 130, 115,
- 119,  22, 215, 230,  38, 132, 151, 186,
-  29,  35,  72, 238, 240, 175, 109,  66,
-   1, 253,  94,  48, 217,  65,  60,  53,
-  28, 102, 159, 233, 132, 191,  17,  80,
-  85, 237,  93,  51, 180,  47,  68, 181,
-  34,  60,  30, 149, 247, 202,  31, 214,
-   6,  68, 162, 149, 238, 102, 210, 192,
- 181, 114, 152,  45, 225,  99, 215,  78,
- 100,  59,  33,  72, 204, 100,  30,  60,
-  95, 167, 150, 134,  54, 164, 230, 232,
- 229,  68, 116,  78, 144, 204,   2,  31,
- 133,  37,  14, 147,  83, 100, 181,  10,
- 248,  85, 136,  61, 108, 176, 102, 137,
- 197, 227, 120, 111,  58,  89,  47,  53,
- 121,  28, 177, 160,   7, 217, 154,  79,
- 194,  90, 136, 105, 205, 164, 242,  87,
- 146, 180, 252, 201,  45,  76, 136, 231,
- 143,  37, 172, 227, 135, 110,  86,  60,
- 128, 245,  68, 212, 161, 164, 195,  73,
- 111, 125,  16, 100, 200, 125, 136, 128,
- 214,  95, 156,   8, 185,  32, 169, 110,
-  82, 203,  58, 117, 206, 253,  51, 172,
- 201, 123,  27,  34, 252, 150, 230, 169,
-   3, 140, 246, 196, 104,  91, 179,  69,
- 249, 246, 191, 236,  56, 193, 168,  56,
-  94,  11, 238, 118, 228,  59, 119, 248,
- 238,  51,   8, 169,  78,  17,  91, 202,
-  72,  89, 189, 133,   3, 140,  12, 227,
-  66, 223, 232, 161, 194, 108, 218,  45,
- 248,  51, 168, 118, 116, 167,  84,  29,
- 152, 180, 214, 210, 104,  79, 248, 252,
- 136, 127,  67, 172,   7, 186,   0, 250,
- 240, 175, 156, 213, 150,  63, 119, 213,
- 224, 207,  69,  42, 101, 221, 214, 197,
- 248,   0, 170, 248,  10, 102,  48, 120,
- 209, 143,  20,  24, 164, 177, 148, 215,
- 182, 158,  64,   2, 110,  73, 118, 111,
- 162,  74, 193,  53, 221,  49,  79, 232,
- 156, 115,  69, 174, 254, 246, 242, 123,
- 250,  61, 233, 241, 172, 172, 167, 151,
-  70, 227, 184,  78, 141,   5, 219, 188,
- 139, 208, 251,  97,  62,  21, 218, 210,
- 211, 126, 118, 129, 231,  23, 144,  98,
- 241,   6,  31, 195, 117,  10, 225, 151,
-  54, 118, 120, 231,  48, 167,  22, 184,
-   3, 196, 250, 216,  10,  90,  66, 223,
-  82, 152,  71,  69,  59,  46, 169, 163,
- 225, 202, 188, 104,  21, 189,  84, 155,
- 126,  55, 134,  20,  25, 244, 176,  60,
-  13,   8, 105, 168, 189, 151, 106,  62,
- 188,  50, 179, 155, 179,  67, 166, 152,
- 159, 191, 130, 248,   2, 228, 123, 177,
-  40, 160, 135, 184,  96, 118,  47,  51,
- 248, 243, 203, 213,  47, 114,  81, 164,
-  60, 132, 201,   5,  52, 221, 129,  99,
-  46, 234,  83, 105,  38, 122,  22, 148,
- 204,  82, 102, 127, 116,  37,  97, 110,
- 118, 224, 136,  69, 221,  71, 133,  65,
- 116,  40, 195, 118, 186,  97, 250, 153,
-  88, 219, 212, 214, 186,  54, 232,  16,
- 177,  57, 242,  82, 201, 249,  44,  37,
-  24, 228, 186, 234,  92, 174,  83, 143,
-  20, 222, 227,  24, 245, 119, 218,   8,
- 243,  70, 176, 214,  81, 103, 252, 200,
-  26, 129,   1, 117, 154, 252, 106, 225,
- 193,  73, 143, 108, 179,  57, 123, 240,
-  24, 220,  82,  13, 110, 105,   2,  91,
-  55,  11, 226, 157, 212, 188, 205, 126,
- 184, 170, 252, 198, 191, 236,  17,  42,
-  14, 200, 179,  16, 190,  17, 161, 182,
- 148, 120, 144, 134, 253, 216, 225, 213,
-  28, 204, 163, 245,  92,  89,  34,  61,
- 190, 191,  53, 208, 204,  55,  24, 218,
-  36, 179,  32, 211,  13, 137, 121, 146,
- 110, 193, 207,  62, 167, 170,   5,  61,
-  73,  44, 201, 158,  91,  40, 167,  95,
-  10,   7, 205, 140, 120, 138, 180, 195,
- 139,  63,  79,  14,  31, 193, 119,  11,
- 132,  20, 154, 152, 113,  83,  40,  68,
-  16, 180, 169,   6,  95, 130, 191, 126,
-  61, 115,  67,  16,  71,  96,  59,  95,
-  19,  51,   7,  21, 158,  24, 170,  25,
- 219, 170, 232, 144,  58,  64, 125, 198,
- 242, 188,  90, 181, 222, 133, 229, 240,
- 247, 196,  81, 202,  84,   8, 203,  87,
- 150, 230, 244,  20, 213,  77,  89, 221,
- 242, 140,  37, 150, 234,  18,  86, 103,
-  28, 197, 204,  44, 174, 109, 235,  41,
- 156, 224, 240,  55, 152, 211,  51,  70,
- 121, 129, 150,  52,  76, 247,  16, 235,
- 150, 127,  15,  74, 138,   8, 207, 194,
- 126, 217, 143, 109, 243, 217, 201, 193,
- 133, 215, 161, 245, 254, 202,  33, 184,
- 159, 147, 167, 125, 203,  36,   2, 244,
- 129, 166,  61,  39,  57, 144, 248,  20,
- 218, 166, 210, 128, 238, 218,   3, 160,
- 128, 112, 168,  64,  20,  71, 141,   7,
- 136,  30,  82, 159, 150, 167, 147,  41,
- 169, 185,   3, 142, 150, 101,  39, 165,
- 127,  14, 124, 112,  73,  19, 212,  90,
-  49, 210, 199, 198, 144, 178, 107,  10,
- 157,  69, 194, 142, 178, 181, 169,  43,
- 209,  15,  54, 112,   1, 249,  13, 232,
- 142,  96, 225, 207, 169, 173,  77, 206,
-  62, 231,  39,  60, 131,  16,  24, 160,
- 190,  17, 177,  71, 238, 129, 171,  85,
-  14,  18, 160,  54, 155, 195, 105, 232,
- 247, 115, 227,  45,  64,  21, 111, 160,
- 114,  58,   1, 145,  67, 175, 185,  87,
- 156,  95, 237, 160,  86, 255,  42, 252,
-  11,  66, 179, 180, 173, 187, 163,  50,
- 146, 115,  67, 236, 154, 231, 182, 245,
- 220,   4,  64, 195, 212, 236, 141,  76,
-  93,  15,  86,  69, 199, 115, 200, 215,
- 233, 138, 192,  92,  31, 137, 113, 105,
- 220, 192, 238,  47,  68, 180,  84, 199,
-   2,   3, 149, 217, 136,  65, 153,  54,
- 150, 131,  36, 122, 122, 165, 162, 174,
- 240, 164,  88,   6, 194, 102, 152,  43,
- 158, 225, 206, 104,  80,   7, 252, 216,
- 221,  29, 225, 182, 162,  47, 124, 217,
- 232,  63, 133,  76, 192, 136,  96,  74,
- 212, 149, 242,  18, 155,  13, 118,  82,
-  19,   2,  49, 117,  41, 126,  70,  72,
-  76, 225, 186,  66, 132,  30,  84, 234,
- 110, 146,  13, 136,  45, 207, 126, 111,
-  19, 108, 114,  53, 155,  52,  95, 254,
- 224, 174,  23, 104, 111, 108,  68,  33,
-  63,  33, 215, 121, 169,  37, 255, 232,
-  40, 173, 250, 186,  67, 164, 238, 195,
-  88,  74,  93, 248,   5, 123, 206, 226,
- 228,  21, 139, 181,  52, 122, 194,  14,
- 240, 170, 237, 113, 143, 228, 206,  60,
- 207, 221, 101, 147,  99, 225,  80,  99,
- 207,  66, 119,  19,  72, 167, 165, 133,
-  52,  76, 181,  36, 145, 213, 247,  55,
-  88,  47, 169,  83, 121, 121,  98, 138,
-  56,  50, 237,  49, 213, 196, 135, 223,
-  42, 135, 128, 133,   1, 207, 178, 150,
- 172,  55, 237,  33, 155,  94, 109,  93,
-   7, 245, 102, 246, 218, 169, 230, 181,
- 147, 249, 140, 239, 209,  33, 133,  85,
- 151,  15,  35, 107,  19, 184,  62, 114,
- 191, 116, 153,  42,   0, 248,  48, 136,
- 184,  98, 182,  47, 169,  11, 149, 206,
-   0, 238,  31, 245, 185,  64,  32,  75,
- 210,  83, 216, 218, 170,  92, 242, 158,
- 214, 195, 229, 128, 222,  75, 169, 177,
- 166,  13,   3, 222, 135, 109,  35, 183,
- 176,  61,  45, 254,  32, 165, 251, 147,
- 162, 198,  50,  69, 253,  60, 175, 110,
- 226, 124, 166, 167, 159, 207,  88,  17,
- 115,  42,  89,   3,  14, 164, 114, 115,
-  97, 129, 118,  47, 112, 145, 220, 175,
-   2, 219, 181,  95, 187, 174,  77,  35,
- 231, 204,  76,  43, 119,  32, 209, 120,
- 133, 137, 103, 239,  93, 129,  56, 233,
-  38,  83,  82, 114,  24,  19, 167,  73,
-  16,  66, 135, 133, 193, 112, 222, 193,
-  62, 229, 140,  44, 252,  84, 102, 218,
-   4,  94,  97, 111,  19, 133, 249,  90,
- 219,  81, 129, 242, 131,  96,  15,  17,
- 236, 161,   1, 188, 106, 183, 219, 195,
- 143, 220,   7, 127, 159, 113, 233, 110,
- 248,  95,  79, 172,  45, 102,  79, 118,
- 201,  28, 143, 167, 187,  98, 172, 188,
- 255, 134,  11, 204,  61,  28, 222,  28,
-   1, 142, 186, 182,  11, 114,  76,  80,
- 174,  15, 127, 146,  24,  17, 108,  71,
- 153,  27,  13, 145, 241,   1,  18, 255,
- 161, 162,  94, 201, 129,  93,  32, 175,
- 139, 147,  18, 178,  36,  13, 124, 116,
- 212,  35, 208, 254, 100, 180,  42, 244,
-  16, 159,  71,   3, 102,  18, 207, 206,
-  85,  97,  45, 107, 135, 101, 130, 131,
-  18, 204, 131, 142,   0,  77, 157,  76,
-  91, 218, 109, 134, 151,   3,  75, 228,
- 255,  13, 159, 144, 146, 164, 164,  69,
- 231,  70,  16, 145, 238,  14, 190,  74,
- 222, 241, 163, 200, 213,  82, 198, 154,
- 190, 142, 140, 241, 165, 208, 196, 213,
- 117, 188, 192,  38,  57,   8, 215,  45,
- 142, 188,  39, 175,  20, 151,  27,  45,
- 249, 124,  11,  12,  89, 247,  67, 159,
- 121, 231, 109,   5,   9,  84,  57,  57,
-  70, 229, 118,   8, 173,  81, 151, 126,
- 197, 213, 103,  86, 101,  35, 110,  76,
-  61, 225, 169, 127, 209, 152,  51, 241,
- 128,  13, 254, 164, 116,  57,  14, 131,
-  64,   0,  39,  96, 105,  64, 109, 251,
- 183, 223, 142, 163,  58,  85, 130, 124,
- 249,   5,  18, 107,  99, 167,  70, 192,
- 167,  21,  26,  36, 120, 177, 234,  49,
-  23, 142, 151,  68, 150,  45, 172, 113,
-  71, 174,   4, 105, 141, 251,  71, 133,
- 103,  17, 144,  97, 250,  45,  30, 159,
- 172, 171,  80, 196, 253,  12, 143, 208,
- 209, 248,  88, 193,   2, 112, 108,  36,
-   3, 145,  53, 111, 196,  71, 196, 189,
- 194, 212,  64, 164,  75, 146,  82, 250,
-  16,  43,  79, 199, 121, 100, 150, 173,
-  60, 211,  24, 175, 221, 137, 251,  67,
- 241, 246,  96, 237, 233,  48, 182,  29,
-  46, 191,  33,  27,  72, 103,   6, 179,
-  95, 175, 115, 113, 125,  13, 221, 174,
- 167, 255, 193, 196,  52, 161, 197, 200,
-  90, 143, 255, 196,  11, 207, 141,  80,
-  36, 101,   9,  85, 231,  58,  53,  69,
- 112, 191, 135,   0, 101, 251, 169, 229,
- 185, 209, 129,  94, 231, 227,  38,  24,
-  15, 111,  93,  70, 119,  45,  75, 122,
-  57,  90, 117, 190,  37,  44, 223,  62,
- 238,  98, 211,  81,  94,  60, 235, 146,
- 146,  84,  24,  77, 238, 179, 124, 215,
- 102, 102,  42,  53,   5, 147, 227,   8,
- 110, 120, 205, 181, 239,  37, 106, 219,
- 155,  34,  35, 136, 132,  45,  19, 204,
- 158,  31, 125, 101,  73, 111, 136, 151,
-   7, 100, 170,  33,  79, 155,  21,  78,
- 169,  31, 221,   2,  46,  14,  77,  59,
- 157, 113, 194,  33,  94,  74, 221, 111,
- 196, 221,  43,  25, 205,  74,  33, 136,
- 238,  24,  78,  84, 231, 203, 211,  66,
- 186, 135,  61,  45,  82, 189, 152,  51,
-  86, 121,   2, 134, 179, 199, 147,  49,
-  81, 206,  51, 125, 236, 117,  13,  20,
- 120,  35,  69, 149,  48,  70, 148,  62,
-  93,  58,  61, 108, 122, 200,   4, 162,
-  19, 214, 248,  86, 160, 126, 237, 178,
- 143, 186, 212, 162, 236,  14, 151, 134,
- 158, 237,  66,  42, 245, 201,  11, 197,
-  77, 139, 184,  11, 200,  97, 149, 236,
- 101, 103, 238, 162, 105, 252,  46, 127,
-  78, 130, 255, 236,  97, 111, 131, 252,
-  32, 102, 251,  44, 114,   7,  69, 163,
- 222,  27, 135,   2, 203, 207, 113, 132,
-  91,  83, 170,  75, 201, 183, 105, 249,
- 180, 137,  44,  24,  39, 190,  68, 227,
- 209,  20,  62,  51, 253,   9, 207,  29,
- 168,  97, 108,  53, 151,  45,  25, 127,
- 230, 213, 119, 224, 221,  12, 140, 218,
-  93,  92,  73, 171,  26, 158, 154, 187,
-  33,  29,  73, 187, 194,   8, 171, 137,
- 165,  45,  47, 250, 202,  59, 191,  27,
- 110,  25, 101,  46, 230,  80,  74, 254,
- 136, 180, 205, 244, 179, 248, 220, 174,
- 194,   0,  52,  50,  59,  10,  39, 208,
-  49, 158, 211, 106, 152, 177,  48,  23,
- 236, 100,  68,  34,  46, 186, 149, 242,
-  79, 153,  68,  95, 253, 152,  83, 116,
- 145, 219, 150,  89,  97,  13, 150,  59,
- 105, 153, 147,  94, 153,  89, 116, 227,
- 252,  97, 144, 118, 198,  16,  15, 152,
-  76,  26,  15, 195, 187, 152,  70,   9,
-  10,  62, 113, 172, 183, 223, 175, 225,
- 127,  82, 189,  85,   7,  55,  78,  59,
- 159, 228,   6,  52, 239, 132, 118, 198,
-  95, 163,   3,   0, 152, 236,  97, 243,
- 206, 101, 190,  32,  45, 196, 255, 105,
-   2, 150, 244, 141, 230,  90,  62,  58,
- 156,  45, 163, 106, 123, 139,  35, 112,
- 138, 153,  92,  24, 177, 248,   1,  11,
-  74, 187, 104,  31, 255, 174, 144,  15,
-  97,  31, 117, 124, 179,   2,  62, 221,
- 194, 200, 253, 236, 112, 231, 174,  13,
- 177, 180, 181,  77,  58, 155, 142,  92,
- 193, 127, 160, 205, 145, 145, 250, 252,
- 146, 134,  20, 250,  85, 147, 206, 107,
- 152,  60, 166,  34, 173, 208,  65, 203,
- 101, 194, 219, 140, 132, 134, 146, 220,
- 152,   1,  32,  32, 207,  95, 110, 208,
- 239, 101, 225, 149, 151, 213, 179, 118,
-  62,  60,  40, 153, 129,  47,  61, 239,
- 163,  88, 166, 224, 123,  10, 102,  40,
- 168,  72,  21, 166,  56,  50,  47, 194,
-  73,  93,  88, 174,  66,  16, 124,  21,
-  81, 248,  26, 199, 152, 218, 166,  11,
- 206, 169,  54, 186,  65, 211, 176,  73,
-  74, 107, 139,  90, 185,  40, 248, 232,
-  77,  47, 196,  91,  49, 229,  91, 154,
- 214, 255, 153,  26,  74, 135, 118,  26,
- 115,  26, 250, 118, 129, 231,  16, 184,
-   0,  22, 189, 245,  40,  87,  25,  98,
- 192,  24, 198,   8,  25, 150, 171, 252,
- 244,  15, 214, 111,  73, 239, 251, 201,
- 115, 169, 100, 165, 121,  42, 115, 189,
-  40, 179,  14, 200, 240, 233, 209,  31,
-  78,  18, 110, 160, 134, 226, 125,  83,
-  83, 236,   7,  81, 216,  78, 105, 220,
- 246, 241, 103, 233, 208, 225, 153, 154,
- 176, 109,  99, 139, 227, 253,  96,  32,
-  56, 255,   8,  34, 184,  99,  96,  84,
-  99,  58, 170, 244, 227, 223, 169,  28,
- 198,  43, 208,  74, 116, 232, 165, 206,
- 130, 144,  88,  73,  50,   4,  36, 115,
- 133, 244, 149,  27, 253, 122, 206,  34,
-  14,  21, 102,  63, 142, 247, 211, 201,
- 186,  34,  11, 220, 189,  87, 241, 161,
-  15, 115, 255, 226, 224,  64,  96, 153,
- 153, 161, 195, 124, 224,  64, 149, 249,
-  52, 222, 210, 182, 150,  63,  92,  34,
-  77,  30, 105, 221, 197, 107,  57, 187,
-  76, 165, 238,  33,  38,  74, 189,  67,
-  56, 205, 232, 230,  97,  48,  82,  97,
- 119, 222,  29, 171, 162, 118,  64, 250,
-  29,  41,   6, 196,  27,  12, 174, 190,
-  49,  48,  19, 243,  51, 148,  46, 199,
- 105,  45, 169, 137, 202,  95,  88, 141,
- 107,  62, 245, 139, 202,  38,  73, 150,
- 181,  30, 252, 194,  46, 103,  35, 111,
-  21,   3,  37,  75, 149,  83, 150, 206,
- 155, 132, 107, 204, 253,  79, 177,  40,
-   6,  36, 207, 114, 233,  41,  36,  65,
- 107, 113,  53,  80,  93,  12, 202, 251,
-  44,  63,  50, 102, 250,  40, 240,  89,
- 134,  47, 185, 131, 226,  59, 200,  52,
- 115, 104, 243, 190, 229,  46, 197, 123,
- 153, 150,  89, 135, 238,  18, 130, 151,
- 154, 192,  11, 161, 244, 139,  89, 245,
- 122, 229, 178, 176, 255, 176, 217, 223,
-   3, 211,  70,  47,  89, 125, 191,  42,
- 155, 209,  34, 128, 140,  86,  82, 126,
- 190, 240,  86,  81, 122, 106, 195,  73,
- 121,  50, 181, 152, 212, 156, 209,  68,
- 173, 160,  95,  68, 115,  57, 180,  78,
- 228,  62, 197, 180, 198,  72, 223, 122,
-  58,  70, 231, 220, 103, 193, 182,  49,
-  22, 201, 121, 121,  42,   3, 227, 231,
- 187,   2,  50, 139,   8, 199, 242, 142,
-  95, 130,   2, 143, 230,  57, 184, 118,
- 103, 190,  15, 137, 243, 183,   0, 121,
- 171,  97, 250, 206, 107,  60, 129,  46,
- 207,  46, 115, 230,  31, 211,  33,   6,
-  68,  10, 190, 133, 205, 173,  40,  99,
- 170, 146, 110, 213, 150,  77, 126, 149,
-  94, 216,  82, 124, 128, 100,  75,   7,
-   9,  59, 199, 207, 151, 137,  24, 120,
- 250, 253, 140, 115, 172, 100, 218,  65,
- 255,  15, 153, 140,  67,  68, 189, 105,
- 203, 197, 147, 254,  59, 188, 235, 186,
- 232,  92,  66,  97,  53,  87,  94, 163,
- 173, 108, 241, 191, 109, 150, 249, 164,
-  54, 164, 122,  16,  94, 220, 114, 209,
- 169, 252, 121, 249,  94, 170, 177, 187,
- 246, 190, 141,  37, 175, 199,  63,  58,
-  55, 196,  55, 227,  72,  34, 100, 100,
- 115,  12, 153, 221,  34, 223,  73,  21,
- 218, 110, 109, 169, 102,  81,  11, 244,
-  80, 147, 245,  42, 130, 224, 132,  49,
- 158, 144,  79, 189,  83,  77, 241,  39,
- 204,  70,  87, 181, 146,   4, 213, 127,
- 123, 244, 238,  77, 247, 169, 100,  91,
-  25, 167, 204, 123,  67, 130, 188, 244,
- 184, 239, 211,  27,  62, 163,   7, 123,
- 136,  34,   0,  34,   2,  76,  97,  60,
- 170,  24, 193,  39, 120, 132, 121, 202,
-  93,  83, 125,   0, 225, 101, 151,  53,
- 197,  21, 211,  38, 116, 101, 141,  89,
- 159, 246, 172,  62,  67,  24, 152,  20,
-   9, 248,  69,  60, 229,  73, 165, 190,
- 101,  50, 173, 241, 115,  48,  36, 220,
- 204, 160, 188, 251, 158, 166,  34, 171,
- 205, 206, 240, 242,  62, 160, 220, 134,
- 159,  96, 135, 255, 132, 253, 200,  37,
- 121, 247, 247, 216,  61, 213,  10, 208,
- 230, 185, 224,  84, 186,  71, 161,  64,
-  55, 227,  34, 101, 126,  22,  43,  52,
-  44, 113, 174, 147, 221, 130,  65, 167,
- 217, 134, 119, 235,  27,  64,  29, 234,
- 138,  70,  65, 224, 135, 169,  84,  34,
- 240, 225, 212,  19, 179, 143,  22, 181,
-  21, 157, 156,  33,  30, 231,  13, 134,
- 125, 116,  77, 138,  95, 106,  59,  33,
- 219, 187,  16, 203,  18, 179, 244,  43,
-  15,  50, 151,  22,  45,  88, 140, 184,
-  42, 216, 107,  73, 204,  13, 180, 141,
-  20, 140, 120, 148, 212, 242, 220, 102,
- 173, 239, 207,  87,   0,  85, 120, 105,
-  74,  30,  49, 229, 116, 139,  65,  87,
- 244, 145, 178, 209, 184, 197,  75, 201,
-  61, 138,  21, 117, 224,  28,  61,  25,
- 213, 230, 177, 195, 119, 108, 152, 167,
- 218, 113, 135, 181,  13, 153,  82, 124,
-  85, 192,  10, 214, 228, 153,  39,  60,
- 201,  65, 213, 170, 156, 120, 223, 140,
- 124,  76, 163, 164, 249, 114, 219,  37,
-  68, 118,  91, 208,  91, 157, 244, 232,
- 122,  44, 254, 182, 124, 200, 145, 207,
-  90, 111, 229, 198, 226,  32,  57,  15,
- 245, 166, 106, 226,  78, 230, 142, 104,
- 218,  98,  23,  37, 190,  17, 142, 227,
- 164, 174, 133, 106,   4,  43, 104,  49,
- 114,  72, 243, 144,   9, 232, 117, 241,
-  61, 224, 133, 126, 241, 204, 242,  55,
- 173,   8, 217,  53, 210, 198, 175,  41,
-  86,  84,  11, 136,  80, 226, 177,  11,
- 123,  97,  39,   9,  41,  99, 114, 103,
-  13, 120,  90, 168, 143,  30, 135,  97,
- 196, 219,   0, 191, 209,  95,  66, 230,
- 149,  27, 133, 137, 181,  29,  78, 193,
-  10, 254, 142, 152, 128, 246, 231,  37,
-   6, 139,  10, 251, 199, 186, 241, 159,
- 168, 129, 182, 136,  79, 254,  40, 126,
- 210, 222, 102, 182, 153,  74,  86, 210,
-  51,  90, 100, 141, 240,  98, 202, 216,
-  80, 170,  82, 226,   0, 135, 233, 173,
- 137, 138,  74,  27, 122, 189, 163,  57,
-  84, 217,  99,  24,  54, 132,  70,  81,
-  79, 222, 118, 247, 237, 213, 251,   1,
- 141, 151, 147,  91,  21,   7, 166,  78,
- 207, 133,  14,  93,  92, 132,   2, 213,
- 180,  26, 209, 106, 181,  11, 222,  17,
- 108, 208,  93,  78, 177, 124,  84, 164,
-  78, 161, 132, 132,  12, 245, 163,  44,
- 182,   1,  28, 151,  84, 248,  49, 133,
-  95, 195, 219,  18, 151, 221,  46, 126,
-  92, 211, 202, 184, 141, 137, 138,  24,
- 175,  66, 158, 179, 186,  97, 175, 127,
-   5,  19, 113, 205,  81,  84,  41, 221,
- 248, 201,  52, 233, 245, 211, 228,  81,
-  33, 127, 205, 127, 251,  79, 244,  67,
- 228, 104, 237, 249, 239, 146, 191, 118,
- 119, 147,  42, 126, 119, 168,  46, 142,
-  81,  45,  63, 214, 180, 226,  97, 189,
- 144,  91,  19, 161,  42, 181, 205, 125,
- 192,  94,  18, 205,  46, 222,  93,  99,
- 118, 231, 180,   6,  90, 132,  98,  90,
-  36,  88,  66,  55,  11, 240,  65,  98,
- 225, 175,  47,  43, 122, 111, 178, 151,
- 255, 237, 231, 214, 105,  40, 159,  22,
- 169, 212,  83, 202, 115, 161,  47, 128,
- 173, 237, 195, 120,  91, 188, 122,  11,
- 102, 121,  27,  69, 251, 200,  69,   6,
- 100, 118,  67, 114,  80, 174,  17, 136,
- 112,  36,  43, 133,   9, 108, 198, 235,
-  68, 134, 190, 201, 186, 251,  93,  63,
- 239,  30,  73, 196,  52, 230, 125, 125,
- 107,  82,  41, 146, 187,  90, 112,  26,
- 239,  67,  13, 128,  34,  81, 210, 128,
- 110,  50, 170,   5, 193,  59,  70, 173,
-  39,  66, 136, 131,  75, 145, 151, 252,
- 115, 182,  41, 121,  40,  57, 194,  50,
-  87, 130,   8,  18, 126,  69,  48, 117,
- 252, 186, 132,  62,  58, 151, 215, 198,
- 229,  47, 244,  40,  14, 140,   9, 116,
- 199, 240, 131,  62, 153,  10,  36,  20,
-  87, 101, 230,   8,  90,  45, 173,  27,
-  77, 248, 253, 190, 250,  65, 238,  21,
-  87, 223,  98, 174,  64, 215, 212,  71,
- 254,  39, 161, 202,   3, 198, 248,  79,
- 210, 218, 236, 106, 175, 224,  85,  82,
-  12, 145, 208,  10, 162, 121,  64,  37,
-  84,  72, 112, 127,  11,  21, 138,  81,
-  65, 196,   3, 156, 166, 203, 223,  55,
- 156, 130, 139, 229,  18, 192, 220,  42,
-  34,  31, 222, 216,  26,   8,  30, 118,
-  85, 184, 103, 167, 127,  84, 155, 154,
- 193,  99,  45,  49, 247, 239,  63,  17,
- 235, 216,  66, 242, 211,  41, 123, 136,
-  26, 234, 245, 152,  17,  81, 119, 203,
-  20, 133,   5,  16,  38, 176,   1,  67,
-   8,  11, 167,  78,  25, 249,  48, 205,
-  79, 218, 192, 210, 147, 111, 154, 188,
- 220, 186, 147, 174, 182, 212,  74, 160,
-  89, 193, 105, 232,  60, 216, 114,  52,
- 152, 198, 247, 239, 223,  30,  48,  28,
- 244,  54,  41, 253,  38, 162,  42,  69,
-  48,  37, 189, 207,  32, 151,  99, 120,
- 253,   2,  19,  58, 234, 236,  48,  56,
-  67, 235,  58,  83,  77, 125,  74, 154,
- 116,  53,   7, 155,  10, 165,  97,  62,
- 248, 140,  58, 241, 198,  17, 178,  11,
- 205,  54,  31,  92,  52, 167, 220, 116,
-  59,  50,  33,   1,  31,  80, 108,  96,
- 151, 193, 190, 228, 135, 177, 247,  39,
-  77,  10, 218, 251, 147, 246, 111, 108,
- 111, 131, 189, 167, 148, 196, 252,  64,
-  44, 102, 186,   7, 132, 207, 105, 222,
-  19,  27, 182, 193, 102, 200,   6, 255,
- 140, 199, 184, 127, 144,  66,  78,  27,
-  82, 113, 205,   2, 169, 134, 251,  54,
- 105, 139, 140, 172, 252, 104, 200,  96,
-  33, 223, 196,  75, 253, 244,  27, 104,
- 115,  77,  73, 220, 211,  66, 174,  30,
- 161,  95,   7, 155,  96,  92, 157, 201,
-  48, 234, 241, 118,  70, 175, 142, 162,
- 190, 116,  54, 157, 101, 108, 107, 247,
- 190, 119, 246, 135, 202,  24,  52, 134,
- 248, 197, 199, 113, 247, 243,  41, 147,
-  30, 170,  86,  82, 187, 131, 227,   5,
- 228, 168, 243, 241, 229,   1, 106, 222,
-  43, 117,  81,  36, 102,  21,  52, 213,
-  52,  59, 215,  55, 148,  49, 251,  43,
-  22,   7, 126, 196, 116,   3, 165,  99,
- 216,  15, 172,  18, 126, 234, 226, 160,
-  24,  15, 150,  96, 121, 174,  52,  44,
- 242, 185,  43,  35,  22,  64, 211, 241,
- 156, 243,  70,   1, 133, 105, 110,  82,
- 251, 238, 224, 197, 199,  49,  15,  59,
- 176,   2,  38, 141, 162, 214, 172, 225,
-  29, 244,  44, 192, 242, 237,  25,  47,
-  55, 182, 122, 238, 241, 151, 251, 211,
- 227, 144, 162,  33,  11, 237, 142, 167,
- 182,  77, 173,  39, 213,  10,  54,  41,
- 227,  14,  50,  72, 137,  93,  79, 235,
- 222,  37,  38, 171,  21, 131, 214, 209,
- 192, 160, 102,  45,  95, 110, 170,  91,
-  93, 131,  16, 179, 138,  55,  24,  53,
-  42,  86,  22,   9, 246,  16,  64, 120,
-  46, 168, 151, 137,  32,  27, 239, 210,
-  98,   5,  38,  50,  31, 174,  85,  11,
-  89,   6,  46,   3,  13,  68, 109,  80,
-  95, 145, 218, 100, 193,  16, 252, 219,
-   0,  38, 210, 231, 107,  66,  19, 212,
- 116, 219,   9, 104, 215, 130, 221,  58,
- 189, 206, 130,  13,  68,  93, 147, 189,
-  20,  43,  52,  43,  59, 124, 244,  35,
- 203,  99, 236,  12,  40,  23, 234,  76,
-  81, 120, 170, 202, 120, 206, 218,  51,
-  58, 104, 107, 121, 190,  43, 124, 220,
- 110,  72, 173, 110, 127, 123,  86,  86,
- 125,  79,  55, 163, 229, 249, 205,  66,
-  29,  38, 143, 103, 233, 198,   0, 190,
- 141,  16,  29,  98, 191,  82,  16,  36,
-  80, 132, 175, 235, 104,  93, 128,  76,
- 175, 155, 168, 208, 232, 210,  31, 113,
- 233, 148,  94, 215, 166, 128, 180, 238,
-  86, 194,  60, 250,  38, 162, 127, 237,
-  54, 227,  82, 209,  77, 163, 250, 120,
- 200,   0, 163, 136, 129,  79, 145, 174,
- 213, 101, 204, 182, 125, 125,  60, 202,
- 218, 248,  90,  26, 108, 125, 161, 242,
- 118,  38,  18, 122, 215,  88, 164,  83,
- 239, 151, 104,  80,  35,  66, 179, 157,
-  49, 144, 104,  14, 143,  67,  49, 136,
-  75, 136, 130, 168,  75, 203, 184, 239,
- 210,  36, 246,  67, 231, 226,  90,  35,
-  35, 198,  79, 209,  32, 178,  96,  54,
- 156, 105,  31, 156,  26,  87,  33, 252,
- 245,  79, 105, 214,  83, 245, 231,  94,
- 132, 151,  17, 233,  66, 230,  58,  41,
- 193,  41, 122, 158, 224, 148,  49,  99,
- 244,  92, 107, 250,  61, 111, 248,  68,
- 204,  78, 247,  67,  14, 199, 182, 136,
- 173, 164, 232, 207, 178,  13,  48,  83,
-  26, 106,  59,  92,  14, 111, 166,  66,
- 172, 203, 104, 131, 218, 252, 248, 238,
-  61, 167, 125, 209, 198, 174,  12, 145,
-  40,  58,  36, 102,  76, 134, 176, 113,
- 155,  22, 180, 149,  42,  92, 191, 179,
-  16, 123, 117, 179,  34,  27,  95,  43,
- 122, 114, 182, 196, 140,  66, 203, 121,
-  29,   5, 213, 136, 149, 197,  24,  51,
- 157, 216,  53,  68, 179,  90, 156,  72,
-  20, 125,   0, 218, 215, 207, 190, 251,
- 163,  33, 242, 185, 104, 116,   6,  46,
- 104, 140, 243,  63, 198, 118, 232, 132,
- 154,  79, 229,  15, 107,  42, 222, 239,
- 106, 224, 147, 182, 209,  48,  92, 214,
-  73, 255, 196,  80, 147,  94, 216, 246,
- 252, 210,  90, 239, 180, 205,   0, 157,
- 118, 172, 240, 164, 254, 155, 228, 249,
- 118, 118,  81,  40, 248, 182, 178,  85,
- 118, 105,  35, 139,   0,   6,  52, 157,
-  42,  29,  92,  35, 154, 130,   7, 161,
- 241, 214, 229,  80, 123,  89,  72, 179,
- 147,  38, 221, 174, 222,  58,  17,  90,
-  89,  30, 110,   1,  96,  57,  47,  43,
- 254,  88,  71, 252, 201, 202, 104, 223,
- 139, 124,  32,  31, 186, 158, 151,  13,
- 132, 213, 254, 246, 172,  94, 180,  43,
- 148, 184,  67,  67,  73, 126,  27,  69,
-  98, 191, 226, 125,   0,   7, 168, 154,
- 112,  86, 166,  33, 123, 196, 120,  11,
-  50,  15, 190, 157, 215, 233,  68, 158,
- 188,  42,  44, 141, 198, 245,  33,  32,
- 120, 191, 188, 134,  80, 185, 152,  36,
- 160, 193, 224, 154,  57, 209, 223,  99,
-  57,  55,  45, 218,  57, 238,  25, 174,
- 102, 169, 236,  54, 180, 208,  21, 120,
-  56,  27, 152, 152, 159,  72, 226,  83,
- 169,  79, 113, 237, 177,  42,  53, 104,
- 120,  54, 211, 171, 148, 217, 119,  51,
-  94, 139,  24, 223, 213, 247,  23, 143,
-  79,  11, 145, 226, 156,  52,  89, 249,
- 187, 155,  54, 111,  64,  32, 131, 189,
- 244,  34, 253,  54,  36,  62, 236,  82,
- 251, 232,  31, 211, 163, 185,  50, 106,
- 133,  29, 181,  85, 157, 127, 211, 124,
- 203,  61,  42, 220,   6,  60, 164,  28,
-  82,  38, 209, 102,  63, 182, 234,  73,
- 213, 238, 205, 162, 153, 176,  64, 143,
- 155,  45,  16, 172, 224,  57,  51, 238,
- 137, 192,  47, 112, 144,  20, 209, 197,
- 232, 229,  28,  64, 126, 106, 189, 184,
- 161, 192, 147,  55, 241,  35, 141,  19,
-  48, 230,  59, 216,  88,  43, 167, 115,
- 176, 219, 183, 190, 250, 158, 187,  14,
-  52,   5, 107, 170,  97,  76, 150, 107,
-  89,  39, 201,  99,  19,  84, 227, 126,
- 172, 188, 104,  73, 130, 182, 164,  46,
- 238,  30, 143,  32,  52,   6, 204, 180,
- 154, 182, 247, 118, 224, 158,  86, 247,
- 183,  75, 131, 117, 152,  38,  57, 106,
-  80, 139, 100, 189, 232, 144,   4, 181,
- 144,  72,   6,   1, 160,  91, 105, 157,
- 163,  14, 185,  27, 103, 254, 105, 195,
- 234, 180,  23,  43, 127,  99, 226, 142,
-  75, 179, 252, 127,  53, 217,   8, 247,
-  22, 165, 198, 251,   1, 205, 130,  28,
- 211, 202,  64,  33, 191,  21,  13, 197,
-  17, 149,  10, 163, 201,   3, 109, 190,
-  74, 174, 107,  84, 229, 233, 158,  47,
- 120, 127, 128,  32, 124, 229, 131,  39,
-  54, 239,  11, 115, 113, 219, 158, 137,
-  62,  85, 129,   1, 101,  71, 214,  33,
- 212, 209,  80, 133,  95, 104,  95, 117,
-  27, 226, 221, 222, 172,  47,  76,  31,
- 233,  41,  74,   9,  31,  45, 242,   4,
- 153, 163,  70,  16,  20, 130,  64, 139,
-  57, 165, 250, 224, 201, 104, 152,  16,
- 144,  16,  49, 173, 147,  23,  62, 117,
- 100, 112, 227,  85,  48, 207,  88, 151,
- 236, 110, 111, 212,  28, 242,  20, 232,
- 186,  10, 143, 239,  87, 183,  45,  73,
-  43,   8, 231, 148, 195,  15,  46,  24,
-  65, 140, 150, 181, 227, 214, 218, 115,
-  23,  94, 111, 131,   6,  70, 210,  12,
- 178, 172, 140,  86, 191,  88, 104, 249,
-   9,  58, 232, 123, 147, 210,  71, 172,
-  28,   0,  85, 133,  85, 173,  68,  49,
- 160,  16, 229,   1, 244,   8, 241, 171,
- 181,  69,  53, 141,  68, 113, 187, 230,
- 239, 214, 106,  46,  62, 109, 133, 198,
-  83, 233, 159, 130,  88,  50, 166, 190,
-  29, 140,  16,  22,  93,  47,  59, 237,
- 154,  39, 126,  61, 149, 254, 247,   1,
-  60,  36, 160,  51,   6,  77, 249,  22,
-  22, 107, 241,  70, 244,  57, 106,  11,
-  27,   0,   1, 246, 254, 240, 155,  81,
- 151, 205,  90, 158,  16, 203, 178, 161,
- 119, 226,  17,  79, 188,  66,   8,  91,
-  69, 228, 102, 190, 241, 152,  87, 116,
-   0,  16,  39, 132, 179, 239, 220, 119,
- 158,  28,  90, 239, 238, 229, 230,  35,
-  71, 232,  28,  34, 111, 105, 127, 149,
-   0, 242,  56,  44, 101, 208, 219, 246,
- 247, 249, 239, 238, 222, 122, 204,  99,
-  49, 139,  42,  59,   7, 185,  90, 210,
- 181, 198,  22, 211,  21,  30, 122, 191,
- 163,   9, 200, 185,  82, 169,  29,  30,
-  47,  86, 218, 142, 125,  90, 209, 112,
- 140, 230, 214, 196, 170, 145, 180, 252,
- 228,   0,  34, 146, 251, 122,  15,  16,
-   2,  59, 103, 205, 157, 120, 111, 102,
-  95,  79,  61,  28, 150,  98, 198, 247,
- 131, 174, 233, 241, 170,   5, 215, 141,
-  83, 106,  61,  83, 113, 235, 171,  78,
-  87,  32, 217,  44, 213, 243,  17,  64,
- 150, 113, 255, 124, 214, 168,  24, 165,
- 140,  98,  39, 210,  99,  24,  21, 249,
- 250,  29, 175, 171,  37,  53,  70,  73,
- 132, 235, 184,  85, 206,  62, 165,   4,
-  84, 145, 173,  68, 166, 109, 101, 232,
- 150, 128, 113,  28,  33, 249, 134, 218,
-  69, 130, 214,  71,  51, 222,  45, 132,
- 165, 126, 171, 129, 116, 134, 199,  94,
- 207, 206,  75,  34, 203, 227, 137,  21,
- 120, 160, 114, 214, 239,   4, 254, 248,
-  21, 197, 112, 150, 204,  18,  91, 223,
- 203, 131, 217, 168, 230, 140, 144, 229,
- 118,  36, 104,  14, 124, 225, 202,  97,
- 225,  83, 111, 144, 138,  17, 235,  49,
- 179, 138, 210,   5, 228,  17, 150,  59,
- 186, 101, 230,  91, 225, 169,   7, 214,
- 165, 240,  19, 222, 194,  75,  97, 217,
- 121, 235, 194, 177, 181, 180, 172, 194,
- 136, 249, 143,  91, 110, 201, 169, 116,
- 248, 210, 122,  97, 237, 126,  99, 218,
- 254, 102, 117, 242, 211, 157, 254, 224,
-  51, 163,  52, 190, 207, 187, 236, 160,
-  42, 252,   2, 231, 249, 143, 203, 133,
- 235, 210,  46,  16, 185, 192, 150,  59,
-  44,  64,  31, 225,  45, 142, 104, 225,
- 205, 144,  65, 247, 171,  88,  26, 163,
- 156,  43, 135, 246, 191, 105, 221, 214,
- 168,  35, 133, 114, 241,  85,  47,  46,
- 149,  11, 253, 208, 110, 109,  78, 130,
-  37,  89,  24, 231, 163, 144,  48,  91,
-  88,  91,  66,  59, 203, 150,  28,   8,
- 218,   8,  24, 209, 146,  40, 100, 145,
- 210, 241, 211,   0, 143, 247, 217, 166,
-  55, 120, 112,  28, 116, 143,  50, 207,
- 251, 131, 121,  57, 162, 128,  86, 255,
-  34, 167,  26,  12,  97, 145, 191,  84,
-  95,  93,  46, 157,  10,  89, 219,   1,
-  90, 114,  90, 254, 142, 191,  26, 115,
- 206,  17,  77,  24, 175, 204, 212, 175,
- 184, 209, 163,  53,  94, 194,  84,  38,
-  23, 235, 235, 123, 115,  76, 243,  42,
- 163,  19,  48, 164,  52, 103,  54,  50,
- 181,  46, 103,   9, 138, 224, 224,   2,
- 170, 196, 208,  49, 195, 130, 215,  55,
- 148, 195,  96, 107, 196, 160, 161, 252,
- 111, 202, 200,  87,  22,  49, 164, 115,
- 133, 210, 235, 155, 103,  59, 235, 163,
- 116,  23,  77, 171, 109, 194, 232,   0,
- 235, 215,  83, 198,  18,   5,  48, 211,
- 231,  23, 188, 240,  88, 142, 193, 118,
- 164,  12,  21, 160, 129,  97,  99,  13,
- 210, 162, 212, 151,  26, 242,  42, 191,
- 130, 226,  77,  18, 179,  84,  81, 192,
- 138,  83, 170, 193, 242, 151,  11, 145,
-  99,  79, 234,  82, 142, 121,  29, 145,
- 169, 247, 162,  16, 210, 187, 187, 167,
- 126, 210, 152, 170, 176, 225, 180, 155,
- 178, 110,  95, 183,  70,   7, 125,  34,
-  46,  68, 228, 101, 198,  42,  56,  10,
- 173, 129,  25,  52,  38,  80,  15, 146,
- 116, 194, 213, 136, 220,  45, 238, 121,
- 204, 119,  57,  44, 196, 207,  96, 196,
-  20, 255,  81, 223,  89, 118,   8, 178,
- 169,  75,  92,  46, 233, 165,  76, 203,
- 157,  53, 224, 145, 114,  38, 194, 117,
- 228,  67, 251,  66,  73, 199, 234,  24,
-  93,  65, 167, 109, 151, 207, 218, 135,
-   8,  34,  86, 125, 206, 222, 112, 228,
- 167, 124,   4, 225,  15, 253, 119,  68,
- 187, 244,  33, 229, 180,  21, 218, 238,
- 237,  62,  30, 120, 239, 247, 170,  84,
- 160, 252,  42,  20, 185,   5, 209, 110,
- 163, 132,  21, 135, 174, 113, 230, 202,
-  14,  10,  76, 150,  94,  72,  97, 190,
- 255, 166,  20, 172, 124,  86, 221, 230,
-   8,  95, 221, 171, 137, 249, 222, 134,
-   2,   7, 233, 248, 246, 109, 177, 109,
-  98, 131, 104,  29,  50,  12, 251, 232,
-  39,  69, 190, 173, 165,  80, 164,  68,
-  64, 107, 128,  57,  63,  16, 127,  35,
- 167, 189,  68, 243, 100,  75,  22,  36,
-  47, 124,  18, 113, 185,  26, 216, 216,
- 127, 147,  64, 188,  18, 240, 214, 223,
-  62,  27, 199,  80,  74,  41, 175, 178,
- 186, 163, 156, 146,   0, 178,  32, 130,
-   6, 110, 139, 190, 203, 198, 174, 214,
-  27, 218, 135,  45, 125,  33, 102, 166,
-  18, 147, 204,  12,  29, 157, 192, 103,
-  36, 105,  93, 193,  12,  34,  71, 119,
- 243,   5, 118,  48,  75,  36, 252, 124,
-  16,  80,  12,  31,  15, 229, 196,   3,
-  31, 230,  55, 130, 172,  91,  14, 200,
- 108,   8, 155, 155,  78, 110, 241, 247,
- 101, 241, 176, 124,  66, 241, 199, 227,
- 190,  69, 114, 240,  17, 119,  30,  49,
- 196, 145, 158, 187,  88,  25, 129, 166,
-  15, 108,  46,  58,  93, 165,  28,  15,
-  21, 139, 188,   7,  43,  40, 164, 180,
-   4,  17,  48,  64,  37, 234, 238,  14,
- 244,  44, 175,  91, 183, 197, 142, 250,
-   2, 158,  58, 136, 246, 232, 223,  69,
-  54, 231,  99, 166, 151,  95,  67,   1,
-  71, 186, 170, 188,  52,  82, 132,  72,
- 218, 120,  52, 141, 166,  39, 205, 221,
-  74, 120, 179,  16, 181, 210, 225, 246,
- 130,  62,  70, 113, 154,  62, 243, 248,
-  10,  59, 123, 161, 139, 122, 136, 125,
- 170,  89, 180, 107,  49, 191, 186, 188,
-  91, 149,  29,  20, 252, 219,  32,  87,
-  63, 162,  73, 225,  64, 132, 133, 205,
- 135,  49, 237,  33, 116, 249,  66,  28,
- 148, 201,  86, 252,  36, 241, 207,  25,
- 145,  68,  85,  11, 221, 191, 181,  55,
- 118, 189,  47, 201,   8, 251, 244, 254,
-  57, 180,  85, 225,  91, 228,  97,  11,
- 101,  25, 133, 183, 118,  48, 237,  72,
- 222, 251,  16,  13, 233,  10,  98, 161,
-  68, 141, 110, 175,  52, 186, 135,  14,
-  64,  46,  80, 197, 190,   0,  28, 177,
- 122, 208, 205, 241, 227, 179, 204,  93,
- 162, 248,   4, 225, 160,  86, 142,   5,
- 194, 241, 186, 194, 190, 178, 176, 234,
- 158, 244, 214,  50,  22, 119, 131, 232,
-   2, 136,  63, 182, 231, 213,  30, 252,
- 248,   8,  21, 254,   9, 107,  12,  80,
- 222,  77, 253,  49, 235, 114, 129, 193,
- 239,  63,   5, 195, 195, 223, 145,  11,
- 220, 169, 155, 127,  50, 254,  92, 255,
- 248, 252, 222, 127, 213, 100, 105,  43,
-  28, 215, 154,  88,  11, 188, 166,  69,
-  57,  15,  65,  87, 207,  83,  60,  63,
- 199,   7, 190, 165, 122, 153, 149, 141,
- 149, 171, 170, 179,  30,  43, 124,  90,
- 168, 165, 214, 193,  52, 181, 118, 102,
- 166, 171, 110,  49,  17, 162, 174, 138,
-  52, 207,  78, 129, 128, 220, 220, 212,
- 208, 175,  46,   4, 104, 210, 253,  26,
- 242, 140, 229, 240, 172,  83, 152, 209,
- 225,  34, 122,  74, 157, 218,  25, 225,
- 233, 167,  77, 200,  97, 246, 132,  26,
- 197, 112,  36,  66, 110, 234,  69, 238,
- 147, 106,  44,  96,  22, 140, 243, 153,
-  69, 180, 230, 247, 154,  72, 211,   7,
- 214,  37, 167,  39,   4, 224, 181, 134,
-  53, 100, 104, 209, 163, 160, 187, 173,
-  58,  31,  16, 189,  16, 168, 122,  91,
- 126, 248,  67, 225, 187, 213, 182, 160,
-  71, 149,  94, 191, 182,  58,  84,  26,
- 139, 175, 242,  96,  75, 144, 126,  18,
- 124, 169,   9,  32, 173, 160,  58, 127,
-  52,  26,  18, 172, 245, 201, 208, 167,
- 205, 116, 156, 160, 128,  53, 187, 240,
-  85, 189, 142,  49, 210, 142,  60, 118,
- 150, 166,  99, 116,  28, 151, 242, 112,
- 105, 173, 142,  74,  31, 214, 118, 190,
-  84, 178, 113,  40,  99, 184, 211,  94,
-  13, 255,  96, 171,  60, 187, 205,  74,
- 243, 253,  29, 202, 107, 165,  37,  90,
- 116, 134,  51,  41, 242, 195, 107,  56,
- 173,  73, 233, 106, 159,  91,  76, 161,
-  95, 237,  31, 242, 128, 188,  51, 201,
- 111, 211,  71, 100, 251, 237,  94, 200,
- 117,   4,  78, 110,  69, 187, 122, 206,
- 128, 242,  27, 126,  54,   9, 104, 117,
- 117, 214, 129, 190, 121,  71, 146, 133,
- 131, 161, 108, 216, 126, 164, 254, 114,
- 249,  44,  85,  72,  11, 119, 175,  93,
- 166, 144, 250, 154, 245,  66, 228,  67,
-  48,  80,  66, 195, 128, 179, 124, 236,
- 191,   7, 107, 103,  85, 180, 124, 242,
- 247,  70, 180, 249, 181,  47, 254, 126,
- 113, 140,  10,  65,  75, 179,  41, 159,
- 117, 247, 181,  47, 118,   9, 142,  18,
- 180,  32, 248, 118,  27,  25, 139, 133,
- 177,   7,  80,  92, 211, 130, 223, 134,
-  22,  17, 171, 161, 228, 200,  11,  60,
- 140, 207, 147,  19, 199,  68,  48, 240,
- 248, 100, 203,  32, 212,  81,  68,  59,
- 129,  54,  48, 230,  22,  20, 147,   4,
- 145, 155, 221,  40, 220,   5, 164,  26,
-  18, 200, 247, 110, 119,   6,  25, 205,
- 238, 231,  94, 121, 146,  30, 163,  85,
-  92, 172,   9, 220,  95,  63, 197, 220,
- 238, 153,  59,  32, 232, 243,  48, 188,
- 140,  31,  51, 251,  63, 111,  96,  88,
- 188, 135, 168, 125, 207,  19,  79, 209,
-   7,  56,  30,  52,  73, 220, 224, 113,
-  13, 234,  19, 239, 245, 154, 180, 199,
- 143, 134, 245, 109, 116, 141,  90,  73,
-  48, 142,   7, 154, 184,  92, 177,  13,
- 186, 196, 160, 255,  63,   4, 225, 207,
- 105, 165, 197, 173, 161, 209, 142,  27,
-  59, 111, 106, 169,  24, 121, 209, 141,
-  21, 190,  59,  10,  30, 109,  62,  70,
- 126, 157, 210,  27, 247, 216,  74,  87,
-  66,  86,  69,  59, 213, 138,  81, 224,
- 103,  92, 202,  62, 203,  38, 111, 159,
-  46,  53, 208, 137, 229, 150, 164,  95,
-  35, 196, 196,   3,   8, 234, 185,  35,
- 200, 141,  59, 220, 174,  61,  88, 147,
-   2, 108,  21,  46, 167, 121,   6,  28,
- 218,  22,  33,  63, 172, 234,  48, 175,
-  77,  31,  58,  50,  10,  85, 172, 239,
-  69, 139, 198, 155,  37, 118,  86, 190,
-  26, 228,  34, 238,  20, 131,  34,  80,
- 134,  87, 224, 197,  92,   1,  97, 132,
-  73,  13,  16,  25,   3, 188, 224, 168,
-  54, 113,  78, 252,  57, 145,  37,  40,
- 148, 170, 216, 128, 249,   0,  29, 248,
-  14,  47, 110,  27,   5,  54, 230,  51,
-  83, 142, 192, 203,  32, 205, 189,   2,
- 142,  84, 240,  22, 140, 227, 161, 188,
- 161, 195, 178, 198,  73, 108, 189,  68,
- 155, 123,  65, 158, 159,   0, 133, 207,
- 220, 237,   6,   9, 198, 166,  79, 133,
- 247,  69,  66, 123,  13,  51,  91, 240,
- 154, 115, 244, 237, 238,  11,   4,  18,
-  66, 177, 204, 209,   8, 238,  34, 118,
-   4, 197, 145, 178, 128,  61,  64, 206,
-  34,  19,  41, 182, 153,  59, 247, 152,
-  92,  14, 213,  30, 139,  72, 140,  40,
- 164, 230, 132,  36,  37, 171, 122,  86,
-  68,  75,  84,  27, 194,  18, 151, 143,
- 212,  23, 147, 161, 212,  47,  32, 186,
-  46,  34,  16, 254,  10,  14,  33,  99,
-  21, 225, 179, 187, 170, 205,  67,  72,
-  14, 160,  82, 211,  16,  80,  30,  65,
-  85, 126,  52, 206,   9,   1, 154, 247,
-   6, 219, 250, 133, 206,  91, 131,  39,
-  13, 146, 182, 220, 135,   1,  88, 157,
- 232,  60,  88,  26,  44, 196,  83,  40,
-  64, 211, 116,  72, 120, 152,  83, 129,
- 164, 180, 179, 189, 204, 238,  82, 103,
-  72, 251, 183,  97,  47, 115, 187, 202,
- 106, 189, 144, 161, 241,  16,  82, 167,
-  38,  90,  40,  50,  51, 205, 197, 203,
- 166, 160,  37, 243,  78, 210, 250,   8,
- 154,  81,  45, 180, 182,  15, 172, 148,
- 209,  41,  68, 113,  54, 138, 178, 243,
- 198,  58, 131, 251, 148, 232, 105,  13,
- 194, 117,  50, 255, 237,  63, 166, 239,
- 234, 162,   3,  51, 166,  98,  44, 151,
-  85, 229, 135, 120, 137, 219, 131, 169,
-   3,  44,  94, 146,  96,  37, 240, 151,
-  55,  93,  81, 160, 114, 109, 117,  15,
-  97, 142,  67, 250,   9, 181,  73,  26,
-  68, 136, 250,  48, 186, 109,  96,  38,
-  96, 228, 223, 116,  92, 198, 212, 151,
-  12,  63,  62,  43, 107,  18,   1, 236,
- 142, 145, 197, 107, 205, 250, 146, 231,
- 205,  84, 205,  86,  50, 181,  95,  99,
- 143, 238, 129, 225,   7, 248, 143, 199,
-  36, 118,  22, 137, 246, 107, 123, 220,
- 107, 174, 169, 178, 104, 177, 204,  17,
- 153, 147, 196, 126, 236,  76, 115, 212,
- 184, 152,  12, 105,  48,   5, 156, 168,
- 231,  38,  82, 189, 207, 209, 189,  75,
- 221, 162,  13, 219, 214, 104,  80,  29,
- 114,  63, 150, 200, 126, 221,  64, 208,
- 190,  64,  33,  40,  33, 176, 119, 156,
-  19,  41, 179, 169,  21, 144, 109, 216,
- 135,  49, 227,  75, 253, 202, 219, 117,
-   9, 205,  76,  56, 133, 248, 204, 132,
-  29,  42, 147, 196, 201, 102,  14, 246,
-  28, 111,  44, 252, 205, 138, 214, 179,
-  85,  99,  63,  21, 126, 206, 236,  94,
- 157,  51, 252, 122,  88, 153, 105,  40,
- 104, 138, 179, 212, 133, 253, 153, 172,
- 214, 137,  51,  72, 217,  71,  32, 168,
- 217, 189,   8,   6, 208, 172,  33,  42,
- 247,  68, 124,   1, 249, 198,  75, 104,
- 146,  38, 235, 181,  27,  42,  33,  62,
- 173, 218, 214, 164,  47,   5, 184,  14,
- 113, 176, 198,  68,  19, 255,  93, 251,
-  47,  43, 166, 254, 151,   1,  42, 147,
-  29, 208, 165,  42,  39, 193, 110,  69,
- 206,   2,  75,  37, 108, 141,  53,  15,
- 204, 213, 220, 172,  89, 122, 164, 156,
- 224,  93,  94,  88,  31, 106, 211, 102,
- 141, 120,  46,  73, 116, 149, 211, 128,
-  91,  50, 214,   6,  12, 197, 211,  68,
- 245, 188,   0,  20,  19, 113, 108, 155,
- 198, 109, 107,   3,   5,  47, 195, 224,
- 177,  87, 129, 169, 107, 217,  30, 237,
- 240,  59,  96, 205,  90, 144, 159, 108,
-  66,  30, 203,  36, 158,  67, 223, 192,
-  30, 124, 213, 244,  95,  51, 153,  39,
- 160, 206,  24, 140,  34, 245, 118, 209,
-   3, 218, 225, 237, 178, 133, 202, 191,
- 124, 124, 145, 164,  22, 130,  30, 229,
-  82, 190, 194, 199, 247, 186, 155,  76,
- 164,  37, 207,  58,  20,  51,  32,  17,
-  76, 173, 123, 213, 102,   6, 114, 180,
- 211, 158, 194,  96, 163, 131,  68,  98,
- 223, 181, 170,  10,  61, 215, 254, 159,
- 109, 133,  18,  52,  41, 160, 114, 117,
-  80,  49,  30, 208,  86,  32, 224,  92,
- 217, 106,  15,  37, 167, 198, 171, 253,
- 187, 126,  69,  61, 248, 147, 224, 132,
- 170, 122, 180, 201, 252,  29,  46, 122,
-  40, 163, 121, 223, 229,  88,  13, 224,
- 126,  65, 161,  69, 201,  14, 112,  80,
-   5, 175, 186, 247, 206, 205, 108, 218,
-  95, 114, 166, 208, 113, 227,  88, 168,
- 218, 248, 201,  31,  63,  32, 124,  86,
- 192, 207, 245, 157,  99,  14,  11, 199,
-  69, 139, 201, 193,  85,  54, 187, 102,
- 224, 148,  93,  90, 119, 165,  32,  72,
- 235, 100,  68,  42, 130, 144, 112, 239,
-  48, 210,  24, 225, 240,  96, 177, 183,
- 103,  33,  24, 231, 181,  33, 251,  91,
- 206, 116,  69, 182, 153, 242, 155, 117,
- 109,  54,  86, 150, 182,  51, 137,  74,
-  26,  15, 172,  15,  29,  41, 241,  55,
- 195, 141,  78, 164, 219, 150, 252, 220,
- 113, 207,  41, 161,  71, 103, 176, 155,
-   0,  68, 111, 241, 130, 243, 226,  19,
- 230, 254, 224, 208,  49, 226, 153,   1,
-  34,  58,  34, 215, 249, 244,  80,  30,
- 147, 216, 143,  40,  27, 182,  43, 153,
- 208,  39, 189, 115, 167,  48, 122, 149,
- 164,  81,  96, 126, 168, 154, 209, 149,
-  34, 113,  21, 241, 135, 132,  97, 211,
- 162, 204, 110, 181,  28, 204, 104, 105,
- 174,  29,  15, 145, 132, 103, 123,  97,
-  95,  63,  16,  65,  36, 189, 191, 225,
-  28,  62,  22,  15,   4,  84, 115,   7,
- 223, 111, 152, 179, 106, 150,  47,   0,
-  39, 228,  88, 255,  48, 171,  64, 229,
-  54, 150,  21, 189,  87,  41, 191, 225,
-  82, 104,  90, 225, 102, 199, 154,  61,
-  10, 120,  45,  74,  23, 127, 233, 151,
- 180, 195,  85, 217,  65, 188,  29, 125,
- 189, 205,  15,  51, 241, 176, 145, 173,
- 236,   2,  18,  22, 107, 222, 229, 197,
-  52, 205, 128, 234, 129, 176, 177, 216,
- 189,  22,  22,  70, 242,  50,  24,  78,
- 229, 250, 184,  16,  57, 249, 218,  45,
- 150, 240, 210,  56,   0, 155, 217, 227,
-  92, 138, 213, 236, 108,  85, 237, 162,
- 102, 187, 149, 214, 146, 176,  46, 235,
- 185, 200, 251, 237, 157,  47, 220, 201,
- 204, 222, 244,  95,  62,  36, 233,  30,
- 236, 108,  87, 216, 137,  59,  20, 209,
- 232, 254,  69,  55, 106, 130, 208, 182,
- 176, 105, 121, 179, 172, 135, 180,  75,
-  59,  13,  70,  70, 226, 187, 159, 252,
- 134,  91,  72, 181,  10, 248, 154,   0,
- 187,  81,  39, 186, 107, 153, 132,  62,
-   7,   3, 240, 141, 188, 153,  99,  47,
-  13,   2,  98, 160, 196, 174, 205, 185,
-  38, 126,  87, 224,  27,  47,   1, 234,
- 232,  46, 101, 208,  82,  35, 218, 138,
- 244, 109,  32, 205,  84,   9,  84, 143,
- 157, 227,  42,  13, 200, 104, 100, 235,
-  71, 143,  68,  79,  72, 226, 227, 159,
- 240,  23, 210,  61, 214,  91, 153, 160,
- 164, 148,  34, 223, 120, 220,  11,  25,
-  28, 126,  31, 228, 146,  96,  26,  64,
- 191,  22, 246,  18,  66,  68,  46,  23,
-  69, 171, 124, 207, 243, 205,  87,  75,
- 185, 218, 167, 252,   5,  90, 234, 135,
- 107, 150, 163, 108, 212,  57,  36, 108,
- 252,  64, 144, 217, 188, 159,  62,  47,
-  71,  25,  86,  45, 136,  34, 195, 103,
- 251,  30, 253, 117,  82,  93, 119, 148,
-  18,  49,  22, 169,   9,  36, 100,  35,
-  58,  49,  67, 134, 203, 249,  17,  87,
-   3, 127,  78,  65,  14, 102, 178, 107,
-  70, 238, 234, 240,  75,  53, 188,  40,
- 190,  98, 207, 164, 221,   2, 110, 106,
- 171,  60,  22, 210, 113, 176, 223,  38,
-  63, 150, 195,  76, 110,  50, 154, 150,
- 180, 177,  39, 121, 215,  79, 227, 246,
-  40,  62, 231, 241,  21, 122, 158, 216,
-   9,  76, 211, 158, 152, 169,   1,   4,
- 131, 210,  19,  34, 136,  59, 167, 237,
- 219, 198, 183,   2,  55, 244,  29, 220,
-  62,  13, 178, 143, 146,   1, 108,  23,
-  84, 106,  60, 174,  94,  62, 100, 164,
-  58, 254,  74, 185, 236, 134,  28, 208,
- 130, 169,  35, 250,  74,  45,  35,  75,
- 138, 113,  98, 120, 242, 144, 104, 113,
- 190, 146,  48, 201, 114, 116, 120, 252,
- 206, 226,   4, 141, 200, 111,  93,  57,
- 255, 182, 185, 241, 229,   2, 223,  29,
-  43, 222, 109,   0,   1, 109, 133, 218,
-  69, 130,  48, 143, 205,  49, 213,  16,
-  14,  89,  18, 254, 133, 161, 114, 244,
- 158, 193, 188,   6,  52,  87, 163,  45,
- 159,   2, 122, 109, 253, 102, 216, 151,
-  41,  89,  34, 149,   9, 130, 126,  76,
-  46,  51, 192, 136, 248,  85, 142, 142,
-  69, 254, 239, 213, 216, 183, 213,   1,
- 223,  77,  77,  79, 189,  66,  29,  98,
- 228,  21, 164, 113, 163, 121, 137, 152,
- 241,   4,   3, 136,  42, 156, 145,  47,
- 241, 173, 180, 232,  64, 227,  17, 177,
- 180,  47, 156, 154,   0, 217, 112, 153,
- 243,  22, 171, 181,  55, 182,   2,  49,
- 100,  37, 173, 166, 252, 138,  25,  94,
-  93,  77,  34, 251, 178, 136, 137, 105,
- 182,   4,  84,  17,  84, 113, 212, 185,
- 206, 114, 228, 135,   1, 138,  35,  20,
-  25,  28, 165, 207, 108, 253,  45,  30,
- 204, 128, 104, 168, 140, 158,  79,   4,
-  51, 207, 105, 106,  67, 179,  77,  64,
-  86,   2, 184, 240, 166, 169, 219,  63,
- 101,  19, 185, 181,  64,  89, 184,  21,
-  98, 133, 128,  51, 187,  69, 175, 101,
- 106, 190, 208,  36, 150, 106,  35, 241,
- 100,  72, 208, 209,  92, 127, 148, 173,
- 202, 111,  62, 170, 168, 213, 244, 192,
-  65, 170,  83, 223, 126, 206, 210,   5,
- 213,  62, 169, 237, 161, 238,  46, 133,
- 135,  64,  48, 215, 128,  91, 155,   0,
-  19, 205, 131, 195,  29, 213, 235,  78,
- 211,  84, 135,  67, 137,  56, 158,   9,
- 200, 152, 188,  83, 190, 225, 211,  56,
- 129,  81,  35, 128, 255, 148,  65,  11,
- 122, 185,  99,  11, 225, 213, 150, 215,
- 129, 213, 180,  51,   1, 212, 217, 174,
- 237, 151, 132,  37,  20,  66, 199,  79,
- 144, 192, 151,  24, 116,  15,  16,  36,
- 242, 117,  56,  86,  43,  22, 100,  56,
- 140,  20,  88, 226,  27, 185, 195, 139,
-  35, 224,  51, 241, 211, 167, 223,  96,
- 178, 214,  86,  86, 234,  44,  55, 178,
- 108, 207, 219, 189, 146,  41,   0, 130,
-  87,  12,  63,  65,  21, 239, 158, 140,
-  35, 168, 205, 225,  36, 236,  60, 204,
- 141,  36,  61, 177, 193, 209, 246, 232,
-  93, 150, 236,  24,  46, 147, 204,  89,
- 109, 198, 168, 196, 125,  64, 204, 239,
- 207,   3, 244, 199, 110,  78, 174,  97,
-  55, 142, 228, 206, 250,  50, 229,  81,
-  33, 252, 186,  76, 118, 118, 249,  81,
-  93, 157, 223, 244, 228, 130,  14,  50,
- 218, 168, 138, 174, 155, 215, 164,  49,
-  86, 147,  69,   6, 216, 207, 183,  21,
- 172, 152, 176, 223, 115,  63, 152,   6,
- 205, 118,  58, 184, 249, 197, 180, 132,
- 135, 123,  67, 178,   0, 175,  17,  72,
- 215, 187, 137, 132, 183, 156, 237,  15,
-  12, 198,  19, 137, 255, 249,  74, 168,
-  70,  37,  26, 254, 129, 143, 193, 156,
-  68, 206, 125,  24, 240, 149, 198,  29,
- 177, 246, 253, 214, 165,  93, 114,  30,
- 183, 104,  71, 186, 250, 147, 154, 103,
- 221,  23, 208, 201, 142,  67, 199,  78,
- 202,  13, 192, 192, 112, 129, 202, 161,
-  92, 230, 106,  34, 190, 172, 187, 199,
- 141, 160,  41,  41,  34, 109,  21,  92,
- 129, 155, 154,  27, 171, 109,   9,  77,
-  28, 153, 177, 162,  55, 254,  27, 204,
- 195, 193, 151,  60, 153,  12,  43, 226,
-  74, 146,  77,  71, 218, 117, 220, 185,
- 209, 161, 107, 249,  60,   3,  82,  28,
-  42, 234, 171,  27, 156, 103,   8, 101,
-  76, 182, 217, 151,  67, 254, 198,  83,
- 243,  29,  70, 105, 215, 237,  73, 202,
- 102,   0,  28, 199,  53,  62, 140, 168,
-  65, 243, 149, 205, 203, 231, 180, 119,
-  56, 208,  12, 166, 178, 221, 192,  10,
- 156, 234,  49,  12, 129,  94,  23, 233,
- 139, 246, 240,  44,  48, 130, 159, 201,
- 179,  94, 122,  23, 126, 135, 236,  56,
- 239, 200,  95, 163, 162, 104, 187, 175,
- 205,  20, 125,  85,  66, 140,  86, 189,
- 190, 218, 162, 216,  22, 163,  75, 140,
- 128,  21, 227, 174, 149,  73, 193, 250,
- 202, 215, 125,  48,  14, 206, 217, 118,
-  96, 146, 158,  32, 126, 150, 128,  12,
-   2, 243,  32,  80, 211, 114,  60, 240,
-  79, 201, 224,  94, 229, 210,  10, 250,
- 194,  34, 198, 104, 209, 141,  60,  10,
-  30, 156, 241,  52, 192,  23, 212, 147,
- 110,  16, 233, 255, 162, 238, 122, 250,
-  16, 244, 162,  56, 130,  68,  63,  10,
- 226,  95, 144, 158, 109,  70, 188,  29,
- 175,  78, 110, 237, 132,   4,  16,  19,
-   6,  38, 119,  75, 189, 250, 234,  57,
-   3, 227,  66,  40, 250,   5, 255, 194,
- 228, 171,  19, 228, 113, 174, 184, 215,
- 115, 100, 152,  88, 112,  68, 215,  70,
-  86,  63,  63, 226, 208,  75,  70,  87,
-  75, 238,  38, 169, 238,  45,  55,  25,
- 121,  10, 168,  22,  92,  25,  54, 230,
-  52, 163, 145,  21,  25,  42,  62,  69,
- 108, 227,  46, 236, 230, 209,  11,  14,
- 242,  52,  92,  86,  91,  91,  29,   2,
- 173, 193, 166,  24, 199, 127,  87, 202,
-  46, 199,  32, 144, 213, 173, 243,  74,
- 138, 201, 172, 124, 200,  14, 101, 177,
- 159, 198, 111,  94, 139, 195, 221,  87,
-  97,  10,  32, 125, 151, 205, 180, 232,
- 140,  29,  50,  76, 118, 181, 250, 102,
-  74, 120, 101,  76,  30,  41,  55,  42,
-  94, 187,  17, 109, 200, 230, 232, 150,
-  87, 253,  21, 220,  92, 179, 125, 172,
- 115, 148,  36, 249, 166, 153, 227, 110,
-  55, 228,  97,  41,  55, 157,  78, 238,
- 180,  36, 130,  14, 209, 175,   6, 104,
- 115, 148,  17, 168, 118,  42,  19, 159,
- 189, 239,  60, 179, 104,  98, 201,  19,
- 140, 241,  62,  92, 133, 189, 231,  70,
-   1,  18, 128,  73,  47,  24, 174,   5,
-   3,  24, 245,  82,   5, 131,  48, 164,
-  56,  93,  86, 253, 151, 123, 233,  33,
-   5, 102, 143, 199, 101, 180, 162,  86,
- 123, 253,  11, 221, 140, 147, 252, 111,
-   3,  21, 190,  52,  95, 114,  18, 208,
- 192, 252, 175,  24, 123,  68,  87, 228,
- 213,  19, 112, 245, 179, 154, 225, 226,
- 245, 117, 191, 239,   7, 182, 188, 191,
- 216, 206,  32,  38, 170, 218, 126, 183,
-  20, 107, 104,   0, 123, 100, 134, 139,
- 242, 130,  74, 175, 100,   6,  93, 217,
- 214, 226, 192,  77, 224, 221,  76,  80,
- 102,  36,  88, 184,  43,  62,  14, 206,
- 203, 123, 147,  14,  83, 170, 142, 100,
- 120, 232, 222, 145,  44,  13, 240, 229,
-  90,  26,   9,  17, 199, 131,  67,  27,
- 233,  10,  48, 218, 180,  51, 234, 255,
- 106, 211, 211,  78, 179,  58, 197, 184,
-  58, 133,  52, 153, 159, 253, 214, 173,
- 144,  80, 157, 126,  91, 168, 248,  94,
- 131, 219, 148, 191, 253,  12, 218, 166,
-  33, 180, 195,  22, 193,  80, 180,  45,
-  22, 244, 134, 179, 193, 177, 150, 241,
-  11,  21,  38, 237, 113, 180, 208, 186,
- 196, 244, 206, 131, 182, 161, 160,  11,
- 222, 177,   0, 180, 238, 180, 108, 167,
-  44,  97, 250, 154, 152, 111,  28, 173,
- 253, 154,  25, 116,  28,  21, 116, 247,
- 211, 103,  38,  36,  48,  11, 177, 210,
- 135,  75,  97,  34, 115,  39,  85, 107,
-  95, 230, 153,  90,  11, 162, 147, 159,
- 180, 219, 200,  58, 239, 191, 121,  61,
-  50,   1, 132,  59, 221, 126, 137, 104,
-  25,  26, 206, 189, 113, 222, 134, 178,
-  20,  14, 169,  65, 176, 205, 122, 119,
-  18,  43, 160, 188, 210,  70,  61,  16,
- 120, 159, 195, 244,   0, 177, 132,  12,
-  87, 184, 219,  78, 118, 203,  54, 150,
- 124,  21, 112, 124,  30, 178,  82,   7,
- 226, 171, 229, 213, 148,  14,  76, 126,
- 127,   4,  63,  29, 155,  37, 141, 167,
- 193, 144,  78, 192, 158,  36, 215, 235,
- 250, 163, 229, 149,  99, 221,  85, 104,
- 148,  52, 241, 195,  10,  71,  88, 209,
- 112,  52,  41,  41, 219,  95, 107, 195,
- 124,  88, 167,  29, 233,  32, 182,  50,
-  72, 185,  53,  84,   7,  89,  96,  66,
- 238, 211, 168,  61,  76, 153,  24, 152,
- 156, 220, 249, 149, 186,  71, 239, 177,
-  65, 144,  80, 239,  19, 235, 215, 210,
- 117,  91, 241,  84,  50, 135, 240, 132,
- 184, 170, 110, 120, 192,  24, 234,  90,
- 143, 184, 226, 189,  28, 136,  75, 200,
-  32, 199, 229, 206, 238, 165, 216,  33,
- 218,  16, 100, 107, 197,  38, 105,  87,
-  43, 211,  17,  94, 247,  15, 167,  67,
-  32,  26, 175, 105, 177, 161,  82, 148,
-  36, 116,  99, 119,  99,  58,  12, 130,
- 222, 207,  35,  85, 221, 205,  81,  10,
- 181,  35, 155,  91, 116,  95, 185,  73,
-   1, 227, 160, 189,  70, 146,  90, 123,
-  66,  39, 246, 229, 138,  99, 132,  94,
- 110, 211,  63,   4,  43, 148, 235,  22,
- 234, 252,  90,  81,  97,   8,  76, 108,
- 135,  54, 160,  82, 243,  69, 218, 254,
- 115, 215,  78, 178, 236, 249, 124,  90,
-  41,  77, 163, 128,  77, 159, 170,  95,
- 131,  30, 122, 239,  78,   8,  81,  83,
-  55, 216, 150, 220, 110, 201,  68, 135,
- 175, 165, 139,  22, 121, 253,  92, 203,
- 159, 222, 227,  14, 162, 142, 165, 144,
- 140, 230,  56, 154, 162, 239,  92, 227,
-  25, 186,  12,   0,  70,  32,  31, 146,
- 105, 184, 107,  87,  81, 206,  40,  82,
- 160,  67, 195,  17, 177,  91, 187,  62,
-  92, 215, 198,  21,  29, 111, 194, 250,
- 210, 104,  69, 180, 125, 194,  73, 248,
- 158,  41,  63, 184, 182,  19, 223, 126,
-  92,  64,  78, 241, 128,  37, 181,  66,
-  41,  97, 252, 158, 142, 234, 205, 231,
- 162, 175, 175, 246,  22,  53, 200,  50,
- 234,  85, 173, 255, 205, 246,  73, 233,
-  44, 240,   1, 178,  14, 201,   7, 100,
-  59,   2,  24,  53, 164, 103,  97,  52,
- 156, 226, 150,  19, 214,  31,  24, 182,
- 223,  31, 216, 143, 162, 130,   0,  93,
- 157, 236, 222,  94, 132,  57, 124, 165,
-   7,   3, 162,  48,  26, 232, 208, 114,
-  33, 209, 199, 221,  19, 219,  14, 249,
-  78, 252, 252, 202, 193,  10, 244,  32,
-  16,  18, 196, 211, 156, 163,   7,  67,
-  70,  94, 148,  57, 160,   2,  54, 211,
- 181,  76,  95,  54,  85, 110,  36,   4,
-  36, 252, 139,  46, 176, 177,  15, 173,
- 153, 120, 214,  91, 149,  17, 182, 189,
- 192,  98, 146, 173, 150, 102, 216, 250,
- 203, 147, 113, 132,  96, 110, 103, 182,
- 179, 176, 122,  59,  70,  58,  91, 108,
- 126,  67,  22, 179,  86,  94, 162, 232,
-  71, 219,  20, 181, 183, 238, 194, 120,
- 196,  36,  90, 176,  30,  66,  71, 107,
- 103, 243,  34, 210, 132, 148,  65, 219,
-  83,  42, 133,  27,  44, 226, 160,  96,
- 195,  86,   3, 153, 255, 216, 211, 159,
-  50, 163,  40, 137, 247,  95,  22, 201,
- 121, 244,  48, 119, 178,  13, 122, 249,
-  61,  84,   7,  94, 189,  95,  72, 143,
- 107, 127,  52, 236, 218, 157,  21, 218,
- 254,  88,   8,  39, 105, 176,  28, 131,
- 119, 153, 108, 241, 133, 198, 161, 245,
-  31, 165, 192, 237, 208, 112, 209, 148,
- 234, 238, 136, 136,  97,  52, 211,   6,
- 170, 210,  92,  84, 179, 201, 147,  13,
-   1,  50, 169,  91, 105, 228, 221,  27,
- 111, 119, 214, 147, 243,  59, 203,  54,
- 181, 234, 214, 177,  78, 100,  62,  60,
- 149, 158, 197,  47, 224, 252, 128, 248,
- 145, 253, 239, 116,  58, 220, 209, 241,
- 150,  87,  68,  20, 133,  86, 234, 213,
- 196,  76, 212,  53, 105,  61,  68, 238,
- 193,  29, 113,  37, 239, 130, 144, 145,
- 196, 109, 201,  51,  23, 245,  17, 129,
- 248, 206,  97,  84, 144,  91, 146,  71,
-  50,   8, 185,   8, 108, 170, 231, 125,
-  28, 225,  17, 241, 238, 110, 102, 248,
- 246, 229,  89, 148, 112,  65,  51, 201,
-  33, 102, 123,   0,  86,  65,  23, 219,
-  39, 252,  49, 155, 217,  29,  12, 205,
- 235,  93, 130, 114, 244, 133,  23, 219,
-  73,  18,  70,  94,  83, 101, 230, 222,
- 173,  15, 100, 244,  80, 227,  42,  93,
- 101,  31,  39, 148,  63,  39, 164, 192,
- 162, 179, 164, 146,   1, 104,  96,  86,
-  59, 149,  41, 153, 219,  14, 216, 249,
-  96, 219, 219,  50, 116, 139, 102, 142,
- 138, 188,  87,  48,  78,  90,  40,  19,
- 113, 244, 102,  91, 224, 247, 210,  27,
-  46, 117, 211,  39, 140, 114,  81, 254,
-  14, 114, 103, 184, 155, 198,  35, 136,
- 168, 208, 100, 163, 203, 111,  48, 210,
- 133,  42, 189, 190,  38, 135, 221,  25,
- 174, 215, 112,  76,  90,  50,  44, 141,
- 104,  68, 119, 235, 118, 221, 107, 246,
- 178,  10,  59, 137, 228,  12,  32, 145,
- 134, 236,  71,  40,  31, 242,  14,  60,
- 178, 133, 172,  56, 171, 252, 251,   9,
- 124, 227, 155,  54, 252,  31, 168,  80,
-  32, 133,  41, 244,  99, 148, 102, 236,
-  22, 212, 147, 186,  65,  31,  56, 230,
- 190,  47, 123, 213,   8,  53, 194,  43,
- 111, 230, 210,  72,  38, 145, 136,  59,
-  69, 129,  10, 239, 251,  28, 174,  52,
-  32, 104, 144, 175, 161, 175, 236, 158,
-  36, 208,   9, 181, 178, 173, 183,  51,
-  22, 178, 232, 228,   4, 172, 253,  29,
- 162, 204, 192,  36, 184,  31,  11,  34,
- 246, 137,  67, 132, 164, 220, 195, 129,
- 176,  43,   1,   9,  63,   1,  44, 156,
- 131,  85, 157, 195,  85, 222,  25,  95,
- 224, 235, 218, 214, 243, 161, 213, 246,
-  94, 239, 159,  65, 241, 222, 125, 161,
- 114, 124,  49, 227, 145,  73, 125, 147,
-  70,  46,  19,  23, 196, 193, 223, 130,
-  78,  14,  51, 235,  10,  22,  56,  47,
- 184, 252, 129,  37,   2, 197,  71, 247,
-  35,  37,  47, 110, 111, 156,  57, 188,
-  17, 175, 115, 201, 167, 193,  32,   1,
- 236, 199, 158, 145,  51,   8, 255,  94,
-  77, 237,  46,  31, 253, 122,  27, 142,
-  10,  60,  32, 177, 251, 120,  12,  82,
- 129, 148, 172, 113,  50,  17, 148, 226,
- 241,  36,  15,  26,  48, 105, 152,  81,
-  78, 208, 245, 248, 189,   4, 252,  31,
-  68, 115, 226,  82, 238,  40, 228, 245,
- 165,  24, 225, 137,  74, 107, 108,  89,
-  33, 191,  80, 131, 140, 140, 234,  56,
-  37,  84, 115, 112, 235,   6, 148, 159,
- 219, 251, 173, 168,  33,  45, 128,   1,
- 150,  66, 180, 230, 248, 141, 111,  96,
- 132, 148, 175, 224,  73, 226,  52, 130,
-  82,  72,  64, 254,   2, 255,  30,  99,
- 215, 186,  12, 251,  35,   7, 253, 163,
- 187, 157,  39, 114, 222,  75, 164, 197,
- 133, 213,  89, 230, 115,  94, 150, 188,
-  17, 132, 245, 224, 231, 124,  27, 246,
- 242, 159,  71, 104, 150,  22,  24, 174,
- 241, 165, 140, 133,  18, 129, 226, 103,
- 251, 171, 139, 213, 183, 235, 110, 193,
-  10,  74,  73,  76,  75, 106, 206, 165,
-  96, 108, 103, 139, 147, 144,  52, 239,
- 141, 181,  39,   6,  81, 245, 187,  64,
-  22, 112,  86, 201,  39, 190, 123, 140,
-  17,   6, 231, 206,  74, 102,  93,  79,
- 238,  54, 159,  53,  76, 100,  18,   3,
- 169,  53, 187, 205,  79,  49, 152, 148,
-  63, 203, 160,  87,  67, 178, 115, 125,
- 200,  18,  94, 169,  19, 225, 135, 231,
-  84, 188,  71, 218, 107, 159, 143,  29,
- 210, 250,   0,  81,  71,   3,  67,  90,
- 202,  33, 235,  19, 210,  77, 218, 236,
- 243, 218, 169, 244,  90, 183,   7, 245,
-  43, 202,   0,  76, 176, 195, 199, 112,
- 166,  97,  46, 126, 175,  72, 221,  28,
- 232, 136, 224,  35, 213,  73, 199, 144,
- 162,   0, 169, 189, 158,  38,  13,  98,
-  30, 101,  64, 171,  75, 218, 247, 202,
- 196, 196,  22,  94,  97, 164, 254, 201,
- 234, 213, 232, 186,   8, 227, 207, 195,
- 157,  71,  59, 150,  78,  85,  74, 118,
-  65,  65, 141,  62,   1, 200,  57, 223,
-  64, 111, 237, 157, 230, 195, 224, 200,
-  80,  48,  84,  41, 115,  58, 202, 108,
- 109,  22, 211, 114, 152, 166,   8,  38,
- 140, 204, 120, 195, 157, 149,  95,  36,
- 233, 255,  93, 190,  99,  98,  43,  22,
- 236, 213, 144, 152, 124,  76,  15, 173,
- 244,  47, 197,  20, 105, 180,  42, 107,
- 173,  59, 121, 123,  68, 125,  92, 157,
-  13, 251, 152, 127,  66,  34, 235,  59,
- 108, 192, 234,  94, 152,  99, 208,  61,
-  84,  39, 154,  51, 217, 226,   8, 149,
-  97, 217, 157,  58, 208,  47,  84,  61,
-  61, 155,  90, 189,  32,  76,  99,  79,
-  36, 180,  77, 202,  22,  38, 211, 200,
- 247, 189, 209,  59, 239,  25, 133,  51,
- 110, 232, 100, 168,  37, 130,  32,  45,
-  40, 193,  64, 131, 165, 144, 204,  57,
- 250, 228,  67, 219,  62,  14,  76, 160,
- 200,  98, 149, 111,  81,  90, 240,  81,
-  43, 200,   3, 211,   3,  87, 149, 210,
- 110, 200, 134, 166, 243,  86, 166, 202,
- 127, 205, 152, 175, 213, 169, 113, 105,
-  39, 249,  52,  35,  61, 195, 246, 101,
-  78, 178,  90, 128,   2,  34,  80, 120,
-  58, 123, 254, 164,  53,   1,  58,  52,
-  25,  92,  56, 119, 134, 210, 115,  59,
- 158,  52, 163, 245,  80,  64, 146, 189,
- 134, 137,  92,  96, 184,  77,  32, 142,
-  86, 220, 131, 119, 205, 116,  63, 190,
- 140,  36, 211, 169,  82, 196,  46,  85,
-  78, 131, 166, 228, 168, 158,   4,  82,
-   4,  95, 223, 226,   4,  84, 205,   7,
- 131, 129,  37,  90,  92, 151, 204, 229,
-  66, 123, 242, 121,  76, 191, 250, 152,
- 204, 112, 101, 181, 246, 136,  69, 203,
-  85, 178,  18, 203,  24,  57, 199,  29,
- 250, 126, 245, 195,  55, 118,  53, 194,
- 230, 185,  99, 181, 122, 168, 253,  76,
- 207, 118,  91,   3, 162, 166, 248, 253,
-  92,  60,  30,  34, 119,  68,  76, 207,
-  81, 119, 209,  46, 197, 145, 119, 186,
-  53,  40, 161, 237, 172, 167,  63,  11,
- 123, 225, 151, 141,  21,  91,  39, 124,
-  47,  65,  13,  37,  94,  38,  68,  62,
- 189, 179, 119, 175,  38,  91,  29,   4,
- 190,  33, 215,  81, 249, 247,  67,  19,
- 137, 228, 231, 138,  48,  41,  38, 131,
- 191, 222,   0, 120, 189,   9, 217,  43,
- 162, 116, 162, 103, 249, 113,  43,  97,
- 138,  44,  26, 199, 110, 173, 185,  53,
-  23, 174,  60,  82, 174, 213,  82, 129,
- 195, 209, 246,  85, 123, 191, 254, 187,
- 111, 230, 149, 187,  23,  53,  57, 248,
-  25, 240,  65,  59,  50, 117, 137,  18,
- 247, 223, 105, 154, 195, 234, 109,  45,
-  11,  12, 133,  66,  76,  37,  80, 243,
- 103,   9, 113, 107, 220,   8, 105, 244,
-  32,  58,   1, 111,  29, 215,  13,  36,
- 211,  16,  98,  17, 230,  57, 187, 127,
-  80,  71, 156,  24, 215, 214, 146,   1,
- 232, 125,  57,  81, 134, 192, 184, 209,
- 194,   4,  63, 113, 231, 112, 131, 123,
-  90, 196,  94,  34,  12, 122, 168, 180,
- 193,  70, 137, 213, 251,  76,  63, 166,
- 176,  34, 141, 105, 114, 220, 208, 240,
-  42,  44, 155, 185, 145, 158, 195, 150,
- 167,  10,  27,   1,  59, 247, 119, 199,
-  15, 172, 196, 156, 114,   5,   6, 238,
- 108, 166, 247, 125,  62, 246, 200, 138,
- 142, 206,  63,  39, 151,  27, 150, 241,
- 182,  21,  55,  68, 191, 103,  28, 221,
-  36, 173, 131, 127, 203,  11, 177,  98,
- 132,  18, 123, 238, 202, 154, 139, 181,
- 226, 126,  55, 200, 103,  42, 193, 104,
- 114, 141, 143, 203, 194,  57,   1,  16,
- 188, 129,  29, 144, 149, 156, 138, 247,
- 157, 149,  19,  81,  72,  16, 155,  42,
- 248,  56,  95, 246,  18, 168, 153,  79,
- 101, 156, 224, 159,   7,  35,   1,  38,
- 212,  87, 214, 162, 173,  95, 193,  70,
-  88, 212, 194, 141,  39, 178, 104,  75,
- 201,   1, 202,  49,  92,  29, 134, 249,
- 135,  23, 226, 165, 223, 224, 241, 174,
-  47,  77, 221, 114,  15, 154, 145,  47,
- 196, 215,  41, 113, 129,  29,  71,  64,
- 120, 215, 206, 224, 137,  34, 114, 215,
- 116,  85, 245, 252,  32,  34,  72,  28,
- 116,  75, 237, 155, 250, 188,   2,  91,
-  47, 242, 127, 167,  90, 195,  14, 216,
- 217, 163, 212,  48,  78, 212, 206,  85,
- 108,  79, 244, 211, 180, 166,  84, 132,
- 209, 175,  34,  49, 203,  93, 140,  81,
-  40,  82, 195,  68,  98, 170, 234,  99,
-  58,   9, 234, 115, 150,   9, 225,  85,
- 170, 159, 156, 189, 223,  40,  69, 185,
-   5, 242, 142, 136,  69,  71, 163, 211,
- 197,  69, 237,  71,  11,  26, 242, 203,
- 110,  66, 115, 193, 150, 100, 185,  38,
- 117, 105,  61, 242, 152, 237, 114,  68,
- 243,  21,  70,  18, 111, 252,  77, 118,
- 200, 139, 208,  50, 220, 199,  42, 101,
- 110,  89, 204,  99, 108,  77, 163,  78,
- 238, 138,  72,  39,  80, 149,  79,  84,
-  71, 213,  94, 163, 235, 142,  97,  39,
- 109,  90, 162, 173, 199, 185, 133, 243,
-  54, 170, 107,   2, 103,  33,  71, 188,
-  38, 100,  86, 239, 221,  79, 147, 135,
- 156, 227, 245, 101,  97, 174,  36, 237,
- 120,  72, 123,  88,  31,  74, 175,  30,
- 120,  68, 168,  20,  98,   5,  83,  65,
- 204,  20,  60, 140,  34, 113, 198,  13,
- 227,  65, 229, 208,  95, 193, 233,  86,
- 177,  83,   1, 200, 130,   7, 251,  49,
- 219,  71,  73, 177, 210,  25, 214, 252,
-  97, 184, 167, 133, 212, 104, 239, 140,
- 111, 101, 203,  44, 219,   0, 237, 101,
- 174,  42, 130, 162, 237, 156, 187,  51,
- 120,  32,  53, 152, 158, 242,  52,   0,
-  21,  82, 223,   1, 115,  57,  71,  43,
- 109,  82,  35, 130,  67,  44, 131,  52,
- 135, 136,  81, 212, 220, 215,   9, 228,
-  44, 118,  39, 249,  18, 232, 229,  71,
- 255, 167,  44,   1, 106,  89, 230,  86,
- 188, 135, 179, 143, 143, 124, 226, 144,
- 186,  61, 224, 205, 106,  37,  89, 210,
- 242,  40, 192,  95,  81, 133, 134, 155,
- 238, 205, 207,  66, 124, 195, 238,  92,
- 174, 209,  84, 152, 197,  72, 124,   4,
- 141, 223, 179, 144, 103, 112,  85, 129,
- 247,  30,  23,  42,  19, 249,  64,  63,
- 231,  19,  21, 127, 217, 191,  21, 209,
-  89,  12, 156,  43, 167, 137,  26, 213,
-  19, 243, 193,  43,  81, 170, 124, 111,
- 152,  89, 184,   9, 142,  20, 176, 158,
- 108,  59, 126, 250, 190, 173,   9, 183,
- 137, 221, 117,  58, 131,   0,   5, 146,
- 114,  38, 182,  29, 142, 227, 101,  92,
- 123, 147, 189, 208, 202,  10,  74,  49,
-  68,  89, 217, 178, 114, 136,  90, 179,
- 192,  92, 135,  47, 185, 212, 170, 189,
- 177, 114, 157, 238, 153,  21, 132,  29,
- 118,  46,  55, 198, 219, 139,  42, 150,
- 210,  80,  74,   8, 181, 190, 118, 255,
- 221,  82, 141,  16,  17,  22, 169,  27,
-  65, 247,  21, 164, 136, 237,  74, 197,
-  89,  22, 231, 177, 188,   6,  55, 124,
- 214, 175,  98, 213,  93, 184, 107,  44,
- 136,  16,  63, 249, 205, 119,  53, 230,
-  88, 246, 229, 126, 148,  25,  54, 172,
- 218,  18, 216, 179,  63, 105,   0, 210,
-  34, 109, 117,  43, 234,  96,  96,  61,
- 144,  29,  46,  64,  86, 255,  27,  92,
-  84, 105,  14, 150, 131, 205, 147, 236,
-   3, 235, 157,  89,  96, 151,  20, 234,
- 154, 253, 210,  48, 232,  84, 128,   8,
-  25,  89,  82,  32, 152, 205, 179,  12,
-   3, 232, 103, 251,  20,  74, 247, 209,
- 227, 188, 111, 175,  24,  24, 235,  13,
- 123, 240,  28,   6, 103, 199,   4, 149,
- 179, 226,  34, 121, 120, 147, 240,  68,
- 174, 188,  82, 214, 164,  55,  36,  40,
-  20, 177,  11, 107,   3,  24,   2, 157,
- 155, 109, 158, 134, 218,  90,  99, 124,
- 213,  40,  72, 224, 173,  97, 110, 113,
-  89, 193, 188, 209,  27,  19, 228, 200,
- 133, 245, 164, 188, 213, 192, 206,  73,
-  58,  87,  93, 197, 140, 145,  38, 218,
- 188, 222,  87, 208, 100,  84, 153,  71,
-   4,  87,  45, 209,   9,  46,  86, 107,
-  28,  40, 148, 152, 176, 179,  80, 235,
-  89, 247, 126,  88, 179,  23, 148, 106,
- 146, 218, 187, 105, 202,  56, 170,   4,
- 197, 129,  82, 110, 129, 102,  47, 180,
- 169,  77,  10, 223, 160, 111, 185, 244,
-  75, 169, 110, 251, 141, 180, 142,  75,
-  41, 129,  82, 183,  12, 165, 237, 242,
-  73, 118,  72,  81, 127, 214,  66,  95,
- 135,  27, 179, 100,  23, 103,  83, 173,
- 164,  34, 123,  47,  71, 219,  69, 216,
- 178, 110, 215, 162, 219, 134, 138,  79,
- 208,  35, 146,  19, 122, 169,  93,   7,
-  84,  95,  62, 223,  79,   8, 253,  73,
- 243,  98,  93, 235, 159,  46, 121, 163,
-  37, 119,  47,  59, 225, 206, 192,   9,
- 128, 200,  26, 154, 112, 179,  18, 153,
- 181, 105, 205, 229,  76, 160,  77, 242,
-  21, 144, 192,   8, 227,  41,   1, 180,
-  34, 250, 157, 121, 255, 137, 216, 169,
- 205,  95, 115, 237, 151, 245, 252,  81,
- 176, 239, 207,  30,  39,  36, 110,  97,
- 195,  33,  12, 171, 217,  83, 246,  27,
- 147, 194, 253, 223, 173, 110, 120, 248,
- 193, 219, 117, 230, 153, 171,  69, 251,
- 101,  51,  24, 101,   5,  83,  69,  90,
- 235, 172, 180, 151, 193, 194, 118, 153,
- 148,  50, 171, 170,  52,  13, 183, 132,
- 228,  87,  69, 220, 210, 206,  32, 208,
- 192, 143, 173, 212, 249, 103, 201, 140,
- 173, 185, 101,  63, 146, 137, 164,  55,
- 250, 248, 215, 132, 243, 107, 100,  37,
-   0, 118,  92, 246, 162, 231, 227,  72,
- 123, 148, 249, 255,  82, 152, 242, 221,
- 137,  61, 213, 150,  89, 207, 105, 254,
-  48, 219, 134, 186, 200, 127,   4, 233,
-  64, 134,  99,  53,   3,  36, 244, 180,
-  67, 241, 197, 191,  39, 240, 124,  42,
- 228,  74, 137,  28, 166,  74, 130, 124,
- 117,  76, 209, 196,  48, 148, 186, 186,
-  49, 141, 132,  38,  13, 241,  57, 181,
-  74,  67,  67, 150,  46,  32, 254, 136,
- 198, 156,  51, 140,  92, 197, 195, 243,
- 207,  85,  16, 216,  88,  92,  69, 134,
-  13, 112, 165, 169, 205, 194, 118, 186,
- 171, 113,  49,  88,  72, 197, 239, 212,
-  30, 168, 197, 107, 181,  56, 181,  42,
- 118,  72,  12,  61, 209, 139,  70, 119,
-   5, 137, 176, 190, 175, 233, 159, 233,
-  44, 112,   6,  52,  85,  84, 221, 163,
-  64, 115, 255,  91,  33, 229, 217, 168,
- 254,  14, 231,  63, 156, 226, 105, 118,
- 231, 140,  54,   4, 198,  61, 247, 163,
-  21,  70, 158, 231, 172, 156, 112, 143,
-  55, 252, 103,  29,  86,  11,  54, 173,
- 245,   2,  63,  17, 156, 227,  91,  97,
- 235, 155,  89,   8, 242, 145, 122, 167,
-  23,  29,  82, 167, 252, 217, 124, 189,
-  48,  47, 139, 173, 146, 107,  19,  18,
-  32,   7,  71, 228, 198,  48, 166, 142,
-  27,  81,  85,  27,  88,  80, 244,   9,
-  79, 238, 214, 131,  31, 144,  31,  86,
-  83, 187, 216,  46,  58, 112,  30,  19,
-  21,  85, 102,   3, 231,  66, 164, 143,
-  42, 131, 140, 127,  16, 138,  49,  73,
- 103, 185,  97,  93,  55, 180, 113, 161,
- 209,  93,  10, 156,   7,  27,  45,  78,
-  86, 158, 130,  73, 121,  32, 174, 201,
-  27, 112, 140, 229,  53,  42,  51, 131,
- 113,  71, 202, 234, 123, 154, 241,  69,
-   0, 216,   7,  66, 179, 209, 228, 250,
-  80, 183, 187, 162, 229, 137,  24,  67,
- 199,  84, 211, 227, 110, 160, 233,  81,
-  10, 108, 202,   1, 182,  39, 200, 154,
- 247,   1, 157, 165, 193, 239,  62, 148,
-  50, 181, 254, 119, 152,  70,  16,  43,
- 156,  40,  13,  67, 109, 161,  36, 149,
- 221, 168, 146,  14, 169, 154, 224, 224,
- 185, 192,   3, 182, 135, 108, 102, 183,
- 110,  41, 203, 177,  58,  83, 150,  93,
- 177, 132, 104, 214, 118,  96, 177, 188,
-  41, 244, 246, 172, 211, 156,  54,  45,
-  47, 205, 114,  52,  36,  98, 247,  42,
- 223, 221,  85, 237,  52,  68, 112,  12,
-  53,  66, 134, 244, 149, 185,  79,  44,
- 212, 103, 117,  31, 185, 154, 122,  51,
- 244, 247, 174,  53, 161,   8, 191,  45,
-  87,  35, 212,  15,  99, 249,  87,   9,
- 142, 246, 205,  68, 165,  87,  19,  61,
-  49,  39, 211, 166,  66, 121, 166, 213,
- 162,  21,  74, 110, 208, 200, 242, 209,
- 175,   4, 242,  39, 108, 220, 233,  30,
-  97, 231, 219, 113,  42, 121, 166, 123,
- 227,  89, 120,  50, 204,  70, 121, 110,
- 101,  20,  73, 235, 244, 179, 225,  57,
-  92,  48,  64, 163, 157, 245, 254, 141,
- 132,  81, 150,  59, 146, 166, 227,  21,
-  60,  15, 182, 249, 114,  25, 239, 145,
- 167, 241,  96,  49, 249, 235, 189, 108,
- 113, 100, 139, 247, 211, 188, 219,  60,
-  35, 255, 112, 155,  21, 187,  55,  26,
- 115, 235,  29, 233,  48, 170,  24, 126,
- 146, 220, 199, 187, 111,  81, 138, 230,
-  23,  88, 252, 153, 143, 142,  27, 159,
- 241, 136, 196,  87, 253, 225, 246,  51,
-  67, 250, 243, 102, 127, 110,   0, 168,
- 154, 250,  43,  37,  17, 207,  60, 173,
-  17, 156, 148, 104,  36,   0,  60,  95,
-  95, 208, 107, 128,  60, 115, 142,   1,
- 237,  10, 244,  36, 206, 231, 101, 247,
- 211, 155,  87, 198,  24, 162, 137, 161,
- 249, 245, 143,  31, 173, 200, 104,  90,
- 226, 166, 254, 252, 221, 212,   8,  75,
-  69,  57, 159,  30, 141, 141,  53, 207,
- 202, 246,  28,  45, 252,  56, 230, 248,
- 149,  41, 145, 182, 182, 242,  82, 178,
- 130, 237, 110, 170,  30, 172, 174, 155,
- 165, 154, 191, 142, 117, 218, 210, 165,
-  65, 152,  95, 120,  27, 164,  70,  64,
-  54, 197, 229, 146,  91, 195,  30,   0,
- 167, 165, 161, 127,  84,  92, 168, 238,
-  40, 199, 230, 116,   1,  55,   7, 210,
- 200, 228,  18,  15,  72,  46,  39, 188,
- 229, 119,  45, 228, 215,  41, 219,  94,
-  75, 185, 100, 131,  47, 221, 121,  31,
- 185, 120,   7, 124,  86,  40, 206,  15,
- 168,   8, 128, 155,  64, 134, 198, 252,
- 194, 167,  58, 149,  89, 119, 119,  31,
- 196, 102, 230,  59, 152,  64,  47,  87,
-  31,   6, 122, 124, 180, 187, 142,  86,
-  59,  78,  93, 165, 212, 251, 184, 157,
-  21,  67,  39, 254,  40,   4,  98, 174,
- 104, 205,  80, 128,  94, 215, 246, 176,
-  41,  48, 172,   2,  43, 250,   9, 178,
- 187,  59, 215,  23, 158, 101,  97,  36,
- 204,   6, 155, 244, 107, 227,   2, 199,
-  46,  21,  80, 232,  41,  88, 176, 208,
- 214,  80, 205, 129,  61, 203,  34,  94,
- 172,  10, 176, 132, 128,  56, 214, 235,
-  46,  86,  85, 125, 130, 228, 147, 251,
- 200,  25, 153, 247, 207, 197, 118, 159,
- 208, 124, 127, 170, 164, 174,  97,  28,
-  88,  47,  71, 229,  74, 172, 208, 157,
- 163,  62,  51, 159, 130, 133,  77, 123,
- 144, 224, 201, 242,  75, 251, 204, 162,
- 243, 192,  66, 127,  75, 109, 204, 120,
- 130,  50, 183,  56, 112,  71,  51,  98,
- 184,  13, 139,  14, 242, 134, 129,  74,
-  99, 252, 244, 195, 137,   0, 159, 111,
- 236, 107,  22, 187, 106, 203, 232,  64,
- 112, 183, 157, 232, 148, 101,   2, 166,
- 229,  24, 183,  58, 192,  13, 136,  25,
- 250, 195, 182,   1, 253, 201, 108,  95,
-  32,  99, 226,  46, 156, 104, 224,  99,
- 150,  78, 134, 247,  62, 113, 212, 141,
- 155,  38,  52,  39, 174,  47, 122, 221,
- 218, 207, 147,  29,  29, 188,  44,  24,
- 132, 155,  86, 192, 140, 117, 182,  38,
- 222, 123, 100, 248,  94,  97,   7, 236,
-   5, 188, 247, 183, 197,  77, 103,  97,
-  37, 219, 220, 218, 163,  15, 111, 144,
- 243, 214,   4, 160,   9, 234,  77, 228,
-  50, 184, 175, 238,  96,  52, 193,  92,
- 131, 184, 223, 141, 189,  56,  21, 240,
- 192,  83, 112, 141,  74, 119, 143,  20,
- 175,   5, 198,  83, 200, 126, 165, 131,
- 255,  99,  92, 186,  27,  35,  15,  20,
- 209, 201, 129,  70, 148, 251,  93, 131,
-  94,  59,  22, 185, 201,  57, 201, 188,
- 147, 152,  57,  66,  44, 122,  94, 145,
-  73, 249, 231,  71, 123,  61, 153,  29,
- 213, 181,  67,   0,  56,  78,  63, 255,
-  82, 195,  80, 155,  18, 162, 182, 102,
- 108,  50, 134,  78, 205, 114, 246, 245,
-  89, 181, 112, 140, 175, 191, 212, 165,
- 110, 240,  54, 202, 198,  35, 166,   5,
-  65,  87,  17, 218,  19, 221, 154,  45,
- 197, 254,  65, 109, 232,  70, 215,  33,
-  26,   2,  73, 197,   2, 156, 185, 142,
-  67, 134, 135, 192,  14,  78,  77, 160,
-  99, 180,  79,  98,   4, 187,  33, 141,
- 192,  70, 149,  98, 213, 203, 193,  27,
- 208,  65, 205, 125,  60,  16, 182,  37,
-  21,  75,  22, 220,   0, 166, 172, 238,
-  70,  87,  50,  70,  35, 190, 235, 177,
- 176, 241,  95,  71, 142, 102, 135, 162,
- 164, 238, 179, 181,  81,  10, 152, 220,
-  98, 234, 170, 185,   7,  84, 244,  88,
-  12,  91, 190, 194, 126, 159,  45, 238,
-  52, 202,  45,   2, 206, 144, 171, 124,
- 189, 139,   8,  69,  86,  13,  50,  72,
- 148, 170, 135, 135,  46, 218, 201,  15,
- 102, 153, 223,   3, 193, 173,  94,  15,
-   0,  95, 167,  53, 155,  34, 197, 106,
-  88,  11, 192,  18,  28, 181, 145, 244,
- 222, 137,  66,  73, 158, 147, 235, 247,
-  83,  17, 212,  82, 241,  31,  13,  66,
-  12,  57,  60,  10, 155,  70, 195, 128,
-  12,  21,  90, 177, 190, 241,  57, 206,
- 121,   0, 135, 181, 144,  89, 104, 207,
- 104,  72,  75,  13, 187,  26,  41,  42,
- 138,  49, 102,   1,  36, 234,  84, 172,
- 183, 120, 138, 167,  92, 238, 226, 193,
-  74, 141, 214, 117,   8, 243, 234,  62,
-  79,  35, 117, 103, 135, 148, 215, 227,
-  28,  89,  99, 254,  69,   8, 137, 149,
- 170,   5, 182, 117, 102, 160, 111, 232,
- 232, 112,  37, 182,  15, 120,  72, 177,
- 249,  69,  83,  14,  40,  81, 123,   6,
-  55, 157, 159, 196, 174,   2, 174, 102,
- 222, 105,  16, 108,  91,  62, 255,  74,
- 215, 174,  35,  43,  30,   9,  72, 151,
- 187,  49, 153,  32, 181, 140, 112, 141,
- 230,  73,  72, 142, 150,  31, 180,  95,
- 100,  26, 144, 246, 151,   6, 239, 215,
-  71, 109,  35,  51, 172, 244, 165, 159,
- 229,  56,  70, 111, 193,  60,  67, 122,
-  23, 183, 123,  41,  43, 218,  65,  32,
- 137, 153,   6,  97, 159, 159, 233, 193,
- 111, 147, 190, 221, 230,  47, 198, 130,
- 180,  77, 110,  35, 176,  32, 173, 148,
- 221,  38, 180,  75, 107,  32, 127, 227,
- 254, 142, 133,  29,  35,  19, 234,  50,
- 160, 196, 248, 164, 153,  63, 222, 196,
- 252,  67, 178, 115, 176, 243, 110, 134,
-  61, 184, 226,  14, 233,  42,  74, 212,
- 110, 116, 214, 118,  22,   0, 193,  49,
- 196, 130,  96,  71, 118,  61, 191, 115,
- 192,  47,  83,   3,  36, 209, 101,  67,
- 106,  31, 106, 214, 246, 117,  89,  87,
- 230, 108, 137, 173, 192, 171, 222, 126,
-  66,  58, 223, 120, 184, 151,  91,  88,
- 155,  78, 194, 114, 102, 212,  90, 152,
-  81,  51,  65,  42,  85, 159, 116, 226,
-  86,  45, 164, 186, 186, 124, 173, 114,
- 245,  85, 156,  18,  79,  15, 130,  67,
- 114, 197, 201, 237, 191,  37, 105, 211,
- 243,  94,  52,  42, 159, 249,  81,  56,
- 164,  46, 220, 157,  72,  39, 165, 232,
-  35,   3, 123,  52, 203,  38, 126,  26,
- 104,  42, 157,   4, 217,  51, 204,  29,
-  80, 146, 188,  17, 177,  37,   8,  95,
- 140,  49, 235, 166,  34, 208,  67,  56,
- 141,  42,  61, 141, 156,  31,  99, 213,
- 155, 100,  82,  17,  55, 160, 116, 104,
- 198, 250,  37, 197, 190,  15,  71, 236,
-  27, 247, 149, 222,   5, 171, 147, 183,
- 186,  54, 106,  53,  92, 219, 245,  94,
- 137,  39,  43,   5,  56,   5,  34, 114,
-   4, 193, 211, 133, 171, 179,  18, 158,
- 207, 187,  97, 132,  85, 152, 209,  94,
- 137, 199,  84, 241,  16, 115,  73, 229,
-  74, 156, 174, 229, 134, 250,  98,  41,
-  36,  73,  14, 205, 221,  36,  17,  44,
-  36, 185, 151, 156,  71, 219, 146,  76,
- 130, 236,  34, 126,  90,  79, 174,  56,
-  96, 140, 145, 202, 207, 241,  99, 104,
-  41, 252, 129,  44, 224, 242, 145,  97,
-  28, 126,   3,  88, 241, 194,  33, 170,
- 113, 198, 183, 199,  59, 132, 105, 179,
-  80, 254, 228, 106, 101, 200, 241,  21,
-  95, 109,  59,  24,  61,  78, 123, 159,
-  89, 240, 140, 212, 175,  65, 142,  16,
- 253,  31, 158, 248,  72, 247,  48, 144,
-  28, 173, 119,  70,  55, 155,   3,  44,
-  41, 171, 216, 184, 170,  59, 157, 185,
-  56,  59, 148, 133,  71, 104,  19, 133,
-  76,   3, 203,   6, 139, 245, 169, 249,
- 248, 220,  71, 173, 117, 103, 125, 220,
-  74, 133, 158, 219,  42, 165,  69, 158,
- 142,  27, 239, 159, 225, 111, 128, 126,
- 158,  61,  53, 126, 118, 166,  54,  83,
-   0, 119, 190, 245, 144, 148, 193, 234,
- 150, 110,  38, 209,  13, 170, 100, 156,
- 215, 107, 241,  56, 161, 181,  59, 135,
- 138,  86,  92, 232, 221, 134, 128, 120,
-  85, 156,  74, 191,  39, 164, 129, 204,
-  82, 240, 203, 246, 155, 225, 127,  13,
-  41,  25, 184, 154,  10, 138,   9, 167,
- 229,  27, 153,  16, 182, 237,  64,  64,
- 184, 118, 108, 253, 145,  82,  61, 211,
-  66, 104,  58,  71, 242,  86, 242, 202,
-  54,  40,  97,   2, 184, 243, 123,   5,
-  91, 184, 160, 126,   5, 133, 253,  83,
- 240,  58, 249,  33, 198,  71,  20, 102,
-  86,  34,  24, 180, 149,  20,  34,  76,
- 101,  30, 184, 194,  77,  87, 255, 228,
- 255, 152, 169,  95,  77, 141, 206, 135,
- 253, 106, 104, 249,  76, 138,  94, 160,
-   9,  67, 139, 125, 211, 198, 145, 199,
- 239,  80,  83,  12,   0, 123, 128, 220,
- 149,  54, 181, 186,  63,  61, 144, 128,
- 187, 181, 214, 156, 228, 248,  94, 181,
- 215, 240, 165,  58,  79, 114, 190,  36,
-  66, 251, 190,  11,  98,  97,  69,  69,
- 221, 134, 230,  51, 193, 143,  22,  20,
- 127, 231, 225,  46, 184,  22, 182, 191,
-   3, 142,  11, 223, 165,  54, 254, 238,
-  63, 147, 159, 159,  26, 155, 120,  14,
-  68, 249, 180, 243,  49, 194,  67, 254,
- 179, 137,  38,  10,   2,  97,  22, 238,
- 223, 132, 191,  14, 129,  64, 100, 167,
- 162,  96, 108, 207,  49, 119, 188, 154,
-  32,   7,  59, 252, 140, 163, 183,  55,
-  30,   0,  46, 230, 253, 180, 116, 119,
-   6,  17, 240, 150, 204, 203, 185, 249,
- 140,  44, 204, 231, 131, 251,  10,  79,
-  72, 252, 240,  34, 228,  39,  37, 216,
-  97, 135, 146, 148, 246,  12, 251, 218,
-  94,  29,  44, 174, 238,  83, 250, 157,
- 253, 105,  57, 106, 225, 157,  55,  88,
-  95, 155, 151,  35, 198, 126, 182, 213,
- 213,   3, 234, 232, 156,  17, 137, 143,
- 161, 146,  40, 245, 192, 122, 115,   0,
-  44, 249, 224,  99,  95, 105, 184,   1,
- 254, 238,  16, 245,  28,  65,  25, 123,
-   3, 149,  42,  32,  44,  39,   2,  96,
- 126, 171,  89,  72, 155, 150,  51,  49,
- 154, 212,  62,  31, 189, 244,  77, 173,
-  72, 223,   3, 202,  73, 255, 212, 170,
- 173, 152, 128,  29,  46, 183,  71, 232,
- 122, 163, 152,  88, 211,  70,  71, 116,
- 109,  77, 177,  16, 121,  49,  50,  49,
-  31,  48,  38,  66, 131, 157,  25,  28,
- 177, 220, 252,  41,  81,  83, 180,  50,
- 222,  56, 128,  28, 179, 230,  24, 179,
- 135, 197, 228, 162, 150, 227, 145, 217,
- 184, 188, 135, 208, 208, 165,  79, 252,
- 148,  21,  50,  97,  24,  96,  73, 195,
- 102, 254,  87,  42, 113, 185,  45, 155,
- 233, 154, 170,  35,  85, 136, 185, 217,
-  10,  48, 114, 246, 147, 172, 201, 123,
-  87,  84, 125, 206,  34, 214,   8, 231,
-  31, 160, 189, 112,  87, 111,  34, 169,
- 110,  83, 245, 140, 112,   1, 218, 147,
-  80, 215, 168, 120,  29, 109, 105, 254,
-  20,  70, 167, 192,  33, 106,  45, 148,
- 147, 235,  22, 135,  65, 110,  10, 243,
- 141,  56,  92, 177,  57, 243, 204, 214,
-   6, 121, 111,   3, 176, 121, 245,  76,
- 160,  30, 236,  15, 229, 238, 213, 244,
- 148,  81, 194,  25, 137, 171,  85, 195,
-  23,  13, 154,  10,  12, 230, 122, 202,
- 162,  74, 195, 225,  78, 183, 182, 203,
-  17, 185, 122, 155,   5,  51, 200,  92,
-  71,  93, 229,  38, 149, 160, 147,  33,
-  89, 181, 103, 161, 148,  97,  55,  62,
- 184,  39,  43, 219,  85,  74, 151,  56,
-  86,  67,  82,  56,  38, 251, 240, 133,
- 215, 153, 179,  60, 231,  60,   0,  24,
-  37, 191, 202, 214, 189,  55,   2, 165,
- 240, 179, 148, 226, 154,  81,  28,  45,
- 231,  97, 253,   2,  54, 254,  90, 162,
- 255, 229,  11, 161,  65, 213, 246,  80,
-   5, 109,  14, 163,   4,  60, 123,  51,
-  91, 134,  98, 183,   2, 154, 211,  42,
- 109, 192, 248,  31,  26,  11, 144, 103,
-   0, 179, 239, 215,  20,  20,  44,  82,
-  18, 220, 179, 112, 168, 171,  80,  64,
- 244, 136, 106,   5,  86, 114, 160, 135,
- 233, 230, 233,  31,  30, 120,  26,  26,
- 255,  11, 173, 238, 195, 186,  10,  16,
- 126, 140,  47,  52, 112, 235,  30, 121,
-   0,  98,  26,  29, 183, 138, 181,  35,
- 227, 220, 251,  22,  33, 177,  25,  26,
- 205, 189, 149, 169, 189, 234,  61,  79,
-  44, 223,  79, 248, 163, 244,  53,  41,
- 177,  28,  33, 119, 234, 138,  18, 252,
- 227, 204, 236,  10, 130, 157, 183, 183,
- 194, 111,  94,  34, 221, 231, 248, 118,
-   3,  51, 103, 215, 195, 226,  92,  92,
- 191, 217, 246, 174,  57, 238,  17, 245,
- 209, 205, 228,   5, 183, 209, 235, 185,
- 118,  12, 181, 115,  94, 155, 235,  23,
- 246,  70,  62, 226, 214,  12,  53, 231,
-   3,  37, 157, 135,  18,  36,  33,   4,
- 208, 189, 199,  74, 231, 159,  86,  25,
- 137, 232,  10, 231, 207, 199,  62,  65,
- 116, 219, 179, 119,  89, 181,  18, 209,
- 170, 161,  79, 137, 119, 136, 126,  80,
-  29,   2,   8, 192, 145, 124,  53, 172,
- 184, 110, 225,  63, 219, 198, 221, 212,
-  26,  89,  59,  18,  30,  84,  59,  63,
- 100,   1, 137, 155, 192, 225, 229, 182,
- 115,  58, 133, 108,  12,  99, 125,   6,
- 238, 249, 225, 176, 120, 182, 248, 108,
-  72, 252, 115, 204, 130, 148, 102,  17,
- 178,   2, 139,   3, 140,  10,  90, 120,
- 122, 130,  66, 211,  80, 134,  50, 235,
-  89,  59, 122,  86,  28, 250, 206, 233,
-  67, 127, 145, 176,   4,  64, 127, 228,
- 229, 111,  10, 202, 172, 146,  72, 188,
- 247, 124, 233, 246,  89, 214, 221, 204,
- 198, 167,  88, 208, 135, 128, 237,  53,
-  50, 165, 114, 244, 137, 240,   1, 180,
- 182,  66,  69, 210, 220,  55, 175,  41,
- 172, 239, 195,  19, 153, 204, 183,  17,
-  76, 199,  29,  58,  52,   3, 237,  48,
- 175,  65, 242, 247,  55, 183, 155, 128,
- 240, 250, 197, 114,   4,  77,   9,   1,
- 126, 104,  94, 184, 142, 108,  57, 255,
- 166, 254, 207,  87, 215, 196, 250,  44,
- 209,  67,  56, 194, 178, 179, 104,  30,
-  97, 167, 121,  86, 141,  60, 102,  19,
-   2, 197, 217, 115,  63, 247,   8,  84,
-  28,  58, 116, 169, 173, 154, 203, 122,
- 188, 174, 166, 221, 148,  47, 176, 160,
- 155,  97, 211, 215,  36,  46,  48, 174,
-  22, 117,  45, 188,  40,  97,  96,   7,
-   6, 213,  44,   3, 200, 194, 238, 191,
-   3,  60, 254, 176, 100, 204, 235,  76,
- 244, 110, 196,  82, 143, 245,   9,  12,
- 210, 171,  30,  93,  84,  93, 178, 206,
-   8, 125,  39, 212, 111,  58, 181, 114,
-  33, 199, 165,  58, 105,  26, 187,  87,
- 184, 139,  99, 136, 182, 230, 149, 172,
-  33,  78,  10,  51, 149, 246, 253,   3,
- 217,   5,   9, 210, 148, 130,  66,  70,
- 130, 128,  49, 149,  97,  77, 153, 142,
- 252, 193,  19, 162, 152, 161, 173, 127,
-  43,  73, 167, 252,  89,  11, 218, 227,
-  97, 136,  93, 205,   8, 190,  48,  82,
-  26, 191, 249,  99, 126,  58, 145,  73,
- 213,  56, 192, 119,  94, 244, 160, 193,
-  15,  26,  78, 227, 217, 215, 218, 180,
- 186, 195, 150,  42, 173, 240,  54, 185,
-  57, 107,   0,  98, 175,  73, 216, 212,
- 149, 168,  75, 227, 132,  50, 178, 221,
-  39, 207, 203,  37,  49,  11, 239,  80,
- 217,  55,   4,  13, 203, 252,  79, 105,
-  41,  35, 134,   5,  63, 209,  26, 240,
-  41, 234,  97, 192, 180,  84,  21,  37,
-  64, 142, 113,  75,  34, 253, 177, 107,
-  47, 197, 240, 157, 141, 196, 125, 183,
-  34,  35, 133,  53, 127,  87,  44, 193,
- 106, 181, 153,  29,  80,   2, 224,   8,
- 216, 164, 201, 251,   6, 246,  70,  32,
-  87,  92, 105,  53,  50, 129, 234,  20,
-  55, 190, 195,   3, 212, 239, 223,   9,
- 243,  84,  21, 201,  29,  51,  89, 154,
-  40, 154, 229,   8,   5, 182,  33,  80,
-  22,   6, 163,  49, 246, 115,  43,  78,
- 113, 247,  45, 172,   4,  48, 242,  93,
-  19, 172, 202,  26,  29, 254,   7, 223,
- 131,  76,  71,  78,  69, 139, 172,   3,
-  96, 202,   0,  50, 179, 158, 178, 234,
- 168, 108, 111,  68,  51,  19,  28,  15,
- 100, 121,  67,  97, 148, 238, 136, 177,
-  76,  50,  58,  63, 245,  23, 104, 126,
- 132,  40,  90,  80, 196, 239,  62, 175,
- 167, 212, 129, 133, 181, 168,   5,  24,
- 197, 143, 170, 199, 198, 205, 172,  47,
- 124, 196,  18,  88, 228, 144, 148, 244,
- 191, 191, 241, 165,  68, 247, 225, 138,
- 246, 102, 170, 222, 241,  14,  30, 130,
- 252,  64, 161,  54,  36, 173,  95, 172,
- 222,  25,  88,  78, 102, 206,  76, 209,
- 249,  83, 164, 104,  88, 150,  70, 238,
- 194,  67, 201, 127,  39,  45,  70,  11,
- 155,  69,  13, 211, 161,  77, 125, 249,
- 189, 208,  40,  12, 156,  49,  38, 229,
- 164, 150,  59, 127, 118,  88, 226, 216,
-  62, 233, 199, 185, 200, 230, 105, 102,
- 166,  71, 125, 162,  80, 176,  92,  58,
-  83, 172, 251,  97,  47, 123,  77,  70,
- 154,  63, 167,   0, 151, 222, 204, 142,
- 210, 156,  27,  67, 112, 182, 194,  93,
- 162, 176, 132,  37, 115, 240, 233, 167,
- 119, 160, 172,  73, 122, 160, 133,  42,
- 192, 251, 123, 241,  73,  44,   4,  67,
-  44, 244, 174, 118,  92, 198,  44, 210,
-  26, 152,  58, 139,  59, 151, 210,  38,
- 210, 205,  46,  94, 218,  39, 110,   9,
-  72, 240, 240, 136, 102,  51, 194, 148,
-  49,  76, 143,   0, 182, 121, 214, 121,
-  41, 174, 211,  70,  54,  32, 199,  63,
- 223, 139, 212,  79, 239, 117, 159,  96,
-  91, 215, 200,  18,  62,  67, 134, 179,
- 167,  85, 203,  40, 239,  27, 238,   9,
- 161, 220, 103, 162,  57,  11,  50,   4,
- 210,   1,  95,  57,  96, 206, 215,  32,
-  16,   1, 137, 240,  35, 229, 122, 171,
- 247, 135, 135,  62, 183, 142,   7,  49,
- 223, 179, 250,  48,  81,  24,  87,  54,
- 194, 151, 230, 214,  76, 236,  76, 168,
- 127,  72,  90, 153, 220,  99,  22, 190,
-  19, 223,   8, 247,  19,   2,  11, 173,
- 137, 240, 146, 204, 216,  10,  15, 225,
- 227,  66, 124, 220, 171, 131, 163, 180,
- 181,  62,  46,  81,  54, 177,  92,  83,
- 219,  98, 161,  88, 230, 238,  32,   0,
- 179, 173, 222,  47,  72, 160, 215, 153,
-  49,  24, 239,  59,  39, 116,  28, 155,
- 227,  62, 215, 180,  24,  46, 237,   0,
- 224, 233, 224, 244, 246,   2, 175,  56,
-  41, 188, 136,  97, 107, 123,  93,  64,
- 130, 254, 219, 135,  11, 175,  99,  24,
-  86, 133, 215,  14, 191,  27, 111,  74,
- 173,  78, 166, 141, 123, 156, 156,  80,
- 253, 220,  12,  84, 244, 204, 102, 151,
- 176, 159, 218,   2, 118, 146,  45,  17,
-  79,  39, 219, 244,  35,  16,  17, 241,
- 218, 187, 175, 166, 168,  88, 145, 186,
- 118, 255,  96, 204,  71, 164, 229, 103,
- 102,  66, 201, 213, 132, 231, 255,  86,
- 220, 179, 193, 128, 156,  11,  85,   2,
-  80, 247, 133,   1, 157,  57, 137, 135,
-  99, 111, 196, 185, 133, 235, 131,  51,
- 210, 173, 175,  38, 184, 230, 247,  70,
- 110,  74,  62,  97, 113, 130, 116,  78,
-  10, 186,  96,   9,  98, 243, 174,  37,
-  36, 133,  82, 154,  63,  36, 140, 243,
-  53, 255, 212,  88,  64,  64, 151, 115,
-  38, 232, 104,   4,  16, 101, 104, 185,
- 177,  54,  55, 212,  14, 152,  31, 131,
- 242, 183, 112, 245, 225, 100, 151, 106,
-  23, 199, 237, 165, 140, 131, 202,  56,
- 130, 192,  34, 147,  22, 138, 217, 227,
- 158, 255,   8, 107,  94,  12,  50,  86,
- 220,  47, 201,   9,  45, 186, 173, 226,
- 226, 182,  15,  80, 144,  39, 155, 193,
- 169,  18,  23,  40, 141, 246, 176,  97,
- 151, 207, 163, 177,  73, 105, 236, 223,
- 150,   6, 252, 221,  65, 217,  67,  91,
-  34,  15, 181,  65, 196, 143, 199,  74,
-  11,  45, 192, 214,  96,  58,  29, 188,
- 187, 195,  47, 141, 154, 204,  35,   0,
-  47, 249,   3,  48, 234, 152, 122,  92,
-  19,  35, 115,   4,  44, 199, 136,  50,
-  69,  93, 133,  19,  10, 186,  27, 179,
- 130,  38, 216,  34, 139, 120,  87, 238,
- 245, 241, 207,  17, 234,  46, 138, 172,
- 188, 113, 178, 118,   6, 205,  24,  35,
-  80,  17, 231,  72, 130, 160,  93,  24,
- 220,  11, 152,  51, 255,  35,  35,  83,
-  76,  79, 128, 107,   3, 126, 219, 238,
-  18, 134, 138, 183, 126,   7,  58, 127,
- 221,  99, 119, 129,  60,  88,  11, 142,
- 180, 140, 174,  58, 178,  10, 248, 238,
- 223, 174, 192, 170, 217,  99,  16, 204,
-  61, 239, 102, 108,  58,  82, 118, 198,
- 215, 191,   8, 139,  44, 137, 161, 125,
- 136,  33,  84,  84, 119, 154, 237,  58,
- 138,  11, 118, 122, 248, 211, 194, 213,
-  91, 230, 157,  27,  34,  92, 220, 186,
-  30, 149,  23,  83, 172, 184,  70, 251,
- 135,  54, 113,  36,  46,  39,  21, 245,
- 164, 100,  14, 232,  76,  92,  41, 102,
-  86, 188,  41, 100, 183,  45, 243, 203,
- 138, 146,  29,  74, 211, 116, 242, 122,
- 156, 240,  69, 188,  87,  68, 127,  10,
-  21, 140,   6, 255, 210, 149, 107, 198,
- 173,  75, 102, 137, 230, 195, 126, 156,
-  49,  73, 157,  73,   1,  72,  67, 203,
-   2, 115, 152, 198, 238,   4, 249, 157,
-   1,  16, 249,  69, 162, 203,  49, 135,
-  68, 110, 210, 137, 182, 170, 117, 255,
- 146, 176, 250, 206,  66,  52, 175,  76,
-  61, 130,  62, 150, 218,  90, 100, 121,
-   5,  12,  11, 222, 115, 222, 165,  82,
- 157,   4, 142, 117,  57, 183,  83, 133,
- 207, 108, 182, 183, 255,  67,  14,  16,
- 132,  28, 227, 209, 213, 207, 108, 110,
- 126, 119, 189,  95,  42,  91, 227,  40,
- 150, 104, 241, 168,  82, 199, 199,  90,
-  10,   5, 211,  22,  75, 251,  71, 132,
-   7,  70, 220, 183,  17, 118, 239, 245,
-   1,  13, 235,  94,  61, 227,  54, 211,
- 216, 103, 221,  22, 205,  33, 167, 118,
- 226, 152,  80,  80, 147, 162, 178,  55,
-  83,  55,   8, 222, 174,  26, 136,   7,
- 127,  60, 155, 197,  33,   5,  45, 195,
-  44,  29, 198,  24, 224, 167,   1,  12,
-  18, 230, 253,  72,  68, 139,  16,  24,
-  94,  58, 242,   4, 122, 106,  96,  97,
- 111,  90, 185, 246, 217,  15, 227, 188,
-  36,   1,  23, 229,   6, 173,  36,   6,
- 159, 240,  64, 212, 118,  41,  96, 180,
- 235, 244, 211, 129, 156,  37,  45, 172,
- 232, 132,  74, 107, 113, 158,  97, 142,
- 171, 113, 138, 106,  18,  20,  33,  51,
-  26,  23,  95, 163,  47,  64,  88, 183,
- 241, 228, 232,  98, 204,  44, 142, 253,
-  88,  17,   8, 226, 242, 214, 146, 183,
- 184, 208, 181, 188, 106, 142, 149,  53,
-  37, 101,  58, 176, 218,  59, 240, 220,
- 208, 164,  38, 195, 232,  22, 194, 171,
-  48, 122, 230,  87, 245,  87, 229, 145,
-   3, 142, 248,  10,  30,  64, 115, 142,
- 165,   5, 169, 217,  25, 113,  41,  27,
- 255, 231,  74,  22,  67, 210, 208,  40,
-  57,  65,  35,  21, 235, 126,  53, 238,
- 190, 115,  47, 153,  40, 189, 242,  23,
- 125, 184, 104,  67, 126, 110,  74,  27,
- 192, 231, 170, 147, 169, 108,  23,  71,
- 194, 168, 255, 245,  77,  50, 196, 200,
-  86,  78,  89, 120, 184,  44, 186,  96,
- 101,  14, 231,   1, 115, 156, 183, 182,
- 158, 232, 255,  66,  20, 229,  13,  70,
- 136, 171, 193, 173,  43,  97,  79,  14,
- 129, 177,  75, 115,  48,  34,  58, 184,
- 112, 217,  28, 155,  10,  85, 113,  50,
-  25, 195,  86,   0, 108, 131, 203, 141,
-  54,  53,  43, 120, 171, 112,  56, 142,
- 221,  55, 175, 104, 149,  80, 176,  21,
-  36,  12,  13, 128,  29, 212, 139,  41,
-  17,  17,  83, 104,  77,  91, 161,  41,
- 213, 151,  68, 111, 209,  33,  47, 176,
-  98, 173,  32,  81, 116, 175, 103, 215,
- 177, 205, 105, 116, 201,  59, 109, 134,
-  74, 161, 161,  13, 145,  93, 235,  33,
-  86, 130, 250, 166,  22,  78, 220, 186,
- 241, 161,  10, 159, 239, 159, 181, 217,
- 229, 243, 116, 145, 101, 240,  26,  44,
-  61, 145, 249,  71, 162,  68, 110,  67,
- 219,  31, 143,  96, 129, 177,  97, 196,
- 113, 146, 227,  88,   7, 110,  70, 247,
- 197,  46, 162, 108, 168,  21, 156, 230,
- 135,  40,  54, 199,  36,  15,  49, 135,
-  10,   4, 171, 193,  15, 236, 166, 152,
-  57,  68, 227, 211, 114,  40,   1, 231,
- 219,  79, 224,  69,  54,  80, 125, 186,
-  75,  69, 141,  48, 116, 227,  39,   2,
-  33, 176,  17, 147,  68, 166, 106, 219,
- 110,  82, 170, 177,  31, 101,  93,  34,
-  81, 243,  96,   8,  30, 186, 160,  40,
-  81, 135,  78, 115, 131, 180,  60,  70,
-  75, 246, 184, 199, 180,  91, 243,  45,
- 113,  85,  40, 155, 195, 197, 173, 136,
- 215, 183, 253,  52, 133,   2, 188,   8,
-  78, 219,  11, 128,  99, 138, 140, 173,
-  94, 112,   3,  71, 237,  88,  52, 162,
- 244, 158,  80, 111, 213,  51,  85, 166,
- 154, 250,   3,  33, 220, 125, 165, 246,
- 126, 205,  64, 196, 120, 181, 251,  71,
-  62, 246, 190, 114, 205, 193, 238,  96,
- 181, 221, 121,  60,   2, 175,  56,  15,
- 199, 197, 249, 127, 129,  62,  70, 148,
- 112, 123, 252,  95, 233, 118,  36, 131,
- 243, 246,  61,  43, 131, 183,  90,  78,
- 237,  61, 173, 131, 182,  11, 178,  76,
-  71,  75, 109,  73, 198, 108,  99, 225,
- 174, 239, 179,  44, 225, 221,  37,  99,
-  90,  24, 138,  88,  25,   8, 104,  30,
- 251, 116, 177, 180, 100, 156, 172, 115,
-  57,  51, 178,  51, 113, 184,  77, 189,
-  57,  53, 149, 126, 245,  25, 156, 144,
- 134, 196, 239, 115,  43, 133, 212, 194,
- 255, 173,  48, 230, 242, 164, 241,  56,
- 131, 241,  58,   1, 110, 209, 179,  98,
-  81,   5,  50,  19, 241,  22, 122, 212,
- 236, 119, 207, 233, 241,  90, 120, 116,
- 233, 155,  79, 179,  79, 252, 111, 169,
- 220, 142, 193,  51, 236,  58, 248,  49,
- 103, 252, 123, 113, 139,  39, 184,  62,
-   2, 242, 102, 145,  23, 236, 174, 173,
-  90, 139, 113, 100,   8, 249,  50, 182,
- 167, 225, 227,  81,  34, 214,  56, 138,
- 143, 194, 214, 199, 222,  88,  45,  26,
- 145,  97,  74,  60, 151,  16, 132, 110,
-   9,  89,  12,  92,  88, 200, 113,  78,
- 220, 158, 210, 190, 249, 241,  35, 138,
- 135,   3, 116, 255,  39, 223,  29,  32,
-  19, 121,  11,  35,  15, 189, 107, 198,
-  81, 195,  39,  47,  41,  91,  18, 185,
- 155, 126, 207, 242, 200,   1, 139,  27,
- 221, 179, 123,  90, 178, 224, 250, 139,
- 236,  55, 116,  11,  27, 160,  14,  24,
- 113, 126, 218,  51, 252, 110, 188, 153,
-  55,   9, 200, 193, 178, 214,  96, 232,
- 235,  96,  95, 135, 102, 132, 165, 184,
-  50,  62,  97, 113,  47, 154,  96, 178,
- 117, 156, 204, 245,  81,  99,  28, 183,
-  54,   5, 247, 192, 193,  77, 104,  69,
- 249, 116, 207, 129,  98,  92, 232, 213,
-  12, 128, 140, 167,  72,  86, 111, 224,
-  94,  57, 109, 105, 215, 147,  45, 100,
- 110,  55, 248, 171, 129, 226, 202, 182,
-  22, 118, 253,  99, 232, 141,  70, 120,
- 182,  24, 138, 185,  84, 180, 103, 220,
- 121,  69,  58, 140, 239,  12, 195, 249,
- 255, 247, 184, 121, 198,  47, 116, 110,
- 227, 178,  52, 150, 243, 219, 176, 189,
-  62, 202, 114, 187,  17, 129,  97, 192,
- 249, 102, 207, 167,  59, 104, 204,  59,
- 114, 107,  23, 152, 123,  70, 253,  19,
- 137, 134, 234, 210,  96, 166,  30, 213,
- 238, 120,  50, 134,  59, 162, 126, 247,
-  61, 119,   3, 243, 255, 195, 189, 188,
- 180, 108, 230, 172, 219,  80, 191, 162,
-  85, 137,  32,  19, 239, 160,  93, 156,
- 103, 218, 149, 167,  40, 137,  73,  67,
- 170, 122,  33,  92, 196, 145, 205,  64,
- 171, 194,  91, 215,  29,  26,  46, 184,
-  63,  41, 252,  92,   3,  33, 247, 230,
-  94, 144,  23,  82, 244, 115, 107, 168,
-  32,  35,  23,  22, 218, 151,  83,   8,
- 116,  90,   7, 227,  52, 243, 150, 235,
- 117, 149, 169, 152,  57, 150,  51, 154,
- 116,   9, 176, 216,  98, 172, 239, 154,
-  20,  53, 146,  87, 233, 182, 246, 162,
- 101, 192, 152, 182, 208, 255, 183, 246,
-  32,  29, 122, 125, 159, 150, 124, 219,
- 108, 131, 213, 202,  61, 168,  81, 113,
- 149, 172, 195, 157,  52, 136, 144,   5,
-  95, 103,  74, 126, 113,   8, 243, 104,
- 254, 167,  64, 121,  16,  67, 221,  82,
-  91,  12, 229,  71, 244, 227, 125, 146,
- 199,  89, 177, 154,  80,  71, 233,  78,
-  15, 168,  94,  47,  46, 230, 221, 254,
-  27, 149,  18, 178,  72, 197, 161,  13,
- 145, 103,  49, 111,  24, 105, 218, 111,
-  28, 223, 124, 177,  57, 202, 207,  47,
- 150, 224,  95, 208, 216, 204,  53,  51,
- 218,  27, 148, 164, 232, 197,  23, 115,
- 127, 100, 172, 160, 132,   2, 148,  92,
- 182, 103,   1,  82, 153, 131, 210, 226,
- 138, 232,  23,  70,  44,  10,   8,  35,
- 185, 204, 126, 199, 140,  45,  59, 205,
-  52, 102, 214, 238,  87,  50, 162, 190,
- 158,  27, 204,   6, 209, 161, 208, 103,
-  71, 166, 119,  80,  29,  82, 133,  96,
- 123,  16, 181, 157,  99, 122, 238, 109,
- 210, 127,  32, 164, 167,  60, 152,  79,
- 182, 184,  10, 164,  39, 250, 220, 102,
-  79, 103, 173, 218, 228, 237,  16, 202,
- 150,  21, 220, 105, 151, 211, 160, 213,
-  59,  17,   0,  88, 138,  45, 236, 138,
- 166, 115, 122,  75, 236, 189,  36, 108,
-  19, 138, 219, 249,  75, 209,  50, 174,
- 190, 116,  17, 116, 239, 221,  75,  30,
- 157, 189,  98,   9,  70, 223,  46, 228,
- 156, 167,  75, 115, 109,  74, 177,   0,
- 104,  22, 240, 213, 194, 211, 157,  52,
-  73,  38, 143,  39, 250, 154, 111, 171,
- 189, 189,  22, 161, 206, 186,  69, 235,
-  95, 217,  36,  17, 206, 243,  95, 114,
- 253, 217, 210,  30, 239,  33, 208, 142,
-   3,  20, 137, 120,  86, 161, 191,  93,
-  26, 125, 135, 205, 172, 218, 191,  92,
-   3,  79, 194,  48, 122,  43,  44, 148,
- 170, 155, 113,  51,   7, 164, 217,  35,
-  73, 217,   0, 250, 148,   4, 175, 109,
-  43,  65, 226, 177, 107, 177, 157, 252,
- 213, 250,  11, 218, 205,  44, 159, 156,
- 117,  71, 101,  85, 119,  71, 214, 217,
- 238, 119, 240,  71, 232, 168,   6,  33,
- 158,  37, 243, 160, 123,  58, 150, 154,
- 233, 171, 219,  86, 130, 174,  67, 238,
- 137, 250,  46,  53, 218, 179, 214,  32,
- 249, 249, 244, 136, 141,  61, 170, 213,
-  23, 249, 170,  22, 200, 101,  97,  55,
-  50,  61,  24, 230,  19, 178,  78, 196,
-  12, 113, 199,  62, 134,  92,  54,  36,
- 156, 140, 211, 188, 101, 108, 141,  43,
-  81,  69, 229,  96, 155,  50, 204, 182,
-  98,  61, 148,  22, 197,   8, 247, 128,
- 123, 170, 223, 186, 109,  68, 100,  93,
-  87,  75, 212,  97, 158,  73,  31,  54,
-  48, 219, 242, 186,  32, 130, 185, 236,
-  41,  66,  40,  59, 238,  60,   1,  13,
- 127,  70, 133,  11, 103, 157, 193,  94,
- 234, 190, 123, 225,  77, 218,   6,  88,
- 157, 131, 228, 127, 177, 126,  52, 150,
- 212, 104, 126,  68,  76,  67, 196,  64,
- 234, 202, 132, 242,  54, 154, 248,  79,
- 154, 110, 208, 111, 184, 216,  14,  63,
-  27,  14, 200, 233, 107,  37,  17,  59,
- 125, 166, 226, 208,  13,  15,  28, 155,
- 225, 102, 113, 217, 118,  56, 150, 129,
-  64, 188, 157, 235, 197, 204,  37, 195,
-  70,  42, 170,  91, 217,  13, 163, 119,
- 224,  95, 163, 240,  51, 248,  56,  35,
- 237, 114, 100, 154,  53,  45, 124,  23,
- 133,  86, 197, 125,  85, 100, 164, 191,
- 206, 150, 127, 235,  16,  33,  93, 219,
- 129, 100,  53,  67,  82, 110,  10, 235,
-  82, 196, 157,  20,  77, 228, 101, 166,
-  98,   0, 235, 177, 126, 163, 102, 173,
- 216, 130, 221, 183, 196, 104, 224, 192,
-  32, 195, 179, 231, 223,  24,  59,  41,
- 155, 255, 154, 207, 252, 120, 143,  21,
- 107,  49, 175,   4, 105,  14, 206, 156,
-  51, 178, 158, 174, 208,  46,   9, 139,
- 239,  37, 104, 186,  41,  51,  31, 113,
-  54, 211, 231,  53,  25, 127,  37, 136,
- 136, 116,  37, 163,  71, 173,  91,  51,
- 181, 147,  74,  15, 119,  88,  25,  57,
- 253, 176, 152, 119, 143, 203, 244, 144,
- 144,  42, 249, 246, 111, 255,  20, 128,
- 178,  97, 102, 207, 221, 172,  72, 123,
-  46, 204, 123,  76, 122, 131,  14, 254,
-  35, 140,  71, 112, 164, 195,  53, 107,
-  63,  39,  92, 118, 245,  27, 164,  45,
- 161, 199, 106, 177,  95, 186, 238, 163,
-  55, 129, 144,   8,  96, 122, 179, 177,
-  97, 249, 113,   1, 205, 193,  82, 226,
-  12,   6, 253, 108, 107, 128,   1, 179,
-  20, 122,  74,  40, 212,  29, 152, 198,
- 147,  14,  90, 213,  88, 103, 101, 137,
-  21,  93, 206, 114,  54, 108, 216,  23,
-  63, 155,  18,   7,  35, 199, 244, 150,
-  93, 200, 121, 217, 147, 129,  37,  92,
- 222, 110, 119, 216,  82,   6, 183,  25,
-  19, 132, 134,  83,  21, 103,  73,  86,
-  93,  90, 199,  51, 179, 181, 105, 126,
- 248,  67, 108,  64,  93, 246, 188,  80,
-  94, 185, 142, 231,  78, 180,  62,  84,
- 177, 127, 242,  41, 149, 110, 134, 197,
-  97, 115, 123, 158, 102,  91, 241,  78,
-  22, 144, 105, 253, 127, 164,   1, 223,
-  77, 197, 157, 240, 247, 174, 200, 219,
-  96, 231,  58,  79, 183,   1,  87, 180,
-  15, 214,   9, 189, 115, 220,  91,  83,
- 151,   3,  68, 162, 152,  85, 165,   4,
- 189,  76,  51, 130,  55, 117, 202, 123,
- 251, 238,  23, 173,  27, 161, 102, 200,
-  59, 182,  85, 187,  22,   8,  86, 109,
- 253, 103, 100, 227, 136, 137, 104, 182,
- 123,  25,   9,   0, 175, 119,  83, 179,
- 155, 213,  37, 221, 222,  53, 234, 250,
- 208, 218, 152,  12, 233,  68, 152,  47,
-  51, 119,  25, 177,   6, 172, 176, 110,
- 186, 238, 113, 168,  30, 232, 100,  95,
-  77, 101,  18,  45, 207,  54, 254,  58,
- 241,  70,   2,  25,  33, 120, 229, 227,
-  74, 175, 146,  27, 164,  12, 194,  62,
-  87,  96,  97,  16, 136, 219, 143,  42,
- 255,  37,   2, 224,  22,   1, 251, 204,
- 167,  63,  76,  53, 122,  18,  66, 117,
- 236,   6, 183, 190, 106,  27, 137,  68,
-  51, 164,  77, 107,  84, 184,  24, 101,
- 202, 221,  11, 218,  16,  15,  73,  59,
- 130, 132, 158, 191,  55,  29,   0,  75,
- 250, 141, 168,  76,  89,  28,  90, 177,
-  18, 115, 131,  11, 231, 118, 160, 160,
- 198, 200, 169, 192, 193, 188, 136,  48,
- 112, 188, 242, 108, 126, 192,  54,  35,
-  41, 225, 160,  11,  38, 176, 244,  39,
- 204,  25, 132, 216, 145, 169,  15, 218,
- 183, 194, 157, 174, 189,   7,  67, 197,
-  73, 231, 167, 223, 252, 253,  72,  66,
- 208, 120, 197,  30,  59, 149,  71,  89,
- 204,  80,  92,  67, 185,  90, 251, 193,
- 138,  51, 244, 181, 114, 251,  43, 155,
-  87,  73, 181,  52, 245,  43,  79, 120,
-  90, 250,   5,  43, 220, 208, 248, 196,
- 221,  98,  59, 204, 118, 133,  95,  22,
- 217, 118,  36, 226, 233,  44, 242,  59,
-  35, 203, 170, 166, 163, 236,  46, 254,
- 119,  60,  91, 150,  44, 115, 204, 153,
- 233,  69, 137,  67, 157, 153,  90, 228,
-  24,  12, 194,  52,  47,  90, 245,  77,
- 150,  76, 128, 118, 162, 241, 105, 196,
- 190, 195, 239, 203, 156, 149,  89,  55,
- 154, 214, 163,  25, 158, 253,  20, 237,
-  99, 136, 106,  84, 129, 115, 175, 210,
- 158,  72, 239, 147, 127, 174, 172,  36,
-  96, 188,  83, 127, 242, 191,  88,  66,
- 135,  17,  84, 242, 139, 230, 202, 227,
- 240, 178, 230,  21, 111, 101, 178,  73,
- 149,  22, 140,  46,  31, 137,  77,  12,
- 207, 191, 139,  39, 189,  22,  78, 233,
- 191,  98, 123,  25,  23,  43,  24, 124,
-   4, 110, 194,  67, 182, 101,  56, 215,
-  31,  15, 162,  34, 208, 125, 161,   2,
- 191,  18, 145, 132,  68, 156, 222, 102,
- 120, 204, 191,  75,  49, 252, 223, 207,
- 129, 104, 125, 237,  82,   5,  78, 227,
- 249, 134, 181, 212,  94, 172, 184, 136,
-  71, 211, 251, 184, 206,  29,   6, 198,
-  40, 164, 190, 213,   1,  26, 150, 154,
-   9, 203,  15, 198,  44, 101,  60,  92,
- 107,  14,  48,   0, 126,  32,  34, 225,
- 244, 134,  10,  79, 235, 202,  49, 169,
- 118,  53, 128, 178, 174, 142,  94, 224,
-  72, 197, 179,   5,  10,  88,  60,  54,
- 188, 113,  70, 165,  81,  10, 146, 218,
- 173, 168,  96,  47,  76,  83,  25,  66,
- 231, 165, 123, 125, 151,  45, 200, 209,
- 157, 173, 115, 159,   4,  65, 157,   8,
-  22,  71,  72, 198, 230,   9, 235, 223,
- 101, 112, 191, 171, 118, 167,  81, 199,
- 253, 126,  48, 223, 109, 204, 172, 244,
- 186, 109, 115, 126, 215,  19,  73,   6,
- 120, 190,  99, 181, 191,  81,  44, 217,
- 129, 226,  17,  94, 178, 204,  15, 246,
- 155,  23, 148,  44,  89,  34, 243, 145,
-  62, 177,  81,  86, 151,  52,  60,  83,
- 154, 226, 169, 144, 153, 133, 100, 202,
-  58, 250, 165,  27, 194,  20, 219, 216,
-  87, 135, 103, 213, 161,  78,  66, 253,
- 107, 222,  93,  52,  72, 146, 152,  17,
- 207,  51, 233, 168, 250,  38,   0, 129,
- 100, 117, 212, 134,  82,  98,  88, 244,
-  11, 160, 204,  38,  72,  60, 206,  12,
- 190,  15, 102, 253,  49, 110, 194,  93,
-  64, 233, 122,  19, 153, 253, 200,   2,
- 252, 162, 189, 128, 148, 112,  73, 160,
-  40, 143, 100,   6,  84, 151, 149,   0,
- 223,  60, 113, 185,  75, 228, 245, 197,
- 248, 226, 138, 133, 172, 172,  46, 146,
-   7, 220,  98, 181,  23, 112, 100, 112,
-  16, 221,   3,  76, 137,  87, 100,  34,
-  50, 152, 149, 199,  54, 248,  86, 150,
- 128, 250,  14, 167, 164, 109, 111, 108,
-  14, 204,  76, 224,  80, 154,  58,  98,
- 242,  87,  93, 178,  73, 222, 223, 190,
- 251, 108,  37, 113,  85,  74,  16,   9,
- 235, 118, 251, 167,  84, 130,  20,  28,
- 248,  91,  17,  41, 153, 253, 109, 126,
-  91,  95, 172,  53, 140, 241,  19,  69,
- 222, 116,  60, 114, 107, 193,  87, 215,
- 210, 224, 135,  44, 153,   9, 117, 132,
-  80, 156, 125, 206, 104, 162,   5, 247,
-  79, 172,  95, 169, 136, 103,  38,  33,
- 141, 178,  36, 121, 196, 212, 221, 200,
-  62,  58, 226,  54, 185, 205, 233, 226,
-  61,  78, 119,  17,  14, 124, 250,  85,
- 181,  97, 150,  35,  20,  40, 110,  76,
- 193, 253, 111, 219, 156, 244, 204, 158,
- 127,   6,  51, 204, 213,  75, 207,  31,
- 188,  57,   8, 112,  19,  24,  16,  95,
-  12, 107,  21, 157,   4,  42,  75, 217,
- 140, 176,  41, 238, 194, 159, 104, 167,
- 226, 197, 252, 181, 130, 108,  79, 141,
- 219,  83, 101, 115, 239, 234,  63, 245,
-  86, 237,  17,  38,  78, 188,   9, 202,
- 200,  56,  19, 176, 165, 114,  17, 144,
- 150, 201, 150, 108, 183, 134, 166,  98,
- 156, 164,  20,  39,  64,  80, 176, 189,
-  40,  62, 219, 223,  10,  86,  47, 188,
- 108, 150, 132,  70, 230,  79, 247, 218,
- 159, 155,  80, 211,  64, 143,  28, 248,
-  76, 177,  37,  20, 254,  62,  52, 138,
- 120, 137, 176, 254, 187, 197, 144,  88,
- 144, 164,  84, 250, 108, 125,  13, 164,
- 110,   5, 113,  40, 175,  85, 183,  84,
- 248,  12,  52, 116, 197, 118,  51,  92,
- 154, 117,  85,  95, 181, 229, 161,  14,
- 164,  41, 112,  87, 167, 158, 120,  23,
- 179,   3, 214,  22, 166, 194, 187,   7,
- 184, 221, 242, 241,  48, 100, 239, 103,
- 241, 161, 160,  91,  33, 177,  10, 154,
-  63, 148, 142, 250, 120, 133,  42, 153,
- 158,  15,  56, 231,  60, 244,  72,  64,
-  77, 129, 246, 188,  51, 102, 195,  93,
- 211,  40, 136,  62,  35, 197, 212, 120,
- 162,  18, 105,  17, 175,  40,  64, 243,
- 246, 205, 228, 138,  77,   8,  16, 200,
- 166, 153, 138, 187,  31,  14, 117, 103,
-   8, 168,   4,  37, 215, 225, 124, 187,
-  79, 222, 216,  80, 214,   1, 154,  57,
-  72, 128, 103, 164, 152, 224,  32, 110,
- 239, 230, 163, 214,  60, 255,  93,  48,
-  89, 225,  31,  67,   9, 221,  86, 248,
-  10, 116, 133,  53,  93, 158, 145, 136,
-  86,  58, 197,  19,  28,  44, 245, 156,
-  53, 192, 123, 154, 168,  30, 133, 142,
-  54,  59,  97,  56,  26, 151,  83, 162,
- 128,  89, 170, 128, 130,  28,  86, 158,
-  31, 135,  43, 195, 164, 197,  51,  35,
-   9, 173, 131, 192, 192,  29,  78, 167,
- 137, 169, 236, 246, 211,  41,  33,  44,
- 161,  39,  93, 187,  89, 234, 115, 201,
-   3, 201, 221, 249,  37,  26, 182, 236,
- 172,  39, 194, 107, 137,  15, 157, 211,
-  15, 112, 169, 196,  91, 174,  81, 210,
-  44, 214,  87, 217, 246,  76, 235,  11,
- 146, 190, 130,  38, 235,  31,  66,  76,
- 249, 125,  61, 254,  27, 106,  18, 155,
-  68,  49,  39, 251,  36,  70, 115,  20,
-  60, 153,  85, 174, 153,  12, 213, 217,
- 162, 127, 121, 158, 185, 112,  92,   9,
-  49, 243,  94, 232, 247, 148, 104, 120,
- 233, 146,  87, 178,  97, 179, 134, 178,
- 136, 224, 185, 176, 253, 232, 243, 134,
-  68, 198, 237, 217, 248,  59, 135, 129,
- 255,  61,  59,  87, 193, 211, 111, 180,
- 230,  14,   9,  45, 116, 231, 252,  56,
- 210,  39, 214, 111, 123,  80,  41, 204,
-  76, 197, 100,  30, 142, 235, 244,  37,
-  25, 120,  96,  88, 237,  85, 206, 183,
-  74, 161,  84, 182, 105, 239, 161,  42,
-  10, 196, 117, 114,  91,  79, 214,  26,
- 225, 206, 167, 160, 219,  99, 228, 227,
-  32,  92, 179, 116,  72, 184, 109,  83,
-  97, 106, 152,  12, 243, 240,  41, 251,
-  35, 249, 105, 228,  53,  94,  43, 119,
-  61, 162, 192,  78,  58,  46,  84, 110,
-#endif
-};
-
-int
-main() 
-{
-  long size = sizeof (random_data) / sizeof (random_data[0]);
-  printf ("%d\n", random_data [size - 1]);
-}
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
deleted file mode 100644
index b286e3a6539..00000000000
--- a/gdb/testsuite/gdb.base/remote.exp
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999, 2001, 2004 Free Software Foundation, 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
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-
-# test only on a remote target board
-if {! [is_remote target]} {
-    return
-}
-
-set testfile "remote"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-gdb_start
-
-set result [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}]
-if {$result != "" } then {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-#
-# Part ONE: Check the down load commands
-#
-
-gdb_test "show download-write-size" \
-	"The write size used when downloading a program is 512." \
-	"download limit default"
-
-gdb_test "set download-write-size" "Argument required.*"
-
-gdb_test "set download-write-size 0" ""
-gdb_test "show download-write-size" \
-	"The write size used when downloading a program is unlimited." \
-	"set download limit - unlimited"
-
-gdb_test "show remote memory-write-packet-size" \
-	"The memory-write-packet-size is 0. Packets are limited to \[0-9\]+ bytes." \
-	"write-packet default"
-
-gdb_test "set remote memory-write-packet-size" \
-	"Argument required .integer, `fixed' or `limited'.\." \
-	"set write-packet - NULL"
-
-gdb_test "set remote memory-write-packet-size 16" ""
-gdb_test "show remote memory-write-packet-size" \
-	"The memory-write-packet-size is 16. Packets are limited to 16 bytes." \
-	"set write-packet - small"
-
-gdb_test "set remote memory-write-packet-size 1" ""
-gdb_test "show remote memory-write-packet-size" \
-	"The memory-write-packet-size is 1. Packets are limited to 16 bytes." \
-	"set write-packet - very-small"
-
-#
-# Part TWO: Check the download behavour
-#
-
-proc gdb_load_timed {executable downloadsize class writesize} {
-    global test gdb_prompt
-    set test "timed download `[file tail $executable]' - $downloadsize, $class, $writesize"
-
-    if {$writesize != ""} then {
-	gdb_test "set remote memory-write-packet-size $writesize" \
-		"" "$test - set packet size"
-    }
-
-    if {$downloadsize != ""} then {
-	gdb_test "set download-write-size $downloadsize" \
-		"" "$test - set download size"
-    }
-
-    if {$downloadsize != ""} then {
-	send_gdb "set remote memory-write-packet-size $class\n"
-	gdb_expect 5 {
-	    -re ".*Change the packet size.*$" {
-		send_gdb "y\n"
-		gdb_expect 5 {
-		    -re ".*$gdb_prompt $" {
-			pass "$test - set write size class"
-		    }
-		    timeout {
-			fail "$test - set write size class"
-			return
-		    }
-		}
-	    }
-	    -re ".*$gdb_prompt $" { }
-	    timeout {
-		fail "$test - set write size class"
-		return
-	    }
-	}
-    }
-
-    set load_begin_time [clock clicks]
-    set result [gdb_load $executable]
-    set load_end_time [clock clicks]
-    if { $result != 0 } then {
-	fail "$test - loading executable"
-	return
-    }
-    verbose "$test - time [expr ($load_end_time - $load_begin_time) / 1000] ms"
-    pass $test
-}
-
-gdb_load_timed $binfile {} "" {}
-
-# Typically about 400-1 bytes can be downloaded
-gdb_load_timed $binfile 0 "limit" 398
-gdb_load_timed $binfile 0 "limit" 400
-
-# Absolute max is 16384
-gdb_load_timed $binfile 0 "fixed" 0
-gdb_load_timed $binfile 0 "fixed" 16385
-
-# fall back to the default
-gdb_load_timed $binfile 0 "limit" 0
-
-# Get size of data uploaded
-
-#
-# Query GDB for the size of various types
-#
-
-proc get_sizeof { type default } {
-    global gdb_prompt
-    send_gdb "print/d sizeof (${type})\n"
-    gdb_expect {
-	-re "\\$\[0-9\]* = (\[0-9\]*).*$gdb_prompt $" {
-	    set size $expect_out(1,string)
-	    pass "get sizeof ${type} ($size)"
-	}
-	timeout {
-	    set size ${default}
-	    fail "get sizeof ${type} (timeout)"
-	}
-    }
-    return ${size}
-}
-
-# Get the size of random_data table (defaults to 48K).
-set sizeof_random_data [get_sizeof "random_data" 48*1024]
-
-#
-# Part THREE: Check the upload behavour
-#
-if ![runto_main] then {
-    fail "Cannot run to main"
-}
-
-# Carefully check memory around each of the most common packet edge
-# conditions
-
-gdb_test "x/8ub random_data" \
-	"<random_data>:\[ \t\]+60\[ \t\]+74\[ \t\]+216\[ \t\]+38\[ \t\]+149\[ \t\]+49\[ \t\]+207\[ \t\]+44"
-
-gdb_test "x/8ub random_data + 400 - 4" \
-	"<random_data\\+396>:\[ \t\]+185\[ \t\]+255\[ \t\]+50\[ \t\]+140\[ \t\]+237\[ \t\]+172\[ \t\]+143\[ \t\]+93"
-
-if {$sizeof_random_data > 16380 } then {
-    gdb_test "x/8ub random_data + 16384 - 4" \
-	"<random_data\\+16380>:\[ \t\]+178\[ \t\]+180\[ \t\]+135\[ \t\]+93\[ \t\]+70\[ \t\]+62\[ \t\]+205\[ \t\]+76"
-}
-
-# Read a chunk just larger than the packet size (reduce the packet
-# size to make life easier)
-gdb_test "set remote memory-read-packet-size 16" \
-	""
-gdb_test "show remote memory-read-packet-size" \
-	"The memory-read-packet-size is 16. Packets are limited to 16 bytes."
-gdb_test "x/17ub random_data" \
-	"<random_data>:\[ \t\]+60\[ \t\]+74\[ \t\]+216\[ \t\]+38\[ \t\]+149\[ \t\]+49\[ \t\]+207\[ \t\]+44.*<random_data\\+8>:\[ \t\]+124\[ \t\]+38\[ \t\]+93\[ \t\]+125\[ \t\]+232\[ \t\]+67\[ \t\]+228\[ \t\]+56.*<random_data\\+16>:\[ \t\]+161"
-
-gdb_exit
diff --git a/gdb/testsuite/gdb.base/remotetimeout.exp b/gdb/testsuite/gdb.base/remotetimeout.exp
deleted file mode 100644
index dd4e2a9277e..00000000000
--- a/gdb/testsuite/gdb.base/remotetimeout.exp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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@gnu.org
-
-# This is a test for the gdb invocation option -l.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-
-global GDBFLAGS
-
-# Skip test if target does not support argument passing.
-if [target_info exists noargs] {
-    return;
-}
-
-#
-# Test that -l is processed correctly.
-#
-set old_gdbflags $GDBFLAGS
-set GDBFLAGS "-l 42"
-gdb_exit
-gdb_start
-gdb_test "show remotetimeout" \
-	"Timeout limit to wait for target to respond is 42\." \
-	"correct remotetimeout printed"
-
-set GDBFLAGS $old_gdbflags
-
diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp
deleted file mode 100644
index 5e17e11df7b..00000000000
--- a/gdb/testsuite/gdb.base/reread.exp
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1998, 2000, 2001 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set prototypes 1
-
-# build the first test case
-
-set testfile1 "reread1"
-set srcfile1 ${testfile1}.c
-# Cygwin needs $EXEEXT.
-set binfile1 ${objdir}/${subdir}/${testfile1}$EXEEXT
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# build the second test case
-
-set testfile2 "reread2"
-set srcfile2 ${testfile2}.c
-set binfile2 ${objdir}/${subdir}/${testfile2}$EXEEXT
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb.
-
-set testfile "reread"
-set binfile ${objdir}/${subdir}/${testfile}$EXEEXT
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-set prms_id 13484
-set bug_id 0
-
-# Load the first executable.
-
-gdb_test "shell mv ${binfile1} ${binfile}" "" ""
-gdb_load ${binfile}
-
-# Set a breakpoint at foo
-
-gdb_test "break foo" \
-    "Breakpoint.*at.* file .*$srcfile1, line 14.*" \
-    "breakpoint foo in first file"
-
-
-# Run, should see "Breakpoint 1, foo () at hello1.c:14"
-
-gdb_run_cmd
-
-gdb_expect {
-    -re ".*Breakpoint.* foo .* at .*$srcfile1:14.*$gdb_prompt $"  {
-	pass "run to foo()";
-    }
-    -re ".*$gdb_prompt $" {
-	fail "run to foo()";
-	gdb_suppress_tests;
-    }
-    timeout { fail "run to foo() (timeout)" ; gdb_suppress_tests }
-}
-
-# Restore first executable to its original name, and move
-# second executable into its place.  Ensure that the new
-# executable is at least a second newer than the old.
-
-gdb_test "shell mv ${binfile} ${binfile1}" "" ""
-gdb_test "shell mv ${binfile2} ${binfile}" "" ""
-gdb_test "shell sleep 1" "" ""
-gdb_test "shell touch ${binfile}" "" ""
-
-# Run a second time; GDB should detect that the executable has changed
-# and reset the breakpoints correctly.
-# Should see "Breakpoint 1, foo () at reread2.c:9"
-
-set prms_id 0
-
-if [is_remote target] {
-    unsupported "run to foo() second time ";
-} else {
-    gdb_run_cmd
-    gdb_expect {
-	#    -re ".*re-reading symbols.*Breakpoint.* foo .* at .*$srcfile2:9.*$gdb_prompt $" {}
-	-re ".*Breakpoint.* foo .* at .*:9.*$gdb_prompt $" {
-	    pass "run to foo() second time ";
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "run to foo() second time";
-	    gdb_suppress_tests;
-	}
-	timeout { 
-	    fail "run to foo() second time (timeout)" ; 
-	    gdb_suppress_tests 
-	}
-    }
-}
-
-
-### Second pass: verify that GDB checks the executable file's
-### timestamp when the program is *restarted*, not just when it exits.
-
-if [is_remote target] {
-    unsupported "second pass: GDB should check for changes before running"
-} else {
-
-    # Put the older executable back in place.
-    gdb_test "shell mv ${binfile} ${binfile2}" "" ""
-    gdb_test "shell mv ${binfile1} ${binfile}" "" ""
-
-    # Restart GDB entirely.
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-
-    # Set a breakpoint on foo and run to it.
-    gdb_test "break foo" \
-            "Breakpoint.*at.* file .*$srcfile1, line 14.*" \
-            "second pass: breakpoint foo in first file"
-    gdb_run_cmd
-    gdb_expect {
-        -re ".*Breakpoint.* foo .* at .*$srcfile1:14.*$gdb_prompt $"  {
-            pass "second pass: run to foo()";
-        }
-        -re ".*$gdb_prompt $" {
-            fail "second pass: run to foo()";
-            gdb_suppress_tests;
-        }
-        timeout {
-            fail "second pass: run to foo() (timeout)"
-            gdb_suppress_tests
-        }
-    }
-
-    # This time, let the program run to completion.  If GDB checks the
-    # executable file's timestamp now, it won't notice any change.
-    gdb_test "continue" ".*Program exited.*" \
-            "second pass: continue to completion"
-    
-    # Now move the newer executable into place, and re-run.  GDB
-    # should still notice that the executable file has changed,
-    # and still re-set the breakpoint appropriately.
-    gdb_test "shell mv ${binfile} ${binfile1}" "" ""
-    gdb_test "shell mv ${binfile2} ${binfile}" "" ""
-    gdb_run_cmd
-    gdb_expect {
-	-re ".*Breakpoint.* foo .* at .*:9.*$gdb_prompt $" {
-	    pass "second pass: run to foo() second time ";
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "second pass: run to foo() second time";
-	    gdb_suppress_tests;
-	}
-	timeout { 
-	    fail "second pass: run to foo() second time (timeout)" ; 
-	    gdb_suppress_tests 
-	}
-    }
-}
-
-# End of tests.
-
-gdb_stop_suppressing_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.base/reread1.c b/gdb/testsuite/gdb.base/reread1.c
deleted file mode 100644
index ae9801047d4..00000000000
--- a/gdb/testsuite/gdb.base/reread1.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* pr 13484 */
-
-#include <stdio.h>
-
-int x;
-
-void bar()
-{
-  x--;
-}
-
-void foo()
-{
-  x++;
-}
-
-int main()
-{
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-  foo();
-  bar();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/reread2.c b/gdb/testsuite/gdb.base/reread2.c
deleted file mode 100644
index fd9f7b7ad64..00000000000
--- a/gdb/testsuite/gdb.base/reread2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* pr 13484 */
-
-#include <stdio.h>
-
-int x;
-
-void foo()
-{
-  x++;
-  printf("This is foo\n");
-}
-
-int main()
-{
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-  foo();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/restore.c b/gdb/testsuite/gdb.base/restore.c
deleted file mode 100644
index 6aeac25341b..00000000000
--- a/gdb/testsuite/gdb.base/restore.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1998, 1999, 2001, 2003, 2004, Free Software Foundation, 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.
-   */
-
-/* Test GDB's ability to restore saved registers from stack frames
-   when using the `return' command.
-   Jim Blandy <jimb@cygnus.com> --- December 1998 */
-
-#include <stdio.h>
-
-/* This is the Emacs Lisp expression I used to generate the functions
-   in this file.  If people modify the functions manually, instead of
-   changing this expression and re-running it, then evaluating this
-   expression could wipe out their work, so you probably shouldn't
-   re-run it.  But I leave it here for reference. 
-
-   (defun callee (n) (format "callee%d" n))
-   (defun caller (n) (format "caller%d" n))
-   (defun local  (n) (format "l%d"  n))
-   (defun local-sum (n)
-     (if (zerop n) (insert "0")
-       (let ((j 1))
-         (while (<= j n)
-           (insert (local j))
-           (if (< j n) (insert "+"))
-           (setq j (1+ j))))))
-   (defun local-chain (n previous first-end)
-     (let ((j 1))
-       (while (<= j n)
-	 (insert "  register int " (local j)
-                 " = increment (" previous  ");")
-	 (if first-end 
-	   (progn
-             (insert "  /" "* " first-end " prologue *" "/")
-             (setq first-end nil)))
-	 (insert "\n")
-	 (setq previous (local j))
-	 (setq j (1+ j))))
-     previous)
-
-   (save-excursion
-     (let ((limit 5))
-       (goto-char (point-max))
-       (search-backward "generated code starts here")
-       (forward-line 1)
-       (let ((start (point)))
-	 (search-forward "generated code ends here")
-	 (forward-line 0)
-	 (delete-region start (point)))
-
-       ;; Generate callee functions.
-       (let ((i 0))
-	 (while (<= i limit)
-           (insert (format "/%s Returns n * %d + %d %s/\n"
-                           "*" i (/ (+ i (* i i)) 2) "*"))
-	   (insert "int\n")
-	   (insert (callee i) " (int n)\n")
-	   (insert "{\n")
-	   (local-chain i "n" (callee i))
-	   (insert "  return ")
-	   (local-sum i)
-	   (insert ";\n")
-	   (insert "}\n\n")
-	   (setq i (1+ i))))
-
-       ;; Generate caller functions.
-       (let ((i 1))
-	 (while (<= i limit)
-	   (insert "int\n")
-	   (insert (caller i) " (void)\n")
-	   (insert "{\n")
-	   (let ((last (local-chain i "0x7eeb" (caller i))))
-	     (insert "  register int n;\n")
-	     (let ((j 0))
-	       (while (<= j limit)
-	         (insert "  n = " (callee j) " (" 
-                         (if (> j 0) "n + " "")
-		         last ");\n")
-	         (setq j (1+ j)))))
-	   (insert "  return n+")
-	   (local-sum i)
-           (insert ";\n")
-	   (insert "}\n\n")
-	   (setq i (1+ i))))
-
-       ;; Generate driver function.
-       (insert "void\n")
-       (insert "driver (void)\n")
-       (insert "{\n")
-       (let ((i 1))
-	 (while (<= i limit)
-	   (insert "  printf (\"" (caller i) " () => %d\\n\", "
-		   (caller i) " ());\n")
-	   (setq i (1+ i))))
-       (insert "}\n\n")))
-
-	 */
-
-int
-increment (int n)
-{
-  return n + 1;
-}
-
-/* generated code starts here */
-/* Returns n * 0 + 0 */
-int
-callee0 (int n)
-{
-  return 0;
-}
-
-/* Returns n * 1 + 1 */
-int
-callee1 (int n)
-{
-  register int l1 = increment (n);  /* callee1 prologue */
-  return l1;
-}
-
-/* Returns n * 2 + 3 */
-int
-callee2 (int n)
-{
-  register int l1 = increment (n);  /* callee2 prologue */
-  register int l2 = increment (l1);
-  return l1+l2;
-}
-
-/* Returns n * 3 + 6 */
-int
-callee3 (int n)
-{
-  register int l1 = increment (n);  /* callee3 prologue */
-  register int l2 = increment (l1);
-  register int l3 = increment (l2);
-  return l1+l2+l3;
-}
-
-/* Returns n * 4 + 10 */
-int
-callee4 (int n)
-{
-  register int l1 = increment (n);  /* callee4 prologue */
-  register int l2 = increment (l1);
-  register int l3 = increment (l2);
-  register int l4 = increment (l3);
-  return l1+l2+l3+l4;
-}
-
-/* Returns n * 5 + 15 */
-int
-callee5 (int n)
-{
-  register int l1 = increment (n);  /* callee5 prologue */
-  register int l2 = increment (l1);
-  register int l3 = increment (l2);
-  register int l4 = increment (l3);
-  register int l5 = increment (l4);
-  return l1+l2+l3+l4+l5;
-}
-
-int
-caller1 (void)
-{
-  register int l1 = increment (0x7eeb);  /* caller1 prologue */
-  register int n;
-  n = callee0 (l1);
-  n = callee1 (n + l1);
-  n = callee2 (n + l1);
-  n = callee3 (n + l1);
-  n = callee4 (n + l1);
-  n = callee5 (n + l1);
-  return n+l1;
-}
-
-int
-caller2 (void)
-{
-  register int l1 = increment (0x7eeb);  /* caller2 prologue */
-  register int l2 = increment (l1);
-  register int n;
-  n = callee0 (l2);
-  n = callee1 (n + l2);
-  n = callee2 (n + l2);
-  n = callee3 (n + l2);
-  n = callee4 (n + l2);
-  n = callee5 (n + l2);
-  return n+l1+l2;
-}
-
-int
-caller3 (void)
-{
-  register int l1 = increment (0x7eeb);  /* caller3 prologue */
-  register int l2 = increment (l1);
-  register int l3 = increment (l2);
-  register int n;
-  n = callee0 (l3);
-  n = callee1 (n + l3);
-  n = callee2 (n + l3);
-  n = callee3 (n + l3);
-  n = callee4 (n + l3);
-  n = callee5 (n + l3);
-  return n+l1+l2+l3;
-}
-
-int
-caller4 (void)
-{
-  register int l1 = increment (0x7eeb);  /* caller4 prologue */
-  register int l2 = increment (l1);
-  register int l3 = increment (l2);
-  register int l4 = increment (l3);
-  register int n;
-  n = callee0 (l4);
-  n = callee1 (n + l4);
-  n = callee2 (n + l4);
-  n = callee3 (n + l4);
-  n = callee4 (n + l4);
-  n = callee5 (n + l4);
-  return n+l1+l2+l3+l4;
-}
-
-int
-caller5 (void)
-{
-  register int l1 = increment (0x7eeb);  /* caller5 prologue */
-  register int l2 = increment (l1);
-  register int l3 = increment (l2);
-  register int l4 = increment (l3);
-  register int l5 = increment (l4);
-  register int n;
-  n = callee0 (l5);
-  n = callee1 (n + l5);
-  n = callee2 (n + l5);
-  n = callee3 (n + l5);
-  n = callee4 (n + l5);
-  n = callee5 (n + l5);
-  return n+l1+l2+l3+l4+l5;
-}
-
-void
-driver (void)
-{
-  printf ("caller1 () => %d\n", caller1 ());
-  printf ("caller2 () => %d\n", caller2 ());
-  printf ("caller3 () => %d\n", caller3 ());
-  printf ("caller4 () => %d\n", caller4 ());
-  printf ("caller5 () => %d\n", caller5 ());
-}
-
-/* generated code ends here */
-
-int main ()
-{
-  register int local;
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  driver ();
-  printf("exiting\n");
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp
deleted file mode 100644
index 1ee71d631d2..00000000000
--- a/gdb/testsuite/gdb.base/restore.exp
+++ /dev/null
@@ -1,120 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1998, 1999, 2000, 2001, 2002, 2004 Free Software
-# Foundation, 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.  
-
-# Test GDB's ability to restore saved registers from stack frames
-# when using the `return' command.
-#
-# This file was written by Jim Blandy <jimb@cygnus.com>, with
-# fragments borrowed from return.exp.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "restore"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc restore_tests { } {
-    global gdb_prompt
-
-    if { ! [ runto driver ] } {
-	return 0
-    }
-
-    set limit 5
-
-    # For each caller function,
-    #   call each of the callee functions,
-    #   force a return from the callee, and
-    #   make sure that the local variables still have the right values.
-
-    for {set c 1} {$c <= $limit} {incr c} {
-
-        # Set a breakpoint at the next caller function.
-        gdb_test "tbreak caller$c" "Breakpoint.*\[0-9\]*\\." \
-	    "tbreak caller$c"
-
-	# Continue to the next caller function.
-	gdb_test "continue" " caller$c prologue .*" "run to caller$c"
-
-	# Do each callee function.
-        for {set e 1} {$e <= $limit} {incr e} {
-
-            gdb_test "tbreak callee$e" "Breakpoint.*\[0-9\]*\\." \
-		"caller$c calls callee$e; tbreak callee"
-            
-  	    gdb_test "continue" " callee$e prologue .*/" \
-		"caller$c calls callee$e; continue to callee"
-	    
-            # Do a forced return from the callee.
-	    set test "caller$c calls callee$e; return callee now"
-	    gdb_test_multiple "return 0" "$test" {
-		-re "Make .* return now.*y or n. $" {
-		    send_gdb "y\n"
-		    exp_continue
-		}
-		-re " caller$c .*$gdb_prompt $" {
-		    pass "$test"
-		}
-            }
-
-            # Check that the values of the local variables are what
-	    # they should be.
-            for {set var 1} {$var <= $c} {incr var} {
-                set expected [expr 0x7eeb + $var]
-	        gdb_test "print l$var" " = $expected" \
-		    "caller$c calls callee$e; return restored l$var to $expected"
-            }
-        }
-    }
-
-    if ![gdb_skip_stdio_test "run to completion"] {
-	send_gdb "continue\n"
-
-	gdb_expect {
-	    -re "exiting" {
-		pass "run to completion"
-	    }
-	    timeout { 
-		fail "(timeout) run to completion"
-	    }
-	}
-    } else {
-	gdb_test "continue" "" ""
-    }
-}
-
-
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set timeout 30
-restore_tests
diff --git a/gdb/testsuite/gdb.base/return.c b/gdb/testsuite/gdb.base/return.c
deleted file mode 100644
index d11a4b57e09..00000000000
--- a/gdb/testsuite/gdb.base/return.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <stdio.h>
-/*  Test "return" command.  */
-
-void func1 ()
-{
-  printf("in func1\n");
-}
-
-int
-func2 ()
-{
-  return -5;
-}
-
-double
-func3 ()
-{
-  return -5.0;
-}
-
-int tmp2;
-double tmp3;
-
-int main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  func1 ();
-  printf("in main after func1\n");
-  tmp2 = func2 ();
-  tmp3 = func3 ();
-  printf("exiting\n");
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/return.exp
deleted file mode 100644
index 2f8946d3020..00000000000
--- a/gdb/testsuite/gdb.base/return.exp
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (C) 1992, 1997, 2001 Free Software Foundation, 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 Jeff Law. (law@cs.utah.edu)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "return"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc return_tests { } {
-    global gdb_prompt
-
-
-    if { ! [ runto func1 ] } then { return 0 }
-    send_gdb "return\n"
-    gdb_expect {
-	-re "Make .* return now.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-	-re "func1 ..;.*$gdb_prompt $" {
-	    send_gdb "step\n"
-	    exp_continue
-	}
-    -re ".*in main after func1.*$gdb_prompt $" { pass "simple return" }
-    -re "$gdb_prompt $" { fail "simple return" }
-    timeout { fail "(timeout) simple return" }
-    }
-
-    # Set breakpoints in other interesting functions.
-    gdb_test "break func2" "" "break func2"
-    gdb_test "break func3" "" "break func3"
-
-    gdb_test "continue" "return -5;" "continue to return of -5"
-    send_gdb "return 5\n"
-    gdb_expect {
-	-re "Make .* return now.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-    -re ".*tmp2 = func2.*$gdb_prompt $" { }
-    -re "$gdb_prompt $" { fail "did not return (integer test)" }
-    timeout { fail "(timeout) did not return (integer test)" }
-    }
-    gdb_test "next" "tmp3 = func3.*" "next over call to func2"
-
-    gdb_test "p tmp2" ".* = 5" "correct value returned (integer test)"
-
-    gdb_test "continue" "return -5.0;" "continue to return of -5.0"
-
-    # Return of a double does not work for 68hc11 (need struct return
-    # in memory).
-    setup_xfail "m6811-*-*"
-    send_gdb "return 5.0\n"
-    gdb_expect {
-	-re "Make .* return now.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-	-re ".*tmp3 = func3.*$gdb_prompt $" { }
-	-re "$gdb_prompt $" { fail "did not return (double test)" }
-	timeout { fail "(timeout) did not return (double test)" }
-    }
-
-    setup_xfail "m6811-*-*"
-    gdb_test "next" "printf.*" "next over call to func3"
-
-    # This test also fails for sparc Solaris 2.3 & 2.4, but passes under 2.5
-    # At the time the `next' is issued, the floating point unit for the
-    # process is not yet initialized, and the storing of the floating
-    # point value to the floating point return register is ignored.
-    # Xfail it for current versions that are known to fail.  Presumably
-    # if some future version does initialize the floating point unit at
-    # process start, making this test pass, it will be for a version that
-    # is not xfailed.
-
-    setup_xfail "sparc-*-solaris2.3*" "sparc-*-solaris2.4*" "m6811-*-*"
-    gdb_test "p tmp3" ".* = 5.*" "correct value returned double test (known problem with sparc solaris)"
-}
-
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set timeout 30
-return_tests
diff --git a/gdb/testsuite/gdb.base/return2.c b/gdb/testsuite/gdb.base/return2.c
deleted file mode 100644
index 58d85eca113..00000000000
--- a/gdb/testsuite/gdb.base/return2.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Test gdb's "return" command.  */
-
-int void_test = 0;
-int main_test = 0;
-
-char      char_returnval      = '1';
-short     short_returnval     = 1;
-int       int_returnval       = 1;
-long      long_returnval      = 1;
-long long long_long_returnval = 1;
-float     float_returnval     = 1;
-double    double_returnval    = 1;
-
-union {
-  char      char_testval;
-  short     short_testval;
-  int       int_testval;
-  long      long_testval;
-  long long long_long_testval;
-  float     float_testval;
-  double    double_testval;
-  char      ffff[80];
-} testval;
-
-void void_func ()
-{
-  void_test = 1;
-}
-
-char char_func ()
-{
-  return char_returnval;
-}
-
-short short_func ()
-{
-  return short_returnval;
-}
-
-int int_func ()
-{
-  return int_returnval;
-}
-
-long long_func ()
-{
-  return long_returnval;
-}
-
-long long long_long_func ()
-{
-  return long_long_returnval;
-}
-
-float float_func ()
-{
-  return float_returnval;
-}
-
-double double_func ()
-{
-  return double_returnval;
-}
-
-int main (int argc, char **argv)
-{
-  char char_resultval;
-  short short_resultval;
-  int int_resultval;
-  long long_resultval;
-  long long long_long_resultval;
-  float float_resultval;
-  double double_resultval;
-  int i;
-
-  /* A "test load" that will insure that the function really returns 
-     a ${type} (as opposed to just a truncated or part of a ${type}).  */
-  for (i = 0; i < sizeof (testval.ffff); i++)
-    testval.ffff[i] = 0xff;
-
-  void_func (); 				/* call to void_func */
-  char_resultval      = char_func ();		/* void_checkpoint */
-  short_resultval     = short_func ();		/* char_checkpoint */
-  int_resultval       = int_func ();		/* short_checkpoint */
-  long_resultval      = long_func ();		/* int_checkpoint */
-  long_long_resultval = long_long_func ();	/* long_checkpoint */
-
-  /* On machines using IEEE floating point, the test pattern of all
-     1-bits established above turns out to be a floating-point NaN
-     ("Not a Number").  According to the IEEE rules, NaN's aren't even
-     equal to themselves.  This can lead to stupid conversations with
-     GDB like:
-
-       (gdb) p testval.float_testval == testval.float_testval
-       $7 = 0
-       (gdb)
-
-     This is the correct answer, but it's not the sort of thing
-     return2.exp wants to see.  So to make things work the way they
-     ought, we'll set aside the `union' cleverness and initialize the
-     test values explicitly here.  These values have interesting bits
-     throughout the value, so we'll still detect truncated values.  */
-
-  testval.float_testval = 2.7182818284590452354;/* long_long_checkpoint */
-  float_resultval     = float_func ();		
-  testval.double_testval = 3.14159265358979323846; /* float_checkpoint */
-  double_resultval    = double_func ();		
-  main_test = 1;				/* double_checkpoint */
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/return2.exp b/gdb/testsuite/gdb.base/return2.exp
deleted file mode 100644
index 050ccf9fa77..00000000000
--- a/gdb/testsuite/gdb.base/return2.exp
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2000, 2001, 2004 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "return2"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc return_1 { type } {
-    global gdb_prompt
-
-    gdb_test "break ${type}_func" "Breakpoint \[0123456789\].*" \
-	    "set break on ${type}_func"
-    gdb_test "continue" "Breakpoint.* ${type}_func.*" \
-	    "continue to ${type}_func"
-    send_gdb "return testval.${type}_testval\n"
-    gdb_expect {
-	-re "Make ${type}_func return now.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-	-re ".*${type}_resultval *= ${type}_func.*$gdb_prompt $" {
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	-re ".*${type}_checkpoint.*$gdb_prompt $" {
-	    pass "return from ${type}_func"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "return from ${type}_func"
-	}
-	timeout {
-	    fail "return from ${type}_func (timeout)"
-	}
-    }
-    gdb_test "print ${type}_resultval == testval.${type}_testval" ".* = 1" \
-	    "${type} value returned successfully"
-    gdb_test "print ${type}_resultval != ${type}_returnval" ".* = 1" \
-	    "validate result value not equal to program return value"
-}
-
-proc return_void { } {
-    global gdb_prompt
-
-    gdb_test "break void_func" "Breakpoint \[0123456789\].*" \
-	    "set break on void_func"
-    gdb_test "continue" "Breakpoint.* void_func.*" \
-	    "continue to void_func"
-    send_gdb "return \n"
-    gdb_expect {
-	-re "Make void_func return now.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-	-re ".*void_func.*call to void_func.*$gdb_prompt $" {
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	-re ".*void_checkpoint.*$gdb_prompt $" {
-	    pass "return from void_func"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "return from void_func"
-	}
-	timeout {
-	    fail "return from void_func (timeout)"
-	}
-    }
-    gdb_test "print void_test == 0" ".* = 1" \
-	    "void function returned successfully"
-}
-
-proc return2_tests { } {
-    global gdb_prompt
-
-    if { ! [ runto_main ] } then {
-	gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
-    }
-
-    return_void
-    return_1 "char"
-    return_1 "short"
-    return_1 "int"
-    return_1 "long"
-    if { ! [istarget "m6811-*-*"] && ![istarget "h8300*-*"] } then {
-        return_1 "long_long"
-    }
-    return_1 "float"
-    if { ! [istarget "m6811-*-*"] } then {
-        return_1 "double"
-    }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set timeout 30
-return2_tests
diff --git a/gdb/testsuite/gdb.base/run.c b/gdb/testsuite/gdb.base/run.c
deleted file mode 100644
index 25b8a4a4aa4..00000000000
--- a/gdb/testsuite/gdb.base/run.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *	This simple classical example of recursion is useful for
- *	testing stack backtraces and such.
- */
-
-#ifdef vxworks
-
-#  include <stdio.h>
-
-/* VxWorks does not supply atoi.  */
-static int
-atoi (z)
-     char *z;
-{
-  int i = 0;
-
-  while (*z >= '0' && *z <= '9')
-    i = i * 10 + (*z++ - '0');
-  return i;
-}
-
-/* I don't know of any way to pass an array to VxWorks.  This function
-   can be called directly from gdb.  */
-
-vxmain (arg)
-char *arg;
-{
-  char *argv[2];
-
-  argv[0] = "";
-  argv[1] = arg;
-  main (2, argv, (char **) 0);
-}
-
-#else /* ! vxworks */
-#  include <stdio.h>
-#  include <stdlib.h>
-#endif /* ! vxworks */
-
-#ifdef PROTOTYPES
-int factorial (int);
-
-int
-main (int argc, char **argv, char **envp)
-#else
-int
-main (argc, argv, envp)
-int argc;
-char *argv[], **envp;
-#endif
-{
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-#ifdef FAKEARGV
-    printf ("%d\n", factorial (1));
-#else    
-    if (argc != 2) {
-	printf ("usage:  factorial <number>\n");
-	return 1;
-    } else {
-	printf ("%d\n", factorial (atoi (argv[1])));
-    }
-#endif
-    return 0;
-}
-
-#ifdef PROTOTYPES
-int factorial (int value)
-#else
-int factorial (value) int value;
-#endif
-{
-    int  local_var;
-
-    if (value > 1) {
-	value *= factorial (value - 1);
-    }
-    local_var = value;
-    return (value);
-}
diff --git a/gdb/testsuite/gdb.base/savedregs.c b/gdb/testsuite/gdb.base/savedregs.c
deleted file mode 100644
index 6709eb1e104..00000000000
--- a/gdb/testsuite/gdb.base/savedregs.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.
-
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-
-static volatile int done;
-
-extern int
-callee (int param)
-{
-  return param * done + 1;
-}
-
-extern int
-caller (int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8)
-{
-  return callee (a1 << a2 * a3 / a4 + a6 & a6 % a7 - a8) + done;
-}
-
-static void
-catcher (int sig)
-{
-  done = 1;
-} /* handler */
-
-static void
-thrower (void)
-{
-  *(char *)0 = 0;
-}
-
-main ()
-{
-  signal (SIGSEGV, catcher);
-  thrower ();
-}
diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/savedregs.exp
deleted file mode 100644
index 319d281a500..00000000000
--- a/gdb/testsuite/gdb.base/savedregs.exp
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-# This test is to check that a frame's "info frame", especially the
-# saved registers list, doesn't change while that frame isn't current.
-
-# It uses the program savedregs.c to construct a somewhat warped
-# backtrace (contains both signal and dummy frames) and then, at each
-# step checks that non-inner frames have consistent "info frame"
-# output.  Note that a frame's "info frame" can only be captured after
-# it is non-current (made a call, interrupted, ...), this is because
-# instructions executed to perform the call may affect "info frame"
-# output.
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping savedregs.exp because of nosignals."
-    continue
-}
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile savedregs
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${module}.c"
-    return -1
-}
-
-# get things started
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Advance to main
-if { ![runto_main] } {
-    gdb_suppress_tests;
-}
-
-proc process_saved_regs { current inner outer } {
-    global gdb_prompt
-    global expect_out
-    global saved_regs
-
-    # Skip the CURRENT frame.
-
-    set level 1
-
-    # Run over the list of INNER frames capturing the "info frame"
-    # output for each.  Both dummy and sigtramp frames need to be
-    # handled specially: they do not yet have correct function names;
-    # and for dummy frames won't have saved registers.  If there's a
-    # problem, fail but capture the output anyway, hopefully later
-    # "info frame" requests for that same frame will at least fail in
-    # a consistent manner (stops propogated fails).
-
-    foreach func $inner {
-	set saved_regs($func) "error"
-	set test "Get $func info frame"
-	# Both dummy and sigtramp frames have problems.
-	switch $func {
-	    dummy {
-		# Dummy frame's do not have saved registers, and do
-		# not print <dummy>.
-		set pat "Stack frame at .* in .*"
-	    }
-	    sigtramp {
-		# Sigtramp frames don't yet print <signal trampoline>.
-		set pat "Stack frame at .* Saved registers:.*"
-	    }
-	    default {
-		set pat "Stack frame at .* in $func .* Saved registers:.*"
-	    }
-	}
-	# If the "info frame" barf, capture the output anyway so that
-	# it does not cascade further failures.
-	gdb_test_multiple "info frame $level" "$test" {
-	    -re "($pat)$gdb_prompt " {
-		set saved_regs($func) "$expect_out(1,string)"
-		pass "$test"
-	    }
-	    -re "(Stack frame at .*)$gdb_prompt " {
-		set saved_regs($func) "$expect_out(1,string)"
-		fail "$test"
-	    }
-	    -re "(Cannot access .*)$gdb_prompt " {
-		set saved_regs($func) "$expect_out(1,string)"
-		fail "$test"
-	    }
-	}
-	incr level
-    }
-    
-    # Now iterate through the list of OUTER frames checking that the
-    # "info frame" output from each still matches what was captured
-    # during an early query.  To avoid cascading failures, checking is
-    # abandoned after the first failure.  The assumption is that,
-    # since frames outer to the botched frame rely on the botched
-    # frame's info, those more outer frames are also botched.  Besides
-    # we've got the failure we're after.
-
-    set ok 1
-    foreach func $outer {
-	set test [concat "Check $func info frame; stack contains" \
-		      $current $inner $outer]
-	if $ok {
-	    set ok 0
-	    set pat [string_to_regexp "$saved_regs($func)"]
-	    gdb_test_multiple "info frame $level" "$test" {
-		-re "$pat$gdb_prompt " {
-		    pass "$test"
-		    set ok 1
-		}
-	    }
-	} {
-	    pass "$test (skipped)"
-	}
-	incr level
-    }
-}
-
-
-# Continue to the signal thrower, capture main's saved-reg info.
-gdb_test "advance thrower" "thrower .* at .*"
-process_saved_regs thrower { main } { }
-
-# Continue to the signal catcher, check main's saved-reg info, capture
-# catcher's saved-reg info.
-gdb_test "handle SIGSEGV pass print nostop"
-gdb_test "advance catcher" "catcher .* at .*"
-process_saved_regs catcher { sigtramp thrower } { main }
-
-# Breakpoint at and call the caller function, saved-regs of main and
-# catcher, capture caller's registers.
-gdb_test "break caller"
-gdb_test "call caller (1,2,3,4,5,6,7,8)"
-process_saved_regs caller { dummy catcher } { sigtramp thrower main }
-
-# Run to callee, again check everything.
-gdb_test "advance callee" "callee .* at .*"
-process_saved_regs callee { caller } { dummy catcher sigtramp thrower main }
diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp
deleted file mode 100644
index 10806bd73a2..00000000000
--- a/gdb/testsuite/gdb.base/scope.exp
+++ /dev/null
@@ -1,598 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003,
-# 2004 Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "scope"
-set binfile ${objdir}/${subdir}/${testfile}
-
-
-if  { [gdb_compile "${srcdir}/${subdir}/scope0.c" "${binfile}0.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/scope1.c" "${binfile}1.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# Test locating various things when stopped just inside main, after
-# running init0().  To prevent cascading of errors, we report the
-# first one and quit.  If all pass, then we print the pass results.
-
-proc test_at_main {} {
-    global gdb_prompt
-    global decimal
-    global det_file
-    global srcdir
-    global subdir
-    global hp_cc_compiler
-
-    # skip past init.  There may be a call to __main at the start of
-    # main, so the first next may only get us to the init0 call.
-    if [gdb_test "next" "$decimal.*foo \\(\\);" "next over init0() in main"  "$decimal.*init0 \\(\\);" "next"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope0.c::filelocal, which is 1
-
-    if [gdb_test "print filelocal" "\\\$$decimal = 1" "print filelocal" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at main"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope0.c::filelocal_bss, which is 101
-
-    if [gdb_test "print filelocal_bss" "\\\$$decimal = 101" "print filelocal_bss" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_main"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope0.c::filelocal_ro, which is 201
-
-    # No clue why the rs6000 fails this test.
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print filelocal_ro" "\\\$$decimal = 201" "print filelocal_ro in test_at_main" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::filelocal, which is 2
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::filelocal_bss, which is 102
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::filelocal_ro, which is 202
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if {$hp_cc_compiler} then { setup_xfail "hppa2.0w-*-*" 11747CLLbs}
-    if [gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::foo::funclocal, which is 3
-
-    if [gdb_test "print foo::funclocal" "\\\$$decimal = 3" "print foo::funclocal" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::foo::funclocal_ro, which is 203
-
-    if [gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" "print foo::funclocal_ro" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::bar::funclocal, which is 4
-
-    if [gdb_test "print bar::funclocal" "\\\$$decimal = 4" "print bar::funclocal" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal"] { 
-      gdb_suppress_tests ; 
-    }
-    gdb_stop_suppressing_tests;
-
-}
-
-proc test_at_foo {} {
-    global gdb_prompt
-    global decimal
-    global det_file
-    global srcdir
-    global subdir
-
-    if [gdb_test "next" ".*bar \\(\\);" "" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope0.c::filelocal, which is 1
-
-    if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at foo"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope0.c::filelocal_bss, which is 101
-
-    if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_foo"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope0.c::filelocal_ro, which is 201
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at foo"
-
-    # Print scope1.c::filelocal, which is 2
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at foo"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    gdb_test "print filelocal_bss" "\\\$$decimal = 102" \
-	"print filelocal_bss at foo"
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at foo"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss"
-
-
-    gdb_test "print filelocal_ro" "\\\$$decimal = 202" \
-	"print filelocal_ro at foo"
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at foo"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"
-
-
-    # Print scope1.c::foo::funclocal, which is 3
-
-    gdb_test "print funclocal" "\\\$$decimal = 3" "print funclocal at foo"
-
-    gdb_test "print foo::funclocal" "\\\$$decimal = 3" \
-	"print foo::funclocal at foo"
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at foo"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal"
-
-
-    # Print scope1.c::foo::funclocal_bss, which is 103
-
-    gdb_test "print funclocal_bss" "\\\$$decimal = 103" \
-	"print funclocal_bss at foo"
-
-    gdb_test "print foo::funclocal_bss" "\\\$$decimal = 103" \
-	"print foo::funclocal_bss at foo"
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at foo"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_bss"
-
-
-    # Print scope1.c::foo::funclocal_ro, which is 203
-
-    gdb_test "print funclocal_ro" "\\\$$decimal = 203" \
-	"print funclocal_ro at foo"
-
-    gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" \
-	"print foo::funclocal_ro at foo"
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at foo"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro"
-
-
-    # Print scope1.c::bar::funclocal, which is 4
-
-    gdb_test "print bar::funclocal" "\\\$$decimal = 4" \
-	"print bar::funclocal at foo"
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at foo"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal"
-    gdb_stop_suppressing_tests;
-
-}
-
-proc test_at_bar {} {
-    global gdb_prompt
-    global decimal
-    global det_file
-    global srcdir
-    global subdir
-
-    if [gdb_test "next" ".*" "" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope0.c::filelocal, which is 1
-
-    if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at bar"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-   # Print scope0.c::filelocal_bss, which is 101
-
-    if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_bar"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-   # Print scope0.c::filelocal_ro, which is 201
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro at bar"  "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::filelocal, which is 2
-
-    if [gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at bar"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::filelocal_bss, which is 102
-
-    if [gdb_test "print filelocal_bss" "\\\$$decimal = 102" "print filelocal_bss at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at bar"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::filelocal_ro, which is 202
-
-    if [gdb_test "print filelocal_ro" "\\\$$decimal = 202" "print filelocal_ro in test_at_bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at bar"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::foo::funclocal, which is 3
-
-    if [gdb_test "print foo::funclocal" "\\\$$decimal = 3" "print foo::funclocal at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at bar"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::foo::funclocal_bss, which is 103
-
-    if [gdb_test "print foo::funclocal_bss" "\\\$$decimal = 103" "print foo::funclocal_bss at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at bar"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_bss"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::foo::funclocal_ro, which is 203
-
-    if [gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" "print foo::funclocal_ro at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at bar"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::bar::funclocal, which is 4
-
-    if [gdb_test "print funclocal" "\\\$$decimal = 4" "print funclocal at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if [gdb_test "print bar::funclocal" "\\\$$decimal = 4" "print bar::funclocal at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at bar"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal"] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    # Print scope1.c::bar::funclocal_bss, which is 104
-
-    if [gdb_test "print funclocal_bss" "\\\$$decimal = 104" "print funclocal_bss at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if [gdb_test "print bar::funclocal_bss" "\\\$$decimal = 104" "print bar::funclocal_bss at bar" ] { 
-      gdb_suppress_tests ; 
-    }
-
-
-    if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
-    if [gdb_test "print 'scope1.c'::bar::funclocal_bss" "\\\$$decimal = 104" "print 'scope1.c'::bar::funclocal_bss at bar"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal_bss"] { 
-      gdb_suppress_tests ; 
-    }
-    gdb_stop_suppressing_tests;
-
-}
-
-# This test has little to do with local scopes, but it is in scope.exp anyway.
-# That's life.
-
-proc test_at_autovars {} {
-    global gdb_prompt
-    global decimal
-    global hex
-    global srcfile
-
-    # Test symbol table lookup with 100 local (auto) variables.
-
-    gdb_breakpoint marker1
-
-    if [gdb_test "cont" "Break.* marker1 \\(\\) at .*:$decimal.*" "continue to marker1"] {
-	gdb_suppress_tests;
-    }
-
-    if [gdb_test "up" ".*autovars.*" "up from marker1 in scope.exp" ] { 
-	gdb_suppress_tests ; 
-    }
-
-    set count 0
-    while {$count < 100} {
-	if [gdb_test "print i$count" ".* = $count" "" ] { 
-	  gdb_suppress_tests ; 
-	}
-
-	set count [expr $count+1]
-    }
-    clear_xfail "*-*-*"
-    pass "$count auto variables correctly initialized"
-
-    # Test that block variable sorting is not screwing us.
-    gdb_test "frame" "#.*autovars \\(bcd=5, abc=6\\).*" "args in correct order"
-}
-
-proc test_at_localscopes {} {
-    global gdb_prompt
-    global decimal
-    global hex
-    global srcfile
-
-    gdb_breakpoint marker2
-    gdb_breakpoint marker3
-    gdb_breakpoint marker4
-
-    if [gdb_test "cont" "Break.* marker2 \\(\\) at .*:$decimal.*" "continue to marker2"] {
-	gdb_suppress_tests;
-    }
-    if [gdb_test "up" ".*localscopes.*" "up from marker2 in scopes.exp" ] { 
-	gdb_suppress_tests ; 
-    }
-
-    # Should be at first (outermost) scope.  Check values.
-
-    gdb_test "print localval" " = 10" "print localval, outer scope"
-    gdb_test "print localval1" " = 11" "print localval1, outer scope"
-    gdb_test "print localval2" "No symbol \"localval2\" in current context." \
-	"print localval2, outer scope"
-    gdb_test "print localval3" "No symbol \"localval3\" in current context." \
-	"print localval3, outer scope"
-
-    if [gdb_test "cont" "Break.* marker3 \\(\\) at .*:$decimal.*" \
-	"continue to marker3 in scope.exp"] then { gdb_suppress_tests }
-    if [gdb_test "up" ".*localscopes.*" "up from marker3 in scope.exp"] { 
-	gdb_suppress_tests 
-    }
-
-    # Should be at next (first nested) scope.  Check values.
-
-    gdb_test "print localval" " = 20" \
-	"print localval, first nested scope"
-    gdb_test "print localval1" " = 11" "print localval1, first nested scope"
-    gdb_test "print localval2" " = 12" "print localval2, first nested scope"
-    gdb_test "print localval3" "No symbol \"localval3\" in current context." \
-	"print localval3, first nested scope"
-
-    # This test will only fail if the file was compiled by gcc, but
-    # there's no way to check that.
-    if [gdb_test "cont" "Break.* marker4.*at .*:$decimal.*" \
-	"continue to marker4 in scope.exp"] then { gdb_suppress_tests }
-    if [gdb_test "up" ".*localscopes.*" "up from marker4 in scope.exp"] {
-	gdb_suppress_tests 
-    }
-
-    gdb_test "print localval" " = 30" "print localval, innermost scope"
-    gdb_test "print localval1" " = 11" "print localval1, innermost scope"
-    gdb_test "print localval2" " = 12" "print localval2, innermost scope"
-    gdb_test "print localval3" " = 13" "print localval3, innermost scope"
-    gdb_stop_suppressing_tests;
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [istarget "*-*-vxworks*"] {
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-}
-
-# Test that variables in various segments print out correctly before
-# the program is run.  
-
-# AIX--sections get mapped to the same address so we can't get the right one.
-setup_xfail "rs6000-*-*"
-
-gdb_test "print 'scope0.c'::filelocal_ro" "= 201"
-
-# gdb currently cannot access bss memory on some targets if the inferior
-# is not running.
-#
-# For PA boards using monitor/remote-pa.c, the bss test is going to 
-# randomly fail.  We've already put remote-pa on the target stack,
-# so we actually read memory from the board.  Problem is crt0.o
-# is responsible for clearing bss and that hasnt' happened yet.
-#
-# This is a problem for all non-native targets. -- manson
-if [is_remote target] {
-    unsupported "print 'scope0.c'::filelocal_bss before run"
-} else {
-    gdb_test "print 'scope0.c'::filelocal_bss" "= 0" \
-	"print 'scope0.c'::filelocal_bss before run"
-}
-
-gdb_test "print 'scope0.c'::filelocal" "= 1" \
-    "print 'scope0.c'::filelocal before run"
-
-if [runto_main] then { test_at_main }
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-}
-if [runto foo] then { test_at_foo }
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-}
-if [runto bar] then { test_at_bar }
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-}
-if [runto localscopes] then { test_at_localscopes }
-if [istarget "mips-idt-*"] then {
-    # Restart because IDT/SIM runs out of file descriptors.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-}
-if [runto autovars] then { test_at_autovars }
-
-if [istarget "*-*-vxworks*"] {
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-}
diff --git a/gdb/testsuite/gdb.base/scope0.c b/gdb/testsuite/gdb.base/scope0.c
deleted file mode 100644
index ad994fc0b21..00000000000
--- a/gdb/testsuite/gdb.base/scope0.c
+++ /dev/null
@@ -1,208 +0,0 @@
-static int filelocal = 1;	/* In Data section */
-static int filelocal_bss;	/* In BSS section */
-#ifndef __STDC__
-#define	const	/**/
-#endif
-static const int filelocal_ro = 201;	/* In Read-Only Data section */
-
-extern void init1();
-extern void foo();
-
-int autovars (int bcd, int abc);
-int localscopes (int x);
-int useit (int val);
-void init0();
-void marker1 ();
-void marker2 ();
-void marker3 ();
-void marker4 ();
-
-int main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  init0 ();
-  foo ();
-  autovars (5, 6);
-  localscopes (0);
-}
-
-/* On some systems, such as AIX, unreferenced variables are deleted
-   from the executable.  */
-void usestatics ()
-{
-  useit (filelocal);
-  useit (filelocal_bss);
-  useit (filelocal_ro);
-}
-
-void init0 ()
-{
-  filelocal_bss = 101;
-  init1 ();
-}
-
-/* This is to derail optimizer in localscopes.
-   Return 1 + 2 + . . . + N.  */
-#ifdef PROTOTYPES
-int
-sum_upto (int n)
-#else
-int
-sum_upto (n)
-     int n;
-#endif
-{
-  int i;
-  int retval = 0;
-
-  for (i = 1; i <= n; ++i)
-    retval += i;
-  return retval;
-}
-
-#ifdef PROTOTYPES
-int
-useit (int val)
-#else
-int
-useit (val)
-#endif
-{
-    static int usedval;
-
-    usedval = val;
-    return val + sum_upto (0);
-}
-
-#ifdef PROTOTYPES
-int
-autovars (int bcd, int abc)
-#else
-int
-autovars (bcd, abc)
-     int bcd;
-     int abc;
-#endif
-{
-    int  i0 =  useit (0),  i1 =  useit (1),  i2 =  useit (2);
-    int  i3 =  useit (3),  i4 =  useit (4),  i5 =  useit (5);
-    int  i6 =  useit (6),  i7 =  useit (7),  i8 =  useit (8);
-    int  i9 =  useit (9), i10 = useit (10), i11 = useit (11);
-    int i12 = useit (12), i13 = useit (13), i14 = useit (14);
-    int i15 = useit (15), i16 = useit (16), i17 = useit (17);
-    int i18 = useit (18), i19 = useit (19), i20 = useit (20);
-    int i21 = useit (21), i22 = useit (22), i23 = useit (23);
-    int i24 = useit (24), i25 = useit (25), i26 = useit (26);
-    int i27 = useit (27), i28 = useit (28), i29 = useit (29);
-    int i30 = useit (30), i31 = useit (31), i32 = useit (32);
-    int i33 = useit (33), i34 = useit (34), i35 = useit (35);
-    int i36 = useit (36), i37 = useit (37), i38 = useit (38);
-    int i39 = useit (39), i40 = useit (40), i41 = useit (41);
-    int i42 = useit (42), i43 = useit (43), i44 = useit (44);
-    int i45 = useit (45), i46 = useit (46), i47 = useit (47);
-    int i48 = useit (48), i49 = useit (49), i50 = useit (50);
-    int i51 = useit (51), i52 = useit (52), i53 = useit (53);
-    int i54 = useit (54), i55 = useit (55), i56 = useit (56);
-    int i57 = useit (57), i58 = useit (58), i59 = useit (59);
-    int i60 = useit (60), i61 = useit (61), i62 = useit (62);
-    int i63 = useit (63), i64 = useit (64), i65 = useit (65);
-    int i66 = useit (66), i67 = useit (67), i68 = useit (68);
-    int i69 = useit (69), i70 = useit (70), i71 = useit (71);
-    int i72 = useit (72), i73 = useit (73), i74 = useit (74);
-    int i75 = useit (75), i76 = useit (76), i77 = useit (77);
-    int i78 = useit (78), i79 = useit (79), i80 = useit (80);
-    int i81 = useit (81), i82 = useit (82), i83 = useit (83);
-    int i84 = useit (84), i85 = useit (85), i86 = useit (86);
-    int i87 = useit (87), i88 = useit (88), i89 = useit (89);
-    int i90 = useit (90), i91 = useit (91), i92 = useit (92);
-    int i93 = useit (93), i94 = useit (94), i95 = useit (95);
-    int i96 = useit (96), i97 = useit (97), i98 = useit (98);
-    int i99 = useit (99);
-
-    /* Use all 100 of the local variables to derail agressive optimizers.  */
-
-    useit ( i0); useit ( i1); useit ( i2); useit ( i3); useit ( i4);
-    useit ( i5); useit ( i6); useit ( i7); useit ( i8); useit ( i9);
-    useit (i10); useit (i11); useit (i12); useit (i13); useit (i14);
-    useit (i15); useit (i16); useit (i17); useit (i18); useit (i19);
-    useit (i20); useit (i21); useit (i22); useit (i23); useit (i24);
-    useit (i25); useit (i26); useit (i27); useit (i28); useit (i29);
-    useit (i30); useit (i31); useit (i32); useit (i33); useit (i34);
-    useit (i35); useit (i36); useit (i37); useit (i38); useit (i39);
-    useit (i40); useit (i41); useit (i42); useit (i43); useit (i44);
-    useit (i45); useit (i46); useit (i47); useit (i48); useit (i49);
-    useit (i50); useit (i51); useit (i52); useit (i53); useit (i54);
-    useit (i55); useit (i56); useit (i57); useit (i58); useit (i59);
-    useit (i60); useit (i61); useit (i62); useit (i63); useit (i64);
-    useit (i65); useit (i66); useit (i67); useit (i68); useit (i69);
-    useit (i70); useit (i71); useit (i72); useit (i73); useit (i74);
-    useit (i75); useit (i76); useit (i77); useit (i78); useit (i79);
-    useit (i80); useit (i81); useit (i82); useit (i83); useit (i84);
-    useit (i85); useit (i86); useit (i87); useit (i88); useit (i89);
-    useit (i90); useit (i91); useit (i92); useit (i93); useit (i94);
-    useit (i95); useit (i96); useit (i97); useit (i98); useit (i99);
-
-    useit (abc); useit (bcd);
-
-    marker1 ();
-    return i0 + i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9 + i10
-      + i11 + i12 + i13 + i14 + i15 + i16 + i17 + i18 + i19 + i20
-      + i21 + i22 + i23 + i24 + i25 + i26 + i27 + i28 + i29 + i30
-      + i31 + i32 + i33 + i34 + i35 + i36 + i37 + i38 + i39 + i40
-      + i41 + i42 + i43 + i44 + i45 + i46 + i47 + i48 + i49 + i50
-      + i51 + i52 + i53 + i54 + i55 + i56 + i57 + i58 + i59 + i60
-      + i61 + i62 + i63 + i64 + i65 + i66 + i67 + i68 + i69 + i70
-      + i71 + i72 + i73 + i74 + i75 + i76 + i77 + i78 + i79 + i80
-      + i81 + i82 + i83 + i84 + i85 + i86 + i87 + i88 + i89 + i90
-      + i91 + i92 + i93 + i94 + i95 + i96 + i97 + i98 + i99 + abc + bcd;
-}
-
-#ifdef PROTOTYPES
-int
-localscopes (int x)
-#else
-int
-localscopes (x)
-     int x;
-#endif
-{
-    int localval;
-    int retval;
-    int i;
-
-    localval = 0;
-    useit (localval);
-
-    {
-	int localval = x + 4 + sum_upto (3); /* 10 */
-	int localval1 = x + 5 + sum_upto (3); /* 11 */
-
-	useit (localval);
-	useit (localval1);
-	marker2 ();
-	{
-	    int localval = localval1 + 3 + sum_upto (3); /* 20 */
-	    int localval2 = localval1 + sum_upto (1); /* 12 */
-	    useit (localval);
-	    useit (localval2);
-	    marker3 ();
-	    {
-		int localval = localval2 + 3 + sum_upto (5); /* 30 */
-		int localval3 = localval2 + sum_upto (1); /* 13 */
-		useit (localval);
-		useit (localval3);
-		marker4 ();
-		retval = x + localval1 + localval2 + localval3;
-	    }
-	}
-    }
-    return retval;
-}
-
-void marker1 () {}
-void marker2 () {}
-void marker3 () {}
-void marker4 () {}
diff --git a/gdb/testsuite/gdb.base/scope1.c b/gdb/testsuite/gdb.base/scope1.c
deleted file mode 100644
index 8c325224993..00000000000
--- a/gdb/testsuite/gdb.base/scope1.c
+++ /dev/null
@@ -1,54 +0,0 @@
-static int filelocal = 2;	/* In Data section */
-static int filelocal_bss;	/* In BSS section */
-#ifndef __STDC__
-#define	const	/**/
-#endif
-static const int filelocal_ro = 202;	/* In Read-Only Data section */
-
-void foo ()
-{
-
-  void bar ();
-  
-  static int funclocal = 3;	/* In Data section */
-  static int funclocal_bss;	/* In BSS section */
-  static const int funclocal_ro = 203;	/* RO Data */
-  static const int funclocal_ro_bss;	/* RO Data */
-
-  funclocal_bss = 103;
-  bar ();
-}
-
-void bar ()
-{
-  static int funclocal = 4;	/* In data section */
-  static int funclocal_bss;	/* In BSS section */
-  funclocal_bss = 104;
-}
-
-void init1 ()
-{
-  filelocal_bss = 102;
-}
-
-/* On some systems, such as AIX, unreferenced variables are deleted
-   from the executable.  */
-void usestatics1 ()
-{
-  void useit1 (int val);
-  
-  useit1 (filelocal);
-  useit1 (filelocal_bss);
-  useit1 (filelocal_ro);
-}
-
-#ifdef PROTOTYPES
-void useit1 (int val)
-#else
-void useit1 (val) int val;
-#endif
-{
-    static int usedval;
-
-    usedval = val;
-}
diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp
deleted file mode 100644
index 0b86b79a90d..00000000000
--- a/gdb/testsuite/gdb.base/sect-cmd.exp
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1997, 1998, 1999, 2003 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-global usestubs
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-# This test exists solely to exercise the "section" command for
-# code-coverage on HP-UX.  (So far as I can tell, the "section"
-# command isn't needed on HP-UX, but probably is for embedded
-# apps.)
-#
-if ![istarget "hppa*-*-hpux*"] then {
-  return
-}
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then { fail "section command tests suppressed" }
-
-# Get the $CODE$ section's starting address.
-#
-# (Note that this works for PA32 programs, which use the SOM file
-# format.  PA64 uses ELF, and when support for that is added, it's
-# not clear that there'll be a section named "$CODE$" in such
-# programs.)
-#
-
-set address1 ""
-set address2 ""
-send_gdb "info files\n"
-gdb_expect {
-  -re ".*(0x\[0-9a-fA-F\]*) - (0x\[0-9a-fA-F\]*) is .(CODE|text).*$gdb_prompt $"\
-          {pass "info files"
-	   set address1 $expect_out(1,string)
-	   set address2 $expect_out(2,string)}
-  -re "$gdb_prompt $"\
-          {fail "info files"}
-  timeout {fail "(timeout) info files"}
-}
-
-# Reset the section to that same starting address, which should be
-# harmless (i.e., we just want to exercise the section command).
-#
-if [istarget "hppa2.0w-*-*"] then {
-  send_gdb "section \.text $address1\n"
-  gdb_expect {
-    -re ".*$address1 \- $address2 is .text.*$gdb_prompt $"\
-            {pass "set section command"}
-    -re "$gdb_prompt $"\
-            {fail "set section command"}
-    timeout {fail "(timeout) set section command"}
-  }
-} else {
-  send_gdb "section \$CODE\$ $address1\n"
-  gdb_expect {
-    -re ".*$address1 \- $address2 is .CODE..*$gdb_prompt $"\
-            {pass "set section command"}
-    -re "$gdb_prompt $"\
-            {fail "set section command"}
-    timeout {fail "(timeout) set section command"}
-  }
-}
-
-# Verify that GDB responds gracefully to a non-existent section name.
-#
-send_gdb "section FOOBARBAZ 0x1234\n"
-gdb_expect {
-  -re "Section FOOBARBAZ not found\r\n$gdb_prompt $"\
-          {pass "non-existent section disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "non-existent section disallowed"}
-  timeout {fail "(timeout) non-existent section disallowed"}
-}
-
-# We "happen to know" that GDB uses a fixed size character buffer to
-# parse the section name into, and the buffer is declared to be 100
-# characters in length.  Verify that GDB gracefully handles section
-# names longer than that.  (The section is also non-existent.)
-#
-send_gdb "section A234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123 0x1234\n"
-gdb_expect {
-  -re "Section A23456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 not found\r\n$gdb_prompt $"\
-          {pass "non-existent too-long section disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "non-existent too-long section disallowed"}
-  timeout {fail "(timeout) non-existent too-long section disallowed"}
-}
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/sep-proc.c b/gdb/testsuite/gdb.base/sep-proc.c
deleted file mode 100644
index 0fbb17a82c2..00000000000
--- a/gdb/testsuite/gdb.base/sep-proc.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This file is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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  */
-
-void
-say_hello (void)
-{
-  printf ("Hello world.\n");
-}
diff --git a/gdb/testsuite/gdb.base/sep.c b/gdb/testsuite/gdb.base/sep.c
deleted file mode 100644
index 4402bd84251..00000000000
--- a/gdb/testsuite/gdb.base/sep.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This file is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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  */
-
-#include <stdio.h>
-
-/* Include a .c file.  This is usually considered bad practice in C,
-   but this emulate a practice which is common in other languages.
-   One such language is Ada and its concept of "separates", for instance.  */
-#include "sep-proc.c"
-
-int
-main (void)
-{
-  say_hello ();
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.base/sep.exp b/gdb/testsuite/gdb.base/sep.exp
deleted file mode 100644
index 7a7c22ae1b6..00000000000
--- a/gdb/testsuite/gdb.base/sep.exp
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile "sep"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Try to display the source code inside a file which is included by
-# another source file.  The purpose of this test is to verify that
-# this operation works, even before we have loaded full symbols for
-# that file (by doing a "break say_hello" for instance).
-#
-# We just check that the command succeeds, so no need to match the
-# complete exact output.  Simply verifying that we get procedure
-# say_hello is good enough, and avoid unnecessary failures is someone
-# decides later to reformat sep-proc.c.
-
-gdb_test "list sep-proc.c:23" \
-         "void.*say_hello.*" \
-         "list using location inside included file"
-
-# Try the same, but this time with a breakpoint.  We need to exit
-# GDB to make sure that we havn't loaded the full symbols yet when
-# we test the breakpoint insertion.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set test "breakpoint inside included file"
-gdb_test_multiple "break sep-proc.c:25" "$test" {
-    -re "Breakpoint.*at.* file .*sep-proc.c, line .*" {
-        pass "$test"
-    }
-    -re "No source file named sep-proc.c.*" {
-        fail "$test"
-    }
-}
-
diff --git a/gdb/testsuite/gdb.base/sepdebug.c b/gdb/testsuite/gdb.base/sepdebug.c
deleted file mode 100644
index adb69210a88..00000000000
--- a/gdb/testsuite/gdb.base/sepdebug.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Copyright 1994, 1995, 1999, 2002, 2003, 2004  Free Software Foundation, 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  */
-
-#ifdef vxworks
-
-#  include <stdio.h>
-
-/* VxWorks does not supply atoi.  */
-static int
-atoi (z)
-     char *z;
-{
-  int i = 0;
-
-  while (*z >= '0' && *z <= '9')
-    i = i * 10 + (*z++ - '0');
-  return i;
-}
-
-/* I don't know of any way to pass an array to VxWorks.  This function
-   can be called directly from gdb.  */
-
-vxmain (arg)
-char *arg;
-{
-  char *argv[2];
-
-  argv[0] = "";
-  argv[1] = arg;
-  main (2, argv, (char **) 0);
-}
-
-#else /* ! vxworks */
-#  include <stdio.h>
-#  include <stdlib.h>
-#endif /* ! vxworks */
-
-/*
- * The following functions do nothing useful.  They are included simply
- * as places to try setting breakpoints at.  They are explicitly
- * "one-line functions" to verify that this case works (some versions
- * of gcc have or have had problems with this).
- */
-
-#ifdef PROTOTYPES
-int marker1 (void) { return (0); }
-int marker2 (int a) { return (1); } /* set breakpoint 8 here */
-void marker3 (char *a, char *b) {}
-void marker4 (long d) {} /* set breakpoint 14 here */
-#else
-int marker1 () { return (0); }
-int marker2 (a) int a; { return (1); } /* set breakpoint 9 here */
-void marker3 (a, b) char *a, *b; {}
-void marker4 (d) long d; {}  /* set breakpoint 13 here */
-#endif
-
-/*
- *	This simple classical example of recursion is useful for
- *	testing stack backtraces and such.
- */
-
-#ifdef PROTOTYPES
-int factorial(int);
-
-int
-main (int argc, char **argv, char **envp)
-#else
-int
-main (argc, argv, envp)
-int argc;
-char *argv[], **envp;
-#endif
-{
-#ifdef usestubs
-    set_debug_traps();  /* set breakpoint 5 here */
-    breakpoint();
-#endif
-    if (argc == 12345) {  /* an unlikely value < 2^16, in case uninited */ /* set breakpoint 6 here */
-	fprintf (stderr, "usage:  factorial <number>\n");
-	return 1;
-    }
-    printf ("%d\n", factorial (atoi ("6")));  /* set breakpoint 1 here */
-    /* set breakpoint 12 here */
-    marker1 ();  /* set breakpoint 11 here */
-    marker2 (43);
-    marker3 ("stack", "trace");
-    marker4 (177601976L);
-    argc = (argc == 12345); /* This is silly, but we can step off of it */ /* set breakpoint 2 here */
-    return argc;  /* set breakpoint 10 here */
-}
-
-#ifdef PROTOTYPES
-int factorial (int value)
-#else
-int factorial (value)
-int value;
-#endif
-{
-  if (value > 1) {  /* set breakpoint 7 here */
-	value *= factorial (value - 1);
-    }
-    return (value);
-}
-
-#ifdef PROTOTYPES
-int multi_line_if_conditional (int a, int b, int c)
-#else
-int multi_line_if_conditional (a, b, c)
-  int a, b, c;
-#endif
-{
-  if (a    /* set breakpoint 3 here */
-      && b
-      && c)
-    return 0;
-  else
-    return 1;
-}
-
-#ifdef PROTOTYPES
-int multi_line_while_conditional (int a, int b, int c)
-#else
-int multi_line_while_conditional (a, b, c)
-  int a, b, c;
-#endif
-{
-  while (a /* set breakpoint 4 here */
-      && b
-      && c)
-    {
-      a--, b--, c--;
-    }
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
deleted file mode 100644
index 1028dab575b..00000000000
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ /dev/null
@@ -1,987 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2002, 2003, 2004
-#   Free Software Foundation, 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
-
-# Based on break.exp, written by Rob Savoye. (rob@cygnus.com)
-# Modified to test gdb's handling of separate debug info files.
-
-# This file has two parts. The first is testing that gdb behaves
-# normally after reading in an executable and its corresponding
-# separate debug file. The second moves the .debug file to a different
-# location and tests the "set debug-file-directory" command.
-
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "sepdebug"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# FIXME: this is nasty. We need to check for the stabs debug format.
-# To do this we must run gdb on the unstripped executable, list 'main'
-# (as to have a default source file), use get_debug_format (which does
-# 'info source') and then see if the debug info is stabs. If so, we
-# bail out.  We cannot do this any other way because get_debug_format
-# finds out the debug format using gdb itself, and in case of stabs we
-# get an error loading the program if it is already stripped.  An
-# alternative would be to find out the debug info from the flags
-# passed to dejagnu when the test is run.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-gdb_test "list main" "" ""
-get_debug_format
-if { [test_debug_format "stabs"] } then {
-    # the separate debug info feature doesn't work well in binutils with stabs.
-    # It produces a corrupted debug info only file, and gdb chokes on it.
-    # It is almost impossible to capture the failing message out of gdb,
-    # because it happens inside gdb_load. At that point any error message
-    # is intercepted by dejagnu itself, and, because of the error threshold,
-    # any faulty test result is changed into an UNRESOLVED. 
-    # (see dejagnu/lib/framework.exp)
-    unsupported "no separate debug info handling with stabs"
-    return -1
-} elseif { [test_debug_format "unknown"] } then {
-    # gdb doesn't know what the debug format is. We are out of luck here. 
-    unsupported "unknown debugging format"
-    return -1
-}
-gdb_exit
-
-# Note: the procedure gdb_gnu_strip_debug will produce an executable called
-# ${binfile}, which is just like the executable ($binfile) but without
-# the debuginfo. Instead $binfile has a .gnudebuglink section which contains
-# the name of a debuginfo only file. This file will be stored in the
-# gdb.base/.debug subdirectory.
-
-if [gdb_gnu_strip_debug $binfile] {
-    # check that you have a recent version of strip and objcopy installed
-    unsupported "cannot produce separate debug info files"
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-#
-# test simple breakpoint setting commands
-#
-
-# Test deleting all breakpoints when there are none installed,
-# GDB should not prompt for confirmation.
-# Note that gdb-init.exp provides a "delete_breakpoints" proc
-# for general use elsewhere.
-
-send_gdb "delete breakpoints\n"
-gdb_expect {
-     -re "Delete all breakpoints.*$" {
-	    send_gdb "y\n"
-	    gdb_expect {
-		-re "$gdb_prompt $" {
-		    fail "Delete all breakpoints when none (unexpected prompt)"
-		}
-		timeout	{ fail "Delete all breakpoints when none (timeout after unexpected prompt)" }
-	    }
-	}
-     -re ".*$gdb_prompt $"       { pass "Delete all breakpoints when none" }
-    timeout	            { fail "Delete all breakpoints when none (timeout)" }
-}
-
-#
-# test break at function
-#
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint function"
-
-#
-# test break at quoted function
-#
-gdb_test "break \"marker2\"" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint quoted function"
-
-#
-# test break at function in file
-#
-gdb_test "break $srcfile:factorial" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint function in file"
-
-set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
-
-#
-# test break at line number
-#
-# Note that the default source file is the last one whose source text
-# was printed.  For native debugging, before we've executed the
-# program, this is the file containing main, but for remote debugging,
-# it's wherever the processor was stopped when we connected to the
-# board.  So, to be sure, we do a list command.
-#
-gdb_test "list main" \
-    ".*main \\(argc, argv, envp\\).*" \
-    "use `list' to establish default source file"
-gdb_test "break $bp_location1" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location1\\." \
-    "breakpoint line number"
-
-#
-# test duplicate breakpoint
-#
-gdb_test "break $bp_location1" \
-    "Note: breakpoint \[0-9\]+ also set at pc.*Breakpoint \[0-9\]+ at.* file .*$srcfile, line $bp_location1\\." \
-    "breakpoint duplicate"
-
-set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
-
-#
-# test break at line number in file
-#
-gdb_test "break $srcfile:$bp_location2" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location2\\." \
-    "breakpoint line number in file"
-
-set bp_location3 [gdb_get_line_number "set breakpoint 3 here"]
-set bp_location4 [gdb_get_line_number "set breakpoint 4 here"]
-
-#
-# Test putting a break at the start of a multi-line if conditional.
-# Verify the breakpoint was put at the start of the conditional.
-#
-gdb_test "break multi_line_if_conditional" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location3\\." \
-    "breakpoint at start of multi line if conditional"
-
-gdb_test "break multi_line_while_conditional" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location4\\." \
-    "breakpoint at start of multi line while conditional"
-
-set bp_location5 [gdb_get_line_number "set breakpoint 5 here"]
-set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
-
-#
-# check to see what breakpoints are set
-#
-if [target_info exists gdb_stub] {
-    set main_line $bp_location5
-} else {
-    set main_line $bp_location6
-}
-
-set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
-set bp_location8 [gdb_get_line_number "set breakpoint 8 here"]
-set bp_location9 [gdb_get_line_number "set breakpoint 9 here"]
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$main_line.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in marker2 at .*$srcfile:($bp_location8|$bp_location9).*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in factorial at .*$srcfile:$bp_location7.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$bp_location2.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in multi_line_if_conditional at .*$srcfile:$bp_location3.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in multi_line_while_conditional at .*$srcfile:$bp_location4" \
-    "breakpoint info"
-
-# FIXME: The rest of this test doesn't work with anything that can't
-# handle arguments.
-# Huh? There doesn't *appear* to be anything that passes arguments
-# below.
-if [istarget "mips-idt-*"] then {
-    return
-}
-
-#
-# run until the breakpoint at main is hit. For non-stubs-using targets.
-#
-if ![target_info exists use_gdb_stub] {
-  if [istarget "*-*-vxworks*"] then {
-    send_gdb "run vxmain \"2\"\n"
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-  } else {
-	send_gdb "run\n"
-  }
-  gdb_expect {
-    -re "The program .* has been started already.*y or n. $" {
-	send_gdb "y\n"
-	exp_continue
-    }
-    -re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $"\
-	                    { pass "run until function breakpoint" }
-    -re ".*$gdb_prompt $"       { fail "run until function breakpoint" }
-    timeout	            { fail "run until function breakpoint (timeout)" }
-  }
-} else {
-    if ![target_info exists gdb_stub] {
-	gdb_test continue ".*Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.*\{.*" "stub continue"
-    }
-}
-
-#
-# run until the breakpoint at a line number
-#
-gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location1.*$bp_location1\[\t \]+printf.*factorial.*" \
-			"run until breakpoint set at a line number"
-
-#
-# Run until the breakpoint set in a function in a file
-#
-for {set i 6} {$i >= 1} {incr i -1} {
-	gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, factorial \\(value=$i\\) at .*$srcfile:$bp_location7.*$bp_location7\[\t \]+.*if .value > 1. \{.*" \
-			"run until file:function($i) breakpoint"
-}
-
-#
-# Run until the breakpoint set at a quoted function
-#
-gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, (0x\[0-9a-f\]+ in )?marker2 \\(a=43\\) at .*$srcfile:($bp_location8|$bp_location9).*" \
-		"run until quoted breakpoint"
-#
-# run until the file:function breakpoint at a line number in a file
-#
-gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location2.*$bp_location2\[\t \]+argc = \\(argc == 12345\\);.*" \
-		"run until file:linenum breakpoint"
-
-# Test break at offset +1
-set bp_location10 [gdb_get_line_number "set breakpoint 10 here"]
-
-gdb_test "break +1" \
-    "Breakpoint.*at.* file .*$srcfile, line $bp_location10\\." \
-    "breakpoint offset +1"
-
-# Check to see if breakpoint is hit when stepped onto
-
-gdb_test "step" \
-    ".*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location10.*$bp_location10\[\t \]+return argc;.*breakpoint 10 here.*" \
-    "step onto breakpoint"
-
-#
-# delete all breakpoints so we can start over, course this can be a test too
-#
-delete_breakpoints
-
-#
-# test temporary breakpoint at function
-#
-
-gdb_test "tbreak main" "Breakpoint.*at.* file .*$srcfile, line.*" "Temporary breakpoint function"
-
-#
-# test break at function in file
-#
-
-gdb_test "tbreak $srcfile:factorial" "Breakpoint.*at.* file .*$srcfile, line.*" \
-	"Temporary breakpoint function in file"
-
-#
-# test break at line number
-#
-send_gdb "tbreak $bp_location1\n"
-gdb_expect {
-    -re "Breakpoint.*at.* file .*$srcfile, line $bp_location1.*$gdb_prompt $" { pass "Temporary breakpoint line number #1" }
-	-re ".*$gdb_prompt $"   { pass "Temporary breakpoint line number #1" }
-	timeout	    { fail "breakpoint line number #1 (timeout)" }
-}
-
-gdb_test "tbreak $bp_location6" "Breakpoint.*at.* file .*$srcfile, line $bp_location6.*" "Temporary breakpoint line number #2"
-
-#
-# test break at line number in file
-#
-send_gdb "tbreak $srcfile:$bp_location2\n"
-gdb_expect {
-    -re "Breakpoint.*at.* file .*$srcfile, line $bp_location2.*$gdb_prompt $" { pass "Temporary breakpoint line number in file #1" }
-	-re ".*$gdb_prompt $"   { pass "Temporary breakpoint line number in file #1" }
-	timeout	    { fail "Temporary breakpoint line number in file #1 (timeout)" }
-}
-
-set bp_location11 [gdb_get_line_number "set breakpoint 11 here"]
-gdb_test  "tbreak $srcfile:$bp_location11" "Breakpoint.*at.* file .*$srcfile, line $bp_location11.*" "Temporary breakpoint line number in file #2"
-
-#
-# check to see what breakpoints are set (temporary this time)
-#
-gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$main_line.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in factorial at .*$srcfile:$bp_location7.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$bp_location1.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$bp_location6.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$bp_location2.*\[\r\n\]
-\[0-9\]+\[\t \]+breakpoint     del.*y.*in main at .*$srcfile:$bp_location11.*" \
-    "Temporary breakpoint info"
-
-
-#***********
-
-# Verify that catchpoints for fork, vfork and exec don't trigger
-# inappropriately.  (There are no calls to those system functions
-# in this test program.)
-#
-if ![runto_main] then { fail "break tests suppressed" }
-
-send_gdb "catch\n"
-gdb_expect {
-  -re "Catch requires an event name.*$gdb_prompt $"\
-          {pass "catch requires an event name"}
-  -re "$gdb_prompt $"\
-          {fail "catch requires an event name"}
-  timeout {fail "(timeout) catch requires an event name"}
-}
-
-
-set name "set catch fork, never expected to trigger"
-send_gdb "catch fork\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .fork..*$gdb_prompt $"
-          {pass $name}
-  -re "Catch of fork not yet implemented.*$gdb_prompt $"
-	  {pass $name}
-  -re "$gdb_prompt $"
-          {fail $name}
-  timeout {fail "(timeout) $name"}
-}
-
-
-set name "set catch vfork, never expected to trigger"
-send_gdb "catch vfork\n"
-
-# If we are on HP-UX 10.20, we expect an error message to be
-# printed if we type "catch vfork" at the gdb gdb_prompt.  This is
-# because on HP-UX 10.20, we cannot catch vfork events.
-
-if [istarget "hppa*-hp-hpux10.20"] then {
-    gdb_expect {
-	-re "Catch of vfork events not supported on HP-UX 10.20..*$gdb_prompt $"
-		{pass $name}
-	-re "$gdb_prompt $"
-		{fail $name}
-	timeout {fail "(timeout) $name"}
-    }
-} else {
-    gdb_expect {
-	-re "Catchpoint \[0-9\]* .vfork..*$gdb_prompt $"
-		{pass $name}
-	-re "Catch of vfork not yet implemented.*$gdb_prompt $"
-		{pass $name}
-	-re "$gdb_prompt $"
-		{fail $name}
-	timeout {fail "(timeout) $name"}
-    }
-}
-
-set name "set catch exec, never expected to trigger"
-send_gdb "catch exec\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .exec..*$gdb_prompt $"
-          {pass $name}
-  -re "Catch of exec not yet implemented.*$gdb_prompt $"
-	  {pass $name}
-  -re "$gdb_prompt $" {fail $name}
-  timeout {fail "(timeout) $name"}
-}
-
-# Verify that GDB responds gracefully when asked to set a breakpoint
-# on a nonexistent source line.
-#
-send_gdb "break 999\n"
-gdb_expect {
-  -re "No line 999 in file .*$gdb_prompt $"\
-          {pass "break on non-existent source line"}
-  -re "$gdb_prompt $"\
-          {fail "break on non-existent source line"}
-  timeout {fail "(timeout) break on non-existent source line"}
-}
-
-# Run to the desired default location. If not positioned here, the
-# tests below don't work.
-#
-gdb_test "until $bp_location1" "main .* at .*:$bp_location1.*" "until bp_location1"
-
-
-# Verify that GDB allows one to just say "break", which is treated
-# as the "default" breakpoint.  Note that GDB gets cute when printing
-# the informational message about other breakpoints at the same
-# location.  We'll hit that bird with this stone too.
-#
-send_gdb "break\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "break on default location, 1st time"}
-  -re "$gdb_prompt $"\
-          {fail "break on default location, 1st time"}
-  timeout {fail "(timeout) break on default location, 1st time"}
-}
-
-send_gdb "break\n"
-gdb_expect {
-  -re "Note: breakpoint \[0-9\]* also set at .*Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "break on default location, 2nd time"}
-  -re "$gdb_prompt $"\
-          {fail "break on default location, 2nd time"}
-  timeout {fail "(timeout) break on default location, 2nd time"}
-}
-
-send_gdb "break\n"
-gdb_expect {
-  -re "Note: breakpoints \[0-9\]* and \[0-9\]* also set at .*Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "break on default location, 3rd time"}
-  -re "$gdb_prompt $"\
-          {fail "break on default location, 3rd time"}
-  timeout {fail "(timeout) break on default location, 3rd time"}
-}
-
-send_gdb "break\n"
-gdb_expect {
-  -re "Note: breakpoints \[0-9\]*, \[0-9\]* and \[0-9\]* also set at .*Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "break on default location, 4th time"}
-  -re "$gdb_prompt $"\
-          {fail "break on default location, 4th time"}
-  timeout {fail "(timeout) break on default location, 4th time"}
-}
-
-# Verify that a "silent" breakpoint can be set, and that GDB is indeed
-# "silent" about its triggering.
-#
-if ![runto_main] then { fail "break tests suppressed" }
-
-send_gdb "break $bp_location1\n"
-gdb_expect {
-  -re "Breakpoint (\[0-9\]*) at .*, line $bp_location1.*$gdb_prompt $"\
-          {pass "set to-be-silent break bp_location1"}
-  -re "$gdb_prompt $"\
-          {fail "set to-be-silent break bp_location1"}
-  timeout {fail "(timeout) set to-be-silent break bp_location1"}
-}
-
-send_gdb "commands $expect_out(1,string)\n"
-send_gdb "silent\n"
-send_gdb "end\n"
-gdb_expect {
-  -re ".*$gdb_prompt $"\
-          {pass "set silent break bp_location1"}
-  timeout {fail "(timeout) set silent break bp_location1"}
-}
-
-send_gdb "info break $expect_out(1,string)\n"
-gdb_expect {
-  -re "\[0-9\]*\[ \t\]*breakpoint.*:$bp_location1\r\n\[ \t\]*silent.*$gdb_prompt $"\
-          {pass "info silent break bp_location1"}
-  -re "$gdb_prompt $"\
-          {fail "info silent break bp_location1"}
-  timeout {fail "(timeout) info silent break bp_location1"}
-}
-send_gdb "continue\n"
-gdb_expect {
-  -re "Continuing.\r\n$gdb_prompt $"\
-          {pass "hit silent break bp_location1"}
-  -re "$gdb_prompt $"\
-          {fail "hit silent break bp_location1"}
-  timeout {fail "(timeout) hit silent break bp_location1"}
-}
-send_gdb "bt\n"
-gdb_expect {
-  -re "#0  main .* at .*:$bp_location1.*$gdb_prompt $"\
-          {pass "stopped for silent break bp_location1"}
-  -re "$gdb_prompt $"\
-          {fail "stopped for silent break bp_location1"}
-  timeout {fail "(timeout) stopped for silent break bp_location1"}
-}
-
-# Verify that GDB can at least parse a breakpoint with the
-# "thread" keyword.  (We won't attempt to test here that a
-# thread-specific breakpoint really triggers appropriately.
-# The gdb.threads subdirectory contains tests for that.)
-#
-set bp_location12 [gdb_get_line_number "set breakpoint 12 here"]
-send_gdb "break $bp_location12 thread 999\n"
-gdb_expect {
-  -re "Unknown thread 999.*$gdb_prompt $"\
-          {pass "thread-specific breakpoint on non-existent thread disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "thread-specific breakpoint on non-existent thread disallowed"}
-  timeout {fail "(timeout) thread-specific breakpoint on non-existent thread disallowed"}
-}
-send_gdb "break $bp_location12 thread foo\n"
-gdb_expect {
-  -re "Junk after thread keyword..*$gdb_prompt $"\
-          {pass "thread-specific breakpoint on bogus thread ID disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "thread-specific breakpoint on bogus thread ID disallowed"}
-  timeout {fail "(timeout) thread-specific breakpoint on bogus thread ID disallowed"}
-}
-
-# Verify that GDB responds gracefully to a breakpoint command with
-# trailing garbage.
-#
-send_gdb "break $bp_location12 foo\n"
-gdb_expect {
-  -re "Junk at end of arguments..*$gdb_prompt $"\
-          {pass "breakpoint with trailing garbage disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "breakpoint with trailing garbage disallowed"}
-  timeout {fail "(timeout) breakpoint with trailing garbage disallowed"}
-}
-
-# Verify that GDB responds gracefully to a "clear" command that has
-# no matching breakpoint.  (First, get us off the current source line,
-# which we know has a breakpoint.)
-#
-send_gdb "next\n"
-gdb_expect {
-  -re ".*$gdb_prompt $"\
-          {pass "step over breakpoint"}
-  timeout {fail "(timeout) step over breakpoint"}
-}
-send_gdb "clear 81\n"
-gdb_expect {
-  -re "No breakpoint at 81..*$gdb_prompt $"\
-          {pass "clear line has no breakpoint disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "clear line has no breakpoint disallowed"}
-  timeout {fail "(timeout) clear line has no breakpoint disallowed"}
-}
-send_gdb "clear\n"
-gdb_expect {
-  -re "No breakpoint at this line..*$gdb_prompt $"\
-          {pass "clear current line has no breakpoint disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "clear current line has no breakpoint disallowed"}
-  timeout {fail "(timeout) clear current line has no breakpoint disallowed"}
-}
-
-# Verify that we can set and clear multiple breakpoints.
-#
-# We don't test that it deletes the correct breakpoints.  We do at
-# least test that it deletes more than one breakpoint.
-#
-gdb_test "break marker3" "Breakpoint.*at.*" "break marker3 #1"
-gdb_test "break marker3" "Breakpoint.*at.*" "break marker3 #2"
-gdb_test "clear marker3" {Deleted breakpoints [0-9]+ [0-9]+.*}
-
-# Verify that a breakpoint can be set via a convenience variable.
-#
-send_gdb "set \$foo=$bp_location11\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "set convenience variable \$foo to bp_location11"}
-  timeout {fail "(timeout) set convenience variable \$foo to bp_location11"}
-}
-send_gdb "break \$foo\n"
-gdb_expect {
-  -re "Breakpoint (\[0-9\]*) at .*, line $bp_location11.*$gdb_prompt $"\
-          {pass "set breakpoint via convenience variable"}
-  -re "$gdb_prompt $"\
-          {fail "set breakpoint via convenience variable"}
-  timeout {fail "(timeout) set breakpoint via convenience variable"}
-}
-
-# Verify that GDB responds gracefully to an attempt to set a
-# breakpoint via a convenience variable whose type is not integer.
-#
-send_gdb "set \$foo=81.5\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "set convenience variable \$foo to 81.5"}
-  timeout {fail "(timeout) set convenience variable \$foo to 81.5"}
-}
-send_gdb "break \$foo\n"
-gdb_expect {
-  -re "Convenience variables used in line specs must have integer values..*$gdb_prompt $"\
-          {pass "set breakpoint via non-integer convenience variable disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "set breakpoint via non-integer convenience variable disallowed"}
-  timeout {fail "(timeout) set breakpoint via non-integer convenience variable disallowed"}
-}
-
-# Verify that we can set and trigger a breakpoint in a user-called function.
-#
-send_gdb "break marker2\n"
-gdb_expect {
-    -re "Breakpoint (\[0-9\]*) at .*, line ($bp_location8|$bp_location9).*$gdb_prompt $"\
-          {pass "set breakpoint on to-be-called function"}
-  -re "$gdb_prompt $"\
-          {fail "set breakpoint on to-be-called function"}
-  timeout {fail "(timeout) set breakpoint on to-be-called function"}
-}
-send_gdb "print marker2(99)\n"
-gdb_expect {
-  -re "The program being debugged stopped while in a function called from GDB.\r\nWhen the function .marker2. is done executing, GDB will silently\r\nstop .instead of continuing to evaluate the expression containing\r\nthe function call...*$gdb_prompt $"\
-          {pass "hit breakpoint on called function"}
-  -re "$gdb_prompt $"\
-          {fail "hit breakpoint on called function"}
-  timeout {fail "(timeout) hit breakpoint on called function"}
-}
-
-# As long as we're stopped (breakpointed) in a called function,
-# verify that we can successfully backtrace & such from here.
-#
-# In this and the following test, the _sr4export check apparently is needed
-# for hppa*-*-hpux.
-#
-send_gdb "bt\n"
-gdb_expect {
-    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*_sr4export.*$gdb_prompt $"\
-            {pass "backtrace while in called function"}
-    -re "#0\[ \t\]*($hex in )?marker2.*:($bp_location8|$bp_location9)\r\n#1.*function called from gdb.*$gdb_prompt $"\
-	    {pass "backtrace while in called function"}
-    -re "$gdb_prompt $"\
-            {fail "backtrace while in called function"}
-    timeout {fail "(timeout) backtrace while in called function"}
-}
-
-# Return from the called function.  For remote targets, it's important to do
-# this before runto_main, which otherwise may silently stop on the dummy
-# breakpoint inserted by GDB at the program's entry point.
-#
-send_gdb "finish\n"
-gdb_expect {
-    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.* in _sr4export.*$gdb_prompt $"\
-            {pass "finish from called function"}
-    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*function called from gdb.*$gdb_prompt $"\
-            {pass "finish from called function"}
-    -re "Run till exit from .*marker2.* at .*($bp_location8|$bp_location9)\r\n.*Value returned.*$gdb_prompt $"\
-            {pass "finish from called function"}
-    -re "$gdb_prompt $"\
-            {fail "finish from called function"}
-    timeout {fail "(timeout) finish from called function"}
-}
-
-# Verify that GDB responds gracefully to a "finish" command with
-# arguments.
-#
-if ![runto_main] then { fail "break tests suppressed" }
-
-send_gdb "finish 123\n"
-gdb_expect {
-  -re "The \"finish\" command does not take any arguments.\r\n$gdb_prompt $"\
-          {pass "finish with arguments disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "finish with arguments disallowed"}
-  timeout {fail "(timeout) finish with arguments disallowed"}
-}
-
-# Verify that GDB responds gracefully to a request to "finish" from
-# the outermost frame.  On a stub that never exits, this will just
-# run to the stubs routine, so we don't get this error...  Thus the 
-# second condition.
-#
-
-send_gdb "finish\n"
-gdb_expect {
-  -re "\"finish\" not meaningful in the outermost frame.\r\n$gdb_prompt $"\
-          {pass "finish from outermost frame disallowed"}
-  -re "Run till exit from.*\r\n$gdb_prompt $" {
-     pass "finish from outermost frame disallowed"
-  }
-  -re "$gdb_prompt $"\
-          {fail "finish from outermost frame disallowed"}
-  timeout {fail "(timeout) finish from outermost frame disallowed"}
-}
-
-# Verify that we can explicitly ask GDB to stop on all shared library
-# events, and that it does so.
-#
-if [istarget "hppa*-*-hpux*"] then {
-  if ![runto_main] then { fail "break tests suppressed" }
-
-  send_gdb "set stop-on-solib-events 1\n"
-  gdb_expect {
-    -re "$gdb_prompt $"\
-            {pass "set stop-on-solib-events"}
-    timeout {fail "(timeout) set stop-on-solib-events"}
-  }
-
-  send_gdb "run\n"
-  gdb_expect {
-    -re ".*Start it from the beginning.*y or n. $"\
-            {send_gdb "y\n"
-             gdb_expect {
-               -re ".*Stopped due to shared library event.*$gdb_prompt $"\
-                       {pass "triggered stop-on-solib-events"}
-               -re "$gdb_prompt $"\
-                       {fail "triggered stop-on-solib-events"}
-               timeout {fail "(timeout) triggered stop-on-solib-events"}
-             }
-            }
-    -re "$gdb_prompt $"\
-            {fail "rerun for stop-on-solib-events"}
-    timeout {fail "(timeout) rerun for stop-on-solib-events"}
-  }
-
-  send_gdb "set stop-on-solib-events 0\n"
-  gdb_expect {
-    -re "$gdb_prompt $"\
-            {pass "reset stop-on-solib-events"}
-    timeout {fail "(timeout) reset stop-on-solib-events"}
-  }
-}
-
-# Hardware breakpoints are unsupported on HP-UX.  Verify that GDB
-# gracefully responds to requests to create them.
-#
-if [istarget "hppa*-*-hpux*"] then {
-  if ![runto_main] then { fail "break tests suppressed" }
-
-  send_gdb "hbreak\n"
-  gdb_expect {
-    -re "No hardware breakpoint support in the target.*$gdb_prompt $"\
-            {pass "hw breaks disallowed"}
-    -re "$gdb_prompt $"\
-            {fail "hw breaks disallowed"}
-    timeout {fail "(timeout) hw breaks disallowed"}
-  }
-
-  send_gdb "thbreak\n"
-  gdb_expect {
-    -re "No hardware breakpoint support in the target.*$gdb_prompt $"\
-            {pass "temporary hw breaks disallowed"}
-    -re "$gdb_prompt $"\
-            {fail "temporary hw breaks disallowed"}
-    timeout {fail "(timeout) temporary hw breaks disallowed"}
-  }
-}
-
-#********
-
-
-#
-# Test "next" over recursive function call.
-#
-
-proc test_next_with_recursion {} { 
-    global gdb_prompt
-    global decimal
-    global binfile
-
-    if [target_info exists use_gdb_stub] {
-	# Reload the program.
-	delete_breakpoints
-	gdb_load ${binfile};
-    } else {
-	# FIXME: should be using runto
-	gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
-
-	delete_breakpoints
-    }
-
-    gdb_test "break factorial" "Breakpoint $decimal at .*" "break at factorial"
-
-    # Run until we call factorial with 6
-
-    if [istarget "*-*-vxworks*"] then {
-	send_gdb "run vxmain \"6\"\n"
-    } else {
-	gdb_run_cmd
-    }
-    gdb_expect {
-	-re "Break.* factorial .value=6. .*$gdb_prompt $" {}
-	-re ".*$gdb_prompt $" {
-	    fail "run to factorial(6)";
-	    gdb_suppress_tests;
-	}
-	timeout { fail "run to factorial(6) (timeout)" ; gdb_suppress_tests }
-    }
-
-    # Continue until we call factorial recursively with 5.
-
-    if [gdb_test "continue" \
-	"Continuing.*Break.* factorial .value=5. .*" \
-	"continue to factorial(5)"] then { gdb_suppress_tests }
-
-    # Do a backtrace just to confirm how many levels deep we are.
-
-    if [gdb_test "backtrace" \
-	"#0\[ \t\]+ factorial .value=5..*" \
-	"backtrace from factorial(5)"] then { gdb_suppress_tests }
-
-    # Now a "next" should position us at the recursive call, which
-    # we will be performing with 4.
-
-    if [gdb_test "next" \
-	".* factorial .value - 1.;.*" \
-	"next to recursive call"] then { gdb_suppress_tests }
-
-    # Disable the breakpoint at the entry to factorial by deleting them all.
-    # The "next" should run until we return to the next line from this
-    # recursive call to factorial with 4.
-    # Buggy versions of gdb will stop instead at the innermost frame on
-    # the line where we are trying to "next" to.
-
-    delete_breakpoints
-
-    if [istarget "mips*tx39-*"] {
-	set timeout 60
-    }
-    # We used to set timeout here for all other targets as well.  This
-    # is almost certainly wrong.  The proper timeout depends on the
-    # target system in use, and how we communicate with it, so there
-    # is no single value appropriate for all targets.  The timeout
-    # should be established by the Dejagnu config file(s) for the
-    # board, and respected by the test suite.
-    #
-    # For example, if I'm running GDB over an SSH tunnel talking to a
-    # portmaster in California talking to an ancient 68k board running
-    # a crummy ROM monitor (a situation I can only wish were
-    # hypothetical), then I need a large timeout.  But that's not the
-    # kind of knowledge that belongs in this file.
-
-    gdb_test next "\[0-9\]*\[\t \]+return \\(value\\);.*" \
-	    "next over recursive call"
-
-    # OK, we should be back in the same stack frame we started from.
-    # Do a backtrace just to confirm.
-
-    set result [gdb_test "backtrace" \
-	    "#0\[ \t\]+ factorial .value=120.*\r\n#1\[ \t\]+ \[0-9a-fx\]+ in factorial .value=6..*" \
-	    "backtrace from factorial(5.1)"]
-    if { $result != 0 } { gdb_suppress_tests }
-
-    if [target_info exists gdb,noresults] { gdb_suppress_tests }
-  gdb_continue_to_end "recursive next test"
-   gdb_stop_suppressing_tests;
-}
-
-test_next_with_recursion
-
-
-#********
-
-# now move the .debug file to a different location so that we can test
-# the "set debug-file-directory" command.
-  
-remote_exec build "mv ${objdir}/${subdir}/.debug/${testfile}.debug ${objdir}/${subdir}"
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_test "set debug-file-directory ${objdir}/${subdir}" ".*" "set separate debug location"
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# test break at function
-#
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint function, optimized file"
-
-#
-# test break at function
-#
-gdb_test "break marker4" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint small function, optimized file"
-
-#
-# run until the breakpoint at main is hit. For non-stubs-using targets.
-#
-if ![target_info exists use_gdb_stub] {
-  if [istarget "*-*-vxworks*"] then {
-    send_gdb "run vxmain \"2\"\n"
-    set timeout 120
-    verbose "Timeout is now $timeout seconds" 2
-  } else {
-	send_gdb "run\n"
-  }
-  gdb_expect {
-    -re "The program .* has been started already.*y or n. $" {
-	send_gdb "y\n"
-	exp_continue
-    }
-    -re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.* \{.*$gdb_prompt $"\
-	                    { pass "run until function breakpoint, optimized file" }
-    -re "Starting program.*Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$gdb_prompt $"\
-	                    { pass "run until function breakpoint, optimized file (code motion)" }
-    -re ".*$gdb_prompt $"       { fail "run until function breakpoint, optimized file" }
-    timeout	            { fail "run until function breakpoint, optimized file (timeout)" }
-  }
-} else {
-    if ![target_info exists gdb_stub] {
-	gdb_test continue ".*Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:$bp_location6.*$bp_location6\[\t \]+if .argc.*\{.*" "stub continue, optimized file"
-    }
-}
-
-#
-# run until the breakpoint at a small function
-#
-
-#
-# Add a second pass pattern.  The behavior differs here between stabs
-# and dwarf for one-line functions.  Stabs preserves two line symbols
-# (one before the prologue and one after) with the same line number, 
-# but dwarf regards these as duplicates and discards one of them.
-# Therefore the address after the prologue (where the breakpoint is)
-# has no exactly matching line symbol, and GDB reports the breakpoint
-# as if it were in the middle of a line rather than at the beginning.
-
-set bp_location13 [gdb_get_line_number "set breakpoint 13 here"]
-set bp_location14 [gdb_get_line_number "set breakpoint 14 here"]
-send_gdb "continue\n"
-gdb_expect {
-    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
-	pass "run until breakpoint set at small function, optimized file"
-    }
-    -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" {
-	pass "run until breakpoint set at small function, optimized file"
-    }
-    -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" {
-        # marker4() is defined at line 46 when compiled with -DPROTOTYPES
-	pass "run until breakpoint set at small function, optimized file (line bp_location14)"
-    }
-    -re ".*$gdb_prompt " {
-	fail "run until breakpoint set at small function, optimized file"
-    }
-    timeout {
-	fail "run until breakpoint set at small function, optimized file (timeout)"
-    }
-}
-
-
-# Reset the default arguments for VxWorks
-if [istarget "*-*-vxworks*"] {
-    set timeout 10
-    verbose "Timeout is now $timeout seconds" 2
-    send_gdb "set args main\n"
-    gdb_expect -re ".*$gdb_prompt $" {}
-}
diff --git a/gdb/testsuite/gdb.base/setshow.c b/gdb/testsuite/gdb.base/setshow.c
deleted file mode 100644
index fbaba0f5ddf..00000000000
--- a/gdb/testsuite/gdb.base/setshow.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* IMPORTANT: leave this comment in the first line of this source file. */
-/*            this will guarantee that line 1 contains no code. */
-
-#include <stdio.h>
-
-#ifdef PROTOTYPES
-int
-main(int argc, char **argv)
-#else
-int 
-main(argc, argv)
-     int argc;
-     char **argv;
-#endif
-{
-  int i = 1;
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-
-  if (argc <= 0 || argc > 8)
-    return -1;
-  while (i < argc)
-    printf ("%s ", argv[i++]);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp
deleted file mode 100644
index a406824eeba..00000000000
--- a/gdb/testsuite/gdb.base/setshow.exp
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1992, 1994, 1996, 1997, 1998, 2001, 2003
-# Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "setshow"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# make sure $pc is sane, in case we're talking to a board.
-if { ![runto_main] } {
-    gdb_suppress_tests;
-}
-
-#
-# Test gdb set and show commands.
-# Add tests here for show and set that don't fit neatly elsewhere.
-# FIXME: many rudimentary tests for set and show commands have been
-#        added below, but most do nothing more than check that a 
-#        variable has been set successfully, ie. they do not test
-#        whether setting the variable has had the desired effect.
-#
-
-#test default annotation_level is 0
-gdb_test "show annotate" "Annotation_level is 0..*"  "default annotation_level is zero"
-
-#test set annotate 2
-send_gdb "set annotate 2\n"
-gdb_expect {
-	-re ".*\032\032pre-prompt.*$gdb_prompt .*\032\032prompt.*$" \
-				{ pass "set annotate 2" }
- 	-re ".*$gdb_prompt $"	{ fail "set annotate 2" }
-	timeout			{ fail "(timeout) set annotate 2" }
-    }
-
-send_gdb "show annotate\n"
-gdb_expect {
-	-re ".*\032\032post-prompt.*Annotation_level is 2..*\032\032pre-prompt.*$gdb_prompt .*\032\032prompt.*$" \
-				{ pass "show annotate (2)" }
- 	-re ".*$gdb_prompt $"	{ fail "show annotate (2)" }
-	timeout			{ fail "(timeout) show annotate (2)" }
-    }
-
-#test annotation_level 2
-send_gdb "info line 1\n"
-gdb_expect {
-	-re ".*\032\032post-prompt.*Line 1 of .* is at address .* but contains no code.*:1:0:beg:0x.*\032\032pre-prompt.*$gdb_prompt .*\032\032prompt.*$" \
-				{ pass "annotation_level 2" }
-	-re ".*$gdb_prompt $"	{ fail "annotation_level 2" }
-	timeout			{ fail "(timeout) annotation_level 2" }
-    }
-
-#test set annotate 1
-gdb_test "set annotate 1" ".*post-prompt.*"  "set annotate 1" 
-gdb_test "show annotate" "Annotation_level is 1..*"  "show annotate (1)" 
-#test annotation_level 1
-gdb_test "info line 1" "Line 1 of .* is at address .* but contains no code.*:1:0:beg:0x.*"  "annotation_level 1" 
-#test set annotate 0
-gdb_test "set annotate 0" "" "set annotate 0" 
-gdb_test "show annotate" "Annotation_level is 0..*"  "show annotate (0)" 
-#test annotation_level 0
-gdb_test "info line 1" "Line 1 of .* is at address .* but contains no code.*"  "annotation_level 0" 
-#test set args
-gdb_test "set args foo bar blup baz bubble" "" "set args" 
-#test show args
-gdb_test "show args" "Argument list to give program being debugged when it is started is \"foo bar blup baz bubble\"..*" "show args"
-
-# Don't test if we can't pass args or if we're using a stub.
-if { ![target_info exists use_gdb_stub] && ![target_info exists noargs] } {
-    #test passing args
-    gdb_test "cont" "Continuing.*" "continuing"
-    delete_breakpoints
-    gdb_test "run" "Starting program:.*foo bar blup baz bubble.*" "passing args"
-}
-#test set check range on
-gdb_test "set check range on" "" "set check range on" 
-#test show check range on
-gdb_test "show check range" "Range checking is \"on\"\..*" "show check range (on)" 
-#test set check range auto
-gdb_test "set check range auto" "" "set check range auto" 
-#test show check range auto
-gdb_test "show check range" "Range checking is \"auto; currently .*" "show check range (auto)" 
-#test set check type on
-gdb_test "set check type on" "" "set check type on" 
-#test show check type on
-gdb_test "show check type" "Type checking is \"on\"..*" "show check type (on)" 
-#test set check type auto
-gdb_test "set check type auto" "" "set check type auto" 
-#test show check type
-gdb_test "show check type" "Type checking is \"auto; currently .*" "show check type (auto)" 
-#test set complaints 100
-gdb_test "set complaints 100" "" "set complaints 100" 
-#test show complaints 100
-gdb_test "show complaints" "Max number of complaints about incorrect symbols is 100..*" "show complaints (100)" 
-#test set complaints 0
-gdb_test "set complaints 0" "" "set complaints 0" 
-#test show complaints 0
-gdb_test "show complaints" "Max number of complaints about incorrect symbols is 0..*" "show complaints (0)" 
-#test set confirm off
-gdb_test "set confirm off" "" "set confirm off" 
-#test show confirm off
-gdb_test "show confirm" "Whether to confirm potentially dangerous operations is off..*" "show confirm (off)" 
-#test set confirm on
-gdb_test "set confirm on" "" "set confirm on" 
-#test show confirm on
-gdb_test "show confirm" "Whether to confirm potentially dangerous operations is on..*" "show confirm (on)" 
-#test set editing off
-gdb_test "set editing off" "" "set editing off" 
-#test show editing off
-gdb_test "show editing" "Editing of command lines as they are typed is off..*" "show editing (off)" 
-#test set editing on
-#gdb_test "set editing on" "" "set editing on" 
-#test show editing on
-#gdb_test "show editing" "Editing of command lines as they are typed is on..*" "show editing (on)" 
-#test set environment FOOBARBAZ
-gdb_test "set environment FOOBARBAZ = grbxgrbxgrbx" ""    "set environment FOOBARBAZ" 
-#test show environment FOOBARBAZ
-gdb_test "show environment FOOBARBAZ" "FOOBARBAZ = grbxgrbxgrbx.*"  "show environment FOOBARBAZ" 
-#test set height 100
-gdb_test "set height 100" "" "set height 100" 
-#test show height 100
-gdb_test "show height" "Number of lines gdb thinks are in a page is 100..*" "show height" 
-#test set history expansion on
-gdb_test "set history expansion on" "" "set history expansion on" 
-#test show history expansion on
-gdb_test "show history expansion on" "History expansion on command input is on.*" "show history expansion" 
-#test set history filename foobar.baz
-gdb_test "set history filename foobar.baz" ""    "set history filename foobar.baz" 
-#test show history filename foobar.baz
-gdb_test "show history filename" "The filename in which to record the command history is \"foobar.baz\"..*"  "show history filename (foobar.baz)" 
-#test set history save on
-gdb_test "set history save on" "" "set history save on" 
-#test show history save on
-gdb_test "show history save" "Saving of the history record on exit is on..*"  "show history save (on)" 
-#test set history size 100
-gdb_test "set history size 100" "" "set history size 100" 
-#test show history size 100
-gdb_test "show history size" "The size of the command history is 100..*" "show history size (100)" 
-#test set language asm
-gdb_test "set language asm" "" "set language asm" 
-#test show language asm
-gdb_test "show language" "The current source language is \"asm\"..*" "show language (asm)" 
-#test set language auto
-gdb_test "set language auto" "" "set language auto" 
-#test show language
-gdb_test "show language" "The current source language is \"auto.*\"..*" "show language (auto)" 
-#test set listsize 100
-gdb_test "set listsize 100" "" "set listsize 100" 
-#test show listsize 100
-gdb_test "show listsize" "Number of source lines gdb will list by default is 100..*" "show listsize (100)" 
-
-if ![board_info target exists gdb_prompt] {
-    #test set prompt (FooBarBaz) 
-    set newprompt "\\(FooBarBaz\\)"
-    send_gdb "set prompt (FooBarBaz) \n"
-    gdb_expect {
-	-re "$newprompt $"	{ pass "set prompt (FooBarBaz) " }
-	timeout			{ fail "(timeout) set prompt (FooBarBaz) " }
-    }
-
-    #test show prompt (FooBarBaz) 
-    send_gdb "show prompt\n"
-    gdb_expect {
-	-re "Gdb's prompt is \"$newprompt \"..* $" \
-		{ pass "show prompt (FooBarBaz) " }
-	timeout			{ fail "(timeout) show prompt (FooBarBaz) " }
-    }
-
-    #test set prompt (gdb) 
-    send_gdb "set prompt (gdb) \n"
-    gdb_expect {
-	-re "$gdb_prompt $"		{ pass "set prompt (gdb) " }
-	timeout			{ fail "(timeout) set prompt (gdb) " }
-    }
-}
-
-#test set radix 11
-gdb_test "set radix 11" "Unsupported output radix ``decimal 11''; output radix unchanged..*"  "set radix 11" 
-#test set radix 16
-gdb_test "set radix 16" "Input and output radices now set to decimal 16, hex 10, octal 20..*"  "set radix 16" 
-#test show radix 16
-gdb_test "show radix" "Input and output radices set to decimal 16, hex 10, octal 20..*"  "show radix (16)" 
-#test set radix 10
-gdb_test "set radix" "Input and output radices now set to decimal 10, hex a, octal 12..*"  "set radix 10" 
-#test show radix 10
-gdb_test "show radix" "Input and output radices set to decimal 10, hex a, octal 12..*" "show radix (10)" 
-#test set width 90
-gdb_test "set width 90" "" "set width 90"
-#test show width 90
-gdb_test "show width" "Number of characters gdb thinks are in a line is 90..*" "show width (90)" 
-#test set write on
-# This is only supported on targets which use exec.o.
-gdb_test "set write on" ""  "set write on" 
-#test show write on
-# This is only supported on targets which use exec.o.
-gdb_test "show write" "Writing into executable and core files is on..*" "show write (on)" 
-#test set symbol-reloading on
-gdb_test "set symbol-reloading on" "" "set symbol-reloading on" 
-#test show symbol-reloading on
-gdb_test "show symbol-reloading" "Dynamic symbol table reloading multiple times in one run is on..*" "show symbol-reloading (on)" 
-#test show user
-gdb_test "show user" "" "show user" 
-#test set verbose on
-gdb_test "set verbose on" "" "set verbose on" 
-#test show verbose on
-gdb_test "show verbose" "Verbose printing of informational messages is on..*" "show verbose (on)" 
-#test set verbose off
-gdb_test "set verbose off" "" "set verbose off" 
-#test show verbose off
-gdb_test "show verbose" "Verbosity is off..*" "show verbose (off)" 
diff --git a/gdb/testsuite/gdb.base/setvar.c b/gdb/testsuite/gdb.base/setvar.c
deleted file mode 100644
index 969de0d5e71..00000000000
--- a/gdb/testsuite/gdb.base/setvar.c
+++ /dev/null
@@ -1,278 +0,0 @@
-#include <stdlib.h>
-
-#ifdef PROTOTYPES
-int main (int argc, char **argv, char **envp)
-#else
-main (argc, argv, envp)
-     int argc;
-     char **argv;
-     char **envp;
-#endif
-{
-    extern void dummy();
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-    dummy();
-    return 0;
-}
-
-/* We put main() right up front so its line number doesn't keep changing.  */
-
-/*
- *	Test file with lots of different types, for testing the
- *	"whatis" command.
- */
-
-/*
- *	First the basic C types.
- */
-
-#if !defined (__STDC__) && !defined (_AIX)
-#define signed  /**/
-#endif
-
-char		v_char;
-signed char	v_signed_char;
-unsigned char	v_unsigned_char;
-
-short		v_short;
-signed short	v_signed_short;
-unsigned short	v_unsigned_short;
-
-int		v_int;
-signed int	v_signed_int;
-unsigned int	v_unsigned_int;
-
-long		v_long;
-signed long	v_signed_long;
-unsigned long	v_unsigned_long;
-
-float		v_float;
-double		v_double;
-
-/*
- *	Now some derived types, which are arrays, functions-returning,
- *	pointers, structures, unions, and enumerations.
- */
-
-/**** arrays *******/
-
-char		v_char_array[2];
-signed char	v_signed_char_array[2];
-unsigned char	v_unsigned_char_array[2];
-
-short		v_short_array[2];
-signed short	v_signed_short_array[2];
-unsigned short	v_unsigned_short_array[2];
-
-int		v_int_array[2];
-signed int	v_signed_int_array[2];
-unsigned int	v_unsigned_int_array[2];
-
-long		v_long_array[2];
-signed long	v_signed_long_array[2];
-unsigned long	v_unsigned_long_array[2];
-
-float		v_float_array[2];
-double		v_double_array[2];
-
-/**** pointers *******/
-
-char		*v_char_pointer;
-signed char	*v_signed_char_pointer;
-unsigned char	*v_unsigned_char_pointer;
-
-short		*v_short_pointer;
-signed short	*v_signed_short_pointer;
-unsigned short	*v_unsigned_short_pointer;
-
-int		*v_int_pointer;
-signed int	*v_signed_int_pointer;
-unsigned int	*v_unsigned_int_pointer;
-
-long		*v_long_pointer;
-signed long	*v_signed_long_pointer;
-unsigned long	*v_unsigned_long_pointer;
-
-float		*v_float_pointer;
-double		*v_double_pointer;
-
-/**** structs *******/
-
-struct t_struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct1;
-
-struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct2;
-
-/**** unions *******/
-
-union t_union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union;
-
-union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union2;
-
-/*** Functions returning type ********/
-
-char		v_char_func () { return(0); }
-signed char	v_signed_char_func () { return (0); }
-unsigned char	v_unsigned_char_func () { return (0); }
-
-short		v_short_func () { return (0); }
-signed short	v_signed_short_func () { return (0); }
-unsigned short	v_unsigned_short_func () { return (0); }
-
-int		v_int_func () { return (0); }
-signed int	v_signed_int_func () { return (0); }
-unsigned int	v_unsigned_int_func () { return (0); }
-
-long		v_long_func () { return (0); }
-signed long	v_signed_long_func () { return (0); }
-unsigned long	v_unsigned_long_func () { return (0); }
-
-float		v_float_func () { return (0.0); }
-double		v_double_func () { return (0.0); }
-
-/**** Some misc more complicated things *******/
-
-struct link {
-	struct link *next;
-#ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
-#else
-	struct link *(*linkfunc) ();
-#endif
-	struct t_struct stuff[1][2][3];
-} *s_link;
-
-union tu_link {
-	struct link *next;
-#ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
-#else
-	struct link *(*linkfunc) ();
-#endif
-	struct t_struct stuff[1][2][3];
-} u_link;
-
-/**** Enumerations *******/
-
-enum colors {red, green, blue} color;
-enum cars {chevy, ford, porsche} clunker;
-
-/**** Enumeration bitfields, supported by GNU C *******/
-
-#ifdef __GNUC__
-enum senum {sm1 = -1, s1 = 1};
-struct senum_field {enum senum field:2; } sef;
-enum uenum {u1 = 1, u2 = 2};
-struct uenum_field {enum uenum field:2; } uef;
-#endif
-
-void
-dummy ()
-{
-  /* setvar.exp wants to allocate memory for constants.  So make sure malloc
-     gets linked into the program.  */
-  malloc (1);
-
-  /* Some linkers (e.g. on AIX) remove unreferenced variables,
-     so make sure to reference them. */
-  v_char = 0;
-  v_signed_char = 1;
-  v_unsigned_char = 2;
-
-  v_short = 3;
-  v_signed_short = 4;
-  v_unsigned_short = 5;    
-
-  v_int = 6;
-  v_signed_int = 7;
-  v_unsigned_int = 8;    
-
-  v_long = 9;
-  v_signed_long = 10;
-  v_unsigned_long = 11;    
-  
-  v_float = 100.0;
-  v_double = 200.0;
-
-
-  v_char_array[0] = v_char;
-  v_signed_char_array[0] = v_signed_char;
-  v_unsigned_char_array[0] = v_unsigned_char;
-
-  v_short_array[0] = v_short;
-  v_signed_short_array[0] = v_signed_short;
-  v_unsigned_short_array[0] = v_unsigned_short;
-
-  v_int_array[0] = v_int;
-  v_signed_int_array[0] = v_signed_int;
-  v_unsigned_int_array[0] = v_unsigned_int;
-
-  v_long_array[0] = v_long;
-  v_signed_long_array[0] = v_signed_long;
-  v_unsigned_long_array[0] = v_unsigned_long;
-
-  v_float_array[0] = v_float;
-  v_double_array[0] = v_double;
-
-  v_char_pointer = &v_char;
-  v_signed_char_pointer = &v_signed_char;
-  v_unsigned_char_pointer = &v_unsigned_char;
-
-  v_short_pointer = &v_short;
-  v_signed_short_pointer = &v_signed_short;
-  v_unsigned_short_pointer = &v_unsigned_short;
-
-  v_int_pointer = &v_int;
-  v_signed_int_pointer = &v_signed_int;
-  v_unsigned_int_pointer = &v_unsigned_int;
-
-  v_long_pointer = &v_long;
-  v_signed_long_pointer = &v_signed_long;
-  v_unsigned_long_pointer = &v_unsigned_long;
-
-  v_float_pointer = &v_float;
-  v_double_pointer = &v_double;
-
-  color = red;
-  clunker = porsche;
-
-  u_link.next = s_link;
-
-  v_struct2.v_int_member = v_struct1.v_int_member;
-  v_union2.v_short_member = v_union.v_short_member;
-
-#ifdef __GNUC__
-  sef.field = s1;
-  uef.field = u1;
-#endif
-}
diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp
deleted file mode 100644
index c101f9c4ce2..00000000000
--- a/gdb/testsuite/gdb.base/setvar.exp
+++ /dev/null
@@ -1,413 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-# 1999, 2000, 2001, 2004 Free Software Foundation, 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@gnu.org
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "setvar"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-#
-# set it up at a breakpoint so we canplay with the variable values
-#
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# Determine expected output for unsigned long variables,
-# the output varies with sizeof (unsigned long).
-
-set ulong_minus_1 4294967295
-set ulong_minus_456 4294966840
-send_gdb "print sizeof (unsigned long)\n"
-gdb_expect {
-    -re ".\[0-9\]* = 4.*$gdb_prompt $" {}
-    -re ".\[0-9\]* = 8.*$gdb_prompt $" {
-	set ulong_minus_1 18446744073709551615
-	set ulong_minus_456 18446744073709551160
-    }
-    -re ".*$gdb_prompt $" {
-	 fail "getting sizeof unsigned long"
-    }
-    default	{ fail "(timeout) getting sizeof unsigned long" }
-}
-
-proc test_set { args } {
-    global gdb_prompt
-
-    set length [expr [llength $args] - 1];
-    set message "[lindex $args $length]";
-    set final [expr $length - 2];
-    set count 1;
-
-    # Set up the variables.
-    for {set x 0;} {$x < $length} {incr x;} {
-	if { "[lindex $args $x]" != "" } {
-	    set arg [lindex $args $x];
-	    if { ($x == $final) || ([string first ".*" [lindex $args [expr $x + 1]]] >= 0) } {
-		set match [lindex $args [expr $x + 1]];
-		if { $count == 1 } {
-		    set mess "$message"
-		} else {
-		    set mess "$message (#$count)";
-		}
-		incr count;
-		incr x;
-	    } else {
-		set mess "";
-		set match ""
-	    }
-	    verbose "doing $arg $match"
-	    if [gdb_test "$arg" "$match" "$mess"] {
-		fail "$message -- $match";
-		return 1;
-	    }
-	}
-    }
-    return 0;
-}
-
-#
-# test "set variable" for type "char"
-#
-# Because bare char types can be either signed or unsigned, we just test the
-# range of values that are common to both (0-127).
-#    
-
-test_set "set variable v_char=0" "print v_char" ".\[0-9\]* = 0 \'.0\'"        "set variable char=0" 
-test_set "set variable v_char=1" "print v_char" ".\[0-9\]* = 1 \'.001\'"        "set variable char=1" 
-test_set "set variable v_char=7" "print v_char" ".\[0-9\]* = 7 \'.a\'"        "set variable char=7 (Bel)" 
-test_set "set variable v_char=32" "print v_char" ".\[0-9\]* = 32 \' \'"        "set variable char=32 (SPC)" 
-test_set "set variable v_char=65" "print v_char" ".\[0-9\]* = 65 \'A\'"        "set variable char=65 ('A')" 
-test_set "set variable v_char=97" "print v_char" ".\[0-9\]* = 97 \'a\'"        "set variable char=97 ('a')" 
-test_set "set variable v_char=126" "print v_char" ".\[0-9\]* = 126 \'~\'"        "set variable char=126 ('~')" 
-test_set "set variable v_char=127" "print v_char" ".\[0-9\]* = 127 \'.177\'"        "set variable char=127 (8-bit)" 
-#
-# test "set variable" for type "signed char"
-#    
-test_set "set variable v_char=0" "print v_signed_char" ".\[0-9\]* = 0 \'.0\'"                 "set variable signed char=0" 
-test_set "set variable v_signed_char=1" "print v_signed_char" ".\[0-9\]* = 1 \'.001\'"        "set variable signed char=1" 
-test_set "set variable v_signed_char=7" "print v_signed_char" ".\[0-9\]* = 7 \'.a\'"        "set variable signed char=7 (Bel)" 
-test_set "set variable v_signed_char=32" "print v_signed_char" ".\[0-9\]* = 32 \' \'"        "set variable signed char=32 (SPC)" 
-test_set "set variable v_signed_char=65" "print v_signed_char" ".\[0-9\]* = 65 \'A\'"        "set variable signed char=65 ('A')" 
-test_set "set variable v_signed_char=97" "print v_signed_char" ".\[0-9\]* = 97 \'a\'"        "set variable signed char=97 ('a')" 
-test_set "set variable v_signed_char=126" "print v_signed_char" ".\[0-9\]* = 126 \'~\'"        "set variable signed char=126 ('~')" 
-test_set "set variable v_signed_char=127" "print v_signed_char" ".\[0-9\]* = 127 \'.177\'"        "set variable signed char=127 (8-bit)" 
-gdb_test "set variable v_signed_char=-1" ""
-if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix4*" }
-gdb_test "print v_signed_char" ".\[0-9\]* = -1 \'.377\'" \
-    "set variable signed char=-1 (-1)"
-gdb_test "set variable v_signed_char=0xFF" ""
-if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix4*" }
-gdb_test "print v_signed_char" ".\[0-9\]* = -1 \'.377\'" \
-    "set variable signed char=0xFF (0xFF)"
-#
-# test "set variable" for type "unsigned char"
-#
-test_set "set variable v_unsigned_char=0" "print v_unsigned_char" ".\[0-9\]* = 0 \'.0\'"        "set variable unsigned char=0" 
-test_set "set variable v_unsigned_char=1" "print v_unsigned_char" ".\[0-9\]* = 1 \'.001\'"        "set variable unsigned char=1" 
-test_set "set variable v_unsigned_char=7" "print v_unsigned_char" ".\[0-9\]* = 7 \'.a\'"        "set variable unsigned char=7 (Bel)" 
-test_set "set variable v_unsigned_char=32" "print v_unsigned_char" ".\[0-9\]* = 32 \' \'"        "set variable unsigned char=32 (SPC)" 
-test_set "set variable v_unsigned_char=65" "print v_unsigned_char" ".\[0-9\]* = 65 \'A\'"        "set variable unsigned char=65 ('A')" 
-test_set "set variable v_unsigned_char=97" "print v_unsigned_char" ".\[0-9\]* = 97 \'a\'"        "set variable unsigned char=97 ('a')" 
-test_set "set variable v_unsigned_char=126" "print v_unsigned_char" ".\[0-9\]* = 126 \'~\'"        "set variable unsigned char=126 ('~')" 
-test_set "set variable v_unsigned_char=~0" "print v_unsigned_char" ".\[0-9\]* = 255 \'.377\'"        "set variable unsigned char=255 (8-bit)" 
-#
-# test "set variable" for type "short"
-#
-test_set "set variable v_short=0" "print v_short" ".\[0-9\]* = 0"        "set variable short=0" 
-test_set "set variable v_short=1" "print v_short" ".\[0-9\]* = 1"        "set variable short=1" 
-test_set "set variable v_short=-1" "print v_short" ".\[0-9\]* = -1"        "set variable short=-1 (minus)" 
-#
-# test "set variable" for type "signed short"
-#
-test_set "set variable v_signed_short=0" "print v_signed_short" ".\[0-9\]* = 0"        "set variable signed short=0" 
-test_set "set variable v_signed_short=1" "print v_signed_short" ".\[0-9\]* = 1"        "set variable signed short=1" 
-test_set "set variable v_signed_short=-1" "print v_signed_short" ".\[0-9\]* = -1"        "set variable signed short=-1 (minus)" 
-#
-# test "set variable" for type "unsigned short"
-#
-test_set "set variable v_unsigned_short=0" "print v_unsigned_short" ".\[0-9\]* = 0"        "set variable unsigned short=0" 
-test_set "set variable v_unsigned_short=1" "print v_unsigned_short" ".\[0-9\]* = 1"        "set variable unsigned short=1" 
-test_set "set variable v_unsigned_short=~0" "print v_unsigned_short" ".\[0-9\]* = 65535"        "set variable unsigned short=~0 (minus)" 
-#
-# test "set variable" for type "int"
-#
-test_set "set variable v_int=0" "print v_int" ".\[0-9\]* = 0"        "set variable int=0" 
-test_set "set variable v_int=1" "print v_int" ".\[0-9\]* = 1"        "set variable int=1" 
-test_set "set variable v_int=-1" "print v_int" ".\[0-9\]* = -1"        "set variable int=-1 (minus)" 
-#
-# test "set variable" for type "signed int"
-#
-test_set "set variable v_signed_int=0" "print v_signed_int" ".\[0-9\]* = 0"        "set variable signed int=0" 
-test_set "set variable v_signed_int=1" "print v_signed_int" ".\[0-9\]* = 1"        "set variable signed int=1" 
-test_set "set variable v_signed_int=-1" "print v_signed_int" ".\[0-9\]* = -1"        "set variable signed int=-1 (minus)" 
-#
-# test "set variable" for type "unsigned int"
-#
-test_set "set variable v_unsigned_int=0" "print v_unsigned_int" ".\[0-9\]* = 0"        "set variable unsigned int=0" 
-test_set "set variable v_unsigned_int=1" "print v_unsigned_int" ".\[0-9\]* = 1"        "set variable unsigned int=1" 
-test_set "set variable v_unsigned_int=~0" "print v_unsigned_int" ".\[0-9\]* = (4294967295|65535)"        "set variable unsigned int=~0 (minus)" 
-#test_set ".\[0-9\]* = 65535"        "set variable unsigned int=~0 (minus)" 
-#
-# test "set variable" for type "long"
-#
-test_set "set variable v_long=0" "print v_long" ".\[0-9\]* = 0"        "set variable long=0" 
-test_set "set variable v_long=1" "print v_long" ".\[0-9\]* = 1"        "set variable long=1" 
-test_set "set variable v_long=-1" "print v_long" ".\[0-9\]* = -1"        "set variable long=-1 (minus)" 
-#
-# test "set variable" for type "signed long"
-#
-test_set "set variable v_signed_long=0" "print v_signed_long" ".\[0-9\]* = 0"        "set variable signed long=0" 
-test_set "set variable v_signed_long=1" "print v_signed_long" ".\[0-9\]* = 1"        "set variable signed long=1" 
-test_set "set variable v_signed_long=-1" "print v_signed_long" ".\[0-9\]* = -1"        "set variable signed long=-1 (minus)" 
-#
-# test "set variable" for type "unsigned long"
-#
-test_set "set variable v_unsigned_long=0" "print v_unsigned_long" ".\[0-9\]* = 0"        "set variable unsigned long=0" 
-test_set "set variable v_unsigned_long=1" "print v_unsigned_long" ".\[0-9\]* = 1"        "set variable unsigned long=1" 
-test_set "set variable v_unsigned_long=~0" "print v_unsigned_long" ".\[0-9\]* = $ulong_minus_1"        "set variable unsigned long=~0 (minus)" 
-#
-# test "set variable" for type "float"
-#
-test_set "set variable v_float=0.0" "print v_float" ".\[0-9\]* = 0"        "set variable float=0" 
-test_set "set variable v_float=1.0" "print v_float" ".\[0-9\]* = 1"        "set variable float=1" 
-test_set "set variable v_float=-1.0" "print v_float" ".\[0-9\]* = -1"        "set variable float=-1 (minus)" 
-#
-# test "set variable" for type "double"
-#
-test_set "set variable v_double=0.0" "print v_double" ".\[0-9\]* = 0"        "set variable double=0" 
-test_set "set variable v_double=1.0" "print v_double" ".\[0-9\]* = 1"        "set variable double=1" 
-test_set "set variable v_double=-1.0" "print v_double" ".*.\[0-9\]* = -1"        "set variable double=-1 (minus)" 
-#
-# test "set variable" for "char array[2]"
-#
-test_set "set variable v_char_array\[0\]='h'" "set variable v_char_array\[1\]='i'" "print v_char_array" ".*.\[0-9\]* =.*\"hi\""        "set variable char array=\"hi\" (string)" 
-#
-# test "set variable" for "signed char array[2]"
-#
-test_set "set variable v_signed_char_array\[0\]='h'" "set variable v_signed_char_array\[1\]='i'" "print v_signed_char_array" ".*.\[0-9\]* =.*\"hi\""        "set variable signed char array=\"hi\" (string)" 
-#
-# test "set variable" for "unsigned char array[2]"
-#
-test_set "set variable v_unsigned_char_array\[0\]='h'" "set variable v_unsigned_char_array\[1\]='i'" "print v_unsigned_char_array" ".*.\[0-9\]* =.*\"hi\""        "set variable unsigned char array=\"hi\" (string)" 
-#
-# test "set variable" for "short array[2]"
-#
-test_set "set variable v_short_array\[0\]=123" "set variable v_short_array\[1\]=-456" "print v_short_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"        "set variable short array" 
-#
-# test "set variable" for "signed short array[2]"
-#
-test_set "set variable v_signed_short_array\[0\]=123" "set variable v_signed_short_array\[1\]=-456" "print v_signed_short_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"        "set variable signed short array" 
-#
-# test "set variable" for "unsigned short array[2]"
-#
-test_set "set variable v_unsigned_short_array\[0\]=123" "set variable v_unsigned_short_array\[1\]=-456" "print v_unsigned_short_array" ".*.\[0-9\]* =.*\\{123,.*65080\\}"        "set variable unsigned short array" 
-#
-# test "set variable" for "int array[2]"
-#
-test_set "set variable v_int_array\[0\]=123" "set variable v_int_array\[1\]=-456" "print v_int_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"        "set variable int array" 
-#
-# test "set variable" for "signed int array[2]"
-#
-test_set "set variable v_signed_int_array\[0\]=123" "set variable v_signed_int_array\[1\]=-456" "print v_signed_int_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"        "set variable signed int array" 
-#
-# test "set variable" for "unsigned int array[2]"
-#
-test_set "set variable v_unsigned_int_array\[0\]=123" "set variable v_unsigned_int_array\[1\]=-456" "print v_unsigned_int_array" ".*.\[0-9\]* =.*\\{123,.*(4294966840|65080)\\}"        "set variable unsigned int array" 
-#
-# test "set variable" for "long array[2]"
-#
-test_set "set variable v_long_array\[0\]=123" "set variable v_long_array\[1\]=-456" "print v_long_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"        "set variable long array" 
-#
-# test "set variable" for "signed long array[2]"
-#
-test_set "set variable v_signed_long_array\[0\]=123" "set variable v_signed_long_array\[1\]=-456" "print v_signed_long_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"        "set variable signed long array" 
-#
-# test "set variable" for "unsigned long array[2]"
-#
-test_set "set variable v_unsigned_long_array\[0\]=123" "set variable v_unsigned_long_array\[1\]=-456" "print v_unsigned_long_array" ".*.\[0-9\]* =.*\\{123,.*$ulong_minus_456\\}"        "set variable unsigned long array" 
-#
-# test "set variable" for "float array[2]"
-#
-test_set "set variable v_float_array\[0\]=123.0" "set variable v_float_array\[1\]=-456.0" "print v_float_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"        "set variable float array" 
-#
-# test "set variable" for "double array[2]"
-#
-test_set "set variable v_double_array\[0\]=123.0" "set variable v_double_array\[1\]=-456.0" "print v_double_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"        "set variable double array" 
-#
-# test "set variable" for type "char *"
-#
-test_set "set v_char_pointer=v_char_array" "set variable *(v_char_pointer)='h'" "set variable *(v_char_pointer+1)='i'" "print v_char_array" ".*.\[0-9\]* =.*\"hi\""  "print *(v_char_pointer+1)" ".*.\[0-9\]* = 105 \'i\'"     "set variable char pointer=\"hi\" (string)" 
-#
-# test "set variable" for type "signed char *"
-#
-test_set "set v_signed_char_pointer=v_signed_char_array" "set variable *(v_signed_char_pointer)='h'" "set variable *(v_signed_char_pointer+1)='i'" "print v_signed_char_array" ".*.\[0-9\]* =.*\"hi\""  "print *(v_signed_char_pointer+1)" ".*.\[0-9\]* = 105 \'i\'"     "set variable signed char pointer=\"hi\" (string)" 
-#
-# test "set variable" for type "unsigned char *"
-#
-test_set "set v_unsigned_char_pointer=v_unsigned_char_array" "set variable *(v_unsigned_char_pointer)='h'" "set variable *(v_unsigned_char_pointer+1)='i'" "print v_unsigned_char_array" ".*.\[0-9\]* =.*\"hi\""  "print *(v_unsigned_char_pointer+1)" ".*.\[0-9\]* = 105 \'i\'"     "set variable unsigned char pointer=\"hi\" (string)" 
-#
-# test "set variable" for type "short *"
-#
-test_set "set v_short_pointer=v_short_array" "set variable *(v_short_pointer)=123" "set variable *(v_short_pointer+1)=-456" "print v_short_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"  "print *(v_short_pointer+1)" ".*.\[0-9\]* = -456"     "set variable short pointer" 
-#
-# test "set variable" for type "signed short *"
-#
-gdb_test "set v_signed_short_pointer=v_signed_short_array" ""
-gdb_test "set variable *(v_signed_short_pointer)=123" ""
-gdb_test "set variable *(v_signed_short_pointer+1)=-456" ""
-gdb_test "print v_signed_short_array" ".\[0-9\]* =.*\\{123,.*-456\\}" \
-    "set variable signed short pointer"
-gdb_test "print *(v_signed_short_pointer+1)" ".\[0-9\]*.*=.*-456"
-#
-# test "set variable" for type "unsigned short *"
-#
-gdb_test "set v_unsigned_short_pointer=v_unsigned_short_array" ""
-gdb_test "set variable *(v_unsigned_short_pointer)=123" ""
-gdb_test "set variable *(v_unsigned_short_pointer+1)=-456" ""
-gdb_test "print v_unsigned_short_array" ".\[0-9\]* =.*\\{123,.*65080\\}" \
-    "set variable unsigned short pointer"
-gdb_test "print *(v_unsigned_short_pointer+1)" ".\[0-9\]* = 65080"
-#
-# test "set variable" for type "int *"
-#
-test_set "set v_int_pointer=v_int_array" "set variable *(v_int_pointer)=123" "set variable *(v_int_pointer+1)=-456" "print v_int_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"  "print *(v_int_pointer+1)" ".*.\[0-9\]* = -456"     "set variable int pointer" 
-#
-# test "set variable" for type "signed int *"
-#
-test_set "set v_signed_int_pointer=v_signed_int_array" "set variable *(v_signed_int_pointer)=123" "set variable *(v_signed_int_pointer+1)=-456" "print v_signed_int_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"  "print *(v_signed_int_pointer+1)" ".*.\[0-9\]* = -456"     "set variable signed int pointer" 
-#
-# test "set variable" for type "unsigned int *"
-#
-test_set "set v_unsigned_int_pointer=v_unsigned_int_array" "set variable *(v_unsigned_int_pointer)=123" "set variable *(v_unsigned_int_pointer+1)=-456" "print v_unsigned_int_array" ".*.\[0-9\]* =.*\\{123,.*(4294966840|65080)\\}" "set variable unsigned int pointer"
-test_set "" "print *(v_unsigned_int_pointer+1)" ".*.\[0-9\]* = (4294966840|65080)"     "print variable unsigned int pointer+1"
-#
-# test "set variable" for type "long *"
-#
-test_set "set v_long_pointer=v_long_array" "set variable *(v_long_pointer)=123" "set variable *(v_long_pointer+1)=-456" "print v_long_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"  "print *(v_long_pointer+1)" ".*.\[0-9\]* = -456"     "set variable long pointer" 
-#
-# test "set variable" for type "signed long *"
-#
-test_set "set v_signed_long_pointer=v_signed_long_array" "set variable *(v_signed_long_pointer)=123" "set variable *(v_signed_long_pointer+1)=-456" "print v_signed_long_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"  "print *(v_signed_long_pointer+1)" ".*.\[0-9\]* = -456"     "set variable signed long pointer" 
-#
-# test "set variable" for type "unsigned long *"
-#
-test_set "set v_unsigned_long_pointer=v_unsigned_long_array" "set variable *(v_unsigned_long_pointer)=123" "set variable *(v_unsigned_long_pointer+1)=-456" "print v_unsigned_long_array" ".*.\[0-9\]* =.*\\{123,.*$ulong_minus_456\\}"  "print *(v_unsigned_long_pointer+1)" ".*.\[0-9\]* = $ulong_minus_456"     "set variable unsigned long pointer" 
-#
-# test "set variable" for type "float *"
-#
-test_set "set v_float_pointer=v_float_array" "set variable *(v_float_pointer)=123.0" "set variable *(v_float_pointer+1)=-456.0" "print v_float_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"  "print *(v_float_pointer+1)" ".*.\[0-9\]* = -456"     "set variable float pointer" 
-#
-# test "set variable" for type "double *"
-#
-test_set "set v_double_pointer=v_double_array" "set variable *(v_double_pointer)=123.0" "set variable *(v_double_pointer+1)=-456.0" "print v_double_array" ".*.\[0-9\]* =.*\\{123,.*-456\\}"  "print *(v_double_pointer+1)" ".*.\[0-9\]* = -456"     "set variable double pointer" 
-#
-# test "set variable" for struct members
-#
-test_set "set variable v_struct1.v_char_member='h'" "print v_struct1.v_char_member" ".*.\[0-9\]* = 104 \'h\'"        "set variable structure char member" 
-test_set "set variable v_struct1.v_short_member=1" "print v_struct1.v_short_member" ".*.\[0-9\]* = 1"        "set variable structure short member" 
-test_set "set variable v_struct1.v_int_member=2" "print v_struct1.v_int_member" ".*.\[0-9\]* = 2"        "set variable structure int member" 
-test_set "set variable v_struct1.v_long_member=3" "print v_struct1.v_long_member" ".*.\[0-9\]* = 3"        "set variable structure long member" 
-test_set "set variable v_struct1.v_float_member=4.0" "print v_struct1.v_float_member" ".*.\[0-9\]* = 4"        "set variable structure float member" 
-test_set "set variable v_struct1.v_double_member=5.0" "print v_struct1.v_double_member" ".*.\[0-9\]* = 5"        "set variable structure double member" 
-
-gdb_test "print v_struct1" \
-  ".*.\[0-9\]* = \{.*v_char_member = 104 \'h\',.*v_short_member = 1,\
-.*v_int_member = 2,.*\
-v_long_member = 3,.*v_float_member = 4,.*v_double_member = 5.*\}" \
-  "set print structure #1"
-
-# Some believe that the following  should be an error.  GCC extensions for
-# structure constants require the type of the structure to be specified, as in
-# v_struct1 = (struct t_struct) {32, 33, 34, 35, 36, 37}
-# The argument is that GDB should do the same if it wants to provide this
-# feature, i.e., require the cast.
-# We decided that we don't want the debugger to be as picky as a
-# compiler and make us type complex casts.
-
-# We need to up this because this can be really slow on some boards.
-# (malloc() is called as part of the test).
-set timeout 60;
-
-# Change the values
-test_set "set variable v_struct1 = {32, 33, 34, 35, 36, 37}" \
-  "print v_struct1" \
-  ".*.\[0-9\]* = \\{.*v_char_member = 32 \' \',.*v_short_member = 33,\
-.*v_int_member = 34,.*\
-v_long_member = 35,.*v_float_member = 36,.*v_double_member = 37.*\\}" \
-  "set print structure #2"
-
-# Change them back
-test_set "set variable v_struct1 = {'h', 1, 2, 3, 4.0, 5.0}" \
-  "print v_struct1" \
-  ".*.\[0-9\]* = \\{.*v_char_member = 104 \'h\',.*v_short_member = 1,\
-.*v_int_member = 2,.*\
-v_long_member = 3,.*v_float_member = 4,.*v_double_member = 5.*\\}" \
-  "set print structure #3"
-
-# Test printing of enumeration bitfields.
-# GNU C supports them, some other compilers don't.
-
-if {$gcc_compiled} then {
-    gdb_test "print sef.field=sm1" ".*.\[0-9\]* = sm1"
-    gdb_test "print sef.field" ".*.\[0-9\]* = sm1" "print sef.field (sm1)"
-    gdb_test "print sef.field=s1" ".*.\[0-9\]* = s1"
-    gdb_test "print sef.field" ".*.\[0-9\]* = s1" "print sef.field (s1)"
-    gdb_test "print uef.field=u2" ".*.\[0-9\]* = u2"
-    gdb_test "print uef.field" ".*.\[0-9\]* = u2" "print uef.field (u2)"
-    gdb_test "print uef.field=u1" ".*.\[0-9\]* = u1"
-    gdb_test "print uef.field" ".*.\[0-9\]* = u1" "print uef.field (u1)"
-
-    # Test for truncation when assigning invalid values to bitfields.
-    gdb_test "print sef.field=7" \
-	".*warning: Value does not fit in 2 bits.*\[0-9\]* = sm1"
-    gdb_test "print uef.field=6" \
-	".*warning: Value does not fit in 2 bits.*\[0-9\]* = u2"
-}
diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp
deleted file mode 100644
index 49a61441992..00000000000
--- a/gdb/testsuite/gdb.base/shlib-call.exp
+++ /dev/null
@@ -1,261 +0,0 @@
-#   Copyright 1997, 1998, 1999, 2000, 2004 Free Software Foundation, 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
-
-# file to test calls into shared libraries
-# the source files for this test are:
-#
-# shmain.c
-# shr1.c (shared lib)
-# shr2.c (shared lib)
-# ss.h (header for shr2.c)
-#
-# file written by Elena Zannoni: elz@ch.apollo.com
-#
-
-#debug shmain
-#prop lib shr1.sl
-#prop lib shr2.sl
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board?
-if ![isnative] then {
-    return 0
-}
-
-set testfile "shmain"
-set libfile1 "shr1"
-set libfile2 "shr2"
-set srcfile  ${srcdir}/${subdir}/${testfile}.c
-set lib1src  ${srcdir}/${subdir}/${libfile1}.c
-set lib2src  ${srcdir}/${subdir}/${libfile2}.c
-set lib1     ${objdir}/${subdir}/${libfile1}.sl
-set lib2     ${objdir}/${subdir}/${libfile2}.sl
-set binfile  ${objdir}/${subdir}/${testfile}
-
-set lib_opts "debug"
-set exec_opts [list debug shlib=${lib1} shlib=${lib2}]
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if { [gdb_compile_shlib ${lib1src} ${lib1} $lib_opts] != ""
-     || [gdb_compile_shlib ${lib2src} ${lib2} $lib_opts] != ""
-     || [gdb_compile ${srcfile} ${binfile} executable $exec_opts] != ""} {
-    untested "Could not compile $lib1, $lib2, or $srcfile."
-    return -1
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
-
-
-if ![runto_main] then {
-        perror "C function calling tests suppressed"
-}
-
-
-#step -over
-
-    send_gdb "next\n"
-    gdb_expect {
-        -re ".*g = shr1\\(g\\).*$gdb_prompt $" {pass "next to shr1"}
-        -re ".*$gdb_prompt $" { fail "next to shr1" }
-        timeout { fail "next to shr1 (timeout)" }
-    }
-
-
-
-#print g
-
-send_gdb "print g\n"
-gdb_expect {
-    -re ".*\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print g"
-      }
-    -re ".*$gdb_prompt $" { fail "print  g" }
-    timeout           { fail "(timeout) print g" }
-  }
-
-
-#step -over
-  if ![gdb_skip_stdio_test "next over shr1"] {
-      send_gdb "next\n"
-      gdb_expect {
-	  -re ".*address of sgs is $hex.*g = shr2\\(g\\).*$gdb_prompt $" {
-	      pass "next over shr1" 
-	  }
-	  -re ".*$gdb_prompt $" { fail "next over shr1" }
-	  timeout { fail "next over shr1 (timeout)" }
-      }
-  } else {
-      gdb_test "next" "" ""
-  }
-
-
-#print g
-send_gdb "print g\n"
-gdb_expect {
-    -re ".*\[0-9\]* = 2.*$gdb_prompt $" {
-        pass "print g" }
-    -re ".*$gdb_prompt $" { fail "print  g" }
-    timeout           { fail "(timeout) print g" }
-  }
-
-#print shr1(1)
-  if ![gdb_skip_stdio_test "print shr1(1)"] {
-      send_gdb "print shr1(1)\n"
-      gdb_expect {
-	  -re ".*address of sgs is $hex.*\[0-9\]* = 2.*$gdb_prompt $" {
-	      pass "print shr1(1)" 
-	  }
-	  -re ".*$gdb_prompt $" { fail "print shr1(1)" }
-	  timeout               { fail "(timeout) print shr1(1)" }
-      }
-  }
-
-#print shr1(g)
-  if ![gdb_skip_stdio_test "print shr1(g)"] {
-      send_gdb "print shr1(g)\n"
-      gdb_expect {
-	  -re ".*address of sgs is $hex.*\[0-9\]* = 4.*$gdb_prompt $" {
-	      pass "print shr1(g)" 
-	  }
-	  -re ".*$gdb_prompt $" { fail "print shr1(g)" }
-	  timeout               { fail "(timeout) print shr1(g)" }
-      }
-  }
-
-#break shr2
-#go
-gdb_test "break shr2" \
-    "Breakpoint.*file.*shr2.c, line.*" \
-    "breakpoint function shr2"
-
-gdb_test "continue" \
-	"Continuing\\..*Breakpoint \[0-9\]+, shr2 \\(.*\\) at.*shr2\\.c:7.*7.*return 2.x;" \
-	"run until breakpoint set at a function"
-
-
-#print shr1(1)
-if ![gdb_skip_stdio_test "print shr1(1) 2nd time"] {
-    send_gdb "print shr1(1)\n"
-    gdb_expect {
-	-re ".*address of sgs is $hex.*\[0-9\]* = 2.*$gdb_prompt $" {
-	    pass "print shr1(1) 2nd time"
-	}
-	-re ".*$gdb_prompt $" { fail "print shr1(1) 2nd time" }
-	timeout               { fail "(timeout) print shr1(1) 2nd time" }
-    }
-}
-
-#print mainshr1(1)
-send_gdb "print mainshr1(1)\n"
-gdb_expect {
-    -re ".*\[0-9\]* = 2.*$gdb_prompt $" {
-        pass "print mainshr1(1) from shlib func"
-      }
-    -re ".*$gdb_prompt $" { fail "print  mainshr1(1) from shlib func" }
-    timeout           { fail "(timeout) print mainshr1(1) from shlib func" }
-  }
-
-#step -return
-    send_gdb "step\n"
-    # A step at this point will either take us entirely out of
-    # the function or into the function's epilogue.  The exact
-    # behavior will differ depending upon upon whether or not
-    # the compiler emits line number information for the epilogue.
-    gdb_expect {
-        -re "main \\(\\) at.*g = mainshr1\\(g\\);.*$gdb_prompt $" { 
-	    pass "step out of shr2 to main"
-	}
-        -re ".*\\\}.*$gdb_prompt $" {
-	    pass "step out of shr2 to main (stopped in shr2 epilogue)"
-	    send_gdb "step\n"
-	    gdb_expect {
-		-re "main \\(\\) at.*g = mainshr1\\(g\\);.*$gdb_prompt $" { pass "step out of shr2 epilogue to main"}
-		-re ".*$gdb_prompt $" { fail "step out of shr2 epilogue to main" }
-		timeout { fail "step out of shr2 epilogue to main (timeout)" }
-	    }
-	}
-        -re ".*$gdb_prompt $" { fail "step out of shr2" }
-        timeout { fail "step out of shr2 to main (timeout)" }
-    }
-    
-
-#print mainshr1(1)
-send_gdb "print mainshr1(1)\n"
-gdb_expect {
-    -re ".*\[0-9\]* = 2.*$gdb_prompt $" {
-        pass "print mainshr1(1)"
-      }
-    -re ".*$gdb_prompt $" { fail "print  mainshr1(1) from main" }
-    timeout           { fail "(timeout) print mainshr1(1) from main" }
-  }
-
-#step
-    send_gdb "step\n"
-    gdb_expect {
-        -re ".*mainshr1 \\(g=4\\) at.*return 2.g;.*$gdb_prompt $" { pass "step into mainshr1"}
-        -re ".*$gdb_prompt $" { fail "step into mainshr1" }
-        timeout { fail "step into mainshr1 (timeout)" }
-    }
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
-
-# PR's 16495, 18213
-# test that we can re-set breakpoints in shared libraries
-gdb_breakpoint "shr1" "allow-pending"
-
-# FIXME: should not send "run" explicitly.  Non-portable.
-
-if ![is_remote target] {
-  gdb_test "run" "Starting program:.*Breakpoint .,.*" \
-	"run to bp in shared library"
-
-  gdb_test "cont" ".*Program exited normally..*"
-
-  gdb_test "run" "Starting program:.*Breakpoint .,.*" \
-	"re-run to bp in shared library (PR's 16495, 18213)"
-
-  gdb_test "cont" ".*Program exited normally..*"
-}
-
-return 0
diff --git a/gdb/testsuite/gdb.base/shmain.c b/gdb/testsuite/gdb.base/shmain.c
deleted file mode 100644
index 7013db52328..00000000000
--- a/gdb/testsuite/gdb.base/shmain.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* A test */
-
-#include "ss.h"
-#include <stdio.h>
-
-extern int structarg(struct s);
-extern int pstructarg(struct s*);
-extern int shr1(int);
-extern int shr2(int);
-extern float sg;
-
-int eglob;
-
-struct {
- int a;  
- int b;
-} s;
-
-int g;
-
-#ifdef PROTOTYPES
-int local_structarg(struct s x)
-#else
-int local_structarg(x)
-struct s x;
-#endif
-{
-  return x.b;
-}
-
-#ifdef PROTOTYPES
-int mainshr1(int g)
-#else
-int mainshr1(g)
-int g;
-#endif
-{
-  return 2*g;
-}
-
-int main()
-{
-  struct s y;
-  g = 1;
-  g = shr1(g);
-  g = shr2(g);
-  g = mainshr1(g);
-  sg = 1.1;
-  printf("address of sg is 0x%x\n", &sg);
-  y.a = 3;
-  y.b = 4;
-  g = local_structarg(y);
-  g = structarg(y);
-  g = pstructarg(&y);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/shr1.c b/gdb/testsuite/gdb.base/shr1.c
deleted file mode 100644
index a0257e40233..00000000000
--- a/gdb/testsuite/gdb.base/shr1.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "ss.h"
-#include <stdio.h>
-
-typedef float f;
-
-float sg = 5.5;
-int sgi = 2;
-static int sgs = 7;
-
-#ifdef PROTOTYPES
-int shr1(int x)
-#else
-int shr1(x)
-int x;
-#endif
-{
-  f mumble;
-  int l;
-  l = 1;
-  {
-    int l;
-    l = 2;
-  }
-  mumble = 7.7;
-  sg = 6.6;
-  sgi++;
-  sgs = 8;
-  printf("address of sgs is 0x%x\n", &sgs);
-  return 2*x;
-}
-
-#ifdef PROTOTYPES
-static int shr1_local(int x)
-#else
-static int shr1_local(x)
-int x;
-#endif
-{
-  return 2*x;
-}
-
-#ifdef PROTOTYPES
-int structarg(struct s x)
-#else
-int structarg(x)
-struct s x;
-#endif
-{
-  return x.a;
-}
-
-#ifdef PROTOTYPES
-int pstructarg(struct s *x)
-#else
-int pstructarg(x)
-struct s *x;
-#endif
-{
-  return x->a;
-}
-
-
-
diff --git a/gdb/testsuite/gdb.base/shr2.c b/gdb/testsuite/gdb.base/shr2.c
deleted file mode 100644
index de34986d76d..00000000000
--- a/gdb/testsuite/gdb.base/shr2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifdef PROTOTYPES
-int shr2(int x)
-#else
-int shr2(x) int x;
-#endif
-{
-  return 2*x;
-}
-
-#ifdef PROTOTYPES
-int shr2_local(int x)
-#else
-int shr2_local(x) int x;
-#endif
-{
-  return 2*x;
-}
diff --git a/gdb/testsuite/gdb.base/shreloc.c b/gdb/testsuite/gdb.base/shreloc.c
deleted file mode 100644
index 6867362bf0a..00000000000
--- a/gdb/testsuite/gdb.base/shreloc.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#if defined(_WIN32) || defined(__CYGWIN__)
-# define ATTRIBUTES __attribute((__dllimport__))
-#else
-# define ATTRIBUTES
-#endif
-
-extern ATTRIBUTES void fn_1 (int);
-extern ATTRIBUTES void fn_2 (int);
-extern ATTRIBUTES int extern_var_1;
-extern ATTRIBUTES int extern_var_2;
-
-int main ()
-{
-  fn_1 (extern_var_1);
-  fn_2 (extern_var_2);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/shreloc.exp b/gdb/testsuite/gdb.base/shreloc.exp
deleted file mode 100644
index 97ba7c0e496..00000000000
--- a/gdb/testsuite/gdb.base/shreloc.exp
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright (C) 2003, 2005 Free Software Foundation, 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.
-#
-
-# Tests for shared object file relocation. If two shared objects have
-# the same load address (actually, overlapping load spaces), one of
-# them gets relocated at load-time. Check that gdb gets the right
-# values for the debugging and minimal symbols.
-
-if {[istarget *-elf*] || [istarget *-coff] || [istarget *-aout]} then {
-    verbose "test skipped - shared object files not supported by this target."
-    return 0
-}
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# This file uses shreloc.c, shreloc1.c and shreloc2.c
-#
-
-set prms_id 0
-set bug_id 0
-
-set workdir ${objdir}/${subdir}
-set testfile "shreloc"
-set libfile1 "shreloc1"
-set libfile2 "shreloc2"
-set srcfile $srcdir/$subdir/$testfile.c
-set lib1src $srcdir/$subdir/$libfile1.c
-set lib2src $srcdir/$subdir/$libfile2.c
-set binfile $objdir/$subdir/$testfile
-set lib1_sl $objdir/$subdir/$libfile1.sl
-set lib2_sl $objdir/$subdir/$libfile2.sl
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-set lib_opts "debug"
-set exec_opts [list debug shlib=$lib1_sl shlib=$lib2_sl]
-
-if {([istarget "*pc-cygwin"] || [istarget "*pc-mingw32"]) } {
-    lappend lib_opts "additional_flags=-Wl,--image-base,0x04000000"
-}
-
-if [test_compiler_info "xlc-*"] {
-
-    # IBM's xlc compiler does not add static variables to the ELF symbol 
-    # table by default.  We need this option to make the variables show 
-    # up in "maint print msymbols". 
-
-    lappend lib_opts "additional_flags=-qstatsym"
-
-}
-
-if { [gdb_compile_shlib $lib1src $lib1_sl $lib_opts] != ""} {
-    untested "Could not build $lib1_sl."
-    return -1
-} elseif { [gdb_compile_shlib $lib2src $lib2_sl $lib_opts] != ""} {
-    untested "Could not build $lib1_s2."
-    return -1
-} elseif { [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "Could not build $binfile."
-    return -1
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${workdir}/shreloc
-
-# Load up the shared objects
-if ![runto_main] then {
-    fail "Can't run to main"
-    return 0
-}
-
-proc get_var_address { var } {
-  global gdb_prompt hex
-
-  send_gdb "print &${var}\n"
-  # Match output like:
-  # $1 = (int *) 0x0
-  # $5 = (int (*)()) 0
-  # $6 = (int (*)()) 0x24 <function_bar>
-  gdb_expect {
-    -re "\\\$\[0-9\]+ = \\(.*\\) (0|$hex)( <${var}>)?\[\r\n\]+${gdb_prompt} $"
-	{
-	  pass "get address of ${var}"
-	  if { $expect_out(1,string) == "0" } {
-	    return "0x0"
-	  } else {
-	    return $expect_out(1,string)
-	  }
-	}
-    -re "${gdb_prompt} $"
-	{ fail "get address of ${var} (unknown output)" }
-    timeout
-	{ fail "get address of ${var} (timeout)" }
-  }
-  return ""
-}
-
-#
-# Check debugging symbol relocations
-#
-
-# Check extern function for relocation
-set fn_1_addr [get_var_address fn_1]
-set fn_2_addr [get_var_address fn_2]
-
-if { "${fn_1_addr}" == "${fn_2_addr}" } {
-  fail "relocated extern functions have different addresses"
-} else {
-  pass "relocated extern functions have different addresses"
-}
-
-# Check extern var for relocation
-set extern_var_1_addr [get_var_address extern_var_1]
-set extern_var_2_addr [get_var_address extern_var_2]
-
-if { "${extern_var_1_addr}" == "${extern_var_2_addr}" } {
-  fail "relocated extern variables have different addresses"
-} else {
-  pass "relocated extern variables have different addresses"
-}
-
-# Check static var for relocation
-set static_var_1_addr [get_var_address static_var_1]
-set static_var_2_addr [get_var_address static_var_2]
-
-if { "${static_var_1_addr}" == "${static_var_2_addr}" } {
-  fail "relocated static variables have different addresses"
-} else {
-  pass "relocated static variables have different addresses"
-}
-
-#
-# Check minimal symbol relocations
-#
-
-proc send_gdb_discard { command } {
-    # Send a command to gdb and discard output up to the next prompt
-
-    global gdb_prompt
-
-    send_gdb "${command}\n"
-
-    # Discard output
-    gdb_expect {
-	-re ".*\[\r\n]+${gdb_prompt} $" {
-	    return 1
-	}
-	timeout {
-	    fail "{$command} (timeout)"
-	    return 0
-	}
-    }
-}
-
-proc get_msym_addrs { var msymfile } {
-    # Extract the list of values for symbols matching var in the
-    # minimal symbol output file
-
-    global gdb_prompt hex
-    set result ""
-
-    send_gdb "shell grep -E \" ${var}(\[ \t\]+.*)?\$\" ${msymfile}\n"
-
-    while 1 {
-	gdb_expect {
-	    -re "\[\[\]\[ 0-9\]+\] . (${hex}) ${var}(\[ \t\]+\[^\r\n\]*)?\[\r\n\]+" {
-		set result [concat $result $expect_out(1,string)]
-	    }
-
-	    -re "$gdb_prompt $" {
-		pass "get_msym_addrs ${var} (${result})"
-		return "${result}"
-	    }
-
-	    -re "\[^\r\n\]*\[\r\n\]+" {
-		# Skip
-	    }
-
-	    timeout {
-		fail "get_msym_addrs ${var} (timeout)"
-		return -1
-	    }
-	}
-    }
-}
-
-proc check_same {var msymfile} {
-    # Check that the minimal symbol values matching var are the same
-
-    set len [llength [lsort -unique [get_msym_addrs "${var}" "${msymfile}"]]]
-
-    if { $len == 1 } {
-	return 1
-    } else {
-	return 0
-    }
-}
-
-proc check_different {var msymfile} {
-    # Check that the minimal symbol values matching var are different
-
-    set addr_list [lsort [get_msym_addrs "${var}" "${msymfile}"]]
-    set prev ""
-
-    if { [llength ${addr_list}] < 2 } {
-	return 0
-    }
-
-    foreach addr ${addr_list} {
-	if { ${prev} == ${addr} } {
-	  return 0
-	}
-	set prev ${addr}
-    }
-
-    return 1
-}
-
-set msymfile "${workdir}/shreloc.txt"
-
-if [send_gdb_discard "maint print msymbols ${msymfile}"] {
-    if {[check_different "static_var_\[12\]" "${msymfile}"]} {
-	pass "(msymbol) relocated static vars have different addresses"
-    } else {
-	fail "(msymbol) relocated static vars have different addresses"
-    }
-
-    if {[check_different "extern_var_\[12\]" "${msymfile}"]} {
-	pass "(msymbol) relocated extern vars have different addresses"
-    } else {
-	fail "(msymbol) relocated extern vars have different addresses"
-    }
-
-    if {[check_different "fn_\[12\]" "${msymfile}"]} {
-	pass "(msymbol) relocated functions have different addresses"
-    } else {
-	fail "(msymbol) relocated functions have different addresses"
-    }
-}
-
-if {([istarget "*pc-cygwin"] || [istarget "*pc-mingw32"]) } {
-    #
-    # We know the names of some absolute symbols included in the
-    # portable-executable (DLL) format. Check that they didn't get
-    # relocated.
-    #
-    # A better approach would be include absolute symbols via the assembler.
-    #
-    if {[check_same "_minor_os_version__" "${msymfile}"]} {
-	pass "Absolute symbols not relocated"
-    } else {
-	fail "Absolute symbols not relocated"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/shreloc1.c b/gdb/testsuite/gdb.base/shreloc1.c
deleted file mode 100644
index 6a228f85853..00000000000
--- a/gdb/testsuite/gdb.base/shreloc1.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#if defined(_WIN32) || defined(__CYGWIN__)
-# define ATTRIBUTES __attribute((__dllexport__))
-#else
-# define ATTRIBUTES
-#endif
-
-static int static_var_1;
-
-ATTRIBUTES void fn_1 (int referenced) { static_var_1 = referenced; }
-ATTRIBUTES int extern_var_1 = 0;
diff --git a/gdb/testsuite/gdb.base/shreloc2.c b/gdb/testsuite/gdb.base/shreloc2.c
deleted file mode 100644
index 1a9b48bd13d..00000000000
--- a/gdb/testsuite/gdb.base/shreloc2.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#if defined(_WIN32) || defined(__CYGWIN__)
-# define ATTRIBUTES __attribute((__dllexport__))
-#else
-# define ATTRIBUTES
-#endif
-
-static int static_var_2;
-
-ATTRIBUTES void fn_2 (int referenced) { static_var_2 = referenced; }
-ATTRIBUTES int extern_var_2 = 0;
diff --git a/gdb/testsuite/gdb.base/sigall.c b/gdb/testsuite/gdb.base/sigall.c
deleted file mode 100644
index 30d06f367d3..00000000000
--- a/gdb/testsuite/gdb.base/sigall.c
+++ /dev/null
@@ -1,1810 +0,0 @@
-#include <signal.h>
-#include <unistd.h>
-
-#ifdef __sh__
-#define signal(a,b)	/* Signals not supported on this target - make them go away */
-#endif
-
-/* Signal handlers, we set breakpoints in them to make sure that the
-   signals really get delivered.  */
-
-#ifdef PROTOTYPES
-void
-handle_ABRT (int sig)
-#else
-void
-handle_ABRT (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_HUP (int sig)
-#else
-void
-handle_HUP (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_QUIT (int sig)
-#else
-void
-handle_QUIT (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_ILL (int sig)
-#else
-void
-handle_ILL (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_EMT (int sig)
-#else
-void
-handle_EMT (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_FPE (int sig)
-#else
-void
-handle_FPE (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_BUS (int sig)
-#else
-void
-handle_BUS (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_SEGV (int sig)
-#else
-void
-handle_SEGV (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_SYS (int sig)
-#else
-void
-handle_SYS (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_PIPE (int sig)
-#else
-void
-handle_PIPE (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_ALRM (int sig)
-#else
-void
-handle_ALRM (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_URG (int sig)
-#else
-void
-handle_URG (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_TSTP (int sig)
-#else
-void
-handle_TSTP (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_CONT (int sig)
-#else
-void
-handle_CONT (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_CHLD (int sig)
-#else
-void
-handle_CHLD (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_TTIN (int sig)
-#else
-void
-handle_TTIN (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_TTOU (int sig)
-#else
-void
-handle_TTOU (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_IO (int sig)
-#else
-void
-handle_IO (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_XCPU (int sig)
-#else
-void
-handle_XCPU (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_XFSZ (int sig)
-#else
-void
-handle_XFSZ (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_VTALRM (int sig)
-#else
-void
-handle_VTALRM (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_PROF (int sig)
-#else
-void
-handle_PROF (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_WINCH (int sig)
-#else
-void
-handle_WINCH (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_LOST (int sig)
-#else
-void
-handle_LOST (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_USR1 (int sig)
-#else
-void
-handle_USR1 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_USR2 (int sig)
-#else
-void
-handle_USR2 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_PWR (int sig)
-#else
-void
-handle_PWR (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_POLL (int sig)
-#else
-void
-handle_POLL (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_WIND (int sig)
-#else
-void
-handle_WIND (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_PHONE (int sig)
-#else
-void
-handle_PHONE (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_WAITING (int sig)
-#else
-void
-handle_WAITING (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_LWP (int sig)
-#else
-void
-handle_LWP (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_DANGER (int sig)
-#else
-void
-handle_DANGER (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_GRANT (int sig)
-#else
-void
-handle_GRANT (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_RETRACT (int sig)
-#else
-void
-handle_RETRACT (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_MSG (int sig)
-#else
-void
-handle_MSG (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_SOUND (int sig)
-#else
-void
-handle_SOUND (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_SAK (int sig)
-#else
-void
-handle_SAK (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_PRIO (int sig)
-#else
-void
-handle_PRIO (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_33 (int sig)
-#else
-void
-handle_33 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_34 (int sig)
-#else
-void
-handle_34 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_35 (int sig)
-#else
-void
-handle_35 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_36 (int sig)
-#else
-void
-handle_36 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_37 (int sig)
-#else
-void
-handle_37 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_38 (int sig)
-#else
-void
-handle_38 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_39 (int sig)
-#else
-void
-handle_39 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_40 (int sig)
-#else
-void
-handle_40 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_41 (int sig)
-#else
-void
-handle_41 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_42 (int sig)
-#else
-void
-handle_42 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_43 (int sig)
-#else
-void
-handle_43 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_44 (int sig)
-#else
-void
-handle_44 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_45 (int sig)
-#else
-void
-handle_45 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_46 (int sig)
-#else
-void
-handle_46 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_47 (int sig)
-#else
-void
-handle_47 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_48 (int sig)
-#else
-void
-handle_48 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_49 (int sig)
-#else
-void
-handle_49 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_50 (int sig)
-#else
-void
-handle_50 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_51 (int sig)
-#else
-void
-handle_51 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_52 (int sig)
-#else
-void
-handle_52 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_53 (int sig)
-#else
-void
-handle_53 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_54 (int sig)
-#else
-void
-handle_54 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_55 (int sig)
-#else
-void
-handle_55 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_56 (int sig)
-#else
-void
-handle_56 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_57 (int sig)
-#else
-void
-handle_57 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_58 (int sig)
-#else
-void
-handle_58 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_59 (int sig)
-#else
-void
-handle_59 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_60 (int sig)
-#else
-void
-handle_60 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_61 (int sig)
-#else
-void
-handle_61 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_62 (int sig)
-#else
-void
-handle_62 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_63 (int sig)
-#else
-void
-handle_63 (sig)
-     int sig;
-#endif
-{
-}
-
-#ifdef PROTOTYPES
-void
-handle_TERM (int sig)
-#else
-void
-handle_TERM (sig)
-     int sig;
-#endif
-{
-}
-
-/* Functions to send signals.  These also serve as markers.  */
-int
-gen_ABRT ()
-{
-  kill (getpid (), SIGABRT);
-  return 0;
-}  
-
-int
-gen_HUP ()
-{
-#ifdef SIGHUP
-  kill (getpid (), SIGHUP);
-#else
-  handle_HUP (0);
-#endif
-return 0;
-}  
-
-int
-gen_QUIT ()
-{
-#ifdef SIGQUIT
-  kill (getpid (), SIGQUIT);
-#else
-  handle_QUIT (0);
-#endif
-return 0;
-}
-
-int
-gen_ILL ()
-{
-#ifdef SIGILL
-  kill (getpid (), SIGILL);
-#else
-  handle_ILL (0);
-#endif
-return 0;
-}
-
-int
-gen_EMT ()
-{
-#ifdef SIGEMT
-  kill (getpid (), SIGEMT);
-#else
-  handle_EMT (0);
-#endif
-return 0;
-}
-
-int x;
-
-int
-gen_FPE ()
-{
-  /* The intent behind generating SIGFPE this way is to check the mapping
-     from the CPU exception itself to the signals.  It would be nice to
-     do the same for SIGBUS, SIGSEGV, etc., but I suspect that even this
-     test might turn out to be insufficiently portable.  */
-
-#if 0
-  /* Loses on the PA because after the signal handler executes we try to
-     re-execute the failing instruction again.  Perhaps we could siglongjmp
-     out of the signal handler?  */
-  /* The expect script looks for the word "kill"; don't delete it.  */
-  return 5 / x; /* and we both started jumping up and down yelling kill */
-#else
-  kill (getpid (), SIGFPE);
-#endif
-return 0;
-}
-
-int
-gen_BUS ()
-{
-#ifdef SIGBUS
-  kill (getpid (), SIGBUS);
-#else
-  handle_BUS (0);
-#endif
-return 0;
-}
-
-int
-gen_SEGV ()
-{
-#ifdef SIGSEGV
-  kill (getpid (), SIGSEGV);
-#else
-  handle_SEGV (0);
-#endif
-return 0;
-}
-
-int
-gen_SYS ()
-{
-#ifdef SIGSYS
-  kill (getpid (), SIGSYS);
-#else
-  handle_SYS (0);
-#endif
-return 0;
-}
-
-int
-gen_PIPE ()
-{
-#ifdef SIGPIPE
-  kill (getpid (), SIGPIPE);
-#else
-  handle_PIPE (0);
-#endif
-return 0;
-}
-
-int
-gen_ALRM ()
-{
-#ifdef SIGALRM
-  kill (getpid (), SIGALRM);
-#else
-  handle_ALRM (0);
-#endif
-return 0;
-}
-
-int
-gen_URG ()
-{
-#ifdef SIGURG
-  kill (getpid (), SIGURG);
-#else
-  handle_URG (0);
-#endif
-return 0;
-}
-
-int
-gen_TSTP ()
-{
-#ifdef SIGTSTP
-  kill (getpid (), SIGTSTP);
-#else
-  handle_TSTP (0);
-#endif
-return 0;
-}
-
-int
-gen_CONT ()
-{
-#ifdef SIGCONT
-  kill (getpid (), SIGCONT);
-#else
-  handle_CONT (0);
-#endif
-return 0;
-}
-
-int
-gen_CHLD ()
-{
-#ifdef SIGCHLD
-  kill (getpid (), SIGCHLD);
-#else
-  handle_CHLD (0);
-#endif
-return 0;
-}
-
-int
-gen_TTIN ()
-{
-#ifdef SIGTTIN
-  kill (getpid (), SIGTTIN);
-#else
-  handle_TTIN (0);
-#endif
-return 0;
-}
-
-int
-gen_TTOU ()
-{
-#ifdef SIGTTOU
-  kill (getpid (), SIGTTOU);
-#else
-  handle_TTOU (0);
-#endif
-return 0;
-}
-
-int
-gen_IO ()
-{
-#ifdef SIGIO
-  kill (getpid (), SIGIO);
-#else
-  handle_IO (0);
-#endif
-return 0;
-}
-
-int
-gen_XCPU ()
-{
-#ifdef SIGXCPU
-  kill (getpid (), SIGXCPU);
-#else
-  handle_XCPU (0);
-#endif
-return 0;
-}
-
-int
-gen_XFSZ ()
-{
-#ifdef SIGXFSZ
-  kill (getpid (), SIGXFSZ);
-#else
-  handle_XFSZ (0);
-#endif
-return 0;
-}
-
-int
-gen_VTALRM ()
-{
-#ifdef SIGVTALRM
-  kill (getpid (), SIGVTALRM);
-#else
-  handle_VTALRM (0);
-#endif
-return 0;
-}
-
-int
-gen_PROF ()
-{
-#ifdef SIGPROF
-  kill (getpid (), SIGPROF);
-#else
-  handle_PROF (0);
-#endif
-return 0;
-}
-
-int
-gen_WINCH ()
-{
-#ifdef SIGWINCH
-  kill (getpid (), SIGWINCH);
-#else
-  handle_WINCH (0);
-#endif
-return 0;
-}
-
-int
-gen_LOST ()
-{
-#if defined(SIGLOST) && (!defined(SIGABRT) || SIGLOST != SIGABRT)
-  kill (getpid (), SIGLOST);
-#else
-  handle_LOST (0);
-#endif
-return 0;
-}
-
-int
-gen_USR1 ()
-{
-#ifdef SIGUSR1
-  kill (getpid (), SIGUSR1);
-#else
-  handle_USR1 (0);
-#endif
-return 0;
-}
-
-int
-gen_USR2 ()
-{
-#ifdef SIGUSR2
-  kill (getpid (), SIGUSR2);
-#else
-  handle_USR2 (0);
-#endif
-return 0;
-}  
-
-int
-gen_PWR ()
-{
-#ifdef SIGPWR
-  kill (getpid (), SIGPWR);
-#else
-  handle_PWR (0);
-#endif
-return 0;
-}
-
-int
-gen_POLL ()
-{
-#if defined (SIGPOLL) && (!defined (SIGIO) || SIGPOLL != SIGIO)
-  kill (getpid (), SIGPOLL);
-#else
-  handle_POLL (0);
-#endif
-return 0;
-}
-
-int
-gen_WIND ()
-{
-#ifdef SIGWIND
-  kill (getpid (), SIGWIND);
-#else
-  handle_WIND (0);
-#endif
-return 0;
-}
-
-int
-gen_PHONE ()
-{
-#ifdef SIGPHONE
-  kill (getpid (), SIGPHONE);
-#else
-  handle_PHONE (0);
-#endif
-return 0;
-}
-
-int
-gen_WAITING ()
-{
-#ifdef SIGWAITING
-  kill (getpid (), SIGWAITING);
-#else
-  handle_WAITING (0);
-#endif
-return 0;
-}
-
-int
-gen_LWP ()
-{
-#ifdef SIGLWP
-  kill (getpid (), SIGLWP);
-#else
-  handle_LWP (0);
-#endif
-return 0;
-}
-
-int
-gen_DANGER ()
-{
-#ifdef SIGDANGER
-  kill (getpid (), SIGDANGER);
-#else
-  handle_DANGER (0);
-#endif
-return 0;
-}
-
-int
-gen_GRANT ()
-{
-#ifdef SIGGRANT
-  kill (getpid (), SIGGRANT);
-#else
-  handle_GRANT (0);
-#endif
-return 0;
-}
-
-int
-gen_RETRACT ()
-{
-#ifdef SIGRETRACT
-  kill (getpid (), SIGRETRACT);
-#else
-  handle_RETRACT (0);
-#endif
-return 0;
-}
-
-int
-gen_MSG ()
-{
-#ifdef SIGMSG
-  kill (getpid (), SIGMSG);
-#else
-  handle_MSG (0);
-#endif
-return 0;
-}
-
-int
-gen_SOUND ()
-{
-#ifdef SIGSOUND
-  kill (getpid (), SIGSOUND);
-#else
-  handle_SOUND (0);
-#endif
-return 0;
-}
-
-int
-gen_SAK ()
-{
-#ifdef SIGSAK
-  kill (getpid (), SIGSAK);
-#else
-  handle_SAK (0);
-#endif
-return 0;
-}
-
-int
-gen_PRIO ()
-{
-#ifdef SIGPRIO
-  kill (getpid (), SIGPRIO);
-#else
-  handle_PRIO (0);
-#endif
-return 0;
-}
-
-int
-gen_33 ()
-{
-#ifdef SIG33
-  kill (getpid (), 33);
-#else
-  handle_33 (0);
-#endif
-return 0;
-}
-
-int
-gen_34 ()
-{
-#ifdef SIG34
-  kill (getpid (), 34);
-#else
-  handle_34 (0);
-#endif
-return 0;
-}
-
-int
-gen_35 ()
-{
-#ifdef SIG35
-  kill (getpid (), 35);
-#else
-  handle_35 (0);
-#endif
-return 0;
-}
-
-int
-gen_36 ()
-{
-#ifdef SIG36
-  kill (getpid (), 36);
-#else
-  handle_36 (0);
-#endif
-return 0;
-}
-
-int
-gen_37 ()
-{
-#ifdef SIG37
-  kill (getpid (), 37);
-#else
-  handle_37 (0);
-#endif
-return 0;
-}
-
-int
-gen_38 ()
-{
-#ifdef SIG38
-  kill (getpid (), 38);
-#else
-  handle_38 (0);
-#endif
-return 0;
-}
-
-int
-gen_39 ()
-{
-#ifdef SIG39
-  kill (getpid (), 39);
-#else
-  handle_39 (0);
-#endif
-return 0;
-}
-
-int
-gen_40 ()
-{
-#ifdef SIG40
-  kill (getpid (), 40);
-#else
-  handle_40 (0);
-#endif
-return 0;
-}
-
-int
-gen_41 ()
-{
-#ifdef SIG41
-  kill (getpid (), 41);
-#else
-  handle_41 (0);
-#endif
-return 0;
-}
-
-int
-gen_42 ()
-{
-#ifdef SIG42
-  kill (getpid (), 42);
-#else
-  handle_42 (0);
-#endif
-return 0;
-}
-
-int
-gen_43 ()
-{
-#ifdef SIG43
-  kill (getpid (), 43);
-#else
-  handle_43 (0);
-#endif
-return 0;
-}
-
-int
-gen_44 ()
-{
-#ifdef SIG44
-  kill (getpid (), 44);
-#else
-  handle_44 (0);
-#endif
-return 0;
-}
-
-int
-gen_45 ()
-{
-#ifdef SIG45
-  kill (getpid (), 45);
-#else
-  handle_45 (0);
-#endif
-return 0;
-}
-
-int
-gen_46 ()
-{
-#ifdef SIG46
-  kill (getpid (), 46);
-#else
-  handle_46 (0);
-#endif
-return 0;
-}
-
-int
-gen_47 ()
-{
-#ifdef SIG47
-  kill (getpid (), 47);
-#else
-  handle_47 (0);
-#endif
-return 0;
-}
-
-int
-gen_48 ()
-{
-#ifdef SIG48
-  kill (getpid (), 48);
-#else
-  handle_48 (0);
-#endif
-return 0;
-}
-
-int
-gen_49 ()
-{
-#ifdef SIG49
-  kill (getpid (), 49);
-#else
-  handle_49 (0);
-#endif
-return 0;
-}
-
-int
-gen_50 ()
-{
-#ifdef SIG50
-  kill (getpid (), 50);
-#else
-  handle_50 (0);
-#endif
-return 0;
-}
-
-int
-gen_51 ()
-{
-#ifdef SIG51
-  kill (getpid (), 51);
-#else
-  handle_51 (0);
-#endif
-return 0;
-}
-
-int
-gen_52 ()
-{
-#ifdef SIG52
-  kill (getpid (), 52);
-#else
-  handle_52 (0);
-#endif
-return 0;
-}
-
-int
-gen_53 ()
-{
-#ifdef SIG53
-  kill (getpid (), 53);
-#else
-  handle_53 (0);
-#endif
-return 0;
-}
-
-int
-gen_54 ()
-{
-#ifdef SIG54
-  kill (getpid (), 54);
-#else
-  handle_54 (0);
-#endif
-return 0;
-}
-
-int
-gen_55 ()
-{
-#ifdef SIG55
-  kill (getpid (), 55);
-#else
-  handle_55 (0);
-#endif
-return 0;
-}
-
-int
-gen_56 ()
-{
-#ifdef SIG56
-  kill (getpid (), 56);
-#else
-  handle_56 (0);
-#endif
-return 0;
-}
-
-int
-gen_57 ()
-{
-#ifdef SIG57
-  kill (getpid (), 57);
-#else
-  handle_57 (0);
-#endif
-return 0;
-}
-
-int
-gen_58 ()
-{
-#ifdef SIG58
-  kill (getpid (), 58);
-#else
-  handle_58 (0);
-#endif
-return 0;
-}
-
-int
-gen_59 ()
-{
-#ifdef SIG59
-  kill (getpid (), 59);
-#else
-  handle_59 (0);
-#endif
-return 0;
-}
-
-int
-gen_60 ()
-{
-#ifdef SIG60
-  kill (getpid (), 60);
-#else
-  handle_60 (0);
-#endif
-return 0;
-}
-
-int
-gen_61 ()
-{
-#ifdef SIG61
-  kill (getpid (), 61);
-#else
-  handle_61 (0);
-#endif
-return 0;
-}
-
-int
-gen_62 ()
-{
-#ifdef SIG62
-  kill (getpid (), 62);
-#else
-  handle_62 (0);
-#endif
-return 0;
-}
-
-int
-gen_63 ()
-{
-#ifdef SIG63
-  kill (getpid (), 63);
-#else
-  handle_63 (0);
-#endif
-return 0;
-}
-
-int
-gen_TERM ()
-{
-  kill (getpid (), SIGTERM);
-return 0;
-}  
-
-int
-main ()
-{
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-  signal (SIGABRT, handle_ABRT);
-#ifdef SIGHUP
-  signal (SIGHUP, handle_HUP);
-#endif
-#ifdef SIGQUIT
-  signal (SIGQUIT, handle_QUIT);
-#endif
-#ifdef SIGILL
-  signal (SIGILL, handle_ILL);
-#endif
-#ifdef SIGEMT
-  signal (SIGEMT, handle_EMT);
-#endif
-#ifdef SIGFPE
-  signal (SIGFPE, handle_FPE);
-#endif
-#ifdef SIGBUS
-  signal (SIGBUS, handle_BUS);
-#endif
-#ifdef SIGSEGV
-  signal (SIGSEGV, handle_SEGV);
-#endif
-#ifdef SIGSYS
-  signal (SIGSYS, handle_SYS);
-#endif
-#ifdef SIGPIPE
-  signal (SIGPIPE, handle_PIPE);
-#endif
-#ifdef SIGALRM
-  signal (SIGALRM, handle_ALRM);
-#endif
-#ifdef SIGURG
-  signal (SIGURG, handle_URG);
-#endif
-#ifdef SIGTSTP
-  signal (SIGTSTP, handle_TSTP);
-#endif
-#ifdef SIGCONT
-  signal (SIGCONT, handle_CONT);
-#endif
-#ifdef SIGCHLD
-  signal (SIGCHLD, handle_CHLD);
-#endif
-#ifdef SIGTTIN
-  signal (SIGTTIN, handle_TTIN);
-#endif
-#ifdef SIGTTOU
-  signal (SIGTTOU, handle_TTOU);
-#endif
-#ifdef SIGIO
-  signal (SIGIO, handle_IO);
-#endif
-#ifdef SIGXCPU
-  signal (SIGXCPU, handle_XCPU);
-#endif
-#ifdef SIGXFSZ
-  signal (SIGXFSZ, handle_XFSZ);
-#endif
-#ifdef SIGVTALRM
-  signal (SIGVTALRM, handle_VTALRM);
-#endif
-#ifdef SIGPROF
-  signal (SIGPROF, handle_PROF);
-#endif
-#ifdef SIGWINCH
-  signal (SIGWINCH, handle_WINCH);
-#endif
-#if defined(SIGLOST) && (!defined(SIGABRT) || SIGLOST != SIGABRT)
-  signal (SIGLOST, handle_LOST);
-#endif
-#ifdef SIGUSR1
-  signal (SIGUSR1, handle_USR1);
-#endif
-#ifdef SIGUSR2
-  signal (SIGUSR2, handle_USR2);
-#endif
-#ifdef SIGPWR
-  signal (SIGPWR, handle_PWR);
-#endif
-#if defined (SIGPOLL) && (!defined (SIGIO) || SIGPOLL != SIGIO)
-  signal (SIGPOLL, handle_POLL);
-#endif
-#ifdef SIGWIND
-  signal (SIGWIND, handle_WIND);
-#endif
-#ifdef SIGPHONE
-  signal (SIGPHONE, handle_PHONE);
-#endif
-#ifdef SIGWAITING
-  signal (SIGWAITING, handle_WAITING);
-#endif
-#ifdef SIGLWP
-  signal (SIGLWP, handle_LWP);
-#endif
-#ifdef SIGDANGER
-  signal (SIGDANGER, handle_DANGER);
-#endif
-#ifdef SIGGRANT
-  signal (SIGGRANT, handle_GRANT);
-#endif
-#ifdef SIGRETRACT
-  signal (SIGRETRACT, handle_RETRACT);
-#endif
-#ifdef SIGMSG
-  signal (SIGMSG, handle_MSG);
-#endif
-#ifdef SIGSOUND
-  signal (SIGSOUND, handle_SOUND);
-#endif
-#ifdef SIGSAK
-  signal (SIGSAK, handle_SAK);
-#endif
-#ifdef SIGPRIO
-  signal (SIGPRIO, handle_PRIO);
-#endif
-#ifdef __Lynx__
-  /* Lynx doesn't seem to have anything in signal.h for this.  */
-  signal (33, handle_33);
-  signal (34, handle_34);
-  signal (35, handle_35);
-  signal (36, handle_36);
-  signal (37, handle_37);
-  signal (38, handle_38);
-  signal (39, handle_39);
-  signal (40, handle_40);
-  signal (41, handle_41);
-  signal (42, handle_42);
-  signal (43, handle_43);
-  signal (44, handle_44);
-  signal (45, handle_45);
-  signal (46, handle_46);
-  signal (47, handle_47);
-  signal (48, handle_48);
-  signal (49, handle_49);
-  signal (50, handle_50);
-  signal (51, handle_51);
-  signal (52, handle_52);
-  signal (53, handle_53);
-  signal (54, handle_54);
-  signal (55, handle_55);
-  signal (56, handle_56);
-  signal (57, handle_57);
-  signal (58, handle_58);
-  signal (59, handle_59);
-  signal (60, handle_60);
-  signal (61, handle_61);
-  signal (62, handle_62);
-  signal (63, handle_63);
-#endif /* lynx */
-  signal (SIGTERM, handle_TERM);
-
-  x = 0;
-
-  gen_ABRT ();
-  gen_HUP ();
-  gen_QUIT ();
-  gen_ILL ();
-  gen_EMT ();
-  gen_FPE ();
-  gen_BUS ();
-  gen_SEGV ();
-  gen_SYS ();
-  gen_PIPE ();
-  gen_ALRM ();
-  gen_URG ();
-  gen_TSTP ();
-  gen_CONT ();
-  gen_CHLD ();
-  gen_TTIN ();
-  gen_TTOU ();
-  gen_IO ();
-  gen_XCPU ();
-  gen_XFSZ ();
-  gen_VTALRM ();
-  gen_PROF ();
-  gen_WINCH ();
-  gen_LOST ();
-  gen_USR1 ();
-  gen_USR2 ();
-  gen_PWR ();
-  gen_POLL ();
-  gen_WIND ();
-  gen_PHONE ();
-  gen_WAITING ();
-  gen_LWP ();
-  gen_DANGER ();
-  gen_GRANT ();
-  gen_RETRACT ();
-  gen_MSG ();
-  gen_SOUND ();
-  gen_SAK ();
-  gen_PRIO ();
-  gen_33 ();
-  gen_34 ();
-  gen_35 ();
-  gen_36 ();
-  gen_37 ();
-  gen_38 ();
-  gen_39 ();
-  gen_40 ();
-  gen_41 ();
-  gen_42 ();
-  gen_43 ();
-  gen_44 ();
-  gen_45 ();
-  gen_46 ();
-  gen_47 ();
-  gen_48 ();
-  gen_49 ();
-  gen_50 ();
-  gen_51 ();
-  gen_52 ();
-  gen_53 ();
-  gen_54 ();
-  gen_55 ();
-  gen_56 ();
-  gen_57 ();
-  gen_58 ();
-  gen_59 ();
-  gen_60 ();
-  gen_61 ();
-  gen_62 ();
-  gen_63 ();
-  gen_TERM ();
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp
deleted file mode 100644
index f452f0c6ef7..00000000000
--- a/gdb/testsuite/gdb.base/sigall.exp
+++ /dev/null
@@ -1,210 +0,0 @@
-#   Copyright 1995, 1996, 1997, 1999 Free Software Foundation, 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.  
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping sigall.exp because of nosignals."
-    continue
-}
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-set testfile sigall
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Make the first signal SIGABRT because it is always supported.
-set sig_supported 1
-set thissig "ABRT"
-
-proc test_one_sig {nextsig} {
-    global sig_supported
-    global gdb_prompt
-    global thissig
-
-    set this_sig_supported $sig_supported
-    gdb_test "handle SIG$thissig stop print" \
-	"SIG$thissig\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Yes.*"
-    gdb_test "b handle_$thissig" "Breakpoint \[0-9\]+ .*"
-    gdb_test "b gen_$nextsig" "Breakpoint \[0-9\]+ .*"
-
-    set need_another_continue 1
-    set missed_handler 0
-    if $this_sig_supported then {
-	send_gdb "continue\n"
-	if { $thissig == "IO" } {
-	    setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu"
-	}
-	gdb_expect {
-	    -re "Continuing.*Program received signal SIG$thissig.*$gdb_prompt $" {
-		pass "get signal $thissig"
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "get signal $thissig"
-		set need_another_continue 0
-	    }
-	    default {
-		fail "get signal $thissig (eof or timeout)"
-	    }
-	}
-    }
-    if [ istarget "alpha-dec-osf3*" ] then {
-	# OSF/1-3.x is unable to continue with a job control stop signal.
-	# The inferior remains stopped without an event of interest
-	# and GDB waits forever for the inferior to stop on an event
-	# of interest. Work around the kernel bug.
-	if { $thissig == "TSTP" || $thissig == "TTIN" || $thissig == "TTOU" } {
-	    setup_xfail "alpha-dec-osf3*"
-	    fail "cannot continue from signal $thissig"
-	    set need_another_continue 0
-	}
-    }
-
-    if $need_another_continue then {
-	send_gdb "continue\n"
-	if { $thissig == "URG" } {
-	    setup_xfail "i*86-pc-linuxoldld-gnu" "i*86-pc-linuxaout-gnu"
-	}
-        # Either Lynx or GDB screws up on SIGPRIO
-	if { $thissig == "PRIO" } {
-	    setup_xfail "*-*-*lynx*"
-	}
-	gdb_expect {
-	    -re "Breakpoint.*handle_$thissig.*$gdb_prompt $" {
-		pass "send signal $thissig"
-	    }
-	    -re "Breakpoint.*gen_$nextsig.*kill.*$gdb_prompt $" {
-		fail "missed breakpoint at handle_$thissig"
-		set missed_handler 1
-	    }
-	}
-    }
-
-    if { $missed_handler == "0" } then {
-        send_gdb "signal 0\n"
-        gdb_expect {
-	    -re "Breakpoint.*gen_$nextsig.*kill.*$gdb_prompt $" {
-	        pass "advance to $nextsig"
-	        set sig_supported 1
-	    }
-	    -re "Breakpoint.*gen_$nextsig.*handle.*$gdb_prompt $" {
-	        pass "advance to $nextsig"
-	        set sig_supported 0
-	    }
-	    -re ".*$gdb_prompt $" { fail "advance to $nextsig" }
-	    default { fail "advance to $nextsig (eof or timeout)" }
-        }
-    }
-    set thissig $nextsig
-}
-
-gdb_load $binfile
-
-runto gen_ABRT
-test_one_sig HUP
-test_one_sig QUIT
-test_one_sig ILL
-test_one_sig EMT
-test_one_sig FPE
-test_one_sig BUS
-test_one_sig SEGV
-test_one_sig SYS
-test_one_sig PIPE
-test_one_sig ALRM
-test_one_sig URG
-test_one_sig TSTP
-test_one_sig CONT
-test_one_sig CHLD
-test_one_sig TTIN
-test_one_sig TTOU
-test_one_sig IO
-test_one_sig XCPU
-test_one_sig XFSZ
-test_one_sig VTALRM
-test_one_sig PROF
-test_one_sig WINCH
-test_one_sig LOST
-test_one_sig USR1
-test_one_sig USR2
-test_one_sig PWR
-test_one_sig POLL
-test_one_sig WIND
-test_one_sig PHONE
-test_one_sig WAITING
-test_one_sig LWP
-test_one_sig DANGER
-test_one_sig GRANT
-test_one_sig RETRACT
-test_one_sig MSG
-test_one_sig SOUND
-test_one_sig SAK
-test_one_sig PRIO
-test_one_sig 33
-test_one_sig 34
-test_one_sig 35
-test_one_sig 36
-test_one_sig 37
-test_one_sig 38
-test_one_sig 39
-test_one_sig 40
-test_one_sig 41
-test_one_sig 42
-test_one_sig 43
-test_one_sig 44
-test_one_sig 45
-test_one_sig 46
-test_one_sig 47
-test_one_sig 48
-test_one_sig 49
-test_one_sig 50
-test_one_sig 51
-test_one_sig 52
-test_one_sig 53
-test_one_sig 54
-test_one_sig 55
-test_one_sig 56
-test_one_sig 57
-test_one_sig 58
-test_one_sig 59
-test_one_sig 60
-test_one_sig 61
-test_one_sig 62
-test_one_sig 63
-test_one_sig TERM
-
-# The last signal (SIGTERM) gets handled slightly differently because
-# we are not setting up for another test.
-gdb_test "handle SIGTERM stop print" \
-    "SIGTERM\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Yes.*"
-gdb_test "b handle_TERM" "Breakpoint \[0-9\]+ .*"
-gdb_test "continue" \
-    "Continuing.*Program received signal SIGTERM.*" \
-    "get signal TERM"
-gdb_test "continue" "Breakpoint.*handle_TERM.*" "send signal TERM"
-gdb_continue_to_end "continue to sigall exit"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/sigaltstack.c b/gdb/testsuite/gdb.base/sigaltstack.c
deleted file mode 100644
index b7abc9b5241..00000000000
--- a/gdb/testsuite/gdb.base/sigaltstack.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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  */
-
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-
-enum level { MAIN, OUTER, INNER, LEAF, NR_LEVELS };
-
-/* Levels completed flag.  */
-volatile enum level level = NR_LEVELS;
-
-void catcher (int signal);
-
-void
-thrower (enum level next_level, int sig, int itimer, int on_stack)
-{
-  level = next_level;
-  /* Set up the signal handler.  */
-  {
-    struct sigaction act;
-    memset (&act, 0, sizeof (act));
-    act.sa_handler = catcher;
-    act.sa_flags |= on_stack;
-    sigaction (sig, &act, NULL);
-  }
-  /* Set up a one-off timer.  A timer, rather than SIGSEGV, is used as
-     after a timer handler finishes the interrupted code can safely
-     resume.  */
-  {
-    struct itimerval itime;
-    memset (&itime, 0, sizeof (itime));
-    itime.it_value.tv_usec = 250 * 1000;
-    setitimer (itimer, &itime, NULL);
-  }
-  /* Wait.  */
-  while (level != LEAF);
-}
-
-void
-catcher (int signal)
-{
-  /* Find the next level.  */
-  switch (level)
-    {
-    case MAIN:
-      thrower (OUTER, SIGALRM, ITIMER_REAL, SA_ONSTACK);
-      break;
-    case OUTER:
-      thrower (INNER, SIGVTALRM, ITIMER_VIRTUAL, SA_ONSTACK);
-      break;
-    case INNER:
-      level = LEAF;
-      return;
-    }
-}
-
-
-main ()
-{
-  /* Set up the altstack.  */
-  {
-    static char stack[SIGSTKSZ * NR_LEVELS];
-    struct sigaltstack alt;
-    memset (&alt, 0, sizeof (alt));
-    alt.ss_sp = stack;
-    alt.ss_size = SIGSTKSZ;
-    alt.ss_flags = 0;
-    if (sigaltstack (&alt, NULL) < 0)
-      {
-	perror ("sigaltstack");
-	exit (0);
-      }
-  }
-  level = MAIN;
-  catcher (0);
-}
diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.base/sigaltstack.exp
deleted file mode 100644
index d1e37d8aa98..00000000000
--- a/gdb/testsuite/gdb.base/sigaltstack.exp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-
-# The program sigaltstack.c creates a backtrace containing nested
-# signal handlers on an alternative stack.  This in turn leads to a
-# non-contiguous (and possibly non-monotonic) backtrace - stack
-# address jump at the normal-alt stack boundary.
-
-# This test confirms that GDB can both backtrace through and finish
-# such a stack.
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping signals.exp because of nosignals."
-    continue
-}
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile sigaltstack
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${module}.c"
-    return -1
-}
-
-# get things started
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Pass all the alarms straight through (but verbosely)
-gdb_test "handle SIGALRM print pass nostop"
-gdb_test "handle SIGVTALRM print pass nostop"
-gdb_test "handle SIGPROF print pass nostop"
-
-# Advance to main
-if { ![runto_main] } then {
-    gdb_suppress_tests;
-}
-
-# Stop in handle, when at the inner most level
-gdb_test "break catcher if level == INNER"
-gdb_test "continue" ".* catcher .*" "continue to catch"
-# step off the assignment
-gdb_test "next"
-
-# Full backtrace?
-send_gdb "bt\n"
-gdb_expect_list "backtrace" ".*$gdb_prompt $" {
-    "\[\r\n\]+.0 \[^\r\n\]* catcher "
-    "\[\r\n\]+.1  .signal handler called."
-    "\[\r\n\]+.2 \[^\r\n\]* thrower .next_level=INNER"
-    "\[\r\n\]+.3 \[^\r\n\]* catcher "
-    "\[\r\n\]+.4  .signal handler called."
-    "\[\r\n\]+.5 \[^\r\n\]* thrower .next_level=OUTER"
-    "\[\r\n\]+.6 \[^\r\n\]* catcher "
-    "\[\r\n\]+.7 \[^\r\n\]* main .*"
-}
-
-proc finish_test { pattern msg } {
-    global gdb_prompt
-
-    gdb_test_multiple "finish" $msg {
-	-re "Cannot insert breakpoint 0.*${gdb_prompt} $" {
-	    # Some platforms use a special read-only page for signal
-	    # trampolines.  We can't set a breakpoint there, and we
-	    # don't gracefully fall back to single-stepping.
-	    setup_kfail "i?86-*-linux*" gdb/1736
-	    fail "$msg (could not set breakpoint)"
-	}
-	-re "$pattern.*${gdb_prompt} $" {
-	    pass $msg
-	}
-    }
-}
-
-# Finish?
-finish_test "signal handler called." "finish from catch LEAF"
-finish_test "thrower .next_level=INNER, .*" "finish to throw INNER"
-finish_test "catcher .*" "finish to catch INNER"
-finish_test "signal handler called.*" "finish from catch INNER"
-finish_test "thrower .next_level=OUTER, .*" "finish to OUTER"
-finish_test "catcher .*" "finish to catch MAIN"
-finish_test "main .*" "finish to MAIN"
diff --git a/gdb/testsuite/gdb.base/sigbpt.c b/gdb/testsuite/gdb.base/sigbpt.c
deleted file mode 100644
index b189f6da7da..00000000000
--- a/gdb/testsuite/gdb.base/sigbpt.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.  */
-
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern void
-keeper (int sig)
-{
-}
-
-volatile long v1 = 0;
-volatile long v2 = 0;
-volatile long v3 = 0;
-
-extern long
-bowler (void)
-{
-  /* Try to read address zero.  Do it in a slightly convoluted way so
-     that more than one instruction is used.  */
-  return *(char *) (v1 + v2 + v3);
-}
-
-int
-main ()
-{
-  static volatile int i;
-
-  struct sigaction act;
-  memset (&act, 0, sizeof act);
-  act.sa_handler = keeper;
-  sigaction (SIGSEGV, &act, NULL);
-
-  bowler ();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp
deleted file mode 100644
index 9e010e214b5..00000000000
--- a/gdb/testsuite/gdb.base/sigbpt.exp
+++ /dev/null
@@ -1,271 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2004, 2005 Free Software Foundation, 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.  
-
-# Check that GDB can and only executes single instructions when
-# stepping through a sequence of breakpoints interleaved by a signal
-# handler.
-
-# This test is known to tickle the following problems: kernel letting
-# the inferior execute both the system call, and the instruction
-# following, when single-stepping a system call; kernel failing to
-# propogate the single-step state when single-stepping the sigreturn
-# system call, instead resuming the inferior at full speed; GDB
-# doesn't know how to software single-step across a sigreturn
-# instruction.  Since the kernel problems can be "fixed" using
-# software single-step this is KFAILed rather than XFAILed.
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping signals.exp because of nosignals."
-    continue
-}
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "sigbpt"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-# If we can examine what's at memory address 0, it is possible that we
-# could also execute it.  This could probably make us run away,
-# executing random code, which could have all sorts of ill effects,
-# especially on targets without an MMU.  Don't run the tests in that
-# case.
-
-send_gdb "x 0\n"
-gdb_expect {
-    -re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { }
-    -re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { }
-    -re ".*$gdb_prompt $" {
-	untested "Memory at address 0 is possibly executable"
-	return
-    }
-}
-
-gdb_test "break keeper"
-
-# Run to bowler, and then single step until there's a SIGSEGV.  Record
-# the address of each single-step instruction (up to and including the
-# instruction that causes the SIGSEGV) in bowler_addrs, and the address
-# of the actual SIGSEGV in segv_addr.
-
-set bowler_addrs bowler
-gdb_test {display/i $pc}
-gdb_test "advance *bowler" "bowler.*" "advance to the bowler"
-set test "stepping to SIGSEGV"
-gdb_test_multiple "stepi" "$test" {
-    -re "Program received signal SIGSEGV.*pc *(0x\[0-9a-f\]*).*$gdb_prompt $" {
-	set segv_addr $expect_out(1,string)
-	pass "$test"
-    }
-    -re " .*pc *(0x\[0-9a-f\]*).*bowler.*$gdb_prompt $" {
-	set bowler_addrs [concat $expect_out(1,string) $bowler_addrs]
-	send_gdb "stepi\n"
-	exp_continue
-    }
-}
-
-# Now record the address of the instruction following the faulting
-# instruction in bowler_addrs.
-
-set test "get insn after fault"
-gdb_test_multiple {x/2i $pc} "$test" {
-    -re "(0x\[0-9a-f\]*).*bowler.*(0x\[0-9a-f\]*).*bowler.*$gdb_prompt $" {
-	set bowler_addrs [concat $expect_out(2,string) $bowler_addrs]
-	pass "$test"
-    }
-}
-
-# Procedures for returning the address of the instruction before, at
-# and after, the faulting instruction.
-
-proc before_segv { } {
-    global bowler_addrs
-    return [lindex $bowler_addrs 2]
-}
-
-proc at_segv { } {
-    global bowler_addrs
-    return [lindex $bowler_addrs 1]
-}
-
-proc after_segv { } {
-    global bowler_addrs
-    return [lindex $bowler_addrs 0]
-}
-
-# Check that the address table and SIGSEGV correspond.
-
-set test "Verify that SIGSEGV occurs at the last STEPI insn"
-if {[string compare $segv_addr [at_segv]] == 0} {
-    pass "$test"
-} else {
-    fail "$test ($segv_addr [at_segv])"
-}
-
-# Check that the inferior is correctly single stepped all the way back
-# to a faulting instruction.
-
-proc stepi_out { name args } {
-    global gdb_prompt
-
-    # Set SIGSEGV to pass+nostop and then run the inferior all the way
-    # through to the signal handler.  With the handler is reached,
-    # disable SIGSEGV, ensuring that further signals stop the
-    # inferior.  Stops a SIGSEGV infinite loop when a broke system
-    # keeps re-executing the faulting instruction.
-    rerun_to_main
-    gdb_test "handle SIGSEGV nostop print pass" "" "${name}; pass SIGSEGV"
-    gdb_test "continue" "keeper.*" "${name}; continue to keeper"
-    gdb_test "handle SIGSEGV stop print nopass" "" "${name}; nopass SIGSEGV"
-
-    # Insert all the breakpoints.  To avoid the need to step over
-    # these instructions, this is delayed until after the keeper has
-    # been reached.
-    for {set i 0} {$i < [llength $args]} {incr i} {
-	gdb_test "break [lindex $args $i]" "Breakpoint.*" \
-	    "${name}; set breakpoint $i of [llength $args]"
-    }
-
-    # Single step our way out of the keeper, through the signal
-    # trampoline, and back to the instruction that faulted.
-    set test "${name}; stepi out of handler"
-    gdb_test_multiple "stepi" "$test" {
-	-re "keeper.*$gdb_prompt $" {
-	    send_gdb "stepi\n"
-	    exp_continue
-	}
-	-re "signal handler.*$gdb_prompt $" {
-	    send_gdb "stepi\n"
-	    exp_continue
-	}
-	-re "Program received signal SIGSEGV.*$gdb_prompt $" {
-	    kfail gdb/1702 "$test (executed fault insn)"
-	}
-	-re "Breakpoint.*pc *[at_segv] .*bowler.*$gdb_prompt $" {
-	    pass "$test (at breakpoint)"
-	}
-	-re "Breakpoint.*pc *[after_segv] .*bowler.*$gdb_prompt $" {
-	    kfail gdb/1702 "$test (executed breakpoint)"
-	}
-	-re "pc *[at_segv] .*bowler.*$gdb_prompt $" {
-	    pass "$test"
-	}
-	-re "pc *[after_segv] .*bowler.*$gdb_prompt $" {
-	    kfail gdb/1702 "$test (skipped fault insn)"
-	}
-	-re "pc *0x\[a-z0-9\]* .*bowler.*$gdb_prompt $" {
-	    kfail gdb/1702 "$test (corrupt pc)"
-	}
-    }
-
-    # Clear any breakpoints
-    for {set i 0} {$i < [llength $args]} {incr i} {
-	gdb_test "clear [lindex $args $i]" "Deleted .*" \
-	    "${name}; clear breakpoint $i of [llength $args]"
-    }
-}
-
-# Let a signal handler exit, returning to a breakpoint instruction
-# inserted at the original fault instruction.  Check that the
-# breakpoint is hit, and that single stepping off that breakpoint
-# executes the underlying fault instruction causing a SIGSEGV.
-
-proc cont_out { name args } {
-    global gdb_prompt
-
-    # Set SIGSEGV to pass+nostop and then run the inferior all the way
-    # through to the signal handler.  With the handler is reached,
-    # disable SIGSEGV, ensuring that further signals stop the
-    # inferior.  Stops a SIGSEGV infinite loop when a broke system
-    # keeps re-executing the faulting instruction.
-    rerun_to_main
-    gdb_test "handle SIGSEGV nostop print pass" "" "${name}; pass SIGSEGV"
-    gdb_test "continue" "keeper.*" "${name}; continue to keeper"
-    gdb_test "handle SIGSEGV stop print nopass" "" "${name}; nopass SIGSEGV"
-
-    # Insert all the breakpoints.  To avoid the need to step over
-    # these instructions, this is delayed until after the keeper has
-    # been reached.  Always set a breakpoint at the signal trampoline
-    # instruction.
-    set args [concat $args "*[at_segv]"]
-    for {set i 0} {$i < [llength $args]} {incr i} {
-	gdb_test "break [lindex $args $i]" "Breakpoint.*" \
-	    "${name}; set breakpoint $i  of [llength $args]"
-    }
-
-    # Let the handler return, it should "appear to hit" the breakpoint
-    # inserted at the faulting instruction.  Note that the breakpoint
-    # instruction wasn't executed, rather the inferior was SIGTRAPed
-    # with the PC at the breakpoint.
-    gdb_test "continue" "Breakpoint.*pc *[at_segv] .*" \
-	"${name}; continue to breakpoint at fault"
-
-    # Now single step the faulted instrction at that breakpoint.
-    gdb_test "stepi" \
-	"Program received signal SIGSEGV.*pc *[at_segv] .*" \
-	"${name}; stepi fault"    
-
-    # Clear any breakpoints
-    for {set i 0} {$i < [llength $args]} {incr i} {
-	gdb_test "clear [lindex $args $i]" "Deleted .*" \
-	    "${name}; clear breakpoint $i of [llength $args]"
-    }
-
-}
-
-
-
-# Try to confuse DECR_PC_AFTER_BREAK architectures by scattering
-# breakpoints around the faulting address.  In all cases the inferior
-# should single-step out of the signal trampoline halting (but not
-# executing) the fault instruction.
-
-stepi_out "stepi"
-stepi_out "stepi bp before segv" "*[before_segv]"
-stepi_out "stepi bp at segv" "*[at_segv]"
-stepi_out "stepi bp before and at segv" "*[at_segv]" "*[before_segv]"
-
-
-# Try to confuse DECR_PC_AFTER_BREAK architectures by scattering
-# breakpoints around the faulting address.  In all cases the inferior
-# should exit the signal trampoline halting at the breakpoint that
-# replaced the fault instruction.
-cont_out "cont"
-cont_out "cont bp after segv" "*[before_segv]"
-cont_out "cont bp before and after segv" "*[before_segv]" "*[after_segv]"
diff --git a/gdb/testsuite/gdb.base/siginfo.c b/gdb/testsuite/gdb.base/siginfo.c
deleted file mode 100644
index 6303f07194f..00000000000
--- a/gdb/testsuite/gdb.base/siginfo.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.
-
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-
-static volatile int done;
-
-#ifdef SA_SIGINFO
-static void /* HANDLER */
-handler (int sig, siginfo_t *info, void *context)
-{
-  done = 1;
-} /* handler */
-#else
-static void
-handler (int sig)
-{
-  done = 1;
-} /* handler */
-#endif
-
-main ()
-{
-  /* Set up the signal handler.  */
-  {
-    struct sigaction action;
-    memset (&action, 0, sizeof (action));
-#ifdef SA_SIGINFO
-    action.sa_sigaction = handler;
-    action.sa_flags |= SA_SIGINFO;
-#else
-    action.sa_handler = handler;
-#endif
-    sigaction (SIGVTALRM, &action, NULL);
-  }
-
-  /* Set up a one-off timer.  A timer, rather than SIGSEGV, is used as
-     after a timer handler finishes the interrupted code can safely
-     resume.  */
-  {
-    struct itimerval itime;
-    memset (&itime, 0, sizeof (itime));
-    itime.it_value.tv_usec = 250 * 1000;
-    setitimer (ITIMER_VIRTUAL, &itime, NULL);
-  }
-  /* Wait.  */
-  while (!done);
-  return 0;
-} /* main */
diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp
deleted file mode 100644
index a081ab8e887..00000000000
--- a/gdb/testsuite/gdb.base/siginfo.exp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-
-# The program siginfo.c creates a backtrace containing a signal
-# handler registered using sigaction's sa_sigaction / SA_SIGINFO.
-# Some OS's (e.g., GNU/Linux) use different signal trampolines for
-# sa_sigaction and sa_handler.
-
-# This test first confirms that GDB can backtrace through the
-# alternative sa_sigaction signal handler, and second that GDB can
-# nexti/stepi out of such a handler.
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping signals.exp because of nosignals."
-    continue
-}
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile siginfo
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${module}.c"
-    return -1
-}
-
-# get things started
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "display/i \$pc"
-
-# Advance to main
-if { ![runto_main] } then {
-    gdb_suppress_tests;
-}
-
-# Pass all the alarms straight through (but verbosely)
-# gdb_test "handle SIGALRM print pass nostop"
-# gdb_test "handle SIGVTALRM print pass nostop"
-# gdb_test "handle SIGPROF print pass nostop"
-
-# Run to the signal handler, validate the backtrace.
-gdb_test "break handler"
-gdb_test "continue" ".* handler .*" "continue to stepi handler"
-send_gdb "bt\n"
-gdb_expect_list "backtrace for nexti" ".*$gdb_prompt $" {
-    "\[\r\n\]+.0 \[^\r\n\]* handler "
-    "\[\r\n\]+.1  .signal handler called."
-    "\[\r\n\]+.2 \[^\r\n\]* main .*"
-}
-
-# Check that GDB can step the inferior back to main
-set test "step out of handler"
-gdb_test_multiple "step" "${test}" {
-    -re "done = 1;.*${gdb_prompt} $" {
-	send_gdb "$i\n"
-	exp_continue
-    }
-    -re "\} .. handler .*${gdb_prompt} $" {
-	send_gdb "step\n"
-	exp_continue
-    }
-    -re "Program exited normally.*${gdb_prompt} $" {
-	kfail gdb/1613 "$test (program exited)"
-    }
-    -re "(while ..done|return 0).*${gdb_prompt} $" {
-	# After stepping out of a function /r signal-handler, GDB will
-	# advance the inferior until it is at the first instruction of
-	# a code-line.  While typically things return to the middle of
-	# the "while..." (and hence GDB advances the inferior to the
-	# "return..." line) it is also possible for the return to land
-	# on the first instruction of "while...".  Accept both cases.
-	pass "$test"
-    }
-}
diff --git a/gdb/testsuite/gdb.base/signals.c b/gdb/testsuite/gdb.base/signals.c
deleted file mode 100644
index f1ebcfccb3d..00000000000
--- a/gdb/testsuite/gdb.base/signals.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Test GDB dealing with stuff like stepping into sigtramp.  */
-
-#include <signal.h>
-#include <unistd.h>
-
-#ifdef __sh__
-#define signal(a,b)	/* Signals not supported on this target - make them go away */
-#define alarm(a)	/* Ditto for alarm() */
-#endif
-
-static int count = 0;
-
-#ifdef PROTOTYPES
-static void
-handler (int sig)
-#else
-static void
-handler (sig)
-     int sig;
-#endif
-{
-  signal (sig, handler);
-  ++count;
-}
-
-static void
-func1 ()
-{
-  ++count;
-}
-
-static void
-func2 ()
-{
-  ++count;
-}
-
-int
-main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-#ifdef SIGALRM
-  signal (SIGALRM, handler);
-#endif
-#ifdef SIGUSR1
-  signal (SIGUSR1, handler);
-#endif
-  alarm (1);
-  ++count; /* first */
-  alarm (1);
-  ++count; /* second */
-  func1 ();
-  alarm (1);
-  func2 ();
-  return count;
-}
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
deleted file mode 100644
index cbe00bf3b12..00000000000
--- a/gdb/testsuite/gdb.base/signals.exp
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1997, 1998, 1999, 2003, 2004 Free Software Foundation, 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.  
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping signals.exp because of nosignals."
-    continue
-}
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile signals
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-if {$hp_cc_compiler} {
-    set void 0
-} else {
-    set void void
-}
-
-gdb_exit
-gdb_start
-
-# This will need to be updated as the exact list of signals changes,
-# but I want to test that TARGET_SIGNAL_0, TARGET_SIGNAL_DEFAULT, and
-# TARGET_SIGNAL_UNKNOWN are skipped.
-
-proc test_handle_all_print {} {
-    global timeout
-    # Increase timeout and expect input buffer for large output from gdb.
-    # Allow blank or TAB as whitespace characters.
-    set oldtimeout $timeout
-    set timeout [expr "$timeout + 360"]
-    verbose "Timeout is now $timeout seconds" 2
-    if { ![istarget "*-*-linux*"]
-         && ( [istarget "*-*-gnu*"]
-              || [istarget "*-*-mach*"] ) } {
-	gdb_test "handle all print" "Signal\[ 	\]+Stop\[ 	\]+Print\[ 	\]+Pass to program\[ 	\]+Description\r\nSIGHUP\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Hangup.*SIG63\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Real-time event 63.*EXC_BREAKPOINT\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Breakpoint"
-    } else {
-	gdb_test "handle all print" "Signal\[ 	\]+Stop\[ 	\]+Print\[ 	\]+Pass to program\[ 	\]+Description\r\nSIGHUP\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Hangup.*SIG63\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Real-time event 63.*"
-    }
-    set timeout $oldtimeout
-    verbose "Timeout restored to $timeout seconds" 2
-}
-test_handle_all_print
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-if [runto_main] then {
-
-    # Since count is a static variable outside main, runto_main is no
-    # guarantee that count will be 0 at this point.
-
-    gdb_test "set variable count = 0" ""
-
-    # Test an inferior function call that takes a signal that hits a
-    # breakpoint (with a false condition).  When GDB tries to run the
-    # stack dummy, it will hit the breakpoint at handler.  Provided it
-    # doesn't lose its cool, this is not a problem, it just has to
-    # note that the breakpoint condition is false and keep going.
-
-    # ...setup an always false conditional breakpoint
-
-    gdb_test "break handler if 0" "Breakpoint \[0-9\]+ .*"
-    gdb_test "set \$handler_breakpoint_number = \$bpnum" ""
-
-    # ...setup the signal
-
-    gdb_test "next" "signal \\(SIGUSR1.*" "next to signal"
-    gdb_test "next" "alarm \\(.*" "next to alarm #1"
-    gdb_test "next" "\\+\\+count; /\\* first \\*/" \
-	"next to ++count #1"
-    sleep 2
-
-    # ...call the function
-
-    gdb_test "p func1 ()" "^p func1 \\(\\)\r\n.\[0-9\]* = $void" \
-	"p func1 () #1"
-
-    # ...veryfiy that the cout was updated
-
-    gdb_test "p count" "= 2" "p count #1"
-
-    # Now run the same test but with a breakpoint that does stop.
-
-    # ...set up the breakpoint and signal
-
-    gdb_test "condition \$handler_breakpoint_number" "now unconditional\\."
-    gdb_test "next" "alarm \\(.*" "next to alarm #2"
-    gdb_test "next" "\\+\\+count; /\\* second \\*/" \
-	"next to ++count #2"
-    sleep 2
-
-    # ...call the function, which is immediatly interrupted
-
-    gdb_test "p func1 ()" \
-"Breakpoint \[0-9\]*, handler.*
-The program being debugged stopped while in a function called from GDB.*" \
-	"p func1 () #2"
-
-    # ...verify the backtrace
-
-    gdb_test "backtrace" \
-	"#0  handler.*#1  .signal handler called.*#2  func1.*#3  .function called from gdb.*#4.*main.*" \
-	"backtrace from handler when calling func1"
-
-    # ...and continue (silently returning)
-
-    gdb_test "continue" "Continuing\\."
-
-    # ...and then count should have been incremented
-
-    gdb_test "p count" "= 5" "p count #2"
-
-
-    # Verify that "info signals" produces reasonable output.
-
-    gdb_test "info signals" "SIGHUP.*SIGINT.*SIGQUIT.*SIGILL.*SIGTRAP.*SIGABRT.*SIGEMT.*SIGFPE.*SIGKILL.*SIGBUS.*SIGSEGV.*SIGSYS.*SIGPIPE.*SIGALRM.*SIGTERM.*SIGURG.*SIGSTOP.*SIGTSTP.*SIGCONT.*SIGCHLD.*SIGTTIN.*SIGTTOU.*SIGIO.*SIGXCPU.*SIGXFSZ.*SIGVTALRM.*SIGPROF.*SIGWINCH.*SIGLOST.*SIGUSR1.*SIGUSR2.*SIGPWR.*SIGPOLL.*SIGWIND.*SIGPHONE.*SIGWAITING.*SIGLWP.*SIGDANGER.*SIGGRANT.*SIGRETRACT.*SIGMSG.*SIGSOUND.*SIGSAK.*SIGPRIO.*SIG33.*SIG34.*SIG35.*SIG36.*SIG37.*SIG38.*SIG39.*SIG40.*SIG41.*SIG42.*SIG43.*SIG44.*SIG45.*SIG46.*SIG47.*SIG48.*SIG49.*SIG50.*SIG51.*SIG52.*SIG53.*SIG54.*SIG55.*SIG56.*SIG57.*SIG58.*SIG59.*SIG60.*SIG61.*SIG62.*SIG63.*Use the \"handle\" command to change these tables.*" \
-	"info signals"
-
-    # Verify that "info signal" correctly handles an argument, be it a
-    # symbolic signal name, or an integer ID.
-
-    gdb_test "info signal SIGTRAP" \
-	"SIGTRAP\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*No\[ \t\]*Trace/breakpoint trap.*" \
-	"info signal SIGTRAP"
-
-    gdb_test "info signal 5" \
-	"SIGTRAP\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*No\[ \t\]*Trace/breakpoint trap.*" \
-	"info signal 5"
-
-    # Verify that "handle" with illegal arguments is gracefully, um,
-    # handled.
-
-    gdb_test "handle" \
-	"Argument required .signal to handle.*" \
-	"handle without arguments"
-
-    gdb_test "handle SIGFOO" \
-	"Unrecognized or ambiguous flag word: \"SIGFOO\".*" \
-	"handle with bogus SIG"
-
-    gdb_test "handle SIGHUP frump" \
-	"Unrecognized or ambiguous flag word: \"frump\".*" \
-	"handle SIG with bogus action"
-
-    # Verify that "handle" can take multiple actions per SIG, and that
-    # in the case of conflicting actions, that the rightmost action
-    # "wins".
-
-    gdb_test "handle SIGHUP print noprint" \
-	"SIGHUP\[ \t\]*No\[ \t\]*No\[ \t\]*Yes\[ \t\]*Hangup.*" \
-	"handle SIG with multiple conflicting actions"
-
-    # Exercise all the various actions.  (We don't care what the
-    # outcome is, this is just to ensure that they all can be parsed.)
-
-    gdb_test "handle SIGHUP print noprint stop nostop ignore noignore pass nopass" \
-	"Signal.*" \
-	"handle SIG parses all legal actions"
-
-    # Verify that we can "handle" multiple signals at once,
-    # interspersed with actions.
-
-    gdb_test "handle SIG63 print SIGILL" \
-	"SIGILL\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Illegal instruction.*SIG63\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*Real-time event 63.*" \
-	"handle multiple SIGs"
-
-    # Verify that "handle" can take a numeric argument for the signal
-    # ID, rather than a symbolic name.  (This may not be portable;
-    # works for HP-UX.)
-
-    # Also note that this testpoint overrides SIGTRAP, which on HP-UX
-    # at least, is used to implement single-steps and breakpoints.
-    # Don't expect to run the inferior after this!
-
-    set test "override SIGTRAP"
-    gdb_test_multiple "handle 5 nopass" "$test" {
-	-re "SIGTRAP is used by the debugger.*Are you sure you want to change it.*y or n.*" {
-	    gdb_test "y" \
-		"SIGTRAP\[ \t\]*Yes\[ \t\]*Yes\[ \t\]*No\[ \t\]*Trace/breakpoint trap.*" \
-		"$test"
-	}
-    }
-
-    # GDB doesn't seem to allow numeric signal IDs larger than 15.  Verify
-    # that restriction.  ??rehrauer: Not sure if this is a feature or a
-    # bug, actually.  Why is the range 1-15?
-
-    gdb_test "handle 58" \
-	"Only signals 1-15 are valid as numeric signals.*Use \"info signals\" for a list of symbolic signals.*" \
-	"invalid signal number rejected"
-
-    # Verify that we can accept a signal ID range (number-number).
-    # ??rehrauer: This feature isn't documented on the quick-reference
-    # card.
-
-    gdb_test "handle 13-15" \
-	"SIGPIPE.*SIGALRM.*SIGTERM.*" \
-	"handle multiple SIGs via integer range"
-
-    # Bizarrely enough, GDB also allows you to reverse the range stat,
-    # stop IDs.  E.g., "3-1" and "1-3" mean the same thing.  Probably
-    # this isn't documented, but the code anticipates it, so we'd best
-    # test it...
-
-    gdb_test "handle 15-13" \
-	"SIGPIPE.*SIGALRM.*SIGTERM.*" \
-	"handle multiple SIGs via reverse integer range"
-
-    # SIGINT is used by the debugger as well.  Verify that we can
-    # change our minds about changing it.
-
-    set test "override SIGINT"
-    gdb_test_multiple "handle SIGINT nopass" "$test" {
-	-re "SIGINT is used by the debugger.*Are you sure you want to change it.*y or n.*" {
-	    gdb_test_multiple "n" "$test" {
-		-re "Not confirmed, unchanged.*Signal.*$gdb_prompt $"  {
-		    # "Signal ..." should not be in the output.
-		    kfail gdb/1707 "$test"
-		}
-		-re "Not confirmed, unchanged.*$gdb_prompt $" {
-		    pass "$test"
-		}
-	    }
-	}
-    }
-
-    # Verify that GDB responds gracefully to the "signal" command with
-    # a missing argument.
-
-    gdb_test "signal" \
-	"Argument required .signal number..*" \
-	"signal without arguments disallowed"
-    
-    # Verify that we can successfully send a signal other than 0 to
-    # the inferior.  (This probably causes the inferior to run away.
-    # Be prepared to rerun to main for further testing.)
-
-    gdb_test "signal SIGUSR1" "Breakpoint.*handler.*"
-    gdb_test "bt" \
-	"#0  handler .*#1  .signal handler called.*\#2 .*main.*" \
-	"backtrace for SIGUSR1"
-}
-
-return 0
diff --git a/gdb/testsuite/gdb.base/signull.c b/gdb/testsuite/gdb.base/signull.c
deleted file mode 100644
index 4139d14640e..00000000000
--- a/gdb/testsuite/gdb.base/signull.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1996, 1999, 2003, 2004 Free Software Foundation, 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.  */
-
-#include <signal.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <string.h>
-
-enum tests {
-  code_entry_point, code_descriptor, data_read, data_write
-};
-
-static volatile enum tests test;
-
-/* Some basic types and zero buffers.  */
-
-typedef long data_t;
-typedef long code_t (void);
-data_t *volatile data;
-code_t *volatile code;
-/* "desc" is intentionally initialized to a data object.  This is
-   needed to test function descriptors on arches like ia64.  */
-data_t zero[10];
-code_t *volatile desc = (code_t *) (void *) zero;
-
-sigjmp_buf env;
-
-extern void
-keeper (int sig)
-{
-  siglongjmp (env, 0);
-}
-
-extern long
-bowler (void)
-{
-  switch (test)
-    {
-    case data_read:
-      /* Try to read address zero.  */
-      return (*data);
-    case data_write:
-      /* Try to write (the assignment) to address zero.  */
-      return (*data) = 1;
-    case code_entry_point:
-      /* For typical architectures, call a function at address
-	 zero.  */
-      return (*code) ();
-    case code_descriptor:
-      /* For atypical architectures that use function descriptors,
-	 call a function descriptor, the code field of which is zero
-	 (which has the effect of jumping to address zero).  */
-      return (*desc) ();
-    }
-}
-
-int
-main ()
-{
-  static volatile int i;
-
-  struct sigaction act;
-  memset (&act, 0, sizeof act);
-  act.sa_handler = keeper;
-  sigaction (SIGSEGV, &act, NULL);
-
-  for (i = 0; i < 10; i++)
-    {
-      sigsetjmp (env, 1);
-      bowler ();
-    }
-}
diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
deleted file mode 100644
index e6a59764783..00000000000
--- a/gdb/testsuite/gdb.base/signull.exp
+++ /dev/null
@@ -1,127 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2004, 2005 Free Software Foundation, 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.  
-
-# Check that GDB can trigger and backtrace SIGSEGV signal stacks
-# caused by both accessing (data) and executing (code) at address
-# zero.
-
-# On function descriptor architectures, a zero descriptor, instead of
-# a NULL pointer, is used.  That way the NULL code test always
-# contains a zero code reference.
-
-# For recovery, sigjmp/longjmp are used.
-
-# This also tests backtrace/gdb1476.
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping signals.exp because of nosignals."
-    continue
-}
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "signull"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-# If we can examine what's at memory address 0, it is possible that we
-# could also execute it.  This could probably make us run away,
-# executing random code, which could have all sorts of ill effects,
-# especially on targets without an MMU.  Don't run the tests in that
-# case.
-
-send_gdb "x 0\n"
-gdb_expect {
-    -re "0x0:.*Cannot access memory at address 0x0.*$gdb_prompt $" { }
-    -re "0x0:.*Error accessing memory address 0x0.*$gdb_prompt $" { }
-    -re ".*$gdb_prompt $" {
-	untested "Memory at address 0 is possibly executable"
-	return
-    }
-}
-
-# If an attempt to call a NULL pointer leaves the inferior in main,
-# then function pointers are descriptors, probe this and remember the
-# result.
-
-gdb_test "set test = code_entry_point" "" "set for function pointer probe"
-set test "probe function pointer"
-set function_pointer code_entry_point
-gdb_test_multiple "continue" "$test" {
-    -re "Program received signal SIGSEGV.*bowler .*$gdb_prompt $" {
-	set function_pointer code_descriptor
-	pass "$test (function descriptor)"
-    }
-    -re "Program received signal SIGSEGV.*0.*$gdb_prompt $" {
-	pass "$test (function entry-point)"
-    }
-}
-
-# Re-start from scratch, breakpoint the bowler so that control is
-# regained after each test, and run up to that.
-rerun_to_main
-gdb_test "break bowler"
-gdb_test "break keeper"
-# By default Stop:Yes Print:Yes Pass:Yes
-gdb_test "handle SIGSEGV" "SIGSEGV.*Yes.*Yes.*Yes.*Segmentation fault"
-
-# For the given signal type, check that: the SIGSEGV occures; a
-# backtrace from the SEGV works; the sigsegv is delivered; a backtrace
-# through the SEGV works.
-
-proc test_segv { name tag bt_from_segv bt_from_keeper } {
-    gdb_test continue "Breakpoint.* bowler.*" "${name}; start with the bowler"
-    # NB: Don't use $tag in the testname - changes across systems.
-    gdb_test "set test = $tag" "" "${name}; select the pointer type"
-    gdb_test continue "Program received signal SIGSEGV.*" \
-	"${name}; take the SIGSEGV"
-    gdb_test backtrace $bt_from_segv "${name}; backtrace from SIGSEGV"
-    gdb_test continue "Breakpoint.* keeper.*" "${name}; continue to the keeper"
-    gdb_test backtrace $bt_from_keeper "${name}; backtrace from keeper through SIGSEGV"
-}
-
-test_segv "data read" data_read \
-    {#0 .* bowler .*#1  .* main .*} \
-    {#0 .* keeper .*#1  .* handler .*#2 .* bowler .*#3  .* main .*}
-test_segv "data write" data_write \
-    {#0 .* bowler .*#1  .* main .*} \
-    {#0 .* keeper .*#1  .* handler .*#2 .* bowler .*#3  .* main .*}
-test_segv code $function_pointer \
-    {#0 .* 0x0+ .*#1 .* bowler .*#2  .* main .*} \
-    {#0 .* keeper .*#1  .* handler .*#2 .* 0x0+ .*#3 .* bowler .*#4 .* main .*}
diff --git a/gdb/testsuite/gdb.base/sigrepeat.c b/gdb/testsuite/gdb.base/sigrepeat.c
deleted file mode 100644
index a21486dde47..00000000000
--- a/gdb/testsuite/gdb.base/sigrepeat.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004, 2005 Free Software Foundation, 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.
-
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-
-static volatile int done[2];
-static volatile int repeats[2];
-static int itimer[2] = { ITIMER_REAL, ITIMER_VIRTUAL };
-static int alarm[2] = { SIGALRM, SIGVTALRM };
-
-static void
-handler (int sig)
-{
-  int sigi;
-  switch (sig)
-    {
-    case SIGALRM: sigi = 0; break;
-    case SIGVTALRM: sigi = 1; break;
-    default: abort ();
-    }
-  if (repeats[sigi]++ > 3)
-    {
-      /* Hit with enough signals, cancel everything and get out.  */
-      {
-	struct itimerval itime;
-	memset (&itime, 0, sizeof (itime));
-	setitimer (itimer[sigi], &itime, NULL);
-      }
-      {
-	struct sigaction action;
-	memset (&action, 0, sizeof (action));
-	action.sa_handler = SIG_IGN;
-	sigaction (sig, &action, NULL);
-      }
-      done[sigi] = 1;
-      return;
-    }
-  /* Set up a nested virtual timer.  */
-  while (1)
-    {
-      /* Wait until a signal has become pending, that way when this
-	 handler returns it will be immediatly delivered leading to
-	 back-to-back signals.  */
-      sigset_t set;
-      sigemptyset (&set);
-      if (sigpending (&set) < 0)
-	{
-	  perror ("sigrepeat");
-	  abort ();
-	}
-      if (sigismember (&set, sig))
-	break;
-    }
-} /* handler */
-
-main ()
-{
-  int i;
-  /* Set up the signal handler.  */
-  for (i = 0; i < 2; i++)
-    {
-      struct sigaction action;
-      memset (&action, 0, sizeof (action));
-      action.sa_handler = handler;
-      sigaction (alarm[i], &action, NULL);
-    }
-
-  /* Set up a rapidly repeating timers.  A timer, rather than SIGSEGV,
-     is used as after a timer handler returns the interrupted code can
-     safely resume.  The intent is for the program to swamp GDB with a
-     backlog of pending signals.  */
-  for (i = 0; i < 2; i++)
-    {
-      struct itimerval itime;
-      memset (&itime, 0, sizeof (itime));
-      itime.it_interval.tv_usec = 1;
-      itime.it_value.tv_usec = 250 * 1000;
-      setitimer (itimer[i], &itime, NULL);
-    }
-
-  /* Wait.  */
-  while (!done[0] && !done[1]); /* infinite loop */
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/sigrepeat.exp
deleted file mode 100644
index 7abe68fbcdb..00000000000
--- a/gdb/testsuite/gdb.base/sigrepeat.exp
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2004, 2005 Free Software Foundation, 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.  
-
-
-# The program sigrepeat.c creates a repeating timer and then waits for
-# it to fire multiple times.  The objective is to create a backlog if
-# sigalrm signals and hence cause repeated signal delivery without any
-# cpu advancment.
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping sigstep.exp because of nosignals."
-    continue
-}
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile sigrepeat
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${module}.c"
-    return -1
-}
-
-# get things started
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Advance to main
-if { ![runto_main] } then {
-    gdb_suppress_tests;
-}
-
-# Run to the signal handler wait loop.
-set infinite_loop [gdb_get_line_number {infinite loop}]
-gdb_test "advance $infinite_loop" "" "advance to infinite loop"
-
-# Make the first of many signals come pending
-sleep 1
-
-# Try to step off this line
-gdb_test "next" "return 0;.*"
diff --git a/gdb/testsuite/gdb.base/sigstep.c b/gdb/testsuite/gdb.base/sigstep.c
deleted file mode 100644
index 0f0d8b7a4f0..00000000000
--- a/gdb/testsuite/gdb.base/sigstep.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.
-
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-
-static volatile int done;
-
-static void
-handler (int sig)
-{
-  done = 1;
-} /* handler */
-
-struct itimerval itime;
-struct sigaction action;
-
-/* The enum is so that GDB can easily see these macro values.  */
-enum {
-  itimer_real = ITIMER_REAL,
-  itimer_virtual = ITIMER_VIRTUAL
-} itimer = ITIMER_VIRTUAL;
-
-main ()
-{
-
-  /* Set up the signal handler.  */
-  memset (&action, 0, sizeof (action));
-  action.sa_handler = handler;
-  sigaction (SIGVTALRM, &action, NULL);
-  sigaction (SIGALRM, &action, NULL);
-
-  /* The values needed for the itimer.  This needs to be at least long
-     enough for the setitimer() call to return.  */
-  memset (&itime, 0, sizeof (itime));
-  itime.it_value.tv_usec = 250 * 1000;
-
-  /* Loop for ever, constantly taking an interrupt.  */
-  while (1)
-    {
-      /* Set up a one-off timer.  A timer, rather than SIGSEGV, is
-	 used as after a timer handler finishes the interrupted code
-	 can safely resume.  */
-      setitimer (itimer, &itime, NULL);
-      /* Wait.  */
-      while (!done);
-      done = 0;
-    }
-}
diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp
deleted file mode 100644
index 81f8eed4533..00000000000
--- a/gdb/testsuite/gdb.base/sigstep.exp
+++ /dev/null
@@ -1,423 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-
-# The program sigstep.c creates a very simple backtrace containing one
-# signal handler and signal trampoline.  A flag is set and then the
-# handler returns.  This is repeated at infinitum.
-
-# This test runs the program up to the signal handler, and then
-# attempts to step/next out of the handler and back into main.
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping sigstep.exp because of nosignals."
-    continue
-}
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile sigstep
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${module}.c"
-    return -1
-}
-
-# get things started
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "display/i \$pc"
-
-# Advance to main
-if { ![runto_main] } then {
-    gdb_suppress_tests;
-}
-
-# Pass all the alarms straight through (but verbosely)
-# gdb_test "handle SIGALRM print pass nostop"
-# gdb_test "handle SIGVTALRM print pass nostop"
-# gdb_test "handle SIGPROF print pass nostop"
-
-# Run to the signal handler, validate the backtrace.
-gdb_test "break handler"
-gdb_test "continue" ".* handler .*" "continue to stepi handler"
-send_gdb "bt\n"
-gdb_expect_list "backtrace for nexti" ".*$gdb_prompt $" {
-    "\[\r\n\]+.0 \[^\r\n\]* handler "
-    "\[\r\n\]+.1  .signal handler called."
-    "\[\r\n\]+.2 \[^\r\n\]* main .*"
-}
-
-proc advance { i } {
-    global gdb_prompt
-    set prefix "$i from handler"
-
-    # Get us back into the handler
-    gdb_test "continue" ".* handler .*" "$prefix; continue to handler"
-
-    set test "$prefix; leave handler"
-    gdb_test_multiple "$i" "${test}" {
-	-re "done = 1;.*${gdb_prompt} $" {
-	    send_gdb "$i\n"
-	    exp_continue -continue_timer
-	}
-	-re "\} .. handler .*${gdb_prompt} $" {
-	    send_gdb "$i\n"
-	    exp_continue -continue_timer
-	}
-	-re "Program exited normally.*${gdb_prompt} $" {
-	    setup_kfail powerpc-*-*bsd* gdb/1639
-	    fail "$test (program exited)"
-	}
-	-re "(while ..done|done = 0).*${gdb_prompt} $" {
-	    # After stepping out of a function /r signal-handler, GDB will
-	    # advance the inferior until it is at the first instruction of
-	    # a code-line.  While typically things return to the middle of
-	    # the "while..." (and hence GDB advances the inferior to the
-	    # "return..." line) it is also possible for the return to land
-	    # on the first instruction of "while...".  Accept both cases.
-	    pass "$test"
-	}
-    }
-}
-
-proc advancei { i } {
-    global gdb_prompt
-    set prefix "$i from handleri"
-    set program_exited 0
-
-    # Get us back into the handler
-    gdb_test "continue" ".* handler .*" "$prefix; continue to handler"
-
-    set test "$prefix; leave handler"
-    gdb_test_multiple "$i" "${test}" {
-        -re "Cannot insert breakpoint 0.*${gdb_prompt} $" {
-            # Some platforms use a special read-only page for signal
-            # trampolines.  We can't set a breakpoint there, and we
-            # don't gracefully fall back to single-stepping.
-            setup_kfail "i?86-*-linux*" gdb/1736
-            fail "$test (could not set breakpoint)"
-	    return
-        }
-	-re "done = 1;.*${gdb_prompt} $" {
-	    send_gdb "$i\n"
-	    exp_continue -continue_timer
-	}
-	-re "\} .. handler .*${gdb_prompt} $" {
-	    send_gdb "$i\n"
-	    exp_continue -continue_timer
-	}
-	-re "signal handler called.*${gdb_prompt} $" {
-	    pass "$test"
-	}
-	-re "main .*${gdb_prompt} $" {
-	    fail "$test (in main)"
-	}
-	-re "Program exited normally.*${gdb_prompt} $" {
-	    fail "$test (program exited)"
-	    set program_exited 1
-	}
-	-re "Make handler return now.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue -continue_timer
-	}
-    }
-
-    set test "$prefix; leave signal trampoline"
-    gdb_test_multiple "$i" "${test}" {
-	-re "while .*${gdb_prompt} $" {
-	    pass "$test (in main)"
-	}
-	-re "signal handler called.*${gdb_prompt} $" {
-	    send_gdb "$i\n"
-	    exp_continue -continue_timer
-	}
-	-re "return .*${gdb_prompt} $" {
-	    fail "$test (stepped)"
-	}
-	-re "Make .*frame return now.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue -continue_timer
-	}
-	-re "Program exited normally.*${gdb_prompt} $" {
-	    kfail gdb/1639 "$test (program exited)"
-	    set program_exited 1
-	}
-	-re "The program is not being run.*${gdb_prompt} $" {
-	    if { $program_exited } {
-		# Previously kfailed with an exit
-		pass "$test (the program is not being run)"
-	    } else {
-		fail "$test (the program is not being run)"
-	    }
-	}
-    }
-}
-
-# Check that we can step/next our way out of a signal handler.
-
-advance step
-advancei stepi
-
-advance next
-advancei nexti
-
-advancei finish
-advancei return
-gdb_test "set done = 1" "" "Set done as return will have skipped it"
-
-
-# Check that we can step/next our way into / over a signal handler.
-
-# There are at least the following cases: breakpoint @pc VS breakpoint
-# in handler VS step / next / continue.
-
-# Use the real-time itimer, as otherwize the process never gets enough
-# time to expire the timer.
-
-delete_breakpoints
-set infinite_loop [gdb_get_line_number {while (!done)}]
-gdb_test "set itimer = itimer_real"
-gdb_test "break [gdb_get_line_number {done = 0}]"
-
-# Try stepping when there's a signal pending, and a breakpoint at the
-# handler.  Should step into the signal handler.
-
-proc skip_to_handler { i } {
-    global gdb_prompt
-    global infinite_loop
-    set prefix "$i to handler"
-    
-    # Run around to the done
-    # You can add more patterns to this if you need them.
-    set test "$prefix; resync"
-    gdb_test_multiple "continue" "$test" {
-	-re "done = 0.*$gdb_prompt " {
-	    pass "$test"
-	}
-    }
-    
-    # Advance to the infinite loop
-    gdb_test "advance $infinite_loop" "" "$prefix; advance to infinite loop"
-
-    # Make the signal pending
-    sleep 1
-    
-    # Insert / remove the handler breakpoint.
-    gdb_test "break handler" "" "$prefix; break handler"
-    gdb_test "$i" " handler .*" "$prefix; performing $i"
-    gdb_test "clear handler" "" "$prefix; clear handler"
-}
-
-skip_to_handler step
-skip_to_handler next
-skip_to_handler continue
-
-# Try stepping when there's a signal pending, and a breakpoint at the
-# handler's entry-point.  Should step into the signal handler stopping
-# at the entry-point.
-
-# Some systems (e.x., GNU/Linux as of 2004-08-30), when delivering a
-# signal, resume the process at the first instruction of the signal
-# handler and not the first instruction of the signal trampoline.  The
-# stack is constructed such that the signal handler still appears to
-# have been called by the trampoline code.  This test checks that it
-# is possible to stop the inferior, even at that first instruction.
-
-proc skip_to_handler_entry { i } {
-    global gdb_prompt
-    global infinite_loop
-    set prefix "$i to handler entry"
-    
-    # Run around to the done
-    # You can add more patterns to this if you need them.
-    set test "$prefix; resync"
-    gdb_test_multiple "continue" "$test" {
-	-re "done = 0.*$gdb_prompt " {
-	    pass "$test"
-	}
-    }
-    
-    # Advance to the infinite loop
-    gdb_test "advance $infinite_loop" "" "$prefix; advance to infinite loop"
-
-    # Make the signal pending
-    sleep 1
-    
-    # Insert / remove the handler breakpoint.
-    gdb_test "break *handler" "" "$prefix; break handler"
-    gdb_test "$i" " handler .*" "$prefix; performing $i"
-    gdb_test "clear *handler" "" "$prefix; clear handler"
-}
-
-skip_to_handler_entry step
-skip_to_handler_entry next
-skip_to_handler_entry continue
-
-# Try stepping when there's a signal pending but no breakpoints.
-# Should skip the handler advancing to the next line.
-
-proc skip_over_handler { i } {
-    global gdb_prompt
-    global infinite_loop
-    set prefix "$i over handler"
-    
-    # Run around to the done
-    # You can add more patterns to this if you need them.
-    set test "$prefix; resync"
-    gdb_test_multiple "continue" "$test" {
-	-re "done = 0.*$gdb_prompt " {
-	    pass "$test"
-	}
-    }
-    
-    # Advance to the infinite loop
-    gdb_test "advance $infinite_loop" "" "$prefix; advance to infinite loop"
-
-    # Make the signal pending
-    sleep 1
-    
-    gdb_test "$i" "done = 0.*" "$prefix; performing $i"
-}
-
-skip_over_handler step
-skip_over_handler next
-skip_over_handler continue
-
-# Try stepping when there's a signal pending, a pre-existing
-# breakpoint at the current instruction, and a breakpoint in the
-# handler.  Should advance to the signal handler.
-
-proc breakpoint_to_handler { i } {
-    global gdb_prompt
-    global infinite_loop
-    set prefix "$i on breakpoint, to handler"
-    
-    # Run around to the done
-    # You can add more patterns to this if you need them.
-    set test "$prefix; resync"
-    gdb_test_multiple "continue" "$test" {
-	-re "done = 0.*$gdb_prompt " {
-	    pass "$test"
-	}
-    }
-    
-    gdb_test "break $infinite_loop" "" "$prefix; break infinite loop"
-    gdb_test "break handler" "" "$prefix; break handler"
-
-    # Continue to the infinite loop
-    gdb_test "continue" "while ..done.*" "$prefix; continue to infinite loop"
-
-    # Make the signal pending
-    sleep 1
-    
-    setup_kfail "i*86-*-*" gdb/1738
-    gdb_test "$i" " handler .*" "$prefix; performing $i"
-    gdb_test "clear $infinite_loop" "" "$prefix; clear infinite loop"
-    gdb_test "clear handler" "" "$prefix; clear handler"
-}
-
-breakpoint_to_handler step
-breakpoint_to_handler next
-breakpoint_to_handler continue
-
-# Try stepping when there's a signal pending, and a breakpoint at the
-# handler's entry instruction and a breakpoint at the current
-# instruction.  Should step into the signal handler and breakpoint at
-# that entry instruction.
-
-# Some systems (e.x., GNU/Linux as of 2004-08-30), when delivering a
-# signal, resume the process at the first instruction of the signal
-# handler and not the first instruction of the signal trampoline.  The
-# stack is constructed such that the signal handler still appears to
-# have been called by the trampoline code.  This test checks that it
-# is possible to stop the inferior, even at that first instruction.
-
-proc breakpoint_to_handler_entry { i } {
-    global gdb_prompt
-    global infinite_loop
-    set prefix "$i on breakpoint, to handler entry"
-    
-    # Run around to the done
-    # You can add more patterns to this if you need them.
-    set test "$prefix; resync"
-    gdb_test_multiple "continue" "$test" {
-	-re "done = 0.*$gdb_prompt " {
-	    pass "$test"
-	}
-    }
-    
-    gdb_test "break $infinite_loop" "" "$prefix; break infinite loop"
-    gdb_test "break *handler" "" "$prefix; break handler"
-
-    # Continue to the infinite loop
-    gdb_test "continue" "while ..done.*" "$prefix; continue to infinite loop"
-
-    # Make the signal pending
-    sleep 1
-    
-    setup_kfail "i*86-*-*" gdb/1738
-    gdb_test "$i" " handler .*" "$prefix; performing $i"
-    gdb_test "clear $infinite_loop" "" "$prefix; clear infinite loop"
-    gdb_test "clear *handler" "" "$prefix; clear handler"
-}
-
-breakpoint_to_handler_entry step
-breakpoint_to_handler_entry next
-breakpoint_to_handler_entry continue
-
-# Try stepping when there's a signal pending, and a pre-existing
-# breakpoint at the current instruction, and no breakpoint in the
-# handler.  Should advance to the next line.
-
-proc breakpoint_over_handler { i } {
-    global gdb_prompt
-    global infinite_loop
-    set prefix "$i on breakpoint, skip handler"
-    
-    # Run around to the done
-    # You can add more patterns to this if you need them.
-    set test "$prefix; resync"
-    gdb_test_multiple "continue" "$test" {
-	-re "done = 0.*$gdb_prompt " {
-	    pass "$test"
-	}
-    }
-    
-    gdb_test "break $infinite_loop" "" "$prefix; break infinite loop"
-
-    # Continue to the infinite loop
-    gdb_test "continue" "while ..done.*" "$prefix; continue to infinite loop"
-
-    # Make the signal pending
-    sleep 1
-    
-    gdb_test "$i" "done = 0.*" "$prefix; performing $i"
-    gdb_test "clear $infinite_loop" "" "$prefix; clear infinite loop"
-}
-
-breakpoint_over_handler step
-breakpoint_over_handler next
-breakpoint_over_handler continue
diff --git a/gdb/testsuite/gdb.base/sizeof.c b/gdb/testsuite/gdb.base/sizeof.c
deleted file mode 100644
index c32231f8566..00000000000
--- a/gdb/testsuite/gdb.base/sizeof.c
+++ /dev/null
@@ -1,123 +0,0 @@
-#include <stdio.h>
-
-typedef char padding[16];
-
-struct {
-  padding p1;
-  char v;
-  padding p2;
-} padding_char;
-
-struct {
-  padding p1;
-  short v;
-  padding p2;
-} padding_short;
-
-struct {
-  padding p1;
-  int v;
-  padding p2;
-} padding_int;
-
-struct {
-  padding p1;
-  long v;
-  padding p2;
-} padding_long;
-
-struct {
-  padding p1;
-  long long v;
-  padding p2;
-} padding_long_long;
-
-struct {
-  padding p1;
-  float v;
-  padding p2;
-} padding_float;
-
-struct {
-  padding p1;
-  double v;
-  padding p2;
-} padding_double;
-
-struct {
-  padding p1;
-  long double v;
-  padding p2;
-} padding_long_double;
-
-static void
-fill (void *buf, long sizeof_buf)
-{
-  char *p = buf;
-  int i;
-  for (i = 0; i < sizeof_buf; i++)
-    p[i] = "The quick brown dingo jumped over the layzy dog."[i];
-}
-
-void
-fill_structs (void)
-{
-  fill (&padding_char.p1, sizeof (padding));
-  fill (&padding_char.v, sizeof (padding_char.v));
-  fill (&padding_char.p2, sizeof (padding));
-
-  fill (&padding_short.p1, sizeof (padding));
-  fill (&padding_short.v, sizeof (padding_short.v));
-  fill (&padding_short.p2, sizeof (padding));
-
-  fill (&padding_int.p1, sizeof (padding));
-  fill (&padding_int.v, sizeof (padding_int.v));
-  fill (&padding_int.p2, sizeof (padding));
-
-  fill (&padding_long.p1, sizeof (padding));
-  fill (&padding_long.v, sizeof (padding_long.v));
-  fill (&padding_long.p2, sizeof (padding));
-
-  fill (&padding_long_long.p1, sizeof (padding));
-  fill (&padding_long_long.v, sizeof (padding_long_long.v));
-  fill (&padding_long_long.p2, sizeof (padding));
-
-  fill (&padding_float.p1, sizeof (padding));
-  fill (&padding_float.v, sizeof (padding_float.v));
-  fill (&padding_float.p2, sizeof (padding));
-
-  fill (&padding_double.p1, sizeof (padding));
-  fill (&padding_double.v, sizeof (padding_double.v));
-  fill (&padding_double.p2, sizeof (padding));
-
-  fill (&padding_long_double.p1, sizeof (padding));
-  fill (&padding_long_double.v, sizeof (padding_long_double.v));
-  fill (&padding_long_double.p2, sizeof (padding));
-}
-
-int
-main ()
-{
-  fill_structs ();
-
-  printf ("sizeof (char) == %d\n", sizeof (char));
-  printf ("sizeof (short) == %d\n", sizeof (short));
-  printf ("sizeof (int) == %d\n", sizeof (int));
-  printf ("sizeof (long) == %d\n", sizeof (long));
-  printf ("sizeof (long long) == %d\n", sizeof (long long));
-
-  printf ("sizeof (void *) == %d\n", sizeof (void*));
-  printf ("sizeof (void (*)(void)) == %d\n", sizeof (void (*)(void)));
-
-  printf ("sizeof (float) == %d\n", sizeof (float));
-  printf ("sizeof (double) == %d\n", sizeof (double));
-  printf ("sizeof (long double) == %d\n", sizeof (long double));
-
-  /* Signed char?  */
-  printf ("valueof ('\\377') == %d\n", '\377');
-  printf ("valueof ((int) (char) -1) == %d\n", (int) (char) -1);
-  printf ("valueof ((int) (signed char) -1) == %d\n", (int) (signed char) -1);
-  printf ("valueof ((int) (unsigned char) -1) == %d\n", (int) (unsigned char) -1);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp
deleted file mode 100644
index b10ffbc13e8..00000000000
--- a/gdb/testsuite/gdb.base/sizeof.exp
+++ /dev/null
@@ -1,182 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2000, 2002, 2003, 2004 Free Software Foundation, 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.  
-
-if [target_info exists gdb,noinferiorio] {
-    verbose "Skipping fileio.exp because of no fileio capabilities."
-    continue
-}
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "sizeof"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-#
-# Query GDB for the size of various types
-#
-
-proc get_valueof { fmt exp default } {
-    global gdb_prompt
-
-    set test "get valueof \"${exp}\""
-    set val ${default}
-    gdb_test_multiple "print${fmt} ${exp}" "$test" {
-	-re "\\$\[0-9\]* = (\[-\]*\[0-9\]*).*$gdb_prompt $" {
-	    set val $expect_out(1,string)
-	    pass "$test ($val)"
-	}
-    }
-    return ${val}
-}
-
-proc get_sizeof { type default } {
-    return [get_valueof "/d" "sizeof (${type})" $default]
-}
-
-gdb_test "next"
-
-set sizeof_char [get_sizeof "char" 1]
-set sizeof_short [get_sizeof "short" 2]
-set sizeof_int [get_sizeof "int" 4]
-set sizeof_long [get_sizeof "long" 4]
-set sizeof_long_long [get_sizeof "long long" 8]
-
-set sizeof_data_ptr [get_sizeof "void *" 4]
-set sizeof_func_ptr [get_sizeof "void (*)(void)" 4]
-
-set sizeof_float [get_sizeof "float" 4]
-set sizeof_double [get_sizeof "double" 8]
-set sizeof_long_double [get_sizeof "long double" 8]
-
-#
-# Compare GDB's idea of types with the running program
-#
-
-proc check_sizeof { type size } {
-    global gdb_prompt
-
-    set pat [string_to_regexp "sizeof (${type}) == ${size}"]
-    gdb_test "next" "${pat}\[\r\n\]+\[0-9\].*"  "check sizeof \"$type\""
-}
-
-check_sizeof "char" ${sizeof_char}
-check_sizeof "short" ${sizeof_short}
-check_sizeof "int" ${sizeof_int}
-check_sizeof "long" ${sizeof_long}
-check_sizeof "long long" ${sizeof_long_long}
-
-check_sizeof "void *" ${sizeof_data_ptr}
-check_sizeof "void (*)(void)" ${sizeof_func_ptr}
-
-check_sizeof "float" ${sizeof_float}
-check_sizeof "double" ${sizeof_double}
-check_sizeof "long double" ${sizeof_long_double}
-
-proc check_valueof { exp val } {
-    global gdb_prompt
-
-    set pat [string_to_regexp "valueof (${exp}) == ${val}"]
-    gdb_test "next" "${pat}\[\r\n\]+\[0-9\].*" "check valueof \"$exp\""
-}
-
-# Check that GDB and the target agree over the sign of a character.
-
-set signof_byte [get_valueof "/d" "'\\377'" -1]
-set signof_char [get_valueof "/d" "(int) (char) -1" -1]
-set signof_signed_char [get_valueof "/d" "(int) (signed char) -1" -1]
-set signof_unsigned_char [get_valueof "/d" "(int) (unsigned char) -1" -1]
-
-check_valueof "'\\\\377'" ${signof_byte}
-check_valueof "(int) (char) -1" ${signof_char}
-check_valueof "(int) (signed char) -1" ${signof_signed_char}
-check_valueof "(int) (unsigned char) -1" ${signof_unsigned_char}
-
-proc check_padding { fmt type val } {
-    global gdb_prompt
-    gdb_test "set padding_${type}.v = ${val}"
-    gdb_test "print padding_${type}.p1" "= \"The quick brown \""
-    gdb_test "print${fmt} padding_${type}.v" "= ${val}"
-    gdb_test "print padding_${type}.p2" "\"The quick brown \".*"
-}
-
-# Check that GDB is managing to store a value in a struct field
-# without corrupting the fields immediately adjacent to it.
-
-check_padding "/d" "char" 1
-check_padding "/d" "short" 2
-check_padding "/d" "int" 4
-check_padding "/d" "long" 4
-check_padding "/d" "long_long" 8
-
-# use multiples of two which can be represented exactly
-check_padding "/f" "float" 1
-check_padding "/f" "double" 2
-check_padding "/f" "long_double" 4
-
-#
-# For reference, dump out the entire architecture
-#
-# The output is very long so use a while loop to consume it
-send_gdb "maint print arch\n"
-set ok 1
-while { $ok } {
-    gdb_expect {
-	-re ".*dump" {
-	    #pass "maint print arch $ok"
-	    #set ok [expr $ok + 1]
-	}
-	-re "$gdb_prompt $" {
-	    pass "maint print arch"
-	    set ok 0
-	}
-	timeout {
-	    fail "maint print arch (timeout)"
-	    set ok 0
-	}
-    }
-}
diff --git a/gdb/testsuite/gdb.base/so-impl-ld.c b/gdb/testsuite/gdb.base/so-impl-ld.c
deleted file mode 100644
index 9310bca1421..00000000000
--- a/gdb/testsuite/gdb.base/so-impl-ld.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* This program is linked against SOM shared libraries, which the loader
-   automatically loads along with the program itself).
-   */
-
-#include <stdio.h>
-
-#if defined(__cplusplus) || defined(__STDCPP__)
-extern "C" int  solib_main (int  arg);
-#else
-int  solib_main (int  arg);
-#endif
-
-int main ()
-{
-  int  result;
-
-  /* Call a shlib function. */
-  result = solib_main (100);
-
-  /* Call it again. */
-  result = solib_main (result);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp
deleted file mode 100644
index 7bf2e16145f..00000000000
--- a/gdb/testsuite/gdb.base/so-impl-ld.exp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1997, 1998, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, 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.
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if ![isnative] then {
-    return
-}
-
-set testfile "so-impl-ld"
-set libfile "solib1"
-set srcfile $srcdir/$subdir/$testfile.c
-set libsrc  $srcdir/$subdir/$libfile.c
-set binfile $objdir/$subdir/$testfile
-set lib_sl  $objdir/$subdir/$libfile.sl
-
-set lib_opts  debug
-set exec_opts [list debug shlib=$lib_sl]
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if [test_compiler_info "hpcc-*"] {
-    lappend exec_opts "additional_flags=-Ae"
-}
-
-if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
-     || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "Couldn't compile $libsrc or $srcfile."
-    return -1
-}
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# This program implicitly loads SOM shared libraries.
-#
-if ![runto_main] then { fail "implicit solibs tests suppressed" }
-
-# Verify that we can step over the first shlib call.
-#
-send_gdb "next\n"
-gdb_expect {
-  -re "21\[ \t\]*result = solib_main .result.*$gdb_prompt $"\
-          {pass "step over solib call"}
-  -re "$gdb_prompt $"\
-          {fail "step over solib call"}
-  timeout {fail "(timeout) step over solib call"}
-}
-
-# Verify that we can step into the second shlib call.
-#
-send_gdb "step\n"
-gdb_expect {
-  -re "solib_main .arg=10000. at.*${libfile}.c:17.*$gdb_prompt $"\
-          {pass "step into solib call"}
-  -re "$gdb_prompt $"\
-          {fail "step into solib call"}
-  timeout {fail "(timeout) step into solib call"}
-}
-
-# Verify that we can step within the shlib call.
-#
-send_gdb "next\n"
-gdb_expect {
-  -re "18\[ \t\]*\}.*$gdb_prompt $"\
-          {pass "step in solib call"}
-  -re "$gdb_prompt $"\
-          {fail "step in solib call"}
-  timeout {fail "(timeout) step in solib call"}
-}
-
-# Verify that we can step out of the shlib call, and back out into
-# the caller.
-#
-send_gdb "next\n"
-gdb_expect {
-    -re "0x\[0-9a-f\]*\[ \t\]*9\[ \t\]*.*$gdb_prompt $" {
-	# we haven't left the callee yet, so do another next
-	send_gdb "next\n"
-	gdb_expect {
-	    -re "main .. at.*so-impl-ld.c:22.*$gdb_prompt $"\
-		{pass "step out of solib call"}
-	    -re "$gdb_prompt $"\
-		{fail "step out of solib call"}
-	    timeout {fail "(timeout) step out of solib call"}
-	}
-    }
-
-    -re "main .. at.*so-impl-ld.c:22.*$gdb_prompt $"\
-	{pass "step out of solib call"}
-    -re "$gdb_prompt $"\
-	{fail "step out of solib call"}
-    timeout {fail "(timeout) step out of solib call"}
-}
-
-gdb_exit
-return 0
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.base/so-indr-cl.c b/gdb/testsuite/gdb.base/so-indr-cl.c
deleted file mode 100644
index f31800d04bf..00000000000
--- a/gdb/testsuite/gdb.base/so-indr-cl.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* This program is linked against SOM shared libraries, which the loader
-   automatically loads along with the program itself).
-   */
-
-#include <stdio.h>
-#ifdef PROTOTYPES
-extern "C" int solib_main (int);
-
-static int
-solib_wrapper (int (*function)(int))
-#else
-extern int solib_main (int);
-
-static int
-solib_wrapper (function)
-  int (*function)(int);
-#endif
-{
-  return (*function)(100);
-}
-
-
-int main ()
-{
-  int  result;
-
-  /* This is an indirect call to solib_main. */
-  result = solib_wrapper (solib_main);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/so-indr-cl.exp b/gdb/testsuite/gdb.base/so-indr-cl.exp
deleted file mode 100644
index 1232cebabe9..00000000000
--- a/gdb/testsuite/gdb.base/so-indr-cl.exp
+++ /dev/null
@@ -1,139 +0,0 @@
-#   Copyright 1997, 1998, 1999, 2000 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if ![isnative] then {
-    return
-}
-
-# This test is presently only valid on HP-UX, since it requires
-# that we use HP-UX-specific compiler & linker options to build
-# the testcase.
-#
-if {! [istarget "hppa*-*-*hpux*"] } {
-    return
-}
-
-set libfile "solib"
-set testfile "so-indr-cl"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-# Build the shared libraries this test case needs.
-#
-#cd ${subdir}
-#remote_exec build "$CC -g +z -c ${libfile}1.c -o ${libfile}1.o"
-
-
-if {$hp_cc_compiler || $hp_aCC_compiler} {
-    set additional_flags "additional_flags=+z"
-} else {
-    set additional_flags "additional_flags=-fpic"
-}
-if {[gdb_compile "${srcdir}/${subdir}/${libfile}1.c" "${objdir}/${subdir}/${libfile}1.o" object [list debug $additional_flags]] != ""} {
-    perror "Couldn't compile ${libfile}1.c"
-    return -1
-}
-
-if [istarget "hppa*-hp-hpux*"] then {
-    remote_exec build "ld -b ${objdir}/${subdir}/${libfile}1.o -o ${objdir}/${subdir}/${libfile}1.sl"
-} else {
-    set additional_flags "additional_flags=-shared"
-    gdb_compile "${objdir}/${subdir}/${libfile}1.o" "${objdir}/${subdir}/${libfile}1.sl" executable [list debug $additional_flags]
-}
-
-# Build the test case
-#remote_exec build "$CC -Aa -g ${srcfile} ${libfile}1.sl -o ${binfile}"
-
-
-if {$hp_cc_compiler} {
-    set additional_flags "additional_flags=-Ae"
-} else {
-    set additional_flags ""
-}
-if {[gdb_compile "${srcdir}/${subdir}/${srcfile} ${objdir}/${subdir}/${libfile}1.sl" "${binfile}" executable [list debug $additional_flags]] != ""} {
-    perror "Couldn't build ${binfile}"
-    return -1
-}
-
-#cd ..
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# This program implicitly loads SOM shared libraries.  We wish to test
-# whether a user can set breakpoints in a shlib before running the
-# program, where the program doesn't directly call the shlib, but
-# indirectly does via passing its address to another function.
-#
-# ??rehrauer: Currently, this doesn't work, but we do catch the case
-# and explicitly disallow it.  The reason it fails appears to be that
-#
-#  [1] gdb consults only the linker symbol table in this scenario, and
-#  [2] For a shlib function that is only indirectly called from the
-#      main a.out, there is in the linker symbol table a stub whose
-#      address is negative.  Possibly this is to be interpreted as
-#      an index into the DLT??
-#
-send_gdb "break solib_main\n"
-gdb_expect {
-  -re "Cannot break on solib_main without a running program.*$gdb_prompt $"\
-          {pass "break on indirect solib call before running"}
-  -re "Breakpoint.*deferred.*\\(\"solib_main\" was not found.*$gdb_prompt $"\
-	  {pass "break on indirect solib call before running 2"}
-  -re "$gdb_prompt $"\
-          {fail "break on indirect solib call before running"}
-  timeout {fail "(timeout) break on indirect solib call before running"}
-}
-
-# However, if we do run to the program's main, we then ought to be
-# able to set a breakpoint on the indirectly called function.  (Apparently,
-# once the inferior is running, gdb consults the debug info rather than
-# the linker symbol table, and is able to find the correct address.)
-#
-if ![runto_main] then { fail "indirect solib call tests suppressed" }
-
-# Verify that we can step over the first shlib call.
-#
-send_gdb "break solib_main\n"
-gdb_expect {
-  -re ".*\[Bb\]reakpoint \[0-9\]* at 0x\[0-9a-fA-F\]*: file.*${libfile}1.c.*$gdb_prompt $"\
-          {pass "break on indirect solib call after running"}
-  -re "$gdb_prompt $"\
-          {fail "break on indirect solib call after running"}
-  timeout {fail "(timeout) break on indirect solib call after running"}
-}
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/solib.c b/gdb/testsuite/gdb.base/solib.c
deleted file mode 100644
index 6fb9f5e11da..00000000000
--- a/gdb/testsuite/gdb.base/solib.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This program uses HP-UX-specific features to load and unload SOM
-   shared libraries that it wasn't linked against (i.e., libraries
-   that the loader doesn't automatically load along with the program
-   itself).
-   */
-
-#include <stdio.h>
-#include <dl.h>
-
-int main ()
-{
-  shl_t  solib_handle;
-  int  dummy;
-  int  status;
-  int  (*solib_main) (int);
-
-  /* Load a shlib, with immediate binding of all symbols.
-
-     Note that the pathname of the loaded shlib is assumed to be relative
-     to the testsuite directory (from whence the tested GDB is run), not
-     from dot/.
-   */
-  dummy = 1;  /* Put some code between shl_ calls... */
-  solib_handle = shl_load ("gdb.base/solib1.sl", BIND_IMMEDIATE, 0);
-
-  /* Find a function within the shlib, and call it. */
-  status = shl_findsym (&solib_handle,
-                        "solib_main",
-                        TYPE_PROCEDURE,
-                        (long *) &solib_main);
-  status = (*solib_main) (dummy);
-
-  /* Unload the shlib. */
-  status = shl_unload (solib_handle);
-
-  /* Load a different shlib, with deferred binding of all symbols. */
-  dummy = 2;
-  solib_handle = shl_load ("gdb.base/solib2.sl", BIND_DEFERRED, 0);
-
-  /* Find a function within the shlib, and call it. */
-  status = shl_findsym (&solib_handle,
-                        "solib_main",
-                        TYPE_PROCEDURE,
-                        (long *) &solib_main);
-  status = (*solib_main) (dummy);
-
-  /* Unload the shlib. */
-  status = shl_unload (solib_handle);
-
-  /* Reload the first shlib again, with deferred symbol binding this time. */
-  dummy = 3;
-  solib_handle = shl_load ("gdb.base/solib1.sl", BIND_IMMEDIATE, 0);
-
-  /* Unload it without trying to find any symbols in it. */
-  status = shl_unload (solib_handle);
-
-  /* All done. */
-  dummy = -1;
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/solib.exp b/gdb/testsuite/gdb.base/solib.exp
deleted file mode 100644
index 3ce0edb7185..00000000000
--- a/gdb/testsuite/gdb.base/solib.exp
+++ /dev/null
@@ -1,360 +0,0 @@
-#   Copyright 1997, 1998, 1999 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if ![isnative] then {
-    return
-}
-
-# This test is presently only valid on HP-UX.  It verifies GDB's
-# ability to catch loads and unloads of shared libraries.
-#
-
-#setup_xfail "*-*-*"
-#clear_xfail "hppa*-*-*hpux*"
-if {![istarget "hppa*-*-hpux*"]} {
-    return 0
-}
-
-set testfile "solib"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# build the first test case
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-# Build the shared libraries this test case needs.
-#
-#cd ${subdir}
-#remote_exec build "$CC -g +z -c ${testfile}1.c -o ${testfile}1.o"
-#remote_exec build "$CC -g +z -c ${testfile}2.c -o ${testfile}2.o"
-
-if {$gcc_compiled == 0} {
-    if [istarget "hppa*-hp-hpux*"] then {
-	set additional_flags "additional_flags=+z"
-    } else {
-	# don't know what the compiler is...
-	set additional_flags ""
-    }
-} else {
-    set additional_flags "additional_flags=-fpic"
-}
-
-if {[gdb_compile "${srcdir}/${subdir}/${testfile}1.c" "${binfile}1.o" object [list debug $additional_flags]] != ""} {
-    perror "Couldn't compile ${testfile}1.c"
-    #return -1
-}
-if {[gdb_compile "${srcdir}/${subdir}/${testfile}2.c" "${binfile}2.o" object [list debug, $additional_flags]] != ""} {
-    perror "Couldn't compile ${testfile}2.c"
-    #return -1
-}
-
-if [istarget "hppa*-*-hpux*"] {
-    remote_exec build "ld -b ${binfile}1.o -o ${binfile}1.sl"
-    remote_exec build "ld -b ${binfile}2.o -o ${binfile}2.sl"
-} else {
-    set additional_flags "additional_flags=-shared"
-    gdb_compile "${binfile}1.o" "${binfile}1.sl" executable [list debug $additional_flags]
-    gdb_compile "${binfile}2.o" "${binfile}2.sl" executable [list debug $additional_flags]
-}
-
-# Build a version where the main program is in a shared library.  For
-# testing an indirect call made in a shared library.
-
-if {[gdb_compile "${srcdir}/${subdir}/${testfile}.c" "${binfile}_sl.o" object [list debug $additional_flags]] != ""} {
-    perror "Couldn't compile ${testfile}.c for ${binfile}_sl.o"
-    #return -1
-}
-
-if { [istarget "hppa*-*-hpux*"] } {
-    remote_exec build "ld -b ${binfile}_sl.o -o ${binfile}_sl.sl"
-} else {
-    set additional_flags "additional_flags=-shared"
-    gdb_compile "${binfile}_sl.o" "${binfile}_sl.sl" executable [list debug $additional_flags]
-}
-
-if { [istarget "hppa*-*-hpux*"] } {
-    set additional_flags "-Wl,-u,main"
-    if { [gdb_compile "${binfile}_sl.sl" "${binfile}_sl" executable [list debug $additional_flags]] != "" } {
-        gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-} else {
-    # FIXME: need to fill this part in for non-HP build
-}
-
-#cd ..
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# This program manually loads and unloads SOM shared libraries, via calls
-# to shl_load and shl_unload.
-#
-if ![runto_main] then { fail "catch load/unload tests suppressed" }
-
-# Verify that we complain if the user tells us to catch something we
-# don't understand.
-#
-send_gdb "catch a_cold\n"
-gdb_expect {
-  -re "Unknown event kind specified for catch.*$gdb_prompt $"\
-          {pass "bogus catch kind is disallowed"}
-  -re "$gdb_prompt $"\
-          {fail "bogus catch kind is disallowed"}
-  timeout {fail "(timeout) bogus catch kind is disallowed"}
-}
-
-# Verify that we can set a generic catchpoint on shlib loads.  I.e., that
-# we can catch any shlib load, without specifying the name.
-#
-send_gdb "catch load\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .load <any library>.*$gdb_prompt $"\
-          {pass "set generic catch load"}
-  -re "$gdb_prompt $"\
-          {fail "set generic catch load"}
-  timeout {fail "(timeout) set generic catch load"}
-}
-
-send_gdb "continue\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\] .loaded gdb.base/solib1.sl.*$gdb_prompt $"\
-          {pass "caught generic solib load"}
-  -re "$gdb_prompt $"\
-          {fail "caught generic solib load"}
-  timeout {fail "(timeout) caught generic solib load"}
-}
-
-# Set a breakpoint on the line following the shl_load call, and
-# continue.
-#
-# ??rehrauer: It appears that we can't just say "finish" from here;
-# GDB is getting confused by the dld's presense on the stack.
-#
-send_gdb "break 27\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]* at.*$gdb_prompt $"\
-          {pass "set break after shl_load"}
-  -re "$gdb_prompt $"\
-          {fail "set break after shl_load"}
-  timeout {fail "(timeout) set break after shl_load"}
-}
-
-send_gdb "continue\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*, main .. at .*solib.c:27.*$gdb_prompt $"\
-          {pass "continue after generic catch load"}
-  -re "$gdb_prompt $"\
-          {fail "continue after generic catch load"}
-  timeout {fail "(timeout) continue after generic catch load"}
-}
-
-# Step over the call to shl_findsym.
-#
-# ??rehrauer: In theory, since the call to shl_load asked for
-# immediate binding of the shlib's symbols, and since the
-# shlib's symbols should have been auto-loaded, we ought to
-# be able to set a breakpoint on solib_main now.  However,
-# that seems not to be the case.  Dunno why for sure; perhaps
-# the breakpoint wants to be set on an import stub in the
-# main program for solib_main?  There wouldn't be one, in
-# this case...
-# 
-send_gdb "next\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "step over shl_findsym"}
-  timeout {fail "(timeout) step over shl_findsym"}
-}
-
-# Verify that we can catch an unload of any library.
-#
-send_gdb "catch unload\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .unload <any library>.*$gdb_prompt $"\
-          {pass "set generic catch unload"}
-  -re "$gdb_prompt $"\
-          {fail "set generic catch unload"}
-  timeout {fail "(timeout) set generic catch load"}
-}
-
-send_gdb "continue\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\] .unloaded gdb.base/solib1.sl.*$gdb_prompt $"\
-          {pass "caught generic solib unload"}
-  -re "$gdb_prompt $"\
-          {fail "caught generic solib unload"}
-  timeout {fail "(timeout) caught generic solib unload"}
-}
-
-# Verify that we can catch a load of a specific library.  (Delete
-# all the other catchpoints first, so that the generic catchpoints
-# we've previously set don't trigger.)
-#
-send_gdb "delete\n"
-gdb_expect {
-  -re "Delete all breakpoints.*y or n.*"\
-          {send_gdb "y\n"
-           gdb_expect {
-             -re "$gdb_prompt $"\
-                     {pass "delete all catchpoints"}
-             timeout {fail "(timeout) delete all catchpoints"}
-           }
-          }
-  -re "$gdb_prompt $"\
-          {fail "delete all catchpoints"}
-  timeout {fail "(timeout) delete all catchpoints"}
-}
-
-send_gdb "catch load gdb.base/solib2.sl\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .load gdb.base/solib2.sl.*$gdb_prompt $"\
-          {pass "set specific catch load"}
-  -re "$gdb_prompt $"\
-          {fail "set specific catch load"}
-  timeout {fail "(timeout) set specific catch load"}
-}
-
-send_gdb "continue\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\] .loaded gdb.base/solib2.sl.*$gdb_prompt $"\
-          {pass "caught specific solib load"}
-  -re "$gdb_prompt $"\
-          {fail "caught specific solib load"}
-  timeout {fail "(timeout) caught specific solib load"}
-}
-
-# Verify that we can catch an unload of a specific library.
-#
-send_gdb "catch unload gdb.base/solib2.sl\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .unload gdb.base/solib2.sl.*$gdb_prompt $"\
-          {pass "set specific catch unload"}
-  -re "$gdb_prompt $"\
-          {fail "set specific catch unload"}
-  timeout {fail "(timeout) set specific catch unload"}
-}
-
-send_gdb "continue\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\] .unloaded gdb.base/solib2.sl.*$gdb_prompt $"\
-          {pass "caught specific solib unload"}
-  -re "$gdb_prompt $"\
-          {fail "caught specific solib unload"}
-  timeout {fail "(timeout) caught specific solib unload"}
-}
-
-# Verify that we can set a catchpoint on a specific library that
-# happens not to be loaded by the program.  And, that this catchpoint
-# won't trigger inappropriately when other shlibs are loaded.
-#
-send_gdb "break 55\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]* at.*$gdb_prompt $"\
-          {pass "set break on shl_unload"}
-  -re "$gdb_prompt $"\
-          {fail "set break on shl_unload"}
-  timeout {fail "(timeout) set break on shl_unload"}
-}
-
-send_gdb "break 58\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]* at.*$gdb_prompt $"\
-          {pass "set break after shl_unload"}
-  -re "$gdb_prompt $"\
-          {fail "set break after shl_unload"}
-  timeout {fail "(timeout) set break after shl_unload"}
-}
-
-send_gdb "catch load foobar.sl\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .load foobar.sl.*$gdb_prompt $"\
-          {pass "set specific catch load for nonloaded shlib"}
-  -re "$gdb_prompt $"\
-          {fail "set specific catch load for nonloaded shlib"}
-  timeout {fail "(timeout) set specific catch load for nonloaded shlib"}
-}
-
-send_gdb "catch unload foobar.sl\n"
-gdb_expect {
-  -re "Catchpoint \[0-9\]* .unload foobar.sl.*$gdb_prompt $"\
-          {pass "set specific catch unload for nonloaded shlib"}
-  -re "$gdb_prompt $"\
-          {fail "set specific catch unload for nonloaded shlib"}
-  timeout {fail "(timeout) set specific catch unload for nonloaded shlib"}
-}
-
-send_gdb "continue\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "specific catch load doesn't trigger inappropriately"}
-  -re "$gdb_prompt $"\
-          {fail "specific catch load doesn't trigger inappropriately"}
-  timeout {fail "(timeout) specific catch load doesn't trigger inappropriately"}
-}
-
-send_gdb "continue\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]*.*$gdb_prompt $"\
-          {pass "specific catch unload doesn't trigger inappropriately"}
-  -re "$gdb_prompt $"\
-          {fail "specific catch unload doesn't trigger inappropriately"}
-  timeout {fail "(timeout) specific catch unload doesn't trigger inappropriately"}
-}
-
-# ??rehrauer: There ought to be testpoints here that verify that
-# load/unload catchpoints can use conditionals, can be temporary,
-# self-disabling, etc etc.
-#
-
-gdb_exit
-
-#
-# Test stepping into an indirect call in a shared library.
-#
-
-gdb_start
-gdb_load ${binfile}_sl
-gdb_test "break main" ".*deferred. at .main..*" "break on main"
-gdb_test "run" ".*Breakpoint.*main.*solib.c.*" "hit breakpoint at main"
-gdb_test "break 45" "Breakpoint.*solib.c, line 45.*" "break on indirect call"
-gdb_test "continue" "Continuing.*solib.c:45.*" \
-	"continue to break on indirect call"
-gdb_test "step" "solib_main.*solib1.c:17.*return arg.arg.*" \
-	"step into indirect call from a shared library"
-gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.base/solib1.c b/gdb/testsuite/gdb.base/solib1.c
deleted file mode 100644
index 2e517504505..00000000000
--- a/gdb/testsuite/gdb.base/solib1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This program is intended to be built as an HP-UX SOM shared
-   library, for use by the solib.exp testcase.  It simply returns
-   the square of its integer argument.
-   */
-#if defined(__cplusplus) || defined(__STDCPP__)
-extern "C" int
-solib_main (int arg)
-#else
-#ifdef PROTOTYPES
-int  solib_main (int arg)
-#else
-int  solib_main (arg)
-  int  arg;
-#endif
-#endif
-{
-  return arg*arg;
-}
diff --git a/gdb/testsuite/gdb.base/solib2.c b/gdb/testsuite/gdb.base/solib2.c
deleted file mode 100644
index 8c69d8b273e..00000000000
--- a/gdb/testsuite/gdb.base/solib2.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This program is intended to be built as an HP-UX SOM shared
-   library, for use by the solib.exp testcase.  It simply returns
-   the cube of its integer argument.
-   */
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef PROTOTYPES
-int  solib_main (int  arg)
-#else
-int  solib_main (arg)
-  int  arg;
-#endif
-{
-  return arg*arg*arg;
-}
-#ifdef __cplusplus
-}
-#endif
diff --git a/gdb/testsuite/gdb.base/source-error.gdb b/gdb/testsuite/gdb.base/source-error.gdb
deleted file mode 100644
index ce66c4d32a3..00000000000
--- a/gdb/testsuite/gdb.base/source-error.gdb
+++ /dev/null
@@ -1,23 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2005 Free Software Foundation, 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.  
-
-# Test GDB's "source" command - reads in a GDB script.
-
-echo working line\n
-x 0
-echo should not reach this line\n
diff --git a/gdb/testsuite/gdb.base/source.exp b/gdb/testsuite/gdb.base/source.exp
deleted file mode 100644
index a17b314dd53..00000000000
--- a/gdb/testsuite/gdb.base/source.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2005 Free Software Foundation, 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.  
-
-# Test GDB's "source" command - reads in a GDB script.
-
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "structs"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-gdb_start
-
-gdb_test "source ${srcdir}/${subdir}/source-error.gdb" \
-    "source-error.gdb:22: Error in sourced command file:\[\r\n\]*Cannot access memory at address 0x0.*" \
-    "script contains error"
-    
-gdb_exit
diff --git a/gdb/testsuite/gdb.base/ss.h b/gdb/testsuite/gdb.base/ss.h
deleted file mode 100644
index 2a4c162dcd6..00000000000
--- a/gdb/testsuite/gdb.base/ss.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct s {
-  int a;
-  int b;
-};
diff --git a/gdb/testsuite/gdb.base/start.c b/gdb/testsuite/gdb.base/start.c
deleted file mode 100644
index 110b7b4ca5c..00000000000
--- a/gdb/testsuite/gdb.base/start.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2005 Free Software Foundation, 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  */
-
-#include <stdio.h>
-
-int x;
-
-void bar()
-{
-  x--;
-}
-
-void foo()
-{
-  x++;
-}
-
-int main()
-{
-  foo();
-  bar();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/start.exp b/gdb/testsuite/gdb.base/start.exp
deleted file mode 100644
index 21b44062785..00000000000
--- a/gdb/testsuite/gdb.base/start.exp
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2005 Free Software Foundation, 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.  
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile start
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile test program"
-    return -1
-}
-
-# Get things started.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# For C programs, "start" should stop in main().
-
-gdb_test "start" \
-         "main \\(\\) at .*start.c.*" \
-         "start"
-
diff --git a/gdb/testsuite/gdb.base/step-line.c b/gdb/testsuite/gdb.base/step-line.c
deleted file mode 100644
index f961120ab1c..00000000000
--- a/gdb/testsuite/gdb.base/step-line.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Test step/next in presence of #line directives.
-   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.  */
-
-void dummy (int, int);
-int f1 (int);
-int f2 (int);
-
-int
-main (int argc, char **argv)
-{
-  int i;
-  i = f1 (4);
-  i = f1 (i);
-  dummy (0, i);
-  return 0;
-}
-
-int
-f1 (int i)
-{
-#line 40 "step-line.c"
-  dummy (1, i);
-#line 24 "step-line.inp"
-  i = f2 (i);
-#line 44 "step-line.c"
-  dummy (2, i);
-#line 25 "step-line.inp"
-  i = f2 (i);
-#line 48 "step-line.c"
-  dummy (3, i);
-#line 26 "step-line.inp"
-  return i;
-#line 52 "step-line.c"
-}
-
-int
-f2 (int i)
-{
-#line 31 "step-line.inp"
-  int j;
-#line 60 "step-line.c"
-  dummy (4, i);
-#line 32 "step-line.inp"
-  j = i;
-#line 64 "step-line.c"
-  dummy (5, i);
-  dummy (6, j);
-#line 33 "step-line.inp"
-  j = j + 1;
-#line 69 "step-line.c"
-  dummy (7, i);
-  dummy (8, j);
-#line 34 "step-line.inp"
-  j = j - i;
-#line 74 "step-line.c"
-  dummy (9, i);
-  dummy (10, j);
-#line 35 "step-line.inp"
-  return i;
-#line 79 "step-line.c"
-}
-
-void
-dummy (int num, int i)
-{
-}
diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp
deleted file mode 100644
index 9754fddcee0..00000000000
--- a/gdb/testsuite/gdb.base/step-line.exp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2001, 2003 Free Software Foundation, 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
-# use this to debug:
-#
-#log_user 1
-
-# step-line.exp -- Expect script to test stepping in files with
-# #line directives.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile step-line
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-remote_exec build "rm -f ${binfile}"
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-   fail "Can't run to main"
-   return 0
-}
-
-gdb_test "break f1" ".*Breakpoint 2 at .* file step-line.c.*" "break f1"
-gdb_test "continue" \
-         "Continuing.*Breakpoint 2, f1 \\(i=4\\).*dummy \\(1, i\\);" \
-	 "continue to f1"
-gdb_test "next" \
-         ".*i = f2 \\(i\\);.*" \
-	 "next over dummy 1"
-gdb_test "next" \
-         ".*dummy \\(2, i\\);.*" \
-	 "next to dummy 2"
-gdb_test "next" \
-         ".*i = f2 \\(i\\);.*" \
-	 "next over dummy 2"
-gdb_test "step" \
-         ".*f2 \\(i=4\\).*dummy \\(4, i\\);.*" \
-	 "step into f2"
-gdb_test "next" \
-         ".*j = i;.*" \
-	 "next over dummy 4"
-gdb_test "next" \
-         ".*dummy \\(5, i\\);.*" \
-	 "next to dummy 5"
-gdb_test "next" \
-         ".*dummy \\(6, j\\);.*" \
-	 "next to dummy 6"
-gdb_test "next" \
-         ".*j = SUCC \\(j\\);.*" \
-	 "next over dummy 6"
-gdb_test "next" \
-         ".*dummy \\(7, i\\);.*" \
-	 "next to dummy 7"
-gdb_test "next" \
-         ".*dummy \\(8, j\\);.*" \
-	 "next to dummy 8"
-gdb_test "next" \
-         ".*j = j - i;.*" \
-	 "next over dummy 8"
-gdb_test "next" \
-         ".*dummy \\(9, i\\);.*" \
-	 "next to dummy 9"
-gdb_test "next" \
-         ".*dummy \\(10, j\\);.*" \
-	 "next to dummy 10"
-gdb_test "next" \
-         ".*RETURN \\(j\\);.*" \
-	 "next over dummy 10"
-return 0
diff --git a/gdb/testsuite/gdb.base/step-line.inp b/gdb/testsuite/gdb.base/step-line.inp
deleted file mode 100644
index f4060a94152..00000000000
--- a/gdb/testsuite/gdb.base/step-line.inp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Test step/next in presence of #line directives
-# Copyright 2001
-# Free Software Foundation, 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.  */
-
-# We pretend that this file has been transformed by some other tool
-# into step-line.c.
-
-FUNCTION f1 (i : INTEGER);
-  BEGIN
-    i = f2 (i);
-    i = f2 (i);
-    RETURN (i);
-  END
-
-FUNCTION f2 (i : INTEGER);
-  BEGIN
-    VARIABLE j : INTEGER
-    j = i;
-    j = SUCC (j);
-    j = j - i;
-    RETURN (j);
-  END
-
-BEGIN
-  VARIABLE i : INTEGER;;
-
-END
diff --git a/gdb/testsuite/gdb.base/step-test.c b/gdb/testsuite/gdb.base/step-test.c
deleted file mode 100644
index a1e1dc408cf..00000000000
--- a/gdb/testsuite/gdb.base/step-test.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-/* Test various kinds of stepping.
-*/
-int myglob = 0;
-
-int callee() {
-    myglob++; return 0;
-}
-
-/* A structure which, we hope, will need to be passed using memcpy.  */
-struct rhomboidal {
-  int rather_large[100];
-};
-
-void
-large_struct_by_value (struct rhomboidal r)
-{
-  myglob += r.rather_large[42]; /* step-test.exp: arrive here 1 */
-}
-
-int main () {
-   int w,x,y,z;
-   int a[10], b[10];
-
-   /* Test "next" and "step" */
-   w = 0;
-   x = 1;
-   y = 2;
-   z = 3;
-   w = w + 2;
-   x = x + 3;
-   y = y + 4;
-   z = z + 5;
-
-   /* Test that "next" goes over a call */
-   callee(); /* OVER */
-
-   /* Test that "step" doesn't */
-   callee(); /* INTO */
-
-   /* Test "stepi" */
-   a[5] = a[3] - a[4];
-   callee(); /* STEPI */
-   
-   /* Test "nexti" */
-   callee(); /* NEXTI */
-
-   y = w + z;
-
-   {
-     struct rhomboidal r;
-     memset (r.rather_large, 0, sizeof (r.rather_large));
-     r.rather_large[42] = 10;
-     large_struct_by_value (r);  /* step-test.exp: large struct by value */
-   }
-
-   exit (0);
-}
-
diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp
deleted file mode 100644
index 1878298a6d3..00000000000
--- a/gdb/testsuite/gdb.base/step-test.exp
+++ /dev/null
@@ -1,214 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1997, 1998, 1999, 2000, 2002, 2001, 2003, 2004 Free
-# Software Foundation, 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.  */
-# step-test.exp -- Expect script to test stepping in gdb
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile step-test
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-remote_exec build "rm -f ${binfile}"
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-   fail "Can't run to main"
-   return 0
-}
-
-# Set a breakpoint at line 45, if stepi then finish fails, we would
-# run to the end of the program, which would mess up the rest of the tests.
-  
-# Vanilla step/next
-#
-gdb_test "next" ".*${decimal}.*x = 1;.*" "next 1"
-gdb_test "step" ".*${decimal}.*y = 2;.*" "step 1"
-
-# With count
-#
-gdb_test "next 2" ".*${decimal}.*w = w.*2;.*" "next 2"
-gdb_test "step 3" ".*${decimal}.*z = z.*5;.*" "step 3"
-gdb_test "next" ".*${decimal}.*callee.*OVER.*" "next 3"
-
-# Step over call
-#
-gdb_test "next" ".*${decimal}.*callee.*INTO.*" "next over"
-
-# Step into call
-#
-gdb_test "step" ".*${decimal}.*myglob.*"   "step into"
-
-# Step out of call
-#
-# I wonder if this is really portable.  Are there any caller-saves
-# platforms, on which `finish' will return you to some kind of pop
-# instruction, which is attributed to the line containing the function
-# call?
-
-# On PA64, we end up at a different instruction than PA32.
-# On IA-64, we also end up on callee instead of on the next line due
-# to the restoration of the global pointer (which is a caller-save).
-# Similarly on MIPS PIC targets.
-set test "step out"
-if { [istarget "hppa2.0w-hp-hpux*"] || [istarget "ia64-*-*"] || [istarget "mips*-*-*"]} {
-    gdb_test_multiple "finish" "$test" {
-        -re ".*${decimal}.*a.*5.*= a.*3.*$gdb_prompt $" {
-	    pass "$test"
-	}
-        -re ".*${decimal}.*callee.*INTO.*$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-} else {
-    gdb_test "finish" ".*${decimal}.*a.*5.*= a.*3.*" "step out"
-}
-
-### Testing nexti and stepi.
-###
-### test_i NAME COMMAND HERE THERE
-###
-### Send COMMAND to gdb over and over, while the output matches the
-### regexp HERE, followed by the gdb prompt.  Pass if the output
-### eventually matches the regexp THERE, followed by the gdb prompt;
-### fail if we have to iterate more than a hundred times, we time out
-### talking to gdb, or we get output which is neither HERE nor THERE.  :)
-###
-### Use NAME as the name of the test.
-###
-### The exact regexps used are "$HERE.*$gdb_prompt $"
-###                        and "$THERE.*$gdb_prompt $"
-### 
-proc test_i {name command here there} {
-    global gdb_prompt
-    
-    set i 0
-    gdb_test_multiple "$command" "$name" {
-	-re "$here.*$gdb_prompt $" {
-	    # Have we gone for too many steps without seeing any progress?
-	    if {[incr i] >= 100} {
-		fail "$name (no progress after 100 steps)"
-		return
-	    }
-	    send_gdb "$command\n"
-	    exp_continue
-	}
-	-re "$there.*$gdb_prompt $" {
-	    # We've reached the next line.  Rah.
-	    pass "$name"
-	    return
-	}
-    }
-}
-
-test_i "stepi to next line" "stepi" \
-       ".*${decimal}.*a.*5.* = a.*3" \
-       ".*${decimal}.*callee.*STEPI"
-test_i "stepi into function" "stepi" \
-       ".*${decimal}.*callee.*STEPI" \
-       ".*callee \\(\\) at .*step-test\\.c" 
-
-# Continue to step until we reach the function's body.  This makes it
-# more likely that we've actually completed the prologue, so "finish"
-# will work.
-test_i "stepi into function's first source line" "stepi" \
-	".*${decimal}.*int callee" \
-	".*${decimal}.*myglob.*; return 0;"
-
-# Have to be careful here, if the finish does not work, 
-# then we may run to the end of the program, which
-# will cause erroneous failures in the rest of the tests
-set test "stepi: finish call"
-gdb_test_multiple "finish" "$test" {
-    -re ".*${decimal}.*callee.*NEXTI.*$gdb_prompt $" {
-	pass "$test"
-    }
-    -re ".*(Program received|Program exited).*$gdb_prompt $" {
-	# Oops... We ran to the end of the program...  Better reset     
-	if {![runto_main]} then {
-	    fail "$test (Can't run to main)"
-	    return 0
-	}
-	if {![runto step-test.c:45]} {
-	    fail "$test (Can't run to line 45)"
-	    return 0
-	}
-	fail "$test"
-    }
-    -re ".*${decimal}.*callee.*STEPI.*$gdb_prompt $" {
-	# On PA64, we end up at a different instruction than PA32.
-	# On IA-64, we end up on callee instead of on the following line due
-	# to the restoration of the global pointer.
-	# Similarly on MIPS PIC targets.
-	if { [istarget "hppa2.0w-hp-hpux*"] || [istarget "ia64-*-*"] || [istarget "mips*-*-*"] } {
-	    test_i "$test" "stepi" \
-		".*${decimal}.*callee.*STEPI"  ".*${decimal}.*callee.*NEXTI"
-	} else {
-	    fail "$test"
-	}
-    }
-}
-
-test_i "nexti over function" "nexti" \
-       ".*${decimal}.*callee.*NEXTI" \
-       ".*${decimal}.*y = w \\+ z;"
-
-# On some platforms, if we try to step into a function call that
-# passes a large structure by value, then we actually end up stepping
-# into memcpy, bcopy, or some such --- GCC emits the call to pass the
-# argument.  Opinion is bitterly divided about whether this is the
-# right behavior for GDB or not, but we'll catch it here, so folks
-# won't forget about it.
-# Update 4/4/2002 - Regardless of which opinion you have, you would
-# probably have to agree that gdb is currently behaving as designed,
-# in the absence of additional code to not stop in functions used
-# internally by the compiler.  Since the testsuite should be checking
-# for conformance to the design, the correct behavior is to accept the
-# cases where gdb stops in memcpy/bcopy.
-
-gdb_test \
-  "break [gdb_get_line_number "step-test.exp: large struct by value"]" \
-  ".*Breakpoint.* at .*" \
-  "set breakpoint at call to large_struct_by_value"
-gdb_test "continue" \
-         ".*Breakpoint ${decimal},.*large_struct_by_value.*" \
-	 "run to pass large struct"
-set test "large struct by value"
-gdb_test_multiple "step" "$test" {
-    -re ".*step-test.exp: arrive here 1.*$gdb_prompt $" {
-	pass "$test"
-    }
-    -re ".*(memcpy|bcopy).*$gdb_prompt $" {
-	send_gdb "finish\n" ; gdb_expect -re "$gdb_prompt $"
-	send_gdb "step\n"
-	exp_continue
-    }
-}
-
-gdb_continue_to_end "step-test.exp"
-
-return 0
diff --git a/gdb/testsuite/gdb.base/store.c b/gdb/testsuite/gdb.base/store.c
deleted file mode 100644
index 545515dfc10..00000000000
--- a/gdb/testsuite/gdb.base/store.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/* Check that GDB can correctly update a value, living in a register,
-   in the target.  This pretty much relies on the compiler taking heed
-   of requests for values to be stored in registers.  */
-
-/* NOTE: carlton/2002-12-05: These functions were all static, but for
-   whatever reason that caused GCC 3.1 to optimize away some of the
-   function calls within main even when no optimization flags were
-   passed.  */
-
-typedef signed char charest;
-
-charest
-add_charest (register charest u, register charest v)
-{
-  return u + v;
-}
-
-short
-add_short (register short u, register short v)
-{
-  return u + v;
-}
-
-int
-add_int (register int u, register int v)
-{
-  return u + v;
-}
-
-long
-add_long (register long u, register long v)
-{
-  return u + v;
-}
-
-typedef long long longest;
-
-longest
-add_longest (register longest u, register longest v)
-{
-  return u + v;
-}
-
-float
-add_float (register float u, register float v)
-{
-  return u + v;
-}
-
-double
-add_double (register double u, register double v)
-{
-  return u + v;
-}
-
-typedef long double doublest;
-
-doublest
-add_doublest (register doublest u, register doublest v)
-{
-  return u + v;
-}
-
-/* */
-
-charest
-wack_charest (register charest u, register charest v)
-{
-  register charest l = u, r = v;
-  l = add_charest (l, r);
-  return l + r;
-}
-
-short
-wack_short (register short u, register short v)
-{
-  register short l = u, r = v;
-  l = add_short (l, r);
-  return l + r;
-}
-
-int
-wack_int (register int u, register int v)
-{
-  register int l = u, r = v;
-  l = add_int (l, r);
-  return l + r;
-}
-
-long
-wack_long (register long u, register long v)
-{
-  register long l = u, r = v;
-  l = add_long (l, r);
-  return l + r;
-}
-
-long
-wack_longest (register longest u, register longest v)
-{
-  register longest l = u, r = v;
-  l = add_longest (l, r);
-  return l + r;
-}
-
-float
-wack_float (register float u, register float v)
-{
-  register float l = u, r = v;
-  l = add_float (l, r);
-  return l + r;
-}
-
-double
-wack_double (register double u, register double v)
-{
-  register double l = u, r = v;
-  l = add_double (l, r);
-  return l + r;
-}
-
-doublest
-wack_doublest (register doublest u, register doublest v)
-{
-  register doublest l = u, r = v;
-  l = add_doublest (l, r);
-  return l + r;
-}
-
-/* */
-
-struct s_1 { short s[1]; } z_1, s_1;
-struct s_2 { short s[2]; } z_2, s_2;
-struct s_3 { short s[3]; } z_3, s_3;
-struct s_4 { short s[4]; } z_4, s_4;
-
-struct s_1
-add_struct_1 (struct s_1 s)
-{
-  int i;
-  for (i = 0; i < sizeof (s) / sizeof (s.s[0]); i++)
-    {
-      s.s[i] = s.s[i] + s.s[i];
-    }
-  return s;
-}
-
-struct s_2
-add_struct_2 (struct s_2 s)
-{
-  int i;
-  for (i = 0; i < sizeof (s) / sizeof (s.s[0]); i++)
-    {
-      s.s[i] = s.s[i] + s.s[i];
-    }
-  return s;
-}
-
-struct s_3
-add_struct_3 (struct s_3 s)
-{
-  int i;
-  for (i = 0; i < sizeof (s) / sizeof (s.s[0]); i++)
-    {
-      s.s[i] = s.s[i] + s.s[i];
-    }
-  return s;
-}
-
-struct s_4
-add_struct_4 (struct s_4 s)
-{
-  int i;
-  for (i = 0; i < sizeof (s) / sizeof (s.s[0]); i++)
-    {
-      s.s[i] = s.s[i] + s.s[i];
-    }
-  return s;
-}
-
-struct s_1
-wack_struct_1 (void)
-{
-  int i; register struct s_1 u = z_1;
-  for (i = 0; i < sizeof (s_1) / sizeof (s_1.s[0]); i++) { s_1.s[i] = i + 1; }
-  u = add_struct_1 (u);
-  return u;
-}
-
-struct s_2
-wack_struct_2 (void)
-{
-  int i; register struct s_2 u = z_2;
-  for (i = 0; i < sizeof (s_2) / sizeof (s_2.s[0]); i++) { s_2.s[i] = i + 1; }
-  u = add_struct_2 (u);
-  return u;
-}
-
-struct s_3
-wack_struct_3 (void)
-{
-  int i; register struct s_3 u = z_3;
-  for (i = 0; i < sizeof (s_3) / sizeof (s_3.s[0]); i++) { s_3.s[i] = i + 1; }
-  u = add_struct_3 (u);
-  return u;
-}
-
-struct s_4
-wack_struct_4 (void)
-{
-  int i; register struct s_4 u = z_4;
-  for (i = 0; i < sizeof (s_4) / sizeof (s_4.s[0]); i++) { s_4.s[i] = i + 1; }
-  u = add_struct_4 (u);
-  return u;
-}
-
-/* */
-
-struct f_1 {unsigned i:1;unsigned j:1;unsigned k:1; } f_1 = {1,1,1}, F_1;
-struct f_2 {unsigned i:2;unsigned j:2;unsigned k:2; } f_2 = {1,1,1}, F_2;
-struct f_3 {unsigned i:3;unsigned j:3;unsigned k:3; } f_3 = {1,1,1}, F_3;
-struct f_4 {unsigned i:4;unsigned j:4;unsigned k:4; } f_4 = {1,1,1}, F_4;
-
-struct f_1
-wack_field_1 (void)
-{
-  register struct f_1 u = f_1;
-  return u;
-}
-
-struct f_2
-wack_field_2 (void)
-{
-  register struct f_2 u = f_2;
-  return u;
-}
-
-struct f_3
-wack_field_3 (void)
-{
-  register struct f_3 u = f_3;
-  return u;
-}
-
-struct f_4
-wack_field_4 (void)
-{
-  register struct f_4 u = f_4;
-  return u;
-}
-
-/* */
-
-int
-main ()
-{
-  /* These calls are for current frame test.  */
-  wack_charest (-1, -2);
-  wack_short (-1, -2);
-  wack_int (-1, -2);
-  wack_long (-1, -2);
-  wack_longest (-1, -2);
-  wack_float (-1, -2);
-  wack_double (-1, -2);
-  wack_doublest (-1, -2);
-
-  /* These calls are for up frame.  */
-  wack_charest (-1, -2);
-  wack_short (-1, -2);
-  wack_int (-1, -2);
-  wack_long (-1, -2);
-  wack_longest (-1, -2);
-  wack_float (-1, -2);
-  wack_double (-1, -2);
-  wack_doublest (-1, -2);
-
-  /* These calls are for current frame test.  */
-  wack_struct_1 ();
-  wack_struct_2 ();
-  wack_struct_3 ();
-  wack_struct_4 ();
-  
-  /* These calls are for up frame.  */
-  wack_struct_1 ();
-  wack_struct_2 ();
-  wack_struct_3 ();
-  wack_struct_4 ();
-  
-  wack_field_1 ();
-  wack_field_2 ();
-  wack_field_3 ();
-  wack_field_4 ();
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp
deleted file mode 100644
index 7b92eca3bf7..00000000000
--- a/gdb/testsuite/gdb.base/store.exp
+++ /dev/null
@@ -1,202 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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.  
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "store"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-#
-
-proc check_set { t l r new add } {
-    set prefix "var ${t} l"
-    gdb_test "tbreak wack_${t}"
-    gdb_test "continue" "register ${t} l = u, r = v;" \
-	"continue to wack_${t}"
-    gdb_test "next" "l = add_${t} .l, r.;" \
-	"${prefix}; next ${t}"
-    gdb_test "print l" " = ${l}" \
-	"${prefix}; print old l, expecting ${l}"
-    gdb_test "print r" " = ${r}" \
-	"${prefix}; print old r, expecting ${r}"
-    gdb_test "set variable l = 4" "" \
-	"${prefix}; setting l to 4"
-    gdb_test "print l" " = ${new}" \
-	"${prefix}; print new l, expecting ${l}"
-    gdb_test "next" "return l \\+ r;" \
-	"${prefix}; next over add call"
-    gdb_test "print l" " = ${add}" \
-	"${prefix}; print incremented l, expecting ${add}"
-}
-
-check_set "charest" "-1 .*" "-2 .*" "4 ..004." "2 ..002."
-check_set "short" "-1" "-2" "4" "2"
-check_set "int" "-1" "-2" "4" "2"
-check_set "long" "-1" "-2" "4" "2"
-check_set "longest" "-1" "-2" "4" "2"
-check_set "float" "-1" "-2" "4" "2"
-check_set "double" "-1" "-2" "4" "2"
-check_set "doublest" "-1" "-2" "4" "2"
-
-#
-
-proc up_set { t l r new } {
-    set prefix "upvar ${t} l"
-    gdb_test "tbreak add_${t}"
-    gdb_test "continue" "return u . v;" \
-	"continue to add_${t}"
-    gdb_test "up" "l = add_${t} .l, r.;" \
-	"${prefix}; up"
-    gdb_test "print l" " = ${l}" \
-	"${prefix}; print old l, expecting ${l}"
-    gdb_test "print r" " = ${r}" \
-	"${prefix}; print old r, expecting ${r}"
-    gdb_test "set variable l = 4" "" \
-	"${prefix}; set l to 4"
-    gdb_test "print l" " = ${new}" \
-	"${prefix}; print new l, expecting ${new}"
-}
-
-up_set "charest" "-1 .*" "-2 .*" "4 ..004."
-up_set "short" "-1" "-2" "4"
-up_set "int" "-1" "-2" "4"
-up_set "long" "-1" "-2" "4"
-up_set "longest" "-1" "-2" "4"
-up_set "float" "-1" "-2" "4"
-up_set "double" "-1" "-2" "4"
-up_set "doublest" "-1" "-2" "4"
-
-#
-
-proc check_struct { t old new } {
-    set prefix "var struct ${t} u"
-    gdb_test "tbreak wack_struct_${t}"
-    gdb_test "continue" "int i; register struct s_${t} u = z_${t};" \
-	"continue to wack_struct_${t}"
-    gdb_test "next 2" "add_struct_${t} .u.;" \
-	"${prefix}; next to add_struct_${t} call"
-    gdb_test "print u" " = ${old}" \
-	"${prefix}; print old u, expecting ${old}"
-    gdb_test "set variable u = s_${t}" "" \
-	"${prefix}; set u to s_${t}"
-    gdb_test "print u" " = ${new}" \
-	"${prefix}; print new u, expecting ${new}"
-}
-
-check_struct "1" "{s = \\{0}}" "{s = \\{1}}"
-check_struct "2" "{s = \\{0, 0}}" "{s = \\{1, 2}}"
-check_struct "3" "{s = \\{0, 0, 0}}" "{s = \\{1, 2, 3}}"
-check_struct "4" "{s = \\{0, 0, 0, 0}}" "{s = \\{1, 2, 3, 4}}"
-
-proc up_struct { t old new } {
-    set prefix "up struct ${t} u"
-    gdb_test "tbreak add_struct_${t}"
-    gdb_test "continue" "for .i = 0; i < sizeof .s. / sizeof .s.s.0..; i..." \
-	"continue to add_struct_${t}"
-    gdb_test "up" "u = add_struct_${t} .u.;" \
-	"${prefix}; up"
-    gdb_test "print u" " = ${old}" \
-	"${prefix}; print old u, expecting ${old}"
-    gdb_test "set variable u = s_${t}" "" \
-	"${prefix}; set u to s_${t}"
-    gdb_test "print u" " = ${new}" \
-	"${prefix}; print new u, expecting ${new}"
-}
-
-up_struct "1" "{s = \\{0}}" "{s = \\{1}}"
-up_struct "2" "{s = \\{0, 0}}" "{s = \\{1, 2}}"
-up_struct "3" "{s = \\{0, 0, 0}}" "{s = \\{1, 2, 3}}"
-up_struct "4" "{s = \\{0, 0, 0, 0}}" "{s = \\{1, 2, 3, 4}}"
-
-#
-
-proc check_field { t } {
-    global gdb_prompt
-    gdb_test "tbreak wack_field_${t}"
-    gdb_test "continue" "register struct f_${t} u = f_${t};" \
-	    "continue field ${t}"
-
-    # Match either the return statement, or the line immediatly after
-    # it.  The compiler can end up merging the return statement into
-    # the return instruction.
-    gdb_test "next" "(return u;|\})" "next field ${t}"
-
-    gdb_test "print u" " = {i = 1, j = 1, k = 1}" "old field ${t}"
-    gdb_test "set variable u = F_${t}"
-    gdb_test "print u" " = {i = 0, j = 0, k = 0}" "new field ${t}"
-
-    gdb_test "set variable u = F_${t}, u.i = f_${t}.i"
-    gdb_test "print u" " = {i = 1, j = 0, k = 0}" "f_${t}.i"
-
-    gdb_test "set variable u = F_${t}, u.j = f_${t}.j"
-    gdb_test "print u" " = {i = 0, j = 1, k = 0}" "f_${t}.j"
-
-    gdb_test "set variable u = F_${t}, u.k = f_${t}.k"
-    gdb_test "print u" " = {i = 0, j = 0, k = 1}" "f_${t}.k"
-
-    gdb_test "set variable u = f_${t}, u.i = F_${t}.i"
-    gdb_test "print u" " = {i = 0, j = 1, k = 1}" "F_${t}.i"
-
-    gdb_test "set variable u = f_${t}, u.j = F_${t}.j"
-    gdb_test "print u" " = {i = 1, j = 0, k = 1}" "F_${t}.j"
-
-    gdb_test "set variable u = f_${t}, u.k = F_${t}.k"
-    gdb_test "print u" " = {i = 1, j = 1, k = 0}" "F_${t}.k"
-
-}
-
-check_field 1
-check_field 2
-check_field 3
-check_field 4
-
-#
-
-# WANTED: A fairly portable way of convincing the compiler to split a
-# value across memory and registers.
-
diff --git a/gdb/testsuite/gdb.base/structs.c b/gdb/testsuite/gdb.base/structs.c
deleted file mode 100644
index f7124dace9f..00000000000
--- a/gdb/testsuite/gdb.base/structs.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1996, 1999, 2003 Free Software Foundation, 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  */
-
-/* Useful abreviations.  */
-typedef void t;
-typedef char tc;
-typedef short ts;
-typedef int ti;
-typedef long tl;
-typedef long long tll;
-typedef float tf;
-typedef double td;
-typedef long double tld;
-
-/* Force the type of each field.  */
-#ifndef tA
-typedef t tA;
-#endif
-#ifndef tB
-typedef tA tB;
-#endif
-#ifndef tC
-typedef tB tC;
-#endif
-#ifndef tD
-typedef tC tD;
-#endif
-#ifndef tE
-typedef tD tE;
-#endif
-#ifndef tF
-typedef tE tF;
-#endif
-#ifndef tG
-typedef tF tG;
-#endif
-#ifndef tH
-typedef tG tH;
-#endif
-#ifndef tI
-typedef tH tI;
-#endif
-#ifndef tJ
-typedef tI tJ;
-#endif
-#ifndef tK
-typedef tJ tK;
-#endif
-#ifndef tL
-typedef tK tL;
-#endif
-#ifndef tM
-typedef tL tM;
-#endif
-#ifndef tN
-typedef tM tN;
-#endif
-#ifndef tO
-typedef tN tO;
-#endif
-#ifndef tP
-typedef tO tP;
-#endif
-#ifndef tQ
-typedef tP tQ;
-#endif
-#ifndef tR
-typedef tQ tR;
-#endif
-
-struct  struct1 {tA a;};
-struct  struct2 {tA a; tB b;};
-struct  struct3 {tA a; tB b; tC c; };
-struct  struct4 {tA a; tB b; tC c; tD d; };
-struct  struct5 {tA a; tB b; tC c; tD d; tE e; };
-struct  struct6 {tA a; tB b; tC c; tD d; tE e; tF f; };
-struct  struct7 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; };
-struct  struct8 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; };
-struct  struct9 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; };
-struct struct10 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; };
-struct struct11 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; tK k; };
-struct struct12 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; tK k; tL l; };
-struct struct13 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; tK k; tL l; tM m; };
-struct struct14 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; tK k; tL l; tM m; tN n; };
-struct struct15 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; tK k; tL l; tM m; tN n; tO o; };
-struct struct16 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; tK k; tL l; tM m; tN n; tO o; tP p; };
-struct struct17 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; tK k; tL l; tM m; tN n; tO o; tP p; tQ q; };
-struct struct18 {tA a; tB b; tC c; tD d; tE e; tF f; tG g; tH h; tI i; tJ j; tK k; tL l; tM m; tN n; tO o; tP p; tQ q; tR r; };
-
-struct  struct1  foo1 = {'1'}, L1;
-struct  struct2  foo2 = {'a','2'}, L2;
-struct  struct3  foo3 = {'1','b','3'}, L3;
-struct  struct4  foo4 = {'a','2','c','4'}, L4;
-struct  struct5  foo5 = {'1','b','3','d','5'}, L5;
-struct  struct6  foo6 = {'a','2','c','4','e','6'}, L6;
-struct  struct7  foo7 = {'1','b','3','d','5','f','7'}, L7;
-struct  struct8  foo8 = {'a','2','c','4','e','6','g','8'}, L8;
-struct  struct9  foo9 = {'1','b','3','d','5','f','7','h','9'}, L9;
-struct struct10 foo10 = {'a','2','c','4','e','6','g','8','i','A'}, L10;
-struct struct11 foo11 = {'1','b','3','d','5','f','7','h','9','j','B'}, L11;
-struct struct12 foo12 = {'a','2','c','4','e','6','g','8','i','A','k','C'}, L12;
-struct struct13 foo13 = {'1','b','3','d','5','f','7','h','9','j','B','l','D'}, L13;
-struct struct14 foo14 = {'a','2','c','4','e','6','g','8','i','A','k','C','m','E'}, L14;
-struct struct15 foo15 = {'1','b','3','d','5','f','7','h','9','j','B','l','D','n','F'}, L15;
-struct struct16 foo16 = {'a','2','c','4','e','6','g','8','i','A','k','C','m','E','o','G'}, L16;
-struct struct17 foo17 = {'1','b','3','d','5','f','7','h','9','j','B','l','D','n','F','p','H'}, L17;
-struct struct18 foo18 = {'a','2','c','4','e','6','g','8','i','A','k','C','m','E','o','G','q','I'}, L18;
-
-struct struct1  fun1()
-{
-  return foo1;  
-}
-struct struct2  fun2()
-{
-  return foo2;
-}
-struct struct3  fun3()
-{
-  return foo3;
-}
-struct struct4  fun4()
-{
-  return foo4;
-}
-struct struct5  fun5()
-{
-  return foo5;
-}
-struct struct6  fun6()
-{
-  return foo6;
-}
-struct struct7  fun7()
-{
-  return foo7;
-}
-struct struct8  fun8()
-{
-  return foo8;
-}
-struct struct9  fun9()
-{
-  return foo9;
-}
-struct struct10 fun10()
-{
-  return foo10; 
-}
-struct struct11 fun11()
-{
-  return foo11; 
-}
-struct struct12 fun12()
-{
-  return foo12; 
-}
-struct struct13 fun13()
-{
-  return foo13; 
-}
-struct struct14 fun14()
-{
-  return foo14; 
-}
-struct struct15 fun15()
-{
-  return foo15; 
-}
-struct struct16 fun16()
-{
-  return foo16; 
-}
-struct struct17 fun17()
-{
-  return foo17; 
-}
-struct struct18 fun18()
-{
-  return foo18; 
-}
-
-#ifdef PROTOTYPES
-void Fun1(struct struct1 foo1)
-#else
-void Fun1(foo1)
-     struct struct1 foo1;
-#endif
-{
-  L1 = foo1;
-}
-#ifdef PROTOTYPES
-void Fun2(struct struct2 foo2)
-#else
-void Fun2(foo2)
-     struct struct2 foo2;
-#endif
-{
-  L2 = foo2;
-}
-#ifdef PROTOTYPES
-void Fun3(struct struct3 foo3)
-#else
-void Fun3(foo3)
-     struct struct3 foo3;
-#endif
-{
-  L3 = foo3;
-}
-#ifdef PROTOTYPES
-void Fun4(struct struct4 foo4)
-#else
-void Fun4(foo4)
-     struct struct4 foo4;
-#endif
-{
-  L4 = foo4;
-}
-#ifdef PROTOTYPES
-void Fun5(struct struct5 foo5)
-#else
-void Fun5(foo5)
-     struct struct5 foo5;
-#endif
-{
-  L5 = foo5;
-}
-#ifdef PROTOTYPES
-void Fun6(struct struct6 foo6)
-#else
-void Fun6(foo6)
-     struct struct6 foo6;
-#endif
-{
-  L6 = foo6;
-}
-#ifdef PROTOTYPES
-void Fun7(struct struct7 foo7)
-#else
-void Fun7(foo7)
-     struct struct7 foo7;
-#endif
-{
-  L7 = foo7;
-}
-#ifdef PROTOTYPES
-void Fun8(struct struct8 foo8)
-#else
-void Fun8(foo8)
-     struct struct8 foo8;
-#endif
-{
-  L8 = foo8;
-}
-#ifdef PROTOTYPES
-void Fun9(struct struct9 foo9)
-#else
-void Fun9(foo9)
-     struct struct9 foo9;
-#endif
-{
-  L9 = foo9;
-}
-#ifdef PROTOTYPES
-void Fun10(struct struct10 foo10)
-#else
-void Fun10(foo10)
-     struct struct10 foo10;
-#endif
-{
-  L10 = foo10; 
-}
-#ifdef PROTOTYPES
-void Fun11(struct struct11 foo11)
-#else
-void Fun11(foo11)
-     struct struct11 foo11;
-#endif
-{
-  L11 = foo11; 
-}
-#ifdef PROTOTYPES
-void Fun12(struct struct12 foo12)
-#else
-void Fun12(foo12)
-     struct struct12 foo12;
-#endif
-{
-  L12 = foo12; 
-}
-#ifdef PROTOTYPES
-void Fun13(struct struct13 foo13)
-#else
-void Fun13(foo13)
-     struct struct13 foo13;
-#endif
-{
-  L13 = foo13; 
-}
-#ifdef PROTOTYPES
-void Fun14(struct struct14 foo14)
-#else
-void Fun14(foo14)
-     struct struct14 foo14;
-#endif
-{
-  L14 = foo14; 
-}
-#ifdef PROTOTYPES
-void Fun15(struct struct15 foo15)
-#else
-void Fun15(foo15)
-     struct struct15 foo15;
-#endif
-{
-  L15 = foo15; 
-}
-#ifdef PROTOTYPES
-void Fun16(struct struct16 foo16)
-#else
-void Fun16(foo16)
-     struct struct16 foo16;
-#endif
-{
-  L16 = foo16; 
-}
-#ifdef PROTOTYPES
-void Fun17(struct struct17 foo17)
-#else
-void Fun17(foo17)
-     struct struct17 foo17;
-#endif
-{
-  L17 = foo17; 
-}
-#ifdef PROTOTYPES
-void Fun18(struct struct18 foo18)
-#else
-void Fun18(foo18)
-     struct struct18 foo18;
-#endif
-{
-  L18 = foo18; 
-}
-
-zed ()
-{
-
-  L1.a = L2.a = L3.a = L4.a = L5.a = L6.a = L7.a = L8.a = L9.a = L10.a = L11.a = L12.a = L13.a = L14.a = L15.a = L16.a = L17.a = L18.a = 'Z';
-
-  L2.b = L3.b = L4.b = L5.b = L6.b = L7.b = L8.b = L9.b = L10.b = L11.b = L12.b = L13.b = L14.b = L15.b = L16.b = L17.b = L18.b = 'Z';
-
-  L3.c = L4.c = L5.c = L6.c = L7.c = L8.c = L9.c = L10.c = L11.c = L12.c = L13.c = L14.c = L15.c = L16.c = L17.c = L18.c = 'Z';
-
-  L4.d = L5.d = L6.d = L7.d = L8.d = L9.d = L10.d = L11.d = L12.d = L13.d = L14.d = L15.d = L16.d = L17.d = L18.d = 'Z';
-
-  L5.e = L6.e = L7.e = L8.e = L9.e = L10.e = L11.e = L12.e = L13.e = L14.e = L15.e = L16.e = L17.e = L18.e = 'Z';
-
-  L6.f = L7.f = L8.f = L9.f = L10.f = L11.f = L12.f = L13.f = L14.f = L15.f = L16.f = L17.f = L18.f = 'Z';
-
-  L7.g = L8.g = L9.g = L10.g = L11.g = L12.g = L13.g = L14.g = L15.g = L16.g = L17.g = L18.g = 'Z';
-
-  L8.h = L9.h = L10.h = L11.h = L12.h = L13.h = L14.h = L15.h = L16.h = L17.h = L18.h = 'Z';
-
-  L9.i = L10.i = L11.i = L12.i = L13.i = L14.i = L15.i = L16.i = L17.i = L18.i = 'Z';
-
-  L10.j = L11.j = L12.j = L13.j = L14.j = L15.j = L16.j = L17.j = L18.j = 'Z';
-
-  L11.k = L12.k = L13.k = L14.k = L15.k = L16.k = L17.k = L18.k = 'Z';
-
-  L12.l = L13.l = L14.l = L15.l = L16.l = L17.l = L18.l = 'Z';
-
-  L13.m = L14.m = L15.m = L16.m = L17.m = L18.m = 'Z';
-
-  L14.n = L15.n = L16.n = L17.n = L18.n = 'Z';
-
-  L15.o = L16.o = L17.o = L18.o = 'Z';
-
-  L16.p = L17.p = L18.p = 'Z';
-
-  L17.q = L18.q = 'Z';
-
-  L18.r = 'Z';
-}
-
-int main()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  int i;
-
-  Fun1(foo1);	
-  Fun2(foo2);	
-  Fun3(foo3);	
-  Fun4(foo4);	
-  Fun5(foo5);	
-  Fun6(foo6);	
-  Fun7(foo7);	
-  Fun8(foo8);	
-  Fun9(foo9);	
-  Fun10(foo10);
-  Fun11(foo11);
-  Fun12(foo12);
-  Fun13(foo13);
-  Fun14(foo14);
-  Fun15(foo15);
-  Fun16(foo16);
-  Fun17(foo17);
-  Fun18(foo18);
-
-  /* An infinite loop that first clears all the variables and then
-     calls each function.  This "hack" is to make testing random
-     functions easier - "advance funN" is guaranteed to have always
-     been preceeded by a global variable clearing zed call.  */
-
-  while (1)
-    {
-      zed ();
-      L1  = fun1();	
-      L2  = fun2();	
-      L3  = fun3();	
-      L4  = fun4();	
-      L5  = fun5();	
-      L6  = fun6();	
-      L7  = fun7();	
-      L8  = fun8();	
-      L9  = fun9();	
-      L10 = fun10();
-      L11 = fun11();
-      L12 = fun12();
-      L13 = fun13();
-      L14 = fun14();
-      L15 = fun15();
-      L16 = fun16();
-      L17 = fun17();
-      L18 = fun18();
-    }
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
deleted file mode 100644
index 84435df84f1..00000000000
--- a/gdb/testsuite/gdb.base/structs.exp
+++ /dev/null
@@ -1,662 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 1996, 1997, 1999, 2003, 2004 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Some targets can't call functions, so don't even bother with this
-# test.
-
-if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*"
-    fail "This target can not call functions"
-    continue
-}
-
-set testfile "structs"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the
-# compiler used to compile the test case.
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# Compile a variant of structs.c using TYPES to specify the type of
-# the first N struct elements (the remaining elements take the type of
-# the last TYPES field).  Run the compmiled program up to "main".
-# Also updates the global "testfile" to reflect the most recent build.
-
-proc start_structs_test { types } {
-    global testfile
-    global srcfile
-    global binfile
-    global objdir
-    global subdir
-    global srcdir
-    global gdb_prompt
-
-    # Create the additional flags
-    set flags "debug"
-    set testfile "structs"
-    set n 0
-    for {set n 0} {$n<[llength ${types}]} {incr n} {
-	set m [I2A ${n}]
-	set t [lindex ${types} $n]
-	lappend flags "additional_flags=-Dt${m}=${t}"
-	append testfile "-" "$t"
-    }
-
-    set binfile ${objdir}/${subdir}/${testfile}
-    if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags}"] != "" } {
-	# built the second test case since we can't use prototypes
-	warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES"
-	if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags} additional_flags=-DNO_PROTOTYPES"] != "" } {
-	    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-	}
-    }
-
-    # Start with a fresh gdb.
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-
-    # Make certain that the output is consistent
-    gdb_test "set print sevenbit-strings" "" \
-	    "set print sevenbit-strings; ${testfile}"
-    gdb_test "set print address off" "" \
-	    "set print address off; ${testfile}"
-    gdb_test "set width 0" "" \
-	    "set width 0; ${testfile}"
-
-    # Advance to main
-    if { ![runto_main] } then {
-	gdb_suppress_tests;
-    }
-
-    # Get the debug format
-    get_debug_format
-
-    # check that at the struct containing all the relevant types is correct
-    set foo_t "type = struct struct[llength ${types}] \{"
-    for {set n 0} {$n<[llength ${types}]} {incr n} {
-	append foo_t "\[\r\n \]+[lindex ${types} $n] [i2a $n];"
-    }
-    append foo_t "\[\r\n \]+\}"
-    gdb_test "ptype foo[llength ${types}]" "${foo_t}" \
-	    "ptype foo[llength ${types}]; ${testfile}"
-}
-
-# The expected value for fun${n}, L${n} and foo${n}.  First element is
-# empty to make indexing easier.  "foo" returns the modified value,
-# "zed" returns the invalid value.
-
-proc foo { n } {
-    return [lindex {
-	"{}"
-	"{a = 49 '1'}"
-	"{a = 97 'a', b = 50 '2'}"
-	"{a = 49 '1', b = 98 'b', c = 51 '3'}"
-	"{a = 97 'a', b = 50 '2', c = 99 'c', d = 52 '4'}"
-	"{a = 49 '1', b = 98 'b', c = 51 '3', d = 100 'd', e = 53 '5'}"
-	"{a = 97 'a', b = 50 '2', c = 99 'c', d = 52 '4', e = 101 'e', f = 54 '6'}"
-	"{a = 49 '1', b = 98 'b', c = 51 '3', d = 100 'd', e = 53 '5', f = 102 'f', g = 55 '7'}"
-	"{a = 97 'a', b = 50 '2', c = 99 'c', d = 52 '4', e = 101 'e', f = 54 '6', g = 103 'g', h = 56 '8'}"
-	"{a = 49 '1', b = 98 'b', c = 51 '3', d = 100 'd', e = 53 '5', f = 102 'f', g = 55 '7', h = 104 'h', i = 57 '9'}"
-	"{a = 97 'a', b = 50 '2', c = 99 'c', d = 52 '4', e = 101 'e', f = 54 '6', g = 103 'g', h = 56 '8', i = 105 'i', j = 65 'A'}"
-	"{a = 49 '1', b = 98 'b', c = 51 '3', d = 100 'd', e = 53 '5', f = 102 'f', g = 55 '7', h = 104 'h', i = 57 '9', j = 106 'j', k = 66 'B'}"
-	"{a = 97 'a', b = 50 '2', c = 99 'c', d = 52 '4', e = 101 'e', f = 54 '6', g = 103 'g', h = 56 '8', i = 105 'i', j = 65 'A', k = 107 'k', l = 67 'C'}"
-	"{a = 49 '1', b = 98 'b', c = 51 '3', d = 100 'd', e = 53 '5', f = 102 'f', g = 55 '7', h = 104 'h', i = 57 '9', j = 106 'j', k = 66 'B', l = 108 'l', m = 68 'D'}"
-	"{a = 97 'a', b = 50 '2', c = 99 'c', d = 52 '4', e = 101 'e', f = 54 '6', g = 103 'g', h = 56 '8', i = 105 'i', j = 65 'A', k = 107 'k', l = 67 'C', m = 109 'm', n = 69 'E'}"
-	"{a = 49 '1', b = 98 'b', c = 51 '3', d = 100 'd', e = 53 '5', f = 102 'f', g = 55 '7', h = 104 'h', i = 57 '9', j = 106 'j', k = 66 'B', l = 108 'l', m = 68 'D', n = 110 'n', o = 70 'F'}"
-	"{a = 97 'a', b = 50 '2', c = 99 'c', d = 52 '4', e = 101 'e', f = 54 '6', g = 103 'g', h = 56 '8', i = 105 'i', j = 65 'A', k = 107 'k', l = 67 'C', m = 109 'm', n = 69 'E', o = 111 'o', p = 71 'G'}"
-	"{a = 49 '1', b = 98 'b', c = 51 '3', d = 100 'd', e = 53 '5', f = 102 'f', g = 55 '7', h = 104 'h', i = 57 '9', j = 106 'j', k = 66 'B', l = 108 'l', m = 68 'D', n = 110 'n', o = 70 'F', p = 112 'p', q = 72 'H'}"
-    } $n]
-}
-
-proc zed { n } {
-    return [lindex {
-	"{}"
-	"{a = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z', j = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z', j = 90 'Z', k = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z', j = 90 'Z', k = 90 'Z', l = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z', j = 90 'Z', k = 90 'Z', l = 90 'Z', m = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z', j = 90 'Z', k = 90 'Z', l = 90 'Z', m = 90 'Z', n = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z', j = 90 'Z', k = 90 'Z', l = 90 'Z', m = 90 'Z', n = 90 'Z', o = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z', j = 90 'Z', k = 90 'Z', l = 90 'Z', m = 90 'Z', n = 90 'Z', o = 90 'Z', p = 90 'Z'}"
-	"{a = 90 'Z', b = 90 'Z', c = 90 'Z', d = 90 'Z', e = 90 'Z', f = 90 'Z', g = 90 'Z', h = 90 'Z', i = 90 'Z', j = 90 'Z', k = 90 'Z', l = 90 'Z', m = 90 'Z', n = 90 'Z', o = 90 'Z', p = 90 'Z', q = 90 'Z'}"
-    } $n]
-}
-
-# Given N (0..25), return the corresponding alphabetic letter in lower
-# or upper case.  This is ment to be i18n proof.
-
-proc i2a { n } {
-    return [string range "abcdefghijklmnopqrstuvwxyz" $n $n]
-}
-
-proc I2A { n } {
-    return [string toupper [i2a $n]]
-}
-
-
-# Use the file name, compiler and tuples to set up any needed KFAILs.
-
-proc setup_kfails { file tuples bug } {
-    global testfile
-    if [string match $file $testfile] {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
-proc setup_compiler_kfails { file compiler format tuples bug } {
-    global testfile
-    if {[string match $file $testfile] && [test_compiler_info $compiler]  && [test_debug_format $format]} {
-	foreach f $tuples { setup_kfail $f $bug }
-    }
-}
-
-# Test GDB's ability to make inferior function calls to functions
-# returning (or passing in a single structs.
-
-# N identifies the number of elements in the struct that will be used
-# for the test case.  FAILS is a list of target tuples that will fail
-# this test.
-
-#  start_structs_test() will have previously built a program with a
-# specified combination of types for those elements.  To ensure
-# robustness of the output, "p/c" is used.
-
-# This tests the code paths "which return-value convention?" and
-# "extract return-value from registers" called by "infcall.c".
-
-proc test_struct_calls { n } {
-    global testfile
-    global gdb_prompt
-
-    # Check that GDB can always extract a struct-return value from an
-    # inferior function call.  Since GDB always knows the location of an
-    # inferior function call's return value these should never fail
-    
-    # Implemented by calling the parameterless function "fun$N" and then
-    # examining the return value printed by GDB.
-
-    set tests "call $n ${testfile}"
-
-    # Call fun${n}, checking the printed return-value.
-    setup_compiler_kfails structs-tc-tll gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455
-    setup_compiler_kfails structs-tc-td gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455
-    gdb_test "p/c fun${n}()"  "[foo ${n}]" "p/c fun<n>(); ${tests}"
-
-    # Check that GDB can always pass a structure to an inferior function.
-    # This test can never fail.
-
-    # Implemented by calling the one parameter function "Fun$N" which
-    # stores its parameter in the global variable "L$N".  GDB then
-    # examining that global to confirm that the value is as expected.
-
-    gdb_test "call Fun${n}(foo${n})" "" "call Fun<n>(foo<n>); ${tests}"
-    setup_compiler_kfails structs-tc-tll gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455
-    setup_compiler_kfails structs-tc-td gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455
-    gdb_test "p/c L${n}" [foo ${n}] "p/c L<n>; ${tests}"
-}
-
-# Test GDB's ability to both return a function (with "return" or
-# "finish") and correctly extract/store any corresponding
-# return-value.
-
-# Check that GDB can consistently extract/store structure return
-# values.  There are two cases - returned in registers and returned in
-# memory.  For the latter case, the return value can't be found and a
-# failure is "expected".  However GDB must still both return the
-# function and display the final source and line information.
-
-# N identifies the number of elements in the struct that will be used
-# for the test case.  FAILS is a list of target tuples that will fail
-# this test.
-
-# This tests the code paths "which return-value convention?", "extract
-# return-value from registers", and "store return-value in registers".
-# Unlike "test struct calls", this test is expected to "fail" when the
-# return-value is in memory (GDB can't find the location).  The test
-# is in three parts: test "return"; test "finish"; check that the two
-# are consistent.  GDB can sometimes work for one command and not the
-# other.
-
-proc test_struct_returns { n } {
-    global gdb_prompt
-    global testfile
-
-    set tests "return $n ${testfile}"
-
-
-    # Check that "return" works.
-
-    # GDB must always force the return of a function that has
-    # a struct result.  Dependant on the ABI, it may, or may not be
-    # possible to store the return value in a register.
-
-    # The relevant code looks like "L{n} = fun{n}()".  The test forces
-    # "fun{n}" to "return" with an explicit value.  Since that code
-    # snippet will store the the returned value in "L{n}" the return
-    # is tested by examining "L{n}".  This assumes that the
-    # compiler implemented this as fun{n}(&L{n}) and hence that when
-    # the value isn't stored "L{n}" remains unchanged.  Also check for
-    # consistency between this and the "finish" case.
-
-    # Get into a call of fun${n}
-    gdb_test "advance fun${n}" \
-	    "fun${n} .*\[\r\n\]+\[0-9\].*return foo${n}.*" \
-	    "advance to fun<n> for return; ${tests}"
-
-    # Check that the program invalidated the relevant global.
-    gdb_test "p/c L${n}" " = [zed $n]" "zed L<n> for return; ${tests}"
-
-    # Force the "return".  This checks that the return is always
-    # performed, and that GDB correctly reported this to the user.
-    # GDB 6.0 and earlier, when the return-value's location wasn't
-    # known, both failed to print a final "source and line" and misplaced
-    # the frame ("No frame").
-
-    # The test is writen so that it only reports one FAIL/PASS for the
-    # entire operation.  The value returned is checked further down.
-    # "return_value_known", if non-zero, indicates that GDB knew where
-    # the return value was located.
-
-    set test "return foo<n>; ${tests}"
-    set return_value_known 1
-    set return_value_unimplemented 0
-    gdb_test_multiple "return foo${n}" "${test}" {
-	-re "The location" {
-	    # Ulgh, a struct return, remember this (still need prompt).
-	    set return_value_known 0
-	    exp_continue
-	}
-	-re "A structure or union" {
-	    # Ulgh, a struct return, remember this (still need prompt).
-	    set return_value_known 0
-	    # Double ulgh.  Architecture doesn't use return_value and
-	    # hence hasn't implemented small structure return.
-	    set return_value_unimplemented 1
-	    exp_continue
-	}
-	-re "Make fun${n} return now.*y or n. $" {
-	    gdb_test_multiple "y" "${test}" {
-		-re "L${n} *= fun${n}.*${gdb_prompt} $" {
-		    # Need to step off the function call
-		    gdb_test "next" "L.* *= fun.*" "${test}"
-		}
-		-re "L[expr ${n} + 1] *= fun[expr ${n} + 1].*${gdb_prompt} $" {
-		    pass "${test}"
-		}
-	    }
-	}
-    }
-
-    # Check that the return-value is as expected.  At this stage we're
-    # just checking that GDB has returned a value consistent with
-    # "return_value_known" set above.
-
-    set test "value foo<n> returned; ${tests}"
-    gdb_test_multiple "p/c L${n}" "${test}" {
-	-re " = [foo ${n}].*${gdb_prompt} $" {
-	    if $return_value_known {
-		pass "${test}"
-		# This contradicts the above claim that GDB didn't
-		# know the location of the return-value.
-	    } else {
-		fail "${test}"
-	    }
-	}
-	-re " = [zed ${n}].*${gdb_prompt} $" {
-	    if $return_value_known {
-		# This contradicts the above claim that GDB knew
-		# the location of the return-value.
-		fail "${test}"
-	    } else {
-		# The struct return case.  Since any modification
-		# would be by reference, and that can't happen, the
-		# value should be unmodified and hence Z is expected.
-		# Is this a reasonable assumption?
-		pass "${test}"
-	    }
-	}
-	-re ".*${gdb_prompt} $" {
-	    if $return_value_unimplemented {
-		# What a suprize.  The architecture hasn't implemented
-		# return_value, and hence has to fail.
-		kfail "$test" gdb/1444
-	    } else {
-		fail "$test"
-	    }
-	}
-    }	
-    
-    # Check that a "finish" works.
-
-    # This is almost but not quite the same as "call struct funcs".
-    # Architectures can have subtle differences in the two code paths.
-
-    # The relevant code snippet is "L{n} = fun{n}()".  The program is
-    # advanced into a call to  "fun{n}" and then that function is
-    # finished.  The returned value that GDB prints, reformatted using
-    # "p/c", is checked.
-
-    # Get into "fun${n}()".
-    gdb_test "advance fun${n}" \
-	    "fun${n} .*\[\r\n\]+\[0-9\].*return foo${n}.*" \
-	    "advance to fun<n> for finish; ${tests}"
-
-    # Check that the program invalidated the relevant global.
-    gdb_test "p/c L${n}" " = [zed $n]" "zed L<n> for finish; ${tests}"
-
-    # Finish the function, set 'finish_value_known" to non-empty if
-    # the return-value was found.
-
-    set test "finish foo<n>; ${tests}"
-    set finish_value_known 1
-    gdb_test_multiple "finish" "${test}" {
-	-re "Value returned is .*${gdb_prompt} $" {
-	    pass "${test}"
-	}
-	-re "Cannot determine contents.*${gdb_prompt} $" {
-	    # Expected bad value.  For the moment this is ok.
-	    set finish_value_known 0
-	    pass "${test}"
-	}
-    }
-
-    # Re-print the last (return-value) using the more robust
-    # "p/c".  If no return value was found, the 'Z' from the previous
-    # check that the variable was cleared, is printed.
-    set test "value foo<n> finished; ${tests}"
-    gdb_test_multiple "p/c" "${test}" {
-	-re "[foo ${n}]\[\r\n\]+${gdb_prompt} $" {
-	    if $finish_value_known {
-		pass "${test}"
-	    } else {
-		# This contradicts the above claim that GDB didn't
-		# know the location of the return-value.
-		fail "${test}"
-	    }
-	}
-	-re "[zed ${n}]\[\r\n\]+${gdb_prompt} $" {
-	    # The value didn't get found.  This is "expected".
-	    if $finish_value_known {
-		# This contradicts the above claim that GDB did
-		# know the location of the return-value.
-		fail "${test}"
-	    } else {
-		pass "${test}"
-	    }
-	}
-    }
-
-    # Finally, check that "return" and finish" have consistent
-    # behavior.
-
-    # Since "finish" works in more cases than "return" (see
-    # RETURN_VALUE_ABI_RETURNS_ADDRESS and
-    # RETURN_VALUE_ABI_PRESERVES_ADDRESS), the "return" value being
-    # known implies that the "finish" value is known (but not the
-    # reverse).
-
-    set test "return value known implies finish value known; ${tests}"
-    if {$return_value_known && ! $finish_value_known} {
-	kfail gdb/1444 "${test}"
-    } else {
-	pass "${test}"
-    }
-}
-
-# ABIs pass anything >8 or >16 bytes in memory but below that things
-# randomly use register and/and structure conventions.  Check all
-# possible sized char structs in that range.  But only a restricted
-# range of the other types.
-
-# NetBSD/PPC returns "unnatural" (3, 5, 6, 7) sized structs in memory.
-
-# d10v is weird. 5/6 byte structs go in memory.  2 or more char
-# structs go in memory.  Everything else is in a register!
-
-# Test every single char struct from 1..17 in size.  This is what the
-# original "structs" test was doing.
-
-start_structs_test { tc }
-test_struct_calls 1
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_calls 5
-test_struct_calls 6
-test_struct_calls 7
-test_struct_calls 8
-test_struct_calls 9
-test_struct_calls 10
-test_struct_calls 11
-test_struct_calls 12
-test_struct_calls 13
-test_struct_calls 14
-test_struct_calls 15
-test_struct_calls 16
-test_struct_calls 17
-test_struct_returns 1
-test_struct_returns 2
-test_struct_returns 3
-test_struct_returns 4
-test_struct_returns 5
-test_struct_returns 6
-test_struct_returns 7
-test_struct_returns 8
-
-
-# Let the fun begin.
-
-# Assuming that any integer struct larger than 8 bytes goes in memory,
-# come up with many and varied combinations of a return struct.  For
-# "struct calls" test just beyond that 8 byte boundary, for "struct
-# returns" test up to that boundary.
-
-# For floats, assumed that up to two struct elements can be stored in
-# floating point registers, regardless of their size.
-
-# The approx size of each structure it is computed assumed that tc=1,
-# ts=2, ti=4, tl=4, tll=8, tf=4, td=8, tld=16, and that all fields are
-# naturally aligned.  Padding being added where needed.  Note that
-# these numbers are just approx, the d10v has ti=2, a 64-bit has has
-# tl=8.
-
-# Approx size: 2, 4, ...
-start_structs_test { ts }
-test_struct_calls 1
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_calls 5
-test_struct_returns 1
-test_struct_returns 2
-test_struct_returns 3
-test_struct_returns 4
-
-# Approx size: 4, 8, ...
-start_structs_test { ti }
-test_struct_calls 1
-test_struct_calls 2
-test_struct_calls 3
-test_struct_returns 1
-test_struct_returns 2
-
-# Approx size: 4, 8, ...
-start_structs_test { tl }
-test_struct_calls 1
-test_struct_calls 2
-test_struct_calls 3
-test_struct_returns 1
-test_struct_returns 2
-
-# Approx size: 8, 16, ...
-start_structs_test { tll }
-test_struct_calls 1
-test_struct_calls 2
-test_struct_returns 1
-
-# Approx size: 4, 8, ...
-start_structs_test { tf }
-test_struct_calls 1
-test_struct_calls 2
-test_struct_calls 3
-test_struct_returns 1
-test_struct_returns 2
-
-# Approx size: 8, 16, ...
-start_structs_test { td }
-test_struct_calls 1
-test_struct_calls 2
-test_struct_returns 1
-
-# Approx size: 16, 32, ...
-start_structs_test { tld }
-test_struct_calls 1
-test_struct_calls 2
-test_struct_returns 1
-
-# Approx size: 2+1=3, 4, ...
-start_structs_test { ts tc }
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_calls 5
-test_struct_calls 6
-test_struct_calls 7
-test_struct_calls 8
-test_struct_returns 2
-
-# Approx size: 4+1=5, 6, ...
-start_structs_test { ti tc }
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_calls 5
-test_struct_calls 6
-test_struct_returns 2
-
-# Approx size: 4+1=5, 6, ...
-start_structs_test { tl tc }
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_calls 5
-test_struct_calls 6
-test_struct_returns 2
-
-# Approx size: 8+1=9, 10, ...
-start_structs_test { tll tc }
-test_struct_calls 2
-
-# Approx size: 4+1=5, 6, ...
-start_structs_test { tf tc }
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_calls 5
-test_struct_calls 6
-test_struct_returns 2
-
-# Approx size: 8+1=9, 10, ...
-start_structs_test { td tc }
-test_struct_calls 2
-
-# Approx size: 16+1=17, 18, ...
-start_structs_test { tld tc }
-test_struct_calls 2
-
-# Approx size: (1+1)+2=4, 6, ...
-start_structs_test { tc ts }
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_calls 5
-test_struct_calls 6
-test_struct_returns 2
-
-# Approx size: (1+3)+4=8, 12, ...
-start_structs_test { tc ti }
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_returns 2
-
-# Approx size: (1+3)+4=8, 12, ...
-start_structs_test { tc tl }
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-test_struct_returns 2
-
-# Approx size: (1+7)+8=16, 24, ...
-start_structs_test { tc tll }
-test_struct_calls 2
-
-# Approx size: (1+3)+4=8, 12, ...
-start_structs_test { tc tf }
-test_struct_calls 2
-test_struct_calls 3
-test_struct_calls 4
-
-# Approx size: (1+7)+8=16, 24, ...
-start_structs_test { tc td }
-test_struct_calls 2
-
-# Approx size: (1+15)+16=32, 48, ...
-start_structs_test { tc tld }
-test_struct_calls 2
-
-# Some float combinations
-
-# Approx size: 8+4=12, 16, ...
-# d10v: 4+4=8, 12, ...
-start_structs_test { td tf }
-test_struct_calls 2
-test_struct_returns 2
-
-# Approx size: (4+4)+8=16, 32, ...
-# d10v: 4+4=8, 12, ...
-start_structs_test { tf td }
-test_struct_calls 2
-test_struct_returns 2
-
-return 0
diff --git a/gdb/testsuite/gdb.base/structs2.c b/gdb/testsuite/gdb.base/structs2.c
deleted file mode 100644
index f1eeab1adc2..00000000000
--- a/gdb/testsuite/gdb.base/structs2.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* pr 13536 */
-
-static void param_reg (register signed char pr_char,
-		       register unsigned char pr_uchar,
-		       register short pr_short,
-		       register unsigned short pr_ushort);
-
-int bkpt;
-
-int
-main ()
-{
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-
-  bkpt = 0;
-  param_reg (120, 130, 32000, 33000);
-  param_reg (130, 120, 33000, 32000);
-
-  return 0;
-}
-
-static void dummy () {}
-
-static void
-param_reg(register signed char pr_char,
-	  register unsigned char pr_uchar,
-	  register short pr_short,
-	  register unsigned short pr_ushort)
-{
-  bkpt = 1;
-  dummy ();
-  pr_char = 1;
-  pr_uchar = pr_short = pr_ushort = 1;
-  dummy ();
-}
diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp
deleted file mode 100644
index e7f6553c650..00000000000
--- a/gdb/testsuite/gdb.base/structs2.exp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1998, 1999 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set prototypes 1
-set testfile "structs2"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# build the first test case
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    # built the second test case since we can't use prototypes
-    warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES"
-    if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DNO_PROTOTYPES}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-    set prototypes 0
-}
-
-# Start with a fresh gdb.
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set width 0" ""
-
-if { ![runto_main] } then {
-    gdb_suppress_tests
-}
-
-# Ok, we're finally ready to actually do our tests.
-
-set prms_id 13536
-set bug_id 0
-
-gdb_test "f" \
-    ".*bkpt = 0.*" \
-    "structs2 sanity check"
-
-gdb_test "break param_reg" \
-    "Breakpoint .* at .*" \
-    "structs2 breakpoint set"
-
-if [test_compiler_info gcc-*-*] {
-  setup_xfail hppa*-* gcc/15860
-}
-gdb_test "continue" \
-    ".*pr_char=120.*pr_uchar=130.*pr_short=32000.*pr_ushort=33000.*bkpt = 1.*" \
-    "structs2 continue1"
-
-if [test_compiler_info gcc-*-*] {
-  setup_xfail hppa*-* gcc/15860
-}
-gdb_test "continue" \
-    ".*pr_char=-126.*pr_uchar=120.*pr_short=-32536.*pr_ushort=32000.*bkpt = 1.*" \
-    "structs2 continue2"
-
-# End of tests.
-
-gdb_stop_suppressing_tests
-
-return 0
diff --git a/gdb/testsuite/gdb.base/sum.c b/gdb/testsuite/gdb.base/sum.c
deleted file mode 100644
index f5a5dbf2631..00000000000
--- a/gdb/testsuite/gdb.base/sum.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This is a sample program for the HP/DDE debugger. */
-#include <stdio.h>
-
-#ifdef PROTOTYPES
-int sum(int *list, int low, int high)
-#else
-int sum(list, low, high)
-int *list, low, high;
-#endif
-    {
-        int i = 0, s = 0;
-        for (i = low; i <= high; i++)
-            s += list[i];
-        return(s);
-    }
diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp
deleted file mode 100644
index 1a645311297..00000000000
--- a/gdb/testsuite/gdb.base/term.exp
+++ /dev/null
@@ -1,76 +0,0 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999
-#   Free Software Foundation, 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 Rob Savoye. (rob@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-# Don't try this for remote targets.
-if [is_remote target] then {
-    continue
-}
-
-gdb_start
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "run"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-delete_breakpoints
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set print sevenbit-strings" "" "test set print sevenbit-strings"
-gdb_test "set print address off" "" "test set print address off"
-gdb_test "set width 0" "" "test set width 0"
-gdb_test "info terminal" "No saved terminal information.*" "test info terminal"
-gdb_run_cmd 5
-gdb_expect {
-    -re ".*120.*Program exited normally.*$gdb_prompt $" {
-	gdb_test "info terminal" "No saved terminal information.*" "test info terminal #2"
-    }
-    default {
-	fail "term.exp, factorial didn't run to completion for info terminal"
-    }
-}
-
-# In mid-execution
-gdb_breakpoint main
-gdb_run_cmd 5
-gdb_expect {
-    -re ".*Breakpoint \[0-9\]+,.*main.*if .argc != 2.*$gdb_prompt $" {
-	gdb_test "info terminal" "Inferior's terminal status .currently saved by GDB.:.*" "info terminal at breakpoint"
-    }
-    -re ".*$gdb_prompt $"	{ fail "info terminal at breakpoint" }
-    timeout		{ fail "(timeout) info terminal at breakpoint" }
-}
diff --git a/gdb/testsuite/gdb.base/twice.c b/gdb/testsuite/gdb.base/twice.c
deleted file mode 100644
index 09eb2ddf5a2..00000000000
--- a/gdb/testsuite/gdb.base/twice.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-int nothing ()
-
-{
-    int x = 3 ;
-    return x ;
-}
-
-
-int main ()
-
-{
-    int y ;
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif    
-    y = nothing () ;
-    printf ("hello\n") ;
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.base/twice.exp b/gdb/testsuite/gdb.base/twice.exp
deleted file mode 100644
index 7a86701cb67..00000000000
--- a/gdb/testsuite/gdb.base/twice.exp
+++ /dev/null
@@ -1,64 +0,0 @@
-#   Copyright 1997, 1999 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile twice-tmp
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set options debug
-lappend options "additional_flags=-I."
-
-set fileid [open ${objdir}/${subdir}/${srcfile} w];
-puts $fileid "#include \"twice.c\"";
-close $fileid;
-
-remote_download host ${srcdir}/${subdir}/twice.c twice.c
-
-if  { [gdb_compile "${objdir}/${subdir}/${srcfile}" "${binfile}" executable $options] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-if [runto_main] then {
-    # Test that GDB can still detect whether we have line numbers
-    # even if we're executing code in an include file.
-
-    # The bug was fixed by
-    #Tue Jun 29 11:02:58 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-    #
-    #	* infrun.c (wait_for_inferior): Use find_pc_line not
-    #	find_pc_symtab to check whether there is line number
-    #	information.
-
-    gdb_test "step" "nothing \\(\\) at.*"
-}
-remote_exec build "rm -f twice.c" 
-return 0
diff --git a/gdb/testsuite/gdb.base/unload.c b/gdb/testsuite/gdb.base/unload.c
deleted file mode 100644
index 5c5e3d3c1d8..00000000000
--- a/gdb/testsuite/gdb.base/unload.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-
-int k = 0;
-
-#define SHLIB_NAME SHLIB_DIR "/unloadshr.sl"
-
-int main()
-{
-  void *handle;
-  int (*unloadshr) (int);
-  int y;
-  const char *msg;
-
-  handle = dlopen (SHLIB_NAME, RTLD_LAZY);
-  msg = dlerror ();
-  
-  if (!handle)
-    {
-      fprintf (stderr, msg);
-      exit (1);
-    }
-
-  unloadshr = (int (*)(int))dlsym (handle, "shrfunc1");
-
-  if (!unloadshr)
-    {
-      fprintf (stderr, dlerror ());
-      exit (1);
-    }
-
-  y = (*unloadshr)(3);
-
-  printf ("y is %d\n", y);
-
-  dlclose (handle);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/unload.exp b/gdb/testsuite/gdb.base/unload.exp
deleted file mode 100644
index b852b1907f0..00000000000
--- a/gdb/testsuite/gdb.base/unload.exp
+++ /dev/null
@@ -1,116 +0,0 @@
-#   Copyright 2003, 2004, 2005
-#   Free Software Foundation, 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.  
-
-# This file was created by Jeff Johnston. (jjohnstn@redhat.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-# are we on a target board?
-if ![isnative] then {
-    return 0
-}
-
-set testfile "unload"
-set libfile "unloadshr"
-set libsrcfile ${libfile}.c
-set srcfile $srcdir/$subdir/$testfile.c
-set binfile $objdir/$subdir/$testfile
-set shlibdir ${objdir}/${subdir}
-set libsrc  $srcdir/$subdir/$libfile.c
-set lib_sl  $objdir/$subdir/$libfile.sl
-
-set dl_lib_flag ""
-switch -glob [istarget] {
-    "hppa*-hp-hpux*" { }
-    "*-*-linux*"     { set dl_lib_flag "libs=-ldl" }
-    "*-*-solaris*"   { set dl_lib_flag "libs=-ldl" }
-    default          { }
-}
-
-set lib_opts debug
-set exec_opts [list debug $dl_lib_flag additional_flags=-DSHLIB_DIR\=\"${shlibdir}\"]
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
-     || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
-    untested "Couldn't compile $libsrc or $srcfile."
-    return -1
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# Test setting a breakpoint in a dynamically loaded library which is
-# manually loaded and unloaded
-#
-
-gdb_test_multiple "break shrfunc1" "set pending breakpoint" {
-     -re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
-	    gdb_test "y" "Breakpoint.*shrfunc1.*pending." "set pending breakpoint"
-     }
-}
-
-gdb_test "info break" \
-    "Num Type\[ \]+Disp Enb Address\[ \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y.*PENDING.*shrfunc1.*" \
-"single pending breakpoint info"
-
-set unloadshr_line [gdb_get_line_number "unloadshr break" ${libsrcfile}]
-
-gdb_test "run" \
-"Starting program.*unload.*
-Breakpoint.*at.*
-Pending breakpoint \"shrfunc1\" resolved.*
-Breakpoint.*, shrfunc1 \\\(x=3\\\).*unloadshr.c:$unloadshr_line.*" \
-"running program"
-
-gdb_test "continue" \
-"Continuing.*y is 7.*warning: Temporarily disabling breakpoints for.*unloadshr.sl.*Program exited normally." \
-"continuing to end of program"
-
-#
-# Try to rerun program and verify that shared breakpoint is reset properly
-#
-
-gdb_test "run" \
-".*Breakpoint.*shrfunc1.*at.*unloadshr.c:$unloadshr_line.*" \
-"rerun to shared library breakpoint"
-
-gdb_test "continue" \
-"Continuing.*y is 7.*warning: Temporarily disabling breakpoints for.*unloadshr.sl.*Program exited normally." \
-"continuing to end of program second time"
-
diff --git a/gdb/testsuite/gdb.base/unloadshr.c b/gdb/testsuite/gdb.base/unloadshr.c
deleted file mode 100644
index 3896e67ffc1..00000000000
--- a/gdb/testsuite/gdb.base/unloadshr.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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. */
-
-#include <stdio.h>
-
-int shrfunc1 (int x)
-{
-  return x + 4; /* unloadshr break */
-}
diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp
deleted file mode 100644
index 033005db0fd..00000000000
--- a/gdb/testsuite/gdb.base/until.exp
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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
-
-# until.exp -- Expect script to test 'until' in gdb
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile "break"
-set srcfile ${testfile}.c
-set srcfile1 ${testfile}1.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
-set bp_location19 [gdb_get_line_number "set breakpoint 19 here"]
-set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
-set bp_location21 [gdb_get_line_number "set breakpoint 21 here"]
-
-if ![runto_main] then {
-    fail "Can't run to main"
-    return 0
-}
-
-# Verify that "until <location>" works.  (This is really just syntactic
-# sugar for "tbreak <location>; continue".)
-#
-gdb_test "until $bp_location1" \
-	"main .* at .*:$bp_location1.*" \
-	"until line number"
-
-# Verify that a malformed "advance" is gracefully caught.
-#
-gdb_test "until 80 then stop" \
-	"Junk at end of arguments." "malformed until"
-
-# Rerun up to factorial, outer invocation
-if { ![runto factorial] } then { gdb_suppress_tests; }
-delete_breakpoints
-
-# At this point, 'until' should continue the inferior up to when all the
-# inner invocations of factorial() are completed and we are back at this
-# frame.
-#
-gdb_test "until $bp_location19" \
-	"factorial.*value=720.*at.*${srcfile}:$bp_location19.*return \\(value\\).*" \
-	"until factorial, recursive function"
-
-# Run to a function called by main
-#
-if { ![runto marker2] } then { gdb_suppress_tests; }
-delete_breakpoints
-
-# Now issue an until with another function, not called by the current
-# frame, as argument. This should not work, i.e. the program should
-# stop at main, the caller, where we put the 'guard' breakpoint.
-#
-gdb_test "until marker3" \
-	"($hex in |)main.*argc.*argv.*envp.*at.*${srcfile}:($bp_location20.*marker2 \\(43\\)|$bp_location21.*marker3 \\(.stack., .trace.\\)).*" \
-	"until func, not called by current frame"
-
diff --git a/gdb/testsuite/gdb.base/varargs.c b/gdb/testsuite/gdb.base/varargs.c
deleted file mode 100644
index 1122767977c..00000000000
--- a/gdb/testsuite/gdb.base/varargs.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* varargs.c - 
- * (Added as part of fix for bug 15306 - "call" to varargs functions fails)
- * This program is intended to let me try out "call" to varargs functions
- * with varying numbers of declared args and various argument types.
- * - RT 9/27/95
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-
-int find_max1(int, ...);
-int find_max2(int, int, ...);
-double find_max_double(int, double, ...);
-
-char ch;
-unsigned char uc;
-short s;
-unsigned short us;
-int a,b,c,d;
-int max_val;
-long long ll;
-float fa,fb,fc,fd;
-double da,db,dc,dd;
-double dmax_val;
-
-int main() {
-  c = -1;
-  uc = 1;
-  s = -2;
-  us = 2;
-  a = 1;
-  b = 60;
-  max_val = find_max1(1, 60);
-  max_val = find_max1(a, b);
-  a = 3;
-  b = 1;
-  c = 4;
-  d = 2;
-  max_val = find_max1(3, 1, 4, 2);
-  max_val = find_max2(a, b, c, d);
-  da = 3.0;
-  db = 1.0;
-  dc = 4.0;
-  dd = 2.0;
-  dmax_val = find_max_double(3, 1.0, 4.0, 2.0);
-  dmax_val = find_max_double(a, db, dc, dd);
-  
-  return 0;
-}
-
-/* Integer varargs, 1 declared arg */
-
-int find_max1(int num_vals, ...) {
-  int max_val = 0;
-  int x;
-  int i;
-  va_list argp;
-  va_start(argp, num_vals);
-  printf("find_max(%d,", num_vals);
-  for (i = 0; i < num_vals; i++) {
-    x = va_arg(argp, int);
-    if (max_val < x) max_val = x;
-    if (i < num_vals - 1)
-      printf(" %d,", x);
-    else
-      printf(" %d)", x);
-  }
-  printf(" returns %d\n", max_val);
-  return max_val;
-}
-
-/* Integer varargs, 2 declared args */
-
-int find_max2(int num_vals, int first_val, ...) {
-  int max_val = 0;
-  int x;
-  int i;
-  va_list argp;
-  va_start(argp, first_val);
-  x = first_val;
-  if (max_val < x) max_val = x;
-  printf("find_max(%d, %d", num_vals, first_val);
-  for (i = 1; i < num_vals; i++) {
-    x = va_arg(argp, int);
-    if (max_val < x) max_val = x;
-    printf(", %d", x);
-  }
-  printf(") returns %d\n", max_val);
-  return max_val;
-}
-
-/* Double-float varargs, 2 declared args */
-
-double find_max_double(int num_vals, double first_val, ...) {
-  double max_val = 0;
-  double x;
-  int i;
-  va_list argp;
-  va_start(argp, first_val);
-  x = first_val;
-  if (max_val < x) max_val = x;
-  printf("find_max(%d, %f", num_vals, first_val);
-  for (i = 1; i < num_vals; i++) {
-    x = va_arg(argp, double);
-    if (max_val < x) max_val = x;
-    printf(", %f", x);
-  }
-  printf(") returns %f\n", max_val);
-  return max_val;
-}
-
diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp
deleted file mode 100644
index 22fa84a3c53..00000000000
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1997, 1998, 1999, 2000 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-
-# this file tests command line calls with functions having variable
-# args list
-# corresponding source file: varargs.c
-
-#print find_max1(5,1,2,3,4,5)
-#print find_max1(1,3)
-#call find_max1(10,1,2,3,4,5,6,7,8,29,0)
-#print find_max2(3,1,2,3)
-#print find_max_double(5,1.0,17.0,2.0,3.0,4.0)
-#quit
-
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set prototypes 0
-set testfile "varargs"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if {$hp_cc_compiler} {
-    set additional_flags "additional_flags=-Ae"
-} else {
-    set additional_flags ""
-}
-
-# build the first test case
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug ${additional_flags}}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set print address off\n" ; gdb_expect -re "$gdb_prompt $"
-send_gdb "set width 0\n" ; gdb_expect -re "$gdb_prompt $"
-
-if [gdb_skip_stdio_test "varargs.exp"] {
-    # Nothing in this module is testable without printf.
-    return;
-}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-if { $hp_aCC_compiler } {
-    # When compiled w/ aCC we need to disable overload resolution
-    # for command line calls.
-    # We need it for vararg calls since the aCC compiler gives us no
-    # information about the undeclared arguments, or even that there 
-    # _are_ undeclared arguments. As far as gdb is concerned it only
-    # knows about the declared arguments. So we need to force the call
-    # even though the overload resolution mechanism says that the types
-    # don't match. 
-    # - guo
-    gdb_test "set overload-resolution 0" ""
-}
-
-send_gdb "print find_max1(5,1,2,3,4,5)\n"
-gdb_expect {
-    -re ".*find_max\\(5, 1, 2, 3, 4, 5\\) returns 5\[ \r\n\]+.\[0-9\]+ = 5.*$gdb_prompt $" {
-        pass "print find_max1(5,1,2,3,4,5)"
-      }
-    -re ".*$gdb_prompt $" { fail "print find_max1(5,1,2,3,4,5)" }
-    timeout           { fail "(timeout) print find_max1(5,1,2,3,4,5)" }
-  }
-
-
-
-
-send_gdb "print find_max1(1,3)\n"
-gdb_expect {
-    -re ".*find_max\\(1, 3\\) returns 3\[ \r\n\]+.\[0-9\]+ = 3.*$gdb_prompt $" {
-        pass "print find_max1(1,3)"
-      }
-    -re ".*$gdb_prompt $" { fail "print find_max1(1,3)" }
-    timeout           { fail "(timeout) print find_max1(1,3)" }
-  }
-
-
-send_gdb "print find_max1(10,1,2,3,4,5,6,7,8,29,0)\n"
-gdb_expect {
-    -re ".*find_max\\(10, 1, 2, 3, 4, 5, 6, 7, 8, 29, 0\\) returns 29\[ \r\n\]+.\[0-9\]+ = 29.*$gdb_prompt $" {
-        pass "print find_max1(10,1,2,3,4,5,6,7,8,29,0)"
-      }
-    -re ".*$gdb_prompt $" { fail "print find_max1(10,1,2,3,4,5,6,7,8,29,0)" }
-    timeout           { fail "(timeout) print find_max1(10,1,2,3,4,5,6,7,8,29,0)" }
-  }
-
-
-
-send_gdb "print find_max2(3,1,2,3)\n"
-gdb_expect {
-    -re ".*find_max\\(3, 1, 2, 3\\) returns 3\[ \r\n\]+.\[0-9\]+ = 3.*$gdb_prompt $" {
-        pass "print find_max2(3,1,2,3)"
-      }
-    -re ".*$gdb_prompt $" { fail "print find_max2(3,1,2,3)" }
-    timeout           { fail "(timeout) print find_max2(3,1,2,3)" }
-  }
-
-
-if {![target_info exists gdb,skip_float_tests]} {
-  send_gdb "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)\n"
-  gdb_expect {
-    -re ".*find_max\\(.*\\) returns 17\\.000000\[ \r\n\]+.\[0-9\]+ = 17.*$gdb_prompt $" {
-      pass "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)"
-    }
-    -re ".*$gdb_prompt $" { fail "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)" }
-    timeout           { fail "(timeout) print find_max_double(5,1.0,17.0,2.0,3.0,4.0)" }
-  }
-}
-
diff --git a/gdb/testsuite/gdb.base/vforked-prog.c b/gdb/testsuite/gdb.base/vforked-prog.c
deleted file mode 100644
index 27504db528a..00000000000
--- a/gdb/testsuite/gdb.base/vforked-prog.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-
-#ifdef PROTOTYPES
-int main (void)
-#else
-main()
-#endif
-{
-  printf("Hello from vforked-prog...\n");
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
deleted file mode 100644
index b6623f8ce9a..00000000000
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1997, 1998, 1999, 2003, 2004 Free Software Foundation, 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.  
-
-# Written by Satish Pai <pai@apollo.hp.com> 1997-07-07
-#    In the spirit of constvars.exp: added volatile, const-volatile stuff.
-
-# This file is part of the gdb testsuite
-# Tests for:
-#           volatile vars
-#           pointers to volatile vars
-#           const volatile vars
-#           pointers to const volatile vars
-#           const pointers to volatile vars
-#           volatile pointers to const vars
-#           const volatile pointers to const vars
-#           const volatile pointers to volatile vars
-#           ... etc.  (you get the idea)
-# Mostly with char and unsigned char.                    
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-# Use the same test program constvars.c.
-
-set testfile "constvars"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-get_debug_format
-
-# Many tests xfail with gcc 2 -gstabs+.
-# TODO: check out the hp side of this.
-
-proc local_compiler_xfail_check { } {
-    if { [test_compiler_info gcc-2-*] } then {
-	if { ![test_debug_format "HP"] \
-		&& ![test_debug_format "DWARF 2"] } then {
-	    setup_xfail "*-*-*" 
-	}
-    }
-
-    global hp_cc_compiler
-    if { $hp_cc_compiler } {
-	setup_xfail "hppa*-*-hpux*"
-    }
-}
-
-# A few tests still xfail with gcc 3 -gstabs+ and gcc 4 -gstabs+.
-
-proc local_compiler_xfail_check_2 { } {
-    if { [test_compiler_info gcc-3-*] || [test_compiler_info gcc-4-*] } {
-	if { [test_debug_format "stabs" ] } {
-	    setup_xfail "*-*-*"
-	}
-    }
-}
-
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
-            send_gdb "up\n"
-            gdb_expect {
-                -re ".*$gdb_prompt $" {}
-                timeout { fail "up from marker1" }
-            }
-        }
-        -re "Break.* marker1__.* \\(\\) at .*:$decimal.*$gdb_prompt $" {
-	    fail "continue to marker1 (demangling)"
-            send_gdb "up\n"
-            gdb_expect {
-                -re ".*$gdb_prompt $" {}
-                timeout { fail "up from marker1" }
-            }
-        }
-        -re "$gdb_prompt $" { fail "continue to marker1"  }
-        timeout { fail "(timeout) continue to marker1"  }
-    }
-
-# As of Feb 1999, GCC does not issue info about volatility of vars, so
-# these tests are all expected to fail if GCC is the compiler. -sts
-
-local_compiler_xfail_check
-gdb_test "ptype vox" "type = volatile char.*"
-
-local_compiler_xfail_check
-gdb_test "ptype victuals" "type = volatile unsigned char.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vixen" "type = volatile short.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vitriol" "type = volatile (unsigned short|short unsigned)( int)?.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vellum" "type = volatile long.*"
-
-local_compiler_xfail_check
-gdb_test "ptype valve" "type = volatile (unsigned long|long unsigned)( int)?.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vacuity" "type = volatile float.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vertigo" "type = volatile double.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vampire" "type = volatile char \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype viper" "type = volatile unsigned char \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vigour" "type = volatile short( int)? \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vapour" "type = volatile (unsigned short|short unsigned)( int)? \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype ventricle" "type = volatile long( int)? \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vigintillion" "type = volatile (unsigned long|long unsigned)( int)? \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vocation" "type = volatile float \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype veracity" "type = volatile double \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vapidity" "type = volatile char \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype velocity" "type = volatile unsigned char \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype veneer" "type = volatile short( int)? \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype video" "type = volatile (unsigned short|short unsigned)( int) \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vacuum" "type = volatile long( int)? \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype veniality" "type = volatile (unsigned long|long unsigned)( int)? \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vitality" "type = volatile float \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype voracity" "type = volatile double \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype victor" "type = const volatile char.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vicar" "type = const volatile unsigned char.*"
-
-local_compiler_xfail_check
-gdb_test "ptype victory" "type = const volatile char \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vicarage" "type = const volatile unsigned char \\*.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vein" "type = volatile char \\* const.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vogue" "type = volatile unsigned char \\* const.*"
-
-local_compiler_xfail_check
-gdb_test "ptype cavern" "type = const volatile char \\* const.*"
-
-local_compiler_xfail_check
-gdb_test "ptype coverlet" "type = const volatile unsigned char \\* const.*"
-
-local_compiler_xfail_check
-gdb_test "ptype caveat" "type = const char \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype covenant" "type = const unsigned char \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vizier" "type = const volatile char \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vanadium" "type = const volatile unsigned char \\* volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vane" "type = char \\* const volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype veldt" "type = unsigned char \\* const volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype cove" "type = const char \\* const volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype cavity" "type = const unsigned char \\* const volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vagus" "type = volatile char \\* const volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vagrancy" "type = volatile unsigned char \\* const volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vagary" "type = const volatile char \\* const volatile.*"
-
-local_compiler_xfail_check
-gdb_test "ptype vendor" "type = const volatile unsigned char \\* const volatile.*"
-
-# test function parameters
-local_compiler_xfail_check
-local_compiler_xfail_check_2
-send_gdb "ptype qux2\n"
-gdb_expect {
-    -re "type = int \\(volatile unsigned char, const volatile int, volatile short( int)?, volatile long( int)? \\*, float \\* volatile, const volatile signed char \\* const volatile\\).*$gdb_prompt $" {
-        pass "ptype qux2"
-    }
-    -re ".*$gdb_prompt $" { fail "ptype qux2" }
-    timeout           { fail "(timeout) ptype qux2" }
-  }   
diff --git a/gdb/testsuite/gdb.base/watchpoint.c b/gdb/testsuite/gdb.base/watchpoint.c
deleted file mode 100644
index 1a61ba16521..00000000000
--- a/gdb/testsuite/gdb.base/watchpoint.c
+++ /dev/null
@@ -1,189 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-/*
- *	Since using watchpoints can be very slow, we have to take some pains to
- *	ensure that we don't run too long with them enabled or we run the risk
- *	of having the test timeout.  To help avoid this, we insert some marker
- *	functions in the execution stream so we can set breakpoints at known
- *	locations, without worrying about invalidating line numbers by changing
- *	this file.  We use null bodied functions are markers since gdb does
- *	not support breakpoints at labeled text points at this time.
- *
- *	One place we need is a marker for when we start executing our tests
- *	instructions rather than any process startup code, so we insert one
- *	right after entering main().  Another is right before we finish, before
- *	we start executing any process termination code.
- *
- *	Another problem we have to guard against, at least for the test
- *	suite, is that we need to ensure that the line that causes the
- *	watchpoint to be hit is still the current line when gdb notices
- *	the hit.  Depending upon the specific code generated by the compiler,
- *	the instruction after the one that triggers the hit may be part of
- *	the same line or part of the next line.  Thus we ensure that there
- *	are always some instructions to execute on the same line after the
- *	code that should trigger the hit.
- */
-
-int count = -1;
-int ival1 = -1;
-int ival2 = -1;
-int ival3 = -1;
-int ival4 = -1;
-int ival5 = -1;
-char buf[10];
-struct foo
-{
-  int val;
-};
-struct foo struct1, struct2, *ptr1, *ptr2;
-
-int doread = 0;
-
-void marker1 ()
-{
-}
-
-void marker2 ()
-{
-}
-
-void marker4 ()
-{
-}
-
-void marker5 ()
-{
-}
-
-void marker6 ()
-{
-}
-
-#ifdef PROTOTYPES
-void recurser (int  x)
-#else
-void recurser (x) int  x;
-#endif
-{
-  int  local_x;
-
-  if (x > 0)
-    recurser (x-1);
-  local_x = x;
-}
-
-void
-func2 ()
-{
-  int  local_a;
-  static int  static_b;
-
-  ival5++;
-  local_a = ival5;
-  static_b = local_a;
-}
-
-void
-func3 ()
-{
-  int x;
-  int y;
-
-  x = 0;
-  x = 1;				/* second x assignment */
-  y = 1;
-  y = 2;
-}
-
-int
-func1 ()
-{
-  /* The point of this is that we will set a breakpoint at this call.
-
-     Then, if DECR_PC_AFTER_BREAK equals the size of a function call
-     instruction (true on a sun3 if this is gcc-compiled--FIXME we
-     should use asm() to make it work for any compiler, present or
-     future), then we will end up branching to the location just after
-     the breakpoint.  And we better not confuse that with hitting the
-     breakpoint.  */
-  func2 ();
-  return 73;
-}
-
-int main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  struct1.val = 1;
-  struct2.val = 2;
-  ptr1 = &struct1;
-  ptr2 = &struct2;
-  marker1 ();
-  func1 ();
-  for (count = 0; count < 4; count++) {
-    ival1 = count;
-    ival3 = count; ival4 = count;
-  }
-  ival1 = count; /* Outside loop */
-  ival2 = count;
-  ival3 = count; ival4 = count;
-  marker2 ();
-  if (doread)
-    {
-      static char msg[] = "type stuff for buf now:";
-      write (1, msg, sizeof (msg) - 1);
-      read (0, &buf[0], 5);
-    }
-  marker4 ();
-
-  /* We have a watchpoint on ptr1->val.  It should be triggered if
-     ptr1's value changes.  */
-  ptr1 = ptr2;
-
-  /* This should not trigger the watchpoint.  If it does, then we
-     used the wrong value chain to re-insert the watchpoints or we
-     are not evaluating the watchpoint expression correctly.  */
-  struct1.val = 5;
-  marker5 ();
-
-  /* We have a watchpoint on ptr1->val.  It should be triggered if
-     ptr1's value changes.  */
-  ptr1 = ptr2;
-
-  /* This should not trigger the watchpoint.  If it does, then we
-     used the wrong value chain to re-insert the watchpoints or we
-     are not evaluating the watchpoint expression correctly.  */
-  struct1.val = 5;
-  marker5 ();
-
-  /* We're going to watch locals of func2, to see that out-of-scope
-     watchpoints are detected and properly deleted.
-     */
-  marker6 ();
-
-  /* This invocation is used for watches of a single
-     local variable. */
-  func2 ();
-
-  /* This invocation is used for watches of an expression
-     involving a local variable. */
-  func2 ();
-
-  /* This invocation is used for watches of a static
-     (non-stack-based) local variable. */
-  func2 ();
-
-  /* This invocation is used for watches of a local variable
-     when recursion happens.
-     */
-  marker6 ();
-  recurser (2);
-
-  marker6 ();
-
-  func3 ();
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
deleted file mode 100644
index a69271b0aff..00000000000
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ /dev/null
@@ -1,814 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "watchpoint"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-set wp_set 1
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Prepare for watchpoint tests by setting up two breakpoints and one
-# watchpoint.
-#
-# We use breakpoints at marker functions to get past all the startup code,
-# so we can get to the watchpoints in a reasonable amount of time from a
-# known starting point.
-#
-# For simplicity, so we always know how to reference specific breakpoints or
-# watchpoints by number, we expect a particular ordering and numbering of
-# each in the combined breakpoint/watchpoint table, as follows:
-#
-#	Number		What		Where
-#	1		Breakpoint	marker1()
-#	2		Breakpoint	marker2()
-#	3		Watchpoint	ival3
-
-proc initialize {} {
-    global gdb_prompt
-    global hex
-    global decimal
-    global srcfile
-    global wp_set
-
-    # Disable hardware watchpoints if necessary.
-    if [target_info exists gdb,no_hardware_watchpoints] {
-	gdb_test "set can-use-hw-watchpoints 0" "" ""
-    }
-
-    if [gdb_test "break marker1" "Breakpoint 1 at $hex: file .*$srcfile, line $decimal.*" "set breakpoint at marker1" ] { 
-      return 0; 
-    }
-
-
-    if [gdb_test "break marker2" "Breakpoint 2 at $hex: file .*$srcfile, line $decimal.*" "set breakpoint at marker2" ] { 
-      return 0; 
-    }
-
-
-    if [gdb_test "info break" "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*" "info break in watchpoint.exp" ] { 
-      return 0; 
-    }
-
-
-    # ??rehrauer: To fix DTS #CHFts23014, in which setting a watchpoint
-    # before running can cause the inferior to croak on HP-UX 11.0 for
-    # reasons yet unknown, we've disabled the ability to set watches
-    # without a running inferior.  Verify the restriction. 
-    #
-    send_gdb "watch ival3\n"
-    gdb_expect {
-        -re ".*\[Ww\]atchpoint 3: ival3.*$gdb_prompt $" {
-            pass "set watchpoint on ival3"
-        }
-        -re "warning: can't do that without a running program; try \"break main\", \"run\" first.*$gdb_prompt $" {
-            pass "set watchpoint on ival3"
-            set wp_set 0
-            return 1
-        }
-        timeout {
-            fail "(timeout) set watchpoint on ival3"
-            return 0
-        }
-    }
-
-    # "info watch" is the same as "info break"
-
-    if [gdb_test "info watch" "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*\r\n3\[ \]*.*watchpoint.*ival3" "watchpoint found in watchpoint/breakpoint table" ] { 
-      return 0; 
-    }
-
-
-    # After installing the watchpoint, we disable it until we are ready
-    # to use it.  This allows the test program to run at full speed until
-    # we get to the first marker function.
-
-    if [gdb_test "disable 3" "disable 3\[\r\n\]+" "disable watchpoint" ] { 
-      return 0; 
-    }
-
-
-    return 1
-}
-
-#
-# Test simple watchpoint.
-#
-
-proc test_simple_watchpoint {} {
-    global gdb_prompt
-    global hex
-    global decimal
-    global wp_set
-
-    # Ensure that the watchpoint is disabled when we startup.
-
-    if { $wp_set } {
-        if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint in test_simple_watchpoint" ] { 
-	    return 0; 
-	}
-    }
-
-
-    # Run until we get to the first marker function.
-
-    gdb_run_cmd
-    set timeout 600
-    gdb_expect {
-	-re "Breakpoint 1, marker1 .*$gdb_prompt $" {
-	    pass "run to marker1 in test_simple_watchpoint"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "run to marker1 in test_simple_watchpoint"
-	    return
-	}
-	timeout {
-	    fail "run to marker1 in test_simple_watchpoint (timeout)"
-	    return
-	}
-    }
-
-    if { !$wp_set } {
-	# ??rehrauer: To fix DTS #CHFts23014, in which setting a watchpoint
-	# before running can cause the inferior to croak on HP-UX 11.0
-	# for reasons yet unknown, we've disabled the ability to set 
-	# watches without a running inferior.  The following testpoints used
-	# to be in [initialize].
-	#
-	send_gdb "watch ival3\n"
-	gdb_expect {
-	    -re ".*\[Ww\]atchpoint 3: ival3\r\n$gdb_prompt $" { 
-	        pass "set watchpoint on ival3"
-	    }
-	    -re ".*$gdb_prompt $" { fail "set watchpoint on ival3"  }
-	    timeout { fail "set watchpoint on ival3 (timeout)"  }
-	}
-
-        set wp_set 1
-
-	# "info watch" is the same as "info break"
-
-	send_gdb "info watch\n"
-	gdb_expect {
-	    -re "1\[ \]*breakpoint.*marker1.*\r\n2\[ \]*breakpoint.*marker2.*\r\n3\[ \]*.*watchpoint.*ival3\r\n$gdb_prompt $" {
-	        pass "watchpoint found in watchpoint/breakpoint table"
-	    }
-	    -re ".*$gdb_prompt $" {
-	        fail "watchpoint found in watchpoint/breakpoint table"
-	    }
-	    timeout {
-	       fail "watchpoint found in watchpoint/breakpoint table"
-	    }
-	}
-
-	# After installing the watchpoint, we disable it until we are ready
-	# to use it.  This allows the test program to run at full speed until
-	# we get to the first marker function.
-
-	send_gdb "disable 3\n"
-	gdb_expect {
-	    -re "disable 3\[\r\n\]+$gdb_prompt $" { pass "disable watchpoint" }
-	    -re ".*$gdb_prompt $" { fail "disable watchpoint"  }
-	    timeout { fail "disable watchpoint (timeout)"  }
-	}
-    }
-
-    # After reaching the marker function, enable the watchpoint.
-
-    if [gdb_test "enable 3" "^enable 3\[\r\n\]+" "enable watchpoint" ] { 
-      return ; 
-    }
-
-
-    gdb_test "break func1" "Breakpoint.*at.*"
-    gdb_test "set \$func1_breakpoint_number = \$bpnum" ""
-
-    gdb_test "continue" "Continuing.*Breakpoint \[0-9\]*, func1.*" \
-	"continue to breakpoint at func1"
-
-    # Continue until the first change, from -1 to 0
-
-    send_gdb "cont\n"
-    gdb_expect {
-	-re "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count; ival4 = count;.*$gdb_prompt $" {
-	    pass "watchpoint hit, first time"
-	}
-	-re "Continuing.*Breakpoint.*func1.*$gdb_prompt $" {
-	    setup_xfail "m68*-*-*" 2597
-	    fail "thought it hit breakpoint at func1 twice"
-	    gdb_test "delete \$func1_breakpoint_number" ""
-	    gdb_test "continue" "\
-Continuing.*\[Ww\]atchpoint.*ival3.*Old value = -1.*New value = 0.*ival3 = count;" \
-		"watchpoint hit, first time"
-	}
-	-re ".*$gdb_prompt $" { fail "watchpoint hit, first time" ; return }
-	timeout { fail "watchpoint hit, first time (timeout)" ; return }
-	eof { fail "watchpoint hit, first time (eof)" ; return }
-    }
-
-    # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 1 time.*" "Watchpoint hit count is 1"
-
-    gdb_test "delete \$func1_breakpoint_number" ""
-
-    # Continue until the next change, from 0 to 1.
-    gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = 1.*ival3 = count; ival4 = count;.*" "watchpoint hit, second time"
-
-    # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 2 times.*" "Watchpoint hit count is 2"
-
-    # Continue until the next change, from 1 to 2.
-    gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 1.*New value = 2.*ival3 = count; ival4 = count;.*" "watchpoint hit, third time"
-
-    # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 3 times.*" "Watchpoint hit count is 3"
-    
-    # Continue until the next change, from 2 to 3.
-    gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 2.*New value = 3.*ival3 = count; ival4 = count;.*" "watchpoint hit, fourth time"
-
-    # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 4 times.*" "Watchpoint hit count is 4"
-
-    # Continue until the next change, from 3 to 4.
-    # Note that this one is outside the loop.
-
-    gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 3.*New value = 4.*ival3 = count; ival4 = count;.*" "watchpoint hit, fifth time"
-
-    # Check that the hit count is reported correctly
-    gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival3\r\n\[ \t]+breakpoint already hit 5 times.*" "Watchpoint hit count is 5"
-
-    # Continue until we hit the finishing marker function.
-    # Make sure we hit no more watchpoints.
-
-    gdb_test "cont" "Continuing.*Breakpoint.*marker2 \(\).*" \
-	"continue to marker2"
-
-    # Disable the watchpoint so we run at full speed until we exit.
-
-    if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "watchpoint disabled" ] { 
-      return ; 
-    }
-
-
-    # Run until process exits.
-
-    if [target_info exists gdb,noresults] { return }
-
-    gdb_continue_to_end "continue to exit in test_simple_watchpoint"
-}
-
-# Test disabling watchpoints.
-
-proc test_disabling_watchpoints {} {
-    global gdb_prompt
-    global binfile
-    global srcfile
-    global decimal
-    global hex
-
-    # "info watch" is the same as "info break"
-    gdb_test "info watch" "\[0-9\]+\[ \]*breakpoint.*marker1.*\r\n\[0-9\]+\[ \]*breakpoint.*marker2.*\r\n\[0-9]+\[ \]*.*watchpoint.*ival3\r\n\.*\[0-9\]+ times.*" "watchpoints found in watchpoint/breakpoint table"
-
-    # Ensure that the watchpoint is disabled when we startup.
-
-    if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint in test_disabling_watchpoints" ] { 
-      return 0; 
-    }
-
-
-    # Run until we get to the first marker function.
-
-    gdb_run_cmd
-    set timeout 600
-    gdb_expect {
-	-re "Breakpoint 1, marker1 .*$gdb_prompt $" {
-	    pass "run to marker1 in test_disabling_watchpoints"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "run to marker1 in test_disabling_watchpoints"
-	    return
-	}
-	timeout {
-	    fail "run to marker1 in test_disabling_watchpoints (timeout)"
-	    return
-	}
-    }
-
-    # After reaching the marker function, enable the watchpoint.
-
-    if [gdb_test "enable 3" "^enable 3\[\r\n\]+" "watchpoint enabled" ] { 
-      return ; 
-    }
-
-
-    # Continue until the first change, from -1 to 0
-    # Don't check the old value, because on VxWorks the variable value
-    # will not have been reinitialized.
-    gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = .*New value = 0.*ival3 = count; ival4 = count;.*" "watchpoint hit in test_disabling_watchpoints, first time"
-    
-    # Continue until the next change, from 0 to 1.
-    gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = 1.*ival3 = count; ival4 = count;.*" "watchpoint hit in test_disabling_watchpoints, second time"
-    
-    # Disable the watchpoint but leave breakpoints
-
-    if [gdb_test "disable 3" "^disable 3\[\r\n\]+" "disable watchpoint #2 in test_disabling_watchpoints" ] { 
-      return 0; 
-    }
-
-
-    # Check watchpoint list, looking for the entry that confirms the
-    # watchpoint is disabled.
-    gdb_test "info watchpoints" "\[0-9]+\[ \]*.*watchpoint\[ \]*keep\[ \]*n\[ \]*ival3\r\n.*" "watchpoint disabled in table"
-
-    # Continue until we hit the finishing marker function.
-    # Make sure we hit no more watchpoints.
-    gdb_test "cont" "Continuing.*Breakpoint.*marker2 \\(\\).*" \
-	"disabled watchpoint skipped"
-    
-    if [target_info exists gdb,noresults] { return }
-
-    gdb_continue_to_end "continue to exit in test_disabling_watchpoints"
-}
-
-# Test stepping and other mundane operations with watchpoints enabled
-proc test_stepping {} {
-    global gdb_prompt
-
-    if [runto marker1] then {
-	gdb_test "watch ival2" ".*\[Ww\]atchpoint \[0-9\]*: ival2"
-
-	# Well, let's not be too mundane.  It should be a *bit* of a challenge
-	gdb_test "break func2 if 0" "Breakpoint.*at.*"
-	gdb_test "p \$func2_breakpoint_number = \$bpnum" " = .*"
-
-	gdb_test "p func1 ()" "= 73" \
-	    "calling function with watchpoint enabled"
-
-	# 
-	# "finish" brings us back to main.
-	# On some targets (e.g. alpha) gdb will stop from the finish in midline
-	# of the marker1 call. This is due to register restoring code on
-	# the alpha and might be caused by stack adjustment instructions
-	# on other targets. In this case we will step once more.
-	#
-
-	send_gdb "finish\n"
-	gdb_expect {
-	    -re "Run.*exit from.*marker1.* at" {
-		pass "finish from marker1"
-	    }
-	    default { fail "finish from marker1 (timeout)" ; return }
-	}
-
-	gdb_expect {
-	    -re "marker1 \\(\\);.*$gdb_prompt $" {
-		send_gdb "step\n"
-		exp_continue
-	    }
-	    -re "func1 \\(\\);.*$gdb_prompt $" {
-		pass "back at main from marker1"
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "back at main from marker1"
-	    }
-	    default { fail "back at main from marker1 (timeout)" ; return }
-	}
-
-	gdb_test "next" "for \\(count = 0.*" "next to `for' in watchpoint.exp"
-
-	# Now test that "until" works.  It's a bit tricky to test
-	# "until", because compilers don't always arrange the code
-	# exactly the same way, and we might get slightly different
-	# sequences of statements.  But the following should be true
-	# (if not it is a compiler or a debugger bug): The user who
-	# does "until" at every statement of a loop should end up
-	# stepping through the loop once, and the debugger should not
-	# stop for any of the remaining iterations.
-
-	gdb_test "until" "ival1 = count.*" "until to ival1 assignment"
-	gdb_test "until" "ival3 = count.*" "until to ival3 assignment"
-	send_gdb "until\n"
-	gdb_expect {
-	    -re "(for \\(count = 0|\}).*$gdb_prompt $" {
-		gdb_test "until" "ival1 = count; /. Outside loop ./" \
-		    "until out of loop"
-	    }
-	    -re "ival1 = count; /. Outside loop ./.*$gdb_prompt $" {
-		pass "until out of loop"
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "until out of loop"
-	    }
-	    default { fail "until out of loop (timeout)" ; return }
-	}
-
-	gdb_test "step" "ival2 = count.*" "step to ival2 assignment"
-    }
-}
-
-# Test stepping and other mundane operations with watchpoints enabled
-proc test_watchpoint_triggered_in_syscall {} {
-    global gdb_prompt
-
-    # These tests won't work without printf support.
-    if [gdb_skip_stdio_test "watchpoints triggered in syscall"] {
-	return;
-    }
-    # Run until we get to the first marker function.
-    set x 0
-    set y 0
-    set testname "Watch buffer passed to read syscall"
-    if [runto marker2] then {
-	gdb_test "watch buf\[0\]" ".*\[Ww\]atchpoint \[0-9\]*: buf\\\[0\\\]"
-	gdb_test "watch buf\[1\]" ".*\[Ww\]atchpoint \[0-9\]*: buf\\\[1\\\]"
-	gdb_test "watch buf\[2\]" ".*\[Ww\]atchpoint \[0-9\]*: buf\\\[2\\\]"
-	gdb_test "watch buf\[3\]" ".*\[Ww\]atchpoint \[0-9\]*: buf\\\[3\\\]"
-	gdb_test "watch buf\[4\]" ".*\[Ww\]atchpoint \[0-9\]*: buf\\\[4\\\]"
-	gdb_test "break marker4" ".*Breakpoint.*"
-
-	gdb_test "set doread = 1" ""
-
-	# If we send_gdb "123\n" before gdb has switched the tty, then it goes
-	# to gdb, not the inferior, and we lose.  So that is why we have
-	# watchpoint.c prompt us, so we can wait for that prompt.
-	send_gdb "continue\n";
-	gdb_expect {
-	    -re "Continuing\\.\r\ntype stuff for buf now:" {
-		pass "continue to read"
-	    }
-	    default {
-		fail "continue to read";
-		return ;
-	    }
-	}
-
-	send_gdb "123\n"
-	gdb_expect {
-	    -re ".*\[Ww\]atchpoint.*buf\\\[0\\\].*Old value = 0.*New value = 49\[^\n\]*\n" { set x [expr $x+1] ; exp_continue }
-	    -re ".*\[Ww\]atchpoint.*buf\\\[1\\\].*Old value = 0.*New value = 50\[^\n\]*\n" { set x [expr $x+1] ; exp_continue }
-	    -re ".*\[Ww\]atchpoint.*buf\\\[2\\\].*Old value = 0.*New value = 51\[^\n\]*\n" { set x [expr $x+1] ; exp_continue }
-	    -re ".*\[Ww\]atchpoint.*buf\\\[3\\\].*Old value = 0.*New value = 10\[^\n\]*\n" { set x [expr $x+1] ; exp_continue }
-	    -re ".*$gdb_prompt $" { pass "sent 123" }
-	    timeout { fail "sent 123 (timeout)" }
-	}
-
-	# Examine the values in buf to see how many watchpoints we
-	# should have printed.
-	send_gdb "print buf\[0\]\n"
-	gdb_expect {
-	    -re ".*= 49.*$gdb_prompt $" { set y [expr $y+1]; pass "print buf\[0\]"}
-	    -re ".*= 0.*$gdb_prompt $" { pass "print buf\[0\]"}
-	    -re ".*$gdb_prompt $" { fail "print buf\[0\]"}
-	    default { fail "print buf\[0\]"}
-	}
-	send_gdb "print buf\[1\]\n"
-	gdb_expect {
-	    -re ".*= 50.*$gdb_prompt $" { set y [expr $y+1]; pass "print buf\[1\]"}
-	    -re ".*= 0.*$gdb_prompt $" { pass "print buf\[1\]"}
-	    -re ".*$gdb_prompt $" { fail "print buf\[1\]"}
-	    default { fail "print buf\[1\]"}
-	}
-	send_gdb "print buf\[2\]\n"
-	gdb_expect {
-	    -re ".*= 51.*$gdb_prompt $" { set y [expr $y+1]; pass "print buf\[2\]"}
-	    -re ".*= 0.*$gdb_prompt $" { pass "print buf\[2\]"}
-	    -re ".*$gdb_prompt $" { fail "print buf\[2\]"}
-	    default { fail "print buf\[2\]"}
-	}
-	send_gdb "print buf\[3\]\n"
-	gdb_expect {
-	    -re ".*= 10.*$gdb_prompt $" { set y [expr $y+1]; pass "print buf\[3\]"}
-	    -re ".*= 0.*$gdb_prompt $" { pass "print buf\[3\]"}
-	    -re ".*$gdb_prompt $" { fail "print buf\[3\]" }
-	    default { fail "print buf\[3\]" }
-	}
-
-	# Did we find what we were looking for?  If not, flunk it.
-	if [expr $x==$y] then { pass $testname } else { fail "$testname (only triggered $x watchpoints, expected $y)"}
-
-	# Continue until we hit the finishing marker function.
-	# Make sure we hit no more watchpoints.
-	gdb_test "cont" "Continuing.*Breakpoint.*marker4 \\(\\).*" \
-	    "continue to marker4"
-
-	# Disable everything so we can finish the program at full speed
-	gdb_test "disable" "" "disable in test_watchpoint_triggered_in_syscall"
-
-	if [target_info exists gdb,noresults] { return }
-
-	gdb_continue_to_end "continue to exit in test_watchpoint_triggered_in_syscall"
-    }
-}
-
-# Do a simple test of of watching through a pointer when the pointer
-# itself changes.  Should add some more complicated stuff here.
-
-proc test_complex_watchpoint {} {
-    global gdb_prompt
-
-    if [runto marker4] then {
-	gdb_test "watch ptr1->val" ".*\[Ww\]atchpoint \[0-9\]*: ptr1->val"
-	gdb_test "break marker5" ".*Breakpoint.*"
-
-	gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ptr1->val.*Old value = 1.*New value = 2.*" "Test complex watchpoint"
-
-	# Continue until we hit the marker5 function.
-	# Make sure we hit no more watchpoints.
-
-	gdb_test "cont" "Continuing.*Breakpoint.*marker5 \\(\\).*" \
-	    "did not trigger wrong watchpoint"
-
-        # Test watches of things declared locally in a function.
-        # In particular, test that a watch of stack-based things
-        # is deleted when the stack-based things go out of scope.
-        #
-	gdb_test "disable" "" "disable in test_complex_watchpoint"
-        gdb_test "break marker6" ".*Breakpoint.*"
-        gdb_test "cont" "Continuing.*Breakpoint.*marker6 \\(\\).*" \
-            "continue to marker6"
-        gdb_test "break func2" ".*Breakpoint.*"
-        gdb_test "cont" "Continuing.*func2.*"
-
-        # Test a watch of a single stack-based variable, whose scope
-        # is the function we're now in.  This should auto-delete when
-        # execution exits the scope of the watchpoint.
-        #
-        gdb_test "watch local_a" ".*\[Ww\]atchpoint \[0-9\]*: local_a" "set local watch"
-        gdb_test "cont" "\[Ww\]atchpoint.*local_a.*" "trigger local watch"
-        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .* deleted because the program has left the block in.*which its expression is valid.*" "self-delete local watch"
-
-        gdb_test "cont" "Continuing.*func2.*"
-        # We should be in "func2" again now.  Test a watch of an
-        # expression which includes both a stack-based local and
-        # something whose scope is larger than this invocation
-        # of "func2".  This should also auto-delete.
-        #
-        gdb_test "watch local_a + ival5" ".*\[Ww\]atchpoint \[0-9\]*: local_a . ival5" \
-                 "set partially local watch"
-        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: local_a . ival5.*" \
-                 "trigger1 partially local watch"
-        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: local_a . ival5.*" \
-                 "trigger2 partially local watch"
-        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .* deleted because the program has left the block in.*which its expression is valid.*" \
-                 "self-delete partially local watch"
-
-        # We should be in "func2" again now.  Test a watch of a
-        # static (non-stack-based) local.  Since this has scope
-        # across any invocations of "func2", it should not auto-
-        # delete.
-        #
-        gdb_test "cont" "Continuing.*func2.*"
-        gdb_test "watch static_b" ".*\[Ww\]atchpoint \[0-9\]*: static_b" \
-                 "set static local watch"
-        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: static_b.*" \
-                 "trigger static local watch"
-        gdb_test "cont" "Continuing.*marker6 \\(\\).*" \
-                 "continue after trigger static local watch"
-        gdb_test "info break" ".*watchpoint.*static_b.*" \
-                 "static local watch did not self-delete"
-
-        # We should be in "recurser" now.  Test a watch of a stack-
-        # based local.  Symbols mentioned in a watchpoint are bound
-        # at watchpoint-creation.  Thus, a watch of a stack-based
-        # local to a recursing function should be bound only to that
-        # one invocation, and should not trigger for other invocations.
-        #
-        gdb_test "tbreak recurser" ".*Breakpoint.*"
-        gdb_test "cont" "Continuing.*recurser.*"
-        gdb_test "watch local_x" ".*\[Ww\]atchpoint \[0-9\]*: local_x" \
-                 "set local watch in recursive call"
-        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .*: local_x.*New value = 2.*" \
-                 "trigger local watch in recursive call"
-        gdb_test "cont" "Continuing.*\[Ww\]atchpoint .* deleted because the program has left the block in.*which its expression is valid.*" \
-                 "self-delete local watch in recursive call"
-
-	# Disable everything so we can finish the program at full speed
-	gdb_test "disable" "" "disable in test_complex_watchpoint"
-
-	if [target_info exists gdb,noresults] { return }
-
-	gdb_continue_to_end "continue to exit in test_complex_watchpoint"
-    }
-}
-
-proc test_watchpoint_and_breakpoint {} {
-    global gdb_prompt
-
-    # This is a test for PR gdb/38, which involves setting a
-    # watchpoint right after you've reached a breakpoint.
-
-    if [runto func3] then {
-	gdb_breakpoint [gdb_get_line_number "second x assignment"]
-	gdb_continue_to_breakpoint "second x assignment"
-	gdb_test "watch x" ".*atchpoint \[0-9\]+: x"
-	gdb_test_multiple "next" "next after watch x" {
-	    -re ".*atchpoint \[0-9\]+: x\r\n\r\nOld value = 0\r\nNew value = 1\r\n.*$gdb_prompt $" {
-		pass "next after watch x"
-	    }
-	    -re "\[0-9\]+\[\t \]+y = 1;\r\n$gdb_prompt $" {
-		kfail "gdb/38" "next after watch x"
-	    }
-	}
-    }
-}
-    
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-set prev_timeout $timeout
-set timeout 600	
-verbose "Timeout now 600 sec.\n"
-
-if [initialize] then {
-
-    test_simple_watchpoint
-
-    # The IDT/sim monitor only has 8 (!) open files, of which it uses
-    # 4 (!).  So we have to make sure one program exits before
-    # starting another one.
-    if [istarget "mips-idt-*"] then {
-	gdb_exit
-	gdb_start
-	gdb_reinitialize_dir $srcdir/$subdir
-	gdb_load $binfile
-	initialize
-    }
-
-    test_disabling_watchpoints
-
-    # See above.
-    if [istarget "mips-idt-*"] then {
-	gdb_exit
-	gdb_start
-	gdb_reinitialize_dir $srcdir/$subdir
-	gdb_load $binfile
-	initialize
-    }
-
-    if ![target_info exists gdb,cannot_call_functions] {
-	test_stepping
-
-	# See above.
-	if [istarget "mips-idt-*"] then {
-	    gdb_exit
-	    gdb_start
-	    gdb_reinitialize_dir $srcdir/$subdir
-	    gdb_load $binfile
-	    initialize
-	}
-    }
-
-    # Only enabled for some targets merely because it has not been tested 
-    # elsewhere.
-    # On sparc-sun-sunos4.1.3, GDB was running all the way to the marker4 
-    # breakpoint before stopping for the watchpoint.  I don't know why.
-    if {[istarget "hppa*-*-*"]} then {
-	test_watchpoint_triggered_in_syscall
-    }
-
-    # See above.
-    if [istarget "mips-idt-*"] then {
-	gdb_exit
-	gdb_start
-	gdb_reinitialize_dir $srcdir/$subdir
-	gdb_load $binfile
-	initialize
-    }
-
-    # Only enabled for some targets merely because it has not been tested 
-    # elsewhere.
-    if {[istarget "hppa*-*-*"] || \
-	    [istarget "sparc*-*-sunos*"] || \
-	    [istarget "m32r-*-*"]} then {
-	test_complex_watchpoint
-    }
-
-    # Verify that a user can force GDB to use "slow" watchpoints.
-    # (This proves rather little on kernels that don't support
-    # fast watchpoints, but still...)
-    #
-    if ![runto_main] then { fail "watch tests suppressed" }
-
-    send_gdb "set can-use-hw-watchpoints 0\n"
-    gdb_expect {
-      -re "$gdb_prompt $"\
-              {pass "disable fast watches"}
-      timeout {fail "(timeout) disable fast watches"}
-    }
-    send_gdb "show can-use-hw-watchpoints\n"
-    gdb_expect {
-      -re "Debugger's willingness to use watchpoint hardware is 0.*$gdb_prompt $"\
-              {pass "show disable fast watches"}
-      -re "$gdb_prompt $"\
-              {fail "show disable fast watches"}
-      timeout {fail "(timeout) show disable fast watches"}
-    }
-    send_gdb "watch ival3 if  count > 1\n"
-    gdb_expect {
-      -re "Watchpoint \[0-9\]*: ival3.*$gdb_prompt $"\
-              {pass "set slow conditional watch"}
-      -re "$gdb_prompt $"\
-              {fail "set slow conditional watch"}
-      timeout {fail "(timeout) set slow conditional watch"}
-    }
-    send_gdb "continue\n"
-    gdb_expect {
-      -re "Watchpoint \[0-9\]*: ival3.*Old value = 1.*New value = 2.*$gdb_prompt $"\
-              {pass "trigger slow conditional watch"}
-      -re "$gdb_prompt $"\
-              {fail "trigger slow conditional watch"}
-      timeout {fail "(timeout) trigger slow conditional watch"}
-    }
-
-    # We've explicitly disabled hardware watches.  Verify that GDB
-    # 
-    #
-    send_gdb "rwatch ival3\n"
-    gdb_expect {
-      -re "Expression cannot be implemented with read/access watchpoint..*$gdb_prompt $"\
-              {pass "rwatch disallowed when can-set-hw-watchpoints cleared"}
-      -re "$gdb_prompt $"\
-              {fail "rwatch disallowed when can-set-hw-watchpoints cleared"}
-      timeout {fail "(timeout) rwatch disallowed when can-use-hw-watchpoints cleared"}
-    }
-
-    # Read- and access watchpoints are unsupported on HP-UX.  Verify
-    # that GDB gracefully responds to requests to create them.
-    #
-    if [istarget "hppa*-*-hpux*"] then {
-      send_gdb "set can-use-hw-watchpoints 1\n"
-      gdb_expect {
-        -re "$gdb_prompt $"\
-                {pass "enable fast watches"}
-        timeout {fail "(timeout) enable fast watches"}
-      }
-      send_gdb "rwatch ival3\n"
-      gdb_expect {
-        -re "Target does not have this type of hardware watchpoint support.*$gdb_prompt $"\
-                {pass "read watches disallowed"}
-        -re "$gdb_prompt $"\
-                {fail "read watches disallowed"}
-        timeout {fail "(timeout) read watches disallowed"}
-      }
-
-      send_gdb "awatch ival3\n"
-      gdb_expect {
-        -re "Target does not have this type of hardware watchpoint support.*$gdb_prompt $"\
-                {pass "access watches disallowed"}
-        -re "$gdb_prompt $"\
-                {fail "access watches disallowed"}
-        timeout {fail "(timeout) access watches disallowed"}
-      }
-    }
-
-    # See above.
-    if [istarget "mips-idt-*"] then {
-	gdb_exit
-	gdb_start
-	gdb_reinitialize_dir $srcdir/$subdir
-	gdb_load $binfile
-	initialize
-    }
-
-    test_watchpoint_and_breakpoint
-}
-
-# Restore old timeout
-set timeout $prev_timeout
-verbose "Timeout now $timeout sec.\n"
diff --git a/gdb/testsuite/gdb.base/whatis-exp.exp b/gdb/testsuite/gdb.base/whatis-exp.exp
deleted file mode 100644
index e36683ed198..00000000000
--- a/gdb/testsuite/gdb.base/whatis-exp.exp
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1998, 1999 Free Software Foundation, 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 Elena Zannoni (ezannoni@cygnus.com)
-
-# This file is part of the gdb testsuite
-#
-# tests for whatis command on expressions.
-# used in file eval.c. This flavor of whatis
-# command performs evaluation of expressions w/o actually
-# computing the value, but just the type
-# of the result. It goes through the evaluate_subexp_standard
-# with the EVAL_AVOID_SIDE_EFFECTS flag rather than EVAL_NORMAL
-# 
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "int-type"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-#
-# test expressions with "int" types
-#
-
-gdb_test "set variable x=14" "" "set variable x=14"
-gdb_test "set variable y=2" "" "set variable y=2"
-gdb_test "set variable z=2" "" "set variable z=2"
-gdb_test "set variable w=3" "" "set variable w=3"
-
-send_gdb "print x\n"
-gdb_expect {
-    -re ".*14.*$gdb_prompt $" {
-        pass "print value of x"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of x" }
-    timeout           { fail "(timeout) print value of x" }    
-  }
-
-
-send_gdb "print y\n"
-gdb_expect {
-    -re ".*2.*$gdb_prompt $" {
-        pass "print value of y"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of y" }
-    timeout           { fail "(timeout) print value of y" }    
-  }
-
-send_gdb "print z\n"
-gdb_expect {
-    -re ".*2.*$gdb_prompt $" {
-        pass "print value of z"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of z" }
-    timeout           { fail "(timeout) print value of z" }    
-  }
-
-send_gdb "print w\n"
-gdb_expect {
-    -re ".*3.*$gdb_prompt $" {
-        pass "print value of w"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of w" }
-    timeout           { fail "(timeout) print value of w" }    
-  }
-
-
-
-send_gdb "whatis x+y\n"
-gdb_expect {
-    -re ".*type = long.*$gdb_prompt $" {
-        pass "whatis value of x+y"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x+y" }
-    timeout           { fail "(timeout) whatis value of x+y" }    
-  }
-
-send_gdb "whatis x-y\n"
-gdb_expect {
-    -re ".*type = long.*$gdb_prompt $" {
-        pass "whatis value of x-y"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x-y" }
-    timeout           { fail "(timeout) whatis value of x-y" }    
-  }
-
-send_gdb "whatis x*y\n"
-gdb_expect {
-    -re ".*type = long.*$gdb_prompt $" {
-        pass "whatis value of x*y"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x*y" }
-    timeout           { fail "(timeout) whatis value of x*y" }    
-  }
-
-send_gdb "whatis x/y\n"
-gdb_expect {
-    -re ".*type = int.*$gdb_prompt $" {
-        pass "whatis value of x/y"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x/y" }
-    timeout           { fail "(timeout) whatis value of x/y" }    
-  }
-
-send_gdb "whatis x%y\n"
-gdb_expect {
-    -re ".*type = int.*$gdb_prompt $" {
-        pass "whatis value of x%y"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x%y" }
-    timeout           { fail "(timeout) whatis value of x%y" }    
-  }
-
-
-
-send_gdb "whatis x=y\n"
-gdb_expect {
-    -re ".*type = int.*$gdb_prompt $" {
-        pass "whatis value of x=y"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x=y" }
-    timeout           { fail "(timeout) whatis value of x=y" }
-  }
-
-
-send_gdb "whatis x+=2\n"
-gdb_expect {
-    -re ".*type = int.*$gdb_prompt $" {
-        pass "whatis value of x+=2"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x+=2" }
-    timeout           { fail "(timeout) whatis value of x+=2" }
-  }
-
-
-send_gdb "whatis ++x\n"
-gdb_expect {
-    -re ".*type = int.*$gdb_prompt $" {
-        pass "whatis value of ++x"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of ++x" }
-    timeout           { fail "(timeout) whatis value of ++x" }
-  }
-
-send_gdb "whatis --x\n"
-gdb_expect {
-    -re ".*type = int.*$gdb_prompt $" {
-        pass "whatis value of --x"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of --x" }
-    timeout           { fail "(timeout) whatis value of --x" }
-  }
-
-send_gdb "whatis x++\n"
-gdb_expect {
-    -re ".*type = int.*$gdb_prompt $" {
-        pass "whatis value of x++"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x++" }
-    timeout           { fail "(timeout) whatis value of x++" }
-  }
-
-send_gdb "whatis x--\n"
-gdb_expect {
-    -re ".*type = int.*$gdb_prompt $" {
-        pass "whatis value of x--"
-      }
-    -re ".*$gdb_prompt $" { fail "whatis value of x--" }
-    timeout           { fail "(timeout) whatis value of x--" }
-  }
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.base/whatis.c b/gdb/testsuite/gdb.base/whatis.c
deleted file mode 100644
index 7d4a647781f..00000000000
--- a/gdb/testsuite/gdb.base/whatis.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/* This test program is part of GDB, the GNU debugger.
-
-   Copyright 1992, 1993, 1994, 1997, 1999, 2004
-   Free Software Foundation, 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.
-   */
-
-/*
- *	Test file with lots of different types, for testing the
- *	"whatis" command.
- */
-
-/*
- *	First the basic C types.
- */
-
-char		v_char;
-signed char	v_signed_char;
-unsigned char	v_unsigned_char;
-
-short		v_short;
-signed short	v_signed_short;
-unsigned short	v_unsigned_short;
-
-int		v_int;
-signed int	v_signed_int;
-unsigned int	v_unsigned_int;
-
-long		v_long;
-signed long	v_signed_long;
-unsigned long	v_unsigned_long;
-
-float		v_float;
-double		v_double;
-
-/*
- *	Now some derived types, which are arrays, functions-returning,
- *	pointers, structures, unions, and enumerations.
- */
-
-/**** arrays *******/
-
-char		v_char_array[2];
-signed char	v_signed_char_array[2];
-unsigned char	v_unsigned_char_array[2];
-
-short		v_short_array[2];
-signed short	v_signed_short_array[2];
-unsigned short	v_unsigned_short_array[2];
-
-int		v_int_array[2];
-signed int	v_signed_int_array[2];
-unsigned int	v_unsigned_int_array[2];
-
-long		v_long_array[2];
-signed long	v_signed_long_array[2];
-unsigned long	v_unsigned_long_array[2];
-
-float		v_float_array[2];
-double		v_double_array[2];
-
-/**** pointers *******/
-
-/* Make sure they still print as pointer to foo even there is a typedef
-   for that type.  Test this not just for char *, which might be
-   a special case kludge in GDB (Unix system include files like to define
-   caddr_t), but for a variety of types.  */
-typedef char *char_addr;
-typedef unsigned short *ushort_addr;
-typedef signed long *slong_addr;
-
-char		*v_char_pointer;
-signed char	*v_signed_char_pointer;
-unsigned char	*v_unsigned_char_pointer;
-
-short		*v_short_pointer;
-signed short	*v_signed_short_pointer;
-unsigned short	*v_unsigned_short_pointer;
-
-int		*v_int_pointer;
-signed int	*v_signed_int_pointer;
-unsigned int	*v_unsigned_int_pointer;
-
-long		*v_long_pointer;
-signed long	*v_signed_long_pointer;
-unsigned long	*v_unsigned_long_pointer;
-
-float		*v_float_pointer;
-double		*v_double_pointer;
-
-/**** structs *******/
-
-struct t_struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct1;
-
-struct {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_struct2;
-
-/**** unions *******/
-
-union t_union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union;
-
-union {
-    char	v_char_member;
-    short	v_short_member;
-    int		v_int_member;
-    long	v_long_member;
-    float	v_float_member;
-    double	v_double_member;
-} v_union2;
-
-/*** Functions returning type ********/
-
-char		v_char_func () { return(0); }
-signed char	v_signed_char_func () { return (0); }
-unsigned char	v_unsigned_char_func () { return (0); }
-
-short		v_short_func () { return (0); }
-signed short	v_signed_short_func () { return (0); }
-unsigned short	v_unsigned_short_func () { return (0); }
-
-int		v_int_func () { return (0); }
-signed int	v_signed_int_func () { return (0); }
-unsigned int	v_unsigned_int_func () { return (0); }
-
-long		v_long_func () { return (0); }
-signed long	v_signed_long_func () { return (0); }
-unsigned long	v_unsigned_long_func () { return (0); }
-
-float		v_float_func () { return (0.0); }
-double		v_double_func () { return (0.0); }
-
-/**** Some misc more complicated things *******/
-
-struct link {
-	struct link *next;
-#ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
-#else
-	struct link *(*linkfunc) ();
-#endif
-	struct t_struct stuff[1][2][3];
-} *s_link;
-
-union tu_link {
-	struct link *next;
-#ifdef __STDC__
-	struct link *(*linkfunc) (struct link *this, int flags);
-#else
-	struct link *(*linkfunc) ();
-#endif
-	struct t_struct stuff[1][2][3];
-} u_link;
-
-struct outer_struct {
-	int outer_int;
-	struct inner_struct {
-		int inner_int;
-		long inner_long;
-	}inner_struct_instance;
-	union inner_union {
-		int inner_union_int;
-		long inner_union_long;
-	}inner_union_instance;
-	long outer_long;
-} nested_su;
-
-/**** Enumerations *******/
-
-enum colors {red, green, blue} color;
-enum cars {chevy, ford, porsche} clunker;
-
-/***********/
-
-int main ()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  /* Some linkers (e.g. on AIX) remove unreferenced variables,
-     so make sure to reference them. */
-  v_char = 0;
-  v_signed_char = 1;
-  v_unsigned_char = 2;
-
-  v_short = 3;
-  v_signed_short = 4;
-  v_unsigned_short = 5;    
-
-  v_int = 6;
-  v_signed_int = 7;
-  v_unsigned_int = 8;    
-
-  v_long = 9;
-  v_signed_long = 10;
-  v_unsigned_long = 11;    
-  
-  v_float = 100.0;
-  v_double = 200.0;
-
-
-  v_char_array[0] = v_char;
-  v_signed_char_array[0] = v_signed_char;
-  v_unsigned_char_array[0] = v_unsigned_char;
-
-  v_short_array[0] = v_short;
-  v_signed_short_array[0] = v_signed_short;
-  v_unsigned_short_array[0] = v_unsigned_short;
-
-  v_int_array[0] = v_int;
-  v_signed_int_array[0] = v_signed_int;
-  v_unsigned_int_array[0] = v_unsigned_int;
-
-  v_long_array[0] = v_long;
-  v_signed_long_array[0] = v_signed_long;
-  v_unsigned_long_array[0] = v_unsigned_long;
-
-  v_float_array[0] = v_float;
-  v_double_array[0] = v_double;
-
-  v_char_pointer = &v_char;
-  v_signed_char_pointer = &v_signed_char;
-  v_unsigned_char_pointer = &v_unsigned_char;
-
-  v_short_pointer = &v_short;
-  v_signed_short_pointer = &v_signed_short;
-  v_unsigned_short_pointer = &v_unsigned_short;
-
-  v_int_pointer = &v_int;
-  v_signed_int_pointer = &v_signed_int;
-  v_unsigned_int_pointer = &v_unsigned_int;
-
-  v_long_pointer = &v_long;
-  v_signed_long_pointer = &v_signed_long;
-  v_unsigned_long_pointer = &v_unsigned_long;
-
-  v_float_pointer = &v_float;
-  v_double_pointer = &v_double;
-
-  color = red;
-  clunker = porsche;
-
-  u_link.next = s_link;
-
-  v_union2.v_short_member = v_union.v_short_member;
-
-  v_struct1.v_char_member = 0;
-  v_struct2.v_char_member = 0;
-
-  nested_su.outer_int = 0;
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
deleted file mode 100644
index 9b41d6a2ff4..00000000000
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ /dev/null
@@ -1,404 +0,0 @@
-# Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999, 2002,
-# 2003, 2004 Free Software Foundation, 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.  
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile whatis
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-# Define a procedure to set up an xfail for all targets that put out a
-# `long' type as an `int' type.
-# Sun/Ultrix cc have this problem.
-# It was said that COFF targets can not distinguish int from long either.
-
-proc setup_xfail_on_long_vs_int {} {
-    global gcc_compiled
-
-    if {!$gcc_compiled} {
-	setup_xfail "*-sun-sunos4*" "*-*-ultrix*" "i*86-sequent-bsd*"
-    }
-}
-
-#
-# Test whatis command with basic C types
-#
-# The name printed now (as of 23 May 1993) is whatever name the compiler
-# uses in the stabs.  So we need to deal with names both from gcc and
-# native compilers.
-#
-
-gdb_test "whatis v_char" \
-    "type = (unsigned char|char)" \
-    "whatis char"
-
-if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix*" }
-gdb_test "whatis v_signed_char" \
-    "type = (signed char|char)" \
-    "whatis signed char"
-
-gdb_test "whatis v_unsigned_char" \
-    "type = unsigned char" \
-    "whatis unsigned char"
-
-gdb_test "whatis v_short" \
-    "type = (short|short int)" \
-    "whatis short"
-
-gdb_test "whatis v_signed_short" \
-    "type = (short|short int|signed short|signed short int)" \
-    "whatis signed short"
-
-gdb_test "whatis v_unsigned_short" \
-    "type = (unsigned short|short unsigned int)" \
-    "whatis unsigned short" 
-
-gdb_test "whatis v_int" \
-    "type = int" \
-    "whatis int"
-
-gdb_test "whatis v_signed_int" \
-    "type = (signed |)int" \
-    "whatis signed int"
-
-gdb_test "whatis v_unsigned_int" \
-    "type = unsigned int" \
-    "whatis unsigned int"
-
-setup_xfail_on_long_vs_int
-# AIX xlc gets this wrong and unsigned long right.  Go figure.
-if {!$gcc_compiled} then {setup_xfail "rs6000-*-aix*"}
-gdb_test "whatis v_long" \
-    "type = (long|long int)" \
-    "whatis long"
-
-setup_xfail_on_long_vs_int
-# AIX xlc gets this wrong and unsigned long right.  Go figure.
-if {!$gcc_compiled} then {setup_xfail "rs6000-*-aix*"}
-gdb_test "whatis v_signed_long" \
-    "type = (signed |)(long|long int)" \
-    "whatis signed long"
-
-setup_xfail_on_long_vs_int
-gdb_test "whatis v_unsigned_long" \
-    "type = (unsigned long|long unsigned int)" \
-    "whatis unsigned long"
-
-gdb_test "whatis v_float" \
-    "type = float" \
-    "whatis float"
-
-gdb_test "whatis v_double" \
-    "type = double" \
-    "whatis double"
-
-
-# test whatis command with arrays
-#
-# We already tested whether char prints as "char", so here we accept
-# "unsigned char", "signed char", and other perversions.  No need for more
-# than one xfail for the same thing.
-gdb_test "whatis v_char_array" \
-    "type = (signed |unsigned |)char \\\[2\\\]" \
-    "whatis char array"
-
-gdb_test "whatis v_signed_char_array" \
-    "type = (signed |unsigned |)char \\\[2\\\]" \
-    "whatis signed char array"
-
-gdb_test "whatis v_unsigned_char_array" \
-    "type = unsigned char \\\[2\\\]" \
-    "whatis unsigned char array"
-
-gdb_test "whatis v_short_array" \
-    "type = (short|short int) \\\[2\\\]" \
-    "whatis short array"
-
-gdb_test "whatis v_signed_short_array" \
-    "type = (signed |)(short|short int) \\\[2\\\]" \
-    "whatis signed short array"
-
-gdb_test "whatis v_unsigned_short_array" \
-    "type = (unsigned short|short unsigned int) \\\[2\\\]" \
-    "whatis unsigned short array"
-
-gdb_test "whatis v_int_array" \
-    "type = int \\\[2\\\]" \
-    "whatis int array"
-
-gdb_test "whatis v_signed_int_array" \
-    "type = (signed |)int \\\[2\\\]" \
-    "whatis signed int array"
-
-gdb_test "whatis v_unsigned_int_array" \
-    "type = unsigned int \\\[2\\\]" \
-    "whatis unsigned int array"
-
-# We already tested whether long prints as long, so here we accept int
-# No need for more than one xfail for the same thing.
-gdb_test "whatis v_long_array" \
-    "type = (int|long|long int) \\\[2\\\]" \
-    "whatis long array"
-
-gdb_test "whatis v_signed_long_array" \
-    "type = (signed |)(int|long|long int) \\\[2\\\]" \
-    "whatis signed long array"
-
-gdb_test "whatis v_unsigned_long_array" \
-    "type = (unsigned (int|long|long int)|long unsigned int) \\\[2\\\]" \
-    "whatis unsigned long array"
-
-gdb_test "whatis v_float_array" \
-    "type = float \\\[2\\\]" \
-    "whatis float array"
-
-gdb_test "whatis v_double_array" \
-    "type = double \\\[2\\\]" \
-    "whatis double array"
-
-
-# test whatis command with pointers
-#
-# We already tested whether char prints as char, so accept various perversions
-# here.  We especially want to make sure we test that it doesn't print as
-# caddr_t.
-gdb_test "whatis v_char_pointer" \
-    "type = (unsigned |signed |)char \\*" \
-    "whatis char pointer"
-
-gdb_test "whatis v_signed_char_pointer" \
-    "type = (unsigned |signed |)char \\*" \
-    "whatis signed char pointer"
-
-gdb_test "whatis v_unsigned_char_pointer" \
-    "type = unsigned char \\*" \
-    "whatis unsigned char pointer"
-
-gdb_test "whatis v_short_pointer" \
-    "type = (short|short int) \\*" \
-    "whatis short pointer"
-
-gdb_test "whatis v_signed_short_pointer" \
-    "type = (signed |)(short|short int) \\*" \
-    "whatis signed short pointer"
-
-gdb_test "whatis v_unsigned_short_pointer" \
-    "type = (unsigned short|short unsigned int) \\*" \
-    "whatis unsigned short pointer"
-
-gdb_test "whatis v_int_pointer" \
-    "type = int \\*" \
-    "whatis int pointer"
-
-gdb_test "whatis v_signed_int_pointer" \
-    "type = (signed |)int \\*" \
-    "whatis signed int pointer"
-
-gdb_test "whatis v_unsigned_int_pointer" \
-    "type = unsigned int \\*" \
-    "whatis unsigned int pointer"
-
-# We already tested whether long prints as long, so here we accept int
-gdb_test "whatis v_long_pointer" \
-    "type = (long|int|long int) \\*" \
-    "whatis long pointer"
-
-gdb_test "whatis v_signed_long_pointer" \
-    "type = (signed |)(long|int|long int) \\*" \
-    "whatis signed long pointer"
-
-gdb_test "whatis v_unsigned_long_pointer" \
-    "type = (unsigned (int|long|long int)|long unsigned int) \\*" \
-    "whatis unsigned long pointer"
-
-gdb_test "whatis v_float_pointer" \
-    "type = float \\*" \
-    "whatis float pointer"
-
-gdb_test "whatis v_double_pointer" \
-    "type = double \\*" \
-    "whatis double pointer"
-
-
-if { $hp_aCC_compiler } {
-    set unstruct "unnamed\.struct\..*"
-    set ununion "unnamed\.union\..*"
-} else {
-    set unstruct "\.\.\."
-    set ununion "\.\.\."
-}
-
-# test whatis command with structure types
-gdb_test "whatis v_struct1" \
-    "type = struct t_struct" \
-    "whatis named structure"
-
-gdb_test "whatis v_struct2" \
-    "type = struct \{$unstruct\}" \
-    "whatis unnamed structure"
-
-
-# test whatis command with union types
-gdb_test "whatis v_union" \
-    "type = union t_union" \
-    "whatis named union"
-
-gdb_test "whatis v_union2" \
-    "type = union \{$ununion\}" \
-    "whatis unnamed union"
-
-
-# HP-UX: HP aCC compiler w/ +objdebug option detects language as
-# c++, so we need the 'void' pattern here.
-# Without +objdebug compilation option we still need to match ''.
-# - guo
-# Also, using stabs we will mark these functions as prototyped.  This
-# is harmless but causes an extra VOID to be printed.
-set void "(void|)"
-
-# test whatis command with functions return type
-gdb_test "whatis v_char_func" \
-    "type = (signed |unsigned |)char \\($void\\)" \
-    "whatis char function"
-
-gdb_test "whatis v_signed_char_func" \
-    "type = (signed |unsigned |)char \\($void\\)" \
-    "whatis signed char function"
-
-gdb_test "whatis v_unsigned_char_func" \
-    "type = unsigned char \\($void\\)"	\
-    "whatis unsigned char function"
-
-gdb_test "whatis v_short_func" \
-    "type = short (int |)\\($void\\)" \
-    "whatis short function"
-
-gdb_test "whatis v_signed_short_func" \
-    "type = (signed |)short (int |)\\($void\\)" \
-    "whatis signed short function"
-
-gdb_test "whatis v_unsigned_short_func" \
-    "type = (unsigned short|short unsigned int) \\($void\\)" \
-    "whatis unsigned short function"
-
-gdb_test "whatis v_int_func" \
-    "type = int \\($void\\)" \
-    "whatis int function"
-
-gdb_test "whatis v_signed_int_func" \
-    "type = (signed |)int \\($void\\)" \
-    "whatis signed int function"
-
-gdb_test "whatis v_unsigned_int_func" \
-    "type = unsigned int \\($void\\)" \
-    "whatis unsigned int function"
-
-gdb_test "whatis v_long_func" \
-    "type = (long|int|long int) \\($void\\)" \
-    "whatis long function"
-
-gdb_test "whatis v_signed_long_func" \
-    "type = (signed |)(int|long|long int) \\($void\\)" \
-    "whatis signed long function"
-
-gdb_test "whatis v_unsigned_long_func" \
-    "type = (unsigned (int|long|long int)|long unsigned int) \\($void\\)" \
-    "whatis unsigned long function"
-
-# Sun /bin/cc calls this a function returning double.
-if {!$gcc_compiled} then {setup_xfail "*-sun-sunos4*"}
-gdb_test "whatis v_float_func" \
-    "type = float \\($void\\)" \
-    "whatis float function"
-
-gdb_test "whatis v_double_func" \
-    "type = double \\($void\\)" \
-    "whatis double function" \
-
-
-# test whatis command with some misc complicated types
-gdb_test "whatis s_link" \
-    "type = struct link \\*" \
-    "whatis complicated structure"
-
-gdb_test "whatis u_link" \
-    "type = union tu_link" \
-    "whatis complicated union"
-
-
-# test whatis command with enumerations
-gdb_test "whatis clunker" \
-    "type = enum cars" \
-    "whatis enumeration"
-
-
-# test whatis command with nested struct and union
-gdb_test "whatis nested_su" \
-    "type = struct outer_struct" \
-    "whatis outer structure"
-
-gdb_test "whatis nested_su.outer_int" \
-    "type = int" \
-    "whatis outer structure member"
-
-if {$hp_aCC_compiler} {
-    set outer "outer_struct::"
-} else {
-    set outer ""
-}
-
-gdb_test "whatis nested_su.inner_struct_instance" \
-    "type = struct ${outer}inner_struct" \
-    "whatis inner structure"
-
-gdb_test "whatis nested_su.inner_struct_instance.inner_int" \
-    "type = int" \
-    "whatis inner structure member"
-
-gdb_test "whatis nested_su.inner_union_instance" \
-    "type = union ${outer}inner_union" \
-    "whatis inner union"
-
-gdb_test "whatis nested_su.inner_union_instance.inner_union_int" \
-    "type = int" \
-    "whatis inner union member"
diff --git a/gdb/testsuite/gdb.cp/Makefile.in b/gdb/testsuite/gdb.cp/Makefile.in
deleted file mode 100644
index 8f4a90e2bb2..00000000000
--- a/gdb/testsuite/gdb.cp/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = ambiguous annota2 anon-union cplusfuncs cttiadd \
-	derivation inherit local member-ptr method misc \
-        overload ovldbreak ref-typ ref-typ2 templates userdef virtfunc namespace ref-types
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *~ *.o *.ci
-	-rm -f core ${EXECUTABLES}
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
diff --git a/gdb/testsuite/gdb.cp/ambiguous.cc b/gdb/testsuite/gdb.cp/ambiguous.cc
deleted file mode 100644
index 6ee7bc18ea9..00000000000
--- a/gdb/testsuite/gdb.cp/ambiguous.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-
-void marker1()
-{
-  return;
-}
-
-class A1 {
-public:
-  int x;
-  int y;
-};
-
-class A2 {
-public:
-  int x;
-  int y;
-};
-
-class A3 {
-public:
-  int x;
-  int y;
-};
-
-class X : public A1, public A2 {
-public:
-  int z;
-};
-
-class L : public A1 {
-public:
-  int z;
-};
-
-class LV : public virtual A1 {
-public:
-  int z;
-};
-
-class M : public A2 {
-public:
-  int w;
-};
-
-class N : public L, public M {
-public:
-  int r;
-};
-
-class K : public A1 {
-public:
-  int i;
-};
-
-class KV : public virtual A1 {
-public:
-  int i;
-};
-
-class J : public K, public L {
-public:
-  int j;
-};
-
-class JV : public KV, public LV {
-public:
-  int jv;
-};
-
-class JVA1 : public KV, public LV, public A1 {
-public:
-  int jva1;
-};
-
-class JVA2 : public KV, public LV, public A2 {
-public:
-  int jva2;
-};
-
-class JVA1V : public KV, public LV, public virtual A1 {
-public:
-  int jva1v;
-};
-
-int main()
-{
-  A1 a1;
-  A2 a2;
-  A3 a3;
-  X x;
-  L l;
-  M m;
-  N n;
-  K k;
-  J j;
-  JV jv;
-  JVA1 jva1;
-  JVA2 jva2;
-  JVA1V jva1v;
-  
-  int i;
-
-  i += k.i + m.w + a1.x + a2.x + a3.x + x.z + l.z + n.r + j.j;
-
-  marker1();
-  
-}
-
-
-  
diff --git a/gdb/testsuite/gdb.cp/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp
deleted file mode 100644
index f54e96458d3..00000000000
--- a/gdb/testsuite/gdb.cp/ambiguous.exp
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1998, 1999, 2003, 2004 Free Software Foundation, 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.  
-
-# This file is part of the gdb testsuite
-
-# tests relating to ambiguous class members
-# Written by Satish Pai <pai@apollo.hp.com> 1997-07-28
-
-# This file is part of the gdb testsuite
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "ambiguous"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1;
-}
-
-if { [test_compiler_info gcc-*] } then { continue }
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
-            send_gdb "up\n"
-            gdb_expect {
-                -re ".*$gdb_prompt $" { pass "up from marker1" }
-                timeout { fail "up from marker1" }
-            }
-        }
-        -re "$gdb_prompt $" { fail "continue to marker1"  }
-        timeout { fail "(timeout) continue to marker1"  }
-    }
-
-# print out various class objects' members.  The values aren't
-# important, just check that the warning is emitted at the
-# right times. 
-
-# X is derived from A1 and A2; both A1 and A2 have a member 'x'
-send_gdb "print x.x\n"
-gdb_expect {
-   -re "warning: x ambiguous; using X::A2::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print x.x"
-   }
-   -re "warning: x ambiguous; using X::A1::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print x.x"
-   }
-   -re ".*$gdb_prompt $" { fail "print x.x" }
-   timeout { fail "(timeout) print x.x" }
-}
-
-
-# N is derived from A1 and A2, but not immediately -- two steps
-# up in the hierarchy. Both A1 and A2 have a member 'x'.
-send_gdb "print n.x\n"
-gdb_expect {
-   -re "warning: x ambiguous; using N::M::A2::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print n.x"
-   }
-   -re "warning: x ambiguous; using N::L::A1::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print n.x"
-   }
-   -re ".*$gdb_prompt $" { fail "print n.x" }
-   timeout { fail "(timeout) print n.x" }
-}
-
-# J is derived from A1 twice.  A1 has a member x. 
-send_gdb "print j.x\n"
-gdb_expect {
-   -re "warning: x ambiguous; using J::L::A1::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print j.x"
-   }
-   -re "warning: x ambiguous; using J::K::A1::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print j.x"
-   }
-   -re ".*$gdb_prompt $" { fail "print j.x" }
-   timeout { fail "(timeout) print j.x" }
-}
-
-# JV is derived from A1 but A1 is a virtual base. Should not
-# report an ambiguity in this case. 
-send_gdb "print jv.x\n"
-gdb_expect {
-   -re "warning: x ambiguous.*Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       fail "print jv.x (ambiguity reported)"
-   }
-   -re "\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" { pass "print jv.x" }
-   -re ".*$gdb_prompt $" { fail "print jv.x (??)" }
-   timeout { fail "(timeout) print jv.x" }
-}
-
-# JVA1 is derived from A1; A1 occurs as a virtual base in two
-# ancestors, and as a non-virtual immediate base. Ambiguity must
-# be reported. 
-send_gdb "print jva1.x\n"
-gdb_expect {
-   -re "warning: x ambiguous; using JVA1::A1::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print jva1.x"
-   }
-   -re "warning: x ambiguous; using JVA1::KV::A1::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print jva1.x"
-   }
-   -re ".*$gdb_prompt $" { fail "print jva1.x" }
-   timeout { fail "(timeout) print jva1.x" }
-}
-
-# JVA2 is derived from A1 & A2; A1 occurs as a virtual base in two
-# ancestors, and A2 is a non-virtual immediate base. Ambiguity must
-# be reported as A1 and A2 both have a member 'x'.
-send_gdb "print jva2.x\n"
-gdb_expect {
-   -re "warning: x ambiguous; using JVA2::A2::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print jva2.x"
-   }
-   -re "warning: x ambiguous; using JVA2::KV::A1::x. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       pass "print jva2.x"
-   }
-   -re ".*$gdb_prompt $" { fail "print jva2.x" }
-   timeout { fail "(timeout) print jva2.x" }
-}
-
-# JVA1V is derived from A1; A1 occurs as a virtual base in two
-# ancestors, and also as a virtual immediate base. Ambiguity must
-# not be reported.
-send_gdb "print jva1v.x\n"
-gdb_expect {
-   -re "warning: x ambiguous.*Use a cast to disambiguate.\r\n\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" {
-       fail "print jva1v.x (ambiguity reported)"
-   }
-   -re "\\$\[0-9\]* = \[-\]*\[0-9\]*\r\n$gdb_prompt $" { pass "print jva1v.x" }
-   -re ".*$gdb_prompt $" { fail "print jva1v.x (??)" }
-   timeout { fail "(timeout) print jva1v.x" }
-}
-
-# Now check for ambiguous bases.
-
-# J is derived from A1 twice; report ambiguity if a J is
-# cast to an A1.
-send_gdb "print (A1)j\n"
-gdb_expect {
-   -re "warning: A1 ambiguous; using J::L::A1. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \{x = \[-\]*\[0-9\]*, y = \[-\]*\[0-9\]*\}\r\n$gdb_prompt $" {
-       pass "print (A1)j"
-   }
-   -re "warning: A1 ambiguous; using J::K::A1. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \{x = \[-\]*\[0-9\]*, y = \[-\]*\[0-9\]*\}\r\n$gdb_prompt $" {
-       pass "print (A1)j"
-   }
-   -re ".*$gdb_prompt $" { fail "print (A1)j" }
-   timeout { fail "(timeout) print (A1)j" }
-}
-
-# JV is derived from A1 twice, but A1 is a virtual base; should
-# not report ambiguity when a JV is cast to an A1.
-send_gdb "print (A1)jv\n"
-gdb_expect {
-   -re "warning: A1 ambiguous.*Use a cast to disambiguate.\r\n\\$\[0-9\]* = \{x = \[-\]*\[0-9\]*, y = \[-\]*\[0-9\]*\}\r\n$gdb_prompt $" {
-       fail "print (A1)jv (ambiguity reported)"
-   }
-   -re "\\$\[0-9\]* = \{x = \[-\]*\[0-9\]*, y = \[-\]*\[0-9\]*\}\r\n$gdb_prompt $" { pass "print (A1)jv" }
-   -re ".*$gdb_prompt $" { fail "print (A1)jv (??)" }
-   timeout { fail "(timeout) print (A1)jv" }
-}
-
-# JVA1 is derived from A1; A1 is a virtual base and also a
-# non-virtual base.  Must report ambiguity if a JVA1 is cast to an A1.
-send_gdb "print (A1)jva1\n"
-gdb_expect {
-   -re "warning: A1 ambiguous; using JVA1::A1. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \{x = \[-\]*\[0-9\]*, y = \[-\]*\[0-9\]*\}\r\n$gdb_prompt $" {
-       pass "print (A1)jva1"
-   }
-   -re "warning: A1 ambiguous; using JVA1::KV::A1. Use a cast to disambiguate.\r\n\\$\[0-9\]* = \{x = \[-\]*\[0-9\]*, y = \[-\]*\[0-9\]*\}\r\n$gdb_prompt $" {
-       pass "print (A1)jva1"
-   }
-   -re ".*$gdb_prompt $" { fail "print (A1)jva1" }
-   timeout { fail "(timeout) print (A1)jva1" }
-}
-
-# JVA1V is derived from A1; A1 is a virtual base indirectly
-# and also directly; must not report ambiguity when a JVA1V is cast to an A1.
-send_gdb "print (A1)jva1v\n"
-gdb_expect {
-   -re "warning: A1 ambiguous.*Use a cast to disambiguate.\r\n\\$\[0-9\]* = \{x = \[-\]*\[0-9\]*, y = \[-\]*\[0-9\]*\}\r\n$gdb_prompt $" {
-       fail "print (A1)jva1v (ambiguity reported)"
-   }
-   -re "\\$\[0-9\]* = \{x = \[-\]*\[0-9\]*, y = \[-\]*\[0-9\]*\}\r\n$gdb_prompt $" { pass "print (A1)jva1v"
-   }
-   -re ".*$gdb_prompt $" { fail "print (A1)jva1v (??)" }
-   timeout { fail "(timeout) print (A1)jva1v" }
-}
-
diff --git a/gdb/testsuite/gdb.cp/annota2.cc b/gdb/testsuite/gdb.cp/annota2.cc
deleted file mode 100644
index 234752e49af..00000000000
--- a/gdb/testsuite/gdb.cp/annota2.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class A {
-public:
-  int x;
-  int y;
-  int foo (int arg);
-};
-
-
-int A::foo (int arg)
-{
-  x += arg;
-  return arg *2;
-}
-
-int main()
-{
-  A a;
-
-  a.x = 0;
-  a.x = 1;
-  a.y = 2;
-
-  printf ("a.x is %d\n", a.x);
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
deleted file mode 100644
index 7710cc495f5..00000000000
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ /dev/null
@@ -1,231 +0,0 @@
-#   Copyright 1999, 2000, 2001, 2002, 2003, 2004
-#   Free Software Foundation, 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.  
-
-# This file was written by Elena Zannoni (ezannoni@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "annota2"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# are we on a target board? If so, don't run these tests.
-# note: this is necessary because we cannot use runto_main (which would
-# work for remote targets too) because of the different prompt we get
-# when using annotation level 2.
-#
-if [is_remote target] then {
-    return 0
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# line number where we need to stop in main
-#
-set main_line 25
-
-# The commands we test here produce many lines of output; disable "press 
-# <return> to continue" prompts.
-send_gdb "set height 0\n"
-gdb_expect -re "$gdb_prompt $"
-
-#
-# break at main
-#
-gdb_test "break 25" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint main"
-
-
-#
-# NOTE: this prompt is OK only when the annotation level is > 1
-# NOTE: When this prompt is in use the gdb_test procedure cannot be used because
-# it assumes that the last char of the gdb_prompt is a white space. This is not
-# true with this annotated prompt. So we must use send_gdb and gdb_expect.
-#
-
-set old_gdb_prompt $gdb_prompt
-set gdb_prompt "\r\n\032\032pre-prompt\r\n$gdb_prompt \r\n\032\032prompt\r\n"
-
-send_gdb "set annotate 2\n" 
-gdb_expect {
-    -re "set annotate 2\r\n$gdb_prompt$" { pass "annotation set at level 2" }
-    -re ".*$gdb_prompt$"       { fail "annotation set at level 2" }
-    timeout	            { fail "annotation set at level 2 (timeout)" }
-  }
-
-send_gdb "run\n"
-  gdb_expect {
-    -re "$main_line.*$gdb_prompt$" { pass "run until main breakpoint" }
-    -re ".*$gdb_prompt$"       { fail "run until main breakpoint" }
-    timeout	            { fail "run until main breakpoint (timeout)" }
-  }
-
-#
-# print class 'a' with public fields.
-# this will test:
-# annotate-field-begin
-# annotate-field-name-end
-# annotate-field-value
-# annotate-field-end
-#
-send_gdb "print a\n"
-gdb_expect {
-  -re "\r\n\032\032post-prompt\r\n\r\n\032\032value-history-begin 1 -\r\n.*= \r\n\032\032value-history-value\r\n\\{\r\n\032\032field-begin -\r\nx\r\n\032\032field-name-end\r\n = \r\n\032\032field-value\r\n1\r\n\032\032field-end\r\n, \r\n\032\032field-begin -\r\ny\r\n\032\032field-name-end\r\n = \r\n\032\032field-value\r\n2\r\n\032\032field-end\r\n\\}\r\n\r\n\032\032value-history-end\r\n$gdb_prompt$" \
-	{ pass "print class" }
-  -re ".*$gdb_prompt$"     { fail "print class" }
-  timeout	            { fail "print class (timeout)" }
-}
-
-#
-# continue until exit
-# this will test:
-# annotate-exited
-#
-send_gdb "continue\n"
-gdb_expect {
-  -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\na.x is 1\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032exited 0\r\n\r\nProgram exited normally.\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-	  { pass "continue until exit" }
-  -re ".*$gdb_prompt$"     { fail "continue to exit" }
-  timeout	            { fail "continue to exit (timeout)" }
-}
-
-#
-# delete all breakpoints
-#
-send_gdb "delete\n"
-gdb_expect {
-  -re ".*Delete all breakpoints. \\(y or n\\) \r\n\032\032query.*$" {
-           send_gdb "y\n"
-           gdb_expect {
-	     -re "\r\n\032\032post-query\r\n$gdb_prompt$" { pass "delete bps" }
-	     -re ".*$gdb_prompt$" { fail "delete bps" }
-	     timeout  { fail "delete bps (timeout)" }
-	 }
-     }
-  -re ".*$gdb_prompt$" { fail "delete bps" }
-  timeout  { fail "delete bps (timeout)" }
-}
-
-#
-# break at first line of main. 
-#
-send_gdb "break 22\n"
-gdb_expect {
-  -re  "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex: file.*$srcfile, line.*\r\n$gdb_prompt$" \
-	    { pass "breakpoint at main" }
-  -re ".*$gdb_prompt$"     { fail "break at main" }
-  timeout	            { fail "break at main (timeout)" }
-}
-
-#
-# change value of main_line
-#
-set main_line 22
-
-#
-# run program up to breakpoint.
-#
-
-
-send_gdb "run\n"
-  gdb_expect {
-    -re "$main_line.*$gdb_prompt$"    { pass "run until main breakpoint" }
-    -re ".*$gdb_prompt$"       { fail "run until main breakpoint" }
-    timeout	            { fail "run until main breakpoint (timeout)" }
-  }
-
-#
-# set up a watch point on a.x 
-#
-send_gdb "watch a.x\n"
-gdb_expect {
-   -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\n.*atchpoint 3: a.x\r\n$gdb_prompt$" \
-	   { pass "set watch on a.x" }
-   -re ".*$gdb_prompt$"  { fail "set watch on a.x" }
-   timeout    { fail "set watch on a.x (timeout)" }
-}
-
-#
-# do a next, so that the watchpoint triggers. This will test:
-# annotate-watchpoint
-#
-send_gdb "next\n"
-gdb_expect {
-   -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-	   { pass "watch triggered on a.x" }
-   -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032watchpoint 3\r\n\.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\n\r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*$srcfile\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$decimal\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" \
-	   { pass "watch triggered on a.x" }
-   -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-	   { kfail "gdb/38" "watch triggered on a.x" }
-   -re ".*$gdb_prompt$"  { fail "watch triggered on a.x" }
-   timeout    { fail "watch triggered on a.x (timeout)" }
-}
-
-
-#
-# send ^C to gdb, so that the quit() function gets called 
-# and annotate-quit is tested
-# test:
-# annotate-quit
-#
-# This test sometimes fails, but not reproducibly.  See gdb/544.
-#
-send_gdb "\003"
-gdb_expect {
-    -re "\r\n\032\032error-begin\r\nQuit\r\n\r\n\032\032quit\r\n$gdb_prompt$" \
-	    { pass "annotate-quit" }
-    -re "$gdb_prompt$" { kfail "gdb/544" "annotate-quit" }
-    -re ".*$gdb_prompt$" { fail "annotate-quit" }
-    timeout { fail "annotate-quit (timeout)" }
-}
-
-#
-# FIXME: the testsuite does not currently have tests for 
-#        annotate_catchpoints and annotate_function_call
-#        and a few variants of the annotations that are 
-#        tested (marked by FIXME on the annot?.exp files)
-#
-
-# reinstall the old prompt for the rest of the testsuite.
-
-set gdb_prompt $old_gdb_prompt
-
diff --git a/gdb/testsuite/gdb.cp/annota3.cc b/gdb/testsuite/gdb.cp/annota3.cc
deleted file mode 100644
index 234752e49af..00000000000
--- a/gdb/testsuite/gdb.cp/annota3.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-class A {
-public:
-  int x;
-  int y;
-  int foo (int arg);
-};
-
-
-int A::foo (int arg)
-{
-  x += arg;
-  return arg *2;
-}
-
-int main()
-{
-  A a;
-
-  a.x = 0;
-  a.x = 1;
-  a.y = 2;
-
-  printf ("a.x is %d\n", a.x);
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp
deleted file mode 100644
index 37be48d9b39..00000000000
--- a/gdb/testsuite/gdb.cp/annota3.exp
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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.  
-
-# This file was written by Elena Zannoni (ezannoni@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "annota3"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++ additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# are we on a target board? If so, don't run these tests.
-# note: this is necessary because we cannot use runto_main (which would
-# work for remote targets too) because of the different prompt we get
-# when using annotation level 2.
-#
-if [is_remote target] then {
-    return 0
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# line number where we need to stop in main
-#
-set main_line 25
-
-# The commands we test here produce many lines of output; disable "press 
-# <return> to continue" prompts.
-send_gdb "set height 0\n"
-gdb_expect -re "$gdb_prompt $"
-
-#
-# break at main
-#
-gdb_test "break 25" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint main"
-
-
-#
-# NOTE: this prompt is OK only when the annotation level is > 1
-# NOTE: When this prompt is in use the gdb_test procedure cannot be used because
-# it assumes that the last char of the gdb_prompt is a white space. This is not
-# true with this annotated prompt. So we must use send_gdb and gdb_expect.
-#
-
-set old_gdb_prompt $gdb_prompt
-set gdb_prompt "\r\n\032\032pre-prompt\r\n$gdb_prompt \r\n\032\032prompt\r\n"
-
-send_gdb "set annotate 3\n" 
-gdb_expect_list "annotation set at level 3" "\r\n$gdb_prompt$" {
-    "set annotate 3"
-}
-
-send_gdb "run\n"
-gdb_expect_list "first run until main breakpoint" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "Starting program: .*annota3 \r\n"
-    "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
-    "\r\n\032\032starting\r\n"
-    "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
-    "\r\n\032\032breakpoint 1\r\n"
-    "\r\n"
-    "Breakpoint 1, main \\(\\) at .*annota3.cc:25\r\n"
-    "\r\n\032\032source.*annota3.cc:25:.*:beg:0x\[0-9a-z\]+\r\n"
-    "\r\n\032\032stopped\r\n"
-}
-
-#
-# print class 'a' with public fields.
-#
-send_gdb "print a\n"
-gdb_expect_list "print class" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    ".*= \\{x = 1, y = 2\\}\r\n"
-}
-
-#
-# continue until exit
-# this will test:
-# annotate-exited
-#
-send_gdb "continue\n"
-gdb_expect_list "continue to exit" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "Continuing.\r\n"
-    "\r\n\032\032starting\r\n"
-    "\r\n\032\032frames-invalid\r\n"
-    "a.x is 1\r\n"
-    "\r\n\032\032frames-invalid\r\n"
-    "\r\n\032\032exited 0\r\n"
-    "\r\n"
-    "Program exited normally.\r\n"
-    "\r\n\032\032frames-invalid\r\n"
-    "\r\n\032\032stopped\r\n"
-}
-
-#
-# delete all breakpoints
-#
-send_gdb "delete\n"
-gdb_expect {
-  -re ".*Delete all breakpoints. \\(y or n\\) \r\n\032\032query.*$" {
-           send_gdb "y\n"
-           gdb_expect {
-	     -re "\r\n\032\032post-query\r\n$gdb_prompt$" { pass "delete bps" }
-	     -re ".*$gdb_prompt$" { fail "delete bps" }
-	     timeout  { fail "delete bps (timeout)" }
-	 }
-     }
-  -re ".*$gdb_prompt$" { fail "delete bps" }
-  timeout  { fail "delete bps (timeout)" }
-}
-
-#
-# break at first line of main. 
-#
-send_gdb "break 22\n"
-gdb_expect_list "break at main" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032breakpoints-invalid\r\n"
-    "Breakpoint.*at 0x\[a-z0-9\]+: file.*annota3.cc, line 22.\r\n"
-}
-
-#
-# run program up to breakpoint.
-#
-
-
-send_gdb "run\n"
-gdb_expect_list "second run until main breakpoint" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
-    "\r\n\032\032starting\r\n"
-    "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
-    "\r\n\032\032breakpoint 2\r\n"
-    "\r\n"
-    "Breakpoint 2, main \\(\\) at .*annota3.cc:22\r\n"
-    "\r\n\032\032source.*annota3.cc:22:.*:beg:0x\[0-9a-z\]+\r\n"
-    "\r\n\032\032stopped\r\n"
-}
-
-#
-# set up a watch point on a.x 
-#
-send_gdb "watch a.x\n"
-gdb_expect_list "set watch on a.x" "$gdb_prompt$" {
-    "\r\n\032\032post-prompt\r\n"
-    "\r\n\032\032breakpoints-invalid\r\n"
-    ".*atchpoint 3: a.x\r\n" \
-}
-
-#
-# do a next, so that the watchpoint triggers. This will test:
-# annotate-watchpoint
-#
-send_gdb "next\n"
-gdb_expect {
-    -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\(\r\n\032\032frames-invalid\r\n\)+\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\nmain \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" { 
-	pass "watch triggered on a.x"
-    }
-    -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {
-	kfail "gdb/38" "watch triggered on a.x"
-    }
-    -re ".*$gdb_prompt$" {
-	fail "watch triggered on a.x"
-    }
-    timeout {
-	fail "watch triggered on a.x (timeout)"
-    }
-}
-
-#
-# send ^C to gdb, so that the quit() function gets called 
-# and annotate-quit is tested
-# test:
-# annotate-quit
-#
-# This test sometimes fails, but not reproducibly.  See gdb/544.
-#
-send_gdb "\003"
-gdb_expect_list "annotate-quit" "$gdb_prompt$" {
-    "\r\n\032\032error-begin\r\n"
-    "Quit\r\n"
-    "\r\n\032\032quit\r\n"
-}
-
-#
-# FIXME: the testsuite does not currently have tests for 
-#        annotate_catchpoints and annotate_function_call
-#        and a few variants of the annotations that are 
-#        tested (marked by FIXME on the annot?.exp files)
-#
-
-# reinstall the old prompt for the rest of the testsuite.
-
-set gdb_prompt $old_gdb_prompt
-
diff --git a/gdb/testsuite/gdb.cp/anon-union.cc b/gdb/testsuite/gdb.cp/anon-union.cc
deleted file mode 100644
index 0b3fd130aeb..00000000000
--- a/gdb/testsuite/gdb.cp/anon-union.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-
-struct Foo {
-  union {
-    int zero;
-    unsigned int one;
-  } num1;
-  struct X {
-      int rock;
-      unsigned int rock2;
-  };
-  union {
-    int pebble;
-    X x;
-    union {
-      int qux;
-      unsigned int mux;
-    };
-    unsigned int boulder;
-  };
-  union {
-    int paper;
-    unsigned int cloth;
-  };
-  union {
-    int two;
-    unsigned int three;
-  } num2;
-};
-
-union Bar {
-  int x;
-  unsigned int y;
-};
-
-
-int main()
-{
-  Foo foo = {0, 0};
-
-  foo.paper = 33;
-  foo.pebble = 44;
-  foo.mux = 55;
-
-  Bar bar = {0};
-
-  union {
-    int z;
-    unsigned int w;
-  }; w = 0;
-
-  bar.x = 33;
-
-  w = 45;
-
-}
diff --git a/gdb/testsuite/gdb.cp/anon-union.exp b/gdb/testsuite/gdb.cp/anon-union.exp
deleted file mode 100644
index 4c34dcfcd90..00000000000
--- a/gdb/testsuite/gdb.cp/anon-union.exp
+++ /dev/null
@@ -1,345 +0,0 @@
-# Tests for anonymous union support.
-# Copyright 1998, 1999, 2003, 2004 Free Software Foundation, 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.  
-
-# Written by Satish Pai <pai@apollo.hp.com> 1997-08-19
-
-# This file is part of the gdb testsuite
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "anon-union"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     perror "Testcase compile failed" 0
-     continue
-}
-
-# Start with a fresh gdb
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-send_gdb "set width 0\n"
-gdb_expect -re "$gdb_prompt $"
-
-#send_gdb "ptype foo\n"
-#gdb_expect {
-#   -re "\r\n$gdb_prompt $" {
-#      pass "ptype foo"
-#    }
-#    -re ".*$gdb_prompt $" { fail "ptype foo" }
-#    timeout { fail "(timeout) ptype foo" }
-#}
-
-#send_gdb "ptype bar\n"
-#gdb_expect {
-#   -re "\r\n$gdb_prompt $" {
-#      pass "ptype foo"
-#    }
-#    -re ".*$gdb_prompt $" { fail "ptype foo" }
-#    timeout { fail "(timeout) ptype foo" }
-#}
-
-# NOTE: Add -- ptype foo.x, etc. when things are working
-
-#Initialize foo
-send_gdb "next\n"
-gdb_expect {
-   -re "40\[ \t\]*foo.paper = 33;\r\n$gdb_prompt $" {
-      pass "next 1"
-    }
-    -re ".*$gdb_prompt $" { fail "next 1" }
-    timeout { fail "(timeout) next 1" }
-}
-
-# Print out the big anon union.
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 0, x = \{rock = 0, rock2 = 0\}, \{qux = 0, mux = 0\}, boulder = 0\}, \{paper = 0, cloth = 0\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 1"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 1" }
-    timeout { fail "(timeout) print foo 1" }
-}
-
-# Step over assignment to member
-
-send_gdb "next\n"
-gdb_expect {
-   -re "41\[ \t\]*foo.pebble = 44;\r\n$gdb_prompt $" {
-      pass "next 1"
-    }
-    -re ".*$gdb_prompt $" { fail "next 1" }
-    timeout { fail "(timeout) next 1" }
-}
-
-# Now print out anon union again
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 0, x = \{rock = 0, rock2 = 0\}, \{qux = 0, mux = 0\}, boulder = 0\}, \{paper = 33, cloth = 33\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 2"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 2" }
-    timeout { fail "(timeout) print foo 2" }
-}
-
-# Modify the member just set
-send_gdb "set var foo.cloth = 35\n"
-gdb_expect {
-   -re "\r\n$gdb_prompt $" {
-      pass "set var foo.cloth"
-    }
-    timeout { fail "(timeout) set var foo.cloth" }
-}
-
-# Now print out anon union again to see if the right member was set 
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 0, x = \{rock = 0, rock2 = 0\}, \{qux = 0, mux = 0\}, boulder = 0\}, \{paper = 35, cloth = 35\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 3"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 3" }
-    timeout { fail "(timeout) print foo 3" }
-}
-
-
-# Step over next assignment to member
-
-send_gdb "next\n"
-gdb_expect {
-   -re "42\[ \t\]*foo.mux = 55;\r\n$gdb_prompt $" {
-      pass "next 2"
-    }
-    -re ".*$gdb_prompt $" { fail "next 2" }
-    timeout { fail "(timeout) next 2" }
-}
-
-# Now print out anon union again 
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 44, x = \{rock = 44, rock2 = 0\}, \{qux = 44, mux = 44\}, boulder = 44\}, \{paper = 35, cloth = 35\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 4"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 4" }
-    timeout { fail "(timeout) print foo 4" }
-}
-
-# Modify the member just set
-send_gdb "set var foo.pebble = 45\n"
-gdb_expect {
-   -re "\r\n$gdb_prompt $" {
-      pass "set var foo.pebble"
-    }
-    timeout { fail "(timeout) set var foo.pebble" }
-}
-
-# Now print out anon union again to see if the right member was set 
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 45, x = \{rock = 45, rock2 = 0\}, \{qux = 45, mux = 45\}, boulder = 45\}, \{paper = 35, cloth = 35\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 5"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 5" }
-    timeout { fail "(timeout) print foo 5" }
-}
-
-# Modify another member at a different level
-send_gdb "set var foo.qux = 46\n"
-gdb_expect {
-   -re "\r\n$gdb_prompt $" {
-      pass "set var foo.qux"
-    }
-    timeout { fail "(timeout) set var foo.qux" }
-}
-
-# Now print out anon union again to see if the right member was set 
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 46, x = \{rock = 46, rock2 = 0\}, \{qux = 46, mux = 46\}, boulder = 46\}, \{paper = 35, cloth = 35\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 6"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 6" }
-    timeout { fail "(timeout) print foo 6" }
-}
-
-# Modify the member at another level, but not the first one in the union
-send_gdb "set var foo.mux = 47\n"
-gdb_expect {
-   -re "\r\n$gdb_prompt $" {
-      pass "set var foo.mux"
-    }
-    timeout { fail "(timeout) set var foo.mux" }
-}
-
-# Now print out anon union again to see if things worked
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 47, x = \{rock = 47, rock2 = 0\}, \{qux = 47, mux = 47\}, boulder = 47\}, \{paper = 35, cloth = 35\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 7"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 7" }
-    timeout { fail "(timeout) print foo 7" }
-}
-
-# Modify a member of a struct in an anon union
-send_gdb "set var foo.x.rock = 48\n"
-gdb_expect {
-   -re "\r\n$gdb_prompt $" {
-      pass "set var foo.x.rock"
-    }
-    timeout { fail "(timeout) set var foo.x.rock" }
-}
-
-# Now print out anon union again to see if things worked
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 48, x = \{rock = 48, rock2 = 0\}, \{qux = 48, mux = 48\}, boulder = 48\}, \{paper = 35, cloth = 35\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 8"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 8" }
-    timeout { fail "(timeout) print foo 8" }
-}
-
-# Modify a member of a struct in an anon union, but something
-# that doesn't alias to some other union member
-send_gdb "set var foo.x.rock2 = 49\n"
-gdb_expect {
-   -re "\r\n$gdb_prompt $" {
-      pass "set var foo.x.rock2"
-    }
-    timeout { fail "(timeout) set var foo.x.rock2" }
-}
-
-# Now print out anon union again to see if things worked
-send_gdb "print foo\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{num1 = \{zero = 0, one = 0\}, \{pebble = 48, x = \{rock = 48, rock2 = 49\}, \{qux = 48, mux = 48\}, boulder = 48\}, \{paper = 35, cloth = 35\}, num2 = \{two = 0, three = 0\}\}\r\n$gdb_prompt $" {
-      pass "print foo 9"
-    }
-    -re ".*$gdb_prompt $" { fail "print foo 9" }
-    timeout { fail "(timeout) print foo 9" }
-}
-
-
-# Step over next four assignments
-send_gdb "next 4\n"
-gdb_expect {
-   -re "53\[ \t\]*w = 45;\r\n$gdb_prompt $" {
-      pass "next 3"
-    }
-    -re ".*$gdb_prompt $" { fail "next 3" }
-    timeout { fail "(timeout) next 3" }
-}
-
-# Tests for anon unions that are not members of a class or struct
-
-send_gdb "print w\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 0\r\n$gdb_prompt $" {
-      pass "print w 1"
-    }
-    -re ".*$gdb_prompt $" { fail "print w 1" }
-    timeout { fail "(timeout) print w 1" }
-}
-
-send_gdb "print z\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 0\r\n$gdb_prompt $" {
-      pass "print z 1"
-    }
-    -re ".*$gdb_prompt $" { fail "print z 1" }
-    timeout { fail "(timeout) print z 1" }
-}
-
-# Step over next assignment to w
-send_gdb "next\n"
-gdb_expect {
-   -re "55\[ \t\]*\}\r\n$gdb_prompt $" {
-      pass "next 4"
-    }
-    -re ".*$gdb_prompt $" { fail "next 4" }
-    timeout { fail "(timeout) next 4" }
-}
-
-# See if the change in value is noticed
-send_gdb "print w\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 45\r\n$gdb_prompt $" {
-      pass "print w 2"
-    }
-    -re ".*$gdb_prompt $" { fail "print w 2" }
-    timeout { fail "(timeout) print w 2" }
-}
-
-# See if z shows the same value
-send_gdb "print z\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 45\r\n$gdb_prompt $" {
-      pass "print z 2"
-    }
-    -re ".*$gdb_prompt $" { fail "print z 2" }
-    timeout { fail "(timeout) print z 2" }
-}
-
-# Set the anon union member 
-send_gdb "set var z = 27\n"
-gdb_expect {
-   -re "\r\n$gdb_prompt $" {
-      pass "set var z"
-    }
-    timeout { fail "(timeout) set var z" }
-}
-
-# See if the change in value is noticed
-send_gdb "print w\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 27\r\n$gdb_prompt $" {
-      pass "print w 3"
-    }
-    -re ".*$gdb_prompt $" { fail "print w 3" }
-    timeout { fail "(timeout) print w 3" }
-}
-
-# See if z shows the same value
-send_gdb "print z\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 27\r\n$gdb_prompt $" {
-      pass "print z 3"
-    }
-    -re ".*$gdb_prompt $" { fail "print z 3" }
-    timeout { fail "(timeout) print z 3" }
-}
diff --git a/gdb/testsuite/gdb.cp/breakpoint.cc b/gdb/testsuite/gdb.cp/breakpoint.cc
deleted file mode 100644
index 266007cced0..00000000000
--- a/gdb/testsuite/gdb.cp/breakpoint.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Code to go along with tests in breakpoint.exp.
-   
-   Copyright 2004 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.  */
-
-class C1 {
-public:
-  class Nested {
-  public:
-    int
-    foo ()
-    {
-      return 1;
-    }
-  };
-};
-
-int main ()
-{
-  C1::Nested c1;
-
-  c1.foo();
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.cp/breakpoint.exp b/gdb/testsuite/gdb.cp/breakpoint.exp
deleted file mode 100644
index c85f80541e1..00000000000
--- a/gdb/testsuite/gdb.cp/breakpoint.exp
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-# This file is part of the gdb testsuite.
-
-# This contains tests for breakpoints in C++.
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "breakpoint"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-proc test_breakpoint {name} {
-    # Restart the program every time, so that a single failure doesn't
-    # lead to a cascade.
-    if ![runto_main] then {
-	perror "couldn't run to main when testing ${name}"
-	continue
-    } else {
-	gdb_breakpoint "${name}"
-	gdb_test "continue" "Continuing.\r\n\r\nBreakpoint \[0-9\]*, ${name}.*" "continue to ${name}"
-    }
-}
-
-test_breakpoint "C1::Nested::foo"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/bs15503.cc b/gdb/testsuite/gdb.cp/bs15503.cc
deleted file mode 100644
index 5581ec5b1bf..00000000000
--- a/gdb/testsuite/gdb.cp/bs15503.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1992, 2004 Free Software Foundation, 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.
-   */
-
-#include <string>
-#include <iostream>
-using namespace std;
-
-template <class T>
-class StringTest {
-public:
-   virtual void runTest();
-   void testFunction();
-};
-
-template <class T>
-void StringTest<T>:: runTest() {
-   testFunction ();
-}
-
-template <class T>
-void StringTest <T>::testFunction() {
-   // initialize s with string literal
-   cout << "in StringTest" << endl;
-   string s("I am a shot string");
-   cout << s << endl;
-
-   // insert 'r' to fix "shot"
-   s.insert(s.begin()+10,'r' );
-   cout << s << endl;
-
-   // concatenate another string
-   s += "and now a longer string";
-   cout << s << endl;
-
-   // find position where blank needs to be inserted
-   string::size_type spos = s.find("and");
-   s.insert(spos, " ");
-   cout << s << endl;
-
-   // erase the concatenated part
-   s.erase(spos);
-   cout << s << endl;
-}
-
-int main() {
-   StringTest<wchar_t> ts;
-   ts.runTest();
-}
-
-/* output:
-I am a shot string
-I am a short string
-I am a short stringand now a longer string
-I am a short string and now a longer string
-I am a short string
-*/
diff --git a/gdb/testsuite/gdb.cp/bs15503.exp b/gdb/testsuite/gdb.cp/bs15503.exp
deleted file mode 100644
index dee8b6ee822..00000000000
--- a/gdb/testsuite/gdb.cp/bs15503.exp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1992, 2004, 2005 Free Software Foundation, 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.  */
-
-# Test case for CLLbs15503
-# This file was written by Sue Kimura (sue_kimura@hp.com)
-# Rewritten by Michael Chastain (mec.gnu@mindspring.com)
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "bs15503"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "debug c++"] != "" } {
-    perror "Couldn't compile ${srcfile}"
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# Set breakpoint on template function
-
-gdb_test "break StringTest<wchar_t>::testFunction" \
-    "Breakpoint $decimal at $hex: file .*${srcfile}, line $decimal."
-
-gdb_test "continue" \
-    ".*Breakpoint $decimal, StringTest<wchar_t>::testFunction \\(this=$hex\\).*" \
-    "continue to StringTest<wchar_t>"
-
-# Run to some random point in the middle of the function.
-
-gdb_breakpoint [gdb_get_line_number "find position where blank needs to be inserted"]
-gdb_continue_to_breakpoint "find position where blank needs to be inserted"
-
-# Call some string methods.
-
-gdb_test "print s.length()"		"\\$\[0-9\]+ = 42"
-gdb_test "print s\[0\]"			"\\$\[0-9\]+ =.* 'I'"
-gdb_test "print s\[s.length()-1\]"	"\\$\[0-9\]+ =.* 'g'"
-gdb_test "print (const char *) s" \
-    "\\$\[0-9\]+ = $hex \"I am a short stringand now a longer string\""
-
-# TODO: tests that do not work with gcc 2.95.3
-# -- chastain 2004-01-07
-# 
-# gdb_test "print s.compare(s)"		"\\$\[0-9\]+ = 0"
-# gdb_test "print s.compare(\"AAA\")"     "\\$\[0-9\]+ = 1"
-# gdb_test "print s.compare(\"ZZZ\")"     "\\$\[0-9\]+ = -1"
-
-# TODO: tests that do not work with gcc 2.95.3 and gcc 3.3.2.
-# cannot call overloaded non-member operator.  -- chastain 2004-01-07
-# 
-# gdb_test "print s == s"			"\\$\[0-9\]+ = true"
-# gdb_test "print s > "AAA"			"\\$\[0-9\]+ = true"
-# gdb_test "print s < "ZZZ"			"\\$\[0-9\]+ = true"
-
-# TODO crash gdb!  This is going to be a great test!
-# -- chastain 2004-01-07
-# 
-# gdb_test "print s == \"I am a short stringand now a longer string\"" \
-#     "\\$\[0-9\]+ = "true"
-
-gdb_test "print (const char *) s.substr(0,4)"	"\\$\[0-9\]+ = $hex \"I am\""
-gdb_test "print (const char *) (s=s.substr(0,4))" \
-    "\\$\[0-9\]+ = $hex \"I am\""
-
-# TODO: cannot call overloaded non-member operator again.
-# -- chastain 2004-01-07
-# 
-# gdb_test "print (const char *) (s + s)" \
-#    "\\$\[0-9\]+ = $hex \"I amI am\""
-# gdb_test "print (const char *) (s + \" \" + s)" \
-#    "\\$\[0-9\]+ = $hex \"I am I am\""
diff --git a/gdb/testsuite/gdb.cp/casts.cc b/gdb/testsuite/gdb.cp/casts.cc
deleted file mode 100644
index 831add94418..00000000000
--- a/gdb/testsuite/gdb.cp/casts.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-struct A
-{
-  int a;
-  A (int aa): a (aa) {}
-};
-
-struct B: public A
-{
-  int b;
-  B (int aa, int bb): A (aa), b(bb) {}
-};
-
-int
-main (int argc, char **argv)
-{
-  A *a = new B(42, 1729);
-  B *b = (B *) a;
-
-  return 0;  /* breakpoint spot: casts.exp: 1 */
-}
diff --git a/gdb/testsuite/gdb.cp/casts.exp b/gdb/testsuite/gdb.cp/casts.exp
deleted file mode 100644
index 3aaf37cbff0..00000000000
--- a/gdb/testsuite/gdb.cp/casts.exp
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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.  
-
-# This file is part of the gdb testsuite
-
-# Test casting, especially between class types or pointer-to-class
-# types.
-
-# This file is part of the gdb testsuite
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "casts"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1;
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_test "break [gdb_get_line_number "casts.exp: 1"]" \
-    "Breakpoint.*at.* file .*" \
-    ""
-
-gdb_test "continue" "Breakpoint .* at .*casts.cc.*" ""
-
-# Casting a pointer to a base class to a pointer to a derived class
-# should yield the entire derived class.  Until August 2002, GDB got
-# the enclosing type on `(B *) a' wrong: while the value's static type
-# was `B *', as it should be, the enclosing type (which is supposed to
-# be the dynamic type) was `A *'.  It's senseless to have a static
-# type derived from the dynamic type; it should be the other way
-# 'round.  Dereferencing this oddly typed pointer yielded a value in
-# which only the base class's members were initialized, since GDB uses
-# the enclosing type to decide how many bytes to read.  Members from
-# the derived class were garbage, from GDB's address space.
-gdb_test "print * (B *) a" ".* = {<A> = {a = 42}, b = 1729}" \
-    "cast base class pointer to derived class pointer"
-
-# Check also that we get the same results from letting the compiler do
-# the dereference.
-gdb_test "print * b" ".* = {<A> = {a = 42}, b = 1729}" \
-    "let compiler cast base class pointer to derived class pointer"
diff --git a/gdb/testsuite/gdb.cp/class2.cc b/gdb/testsuite/gdb.cp/class2.cc
deleted file mode 100644
index b4aa20a0df1..00000000000
--- a/gdb/testsuite/gdb.cp/class2.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2003, 2004 Free Software Foundation, 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.
-   */
-
-struct A
-{
-  virtual ~A ();
-  int a1;
-};
-
-A::~A()
-{
-  a1 = 800;
-}
-
-struct B : public A
-{
-  virtual ~B ();
-  int b1;
-  int b2;
-};
-
-B::~B()
-{
-  a1 = 900;
-  b1 = 901;
-  b2 = 902;
-}
-
-// Stop the compiler from optimizing away data.
-void refer (A *)
-{
-  ;
-}
-
-struct empty {};
-
-// Stop the compiler from optimizing away data.
-void refer (empty *)
-{
-  ;
-}
-
-int main (void)
-{
-  A alpha, *aap, *abp;
-  B beta, *bbp;
-  empty e;
-
-  alpha.a1 = 100;
-  beta.a1 = 200; beta.b1 = 201; beta.b2 = 202;
-
-  aap = &alpha; refer (aap);
-  abp = &beta;  refer (abp);
-  bbp = &beta;  refer (bbp);
-  refer (&e);
-
-  return 0;  // marker return 0
-} // marker close brace
diff --git a/gdb/testsuite/gdb.cp/class2.exp b/gdb/testsuite/gdb.cp/class2.exp
deleted file mode 100644
index e3f63b08eae..00000000000
--- a/gdb/testsuite/gdb.cp/class2.exp
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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.  
-
-if $tracelevel then {
-    strace $tracelevel
-    }
-
-if { [skip_cplus_tests] } { continue }
-
-set prms_id 0
-set bug_id 0
-
-set testfile "class2"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Start with "set print object off".
-
-gdb_test "set print object off" ""
-
-if ![runto_main] then {
-    perror "couldn't run to main"
-    continue
-}
-
-get_debug_format
-
-gdb_test "break [gdb_get_line_number "marker return 0"]" \
-    "Breakpoint.*at.* file .*" ""
-
-gdb_test "continue" "Breakpoint .* at .*" ""
-
-# Access the "A" object.
-
-gdb_test "print alpha" \
-    "= {.*a1 = 100.*}" \
-    "print alpha at marker return 0"
-
-# Access the "B" object.
-
-gdb_test "print beta" \
-    "= {.*a1 = 200.*b1 = 201.*b2 = 202}" \
-    "print beta at marker return 0"
-
-# Access the "A" object through an "A *" pointer.
-
-gdb_test_multiple "print * aap" "print * aap at marker return 0" {
-    -re "= {.*a1 = 100.*}\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.3.2 -gdwarf-2
-	# gcc 3.3.2 -gstabs+
-	pass "print * aap at marker return 0"
-    }
-    -re "= {.*a1 = .*}\r\n$gdb_prompt $" {
-	if { [test_compiler_info gcc-2-*] && [test_debug_format "DWARF 2"] } {
-	    # gcc 2.95.3 -gdwarf-2
-	    setup_kfail "gdb/1465" "*-*-*"
-	}
-	fail "print * aap at marker return 0"
-    }
-}
-
-# Access the "B" object through a "B *" pointer.
-
-gdb_test "print * bbp" \
-    "= {.*a1 = 200.*b1 = 201.*b2 = 202}" \
-    "print * bbp at marker return 0"
-
-# Access the "B" object through an "A *" pointer.
-# This should print using the "A" type.
-
-gdb_test_multiple "print * abp" "print * abp at marker return 0, s-p-o off" {
-    -re "= {.*a1 = 200.*b1 = .*b2 = .*}\r\n$gdb_prompt $" {
-	# This would violate the documentation for "set print object off".
-	fail "print * abp at marker return 0, s-p-o off"
-    }
-    -re "= {.*a1 = 200.*}\r\n$gdb_prompt $" {
-	pass "print * abp at marker return 0, s-p-o off"
-    }
-}
-
-# Access the "B" object through a "B *" pointer expression.
-# This should print using the "B" type.
-
-gdb_test "print * (B *) abp" \
-    "= {.*a1 = 200.*b1 = 201.*b2 = 202}" \
-    "print * (B *) abp at marker return 0"
-
-# Printing the value of an object containing no data fields:
-
-gdb_test "p e" "= \{<No data fields>\}" "print object with no data fields"
diff --git a/gdb/testsuite/gdb.cp/classes.cc b/gdb/testsuite/gdb.cp/classes.cc
deleted file mode 100644
index d09f38fc36d..00000000000
--- a/gdb/testsuite/gdb.cp/classes.cc
+++ /dev/null
@@ -1,608 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2004
-   Free Software Foundation, 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.
-   */
-
-// Test various -*- C++ -*- things.
-
-// ====================== basic C++ types  =======================
-bool            v_bool;
-bool            v_bool_array[2];
-
-typedef struct fleep fleep;
-struct fleep { int a; } s;
-
-// ====================== simple class structures  =======================
-
-struct default_public_struct {
- // defaults to public:
-  int a;
-  int b;
-};
-
-struct explicit_public_struct {
- public:
-  int a;
-  int b;
-};
-
-struct protected_struct {
- protected:
-  int a;
-  int b;
-};
-
-struct private_struct {
- private:
-  int a;
-  int b;
-};
-
-struct mixed_protection_struct {
- public:
-  int a;
-  int b;
- private:
-  int c;
-  int d;
- protected:
-  int e;
-  int f;
- public:
-  int g;
- private:
-  int h;
- protected:
-  int i;
-};
-
-class public_class {
- public:
-  int a;
-  int b;
-};
-
-class protected_class {
- protected:
-  int a;
-  int b;
-};
-
-class default_private_class {
- // defaults to private:
-  int a;
-  int b;
-};
-
-class explicit_private_class {
- private:
-  int a;
-  int b;
-};
-
-class mixed_protection_class {
- public:
-  int a;
-  int b;
- private:
-  int c;
-  int d;
- protected:
-  int e;
-  int f;
- public:
-  int g;
- private:
-  int h;
- protected:
-  int i;
-};
-
-class const_vol_method_class {
-public:
-  int a;
-  int b;
-  int foo (int &) const;
-  int bar (int &) volatile;
-  int baz (int &) const volatile;
-};
-
-int const_vol_method_class::foo (int & ir) const
-{
-  return ir + 3;
-}
-int const_vol_method_class::bar (int & ir) volatile
-{
-  return ir + 4;
-}
-int const_vol_method_class::baz (int & ir) const volatile
-{
-  return ir + 5;
-}
-
-// ========================= simple inheritance ==========================
-
-class A {
- public:
-  int a;
-  int x;
-};
-
-A g_A;
-
-class B : public A {
- public:
-  int b;
-  int x;
-};
-
-B g_B;
-
-class C : public A {
- public:
-  int c;
-  int x;
-};
-
-C g_C;
-
-class D : public B, public C {
- public:
-  int d;
-  int x;
-};
-
-D g_D;
-
-class E : public D {
- public:
-  int e;
-  int x;
-};
-
-E g_E;
-
-class class_with_anon_union
-{
- public:
-  int one;
-  union
-  {
-    int a;
-    long b;
-  };
-};
-
-class_with_anon_union g_anon_union;
-
-void inheritance2 (void)
-{
-}
-
-void inheritance1 (void)
-{
-  int ival;
-  int *intp;
-
-  // {A::a, A::x}
-
-  g_A.A::a = 1;
-  g_A.A::x = 2;
-
-  // {{A::a,A::x},B::b,B::x}
-
-  g_B.A::a = 3;
-  g_B.A::x = 4;
-  g_B.B::b = 5;
-  g_B.B::x = 6;
-
-  // {{A::a,A::x},C::c,C::x}
-
-  g_C.A::a = 7;
-  g_C.A::x = 8;
-  g_C.C::c = 9;
-  g_C.C::x = 10;
-
-  // {{{A::a,A::x},B::b,B::x},{{A::a,A::x},C::c,C::x},D::d,D::x}
-
-  // The following initialization code is non-portable, but allows us
-  // to initialize all members of g_D until we can fill in the missing
-  // initialization code with legal C++ code.
-
-  for (intp = (int *) &g_D, ival = 11;
-       intp < ((int *) &g_D + sizeof (g_D) / sizeof (int));
-       intp++, ival++)
-    {
-      *intp = ival;
-    }
-
-  // Overlay the nonportable initialization with legal initialization.
-
-  // ????? = 11;  (g_D.A::a = 11; is ambiguous)
-  // ????? = 12;  (g_D.A::x = 12; is ambiguous)
-/* djb 6-3-2000
-
-	This should take care of it. Rather than try to initialize using an ambiguous
-	construct, use 2 unambiguous ones for each. Since the ambiguous a/x member is
-	coming from C, and B, initialize D's C::a, and B::a, and D's C::x and B::x.
- */
-  g_D.C::a = 15;
-  g_D.C::x = 12;
-  g_D.B::a = 11;
-  g_D.B::x = 12;
-  g_D.B::b = 13;
-  g_D.B::x = 14;
-  // ????? = 15;
-  // ????? = 16;
-  g_D.C::c = 17;
-  g_D.C::x = 18;
-  g_D.D::d = 19;
-  g_D.D::x = 20;
-
-
-  // {{{{A::a,A::x},B::b,B::x},{{A::a,A::x},C::c,C::x},D::d,D::x}},E::e,E::x}
-
-  // The following initialization code is non-portable, but allows us
-  // to initialize all members of g_D until we can fill in the missing
-  // initialization code with legal C++ code.
-
-  for (intp = (int *) &g_E, ival = 21;
-       intp < ((int *) &g_E + sizeof (g_E) / sizeof (int));
-       intp++, ival++)
-  {
-    *intp = ival;
-  }
-
-  // Overlay the nonportable initialization with legal initialization.
-
-  // ????? = 21;  (g_E.A::a = 21; is ambiguous)
-  // ????? = 22;  (g_E.A::x = 22; is ambiguous)
-  g_E.B::b = 23;
-  g_E.B::x = 24;
-  // ????? = 25;
-  // ????? = 26;
-  g_E.C::c = 27;
-  g_E.C::x = 28;
-  g_E.D::d = 29;
-  g_E.D::x = 30;
-  g_E.E::e = 31;
-  g_E.E::x = 32;
-
-  g_anon_union.one = 1;
-  g_anon_union.a = 2;
-
-  inheritance2 ();	
-}
-
-// ======================== static member functions =====================
-
-class Static {
-public:
-  static void ii(int, int);
-};
-void Static::ii (int, int) { }
-
-// ======================== virtual base classes=========================
-
-class vA {
- public:
-  int va;
-  int vx;
-};
-
-vA g_vA;
-
-class vB : public virtual vA {
- public:
-  int vb;
-  int vx;
-};
-
-vB g_vB;
-
-class vC : public virtual vA {
- public:
-  int vc;
-  int vx;
-};
-
-vC g_vC;
-
-class vD : public virtual vB, public virtual vC {
- public:
-  int vd;
-  int vx;
-};
-
-vD g_vD;
-
-class vE : public virtual vD {
- public:
-  int ve;
-  int vx;
-};
-
-vE g_vE;
-
-void inheritance4 (void)
-{
-}
-
-void inheritance3 (void)
-{
-  int ival;
-  int *intp;
-
-  // {vA::va, vA::vx}
-
-  g_vA.vA::va = 1;
-  g_vA.vA::vx = 2;
-
-  // {{vA::va, vA::vx}, vB::vb, vB::vx}
-
-  g_vB.vA::va = 3;
-  g_vB.vA::vx = 4;
-  g_vB.vB::vb = 5;
-  g_vB.vB::vx = 6;
-
-  // {{vA::va, vA::vx}, vC::vc, vC::vx}
-
-  g_vC.vA::va = 7;
-  g_vC.vA::vx = 8;
-  g_vC.vC::vc = 9;
-  g_vC.vC::vx = 10;
-
-  // {{{{vA::va, vA::vx}, vB::vb, vB::vx}, vC::vc, vC::vx}, vD::vd,vD::vx}
-
-  g_vD.vA::va = 11;
-  g_vD.vA::vx = 12;
-  g_vD.vB::vb = 13;
-  g_vD.vB::vx = 14;
-  g_vD.vC::vc = 15;
-  g_vD.vC::vx = 16;
-  g_vD.vD::vd = 17;
-  g_vD.vD::vx = 18;
-
-
-  // {{{{{vA::va,vA::vx},vB::vb,vB::vx},vC::vc,vC::vx},vD::vd,vD::vx},vE::ve,vE::vx}
-
-  g_vD.vA::va = 19;
-  g_vD.vA::vx = 20;
-  g_vD.vB::vb = 21;
-  g_vD.vB::vx = 22;
-  g_vD.vC::vc = 23;
-  g_vD.vC::vx = 24;
-  g_vD.vD::vd = 25;
-  g_vD.vD::vx = 26;
-  g_vE.vE::ve = 27;
-  g_vE.vE::vx = 28;
-
-  inheritance4 ();	
-}
-
-// ======================================================================
-
-class Base1 {
- public:
-  int x;
-  Base1(int i) { x = i; }
-};
-
-class Foo
-{
- public:
-  int x;
-  int y;
-  static int st;
-  Foo (int i, int j) { x = i; y = j; }
-  int operator! ();
-  operator int ();
-  int times (int y);
-};
-
-class Bar : public Base1, public Foo {
- public:
-  int z;
-  Bar (int i, int j, int k) : Base1 (10*k), Foo (i, j) { z = k; }
-};
-
-int Foo::operator! () { return !x; }
-
-int Foo::times (int y) { return x * y; }
-
-int Foo::st = 100;
-
-Foo::operator int() { return x; }
-
-Foo foo(10, 11);
-Bar bar(20, 21, 22);
-
-class ClassWithEnum {
-public:
-  enum PrivEnum { red, green, blue, yellow = 42 };
-  PrivEnum priv_enum;
-  int x;
-};
-
-void enums2 (void)
-{
-}
-
-/* classes.exp relies on statement order in this function for testing
-   enumeration fields.  */
-
-void enums1 ()
-{
-  ClassWithEnum obj_with_enum;
-  obj_with_enum.priv_enum = ClassWithEnum::red;
-  obj_with_enum.x = 0;
-  enums2 ();
-  obj_with_enum.priv_enum = ClassWithEnum::green;
-  obj_with_enum.x = 1;
-}
-
-class ClassParam {
-public:
-  int Aptr_a (A *a) { return a->a; }
-  int Aptr_x (A *a) { return a->x; }
-  int Aref_a (A &a) { return a.a; }
-  int Aref_x (A &a) { return a.x; }
-  int Aval_a (A a) { return a.a; }
-  int Aval_x (A a) { return a.x; }
-};
-
-ClassParam class_param;
-
-class Contains_static_instance
-{
- public:
-  int x;
-  int y;
-  Contains_static_instance (int i, int j) { x = i; y = j; }
-  static Contains_static_instance null;
-};
-
-Contains_static_instance Contains_static_instance::null(0,0);
-Contains_static_instance csi(10,20);
-
-class Contains_nested_static_instance
-{
- public:
-  class Nested
-  {
-   public:
-    Nested(int i) : z(i) {}
-    int z;
-    static Contains_nested_static_instance xx;
-  };
-
-  Contains_nested_static_instance(int i, int j) : x(i), y(j) {}
-
-  int x;
-  int y;
-
-  static Contains_nested_static_instance null;
-  static Nested yy;
-};
-
-Contains_nested_static_instance Contains_nested_static_instance::null(0, 0);
-Contains_nested_static_instance::Nested Contains_nested_static_instance::yy(5);
-Contains_nested_static_instance
-  Contains_nested_static_instance::Nested::xx(1,2);
-Contains_nested_static_instance cnsi(30,40);
-
-typedef struct {
-  int one;
-  int two;
-} tagless_struct;
-tagless_struct v_tagless;
-
-/* Try to get the compiler to allocate a class in a register.  */
-class small {
- public:
-  int x;
-  int method ();
-};
-
-int
-small::method ()
-{
-  return x + 5;
-}
-
-void marker_reg1 () {}
-
-int
-register_class ()
-{
-  /* We don't call any methods for v, so gcc version cygnus-2.3.3-930220
-     might put this variable in a register.  This is a lose, though, because
-     it means that GDB can't call any methods for that variable.  */
-  register small v;
-
-  int i;
-
-  /* Perform a computation sufficiently complicated that optimizing compilers
-     won't optimized out the variable.  If some compiler constant-folds this
-     whole loop, maybe using a parameter to this function here would help.  */
-  v.x = 0;
-  for (i = 0; i < 13; ++i)
-    v.x += i;
-  --v.x; /* v.x is now 77 */
-  marker_reg1 ();
-  return v.x + 5;
-}
-
-void dummy()
-{
-  v_bool = true;
-  v_bool_array[0] = false;
-  v_bool_array[1] = v_bool;
-}
-
-void use_methods ()
-{
-  /* Refer to methods so that they don't get optimized away. */
-  int i;
-  i = class_param.Aptr_a (&g_A);
-  i = class_param.Aptr_x (&g_A);
-  i = class_param.Aref_a (g_A);
-  i = class_param.Aref_x (g_A);
-  i = class_param.Aval_a (g_A);
-  i = class_param.Aval_x (g_A);
-}
-
-
-int
-main()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  dummy();
-  inheritance1 ();
-  inheritance3 ();
-  enums1 ();
-  register_class ();
-
-  /* FIXME: pmi gets optimized out.  Need to do some more computation with
-     it or something.  (No one notices, because the test is xfail'd anyway,
-     but that probably won't always be true...).  */
-  int Foo::* pmi = &Foo::y;
-
-  /* Make sure the AIX linker doesn't remove the variable.  */
-  v_tagless.one = 5;
-
-  use_methods ();
-
-  return foo.*pmi;
-}
-
-/* Create an instance for some classes, otherwise they get optimized away.  */
-
-default_public_struct default_public_s;
-explicit_public_struct explicit_public_s;
-protected_struct protected_s;
-private_struct private_s;
-mixed_protection_struct mixed_protection_s;
-public_class public_c;
-protected_class protected_c;
-default_private_class default_private_c;
-explicit_private_class explicit_private_c;
-mixed_protection_class mixed_protection_c;
diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
deleted file mode 100644
index 397a14920f2..00000000000
--- a/gdb/testsuite/gdb.cp/classes.exp
+++ /dev/null
@@ -1,624 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-# And rewritten by Michael Chastain <mec.gnu@mindspring.com>.
-
-set nl "\[\r\n\]+"
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-load_lib "cp-support.exp"
-
-set testfile "classes"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Test ptype of class objects.
-
-proc test_ptype_class_objects {} {
-
-    # Simple type.
-
-    cp_test_ptype_class \
-	"ptype struct default_public_struct" "" "struct" "default_public_struct" \
-	{
-	    { field public "int a;" }
-	    { field public "int b;" }
-	}
-
-    # Another simple type.
-
-    cp_test_ptype_class \
-	"ptype struct explicit_public_struct" "" "struct" "explicit_public_struct" \
-	{
-	    { field public "int a;" }
-	    { field public "int b;" }
-	}
-
-    # Another simple type.
-
-    cp_test_ptype_class \
-	"ptype struct protected_struct" "" "struct" "protected_struct" \
-	{
-	    { field protected "int a;" }
-	    { field protected "int b;" }
-	}
-
-    # Another simple type.
-
-    cp_test_ptype_class \
-	"ptype struct private_struct" "" "struct" "private_struct" \
-	{
-	    { field private "int a;" }
-	    { field private "int b;" }
-	}
-
-    # A bigger type.
-
-    cp_test_ptype_class \
-	"ptype struct mixed_protection_struct" "" "struct" "mixed_protection_struct" \
-	{
-	    { field public    "int a;" }
-	    { field public    "int b;" }
-	    { field private   "int c;" }
-	    { field private   "int d;" }
-	    { field protected "int e;" }
-	    { field protected "int f;" }
-	    { field public    "int g;" }
-	    { field private   "int h;" }
-	    { field protected "int i;" }
-	}
-
-    # All that again with "class" instead of "struct".
-    # gdb does not care about the difference anyways.
-
-    cp_test_ptype_class \
-	"ptype class public_class" "" "class" "public_class" \
-	{
-	    { field public "int a;" }
-	    { field public "int b;" }
-	}
-
-    # Another simple type.
-
-    cp_test_ptype_class \
-	"ptype class protected_class" "" "class" "protected_class" \
-	{
-	    { field protected "int a;" }
-	    { field protected "int b;" }
-	}
-
-    # Another simple type.
-
-    cp_test_ptype_class \
-	"ptype class default_private_class" "" "class" "default_private_class" \
-	{
-	    { field private "int a;" }
-	    { field private "int b;" }
-	}
-
-    # Another simple type.
-
-    cp_test_ptype_class \
-	"ptype class explicit_private_class" "" "class" "explicit_private_class" \
-	{
-	    { field private "int a;" }
-	    { field private "int b;" }
-	}
-
-    # A bigger type.
-
-    cp_test_ptype_class \
-	"ptype class mixed_protection_class" "" "class" "mixed_protection_class" \
-	{
-
-	    { field public    "int a;" }
-	    { field public    "int b;" }
-	    { field private   "int c;" }
-	    { field private   "int d;" }
-	    { field protected "int e;" }
-	    { field protected "int f;" }
-	    { field public    "int g;" }
-	    { field private   "int h;" }
-	    { field protected "int i;" }
-	}
-
-    # Here are some classes with inheritance.
-
-    # Base class.
-
-    cp_test_ptype_class \
-	"ptype class A" "" "class" "A" \
-	{
-	    { field public "int a;" }
-	    { field public "int x;" }
-	}
-
-    # Derived class.
-
-    cp_test_ptype_class \
-	"ptype class B" "" "class" "B" \
-	{
-	    { base         "public A" }
-	    { field public "int b;" }
-	    { field public "int x;" }
-	}
-
-    # Derived class.
-
-    cp_test_ptype_class \
-	"ptype class C" "" "class" "C" \
-	{
-	    { base         "public A" }
-	    { field public "int c;" }
-	    { field public "int x;" }
-	}
-
-    # Derived class, multiple inheritance.
-
-    cp_test_ptype_class \
-	"ptype class D" "" "class" "D" \
-	{
-	    { base         "public B" }
-	    { base         "public C" }
-	    { field public "int d;" }
-	    { field public "int x;" }
-	}
-
-    # Derived class.
-
-    cp_test_ptype_class \
-	"ptype class E" "" "class" "E" \
-	{
-	    { base         "public D" }
-	    { field public "int e;" }
-	    { field public "int x;" }
-	}
-
-    # This is a break from inheritance tests.
-    #
-    # gcc 2.X with stabs (stabs or stabs+?) used to have a problem with
-    # static methods whose name is the same as their argument mangling.
- 
-    cp_test_ptype_class \
-	"ptype class Static" "" "class" "Static" \
-	{
-	    { method public "static void ii(int, int);" }
-	}
-
-    # Here are some virtual inheritance tests.
-
-    # A virtual base class.
-
-    cp_test_ptype_class \
-	"ptype class vA" "" "class" "vA" \
-	{
-	    { field public "int va;" }
-	    { field public "int vx;" }
-	}
-
-    # A derived class with a virtual base.
-
-    cp_test_ptype_class \
-	"ptype class vB" "" "class" "vB" \
-	{
-	    { base         "public virtual vA" }
-	    { vbase        "vA" }
-	    { field public "int vb;" }
-	    { field public "int vx;" }
-	}
-
-    # Another derived class with a virtual base.
-
-    cp_test_ptype_class \
-	"ptype class vC" "" "class" "vC" \
-	{
-	    { base         "public virtual vA" }
-	    { vbase        "vA" }
-	    { field public "int vc;" }
-	    { field public "int vx;" }
-	}
-
-    # A classic diamond class.
-
-    cp_test_ptype_class \
-	"ptype class vD" "" "class" "vD" \
-	{
-	    { base         "public virtual vB" }
-	    { base         "public virtual vC" }
-	    { vbase        "vC" }
-	    { vbase        "vB" }
-	    { field public "int vd;" }
-	    { field public "int vx;" }
-	}
-
-    # A class derived from a diamond class.
-
-    cp_test_ptype_class \
-	"ptype class vE" "" "class" "vE" \
-	{
-	    { base         "public virtual vD" }
-	    { vbase        "vD" }
-	    { field public "int ve;" }
-	    { field public "int vx;" }
-	}
-
-    # Another inheritance series.
-
-    # A base class.
-
-    cp_test_ptype_class \
-	"ptype class Base1" "" "class" "Base1" \
-	{
-	    { field  public "int x;" }
-	    { method public "Base1(int);" }
-	}
-
-    # Another base class.
-
-    cp_test_ptype_class \
-	"ptype class Foo" "" "class" "Foo" \
-	{
-	    { field public "int x;" }
-	    { field public "int y;" }
-	    { field public "static int st;" }
-	    { method public "Foo(int, int);" }
-	    { method public "int operator!();" }
-	    { method public "operator int();" }
-	    { method public "int times(int);" }
-	} \
-	"" \
-	{
-	    {
-		"operator int();"
-		"int operator int();"
-		{ setup_kfail "gdb/1497" "*-*-*" }
-	    }
-	    {
-		"operator int();"
-		"int operator int(void);"
-		{ setup_kfail "gdb/1497" "*-*-*" }
-	    }
-	}
-
-    # A multiple inheritance derived class.
-
-    cp_test_ptype_class \
-	"ptype class Bar" "" "class" "Bar" \
-	{
-	    { base          "public Base1" }
-	    { base          "public Foo" }
-	    { field  public "int z;" }
-	    { method public "Bar(int, int, int);" }
-	}
-
-}
-
-# Test simple access to class members.
-
-proc test_non_inherited_member_access {} {
-    
-    # Print non-inherited members of g_A.
-    gdb_test "print g_A.a" ".* = 1"
-    gdb_test "print g_A.x" ".* = 2"
-
-    # Print non-inherited members of g_B.
-    gdb_test "print g_B.b" ".* = 5"
-    gdb_test "print g_B.x" ".* = 6"
-
-    # Print non-inherited members of g_C.
-    gdb_test "print g_C.c" ".* = 9"
-    gdb_test "print g_C.x" ".* = 10"
-
-    # Print non-inherited members of g_D.
-    gdb_test "print g_D.d" ".* = 19"
-    gdb_test "print g_D.x" ".* = 20"
-
-    # Print non-inherited members of g_E.
-    gdb_test "print g_E.e" ".* = 31"
-    gdb_test "print g_E.x" ".* = 32"
-}
-
-# Test access to members of other classes.
-# gdb should refuse to print them.
-# (I feel old -- I remember when this was legal in C -- chastain).
-
-proc test_wrong_class_members {} {
-    gdb_test "print g_A.b" "There is no member( or method|) named b."
-    gdb_test "print g_B.c" "There is no member( or method|) named c."
-    gdb_test "print g_B.d" "There is no member( or method|) named d."
-    gdb_test "print g_C.b" "There is no member( or method|) named b."
-    gdb_test "print g_C.d" "There is no member( or method|) named d."
-    gdb_test "print g_D.e" "There is no member( or method|) named e."
-}
-
-# Test access to names that are not members of any class.
-
-proc test_nonexistent_members {} {
-    gdb_test "print g_A.y" "There is no member( or method|) named y."
-    gdb_test "print g_B.z" "There is no member( or method|) named z."
-    gdb_test "print g_C.q" "There is no member( or method|) named q."
-    gdb_test "print g_D.p" "There is no member( or method|) named p."
-}
-
-# Call a method that expects a base class parameter with base, inherited,
-# and unrelated class arguments.
-
-proc test_method_param_class {} {
-    gdb_test "call class_param.Aptr_a (&g_A)" ".* = 1"
-    gdb_test "call class_param.Aptr_x (&g_A)" ".* = 2"
-    gdb_test "call class_param.Aptr_a (&g_B)" ".* = 3"
-    gdb_test "call class_param.Aptr_x (&g_B)" ".* = 4"
-    gdb_test "call class_param.Aref_a (g_A)" ".* = 1"
-    gdb_test "call class_param.Aref_x (g_A)" ".* = 2"
-    gdb_test "call class_param.Aref_a (g_B)" ".* = 3"
-    gdb_test "call class_param.Aref_x (g_B)" ".* = 4"
-    gdb_test "call class_param.Aval_a (g_A)" ".* = 1"
-    gdb_test "call class_param.Aval_x (g_A)" ".* = 2"
-    gdb_test "call class_param.Aval_a (g_B)" ".* = 3"
-    gdb_test "call class_param.Aval_x (g_B)" ".* = 4"
-
-    gdb_test "call class_param.Aptr_a (&foo)" "Cannot resolve .*" "unrelated class *param"
-    gdb_test "call class_param.Aref_a (foo)" "Cannot resolve .*" "unrelated class &param"
-    gdb_test "call class_param.Aval_a (foo)" "Cannot resolve .*" "unrelated class param"
-}
-
-# Examine a class with an enum field.
-
-proc test_enums {} {
-    global gdb_prompt
-    global nl
-
-    # print the object
-
-    gdb_test "print obj_with_enum" \
-	"\\$\[0-9\]+ = \{priv_enum = red, x = 0\}" \
-	"print obj_with_enum (1)"
-
-    # advance one line
-
-    gdb_test "next" ""
-
-    # print the object again
-
-    gdb_test "print obj_with_enum" \
-	"\\$\[0-9\]+ = \{priv_enum = green, x = 0\}" \
-	"print obj_with_enum (2)"
-
-    # print the enum member
-
-    gdb_test "print obj_with_enum.priv_enum" "\\$\[0-9\]+ = green"
-
-    # ptype on the enum member
-
-    gdb_test_multiple "ptype obj_with_enum.priv_enum" "ptype obj_with_enum.priv_enum" {
-        -re "type = enum ClassWithEnum::PrivEnum \{ ?red, green, blue, yellow = 42 ?\}$nl$gdb_prompt $" {
-	    pass "ptype obj_with_enum.priv_enum"
-        }
-	-re "type = enum PrivEnum \{ ?red, green, blue, yellow = 42 ?\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    pass "ptype obj_with_enum.priv_enum"
-	}
-	-re "type = enum \{ ?red, green, blue, yellow = 42 ?\}$nl$gdb_prompt $" {
-	    # This case case is a little dubious, but it's not clear what
-	    # ought to be required of a ptype on a private enum...
-	    # -sts 19990324
-	    #
-	    # It bugs me that this happens with gcc 3.
-	    # -- chastain 2003-12-30
-	    #
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
-	    pass "ptype obj_with_enum.priv_enum"
-	}
-    }
-
-    # ptype on the object
-
-    # NOTE: carlton/2003-02-28: One could certainly argue that plain
-    # "PrivEnum"
-    # is acceptable: PrivEnum is a member of ClassWithEnum, so
-    # there's no need to explicitly qualify its name with
-    # "ClassWithEnum::".  The truth, though, is that GDB is simply
-    # forgetting that PrivEnum is a member of ClassWithEnum, so we do
-    # that output for a bad reason instead of a good reason.  Under
-    # stabs, we probably can't get this right; under DWARF-2, we can.
-
-    cp_test_ptype_class \
-	"ptype obj_with_enum" "" "class" "ClassWithEnum" \
-	{
-	    { field public "ClassWithEnum::PrivEnum priv_enum;" }
-	    { field public "int x;" }
-	} \
-	"" \
-	{
-	    {
-		"ClassWithEnum::PrivEnum priv_enum;"
-		"PrivEnum priv_enum;"
-		{ setup_kfail "gdb/57" "*-*-*" }
-	    }
-	}
-
-    # I'll do this test two different ways, because of a parser bug.
-    # See PR gdb/1588.
-
-    gdb_test_multiple "print (ClassWithEnum::PrivEnum) 42" "print (ClassWithEnum::PrivEnum) 42" {
-	-re "\\$\[0-9\]+ = yellow$nl$gdb_prompt $" {
-	    pass "print (ClassWithEnum::PrivEnum) 42"
-	}
-	-re "A (parse|syntax) error in expression, near `42'.$nl$gdb_prompt $" {
-	    # "parse error" is bison 1.35.
-	    # "syntax error" is bison 1.875.
-	    kfail "gdb/1588" "print (ClassWithEnum::PrivEnum) 42"
-	}
-    }
-
-    gdb_test_multiple "print ('ClassWithEnum::PrivEnum') 42" "print ('ClassWithEnum::PrivEnum') 42" {
-	-re "\\$\[0-9\]+ = yellow$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gstabs+
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
-	    pass "print ('ClassWithEnum::PrivEnum') 42"
-	}
-	-re "No symbol \"ClassWithEnum::PrivEnum\" in current context.$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gdwarf-2
-	    # gcc 2.95.3 -gstabs+
-	    kfail "gdb/57" "print ('ClassWithEnum::PrivEnum') 42"
-	}
-    }
-}
-
-# Pointers to class members
-
-proc test_pointers_to_class_members {} {
-    gdb_test "print Bar::z" "\\$\[0-9\]+ = \\(int ?\\( ?Bar::& ?\\) ?\\) ?Bar::z"
-    gdb_test "print &Foo::x" "\\$\[0-9\]+ = \\(int ?\\( ?Foo::\\* ?\\) ?\\) ?&Foo::x"
-    gdb_test "print (int)&Foo::x" "\\$\[0-9\]+ = 0"
-    gdb_test "print (int)&Bar::y == 2*sizeof(int)" "\\$\[0-9\]+ = true"
-
-    # TODO: this is a bogus test.  It's looking at a variable that
-    # has not even been declared yet, so it's accessing random junk
-    # on the stack and comparing that it's NOT equal to a specific
-    # value.  It's been like this since gdb 4.10 in 1993!
-    # -- chastain 2004-01-01
-    gdb_test "print (int)pmi == sizeof(int)" ".* = false"
-}
-
-# Test static members.
-
-proc test_static_members {} {
-    global hex
-
-    gdb_test "print Foo::st" "\\$\[0-9\]+ = 100"
-    gdb_test "set foo.st = 200" "" ""
-    gdb_test "print bar.st" "\\$\[0-9\]+ = 200"
-    gdb_test "print &foo.st" "\\$\[0-9\]+ = \\(int ?\\*\\) $hex"
-    gdb_test "print &Bar::st" "\\$\[0-9\]+ = \\(int ?\\*\\) $hex"
-    gdb_test "print *\$" "\\$\[0-9\]+ = 200"
-
-    gdb_test "set print static-members off" ""
-    gdb_test "print csi" \
-	"{x = 10, y = 20}" \
-	"print csi without static members"
-    gdb_test "print cnsi" \
-	"{x = 30, y = 40}" \
-	"print cnsi without static members"
-
-    gdb_test "set print static-members on" ""
-    gdb_test "print csi" \
-	"{x = 10, y = 20, static null = {x = 0, y = 0, static null = <same as static member of an already seen type>}}" \
-	"print csi with static members"
-    gdb_test "print cnsi" \
-	"{x = 30, y = 40, static null = {x = 0, y = 0, static null = <same as static member of an already seen type>, static yy = {z = 5, static xx = {x = 1, y = 2, static null = <same as static member of an already seen type>, static yy = <same as static member of an already seen type>}}}, static yy = <same as static member of an already seen type>}" \
-	"print cnsi with static members"
-}
-
-proc do_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-    global gdb_prompt
-    global nl
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-    gdb_test "set language c++" "" ""
-    gdb_test "set width 0" "" ""
-
-    if ![runto_main ] then {
-	perror "couldn't run to breakpoint"
-	return
-    }
-
-    gdb_breakpoint inheritance2
-    gdb_test "continue" ".*Breakpoint .* inheritance2.*" ""
-
-    test_ptype_class_objects
-    test_non_inherited_member_access
-    test_wrong_class_members
-    test_nonexistent_members
-    test_method_param_class
-
-    gdb_breakpoint enums2
-    gdb_test "continue" ".*Breakpoint .* enums2.*" "continue to enums2(\\(\\)|)"
-    gdb_test "finish" "" ""
-    test_enums
-
-    gdb_test "finish" "" ""
-    test_pointers_to_class_members
-    test_static_members
-
-    # Now some random tests that were just thrown in here.
-
-    gdb_breakpoint marker_reg1
-    gdb_test "continue" ".*Breakpoint .* marker_reg1.*" ""
-    gdb_test "finish" "Run till exit from.*" "finish from marker_reg1"
-
-    # This class is so small that an instance of it can fit in a register.
-    # When gdb tries to call a method, it gets embarrassed about taking
-    # the address of a register.
-    #
-    # TODO: I think that message should be a PASS, not an XFAIL.
-    # gdb prints an informative message and declines to do something
-    # impossible.
-    #
-    # The method call actually succeeds if the compiler allocates very
-    # small classes in memory instead of registers.  So this test does
-    # not tell us anything interesting if the call succeeds.
-    #
-    # -- chastain 2003-12-31
-    gdb_test_multiple "print v.method ()" "calling method for small class" {
-	-re "\\$\[0-9\]+ = 82$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gdwarf-2
-	    # gcc 3.3.2 -gstabs+
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
-	    pass "calling method for small class"
-	}
-	-re "Address requested for identifier \"v\" which is in register .*$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 2.95.3 -gstabs+
-	    setup_xfail "*-*-*" 2972
-	    fail "calling method for small class"
-	}
-    }
-}
-
-do_tests
diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.cc b/gdb/testsuite/gdb.cp/cplusfuncs.cc
deleted file mode 100644
index 7f033d6d90c..00000000000
--- a/gdb/testsuite/gdb.cp/cplusfuncs.cc
+++ /dev/null
@@ -1,196 +0,0 @@
-#include <stddef.h>
-
-class foo {
-public:
-  foo  (int);
-  foo  (int, const char *);
-  foo  (foo&);
-  ~foo ();
-
-  void  operator *      (foo&);
-  void  operator %      (foo&);
-  void  operator -      (foo&);
-  void  operator >>     (foo&);
-  void  operator !=     (foo&);
-  void  operator >      (foo&);
-  void  operator >=     (foo&);
-  void  operator |      (foo&);
-  void  operator &&     (foo&);
-  void  operator !      (void);
-  void  operator ++     (int);
-  void  operator =      (foo&);
-  void  operator +=     (foo&);
-  void  operator *=     (foo&);
-  void  operator %=     (foo&);
-  void  operator >>=    (foo&);
-  void  operator |=     (foo&);
-  void  operator ,      (foo&);
-  void  operator /      (foo&);
-  void  operator +      (foo&);
-  void  operator <<     (foo&);
-  void  operator ==     (foo&);
-  void  operator <      (foo&);
-  void  operator <=     (foo&);
-  void  operator &      (foo&);
-  void  operator ^      (foo&);
-  void  operator ||     (foo&);
-  void  operator ~      (void);
-  void  operator --     (int);
-  foo*  operator ->     (void);
-  void  operator -=     (foo&);
-  void  operator /=     (foo&);
-  void  operator <<=    (foo&);
-  void  operator &=     (foo&);
-  void  operator ^=     (foo&);
-  void  operator ->*    (foo&);
-  void  operator []     (foo&);
-  void  operator ()     (foo&);
-  void* operator new    (size_t) throw ();
-  void  operator delete (void *);
-  /**/  operator int    ();
-  /**/  operator char*  ();
-
-  int foofunc (int); // forced to have int return type, which is required
-  int foofunc (int, signed char *); // forced to have int return type, which is required
-  int ifoo;
-  const char *ccpfoo;
-};
-
-#ifdef usestubs
-extern "C" { 
-   void set_debug_traps();
-   void breakpoint();
-};
-#endif
-
-int main () {
-#ifdef usestubs
-   set_debug_traps();
-   breakpoint();
-#endif
-   int z=3;
-}
-
-foo::foo  (int i)                  { ifoo = i;}
-foo::foo  (int i, const char *ccp) { ifoo = i; ccpfoo = ccp; }
-foo::foo  (foo& afoo)              { afoo.ifoo = 0; }
-foo::~foo ()                       {}
-
-void  foo::operator *      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator %      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator -      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator >>     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator !=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator >      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator >=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator |      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator &&     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator !      (void) {}
-void  foo::operator ++     (int ival) { ival = 0; }
-void  foo::operator =      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator +=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator *=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator %=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator >>=    (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator |=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator ,      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator /      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator +      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator <<     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator ==     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator <      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator <=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator &      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator ^      (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator ||     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator ~      (void) {}
-void  foo::operator --     (int ival) { ival = 0; }
-foo*  foo::operator ->     (void) {return this;}
-void  foo::operator -=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator /=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator <<=    (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator &=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator ^=     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator ->*    (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator []     (foo& afoo) { afoo.ifoo = 0; }
-void  foo::operator ()     (foo& afoo) { afoo.ifoo = 0; }
-void* foo::operator new    (size_t ival) throw () { ival = 0; return 0; }
-void  foo::operator delete (void *ptr) { ptr = 0; }
-/**/  foo::operator int    () { return 0; }
-/**/  foo::operator char*  () { return 0; }
-
-/* Some functions to test overloading by varying one argument type. */
-
-void overload1arg (void)		{          }
-void overload1arg (char arg)		{ arg = 0; }
-void overload1arg (signed char arg)	{ arg = 0; }
-void overload1arg (unsigned char arg)	{ arg = 0; }
-void overload1arg (short arg)		{ arg = 0; }
-void overload1arg (unsigned short arg)	{ arg = 0; }
-void overload1arg (int arg)		{ arg = 0; }
-void overload1arg (unsigned int arg)	{ arg = 0; }
-void overload1arg (long arg)		{ arg = 0; }
-void overload1arg (unsigned long arg)	{ arg = 0; }
-void overload1arg (float arg)		{ arg = 0; }
-void overload1arg (double arg)		{ arg = 0; }
-
-/* Some functions to test overloading by varying argument count. */
-
-void overloadargs (int a1)				{ a1 = 0; }
-void overloadargs (int a1, int a2)			{ a1 = a2 = 0; }
-void overloadargs (int a1, int a2, int a3)		{ a1 = a2 = a3 = 0; }
-void overloadargs (int a1, int a2, int a3, int a4)
-			{ a1 = a2 = a3 = a4 = 0; }
-void overloadargs (int a1, int a2, int a3, int a4, int a5)
-			{ a1 = a2 = a3 = a4 = a5 = 0; }
-void overloadargs (int a1, int a2, int a3, int a4, int a5, int a6)
-			{ a1 = a2 = a3 = a4 = a5 = a6 = 0; }
-void overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7)
-			{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = 0; }
-void overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-		   int a8)
-			{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = 0; }
-void overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-		   int a8, int a9)
-			{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 = 0; }
-void overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-		   int a8, int a9, int a10)
-			{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 =
-			  a10 = 0; }
-void overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-		   int a8, int a9, int a10, int a11)
-			{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 =
-			  a10 = a11 == 0; }
-
-/* Some hairy function definitions.
-   Use typedefs to help maintain sanity. */
-
-typedef int   (*PFPc_i)(char *);
-typedef short (*PFPl_s)(long *);
-typedef short (*PFPc_s)(char *);
-typedef int   (*PFl_i)(long);
-typedef PFl_i (*PFPc_PFl_i)(char *);
-typedef PFl_i (*PFPi_PFl_i)(int *);
-typedef PFl_i (*PFPFPc_i_PFl_i)(PFPc_i);
-typedef PFl_i (*PFs_PFl_i)(short);
-typedef int   (*PFPFPl_s_i)(PFPl_s);
-typedef int   (*PFPFPc_s_i)(PFPc_s);
-
-PFs_PFl_i hairyfunc1 (int arg)			{ arg = 0; return 0; }
-int       hairyfunc2 (PFPc_i arg)		{ arg = 0; return 0; }
-int	  hairyfunc3 (PFPFPl_s_i arg)		{ arg = 0; return 0; }
-int	  hairyfunc4 (PFPFPc_s_i arg)		{ arg = 0; return 0; }
-int	  hairyfunc5 (PFPc_PFl_i arg)		{ arg = 0; return 0; }
-int	  hairyfunc6 (PFPi_PFl_i arg)		{ arg = 0; return 0; }
-int	  hairyfunc7 (PFPFPc_i_PFl_i arg)	{ arg = 0; return 0; }
-
-/* gdb has two demanglers (one for g++ 2.95, one for g++ 3).
-   These marker functions help me figure out which demangler is in use. */
-
-char *	dm_type_char_star (char * p)		{ return p; }
-int	dm_type_foo_ref (foo & foo)		{ return foo.ifoo; }
-int *	dm_type_int_star (int * p)		{ return p; }
-long *	dm_type_long_star (long * p)		{ return p; }
-int	dm_type_unsigned_int (unsigned int i)	{ return i; }
-int	dm_type_void (void)			{ return 0; }
-void *	dm_type_void_star (void * p)		{ return p; }
diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
deleted file mode 100644
index a509afb54e8..00000000000
--- a/gdb/testsuite/gdb.cp/cplusfuncs.exp
+++ /dev/null
@@ -1,562 +0,0 @@
-# Copyright 1992, 1997, 1999, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-# Adapted for g++ 3.0 ABI by Michael Chastain. (chastain@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "cplusfuncs"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if { [get_compiler_info $binfile "c++"] } {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-#
-# g++ changed its ABI between 2.95 and 3.0.  gdb has two demanglers
-# for the two different styles.  The two demanglers have some subtle
-# discrepancies in their output.
-#
-#   old demangler         new demangler
-#   --- ---------         --- ---------
-#   "operator, "          "operator,"
-#   "char *"              "char*"
-#   "int *"               "int*"
-#   "long *"              "long*"
-#   "void *"              "void*"
-#   "foo &"               "foo&"
-#   "unsigned int"        "unsigned"
-#   "void"                ""
-#
-# I probe for the forms in use.
-# The defaults are for the v3 demangler (as of 2001-02-13).
-#
-
-set dm_operator_comma		","
-set dm_type_char_star		"char*"
-set dm_type_char_star_quoted    "char\\*"
-set dm_type_foo_ref 		"foo&"
-set dm_type_int_star		"int*"
-set dm_type_long_star		"long*"
-set dm_type_unsigned_int	"unsigned"
-set dm_type_void		""
-set dm_type_void_star		"void*"
-
-proc probe_demangler { } {
-    global gdb_prompt
-    global dm_operator_comma
-    global dm_type_char_star
-    global dm_type_char_star_quoted
-    global dm_type_foo_ref
-    global dm_type_int_star
-    global dm_type_long_star
-    global dm_type_unsigned_int
-    global dm_type_void
-    global dm_type_void_star
-
-    send_gdb "print &'foo::operator,(foo&)'\n"
-    gdb_expect {
-	-re ".*foo::operator, \\(.*foo.*&.*\\).*\r\n$gdb_prompt $" {
-	    # v2 demangler
-	    set dm_operator_comma ", "
-	    pass "detect dm_operator_comma"
-	}
-	-re ".*foo::operator,\\(.*foo.*&.*\\).*\r\n$gdb_prompt $" {
-	    # v3 demangler
-	    pass "detect dm_operator_comma"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "detect dm_operator_comma"
-	}
-	timeout {
-	    fail "detect dm_operator_comma"
-	}
-    }
-
-    send_gdb "print &'dm_type_char_star'\n"
-    gdb_expect {
-	-re ".*dm_type_char_star\\(char \\*\\).*\r\n$gdb_prompt $" {
-	    # v2 demangler
-	    set dm_type_char_star "char *"
-	    set dm_type_char_star_quoted "char \\*"
-	    pass "detect dm_type_char_star"
-	}
-	-re ".*dm_type_char_star\\(char\\*\\).*\r\n$gdb_prompt $" {
-	    # v3 demangler
-	    pass "detect dm_type_char_star"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "detect dm_type_char_star"
-	}
-	timeout {
-	    fail "detect dm_type_char_star (timeout)"
-	}
-    }
-
-    send_gdb "print &'dm_type_foo_ref'\n"
-    gdb_expect {
-	-re ".*dm_type_foo_ref\\(foo &\\).*\r\n$gdb_prompt $" {
-	    # v2 demangler
-	    set dm_type_foo_ref "foo &"
-	    pass "detect dm_type_foo_ref"
-	}
-	-re ".*dm_type_foo_ref\\(foo&\\).*\r\n$gdb_prompt $" {
-	    # v3 demangler
-	    pass "detect dm_type_foo_ref"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "detect dm_type_foo_ref"
-	}
-	timeout {
-	    fail "detect dm_type_foo_ref (timeout)"
-	}
-    }
-
-    send_gdb "print &'dm_type_int_star'\n"
-    gdb_expect {
-	-re ".*dm_type_int_star\\(int \\*\\).*\r\n$gdb_prompt $" {
-	    # v2 demangler
-	    set dm_type_int_star "int *"
-	    pass "detect dm_type_int_star"
-	}
-	-re ".*dm_type_int_star\\(int\\*\\).*\r\n$gdb_prompt $" {
-	    # v3 demangler
-	    pass "detect dm_type_int_star"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "detect dm_type_int_star"
-	}
-	timeout {
-	    fail "detect dm_type_int_star (timeout)"
-	}
-    }
-
-    send_gdb "print &'dm_type_long_star'\n"
-    gdb_expect {
-	-re ".*dm_type_long_star\\(long \\*\\).*\r\n$gdb_prompt $" {
-	    # v2 demangler
-	    set dm_type_long_star "long *"
-	    pass "detect dm_type_long_star"
-	}
-	-re ".*dm_type_long_star\\(long\\*\\).*\r\n$gdb_prompt $" {
-	    # v3 demangler
-	    pass "detect dm_type_long_star"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "detect dm_type_long_star"
-	}
-	timeout {
-	    fail "detect dm_type_long_star (timeout)"
-	}
-    }
-
-    send_gdb "print &'dm_type_unsigned_int'\n"
-    gdb_expect {
-	-re ".*dm_type_unsigned_int\\(unsigned int\\).*\r\n$gdb_prompt $" {
-	    # v2 demangler
-	    set dm_type_unsigned_int "unsigned int"
-	    pass "detect dm_type_unsigned_int"
-	}
-	-re ".*dm_type_unsigned_int\\(unsigned\\).*\r\n$gdb_prompt $" {
-	    # v3 demangler
-	    pass "detect dm_type_unsigned_int"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "detect dm_type_unsigned_int"
-	}
-	timeout {
-	    fail "detect dm_unsigned int (timeout)"
-	}
-    }
-
-    send_gdb "print &'dm_type_void'\n"
-    gdb_expect {
-	-re ".*dm_type_void\\(void\\).*\r\n$gdb_prompt $" {
-	    # v2 demangler
-	    set dm_type_void "void"
-	    pass "detect dm_type_void"
-	}
-	-re ".*dm_type_void\\(\\).*\r\n$gdb_prompt $" {
-	    # v3 demangler
-	    pass "detect dm_type_void"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "detect dm_type_void"
-	}
-	timeout {
-	    fail "detect dm_type_void (timeout)"
-	}
-    }
-
-    send_gdb "print &'dm_type_void_star'\n"
-    gdb_expect {
-	-re ".*dm_type_void_star\\(void \\*\\).*\r\n$gdb_prompt $" {
-	    # v2 demangler
-	    set dm_type_void_star "void *"
-	    pass "detect dm_type_void_star"
-	}
-	-re ".*dm_type_void_star\\(void\\*\\).*\r\n$gdb_prompt $" {
-	    # v3 demangler
-	    pass "detect dm_type_void_star"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "detect dm_type_void_star"
-	}
-	timeout {
-	    fail "detect dm_type_void_star (timeout)"
-	}
-    }
-}
-
-#
-#  Lookup a specific C++ function and print the demangled type.
-#  This form accepts the demangled type as a regexp.
-#
-
-proc info_func_regexp { name demangled } {
-    global gdb_prompt
-
-    send_gdb "info function $name\n"
-    gdb_expect {
-	-re ".*File .*:\r\n(class |)$demangled\r\n.*$gdb_prompt $" {
-	    pass "info function for \"$name\""
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "info function for \"$name\""
-	}
-	timeout {
-	    fail "info function for \"$name\" (timeout)"
-	}
-    }
-}
-
-#
-#  Lookup a specific C++ function and print the demangled type.
-#  This form accepts the demangled type as a literal string.
-#
-
-proc info_func { name demangled } {
-    info_func_regexp "$name" [string_to_regexp "$demangled"]
-}
-
-#
-# Print the address of a function.
-# This checks that I can lookup a fully qualified C++ function.
-# This also checks the argument types on the return string.
-
-# Note: carlton/2003-01-16: If you modify this, make a corresponding
-# modification to print_addr_2_kfail.
-
-proc print_addr_2 { name good } {
-    global gdb_prompt
-    global hex
-
-    set good_pattern [string_to_regexp $good]
-
-    send_gdb "print &'$name'\n"
-    gdb_expect {
-	-re ".* = .* $hex <$good_pattern>\r\n$gdb_prompt $" {
-	    pass "print &'$name'"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "print &'$name'"
-	}
-	timeout {
-	    fail "print &'$name' (timeout)"
-	}
-    }
-}
-
-# NOTE: carlton/2003-01-16: hairyfunc5-6 fail on GCC 3.x (for at least
-# x=1 and x=2.1).  So I'm modifying print_addr_2 to accept a failure
-# condition.  FIXME: It would be nice if the failure condition were
-# conditional on the compiler version, but I'm not sufficiently
-# motivated.  I did hardwire in the versions of char * and int *,
-# which will give some compiler-specificity to the failure.
-
-proc print_addr_2_kfail { name good bad bugid } {
-    global gdb_prompt
-    global hex
-
-    set good_pattern [string_to_regexp $good]
-    set bad_pattern [string_to_regexp $bad]
-
-    send_gdb "print &'$name'\n"
-    gdb_expect {
-	-re ".* = .* $hex <$good_pattern>\r\n$gdb_prompt $" {
-	    pass "print &'$name'"
-	}
-	-re ".* = .* $hex <$bad_pattern>\r\n$gdb_prompt $" {
-	    kfail $bugid "print &'$name'"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "print &'$name'"
-	}
-	timeout {
-	    fail "print &'$name' (timeout)"
-	}
-    }
-}
-
-#
-#  Simple interfaces to print_addr_2.
-#
-
-proc print_addr { name } {
-    print_addr_2 "$name" "$name"
-}
-
-#
-# Test name demangling for operators.
-#
-# The '(' at the end of each regex input pattern is so that we match only
-# the one we are looking for.  I.E. "operator&" would match both
-# "operator&(foo &)" and "operator&&(foo &)".
-#
-# gdb-gnats bug gdb/18:
-#  "gdb can't parse "info func operator*" or "info func operator\*".
-#  The star in "operator*" is interpreted as a regexp, but the "\*"
-#  in  "operator\*" is not a legal operator.
-#
-
-proc test_lookup_operator_functions {} {
-    global dm_operator_comma
-    global dm_type_char_star
-    global dm_type_char_star_quoted
-    global dm_type_foo_ref
-    global dm_type_void
-    global dm_type_void_star
-
-    # operator* requires quoting so that GDB does not treat it as a regexp.
-    info_func "operator\\*("	"void foo::operator*($dm_type_foo_ref);"
-    info_func "operator%("	"void foo::operator%($dm_type_foo_ref);"
-    info_func "operator-("	"void foo::operator-($dm_type_foo_ref);"
-    info_func "operator>>("	"void foo::operator>>($dm_type_foo_ref);"
-    info_func "operator!=("	"void foo::operator!=($dm_type_foo_ref);"
-    info_func "operator>("	"void foo::operator>($dm_type_foo_ref);"
-    info_func "operator>=("	"void foo::operator>=($dm_type_foo_ref);"
-    info_func "operator|("	"void foo::operator|($dm_type_foo_ref);"
-    info_func "operator&&("	"void foo::operator&&($dm_type_foo_ref);"
-    info_func "operator!("	"void foo::operator!($dm_type_void);"
-    info_func "operator++("	"void foo::operator++(int);"
-    info_func "operator=("	"void foo::operator=($dm_type_foo_ref);"
-    info_func "operator+=("	"void foo::operator+=($dm_type_foo_ref);"
-    # operator*= requires quoting so that GDB does not treat it as a regexp.
-    info_func "operator\\*=("	"void foo::operator*=($dm_type_foo_ref);"
-    info_func "operator%=("	"void foo::operator%=($dm_type_foo_ref);"
-    info_func "operator>>=("	"void foo::operator>>=($dm_type_foo_ref);"
-    info_func "operator|=("	"void foo::operator|=($dm_type_foo_ref);"
-    info_func "operator$dm_operator_comma\("	\
-    				"void foo::operator$dm_operator_comma\($dm_type_foo_ref);"
-    info_func "operator/("	"void foo::operator/($dm_type_foo_ref);"
-    info_func "operator+("	"void foo::operator+($dm_type_foo_ref);"
-    info_func "operator<<("	"void foo::operator<<($dm_type_foo_ref);"
-    info_func "operator==("	"void foo::operator==($dm_type_foo_ref);"
-    info_func "operator<("	"void foo::operator<($dm_type_foo_ref);"
-    info_func "operator<=("	"void foo::operator<=($dm_type_foo_ref);"
-    info_func "operator&("	"void foo::operator&($dm_type_foo_ref);"
-    info_func "operator^("	"void foo::operator^($dm_type_foo_ref);"
-    info_func "operator||("	"void foo::operator||($dm_type_foo_ref);"
-    info_func "operator~("	"void foo::operator~($dm_type_void);"
-    info_func "operator--("	"void foo::operator--(int);"
-    info_func "operator->("	"foo *foo::operator->($dm_type_void);"
-    info_func "operator-=("	"void foo::operator-=($dm_type_foo_ref);"
-    info_func "operator/=("	"void foo::operator/=($dm_type_foo_ref);"
-    info_func "operator<<=("	"void foo::operator<<=($dm_type_foo_ref);"
-    info_func "operator&=("	"void foo::operator&=($dm_type_foo_ref);"
-    info_func "operator^=("	"void foo::operator^=($dm_type_foo_ref);"
-    # operator->* requires quoting so that GDB does not treat it as a regexp.
-    info_func "operator->\\*("	"void foo::operator->*($dm_type_foo_ref);"
-
-    # operator[] needs double backslashes, so that a single backslash
-    # will be sent to GDB, preventing the square brackets from being
-    # evaluated as a regular expression. 
-    info_func "operator\\\[\\\](" "void foo::operator\[\]($dm_type_foo_ref);"
-
-    # These are gnarly because they might end with 'static'.
-    set dm_type_void_star_regexp [string_to_regexp $dm_type_void_star]
-    info_func_regexp "operator new("     "void \\*foo::operator new\\(.*\\)(| static);"
-    info_func_regexp "operator delete("  "void foo::operator delete\\($dm_type_void_star_regexp\\)(| static);"
-
-    info_func "operator int("	"int foo::operator int($dm_type_void);"
-    info_func "operator()("	"void foo::operator()($dm_type_foo_ref);"
-    info_func "operator $dm_type_char_star_quoted\(" \
-				"char *foo::operator $dm_type_char_star\($dm_type_void);"
-
-}
-
-
-proc test_paddr_operator_functions {} {
-    global hex
-    global hp_aCC_compiler
-    global dm_operator_comma
-    global dm_type_char_star
-    global dm_type_foo_ref
-    global dm_type_long_star
-    global dm_type_unsigned_int
-    global dm_type_void
-    global dm_type_void_star
-
-    print_addr "foo::operator*($dm_type_foo_ref)"
-    print_addr "foo::operator%($dm_type_foo_ref)"
-    print_addr "foo::operator-($dm_type_foo_ref)"
-    print_addr "foo::operator>>($dm_type_foo_ref)"
-    print_addr "foo::operator!=($dm_type_foo_ref)"
-    print_addr "foo::operator>($dm_type_foo_ref)"
-    print_addr "foo::operator>=($dm_type_foo_ref)"
-    print_addr "foo::operator|($dm_type_foo_ref)"
-    print_addr "foo::operator&&($dm_type_foo_ref)"
-    print_addr "foo::operator!($dm_type_void)"
-    print_addr "foo::operator++(int)"
-    print_addr "foo::operator=($dm_type_foo_ref)"
-    print_addr "foo::operator+=($dm_type_foo_ref)"
-    print_addr "foo::operator*=($dm_type_foo_ref)"
-    print_addr "foo::operator%=($dm_type_foo_ref)"
-    print_addr "foo::operator>>=($dm_type_foo_ref)"
-    print_addr "foo::operator|=($dm_type_foo_ref)"
-    print_addr "foo::operator$dm_operator_comma\($dm_type_foo_ref)"
-    print_addr "foo::operator/($dm_type_foo_ref)"
-    print_addr "foo::operator+($dm_type_foo_ref)"
-    print_addr "foo::operator<<($dm_type_foo_ref)"
-    print_addr "foo::operator==($dm_type_foo_ref)"
-    print_addr "foo::operator<($dm_type_foo_ref)"
-    print_addr "foo::operator<=($dm_type_foo_ref)"
-    print_addr "foo::operator&($dm_type_foo_ref)"
-    print_addr "foo::operator^($dm_type_foo_ref)"
-    print_addr "foo::operator||($dm_type_foo_ref)"
-    print_addr "foo::operator~($dm_type_void)"
-    print_addr "foo::operator--(int)"
-    print_addr "foo::operator->($dm_type_void)"
-    print_addr "foo::operator-=($dm_type_foo_ref)"
-    print_addr "foo::operator/=($dm_type_foo_ref)"
-    print_addr "foo::operator<<=($dm_type_foo_ref)"
-    print_addr "foo::operator&=($dm_type_foo_ref)"
-    print_addr "foo::operator^=($dm_type_foo_ref)"
-    print_addr "foo::operator->*($dm_type_foo_ref)"
-    print_addr "foo::operator\[\]($dm_type_foo_ref)"
-    print_addr "foo::operator()($dm_type_foo_ref)"
-
-    gdb_test "print &'foo::operator new'" \
-	" = .* $hex <foo::operator new\\(.*\\)(| static)>"
-    if { !$hp_aCC_compiler } {
-	print_addr "foo::operator delete($dm_type_void_star)"
-    } else {
-	gdb_test "print &'foo::operator delete($dm_type_void_star) static'" \
-	    " = .*(0x\[0-9a-f\]+|) <foo::operator delete.*>"
-    }
-
-    print_addr "foo::operator int($dm_type_void)"
-    print_addr "foo::operator $dm_type_char_star\($dm_type_void)"
-}
-
-#
-# Test overloaded functions (1 arg).
-#
-
-proc test_paddr_overloaded_functions {} {
-    global dm_type_unsigned_int
-    global dm_type_void
-
-    print_addr "overload1arg($dm_type_void)"
-    print_addr "overload1arg(char)"
-    print_addr "overload1arg(signed char)"
-    print_addr "overload1arg(unsigned char)"
-    print_addr "overload1arg(short)"
-    print_addr "overload1arg(unsigned short)"
-    print_addr "overload1arg(int)"
-    print_addr "overload1arg($dm_type_unsigned_int)"
-    print_addr "overload1arg(long)"
-    print_addr "overload1arg(unsigned long)"
-    print_addr "overload1arg(float)"
-    print_addr "overload1arg(double)"
-
-    print_addr "overloadargs(int)"
-    print_addr "overloadargs(int, int)"
-    print_addr "overloadargs(int, int, int)"
-    print_addr "overloadargs(int, int, int, int)"
-    print_addr "overloadargs(int, int, int, int, int)"
-    print_addr "overloadargs(int, int, int, int, int, int)"
-    print_addr "overloadargs(int, int, int, int, int, int, int)"
-    print_addr "overloadargs(int, int, int, int, int, int, int, int)"
-    print_addr "overloadargs(int, int, int, int, int, int, int, int, int)"
-    print_addr "overloadargs(int, int, int, int, int, int, int, int, int, int)"
-    print_addr "overloadargs(int, int, int, int, int, int, int, int, int, int, int)"
-}
-
-proc test_paddr_hairy_functions {} {
-    global gdb_prompt
-    global hex
-    global dm_type_char_star
-    global dm_type_int_star
-    global dm_type_long_star
-
-    print_addr_2 "hairyfunc1" "hairyfunc1(int)"
-    print_addr_2 "hairyfunc2" "hairyfunc2(int (*)($dm_type_char_star))"
-    print_addr_2 "hairyfunc3" "hairyfunc3(int (*)(short (*)($dm_type_long_star)))"
-    print_addr_2 "hairyfunc4" "hairyfunc4(int (*)(short (*)($dm_type_char_star)))"
-
-    # gdb-gnats bug gdb/19:
-    # "gdb v3 demangler fails on hairyfunc5 hairyfunc6 hairyfunc7"
-    print_addr_2_kfail "hairyfunc5" "hairyfunc5(int (*(*)($dm_type_char_star))(long))" "hairyfunc5(int (*)(long) (*)(char*))" "gdb/19"
-    print_addr_2_kfail "hairyfunc6" "hairyfunc6(int (*(*)($dm_type_int_star))(long))" "hairyfunc6(int (*)(long) (*)(int*))" "gdb/19"
-    print_addr_2_kfail "hairyfunc7" "hairyfunc7(int (*(*)(int (*)($dm_type_char_star)))(long))" "hairyfunc7(int (*)(long) (*)(int (*)(char*)))" "gdb/19"
-}
-
-proc do_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-    send_gdb "set language c++\n"
-    gdb_expect -re "$gdb_prompt $"
-    send_gdb "set width 0\n"
-    gdb_expect -re "$gdb_prompt $"
-
-    runto_main
-
-    probe_demangler
-    test_paddr_overloaded_functions
-    test_paddr_operator_functions
-    test_paddr_hairy_functions
-    test_lookup_operator_functions
-}
-
-do_tests
diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp
deleted file mode 100644
index de1ee3496d9..00000000000
--- a/gdb/testsuite/gdb.cp/ctti.exp
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1998, 1999, 2001, 2003, 2004 Free Software Foundation, 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.  
-
-# This file is part of the gdb testsuite
-# file written by Elena Zannoni (ezannoni@cygnus.com)
-# rewritten by Michael Chastain (mec.gnu@mindspring.com)
-#
-# source files cttiadd.cc, cttiadd1.cc, cttiadd2.cc, cttiadd3.cc
-
-# Call to template instantiations.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "cttiadd"
-set srcfile  "${testfile}.cc"
-set srcfile1 "${testfile}1.cc"
-set srcfile2 "${testfile}2.cc"
-set srcfile3 "${testfile}3.cc"
-set objfile  "${testfile}.o"
-set objfile1 "${testfile}1.o"
-set objfile2 "${testfile}2.o"
-set objfile3 "${testfile}3.o"
-set binfile  "${objdir}/${subdir}/${testfile}"
-
-if { [gdb_compile "$srcdir/$subdir/$srcfile" "$objdir/$subdir/$objfile" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "$srcdir/$subdir/$srcfile2" "$objdir/$subdir/$objfile2" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "$srcdir/$subdir/$srcfile3" "$objdir/$subdir/$objfile3" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "$objdir/$subdir/$objfile $objdir/$subdir/$objfile1 $objdir/$subdir/$objfile2 $objdir/$subdir/$objfile3" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1;
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_breakpoint [gdb_get_line_number "marker add1"]
-gdb_continue_to_breakpoint "marker add1"
-
-gdb_test "print c" "\\$\[0-9\]+ = 194 .*"
-gdb_test "print f" "\\$\[0-9\]+ = 9"
-gdb_test "print i" "\\$\[0-9\]+ = 4"
-
-# TODO: this needs more work before actually deploying it.
-# So bail out here.
-
-if { [ test_compiler_info gcc-*] } then { continue }
-
-gdb_test_multiple "print add<int>(2,2)" "print add<int>(2,2)" {
-    -re "\\$\[0-9\]+ = 4\r\n$gdb_prompt $" {
-	pass "print add<int>(2,2)"
-    }
-    -re "No symbol \"add<int>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add<int>(2,2)"
-    }
-}
-
-# Note: 2.25 and 4.5 are exactly representable in IEEE-ish formats
-gdb_test_multiple "print add<float>(2.25,2.25)" "print add<float>(2.25,2.25)" {
-    -re "\\$\[0-9\]+ = 4\\.5\r\n$gdb_prompt $" {
-	pass "print add<float>(2.25,2.25)"
-    }
-    -re "No symbol \"add<float>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add<float>(2.25,2.25)"
-    }
-}
-
-gdb_test_multiple "print add<unsigned char>('A','A')" "print add<unsigned char>('A','A')" {
-    -re "\\$\[0-9\]+ = -126 .*\r\n$gdb_prompt $" {
-	pass "print add<unsigned char>('A','A')"
-    }
-    -re "No symbol \"add<unsigned char>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add<unsigned char>('A','A')"
-    }
-}
-
-gdb_test_multiple "print add2<int>(2,2)" "print add2<int>(2,2)" {
-    -re "\\$\[0-9\]+ = 4\r\n$gdb_prompt $" {
-	pass "print add2<int>(2,2)"
-    }
-    -re "No symbol \"add2<int>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add2<int>(2,2)"
-    }
-}
-
-gdb_test_multiple "print add2<float>(2.25,2.25)" "print add2<float>(2.25,2.25)" {
-    -re "\\$\[0-9\]+ = 4\\.5\r\n$gdb_prompt $" {
-	pass "print add2<float>(2.25,2.25)"
-    }
-    -re "No symbol \"add2<float>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add2<float>(2.25,2.25)"
-    }
-}
-
-gdb_test_multiple "print add2<unsigned char>('A','A')" "print add2<unsigned char>('A','A')" {
-    -re "\\$\[0-9]+ = -126 .*$gdb_prompt $" {
-	pass "print add2<unsigned char>('A','A')"
-    }
-    -re "No symbol \"add2<unsigned char>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add2<unsigned char>('A','A')"
-    }
-}
-
-gdb_test_multiple "print add3<int>(2,2)" "print add3<int>(2,2)" {
-    -re "\\$\[0-9\]+ = 4\r\n$gdb_prompt $" {
-	pass "print add3<int>(2,2)"
-    }
-    -re "No symbol \"add3<int>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add3<int>(2,2)"
-    }
-}
-
-gdb_test_multiple "print add3<float>(2.25,2.25)" "print add3<float>(2.25,2.25)" {
-    -re "\\$\[0-9\]+ = 4\\.5\r\n$gdb_prompt $" {
-	pass "print add3<float>(2.25,2.25)"
-    }
-    -re "No symbol \"add3<float>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add3<float>(2.25,2.25)"
-    }
-}
-
-gdb_test_multiple "print add3<unsigned char>('A','A')" "print add3<unsigned char>('A','A')" {
-    -re "\\$\[0-9]+ = -126 .*$gdb_prompt $" {
-	pass "print add3<unsigned char>('A','A')"
-    }
-    -re "No symbol \"add3<unsigned char>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add3<unsigned char>('A','A')"
-    }
-}
-
-gdb_test_multiple "print add4<int>(2,2)" "print add4<int>(2,2)" {
-    -re "\\$\[0-9\]+ = 4\r\n$gdb_prompt $" {
-	pass "print add4<int>(2,2)"
-    }
-    -re "No symbol \"add4<int>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add4<int>(2,2)"
-    }
-}
-
-gdb_test_multiple "print add4<float>(2.25,2.25)" "print add4<float>(2.25,2.25)" {
-    -re "\\$\[0-9\]+ = 4\\.5\r\n$gdb_prompt $" {
-	pass "print add4<float>(2.25,2.25)"
-    }
-    -re "No symbol \"add4<float>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add4<float>(2.25,2.25)"
-    }
-}
-
-gdb_test_multiple "print add4<unsigned char>('A','A')" "print add4<unsigned char>('A','A')" {
-    -re "\\$\[0-9]+ = -126 .*$gdb_prompt $" {
-	pass "print add4<unsigned char>('A','A')"
-    }
-    -re "No symbol \"add4<unsigned char>\" in current context.\r\n$gdb_prompt $" {
-	# TODO: kfail or xfail this
-	fail "print add4<unsigned char>('A','A')"
-    }
-}
diff --git a/gdb/testsuite/gdb.cp/cttiadd.cc b/gdb/testsuite/gdb.cp/cttiadd.cc
deleted file mode 100644
index 14ac6d130e5..00000000000
--- a/gdb/testsuite/gdb.cp/cttiadd.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1998, 1999, 2004 Free Software Foundation, 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.
-   */
-
-template<class T> T add(T v1, T v2)
-{
-   T v3;
-   v3 = v1;
-   v3 += v2;
-   return v3;
- }
-
-int main()
-{
-  unsigned char c;
-  int i;
-  float f;
-  extern void add1();
-  extern void subr2();
-  extern void subr3();
-  
-  c = 'a';
-  i = 2;
-  f = 4.5;
-
-  c = add(c, c);
-  i = add(i, i);
-  f = add(f, f);
-
-  // marker add1
-  add1();
-  subr2();
-  subr3();
-}
diff --git a/gdb/testsuite/gdb.cp/cttiadd1.cc b/gdb/testsuite/gdb.cp/cttiadd1.cc
deleted file mode 100644
index a67babe0a9c..00000000000
--- a/gdb/testsuite/gdb.cp/cttiadd1.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1998, 1999, 2004 Free Software Foundation, 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.
-   */
-
-template<class T> T add(T v1, T v2);
-
-void add1()
-{
-  unsigned char c;
-  int i;
-  float f;
-  
-  c = 'b';
-  i = 3;
-  f = 6.5;
-
-  c = add(c, c);
-  i = add(i, i);
-  f = add(f, f);
-}
diff --git a/gdb/testsuite/gdb.cp/cttiadd2.cc b/gdb/testsuite/gdb.cp/cttiadd2.cc
deleted file mode 100644
index 0d388d7cfb8..00000000000
--- a/gdb/testsuite/gdb.cp/cttiadd2.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1998, 1999, 2004 Free Software Foundation, 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.
-   */
-
-template<class T> T add2(T v1, T v2)
-{
-   T v3;
-   v3 = v1;
-   v3 += v2;
-   return v3;
-}
-
-void subr2()
-{
-  unsigned char c;
-  int i;
-  float f;
-  
-  c = 'b';
-  i = 3;
-  f = 6.5;
-
-  c = add2(c, c);
-  i = add2(i, i);
-  f = add2(f, f);
-}
diff --git a/gdb/testsuite/gdb.cp/cttiadd3.cc b/gdb/testsuite/gdb.cp/cttiadd3.cc
deleted file mode 100644
index 1d11dafccd6..00000000000
--- a/gdb/testsuite/gdb.cp/cttiadd3.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1998, 1999, 2004 Free Software Foundation, 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.
-   */
-
-template<class T> T add3(T v1, T v2)
-{
-   T v3;
-   v3 = v1;
-   v3 += v2;
-   return v3;
-}
-
-template<class T> T add4(T v1, T v2)
-{
-   T v3;
-   v3 = v1;
-   v3 += v2;
-   return v3;
-}
-
-void subr3()
-{
-  unsigned char c;
-  int i;
-  float f;
-  
-  c = 'b';
-  i = 3;
-  f = 6.5;
-
-  c = add3(c, c);
-  i = add3(i, i);
-  f = add3(f, f);
-  c = add4(c, c);
-  i = add4(i, i);
-  f = add4(f, f);
-}
diff --git a/gdb/testsuite/gdb.cp/demangle.exp b/gdb/testsuite/gdb.cp/demangle.exp
deleted file mode 100644
index 848f66fc7e8..00000000000
--- a/gdb/testsuite/gdb.cp/demangle.exp
+++ /dev/null
@@ -1,1579 +0,0 @@
-# Copyright (C) 1992, 1997, 1999, 2003, 2004 Free Software Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-### The demangling style we last sent to GDB.
-set current_demangling_style none
-
-### Set GDB's current demangling style to STYLE.  Subsequent calls to
-### test_demangle will include STYLE in the test name when reporting
-### passes and failures.
-proc set_demangling_style {style} {
-    global gdb_prompt
-    global current_demangling_style
-
-    send_gdb "set demangle-style $style\n"
-    gdb_expect {
-	-re "set demangle-style $style\[\r\n\]+$gdb_prompt $" {
-	    pass "$style: set demangle-style"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$style: set demangle-style"
-	    error "set_demangling_style: set style"
-	}
-	timeout { 
-	    fail "$style: set demangle-style (timeout)"
-	    error "set_demangling_style: set style"
-	}
-    }
-
-    send_gdb "show demangle-style\n"
-    gdb_expect {
-	-re "The current C\[+\]+ demangling style is \"$style\".\r\n$gdb_prompt $" { 
-	    pass "$style: check demangling style"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$style: check demangling style"
-	    error "set_demangling_style: check style"
-	}
-	timeout { 
-	    fail "$style: check demangling style (timeout)" 
-	    error "set_demangling_style: check style"
-	}
-    }
-
-    set current_demangling_style $style
-}
-
-
-### Utility function for test_demangling and test_demangling_exact.
-proc test_demangling_core {tester test result} {
-    global current_demangling_style
-
-    if {! [regexp {^([^ ]+): (.+)$} $test dummy style name]} {
-      error "bad test name passed to test_demangling"
-    }
-
-    if {[string compare $style $current_demangling_style]} {
-	set_demangling_style $style
-    }
-
-    $tester "maintenance demangle $name" $result $test
-}
-
-### Demangle an identifier, and check that the result matches a pattern.
-###
-### TEST should be of the form "STYLE: NAME", where STYLE is the name
-### of a demangling style (like "gnu" or "arm"), and NAME is a mangled
-### identifier to demangle.  Pass when the result matches the regular
-### expression RESULT.  Report passes and fails using TEST as the name
-### of the test.
-###
-### Why don't we just pass the STYLE and NAME as two separate
-### arguments, or let the style be a global variable?  That would be
-### cleaner.  However, doing it this way means that:
-### 
-### 1) the name of the test, as recorded in the summary and log,
-### appears verbatim in the script, and
-### 
-### 2) that test names are unique, even though we try to demangle the same
-### identifiers using several different mangling styles.
-### 
-### This makes it a lot easier for people tracking down failures to
-### find the one they care about.
-
-proc test_demangling {test result} {
-    test_demangling_core gdb_test $test $result
-}
-
-### Like test_demangling, above, except that RESULT is not a regexp,
-### but a string that must match exactly.
-
-proc test_demangling_exact {test result} {
-    test_demangling_core gdb_test_exact $test $result
-}
-
-
-
-#
-#  Test gnu style name demangling
-#
-
-proc test_gnu_style_demangling {} {
-    global gdb_prompt
-
-    test_demangling "gnu: Abort__FP6EditoriPCc" \
-	"Abort\[(\]+Editor \[*\]+, int, (const char|char const) \[*\]+\[)\]+"
-    test_demangling_exact "gnu: AddAlignment__9ivTSolverUiP12ivInteractorP7ivTGlue" "ivTSolver::AddAlignment(unsigned int, ivInteractor *, ivTGlue *)"
-    test_demangling "gnu: Append__15NameChooserViewPCc" \
-	"NameChooserView::Append\[(\]+(const char|char const) \[*\]+\[)\]+"
-    test_demangling_exact "gnu: ArrowheadIntersects__9ArrowLineP9ArrowheadR6BoxObjP7Graphic" "ArrowLine::ArrowheadIntersects(Arrowhead *, BoxObj &, Graphic *)"
-    test_demangling_exact "gnu: AtEnd__13ivRubberGroup" "ivRubberGroup::AtEnd(void)"
-    test_demangling_exact "gnu: BgFilter__9ivTSolverP12ivInteractor" "ivTSolver::BgFilter(ivInteractor *)"
-    test_demangling "gnu: BitPatterntoa__FRC10BitPatternccc" \
-	"BitPatterntoa\[(\]+(const BitPattern|BitPattern const) &, char, char, char\[)\]+"
-    test_demangling_exact "gnu: Check__6UArrayi" "UArray::Check(int)"
-    test_demangling_exact "gnu: CoreConstDecls__8TextCodeR7ostream" "TextCode::CoreConstDecls(ostream &)"
-    test_demangling_exact "gnu: Detach__8StateVarP12StateVarView" "StateVar::Detach(StateVarView *)"
-    test_demangling_exact "gnu: Done__9ComponentG8Iterator" "Component::Done(Iterator)"
-    test_demangling "gnu: DrawDestinationTransformedImage__FP7_XImageiiT0iiUlUiiiUiUlUlP4_XGCRC13ivTransformeriiii" \
-	"DrawDestinationTransformedImage\[(\]+_XImage \[*\]+, int, int, _XImage \[*\]+, int, int, unsigned long, unsigned int, int, int, unsigned int, unsigned long, unsigned long, _XGC \[*\]+, (const ivTransformer|ivTransformer const) &, int, int, int, int\[)\]+"
-
-    test_demangling "gnu: Edit__12StringEditorPCcii" \
-	"StringEditor::Edit\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    test_demangling_exact "gnu: Effect__11RelateManipR7ivEvent" "RelateManip::Effect(ivEvent &)"
-    test_demangling "gnu: FilterName__FPCc" \
-	"FilterName\[(\]+(const char|char const) \[*\]+\[)\]+"
-    test_demangling "gnu: Filter__6PSTextPCci" \
-	"PSText::Filter\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    test_demangling "gnu: FindColor__7CatalogPCciii" \
-	"Catalog::FindColor\[(\]+(const char|char const) \[*\]+, int, int, int\[)\]+"
-    test_demangling_exact "gnu: FindFixed__FRP4CNetP4CNet" "FindFixed(CNet *&, CNet *)"
-    test_demangling "gnu: FindFont__7CatalogPCcN21" \
-	"Catalog::FindFont\[(\]+(const char|char const) \[*\]+, (const char|char const) \[*\]+, (const char|char const) \[*\]+\[)\]+"
-    test_demangling_exact "gnu: Fix48_abort__FR8twolongs" "Fix48_abort(twolongs &)"
-    test_demangling_exact "gnu: GetBarInfo__15iv2_6_VScrollerP13ivPerspectiveRiT2" "iv2_6_VScroller::GetBarInfo(ivPerspective *, int &, int &)"
-    test_demangling_exact "gnu: GetBgColor__C9ivPainter" "ivPainter::GetBgColor(void) const"
-
-    test_demangling "gnu: Iisdouble__FPC6IntRep" \
-	"Iisdouble\[(\]+(const IntRep|IntRep const) \[*\]+\[)\]+"
-    test_demangling_exact "gnu: InsertBody__15H_PullrightMenuii" "H_PullrightMenu::InsertBody(int, int)"
-    test_demangling_exact "gnu: InsertCharacter__9TextManipc" "TextManip::InsertCharacter(char)"
-
-    test_demangling_exact "gnu: InsertToplevel__7ivWorldP12ivInteractorT1" "ivWorld::InsertToplevel(ivInteractor *, ivInteractor *)"
-    test_demangling_exact "gnu: InsertToplevel__7ivWorldP12ivInteractorT1iiUi" "ivWorld::InsertToplevel(ivInteractor *, ivInteractor *, int, int, unsigned int)"
-    test_demangling "gnu: IsADirectory__FPCcR4stat" \
-	"IsADirectory\[(\]+(const char|char const) \[*\]+, stat &\[)\]+"
-    test_demangling_exact "gnu: IsAGroup__FP11GraphicViewP11GraphicComp" "IsAGroup(GraphicView *, GraphicComp *)"
-    test_demangling_exact "gnu: IsA__10ButtonCodeUl" "ButtonCode::IsA(unsigned long)"
-
-    test_demangling_exact "gnu: ReadName__FR7istreamPc" "ReadName(istream &, char *)"
-    test_demangling_exact "gnu: Redraw__13StringBrowseriiii" "StringBrowser::Redraw(int, int, int, int)"
-    test_demangling_exact "gnu: Rotate__13ivTransformerf" "ivTransformer::Rotate(float)"
-    test_demangling_exact "gnu: Rotated__C13ivTransformerf" "ivTransformer::Rotated(float) const"
-    test_demangling_exact "gnu: Round__Ff" "Round(float)"
-
-    test_demangling_exact "gnu: SetExport__16MemberSharedNameUi" "MemberSharedName::SetExport(unsigned int)"
-    test_demangling_exact "gnu: Set__14ivControlState13ControlStatusUi" "ivControlState::Set(ControlStatus, unsigned int)"
-    test_demangling_exact "gnu: Set__5DFacePcii" "DFace::Set(char *, int, int)"
-
-    test_demangling_exact "gnu: VConvert__9ivTSolverP12ivInteractorRP8TElementT2" "ivTSolver::VConvert(ivInteractor *, TElement *&, TElement *&)"
-    test_demangling_exact "gnu: VConvert__9ivTSolverP7ivTGlueRP8TElement" "ivTSolver::VConvert(ivTGlue *, TElement *&)"
-    test_demangling_exact "gnu: VOrder__9ivTSolverUiRP12ivInteractorT2" "ivTSolver::VOrder(unsigned int, ivInteractor *&, ivInteractor *&)"
-    test_demangling "gnu: Valid__7CatalogPCcRP4Tool" \
-	"Catalog::Valid\[(\]+(const char|char const) \[*\]+, Tool \[*\]+&\[)\]+"
-    test_demangling_exact "gnu: _10PageButton\$__both" "PageButton::__both"
-    test_demangling_exact "gnu: _3RNG\$singleMantissa" "RNG::singleMantissa"
-    test_demangling_exact "gnu: _5IComp\$_release" "IComp::_release"
-    test_demangling_exact "gnu: _\$_10BitmapComp" "BitmapComp::~BitmapComp(void)"
-
-    test_demangling_exact "gnu: _\$_9__io_defs" "__io_defs::~__io_defs(void)"
-    test_demangling_exact "gnu: _\$_Q23foo3bar" "foo::bar::~bar(void)"
-    test_demangling_exact "gnu: _\$_Q33foo3bar4bell" "foo::bar::bell::~bell(void)"
-    test_demangling_exact "gnu: __10ivTelltaleiP7ivGlyph" "ivTelltale::ivTelltale(int, ivGlyph *)"
-    test_demangling_exact "gnu: __10ivViewportiP12ivInteractorUi" "ivViewport::ivViewport(int, ivInteractor *, unsigned int)"
-    test_demangling_exact "gnu: __10ostrstream" "ostrstream::ostrstream(void)"
-    test_demangling_exact "gnu: __10ostrstreamPcii" "ostrstream::ostrstream(char *, int, int)"
-    test_demangling "gnu: __11BasicDialogiPCcP13ivButtonStateN22Ui" \
-	"BasicDialog::BasicDialog\[(\]+int, (const char|char const) \[*\]+, ivButtonState \[*\]+, (const char|char const) \[*\]+, (const char|char const) \[*\]+, unsigned int\[)\]+"
-    test_demangling_exact "gnu: __11BitmapTablei" "BitmapTable::BitmapTable(int)"
-    test_demangling_exact "gnu: __12ViewportCodeP12ViewportComp" "ViewportCode::ViewportCode(ViewportComp *)"
-    test_demangling "gnu: __12iv2_6_BorderiPCci" \
-	"iv2_6_Border::iv2_6_Border\[(\]+int, (const char|char const) \[*\]+, int\[)\]+"
-    test_demangling_exact "gnu: __12iv2_6_Borderii" "iv2_6_Border::iv2_6_Border(int, int)"
-    test_demangling "gnu: __12ivBackgroundiP7ivGlyphPC7ivColor" \
-	"ivBackground::ivBackground\[(\]+int, ivGlyph \[*\]+, (const ivColor|ivColor const) \[*\]+\[)\]+"
-    test_demangling_exact "gnu: __12ivBreak_Listl" "ivBreak_List::ivBreak_List(long)"
-    test_demangling "gnu: __14TextInteractoriPCcUi" \
-	"TextInteractor::TextInteractor\[(\]+int, (const char|char const) \[*\]+, unsigned int\[)\]+"
-    test_demangling_exact "gnu: __14iv2_6_MenuItemiP12ivInteractor" "iv2_6_MenuItem::iv2_6_MenuItem(int, ivInteractor *)"
-    test_demangling "gnu: __14iv2_6_MenuItemiPCcP12ivInteractor" \
-	"iv2_6_MenuItem::iv2_6_MenuItem\[(\]+int, (const char|char const) \[*\]+, ivInteractor \[*\]+\[)\]+"
-
-    test_demangling_exact "gnu: __20DisplayList_IteratorR11DisplayList" "DisplayList_Iterator::DisplayList_Iterator(DisplayList &)"
-    test_demangling_exact "gnu: __3fooRT0" "foo::foo(foo &)"
-    test_demangling_exact "gnu: __3fooiN31" "foo::foo(int, int, int, int)"
-    test_demangling "gnu: __3fooiPCc" \
-	"foo::foo\[(\]+int, (const char|char const) \[*\]+\[)\]+"
-    test_demangling_exact "gnu: __3fooiRT0iT2iT2" "foo::foo(int, foo &, int, foo &, int, foo &)"
-    test_demangling "gnu: __6GetOptiPPcPCc" \
-	"GetOpt::GetOpt\[(\]+int, char \[*\]+\[*\]+, (const char|char const) \[*\]+\[)\]+"
-    test_demangling_exact "gnu: __6KeyMapPT0" "KeyMap::KeyMap(KeyMap *)"
-    test_demangling "gnu: __7ivWorldPCcRiPPcPC12ivOptionDescPC14ivPropertyData" \
-	"ivWorld::ivWorld\[(\]+(const char|char const) \[*\]+, int &, char \[*\]+\[*\]+, (const ivOptionDesc|ivOptionDesc const) \[*\]+, (const ivPropertyData|ivPropertyData const) \[*\]+\[)\]+"
-    test_demangling "gnu: __7procbufPCci" \
-	"procbuf::procbuf\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    test_demangling_exact "gnu: __8ArrowCmdP6EditorUiUi" "ArrowCmd::ArrowCmd(Editor *, unsigned int, unsigned int)"
-
-    test_demangling_exact "gnu: __9F_EllipseiiiiP7Graphic" "F_Ellipse::F_Ellipse(int, int, int, int, Graphic *)"
-    test_demangling_exact "gnu: __9FrameDataP9FrameCompi" "FrameData::FrameData(FrameComp *, int)"
-    test_demangling_exact "gnu: __9HVGraphicP9CanvasVarP7Graphic" "HVGraphic::HVGraphic(CanvasVar *, Graphic *)"
-    test_demangling_exact "gnu: __Q23foo3bar" "foo::bar::bar(void)"
-    test_demangling_exact "gnu: __Q33foo3bar4bell" "foo::bar::bell::bell(void)"
-    test_demangling_exact "gnu: __aa__3fooRT0" "foo::operator&&(foo &)"
-    test_demangling_exact "gnu: __aad__3fooRT0" "foo::operator&=(foo &)"
-    test_demangling_exact "gnu: __ad__3fooRT0" "foo::operator&(foo &)"
-    test_demangling_exact "gnu: __adv__3fooRT0" "foo::operator/=(foo &)"
-    test_demangling_exact "gnu: __aer__3fooRT0" "foo::operator^=(foo &)"
-    test_demangling_exact "gnu: __als__3fooRT0" "foo::operator<<=(foo &)"
-    test_demangling_exact "gnu: __amd__3fooRT0" "foo::operator%=(foo &)"
-    test_demangling_exact "gnu: __ami__3fooRT0" "foo::operator-=(foo &)"
-    test_demangling_exact "gnu: __aml__3FixRT0" "Fix::operator*=(Fix &)"
-    test_demangling_exact "gnu: __aml__5Fix16i" "Fix16::operator*=(int)"
-    test_demangling_exact "gnu: __aml__5Fix32RT0" "Fix32::operator*=(Fix32 &)"
-    test_demangling_exact "gnu: __aor__3fooRT0" "foo::operator|=(foo &)"
-    test_demangling_exact "gnu: __apl__3fooRT0" "foo::operator+=(foo &)"
-    test_demangling_exact "gnu: __ars__3fooRT0" "foo::operator>>=(foo &)"
-
-    test_demangling_exact "gnu: __as__3fooRT0" "foo::operator=(foo &)"
-    test_demangling_exact "gnu: __cl__3fooRT0" "foo::operator()(foo &)"
-    test_demangling_exact "gnu: __cl__6Normal" "Normal::operator()(void)"
-    test_demangling_exact "gnu: __cl__6Stringii" "String::operator()(int, int)"
-    test_demangling_exact "gnu: __cm__3fooRT0" "foo::operator, (foo &)"
-    test_demangling_exact "gnu: __co__3foo" "foo::operator~(void)"
-    test_demangling_exact "gnu: __dl__3fooPv" "foo::operator delete(void *)"
-    test_demangling_exact "gnu: __dv__3fooRT0" "foo::operator/(foo &)"
-    test_demangling_exact "gnu: __eq__3fooRT0" "foo::operator==(foo &)"
-    test_demangling_exact "gnu: __er__3fooRT0" "foo::operator^(foo &)"
-    test_demangling_exact "gnu: __ge__3fooRT0" "foo::operator>=(foo &)"
-    test_demangling_exact "gnu: __gt__3fooRT0" "foo::operator>(foo &)"
-    test_demangling_exact "gnu: __le__3fooRT0" "foo::operator<=(foo &)"
-    test_demangling_exact "gnu: __ls__3fooRT0" "foo::operator<<(foo &)"
-    test_demangling_exact "gnu: __ls__FR7ostreamPFR3ios_R3ios" "operator<<(ostream &, ios &(*)(ios &))"
-    test_demangling_exact "gnu: __ls__FR7ostreamR3Fix" "operator<<(ostream &, Fix &)"
-    test_demangling_exact "gnu: __lt__3fooRT0" "foo::operator<(foo &)"
-    test_demangling_exact "gnu: __md__3fooRT0" "foo::operator%(foo &)"
-    test_demangling_exact "gnu: __mi__3fooRT0" "foo::operator-(foo &)"
-    test_demangling_exact "gnu: __ml__3fooRT0" "foo::operator*(foo &)"
-    test_demangling_exact "gnu: __mm__3fooi" "foo::operator--(int)"
-
-    test_demangling_exact "gnu: __ne__3fooRT0" "foo::operator!=(foo &)"
-    test_demangling "gnu: __ne__FRC7ComplexT0" \
-	"operator!=\[(\]+(const Complex|Complex const) &, (const Complex|Complex const) &\[)\]+"
-    test_demangling "gnu: __ne__FRC7Complexd" \
-	"operator!=\[(\]+(const Complex|Complex const) &, double\[)\]+"
-    test_demangling "gnu: __ne__FRC9SubStringRC6String" \
-	"operator!=\[(\]+(const SubString|SubString const) &, (const String|String const) &\[)\]+"
-    test_demangling_exact "gnu: __nt__3foo" "foo::operator!(void)"
-    test_demangling_exact "gnu: __nw__3fooi" "foo::operator new(int)"
-    test_demangling_exact "gnu: __oo__3fooRT0" "foo::operator||(foo &)"
-    test_demangling_exact "gnu: __opPc__3foo" "foo::operator char *(void)"
-    test_demangling_exact "gnu: __opi__3foo" "foo::operator int(void)"
-    test_demangling_exact "gnu: __or__3fooRT0" "foo::operator|(foo &)"
-    test_demangling_exact "gnu: __pl__3fooRT0" "foo::operator+(foo &)"
-    test_demangling_exact "gnu: __pp__3fooi" "foo::operator++(int)"
-    test_demangling_exact "gnu: __rf__3foo" "foo::operator->(void)"
-    test_demangling_exact "gnu: __rm__3fooRT0" "foo::operator->*(foo &)"
-    test_demangling_exact "gnu: __rs__3fooRT0" "foo::operator>>(foo &)"
-    test_demangling "gnu: __vc__3fooRT0" "foo::operator\\\[\\\]\\(foo &\\)"
-    test_demangling "gnu: _gsub__6StringRC5RegexPCci" \
-	"String::_gsub\[(\]+(const Regex|Regex const) &, (const char|char const) \[*\]+, int\[)\]+"
-    test_demangling_exact "gnu: _new_Fix__FUs" "_new_Fix(unsigned short)"
-
-    # gcc 2.4.5 (and earlier) style virtual tables.  We want to continue to
-    # correctly demangle these even if newer compilers use a different form.
-    test_demangling_exact "gnu: _vt.foo" "foo virtual table"
-    test_demangling_exact "gnu: _vt.foo.bar" "foo::bar virtual table"
-    test_demangling_exact "gnu: _vt\$foo" "foo virtual table"
-    test_demangling_exact "gnu: _vt\$foo\$bar" "foo::bar virtual table"
-
-    test_demangling_exact "gnu: append__7ivGlyphPT0" "ivGlyph::append(ivGlyph *)"
-    test_demangling "gnu: arg__FRC7Complex" \
-	"arg\[(\]+(const Complex|Complex const) &\[)\]+"
-    test_demangling_exact "gnu: clearok__FP7_win_sti" "clearok(_win_st *, int)"
-
-    test_demangling_exact "gnu: complexfunc2__FPFPc_i" "complexfunc2(int (*)(char *))"
-    test_demangling_exact "gnu: complexfunc3__FPFPFPl_s_i" "complexfunc3(int (*)(short (*)(long *)))"
-    test_demangling_exact "gnu: complexfunc4__FPFPFPc_s_i" "complexfunc4(int (*)(short (*)(char *)))"
-    test_demangling_exact "gnu: complexfunc5__FPFPc_PFl_i" "complexfunc5(int (*(*)(char *))(long))"
-    test_demangling_exact "gnu: complexfunc6__FPFPi_PFl_i" "complexfunc6(int (*(*)(int *))(long))"
-    test_demangling_exact "gnu: complexfunc7__FPFPFPc_i_PFl_i" "complexfunc7(int (*(*)(int (*)(char *)))(long))"
-    test_demangling "gnu: contains__C9BitStringRC10BitPattern" \
-	"BitString::contains\[(\]+(const BitPattern|BitPattern const) &\[)\]+ const"
-    test_demangling "gnu: contains__C9BitStringRC12BitSubStringi" \
-	"BitString::contains\[(\]+(const BitSubString|BitSubString const) &, int\[)\]+ const"
-    test_demangling "gnu: contains__C9BitStringRT0" \
-	"BitString::contains\[(\]+(const BitString|BitString const) &\[)\]+ const"
-    test_demangling "gnu: div__FPC6IntRepT0P6IntRep" \
-	"div\[(\]+(const IntRep|IntRep const) \[*\]+, (const IntRep|IntRep const) \[*\]+, IntRep \[*\]+\[)\]+"
-    test_demangling "gnu: div__FPC6IntReplP6IntRep" \
-	"div\[(\]+(const IntRep|IntRep const) \[*\]+, long, IntRep \[*\]+\[)\]+"
-    test_demangling "gnu: div__FRC8RationalT0R8Rational" \
-	"div\[(\]+(const Rational|Rational const) &, (const Rational|Rational const) &, Rational &\[)\]+"
-    test_demangling "gnu: divide__FRC7IntegerT0R7IntegerT2" \
-	"divide\[(\]+(const Integer|Integer const) &, (const Integer|Integer const) &, Integer &, Integer &\[)\]+"
-    test_demangling "gnu: divide__FRC7IntegerlR7IntegerRl" \
-	"divide\[(\]+(const Integer|Integer const) &, long, Integer &, long &\[)\]+"
-    test_demangling "gnu: enable__14DocumentViewerPCcUi" \
-	"DocumentViewer::enable\[(\]+(const char|char const) \[*\]+, unsigned int\[)\]+"
-
-    test_demangling_exact "gnu: foo__FiN30" "foo(int, int, int, int)"
-    test_demangling_exact "gnu: foo__FiR3fooiT1iT1" "foo(int, foo &, int, foo &, int, foo &)"
-    test_demangling_exact "gnu: foo___3barl" "bar::foo_(long)"
-    test_demangling_exact "gnu: insert__15ivClippingStacklRP8_XRegion" "ivClippingStack::insert(long, _XRegion *&)"
-    test_demangling_exact "gnu: insert__16ChooserInfo_ListlR11ChooserInfo" "ChooserInfo_List::insert(long, ChooserInfo &)"
-    test_demangling_exact "gnu: insert__17FontFamilyRepListlRP15ivFontFamilyRep" "FontFamilyRepList::insert(long, ivFontFamilyRep *&)"
-    test_demangling_exact "gnu: leaveok__FP7_win_stc" "leaveok(_win_st *, char)"
-    test_demangling_exact "gnu: left_mover__C7ivMFKitP12ivAdjustableP7ivStyle" "ivMFKit::left_mover(ivAdjustable *, ivStyle *) const"
-    test_demangling "gnu: matches__C9BitStringRC10BitPatterni" \
-	"BitString::matches\[(\]+(const BitPattern|BitPattern const) &, int\[)\]+ const"
-    test_demangling "gnu: matches__C9SubStringRC5Regex" \
-	"SubString::matches\[(\]+(const Regex|Regex const) &\[)\]+ const"
-
-    test_demangling_exact "gnu: overload1arg__FSc" "overload1arg(signed char)"
-    test_demangling_exact "gnu: overload1arg__FUc" "overload1arg(unsigned char)"
-    test_demangling_exact "gnu: overload1arg__FUi" "overload1arg(unsigned int)"
-    test_demangling_exact "gnu: overload1arg__FUl" "overload1arg(unsigned long)"
-    test_demangling_exact "gnu: overload1arg__FUs" "overload1arg(unsigned short)"
-    test_demangling_exact "gnu: overload1arg__Fc" "overload1arg(char)"
-    test_demangling_exact "gnu: overload1arg__Fd" "overload1arg(double)"
-    test_demangling_exact "gnu: overload1arg__Ff" "overload1arg(float)"
-    test_demangling_exact "gnu: overload1arg__Fi" "overload1arg(int)"
-    test_demangling_exact "gnu: overload1arg__Fl" "overload1arg(long)"
-    test_demangling_exact "gnu: overload1arg__Fs" "overload1arg(short)"
-    test_demangling_exact "gnu: overload1arg__Fv" "overload1arg(void)"
-    test_demangling_exact "gnu: overloadargs__Fi" "overloadargs(int)"
-    test_demangling_exact "gnu: overloadargs__Fii" "overloadargs(int, int)"
-    test_demangling_exact "gnu: overloadargs__Fiii" "overloadargs(int, int, int)"
-    test_demangling_exact "gnu: overloadargs__Fiiii" "overloadargs(int, int, int, int)"
-
-    test_demangling_exact "gnu: overloadargs__Fiiiii" "overloadargs(int, int, int, int, int)"
-    test_demangling_exact "gnu: overloadargs__Fiiiiii" "overloadargs(int, int, int, int, int, int)"
-    test_demangling_exact "gnu: overloadargs__Fiiiiiii" "overloadargs(int, int, int, int, int, int, int)"
-    test_demangling_exact "gnu: overloadargs__Fiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int)"
-    test_demangling_exact "gnu: overloadargs__Fiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int)"
-    test_demangling_exact "gnu: overloadargs__Fiiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int, int)"
-    test_demangling_exact "gnu: overloadargs__Fiiiiiiiiiii" "overloadargs(int, int, int, int, int, int, int, int, int, int, int)"
-    test_demangling "gnu: pick__13ivCompositionP8ivCanvasRC12ivAllocationiR5ivHit" \
-	"ivComposition::pick\[(\]+ivCanvas \[*\]+, (const ivAllocation|ivAllocation const) &, int, ivHit &\[)\]+"
-    test_demangling "gnu: pointer__C11ivHScrollerRC7ivEventRC12ivAllocation" \
-	"ivHScroller::pointer\[(\]+(const ivEvent|ivEvent const) &, (const ivAllocation|ivAllocation const) &\[)\]+ const"
-    test_demangling_exact "gnu: poke__8ivRasterUlUlffff" "ivRaster::poke(unsigned long, unsigned long, float, float, float, float)"
-    test_demangling_exact "gnu: polar__Fdd" "polar(double, double)"
-    test_demangling "gnu: read__10osStdInputRPCc" \
-	"osStdInput::read\[(\]+(const char|char const) \[*\]+&\[)\]+"
-
-    test_demangling_exact "gnu: scale__13ivTransformerff" "ivTransformer::scale(float, float)"
-    test_demangling "gnu: scanw__12CursesWindowPCce" \
-	"CursesWindow::scanw\[(\]+(const char|char const) \[*\]+,...\[)\]+"
-    test_demangling "gnu: scmp__FPCcT0" \
-	"scmp\[(\]+(const char|char const) \[*\]+, (const char|char const) \[*\]+\[)\]+"
-    test_demangling_exact "gnu: sgetn__7filebufPci" "filebuf::sgetn(char *, int)"
-    test_demangling_exact "gnu: shift__FP5_FrepiT0" "shift(_Frep *, int, _Frep *)"
-    test_demangling_exact "gnu: test__C6BitSeti" "BitSet::test(int) const"
-    test_demangling_exact "gnu: test__C6BitSetii" "BitSet::test(int, int) const"
-    test_demangling "gnu: testbit__FRC7Integerl" \
-	"testbit\[(\]+(const Integer|Integer const) &, long\[)\]+"
-    test_demangling_exact "gnu: text_source__8Documentl" "Document::text_source(long)"
-    test_demangling_exact "gnu: variance__6Erlangd" "Erlang::variance(double)"
-    test_demangling "gnu: vform__8iostreamPCcPc" \
-	"iostream::vform\[(\]+(const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    test_demangling_exact "gnu: view__14DocumentViewerP8ItemViewP11TabularItem" "DocumentViewer::view(ItemView *, TabularItem *)"
-    test_demangling_exact "gnu: xy_extents__11ivExtensionffff" "ivExtension::xy_extents(float, float, float, float)"
-    test_demangling_exact "gnu: zero__8osMemoryPvUi" "osMemory::zero(void *, unsigned int)"
-    test_demangling_exact "gnu: _2T4\$N" "T4::N"
-    test_demangling_exact "gnu: _Q22T42t1\$N" "T4::t1::N"
-    test_demangling_exact "gnu: get__2T1" "T1::get(void)"
-    test_demangling_exact "gnu: get__Q22T11a" "T1::a::get(void)"
-    test_demangling_exact "gnu: get__Q32T11a1b" "T1::a::b::get(void)"
-    test_demangling_exact "gnu: get__Q42T11a1b1c" "T1::a::b::c::get(void)"
-    test_demangling_exact "gnu: get__Q52T11a1b1c1d" "T1::a::b::c::d::get(void)"
-    test_demangling_exact "gnu: put__2T1i" "T1::put(int)"
-    test_demangling_exact "gnu: put__Q22T11ai" "T1::a::put(int)"
-    test_demangling_exact "gnu: put__Q32T11a1bi" "T1::a::b::put(int)"
-    test_demangling_exact "gnu: put__Q42T11a1b1ci" "T1::a::b::c::put(int)"
-    test_demangling_exact "gnu: put__Q52T11a1b1c1di" "T1::a::b::c::d::put(int)"
-
-    test_demangling_exact "gnu: bar__3fooPv"       "foo::bar(void *)"
-    test_demangling "gnu: bar__3fooPCv" \
-	"foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+"
-    test_demangling_exact "gnu: bar__C3fooPv"      "foo::bar(void *) const"
-    test_demangling "gnu: bar__C3fooPCv" \
-	"foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+ const"
-    test_demangling_exact "gnu: __eq__3fooRT0"     "foo::operator==(foo &)"
-    test_demangling "gnu: __eq__3fooRC3foo" \
-	 "foo::operator==\[(\]+(const foo|foo const) &\[)\]+"
-    test_demangling_exact "gnu: __eq__C3fooR3foo"  "foo::operator==(foo &) const"
-    test_demangling "gnu: __eq__C3fooRT0" \
-	   "foo::operator==\[(\]+(const foo|foo const) &\[)\]+ const"
-
-    test_demangling_exact "gnu: elem__t6vector1Zdi" "vector<double>::elem(int)"
-    test_demangling_exact "gnu: elem__t6vector1Zii" "vector<int>::elem(int)"
-    test_demangling_exact "gnu: __t6vector1Zdi"     "vector<double>::vector(int)"
-    test_demangling_exact "gnu: __t6vector1Zii"     "vector<int>::vector(int)"
-    test_demangling_exact "gnu: _\$_t6vector1Zdi"    "vector<double>::~vector(int)"
-    test_demangling_exact "gnu: _\$_t6vector1Zii"    "vector<int>::~vector(int)"
-
-    test_demangling_exact "gnu: __nw__t2T11ZcUi" "T1<char>::operator new(unsigned int)"
-    test_demangling_exact "gnu: __nw__t2T11Z1tUi" "T1<t>::operator new(unsigned int)"
-    test_demangling_exact "gnu: __dl__t2T11ZcPv" "T1<char>::operator delete(void *)"
-    test_demangling_exact "gnu: __dl__t2T11Z1tPv" "T1<t>::operator delete(void *)"
-    test_demangling_exact "gnu: __t2T11Zci" "T1<char>::T1(int)"
-    test_demangling_exact "gnu: __t2T11Zc" "T1<char>::T1(void)"
-    test_demangling_exact "gnu: __t2T11Z1ti" "T1<t>::T1(int)"
-    test_demangling_exact "gnu: __t2T11Z1t" "T1<t>::T1(void)"
-
-    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity3Pix" \
-	"List<VHDLEntity>::Pix::Pix(void)"
-
-    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity3PixPQ2t4List1Z10VHDLEntity7element" \
-	"List<VHDLEntity>::Pix::Pix(List<VHDLEntity>::element *)"
-
-    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity3PixRCQ2t4List1Z10VHDLEntity3Pix" \
-	"List<VHDLEntity>::Pix::Pix(List<VHDLEntity>::Pix const &)"
-
-    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity7elementRC10VHDLEntityPT0" \
-	"List<VHDLEntity>::element::element(VHDLEntity const &, List<VHDLEntity>::element *)"
-
-    test_demangling_exact "gnu: __Q2t4List1Z10VHDLEntity7elementRCQ2t4List1Z10VHDLEntity7element" \
-	"List<VHDLEntity>::element::element(List<VHDLEntity>::element const &)"
-
-    test_demangling_exact "gnu: __cl__C11VHDLLibraryGt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
-	"VHDLLibrary::operator()(PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> >) const"
-
-    test_demangling_exact "gnu: __cl__Ct4List1Z10VHDLEntityRCQ2t4List1Z10VHDLEntity3Pix" \
-	"List<VHDLEntity>::operator()(List<VHDLEntity>::Pix const &) const"
-
-    test_demangling_exact "gnu: __ne__FPvRCQ2t4List1Z10VHDLEntity3Pix" \
-	"operator!=(void *, List<VHDLEntity>::Pix const &)"
-
-    test_demangling_exact "gnu: __ne__FPvRCt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
-	"operator!=(void *, PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> > const &)"
-
-    test_demangling_exact "gnu: __t4List1Z10VHDLEntityRCt4List1Z10VHDLEntity" \
-	"List<VHDLEntity>::List(List<VHDLEntity> const &)"
-
-    test_demangling_exact "gnu: __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
-	"PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> >::PixX(void)"
-
-    test_demangling_exact "gnu: __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntityP14VHDLLibraryRepGQ2t4List1Z10VHDLEntity3Pix" \
-	"PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> >::PixX(VHDLLibraryRep *, List<VHDLEntity>::Pix)"
-
-    test_demangling_exact "gnu: __t4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntityRCt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
-	"PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> >::PixX(PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> > const &)"
-
-    test_demangling_exact "gnu: nextE__C11VHDLLibraryRt4PixX3Z11VHDLLibraryZ14VHDLLibraryRepZt4List1Z10VHDLEntity" \
-	"VHDLLibrary::nextE(PixX<VHDLLibrary, VHDLLibraryRep, List<VHDLEntity> > &) const"
-
-    test_demangling_exact "gnu: next__Ct4List1Z10VHDLEntityRQ2t4List1Z10VHDLEntity3Pix" \
-	"List<VHDLEntity>::next(List<VHDLEntity>::Pix &) const"
-
-    test_demangling_exact "gnu: _GLOBAL_\$D\$set" "global destructors keyed to set"
-
-    test_demangling_exact "gnu: _GLOBAL_\$I\$set" "global constructors keyed to set"
-
-    test_demangling_exact "gnu: __as__t5ListS1ZUiRCt5ListS1ZUi" \
-	"ListS<unsigned int>::operator=(ListS<unsigned int> const &)"
-
-    test_demangling_exact "gnu: __cl__Ct5ListS1ZUiRCQ2t5ListS1ZUi3Vix" \
-	"ListS<unsigned int>::operator()(ListS<unsigned int>::Vix const &) const"
-
-    test_demangling_exact "gnu: __cl__Ct5SetLS1ZUiRCQ2t5SetLS1ZUi3Vix" \
-	"SetLS<unsigned int>::operator()(SetLS<unsigned int>::Vix const &) const"
-
-    test_demangling_exact "gnu: __t10ListS_link1ZUiRCUiPT0" \
-	"ListS_link<unsigned int>::ListS_link(unsigned int const &, ListS_link<unsigned int> *)"
-
-    test_demangling_exact "gnu: __t10ListS_link1ZUiRCt10ListS_link1ZUi" \
-	"ListS_link<unsigned int>::ListS_link(ListS_link<unsigned int> const &)"
-
-    test_demangling_exact "gnu: __t5ListS1ZUiRCt5ListS1ZUi" \
-	"ListS<unsigned int>::ListS(ListS<unsigned int> const &)"
-
-    test_demangling_exact "gnu: next__Ct5ListS1ZUiRQ2t5ListS1ZUi3Vix" \
-	"ListS<unsigned int>::next(ListS<unsigned int>::Vix &) const"
-
-    test_demangling_exact "gnu: __ne__FPvRCQ2t5SetLS1ZUi3Vix" \
-	"operator!=(void *, SetLS<unsigned int>::Vix const &)"
-    test_demangling_exact "gnu: __t8ListElem1Z5LabelRt4List1Z5Label" \
-	"ListElem<Label>::ListElem(List<Label> &)"
-    test_demangling_exact "gnu: __t8BDDHookV1ZPcRCPc" \
-	"BDDHookV<char *>::BDDHookV(char *const &)"
-
-    test_demangling_exact "gnu: _vt\$t8BDDHookV1ZPc" "BDDHookV<char *> virtual table"
-
-    test_demangling_exact "gnu: __ne__FPvRCQ211BDDFunction4VixB" \
-	"operator!=(void *, BDDFunction::VixB const &)"
-    test_demangling_exact "gnu: __eq__FPvRCQ211BDDFunction4VixB" \
-	"operator==(void *, BDDFunction::VixB const &)"
-
-    test_demangling_exact "gnu: relativeId__CQ36T_phi210T_preserve8FPC_nextRCQ26T_phi210T_preserveRC10Parameters" \
-	 "T_phi2::T_preserve::FPC_next::relativeId(T_phi2::T_preserve const &, Parameters const &) const"
-
-    test_demangling_exact "gnu: _Utf390_1__1_9223372036854775807__9223372036854775" \
-	    "Can't demangle \"_Utf390_1__1_9223372036854775807__9223372036854775\""
-    test_demangling_exact "gnu: foo__I40" "foo(int64_t)"
-    test_demangling_exact "gnu: foo__I_200_" "foo(int512_t)"
-    test_demangling_exact "gnu: foo__I_200" "Can't demangle \"foo__I_200\""
-
-    ## Buffer overrun.  Should make GDB crash.  Woo hoo!
-    test_demangling_exact "gnu: foo__I_4000000000000000000000000000000000000000000000000000000000000000000000000" "Can't demangle \"foo__I_4000000000000000000000000000000000000000000000000000000000000000000000000\""
-
-    ## 1999-04-19: "Fix from Dale Hawkins".  Shouldn't segfault.
-    # Accept even a dubious demangling; the string is ambiguous.
-    send_gdb "maintenance demangle __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator\n"
-    gdb_expect {
-	-re "virtual function thunk \\(delta:-64\\) for CosNaming::_proxy_NamingContext::_0RL__list\\(unsigned long, _CORBA_Unbounded_Sequence<CosNaming::Binding> \\*\\&, CosNaming::BindingIterator \\*\\&\\)\r\n$gdb_prompt $" {
-		pass "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator"
-	}
-	-re ".*Can't demangle \"__thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator\"\r\n$gdb_prompt $" {
-		pass "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator"
-	}
-	-re ".*$gdb_prompt $" {
-		fail "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator"
-	}
-	timeout {
-		fail "gnu: __thunk_64__0RL__list__Q29CosNaming20_proxy_NamingContextUlRPt25_CORBA_Unbounded_Sequence1ZQ29CosNaming7BindingRPQ29CosNaming15BindingIterator (timeout)"
-	}
-    }
-}
-
-#
-#  Test lucid style name demangling
-#
-
-proc test_lucid_style_demangling {} {
-    test_demangling_exact "lucid: WS__FR7istream" "WS(istream &)"
-    test_demangling_exact "lucid: __aa__3fooFR3foo" "foo::operator&&(foo &)"
-    test_demangling_exact "lucid: __aad__3fooFR3foo" "foo::operator&=(foo &)"
-    test_demangling_exact "lucid: __ad__3fooFR3foo" "foo::operator&(foo &)"
-    test_demangling_exact "lucid: __adv__3fooFR3foo" "foo::operator/=(foo &)"
-    test_demangling_exact "lucid: __adv__7complexF7complex" "complex::operator/=(complex)"
-    test_demangling_exact "lucid: __aer__3fooFR3foo" "foo::operator^=(foo &)"
-    test_demangling_exact "lucid: __als__3fooFR3foo" "foo::operator<<=(foo &)"
-    test_demangling_exact "lucid: __amd__3fooFR3foo" "foo::operator%=(foo &)"
-    test_demangling_exact "lucid: __ami__3fooFR3foo" "foo::operator-=(foo &)"
-    test_demangling_exact "lucid: __amu__3fooFR3foo" "foo::operator*=(foo &)"
-    test_demangling_exact "lucid: __amu__7complexF7complex" "complex::operator*=(complex)"
-    test_demangling_exact "lucid: __aor__3fooFR3foo" "foo::operator|=(foo &)"
-    test_demangling_exact "lucid: __apl__3fooFR3foo" "foo::operator+=(foo &)"
-    test_demangling_exact "lucid: __ars__3fooFR3foo" "foo::operator>>=(foo &)"
-    test_demangling_exact "lucid: __as__18istream_withassignFP9streambuf" "istream_withassign::operator=(streambuf *)"
-    test_demangling_exact "lucid: __as__18istream_withassignFR7istream" "istream_withassign::operator=(istream &)"
-    test_demangling_exact "lucid: __as__3fooFR3foo" "foo::operator=(foo &)"
-    test_demangling_exact "lucid: __as__3iosFR3ios" "ios::operator=(ios &)"
-    test_demangling_exact "lucid: __cl__3fooFR3foo" "foo::operator()(foo &)"
-    test_demangling_exact "lucid: __cm__3fooFR3foo" "foo::operator, (foo &)"
-
-    test_demangling_exact "lucid: __co__3fooFv" "foo::operator~(void)"
-    test_demangling_exact "lucid: __ct__10istrstreamFPc" "istrstream::istrstream(char *)"
-    test_demangling_exact "lucid: __ct__10istrstreamFPci" "istrstream::istrstream(char *, int)"
-    test_demangling_exact "lucid: __ct__10ostrstreamFPciT2" "ostrstream::ostrstream(char *, int, int)"
-    test_demangling_exact "lucid: __ct__10ostrstreamFv" "ostrstream::ostrstream(void)"
-    test_demangling_exact "lucid: __ct__10smanip_intFPFR3iosi_R3iosi" "smanip_int::smanip_int(ios &(*)(ios &, int), int)"
-    test_demangling "lucid: __ct__11c_exceptionFPcRC7complexT2" "c_exception::c_exception\[(\]+char \[*\]+, (const complex|complex const) &, (const complex|complex const) &\[)\]+"
-    test_demangling "lucid: __ct__11fstreambaseFPCciT2" "fstreambase::fstreambase\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    test_demangling_exact "lucid: __ct__11fstreambaseFi" "fstreambase::fstreambase(int)"
-    test_demangling_exact "lucid: __ct__11fstreambaseFiPcT1" "fstreambase::fstreambase(int, char *, int)"
-    test_demangling_exact "lucid: __ct__11fstreambaseFv" "fstreambase::fstreambase(void)"
-    test_demangling_exact "lucid: __ct__11smanip_longFPFR3iosl_R3iosl" "smanip_long::smanip_long(ios &(*)(ios &, long), long)"
-    test_demangling_exact "lucid: __ct__11stdiostreamFP4FILE" "stdiostream::stdiostream(FILE *)"
-    test_demangling_exact "lucid: __ct__12strstreambufFPFl_PvPFPv_v" "strstreambuf::strstreambuf(void *(*)(long), void (*)(void *))"
-    test_demangling_exact "lucid: __ct__12strstreambufFPUciT1" "strstreambuf::strstreambuf(unsigned char *, int, unsigned char *)"
-    test_demangling_exact "lucid: __ct__12strstreambufFPciT1" "strstreambuf::strstreambuf(char *, int, char *)"
-    test_demangling_exact "lucid: __ct__12strstreambufFi" "strstreambuf::strstreambuf(int)"
-    test_demangling_exact "lucid: __ct__12strstreambufFv" "strstreambuf::strstreambuf(void)"
-    test_demangling_exact "lucid: __ct__13strstreambaseFPciT1" "strstreambase::strstreambase(char *, int, char *)"
-    test_demangling_exact "lucid: __ct__3fooFR3foo" "foo::foo(foo &)"
-
-    test_demangling_exact "lucid: __ct__3fooFi" "foo::foo(int)"
-    test_demangling_exact "lucid: __ct__3fooFiN31" "foo::foo(int, int, int, int)"
-    test_demangling "lucid: __ct__3fooFiPCc" \
-	"foo::foo\[(\]+int, (const char|char const) \[*\]+\[)\]+"
-    test_demangling_exact "lucid: __ct__3fooFiR3fooT1T2T1T2" "foo::foo(int, foo &, int, foo &, int, foo &)"
-    test_demangling_exact "lucid: __ct__3iosFP9streambuf" "ios::ios(streambuf *)"
-    test_demangling_exact "lucid: __ct__7filebufFiPcT1" "filebuf::filebuf(int, char *, int)"
-    test_demangling "lucid: __ct__7fstreamFPCciT2" \
-	"fstream::fstream\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    test_demangling_exact "lucid: __ct__7fstreamFiPcT1" "fstream::fstream(int, char *, int)"
-    test_demangling_exact "lucid: __ct__7istreamFP9streambuf" "istream::istream(streambuf *)"
-    test_demangling_exact "lucid: __ct__7istreamFP9streambufiP7ostream" "istream::istream(streambuf *, int, ostream *)"
-    test_demangling_exact "lucid: __ct__7istreamFiPcT1" "istream::istream(int, char *, int)"
-    test_demangling_exact "lucid: __ct__7istreamFiT1P7ostream" "istream::istream(int, int, ostream *)"
-    test_demangling_exact "lucid: __ct__7ostreamFP9streambuf" "ostream::ostream(streambuf *)"
-    test_demangling_exact "lucid: __ct__7ostreamFiPc" "ostream::ostream(int, char *)"
-    test_demangling "lucid: __ct__8ifstreamFPCciT2" \
-	"ifstream::ifstream\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    test_demangling_exact "lucid: __ct__8ifstreamFiPcT1" "ifstream::ifstream(int, char *, int)"
-
-    test_demangling_exact "lucid: __ct__Q23foo3barFv" "foo::bar::bar(void)"
-    test_demangling_exact "lucid: __ct__Q33foo3bar4bellFv" "foo::bar::bell::bell(void)"
-    test_demangling_exact "lucid: __dl__3fooSFPv" "foo::operator delete(void *) static"
-    test_demangling_exact "lucid: __dl__FPv" "operator delete(void *)"
-    test_demangling_exact "lucid: __dt__10istrstreamFv" "istrstream::~istrstream(void)"
-
-    test_demangling_exact "lucid: __dt__Q23foo3barFv" "foo::bar::~bar(void)"
-    test_demangling_exact "lucid: __dt__Q33foo3bar4bellFv" "foo::bar::bell::~bell(void)"
-    test_demangling_exact "lucid: __dv__3fooFR3foo" "foo::operator/(foo &)"
-    test_demangling_exact "lucid: __dv__F7complexT1" "operator/(complex, complex)"
-    test_demangling_exact "lucid: __eq__3fooFR3foo" "foo::operator==(foo &)"
-    test_demangling_exact "lucid: __er__3fooFR3foo" "foo::operator^(foo &)"
-    test_demangling_exact "lucid: __ge__3fooFR3foo" "foo::operator>=(foo &)"
-    test_demangling_exact "lucid: __gt__3fooFR3foo" "foo::operator>(foo &)"
-    test_demangling_exact "lucid: __le__3fooFR3foo" "foo::operator<=(foo &)"
-    test_demangling_exact "lucid: __ls__3fooFR3foo" "foo::operator<<(foo &)"
-    test_demangling_exact "lucid: __ls__7ostreamFP9streambuf" "ostream::operator<<(streambuf *)"
-
-    test_demangling "lucid: __ls__7ostreamFPCc" \
-	"ostream::operator<<\[(\]+(const char|char const) \[*\]+\[)\]+"
-    test_demangling_exact "lucid: __ls__7ostreamFPFR3ios_R3ios" "ostream::operator<<(ios &(*)(ios &))"
-    test_demangling_exact "lucid: __ls__7ostreamFPv" "ostream::operator<<(void *)"
-    test_demangling_exact "lucid: __ls__7ostreamFUi" "ostream::operator<<(unsigned int)"
-    test_demangling_exact "lucid: __ls__7ostreamFUl" "ostream::operator<<(unsigned long)"
-    test_demangling_exact "lucid: __ls__7ostreamFd" "ostream::operator<<(double)"
-    test_demangling_exact "lucid: __ls__7ostreamFf" "ostream::operator<<(float)"
-    test_demangling_exact "lucid: __ls__7ostreamFi" "ostream::operator<<(int)"
-    test_demangling_exact "lucid: __ls__7ostreamFl" "ostream::operator<<(long)"
-    test_demangling_exact "lucid: __ls__FR7ostream7complex" "operator<<(ostream &, complex)"
-    test_demangling_exact "lucid: __lt__3fooFR3foo" "foo::operator<(foo &)"
-    test_demangling_exact "lucid: __md__3fooFR3foo" "foo::operator%(foo &)"
-    test_demangling_exact "lucid: __mi__3fooFR3foo" "foo::operator-(foo &)"
-    test_demangling_exact "lucid: __ml__3fooFR3foo" "foo::operator*(foo &)"
-    test_demangling_exact "lucid: __ml__F7complexT1" "operator*(complex, complex)"
-    test_demangling_exact "lucid: __mm__3fooFi" "foo::operator--(int)"
-    test_demangling_exact "lucid: __ne__3fooFR3foo" "foo::operator!=(foo &)"
-    test_demangling_exact "lucid: __nt__3fooFv" "foo::operator!(void)"
-    test_demangling_exact "lucid: __nw__3fooSFi" "foo::operator new(int) static"
-    test_demangling_exact "lucid: __nw__FUi" "operator new(unsigned int)"
-    test_demangling_exact "lucid: __nw__FUiPv" "operator new(unsigned int, void *)"
-    test_demangling_exact "lucid: __oo__3fooFR3foo" "foo::operator||(foo &)"
-    test_demangling_exact "lucid: __opPc__3fooFv" "foo::operator char *(void)"
-    test_demangling_exact "lucid: __opi__3fooFv" "foo::operator int(void)"
-    test_demangling_exact "lucid: __or__3fooFR3foo" "foo::operator|(foo &)"
-
-    test_demangling_exact "lucid: __pl__3fooFR3foo" "foo::operator+(foo &)"
-    test_demangling_exact "lucid: __pp__3fooFi" "foo::operator++(int)"
-    test_demangling_exact "lucid: __pt__3fooFv" "foo::operator->(void)"
-    test_demangling_exact "lucid: __rm__3fooFR3foo" "foo::operator->*(foo &)"
-    test_demangling_exact "lucid: __rs__3fooFR3foo" "foo::operator>>(foo &)"
-    test_demangling_exact "lucid: __rs__7istreamFP9streambuf" "istream::operator>>(streambuf *)"
-    test_demangling_exact "lucid: __rs__7istreamFPFR3ios_R3ios" "istream::operator>>(ios &(*)(ios &))"
-    test_demangling_exact "lucid: __rs__7istreamFPFR7istream_R7istream" "istream::operator>>(istream &(*)(istream &))"
-    test_demangling_exact "lucid: __rs__7istreamFPUc" "istream::operator>>(unsigned char *)"
-    test_demangling_exact "lucid: __rs__7istreamFPc" "istream::operator>>(char *)"
-    test_demangling_exact "lucid: __rs__7istreamFRUi" "istream::operator>>(unsigned int &)"
-    test_demangling_exact "lucid: __rs__7istreamFRUl" "istream::operator>>(unsigned long &)"
-    test_demangling_exact "lucid: __rs__7istreamFRUs" "istream::operator>>(unsigned short &)"
-    test_demangling_exact "lucid: __rs__7istreamFRd" "istream::operator>>(double &)"
-    test_demangling_exact "lucid: __rs__7istreamFRf" "istream::operator>>(float &)"
-    test_demangling_exact "lucid: __rs__7istreamFRi" "istream::operator>>(int &)"
-    test_demangling_exact "lucid: __rs__7istreamFRl" "istream::operator>>(long &)"
-    test_demangling_exact "lucid: __rs__7istreamFRs" "istream::operator>>(short &)"
-    test_demangling_exact "lucid: __rs__FR7istreamR7complex" "operator>>(istream &, complex &)"
-    test_demangling "lucid: __vc__3fooFR3foo" "foo::operator\\\[\\\]\\(foo &\\)"
-    test_demangling_exact "lucid: __vtbl__10istrstream" "istrstream virtual table"
-    test_demangling_exact "lucid: __vtbl__17ostream__iostream__19iostream_withassign" "iostream_withassign::ostream__iostream virtual table"
-
-    test_demangling_exact "lucid: __vtbl__3ios" "ios virtual table"
-    test_demangling_exact "lucid: __vtbl__3ios__13strstreambase" "strstreambase::ios virtual table"
-
-    # GDB 930414 demangles this as t_cc_main_ (obviously wrong).
-    # GDB 930701 gets into an infinite loop.
-    # GDB 930727 says "Can't demangle".
-    # What is the correct demangling?  FIXME.
-
-    # NOTE: carlton/2003-01-17: No, don't FIXME, just obsolete lucid.
-    # I'm KFAILing this rather than deleting it for form's sake.
-    setup_kfail "gdb/945" "*-*-*"
-    test_demangling_exact "lucid: __vtbl__3foo__vt_cc_main_" ""
-
-    test_demangling_exact "lucid: abs__F7complex" "abs(complex)"
-    test_demangling_exact "lucid: allocate__9streambufFv" "streambuf::allocate(void)"
-    test_demangling_exact "lucid: attach__11fstreambaseFi" "fstreambase::attach(int)"
-    test_demangling_exact "lucid: bitalloc__3iosSFv" "ios::bitalloc(void) static"
-    test_demangling_exact "lucid: chr__FiT1" "chr(int, int)"
-    test_demangling_exact "lucid: complex_error__FR11c_exception" "complex_error(c_exception &)"
-    test_demangling_exact "lucid: complexfunc2__FPFPc_i" "complexfunc2(int (*)(char *))"
-    test_demangling_exact "lucid: complexfunc3__FPFPFPl_s_i" "complexfunc3(int (*)(short (*)(long *)))"
-
-    test_demangling_exact "lucid: complexfunc4__FPFPFPc_s_i" "complexfunc4(int (*)(short (*)(char *)))"
-    test_demangling_exact "lucid: complexfunc5__FPFPc_PFl_i" "complexfunc5(int (*(*)(char *))(long))"
-    test_demangling_exact "lucid: complexfunc6__FPFPi_PFl_i" "complexfunc6(int (*(*)(int *))(long))"
-    test_demangling_exact "lucid: complexfunc7__FPFPFPc_i_PFl_i" "complexfunc7(int (*(*)(int (*)(char *)))(long))"
-    test_demangling_exact "lucid: complicated_put__7ostreamFc" "ostream::complicated_put(char)"
-    test_demangling_exact "lucid: conv10__FlPc" "conv10(long, char *)"
-    test_demangling_exact "lucid: conv16__FUlPc" "conv16(unsigned long, char *)"
-    test_demangling_exact "lucid: dec__FR3ios" "dec(ios &)"
-    test_demangling_exact "lucid: dec__Fli" "dec(long, int)"
-    test_demangling_exact "lucid: dofield__FP7ostreamPciT2T3" "dofield(ostream *, char *, int, char *, int)"
-
-    test_demangling_exact "lucid: flags__3iosFl" "ios::flags(long)"
-    test_demangling_exact "lucid: flags__3iosFv" "ios::flags(void)"
-    test_demangling_exact "lucid: foo__FiN31" "foo(int, int, int, int)"
-    test_demangling_exact "lucid: foo__FiR3fooT1T2T1T2" "foo(int, foo &, int, foo &, int, foo &)"
-    test_demangling_exact "lucid: foo___3barFl" "bar::foo_(long)"
-    test_demangling "lucid: form__FPCce" "form\[(\]+(const char|char const) \[*\]+,...\[)\]+"
-    test_demangling_exact "lucid: get__7istreamFPcic" "istream::get(char *, int, char)"
-    test_demangling_exact "lucid: get__7istreamFR9streambufc" "istream::get(streambuf &, char)"
-    test_demangling_exact "lucid: get_complicated__7istreamFRUc" "istream::get_complicated(unsigned char &)"
-    test_demangling_exact "lucid: get_complicated__7istreamFRc" "istream::get_complicated(char &)"
-    test_demangling_exact "lucid: getline__7istreamFPUcic" "istream::getline(unsigned char *, int, char)"
-    test_demangling_exact "lucid: getline__7istreamFPcic" "istream::getline(char *, int, char)"
-
-    test_demangling_exact "lucid: ignore__7istreamFiT1" "istream::ignore(int, int)"
-    test_demangling_exact "lucid: init__12strstreambufFPciT1" "strstreambuf::init(char *, int, char *)"
-    test_demangling_exact "lucid: init__3iosFP9streambuf" "ios::init(streambuf *)"
-    test_demangling_exact "lucid: initcount__13Iostream_init" "Iostream_init::initcount"
-    test_demangling_exact "lucid: ipfx__7istreamFi" "istream::ipfx(int)"
-    test_demangling_exact "lucid: ls_complicated__7ostreamFUc" "ostream::ls_complicated(unsigned char)"
-    test_demangling_exact "lucid: ls_complicated__7ostreamFc" "ostream::ls_complicated(char)"
-    test_demangling "lucid: open__11fstreambaseFPCciT2" \
-	"fstreambase::open\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-    test_demangling "lucid: open__7filebufFPCciT2" \
-	"filebuf::open\[(\]+(const char|char const) \[*\]+, int, int\[)\]+"
-
-    test_demangling_exact "lucid: overload1arg__FSc" "overload1arg(signed char)"
-    test_demangling_exact "lucid: overload1arg__FUc" "overload1arg(unsigned char)"
-    test_demangling_exact "lucid: overload1arg__FUi" "overload1arg(unsigned int)"
-    test_demangling_exact "lucid: overload1arg__FUl" "overload1arg(unsigned long)"
-    test_demangling_exact "lucid: overload1arg__FUs" "overload1arg(unsigned short)"
-    test_demangling_exact "lucid: overload1arg__Fc" "overload1arg(char)"
-    test_demangling_exact "lucid: overload1arg__Fd" "overload1arg(double)"
-    test_demangling_exact "lucid: overload1arg__Ff" "overload1arg(float)"
-    test_demangling_exact "lucid: overload1arg__Fi" "overload1arg(int)"
-    test_demangling_exact "lucid: overload1arg__Fl" "overload1arg(long)"
-    test_demangling_exact "lucid: overload1arg__Fs" "overload1arg(short)"
-    test_demangling_exact "lucid: overload1arg__Fv" "overload1arg(void)"
-    test_demangling_exact "lucid: overloadargs__FiN21" "overloadargs(int, int, int)"
-    test_demangling_exact "lucid: overloadargs__FiN31" "overloadargs(int, int, int, int)"
-    test_demangling_exact "lucid: overloadargs__FiN41" "overloadargs(int, int, int, int, int)"
-    test_demangling_exact "lucid: overloadargs__FiN51" "overloadargs(int, int, int, int, int, int)"
-    test_demangling_exact "lucid: overloadargs__FiN61" "overloadargs(int, int, int, int, int, int, int)"
-
-    test_demangling_exact "lucid: overloadargs__FiN71" "overloadargs(int, int, int, int, int, int, int, int)"
-    test_demangling_exact "lucid: overloadargs__FiN81" "overloadargs(int, int, int, int, int, int, int, int, int)"
-    test_demangling_exact "lucid: overloadargs__FiN91" "overloadargs(int, int, int, int, int, int, int, int, int, int)"
-    test_demangling_exact "lucid: overloadargs__FiN91N11" "overloadargs(int, int, int, int, int, int, int, int, int, int, int)"
-    test_demangling_exact "lucid: overloadargs__FiT1" "overloadargs(int, int)"
-    test_demangling_exact "lucid: polar__FdT1" "polar(double, double)"
-    test_demangling_exact "lucid: pow__F7complexT1" "pow(complex, complex)"
-    test_demangling_exact "lucid: pow__F7complexd" "pow(complex, double)"
-    test_demangling_exact "lucid: pow__F7complexi" "pow(complex, int)"
-    test_demangling_exact "lucid: pow__Fd7complex" "pow(double, complex)"
-    test_demangling_exact "lucid: pstart__FPciT2" "pstart(char *, int, int)"
-    test_demangling_exact "lucid: put__7ostreamFc" "ostream::put(char)"
-
-    test_demangling_exact "lucid: read__7istreamFPci" "istream::read(char *, int)"
-    test_demangling_exact "lucid: resetiosflags__FR3iosl" "resetiosflags(ios &, long)"
-    test_demangling_exact "lucid: restore_errno__FRi" "restore_errno(int &)"
-    test_demangling_exact "lucid: rs_complicated__7istreamFRUc" "istream::rs_complicated(unsigned char &)"
-    test_demangling_exact "lucid: rs_complicated__7istreamFRc" "istream::rs_complicated(char &)"
-    test_demangling_exact "lucid: seekg__7istreamFl8seek_dir" "istream::seekg(long, seek_dir)"
-    test_demangling_exact "lucid: seekoff__12strstreambufFl8seek_diri" "strstreambuf::seekoff(long, seek_dir, int)"
-    test_demangling_exact "lucid: seekoff__9streambufFlQ2_3ios12ios_seek_diri" "streambuf::seekoff(long, ios::ios_seek_dir, int)"
-    test_demangling_exact "lucid: seekpos__9streambufFli" "streambuf::seekpos(long, int)"
-    test_demangling_exact "lucid: set_new_handler__FPFv_v" "set_new_handler(void (*)(void))"
-    test_demangling_exact "lucid: setb__9streambufFPcT1i" "streambuf::setb(char *, char *, int)"
-
-    test_demangling_exact "lucid: setb__FR3iosi" "setb(ios &, int)"
-    test_demangling_exact "lucid: setbuf__11fstreambaseFPci" "fstreambase::setbuf(char *, int)"
-    test_demangling_exact "lucid: setbuf__9streambufFPUci" "streambuf::setbuf(unsigned char *, int)"
-    test_demangling_exact "lucid: setbuf__9streambufFPciT2" "streambuf::setbuf(char *, int, int)"
-    test_demangling_exact "lucid: setf__3iosFlT1" "ios::setf(long, long)"
-    test_demangling_exact "lucid: setfill__FR3iosi" "setfill(ios &, int)"
-    test_demangling_exact "lucid: setg__9streambufFPcN21" "streambuf::setg(char *, char *, char *)"
-    test_demangling_exact "lucid: setp__9streambufFPcT1" "streambuf::setp(char *, char *)"
-
-    test_demangling "lucid: sputn__9streambufFPCci" \
-	"streambuf::sputn\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    test_demangling "lucid: str__FPCci" \
-	"str\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    test_demangling_exact "lucid: tie__3iosFP7ostream" "ios::tie(ostream *)"
-    test_demangling_exact "lucid: uconv10__FUlPc" "uconv10(unsigned long, char *)"
-
-    test_demangling "lucid: write__7ostreamFPCci" \
-	"ostream::write\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-    test_demangling_exact "lucid: xget__7istreamFPc" "istream::xget(char *)"
-    test_demangling_exact "lucid: xsgetn__9streambufFPci" "streambuf::xsgetn(char *, int)"
-    test_demangling "lucid: xsputn__9streambufFPCci" \
-	"streambuf::xsputn\[(\]+(const char|char const) \[*\]+, int\[)\]+"
-
-    test_demangling_exact "lucid: _Utf390_1__1_9223372036854775807__9223372036854775" \
-	    "Can't demangle \"_Utf390_1__1_9223372036854775807__9223372036854775\""
-}
-
-#
-#  Test arm style name demangling
-#
-
-proc test_arm_style_demangling {} {
-    test_demangling_exact "arm: __dt__21T5__pt__11_PFiPPdPv_iFv" "T5<int (*)(int, double **, void *)>::~T5(void)"
-
-    test_demangling_exact "arm: __ct__1cFi" "c::c(int)"
-
-    test_demangling_exact "arm: __dt__11T5__pt__2_iFv" "T5<int>::~T5(void)"
-
-    test_demangling_exact "arm: __dt__11T5__pt__2_cFv" "T5<char>::~T5(void)"
-
-    test_demangling_exact "arm: __ct__2T2Fi" "T2::T2(int)"
-    test_demangling_exact "arm: __dt__2T1Fv" "T1::~T1(void)"
-
-    test_demangling_exact "arm: __dt__12T5__pt__3_1xFv" "T5<x>::~T5(void)"
-
-    test_demangling_exact "arm: __dt__17T5__pt__8_PFcPv_iFv" "T5<int (*)(char, void *)>::~T5(void)"
-
-    test_demangling "arm: g__FP1cPC1cT1" \
-	"g\[(\]+c *\[*\]+, (const c|c const) *\[*\]+, c *\[*\]+\[)\]+"
-    test_demangling "arm: g__FPUlPCUlT1" \
-	"g\[(\]+unsigned long \[*\]+, (const unsigned long|unsigned long const) \[*\]+, unsigned long \[*\]+\[)\]+"
-    test_demangling "arm: g__FPUiPCUiT1" \
-	"g\[(\]+unsigned int \[*\]+, (const unsigned int|unsigned int const) \[*\]+, unsigned int \[*\]+\[)\]+"
-    test_demangling "arm: g__FPUsPCUsT1" \
-	"g\[(\]+unsigned short \[*\]+, (const unsigned short|unsigned short const) \[*\]+, unsigned short \[*\]+\[)\]+"
-    test_demangling "arm: g__FPUcPCUcT1" \
-	"g\[(\]+unsigned char \[*\]+, (const unsigned char|unsigned char const) \[*\]+, unsigned char \[*\]+\[)\]+"
-    test_demangling "arm: g__F1TPlPClT2" \
-	"g\[(\]+T, long \[*\]+, (const long|long const) \[*\]+, long \[*\]+\[)\]+"
-    test_demangling "arm: g__F1RRlRClT2" \
-	"g\[(\]+R, long &, (const long|long const) &, long &\[)\]+"
-    test_demangling "arm: g__F1TPiPCiT2" \
-	"g\[(\]+T, int \[*\]+, (const int|int const) \[*\]+, int \[*\]+\[)\]+"
-    test_demangling "arm: g__F1RRiRCiT2" \
-	"g\[(\]+R, int &, (const int|int const) &, int &\[)\]+"
-    test_demangling "arm: g__F1TPsPCsT2" \
-	"g\[(\]+T, short \[*\]+, (const short|short const) \[*\]+, short \[*\]+\[)\]+"
-    test_demangling "arm: g__F1RRsRCsT2" \
-	"g\[(\]+R, short &, (const short|short const) &, short &\[)\]+"
-    test_demangling "arm: g__F1TPcPCcT2" \
-	"g\[(\]+T, char \[*\]+, (const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    test_demangling "arm: g__F1RRcRCcT2" \
-	"g\[(\]+R, char &, (const char|char const) &, char &\[)\]+"
-
-    test_demangling_exact "arm: __ct__21T5__pt__11_PFiPPdPv_iFi" "T5<int (*)(int, double **, void *)>::T5(int)"
-
-    test_demangling "arm: __gt__FRC2T2c" \
-	"operator>\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling "arm: __ge__FRC2T2c" \
-	"operator>=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling "arm: __lt__FRC2T2c" \
-	"operator<\[(\]+(const T2|T2 const) &, char\[)\]+"
-
-    test_demangling "arm: __le__FRC2T2c" \
-	"operator<=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling "arm: __ne__FRC2T2c" \
-	"operator!=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling "arm: __eq__FRC2T2c" \
-	"operator==\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling_exact "arm: __amd__FR2T2i" "operator%=(T2 &, int)"
-    test_demangling_exact "arm: __adv__FR2T2i" "operator/=(T2 &, int)"
-    test_demangling_exact "arm: __amu__FR2T2i" "operator*=(T2 &, int)"
-    test_demangling_exact "arm: __ami__FR2T2i" "operator-=(T2 &, int)"
-    test_demangling_exact "arm: __apl__FR2T2i" "operator+=(T2 &, int)"
-    test_demangling_exact "arm: __nw__2T1SFUi" "T1::operator new(unsigned int) static"
-    test_demangling_exact "arm: __dl__2T1SFPv" "T1::operator delete(void *) static"
-    test_demangling_exact "arm: put__2T7SFi" "T7::put(int) static"
-
-    test_demangling_exact "arm: __dl__12T5__pt__3_1xSFPv" "T5<x>::operator delete(void *) static"
-
-    test_demangling_exact "arm: h__FUc" "h(unsigned char)"
-    test_demangling_exact "arm: f__Fic" "f(int, char)"
-    test_demangling_exact "arm: h__FUi" "h(unsigned int)"
-    test_demangling_exact "arm: h__Fci" "h(char, int)"
-    test_demangling_exact "arm: h__FUl" "h(unsigned long)"
-    test_demangling_exact "arm: h__Fcl" "h(char, long)"
-    test_demangling_exact "arm: h__FUs" "h(unsigned short)"
-    test_demangling_exact "arm: h__Fcs" "h(char, short)"
-    test_demangling "arm: __amd__FR2T2RC2T2" \
-	"operator%=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __adv__FR2T2RC2T2" \
-	"operator/=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __amu__FR2T2RC2T2" \
-	"operator\[*\]+=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __ami__FR2T2RC2T2" \
-	"operator-=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __apl__FR2T2RC2T2" \
-	"operator\[+\]+=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-
-    test_demangling "arm: g__F1SRPUlRPCUlT2" \
-	"g\[(\]+S, unsigned long \[*\]+&, (const unsigned long|unsigned long const) \[*\]+&, unsigned long \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1SRPUiRPCUiT2" \
-	"g\[(\]+S, unsigned int \[*\]+&, (const unsigned int|unsigned int const) \[*\]+&, unsigned int \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1SRPUsRPCUsT2" \
-	"g\[(\]+S, unsigned short \[*\]+&, (const unsigned short|unsigned short const) \[*\]+&, unsigned short \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1SRPUcRPCUcT2" \
-	"g\[(\]+S, unsigned char \[*\]+&, (const unsigned char|unsigned char const) \[*\]+&, unsigned char \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1T1SRPlRPClT3" \
-	"g\[(\]+T, S, long \[*\]+&, (const long|long const) \[*\]+&, long \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1T1SRPiRPCiT3" \
-	"g\[(\]+T, S, int \[*\]+&, (const int|int const) \[*\]+&, int \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1T1SRPcRPCcT3" \
-	"g\[(\]+T, S, char \[*\]+&, (const char|char const) \[*\]+&, char \[*\]+&\[)\]+"
-
-    test_demangling_exact "arm: X__12T5__pt__3_1x" "T5<x>::X"
-
-    test_demangling_exact "arm: __ct__11T5__pt__2_iFi" "T5<int>::T5(int)"
-
-    test_demangling_exact "arm: __ct__11T5__pt__2_cFi" "T5<char>::T5(int)"
-
-    test_demangling "arm: __gt__FRC2T2T1" \
-	"operator>\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __ge__FRC2T2T1" \
-	"operator>=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __lt__FRC2T2T1" \
-	"operator<\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __le__FRC2T2T1" \
-	"operator<=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __ne__FRC2T2T1" \
-	"operator!=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __eq__FRC2T2T1" \
-	"operator==\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: g__FcR1cRC1cT2" \
-	"g\[(\]+char, c &, (const c|c const) &, c &\[)\]+"
-    test_demangling "arm: g__FcRPdRPCdT2" \
-	"g\[(\]+char, double *\[*\]+&, (const double|double const) *\[*\]+&, double *\[*\]+&\[)\]+"
-    test_demangling "arm: g__FcRPfRPCfT2" \
-	"g\[(\]+char, float *\[*\]+&, (const float|float const) *\[*\]+&, float *\[*\]+&\[)\]+"
-    test_demangling_exact "arm: h__FcT1" "h(char, char)"
-    test_demangling_exact "arm: f__Ficd" "f(int, char, double)"
-    test_demangling "arm: g__F1T1SdRPsRPCsT4" \
-	"g\[(\]+T, S, double, short \[*\]+&, (const short|short const) \[*\]+&, short \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1cC1cT1" \
-	"g\[(\]+c, (const c|c const), c\[)\]+"
-    test_demangling "arm: g__FPdPCdT1" \
-	"g\[(\]+double *\[*\]+, (const double|double const) *\[*\]+, double *\[*\]+\[)\]+"
-    test_demangling "arm: g__FPfPCfT1" \
-	"g\[(\]+float *\[*\]+, (const float|float const) *\[*\]+, float *\[*\]+\[)\]+"
-
-    test_demangling "arm: g__FUlCUlT1" \
-	"g\[(\]+unsigned long, (const unsigned long|unsigned long const), unsigned long\[)\]+"
-    test_demangling "arm: g__FPlPClT1" \
-	"g\[(\]+long \[*\]+, (const long|long const) \[*\]+, long \[*\]+\[)\]+"
-    test_demangling "arm: g__FUiCUiT1" \
-	"g\[(\]+unsigned int, (const unsigned int|unsigned int const), unsigned int\[)\]+"
-    test_demangling "arm: g__FPiPCiT1" \
-	"g\[(\]+int \[*\]+, (const int|int const) \[*\]+, int \[*\]+\[)\]+"
-    test_demangling "arm: g__FUsCUsT1" \
-	"g\[(\]+unsigned short, (const unsigned short|unsigned short const), unsigned short\[)\]+"
-    test_demangling "arm: g__FPsPCsT1" \
-	"g\[(\]+short \[*\]+, (const short|short const) \[*\]+, short \[*\]+\[)\]+"
-    test_demangling "arm: g__FUcCUcT1" \
-	"g\[(\]+unsigned char, (const unsigned char|unsigned char const), unsigned char\[)\]+"
-    test_demangling "arm: g__FPcPCcT1" \
-	"g\[(\]+char \[*\]+, (const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    test_demangling "arm: g__F1TlClT2" \
-	"g\[(\]+T, long, (const long|long const), long\[)\]+"
-    test_demangling "arm: g__F1TiCiT2" \
-	"g\[(\]+T, int, (const int|int const), int\[)\]+"
-    test_demangling "arm: g__F1TsCsT2" \
-	"g\[(\]+T, short, (const short|short const), short\[)\]+"
-    test_demangling "arm: g__F1TcCcT2" \
-	"g\[(\]+T, char, (const char|char const), char\[)\]+"
-
-    test_demangling_exact "arm: __dl__17T5__pt__8_PFcPv_iSFPv" "T5<int (*)(char, void *)>::operator delete(void *) static"
-
-    test_demangling "arm: printf__FPCce" \
-	"printf\[(\]+(const char|char const) \[*\]+,...\[)\]+"
-
-    test_demangling_exact "arm: X__17T5__pt__8_PFcPv_i" "T5<int (*)(char, void *)>::X"
-
-    test_demangling_exact "arm: __ct__12T5__pt__3_1xFi" "T5<x>::T5(int)"
-
-    test_demangling "arm: g__F1SRUlRCUlT2" \
-	"g\[(\]+S, unsigned long &, (const unsigned long|unsigned long const) &, unsigned long &\[)\]+"
-    test_demangling "arm: g__F1SRPlRPClT2" \
-	"g\[(\]+S, long \[*\]+&, (const long|long const) \[*\]+&, long \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1RRUiRCUiT2" \
-	"g\[(\]+R, unsigned int &, (const unsigned int|unsigned int const) &, unsigned int &\[)\]+"
-    test_demangling "arm: g__F1SRPiRPCiT2" \
-	"g\[(\]+S, int \[*\]+&, (const int|int const) \[*\]+&, int \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1RRUsRCUsT2" \
-	"g\[(\]+R, unsigned short &, (const unsigned short|unsigned short const) &, unsigned short &\[)\]+"
-    test_demangling "arm: g__F1SRPsRPCsT2" \
-	"g\[(\]+S, short \[*\]+&, (const short|short const) \[*\]+&, short \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1RRUcRCUcT2" \
-	"g\[(\]+R, unsigned char &, (const unsigned char|unsigned char const) &, unsigned char &\[)\]+"
-    test_demangling "arm: g__F1SRPcRPCcT2" \
-	"g\[(\]+S, char \[*\]+&, (const char|char const) \[*\]+&, char \[*\]+&\[)\]+"
-    test_demangling "arm: g__F1T1RRlRClT3" \
-	"g\[(\]+T, R, long &, (const long|long const) &, long &\[)\]+"
-    test_demangling "arm: g__F1T1RRiRCiT3" \
-	"g\[(\]+T, R, int &, (const int|int const) &, int &\[)\]+"
-    test_demangling "arm: g__F1T1RRsRCsT3" \
-	"g\[(\]+T, R, short &, (const short|short const) &, short &\[)\]+"
-    test_demangling "arm: g__F1T1RRcRCcT3" \
-	"g\[(\]+T, R, char &, (const char|char const) &, char &\[)\]+"
-
-    test_demangling_exact "arm: __dl__21T5__pt__11_PFiPPdPv_iSFPv" "T5<int (*)(int, double **, void *)>::operator delete(void *) static"
-
-    test_demangling_exact "arm: __std__foo" "global destructors keyed to foo"
-
-    test_demangling_exact "arm: __sti__bar" "global constructors keyed to bar"
-
-    test_demangling_exact "arm: f__FicdPcPFci_v" "f(int, char, double, char *, void (*)(char, int))"
-    test_demangling_exact "arm: f__FicdPcPFic_v" "f(int, char, double, char *, void (*)(int, char))"
-    test_demangling_exact "arm: get__2T7SFv" "T7::get(void) static"
-
-    test_demangling_exact "arm: X__21T5__pt__11_PFiPPdPv_i" "T5<int (*)(int, double **, void *)>::X"
-
-    test_demangling "arm: g__FcRdRCdT2" \
-	"g\[(\]+char, double &, (const double|double const) &, double &\[)\]+"
-    test_demangling "arm: g__FcRfRCfT2" \
-	"g\[(\]+char, float &, (const float|float const) &, float &\[)\]+"
-    test_demangling "arm: __md__FC2T2i" \
-	"operator%\[(\]+(const T2|T2 const), int\[)\]+"
-    test_demangling "arm: __dv__FC2T2i" \
-	"operator/\[(\]+(const T2|T2 const), int\[)\]+"
-    test_demangling "arm: __ml__FC2T2i" \
-	"operator\[*\]+\[(\]+(const T2|T2 const), int\[)\]+"
-    test_demangling "arm: __mi__FC2T2i" \
-	"operator-\[(\]+(const T2|T2 const), int\[)\]+"
-    test_demangling "arm: __pl__FC2T2i" \
-	"operator\[+\]+\[(\]+(const T2|T2 const), int\[)\]+"
-
-    test_demangling_exact "arm: __dl__11T5__pt__2_iSFPv" "T5<int>::operator delete(void *) static"
-
-    test_demangling_exact "arm: __dl__11T5__pt__2_cSFPv" "T5<char>::operator delete(void *) static"
-
-    test_demangling_exact "arm: h__Fc" "h(char)"
-    test_demangling_exact "arm: h__Fd" "h(double)"
-    test_demangling_exact "arm: h__Ff" "h(float)"
-    test_demangling_exact "arm: h__Fi" "h(int)"
-    test_demangling_exact "arm: f__Fi" "f(int)"
-    test_demangling_exact "arm: h__Fl" "h(long)"
-
-    test_demangling_exact "arm: h__Fs" "h(short)"
-    test_demangling "arm: __md__FC2T2RC2T2" \
-	"operator%\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __dv__FC2T2RC2T2" \
-	"operator/\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __ml__FC2T2RC2T2" \
-	"operator\[*\]+\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __mi__FC2T2RC2T2" \
-	"operator-\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: __pl__FC2T2RC2T2" \
-	"operator\[+\]+\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "arm: g__FcRP1cRPC1cT2" \
-	"g\[(\]+char, c *\[*\]+&, (const c|c const) *\[*\]+&, c *\[*\]+&\[)\]+"
-
-    test_demangling_exact "arm: X__11T5__pt__2_c" "T5<char>::X"
-
-    test_demangling_exact "arm: X__11T5__pt__2_i" "T5<int>::X"
-
-    test_demangling "arm: g__FdCdT1" \
-	"g\[(\]+double, (const double|double const), double\[)\]+"
-    test_demangling "arm: g__FfCfT1" \
-	"g\[(\]+float, (const float|float const), float\[)\]+"
-    test_demangling "arm: g__FlClT1" \
-	"g\[(\]+long, (const long|long const), long\[)\]+"
-    test_demangling "arm: g__FiCiT1" \
-	"g\[(\]+int, (const int|int const), int\[)\]+"
-    test_demangling "arm: g__FsCsT1" \
-	"g\[(\]+short, (const short|short const), short\[)\]+"
-    test_demangling "arm: g__FcCcT1" \
-	"g\[(\]+char, (const char|char const), char\[)\]+"
-
-    test_demangling_exact "arm: __ct__17T5__pt__8_PFcPv_iFi" "T5<int (*)(char, void *)>::T5(int)"
-
-    test_demangling_exact "arm: f__FicdPc" "f(int, char, double, char *)"
-    test_demangling_exact "arm: __nw__FUi" "operator new(unsigned int)"
-    test_demangling_exact "arm: __ct__Q3_2T11a1bSFi" "T1::a::b::b(int) static"
-    test_demangling_exact "arm: __dt__Q3_2T11a1bSFi" "T1::a::b::~b(int) static"
-    test_demangling_exact "arm: put__Q3_2T11a1bSFi" "T1::a::b::put(int) static"
-    test_demangling_exact "arm: get__Q2_2T11aSFv" "T1::a::get(void) static"
-    test_demangling_exact "arm: put__2T1SFi" "T1::put(int) static"
-    test_demangling_exact "arm: put__Q5_2T11a1b1c1dSFi" "T1::a::b::c::d::put(int) static"
-    test_demangling_exact "arm: get__Q4_2T11a1b1cSFv" "T1::a::b::c::get(void) static"
-    test_demangling_exact "arm: put__Q2_2T11aSFi" "T1::a::put(int) static"
-    test_demangling_exact "arm: put__Q4_2T11a1b1cSFi" "T1::a::b::c::put(int) static"
-    test_demangling_exact "arm: get__Q3_2T11a1bSFv" "T1::a::b::get(void) static"
-    test_demangling_exact "arm: get__2T1SFv" "T1::get(void) static"
-    test_demangling_exact "arm: get__Q5_2T11a1b1c1dSFv" "T1::a::b::c::d::get(void) static"
-
-    test_demangling_exact "arm: __dt__11T1__pt__2_cFv" "T1<char>::~T1(void)"
-
-    test_demangling_exact "arm: __dt__12T1__pt__3_1tFv" "T1<t>::~T1(void)"
-
-    test_demangling_exact "arm: __dl__12T1__pt__3_1tSFPv" "T1<t>::operator delete(void *) static"
-
-    test_demangling_exact "arm: __ct__11T1__pt__2_cFi" "T1<char>::T1(int)"
-
-    test_demangling_exact "arm: __ct__11T1__pt__2_cFv" "T1<char>::T1(void)"
-
-    test_demangling_exact "arm: __ct__12T1__pt__3_1tFi" "T1<t>::T1(int)"
-
-    test_demangling_exact "arm: __ct__12T1__pt__3_1tFv" "T1<t>::T1(void)"
-
-    test_demangling_exact "arm: __dl__11T1__pt__2_cSFPv" "T1<char>::operator delete(void *) static"
-
-    test_demangling_exact "arm: bar__3fooFPv"       "foo::bar(void *)"
-    test_demangling "arm: bar__3fooFPCv" \
-	     "foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+"
-    test_demangling_exact "arm: bar__3fooCFPv"      "foo::bar(void *) const"
-    test_demangling "arm: bar__3fooCFPCv" \
-	    "foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+ const"
-    test_demangling_exact "arm: __eq__3fooFR3foo"   "foo::operator==(foo &)"
-    test_demangling "arm: __eq__3fooFRC3foo" \
-	 "foo::operator==\[(\]+(const foo|foo const) &\[)\]+"
-    test_demangling_exact "arm: __eq__3fooCFR3foo"  "foo::operator==(foo &) const"
-    test_demangling "arm: __eq__3fooCFRC3foo" \
-	"foo::operator==\[(\]+(const foo|foo const) &\[)\]+ const"
-
-    test_demangling_exact "arm: elem__15vector__pt__2_dFi" "vector<double>::elem(int)"
-
-    test_demangling_exact "arm: elem__15vector__pt__2_iFi" "vector<int>::elem(int)"
-
-    test_demangling_exact "arm: __ct__15vector__pt__2_dFi" "vector<double>::vector(int)"
-
-    test_demangling_exact "arm: __ct__15vector__pt__2_iFi" "vector<int>::vector(int)"
-
-    test_demangling_exact "arm: __ct__25DListNode__pt__9_R6RLabelFR6RLabelP25DListNode__pt__9_R6RLabelT2" \
-	"DListNode<RLabel &>::DListNode(RLabel &, DListNode<RLabel &> *, DListNode<RLabel &> *)"
-
-    test_demangling_exact "arm: bar__3fooFiT16FooBar" "foo::bar(int, int, FooBar)"
-
-    test_demangling_exact "arm: bar__3fooFPiN51PdN37PcN211T1iN215" \
-      "foo::bar(int *, int *, int *, int *, int *, int *, double *, double *, double *, double *, char *, char *, char *, int *, int, int, int)"
-
-    test_demangling_exact "arm: _Utf390_1__1_9223372036854775807__9223372036854775" \
-	    "Can't demangle \"_Utf390_1__1_9223372036854775807__9223372036854775\""
-}
-
-proc test_hp_style_demangling {} {
-
-    # HP aCC mangling style is based on ARM for all the basic stuff,
-    # so first we use some of the ARM tests here.  Later we have HP-specific
-    # tests.
-        
-    test_demangling "hp: g__FP1cPC1cT1" \
-	"g\[(\]+c *\[*\]+, (const c|c const) *\[*\]+, c *\[*\]+\[)\]+"
-    test_demangling "hp: g__FPUlPCUlT1" \
-	"g\[(\]+unsigned long \[*\]+, (const unsigned long|unsigned long const) \[*\]+, unsigned long \[*\]+\[)\]+"
-    test_demangling "hp: g__FPUiPCUiT1" \
-	"g\[(\]+unsigned int \[*\]+, (const unsigned int|unsigned int const) \[*\]+, unsigned int \[*\]+\[)\]+"
-    test_demangling "hp: g__FPUsPCUsT1" \
-	"g\[(\]+unsigned short \[*\]+, (const unsigned short|unsigned short const) \[*\]+, unsigned short \[*\]+\[)\]+"
-    test_demangling "hp: g__FPUcPCUcT1" \
-	"g\[(\]+unsigned char \[*\]+, (const unsigned char|unsigned char const) \[*\]+, unsigned char \[*\]+\[)\]+"
-    test_demangling "hp: g__F1TPlPClT2" \
-	"g\[(\]+T, long \[*\]+, (const long|long const) \[*\]+, long \[*\]+\[)\]+"
-    test_demangling "hp: g__F1RRlRClT2" \
-	"g\[(\]+R, long &, (const long|long const) &, long &\[)\]+"
-    test_demangling "hp: g__F1TPiPCiT2" \
-	"g\[(\]+T, int \[*\]+, (const int|int const) \[*\]+, int \[*\]+\[)\]+"
-    test_demangling "hp: g__F1RRiRCiT2" \
-	"g\[(\]+R, int &, (const int|int const) &, int &\[)\]+"
-    test_demangling "hp: g__F1TPsPCsT2" \
-	"g\[(\]+T, short \[*\]+, (const short|short const) \[*\]+, short \[*\]+\[)\]+"
-    test_demangling "hp: g__F1RRsRCsT2" \
-	"g\[(\]+R, short &, (const short|short const) &, short &\[)\]+"
-    test_demangling "hp: g__F1TPcPCcT2" \
-	"g\[(\]+T, char \[*\]+, (const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    test_demangling "hp: g__F1RRcRCcT2" \
-	"g\[(\]+R, char &, (const char|char const) &, char &\[)\]+"
-
-    test_demangling "hp: __gt__FRC2T2c" \
-	"operator>\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling "hp: __ge__FRC2T2c" \
-	"operator>=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling "hp: __lt__FRC2T2c" \
-	"operator<\[(\]+(const T2|T2 const) &, char\[)\]+"
-
-    test_demangling "hp: __le__FRC2T2c" \
-	"operator<=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling "hp: __ne__FRC2T2c" \
-	"operator!=\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling "hp: __eq__FRC2T2c" \
-	"operator==\[(\]+(const T2|T2 const) &, char\[)\]+"
-    test_demangling_exact "hp: __amd__FR2T2i" "operator%=(T2 &, int)"
-    test_demangling_exact "hp: __adv__FR2T2i" "operator/=(T2 &, int)"
-    test_demangling_exact "hp: __amu__FR2T2i" "operator*=(T2 &, int)"
-    test_demangling_exact "hp: __ami__FR2T2i" "operator-=(T2 &, int)"
-    test_demangling_exact "hp: __apl__FR2T2i" "operator+=(T2 &, int)"
-    test_demangling_exact "hp: __nw__2T1SFUi" "T1::operator new(unsigned int) static"
-    test_demangling_exact "hp: __dl__2T1SFPv" "T1::operator delete(void *) static"
-    test_demangling_exact "hp: put__2T7SFi" "T7::put(int) static"
-
-    test_demangling_exact "hp: h__FUc" "h(unsigned char)"
-    test_demangling_exact "hp: f__Fic" "f(int, char)"
-    test_demangling_exact "hp: h__FUi" "h(unsigned int)"
-    test_demangling_exact "hp: h__Fci" "h(char, int)"
-    test_demangling_exact "hp: h__FUl" "h(unsigned long)"
-    test_demangling_exact "hp: h__Fcl" "h(char, long)"
-    test_demangling_exact "hp: h__FUs" "h(unsigned short)"
-    test_demangling_exact "hp: h__Fcs" "h(char, short)"
-    test_demangling "hp: __amd__FR2T2RC2T2" \
-	"operator%=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __adv__FR2T2RC2T2" \
-	"operator/=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __amu__FR2T2RC2T2" \
-	"operator\[*\]+=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __ami__FR2T2RC2T2" \
-	"operator-=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __apl__FR2T2RC2T2" \
-	"operator\[+\]+=\[(\]+T2 &, (const T2|T2 const) &\[)\]+"
-
-    test_demangling "hp: g__F1SRPUlRPCUlT2" \
-	"g\[(\]+S, unsigned long \[*\]+&, (const unsigned long|unsigned long const) \[*\]+&, unsigned long \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1SRPUiRPCUiT2" \
-	"g\[(\]+S, unsigned int \[*\]+&, (const unsigned int|unsigned int const) \[*\]+&, unsigned int \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1SRPUsRPCUsT2" \
-	"g\[(\]+S, unsigned short \[*\]+&, (const unsigned short|unsigned short const) \[*\]+&, unsigned short \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1SRPUcRPCUcT2" \
-	"g\[(\]+S, unsigned char \[*\]+&, (const unsigned char|unsigned char const) \[*\]+&, unsigned char \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1T1SRPlRPClT3" \
-	"g\[(\]+T, S, long \[*\]+&, (const long|long const) \[*\]+&, long \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1T1SRPiRPCiT3" \
-	"g\[(\]+T, S, int \[*\]+&, (const int|int const) \[*\]+&, int \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1T1SRPcRPCcT3" \
-	"g\[(\]+T, S, char \[*\]+&, (const char|char const) \[*\]+&, char \[*\]+&\[)\]+"
-
-
-    test_demangling "hp: __gt__FRC2T2T1" \
-	"operator>\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __ge__FRC2T2T1" \
-	"operator>=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __lt__FRC2T2T1" \
-	"operator<\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __le__FRC2T2T1" \
-	"operator<=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __ne__FRC2T2T1" \
-	"operator!=\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __eq__FRC2T2T1" \
-	"operator==\[(\]+(const T2|T2 const) &, (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: g__FcR1cRC1cT2" \
-	"g\[(\]+char, c &, (const c|c const) &, c &\[)\]+"
-    test_demangling "hp: g__FcRPdRPCdT2" \
-	"g\[(\]+char, double *\[*\]+&, (const double|double const) *\[*\]+&, double *\[*\]+&\[)\]+"
-    test_demangling "hp: g__FcRPfRPCfT2" \
-	"g\[(\]+char, float *\[*\]+&, (const float|float const) *\[*\]+&, float *\[*\]+&\[)\]+"
-    test_demangling_exact "hp: h__FcT1" "h(char, char)"
-    test_demangling_exact "hp: f__Ficd" "f(int, char, double)"
-    test_demangling "hp: g__F1T1SdRPsRPCsT4" \
-	"g\[(\]+T, S, double, short \[*\]+&, (const short|short const) \[*\]+&, short \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1cC1cT1" \
-	"g\[(\]+c, (const c|c const), c\[)\]+"
-    test_demangling "hp: g__FPdPCdT1" \
-	"g\[(\]+double *\[*\]+, (const double|double const) *\[*\]+, double *\[*\]+\[)\]+"
-    test_demangling "hp: g__FPfPCfT1" \
-	"g\[(\]+float *\[*\]+, (const float|float const) *\[*\]+, float *\[*\]+\[)\]+"
-
-    test_demangling "hp: g__FUlCUlT1" \
-	"g\[(\]+unsigned long, (const unsigned long|unsigned long const), unsigned long\[)\]+"
-    test_demangling "hp: g__FPlPClT1" \
-	"g\[(\]+long \[*\]+, (const long|long const) \[*\]+, long \[*\]+\[)\]+"
-    test_demangling "hp: g__FUiCUiT1" \
-	"g\[(\]+unsigned int, (const unsigned int|unsigned int const), unsigned int\[)\]+"
-    test_demangling "hp: g__FPiPCiT1" \
-	"g\[(\]+int \[*\]+, (const int|int const) \[*\]+, int \[*\]+\[)\]+"
-    test_demangling "hp: g__FUsCUsT1" \
-	"g\[(\]+unsigned short, (const unsigned short|unsigned short const), unsigned short\[)\]+"
-    test_demangling "hp: g__FPsPCsT1" \
-	"g\[(\]+short \[*\]+, (const short|short const) \[*\]+, short \[*\]+\[)\]+"
-    test_demangling "hp: g__FUcCUcT1" \
-	"g\[(\]+unsigned char, (const unsigned char|unsigned char const), unsigned char\[)\]+"
-    test_demangling "hp: g__FPcPCcT1" \
-	"g\[(\]+char \[*\]+, (const char|char const) \[*\]+, char \[*\]+\[)\]+"
-    test_demangling "hp: g__F1TlClT2" \
-	"g\[(\]+T, long, (const long|long const), long\[)\]+"
-    test_demangling "hp: g__F1TiCiT2" \
-	"g\[(\]+T, int, (const int|int const), int\[)\]+"
-    test_demangling "hp: g__F1TsCsT2" \
-	"g\[(\]+T, short, (const short|short const), short\[)\]+"
-    test_demangling "hp: g__F1TcCcT2" \
-	"g\[(\]+T, char, (const char|char const), char\[)\]+"
-
-    test_demangling "hp: printf__FPCce" \
-	"printf\[(\]+(const char|char const) \[*\]+,...\[)\]+"
-
-
-    test_demangling "hp: g__F1SRUlRCUlT2" \
-	"g\[(\]+S, unsigned long &, (const unsigned long|unsigned long const) &, unsigned long &\[)\]+"
-    test_demangling "hp: g__F1SRPlRPClT2" \
-	"g\[(\]+S, long \[*\]+&, (const long|long const) \[*\]+&, long \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1RRUiRCUiT2" \
-	"g\[(\]+R, unsigned int &, (const unsigned int|unsigned int const) &, unsigned int &\[)\]+"
-    test_demangling "hp: g__F1SRPiRPCiT2" \
-	"g\[(\]+S, int \[*\]+&, (const int|int const) \[*\]+&, int \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1RRUsRCUsT2" \
-	"g\[(\]+R, unsigned short &, (const unsigned short|unsigned short const) &, unsigned short &\[)\]+"
-    test_demangling "hp: g__F1SRPsRPCsT2" \
-	"g\[(\]+S, short \[*\]+&, (const short|short const) \[*\]+&, short \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1RRUcRCUcT2" \
-	"g\[(\]+R, unsigned char &, (const unsigned char|unsigned char const) &, unsigned char &\[)\]+"
-    test_demangling "hp: g__F1SRPcRPCcT2" \
-	"g\[(\]+S, char \[*\]+&, (const char|char const) \[*\]+&, char \[*\]+&\[)\]+"
-    test_demangling "hp: g__F1T1RRlRClT3" \
-	"g\[(\]+T, R, long &, (const long|long const) &, long &\[)\]+"
-    test_demangling "hp: g__F1T1RRiRCiT3" \
-	"g\[(\]+T, R, int &, (const int|int const) &, int &\[)\]+"
-    test_demangling "hp: g__F1T1RRsRCsT3" \
-	"g\[(\]+T, R, short &, (const short|short const) &, short &\[)\]+"
-    test_demangling "hp: g__F1T1RRcRCcT3" \
-	"g\[(\]+T, R, char &, (const char|char const) &, char &\[)\]+"
-
-
-    test_demangling_exact "hp: f__FicdPcPFci_v" "f(int, char, double, char *, void (*)(char, int))"
-    test_demangling_exact "hp: f__FicdPcPFic_v" "f(int, char, double, char *, void (*)(int, char))"
-    test_demangling_exact "hp: get__2T7SFv" "T7::get(void) static"
-
-
-    test_demangling "hp: g__FcRdRCdT2" \
-	"g\[(\]+char, double &, (const double|double const) &, double &\[)\]+"
-    test_demangling "hp: g__FcRfRCfT2" \
-	"g\[(\]+char, float &, (const float|float const) &, float &\[)\]+"
-    test_demangling "hp: __md__FC2T2i" \
-	"operator%\[(\]+(const T2|T2 const), int\[)\]+"
-    test_demangling "hp: __dv__FC2T2i" \
-	"operator/\[(\]+(const T2|T2 const), int\[)\]+"
-    test_demangling "hp: __ml__FC2T2i" \
-	"operator\[*\]+\[(\]+(const T2|T2 const), int\[)\]+"
-    test_demangling "hp: __mi__FC2T2i" \
-	"operator-\[(\]+(const T2|T2 const), int\[)\]+"
-    test_demangling "hp: __pl__FC2T2i" \
-	"operator\[+\]+\[(\]+(const T2|T2 const), int\[)\]+"
-
-
-    test_demangling_exact "hp: h__Fc" "h(char)"
-    test_demangling_exact "hp: h__Fd" "h(double)"
-    test_demangling_exact "hp: h__Ff" "h(float)"
-    test_demangling_exact "hp: h__Fi" "h(int)"
-    test_demangling_exact "hp: f__Fi" "f(int)"
-    test_demangling_exact "hp: h__Fl" "h(long)"
-
-    test_demangling_exact "hp: h__Fs" "h(short)"
-    test_demangling "hp: __md__FC2T2RC2T2" \
-	"operator%\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __dv__FC2T2RC2T2" \
-	"operator/\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __ml__FC2T2RC2T2" \
-	"operator\[*\]+\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __mi__FC2T2RC2T2" \
-	"operator-\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: __pl__FC2T2RC2T2" \
-	"operator\[+\]+\[(\]+(const T2|T2 const), (const T2|T2 const) &\[)\]+"
-    test_demangling "hp: g__FcRP1cRPC1cT2" \
-	"g\[(\]+char, c *\[*\]+&, (const c|c const) *\[*\]+&, c *\[*\]+&\[)\]+"
-
-
-    test_demangling "hp: g__FdCdT1" \
-	"g\[(\]+double, (const double|double const), double\[)\]+"
-    test_demangling "hp: g__FfCfT1" \
-	"g\[(\]+float, (const float|float const), float\[)\]+"
-    test_demangling "hp: g__FlClT1" \
-	"g\[(\]+long, (const long|long const), long\[)\]+"
-    test_demangling "hp: g__FiCiT1" \
-	"g\[(\]+int, (const int|int const), int\[)\]+"
-    test_demangling "hp: g__FsCsT1" \
-	"g\[(\]+short, (const short|short const), short\[)\]+"
-    test_demangling "hp: g__FcCcT1" \
-	"g\[(\]+char, (const char|char const), char\[)\]+"
-
-
-    test_demangling_exact "hp: f__FicdPc" "f(int, char, double, char *)"
-    test_demangling_exact "hp: __nw__FUi" "operator new(unsigned int)"
-    test_demangling_exact "hp: __ct__Q3_2T11a1bSFi" "T1::a::b::b(int) static"
-    test_demangling_exact "hp: __dt__Q3_2T11a1bSFi" "T1::a::b::~b(int) static"
-    test_demangling_exact "hp: put__Q3_2T11a1bSFi" "T1::a::b::put(int) static"
-    test_demangling_exact "hp: get__Q2_2T11aSFv" "T1::a::get(void) static"
-    test_demangling_exact "hp: put__2T1SFi" "T1::put(int) static"
-    test_demangling_exact "hp: put__Q5_2T11a1b1c1dSFi" "T1::a::b::c::d::put(int) static"
-    test_demangling_exact "hp: get__Q4_2T11a1b1cSFv" "T1::a::b::c::get(void) static"
-    test_demangling_exact "hp: put__Q2_2T11aSFi" "T1::a::put(int) static"
-    test_demangling_exact "hp: put__Q4_2T11a1b1cSFi" "T1::a::b::c::put(int) static"
-    test_demangling_exact "hp: get__Q3_2T11a1bSFv" "T1::a::b::get(void) static"
-    test_demangling_exact "hp: get__2T1SFv" "T1::get(void) static"
-    test_demangling_exact "hp: get__Q5_2T11a1b1c1dSFv" "T1::a::b::c::d::get(void) static"
-
-
-    test_demangling_exact "hp: bar__3fooFPv"       "foo::bar(void *)"
-    test_demangling "hp: bar__3fooFPCv" \
-	     "foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+"
-    test_demangling_exact "hp: bar__3fooCFPv"      "foo::bar(void *) const"
-    test_demangling "hp: bar__3fooCFPCv" \
-	    "foo::bar\[(\]+(const void|void const) *\[*\]+\[)\]+ const"
-    test_demangling_exact "hp: __eq__3fooFR3foo"   "foo::operator==(foo &)"
-    test_demangling "hp: __eq__3fooFRC3foo" \
-	 "foo::operator==\[(\]+(const foo|foo const) &\[)\]+"
-    test_demangling_exact "hp: __eq__3fooCFR3foo"  "foo::operator==(foo &) const"
-    test_demangling "hp: __eq__3fooCFRC3foo" \
-	"foo::operator==\[(\]+(const foo|foo const) &\[)\]+ const"
-
-    test_demangling_exact "hp: bar__3fooFiT16FooBar" "foo::bar(int, int, FooBar)"
-
-    test_demangling_exact "hp: bar__3fooFPiN51PdN37PcN211T1iN215" \
-      "foo::bar(int *, int *, int *, int *, int *, int *, double *, double *, double *, double *, char *, char *, char *, int *, int, int, int)"
-
-
-    # HP aCC specific tests. HP aCC demangling does not use __pt__ for
-    # template specifications.  There are other differences as well.
-
-    test_demangling_exact "hp: __dt__2T5XTPFiPPdPv_i__Fv" "T5<int (*)(int, double **, void *)>::~T5(void)"
-
-    test_demangling_exact "hp: __ct__1cFi" "c::c(int)"
-
-    test_demangling_exact "hp: __dt__2T5XTi__Fv" "T5<int>::~T5(void)"
-
-    test_demangling_exact "hp: __dt__2T5XTc__Fv" "T5<char>::~T5(void)"
-
-    test_demangling_exact "hp: __ct__2T2Fi" "T2::T2(int)"
-    test_demangling_exact "hp: __dt__2T1Fv" "T1::~T1(void)"
-
-    test_demangling_exact "hp: __dt__2T5XT1x__Fv" "T5<x>::~T5(void)"
-
-    test_demangling_exact "hp: __dt__2T5XTPFcPv_i__Fv" "T5<int (*)(char, void *)>::~T5(void)"
-    
-    test_demangling_exact "hp: __ct__2T5XTPFiPPdPv_i__Fi" "T5<int (*)(int, double **, void *)>::T5(int)"
-
-    test_demangling_exact "hp: __dl__2T5XT1x__SFPv" "T5<x>::operator delete(void *) static"
-    
-    test_demangling_exact "hp: X__2T5XT1x" "T5<x>::X"
-
-    test_demangling_exact "hp: __ct__2T5XTi__Fi" "T5<int>::T5(int)"
-
-    test_demangling_exact "hp: __ct__2T5XTc__Fi" "T5<char>::T5(int)"
-
-    test_demangling_exact "hp: __dl__2T5XTPFcPv_i__SFPv" "T5<int (*)(char, void *)>::operator delete(void *) static"
-
-    test_demangling_exact "hp: X__2T5XTPFcPv_i" "T5<int (*)(char, void *)>::X"
-
-    test_demangling_exact "hp: __ct__2T5XT1x__Fi" "T5<x>::T5(int)"
-
-    test_demangling_exact "hp: __dl__2T5XTPFiPPdPv_i__SFPv" "T5<int (*)(int, double **, void *)>::operator delete(void *) static"
-    test_demangling_exact "hp: X__2T5XTPFiPPdPv_i" "T5<int (*)(int, double **, void *)>::X"
-
-    test_demangling_exact "hp: __dl__2T5XTi__SFPv" "T5<int>::operator delete(void *) static"
-
-    test_demangling_exact "hp: __dl__2T5XTc__SFPv" "T5<char>::operator delete(void *) static"
-
-    test_demangling_exact "hp: X__2T5XTc" "T5<char>::X"
-
-    test_demangling_exact "hp: X__2T5XTi" "T5<int>::X"
-
-    test_demangling_exact "hp: __ct__2T5XTPFcPv_i__Fi" "T5<int (*)(char, void *)>::T5(int)"
-    
-    test_demangling_exact "hp: __dt__2T1XTc__Fv" "T1<char>::~T1(void)"
-
-    test_demangling_exact "hp: __dt__2T1XT1t__Fv" "T1<t>::~T1(void)"
-
-    test_demangling_exact "hp: __dl__2T1XT1t__SFPv" "T1<t>::operator delete(void *) static"
-
-    test_demangling_exact "hp: __ct__2T1XTc__Fi" "T1<char>::T1(int)"
-
-    test_demangling_exact "hp: __ct__2T1XTc__Fv" "T1<char>::T1(void)"
-
-    test_demangling_exact "hp: __ct__2T1XT1t__Fi" "T1<t>::T1(int)"
-
-    test_demangling_exact "hp: __ct__2T1XT1t__Fv" "T1<t>::T1(void)"
-
-    test_demangling_exact "hp: __dl__2T1XTc__SFPv" "T1<char>::operator delete(void *) static"
-
-    test_demangling_exact "hp: elem__6vectorXTd__Fi" "vector<double>::elem(int)"
-
-    test_demangling_exact "hp: elem__6vectorXTi__Fi" "vector<int>::elem(int)"
-
-    test_demangling_exact "hp: __ct__6vectorXTd__Fi" "vector<double>::vector(int)"
-
-    test_demangling_exact "hp: __ct__6vectorXTi__Fi" "vector<int>::vector(int)"
-
-    test_demangling_exact "hp: __ct__9DListNodeXTR6RLabel__FR6RLabelP9DListNodeXTR6RLabel_T2" \
-	"DListNode<RLabel &>::DListNode(RLabel &, DListNode<RLabel &> *, DListNode<RLabel &> *)"
-
-
-    # Absolute integer constants in template args
-
-    test_demangling_exact "hp: elem__6vectorXTiUP34__Fi" "vector<int,34U>::elem(int)"
-    test_demangling_exact "hp: elem__6vectorXUP2701Td__Fi" "vector<2701U,double>::elem(int)"
-    test_demangling_exact "hp: elem__6vectorXTiSP334__Fi" "vector<int,334>::elem(int)"
-    test_demangling_exact "hp: elem__6vectorXTiSN67__Fi" "vector<int,-67>::elem(int)"
-    test_demangling_exact "hp: elem__6vectorXTiSM__SCFPPd" "vector<int,-2147483648>::elem(double **) static const"
-    test_demangling_exact "hp: elem__6vectorXTiSN67UP4000TRs__Fi" "vector<int,-67,4000U,short &>::elem(int)"
-    test_demangling_exact "hp: elem__6vectorXTiSN67TRdTFPv_i__Fi" "vector<int,-67,double &,int (void *)>::elem(int)"
-    test_demangling_exact "hp: X__6vectorXTiSN67TdTPvUP5TRs" "vector<int,-67,double,void *,5U,short &>::X"
-
-    # Named constants in template args
-
-    test_demangling_exact "hp: elem__6vectorXTiA3foo__Fi" "vector<int,&foo>::elem(int)"
-    test_demangling_exact "hp: elem__6vectorXTiA3fooTPvA5Label__FiPPvT2" "vector<int,&foo,void *,&Label>::elem(int, void **, void **)"
-    test_demangling_exact "hp: elem__6vectorXTiSN42A3foo__Fi" "vector<int,-42,&foo>::elem(int)"
-
-    # Alternate entry points for functions
-
-    test_demangling_exact "hp: __ct__2T5XTPFcPv_i__Fi_2" "T5<int (*)(char, void *)>::T5(int)"
-    test_demangling_exact "hp: __ct__2T5XTPFcPv_i__Fi_19" "T5<int (*)(char, void *)>::T5(int)"
-    test_demangling_exact "hp: f__FicdPcPFci_v_34" "f(int, char, double, char *, void (*)(char, int))"
-
-
-    # Template partial specializations
-
-# FIXME!  The # characters don't go through expect, and backslashes don't seem to work.
-#    test_demangling_exact "hp: spec__13Spec<#1,#1.*>XTiTPi_FPi" "Spec<int,int *>::spec(int *)"
-#    test_demangling_exact "hp: spec__16Spec<#1,#1.&,#1>XTiTRiTi_FPi" "Spec<int,int &, int>::spec(int *)"
-# Fake test -- replace # with %
-    test_demangling_exact "hp: spec__13Spec<%1,%1.*>XTiTPi_FPi" "Spec<int,int *>::spec(int *)"
-    test_demangling_exact "hp: spec__16Spec<%1,%1.&,%1>XTiTRiTi_FPi" "Spec<int,int &,int>::spec(int *)"
-
-    # Global template functions
-
-    test_demangling_exact "hp: add__XTc_FcT1" "add<char>(char, char)"
-    test_demangling_exact "hp: add__XTcSP9A5label_FcPPlT1" "add<char,9,&label>(char, long **, char)"
-    test_demangling_exact "hp: add__XTPfTFPd_f_FcT1" "add<float *,float (double *)>(char, char)"
-
-    # Template for template arg
-
-    test_demangling_exact "hp: unLink__12basic_stringXTcT18string_char_traitsXTc_T9allocator_Fv" "basic_string<char,string_char_traits<char>,allocator>::unLink(void)"
-
-    test_demangling_exact "hp: _Utf390_1__1_9223372036854775807__9223372036854775" \
-	    "Can't demangle \"_Utf390_1__1_9223372036854775807__9223372036854775\""
-}
-
-
-proc catch_demangling_errors {command} {
-    if {[catch $command result]} {
-	puts "ERROR: demangle.exp: while running $command: $result"
-    }
-}
-
-# Test support for different demangling styles.  Note that this does
-# not depend upon running the test program and does not depend upon
-# gdb being able to lookup any C++ symbols.  It simply calls the 
-# internal demangler with synthesized strings and tests the results.
-
-proc do_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-
-    send_gdb "set language c++\n"
-    gdb_expect -re "$gdb_prompt $"
-    send_gdb "set width 0\n"
-    gdb_expect -re "$gdb_prompt $"
-
-    # Using catch_demangling_errors this way ensures that, if one of
-    # the functions raises a Tcl error, then it'll get reported, and
-    # the rest of the functions will still run.
-    catch_demangling_errors test_lucid_style_demangling
-    catch_demangling_errors test_gnu_style_demangling
-    catch_demangling_errors test_arm_style_demangling
-    catch_demangling_errors test_hp_style_demangling
-}
-
-do_tests
diff --git a/gdb/testsuite/gdb.cp/derivation.cc b/gdb/testsuite/gdb.cp/derivation.cc
deleted file mode 100644
index f6d42e7d1de..00000000000
--- a/gdb/testsuite/gdb.cp/derivation.cc
+++ /dev/null
@@ -1,240 +0,0 @@
-class A {
-public:
-    int a;
-    int aa;
-
-    A()
-    {
-        a=1;
-        aa=2;
-    }
-    int afoo();
-    int foo();
-    
-};
-
-
-
-class B {
-public:
-    int b;
-    int bb;
-
-    B()
-    {
-        b=3;
-        bb=4;
-    }
-    int bfoo();
-    int foo();
-    
-};
-
-
-
-class C {
-public:
-    int c;
-    int cc;
-
-    C()
-    {
-        c=5;
-        cc=6;
-    }
-    int cfoo();
-    int foo();
-    
-};
-
-
-
-class D : private A, public B, protected C {
-public:
-    int d;
-    int dd;
-
-    D()
-    {
-        d =7;
-        dd=8;
-    }
-    int dfoo();
-    int foo();
-    
-};
-
-
-class E : public A, B, protected C {
-public:
-    int e;
-    int ee;
-
-    E()
-    {
-        e =9;
-        ee=10;
-    }
-    int efoo();
-    int foo();
-    
-};
-
-
-class F : A, public B, C {
-public:
-    int f;
-    int ff;
-
-    F()
-    {
-        f =11;
-        ff=12;
-    }
-    int ffoo();
-    int foo();
-    
-};
-
-class G : private A, public B, protected C {
-public:
-    int g;
-    int gg;
-    int a;
-    int b;
-    int c;
-
-    G()
-    {
-        g =13;
-        gg =14;
-        a=15;
-        b=16;
-        c=17;
-        
-    }
-    int gfoo();
-    int foo();
-    
-};
-
-
-
-
-int A::afoo() {
-    return 1;
-}
-
-int B::bfoo() {
-    return 2;
-}
-
-int C::cfoo() {
-    return 3;
-}
-
-int D::dfoo() {
-    return 4;
-}
-
-int E::efoo() {
-    return 5;
-}
-
-int F::ffoo() {
-    return 6;
-}
-
-int G::gfoo() {
-    return 77;
-}
-
-int A::foo()
-{
-    return 7;
-    
-}
-
-int B::foo()
-{
-    return 8;
-    
-}
-
-int C::foo()
-{
-    return 9;
-    
-}
-
-int D::foo()
-{
-    return 10;
-    
-}
-
-int E::foo()
-{
-    return 11;
-    
-}
-
-int F::foo()
-{
-    return 12;
-    
-}
-
-int G::foo()
-{
-    return 13;
-    
-}
-
-
-void marker1()
-{
-}
-
-
-int main(void)
-{
-
-    A a_instance;
-    B b_instance;
-    C c_instance;
-    D d_instance;
-    E e_instance;
-    F f_instance;
-    G g_instance;
-    
-    #ifdef usestubs
-       set_debug_traps();
-       breakpoint();
-    #endif
-    
-
-    marker1(); // marker1-returns-here
-    
-    a_instance.a = 20; // marker1-returns-here
-    a_instance.aa = 21;
-    b_instance.b = 22;
-    b_instance.bb = 23;
-    c_instance.c = 24;
-    c_instance.cc = 25;
-    d_instance.d = 26;
-    d_instance.dd = 27;
-    e_instance.e = 28;
-    e_instance.ee =29;
-    f_instance.f =30;
-    f_instance.ff =31;
-    
-    
-    
-
-    return 0;
-    
-}
-
-    
-    
diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp
deleted file mode 100644
index 6c98d3ce5a4..00000000000
--- a/gdb/testsuite/gdb.cp/derivation.exp
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# This file was written by Elena Zannoni (ezannoni@cygnus.com)
-# And rewritten by Michael Chastain <mec.gnu@mindspring.com>
-
-# This file is part of the gdb testsuite
-
-# tests for inheritance, with several derivations types combinations
-# (private, public, protected) 
-# classes have simple members and member functions.
-
-set ws "\[\r\n\t \]+"
-set nl "\[\r\n\]+"
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-# Start program.
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-load_lib "cp-support.exp"
-
-set testfile "derivation"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Set it up at a breakpoint so we can play with the variable values.
-
-if ![runto 'marker1'] then {
-    perror "couldn't run to marker1"
-    continue
-}
-
-gdb_test "up" ".*main.*" "up from marker1"
-
-# Print class types and values.
-
-# class A
-
-gdb_test "print a_instance" "\\$\[0-9\]+ = \{a = 1, aa = 2\}" "print value of a_instance"
-
-cp_test_ptype_class \
-    "ptype a_instance" "" "class" "A" \
-    {
-	{ field  public "int a;" }
-	{ field  public "int aa;" }
-	{ method public "A();" }
-	{ method public "int afoo();" }
-	{ method public "int foo();" }
-    }
-
-# class D
-
-gdb_test_multiple "print d_instance" "print value of d_instance" {
-    -re "\\$\[0-9\]+ = \{<(class A|A)> = \{a = 1, aa = 2\}, <(class B|B)> = \{b = 3, bb = 4\}, <(class C|C)> = \{c = 5, cc = 6\}, d = 7, dd = 8\}$nl$gdb_prompt $" {
-	pass "print value of d_instance"
-    }
-}
-
-cp_test_ptype_class \
-    "ptype d_instance" "" "class" "D" \
-    {
-	{ base          "private A" }
-	{ base          "public B" }
-	{ base          "protected C" }
-	{ field  public "int d;" }
-	{ field  public "int dd;" }
-	{ method public "D();" }
-	{ method public "int dfoo();" }
-	{ method public "int foo();" }
-    } \
-    "" \
-    {
-	{ "protected C" "private C" { setup_xfail "*-*-*" "gcc/13539" } }
-    }
-
-# class E
-
-gdb_test_multiple "print e_instance" "print value of e_instance" {
-    -re "\\$\[0-9\]+ = \{<(class A|A)> = \{a = 1, aa = 2\}, <(class B|B)> = \{b = 3, bb = 4\}, <(class C|C)> = \{c = 5, cc = 6\}, e = 9, ee = 10\}$nl$gdb_prompt $" {
-	pass "print value of e_instance"
-    }
-}
-
-cp_test_ptype_class \
-    "ptype e_instance" "" "class" "E" \
-    {
-	{ base          "public A" }
-	{ base          "private B" }
-	{ base          "protected C" }
-	{ field  public "int e;" }
-	{ field  public "int ee;" }
-	{ method public "E();" }
-	{ method public "int efoo();" }
-	{ method public "int foo();" }
-    } \
-    "" \
-    {
-	{ "protected C" "private C" { setup_xfail "*-*-*" "gcc/13539" } }
-    }
-
-# class F
-
-gdb_test_multiple "print f_instance" "print value of f_instance" {
-    -re "\\$\[0-9\]+ = \{<(class A|A)> = \{a = 1, aa = 2\}, <(class B|B)> = \{b = 3, bb = 4\}, <(class C|C)> = \{c = 5, cc = 6\}, f = 11, ff = 12\}$nl$gdb_prompt $" {
-	pass "print value of f_instance"
-    }
-}
-
-cp_test_ptype_class \
-    "ptype f_instance" "" "class" "F" \
-    {
-	{ base          "private A" }
-	{ base          "public B" }
-	{ base          "private C" }
-	{ field  public "int f;" }
-	{ field  public "int ff;" }
-	{ method public "F();" }
-	{ method public "int ffoo();" }
-	{ method public "int foo();" }
-    }
-
-# Print individual fields.
-
-gdb_test "print d_instance.a"  "\\$\[0-9\]+ = 1" "print value of d_instance.a"
-gdb_test "print d_instance.aa" "\\$\[0-9\]+ = 2" "print value of d_instance.aa"
-gdb_test "print d_instance.b"  "\\$\[0-9\]+ = 3" "print value of d_instance.b"
-gdb_test "print d_instance.bb" "\\$\[0-9\]+ = 4" "print value of d_instance.bb"
-gdb_test "print d_instance.c"  "\\$\[0-9\]+ = 5" "print value of d_instance.c"
-gdb_test "print d_instance.cc" "\\$\[0-9\]+ = 6" "print value of d_instance.cc"
-gdb_test "print d_instance.d"  "\\$\[0-9\]+ = 7" "print value of d_instance.d"
-gdb_test "print d_instance.dd" "\\$\[0-9\]+ = 8" "print value of d_instance.dd"
-
-# Print some fields which are defined in the top of class G
-# and in its base classes.  This is not be ambiguous.
-
-gdb_test "print g_instance.a"  "\\$\[0-9\]+ = 15" "print value of g_instance.a"
-gdb_test "print g_instance.b"  "\\$\[0-9\]+ = 16" "print value of g_instance.b"
-gdb_test "print g_instance.c"  "\\$\[0-9\]+ = 17" "print value of g_instance.c"
-
-# Print a function call.
-
-gdb_test "print g_instance.afoo()" "\\$\[0-9\]+ = 1" "print value of g_instance.afoo()"
-
-# If GDB fails to restore the selected frame properly after the
-# inferior function call above (see GDB PR 1155 for an explanation of
-# why this might happen), all the subsequent tests will fail.  We
-# should detect report that failure, but let the marker call finish so
-# that the rest of the tests can run undisturbed.
-
-gdb_test_multiple "frame" "re-selected 'main' frame after inferior call" {
-    -re "#0  marker1.*$gdb_prompt $" {
-        setup_kfail "gdb/1155" s390-*-linux-gnu
-        fail "re-selected 'main' frame after inferior call"
-        gdb_test "finish" ".*main.*at .*derivation.cc:.*// marker1-returns-here.*" \
-            "finish call to marker1"
-    }
-    -re "#1  ($hex in )?main.*$gdb_prompt $" {
-        pass "re-selected 'main' frame after inferior call"
-    }
-}
-
-gdb_test "print g_instance.bfoo()" "\\$\[0-9\]+ = 2" "print value of g_instance.bfoo()"
-gdb_test "print g_instance.cfoo()" "\\$\[0-9\]+ = 3" "print value of g_instance.cfoo()"
diff --git a/gdb/testsuite/gdb.cp/exception.cc b/gdb/testsuite/gdb.cp/exception.cc
deleted file mode 100644
index cd124e59285..00000000000
--- a/gdb/testsuite/gdb.cp/exception.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1997, 1998, 2004 Free Software Foundation, 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.
-   */
-
-
-
-// Test file for exception handling support.
-
-#include <iostream>
-using namespace std;
-
-int foo (int i)
-{
-  if (i < 32)
-    throw (int) 13;
-  else
-    return i * 2;
-}
-
-extern "C" int bar (int k, unsigned long eharg, int flag);
-    
-int bar (int k, unsigned long eharg, int flag)
-{
-  cout << "k is " << k << " eharg is " << eharg << " flag is " << flag << endl;
-  return 1;
-}
-
-int main()
-{
-  int j;
-
-  try {
-    j = foo (20);
-  }
-  catch (int x) {
-    cout << "Got an except " << x << endl;
-  }
-  
-  try {
-    try {
-      j = foo (20);
-    }
-    catch (int x) {
-      cout << "Got an except " << x << endl;
-      throw;
-    }
-  }
-  catch (int y) {
-    cout << "Got an except (rethrown) " << y << endl;
-  }
-
-  // Not caught 
-  foo (20);
-}
diff --git a/gdb/testsuite/gdb.cp/exception.exp b/gdb/testsuite/gdb.cp/exception.exp
deleted file mode 100644
index 9cfaa406873..00000000000
--- a/gdb/testsuite/gdb.cp/exception.exp
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1997, 1998, 2004, 2005 Free Software Foundation, 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.  
-
-# This file is part of the gdb testsuite.
-# tests for exception-handling support
-# Written by Satish Pai <pai@apollo.hp.com> 1997-07-23
-# Rewritten by Michael Chastain <mec.gnu@mindspring.com> 2004-01-08
-
-# This file used to have two copies of the tests with different
-# compiler flags for hp-ux.  Instead, the user should set CXXOPTS
-# or run runtest with --target_board unix/gdb:debug_flags="..."
-# to choose the compiler flags.
-#
-# The interesting compiler flags are: "aCC +A -Wl,-a,-archive" .
-# Static-linked executables use a different mechanism to get the
-# address of the notification hook in the C++ support library.
-
-# TODO: this file is not ready for production yet.  If you are working
-# on C++ exception support for gdb, you can take out the "continue"
-# statement and try your luck.  -- chastain 2004-01-09
-
-# TODO: this file has many absolute line numbers.
-# Replace them with gdb_get_line_number.
-
-set ws	"\[\r\n\t \]+"
-set nl	"\[\r\n\]+"
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "exception"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
- 
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Start with a fresh gdb
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# As I said before, this test script is not ready yet!
-
-continue
-
-# Set a catch catchpoint
-
-gdb_test "catch catch" "Catchpoint \[0-9\]+ \\(catch\\)"
-
-# Set a throw catchpoint
-
-gdb_test "catch throw" "Catchpoint \[0-9\]+ \\(throw\\)" \
-    "catch throw (static executable)"
-
-# The catchpoints should be listed in the list of breakpoints.
-
-set re_head	"Num${ws}Type${ws}Disp${ws}Enb${ws}Address${ws}What"
-set re_1_main   "1${ws}breakpoint${ws}keep${ws}y${ws}$hex${ws}in main.*breakpoint already hit.*"
-set re_2_catch	"2${ws}catch catch${ws}keep${ws}y${ws}$hex${ws}exception catch"
-set re_3_catch	"3${ws}catch throw${ws}keep${ws}y${ws}$hex${ws}exception throw"
-set re_2_bp	"2${ws}breakpoint${ws}keep${ws}y${ws}$hex${ws}exception catch"
-set re_3_bp	"3${ws}breakpoint${ws}keep${ws}y${ws}$hex${ws}exception throw"
-
-set name "info breakpoints"
-gdb_test_multiple "info breakpoints" $name {
-    -re "$re_head${ws}$re_1_main${ws}$re_2_catch${ws}$re_3_catch\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$re_head${ws}$re_1_main${ws}$re_2_bp${ws}$re_3_bp\r\n$gdb_prompt $" {
-	# TODO: gdb HEAD 2004-01-08 does this.  Is this okay?
-	unresolved $name
-    }
-}
-
-# Some targets support "info catch".
-# Some do not.
-
-set name "info catch"
-gdb_test_multiple "info catch" $name {
-    -re "Info catch not supported with this target/compiler combination.\r\n$gdb_prompt $" {
-	unsupported $name
-    }
-    -re "No catches.\r\n$gdb_prompt $" {
-	# TODO: gdb HEAD 2004-01-08 does this.  Is this okay?
-	unresolved $name
-    }
-}
-
-# Get the first exception thrown
-       
-set name "continue to first throw"
-gdb_test_multiple "continue" $name {
-    -re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception thrown\\), throw location.*${srcfile}:30, catch location .*${srcfile}:50\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception thrown\\)\r\n.*\r\n$gdb_prompt $" {
-	# TODO: gdb HEAD 2004-01-08 does this.  Is this okay?
-	unresolved $name
-    }
-}
-
-# Backtrace from the throw point.
-# This should get to user code.
-
-set name "backtrace after first throw"
-gdb_test_multiple "backtrace" $name {
-    -re ".*#\[0-9\]+${ws}$hex in foo \\(i=20\\) at .*${srcfile}:30\r\n#\[0-9\]+${ws}$hex in main \\((void|)\\) at .*${srcfile}:48\r\n$gdb_prompt $" {
-	pass $name
-    }
-}
-
-# Continue to the catch.
-
-set name "continue to first catch"
-gdb_test_multiple "continue" $name {
-    -re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception caught\\), throw location.*${srcfile}:30, catch location .*${srcfile}:50\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception caught\\)\r\n.*\r\n$gdb_prompt $" {
-	# TODO: gdb HEAD 2004-01-08 does this.  Is this okay?
-	unresolved $name
-    }
-}
-
-# Backtrace from the catch point.
-# This should get to user code.
-
-set name "backtrace after first catch"
-gdb_test_multiple "backtrace" $name {
-    -re ".*#\[0-9\]+${ws}$hex in main \\((void|)\\) at .*$srcfile:50\r\n$gdb_prompt $" {
-	pass $name
-    }
-}
-
-# Continue to second throw.
-
-set name "continue to second throw"
-gdb_test_multiple "continue" $name {
-    -re "Continuing.${ws}Got an except 13${ws}Catchpoint \[0-9\]+ \\(exception thrown\\), throw location.*${srcfile}:30, catch location .*${srcfile}:58\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Continuing.${ws}Got an except 13${ws}Catchpoint \[0-9\]+ \\(exception thrown\\)\r\n.*\r\n$gdb_prompt $" {
-	# TODO: gdb HEAD 2004-01-08 does this.  Is this okay?
-	unresolved $name
-    }
-}
-
-# Backtrace from the throw point.
-# This should get to user code.
-
-set name "backtrace after second throw"
-gdb_test_multiple "backtrace" $name {
-    -re ".*#\[0-9\]+${ws}$hex in foo \\(i=20\\) at .*${srcfile}:30\r\n#\[0-9\]+${ws}$hex in main \\((void|)\\) at .*${srcfile}:56\r\n$gdb_prompt $" {
-	pass $name
-    }
-}
-
-# Continue to second catch.
-
-set name "continue to second catch"
-gdb_test_multiple "continue" $name {
-    -re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception caught\\), throw location.*${srcfile}:30, catch location .*${srcfile}:58\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Continuing.${ws}Catchpoint \[0-9\]+ \\(exception caught\\)\r\n.*\r\n$gdb_prompt $" {
-	# TODO: gdb HEAD 2004-01-08 does this.  Is this okay?
-	unresolved $name
-    }
-}
-
-# Backtrace from the catch point.
-# This should get to user code.
-
-set name "backtrace after second catch"
-gdb_test_multiple "backtrace" $name {
-    -re ".*#\[0-9\]+${ws}$hex in main \\((void|)\\) at .*$srcfile:58\r\n$gdb_prompt $" {
-	pass $name
-    }
-}
-
-# That is all for now.
-# 
-# The original code had:
-#
-#    continue to re-throw ; backtrace
-#    continue to catch    ; backtrace
-#    continue to throw out of main
-#
-# The problem is that "re-throw" does not show a throw; only a catch.
-# I do not know if this is because of a bug, or because the generated
-# code is optimized for a throw into the same function.
-#
-# -- chastain 2004-01-09
diff --git a/gdb/testsuite/gdb.cp/gdb1355.cc b/gdb/testsuite/gdb.cp/gdb1355.cc
deleted file mode 100644
index a53ca20e4d5..00000000000
--- a/gdb/testsuite/gdb.cp/gdb1355.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-struct mystruct
-{
-  int m_int;
-  char m_char;
-  long int m_long_int;
-  unsigned int m_unsigned_int;
-  long unsigned int m_long_unsigned_int;
-  // long long int m_long_long_int;
-  // long long unsigned int m_long_long_unsigned_int;
-  short int m_short_int;
-  short unsigned int m_short_unsigned_int;
-  unsigned char m_unsigned_char;
-  float m_float;
-  double m_double;
-  long double m_long_double;
-  // complex int m_complex_int;
-  // complex float m_complex_float;
-  // complex long double m_complex_long_double;
-  // wchar_t m_wchar_t;
-  bool m_bool;
-};
-
-struct mystruct s1 =
-{
-    117, 'a', 118, 119, 120,
-    // 121, 122,
-    123, 124, 'b', 125.0, 126.0, 127.0,
-    // complex int, complex float, complex long double, wchar_t,
-    true
-};
-
-int main ()
-{
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.cp/gdb1355.exp b/gdb/testsuite/gdb.cp/gdb1355.exp
deleted file mode 100644
index 11f16d5b639..00000000000
--- a/gdb/testsuite/gdb.cp/gdb1355.exp
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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.  
-
-# Tests for PR gdb/1355, which is a reference to PR gcc/12066.
-# 2003-08-26  Michael Chastain <mec@shout.net>
-
-# This file is part of the gdb testsuite.
-
-set ws "\[\r\n\t \]*"
-set nl "\[\r\n\]+"
-
-if $tracelevel then {
-    strace $tracelevel
-    }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "gdb1355"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to main"
-    continue
-} 
-
-# See http://sources.redhat.com/gdb/bugs/1355
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12066
-#
-# g++ -gstabs+ does not emit stabs for fundamental types.
-# They get emitted later inside other types, so they have no names
-# and gdb cannot handle them.
-
-set s_head  "${ws}(struct|class) mystruct \{(${ws}public:|)"
-set s_tail  ".*"
-
-set f_i     "${ws}int m_int;"
-set f_c     "${ws}char m_char;"
-set f_li    "${ws}long int m_long_int;"
-set f_ui    "${ws}unsigned int m_unsigned_int;"
-set f_lui   "${ws}long unsigned int m_long_unsigned_int;"
-set f_si    "${ws}short int m_short_int;"
-set f_sui   "${ws}short unsigned int m_short_unsigned_int;"
-set f_uc    "${ws}unsigned char m_unsigned_char;"
-set f_f     "${ws}float m_float;"
-set f_d     "${ws}double m_double;"
-set f_ld    "${ws}long double m_long_double;"
-set f_b     "${ws}bool m_bool;"
-
-set itc     "<invalid type code ${decimal}>"
-set bad_i   "${ws}(${itc}|int) m_int;";
-set bad_c   "${ws}(${itc}|char) m_char;"
-set bad_li  "${ws}(${itc}|long int) m_long_int;"
-set bad_ui  "${ws}(${itc}|unsigned int) m_unsigned_int;"
-set bad_lui "${ws}(${itc}|long unsigned int) m_long_unsigned_int;"
-set bad_si  "${ws}(${itc}|short int) m_short_int;"
-set bad_sui "${ws}(${itc}|short unsigned int) m_short_unsigned_int;"
-set bad_uc  "${ws}(${itc}|unsigned char) m_unsigned_char;"
-set bad_f   "${ws}(${itc}|float) m_float;"
-set bad_d   "${ws}(${itc}|double) m_double;"
-set bad_ld  "${ws}(${itc}|long double) m_long_double;"
-set bad_b   "${ws}(${itc}|bool) m_bool;"
-
-gdb_test_multiple "ptype s1" "ptype s1" {
-    -re "type = ${s_head}${f_i}${f_c}${f_li}${f_ui}${f_lui}${f_si}${f_sui}${f_uc}${f_f}${f_d}${f_ld}${f_b}${s_tail}\}$nl$gdb_prompt $" {
-	pass "ptype s1"
-    }
-    -re "type = ${s_head}${bad_i}${bad_c}${bad_li}${bad_ui}${bad_lui}${bad_si}${bad_sui}${bad_uc}${bad_f}${bad_d}${bad_ld}${bad_b}${s_tail}\}$nl$gdb_prompt $" {
-	# This happened with gcc HEAD 2003-08-20 08:00:00 UTC, -gstabs+.
-	kfail "gdb/1355" "ptype s1"
-    }
-}
-
-gdb_test_multiple "print s1" "print s1" {
-    -re "$decimal = \{m_int = 117, m_char = 97 'a', m_long_int = 118, m_unsigned_int = 119, m_long_unsigned_int = 120, m_short_int = 123, m_short_unsigned_int = 124, m_unsigned_char = 98 'b', m_float = 125, m_double = 126, m_long_double = 127, m_bool = true\}$nl$gdb_prompt $" {
-	pass "print s1"
-    }
-    -re "$decimal = \{m_int = 117, m_char = 97 'a', m_long_int = 118, m_unsigned_int = 119, m_long_unsigned_int = 120, m_short_int = 123, m_short_unsigned_int = 124, m_unsigned_char = 98 'b', m_float = 125, m_double = 126, m_long_double = 127, m_bool = 117\}$nl$gdb_prompt $" {
-	# This pattern is very picky, but if more different output
-	# shows up, I can just add more arms.  -- chastain 2003-08-26
-	#
-	# This happened with gcc HEAD 2003-08-20 08:00:00 UTC, -gstabs+.
-	# Look at the value of m_bool.  It looks like gdb latched onto
-	# random int type and then used the data at structure offset 0.
-	kfail "gdb/1355" "print s1"
-    }
-}
diff --git a/gdb/testsuite/gdb.cp/hang.H b/gdb/testsuite/gdb.cp/hang.H
deleted file mode 100644
index 26fec8792ad..00000000000
--- a/gdb/testsuite/gdb.cp/hang.H
+++ /dev/null
@@ -1,12 +0,0 @@
-struct A
-{
-  struct B *b_ptr_in_a;
-};
-
-struct C
-{
-  struct B
-  {
-    int member_of_B_in_C;
-  };
-};
diff --git a/gdb/testsuite/gdb.cp/hang.exp b/gdb/testsuite/gdb.cp/hang.exp
deleted file mode 100644
index 23088741fb4..00000000000
--- a/gdb/testsuite/gdb.cp/hang.exp
+++ /dev/null
@@ -1,125 +0,0 @@
-#   Copyright 2002, 2004 Free Software Foundation, 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.  
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile hang
-set binfile ${objdir}/${subdir}/${testfile}
-
-foreach file {hang1 hang2 hang3} {
-    if {[gdb_compile "${srcdir}/${subdir}/${file}.C" "${file}.o" object {c++ debug}] != ""} {
-        gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-
-if {[gdb_compile "hang1.o hang2.o hang3.o" ${binfile} executable {c++ debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-# As of May 1, 2002, GDB hangs trying to read the debug info for the
-# `hang2.o' compilation unit from the executable `hang', when compiled
-# by g++ 2.96 with STABS debugging info.  Here's what's going on, as
-# best as I can tell.
-#
-# The definition of `struct A' in `hang.H' refers to `struct B' as an
-# incomplete type.  The stabs declare type number (1,3) to be a cross-
-# reference type, `xsB:'.
-#
-# The definition of `struct C' contains a nested definition for
-# `struct B' --- or more properly, `struct C::B'.  However, the stabs
-# fail to qualify the structure tag: it just looks like a definition
-# for `struct B'.  I think this is a compiler bug, but perhaps GCC
-# doesn't emit qualified names for a reason.
-#
-# `hang.H' gets #included by both `hang1.C' and `hang2.C'.  So the
-# stabs for `struct A', the incomplete `struct B', and `struct C'
-# appear in both hang1.o's and hang2.o's stabs.
-#
-# When those two files are linked together, since hang2.o appears
-# later in the command line, its #inclusion of `hang.H' gets replaced
-# with an N_EXCL stab, referring back to hang1.o's stabs for the
-# header file.
-#
-# When GDB builds psymtabs for the executable hang, it notes that
-# hang2.o's stabs contain an N_EXCL referring to a header that appears
-# in full in hang1.o's stabs.  So hang2.o's psymtab lists a dependency
-# on hang1.o's psymtab.
-#
-# When the user types the command `print var_in_b', GDB scans the
-# psymtabs for a symbol by that name, and decides to read full symbols
-# for `hang2.o'.
-#
-# Since `hang2.o''s psymtab lists `hang1.o' as a dependency, GDB first
-# reads `hang1.o''s symbols.  When GDB sees `(1,3)=xsB:', it creates a
-# type object for `struct B', sets its TYPE_FLAG_STUB flag, and
-# records it as type number `(1,3)'.
-#
-# When GDB finds the definition of `struct C::B', since the stabs
-# don't indicate that the type is nested within C, it treats it as
-# a definition of `struct B'.
-#
-# When GDB is finished reading `hang1.o''s symbols, it calls
-# `cleanup_undefined_types'.  This function mistakes the definition of
-# `struct C::B' for a definition for `struct B', and overwrites the
-# incomplete type object for the real `struct B', using `memcpy'.  Now
-# stabs type number `(1,3)' refers to this (incorrect) complete type.
-# Furthermore, the `memcpy' simply copies the original's `cv_type'
-# field to the target, giving the target a corrupt `cv_type' ring: the
-# chain does not point back to the target type.
-#
-# Having satisfied `hang2.o''s psymtab's dependencies, GDB begins to
-# read `hang2.o''s symbols.  These contain the true definition for
-# `struct B', which refers to type number `(1,3)' as the type it's
-# defining.  GDB looks up type `(1,3)', and finds the (incorrect)
-# complete type established by the call to `cleanup_undefined_types'
-# above.  However, it doesn't notice that the type is already defined,
-# and passes it to `read_struct_type', which then writes the new
-# definition's size, field list, etc. into the type object which
-# already has those fields initialized.  Adding insult to injury,
-# `read_struct_type' then calls `finish_cv_type'; since the `memcpy'
-# in `cleanup_undefined_types' corrupted the target type's `cv_type'
-# ring, `finish_cv_type' enters an infinite loop.
-
-# This checks that GDB recognizes when a structure is about to be
-# overwritten, and refuses, with a complaint.
-gdb_test "print var_in_b" " = 1729" "doesn't overwrite struct type"
-
-# This checks that cleanup_undefined_types doesn't create corrupt
-# cv_type chains.  Note that var_in_hang3 does need to be declared in
-# a separate compilation unit, whose psymtab depends on hang1.o's
-# psymtab.  Otherwise, GDB won't call cleanup_undefined_types (as it
-# finishes hang1.o's symbols) before it calls make_cv_type (while
-# reading hang3.o's symbols).
-#
-# The bug only happens when you compile with -gstabs+; Otherwise, GCC
-# won't include the `const' qualifier on `const_B_ptr' in `hang3.o''s
-# STABS, so GDB won't try to create a const variant of the smashed
-# struct type, and get caught by the corrupted cv_type chain.
-gdb_test "print var_in_hang3" " = 42" "doesn't corrupt cv_type chain"
diff --git a/gdb/testsuite/gdb.cp/hang1.C b/gdb/testsuite/gdb.cp/hang1.C
deleted file mode 100644
index 4b04d77e68c..00000000000
--- a/gdb/testsuite/gdb.cp/hang1.C
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "hang.H"
-
-int main (int argc, char **argv) { return 0; }
diff --git a/gdb/testsuite/gdb.cp/hang2.C b/gdb/testsuite/gdb.cp/hang2.C
deleted file mode 100644
index 59732f87d63..00000000000
--- a/gdb/testsuite/gdb.cp/hang2.C
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "hang.H"
-
-struct B
-{
-  int member_of_B;
-};
-
-int var_in_b = 1729;
diff --git a/gdb/testsuite/gdb.cp/hang3.C b/gdb/testsuite/gdb.cp/hang3.C
deleted file mode 100644
index 92c82fa2441..00000000000
--- a/gdb/testsuite/gdb.cp/hang3.C
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "hang.H"
-
-const struct B *const_B_ptr;
-int var_in_hang3 = 42;
diff --git a/gdb/testsuite/gdb.cp/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp
deleted file mode 100644
index 9ae1c1e2f3a..00000000000
--- a/gdb/testsuite/gdb.cp/inherit.exp
+++ /dev/null
@@ -1,685 +0,0 @@
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-# 2004 Free Software Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-# And rewritten by Michael Chastain. (mec.gnu@mindspring.com)
-
-set ws  "\[\r\n\t \]+"
-set nl  "\[\r\n\]+"
-set vhn "\\$\[0-9\]+"
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-load_lib "cp-support.exp"
-
-set testfile "inherit"
-set srcfile misc.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Single inheritance, print type definitions.
-
-proc test_ptype_si { } {
-    global gdb_prompt
-    global ws
-    global nl
-
-    # A simple class.
-
-    cp_test_ptype_class \
-	"ptype A" "ptype A (FIXME)" "class" "A" \
-	{
-	    { field public "int a;" }
-	    { field public "int x;" }
-	}
-    cp_test_ptype_class "ptype class A" "ptype class A (FIXME)" "class" "A" ibid
-    cp_test_ptype_class "ptype g_A" "ptype g_A (FIXME)" "class" "A" ibid
-
-    # A derived class.
-
-    cp_test_ptype_class \
-	"ptype B" "" "class" "B" \
-	{
-	    { base         "public A" }
-	    { field public "int b;" }
-	    { field public "int x;" }
-	}
-    cp_test_ptype_class "ptype class B" "" "class" "B" ibid
-    cp_test_ptype_class "ptype g_B" "" "class" "B" ibid
-
-    # Another derived class.
-
-    cp_test_ptype_class \
-	"ptype C" "" "class" "C" \
-	{
-	    { base         "public A" }
-	    { field public "int c;" }
-	    { field public "int x;" }
-	}
-    cp_test_ptype_class "ptype class C" "" "class" "C" ibid
-    cp_test_ptype_class "ptype g_C" "" "class" "C" ibid
-
-    # A structure with no tag.
-    # TODO: move this mess into a separate file, and re-specify
-    # which results are PASS, KFAIL, XFAIL, and FAIL.
-
-    set re_tag		"tagless_struct"
-    set XX_tag		"\\._1"
-    set re_class	"(class $re_tag \{${ws}public:|class \{${ws}public:|struct $re_tag \{|struct \{)"
-    set XX_class	"(class $XX_tag \{${ws}public:|struct $XX_tag \{)"
-    set re_fields	"int one;${ws}int two;"
-    set re_synth_gcc_23	"$re_tag & operator=\\($re_tag const ?&\\);${ws}$re_tag\\($re_tag const ?&\\);${ws}$re_tag\\((void|)\\);"
-    set XX_synth_gcc_23	"($re_tag|$XX_tag) & operator=\\($XX_tag const ?&\\);${ws}$XX_tag\\($XX_tag const ?&\\);${ws}$XX_tag\\((void|)\\);"
-
-    set name "ptype tagless struct"
-    gdb_test_multiple "ptype tagless_struct" $name {
-	-re "type = $XX_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    pass "$name"
-	}
-	-re "type = $re_class${ws}$re_fields${ws}$XX_synth_gcc_23$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    pass "$name"
-	}
-	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 -gdwarf-2
-	    # gcc HEAD 2004-07-31 -gstabs+
-	    pass "$name"
-	}
-	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "$name"
-	}
-    }
-
-    set name "ptype variable of type tagless struct"
-    gdb_test_multiple "ptype v_tagless" $name {
-	-re "type = $XX_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    pass "$name"
-	}
-	-re "type = $re_class${ws}$re_fields${ws}$XX_synth_gcc_23$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    pass "$name"
-	}
-	-re "type = $re_class${ws}$re_fields$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 -gdwarf-2
-	    # gcc HEAD 2004-07-31 -gstabs+
-	    pass "$name"
-	}
-	-re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "$name"
-	}
-    }
-}
-
-# Multiple inheritance, print type definitions.
-
-proc test_ptype_mi { } {
-
-    # A class with two bases.
-
-    cp_test_ptype_class \
-	"ptype D" "" "class" "D" \
-	{
-	    { base         "public B" }
-	    { base         "public C" }
-	    { field public "int d;" }
-	    { field public "int x;" }
-	}
-    cp_test_ptype_class "ptype class D" "" "class" "D" ibid
-    cp_test_ptype_class "ptype g_D" "" "class" "D" ibid
-
-    # A class derived from the previous class.
-
-    cp_test_ptype_class \
-	"ptype E" "" "class" "E" \
-	{
-	    { base         "public D" }
-	    { field public "int e;" }
-	    { field public "int x;" }
-	}
-    cp_test_ptype_class "ptype class E" "" "class" "E" ibid
-    cp_test_ptype_class "ptype g_E" "" "class" "E" ibid
-}
-
-# Single virtual inheritance, print type definitions.
-
-proc test_ptype_vi { } {
-
-    # class vA
-
-    cp_test_ptype_class \
-	"ptype vA" "" "class" "vA" \
-	{
-	    { field public "int va;" }
-	    { field public "int vx;" }
-	}
-    cp_test_ptype_class "ptype class vA" "" "class" "vA" ibid
-    cp_test_ptype_class "ptype g_vA" "" "class" "vA" ibid
-
-    # class vB
-
-    cp_test_ptype_class \
-	"ptype vB" "" "class" "vB" \
-	{
-	    { base         "public virtual vA" }
-	    { vbase        "vA" }
-	    { field public "int vb;" }
-	    { field public "int vx;" }
-	}
-    cp_test_ptype_class "ptype class vB" "" "class" "vB" ibid
-    cp_test_ptype_class "ptype g_vB" "" "class" "vB" ibid
-
-    # class vC
-
-    cp_test_ptype_class \
-	"ptype vC" "" "class" "vC" \
-	{
-	    { base         "public virtual vA" }
-	    { vbase        "vA" }
-	    { field public "int vc;" }
-	    { field public "int vx;" }
-	}
-    cp_test_ptype_class "ptype class vC" "" "class" "vC" ibid
-    cp_test_ptype_class "ptype g_vC" "" "class" "vC" ibid
-
-}
-
-# Multiple virtual inheritance, print type definitions.
-
-proc test_ptype_mvi { } {
-
-    # class vD
-
-    cp_test_ptype_class \
-	"ptype vD" "" "class" "vD" \
-	{
-	    { base         "public virtual vB" }
-	    { base         "public virtual vC" }
-	    { vbase        "vC" }
-	    { vbase        "vB" }
-	    { field public "int vd;" }
-	    { field public "int vx;" }
-	}
-    cp_test_ptype_class "ptype class vD" "" "class" "vD" ibid
-    cp_test_ptype_class "ptype g_vD" "" "class" "vD" ibid
-
-    # class vE
-
-    cp_test_ptype_class \
-	"ptype vE" "" "class" "vE" \
-	{
-	    { base         "public virtual vD" }
-	    { vbase        "vD" }
-	    { field public "int ve;" }
-	    { field public "int vx;" }
-	}
-    cp_test_ptype_class "ptype class vE" "" "class" "vE" ibid
-    cp_test_ptype_class "ptype g_vE" "" "class" "vE" ibid
-
-}
-
-# Single inheritance, print individual members.
-
-proc test_print_si_members { } {
-    global vhn
-
-    # Print all members of g_A using fully qualified form.
-    gdb_test "print g_A.A::a" "$vhn = 1"
-    gdb_test "print g_A.A::x" "$vhn = 2"
-
-    # Print members of g_A using nonambiguous compact form.
-    gdb_test "print g_A.a" "$vhn = 1"
-    gdb_test "print g_A.x" "$vhn = 2"
-
-    # Print all members of g_B using fully qualified form.
-    gdb_test "print g_B.A::a" "$vhn = 3"
-    gdb_test "print g_B.A::x" "$vhn = 4"
-    gdb_test "print g_B.B::b" "$vhn = 5"
-    gdb_test "print g_B.B::x" "$vhn = 6"
-
-    # Print members of g_B using nonambiguous compact form.
-    gdb_test "print g_B.a" "$vhn = 3"
-    gdb_test "print g_B.b" "$vhn = 5"
-    gdb_test "print g_B.x" "$vhn = 6"
-
-    # Print all members of g_C using fully qualified form.
-    gdb_test "print g_C.A::a" "$vhn = 7"
-    gdb_test "print g_C.A::x" "$vhn = 8"
-    gdb_test "print g_C.C::c" "$vhn = 9"
-    gdb_test "print g_C.C::x" "$vhn = 10"
-
-    # Print members of g_C using nonambiguous compact form.
-    gdb_test "print g_C.a" "$vhn = 7"
-    gdb_test "print g_C.c" "$vhn = 9"
-    gdb_test "print g_C.x" "$vhn = 10"
-}
-
-# Single inheritance, print complete classes.
-
-proc test_print_si_classes { } {
-    global vhn
-
-    # Print all members of g_A, g_B, g_C.
-    gdb_test "print g_A" "$vhn = \{a = 1, x = 2\}"
-    gdb_test "print g_B" "$vhn = \{<(class A|A)> = \{a = 3, x = 4\}, b = 5, x = 6\}"
-    gdb_test "print g_C" "$vhn = \{<(class A|A)> = \{a = 7, x = 8\}, c = 9, x = 10\}"
-}
-
-# Multiple inheritance, print individual members.
-
-proc test_print_mi_members {} {
-    global gdb_prompt
-    global nl
-    global vhn
-
-    # Print all members of g_A.
-    gdb_test "print g_A.A::a" "$vhn = 1"
-    gdb_test "print g_A.A::x" "$vhn = 2"
-
-    # Print all members of g_B.
-    gdb_test "print g_B.A::a" "$vhn = 3"
-    gdb_test "print g_B.A::x" "$vhn = 4"
-    gdb_test "print g_B.B::b" "$vhn = 5"
-    gdb_test "print g_B.B::x" "$vhn = 6"
-
-    # Print all members of g_C.
-    gdb_test "print g_C.A::a" "$vhn = 7"
-    gdb_test "print g_C.A::x" "$vhn = 8"
-    gdb_test "print g_C.C::c" "$vhn = 9"
-    gdb_test "print g_C.C::x" "$vhn = 10"
-
-    # Print all members of g_D.
-    #
-    # g_D.A::a and g_D.A::x are ambiguous member accesses, and gdb
-    # should detect these.  There are no ways to PASS these tests
-    # because I don't know what the gdb message will be.  -- chastain
-    # 2004-01-27.
-
-    set name "print g_D.A::a"
-    gdb_test_multiple "print g_D.A::a" $name {
-	-re "$vhn = (15|11)$nl$gdb_prompt $" {
-	    kfail "gdb/68" "print g_D.A::a"
-	}
-    }
-
-    set name "print g_D.A::x"
-    gdb_test_multiple "print g_D.A::x" $name {
-	-re "$vhn = (16|12)$nl$gdb_prompt $" {
-	    kfail "gdb/68" "print g_D.A::x"
-	}
-    }
-
-    gdb_test "print g_D.B::b" "$vhn = 13"
-    gdb_test "print g_D.B::x" "$vhn = 14"
-    gdb_test "print g_D.C::c" "$vhn = 17"
-    gdb_test "print g_D.C::x" "$vhn = 18"
-    gdb_test "print g_D.D::d" "$vhn = 19"
-    gdb_test "print g_D.D::x" "$vhn = 20"
-
-    # Print all members of g_E.
-    # g_E.A::a and g_E.A::x are ambiguous.
-
-    set name "print g_E.A::a"
-    gdb_test_multiple "print g_E.A::a" $name {
-	-re "$vhn = (21|25)$nl$gdb_prompt $" {
-	    kfail "gdb/68" "print g_E.A::a"
-	}
-    }
-
-    set name "print g_E.A::x"
-    gdb_test_multiple "print g_E.A::x" $name {
-	-re "$vhn = (26|22)$nl$gdb_prompt $" {
-	    kfail "gdb/68" "print g_E.A::x"
-	}
-    }
-
-    gdb_test "print g_E.B::b" "$vhn = 23"
-    gdb_test "print g_E.B::x" "$vhn = 24"
-    gdb_test "print g_E.C::c" "$vhn = 27"
-    gdb_test "print g_E.C::x" "$vhn = 28"
-    gdb_test "print g_E.D::d" "$vhn = 29"
-    gdb_test "print g_E.D::x" "$vhn = 30"
-    gdb_test "print g_E.E::e" "$vhn = 31"
-    gdb_test "print g_E.E::x" "$vhn = 32"
-}
-
-# Multiple inheritance, print complete classes.
-
-proc test_print_mi_classes { } {
-    global vhn
-
-    # Print all members of g_D.
-    gdb_test "print g_D" "$vhn = \{\<(class |)B\> = \{\<(class |)A\> = \{a = 11, x = 12\}, b = 13, x = 14\}, \<(class |)C\> = \{\<(class |)A\> = \{a = 15, x = 16\}, c = 17, x = 18\}, d = 19, x = 20\}"
-
-    # Print all members of g_E.
-    gdb_test "print g_E" "$vhn = \{\<(class |)D\> = \{\<(class |)B\> = \{\<(class |)A\> = \{a = 21, x = 22\}, b = 23, x = 24\}, \<(class |)C\> = \{\<(class |)A\> = \{a = 25, x = 26\}, c = 27, x = 28\}, d = 29, x = 30\}, e = 31, x = 32\}"
-}
-
-# Single inheritance, print anonymous unions.
-# GDB versions prior to 4.14 entered an infinite loop when printing
-# the type of a class containing an anonymous union, and they were also
-# incapable of printing the member of an anonymous union.
-# We test the printing of the member first, and perform the other tests
-# only if the test succeeds, to avoid the infinite loop.
-#
-# GDB HEAD 2004-01-27 with hp aCC A.03.45 crashes on the first test.
-# -- chastain 2004-01-27
-
-proc test_print_anon_union {} {
-    global gdb_prompt
-    global ws
-    global nl
-    global vhn
-
-    gdb_test "print g_anon_union.a" "$vhn = 2" "print anonymous union member"
-
-    set name "print variable of type anonymous union"
-    gdb_test_multiple "print g_anon_union" $name {
-	-re "$vhn = \{one = 1, \{a = 2, b = 2\}\}$nl$gdb_prompt $" {
-	    pass $name
-	}
-    }
-
-    # The nested union prints as a multi-line field, but the class body
-    # scanner is inherently line-oriented.  This is ugly but it works.
-
-    cp_test_ptype_class \
-	"ptype g_anon_union" "print type of anonymous union" \
-	"class" "class_with_anon_union" \
-	{
-	    { field public "int one;" }
-	    { field public "union \{" }
-	    { field public "int a;" }
-	    { field public "long int b;" }
-	    { field public "\};" }
-	}
-
-}
-
-
-# Single virtual inheritance, print individual members.
-
-proc test_print_svi_members { } {
-    global vhn
-
-    # Print all members of g_vA.
-    gdb_test "print g_vA.vA::va" "$vhn = 1"
-    gdb_test "print g_vA.vA::vx" "$vhn = 2"
-
-    # Print members of g_vA using compact form.
-    gdb_test "print g_vA.va" "$vhn = 1"
-    gdb_test "print g_vA.vx" "$vhn = 2"
-
-    # Print all members of g_vB.
-    gdb_test "print g_vB.vA::va" "$vhn = 3"
-    gdb_test "print g_vB.vA::vx" "$vhn = 4"
-    gdb_test "print g_vB.vB::vb" "$vhn = 5"
-    gdb_test "print g_vB.vB::vx" "$vhn = 6"
-
-    # Print members of g_vB using compact form.
-    gdb_test "print g_vB.va" "$vhn = 3"
-    gdb_test "print g_vB.vb" "$vhn = 5"
-    gdb_test "print g_vB.vx" "$vhn = 6"
-
-    # Print all members of g_vC.
-    gdb_test "print g_vC.vA::va" "$vhn = 7"
-    gdb_test "print g_vC.vA::vx" "$vhn = 8"
-    gdb_test "print g_vC.vC::vc" "$vhn = 9"
-    gdb_test "print g_vC.vC::vx" "$vhn = 10"
-
-    # Print members of g_vC using compact form.
-    gdb_test "print g_vC.va" "$vhn = 7" "print g_vC.va"
-    gdb_test "print g_vC.vc" "$vhn = 9" "print g_vC.vc"
-    gdb_test "print g_vC.vx" "$vhn = 10" "print g_vC.vx"
-}
-
-# Single virtual inheritance, print complete classes.
-
-proc test_print_svi_classes { } {
-    global gdb_prompt
-    global hex
-    global nl
-    global vhn
-
-    # Print all members of g_vA.
-    gdb_test "print g_vA" "$vhn = \{va = 1, vx = 2\}"
-
-    # Print all members of g_vB.
-    set re_vbptr_2	"(_vb.2vA|_vb.vA)"
-    set re_vbptr_3	"_vptr.vB"
-
-    set name "print g_vB"
-    gdb_test_multiple "print g_vB" $name {
-	-re "$vhn = \{<vA> = \{va = 3, vx = 4\}, $re_vbptr_2 = $hex, vb = 5, vx = 6\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 2.95.3 -gstabs+
-	    pass $name
-	}
-	-re "$vhn = \{<vA> = \{va = 3, vx = 4\}, $re_vbptr_3 = $hex, vb = 5, vx = 6\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc 3.4.1 -gstabs+
-	    # gcc HEAD 2004-07-31 -gdwarf-2
-	    pass "$name (FIXME v3 vtbl ptr)"
-	}
-	-re "$vhn = \{<vA> = \{va = 3, vx = 4\}, $re_vbptr_3 = $hex <VTT for vB>, vb = 5, vx = 6\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gstabs+
-	    pass $name
-	}
-	-re "$vhn = \{<vA> = \{va = 3, vx = 4\}, $re_vbptr_3 = $hex <typeinfo for vB>, vb = 5, vx = 6\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2004-07-31 -gstabs+
-	    pass $name
-	}
-    }
-
-    # Print all members of g_vC.
-    set re_vbptr_2	"(_vb.2vA|_vb.vA)"
-    set re_vbptr_3	"_vptr.vC"
-
-    set name "print g_vC"
-    gdb_test_multiple "print g_vC" $name {
-	-re "$vhn = \{<vA> = \{va = 7, vx = 8\}, $re_vbptr_2 = $hex, vc = 9, vx = 10\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 2.95.3 -gstabs+
-	    pass $name
-	}
-	-re "$vhn = \{<vA> = \{va = 7, vx = 8\}, $re_vbptr_3 = $hex, vc = 9, vx = 10\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc 3.4.1 -gstabs+
-	    # gcc HEAD 2004-07-31 -gdwarf-2
-	    pass "$name (FIXME v3 vtbl ptr)"
-	}
-	-re "$vhn = \{<vA> = \{va = 7, vx = 8\}, $re_vbptr_3 = $hex <VTT for vC>, vc = 9, vx = 10\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gstabs+
-	    pass $name
-	}
-	-re "$vhn = \{<vA> = \{va = 7, vx = 8\}, $re_vbptr_3 = $hex <typeinfo for vC>, vc = 9, vx = 10\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2004-07-31 -gstabs+
-	    pass $name
-	}
-    }
-}
-
-# Multiple virtual inheritance, print individual members.
-
-proc test_print_mvi_members { } {
-    global vhn
-
-    # Print all members of g_vD.
-    gdb_test "print g_vD.vA::va" "$vhn = 19"
-    gdb_test "print g_vD.vA::vx" "$vhn = 20"
-    gdb_test "print g_vD.vB::vb" "$vhn = 21"
-    gdb_test "print g_vD.vB::vx" "$vhn = 22"
-    gdb_test "print g_vD.vC::vc" "$vhn = 23"
-    gdb_test "print g_vD.vC::vx" "$vhn = 24"
-    gdb_test "print g_vD.vD::vd" "$vhn = 25"
-    gdb_test "print g_vD.vD::vx" "$vhn = 26"
-
-    # Print all members of g_vE.
-    gdb_test "print g_vE.vA::va" "$vhn = 0"
-    gdb_test "print g_vE.vA::vx" "$vhn = 0"
-    gdb_test "print g_vE.vB::vb" "$vhn = 0"
-    gdb_test "print g_vE.vB::vx" "$vhn = 0"
-    gdb_test "print g_vE.vC::vc" "$vhn = 0"
-    gdb_test "print g_vE.vC::vx" "$vhn = 0"
-    gdb_test "print g_vE.vD::vd" "$vhn = 0"
-    gdb_test "print g_vE.vD::vx" "$vhn = 0"
-    gdb_test "print g_vE.vE::ve" "$vhn = 27"
-    gdb_test "print g_vE.vE::vx" "$vhn = 28"
-}
-
-# Multiple virtual inheritance, print complete classes.
-
-proc test_print_mvi_classes { } {
-    global gdb_prompt
-    global hex
-    global ws
-    global nl
-    global vhn
-
-    # Virtual base pointers for everybody.
-
-    set re_vbptr_2_vA	"(_vb.2vA|_vb.vA)"
-    set re_vbptr_2_vB	"(_vb.2vB|_vb.vB)"
-    set re_vbptr_2_vC	"(_vb.2vC|_vb.vC)"
-    set re_vbptr_2_vD	"(_vb.2vD|_vb.vD)"
-    set re_vbptr_3_vA	"_vptr.vA"
-    set re_vbptr_3_vB	"_vptr.vB"
-    set re_vbptr_3_vC	"_vptr.vC"
-    set re_vbptr_3_vD	"_vptr.vD"
-    set re_vbptr_3_vE	"_vptr.vE"
-
-    # Print all members of g_vD.
-
-    set name "print g_vD"
-    gdb_test_multiple "print g_vD" $name {
-	-re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_2_vA = $hex, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_2_vA = $hex, vc = 23, vx = 24\}, $re_vbptr_2_vC = $hex, $re_vbptr_2_vB = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 2.95.3 -gstabs+
-	    pass $name
-	}
-	-re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_3_vB = $hex, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_3_vC = $hex, vc = 23, vx = 24\}, $re_vbptr_3_vD = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc HEAD 2004-01-21 -gdwarf-2
-	    # gcc HEAD 2004-01-21 -gstabs+
-	    pass "$name (FIXME v3 vtbl ptr)"
-	}
-	-re "$vhn = \{<vB> = \{<vA> = \{va = 19, vx = 20\}, $re_vbptr_3_vB = $hex, vb = 21, vx = 22\}, <vC> = \{$re_vbptr_3_vC = $hex <VTT for vD>, vc = 23, vx = 24\}, $re_vbptr_3_vD = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gstabs+
-	    pass "$name"
-	}
-    }
-
-    # Print all members of g_vE.
-
-    set name "print g_vE"
-    gdb_test_multiple "print g_vE" $name {
-	-re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_2_vA = $hex, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_2_vA = $hex, vc = 0, vx = 0\}, $re_vbptr_2_vC = $hex, $re_vbptr_2_vB = $hex, vd = 0, vx = 0\}, $re_vbptr_2_vD = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 2.95.3 -gstabs+
-	    pass $name
-	}
-	-re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_3_vB = $hex, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_3_vC = $hex, vc = 0, vx = 0\}, $re_vbptr_3_vD = $hex, vd = 0, vx = 0\}, $re_vbptr_3_vE = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gdwarf-2
-	    # gcc 3.3.4 -gstabs+
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc 3.4.1 -gstabs+
-	    # gcc HEAD 2004-07-31 -gdwarf-2
-	    pass "$name (FIXME v3 vtbl ptr)"
-	}
-	-re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_3_vB = $hex, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_3_vC = $hex <VTT for vD>, vc = 0, vx = 0\}, $re_vbptr_3_vD = $hex, vd = 0, vx = 0\}, $re_vbptr_3_vE = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
-	    # gcc 3.2.7-rh -gstabs+
-	    pass $name
-	}
-	-re "$vhn = \{<vD> = \{<vB> = \{<vA> = \{va = 0, vx = 0\}, $re_vbptr_3_vB = $hex, vb = 0, vx = 0\}, <vC> = \{$re_vbptr_3_vC = $hex <typeinfo for vE>, vc = 0, vx = 0\}, $re_vbptr_3_vD = $hex, vd = 0, vx = 0\}, $re_vbptr_3_vE = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2004-07-31 -gstabs+
-	    pass $name
-	}
-    }
-}
-
-proc do_tests { } {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-    gdb_test "set language c++" ""
-    gdb_test "set width 0" ""
-
-    if { ![runto_main] } then {
-	perror "couldn't run to main"
-	return
-    }
-
-    test_ptype_si
-    test_ptype_mi
-    test_ptype_vi
-    test_ptype_mvi
-
-    if { ![runto 'inheritance2'] } then {
-	perror "couldn't run to inheritance2"
-	return
-    }
-
-    test_print_si_members
-    test_print_si_classes
-    test_print_mi_members
-    test_print_mi_classes
-    test_print_anon_union
-
-    if { ![runto 'inheritance4'] } {
-	perror "couldn't run to inheritance4"
-	return
-    }
-
-    test_print_svi_members
-    test_print_svi_classes
-    test_print_mvi_members
-    test_print_mvi_classes
-}
-
-do_tests
diff --git a/gdb/testsuite/gdb.cp/local.cc b/gdb/testsuite/gdb.cp/local.cc
deleted file mode 100644
index 85fd6e14a87..00000000000
--- a/gdb/testsuite/gdb.cp/local.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Tests for local types
-
-void marker1 (void)
-{ 
-}
-
-void marker2 (void)
-{
-}
-  
-int foobar (int x)
-{
-  class Local {
-  public:
-    int loc1;
-    char loc_foo (char c)
-    {
-      return c + 3;
-    }
-  };
-
-  Local l;
-  static Local l1;
-  char  c;
-
-  marker1 ();
-
-  l.loc1 = 23;
-
-  c = l.loc_foo('x');
-  return c + 2;
-}
-
-int main()
-{
-  int c;
-  
-  c = foobar (31);
-  
- { // inner block
-   class InnerLocal {
-   public:
-     char ilc;
-     int * ip;
-     int il_foo (unsigned const char & uccr)
-     {
-       return uccr + 333;
-     }
-     class NestedInnerLocal {
-     public:
-       int nil;
-       int nil_foo (int i)
-       {
-         return i * 27;
-       }
-     };
-     NestedInnerLocal nest1;
-   };
-
-   InnerLocal il;
-
-   il.ilc = 'b';
-   il.ip = &c;
-   marker2();
- }
-}
diff --git a/gdb/testsuite/gdb.cp/local.exp b/gdb/testsuite/gdb.cp/local.exp
deleted file mode 100644
index 6bae99ff290..00000000000
--- a/gdb/testsuite/gdb.cp/local.exp
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# tests for local variables
-# Written by Satish Pai <pai@apollo.hp.com> 1997-07-08
-# Cleaned by Michael Chastain <mec@shout.net> 2002-04-08
-
-
-# This file is part of the gdb testsuite
-
-set ws "\[\r\n\t \]+"
-set nl "\[\r\n\]+"
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "local"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info $binfile "c++"] {
-  return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-if ![runto 'marker1'] then {
-    perror "couldn't run to marker1"
-    continue
-}
-
-gdb_test "up" ".*foobar.*" "up from marker1"
-
-set sep "(\[.\]|___)\[0-9\]"
-
-# ptype on a local variable.
-#
-# This test has six arms.  The first three arms accept normal output:
-# no synthetic methods; synthetic methods before user methods;
-# synthetic methods after user methods.
-#
-# The next two arms accept "foobar__Fi.0::Local" instead of "Local".
-# This is a bug.  It happens in various places with various versions of
-# gcc and gdb and various debugging types.
-#
-# The last arm accepts the user methods in duplicate.  This bug happens
-# with gcc 3.3.2 -gdwarf-2, and has been fixed in gcc HEAD 2004-01-22.
-#
-# -- chastain 2004-01-24
-
-set re_class		"((struct|class) Local \{${ws}public:|struct Local \{)"
-set re_fields		"int loc1;"
-set re_methods		"char loc_foo\\(char\\);"
-set re_synth_gcc_23	"Local & operator=\\(Local const ?&\\);${ws}Local\\(Local const ?&\\);${ws}Local\\((void|)\\);"
-
-set XX_class		"((struct|class) foobar__Fi.0::Local \{${ws}public:|struct foobar__Fi.0:Local \{)"
-set XX_synth_gcc_2	"Local & operator=\\(foobar__Fi.0::Local const ?&\\);${ws}Local\\(foobar__Fi.0::Local const ?&\\);${ws}Local\\((void|)\\);"
-set YY_methods		"$re_methods${ws}$re_methods"
-
-set name "ptype l"
-gdb_test_multiple "ptype l" $name {
-    -re "type = $re_class${ws}$re_fields${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc 2.95.3, dwarf-2
-	# gdb 6.0, gcc HEAD 2004-01-22, dwarf-2
-	# gdb HEAD 2004-01-23, gcc HEAD 2004-01,22, dwarf-2
-	pass "$name"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc 3.3.2, stabs+
-	# gdb HEAD 2004-01-23, gcc 3.3.2, stabs+
-	pass "$name"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_methods${ws}$re_synth_gcc_23${ws}$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc HEAD 2004-01-22, stabs+
-	# gdb HEAD 2004-01-23, gcc HEAD 2004-01-22, stabs+
-	pass "$name"
-    }
-    -re "type = $XX_class${ws}$re_fields${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gdb HEAD 2004-01-23, gcc 2.95.3, dwarf-2
-	kfail "gdb/1516" "$name"
-    }
-    -re "type = ($re_class|$XX_class)${ws}$re_fields${ws}($re_synth_gcc_23|$XX_synth_gcc_2)${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc 2.95.3, stabs+
-	# gdb HEAD 2004-01-23, gcc 2.95.3, stabs+
-	kfail "gdb/1516" "$name"
-    }
-    -re "type = ($re_class|$XX_class)${ws}$re_fields${ws}$YY_methods$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc 3.3.2, dwarf-2
-	# gdb HEAD 2004-01-23, gcc 3.2.2, dwarf-2
-	kfail "gdb/483" "$name"
-    }
-}
-
-# This is the same test with "ptype Local" (the type name)
-# instead of "ptype l" (the variable name).
-
-set name "ptype Local"
-gdb_test_multiple "ptype Local" $name {
-    -re "type = $re_class${ws}$re_fields${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc 2.95.3, dwarf-2
-	# gdb 6.0, gcc HEAD 2004-01-22, dwarf-2
-	# gdb HEAD 2004-01-23, gcc HEAD 2004-01-22, dwarf-2
-	pass "$name"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc 3.3.2, stabs+
-	# gdb HEAD 2004-01-23, gcc 3.3.2, stabs+
-	pass "$name"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_methods${ws}$re_synth_gcc_23${ws}$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc HEAD 2004-01-22, stabs+
-	# gdb HEAD 2004-01-23, gcc HEAD 2004-01-22, stabs+
-	pass "$name"
-    }
-    -re "type = $XX_class${ws}$re_fields${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	kfail "gdb/1516" "$name"
-    }
-    -re "type = ($re_class|$XX_class)${ws}$re_fields${ws}($re_synth_gcc_23|$XX_synth_gcc_2)${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc 2.95.3, stabs+
-	# gdb HEAD 2004-01-23, gcc 2.95.3, stabs+
-	kfail "gdb/1516" "$name"
-    }
-    -re "type = ($re_class|$XX_class)${ws}$re_fields${ws}$YY_methods$nl\}$nl$gdb_prompt $" {
-	# gdb 6.0, gcc 3.3.2, dwarf-2
-	# gdb HEAD 2004-01-23, gcc 3.2.2, dwarf-2
-	kfail "gdb/483" "$name"
-    }
-    -re "No symbol \"Local\" in current context.$nl$gdb_prompt $" {
-	# gdb HEAD 2004-01-23, gcc 2.95.3, dwarf-2
-	fail "$name"
-    }
-}
-
-gdb_test "break marker2"
-gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker2.*" \
-    "continuing to marker2"
-
-gdb_test "up" ".*main.*" "up from marker2"
-
-# Make sure that `Local' isn't in scope here; it's local to foobar.
-# setup_kfail "gdb/825"
-send_gdb "ptype Local\n"
-set eol "\[\t \]*\[\r\n\]+\[\t \]*"
-gdb_expect {
-    -re "No symbol \"Local\" in current context.*${gdb_prompt} $" {
-        pass "Local out of scope"
-    }
-    -re "ptype Local${eol}type = class Local {${eol}  public:${eol}    int loc1;${eol}.*${eol}    char loc_foo\\(char\\);${eol}}${eol}${gdb_prompt} " {
-        # GCC emits STABS debugging information in a way that doesn't
-        # properly preserve the scoping of local classes.  I think
-        # we'd need to start using Sun's extensions to stabs to get
-        # this right.
-        kfail gdb/825 "Local out of scope"
-    }
-    -re "ptype Local${eol}type = class Local {${eol}  public:${eol}    int loc1;${eol}    char loc_foo\\(char\\);${eol}.*${eol}}${eol}${gdb_prompt} " {
-	# gcc 3.X abi-2 -gstabs+
-        kfail gdb/825 "Local out of scope"
-    }
-    -re ".*${gdb_prompt} $" {
-        fail "Local out of scope"
-    }
-    timeout {
-        fail "Local out of scope (timeout)"
-    }
-}
-        
-
-# DTS CLLbs14316 and CLLbs17058
-# coulter - I added a clause for HP's aCC compiler.  We print out the type
-#   as xx instead of const unsigned char, but we still have an expected failure
-#   because of two reasons:
-#   There is a number at the end of InnerLocal4 which should not be there,
-#       DTS CLLbs14316
-#   The line number for the class 
-# setup_xfail "hppa*-*-*" CLLbs14316
-
-# ---
-# Pattern 1:
-# PASS
-#   dwarf-2
-#     2.95.3, 2.96-rh, 3.0.4, 3.1, gcc-3_1-branch, HEAD
-#
-# Pattern 2:
-# PASS
-#   stabs+
-#     2.95.3, 2.96-rh, 3.0.4, 3.1, gcc-3_1-branch, HEAD
-#
-# Pattern 3:
-# Old hppa pattern.
-#
-# Pattern 4:
-# Old hppa pattern.
-#
-# chastain 2002-05-27
-
-# Pattern 5:
-# PASS
-#   stabs+
-#     HEAD
-#
-# chastain 2004-01-02
-
-send_gdb "ptype InnerLocal\n"
-gdb_expect {
-  -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]*int il_foo\\((unsigned char const|const unsigned char) *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal (pattern 1)" }
-  -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]*InnerLocal *& operator *=\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((void|)\\);\[\r\n\t \]*int il_foo\\(unsigned char const *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal (pattern 2)" }
-  -re "type = class InnerLocal \{\r\n\[\t \]*public:\r\n\[\t \]*char ilc;\r\n\[\t \]*int \\*ip;\r\n\[\t \]*InnerLocal::NestedInnerLocal nest1;\r\n\r\n\[\t \]*.int il_foo\\(unsigned char const &\\);\r\n\[\t \]*\}\[\t \]*\\(Local at.*local\\.cc:36\\).*$gdb_prompt $" { pass "ptype InnerLocal (old HP aCC)" }
-  -re "type = class InnerLocal \{\r\n\[\t \]*public:\r\n\[\t \]*char ilc;\r\n\[\t \]*int \\*ip;\r\n\[\t \]*class InnerLocal4::NestedInnerLocal nest1;\r\n\r\n\[\t \]*int il_foo\\(unsigned char const &\\);\r\n\[\t \]*\\(Local at.*local\.cc:\[0-9\]+\\)\r\n\}.*$gdb_prompt $" { pass "ptype InnerLocal (old HP aCC)" }
-  -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]* int il_foo\\(unsigned char const *&\\);\[\r\n\t \]*InnerLocal *& operator *=\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((void|)\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal (pattern 5)" }
-  -re ".*$gdb_prompt $"   {  fail "ptype InnerLocal" }
-  timeout             { fail "(timeout) ptype InnerLocal" }
-}
-
-#---
-# Pattern 1:
-# PASS
-#   dwarf-2
-#     gcc 2.95.3, 2.96-rh, 3.0.4, gcc-3_1-branch, HEAD
-#
-# Pattern 2:
-# PASS
-#   stabs+
-#     gcc 2.95.3, 2.96-rh, 3.0.4, gcc-3_1-branch, HEAD
-#
-# chastain 2002-04-08
-
-# NOTE (2004-02-24, carlton): This test really is invalid -
-# 'NestedInnerLocal' shouldn't be visible, so only the third
-# expression should count as a pass.  I'm leaving in the earlier
-# passes, however, given the current problematic state of our local
-# class support, but once we fix PR gdb/482, we should delete this
-# test.
-
-send_gdb "ptype NestedInnerLocal\n"
-gdb_expect {
-  -re "type = class NestedInnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*int nil;\[\r\n\t \]*int nil_foo\\(int\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype NestedInnerLocal" }
-  -re "type = class NestedInnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*int nil;\[\r\n\t \]*NestedInnerLocal *& *operator *= *\\((main${sep}::|)InnerLocal::NestedInnerLocal const *&\\);\[\r\n\t \]*NestedInnerLocal\\((main${sep}::|)InnerLocal::NestedInnerLocal const *&\\);\[\r\n\t \]*NestedInnerLocal\\((void|)\\);\[\r\n\t \]*int nil_foo\\(int\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype NestedInnerLocal" }
-  -re "No symbol \"NestedInnerLocal\" in current context\.\r\n$gdb_prompt $" {
-    pass "ptype NestedInnerLocal"
-  }
-  -re ".*$gdb_prompt $"   {  fail "ptype NestedInnerLocal" }
-  timeout             { fail "(timeout) ptype NestedInnerLocal" }
-}
-
-set re_class		"((struct|class) InnerLocal::NestedInnerLocal \{${ws}public:|struct InnerLocal::NestedInnerLocal \{)"
-set re_fields		"int nil;"
-set re_methods		"int nil_foo\\(int\\);"
-set re_synth_gcc_23	"InnerLocal::NestedInnerLocal & operator=\\(InnerLocal::NestedInnerLocal const ?&\\);${ws}NestedInnerLocal\\(InnerLocal::NestedInnerLocal const ?&\\);${ws}NestedInnerLocal\\(\\);"
-
-set name "ptype InnerLocal::NestedInnerLocal"
-gdb_test_multiple "ptype InnerLocal::NestedInnerLocal" $name {
-    -re "type = $re_class${ws}$re_fields${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gcc -gdwarf-2 should produce this but does not yet
-	pass $name
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_synth_gcc_23${ws}$re_methods${ws}$nl\}$nl$gdb_prompt $" {
-	# gcc 2.95.3 -gstabs+
-	# gcc v3 -gstabs+, abi 1
-	pass $name
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_methods${ws}$re_synth_gcc_23${ws}$nl\}$nl$gdb_prompt $" {
-	# gcc v3 -gstabs+, abi 2
-	pass $name
-    }
-    -re "There is no field named NestedInnerLocal.*$gdb_prompt $" {
-	# gcc v3 -gdwarf-2
-	kfail "gdb/482" $name
-    }
-}
diff --git a/gdb/testsuite/gdb.cp/m-data.cc b/gdb/testsuite/gdb.cp/m-data.cc
deleted file mode 100644
index c97e7195f77..00000000000
--- a/gdb/testsuite/gdb.cp/m-data.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// 2002-05-13
-
-enum region { oriental, egyptian, greek, etruscan, roman };
-
-// Test one.
-class gnu_obj_1
-{
-protected:
-  typedef region antiquities;
-  const bool 		test;
-  const int 		key1;
-  long       		key2;
-
-  antiquities 	value;
-
-public:
-  gnu_obj_1(antiquities a, long l): test(true), key1(5), key2(l), value(a) {}
-};
-
-// Test two.
-template<typename T>
-class gnu_obj_2: public virtual gnu_obj_1
-{
-protected:
-  antiquities	value_derived;
-      
-public:
-  gnu_obj_2(antiquities b): gnu_obj_1(oriental, 7), value_derived(b) { }
-}; 
-
-// Test three.
-template<typename T>
-class gnu_obj_3
-{
-protected:
-  typedef region antiquities;
-  gnu_obj_2<int>   	data;
-      
-public:
-  gnu_obj_3(antiquities b): data(etruscan) { }
-}; 
-
-int shadow = 0;
-
-class C
-{
-public:
-  C (int x) : shadow (x) {}
-  void marker () {}
-private:
-  int shadow;
-};
-
-int main()
-{
-  gnu_obj_1		test1(egyptian, 4589);
-  gnu_obj_2<long>	test2(roman);
-  gnu_obj_3<long>	test3(greek);
-
-  C theC (1);				// breakpoint: first-constructs-done
-  theC.marker ();
-  
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.cp/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp
deleted file mode 100644
index 85adb5e5200..00000000000
--- a/gdb/testsuite/gdb.cp/m-data.exp
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2002 Free Software Foundation, 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.  
-
-# Tests for member data
-# 2002-05-13  Benjamin Kosnik  <bkoz@redhat.com>
-
-# This file is part of the gdb testsuite
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "m-data"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# First, run to after we've constructed all the gnu_obj_N's:
-
-gdb_breakpoint [gdb_get_line_number "first-constructs-done"]
-gdb_continue_to_breakpoint "end of first constructors"
-
-# One.
-
-# simple object, const bool
-gdb_test "print test1.test" "\\$\[0-9\]* = true" "simple object, const bool"
-
-# simple object, const int
-gdb_test "print test1.key1" "\\$\[0-9\]* = 5" "simple object, const int"
-
-# simple object, long
-gdb_test "print test1.key2" "\\$\[0-9\]* = 4589" "simple object, long"
-
-# simple object, enum
-gdb_test "print test1.value" "\\$\[0-9\]* = egyptian" "simple object, enum"
-
-# Two.
-
-# derived template object, base const bool
-gdb_test "print test2.test" "\\$\[0-9\]* = true" "derived template object, base const bool"
-
-# derived template object, base const int
-gdb_test "print test2.key1" "\\$\[0-9\]* = 5" "derived template object, base const int"
-
-# derived template object, base long
-gdb_test "print test2.key2" "\\$\[0-9\]* = 7" "derived template object, base long"
-
-# derived template object, base enum
-gdb_test "print test2.value" "\\$\[0-9\]* = oriental" "derived template object, base enum"
-
-# derived template object, enum
-gdb_test "print test2.value_derived" "\\$\[0-9\]* = roman" "derived template object, derived enum"
-
-# Three.
-
-# template object, derived template data member's base const bool
-gdb_test "print test3.data.test" "\\$\[0-9\]* = true" "template object, const bool"
-
-# template object, derived template data member's base const int
-gdb_test "print test3.data.key1" "\\$\[0-9\]* = 5" "template object, const int"
-
-# template object, derived template data member's base long
-gdb_test "print test3.data.key2" "\\$\[0-9\]* = 7" "template object, long"
-
-# template object, derived template data member's base enum
-gdb_test "print test3.data.value" "\\$\[0-9\]* = oriental" "template object, base enum"
-
-# template object, derived template data member's enum
-gdb_test "print test3.data.value_derived" "\\$\[0-9]\* = etruscan" "template object, derived enum"
-
-# Now some tests for shadowing (see PR gdb/804):
-
-gdb_breakpoint "C::marker"
-gdb_continue_to_breakpoint "continue to shadow breakpoint"
-
-gdb_test "print shadow" "\\$\[0-9]\* = 1" "shadowing member"
-gdb_test "print ::shadow" "\\$\[0-9]\* = 0" "shadowed global variable"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/m-static.cc b/gdb/testsuite/gdb.cp/m-static.cc
deleted file mode 100644
index 6d08cb063ea..00000000000
--- a/gdb/testsuite/gdb.cp/m-static.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// 2002-05-13
-
-enum region { oriental, egyptian, greek, etruscan, roman };
-
-// Test one.
-class gnu_obj_1
-{
-protected:
-  typedef region antiquities;
-  static const bool 	test = true;
-  static const int 	key1 = 5;
-  static long       	key2;
-
-  static antiquities 	value;
-
-public:
-  gnu_obj_1(antiquities a, long l) {}
-};
-
-const bool gnu_obj_1::test;
-const int gnu_obj_1::key1;
-long gnu_obj_1::key2 = 77;
-gnu_obj_1::antiquities gnu_obj_1::value = oriental;
-
-
-// Test two.
-template<typename T>
-class gnu_obj_2: public virtual gnu_obj_1
-{
-public:
-  static antiquities	value_derived;
-      
-public:
-  gnu_obj_2(antiquities b): gnu_obj_1(oriental, 7) { }
-}; 
-
-template<typename T>
-typename gnu_obj_2<T>::antiquities gnu_obj_2<T>::value_derived = etruscan;
-
-// Test three.
-template<typename T>
-class gnu_obj_3
-{
-public:
-  typedef region antiquities;
-  static gnu_obj_2<int> data;
-      
-public:
-  gnu_obj_3(antiquities b) { }
-}; 
-
-template<typename T>
-gnu_obj_2<int> gnu_obj_3<T>::data(etruscan);
-
-// 2002-08-16
-// Test four.
-#include "m-static.h"
-
-// instantiate templates explicitly so their static members will exist
-template class gnu_obj_2<int>;
-template class gnu_obj_2<long>;
-template class gnu_obj_3<long>;
-
-int main()
-{
-  gnu_obj_1		test1(egyptian, 4589);
-  gnu_obj_2<long>	test2(roman);
-  gnu_obj_3<long>	test3(greek);
-  gnu_obj_4		test4;
-
-  return 0;				// breakpoint: constructs-done
-}
diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp
deleted file mode 100644
index 7963a101686..00000000000
--- a/gdb/testsuite/gdb.cp/m-static.exp
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2002, 2004 Free Software Foundation, 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.  
-
-# Tests for member static data
-# 2002-05-13  Benjamin Kosnik  <bkoz@redhat.com>
-# 2002-08-22  David Carlton <carlton@math.stanford.edu>
-
-# This file is part of the gdb testsuite
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "m-static"
-set srcfile  "${testfile}.cc"
-set srcfile1 "${testfile}1.cc"
-set objfile  "${testfile}.o"
-set objfile1 "${testfile}1.o"
-set binfile  "${objdir}/${subdir}/${testfile}"
-
-if  { [gdb_compile "$srcdir/$subdir/$srcfile" "$objdir/$subdir/$objfile" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if { [gdb_compile "$objdir/$subdir/$objfile $objdir/$subdir/$objfile1" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# First, run to after we've constructed all the objects:
-
-gdb_breakpoint [gdb_get_line_number "constructs-done"]
-gdb_continue_to_breakpoint "end of constructors"
-
-
-# One.
-
-# simple object, static const bool
-gdb_test "print test1.test" "\\$\[0-9\]* = true" "simple object, static const bool"
-
-# simple object, static const int
-gdb_test "print test1.key1" "\\$\[0-9\]* = 5" "simple object, static const int"
-
-# simple object, static long
-gdb_test "print test1.key2" "\\$\[0-9\]* = 77" "simple object, static long"
-
-# simple object, static enum
-gdb_test "print test1.value" "\\$\[0-9\]* = oriental" "simple object, static enum"
-
-# Two.
-
-# derived template object, base static const bool
-gdb_test "print test2.test" "\\$\[0-9\]* = true" "derived template object, base static const bool"
-
-# derived template object, base static const int
-gdb_test "print test2.key1" "\\$\[0-9\]* = 5" "derived template object, base static const int"
-
-# derived template object, base static long
-gdb_test "print test2.key2" "\\$\[0-9\]* = 77" "derived template object, base static long"
-
-# derived template object, base static enum
-gdb_test "print test2.value" "\\$\[0-9\].* = oriental" "derived template object, base static enum"
-
-# derived template object, static enum
-gdb_test "print test2.value_derived" "\\$\[0-9\].* = etruscan" "derived template object, static enum"
-
-# Three.
-
-# template object, static derived template data member's base static const bool
-gdb_test "print test3.data.test" "\\$\[0-9\].* = true" "template object, static const bool"
-
-# template object, static derived template data member's base static const int
-gdb_test "print test3.data.key1" "\\$\[0-9\].* = 5" "template object, static const int"
-
-# template object, static derived template data member's base static long
-gdb_test "print test3.data.key2" "\\$\[0-9\].* = 77" "template object, static long"
-
-# template object, static derived template data member's base static enum
-gdb_test "print test3.data.value" "\\$\[0-9\].* = oriental" "template object, static enum"
-
-#  template object, static derived template data member's static enum
-gdb_test "print test3.data.value_derived" "\\$\[0-9\].* = etruscan" "template object, static derived enum"
-
-# 2002-08-16
-# Four.
-
-# static const int initialized in another file.
-gdb_test "print test4.elsewhere" "\\$\[0-9\].* = 221" "static const int initialized elsewhere"
-
-# static const int that nobody initializes.  From PR gdb/635.
-gdb_test "print test4.nowhere" "field nowhere is nonexistent or has been optimised out" "static const int initialized nowhere"
-
-# Perhaps at some point test4 should also include a test for a static
-# const int that was initialized in the header file.  But I'm not sure
-# that GDB's current behavior in such situations is either consistent
-# across platforms or optimal, so I'm not including one now.
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/m-static.h b/gdb/testsuite/gdb.cp/m-static.h
deleted file mode 100644
index 137d3b75c50..00000000000
--- a/gdb/testsuite/gdb.cp/m-static.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// 2002-08-16
-
-class gnu_obj_4
-{
- public:
-  static const int elsewhere;
-  static const int nowhere;
-  // At some point, perhaps:
-  // static const int everywhere = 317;
-};
-
diff --git a/gdb/testsuite/gdb.cp/m-static1.cc b/gdb/testsuite/gdb.cp/m-static1.cc
deleted file mode 100644
index 302a5ada254..00000000000
--- a/gdb/testsuite/gdb.cp/m-static1.cc
+++ /dev/null
@@ -1,5 +0,0 @@
-// 2002-08-16
-
-#include "m-static.h"
-
-const int gnu_obj_4::elsewhere = 221;
diff --git a/gdb/testsuite/gdb.cp/maint.exp b/gdb/testsuite/gdb.cp/maint.exp
deleted file mode 100644
index fd93333b758..00000000000
--- a/gdb/testsuite/gdb.cp/maint.exp
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation 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.  
-
-
-# This file tests C++-specific maintenance commands and help on those.
-
-# Currently, no source file is used.
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-# Test the help messages.
-
-proc test_help {} {
-    set first_component_help "Print the first class/namespace component of NAME"
-    set namespace_help "Print the list of possible C\\+\\+ namespaces"
-
-    set multiple_help_body "List of maintenance cplus subcommands:\r\n\r\nmaintenance cplus first_component -- ${first_component_help}\r\nmaintenance cplus namespace -- ${namespace_help}\r\n\r\nType \"help maintenance cplus\" followed by maintenance cplus subcommand name for full documentation.\r\nCommand name abbreviations are allowed if unambiguous."
-
-    set help_maint_cp "C\\+\\+ maintenance commands.\r\n\r\n${multiple_help_body}"
-
-    gdb_test "help maintenance cplus" "${help_maint_cp}"
-    gdb_test "help maint cp" "${help_maint_cp}"
-    gdb_test "maint cp" "\"maintenance cplus\" must be followed by the name of a command.\r\n${multiple_help_body}"
-
-    gdb_test "help maint cp first_component" "${first_component_help}."
-    gdb_test "help maint cp namespace" "${namespace_help}."
-}
-
-# This is used when NAME should contain only a single component.  Be
-# careful to make sure that parentheses get escaped properly.
-proc test_single_component {name} {
-    set matchname [string_to_regexp "$name"]
-    gdb_test "maint cp first_component $name" "$matchname"
-}
-
-# This is used when NAME is invalid.
-proc test_invalid_name {name} {
-    set matchname [string_to_regexp "$name"]
-    gdb_test "maint cp first_component $name" \
-	"During symbol reading, unexpected demangled name '$matchname'.\r\n$matchname"
-}
-
-proc test_first_component {} {
-    # The function in question might complain; make sure that we see
-    # all complaints.
-
-    gdb_test "set complaints -1" ""
-
-    test_single_component "foo"
-    test_single_component "operator<<"
-    test_single_component "operator>>"
-    test_single_component "operator ->"
-    test_single_component "operator()"
-    test_single_component "operator>"
-    test_single_component "operator<"
-    test_single_component "operator ->"
-    test_single_component "operator  ->"
-
-    test_single_component "foo()"
-    test_single_component "foo(int)"
-    test_single_component "foo(X::Y)"
-    test_single_component "foo(X::Y, A::B)"
-    test_single_component "foo(std::basic_streambuf<wchar_t,std::char_traits<wchar_t> >)"
-    test_single_component "operator>(X::Y)"
-
-    # Operator names can show up in weird places.
-
-    test_single_component "int operator<< <char>()"
-    test_single_component "T<Cooperator>"
-
-    # NOTE: carlton/2003-04-23: I've only seen the first of these
-    # produced by the demangler, but I'm including two more just to be
-    # on the safe side.
-    test_single_component "int foo<&(operator<<(C, C))>()"
-    test_single_component "int foo<&operator<<(C, C)>()"
-    test_single_component "int foo<operator<<(C, C)>()"
-
-    gdb_test "maint cp first_component foo::bar" "foo"
-    gdb_test "maint cp first_component foo::bar::baz" "foo"
-    gdb_test "maint cp first_component C<A>::bar" "C<A>"
-    gdb_test "maint cp first_component C<std::basic_streambuf<wchar_t,std::char_traits<wchar_t> > >::bar" "C<std::basic_streambuf<wchar_t,std::char_traits<wchar_t> > >"
-
-    # Make sure we behave appropriately on invalid input.
-
-    # NOTE: carlton/2003-06-25: As of today, the demangler can in fact
-    # produce examples like the third case below: there really should
-    # be a space between the two <'s.  See PR gdb/1245.
-
-    test_invalid_name "foo<"
-    test_invalid_name "foo("
-    test_invalid_name "bool operator<<char>"
-}
-
-proc test_namespace {} {
-    # There's not a lot we can do to test this.
-
-    gdb_test "maint cp namespace" "Possible namespaces:"
-}
-
-gdb_exit
-gdb_start
-
-test_help
-test_first_component
-test_namespace
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/member-ptr.cc b/gdb/testsuite/gdb.cp/member-ptr.cc
deleted file mode 100644
index e668c4623c1..00000000000
--- a/gdb/testsuite/gdb.cp/member-ptr.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1998, 1999, 2004 Free Software Foundation, 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.
-   */
-
-
-
-extern "C" {
-#include <stdio.h>
-}
-
-
-class A {
-public:
-  A();
-  int foo (int x);
-  int bar (int y);
-  virtual int baz (int z);
-  char c;
-  int  j;
-  int  jj;
-  static int s;
-};
-
-class B {
-public:
-  static int s;
-};
-
-int A::s = 10;
-int B::s = 20;
-
-A::A()
-{
-  c = 'x';
-  j = 5;
-}
-
-int A::foo (int dummy)
-{
-  j += 3;
-  return j + dummy;
-}
-
-int A::bar (int dummy)
-{
-  int r;
-  j += 13;
-  r = this->foo(15);
-  return r + j + 2 * dummy;
-}
-
-int A::baz (int dummy)
-{
-  int r;
-  j += 15;
-  r = this->foo(15);
-  return r + j + 12 * dummy;
-}
-
-int fum (int dummy)
-{
-  return 2 + 13 * dummy;
-}
-
-typedef int (A::*PMF)(int);
-
-typedef int A::*PMI;
-
-int main ()
-{
-  A a;
-  A * a_p;
-  PMF pmf;
-
-  PMF * pmf_p;
-  PMI pmi;
-
-  a.j = 121;
-  a.jj = 1331;
-  
-  int k;
-
-  a_p = &a;
-
-  pmi = &A::j;
-  pmf = &A::bar;
-  pmf_p = &pmf;
-
-  pmi = NULL;
-  
-  k = (a.*pmf)(3);
-
-  pmi = &A::jj;
-  pmf = &A::foo;
-  pmf_p = &pmf;
-
-  k = (a.*pmf)(4);
-
-  k = (a.**pmf_p)(5);
-
-  k = a.*pmi;
-  
-
-  k = a.bar(2);
-
-  k += fum (4);
-
-  B b;
-
-  k += b.s;
-  
-}
diff --git a/gdb/testsuite/gdb.cp/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp
deleted file mode 100644
index f6a9d4039b0..00000000000
--- a/gdb/testsuite/gdb.cp/member-ptr.exp
+++ /dev/null
@@ -1,622 +0,0 @@
-# Copyright 1998, 1999, 2003, 2004 Free Software Foundation, Inc.
-
-# This file is part of the gdb testsuite
-
-# 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.  
-
-# Tests for pointer-to-member support
-# Written by Satish Pai <pai@apollo.hp.com> 1997-08-19
-# Rewritten by Michael Chastain <mec.gnu@mindspring.com> 2004-01-11
-
-# TODO: copyright notice for member-ptr.cc
-
-set vhn "\\$\[0-9\]+"
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-set prms_id 0
-set bug_id 0
-
-set testfile "member-ptr"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_breakpoint [gdb_get_line_number "pmi = NULL"]
-gdb_continue_to_breakpoint "continue to pmi = NULL"
-
-# gcc is not ready for production
-# -- chastain 2004-01-12
-
-if { [test_compiler_info "gcc-*"] } {
-    continue
-}
-
-# ======================
-# pointer to member data
-# ======================
-
-# ptype on pointer to data member
-
-set name "ptype pmi (A::j)"
-gdb_test_multiple "ptype pmi" $name {
-    -re "type = int *\\( ?A::\\*\\)\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "type = int *A::\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# print pointer to data member
-
-set name "print pmi (A::j) "
-gdb_test_multiple "print pmi" $name {
-    -re "$vhn = &A::j\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \\(int ?\\( ?A::\\*\\)\\) &A::j\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \\(int ?\\( ?A::\\*\\)\\) ?&A::j ?\\+ ?1 bytes\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	kfail "gdb/NNNN" $name
-    }
-    -re "$vhn = &A::j ?\\+ ?1 bytes\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "$vhn = not implemented: member type in c_val_print\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-11 05:33:21 -gdwarf-2
-	# gcc HEAD 2004-01-11 05:33:21 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "$vhn = \\(int ?\\( A::\\*\\)\\) 536870920\r\n$gdb_prompt $" {
-	# the value is 0x20000008 hex.   0x20000000 is an internal flag.
-	# Use '|' to add in more values as needed.
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# print dereferenced pointer to data member
-
-set name "print a.*pmi (A::j)"
-gdb_test_multiple "print a.*pmi" $name {
-    -re "$vhn = 121\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = 855638016\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# print dereferenced pointer to data member
-# this time, dereferenced through a pointer
-
-set name "print a_p->*pmi (A::j)"
-gdb_test_multiple "print a_p->*pmi" $name {
-    -re "$vhn = 121\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = 855638016\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# set the pointer to a different data member
-
-set name "set var pmi = &A::jj"
-gdb_test_multiple "set var pmi = &A::jj" $name {
-    -re "Invalid cast.\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "set var pmi = &A::jj\r\n$gdb_prompt $" {
-	# I have to match the echo'ed input explicitly here.
-	# If I leave it out, the pattern becomes too general
-	# and matches anything that ends in "$gdb_prompt $".
-	pass $name
-    }
-}
-
-# print the pointer again
-
-set name "print pmi (A::jj)"
-gdb_test_multiple "print pmi" $name {
-    -re "$vhn = &A::jj\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \\(int ?\\( ?A::\\*\\)\\) &A::jj\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = not implemented: member type in c_val_print\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-11 05:33:21 -gdwarf-2
-	# gcc HEAD 2004-01-11 05:33:21 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "$vhn = \\(int ?\\( A::\\*\\)\\) 536870924\r\n$gdb_prompt $" {
-	# the value is 0x20000008 hex.   0x20000000 is an internal flag.
-	# Use '|' to add in more values as needed.
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# print dereferenced pointer to data member again
-
-set name "print a.*pmi (A::jj)"
-gdb_test_multiple "print a.*pmi" $name {
-    -re "$vhn = 1331\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# set the pointer to data member back to A::j
-
-set name "set var pmi = &A::j"
-gdb_test_multiple "set var pmi = &A::j" $name {
-    -re "Invalid cast.\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "set var pmi = &A::j\r\n$gdb_prompt $" {
-	# I have to match the echo'ed input explicitly here.
-	# If I leave it out, the pattern becomes too general
-	# and matches anything that ends in "$gdb_prompt $".
-	pass $name
-    }
-}
-
-# print dereferenced pointer to data member yet again (extra check, why not)
-
-set name "print a.*pmi (A::j) (again)"
-gdb_test_multiple "print a.*pmi" $name {
-    -re "$vhn = 121\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# Set the data member pointed to.
-
-set name "print a.*pmi = 33"
-gdb_test_multiple "print a.*pmi = 33" $name {
-    -re "$vhn = 33\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# Now check that the data really was changed
-
-set name "print a.*pmi (A::j) (33)"
-gdb_test_multiple "print a.*pmi" $name {
-    -re "$vhn = 33\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# Double-check by printing a.
-
-set name "print a (j = 33)"
-gdb_test_multiple "print a" $name {
-    -re "$vhn = \{c = 120 'x', j = 33, jj = 1331, (static|static int) s = 10, (_vptr.A|_vptr\\$) = ($hex|$hex <A virtual table>)\}\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \{c = 120 'x', j = 33, jj = 1331, (static|static int) s = 10, Virtual table at $hex\}\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \{(_vptr.A|_vptr\\$) = $hex, c = 120 'x', j = 33, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \{(_vptr.A|_vptr\\$) = $hex, c = 120 'x', j = 121, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# Set the data member pointed to, using ->*
-
-set name "print a_p->*pmi = 44"
-gdb_test_multiple "print a_p->*pmi = 44" $name {
-    -re "$vhn = 44\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# Check that the data really was changed
-
-set name "print a_p->*pmi (44)"
-gdb_test_multiple "print a_p->*pmi" $name {
-    -re "$vhn = 44\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# Double-check by printing a.
-
-set name "print a (j = 44)"
-gdb_test_multiple "print a" $name {
-    -re "$vhn = \{c = 120 'x', j = 44, jj = 1331, (static|static int) s = 10, (_vptr.A|_vptr\\$) = ($hex|$hex <A virtual table>)\}\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \{c = 120 'x', j = 44, jj = 1331, (static|static int) s = 10, Virtual table at $hex\}\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \{(_vptr.A|_vptr\\$) = $hex, c = 120 'x', j = 44, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \{(_vptr.A|_vptr\\$) = $hex, c = 120 'x', j = 121, jj = 1331, (static|static int) s = 10\}\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# ptype the dereferenced pointer to member.
-
-set name "ptype a.*pmi"
-gdb_test_multiple "ptype a.*pmi" $name {
-    -re "type = int\r\n$gdb_prompt" {
-	pass $name
-    }
-    -re "not implemented: member types in unpack_long\r\n$gdb_prompt $" {
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# dereference the pointer to data member without any object
-# this is not allowed: a pmi must be bound to an object to dereference
-
-set name "print *pmi"
-gdb_test_multiple "print *pmi" $name {
-    -re "Attempt to dereference pointer to member without an object\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Cannot access memory at address 0x4\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "Cannot access memory at address 0x8\r\n$gdb_prompt $" {
-	# gcc 3.3.2 -gdwarf-2
-	# gcc 3.3.2 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# dereference the pointer to data member without any object
-# this is not allowed: a pmi must be bound to an object to dereference
-
-set name "ptype *pmi"
-gdb_test_multiple "ptype *pmi" $name {
-    -re "Attempt to dereference pointer to member without an object\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "type = int  A::\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# Check cast of pointer to member to integer.
-# This is similar to "offset-of".
-# such as "A a; print (size_t) &A.j - (size_t) &A".
-
-set name "print (int) pmi"
-gdb_test_multiple "print (int) pmi" $name {
-    -re "$vhn = (4|8)\r\n$gdb_prompt" {
-	pass $name
-    }
-}
-
-# Check "(int) pmi" explicitly for equality.
-
-set name "print ((int) pmi) == ((char *) &a.j - (char *) &a)"
-gdb_test_multiple "print ((int) pmi) == ((char *) &a.j - (char *) & a)" $name {
-    -re "$vhn = true\r\n$gdb_prompt" {
-	pass $name
-    }
-}
-
-# ==========================
-# pointer to member function
-# ==========================
-
-# ptype a pointer to a method
-
-set name "ptype pmf"
-gdb_test_multiple "ptype pmf" $name {
-    -re "type = int \\( ?A::\\*\\)\\(int\\)\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "type = int \\( ?A::\\*\\)\\(void\\)\r\n$gdb_prompt $" {
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-    -re "type = struct \{.*\}\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.2.2 -gdwarf-2
-	# gcc 3.2.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# print a pointer to a method
-
-set name "print pmf"
-gdb_test_multiple "print pmf" $name {
-    -re "$vhn = &A::bar\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = .*not supported with HP aCC.*\r\n$gdb_prompt $" {
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-    -re "$vhn = \{.*\}\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.2.2 -gdwarf-2
-	# gcc 3.2.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# ptype a pointer to a pointer to a method
-
-set name "ptype pmf_p"
-gdb_test_multiple "ptype pmf_p" $name {
-    -re "type = int \\( ?A::\\*\\*\\)\\(int\\)\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "type = int \\( ?A::\\*\\*\\)\\(void\\)\r\n$gdb_prompt $" {
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-    -re "type = struct \{.*\} \\*\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.2.2 -gdwarf-2
-	# gcc 3.2.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# print a pointer to a pointer to a method
-
-set name "print pmf_p"
-gdb_test_multiple "print pmf_p" $name {
-    -re "$vhn = \\(int \\( ?A::\\*\\*\\)\\)\\(int\\)\\) $hex\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "$vhn = \\(PMF \\*\\) $hex\r\n$gdb_prompt $" {
-	pass "gdb/NNNN"
-    }
-    -re "$vhn = \\(int \\( ?A::\\*\\*\\)\\(void\\)\\) $hex\r\n$gdb_prompt $" {
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-    -re "$vhn = \\(struct \{.*\} \\*\\) $hex\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# print dereferenced pointer to method
-
-set name "print a.*pmf"
-gdb_test_multiple "print a.*pmf" $name {
-    -re "$vhn = \\(int \\(\\*\\)\\(int\\)\\) $hex <A::bar\\(int\\)>\r\n$gdb_prompt$ " {
-	pass $name
-    }
-    -re "Pointers to methods not supported with HP aCC\r\n$gdb_prompt $" {
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-    -re "Value can't be converted to integer.\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.2.2 -gdwarf-2
-	# gcc 3.2.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# print dereferenced pointer to method, using ->*
-
-set name "print a_p->*pmf"
-gdb_test_multiple "print a_p->*pmf" $name {
-    -re "$vhn = \\(int \\(\\*\\)\\(int\\)\\) $hex <A::bar\\(int\\)>\r\n$gdb_prompt$ " {
-	pass $name
-    }
-    -re "Pointers to methods not supported with HP aCC\r\n$gdb_prompt $" {
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-    -re "Value can't be converted to integer.\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.2.2 -gdwarf-2
-	# gcc 3.2.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# set the pointer to data member
-
-set name "set var pmf = &A::foo"
-gdb_test_multiple "set var pmf = &A::foo" $name {
-    -re "set var pmf = &A::foo\r\n$gdb_prompt $" {
-	# I have to match the echo'ed input explicitly here.
-	# If I leave it out, the pattern becomes too general
-	# and matches anything that ends in "$gdb_prompt $".
-	pass $name
-    }
-    -re "Invalid cast.\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.2.2 -gdwarf-2
-	# gcc 3.2.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-    -re "Assignment to pointers to methods not implemented with HP aCC\r\n$gdb_prompt $" {
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# dereference the pointer to data member without any object
-# this is not allowed: a pmf must be bound to an object to dereference
-
-set name "print *pmf"
-gdb_test_multiple "print *pmf" $name {
-    -re "Attempt to dereference pointer to member without an object\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Structure has no component named operator\\*.\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.3.2 -gdwarf-2
-	# gcc 3.3.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# dereference the pointer to data member without any object
-# this is not allowed: a pmf must be bound to an object to dereference
-
-set name "ptype *pmf"
-gdb_test_multiple "ptype *pmf" $name {
-    -re "Attempt to dereference pointer to member without an object\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Structure has no component named operator\\*.\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.3.2 -gdwarf-2
-	# gcc 3.3.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
-
-# Call a function through a pmf.
-
-set name "print (a.*pmf)(3)"
-gdb_test_multiple "print (a.*pmf)(3)" $name {
-    -re "$vhn = 50\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Not implemented: function invocation through pointer to method with HP aCC\r\n$gdb_prompt $" {
-	# hpacc A.03.45
-	kfail "gdb/NNNN" $name
-    }
-    -re "Value can't be converted to integer.\r\n$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# gcc 2.95.3 -gstabs+
-	# gcc 3.3.2 -gdwarf-2
-	# gcc 3.3.2 -gstabs+
-	# gcc HEAD 2004-01-10 -gdwarf-2
-	# gcc HEAD 2004-01-10 -gstabs+
-	kfail "gdb/NNNN" $name
-    }
-}
diff --git a/gdb/testsuite/gdb.cp/method.cc b/gdb/testsuite/gdb.cp/method.cc
deleted file mode 100644
index 949b027a02e..00000000000
--- a/gdb/testsuite/gdb.cp/method.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-// Class funk has a constructor and an ordinary method
-// Test for CHFts23426
-
-class funk
-{
-public:
-  funk();
-  void getFunky(int a, int b);
-  int data_;
-};
-
-funk::funk()
-  : data_(33)
-{
-}
-
-void funk::getFunky(int a, int b)
-{
-  int res;
-  res = a + b - data_;
-  data_ = res;
-}
-
-// Class A has const and volatile methods
-
-class A {
-public:
-  int x;
-  int y;
-  int foo (int arg);
-  int bar (int arg) const;
-  int baz (int arg, char c) volatile;
-  int qux (int arg, float f) const volatile;
-};
-
-int A::foo (int arg)
-{
-  x += arg;
-  return arg *2;
-}
-
-int A::bar (int arg) const
-{
-  return arg + 2 * x;
-}
-
-int A::baz (int arg, char c) volatile
-{
-  return arg - 2 * x + c;
-}
-
-int A::qux (int arg, float f) const volatile
-{
-  if (f > 0)
-    return 2 * arg - x;
-  else
-    return 2 * arg + x;
-}
-
-
-int main()
-{
-  A a;
-  int k;
-
-  k = 10;
-  a.x = k * 2;
-
-  k = a.foo(13);
-  
-  k += a.bar(15);
-
-  // Test for CHFts23426 follows
-  funk f;
-  f.getFunky(1, 2);
-  return 0;
-}
-
-
-
diff --git a/gdb/testsuite/gdb.cp/method.exp b/gdb/testsuite/gdb.cp/method.exp
deleted file mode 100644
index 87666d833a8..00000000000
--- a/gdb/testsuite/gdb.cp/method.exp
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1998, 1999, 2001, 2002, 2003, 2004 Free Software Foundation, 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.  
-
-# tests for misc. C++ method stuff
-# Written by Satish Pai <pai@apollo.hp.com> 1997-07-08
-
-# This file is part of the gdb testsuite
-
-# This tests:
-# 0. method arguments are correct
-# 1. access to class data members inside method scopes
-# 2. correct param types for methods in ptype.
-# 3. const and volatile methods
-
-# (#0 and #1 above relate to an HP specific problem -- GDB must correctly
-# integrate FPARAM symbols in HP debug info into the local var list
-# for the function or method's block.)
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "method"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info $binfile "c++"] {
-  return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_test "break A::foo" \
-  "Breakpoint \[0-9\]* at $hex.*file .*method.cc, line 38\\."
-
-gdb_test "continue" \
-  "Continuing\\.\r\n\r\nBreakpoint \[0-9\]*, A::foo(\\(int\\)|) \\(this=$hex, arg=13\\) at .*method\\.cc:38\r\n38\[\t \]*x \\+= arg;" \
-  "continue to A::foo"
-
-# Check ability to access this-relative stuff.
-
-gdb_test "print x" \
-   "\\$\[0-9\]* = 20" \
-   "print x in A::foo"
-
-# Check access to this pointer       
-
-gdb_test "print this" \
-   "\\$\[0-9\]* = \\((class |)A *\\* *(const|)\\) $hex" \
-   "print this in A::foo"
-
-# Now do everything over again for A::bar, because sometimes processing one method
-# (the first one) is fine, but the second one's debug info gets munged beyond recognition.
-
-gdb_test "break A::bar" \
-  "Breakpoint \[0-9\]* at $hex.*file .*method.cc, line 44\\."
-
-gdb_test "continue" \
-  "Continuing\\.\r\n\r\nBreakpoint \[0-9\]*, A::bar(|\\(int\\) const| const) \\(this=$hex, arg=15\\) at .*method\\.cc:44\r\n44\[\t \]*return arg \\+ 2 \\* x;" \
-  "continue to A::bar"
-
-# Check ability to access this-relative stuff.
-
-gdb_test "print x" \
-  "\\$\[0-9\]* = 33" \
-  "print x in A::bar"
-
-# Check access to this pointer       
-
-get_debug_format
-
-send_gdb "print this\n"
-gdb_expect {
-  -re "\\$\[0-9\]* = \\(const (class |)A *\\* *(const|)\\) $hex\r\n$gdb_prompt $" {
-    pass "print this in A::bar"
-  }
-  -re "\\$\[0-9\]* = \\((class |)A *\\* *(const|)\\) $hex\r\n$gdb_prompt $" {
-    # gcc versions up to 3.0.4 with -gstabs+ do not emit "const" indicators,
-    # so the output is "A *".  It should be "const A *" or "const A * const".
-    setup_xfail_format "stabs"
-    fail "print this in A::bar (missing const)"
-  }
-  -re "\\$\[0-9\]* = \\(const (class |)\{\\.\\.\\.\} *\\* *(const|)\\) $hex\r\n$gdb_prompt $" {
-    # gcc versions gcc-3_1-branch%20020404 and HEAD%20020404 with -gstabs+
-    # produce good stabs, but gdb prints "const class {...} *" const.
-    # This is PR gdb/277.
-    # setup_kfail "gdb/277"
-    fail "print this in A::bar (gdb/277)"
-  }
-  -re ".*$gdb_prompt $" { fail "print this in A::bar" }
-  timeout { fail "(timeout) print this in A::bar" }
-}
-
-# Check again with funk::getFunky (this is the original test case
-# for CHFts23426); sometimes having a constructor with no arguments
-# will nuke the debug info read in for other methods in the class.
-
-gdb_test "break 21" \
-  "Breakpoint \[0-9\]* at $hex.*file .*method.cc, line 21\\."
-
-gdb_test "continue" \
-  "Continuing\\.\r\n\r\nBreakpoint \[0-9\]*, funk::getFunky(\\(int, int\\)|) \\(this=$hex, a=1, b=2\\) at .*method\\.cc:21\r\n21\[\t \]*data_ = res;" \
-  "continue to 21"
-
-# Check ability to access this-relative stuff.
-
-gdb_test "print data_" \
-  "\\$\[0-9\]* = 33" \
-  "print data_ in funk::getFunky"
-
-# Check access to this pointer       
-
-gdb_test "print this" \
-  "\\$\[0-9\]* = \\((class |)funk *\\* *(const|)\\) $hex" \
-  "print this in funk::getFunky"
-
-# Check access to local variable
-
-gdb_test "print res" \
-  "\\$\[0-9\]* = -30" \
-   "print res in funk::getFunky"
-
-# Check ptype of class -- should show const/volatile methods
-
-send_gdb "ptype A\n"
-gdb_expect {
-   -re "type = class A \{\r\n\[ \]*public:\r\n\[ \]*int x;\r\n\[ \]*int y;\r\n\r\n\[ \]*int foo\\(int\\);\r\n\[ \]*int bar\\(int\\) const;\r\n\[ \]*int baz\\(int, char\\) volatile;\r\n\[ \]*int qux\\(int, float\\) (const volatile|volatile const);\r\n\}\r\n$gdb_prompt $" {
-      pass "ptype A"
-   }
-   -re "type = class A \{\r\n\[ \]*public:\r\n\[ \]*int x;\r\n\[ \]*int y;\r\n\r\n\[ \]*A & operator=\\(A const ?&\\);\r\n\[ \]*A\\(A const ?&\\);\r\n\[ \]*A\\((void|)\\);\r\n\[ \]*int foo\\(int\\);\r\n\[ \]*int bar\\(int\\) const;\r\n\[ \]*int baz\\(int, char\\) volatile;\r\n\[ \]*int qux\\(int, float\\) (const volatile|volatile const);\r\n\}\r\n$gdb_prompt $" {
-      pass "ptype A"
-   }
-   -re "type = class A \{\r\n\[ \]*public:\r\n\[ \]*int x;\r\n\[ \]*int y;\r\n\r\n\[ \]*int foo\\(int\\);\r\n\[ \]*int bar\\(int\\) const;\r\n\[ \]*int baz\\(int, char\\) volatile;\r\n\[ \]*int qux\\(int, float\\) (const volatile|volatile const);\r\n\[ \]*A & operator=\\(A const ?&\\);\r\n\[ \]*A\\(A const ?&\\);\r\n\[ \]*A\\((void|)\\);\r\n\}\r\n$gdb_prompt $" {
-      pass "ptype A"
-   }
-   -re "type = class A \{\r\n\[ \]*public:\r\n\[ \]*int x;\r\n\[ \]*int y;\r\n\r\n\[ \]*int foo\\(int\\);\r\n\[ \]*int bar\\(int\\) const;\r\n\[ \]*int baz\\(int, char\\);\r\n\[ \]*int qux\\(int, float\\) const;\r\n\}\r\n$gdb_prompt $" {
-      pass "ptype A (HP aCC bug -- volatile not indicated)"
-   }
-   -re "type = class A \{\r\n\[ \]*public:\r\n\[ \]*int x;\r\n\[ \]*int y;\r\n\r\n\[ \]*int foo\\(int\\);\r\n\[ \]*int bar\\(int\\) const;\r\n\[ \]*int baz\\(int, char\\) volatile;\r\n\[ \]*int qux\\(int, float\\) const volatile;\r\n\}\r\n$gdb_prompt $" {
-      pass "ptype A"
-   }
-   -re ".*$gdb_prompt $" { fail "ptype A" }
-   timeout { fail "(timeout) ptype A" }
-}
-
-send_gdb "cont\n"
-gdb_expect {
-    -re "Continuing.\r\n\r\nProgram exited normally.*$gdb_prompt $" {
-	pass "finish program"
-    }
-    -re "Continuing.* EXIT code 0.*Program exited normally.*$gdb_prompt $" {
-	pass "finish program (exit wrapper)" 
-    }
-    -re ".*$gdb_prompt $" { fail "finish program" }
-    default:{               fail "finish program (timeout)" }
-}
-
diff --git a/gdb/testsuite/gdb.cp/misc.cc b/gdb/testsuite/gdb.cp/misc.cc
deleted file mode 100644
index 7d69ed225ae..00000000000
--- a/gdb/testsuite/gdb.cp/misc.cc
+++ /dev/null
@@ -1,607 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-   Free Software Foundation, 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.
-   */
-
-// Test various -*- C++ -*- things.
-
-// ====================== basic C++ types  =======================
-bool            v_bool;
-bool            v_bool_array[2];
-
-typedef struct fleep fleep;
-struct fleep { int a; } s;
-
-// ====================== simple class structures  =======================
-
-struct default_public_struct {
- // defaults to public:
-  int a;
-  int b;
-};
-
-struct explicit_public_struct {
- public:
-  int a;
-  int b;
-};
-
-struct protected_struct {
- protected:
-  int a;
-  int b;
-};
-
-struct private_struct {
- private:
-  int a;
-  int b;
-};
-
-struct mixed_protection_struct {
- public:
-  int a;
-  int b;
- private:
-  int c;
-  int d;
- protected:
-  int e;
-  int f;
- public:
-  int g;
- private:
-  int h;
- protected:
-  int i;
-};
-
-class public_class {
- public:
-  int a;
-  int b;
-};
-
-class protected_class {
- protected:
-  int a;
-  int b;
-};
-
-class default_private_class {
- // defaults to private:
-  int a;
-  int b;
-};
-
-class explicit_private_class {
- private:
-  int a;
-  int b;
-};
-
-class mixed_protection_class {
- public:
-  int a;
-  int b;
- private:
-  int c;
-  int d;
- protected:
-  int e;
-  int f;
- public:
-  int g;
- private:
-  int h;
- protected:
-  int i;
-};
-
-class const_vol_method_class {
-public:
-  int a;
-  int b;
-  int foo (int &) const;
-  int bar (int &) volatile;
-  int baz (int &) const volatile;
-};
-
-int const_vol_method_class::foo (int & ir) const
-{
-  return ir + 3;
-}
-int const_vol_method_class::bar (int & ir) volatile
-{
-  return ir + 4;
-}
-int const_vol_method_class::baz (int & ir) const volatile
-{
-  return ir + 5;
-}
-
-// ========================= simple inheritance ==========================
-
-class A {
- public:
-  int a;
-  int x;
-};
-
-A g_A;
-
-class B : public A {
- public:
-  int b;
-  int x;
-};
-
-B g_B;
-
-class C : public A {
- public:
-  int c;
-  int x;
-};
-
-C g_C;
-
-class D : public B, public C {
- public:
-  int d;
-  int x;
-};
-
-D g_D;
-
-class E : public D {
- public:
-  int e;
-  int x;
-};
-
-E g_E;
-
-class class_with_anon_union
-{
- public:
-  int one;
-  union
-  {
-    int a;
-    long b;
-  };
-};
-
-class_with_anon_union g_anon_union;
-
-void inheritance2 (void)
-{
-}
-
-void inheritance1 (void)
-{
-  int ival;
-  int *intp;
-
-  // {A::a, A::x}
-
-  g_A.A::a = 1;
-  g_A.A::x = 2;
-
-  // {{A::a,A::x},B::b,B::x}
-
-  g_B.A::a = 3;
-  g_B.A::x = 4;
-  g_B.B::b = 5;
-  g_B.B::x = 6;
-
-  // {{A::a,A::x},C::c,C::x}
-
-  g_C.A::a = 7;
-  g_C.A::x = 8;
-  g_C.C::c = 9;
-  g_C.C::x = 10;
-
-  // {{{A::a,A::x},B::b,B::x},{{A::a,A::x},C::c,C::x},D::d,D::x}
-
-  // The following initialization code is non-portable, but allows us
-  // to initialize all members of g_D until we can fill in the missing
-  // initialization code with legal C++ code.
-
-  for (intp = (int *) &g_D, ival = 11;
-       intp < ((int *) &g_D + sizeof (g_D) / sizeof (int));
-       intp++, ival++)
-    {
-      *intp = ival;
-    }
-
-  // Overlay the nonportable initialization with legal initialization.
-
-  // ????? = 11;  (g_D.A::a = 11; is ambiguous)
-  // ????? = 12;  (g_D.A::x = 12; is ambiguous)
-/* djb 6-3-2000
-
-	This should take care of it. Rather than try to initialize using an ambiguous
-	construct, use 2 unambiguous ones for each. Since the ambiguous a/x member is
-	coming from C, and B, initialize D's C::a, and B::a, and D's C::x and B::x.
- */
-  g_D.C::a = 15;
-  g_D.C::x = 12;
-  g_D.B::a = 11;
-  g_D.B::x = 12;
-  g_D.B::b = 13;
-  g_D.B::x = 14;
-  // ????? = 15;
-  // ????? = 16;
-  g_D.C::c = 17;
-  g_D.C::x = 18;
-  g_D.D::d = 19;
-  g_D.D::x = 20;
-
-
-  // {{{{A::a,A::x},B::b,B::x},{{A::a,A::x},C::c,C::x},D::d,D::x}},E::e,E::x}
-
-  // The following initialization code is non-portable, but allows us
-  // to initialize all members of g_D until we can fill in the missing
-  // initialization code with legal C++ code.
-
-  for (intp = (int *) &g_E, ival = 21;
-       intp < ((int *) &g_E + sizeof (g_E) / sizeof (int));
-       intp++, ival++)
-  {
-    *intp = ival;
-  }
-
-  // Overlay the nonportable initialization with legal initialization.
-
-  // ????? = 21;  (g_E.A::a = 21; is ambiguous)
-  // ????? = 22;  (g_E.A::x = 22; is ambiguous)
-  g_E.B::b = 23;
-  g_E.B::x = 24;
-  // ????? = 25;
-  // ????? = 26;
-  g_E.C::c = 27;
-  g_E.C::x = 28;
-  g_E.D::d = 29;
-  g_E.D::x = 30;
-  g_E.E::e = 31;
-  g_E.E::x = 32;
-
-  g_anon_union.one = 1;
-  g_anon_union.a = 2;
-
-  inheritance2 ();	
-}
-
-// ======================== static member functions =====================
-
-class Static {
-public:
-  static void ii(int, int);
-};
-void Static::ii (int, int) { }
-
-// ======================== virtual base classes=========================
-
-class vA {
- public:
-  int va;
-  int vx;
-};
-
-vA g_vA;
-
-class vB : public virtual vA {
- public:
-  int vb;
-  int vx;
-};
-
-vB g_vB;
-
-class vC : public virtual vA {
- public:
-  int vc;
-  int vx;
-};
-
-vC g_vC;
-
-class vD : public virtual vB, public virtual vC {
- public:
-  int vd;
-  int vx;
-};
-
-vD g_vD;
-
-class vE : public virtual vD {
- public:
-  int ve;
-  int vx;
-};
-
-vE g_vE;
-
-void inheritance4 (void)
-{
-}
-
-void inheritance3 (void)
-{
-  int ival;
-  int *intp;
-
-  // {vA::va, vA::vx}
-
-  g_vA.vA::va = 1;
-  g_vA.vA::vx = 2;
-
-  // {{vA::va, vA::vx}, vB::vb, vB::vx}
-
-  g_vB.vA::va = 3;
-  g_vB.vA::vx = 4;
-  g_vB.vB::vb = 5;
-  g_vB.vB::vx = 6;
-
-  // {{vA::va, vA::vx}, vC::vc, vC::vx}
-
-  g_vC.vA::va = 7;
-  g_vC.vA::vx = 8;
-  g_vC.vC::vc = 9;
-  g_vC.vC::vx = 10;
-
-  // {{{{vA::va, vA::vx}, vB::vb, vB::vx}, vC::vc, vC::vx}, vD::vd,vD::vx}
-
-  g_vD.vA::va = 11;
-  g_vD.vA::vx = 12;
-  g_vD.vB::vb = 13;
-  g_vD.vB::vx = 14;
-  g_vD.vC::vc = 15;
-  g_vD.vC::vx = 16;
-  g_vD.vD::vd = 17;
-  g_vD.vD::vx = 18;
-
-
-  // {{{{{vA::va,vA::vx},vB::vb,vB::vx},vC::vc,vC::vx},vD::vd,vD::vx},vE::ve,vE::vx}
-
-  g_vD.vA::va = 19;
-  g_vD.vA::vx = 20;
-  g_vD.vB::vb = 21;
-  g_vD.vB::vx = 22;
-  g_vD.vC::vc = 23;
-  g_vD.vC::vx = 24;
-  g_vD.vD::vd = 25;
-  g_vD.vD::vx = 26;
-  g_vE.vE::ve = 27;
-  g_vE.vE::vx = 28;
-
-  inheritance4 ();	
-}
-
-// ======================================================================
-
-class Base1 {
- public:
-  int x;
-  Base1(int i) { x = i; }
-};
-
-class Foo
-{
- public:
-  int x;
-  int y;
-  static int st;
-  Foo (int i, int j) { x = i; y = j; }
-  int operator! ();
-  operator int ();
-  int times (int y);
-};
-
-class Bar : public Base1, public Foo {
- public:
-  int z;
-  Bar (int i, int j, int k) : Base1 (10*k), Foo (i, j) { z = k; }
-};
-
-int Foo::operator! () { return !x; }
-
-int Foo::times (int y) { return x * y; }
-
-int Foo::st = 100;
-
-Foo::operator int() { return x; }
-
-Foo foo(10, 11);
-Bar bar(20, 21, 22);
-
-class ClassWithEnum {
-public:
-  enum PrivEnum { red, green, blue, yellow = 42 };
-  PrivEnum priv_enum;
-  int x;
-};
-
-void enums2 (void)
-{
-}
-
-/* classes.exp relies on statement order in this function for testing
-   enumeration fields.  */
-
-void enums1 ()
-{
-  ClassWithEnum obj_with_enum;
-  obj_with_enum.priv_enum = ClassWithEnum::red;
-  obj_with_enum.x = 0;
-  enums2 ();
-  obj_with_enum.priv_enum = ClassWithEnum::green;
-}
-
-class ClassParam {
-public:
-  int Aptr_a (A *a) { return a->a; }
-  int Aptr_x (A *a) { return a->x; }
-  int Aref_a (A &a) { return a.a; }
-  int Aref_x (A &a) { return a.x; }
-  int Aval_a (A a) { return a.a; }
-  int Aval_x (A a) { return a.x; }
-};
-
-ClassParam class_param;
-
-class Contains_static_instance
-{
- public:
-  int x;
-  int y;
-  Contains_static_instance (int i, int j) { x = i; y = j; }
-  static Contains_static_instance null;
-};
-
-Contains_static_instance Contains_static_instance::null(0,0);
-Contains_static_instance csi(10,20);
-
-class Contains_nested_static_instance
-{
- public:
-  class Nested
-  {
-   public:
-    Nested(int i) : z(i) {}
-    int z;
-    static Contains_nested_static_instance xx;
-  };
-
-  Contains_nested_static_instance(int i, int j) : x(i), y(j) {}
-
-  int x;
-  int y;
-
-  static Contains_nested_static_instance null;
-  static Nested yy;
-};
-
-Contains_nested_static_instance Contains_nested_static_instance::null(0, 0);
-Contains_nested_static_instance::Nested Contains_nested_static_instance::yy(5);
-Contains_nested_static_instance
-  Contains_nested_static_instance::Nested::xx(1,2);
-Contains_nested_static_instance cnsi(30,40);
-
-typedef struct {
-  int one;
-  int two;
-} tagless_struct;
-tagless_struct v_tagless;
-
-/* Try to get the compiler to allocate a class in a register.  */
-class small {
- public:
-  int x;
-  int method ();
-};
-
-int
-small::method ()
-{
-  return x + 5;
-}
-
-void marker_reg1 () {}
-
-int
-register_class ()
-{
-  /* We don't call any methods for v, so gcc version cygnus-2.3.3-930220
-     might put this variable in a register.  This is a lose, though, because
-     it means that GDB can't call any methods for that variable.  */
-  register small v;
-
-  int i;
-
-  /* Perform a computation sufficiently complicated that optimizing compilers
-     won't optimized out the variable.  If some compiler constant-folds this
-     whole loop, maybe using a parameter to this function here would help.  */
-  v.x = 0;
-  for (i = 0; i < 13; ++i)
-    v.x += i;
-  --v.x; /* v.x is now 77 */
-  marker_reg1 ();
-  return v.x + 5;
-}
-
-void dummy()
-{
-  v_bool = true;
-  v_bool_array[0] = false;
-  v_bool_array[1] = v_bool;
-}
-
-void use_methods ()
-{
-  /* Refer to methods so that they don't get optimized away. */
-  int i;
-  i = class_param.Aptr_a (&g_A);
-  i = class_param.Aptr_x (&g_A);
-  i = class_param.Aref_a (g_A);
-  i = class_param.Aref_x (g_A);
-  i = class_param.Aval_a (g_A);
-  i = class_param.Aval_x (g_A);
-}
-
-
-int
-main()
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  dummy();
-  inheritance1 ();
-  inheritance3 ();
-  enums1 ();
-  register_class ();
-
-  /* FIXME: pmi gets optimized out.  Need to do some more computation with
-     it or something.  (No one notices, because the test is xfail'd anyway,
-     but that probably won't always be true...).  */
-  int Foo::* pmi = &Foo::y;
-
-  /* Make sure the AIX linker doesn't remove the variable.  */
-  v_tagless.one = 5;
-
-  use_methods ();
-
-  return foo.*pmi;
-}
-
-/* Create an instance for some classes, otherwise they get optimized away.  */
-
-default_public_struct default_public_s;
-explicit_public_struct explicit_public_s;
-protected_struct protected_s;
-private_struct private_s;
-mixed_protection_struct mixed_protection_s;
-public_class public_c;
-protected_class protected_c;
-default_private_class default_private_c;
-explicit_private_class explicit_private_c;
-mixed_protection_class mixed_protection_c;
diff --git a/gdb/testsuite/gdb.cp/misc.exp b/gdb/testsuite/gdb.cp/misc.exp
deleted file mode 100644
index 2758cd0ae64..00000000000
--- a/gdb/testsuite/gdb.cp/misc.exp
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2002 Free Software
-# Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "misc"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-#
-# Deduce language of main()
-#
-
-proc deduce_language_of_main {} {
-    global gdb_prompt
-
-    # See what language gdb thinks main() is, prior to reading full symbols.
-    # I think this fails for COFF targets.
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"auto; currently c\[+\]+\".*$gdb_prompt $" {
-	    pass "deduced language is C++, before full symbols"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "source language not correct for C++ (psymtabs only)"
-	    return
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return
-	}
-    }
-
-    runto_main
-
-    # See if our idea of the language has changed.
-
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"auto; currently c\[+\]+\".*$gdb_prompt $" {
-	    pass "deduced language is C++, after full symbols"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "source language not correct for C++ (full symbols)"
-	    return
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return
-	}
-    }
-}
-
-proc test_expr { args } {
-    if { [llength $args] % 2 } {
-	warning "an even # of arguments should be passed to test_expr"
-    }
-    set last_ent [expr [llength $args] - 1];
-    set testname [lindex $args $last_ent];
-    if [gdb_test [lindex $args 0] "" "$testname (setup)"] {
-	gdb_suppress_tests;
-    }
-    for {set x 1} {$x < $last_ent} {set x [expr $x + 2]} {
-	if [gdb_test [lindex $args $x] [lindex $args [expr $x + 1]] "$testname ([lindex $args $x])"] {
-	    gdb_suppress_tests;
-	}
-    }
-    gdb_stop_suppressing_tests;
-}
-
-proc do_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-    deduce_language_of_main
-    # Check for fixes for PRs 8916 and 8630
-    gdb_test "print s.a" ".* = 0" "print s.a for foo struct (known gcc 2.7.2 and earlier bug)"
-}
-
-do_tests
-
-test_expr "set language c++" \
-    "print 1 == 1" "print.*\\$\[0-9\]* = true" \
-    "print 1 == 2" "print.*\\$\[0-9\]* = false" \
-    "print as bool"
-
-# Test bool type printing, etc.
-# Note: Language is already set to C++ above! 
-gdb_test "print v_bool" "\\$\[0-9\]* = false" "print a bool var"
-
-# set a bool variable
-test_expr "set variable v_bool = true" \
-    "print v_bool" "\\$\[0-9\]* = true" \
-    "set a bool var"
-
-# next print an array of bool
-gdb_test "print v_bool_array" "\\$\[0-9\]* = \\{false, false\\}" "print a bool array"
-
-# set elements of a bool array
-test_expr "set variable v_bool_array\[1\] = true" \
-    "print v_bool_array" "\\$\[0-9\]* = \\{false, true\\}" \
-    "set a bool array elem"
-
-# bool constants
-gdb_test "print true" "\\$\[0-9\]* = true" "print true"
-gdb_test "print false" "\\$\[0-9\]* = false" "print false"
-
-# arithmetic conversions
-gdb_test "print 1 + true" "\\$\[0-9\]* = 2" "1 + true"
-gdb_test "print 3 + false" "\\$\[0-9\]* = 3" "3 + false"
-gdb_test "print 1 < 2 < 3" "\\$\[0-9\]* = true" "1 < 2 < 3"
-gdb_test "print 2 < 1 > 4" "\\$\[0-9\]* = false" "2 < 1 > 4"
-gdb_test "print (bool)43" "\\$\[0-9\]* = true" "(bool)43"
-gdb_test "print (bool)0" "\\$\[0-9\]* = false" "(bool)0"
-gdb_test "print (bool)17.93" "\\$\[0-9\]* = true" "(bool)17.93"
-gdb_test "print (bool)0.0" "\\$\[0-9\]* = false" "(bool)0.0"
-gdb_test "print (int)true" "\\$\[0-9\]* = 1" "(int)true"
-gdb_test "print (int)false" "\\$\[0-9\]* = 0" "(int)false"
diff --git a/gdb/testsuite/gdb.cp/namespace.cc b/gdb/testsuite/gdb.cp/namespace.cc
deleted file mode 100644
index ee55168528b..00000000000
--- a/gdb/testsuite/gdb.cp/namespace.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-namespace AAA {
-  char c;
-  int i;
-  int A_xyzq (int);
-  char xyzq (char);
-  class inA {
-  public:
-    int xx;
-    int fum (int);
-  };
-};
-
-int AAA::inA::fum (int i)
-{
-  return 10 + i;
-}
-
-namespace BBB {
-  char c;
-  int i;
-  int B_xyzq (int);
-  char xyzq (char);
-
-  namespace CCC {
-    char xyzq (char);
-  };
-
-  class Class {
-  public:
-    char xyzq (char);
-    int dummy;
-  };
-};
-
-int AAA::A_xyzq (int x)
-{
-  return 2 * x;
-}
-
-char AAA::xyzq (char c)
-{
-  return 'a';
-}
-
-
-int BBB::B_xyzq (int x)
-{
-  return 3 * x;
-}
-
-char BBB::xyzq (char c)
-{
-  return 'b';
-}
-
-char BBB::CCC::xyzq (char c)
-{
-  return 'z';
-}
-
-char BBB::Class::xyzq (char c)
-{
-  return 'o';
-}
-
-void marker1(void)
-{
-  return;
-}
-
-namespace
-{
-  int X = 9;
-
-  namespace G
-  {
-    int Xg = 10;
-
-    namespace
-    {
-      int XgX = 11;
-    }
-  }
-}
-
-namespace C
-{
-  int c = 1;
-  int shadow = 12;
-
-  class CClass {
-  public:
-    int x;
-    class NestedClass {
-    public:
-      int y;
-    };
-  };
-
-  void ensureRefs () {
-    // NOTE (2004-04-23, carlton): This function is here only to make
-    // sure that GCC 3.4 outputs debug info for these classes.
-    static CClass *c = new CClass();
-    static CClass::NestedClass *n = new CClass::NestedClass();
-  }
-
-  namespace
-  {
-    int cX = 6;
-    
-    namespace F
-    {
-      int cXf = 7;
-
-      namespace
-      {
-	int cXfX = 8;
-      }
-    }
-  }
-
-  namespace C
-  {
-    int cc = 2;
-  }
-
-  namespace E
-  {
-    int ce = 4;
-  }
-
-  namespace D
-  {
-    int cd = 3;
-    int shadow = 13;
-
-    namespace E
-    {
-      int cde = 5;
-    }
-
-    void marker2 (void)
-    {
-      // NOTE: carlton/2003-04-23: I'm listing the expressions that I
-      // plan to have GDB try to print out, just to make sure that the
-      // compiler and I agree which ones should be legal!  It's easy
-      // to screw up when testing the boundaries of namespace stuff.
-      c;
-      //cc;
-      C::cc;
-      cd;
-      //C::D::cd;
-      E::cde;
-      shadow;
-      //E::ce;
-      cX;
-      F::cXf;
-      F::cXfX;
-      X;
-      G::Xg;
-      //cXOtherFile;
-      //XOtherFile;
-      G::XgX;
-
-      return;
-    }
-
-  }
-}
-
-int main ()
-{
-  using AAA::inA;
-  char c1;
-
-  using namespace BBB;
-  
-  c1 = xyzq ('x');
-  c1 = AAA::xyzq ('x');
-  c1 = BBB::CCC::xyzq ('m');
-  
-  inA ina;
-
-  ina.xx = 33;
-
-  int y;
-
-  y = AAA::A_xyzq (33);
-  y += B_xyzq (44);
-
-  BBB::Class cl;
-
-  c1 = cl.xyzq('e');
-
-  marker1();
-  
-  C::D::marker2 ();
-}
diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
deleted file mode 100644
index 4d295894986..00000000000
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1997, 1998, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# tests for namespaces
-# Originally written by Satish Pai <pai@apollo.hp.com> 1997-07-23
-
-# This file is part of the gdb testsuite
-
-# Note: The original tests were geared to the HP aCC compiler,
-# which has an idiosyncratic way of emitting debug info
-# for namespaces.
-# Note: As of 2000-06-03, they passed under g++ - djb
-
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "namespace"
-set srcfile ${testfile}.cc
-set objfile ${objdir}/${subdir}/${testfile}.o
-set srcfile1 ${testfile}1.cc
-set objfile1 ${objdir}/${subdir}/${testfile}1.o
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile} c++] {
-    return -1;
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${objfile1}" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${objfile} ${objfile1}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-if ![runto 'marker1'] then {
-    perror "couldn't run to marker1"
-    continue
-}
-
-gdb_test "up" ".*main.*" "up from marker1"
-
-# Access a data item inside a namespace using colons and
-# single quotes. :-(
-
-# NOTE: carlton/2003-09-24: the quotes are becoming less necessary (or
-# even desirable.)  For tests where it should still work with quotes,
-# I'm including versions both with and without quotes; for tests that
-# shouldn't work with quotes, I'm only including one version.
-
-send_gdb "print 'AAA::c'\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 0 '\\\\(0|000)'\r\n$gdb_prompt $" { pass "print 'AAA::c'" }
-   -re ".*$gdb_prompt $" { fail "print 'AAA::c'" }
-   timeout { fail "(timeout) print 'AAA::c'" }
-}
-
-send_gdb "print AAA::c\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 0 '\\\\(0|000)'\r\n$gdb_prompt $" { pass "print AAA::c" }
-   -re ".*$gdb_prompt $" { fail "print AAA::c" }
-   timeout { fail "(timeout) print AAA::c" }
-}
-
-# An object declared using "using".
-
-send_gdb "print ina\n"
-gdb_expect {
-   -re "\\$\[0-9\]+ = {xx = 33}.*$gdb_prompt $" {
-      pass "print ina"
-   }
-   -re ".*$gdb_prompt $" { fail "print ina" }
-   timeout { fail "(timeout) print ina" }
-}
-
-send_gdb "ptype ina\n"
-gdb_expect {
-   -re "type = class (AAA::|)inA \{\r\n\[ \]*public:\r\n\[ \]*int xx;\r\n\[ \]*\r\n\[ \]*.*int fum\\(int\\);\r\n\}\r\n$gdb_prompt $" {
-       pass "ptype ina"
-   }
-   -re "type = class (AAA::|)inA \{\r\n\[ \]*public:\r\n\[ \]*int xx;\r\n\[ \]*\r\n\[ \]*int fum\\(int\\);\r\n.*\}\r\n$gdb_prompt $" {
-       pass "ptype ina"
-   }
-   -re ".*$gdb_prompt $" { fail "ptype ina" }
-   timeout { fail "(timeout) ptype ina" }
-}
-
-# Check all functions are known to GDB
-
-setup_xfail hppa*-*-*11* CLLbs14869
-send_gdb "info func xyzq\n"
-gdb_expect {
-   -re "All functions.*File.*namespace.cc:\r\nint AAA::A_xyzq\\(int\\);\r\nint BBB::B_xyzq\\(int\\);\r\nchar AAA::xyzq\\(char\\);\r\nchar BBB::xyzq\\(char\\);\r\nchar BBB::CCC::xyzq\\(char\\);\r\nchar BBB::Class::xyzq\\(char\\);\r\n$gdb_prompt $" {
-       pass "info func xyzq"
-   }    
-   -re "All functions.*File.*namespace.cc:\r\nint AAA::A_xyzq\\(int\\);\r\nchar AAA::xyzq\\(char\\);\r\nint BBB::B_xyzq\\(int\\);\r\nchar BBB::CCC::xyzq\\(char\\);\r\nchar BBB::Class::xyzq\\(char\\);\r\nchar BBB::xyzq\\(char\\);\r\n$gdb_prompt $" {
-       pass "info func xyzq"
-   }    
-   -re ".*$gdb_prompt $" { fail "info func xyzq" }
-   timeout { fail "(timeout) info func xyzq" }
-}
-
-# Call a function in a namespace
-
-send_gdb "print 'AAA::xyzq'('x')\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 97 'a'\r\n$gdb_prompt $" {
-       pass "print 'AAA::xyzq'('x')"
-   }
-   -re ".*$gdb_prompt $" { fail "print 'AAA::xyzq'('x')" }
-   timeout { fail "(timeout) print 'AAA::xyzq'('x')" }
-}
-       
-send_gdb "print AAA::xyzq('x')\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 97 'a'\r\n$gdb_prompt $" {
-       pass "print AAA::xyzq('x')"
-   }
-   -re ".*$gdb_prompt $" { fail "print AAA::xyzq('x')" }
-   timeout { fail "(timeout) print AAA::xyzq('x')" }
-}
-       
-# Break on a function in a namespace
-
-send_gdb "break AAA::xyzq\n"
-gdb_expect {
-    -re "Breakpoint.*at $hex: file.*namespace.cc, line 42\\.\r\n$gdb_prompt $" {
-         pass "break AAA::xyzq"
-    }    
-   -re ".*$gdb_prompt $" { fail "break AAA::xyzq" }
-   timeout { fail "(timeout) break AAA::xyzq" }
-}
-
-# Call a function in a nested namespace
-
-send_gdb "print 'BBB::CCC::xyzq'('x')\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 122 'z'\r\n$gdb_prompt $" {
-       pass "print 'BBB::CCC::xyzq'('x')"
-   }
-   -re ".*$gdb_prompt $" { fail "print 'BBB::CCC::xyzq'('x')" }
-   timeout { fail "(timeout) print 'BBB::CCC::xyzq'('x')" }
-}
-       
-send_gdb "print BBB::CCC::xyzq('x')\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = 122 'z'\r\n$gdb_prompt $" {
-       pass "print BBB::CCC::xyzq('x')"
-   }
-   -re ".*$gdb_prompt $" { fail "print BBB::CCC::xyzq('x')" }
-   timeout { fail "(timeout) print BBB::CCC::xyzq('x')" }
-}
-       
-# Break on a function in a nested namespace
-
-send_gdb "break BBB::CCC::xyzq\n"
-gdb_expect {
-    -re "Breakpoint.*at $hex: file.*namespace.cc, line 58\\.\r\n$gdb_prompt $" {
-         pass "break BBB::CCC::xyzq"
-    }    
-   -re ".*$gdb_prompt $" { fail "break BBB::CCC::xyzq" }
-   timeout { fail "(timeout) break BBB::CCC::xyzq" }
-}
-
-# Print address of a function in a class in a namespace
-
-send_gdb "print 'BBB::Class::xyzq'\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{char \\((BBB::|)Class \\*( const|), (char|int)\\)\} $hex <BBB::Class::xyzq\\(char\\)>\r\n$gdb_prompt $" {
-       pass "print 'BBB::Class::xyzq'"
-   }
-   -re ".*$gdb_prompt $" { fail "print 'BBB::Class::xyzq'" }
-   timeout { fail "(timeout) print 'BBB::Class::xyzq'" }
-}
-
-send_gdb "print BBB::Class::xyzq\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \{char \\((BBB::|)Class \\*( const|), (char|int)\\)\} $hex <BBB::Class::xyzq\\(char\\)>\r\n$gdb_prompt $" {
-       pass "print BBB::Class::xyzq"
-   }
-   -re ".*$gdb_prompt $" { fail "print BBB::Class::xyzq" }
-   timeout { fail "(timeout) print BBB::Class::xyzq" }
-}
-
-# Break on a function in a class in a namespace
-
-send_gdb "break BBB::Class::xyzq\n"
-gdb_expect {
-    -re "Breakpoint.*at $hex: file.*namespace.cc, line 63\\.\r\n$gdb_prompt $" {
-         pass "break BBB::Class::xyzq"
-    }    
-   -re ".*$gdb_prompt $" { fail "break BBB::Class::xyzq" }
-   timeout { fail "(timeout) break BBB::Class::xyzq" }
-}
-
-# Test to see if the appropriate namespaces are in scope when trying
-# to print out stuff from within a function defined within a
-# namespace.
-
-if ![runto "C::D::marker2"] then {
-    perror "couldn't run to marker2"
-    continue
-}
-
-gdb_test "print c" "\\$\[0-9\].* = 1"
-gdb_test "print cc" "No symbol \"cc\" in current context."
-gdb_test "print 'C::cc'" "\\$\[0-9\].* = 2"
-gdb_test "print C::cc" "\\$\[0-9\].* = 2"
-gdb_test "print cd" "\\$\[0-9\].* = 3"
-gdb_test "print C::D::cd" "No type \"D\" within class or namespace \"C::C\"."
-gdb_test "print 'E::cde'" "\\$\[0-9\].* = 5"
-gdb_test "print E::cde" "\\$\[0-9\].* = 5"
-gdb_test "print shadow" "\\$\[0-9\].* = 13"
-gdb_test "print E::ce" "No symbol \"ce\" in namespace \"C::D::E\"."
-gdb_test "ptype C" "type = namespace C::C"
-gdb_test "ptype E" "type = namespace C::D::E"
-
-gdb_test "ptype CClass" "type = (class C::CClass \{\r\n  public:|struct C::CClass \{)\r\n    int x;\r\n\}"
-gdb_test "ptype CClass::NestedClass" "type = (class C::CClass::NestedClass \{\r\n  public:|struct C::CClass::NestedClass \{)\r\n    int y;\r\n\}"
-gdb_test "ptype NestedClass" "No symbol \"NestedClass\" in current context."
-setup_kfail "gdb/1448" "*-*-*"
-gdb_test "ptype ::C::CClass" "type = class C::CClass \{\r\n  public:\r\n    int x;\r\n\}"
-setup_kfail "gdb/1448" "*-*-*"
-gdb_test "ptype ::C::CClass::NestedClass" "type = class C::CClass::NestedClass \{\r\n  public:\r\n    int y;\r\n\}"
-setup_kfail "gdb/1448" "*-*-*"
-gdb_test "ptype ::C::NestedClass" "No symbol \"NestedClass\" in namespace \"C\"."
-gdb_test "ptype C::CClass" "No symbol \"CClass\" in namespace \"C::C\"."
-gdb_test "ptype C::CClass::NestedClass" "No type \"CClass\" within class or namespace \"C::C\"."
-gdb_test "ptype C::NestedClass" "No symbol \"NestedClass\" in namespace \"C::C\"."
-
-# Tests involving multiple files
-
-gdb_test "print cOtherFile" "\\$\[0-9\].* = 316"
-gdb_test "ptype OtherFileClass" "type = (class C::OtherFileClass \{\r\n  public:|struct C::OtherFileClass \{)\r\n    int z;\r\n\}"
-setup_kfail "gdb/1448" "*-*-*"
-gdb_test "ptype ::C::OtherFileClass" "type = class C::OtherFileClass \{\r\n  public:\r\n    int z;\r\n\}"
-gdb_test "ptype C::OtherFileClass" "No symbol \"OtherFileClass\" in namespace \"C::C\"."
-
-# Some anonymous namespace tests.
-
-gdb_test "print cX" "\\$\[0-9\].* = 6"
-gdb_test "print 'F::cXf'" "\\$\[0-9\].* = 7"
-gdb_test "print F::cXf" "\\$\[0-9\].* = 7"
-gdb_test "print F::cXfX" "\\$\[0-9\].* = 8"
-gdb_test "print X" "\\$\[0-9\].* = 9"
-gdb_test "print 'G::Xg'" "\\$\[0-9\].* = 10"
-gdb_test "print G::Xg" "\\$\[0-9\].* = 10"
-gdb_test "print G::XgX" "\\$\[0-9\].* = 11"
-gdb_test "print cXOtherFile" "No symbol \"cXOtherFile\" in current context."
-gdb_test "print XOtherFile" "No symbol \"XOtherFile\" in current context."
diff --git a/gdb/testsuite/gdb.cp/namespace1.cc b/gdb/testsuite/gdb.cp/namespace1.cc
deleted file mode 100644
index c3ad6921ba8..00000000000
--- a/gdb/testsuite/gdb.cp/namespace1.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2003, 2004 Free Software Foundation, 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.  
-   */
-
-
-
-namespace C
-{
-  class OtherFileClass {
-  public:
-    int z;
-  };
-
-  void ensureOtherRefs () {
-    // NOTE (2004-04-23, carlton): This function is here only to make
-    // sure that GCC 3.4 outputs debug info for this class.
-    static OtherFileClass *c = new OtherFileClass();
-  }
-
-  namespace {
-    int cXOtherFile = 29;
-  };
-
-  int cOtherFile = 316;
-}
-
-namespace {
-  int XOtherFile = 317;
-}
diff --git a/gdb/testsuite/gdb.cp/overload.cc b/gdb/testsuite/gdb.cp/overload.cc
deleted file mode 100644
index a41e14dc198..00000000000
--- a/gdb/testsuite/gdb.cp/overload.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-#include <stddef.h>
-
-class foo {
-public:
-  foo  (int);
-  foo  (int, const char *);
-  foo  (foo&);
-  ~foo ();
-  void foofunc (int);
-  void foofunc (int, signed char *);
-  int ifoo;
-  const char *ccpfoo;
-
-int overload1arg (void);
-int overload1arg (char);         
-int overload1arg (signed char);
-int overload1arg (unsigned char);
-int overload1arg (short);
-int overload1arg (unsigned short);
-int overload1arg (int);
-int overload1arg (unsigned int);
-int overload1arg (long);
-int overload1arg (unsigned long);
-int overload1arg (float);
-int overload1arg (double);
-
-int overloadfnarg (void);
-int overloadfnarg (int);
-int overloadfnarg (int, int (*) (int));
-
-int overloadargs (int a1);
-int overloadargs (int a1, int a2);
-int overloadargs (int a1, int a2, int a3);
-int overloadargs (int a1, int a2, int a3, int a4);
-int overloadargs (int a1, int a2, int a3, int a4, int a5);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9, int a10);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9, int a10, int a11);
-
-
-};
-
-int intToChar (char c)
-{
-  return 297;
-}
-
-void marker1()
-{}
-
-// Now test how overloading and namespaces interact.
-
-class dummyClass {};
-
-dummyClass dummyInstance;
-
-int overloadNamespace(int i)
-{
-  return 1;
-}
-
-int overloadNamespace(dummyClass d)
-{
-  return 2;
-}
-
-namespace XXX {
-  int overloadNamespace (char c)
-  {
-    return 3;
-  }
-
-  void marker2() {}
-}
-
-int main () 
-{
-    char arg2 = 2;
-    signed char arg3 =3;
-    unsigned char arg4 =4;
-    short arg5 =5;
-    unsigned short arg6 =6;
-    int arg7 =7;
-    unsigned int arg8 =8;
-    long arg9 =9;
-    unsigned long arg10 =10;
-    float arg11 =100.0;
-    double arg12 = 200.0;
-
-    char *str = (char *) "A";
-    foo foo_instance1(111);
-    foo foo_instance2(222, str);
-    foo foo_instance3(foo_instance2);
-
-    #ifdef usestubs
-       set_debug_traps();
-       breakpoint();
-    #endif
-
-    // Verify that intToChar should work:
-    intToChar(1);
-
-    marker1(); // marker1-returns-here
-    XXX::marker2(); // marker1-returns-here
-    return 0;
-}
-
-foo::foo  (int i)                  { ifoo = i; ccpfoo = NULL; }
-foo::foo  (int i, const char *ccp) { ifoo = i; ccpfoo = ccp; }
-foo::foo  (foo& afoo)              { ifoo = afoo.ifoo; ccpfoo = afoo.ccpfoo;}
-foo::~foo ()                       {}
-
-
-/* Some functions to test overloading by varying one argument type. */
-
-int foo::overload1arg (void)                {  return 1; }
-int foo::overload1arg (char arg)            { arg = 0; return 2;}
-int foo::overload1arg (signed char arg)     { arg = 0; return 3;}
-int foo::overload1arg (unsigned char arg)   { arg = 0; return 4;}
-int foo::overload1arg (short arg)           { arg = 0; return 5;}
-int foo::overload1arg (unsigned short arg)  { arg = 0; return 6;}
-int foo::overload1arg (int arg)             { arg = 0; return 7;}
-int foo::overload1arg (unsigned int arg)    { arg = 0; return 8;}
-int foo::overload1arg (long arg)            { arg = 0; return 9;}
-int foo::overload1arg (unsigned long arg)   { arg = 0; return 10;}
-int foo::overload1arg (float arg)           { arg = 0; return 11;}
-int foo::overload1arg (double arg)          { arg = 0; return 12;}
-
-/* Test to see that we can explicitly request overloaded functions
-   with function pointers in the prototype. */
-
-int foo::overloadfnarg (void) { return ifoo * 20; }
-int foo::overloadfnarg (int arg) { arg = 0; return 13;}
-int foo::overloadfnarg (int arg, int (*foo) (int))    { return foo(arg); } 
-
-/* Some functions to test overloading by varying argument count. */
-
-int foo::overloadargs (int a1)                 
-{ a1 = 0; 
-return 1;}
-
-int foo::overloadargs (int a1, int a2)          
-{ a1 = a2 = 0; 
-return 2;}
-
-int foo::overloadargs (int a1, int a2, int a3)              
-{ a1 = a2 = a3 = 0; 
-return 3;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4)
-{ a1 = a2 = a3 = a4 = 0; 
-return 4;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5)
-{ a1 = a2 = a3 = a4 = a5 = 0; 
-return 5;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6)
-{ a1 = a2 = a3 = a4 = a5 = a6 = 0; 
-return 6;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7)
-{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = 0; 
-return 7;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8)
-{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = 0; 
-return 8;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9)
-{ 
-  a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 = 0; 
-  return 9;
-}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9, int a10)
-                        { a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 =
-                          a10 = 0; return 10;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9, int a10, int a11)
-                        { a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 =
-                          a10 = a11 = 0; return 11;}
-
-
-
diff --git a/gdb/testsuite/gdb.cp/overload.exp b/gdb/testsuite/gdb.cp/overload.exp
deleted file mode 100644
index b09c58e3859..00000000000
--- a/gdb/testsuite/gdb.cp/overload.exp
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# written by Elena Zannoni (ezannoni@cygnus.com)
-# Rewritten by Michael Chastain <mec.gnu@mindspring.com>
-
-# This file is part of the gdb testsuite
-
-# Tests for overloaded member functions.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set ws "\[\r\n\t \]+"
-set nl "\[\r\n\]+"
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "overload"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Set it up at a breakpoint so we can play with the variable values.
-
-if ![runto 'marker1'] then {
-    perror "couldn't run to marker1"
-    continue
-}
-
-gdb_test "up" ".*main.*" "up from marker1"
-
-# Print the monster class type.
-# See virtfunc.exp for a discussion of ptype.
-#
-# This is hairy to begin with.  It is even more hairy because of the
-# XX_* alternate patterns to catch the KFAIL and XFAIL cases.
-
-set re_class	"((struct|class) foo \{${ws}public:|struct foo \{)"
-set re_fields	"int ifoo;${ws}const char ?\\* ?ccpfoo;"
-set XX_fields  	"int ifoo;${ws}char ?\\* ?ccpfoo;"
-set re_ctor	"foo\\(int\\);${ws}foo\\(int, (char const|const char) ?\\*\\);${ws}foo\\(foo ?&\\);"
-set re_dtor	"~foo\\((void|)\\);"
-set XX_dtor	"~foo\\(int\\);"
-set re_methods	                  "void foofunc\\(int\\);"
-set re_methods	"${re_methods}${ws}void foofunc\\(int, signed char ?\\*\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\((void|)\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(char\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(signed char\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(unsigned char\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(short\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(unsigned short\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(int\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(unsigned int\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(long\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(unsigned long\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(float\\);"
-set re_methods	"${re_methods}${ws}int overload1arg\\(double\\);"
-set re_methods	"${re_methods}${ws}int overloadfnarg\\((void|)\\);"
-set re_methods	"${re_methods}${ws}int overloadfnarg\\(int\\);"
-set re_methods	"${re_methods}${ws}int overloadfnarg\\(int, int ?\\(\\*\\) ?\\(int\\)\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int, int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int, int, int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int, int, int, int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int, int, int, int, int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int, int, int, int, int, int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int, int, int, int, int, int, int, int\\);"
-set re_methods	"${re_methods}${ws}int overloadargs\\(int, int, int, int, int, int, int, int, int, int, int\\);"
-set re_synth	"foo & operator=\\(foo const ?&\\);"
-
-gdb_test "print foo_instance1" "\\$\[0-9\]+ = \{ifoo = 111, ccpfoo = 0x0\}"
-
-gdb_test_multiple "ptype foo_instance1" "ptype foo_instance1" {
-    -re "type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$re_dtor${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gcc 2.95.3 -gdwarf-2
-	# TODO: this is not a quirk!
-	pass "ptype foo_instance1 (HP aCC -- known quirk with ~foo parameter list)"
-    }
-    -re "type = $re_class${ws}$XX_fields${ws}$re_synth${ws}$re_dtor${ws}$re_ctor${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gcc 2.95.3 -gstabs+, no "const" on "const char *"
-	# TODO: gdb.base/constvar.exp has XFAILed this kind of problem for a
-	# long time, but an XFAIL really needs an external bug report.
-	# -- chastain 2003-12-31
-	# setup_xfail "*-*-*"
-	# fail "ptype foo_instance1"
-	# TODO: this should be a KFAIL.
-	pass "ptype foo_instance1 (shorter match)"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_synth${ws}$re_dtor${ws}$re_ctor${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gcc 2.95.3 -gstabs+ if "const char *" ever gets fixed
-	pass "ptype foo_instance1"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$XX_dtor${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gcc 3.3.2 -gdwarf-2, "~foo(int)"
-	# TODO: kfail this
-	# kfail "gdb/1113" "ptype foo_instance1"
-	pass "ptype foo_instance1 (shorter match)"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$re_dtor${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gcc 3.3.2 -gdwarf-2, if the dtor bug gets fixed
-	# gcc HEAD -gdwarf-2 (abi-2)
-	# TODO: just pass this
-	pass "ptype foo_instance1 (shorter match)"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_synth${ws}$re_ctor${ws}$re_dtor${ws}$re_methods$nl\}$nl$gdb_prompt $" {
-	# gcc 3.3.2 -gstabs+
-	# TODO: enough with the "shorter match"
-	pass "ptype foo_instance1 (shorter match)"
-    }
-    -re "type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$re_dtor${ws}$re_methods${ws}$re_synth$nl\}$nl$gdb_prompt $" {
-	# gcc HEAD -gstabs+ (abi-2)
-	pass "ptype foo_instance1 (shorter match)"
-    }
-}
-
-# Print variables and method calls.
-# This is a walk in the park.
-
-gdb_test "print foo_instance2" "\\$\[0-9\]+ = \{ifoo = 222, ccpfoo = $hex \"A\"\}"
-gdb_test "print foo_instance3" "\\$\[0-9\]+ = \{ifoo = 222, ccpfoo = $hex \"A\"\}"
-
-gdb_test "print foo_instance1.overloadargs(1)" "\\$\[0-9\]+ = 1" \
-    "print call overloaded func 1 arg"
-
-# If GDB fails to restore the selected frame properly after the
-# inferior function call above (see GDB PR 1155 for an explanation of
-# why this might happen), all the subsequent tests will fail.  We
-# should detect and report that failure, but let the marker call
-# finish so that the rest of the tests can run undisturbed.
-
-gdb_test_multiple "frame" "re-selected 'main' frame after inferior call" {
-    -re "#0  marker1.*$gdb_prompt $" {
-        setup_kfail "gdb/1155" s390-*-linux-gnu
-        fail "re-selected 'main' frame after inferior call"
-        gdb_test "finish" ".*main.*at .*overload.cc:.*// marker1-returns-here.*" \
-            "finish call to marker1"
-    }
-    -re "#1  ($hex in )?main.*$gdb_prompt $" {
-        pass "re-selected 'main' frame after inferior call"
-    }
-}
-
-gdb_test "print foo_instance1.overloadargs(1, 2)" \
-    "\\$\[0-9\]+ = 2" \
-    "print call overloaded func 2 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3)" \
-    "\\$\[0-9\]+ = 3" \
-    "print call overloaded func 3 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3, 4)" \
-    "\\$\[0-9\]+ = 4" \
-    "print call overloaded func 4 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3, 4, 5)" \
-    "\\$\[0-9\]+ = 5" \
-    "print call overloaded func 5 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6)" \
-    "\\$\[0-9\]+ = 6" \
-    "print call overloaded func 6 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7)" \
-    "\\$\[0-9\]+ = 7" \
-    "print call overloaded func 7 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8)" \
-    "\\$\[0-9\]+ = 8" \
-    "print call overloaded func 8 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9)" \
-    "\\$\[0-9\]+ = 9" \
-    "print call overloaded func 9 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)" \
-    "\\$\[0-9\]+ = 10" \
-    "print call overloaded func 10 args"
-
-gdb_test "print foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)" \
-    "\\$\[0-9\]+ = 11" \
-    "print call overloaded func 11 args"
-
-gdb_test "print foo_instance1.overload1arg()" \
-    "\\$\[0-9\]+ = 1" \
-    "print call overloaded func void arg"
-
-gdb_test "print foo_instance1.overload1arg((char)arg2)" \
-    "\\$\[0-9\]+ = 2" \
-    "print call overloaded func char arg"
-
-gdb_test "print foo_instance1.overload1arg((signed char)arg3)" \
-    "\\$\[0-9\]+ = 3" \
-    "print call overloaded func signed char arg"
-
-gdb_test "print foo_instance1.overload1arg((unsigned char)arg4)" \
-    "\\$\[0-9\]+ = 4" \
-    "print call overloaded func unsigned char arg"
-
-gdb_test "print foo_instance1.overload1arg((short)arg5)" \
-    "\\$\[0-9\]+ = 5" \
-    "print call overloaded func short arg"
-
-gdb_test "print foo_instance1.overload1arg((unsigned short)arg6)" \
-    "\\$\[0-9\]+ = 6" \
-    "print call overloaded func unsigned short arg"
-
-gdb_test "print foo_instance1.overload1arg((int)arg7)" \
-    "\\$\[0-9\]+ = 7" \
-    "print call overloaded func int arg"
-
-gdb_test "print foo_instance1.overload1arg((unsigned int)arg8)" \
-    "\\$\[0-9\]+ = 8" \
-    "print call overloaded func unsigned int arg"
-
-gdb_test "print foo_instance1.overload1arg((long)arg9)" \
-    "\\$\[0-9\]+ = 9" \
-    "print call overloaded func long arg"
-
-gdb_test "print foo_instance1.overload1arg((unsigned long)arg10)" \
-    "\\$\[0-9\]+ = 10" \
-    "print call overloaded func unsigned long arg"
-
-gdb_test "print foo_instance1.overload1arg((float)arg11)" \
-    "\\$\[0-9\]+ = 11" \
-    "print call overloaded func float arg"
-
-gdb_test "print foo_instance1.overload1arg((double)arg12)" \
-    "\\$\[0-9\]+ = 12" \
-    "print call overloaded func double arg"
-
-# ---
-
-# List overloaded functions.
-
-# The void case is tricky because some compilers say "(void)"
-# and some compilers say "()".
-
-gdb_test "set listsize 1" "" ""
-gdb_test_multiple "info func overloadfnarg" "list overloaded function with no args" {
-    -re ".*overloadfnarg\\(void\\).*$gdb_prompt $" {
-	# gcc 2
-	gdb_test "list foo::overloadfnarg(void)"\
-		".*int foo::overloadfnarg.*\\(void\\).*" \
-		"list overloaded function with no args"
-    }
-    -re ".*overloadfnarg\\(\\).*$gdb_prompt $" {
-	# gcc 3
-	gdb_test "list foo::overloadfnarg()"\
-		".*int foo::overloadfnarg.*\\(void\\).*" \
-		"list overloaded function with no args"
-    }
-}
-
-gdb_test "list foo::overloadfnarg(int)" \
-    "int foo::overloadfnarg.*\\(int arg\\).*" \
-   "list overloaded function with int arg"
-
-gdb_test "list foo::overloadfnarg(int, int (*)(int))" \
-   "int foo::overloadfnarg.*\\(int arg, int \\(\\*foo\\) \\(int\\)\\).*" \
-   "list overloaded function with function ptr args"
-
-gdb_test "list \"foo::overloadfnarg(int, int (*)(int))\"" \
-   "int foo::overloadfnarg.*\\(int arg, int \\(\\*foo\\) \\(int\\)\\).*" \
-   "list overloaded function with function ptr args - quotes around argument"
-
-# Now some tests to see how overloading and namespaces interact.
-
-gdb_test "print overloadNamespace(1)" ".\[0-9\]* = 1"
-gdb_test "print overloadNamespace('a')" ".\[0-9\]* = 1"
-gdb_test "print overloadNamespace(dummyInstance)" ".\[0-9\]* = 2"
-
-if ![runto 'XXX::marker2'] then {
-    perror "couldn't run to XXX::marker2"
-    continue
-}
-
-gdb_test "print overloadNamespace(1)" ".\[0-9\]* = 3" "print overloadNamespace(1) in XXX"
-gdb_test "print overloadNamespace('a')" ".\[0-9\]* = 3" "print overloadNamespace('a') in XXX"
-gdb_test "print overloadNamespace(dummyInstance)" ".\[0-9\]* = 2" "print overloadNamespace(dummyInstance) in XXX"
-
-# One last mysterious test.
-# I wonder what this is for?
-
-gdb_test "print intToChar(1)" "\\$\[0-9\]+ = 297"
diff --git a/gdb/testsuite/gdb.cp/ovldbreak.cc b/gdb/testsuite/gdb.cp/ovldbreak.cc
deleted file mode 100644
index 9a5b5cbf7c7..00000000000
--- a/gdb/testsuite/gdb.cp/ovldbreak.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-#include <stddef.h>
-
-class foo {
-public:
-  foo  (int);
-  foo  (int, const char *);
-  foo  (foo&);
-  ~foo ();
-  void foofunc (int);
-  void foofunc (int, signed char *);
-  int ifoo;
-  const char *ccpfoo;
-
-int overload1arg (void);
-int overload1arg (char);         
-int overload1arg (signed char);
-int overload1arg (unsigned char);
-int overload1arg (short);
-int overload1arg (unsigned short);
-int overload1arg (int);
-int overload1arg (unsigned int);
-int overload1arg (long);
-int overload1arg (unsigned long);
-int overload1arg (float);
-int overload1arg (double);
-
-int overloadargs (int a1);
-int overloadargs (int a1, int a2);
-int overloadargs (int a1, int a2, int a3);
-int overloadargs (int a1, int a2, int a3, int a4);
-int overloadargs (int a1, int a2, int a3, int a4, int a5);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9, int a10);
-int overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9, int a10, int a11);
-
-
-};
-
-void marker1()
-{}
-
-int main () 
-{
-    char arg2 = 2;
-    signed char arg3 =3;
-    unsigned char arg4 =4;
-    short arg5 =5;
-    unsigned short arg6 =6;
-    int arg7 =7;
-    unsigned int arg8 =8;
-    long arg9 =9;
-    unsigned long arg10 =10;
-    float arg11 =100.0;
-    double arg12 = 200.0;
-
-    char ch='A';
-    foo foo_instance1(111);
-    foo foo_instance2(222, &ch);
-    foo foo_instance3(foo_instance2);
-
-    foo_instance1.overload1arg();
-    foo_instance1.overload1arg(arg2);
-    foo_instance1.overload1arg(arg3);
-    foo_instance1.overload1arg(arg4);
-    foo_instance1.overload1arg(arg5);
-    foo_instance1.overload1arg(arg6);
-    foo_instance1.overload1arg(arg7);
-    foo_instance1.overload1arg(arg8);
-    foo_instance1.overload1arg(arg9);
-    foo_instance1.overload1arg(arg10);
-    foo_instance1.overload1arg(arg11);
-    foo_instance1.overload1arg(arg12);
-
-    foo_instance1.overloadargs(1);
-    foo_instance1.overloadargs(1, 2);
-    foo_instance1.overloadargs(1, 2, 3);
-    foo_instance1.overloadargs(1, 2, 3, 4);
-    foo_instance1.overloadargs(1, 2, 3, 4, 5);
-    foo_instance1.overloadargs(1, 2, 3, 4, 5, 6);
-    foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7);
-    foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8);
-    foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9);
-    foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-    foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
-   
-
-    #ifdef usestubs
-       set_debug_traps();
-       breakpoint();
-    #endif
-
-
-    marker1();
-    return 0; 
-}
-
-foo::foo  (int i)                  { ifoo = i;}
-foo::foo  (int i, const char *ccp) { ifoo = i; ccpfoo = ccp; }
-foo::foo  (foo& afoo)              { ifoo = afoo.ifoo; ccpfoo = afoo.ccpfoo;}
-foo::~foo ()                       {}
-
-
-/* Some functions to test overloading by varying one argument type. */
-
-int foo::overload1arg (void)                {  return 1; }
-int foo::overload1arg (char arg)            { arg = 0; return 2;}
-int foo::overload1arg (signed char arg)     { arg = 0; return 3;}
-int foo::overload1arg (unsigned char arg)   { arg = 0; return 4;}
-int foo::overload1arg (short arg)           { arg = 0; return 5;}
-int foo::overload1arg (unsigned short arg)  { arg = 0; return 6;}
-int foo::overload1arg (int arg)             { arg = 0; return 7;}
-int foo::overload1arg (unsigned int arg)    { arg = 0; return 8;}
-int foo::overload1arg (long arg)            { arg = 0; return 9;}
-int foo::overload1arg (unsigned long arg)   { arg = 0; return 10;}
-int foo::overload1arg (float arg)           { arg = 0; return 11;}
-int foo::overload1arg (double arg)          { arg = 0; return 12;}
-
-
-/* Some functions to test overloading by varying argument count. */
-
-int foo::overloadargs (int a1)                 
-{ a1 = 0; 
-return 1;}
-
-int foo::overloadargs (int a1, int a2)          
-{ a1 = a2 = 0; 
-return 2;}
-
-int foo::overloadargs (int a1, int a2, int a3)              
-{ a1 = a2 = a3 = 0; 
-return 3;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4)
-{ a1 = a2 = a3 = a4 = 0; 
-return 4;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5)
-{ a1 = a2 = a3 = a4 = a5 = 0; 
-return 5;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6)
-{ a1 = a2 = a3 = a4 = a5 = a6 = 0; 
-return 6;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7)
-{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = 0; 
-return 7;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8)
-{ a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = 0; 
-return 8;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9)
-{ 
-  a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 = 0; 
-  return 9;
-}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9, int a10)
-                        { a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 =
-                          a10 = 0; return 10;}
-
-int foo::overloadargs (int a1, int a2, int a3, int a4, int a5, int a6, int a7,
-                   int a8, int a9, int a10, int a11)
-                        { a1 = a2 = a3 = a4 = a5 = a6 = a7 = a8 = a9 =
-                          a10 = a11 = 0; return 11;}
-
-
-
diff --git a/gdb/testsuite/gdb.cp/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp
deleted file mode 100644
index fefe7812fed..00000000000
--- a/gdb/testsuite/gdb.cp/ovldbreak.exp
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright (C) 1998, 1999, 2001, 2004 Free Software Foundation, 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.  
-
-# written by Elena Zannoni (ezannoni@cygnus.com)
-# modified by Michael Chastain (chastain@redhat.com)
-
-# This file is part of the gdb testsuite
-#
-# tests for overloaded member functions. Set breakpoints on
-# overloaded member functions
-#
-
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "ovldbreak"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-
-
-# When I ask gdb to set a breakpoint on an overloaded function,
-# gdb gives me a choice menu.  I might get stuck in that choice menu
-# (for example, if C++ name mangling is not working properly).
-#
-# This procedure issues a command that works at either the menu
-# prompt or the command prompt to get back to the command prompt.
-#
-# Note that an empty line won't do it (it means 'repeat the previous command'
-# at top level).  A line with a single space in it works nicely.
-
-proc take_gdb_out_of_choice_menu {} {
-    global gdb_prompt
-    send_gdb " \n"
-    gdb_expect {
-        -re ".*$gdb_prompt $" {
-        }
-        timeout {
-            perror "could not resynchronize to command prompt (timeout)"
-            continue
-        }
-    }
-}
-
-
-
-# This procedure sets an overloaded breakpoint.
-# When I ask for such a breakpoint, gdb gives me a menu of 'cancel' 'all'
-# and a bunch of choices.  I then choose from that menu by number.
-
-proc set_bp_overloaded {name expectedmenu mychoice bpnumber linenumber} {
-    global gdb_prompt hex srcfile
-
-    # Get into the overload menu.
-    send_gdb "break $name\n"
-    gdb_expect {
-        -re "$expectedmenu" {
-            pass "bp menu for $name choice $mychoice"
-
-            # Choose my choice.
-            send_gdb "$mychoice\n"
-            gdb_expect {
-                -re "Breakpoint $bpnumber at $hex: file.*$srcfile, line $linenumber.\r\n$gdb_prompt $" {
-                    pass "set bp $bpnumber on $name $mychoice line $linenumber"
-                }
-                -re ".*$gdb_prompt $" {
-                    fail "set bp $bpnumber on $name $mychoice line $linenumber (bad bp)"
-                }
-                timeout {
-                    fail "set bp $bpnumber on $name $mychoice line $linenumber (timeout)"
-                    take_gdb_out_of_choice_menu
-                }
-            }
-        }
-        -re ".*\r\n> " {
-            fail "bp menu for $name choice $mychoice (bad menu)"
-            take_gdb_out_of_choice_menu
-        }
-        -re ".*$gdb_prompt $" {
-            fail "bp menu for $name choice $mychoice (no menu)"
-        }
-        timeout {
-            fail "bp menu for $name choice $mychoice (timeout)"
-            take_gdb_out_of_choice_menu
-        }
-    }
-}
-
-# This is the expected menu for overload1arg.
-# Note the arg type variations on lines 6 and 13.
-# This accommodates different versions of g++.
-
-set menu_overload1arg "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] foo::overload1arg\\(double\\) at.*$srcfile:121\r\n\\\[3\\\] foo::overload1arg\\(float\\) at.*$srcfile:120\r\n\\\[4\\\] foo::overload1arg\\(unsigned long\\) at.*$srcfile:119\r\n\\\[5\\\] foo::overload1arg\\(long\\) at.*$srcfile:118\r\n\\\[6\\\] foo::overload1arg\\((unsigned int|unsigned)\\) at.*$srcfile:117\r\n\\\[7\\\] foo::overload1arg\\(int\\) at.*$srcfile:116\r\n\\\[8\\\] foo::overload1arg\\(unsigned short\\) at.*$srcfile:115\r\n\\\[9\\\] foo::overload1arg\\(short\\) at.*$srcfile:114\r\n\\\[10\\\] foo::overload1arg\\(unsigned char\\) at.*$srcfile:113\r\n\\\[11\\\] foo::overload1arg\\(signed char\\) at.*$srcfile:112\r\n\\\[12\\\] foo::overload1arg\\(char\\) at.*$srcfile:111\r\n\\\[13\\\] foo::overload1arg\\((void|)\\) at.*$srcfile:110\r\n> $"
-
-
-
-# Set breakpoints on foo::overload1arg, one by one.
-
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg" 12    2 111
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg" 11    3 112
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg" 10    4 113
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg"  9    5 114
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg"  8    6 115
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg"  7    7 116
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg"  6    8 117
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg"  5    9 118
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg"  4   10 119
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg"  3   11 120
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg"  2   12 121
-set_bp_overloaded "foo::overload1arg" "$menu_overload1arg" 13   13 110
-
-
-
-# Verify the breakpoints.
-
-gdb_test "info break" \
-    "Num Type\[\t \]+Disp Enb Address\[\t \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in main at.*$srcfile:49\r
-\[\t \]+breakpoint already hit 1 time\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(char\\) at.*$srcfile:111\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(signed char\\) at.*$srcfile:112\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned char\\) at.*$srcfile:113\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(short\\) at.*$srcfile:114\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned short\\) at.*$srcfile:115\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(int\\) at.*$srcfile:116\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\((unsigned|unsigned int)\\) at.*$srcfile:117\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(long\\) at.*$srcfile:118\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned long\\) at.*$srcfile:119\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(float\\) at.*$srcfile:120\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(double\\) at.*$srcfile:121\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\((void|)\\) at.*$srcfile:110" \
-    "breakpoint info (after setting one-by-one)"
-
-
-
-# Test choice "cancel".
-# This is copy-and-paste from set_bp_overloaded.
-
-send_gdb "break foo::overload1arg\n" 
-gdb_expect {
-    -re "$menu_overload1arg" {
-        pass "bp menu for foo::overload1arg choice cancel"
-        # Choose cancel.
-        send_gdb "0\n"
-        gdb_expect {
-            -re "canceled\r\n$gdb_prompt $" {
-                pass "set bp on overload1arg canceled"
-            }
-	    -re "cancelled\r\n$gdb_prompt $" {
-		pass "set bp on overload1arg canceled"
-	    }
-            -re ".*$gdb_prompt $" {
-                fail "set bp on overload1arg canceled (bad message)"
-            }
-            timeout {
-                fail "set bp on overload1arg canceled (timeout)"
-                take_gdb_out_of_choice_menu
-            }
-        }
-    }
-    -re ".*\r\n> " {
-        fail "bp menu for foo::overload1arg choice cancel (bad menu)"
-        take_gdb_out_of_choice_menu
-    }
-    -re ".*$gdb_prompt $" {
-        fail "bp menu for foo::overload1arg choice cancel (no menu)"
-    }
-    timeout {
-        fail "bp menu for foo::overload1arg choice cancel (timeout)"
-        take_gdb_out_of_choice_menu
-    }
-}
-
-gdb_test "info break" \
-    "Num Type\[\t \]+Disp Enb Address\[\t \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in main at.*$srcfile:49\r
-\[\t \]+breakpoint already hit 1 time\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(char\\) at.*$srcfile:111\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(signed char\\) at.*$srcfile:112\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned char\\) at.*$srcfile:113\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(short\\) at.*$srcfile:114\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned short\\) at.*$srcfile:115\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(int\\) at.*$srcfile:116\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\((unsigned|unsigned int)\\) at.*$srcfile:117\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(long\\) at.*$srcfile:118\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned long\\) at.*$srcfile:119\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(float\\) at.*$srcfile:120\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(double\\) at.*$srcfile:121\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\((void|)\\) at.*$srcfile:110" \
-    "breakpoint info (after cancel)"
-
-
-
-# Delete these breakpoints.
-
-send_gdb "delete breakpoints\n"
-gdb_expect {
-    -re "Delete all breakpoints.* $" {
-        send_gdb "y\n"
-        gdb_expect {
-            -re ".*$gdb_prompt $" {
-                pass "delete all breakpoints"
-            }
-            timeout {
-                fail "delete all breakpoints (timeout)"
-            }
-        }
-    }
-    timeout {
-        fail "delete all breakpoints (timeout)"
-    }
-}
-
-gdb_test "info breakpoints" "No breakpoints or watchpoints." "breakpoint info (after delete)"
-
-
-
-# Test choice "all".
-# This is copy-and-paste from set_bp_overloaded.
-
-send_gdb "break foo::overload1arg\n" 
-gdb_expect {
-    -re "$menu_overload1arg" {
-        pass "bp menu for foo::overload1arg choice all"
-        # Choose all.
-        send_gdb "1\n"
-        gdb_expect {
-            -re "Breakpoint $decimal at $hex: file.*$srcfile, line 121.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 120.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 119.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 118.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 117.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 116.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 115.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 114.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 113.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 112.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 111.\r\nBreakpoint $decimal at $hex: file.*$srcfile, line 110.\r\nwarning: Multiple breakpoints were set.\r\nUse the .delete. command to delete unwanted breakpoints.\r\n$gdb_prompt $" {
-                pass "set bp on overload1arg all"
-            }
-            -re ".*$gdb_prompt $" {
-                fail "set bp on overload1arg all (bad message)"
-            }
-            timeout {
-                fail "set bp on overload1arg all (timeout)"
-                take_gdb_out_of_choice_menu
-            }
-        }
-    }
-    -re ".*\r\n> " {
-        fail "bp menu for foo::overload1arg choice all (bad menu)"
-        take_gdb_out_of_choice_menu
-    }
-    -re ".*$gdb_prompt $" {
-        fail "bp menu for foo::overload1arg choice all (no menu)"
-    }
-    timeout {
-        fail "bp menu for foo::overload1arg choice all (timeout)"
-        take_gdb_out_of_choice_menu
-    }
-}
-
-gdb_test "info break" \
-    "Num Type\[\t \]+Disp Enb Address\[\t \]+What.*
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(double\\) at.*$srcfile:121\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(float\\) at.*$srcfile:120\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned long\\) at.*$srcfile:119\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(long\\) at.*$srcfile:118\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\((unsigned|unsigned int)\\) at.*$srcfile:117\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(int\\) at.*$srcfile:116\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned short\\) at.*$srcfile:115\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(short\\) at.*$srcfile:114\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(unsigned char\\) at.*$srcfile:113\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(signed char\\) at.*$srcfile:112\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\(char\\) at.*$srcfile:111\r
-\[0-9\]+\[\t \]+breakpoint     keep y\[\t \]+$hex\[\t \]+in foo::overload1arg\\((void|)\\) at.*$srcfile:110" \
-    "breakpoint info (after setting on all)"
-
-
-
-# Run through each breakpoint.
-
-# NOTE: carlton/2003-02-03: I'm seeing failures on some of the tests,
-# with the wrong arg being printed out.  Michael Chastain sees
-# failures at times, too, albeit fewer than I do.
-
-proc continue_to_bp_overloaded {might_kfail bpnumber argtype actuals} {
-    global gdb_prompt hex decimal srcfile 
-
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "Continuing.\r\n\r\nBreakpoint ${bpnumber}, (${hex} in )?foo::overload1arg(\\(${argtype}\\))? \\(this=${hex}(, )?${actuals}\\) at.*${srcfile}:${decimal}\r\n${decimal}\[\t \]+int foo::overload1arg \\(${argtype}( arg)?\\).*\r\n.*$gdb_prompt $" {
-	    pass "continue to bp overloaded : ${argtype}"
-	}
-	-re "Continuing.\r\n\r\nBreakpoint ${bpnumber}, (${hex} in )?foo::overload1arg(\\(${argtype}\\))? \\(this=${hex}, arg=.*\\) at.*${srcfile}:${decimal}\r\n${decimal}\[\t \]+int foo::overload1arg \\(${argtype}( arg)?\\).*\r\n.*$gdb_prompt $" {
-	    if $might_kfail {
-		kfail "gdb/1025" "continue to bp overloaded : ${argtype}"
-	    } else {
-		fail "continue to bp overloaded : ${argtype}"
-	    }
-	}
-        -re ".*$gdb_prompt $" {
-	    fail "continue to bp overloaded : ${argtype}" 
-	}
-        timeout {
-	    fail "continue to bp overloaded : ${argtype} (timeout)"
-	}
-    }
-}
-
-continue_to_bp_overloaded 0 25 "(void|)" ""
-continue_to_bp_overloaded 1 24 "char" "arg=2 \\'\\\\002\\'"
-continue_to_bp_overloaded 1 23 "signed char" "arg=3 \\'\\\\003\\'"
-continue_to_bp_overloaded 1 22 "unsigned char" "arg=4 \\'\\\\004\\'"
-continue_to_bp_overloaded 1 21 "short" "arg=5"
-continue_to_bp_overloaded 1 20 "unsigned short" "arg=6"
-continue_to_bp_overloaded 0 19 "int" "arg=7"
-continue_to_bp_overloaded 0 18 "(unsigned|unsigned int)" "arg=8"
-continue_to_bp_overloaded 0 17 "long" "arg=9"
-continue_to_bp_overloaded 0 16 "unsigned long" "arg=10"
-continue_to_bp_overloaded 0 15 "float" "arg=100"
-continue_to_bp_overloaded 1 14 "double" "arg=200"
-
-
-
-# That's all, folks.
-
-gdb_continue_to_end "finish program"
diff --git a/gdb/testsuite/gdb.cp/pr-1023.cc b/gdb/testsuite/gdb.cp/pr-1023.cc
deleted file mode 100644
index 758308481dc..00000000000
--- a/gdb/testsuite/gdb.cp/pr-1023.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-class myClass
-{
-  public:
-    myClass() {};
-    ~myClass() {};
-    void performUnblocking( short int cell_index );
-    void performBlocking( int cell_index );
-};
-
-void myClass::performUnblocking( short int cell_index ) {}
-
-void myClass::performBlocking( int cell_index ) {}
-
-int main ()
-{
-  myClass mc;
-  mc.performBlocking (0);
-  mc.performUnblocking (0);
-}
-
diff --git a/gdb/testsuite/gdb.cp/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp
deleted file mode 100644
index c8c98027471..00000000000
--- a/gdb/testsuite/gdb.cp/pr-1023.exp
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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.  
-
-# Tests for PR gdb/1023.
-# 2003-02-03  Michael Chastain <mec@shout.net>
-
-# This file is part of the gdb testsuite.
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "pr-1023"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-send_gdb "break myClass::performBlocking\n"
-gdb_expect {
-    -re "Breakpoint $decimal at $hex: file .*$srcfile, line 12.*$gdb_prompt $" {
-	pass "break myClass::performBlocking"
-    }
-    -re "the class myClass does not have any method named performBlocking.*$gdb_prompt $" {
-	# fails with gcc 2.95.3 -gstabs+, native i686-pc-linux-gnu
-	# -- chastain 2003-02-03
-	kfail "gdb/1023" "break myClass::performBlocking"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "break myClass::performBlocking"
-    }
-    timeout {
-	fail "break myClass::performBlocking (timeout)"
-    }
-}
-
-gdb_test \
-  "break myClass::performUnblocking" \
-  "Breakpoint $decimal at $hex: file .*$srcfile, line 10.*"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/pr-1210.cc b/gdb/testsuite/gdb.cp/pr-1210.cc
deleted file mode 100644
index 5747e5da58d..00000000000
--- a/gdb/testsuite/gdb.cp/pr-1210.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-class A
-{
-};
-
-class B : virtual public A
-{
-};
-
-class C : public A
-{
-     protected:
-         B myB;
-};
-
-int main()
-{
-     C *obj = new C();
-     return 0;
-}
diff --git a/gdb/testsuite/gdb.cp/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp
deleted file mode 100644
index 3ff850d121c..00000000000
--- a/gdb/testsuite/gdb.cp/pr-1210.exp
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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.  
-
-# Tests for PR gdb/1210.
-
-# This file is part of the gdb testsuite.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "pr-1210"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_test "next" ".*return 0;" "step past initialization"
-
-gdb_test_multiple "print *obj" "" {
-  -re "Cannot access memory.*$gdb_prompt $" {
-    fail "print *obj"
-  }
-  -re " = {<A> = {<No data fields>}, myB = {<A> = {<No data fields>}.*}}\r\n$gdb_prompt $" {
-    pass "print *obj"
-  }
-}
-
-gdb_test_multiple "print obj->myB" "" {
-  -re "Cannot access memory.*$gdb_prompt $" {
-    fail "print obj->myB"
-  }
-  -re " = {<A> = {<No data fields>}.*}\r\n$gdb_prompt $" {
-    pass "print obj->myB"
-  }
-}
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/pr-574.cc b/gdb/testsuite/gdb.cp/pr-574.cc
deleted file mode 100644
index ff9df6c2361..00000000000
--- a/gdb/testsuite/gdb.cp/pr-574.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2004
-   Free Software Foundation, 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.
-   */
-
-/*
-  An attempt to replicate PR gdb/574 with a shorter program.
-
-  Printing out *theB failed if the program was compiled with GCC 2.95.
-*/
-
-class A {
-public:
-  virtual void foo() {};		// Stick in a virtual function.
-  int a;				// Stick in a data member.
-};
-
-class B : public A {
-  static int b;				// Stick in a static data member.
-};
-
-int main()
-{
-  B *theB = new B;
-
-  return 0;				// breakpoint: constructs-done
-}
diff --git a/gdb/testsuite/gdb.cp/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp
deleted file mode 100644
index 5beacd10fee..00000000000
--- a/gdb/testsuite/gdb.cp/pr-574.exp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2002 Free Software Foundation, 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.  
-
-# Tests for the bug mentioned in PR gdb/574.  It's a bit
-# idiosyncratic, so I gave it its own file.
-
-# 2002-08-16  David Carlton <carlton@math.stanford.edu>
-
-# This file is part of the gdb testsuite
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "pr-574"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# First, run to after we've constructed the object:
-
-gdb_breakpoint [gdb_get_line_number "constructs-done"]
-gdb_continue_to_breakpoint "end of constructors"
-
-# This failed, as long as the code was compiled with GCC v. 2.
-
-# Different compilers order the data for <A> differently, so I'm not
-# matching the result exactly.
-
-gdb_test "print *theB" "\\$\[0-9\]* = {<A> = {\[^}\]*}, static b = <optimized out>}" "PR gdb/574"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/printmethod.cc b/gdb/testsuite/gdb.cp/printmethod.cc
deleted file mode 100644
index 6afb491ddc5..00000000000
--- a/gdb/testsuite/gdb.cp/printmethod.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2004,
-   Free Software Foundation, 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.
-   */
-
-/* Create some objects, and try to print out their methods.  */
-
-class A {
-public:
-  virtual void virt() {};
-  void nonvirt() {};
-};
-
-int main()
-{
-  A *theA = new A;
-
-  return 0;				// breakpoint: constructs-done
-}
diff --git a/gdb/testsuite/gdb.cp/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp
deleted file mode 100644
index a45393f34d9..00000000000
--- a/gdb/testsuite/gdb.cp/printmethod.exp
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2002, 2003 Free Software Foundation, 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.  
-
-# This tries to print out methods of classes.
-
-# 2002-08-16  David Carlton <carlton@math.stanford.edu>
-
-# This file is part of the gdb testsuite
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "printmethod"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# First, run to after we've constructed the object:
-
-gdb_breakpoint [gdb_get_line_number "constructs-done"]
-gdb_continue_to_breakpoint "end of constructors"
-
-# The first of these is for PR gdb/653.
-
-gdb_test "print theA->virt" "\\$\[0-9\]* = &A::virt\\((void|)\\)" "print virtual method."
-gdb_test "print theA->nonvirt" "Cannot take address of a method" "print nonvirtual method."
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/psmang.exp b/gdb/testsuite/gdb.cp/psmang.exp
deleted file mode 100644
index b13737956cc..00000000000
--- a/gdb/testsuite/gdb.cp/psmang.exp
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 2002, 2004 Free Software Foundation, 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.  
-
-# This file is part of the gdb testsuite
-
-# Looking up methods by name, in programs with multiple compilation units.
-
-# ====== PLEASE BE VERY CAREFUL WHEN CHANGING THIS TEST. =====
-#
-# The bug we're testing for (circa October 2002) is very sensitive to
-# various conditions that are hard to control directly in the test
-# suite.  If you change the test, please revert this change, and make
-# sure the test still fails:
-#
-# 2002-08-29  Jim Blandy  <jimb@redhat.com>
-# 
-# 	* symtab.c (lookup_symbol_aux): In the cases where we find a
-# 	minimal symbol of an appropriate name and use its address to
-# 	select a symtab to read and search, use `name' (as passed to us)
-# 	as the demangled name when searching the symtab's global and
-# 	static blocks, not the minsym's name.
-#
-# The original bug was that you'd try to set a breakpoint on a method
-# (e.g., `break s::method1'), and you'd get an error, but if you
-# repeated the command, it would work the second time:
-#   
-#   (gdb) break s::method1
-#   the class s does not have any method named method1
-#   Hint: try 's::method1<TAB> or 's::method1<ESC-?>
-#   (Note leading single quote.)
-#   (gdb) break s::method1
-#   Breakpoint 1 at 0x804841b: file psmang1.cc, line 13.
-#   (gdb) 
-#
-# We observed this bug first using Stabs, and then using Dwarf 2.
-#
-# The problem was in lookup_symbol_aux: when looking up s::method1, it
-# would fail to find it in any symtabs, find the minsym with the
-# corresponding mangled name (say, `_ZN1S7method1Ev'), pass the
-# minsym's address to find_pc_sect_symtab to look up the symtab
-# (causing the compilation unit's full symbols to be read in), and
-# then look up the symbol in that symtab's global block.  All that is
-# correct.  However, it would pass the minsym's name as the NAME
-# argument to lookup_block_symbol; a minsym's name is mangled, whereas
-# lookup_block_symbol's NAME argument should be demangled.
-#
-# This is a pretty simple bug, but it turns out to be a bear to
-# construct a test for.  That's why this test case is so delicate.  If
-# you can see how to make it less so, please contribute a patch.
-#
-# Here are the twists:
-#
-# The bug only manifests itself when we call lookup_symbol to look up
-# a method name (like "s::method1" or "s::method2"), and that method's
-# definition is in a compilation unit for which we have read partial
-# symbols, but not full symbols.  The partial->full conversion must be
-# caused by that specific lookup.  (If we already have full symbols
-# for the method's compilation unit, we won't need to look up the
-# minsym, find the symtab for the minsym's address, and then call
-# lookup_block_symbol; it's that last call where things go awry.)
-#
-# Now, when asked to set a breakpoint at `s::method1', GDB will first
-# look up `s' to see if that is, in fact, the name of a class, and
-# then look up 's::method1'.  So we have to make sure that looking up
-# `s' doesn't cause full symbols to be read for the compilation unit
-# containing the definition of `s::method1'.
-#
-# The partial symbol tables for `psmang1.cc' and `psmang2.cc' will
-# both have entries for `s'; GDB will read full symbols for whichever
-# compilation unit's partial symbol table appears first in the
-# objfile's list.  The order in which compilation units appear in the
-# partial symbol table list depends on how the program is linked, and
-# how the debug info reader does the partial symbol scan.  Ideally,
-# the test shouldn't rely on them appearing in any particular order.
-#
-# So, since we don't know which compilation unit's full symbols are
-# going to get read, we simply try looking up one method from each of
-# the two compilation units.  One of them has to come after the other
-# in the partial symbol table list, so whichever comes later will
-# still need its partial symbols read by the time we go to look up
-# 's::methodX'.
-#
-# Second twist: don't move the common definition of `struct s' into a
-# header file.  If the compiler emits identical stabs for the
-# #inclusion of that header file into psmang1.cc and into psmang2.cc,
-# then the linker will do stabs compression, and replace one of the
-# BINCL/EINCL regions with an EXCL stab, pointing to the other
-# BINCL/EINCL region.  GDB will read this, and record that the
-# compilation unit that got the EXCL depends on the compilation unit
-# that kept the BINCL/EINCL.  Then, when it decides it needs to read
-# full symbols for the former, it'll also read full symbols for the
-# latter.  Now, if it just so happens that the compilation unit that
-# got the EXCL is also the first one with a definition of `s' in the
-# partial symbol table list, then that first probe for `s' will cause
-# both compilation units' full symbols to be read --- again defeating
-# the test.
-#
-# We could work around this by having three compilation units, or by
-# ensuring that the header file produces different stabs each time
-# it's #included, but it seems simplest just to avoid compilation unit
-# dependencies altogether, drop the header file, and duplicate the
-# (pretty trivial) struct definition.
-#
-# Note that #including any header file at all into both compilation
-# units --- say, <stdio.h> --- could create this sort of dependency.
-#
-# This is the aspect of the test which the debug format is most likely
-# to affect, I think.  The different formats create different kinds of
-# inter-CU dependencies, which could mask the bug.  It might be
-# possible for the test to check that at least one of the partial
-# symtabs remains unread, and fail otherwise --- the failure
-# indicating that the test itself isn't going to catch the bug it was
-# meant to, not that GDB is misbehaving.
-#
-# Third twist: given the way lookup_block_symbol is written, it's
-# possible to find the symbol even when it gets passed a mangled name
-# for its NAME parameter.  There are three ways lookup_block_symbol
-# might search a block, depending on how it was constructed:
-#
-# linear search.  In this case, this bug will never manifest itself,
-# since we check every symbol against NAME using SYMBOL_MATCHES_NAME.
-# Since that macro checks its second argument (NAME) against both the
-# mangled and demangled names of the symbol, this will always find the
-# symbol successfully, so, no bug.
-#
-# hash table.  If both the mangled and demangled names hash to the
-# same bucket, then you'll again find the symbol "by accident", since
-# we search the entire bucket using SYMBOL_SOURCE_NAME.  Since GDB
-# chooses the number of buckets based on the number of symbols, small
-# compilation units may have only one hash bucket; in this case, the
-# search always succeeds, even though we hashed on the wrong name.
-# This test works around that by having a lot of dummy variables,
-# making it less likely that the mangled and demangled names fall in
-# the same bucket.
-#
-# binary search.  (GDB 5.2 produced these sorts of blocks, and this
-# test tries to detect the bug there, but subsequent versions of GDB
-# almost never build them, and they may soon be removed entirely.)  In
-# this case, the symbols in the block are sorted by their
-# SYMBOL_SOURCE_NAME (whose behavior depends on the current demangling
-# setting, so that's wrong, but let's try to stay focussed).
-# lookup_block_symbol does a binary search comparing NAME with
-# SYMBOL_SOURCE_NAME until the range has been narrowed down to only a
-# few symbols; then it starts a linear search forward from the lower
-# end of that range, until it reaches a symbol whose
-# SYMBOL_SOURCE_NAME follows NAME in lexicographic order.  This means
-# that, if you're doing a binary search for a mangled name in a block
-# sorted by SYMBOL_SOURCE_NAME, you might find the symbol `by
-# accident' if the mangled and demangled names happen to fall near
-# each other in the ordering.  The initial version of this patch used
-# a class called `S'; all the other symbols in the compilation unit
-# started with lower-case letters, so the demangled name `S::method1'
-# sorted at the same place as the mangled name `_ZN1S7method1Ev': at
-# the very beginning.  Using a lower-case 's' as the name ensures that
-# the demangled name falls after all the dummy symbols introduced for
-# the hash table, as described above.
-#
-# This is all so tortured, someone will probably come up with still
-# other ways this test could fail to do its job.  If you need to make
-# revisions, please be very careful.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "psmang"
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1;
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${testfile}1.cc" "${testfile}1.o" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${testfile}2.cc" "${testfile}2.o" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${testfile}1.o ${testfile}2.o" ${binfile} executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "break s::method1" "Breakpoint .* at .*: file .*psmang1.cc.*"
-
-# We have to exit and restart GDB here, to make sure that all the
-# compilation units are psymtabs again.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "break s::method2" "Breakpoint .* at .*: file .*psmang2.cc.*"
diff --git a/gdb/testsuite/gdb.cp/psmang1.cc b/gdb/testsuite/gdb.cp/psmang1.cc
deleted file mode 100644
index 9f19bed2e32..00000000000
--- a/gdb/testsuite/gdb.cp/psmang1.cc
+++ /dev/null
@@ -1,179 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2004,
-   Free Software Foundation, 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.
-   */
-
-/* Do not move this definition into a header file!  See the comments
-   in psmang.exp.  */
-struct s
-{
-  int value;
-  void method1 (void);
-  void method2 (void);
-};
-
-void
-s::method1 ()
-{
-  value = 42;
-}
-
-int
-main (int argc, char **argv)
-{
-  s si;
-
-  si.method1 ();
-  si.method2 ();
-}
-
-
-/* The presence of these variables ensures there will be so many
-   symbols in psmang1.cc's symtab's global block that it will have a
-   non-trivial hash table.  When there are only a very few symbols,
-   the block only has one hash bucket, so even if we compute the hash
-   value for the wrong symbol name, we'll still find a symbol that
-   matches.  */
-int ax;
-int bx;
-int a1x;
-int b1x;
-int a2x;
-int b2x;
-int a12x;
-int b12x;
-int a3x;
-int b3x;
-int a13x;
-int b13x;
-int a23x;
-int b23x;
-int a123x;
-int b123x;
-int a4x;
-int b4x;
-int a14x;
-int b14x;
-int a24x;
-int b24x;
-int a124x;
-int b124x;
-int a34x;
-int b34x;
-int a134x;
-int b134x;
-int a234x;
-int b234x;
-int a1234x;
-int b1234x;
-int a5x;
-int b5x;
-int a15x;
-int b15x;
-int a25x;
-int b25x;
-int a125x;
-int b125x;
-int a35x;
-int b35x;
-int a135x;
-int b135x;
-int a235x;
-int b235x;
-int a1235x;
-int b1235x;
-int a45x;
-int b45x;
-int a145x;
-int b145x;
-int a245x;
-int b245x;
-int a1245x;
-int b1245x;
-int a345x;
-int b345x;
-int a1345x;
-int b1345x;
-int a2345x;
-int b2345x;
-int a12345x;
-int b12345x;
-int a6x;
-int b6x;
-int a16x;
-int b16x;
-int a26x;
-int b26x;
-int a126x;
-int b126x;
-int a36x;
-int b36x;
-int a136x;
-int b136x;
-int a236x;
-int b236x;
-int a1236x;
-int b1236x;
-int a46x;
-int b46x;
-int a146x;
-int b146x;
-int a246x;
-int b246x;
-int a1246x;
-int b1246x;
-int a346x;
-int b346x;
-int a1346x;
-int b1346x;
-int a2346x;
-int b2346x;
-int a12346x;
-int b12346x;
-int a56x;
-int b56x;
-int a156x;
-int b156x;
-int a256x;
-int b256x;
-int a1256x;
-int b1256x;
-int a356x;
-int b356x;
-int a1356x;
-int b1356x;
-int a2356x;
-int b2356x;
-int a12356x;
-int b12356x;
-int a456x;
-int b456x;
-int a1456x;
-int b1456x;
-int a2456x;
-int b2456x;
-int a12456x;
-int b12456x;
-int a3456x;
-int b3456x;
-int a13456x;
-int b13456x;
-int a23456x;
-int b23456x;
-int a123456x;
-int b123456x;
diff --git a/gdb/testsuite/gdb.cp/psmang2.cc b/gdb/testsuite/gdb.cp/psmang2.cc
deleted file mode 100644
index 88e04ba4cf2..00000000000
--- a/gdb/testsuite/gdb.cp/psmang2.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2004,
-   Free Software Foundation, 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.
-   */
-
-#include <stdio.h>
-
-/* Do not move this definition into a header file!  See the comments
-   in psmang.exp.  */
-struct s
-{
-  int value;
-  void method1 (void);
-  void method2 (void);
-};
-
-void
-s::method2 (void)
-{
-  printf ("%d\n", value);
-}
-
-
-/* The presence of these variables ensures there will be so many
-   symbols in psmang2.cc's symtab's global block that it will have a
-   non-trivial hash table.  When there are only a very few symbols,
-   the block only has one hash bucket, so even if we compute the hash
-   value for the wrong symbol name, we'll still find a symbol that
-   matches.  */
-int a;
-int b;
-int a1;
-int b1;
-int a2;
-int b2;
-int a12;
-int b12;
-int a3;
-int b3;
-int a13;
-int b13;
-int a23;
-int b23;
-int a123;
-int b123;
-int a4;
-int b4;
-int a14;
-int b14;
-int a24;
-int b24;
-int a124;
-int b124;
-int a34;
-int b34;
-int a134;
-int b134;
-int a234;
-int b234;
-int a1234;
-int b1234;
-int a5;
-int b5;
-int a15;
-int b15;
-int a25;
-int b25;
-int a125;
-int b125;
-int a35;
-int b35;
-int a135;
-int b135;
-int a235;
-int b235;
-int a1235;
-int b1235;
-int a45;
-int b45;
-int a145;
-int b145;
-int a245;
-int b245;
-int a1245;
-int b1245;
-int a345;
-int b345;
-int a1345;
-int b1345;
-int a2345;
-int b2345;
-int a12345;
-int b12345;
-int a6;
-int b6;
-int a16;
-int b16;
-int a26;
-int b26;
-int a126;
-int b126;
-int a36;
-int b36;
-int a136;
-int b136;
-int a236;
-int b236;
-int a1236;
-int b1236;
-int a46;
-int b46;
-int a146;
-int b146;
-int a246;
-int b246;
-int a1246;
-int b1246;
-int a346;
-int b346;
-int a1346;
-int b1346;
-int a2346;
-int b2346;
-int a12346;
-int b12346;
-int a56;
-int b56;
-int a156;
-int b156;
-int a256;
-int b256;
-int a1256;
-int b1256;
-int a356;
-int b356;
-int a1356;
-int b1356;
-int a2356;
-int b2356;
-int a12356;
-int b12356;
-int a456;
-int b456;
-int a1456;
-int b1456;
-int a2456;
-int b2456;
-int a12456;
-int b12456;
-int a3456;
-int b3456;
-int a13456;
-int b13456;
-int a23456;
-int b23456;
-int a123456;
-int b123456;
diff --git a/gdb/testsuite/gdb.cp/ref-types.cc b/gdb/testsuite/gdb.cp/ref-types.cc
deleted file mode 100644
index 1c2f4f46cce..00000000000
--- a/gdb/testsuite/gdb.cp/ref-types.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 1999, 2004
-   Free Software Foundation, 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.
-   */
-
-int main2(void);
-
-void marker1 (void)
-{
-    
-}
-
-
-
-int main(void)
-{
-    short s;
-    short &rs = s;
-    short *ps;
-    short *&rps = ps;
-    short as[4];
-    short (&ras)[4] = as;
-    s = -1;
-    ps = &s;
-    as[0] = 0;
-    as[1] = 1;
-    as[2] = 2;
-    as[3] = 3;
-
-   #ifdef usestubs
-       set_debug_traps();
-       breakpoint();
-    #endif
-    marker1();
-
-    main2();
-
-    return 0;
-}
-
-int f()
-{
-    int f1;
-    f1 = 1;
-    return f1;
-}
-
-int main2(void)
-{
-    char C;
-    unsigned char UC;
-    short S;
-    unsigned short US;
-    int I;
-    unsigned int UI;
-    long L;
-    unsigned long UL;
-    float F;
-    double D;
-    char &rC = C;
-    unsigned char &rUC = UC;
-    short &rS = S;
-    unsigned short &rUS = US;
-    int &rI = I;
-    unsigned int &rUI = UI;
-    long &rL = L;
-    unsigned long &rUL = UL;
-    float &rF = F;
-    double &rD = D;
-    C = 'A';
-    UC = 21;
-    S = -14;
-    US = 7;
-    I = 102;
-    UI = 1002;
-    L = -234;
-    UL = 234;
-    F = 1.25E10;
-    D = -1.375E-123;
-    I = f();
-
-    return 0;
-    
-}
diff --git a/gdb/testsuite/gdb.cp/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp
deleted file mode 100644
index 764ba8b6b76..00000000000
--- a/gdb/testsuite/gdb.cp/ref-types.exp
+++ /dev/null
@@ -1,658 +0,0 @@
-# Tests for reference types with short type variables in GDB.
-# Copyright 1998, 1999, 2000, 2004 Free Software Foundation, 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.  
-
-# written by Elena Zannoni (ezannoni@cygnus.com)
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "ref-types"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-if ![runto 'marker1'] then {
-    perror "couldn't run to marker1"
-    continue
-}
-
-gdb_test "up" ".*main.*" "up from marker1 1"
-
-proc gdb_start_again {} {
-    global srcdir
-    global subdir
-    global binfile
-    global gdb_prompt
-    global decimal
-
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load ${binfile}
-
-    #
-    # set it up at a breakpoint so we can play with the variable values
-    #
-    if ![runto_main] then {
-	perror "couldn't run to breakpoint"
-	continue
-    }
-
-    if ![runto 'marker1'] then {
-	perror "couldn't run to marker1"
-	continue
-    }
-
-    gdb_test "up" ".*main.*" "up from marker1 2"
-}
-
-
-
-send_gdb "print s\n"
-gdb_expect {
-    -re ".\[0-9\]* = -1.*$gdb_prompt $" {
-        pass "print value of s"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of s" }
-    timeout           { fail "(timeout) print value of s" }
-  }
-
-
-send_gdb "ptype s\n"
-gdb_expect {
-    -re "type = short.*$gdb_prompt $"  { pass "ptype s" }
-    -re ".*$gdb_prompt $"   {  fail "ptype s" }
-    timeout             { fail "(timeout) ptype s" }
-}
-
-
-send_gdb "print *ps\n"
-gdb_expect {
-    -re ".\[0-9\]* = -1.*$gdb_prompt $" {
-        pass "print value of ps"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ps" }
-    timeout           { fail "(timeout) print value of ps" }
-  }
-
-
-send_gdb "ptype ps\n"
-gdb_expect {
-    -re "type = short \*.*$gdb_prompt $"  { pass "ptype ps" }
-    -re ".*$gdb_prompt $"   {  fail "ptype ps" }
-    timeout             { fail "(timeout) ptype ps" }
-}
-
-send_gdb "print as\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of as\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of as\[0\]" }
-    timeout           { fail "(timeout) print value of as\[0\]" }
-  }
-
-
-send_gdb "ptype as\n"
-gdb_expect {
-    -re "type = short \\\[4\\\].*$gdb_prompt $"  { pass "ptype as" }
-    -re "type = short int \\\[4\\\].*$gdb_prompt $"  { pass "ptype as" }
-    -re ".*$gdb_prompt $"   {  fail "ptype as" }
-    timeout             { fail "(timeout) ptype as" }
-}
-
-send_gdb "print as\[1\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of as\[1\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of as\[1\]" }
-    timeout           { fail "(timeout) print value of as\[1\]" }
-  }
-
-send_gdb "print as\[2\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 2.*$gdb_prompt $" {
-        pass "print value of as\[2\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of as\[2\]" }
-    timeout           { fail "(timeout) print value of as\[2\]" }
-  }
-
-send_gdb "print as\[3\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 3.*$gdb_prompt $" {
-        pass "print value of as\[3\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of as\[3\]" }
-    timeout           { fail "(timeout) print value of as\[3\]" }
-  }
-
-send_gdb "print rs\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(short &\\) @$hex: -1.*$gdb_prompt $" {
-        pass "print value of rs"
-    }
-    -re ".\[0-9\]* = \\(short int &\\) @$hex: -1.*$gdb_prompt $" {
-        pass "print value of rs"
-    }
-    -re ".*$gdb_prompt $" { fail "print value of rs" }
-    timeout           { fail "(timeout) print value of rs" }
-    eof { fail "print rs ($GDB dumped core) (FIXME)" ; gdb_start_again ; }
-
-  }
-
-send_gdb "ptype rs\n"
-gdb_expect {
-    -re "type = short &.*$gdb_prompt $"  { pass "ptype rs" }
-    -re "type = short int &.*$gdb_prompt $"  { pass "ptype rs" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rs" }
-    timeout             { fail "(timeout) ptype rs" }
-}
-
-
-send_gdb "print *rps\n"
-gdb_expect {
-    -re ".\[0-9\]* = -1.*$gdb_prompt $" {
-        pass "print value of *rps"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of *rps" }
-    timeout           { fail "(timeout) print value of *rps" }
-  }
-
-
-send_gdb "ptype rps\n"
-gdb_expect {
-    -re "type = short \\*&.*$gdb_prompt $"  { pass "ptype rps" }
-    -re "type = short int \\*&.*$gdb_prompt $"  { pass "ptype rps" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rps" }
-    timeout             { fail "(timeout) ptype rps" }
-}
-
-
-
-send_gdb "print ras\[0\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 0.*$gdb_prompt $" {
-        pass "print value of ras\[0\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ras\[0\]" }
-    timeout           { fail "(timeout) print value of ras\[0\]" }
-  }
-
-
-send_gdb "ptype ras\n"
-gdb_expect {
-    -re "type = short \\\(&\\\)\\\[4\\\].*$gdb_prompt $"  { pass "ptype ras" }
-    -re "type = short int \\\(&\\\)\\\[4\\\].*$gdb_prompt $"  { pass "ptype ras" }
-    -re ".*$gdb_prompt $"   {  fail "ptype ras" }
-    timeout             { fail "(timeout) ptype ras" }
-}
-
-send_gdb "print ras\[1\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.*$gdb_prompt $" {
-        pass "print value of ras\[1\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ras\[1\]" }
-    timeout           { fail "(timeout) print value of ras\[1\]" }
-  }
-
-send_gdb "print ras\[2\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 2.*$gdb_prompt $" {
-        pass "print value of ras\[2\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ras\[2\]" }
-    timeout           { fail "(timeout) print value of ras\[2\]" }
-  }
-
-send_gdb "print ras\[3\]\n"
-gdb_expect {
-    -re ".\[0-9\]* = 3.*$gdb_prompt $" {
-        pass "print value of ras\[3\]"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of ras\[3\]" }
-    timeout           { fail "(timeout) print value of ras\[3\]" }
-  }
-
-
-if ![runto 'f'] then {
-    perror "couldn't run to f"
-    continue
-}
-
-gdb_test "up" ".main2.*" "up from f"
-
-send_gdb "print C\n"
-gdb_expect {
-    -re ".\[0-9\]* = 65 \'A\'.*$gdb_prompt $" {
-        pass "print value of C"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of C" }
-    timeout           { fail "(timeout) print value of C" }
-  }
-
-
-send_gdb "ptype C\n"
-gdb_expect {
-    -re "type = char.*$gdb_prompt $"  { pass "ptype C" }
-    -re ".*$gdb_prompt $"   {  fail "ptype C" }
-    timeout             { fail "(timeout) ptype C" }
-}
-
-
-send_gdb "print UC\n"
-gdb_expect {
-    -re ".\[0-9\]* = 21 '\.025'\.*$gdb_prompt $" {
-        pass "print value of UC"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of UC" }
-    timeout           { fail "(timeout) print value of UC" }
-  }
-
-
-send_gdb "ptype UC\n"
-gdb_expect {
-    -re "type = unsigned char.*$gdb_prompt $"  { pass "ptype UC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype UC" }
-    timeout             { fail "(timeout) ptype UC" }
-}
-
-
-send_gdb "print S\n"
-gdb_expect {
-    -re ".\[0-9\]* = -14.*$gdb_prompt $" {
-        pass "print value of S"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of S" }
-    timeout           { fail "(timeout) print value of S" }
-  }
-
-
-send_gdb "ptype S\n"
-gdb_expect {
-    -re "type = short.*$gdb_prompt $"  { pass "ptype S" }
-    -re ".*$gdb_prompt $"   {  fail "ptype S" }
-    timeout             { fail "(timeout) ptype S" }
-}
-
-
-send_gdb "print US\n"
-gdb_expect {
-    -re ".\[0-9\]* = 7.*$gdb_prompt $" {
-        pass "print value of US"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of US" }
-    timeout           { fail "(timeout) print value of US" }
-  }
-
-
-send_gdb "ptype US\n"
-gdb_expect {
-    -re "type = unsigned short.*$gdb_prompt $"  { pass "ptype US" }
-    -re "type = short unsigned.*$gdb_prompt $"  { pass "ptype US" }
-    -re ".*$gdb_prompt $"   {  fail "ptype US" }
-    timeout             { fail "(timeout) ptype US" }
-}
-
-
-send_gdb "print I\n"
-gdb_expect {
-    -re ".\[0-9\]* = 102.*$gdb_prompt $" {
-        pass "print value of I"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of I" }
-    timeout           { fail "(timeout) print value of I" }
-  }
-
-
-send_gdb "ptype I\n"
-gdb_expect {
-    -re "type = int.*$gdb_prompt $"  { pass "ptype I" }
-    -re ".*$gdb_prompt $"   {  fail "ptype I" }
-    timeout             { fail "(timeout) ptype I" }
-}
-
-
-send_gdb "print UI\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1002.*$gdb_prompt $" {
-        pass "print value of UI"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of UI" }
-    timeout           { fail "(timeout) print value of UI" }
-  }
-
-
-send_gdb "ptype UI\n"
-gdb_expect {
-    -re "type = unsigned int.*$gdb_prompt $"  { pass "ptype UI" }
-    -re ".*$gdb_prompt $"   {  fail "ptype UI" }
-    timeout             { fail "(timeout) ptype UI" }
-}
-
-
-send_gdb "print L\n"
-gdb_expect {
-    -re ".\[0-9\]* = -234.*$gdb_prompt $" {
-        pass "print value of L"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of L" }
-    timeout           { fail "(timeout) print value of L" }
-  }
-
-
-send_gdb "ptype L\n"
-gdb_expect {
-    -re "type = long.*$gdb_prompt $"  { pass "ptype L" }
-    -re ".*$gdb_prompt $"   {  fail "ptype L" }
-    timeout             { fail "(timeout) ptype L" }
-}
-
-
-send_gdb "print UL\n"
-gdb_expect {
-    -re ".\[0-9\]* = 234.*$gdb_prompt $" {
-        pass "print value of UL"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of UL" }
-    timeout           { fail "(timeout) print value of UL" }
-  }
-
-
-send_gdb "ptype UL\n"
-gdb_expect {
-    -re "type = unsigned long.*$gdb_prompt $"  { pass "ptype UL" }
-    -re "type = long unsigned.*$gdb_prompt $"  { pass "ptype UL" }
-    -re ".*$gdb_prompt $"   {  fail "ptype UL" }
-    timeout             { fail "(timeout) ptype UL" }
-}
-
-
-send_gdb "print F\n"
-gdb_expect {
-    -re ".\[0-9\]* = 1.2\[0-9\]*e\\+10.*$gdb_prompt $" {
-        pass "print value of F"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of F" }
-    timeout           { fail "(timeout) print value of F" }
-  }
-
-
-
-send_gdb "ptype F\n"
-gdb_expect {
-    -re "type = float.*$gdb_prompt $"  { pass "ptype F" }
-    -re ".*$gdb_prompt $"   {  fail "ptype F" }
-    timeout             { fail "(timeout) ptype F" }
-}
-
-
-send_gdb "print D\n"
-gdb_expect {
-    -re ".\[0-9\]* = -1.375e-123.*$gdb_prompt $" {
-        pass "print value of D"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of D" }
-    timeout           { fail "(timeout) print value of D" }
-  }
-
-
-send_gdb "ptype D\n"
-gdb_expect {
-    -re "type = double.*$gdb_prompt $"  { pass "ptype D" }
-    -re ".*$gdb_prompt $"   {  fail "ptype D" }
-    timeout             { fail "(timeout) ptype D" }
-}
-
-
-
-#
-# test reference types
-#
-
-
-
-
-send_gdb "ptype rC\n"
-gdb_expect {
-    -re "type = char &.*$gdb_prompt $"  { pass "ptype rC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rC" }
-    timeout             { fail "(timeout) ptype rC" }
-}
-
-
-
-
-send_gdb "ptype rUC\n"
-gdb_expect {
-    -re "type = unsigned char &.*$gdb_prompt $"  { pass "ptype rUC" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rUC" }
-    timeout             { fail "(timeout) ptype rUC" }
-}
-
-
-
-send_gdb "ptype rS\n"
-gdb_expect {
-    -re "type = short &.*$gdb_prompt $"  { pass "ptype rS" }
-    -re "type = short int &.*$gdb_prompt $"  { pass "ptype rS" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rS" }
-    timeout             { fail "(timeout) ptype rS" }
-}
-
-
-
-send_gdb "ptype rUS\n"
-gdb_expect {
-    -re "type = unsigned short &.*$gdb_prompt $"  { pass "ptype rUS" }
-    -re "type = short unsigned int &.*$gdb_prompt $"  { pass "ptype rUS" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rUS" }
-    timeout             { fail "(timeout) ptype rUS" }
-}
-
-
-send_gdb "ptype rI\n"
-gdb_expect {
-    -re "type = int &.*$gdb_prompt $"  { pass "ptype rI" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rI" }
-    timeout             { fail "(timeout) ptype rI" }
-}
-
-
-
-send_gdb "ptype rUI\n"
-gdb_expect {
-    -re "type = unsigned int &.*$gdb_prompt $"  { pass "ptype rUI" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rUI" }
-    timeout             { fail "(timeout) ptype rUI" }
-}
-
-
-
-send_gdb "ptype rL\n"
-gdb_expect {
-    -re "type = long &.*$gdb_prompt $"  { pass "ptype rL" }
-    -re "type = long int &.*$gdb_prompt $"  { pass "ptype rL" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rL" }
-    timeout             { fail "(timeout) ptype rL" }
-}
-
-
-send_gdb "ptype rUL\n"
-gdb_expect {
-    -re "type = unsigned long &.*$gdb_prompt $"  { pass "ptype rUL" }
-    -re "type = long unsigned int &.*$gdb_prompt $"  { pass "ptype rUL" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rUL" }
-    timeout             { fail "(timeout) ptype rUL" }
-}
-
-
-send_gdb "ptype rF\n"
-gdb_expect {
-    -re "type = float &.*$gdb_prompt $"  { pass "ptype rF" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rF" }
-    timeout             { fail "(timeout) ptype rF" }
-}
-
-
-send_gdb "ptype rD\n"
-gdb_expect {
-    -re "type = double &.*$gdb_prompt $"  { pass "ptype rD" }
-    -re ".*$gdb_prompt $"   {  fail "ptype rD" }
-    timeout             { fail "(timeout) ptype rD" }
-}
-
-
-send_gdb "print rC\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(char &\\) @$hex: 65 \'A\'.*$gdb_prompt $" {
-        pass "print value of rC"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of rC" }
-    timeout           { fail "(timeout) print value of rC" }
-  }
-
-
-send_gdb "print rUC\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(unsigned char &\\) @$hex: 21 \'.025\'.*$gdb_prompt $" {
-        pass "print value of rUC"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of rUC" }
-    timeout           { fail "(timeout) print value of rUC" }
-  }
-
-
-send_gdb "print rS\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(short &\\) @$hex: -14.*$gdb_prompt $" {
-        pass "print value of rS"
-    }
-    -re ".\[0-9\]* = \\(short int &\\) @$hex: -14.*$gdb_prompt $" {
-        pass "print value of rS"
-    }
-    -re ".*$gdb_prompt $" { fail "print value of rS" }
-    timeout           { fail "(timeout) print value of rS" }
-  }
-
-
-send_gdb "print rUS\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(unsigned short &\\) @$hex: 7.*$gdb_prompt $" {
-        pass "print value of rUS"
-    }
-    -re ".\[0-9\]* = \\(short unsigned int &\\) @$hex: 7.*$gdb_prompt $" {
-        pass "print value of rUS"
-    }
-    -re ".*$gdb_prompt $" { fail "print value of rUS" }
-    timeout           { fail "(timeout) print value of rUS" }
-  }
-
-
-send_gdb "print rI\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(int &\\) @$hex: 102.*$gdb_prompt $" {
-        pass "print value of rI"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of rI" }
-    timeout           { fail "(timeout) print value of rI" }
-  }
-
-
-send_gdb "print rUI\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(unsigned int &\\) @$hex: 1002.*$gdb_prompt $" {
-        pass "print value of UI"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of rUI" }
-    timeout           { fail "(timeout) print value of rUI" }
-  }
-
-
-send_gdb "print rL\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(long &\\) @$hex: -234.*$gdb_prompt $" {
-        pass "print value of rL"
-    }
-    -re ".\[0-9\]* = \\(long int &\\) @$hex: -234.*$gdb_prompt $" {
-        pass "print value of rL"
-    }
-    -re ".*$gdb_prompt $" { fail "print value of rL" }
-    timeout           { fail "(timeout) print value of rL" }
-  }
-
-
-
-send_gdb "print rUL\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(unsigned long &\\) @$hex: 234.*$gdb_prompt $" {
-        pass "print value of rUL"
-    }
-    -re ".\[0-9\]* = \\(long unsigned int &\\) @$hex: 234.*$gdb_prompt $" {
-        pass "print value of rUL"
-    }
-    -re ".*$gdb_prompt $" { fail "print value of rUL" }
-    timeout           { fail "(timeout) print value of rUL" }
-  }
-
-
-send_gdb "print rF\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(float &\\) @$hex: 1.2\[0-9\]*e\\+10.*$gdb_prompt $" {
-        pass "print value of rF"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of rF" }
-    timeout           { fail "(timeout) print value of rF" }
-  }
-
-
-send_gdb "print rD\n"
-gdb_expect {
-    -re ".\[0-9\]* = \\(double &\\) @$hex: -1.375e-123.*$gdb_prompt $" {
-        pass "print value of rD"
-      }
-    -re ".*$gdb_prompt $" { fail "print value of rD" }
-    timeout           { fail "(timeout) print value of rD" }
-  }
-
diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp
deleted file mode 100644
index 991836d3073..00000000000
--- a/gdb/testsuite/gdb.cp/rtti.exp
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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.  
-
-# This file is part of the gdb testsuite.
-
-# This contains tests for GDB's use of RTTI information.  This stems
-# from a bug reported in PR gdb/488 and other places, which leads to
-# statements like 'warning: can't find class named 'C::D', as given by
-# C++ RTTI'.  It arises from GDB not knowing about classes that are
-# defined in namespaces.
-
-# NOTE: carlton/2003-05-16: I suspect it could arise from nested class
-# issues, too, and even once we fix that, there might be situations
-# (involving templates, in particular) where this problem triggers
-# because GDB and GCC have different ideas what a class is called.
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "rtti"
-set srcfile1 "${testfile}1.cc"
-set objfile1 "${testfile}1.o"
-set srcfile2 "${testfile}2.cc"
-set objfile2 "${testfile}2.o"
-set binfile  "${objdir}/${subdir}/${testfile}"
-
-if  { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "$srcdir/$subdir/$srcfile2" "$objdir/$subdir/$objfile2" object {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "$objdir/$subdir/$objfile1 $objdir/$subdir/$objfile2" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# First, run to after we've constructed the object:
-
-gdb_breakpoint [gdb_get_line_number "main-constructs-done" "$srcfile1"]
-gdb_continue_to_breakpoint "end of constructors in main"
-
-gdb_test_multiple "print *e1" "print *e1" {
-    -re "warning: RTTI symbol not found for class 'n1::D1'.*$gdb_prompt $" {
-	# gdb HEAD 2003-12-05
-	kfail "gdb/488" "print *e1"
-    }
-    -re "warning: can't find class named `n1::D1', as given by C\\+\\+ RTTI.*$gdb_prompt $" {
-	# gdb 6.0
-	kfail "gdb/488" "print *e1"
-    }
-    -re "\\$\[0-9\]* = {<n1::Base1> = .*}\r\n$gdb_prompt $" {
-	pass "print *e1"
-    }
-    -re "\\$\[0-9\]* = {<Base1> = .*}\r\n$gdb_prompt $" {
-	# NOTE: carlton/2003-05-16: If code is compiled by GCC2, we
-	# don't print the warning (for no particular reason), but we
-	# still call the class via the wrong name; PR gdb/57 is our
-	# catch-all PR for nested type problems.
-	kfail "gdb/57" "print *e1"
-    }
-}
-
-# NOTE: carlton/2004-01-14: This test with an "<incomplete type>"
-# message because, within rtt1.cc, GDB has no way of knowing that the
-# class is called 'n2::D2' instead of just 'D2'.  This is an artifical
-# test case, though: if we were using these classes in a more
-# substantial way, G++ would emit more debug info.  As is, I don't
-# think there's anything that GDB can do about this case until G++
-# starts emitting DW_TAG_namespace info; this should arrive with GCC
-# 3.4.
-
-gdb_test_multiple "print *e2" "print *e2" {
-    -re "warning: RTTI symbol not found for class 'n2::D2'.*$gdb_prompt $" {
-	# gdb HEAD 2003-12-05
-	kfail "gdb/488" "print *e2"
-    }
-    -re "warning: can't find class named `n2::D2', as given by C\\+\\+ RTTI.*$gdb_prompt $" {
-	# gdb 6.0
-	kfail "gdb/488" "print *e2"
-    }
-    -re "\\$\[0-9\]* = <incomplete type>\r\n$gdb_prompt $" {
-	kfail "gdb/1511" "print *e2"
-    }
-    -re "\\$\[0-9\]* = {<n2::Base2> = .*}\r\n$gdb_prompt $" {
-	pass "print *e2"
-    }
-    -re "\\$\[0-9\]* = {<Base2> = .*}\r\n$gdb_prompt $" {
-	kfail "gdb/57" "print *e2"
-    }
-}
-
-# Now we test the hack that's been implemented to get around some
-# instances of PR gdb/1511.
-
-gdb_breakpoint [gdb_get_line_number "func-constructs-done" "$srcfile1"]
-gdb_continue_to_breakpoint "end of constructors in func"
-
-gdb_test "print *obj" "\\$\[0-9\]* = {<n2::Base2> = .*}"
-
-gdb_breakpoint [gdb_get_line_number "func3-constructs-done" "$srcfile1"]
-gdb_continue_to_breakpoint "end of constructors in func3"
-
-gdb_test "print *obj3" "\\$\[0-9\]* = {<n2::C2> = .*}"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/rtti.h b/gdb/testsuite/gdb.cp/rtti.h
deleted file mode 100644
index c3249252f09..00000000000
--- a/gdb/testsuite/gdb.cp/rtti.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Code to go along with tests in rtti.exp.
-   
-   Copyright 2003, 2004 Free Software Foundation, Inc.
-
-   Contributed by David Carlton <carlton@bactrian.org> and by Kealia,
-   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.  */
-
-namespace n2 {
-
-  class C2;
-
-  class Base2 {
-  public:
-    virtual ~Base2() { }
-  };
-
-
-  class C2: public Base2 {
-  public:
-  };
-
-  class D2 : public C2{
-  public:
-    D2(C2 *, C2 *);
-    
-    C2* expr_1_;
-    C2* expr_2_;
-  };
-
-  extern C2 *create2();
-
-  namespace n3 {
-    class C3 : public C2 {
-    public:
-    };
-  }
-
-  extern n3::C3 *create3();
-}
diff --git a/gdb/testsuite/gdb.cp/rtti1.cc b/gdb/testsuite/gdb.cp/rtti1.cc
deleted file mode 100644
index d32ac047d44..00000000000
--- a/gdb/testsuite/gdb.cp/rtti1.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Code to go along with tests in rtti.exp.
-   
-   Copyright 2003, 2004 Free Software Foundation, Inc.
-
-   Contributed by David Carlton <carlton@bactrian.org> and by Kealia,
-   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 "rtti.h"
-
-namespace n1 {
-
-  class C1;
-
-  class Base1 {
-  public:
-    virtual ~Base1() { }
-  };
-
-
-  class C1: public Base1 {
-  public:
-  };
-
-  class D1 : public C1{
-  public:
-    D1(C1 *, C1 *);
-    
-    C1* expr_1_;
-    C1* expr_2_;
-  };
-  
-  D1::D1(C1 *expr_1, C1 *expr_2)
-    : expr_1_(expr_1), expr_2_(expr_2) { }
-
-  C1 *create1() {
-    return new D1(0, 0);
-  }
-
-} // n1
-
-// NOTE: carlton/2004-01-23: This call exists only to convince GCC to
-// keep around a reference to 'obj' in n2::func - GCC 3.4 had been
-// optimizing it away.
-void refer_to (n2::C2 *obj)
-{
-  // Do nothing.
-}
-
-void refer_to (n2::n3::C3 *obj)
-{
-  // Do nothing.
-}
-
-namespace n2
-{
-  void func ()
-  {
-    C2 *obj = create2 ();
-
-    refer_to (obj);		// func-constructs-done
-
-    return;
-  }
-
-  namespace n3
-  {
-    void func3 ()
-    {
-      C3 *obj3 = create3 ();
-
-      refer_to (obj3);		// func3-constructs-done
-
-      return;
-    }
-  }
-}
-
-int main()
-{
-    using namespace n1;
-    using namespace n2;
-
-    C1 *e1 = create1();
-    C2 *e2 = create2();
-
-    n2::func();				// main-constructs-done
-    n2::n3::func3();
-
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.cp/rtti2.cc b/gdb/testsuite/gdb.cp/rtti2.cc
deleted file mode 100644
index 353a1f8c7b8..00000000000
--- a/gdb/testsuite/gdb.cp/rtti2.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Code to go along with tests in rtti.exp.
-   
-   Copyright 2003, 2004 Free Software Foundation, Inc.
-
-   Contributed by David Carlton <carlton@bactrian.org> and by Kealia,
-   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 "rtti.h"
-
-namespace n2 {
-  
-  D2::D2(C2 *expr_1, C2 *expr_2)
-    : expr_1_(expr_1), expr_2_(expr_2) { }
-
-  C2 *create2() {
-    return new D2(0, 0);
-  }
-
-  n3::C3 *create3() {
-    return new n3::C3();
-  }
-
-}
diff --git a/gdb/testsuite/gdb.cp/templates.cc b/gdb/testsuite/gdb.cp/templates.cc
deleted file mode 100644
index c13f18b643f..00000000000
--- a/gdb/testsuite/gdb.cp/templates.cc
+++ /dev/null
@@ -1,785 +0,0 @@
-/* This test code is from Wendell Baker (wbaker@comet.berkeley.edu) */
-
-#include <stddef.h>
-
-int a_i;
-char a_c;
-double a_d;
-
-typedef void *Pix;
-
-int
-f(int i)
-{ return 0; }
-
-int
-f(int i, char c)
-{ return 0; }
-
-int
-f(int i, char c, double d)
-{ return 0; }
-
-int
-f(int i, char c, double d, char *cs)
-{ return 0; }
-
-int
-f(int i, char c, double d, char *cs, void (*fig)(int, char))
-{ return 0; }
-
-int
-f(int i, char c, double d, char *cs, void (*fig)(char, int))
-{ return 0; }
-
-class R {
-public:
-    int i;
-};
-class S {
-public:
-    int i;
-};
-class T {
-public:
-    int i;
-};
-
-char g(char, const char, volatile char)
-{ return 'c'; }
-char g(R, char&, const char&, volatile char&)
-{ return 'c'; }
-char g(char*, const char*, volatile char*)
-{ return 'c'; }
-char g(S, char*&, const char*&, volatile char*&)
-{ return 'c'; }
-
-signed char g(T,signed char, const signed char, volatile signed char)
-{ return 'c'; }
-signed char g(T, R, signed char&, const signed char&, volatile signed char&)
-{ return 'c'; }
-signed char g(T, signed char*, const signed char*, volatile signed char*)
-{ return 'c'; }
-signed char g(T, S, signed char*&, const signed char*&, volatile signed char*&)
-{ return 'c'; }
-
-unsigned char g(unsigned char, const unsigned char, volatile unsigned char)
-{ return 'c'; }
-unsigned char g(R, unsigned char&, const unsigned char&, volatile unsigned char&)
-{ return 'c'; }
-unsigned char g(unsigned char*, const unsigned char*, volatile unsigned char*)
-{ return 'c'; }
-unsigned char g(S, unsigned char*&, const unsigned char*&, volatile unsigned char*&)
-{ return 'c'; }
-
-short g(short, const short, volatile short)
-{ return 0; }
-short g(R, short&, const short&, volatile short&)
-{ return 0; }
-short g(short*, const short*, volatile short*)
-{ return 0; }
-short g(S, short*&, const short*&, volatile short*&)
-{ return 0; }
-
-signed short g(T, signed short, const signed short, volatile signed short)
-{ return 0; }
-signed short g(T, R, signed short&, const signed short&, volatile signed short&)
-{ return 0; }
-signed short g(T, signed short*, const signed short*, volatile signed short*)
-{ return 0; }
-signed short g(T, S, double, signed short*&, const signed short*&, volatile signed short*&)
-{ return 0; }
-
-unsigned short g(unsigned short, const unsigned short, volatile unsigned short)
-{ return 0; }
-unsigned short g(R, unsigned short&, const unsigned short&, volatile unsigned short&)
-{ return 0; }
-unsigned short g(unsigned short*, const unsigned short*, volatile unsigned short*)
-{ return 0; }
-unsigned short g(S, unsigned short*&, const unsigned short*&, volatile unsigned short*&)
-{ return 0; }
-
-int g(int, const int, volatile int)
-{ return 0; }
-int g(R, int&, const int&, volatile int&)
-{ return 0; }
-int g(int*, const int*, volatile int*)
-{ return 0; }
-int g(S, int*&, const int*&, volatile int*&)
-{ return 0; }
-
-signed int g(T, signed int, const signed int, volatile signed int)
-{ return 0; }
-signed int g(T, R, signed int&, const signed int&, volatile signed int&)
-{ return 0; }
-signed int g(T, signed int*, const signed int*, volatile signed int*)
-{ return 0; }
-signed int g(T, S, signed int*&, const signed int*&, volatile signed int*&)
-{ return 0; }
-
-unsigned int g(unsigned int, const unsigned int, volatile unsigned int)
-{ return 0; }
-unsigned int g(R, unsigned int&, const unsigned int&, volatile unsigned int&)
-{ return 0; }
-unsigned int g(unsigned int*, const unsigned int*, volatile unsigned int*)
-{ return 0; }
-unsigned int g(S, unsigned int*&, const unsigned int*&, volatile unsigned int*&)
-{ return 0; }
-
-long g(long, const long, volatile long)
-{ return 0; }
-long g(R, long&, const long&, volatile long&)
-{ return 0; }
-long g(long*, const long*, volatile long*)
-{ return 0; }
-long g(S, long*&, const long*&, volatile long*&)
-{ return 0; }
-
-signed long g(T, signed long, const signed long, volatile signed long)
-{ return 0; }
-signed long g(T, R, signed long&, const signed long&, volatile signed long&)
-{ return 0; }
-signed long g(T, signed long*, const signed long*, volatile signed long*)
-{ return 0; }
-signed long g(T, S, signed long*&, const signed long*&, volatile signed long*&)
-{ return 0; }
-
-unsigned long g(unsigned long, const unsigned long, volatile unsigned long)
-{ return 0; }
-unsigned long g(S, unsigned long&, const unsigned long&, volatile unsigned long&)
-{ return 0; }
-unsigned long g(unsigned long*, const unsigned long*, volatile unsigned long*)
-{ return 0; }
-unsigned long g(S, unsigned long*&, const unsigned long*&, volatile unsigned long*&)
-{ return 0; }
-
-#ifdef __GNUC__
-long long g(long long, const long long, volatile long long)
-{ return 0; }
-long long g(S, long long&, const long long&, volatile long long&)
-{ return 0; }
-long long g(long long*, const long long*, volatile long long*)
-{ return 0; }
-long long g(R, long long*&, const long long*&, volatile long long*&)
-{ return 0; }
-
-signed long long g(T, signed long long, const signed long long, volatile signed long long)
-{ return 0; }
-signed long long g(T, R, signed long long&, const signed long long&, volatile signed long long&)
-{ return 0; }
-signed long long g(T, signed long long*, const signed long long*, volatile signed long long*)
-{ return 0; }
-signed long long g(T, S, signed long long*&, const signed long long*&, volatile signed long long*&)
-{ return 0; }
-
-unsigned long long g(unsigned long long, const unsigned long long, volatile unsigned long long)
-{ return 0; }
-unsigned long long g(R, unsigned long long*, const unsigned long long*, volatile unsigned long long*)
-{ return 0; }
-unsigned long long g(unsigned long long&, const unsigned long long&, volatile unsigned long long&)
-{ return 0; }
-unsigned long long g(S, unsigned long long*&, const unsigned long long*&, volatile unsigned long long*&)
-{ return 0; }
-#endif
-
-float g(float, const float, volatile float)
-{ return 0; }
-float g(char, float&, const float&, volatile float&)
-{ return 0; }
-float g(float*, const float*, volatile float*)
-{ return 0; }
-float g(char, float*&, const float*&, volatile float*&)
-{ return 0; }
-
-double g(double, const double, volatile double)
-{ return 0; }
-double g(char, double&, const double&, volatile double&)
-{ return 0; }
-double g(double*, const double*, volatile double*)
-{ return 0; }
-double g(char, double*&, const double*&, volatile double*&)
-{ return 0; }
-
-#ifdef __GNUC__
-long double g(long double, const long double, volatile long double)
-{ return 0; }
-long double g(char, long double&, const long double&, volatile long double&)
-{ return 0; }
-long double g(long double*, const long double*, volatile long double*)
-{ return 0; }
-long double g(char, long double*&, const long double*&, volatile long double*&)
-{ return 0; }
-#endif
-
-class c {
-public:
-    c(int) {};
-    int i;
-};
-
-class c g(c, const c, volatile c)
-{ return 0; }
-c g(char, c&, const c&, volatile c&)
-{ return 0; }
-c g(c*, const c*, volatile c*)
-{ return 0; }
-c g(char, c*&, const c*&, volatile c*&)
-{ return 0; }
-
-/*
-void h(char = 'a')
-{ }
-void h(char, signed char = 'a')
-{ }
-void h(unsigned char = 'a')
-{ }
-*/
-/*
-void h(char = (char)'a')
-{ }
-void h(char, signed char = (signed char)'a')
-{ }
-void h(unsigned char = (unsigned char)'a')
-{ }
-
-
-void h(short = (short)43)
-{ }
-void h(char, signed short = (signed short)43)
-{ }
-void h(unsigned short = (unsigned short)43)
-{ }
-
-void h(int = (int)43)
-{ }
-void h(char, signed int = (signed int)43)
-{ }
-void h(unsigned int = (unsigned int)43)
-{ }
-
-
-void h(long = (long)43)
-{ }
-void h(char, signed long = (signed long)43)
-{ }
-void h(unsigned long = (unsigned long)43)
-{ }
-
-#ifdef __GNUC__
-void h(long long = 43)
-{ }
-void h(char, signed long long = 43)
-{ }
-void h(unsigned long long = 43)
-{ }
-#endif
-
-void h(float = 4.3e-10)
-{ }
-void h(double = 4.3)
-{ }
-#ifdef __GNUC__
-void h(long double = 4.33e33)
-{ }
-#endif
-*/
-
-/* An unneeded printf() definition - actually, just a stub - used to occupy
-   this space.  It has been removed and replaced with this comment which
-   exists to occupy some lines so that templates.exp won't need adjustment.  */
-
-class T1 {
-public:
-    static void* operator new(size_t) throw ();
-    static void operator delete(void *pointer);
-
-    void operator=(const T1&);
-    T1& operator=(int);
-
-    int operator==(int) const;
-    int operator==(const T1&) const;
-    int operator!=(int) const;
-    int operator!=(const T1&) const;
-
-    int operator<=(int) const;
-    int operator<=(const T1&) const;
-    int operator<(int) const;
-    int operator<(const T1&) const;
-    int operator>=(int) const;
-    int operator>=(const T1&) const;
-    int operator>(int) const;
-    int operator>(const T1&) const;
-
-    void operator+(int) const;
-    T1& operator+(const T1&) const;
-    void operator+=(int) const;
-    T1& operator+=(const T1&) const;
-
-    T1& operator++() const;
-
-    void operator-(int) const;
-    T1& operator-(const T1&) const;
-    void operator-=(int) const;
-    T1& operator-=(const T1&) const;
-
-    T1& operator--() const;
-
-    void operator*(int) const;
-    T1& operator*(const T1&) const;
-    void operator*=(int) const;
-    T1& operator*=(const T1&) const;
-
-    void operator/(int) const;
-    T1& operator/(const T1&) const;
-    void operator/=(int) const;
-    T1& operator/=(const T1&) const;
-
-    void operator%(int) const;
-    T1& operator%(const T1&) const;
-    void operator%=(int) const;
-    T1& operator%=(const T1&) const;
-
-    void operator&&(int) const;
-    T1& operator&&(const T1&) const;
-
-    void operator||(int) const;
-    T1& operator||(const T1&) const;
-
-    void operator&(int) const;
-    T1& operator&(const T1&) const;
-    void operator&=(int) const;
-    T1& operator&=(const T1&) const;
-
-    void operator|(int) const;
-    T1& operator|(const T1&) const;
-    void operator|=(int) const;
-    T1& operator|=(const T1&) const;
-
-    void operator^(int) const;
-    T1& operator^(const T1&) const;
-    void operator^=(int) const;
-    T1& operator^=(const T1&) const;
-
-    T1& operator!() const;
-    T1& operator~() const;
-};
-
-void* 
-T1::operator new(size_t) throw ()
-{ return 0; }
-
-void
-T1::operator delete(void *pointer)
-{ }
-
-class T2 {
-public:
-    T2(int i): integer(i)
-	{ }
-    int integer;
-};
-
-int operator==(const T2&, const T2&)
-{ return 0; }
-int operator==(const T2&, char)
-{ return 0; }
-int operator!=(const T2&, const T2&)
-{ return 0; }
-int operator!=(const T2&, char)
-{ return 0; }
-
-int operator<=(const T2&, const T2&)
-{ return 0; }
-int operator<=(const T2&, char)
-{ return 0; }
-int operator<(const T2&, const T2&)
-{ return 0; }
-int operator<(const T2&, char)
-{ return 0; }
-int operator>=(const T2&, const T2&)
-{ return 0; }
-int operator>=(const T2&, char)
-{ return 0; }
-int operator>(const T2&, const T2&)
-{ return 0; }
-int operator>(const T2&, char)
-{ return 0; }
-
-T2 operator+(const T2 t, int i)
-{ return t.integer + i; }
-T2 operator+(const T2 a, const T2& b)
-{ return a.integer + b.integer; }
-T2& operator+=(T2& t, int i)
-{ t.integer += i; return t; }
-T2& operator+=(T2& a, const T2& b)
-{ a.integer += b.integer; return a; }
-
-T2 operator-(const T2 t, int i)
-{ return t.integer - i; }
-T2 operator-(const T2 a, const T2& b)
-{ return a.integer - b.integer; }
-T2& operator-=(T2& t, int i)
-{ t.integer -= i; return t; }
-T2& operator-=(T2& a, const T2& b)
-{ a.integer -= b.integer; return a; }
-
-T2 operator*(const T2 t, int i)
-{ return t.integer * i; }
-T2 operator*(const T2 a, const T2& b)
-{ return a.integer * b.integer; }
-T2& operator*=(T2& t, int i)
-{ t.integer *= i; return t; }
-T2& operator*=(T2& a, const T2& b)
-{ a.integer *= b.integer; return a; }
-
-T2 operator/(const T2 t, int i)
-{ return t.integer / i; }
-T2 operator/(const T2 a, const T2& b)
-{ return a.integer / b.integer; }
-T2& operator/=(T2& t, int i)
-{ t.integer /= i; return t; }
-T2& operator/=(T2& a, const T2& b)
-{ a.integer /= b.integer; return a; }
-
-T2 operator%(const T2 t, int i)
-{ return t.integer % i; }
-T2 operator%(const T2 a, const T2& b)
-{ return a.integer % b.integer; }
-T2& operator%=(T2& t, int i)
-{ t.integer %= i; return t; }
-T2& operator%=(T2& a, const T2& b)
-{ a.integer %= b.integer; return a; }
-
-template<class T>
-class T5 {
-public:
-    T5(int);
-    T5(const T5<T>&);
-    ~T5();
-    static void* operator new(size_t) throw ();
-    static void operator delete(void *pointer);
-    int value();
-    
-    static T X;
-    T x;
-    int val;
-};
-
-template<class T>
-T5<T>::T5(int v)
-{ val = v; }
-
-template<class T>
-T5<T>::T5(const T5<T>&)
-{}
-
-template<class T>
-T5<T>::~T5()
-{}
-
-template<class T>
-void*
-T5<T>::operator new(size_t) throw ()
-{ return 0; }
-
-template<class T>
-void
-T5<T>::operator delete(void *pointer)
-{ }
-
-template<class T>
-int
-T5<T>::value()
-{ return val; }
-
-
-#if ! defined(__GNUC__) || defined(GCC_BUG)
-template<class T>
-T T5<T>::X;
-#endif
-
-
-
-
-T5<char> t5c(1);
-T5<int> t5i(2);
-T5<int (*)(char, void *)> t5fi1(3);
-T5<int (*)(int, double **, void *)> t5fi2(4);
-
- 
-
-
-
-
-class x {
-public:
-    int (*manage[5])(double,
-		     void *(*malloc)(unsigned size),
-		     void (*free)(void *pointer));
-    int (*device[5])(int open(const char *, unsigned mode, unsigned perms, int extra), 
-		     int *(*read)(int fd, void *place, unsigned size),
-		     int *(*write)(int fd, void *place, unsigned size),
-		     void (*close)(int fd));
-};
-T5<x> t5x(5);
-
-#if !defined(__GNUC__) || (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)
-template class T5<char>;
-template class T5<int>;
-template class T5<int (*)(char, void *)>;
-template class T5<int (*)(int, double **, void *)>;
-template class T5<x>;
-#endif
-
-class T7 {
-public:
-    static int get();
-    static void put(int);
-};
-
-int
-T7::get()
-{ return 1; }
-
-void
-T7::put(int i)
-{
-    // nothing
-}
-
-// More template kinds.  GDB 4.16 didn't handle these, but
-// Wildebeest does.  Note: Assuming HP aCC is used to compile
-// this file; with g++ or HP cfront or other compilers the
-// demangling may not get done correctly.
-
-// Ordinary template, to be instantiated with different types
-template<class T>
-class Foo {
-public:
-  int x;
-  T t;
-  T foo (int, T);
-};
-
-
-template<class T> T Foo<T>::foo (int i, T tt)
-{
-  return tt;
-}
-
-// Template with int parameter
-
-template<class T, int sz>
-class Bar {
-public:
-  int x;
-  T t;
-  T bar (int, T);
-};
-
-
-template<class T, int sz> T Bar<T, sz>::bar (int i, T tt)
-{
-  if (i < sz)
-    return tt;
-  else
-    return 0;
-}
-
-// function template with int parameter
-template<class T> int dummy (T tt, int i)
-{
-  return tt;
-}
-
-// Template with partial specializations
-template<class T1, class T2>
-class Spec {
-public:
-  int x;
-  T1 spec (T2);
-};
-
-template<class T1, class T2>
-T1 Spec<T1, T2>::spec (T2 t2)
-{
-  return 0;
-}
-
-template<class T>
-class Spec<T, T*> {
-public:
-  int x;
-  T spec (T*);
-};
-
-template<class T>
-T Spec<T, T*>::spec (T * tp)
-{
-  return *tp;
-}
-
-// Template with char parameter
-template<class T, char sz>
-class Baz {
-public:
-  int x;
-  T t;
-  T baz (int, T);
-};
-
-template<class T, char sz> T Baz<T, sz>::baz (int i, T tt)
-{
-  if (i < sz)
-    return tt;
-  else
-    return 0;
-}
-
-// Template with char * parameter
-template<class T, char * sz>
-class Qux {
-public:
-  int x;
-  T t;
-  T qux (int, T);
-};
-
-template<class T, char * sz> T Qux<T, sz>::qux (int i, T tt)
-{
-  if (sz[0] == 'q')
-    return tt;
-  else
-    return 0;
-}
-
-// Template with a function pointer parameter
-template<class T, int (*f)(int) >
-class Qux1 {
-public:
-  int x;
-  T t;
-  T qux (int, T);
-};
-
-template<class T, int (*f)(int)> T Qux1<T, f>::qux (int i, T tt)
-{
-  if (f != 0)
-    return tt;
-  else
-    return 0;
-}
-
-// Some functions to provide as arguments to template
-int gf1 (int a) {
-  return a * 2 + 13;
-}
-int gf2 (int a) {
-  return a * 2 + 26;
-}
-
-char string[3];
-
-
-// Template for nested instantiations
-
-template<class T>
-class Garply {
-public:
-  int x;
-  T t;
-  T garply (int, T);
-};
-
-template<class T> T Garply<T>::garply (int i, T tt)
-{
-  if (i > x)
-    return tt;
-  else
-    {
-      x += i;
-      return tt;
-    }
-}
-
-
-int main()
-{
-    int i;
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-    i = i + 1;
-
-    // New tests added here
-
-  Foo<int> fint={0,0};
-  Foo<char> fchar={0,0};
-  Foo<volatile char *> fvpchar = {0, 0};
-
-  Bar<int, 33> bint;
-  Bar<int, (4 > 3)> bint2;
-
-  Baz<int, 's'> bazint;
-  Baz<char, 'a'> bazint2;
-
-  Qux<char, string> quxint2;
-  Qux<int, string> quxint;
-
-  Qux1<int, gf1> qux11;
-
-  int x = fint.foo(33, 47);
-  char c = fchar.foo(33, 'x');
-  volatile char * cp = fvpchar.foo(33, 0);
-  
-  int y = dummy<int> (400, 600);
-
-  int z = bint.bar(55, 66);
-  z += bint2.bar(55, 66);
-
-  c = bazint2.baz(4, 'y');
-  c = quxint2.qux(4, 'z');
-  
-  y = bazint.baz(4,3);
-  y = quxint.qux(4, 22);
-  y += qux11.qux(4, 22);
-
-  y *= gf1(y) - gf2(y);
-  
-  Spec<int, char> sic;
-  Spec<int, int *> siip;
-
-  sic.spec ('c');
-  siip.spec (&x);
-
-  Garply<int> f;
-  Garply<char> fc;
-  f.x = 13;
-
-  Garply<Garply<char> > nf;
-  nf.x = 31;
-  
-  x = f.garply (3, 4);
-  
-  fc = nf.garply (3, fc);
-
-  y = x + fc.x;
-  
-
-  return 0;
-    
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
deleted file mode 100644
index 15e9a58f94c..00000000000
--- a/gdb/testsuite/gdb.cp/templates.exp
+++ /dev/null
@@ -1,540 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-
-set ws "\[\r\n\t \]+"
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "templates"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-#
-#  Test printing of the types of templates.
-#
-
-proc test_ptype_of_templates {} {
-    global gdb_prompt
-    global ws
-
-    send_gdb "ptype T5<int>\n"
-    gdb_expect {
-	-re "type = class T5<int> \{${ws}public:${ws}static int X;${ws}int x;${ws}int val;${ws}T5<int> & operator=\\(T5<int> const ?&\\);${ws}T5\\(int\\);${ws}T5\\((T5<int> const|const T5<int>) ?&\\);${ws}~T5\\((void|)\\);${ws}static void \\* operator new\\(unsigned( int| long)?\\);${ws}static void operator delete\\(void ?\\*\\);${ws}int value\\((void|)\\);${ws}\}\r\n$gdb_prompt $" {
-	    pass "ptype T5<int>"
-	}
-	-re "type = class T5<int> \{${ws}public:${ws}static int X;${ws}int x;${ws}int val;${ws}T5\\(int\\);${ws}T5\\((T5<int> const|const T5<int>) ?&\\);${ws}~T5\\((void|)\\);${ws}static void \\* operator new\\(unsigned( int| long)?\\);${ws}static void operator delete\\(void ?\\*\\);${ws}int value\\((void|)\\);${ws}T5<int> & operator=\\(T5<int> const ?&\\);${ws}\}\r\n$gdb_prompt $" {
-	    pass "ptype T5<int>"
-	}
-	-re "type = class T5<int> \\{${ws}public:${ws}static int X;${ws}int x;${ws}int val;${ws}${ws}T5 \\(int\\);${ws}T5 \\(const class T5<int> &\\);${ws}void ~T5 \\(int\\);${ws}static void \\* new \\(unsigned int\\);${ws}static void delete \\(void ?\\*\\);${ws}int value \\((void|)\\);${ws}\\}${ws}$gdb_prompt $" { pass "ptype T5<int> -- new with unsigned int" }
-	-re "type = class T5<int> \\{.*public:.*static int X;.*int x;.*int val;.*T5 \\(int\\);.*T5 \\(const class T5<int> &\\);.*void ~T5 \\(int\\);.*static void \\* new \\(unsigned long\\);.*static void delete \\(void ?\\*\\);.*int value \\((void|)\\);.*\\}\r\n$gdb_prompt $" { pass "ptype T5<int> -- new with unsigned long" }
-	-re "type = class T5<int> \{${ws}public:${ws}static int X;${ws}int x;${ws}int val;((${ws}T5<int> & operator=\\(T5<int> const ?&\\);)|(${ws}T5\\(int\\);)|(${ws}T5\\((T5<int> const|const T5<int>) ?&\\);)|(${ws}~T5\\((void|)\\);)|(${ws}static void \\* operator new\\(unsigned( int| long)?\\);)|(${ws}static void operator delete\\(void ?\\*\\);)|(${ws}int value\\((void|)\\);))*${ws}\}\r\n$gdb_prompt $" {
-	    pass "ptype T5<int> (obsolescent gcc or gdb)"
-	}
-	-re "type = class T5<int> \{${ws}public:${ws}static int X;${ws}int x;${ws}int val;${ws}void T5\\(int\\);${ws}void T5\\((T5<int> const|const T5<int>) ?&\\);${ws}~T5\\(int\\);${ws}static void \\* operator new\\(unsigned( int| long|)\\);${ws}static void operator delete\\(void ?\\*\\);${ws}int value\\((void|)\\);${ws}\}\r\n$gdb_prompt $" {
-	    # This also triggers gdb/1113...
-	    kfail "gdb/1111" "ptype T5<int>"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "ptype T5<int>"
-	}
-	timeout {
-	    fail "ptype T5<int> (timeout)"
-	}
-    }
-
-    send_gdb "ptype t5i\n"
-    gdb_expect {
-        -re "type = class T5<int> \\{${ws}public:${ws}static int X;${ws}int x;${ws}int val;\r\n${ws}T5\\(int\\);${ws}T5\\(T5<int> const ?&\\);${ws}~T5\\((void|)\\);${ws}static void \\* operator new\\(unsigned( int| long)?\\);${ws}static void operator delete\\(void ?\\*\\);${ws}int value\\((void|)\\);${ws}\\}\r\n$gdb_prompt $" { pass "ptype T5<int> -- with several fixes from 4.17" }
-        -re "type = class T5<int> \\{${ws}public:${ws}static int X;${ws}int x;${ws}int val;\r\n${ws}T5 \\(int\\);${ws}T5 \\(const class T5<int> &\\);${ws}void ~T5 \\(int\\);${ws}static void \\* new \\(unsigned int\\);${ws}static void delete \\(void ?\\*\\);${ws}int value \\((void|)\\);${ws}\\}\r\n$gdb_prompt $" { pass "ptype t5i<int> -- new with unsigned int" }
-        -re "type = class T5<int> \\{${ws}public:${ws}static int X;${ws}int x;${ws}int val;\r\n${ws}T5 \\(int\\);${ws}T5 \\(const class T5<int> &\\);${ws}void ~T5 \\(int\\);${ws}static void \\* new \\(unsigned long\\);${ws}static void delete \\(void ?\\*\\);${ws}int value \\((void|)\\);${ws}\\}\r\n$gdb_prompt $" { pass "ptype t5i<int> -- new with unsigned long" }
-        -re "type = class T5<int> \{.*public:.*static int X;.*int x;.*int val;.*.*T5 \\(int\\);.*.*void ~T5 \\(int\\).*.*.*int value \\((void|)\\);.*\}.*$gdb_prompt $" { 
-            pass "ptype t5i"
-        }
-	-re "type = class T5<int> \{${ws}public:${ws}static int X;${ws}int x;${ws}int val;${ws}T5<int> & operator=\\(T5<int> const ?&\\);${ws}T5\\(int\\);${ws}T5\\((T5<int> const|const T5<int>) ?&\\);${ws}~T5\\((void|)\\);${ws}static void \\* operator new\\(unsigned( int| long)?\\);${ws}static void operator delete\\(void ?\\*\\);${ws}int value\\((void|)\\);${ws}\}\r\n$gdb_prompt $" {
-	    pass "ptype t5i"
-	}
-	-re "type = class T5<int> \{${ws}public:${ws}static int X;${ws}int x;${ws}int val;${ws}T5\\(int\\);${ws}T5\\((T5<int> const|const T5<int>) ?&\\);${ws}~T5\\((void|)\\);${ws}static void \\* operator new\\(unsigned( int| long)?\\);${ws}static void operator delete\\(void ?\\*\\);${ws}int value\\((void|)\\);${ws}T5<int> & operator=\\(T5<int> const ?&\\);${ws}\}\r\n$gdb_prompt $" {
-	    pass "ptype t5i"
-	}
-	-re "type = class T5<int> \{${ws}public:${ws}static int X;${ws}int x;${ws}int val;((${ws}T5<int> & operator=\\(T5<int> const ?&\\);)|(${ws}T5\\(int\\);)|(${ws}T5\\(T5<int> const ?&\\);)|(${ws}~T5\\((void|)\\);)|(${ws}static void \\* operator new\\(unsigned( int| long)?\\);)|(${ws}static void operator delete\\(void ?\\*\\);)|(${ws}int value\\((void|)\\);))*${ws}\}\r\n$gdb_prompt $" {
-	    pass "ptype t5i (obsolescent gcc or gdb)"
-	}
-	-re "type = class T5<int> \{${ws}public:${ws}static int X;${ws}int x;${ws}int val;${ws}void T5\\(int\\);${ws}void T5\\((T5<int> const|const T5<int>) ?&\\);${ws}~T5\\(int\\);${ws}static void \\* operator new\\(unsigned( int| long|)\\);${ws}static void operator delete\\(void ?\\*\\);${ws}int value\\((void|)\\);${ws}\}\r\n$gdb_prompt $" {
-	    # This also triggers gdb/1113...
-	    kfail "gdb/1111" "ptype T5<int>"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "ptype t5i"
-	}
-	timeout {
-	    fail "ptype t5i (timeout)"
-	}
-    }
-}
-
-#
-#  Test breakpoint setting on template methods.
-#
-
-proc test_template_breakpoints {} {
-    global gdb_prompt
-    global testfile
-    global srcdir
-    global hp_aCC_compiler
-
-    send_gdb "break T5<int>::T5\n"
-    gdb_expect {
-	-re "0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*.2. T5<int>::T5\\(int\\) at .*\[\r\n\]*.3. T5<int>::T5\\((T5<int> const|const T5<int>) ?&\\) at .*\[\r\n\]*> $" {
-	    gdb_test "0" \
-		"canceled" \
-		"constructor breakpoint (obsolete format!)"
-	}
-	-re ".0. cancel\[\r\n\]*.1. all\[\r\n\]*.2. T5<int>::T5\\((T5<int> const|const T5<int>) ?&\\) at .*templates.cc:.*\[\r\n\]*.3. T5<int>::T5\\(int\\) at .*templates.cc:.*\[\r\n\]*> $" {
-	    gdb_test "0" \
-		"canceled" \
-		"constructor breakpoint"
-	}
-	-re "0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*.2. T5 at .*\[\r\n\]*.3. T5 at .*\[\r\n\]*> $" {
-	    setup_kfail "gdb/1062" "*-*-*"
-	    gdb_test "0" \
-		"nonsense intended to insure that this test fails" \
-		"constructor breakpoint"
-	}
-        -re ".*\n> $" {
-	    gdb_test "0" \
-		    "nonsense intended to insure that this test fails" \
-		    "constructor breakpoint (bad menu choices)"
-	}
-	-re ".*$gdb_prompt $" { fail "constructor breakpoint" }
-	default { fail "constructor breakpoint (timeout)" }
-    }
-    
-# See CLLbs14792
-    if {$hp_aCC_compiler} {setup_xfail hppa*-*-* CLLbs14792}
-
-    gdb_test_multiple "break T5<int>::~T5" "destructor_breakpoint" {
-	-re "Breakpoint.*at.* file .*${testfile}.cc, line.*$gdb_prompt $"
-	{
-	    pass "destructor breakpoint"
-	}
-	-re "the class `T5<int>' does not have destructor defined\r\nHint: try 'T5<int>::~T5<TAB> or 'T5<int>::~T5<ESC-\\?>\r\n\\(Note leading single quote.\\)\r\n$gdb_prompt $"
-	{
-	    kfail "gdb/1112" "destructor breakpoint"
-	}
-    }
-    
-    gdb_test "break T5<int>::value" \
-	"Breakpoint.*at.* file .*${testfile}.cc, line.*" \
-	"value method breakpoint"
-
-    delete_breakpoints
-}
-
-#
-#  Test calling of template methods.
-#
-
-proc test_template_calls {} {
-    global gdb_prompt
-    global hp_aCC_compiler
-
-    if [target_info exists gdb,cannot_call_functions] {
-	setup_xfail "*-*-*" 2416
-	fail "This target can not call functions"
-	return
-    }
-
-    if {!$hp_aCC_compiler} {setup_xfail hppa*-*-*}
-    send_gdb "print t5i.value()\n"
-    gdb_expect {
-	-re ".* = 2\[\r\n\]*$gdb_prompt $" { pass "print t5i.value()" }
-	-re "Cannot invoke functions on this machine.*$gdb_prompt $" {
-	    fail "print t5i.value()"
-	}
-        -re "Cannot resolve .* to any overloaded instance.*$gdb_prompt $" {
-	    setup_xfail hppa*-*-* CLLbs16899
-            xfail "print t5i.value"
-	}
-	-re ".*$gdb_prompt $" { fail "print t5i.value()" }
-	timeout { fail "print t5i.value() (timeout)" }
-    }
-}
-
-
-proc do_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-    runto_main
-
-    test_ptype_of_templates
-    test_template_breakpoints
-
-    if [ runto_main] {
-	test_template_calls
-    }
-}
-
-do_tests
-
-
-# More tests for different kinds of template parameters,
-# templates with partial specializations, nested templates, etc.
-# These have been tested only with HP aCC.  They probably won't
-# work with other compilers because of differences in mangling
-# schemes. 
-# Added by Satish Pai <pai@apollo.hp.com> 1997-09-25 
-# As of 2000-06-03, C++ support has been improved to the point that g++ can
-# pass all of theses, excluding what appears to be one that exposes a stabs bug. - djb
-
-# I don't know how HP could be passing these tests without this. They
-# weren't breakpointing past a point where the below expressions were
-# initialized in the actual source. - djb
-
-send_gdb "b 770\n"
-gdb_expect {
-		-re ".*$gdb_prompt $"
-}
-send_gdb "c\n"
-gdb_expect {
-		-re ".*$gdb_prompt $"
-}
-send_gdb "print fint\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = \\{x = 0, t = 0\\}\r\n$gdb_prompt $" { pass "print fint" }
-   -re "$gdb_prompt $"                     { fail "print fint" }
-   timeout                             { fail "(timeout) print fint" }
-}
-
-send_gdb "print fvpchar\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = \\{x = 0, t = 0x0\\}\r\n$gdb_prompt $" { pass "print fvpchar" }
-   -re "$gdb_prompt $"                     { fail "print fvpchar" }
-   timeout                             { fail "(timeout) print fvpchar" }
-}
-
-# Template Foo<T>
-
-# Neither stabs nor DWARF-2 contains type information about templates
-# (as opposed to instantiations of templates), so in those
-# circumstances we expect GDB to not find a symbol.  HP has a debug
-# format that contains more info, though, so it's also correct to
-# print out template info.  (This affects several subsequent tests as
-# well.)
-
-# NOTE: carlton/2003-02-26: However, because of a bug in the way GDB
-# handles nested types, we don't get this right in the DWARF-2 case.
-
-send_gdb "ptype Foo\n"   
-gdb_expect {   
-    -re "type = template <(class |)T> (class |)Foo \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*T t;\r\n\\}\r\ntemplate instantiations:\r\n\[ \t\]*(class |)Foo<volatile char \\*>\r\n\[ \t\]*(class |)Foo<char>\r\n\[ \t\]*(class |)Foo<int>\r\n$gdb_prompt $" { pass "ptype Foo" }
-    -re "type = template <(class |)T> (class |)Foo \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*T t;\r\n\\}\r\n$gdb_prompt $" { xfail "ptype Foo" }
-    -re "type = class Foo<int> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int foo\\(int, int\\);\r\n\\}\r\n$gdb_prompt $"
-    { # GCC 3.1, DWARF-2 output.
-	kfail "gdb/57" "ptype Foo" }
-    -re "No symbol \"Foo\" in current context.\r\n$gdb_prompt $"
-    { # GCC 2.95.3, stabs+ output.
-	pass "ptype Foo" }
-    -re "$gdb_prompt $"                     { fail "ptype Foo" }
-    timeout                             { fail "(timeout) ptype Foo" }
-}
-#    -re "type = class Foo<int> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int foo(int, int);\r\n\\}\r\n$gdb_prompt $"
-
-# ptype Foo<int>
-
-send_gdb "ptype fint\n"   
-gdb_expect {   
-   -re "type = (class |)Foo<int> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*.*int foo\\(int, int\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype fint" }
-   -re "type = (class |)Foo<int> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int foo\\(int, int\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype fint" }
-   -re "$gdb_prompt $"                     { fail "ptype fint" }
-   timeout                             { fail "(timeout) ptype fint" }
-}
-
-# ptype Foo<char>
-
-send_gdb "ptype fchar\n"   
-gdb_expect {   
-   -re "type = (class |)Foo<char> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*char t;\r\n\r\n\[ \t\]*.*char foo\\(int, char\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype fchar" }
-   -re "type = (class |)Foo<char> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*char t;\r\n\r\n\[ \t\]*char foo\\(int, char\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype fchar" }
-   -re "$gdb_prompt $"                     { fail "ptype fchar" }
-   timeout                             { fail "(timeout) ptype fchar" }
-}
-
-# ptype Foo<volatile char *>
-
-send_gdb "ptype fvpchar\n"   
-gdb_expect {   
-   -re "type = (class |)Foo<volatile char ?\\*> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*.*char.*\\*t;\r\n\r\n\[ \t\]*.*char \\* foo\\(int,.*char.*\\*\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype fvpchar" }
-   -re "type = (class |)Foo<volatile char ?\\*> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*.*char.*\\*t;\r\n\r\n\[ \t\]*.*char \\* foo\\(int,.*char.*\\*\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype fvpchar" }
-   -re "type = (class |)Foo<char volatile ?\\*> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*.*char.*\\*t;\r\n\r\n\[ \t\]*.*char \\* foo\\(int,.*char.*\\*\\);\r\n\\}\r\n$gdb_prompt $" {
-       kfail "gdb/1512" "ptype fvpchar"
-   }
-   -re "$gdb_prompt $"                     { fail "ptype fvpchar" }
-   timeout                             { fail "(timeout) ptype fvpchar" }
-}
-
-# print a function from Foo<volatile char *>
-
-# This test is sensitive to whitespace matching, so we'll do it twice,
-# varying the spacing, because of PR gdb/33.
-
-send_gdb "print Foo<volatile char *>::foo\n"   
-gdb_expect {   
-    -re "\\$\[0-9\]* = \\{.*char \\*\\((class |)Foo<volatile char ?\\*> \\*(| const), int, .*char \\*\\)\\} $hex <Foo<.*char.*\\*>::foo\\(int, .*char.*\\*\\)>\r\n$gdb_prompt $" { pass "print Foo<volatile char *>::foo" }
-    -re "No symbol \"Foo<volatile char \\*>\" in current context.\r\n$gdb_prompt $"
-    {
-	# This used to be a kfail gdb/33.  That problem has been
-	# fixed, but now gdb/931 and gdb/1512 are rearing their ugly
-	# heads.
-	kfail "gdb/931" "print Foo<volatile char *>::foo"
-    }
-    -re "$gdb_prompt $"                     { fail "print Foo<volatile char *>::foo" }
-    timeout                             { fail "(timeout) print Foo<volatile char *>::foo" }
-}
-
-send_gdb "print Foo<volatile char*>::foo\n"   
-gdb_expect {   
-    -re "\\$\[0-9\]* = \\{.*char \\*\\((class |)Foo<volatile char ?\\*> \\*(| const), int, .*char \\*\\)\\} $hex <Foo<.*char.*\\*>::foo\\(int, .*char.*\\*\\)>\r\n$gdb_prompt $" { pass "print Foo<volatile char*>::foo" }
-    -re "No symbol \"Foo<volatile char\\*>\" in current context.\r\n$gdb_prompt $"
-    {
-	# This used to be a kfail gdb/33.  That problem has been
-	# fixed, but now gdb/931 and gdb/1512 are rearing their ugly
-	# heads.
-	kfail "gdb/931" "print Foo<volatile char*>::foo"
-    }
-    -re "$gdb_prompt $"                     { fail "print Foo<volatile char*>::foo" }
-    timeout                             { fail "(timeout) print Foo<volatile char*>::foo" }
-}
-
-# Template Bar<T, int>
-
-# same as Foo for g++
-send_gdb "ptype Bar\n"   
-gdb_expect {   
-    -re "type = template <(class |)T, (class |)sz> (class |)Bar \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*T t;\r\n\\}\r\ntemplate instantiations:\r\n\[ \t\]*(class |)Bar<int,(\\(int\\)|)1>\r\n\[ \t\]*(class |)Bar<int,(\\(int\\)|)33>\r\n$gdb_prompt $" { pass "ptype Bar" }
-    -re "type = <(class |)T, (class |)sz> (class |)Bar \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*T t;\r\n\\}\r\n$gdb_prompt $" { xfail "ptype Bar" }
-    -re "ptype Bar\r\ntype = class Bar<int, ?33> {\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int bar\\(int, int\\);\r\n}\r\n$gdb_prompt $"
-    { # GCC 3.1, DWARF-2 output.
-	kfail "gdb/57" "ptype Bar" }
-    -re "No symbol \"Bar\" in current context.\r\n$gdb_prompt $"
-    { # GCC 2.95.3, stabs+ output.
-	pass "ptype Bar" }
-    -re "$gdb_prompt $"                     { fail "ptype Bar" }
-    timeout                             { fail "(timeout) ptype Bar" }
-}
-
-
-# ptype Bar<int,33>
-
-send_gdb "ptype bint\n"   
-gdb_expect {   
-   -re "type = (class |)Bar<int, ?(\\(int\\)|)33> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*.*int bar\\(int, int\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype bint" }
-   -re "type = (class |)Bar<int,(\\(int\\)|)33> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int bar\\(int, int\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype bint" }
-   -re "$gdb_prompt $"                     { fail "ptype bint" }
-   timeout                             { fail "(timeout) ptype bint" }
-}
-
-# ptype Bar<int, (4>3)>
-
-send_gdb "ptype bint2\n"   
-gdb_expect {   
-   -re "type = (class |)Bar<int, ?(\\(int\\)|)1> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*.*int bar\\(int, int\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype bint2" }
-   -re "type = (class |)Bar<int,(\\(int\\)|)1> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int bar\\(int, int\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype bint2" }
-   -re "$gdb_prompt $"                     { fail "ptype bint2" }
-   timeout                             { fail "(timeout) ptype bint2" }
-}
-
-# Template Baz<T, char>
-
-# Same as Foo, for g++
-send_gdb "ptype Baz\n"   
-gdb_expect {   
-    -re "type = template <(class |)T, ?(class |)sz> (class |)Baz \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*T t;\r\n\\}\r\ntemplate instantiations:\r\n\[ \t\]*(class |)Baz<char,(\\(char\\)|)97>\r\n\[ \t\]*(class |)Baz<int,(\\(char\\)|)115>\r\n$gdb_prompt $" { pass "ptype Baz" }
-    -re "type = <(class |)T, ?(class |)sz> (class |)Baz \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*T t;\r\n\\}\r\n$gdb_prompt $" { xfail "ptype Baz" }
-    -re "type = class Baz<int, ?'s'> {\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int baz\\(int, int\\);\r\n}\r\n$gdb_prompt $"
-    { # GCC 3.1, DWARF-2 output.
-	kfail "gdb/57" "ptype Baz" }
-    -re "type = class Baz<int, ?(\\(char\\))?115> {\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int baz\\(int, int\\);\r\n}\r\n$gdb_prompt $"
-    { # GCC 3.x, DWARF-2 output, running into gdb/57 and gdb/1512.
-	kfail "gdb/57" "ptype Baz" }
-    -re "No symbol \"Baz\" in current context.\r\n$gdb_prompt $"
-    { # GCC 2.95.3, stabs+ output.
-	pass "ptype Baz" }
-    -re "$gdb_prompt $"                     { fail "ptype Baz" }
-    timeout                             { fail "(timeout) ptype Baz" }
-}
-
-
-# ptype Baz<int, 's'>
-
-send_gdb "ptype bazint\n"   
-gdb_expect {   
-   -re "type = (class |)Baz<int, ?(\\(char\\)|)(115|\\'s\\')> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*.*int baz\\(int, int\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype bazint" }
-   -re "type = (class |)Baz<int,(\\(char\\)|)(115|\\'s\\')> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int baz\\(int, int\\).*;\r\n\\}\r\n$gdb_prompt $" { pass "ptype bazint" }
-   -re "$gdb_prompt $"                     { fail "ptype bazint" }
-   timeout                             { fail "(timeout) ptype bazint" }
-}
-
-# ptype Baz<char, 'a'>
-
-send_gdb "ptype bazint2\n"   
-gdb_expect {   
-   -re "type = (class |)Baz<char, ?(\\(char\\)|)(97|\\'a\\')> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*char t;\r\n\r\n\[ \t\]*.*char baz\\(int, char\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype bazint2" }
-   -re "type = (class |)Baz<char,(\\(char\\)|)(97|\\'a\\')> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*char t;\r\n\r\n\[ \t\]*char baz\\(int, char\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype bazint2" }
-   -re "$gdb_prompt $"                     { fail "ptype bazint2" }
-   timeout                             { fail "(timeout) ptype bazint2" }
-}
-
-# Template Qux<T, int (*f)(int) >
-# Same as Foo for g++
-send_gdb "ptype Qux\n"   
-gdb_expect {   
-    -re "type = template <(class |)T, ?(class |)sz> (class |)Qux \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*T t;\r\n\\}\r\ntemplate instantiations:\r\n\[ \t\]*(class |)Qux<int,&string>\r\n\[ \t\]*(class |)Qux<char,&string>\r\n$gdb_prompt $" { pass "ptype Qux" }
-    -re ".*type = template <(class |)T.*, ?(class |)sz> (class |)Qux \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*T t;\r\n\\}.*$gdb_prompt $" { pass "ptype Qux" }
-    -re "type = class Qux<char, ?&string> {\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*char t;\r\n\r\n\[ \t\]*char qux\\(int, char\\);\r\n}\r\n$gdb_prompt $"
-    { # GCC 3.1, DWARF-2 output.
-	kfail "gdb/57" "ptype Qux" }
-    -re "type = class Qux<char, ?&\\(string\\)> {\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*char t;\r\n\r\n\[ \t\]*char qux\\(int, char\\);\r\n}\r\n$gdb_prompt $"
-    { # GCC 3.x, DWARF-2 output; gdb/57 + gdb/1512.
-	kfail "gdb/57" "ptype Qux" }
-    -re "No symbol \"Qux\" in current context.\r\n$gdb_prompt $"
-    { # GCC 2.95.3, stabs+ output.
-	pass "ptype Qux" }
-    -re "$gdb_prompt $"                     { fail "ptype Qux" }
-    timeout                             { fail "(timeout) ptype Qux" }
-}
-
-# pt Qux<int,&string>
-
-send_gdb "ptype quxint\n"   
-gdb_expect {   
-   -re "type = class Qux<int, ?& ?string> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*.*int qux\\(int, int\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype quxint" }
-   -re "type = class Qux<int, ?& ?string> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int qux\\(int, int\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype quxint" }
-   -re "type = class Qux<int, ?\\(char ?\\*\\)\\(& ?string\\)> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int qux\\(int, int\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype quxint" }
-   -re "type = class Qux<int, ?& ?\\(string\\)> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int qux\\(int, int\\);.*\r\n\\}\r\n$gdb_prompt $" {
-       kfail "gdb/1512" "ptype quxint"
-   }
-   -re "$gdb_prompt $"                     { fail "ptype quxint" }
-   timeout                             { fail "(timeout) ptype quxint" }
-}
-
-# pt Qux<char,0>
-
-# commented out this as quxint2 declaration was commented out in
-# templates.exp -- ovidiu
-# send_gdb "ptype quxint2\n"   
-# gdb_expect {   
-#    -re "type = class Qux<char,&string> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*char t;\r\n\r\n\[ \t\]*char qux\\(int, char\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype quxint2" }
-#    -re "$gdb_prompt $"                     { fail "ptype quxint2" }
-#    timeout                             { fail "(timeout) ptype quxint2" }
-# }
-
-# Template Spec<T1, T2>
-
-# Same as Foo for g++
-send_gdb "ptype Spec\n"   
-gdb_expect {   
-    -re "type = template <(class |)T1, (class |)T2> (class |)Spec \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\\}\r\ntemplate instantiations:\r\n\[ \t\]*(class |)Spec<int,int \\*>\r\n\[ \t\]*(class |)Spec<int,char>\r\n$gdb_prompt $" { pass "ptype Spec" }
-    -re "type = <(class |)T1, (class |)T2> (class |)Spec \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\\}\r\n$gdb_prompt $" { xfail "ptype Spec" }
-    -re "type = class Spec<int, ?char> {\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\r\n\[ \t\]*int spec\\(char\\);\r\n}\r\n$gdb_prompt $"
-    { # GCC 3.1, DWARF-2 output.
-	kfail "gdb/57" "ptype Spec" }
-    -re "No symbol \"Spec\" in current context.\r\n$gdb_prompt $"
-    { # GCC 2.95.3, stabs+ output.
-	pass "ptype Spec" }
-    -re "$gdb_prompt $"                     { fail "ptype Spec" }
-    timeout                             { fail "(timeout) ptype Spec" }
-}
-
-# pt Spec<char,0>
-
-send_gdb "ptype siip\n"   
-gdb_expect {   
-   -re "type = class Spec<int, ?int ?\\*> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\r\n\[ \t\]*.*int spec\\(int ?\\*\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype siip" }
-   -re "type = class Spec<int,int ?\\*> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\r\n\[ \t\]*int spec\\(int ?\\*\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype siip" }
-   -re "$gdb_prompt $"                     { fail "ptype siip" }
-   timeout                             { fail "(timeout) ptype siip" }
-}
-
-# pt Garply<int>
-
-send_gdb "ptype Garply<int>\n"   
-gdb_expect {   
-   -re "type = class Garply<int> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*.*int garply\\(int, int\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype Garply<int>" }
-   -re "type = class Garply<int> \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*int t;\r\n\r\n\[ \t\]*int garply\\(int, int\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype Garply<int>" }
-   -re "$gdb_prompt $"                     { fail "ptype Garply<int>" }
-   timeout                             { fail "(timeout) ptype Garply<int>" }
-}
-
-# ptype of nested template name
-
-send_gdb "ptype Garply<Garply<char> >\n"   
-gdb_expect {   
-   -re "type = (class |)Garply<Garply<char> > \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*.*(class |)Garply<char> t;\r\n\r\n\[ \t\]*.*(class |)Garply<char> garply\\(int, (class |)Garply<char>\\);\r\n\\}\r\n$gdb_prompt $" { pass "ptype Garply<Garply<char> >" }
-   -re "type = (class |)Garply<Garply<char> > \\{\r\n\[ \t\]*public:\r\n\[ \t\]*int x;\r\n\[ \t\]*.*(class |)Garply<char> t;\r\n\r\n\[ \t\]*(class |)Garply<char> garply\\(int, (class |)Garply<char>\\);.*\r\n\\}\r\n$gdb_prompt $" { pass "ptype Garply<Garply<char> >" }
-   -re "$gdb_prompt $"                     { fail "ptype Garply<Garply<char> >" }
-   timeout                             { fail "(timeout) ptype Garply<Garply<char> >" }
-}
-
-# print out a function from a nested template name
-
-send_gdb "print Garply<Garply<char> >::garply\n"
-gdb_expect {
-   -re "\\$\[0-9\]* = \\{(class |)Garply<char> \\((class |)Garply<Garply<char> > \\*(| const), int, (class |)Garply<char>\\)\\} $hex <Garply<Garply<char>\[ \t\]*>::garply\\(int, (class |)Garply<char>\\)>\r\n$gdb_prompt $" { pass "print Garply<Garply<char> >::garply" }
-   -re ".*$gdb_prompt $" { fail "print Garply<Garply<char> >::garply" }
-   timeout { fail "print Garply<Garply<char> >::garply (timeout)" }
-}
-
-# djb - 06-03-2000
-# Now should work fine
-send_gdb "break Garply<Garply<char> >::garply\n"
-gdb_expect {
-   -re "Breakpoint \[0-9\]* at $hex: file .*templates.cc, line.*\r\n$gdb_prompt $" { pass "break Garply<Garply<char> >::garply" }
-   -re ".*$gdb_prompt $" { fail "break Garply<Garply<char> >::garply" }
-   timeout { fail "break Garply<Garply<char> >::garply (timeout)" }
-}
diff --git a/gdb/testsuite/gdb.cp/try_catch.cc b/gdb/testsuite/gdb.cp/try_catch.cc
deleted file mode 100644
index 764a6121066..00000000000
--- a/gdb/testsuite/gdb.cp/try_catch.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2004,
-   Free Software Foundation, 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.
-   */
-
-#include <exception>
-#include <stdexcept>
-#include <string>
-
-enum region { oriental, egyptian, greek, etruscan, roman };
-
-// Test one.
-class gnu_obj_1
-{
-public:
-  typedef region antiquities;
-  const bool 		test;
-  const int 		key1;
-  long       		key2;
-
-  antiquities 	value;
-
-  gnu_obj_1(antiquities a, long l): test(true), key1(5), key2(l), value(a) {}
-};
-
-// Test two.
-template<typename T>
-class gnu_obj_2: public virtual gnu_obj_1
-{
-public:
-  antiquities	value_derived;
-  
-  gnu_obj_2(antiquities b): gnu_obj_1(oriental, 7), value_derived(b) { }
-}; 
-
-// Test three.
-template<typename T>
-class gnu_obj_3
-{
-public:
-  typedef region antiquities;
-  gnu_obj_2<int>   	data;
-      
-  gnu_obj_3(antiquities b): data(etruscan) { }
-}; 
-
-int main()
-{
-  bool test = true;
-  const int i = 5;
-  int j = i;
-  gnu_obj_2<long> test2(roman);
-  gnu_obj_3<long> test3(greek);
-
-  // 1
-  try
-    {
-      ++j;
-      throw gnu_obj_1(egyptian, 4589);	// marker 1-throw
-    }
-  catch (gnu_obj_1& obj)
-    {
-      ++j;
-      if (obj.value != egyptian)	// marker 1-catch
-	test &= false;
-      if (obj.key2 != 4589)
-	test &= false;     
-    }
-  catch (...)
-    {
-      j = 0;
-      test &= false;
-    }
-
-  // 2
-  try
-    {
-      ++j;				// marker 2-start
-      try
-	{
-	  ++j;				// marker 2-next
-	  try
-	    {
-	      ++j;
-	      throw gnu_obj_1(egyptian, 4589); // marker 2-throw
-	    }
-	  catch (gnu_obj_1& obj)
-	    {
-	      ++j;
-	      if (obj.value != egyptian) // marker 2-catch
-		test &= false;
-	      if (obj.key2 != 4589)
-		test &= false;     
-	    }
-	}
-      catch (gnu_obj_1& obj)
-	{
-	  ++j;
-	  if (obj.value != egyptian)
-	    test &= false;
-	  if (obj.key2 != 4589)
-	    test &= false;     
-	}
-    }
-  catch (...)
-    {
-      j = 0;
-      test &= false;
-    }
-
-  // 3 use standard library
-  using namespace std;
-  try
-    {
-      if (j < 100)
-	throw invalid_argument("gdb.1"); // marker 3-throw
-    }
-  catch (exception& obj)
-    {
-      if (obj.what() != "gdb.1")	// marker 3-catch
-	test &= false;
-    }
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.cp/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp
deleted file mode 100644
index 1473e20c5f1..00000000000
--- a/gdb/testsuite/gdb.cp/try_catch.exp
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2002 Free Software Foundation, 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.  
-
-# Tests for member data
-# 2002-05-27  Benjamin Kosnik  <bkoz@redhat.com>
-
-# This file is part of the gdb testsuite
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_cplus_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "try_catch"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-gdb_breakpoint [gdb_get_line_number "marker 1-throw"]
-gdb_continue_to_breakpoint "marker 1-throw"
-
-gdb_breakpoint [gdb_get_line_number "marker 1-catch"]
-gdb_continue_to_breakpoint "marker 1-catch"
-
-gdb_breakpoint [gdb_get_line_number "marker 2-start"]
-gdb_continue_to_breakpoint "marker 2-start"
-
-gdb_breakpoint [gdb_get_line_number "marker 2-next"]
-gdb_continue_to_breakpoint "marker 2-next"
-
-gdb_breakpoint [gdb_get_line_number "marker 2-throw"]
-gdb_continue_to_breakpoint "marker 2-throw"
-
-gdb_breakpoint [gdb_get_line_number "marker 2-catch"]
-gdb_continue_to_breakpoint "marker 2-catch"
-
-gdb_breakpoint [gdb_get_line_number "marker 3-throw"]
-gdb_continue_to_breakpoint "marker 3-throw"
-
-gdb_breakpoint [gdb_get_line_number "marker 3-catch"]
-gdb_continue_to_breakpoint "marker 3-catch"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/userdef.cc b/gdb/testsuite/gdb.cp/userdef.cc
deleted file mode 100644
index 0ed81dc6af3..00000000000
--- a/gdb/testsuite/gdb.cp/userdef.cc
+++ /dev/null
@@ -1,384 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 1999, 2002, 2003, 2004, 2005
-   Free Software Foundation, 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.
-   */
-
-#include <iostream>
-
-using namespace std;
-
-void marker1()
-{
-  return;
-}
-
-class A1 {
-  int x;
-  int y;
-
-friend ostream& operator<<(ostream& outs, A1 one);
-
-public:
-
-  A1(int a, int b)
-  {
-   x=a;
-   y=b;
-  }
-
-A1 operator+=(int value);
-A1 operator+(const A1&);
-A1 operator-(const A1&);
-A1 operator%(const A1&);
-int operator==(const A1&);
-int operator!=(const A1&);
-int operator&&(const A1&);
-int operator||(const A1&);
-A1 operator<<(int);
-A1 operator>>(int);
-A1 operator|(const A1&);
-A1 operator^(const A1&);
-A1 operator&(const A1&);
-int operator<(const A1&);
-int operator<=(const A1&);
-int operator>=(const A1&);
-int operator>(const A1&);
-A1 operator*(const A1&);
-A1 operator/(const A1&);
-A1 operator=(const A1&);
-
-A1 operator~();
-A1 operator+();
-A1 operator-();
-int operator!();
-A1 operator++();
-A1 operator++(int);
-A1 operator--(); 
-A1 operator--(int);
-
-};
-
-
-A1 A1::operator+(const A1& second)
-{
- A1 sum(0,0);
- sum.x = x + second.x;
- sum.y = y + second.y;
- 
- return (sum);
-}
-
-A1 A1::operator*(const A1& second)
-{
- A1 product(0,0);
- product.x = this->x * second.x;
- product.y = this->y * second.y;
- 
- return product;
-}
-
-A1 A1::operator-(const A1& second)
-{
- A1 diff(0,0);
- diff.x = x - second.x;
- diff.y = y - second.y;
- 
- return diff;
-}
-
-A1 A1::operator/(const A1& second)
-{
- A1 div(0,0);
- div.x = x / second.x;
- div.y = y / second.y;
- 
- return div;
-}
-
-A1 A1::operator%(const A1& second)
-{
- A1 rem(0,0);
- rem.x = x % second.x;
- rem.y = y % second.y;
- 
- return rem;
-}
-
-int A1::operator==(const A1& second)
-{
- int a = (x == second.x);
- int b = (y == second.y);
- 
- return (a && b);
-}
-
-int A1::operator!=(const A1& second)
-{
- int a = (x != second.x);
- int b = (y != second.y);
- 
- return (a || b);
-}
-
-int A1::operator&&(const A1& second)
-{
- return ( x && second.x);
-}
-
-int A1::operator||(const A1& second)
-{
- return ( x || second.x);
-}
-
-A1 A1::operator<<(int value)
-{
- A1 lshft(0,0);
- lshft.x = x << value;
- lshft.y = y << value;
- 
- return lshft;
-}
-
-A1 A1::operator>>(int value)
-{
- A1 rshft(0,0);
- rshft.x = x >> value;
- rshft.y = y >> value;
- 
- return rshft;
-}
-
-A1 A1::operator|(const A1& second)
-{
- A1 abitor(0,0);
- abitor.x = x | second.x;
- abitor.y = y | second.y;
- 
- return abitor;
-}
-
-A1 A1::operator^(const A1& second)
-{
- A1 axor(0,0);
- axor.x = x ^ second.x;
- axor.y = y ^ second.y;
- 
- return axor;
-}
-
-A1 A1::operator&(const A1& second)
-{
- A1 abitand(0,0);
- abitand.x = x & second.x;
- abitand.y = y & second.y;
- 
- return abitand;
-}
-
-int A1::operator<(const A1& second)
-{
- A1 b(0,0);
- b.x = 3;
- return (x < second.x);
-}
-
-int A1::operator<=(const A1& second)
-{
- return (x <= second.x);
-}
-
-int A1::operator>=(const A1& second)
-{
- return (x >= second.x);
-}
-
-int A1::operator>(const A1& second)
-{
- return (x > second.x);
-}
-
-int A1::operator!(void)
-{
- return (!x);
-}
-
-A1 A1::operator-(void)
-{
- A1 neg(0,0);
- neg.x = -x;
- neg.y = -y;
-
- return (neg);
-}
-
-A1 A1::operator+(void)
-{
- A1 pos(0,0);
- pos.x = +x;
- pos.y = +y;
-
- return (pos);
-}
-
-A1 A1::operator~(void)
-{
- A1 acompl(0,0);
- acompl.x = ~x;
- acompl.y = ~y;
-
- return (acompl);
-}
-
-A1 A1::operator++() // pre increment
-{
- x = x +1;
- 
- return (*this);
-}
-
-A1 A1::operator++(int) // post increment
-{
- y = y +1;
- 
- return (*this);
-}
-
-A1 A1::operator--() // pre decrement
-{
- x = x -1;
- 
- return (*this);
-}
-
-A1 A1::operator--(int) // post decrement
-{
- y = y -1;
- 
- return (*this);
-}
-
-
-A1 A1::operator=(const A1& second)
-{
-
- x = second.x;
- y = second.y;
-
- return (*this);
-}
-
-A1 A1::operator+=(int value)
-{
-
- x += value;
- y += value;
-
- return (*this);
-}
-
-ostream& operator<<(ostream& outs, A1 one)
-{
- return (outs << endl << "x = " << one.x << endl << "y = " << one.y << endl << "-------" << endl); 
-}
-
-class A2 {
-  public:
-A2 operator+();
-};
-
-A2 A2::operator+()
-{
-  return A2 ();
-}
-
-
-int main (void)
-{
- A1 one(2,3);
- A1 two(4,5);
- A1 three(0,0);
- int val;
- 
- marker1(); // marker1-returns-here
- cout << one; // marker1-returns-here
- cout << two;
- three = one + two;
- cout << "+ " <<  three;
- three = one - two;
- cout <<  "- " << three;
- three = one * two;
- cout <<"* " <<  three;
- three = one / two;
- cout << "/ " << three;
- three = one % two;
- cout << "% " << three;
- three = one | two;
- cout << "| " <<three;
- three = one ^ two;
- cout << "^ " <<three;
- three = one & two;
- cout << "& "<< three;
-
- val = one && two;
- cout << "&& " << val << endl << "-----"<<endl;
- val = one || two;
- cout << "|| " << val << endl << "-----"<<endl;
- val = one == two;
- cout << " == " << val << endl << "-----"<<endl;
- val = one != two;
- cout << "!= " << val << endl << "-----"<<endl;
- val = one >= two;
- cout << ">= " << val << endl << "-----"<<endl;
- val = one <= two;
- cout << "<= " << val << endl << "-----"<<endl;
- val = one < two;
- cout << "< " << val << endl << "-----"<<endl;
- val = one > two;
- cout << "> " << val << endl << "-----"<<endl;
- 
- three = one << 2;
- cout << "lsh " << three;
- three = one >> 2;
- cout << "rsh " << three;
-
- three = one;
- cout << " = "<< three;
- three += 5;
- cout << " += "<< three;
- 
- val = (!one);
- cout << "! " << val << endl << "-----"<<endl;
- three = (+one);
- cout << "+ " << three;
- three = (-one);
- cout << "- " << three;
- three = (~one);
- cout << " ~" << three;
- three++;
- cout << "postinc " << three;
- three--;
- cout << "postdec " << three;
- 
- --three;
- cout << "predec " << three;
- ++three;
- cout << "preinc " << three;
-
- return 0;
-
-}
diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp
deleted file mode 100644
index 834688b6b0b..00000000000
--- a/gdb/testsuite/gdb.cp/userdef.exp
+++ /dev/null
@@ -1,147 +0,0 @@
-# Tests of overloaded operators resolution.
-# Copyright 1998, 1999, 2002, 2004, 2005 Free Software Foundation, 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.  
-
-# written by Elena Zannoni (ezannoni@cygnus.com)
-#
-# source file "userdef.cc"
-#
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-set testfile "userdef"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
-    send_gdb "cont\n"
-    gdb_expect {
-        -re "Break.* marker1(\\(\\)|) \\(\\) at .*:$decimal.*$gdb_prompt $" {
-            send_gdb "up\n"
-            gdb_expect {
-                -re ".*$gdb_prompt $" { pass "up from marker1" }
-                timeout { fail "up from marker1" }
-            }
-        }
-        -re "$gdb_prompt $" { fail "continue to marker1"  }
-        timeout { fail "(timeout) continue to marker1"  }
-    }
-
-
-gdb_test "print one + two" "\\\$\[0-9\]* = {x = 6, y = 8}"
-
-# If GDB fails to restore the selected frame properly after the
-# inferior function call above (see GDB PR 1155 for an explanation of
-# why this might happen), all the subsequent tests will fail.  We
-# should detect report that failure, but let the marker call finish so
-# that the rest of the tests can run undisturbed.
-gdb_test_multiple "frame" "re-selected 'main' frame after inferior call" {
-    -re "#0  marker1.*$gdb_prompt $" {
-        setup_kfail "gdb/1155" s390-*-linux-gnu
-        fail "re-selected 'main' frame after inferior call"
-        gdb_test "finish" ".*main.*at .*userdef.cc:.*// marker1-returns-here.*" \
-                "finish call to marker1"
-    }
-    -re "#1  ($hex in )?main.*$gdb_prompt $" {
-        pass "re-selected 'main' frame after inferior call"
-    }
-}
-        
-gdb_test "print one - two" "\\\$\[0-9\]* = {x = -2, y = -2}"
-
-gdb_test "print one * two" "\\\$\[0-9\]* = {x = 8, y = 15}"
-
-gdb_test "print one / two" "\\\$\[0-9\]* = {x = 0, y = 0}"
-
-gdb_test "print one % two" "\\\$\[0-9\]* = {x = 2, y = 3}"
-
-gdb_test "print one && two" "\\\$\[0-9\]* = 1\[\r\n\]"
-
-gdb_test "print one || two" "\\\$\[0-9\]* = 1\[\r\n\]"
-
-gdb_test "print one & two" "\\\$\[0-9\]* = {x = 0, y = 1}"
-
-gdb_test "print one | two" "\\\$\[0-9\]* = {x = 6, y = 7}"
-
-gdb_test "print one ^ two" "\\\$\[0-9\]* = {x = 6, y = 6}"
-
-gdb_test "print one < two" "\\\$\[0-9\]* = 1\[\r\n\]"
-
-gdb_test "print one <= two" "\\\$\[0-9\]* = 1\[\r\n\]"
-
-gdb_test "print one > two" "\\\$\[0-9\]* = 0\[\r\n\]"
-
-gdb_test "print one >= two" "\\\$\[0-9\]* = 0\[\r\n\]"
-
-gdb_test "print one == two" "\\\$\[0-9\]* = 0\[\r\n\]"
-
-gdb_test "print one != two" "\\\$\[0-9\]* = 1\[\r\n\]"
-
-# Can't really check the output of this one without knowing
-# target integer width.  Make sure we don't try to call
-# the iostreams operator instead, though.
-gdb_test "print one << 31" "\\\$\[0-9\]* = {x = -?\[0-9\]*, y = -?\[0-9\]*}"
-
-# Should be fine even on < 32-bit targets.
-gdb_test "print one >> 31" "\\\$\[0-9\]* = {x = 0, y = 0}"
-
-gdb_test "print !one" "\\\$\[0-9\]* = 0\[\r\n\]"
-
-# Assumes 2's complement.  So does everything...
-gdb_test "print +one" "\\\$\[0-9\]* = {x = 2, y = 3}"
-
-gdb_test "print ~one" "\\\$\[0-9\]* = {x = -3, y = -4}"
-
-gdb_test "print -one" "\\\$\[0-9\]* = {x = -2, y = -3}"
-
-gdb_test "print one++" "\\\$\[0-9\]* = {x = 2, y = 4}"
-
-gdb_test "print ++one" "\\\$\[0-9\]* = {x = 3, y = 4}"
-
-gdb_test "print one--" "\\\$\[0-9\]* = {x = 3, y = 3}"
-
-gdb_test "print --one" "\\\$\[0-9\]* = {x = 2, y = 3}"
-
-gdb_test "print one += 7" "\\\$\[0-9\]* = {x = 9, y = 10}"
-
-gdb_test "print two = one" "\\\$\[0-9\]* = {x = 9, y = 10}"
-
-# Check that GDB tolerates whitespace in operator names.
-gdb_test "break A2::'operator+'" ".*Breakpoint $decimal at.*"
-gdb_test "break A2::'operator +'" ".*Breakpoint $decimal at.*"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.cp/virtfunc.cc b/gdb/testsuite/gdb.cp/virtfunc.cc
deleted file mode 100644
index 0757ae78ecd..00000000000
--- a/gdb/testsuite/gdb.cp/virtfunc.cc
+++ /dev/null
@@ -1,221 +0,0 @@
-/* This test script is part of GDB, the GNU debugger.
-
-   Copyright 1993, 1994, 1997, 1998, 1999, 2003, 2004,
-   Free Software Foundation, 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.
-   */
-
-// Pls try the following program on virtual functions and try to do print on
-//  most of the code in main().  Almost none of them works !
-
-//
-// The inheritance structure is:
-//
-// V : VA VB
-// A : (V)
-// B : A
-// D : AD (V)
-// C : (V)
-// E : B (V) D C
-//
-
-class VA 
-{
-public:
-    int va;
-};
-
-class VB
-{
-public:
-    int vb;
-    int fvb();
-    virtual int vvb();
-};
-
-class V : public VA, public VB
-{
-public:
-    int f();
-    virtual int vv();
-    int w;
-};
-
-class A : virtual public V
-{
-public:
-    virtual int f();
-private:
-    int a;
-};
-
-class B : public A
-{
-public:
-    int f();
-private:
-    int b;
-};
-
-class C : public virtual V
-{
-public:
-    int c;
-};
-
-class AD
-{
-public:
-    virtual int vg() = 0;
-};
-
-class D : public AD, virtual public V
-{
-public:
-    static void s();
-    virtual int vg();
-    virtual int vd();
-    int fd();
-    int d;
-};
-
-class E : public B, virtual public V, public D, public C
-{
-public:
-    int f();
-    int vg();
-    int vv();
-    int e;
-};
-
-D   dd;
-D*  ppd = &dd;
-AD* pAd = &dd;
-
-A   a;
-B   b;
-C   c;
-D   d;
-E   e;
-V   v;
-VB  vb;
-
-
-A* 	pAa	= 	&a;
-A*	pAe	=	&e;
-
-B*	pBe	=	&e;
-
-D*	pDd	=	&d;
-D*	pDe	=	&e;
-
-V*	pVa	=	&a;
-V*	pVv	=	&v;
-V*	pVe	=	&e;
-V*     pVd	=	&d;
-
-AD*	pADe	=	&e;
-
-E*	pEe	=	&e;
-
-VB*     pVB	=	&vb;
-
-void init()
-{
-	a.vb = 1;
-	b.vb = 2;
-	c.vb = 3;
-	d.vb = 4;
-	e.vb = 5;
-	v.vb = 6;
-	vb.vb = 7;
-
-	d.d	= 1;
-	e.d	=  2;
-}
-
-extern "C" int printf(const char *, ...);
-
-int all_count = 0;
-int failed_count = 0;
-
-#define TEST(EXPR, EXPECTED) \
-   ret = EXPR; \
-   if (ret != EXPECTED) {\
-      printf("Failed %s is %d, should be %d!\n", #EXPR, ret, EXPECTED); \
-      failed_count++; } \
-   all_count++;
-
-int ret;
-
-void test_calls()
-{
-	TEST(pAe->f(), 20);
-	TEST(pAa->f(), 1);
-
-	TEST(pDe->vg(), 202);
-	TEST(pADe->vg(), 202);
-	TEST(pDd->vg(), 101);
-
-	TEST(pEe->vvb(), 411);
-
-	TEST(pVB->vvb(), 407);
-
-	TEST(pBe->vvb(), 411);
-	TEST(pDe->vvb(), 411);
-
-        TEST(pEe->vd(), 282);
-        TEST(pEe->fvb(), 311);
-    
-        TEST(pEe->D::vg(), 102);
-	printf("Did %d tests, of which %d failed.\n", all_count, failed_count);
-}
-#ifdef usestubs
-extern "C" {
-  void set_debug_traps();
-  void breakpoint();
-};
-#endif
-
-int main()
-{
-#ifdef usestubs
-   set_debug_traps();
-   breakpoint();
-#endif
-    init();
-
-    e.w = 7;
-    e.vb = 11;
-
-    test_calls();
-    return 0;
-    
-}
-
-int A::f() {return 1;}
-int B::f() {return 2;}
-void D::s() {}
-int E::f() {return 20;}
-int D::vg() {return 100+d;}
-int E::vg() {return 200+d;}
-int V::f() {return 600+w;}
-int V::vv() {return 400+w;}
-int E::vv() {return 450+w;}
-int D::fd() {return 250+d;}
-int D::vd() {return 280+d;}
-int VB::fvb() {return 300+vb;}
-int VB::vvb() {return 400+vb;}
diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp
deleted file mode 100644
index 0a0291d2493..00000000000
--- a/gdb/testsuite/gdb.cp/virtfunc.exp
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-# And rewritten by Michael Chastain <mec.gnu@mindspring.com>.
-
-set nl		"\[\r\n\]+"
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if { [skip_cplus_tests] } { continue }
-
-load_lib "cp-support.exp"
-
-set testfile "virtfunc"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {c++ debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc test_ptype_of_classes {} {
-
-    # class VA
-
-    cp_test_ptype_class \
-	"ptype VA" "" "class" "VA" \
-	{
-	    { field public "int va;" }
-	}
-
-    # class VB
-
-    cp_test_ptype_class \
-	"ptype VB" "" "class" "VB" \
-	{
-	    { field  public "int vb;" }
-	    { method public "int fvb();" }
-	    { method public "virtual int vvb();" }
-	}
-
-    # class V
-
-    cp_test_ptype_class \
-	"ptype V" "" "class" "V" \
-	{
-	    { base          "public VA" }
-	    { base          "public VB" }
-	    { field  public "int w;" }
-	    { method public "int f();" }
-	    { method public "virtual int vv();" }
-	}
-
-    # class A
-
-    cp_test_ptype_class \
-	"ptype A" "" "class" "A" \
-	{
-	    { base           "public virtual V" }
-	    { vbase          "V" }
-	    { field  private "int a;" }
-	    { method public  "virtual int f();" }
-	}
-
-    # class B
-
-    cp_test_ptype_class \
-	"ptype B" "" "class" "B" \
-	{
-	    { base           "public A" }
-	    { field  private "int b;" }
-	    { method public  "virtual int f();" }
-	}
-
-    # class C
-
-    cp_test_ptype_class \
-	"ptype C" "" "class" "C" \
-	{
-	    { base         "public virtual V" }
-	    { vbase        "V" }
-	    { field public "int c;" }
-	}
-
-    # class AD
-
-    cp_test_ptype_class \
-	"ptype AD" "" "class" "AD" \
-	{
-	    { method public "virtual int vg();" }
-	}
-
-    # class D
-
-    cp_test_ptype_class \
-	"ptype D" "" "class" "D" \
-	{
-	    { base          "public AD" }
-	    { base          "public virtual V" }
-	    { vbase         "V" }
-	    { method public "static void s();" }
-	    { method public "virtual int vg();" }
-	    { method public "virtual int vd();" }
-	    { method public "int fd();" }
-	    { field  public "int d;" }
-	}
-
-    # class E
-
-    cp_test_ptype_class \
-	"ptype E" "" "class" "E" \
-	{
-	    { base          "public B" }
-	    { base          "public virtual V" }
-	    { base          "public D" }
-	    { base          "public C" }
-	    { vbase         "V" }
-	    { method public "virtual int f();" }
-	    { method public "virtual int vg();" }
-	    { method public "virtual int vv();" }
-	    { field  public "int e;" }
-	}
-
-    # An instance of D
-
-    cp_test_ptype_class "ptype dd" "" "class" "D" ibid
-
-    # An instance of D *
-
-    cp_test_ptype_class "ptype ppd" "" "class" "D" ibid "*"
-
-    # An instance of AD *
-    # TODO: this should be named pADd, not pAd.
-
-    cp_test_ptype_class "ptype pAd" "" "class" "AD" ibid "*"
-
-    # Instances of these classes.
-
-    cp_test_ptype_class "ptype a" "" "class" "A" ibid
-    cp_test_ptype_class "ptype b" "" "class" "B" ibid
-    cp_test_ptype_class "ptype c" "" "class" "C" ibid
-    cp_test_ptype_class "ptype d" "" "class" "D" ibid
-    cp_test_ptype_class "ptype e" "" "class" "E" ibid
-    cp_test_ptype_class "ptype v" "" "class" "V" ibid
-    cp_test_ptype_class "ptype vb" "" "class" "VB" ibid
-
-    # Instances of pointers to these classes.
-
-    cp_test_ptype_class "ptype pAa" "" "class" "A" ibid "*"
-    cp_test_ptype_class "ptype pAe" "" "class" "A" ibid "*"
-    cp_test_ptype_class "ptype pBe" "" "class" "B" ibid "*"
-    cp_test_ptype_class "ptype pDd" "" "class" "D" ibid "*"
-    cp_test_ptype_class "ptype pDe" "" "class" "D" ibid "*"
-    cp_test_ptype_class "ptype pVa" "" "class" "V" ibid "*"
-    cp_test_ptype_class "ptype pVv" "" "class" "V" ibid "*"
-    cp_test_ptype_class "ptype pVe" "" "class" "V" ibid "*"
-    cp_test_ptype_class "ptype pVd" "" "class" "V" ibid "*"
-    cp_test_ptype_class "ptype pADe" "" "class" "AD" ibid "*"
-    cp_test_ptype_class "ptype pEe" "" "class" "E" ibid "*"
-    cp_test_ptype_class "ptype pVB" "" "class" "VB" ibid "*"
-
-}
-
-# Call virtual functions.
-
-proc test_virtual_calls {} {
-    global gdb_prompt
-    global nl
-
-    if [target_info exists gdb,cannot_call_functions] {
-	setup_xfail "*-*-*" 2416
-	fail "This target can not call functions"
-	return 0
-    }
-
-    gdb_test "print pAe->f()"   "\\$\[0-9\]+ = 20"
-    gdb_test "print pAa->f()"   "\\$\[0-9\]+ = 1"
-    gdb_test "print pDe->vg()"  "\\$\[0-9\]+ = 202"
-    gdb_test "print pADe->vg()" "\\$\[0-9\]+ = 202"
-    gdb_test "print pDd->vg()"  "\\$\[0-9\]+ = 101"
-    gdb_test "print pEe->vvb()" "\\$\[0-9\]+ = 411"
-    gdb_test "print pVB->vvb()" "\\$\[0-9\]+ = 407"
-    gdb_test "print pBe->vvb()" "\\$\[0-9\]+ = 411"
-    gdb_test "print pDe->vvb()" "\\$\[0-9\]+ = 411"
-    gdb_test "print pEe->vd()"  "\\$\[0-9\]+ = 282"
-    gdb_test "print pEe->fvb()" "\\$\[0-9\]+ = 311"
-
-    # more recent results:
-    # wrong value "202"
-    #   gcc 2.95.3 -gdwarf-2
-    #   gcc 2.95.3 -gstabs+
-    # attempt to take addres of value not located in memory
-    #   gcc 3.3.2 -gdwarf-2
-    #   gcc 3.3.2 -gstabs+
-    #
-    # -- chastain 2003-12-31
-
-    gdb_test_multiple "print pEe->D::vg()" "print pEe->D::vg()" {
-	-re "\\$\[0-9]+ = 102$nl$gdb_prompt $" {
-	    pass "print pEe->D::vg()"
-	}
-	-re "Attempt to take address of value not located in memory.$nl$gdb_prompt $" {
-	    kfail "gdb/1064" "print pEe->D::vg()"
-	}
-    }
-}
-
-proc do_tests {} {
-    global prms_id
-    global bug_id
-    global srcdir subdir binfile
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-    gdb_test "set language c++" "" ""
-    gdb_test "set width 0" "" ""
-
-    runto_main
-    test_ptype_of_classes
-
-    gdb_breakpoint test_calls
-    gdb_test "continue" ".*Breakpoint .* test_calls.*" ""
-    test_virtual_calls
-}
-
-do_tests
diff --git a/gdb/testsuite/gdb.disasm/Makefile.in b/gdb/testsuite/gdb.disasm/Makefile.in
deleted file mode 100644
index 0db2a26ca1b..00000000000
--- a/gdb/testsuite/gdb.disasm/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-.PHONY: all clean mostlyclean distclean realclean
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *.o *.diff *~ *.bad core h8300s hppa mn10300 sh3
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
diff --git a/gdb/testsuite/gdb.disasm/am33.exp b/gdb/testsuite/gdb.disasm/am33.exp
deleted file mode 100644
index c020fac88fe..00000000000
--- a/gdb/testsuite/gdb.disasm/am33.exp
+++ /dev/null
@@ -1,838 +0,0 @@
-
-# Copyright 1997, 1998 Free Software Foundation, 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 Jeff Law. (law@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "mn10300*-*-*"] {
-    verbose "Tests ignored for all but mn10300 based targets."
-    return
-}
-
-global exec_output
-set prms_id 0
-set bug_id 0
-
-set testfile "am33"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc call_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/8i call_tests\n"
-    gdb_expect {
-	-re "
-.*call	.*,.a2,a3,exreg0.,9.*
-.*call	.*,.a2,a3,exreg1.,9.*
-.*call	.*,.a2,a3,exother.,9.*
-.*call	.*,.d2,d3,a2,a3,other,exreg0,exreg1,exother.,9.*
-.*call	.*,.a2,a3,exreg0.,9.*
-.*call	.*,.a2,a3,exreg1.,9.*
-.*call	.*,.a2,a3,exother.,9.*
-.*call	.*,.d2,d3,a2,a3,other,exreg0,exreg1,exother.,9.*
-.*$gdb_prompt $" { pass "call tests" }
-	-re "$gdb_prompt $" { fail "call tests" }
-	timeout { fail "(timeout) call tests" }
-    }
-}
-
-proc movm_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/16i movm_tests\n"
-    gdb_expect {
-	-re "
-.*movm	\\(sp\\),.a2,a3,exreg0.*
-.*movm	\\(sp\\),.a2,a3,exreg1.*
-.*movm	\\(sp\\),.a2,a3,exother.*
-.*movm	\\(sp\\),.d2,d3,a2,a3,other,exreg0,exreg1,exother.*
-.*movm	.a2,a3,exreg0.,\\(sp\\).*
-.*movm	.a2,a3,exreg1.,\\(sp\\).*
-.*movm	.a2,a3,exother.,\\(sp\\).*
-.*movm	.d2,d3,a2,a3,other,exreg0,exreg1,exother.,\\(sp\\).*
-.*movm	\\(usp\\),.a2,a3,exreg0.*
-.*movm	\\(usp\\),.a2,a3,exreg1.*
-.*movm	\\(usp\\),.a2,a3,exother.*
-.*movm	\\(usp\\),.d2,d3,a2,a3,other,exreg0,exreg1,exother.*
-.*movm	.a2,a3,exreg0.,\\(usp\\).*
-.*movm	.a2,a3,exreg1.,\\(usp\\).*
-.*movm	.a2,a3,exother.,\\(usp\\).*
-.*movm	.d2,d3,a2,a3,other,exreg0,exreg1,exother.,\\(usp\\).*
-.*$gdb_prompt $" { pass "movm tests" }
-	-re "$gdb_prompt $" { fail "movm tests" }
-	timeout { fail "(timeout) movm tests" }
-    }
-}
-
-proc misc_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/11i misc_tests\n"
-    gdb_expect {
-	-re "
-.*syscall	4.*
-.*mcst9	d0.*
-.*mcst48	d1.*
-.*getchx	d0.*
-.*getclx	d1.*
-.*clr	a1.*
-.*sat16	a1,a0.*
-.*mcste	r7,r6.*
-.*swap	r5,r4.*
-.*swaph	r3,r2.*
-.*swhw	r1,r0.*
-.*$gdb_prompt $" { pass "misc tests" }
-	-re "$gdb_prompt $" { fail "misc tests" }
-	timeout { fail "(timeout) misc tests" }
-    }
-}
-
-proc mov_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/45i mov_tests\n"
-    gdb_expect {
-	-re "
-.*mov	r0,r1.*
-.*mov	sp,r1.*
-.*mov	r1,xr2.*
-.*mov	\\(r1\\),r2.*
-.*mov	r3,\\(r4\\).*
-.*mov	\\(sp\\),r5.*
-.*mov	r6,\\(sp\\).*
-.*mov	16,r1.*
-.*mov	16,xr1.*
-.*mov	\\(16,r1\\),r2.*
-.*mov	r2,\\(16,r1\\).*
-.*mov	\\(16,sp\\),r2.*
-.*mov	r2,\\(16,sp\\).*
-.*mov	2096895,r2.*
-.*mov	2096895,xr2.*
-.*mov	\\(2096895,r1\\),r2.*
-.*mov	r2,\\(2096895,r1\\).*
-.*mov	\\(2096895,sp\\),r2.*
-.*mov	r2,\\(2096895,sp\\).*
-.*mov	\\(0x1ffeff\\),r2.*
-.*mov	r2,\\(0x1ffeff\\).*
-.*mov	2147417596,r2.*
-.*mov	2147417596,xr2.*
-.*mov	\\(2147417596,r1\\),r2.*
-.*mov	r2,\\(2147417596,r1\\).*
-.*mov	\\(2147417596,sp\\),r2.*
-.*mov	r2,\\(2147417596,sp\\).*
-.*mov	\\(0x7ffefdfc\\),r2.*
-.*mov	r2,\\(0x7ffefdfc\\).*
-.*movu	16,r1.*
-.*movu	2096895,r2.*
-.*movu	2147417596,r2.*
-.*mov	usp,a0.*
-.*mov	ssp,a1.*
-.*mov	msp,a2.*
-.*mov	pc,a3.*
-.*mov	a0,usp.*
-.*mov	a1,ssp.*
-.*mov	a2,msp.*
-.*mov	epsw,d0.*
-.*mov	d1,epsw.*
-.*mov	a0,r1.*
-.*mov	d2,r3.*
-.*mov	r5,a1.*
-.*mov	r7,d3.*
-.*$gdb_prompt $" { pass "mov tests" }
-	-re "$gdb_prompt $" { fail "mov tests" }
-	timeout { fail "(timeout) mov tests" }
-    }
-}
-
-proc ext_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/5i ext_tests\n"
-    gdb_expect {
-	-re "
-.*ext	r2.*
-.*extb	r3,r4.*
-.*extbu	r4,r5.*
-.*exth	r6,r7.*
-.*exthu	r7,a0.*
-.*$gdb_prompt $" { pass "ext tests" }
-	-re "$gdb_prompt $" { fail "ext tests" }
-	timeout { fail "(timeout) ext tests" }
-    }
-}
-
-proc add_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/11i add_tests\n"
-    gdb_expect {
-	-re "
-.*add	a2,a3.*
-.*add	16,r1.*
-.*add	2096895,r2.*
-.*add	2147417596,r2.*
-.*add	r1,r2,r3.*
-.*addc	d0,d1.*
-.*addc	16,r1.*
-.*addc	2096895,r2.*
-.*addc	2147417596,r2.*
-.*inc	d1.*
-.*inc4	d0.*
-.*$gdb_prompt $" { pass "add tests" }
-	-re "$gdb_prompt $" { fail "add tests" }
-	timeout { fail "(timeout) add tests" }
-    }
-}
-
-proc sub_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/8i sub_tests\n"
-    gdb_expect {
-	-re "
-.*sub	d2,d3.*
-.*sub	16,r1.*
-.*sub	2096895,r2.*
-.*sub	2147417596,r2.*
-.*subc	d3,d2.*
-.*subc	16,r1.*
-.*subc	2096895,r2.*
-.*subc	2147417596,r2.*
-.*$gdb_prompt $" { pass "sub tests" }
-	-re "$gdb_prompt $" { fail "sub tests" }
-	timeout { fail "(timeout) sub tests" }
-    }
-}
-
-proc cmp_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/4i cmp_tests\n"
-    gdb_expect {
-	-re "
-.*cmp	a3,a2.*
-.*cmp	16,r1.*
-.*cmp	2096895,r2.*
-.*cmp	2147417596,r2.*
-.*$gdb_prompt $" { pass "cmp tests" }
-	-re "$gdb_prompt $" { fail "cmp tests" }
-	timeout { fail "(timeout) cmp tests" }
-    }
-}
-
-proc logical_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/15i logical_tests\n"
-    gdb_expect {
-	-re "
-.*and	r0,r1.*
-.*or	r2,r3.*
-.*xor	r4,r5.*
-.*not	r6.*
-.*and	16,r1.*
-.*or	16,r1.*
-.*xor	16,r1.*
-.*and	2096895,r2.*
-.*or	2096895,r2.*
-.*xor	2096895,r2.*
-.*and	2147417596,r2.*
-.*or	2147417596,r2.*
-.*xor	2147417596,r2.*
-.*and	131072,epsw.*
-.*or	65535,epsw.*
-.*$gdb_prompt $" { pass "logical tests" }
-	-re "$gdb_prompt $" { fail "logical tests" }
-	timeout { fail "(timeout) logical tests" }
-    }
-}
-
-proc shift_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/15i shift_tests\n"
-    gdb_expect {
-	-re "
-.*asr	r7,a0.*
-.*lsr	a1,a2.*
-.*asl	a3,d0.*
-.*asl2	d1.*
-.*ror	d2.*
-.*rol	d3.*
-.*asr	16,r1.*
-.*lsr	16,r1.*
-.*asl	16,r1.*
-.*asr	2096895,r2.*
-.*lsr	2096895,r2.*
-.*asl	2096895,r2.*
-.*asr	2147417596,r2.*
-.*lsr	2147417596,r2.*
-.*asl	2147417596,r2.*
-.*$gdb_prompt $" { pass "shift tests" }
-	-re "$gdb_prompt $" { fail "shift tests" }
-	timeout { fail "(timeout) shift tests" }
-    }
-}
-
-proc muldiv_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/16i muldiv_tests\n"
-    gdb_expect {
-	-re "
-.*mul	r1,r2.*
-.*mulu	r3,r4.*
-.*mul	16,r1.*
-.*mulu	16,r1.*
-.*mul	2096895,r2.*
-.*mulu	2096895,r2.*
-.*mul	2147417596,r2.*
-.*mulu	2147417596,r2.*
-.*div	r5,r6.*
-.*divu	r7,a0.*
-.*dmulh	d1,d0.*
-.*dmulhu	a3,a2.*
-.*dmulh	2147417596,r2.*
-.*dmulhu	2147417596,r2.*
-.*mul	r1,r2,r3,r4.*
-.*mulu	r1,r2,r3,r4.*
-.*$gdb_prompt $" { pass "muldiv tests" }
-	-re "$gdb_prompt $" { fail "muldiv tests" }
-	timeout { fail "(timeout) muldiv tests" }
-    }
-}
-
-proc movbu_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/20i movbu_tests\n"
-    gdb_expect {
-	-re "
-.*movbu	\\(r5\\),r6.*
-.*movbu	r7,\\(a0\\).*
-.*movbu	\\(sp\\),r7.*
-.*movbu	a0,\\(sp\\).*
-.*movbu	\\(16,r1\\),r2.*
-.*movbu	r2,\\(16,r1\\).*
-.*movbu	\\(16,sp\\),r2.*
-.*movbu	r2,\\(16,sp\\).*
-.*movbu	\\(2096895,r1\\),r2.*
-.*movbu	r2,\\(2096895,r1\\).*
-.*movbu	\\(2096895,sp\\),r2.*
-.*movbu	r2,\\(2096895,sp\\).*
-.*movbu	\\(0x1ffeff\\),r2.*
-.*movbu	r2,\\(0x1ffeff\\).*
-.*movbu	\\(2147417596,r1\\),r2.*
-.*movbu	r2,\\(2147417596,r1\\).*
-.*movbu	\\(2147417596,sp\\),r2.*
-.*movbu	r2,\\(2147417596,sp\\).*
-.*movbu	\\(0x7ffefdfc\\),r2.*
-.*movbu	r2,\\(0x7ffefdfc\\).*
-.*$gdb_prompt $" { pass "movbu tests" }
-	-re "$gdb_prompt $" { fail "movbu tests" }
-	timeout { fail "(timeout) movbu tests" }
-    }
-}
-
-proc movhu_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/20i movhu_tests\n"
-    gdb_expect {
-	-re "
-.*movhu	\\(a1\\),a2.*
-.*movhu	a3,\\(d0\\).*
-.*movhu	\\(sp\\),a1.*
-.*movhu	a2,\\(sp\\).*
-.*movhu	\\(16,r1\\),r2.*
-.*movhu	r2,\\(16,r1\\).*
-.*movhu	\\(16,sp\\),r2.*
-.*movhu	r2,\\(16,sp\\).*
-.*movhu	\\(2096895,r1\\),r2.*
-.*movhu	r2,\\(2096895,r1\\).*
-.*movhu	\\(2096895,sp\\),r2.*
-.*movhu	r2,\\(2096895,sp\\).*
-.*movhu	\\(0x1ffeff\\),r2.*
-.*movhu	r2,\\(0x1ffeff\\).*
-.*movhu	\\(2147417596,r1\\),r2.*
-.*movhu	r2,\\(2147417596,r1\\).*
-.*movhu	\\(2147417596,sp\\),r2.*
-.*movhu	r2,\\(2147417596,sp\\).*
-.*movhu	\\(0x7ffefdfc\\),r2.*
-.*movhu	r2,\\(0x7ffefdfc\\).*
-.*$gdb_prompt $" { pass "movhu tests" }
-	-re "$gdb_prompt $" { fail "movhu tests" }
-	timeout { fail "(timeout) movhu tests" }
-    }
-}
-
-proc mac_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/28i mac_tests\n"
-    gdb_expect {
-	-re "
-.*mac	r1,r2.*
-.*macu	r3,r4.*
-.*macb	r5,r6.*
-.*macbu	r7,a0.*
-.*mach	a1,a2.*
-.*machu	a3,d0.*
-.*dmach	d1,d2.*
-.*dmachu	d3,d2.*
-.*mac	16,r1.*
-.*macu	16,r1.*
-.*macb	16,r1.*
-.*macbu	16,r1.*
-.*mach	16,r1.*
-.*machu	16,r1.*
-.*mac	2096895,r2.*
-.*macu	2096895,r2.*
-.*macb	2096895,r2.*
-.*macbu	2096895,r2.*
-.*mach	2096895,r2.*
-.*machu	2096895,r2.*
-.*mac	2147417596,r2.*
-.*macu	2147417596,r2.*
-.*macb	2147417596,r2.*
-.*macbu	2147417596,r2.*
-.*mach	2147417596,r2.*
-.*machu	2147417596,r2.*
-.*dmach	2147417596,r2.*
-.*dmachu	2147417596,r2.*
-.*$gdb_prompt $" { pass "mac tests" }
-	-re "$gdb_prompt $" { fail "mac tests" }
-	timeout { fail "(timeout) mac tests" }
-    }
-}
-
-proc bit_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/4i bit_tests\n"
-    gdb_expect {
-	-re "
-.*bsch	r1,r2.*
-.*btst	16,r1.*
-.*btst	2096895,r2.*
-.*btst	2147417596,r2.*
-.*$gdb_prompt $" { pass "bit tests" }
-	-re "$gdb_prompt $" { fail "bit tests" }
-	timeout { fail "(timeout) bit tests" }
-    }
-}
-
-proc dsp_add_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/28i dsp_add_tests\n"
-    gdb_expect {
-	-re "
-.*add_add	r4,r1,r2,r3.*
-.*add_add	r4,r1,2,r3.*
-.*add_sub	r4,r1,r2,r3.*
-.*add_sub	r4,r1,2,r3.*
-.*add_cmp	r4,r1,r2,r3.*
-.*add_cmp	r4,r1,2,r3.*
-.*add_mov	r4,r1,r2,r3.*
-.*add_mov	r4,r1,2,r3.*
-.*add_asr	r4,r1,r2,r3.*
-.*add_asr	r4,r1,2,r3.*
-.*add_lsr	r4,r1,r2,r3.*
-.*add_lsr	r4,r1,2,r3.*
-.*add_asl	r4,r1,r2,r3.*
-.*add_asl	r4,r1,2,r3.*
-.*add_add	4,r1,r2,r3.*
-.*add_add	4,r1,2,r3.*
-.*add_sub	4,r1,r2,r3.*
-.*add_sub	4,r1,2,r3.*
-.*add_cmp	4,r1,r2,r3.*
-.*add_cmp	4,r1,2,r3.*
-.*add_mov	4,r1,r2,r3.*
-.*add_mov	4,r1,2,r3.*
-.*add_asr	4,r1,r2,r3.*
-.*add_asr	4,r1,2,r3.*
-.*add_lsr	4,r1,r2,r3.*
-.*add_lsr	4,r1,2,r3.*
-.*add_asl	4,r1,r2,r3.*
-.*add_asl	4,r1,2,r3.*
-.*$gdb_prompt $" { pass "dsp_add tests" }
-	-re "$gdb_prompt $" { fail "dsp_add tests" }
-	timeout { fail "(timeout) dsp_add tests" }
-    }
-}
-
-proc dsp_cmp_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/24i dsp_cmp_tests\n"
-    gdb_expect {
-	-re "
-.*cmp_add	r4,r1,r2,r3.*
-.*cmp_add	r4,r1,2,r3.*
-.*cmp_sub	r4,r1,r2,r3.*
-.*cmp_sub	r4,r1,2,r3.*
-.*cmp_mov	r4,r1,r2,r3.*
-.*cmp_mov	r4,r1,2,r3.*
-.*cmp_asr	r4,r1,r2,r3.*
-.*cmp_asr	r4,r1,2,r3.*
-.*cmp_lsr	r4,r1,r2,r3.*
-.*cmp_lsr	r4,r1,2,r3.*
-.*cmp_asl	r4,r1,r2,r3.*
-.*cmp_asl	r4,r1,2,r3.*
-.*cmp_add	4,r1,r2,r3.*
-.*cmp_add	4,r1,2,r3.*
-.*cmp_sub	4,r1,r2,r3.*
-.*cmp_sub	4,r1,2,r3.*
-.*cmp_mov	4,r1,r2,r3.*
-.*cmp_mov	4,r1,2,r3.*
-.*cmp_asr	4,r1,r2,r3.*
-.*cmp_asr	4,r1,2,r3.*
-.*cmp_lsr	4,r1,r2,r3.*
-.*cmp_lsr	4,r1,2,r3.*
-.*cmp_asl	4,r1,r2,r3.*
-.*cmp_asl	4,r1,2,r3.*
-.*$gdb_prompt $" { pass "dsp_cmp tests" }
-	-re "$gdb_prompt $" { fail "dsp_cmp tests" }
-	timeout { fail "(timeout) dsp_cmp tests" }
-    }
-}
-
-proc dsp_sub_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/28i dsp_sub_tests\n"
-    gdb_expect {
-	-re "
-.*sub_add	r4,r1,r2,r3.*
-.*sub_add	r4,r1,2,r3.*
-.*sub_sub	r4,r1,r2,r3.*
-.*sub_sub	r4,r1,2,r3.*
-.*sub_cmp	r4,r1,r2,r3.*
-.*sub_cmp	r4,r1,2,r3.*
-.*sub_mov	r4,r1,r2,r3.*
-.*sub_mov	r4,r1,2,r3.*
-.*sub_asr	r4,r1,r2,r3.*
-.*sub_asr	r4,r1,2,r3.*
-.*sub_lsr	r4,r1,r2,r3.*
-.*sub_lsr	r4,r1,2,r3.*
-.*sub_asl	r4,r1,r2,r3.*
-.*sub_asl	r4,r1,2,r3.*
-.*sub_add	4,r1,r2,r3.*
-.*sub_add	4,r1,2,r3.*
-.*sub_sub	4,r1,r2,r3.*
-.*sub_sub	4,r1,2,r3.*
-.*sub_cmp	4,r1,r2,r3.*
-.*sub_cmp	4,r1,2,r3.*
-.*sub_mov	4,r1,r2,r3.*
-.*sub_mov	4,r1,2,r3.*
-.*sub_asr	4,r1,r2,r3.*
-.*sub_asr	4,r1,2,r3.*
-.*sub_lsr	4,r1,r2,r3.*
-.*sub_lsr	4,r1,2,r3.*
-.*sub_asl	4,r1,r2,r3.*
-.*sub_asl	4,r1,2,r3.*
-.*$gdb_prompt $" { pass "dsp_sub tests" }
-	-re "$gdb_prompt $" { fail "dsp_sub tests" }
-	timeout { fail "(timeout) dsp_sub tests" }
-    }
-}
-
-proc dsp_mov_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/28i dsp_mov_tests\n"
-    gdb_expect {
-	-re "
-.*mov_add	r4,r1,r2,r3.*
-.*mov_add	r4,r1,2,r3.*
-.*mov_sub	r4,r1,r2,r3.*
-.*mov_sub	r4,r1,2,r3.*
-.*mov_cmp	r4,r1,r2,r3.*
-.*mov_cmp	r4,r1,2,r3.*
-.*mov_mov	r4,r1,r2,r3.*
-.*mov_mov	r4,r1,2,r3.*
-.*mov_asr	r4,r1,r2,r3.*
-.*mov_asr	r4,r1,2,r3.*
-.*mov_lsr	r4,r1,r2,r3.*
-.*mov_lsr	r4,r1,2,r3.*
-.*mov_asl	r4,r1,r2,r3.*
-.*mov_asl	r4,r1,2,r3.*
-.*mov_add	4,r1,r2,r3.*
-.*mov_add	4,r1,2,r3.*
-.*mov_sub	4,r1,r2,r3.*
-.*mov_sub	4,r1,2,r3.*
-.*mov_cmp	4,r1,r2,r3.*
-.*mov_cmp	4,r1,2,r3.*
-.*mov_mov	4,r1,r2,r3.*
-.*mov_mov	4,r1,2,r3.*
-.*mov_asr	4,r1,r2,r3.*
-.*mov_asr	4,r1,2,r3.*
-.*mov_lsr	4,r1,r2,r3.*
-.*mov_lsr	4,r1,2,r3.*
-.*mov_asl	4,r1,r2,r3.*
-.*mov_asl	4,r1,2,r3.*
-.*$gdb_prompt $" { pass "dsp_mov tests" }
-	-re "$gdb_prompt $" { fail "dsp_mov tests" }
-	timeout { fail "(timeout) dsp_mov tests" }
-    }
-}
-
-proc dsp_logical_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/42i dsp_logical_tests\n"
-    gdb_expect {
-	-re "
-.*and_add	r4,r1,r2,r3.*
-.*and_add	r4,r1,2,r3.*
-.*and_sub	r4,r1,r2,r3.*
-.*and_sub	r4,r1,2,r3.*
-.*and_cmp	r4,r1,r2,r3.*
-.*and_cmp	r4,r1,2,r3.*
-.*and_mov	r4,r1,r2,r3.*
-.*and_mov	r4,r1,2,r3.*
-.*and_asr	r4,r1,r2,r3.*
-.*and_asr	r4,r1,2,r3.*
-.*and_lsr	r4,r1,r2,r3.*
-.*and_lsr	r4,r1,2,r3.*
-.*and_asl	r4,r1,r2,r3.*
-.*and_asl	r4,r1,2,r3.*
-.*xor_add	r4,r1,r2,r3.*
-.*xor_add	r4,r1,2,r3.*
-.*xor_sub	r4,r1,r2,r3.*
-.*xor_sub	r4,r1,2,r3.*
-.*xor_cmp	r4,r1,r2,r3.*
-.*xor_cmp	r4,r1,2,r3.*
-.*xor_mov	r4,r1,r2,r3.*
-.*xor_mov	r4,r1,2,r3.*
-.*xor_asr	r4,r1,r2,r3.*
-.*xor_asr	r4,r1,2,r3.*
-.*xor_lsr	r4,r1,r2,r3.*
-.*xor_lsr	r4,r1,2,r3.*
-.*xor_asl	r4,r1,r2,r3.*
-.*xor_asl	r4,r1,2,r3.*
-.*or_add	r4,r1,r2,r3.*
-.*or_add	r4,r1,2,r3.*
-.*or_sub	r4,r1,r2,r3.*
-.*or_sub	r4,r1,2,r3.*
-.*or_cmp	r4,r1,r2,r3.*
-.*or_cmp	r4,r1,2,r3.*
-.*or_mov	r4,r1,r2,r3.*
-.*or_mov	r4,r1,2,r3.*
-.*or_asr	r4,r1,r2,r3.*
-.*or_asr	r4,r1,2,r3.*
-.*or_lsr	r4,r1,r2,r3.*
-.*or_lsr	r4,r1,2,r3.*
-.*or_asl	r4,r1,r2,r3.*
-.*or_asl	r4,r1,2,r3.*
-.*$gdb_prompt $" { pass "dsp_logical tests" }
-	-re "$gdb_prompt $" { fail "dsp_logical tests" }
-	timeout { fail "(timeout) dsp_logical tests" }
-    }
-}
-
-proc dsp_misc_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/42i dsp_misc_tests\n"
-    gdb_expect {
-	-re "
-.*dmach_add	r4,r1,r2,r3.*
-.*dmach_add	r4,r1,2,r3.*
-.*dmach_sub	r4,r1,r2,r3.*
-.*dmach_sub	r4,r1,2,r3.*
-.*dmach_cmp	r4,r1,r2,r3.*
-.*dmach_cmp	r4,r1,2,r3.*
-.*dmach_mov	r4,r1,r2,r3.*
-.*dmach_mov	r4,r1,2,r3.*
-.*dmach_asr	r4,r1,r2,r3.*
-.*dmach_asr	r4,r1,2,r3.*
-.*dmach_lsr	r4,r1,r2,r3.*
-.*dmach_lsr	r4,r1,2,r3.*
-.*dmach_asl	r4,r1,r2,r3.*
-.*dmach_asl	r4,r1,2,r3.*
-.*swhw_add	r4,r1,r2,r3.*
-.*swhw_add	r4,r1,2,r3.*
-.*swhw_sub	r4,r1,r2,r3.*
-.*swhw_sub	r4,r1,2,r3.*
-.*swhw_cmp	r4,r1,r2,r3.*
-.*swhw_cmp	r4,r1,2,r3.*
-.*swhw_mov	r4,r1,r2,r3.*
-.*swhw_mov	r4,r1,2,r3.*
-.*swhw_asr	r4,r1,r2,r3.*
-.*swhw_asr	r4,r1,2,r3.*
-.*swhw_lsr	r4,r1,r2,r3.*
-.*swhw_lsr	r4,r1,2,r3.*
-.*swhw_asl	r4,r1,r2,r3.*
-.*swhw_asl	r4,r1,2,r3.*
-.*sat16_add	r4,r1,r2,r3.*
-.*sat16_add	r4,r1,2,r3.*
-.*sat16_sub	r4,r1,r2,r3.*
-.*sat16_sub	r4,r1,2,r3.*
-.*sat16_cmp	r4,r1,r2,r3.*
-.*sat16_cmp	r4,r1,2,r3.*
-.*sat16_mov	r4,r1,r2,r3.*
-.*sat16_mov	r4,r1,2,r3.*
-.*sat16_asr	r4,r1,r2,r3.*
-.*sat16_asr	r4,r1,2,r3.*
-.*sat16_lsr	r4,r1,r2,r3.*
-.*sat16_lsr	r4,r1,2,r3.*
-.*sat16_asl	r4,r1,r2,r3.*
-.*sat16_asl	r4,r1,2,r3.*
-.*$gdb_prompt $" { pass "dsp_misc tests" }
-	-re "$gdb_prompt $" { fail "dsp_misc tests" }
-	timeout { fail "(timeout) dsp_misc tests" }
-    }
-}
-
-proc autoincrement_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/16i autoincrement_tests\n"
-    gdb_expect {
-	-re "
-.*mov	\\(r1\\+\\),r2.*
-.*mov	r3,\\(r4\\+\\).*
-.*movhu	\\(r6\\+\\),r7.*
-.*movhu	a0,\\(a1\\+\\).*
-.*mov	\\(r1\\+,64\\),r2.*
-.*mov	r1,\\(r2\\+,64\\).*
-.*movhu	\\(r1\\+,64\\),r2.*
-.*movhu	r1,\\(r2\\+,64\\).*
-.*mov	\\(r1\\+,131055\\),r2.*
-.*mov	r1,\\(r2\\+,131055\\).*
-.*movhu	\\(r1\\+,131055\\),r2.*
-.*movhu	r1,\\(r2\\+,131055\\).*
-.*mov	\\(r1\\+,2147417596\\),r2.*
-.*mov	r1,\\(r2\\+,2147417596\\).*
-.*movhu	\\(r1\\+,2147417596\\),r2.*
-.*movhu	r1,\\(r2\\+,2147417596\\).*
-.*$gdb_prompt $" { pass "autoincrement tests" }
-	-re "$gdb_prompt $" { fail "autoincrement tests" }
-	timeout { fail "(timeout) autoincrement tests" }
-    }
-}
-
-proc dsp_autoincrement_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/11i dsp_autoincrement_tests\n"
-    gdb_expect {
-	-re "
-.*mov_llt	\\(r1\\+,4\\),r2.*
-.*mov_lgt	\\(r1\\+,4\\),r2.*
-.*mov_lge	\\(r1\\+,4\\),r2.*
-.*mov_lle	\\(r1\\+,4\\),r2.*
-.*mov_lcs	\\(r1\\+,4\\),r2.*
-.*mov_lhi	\\(r1\\+,4\\),r2.*
-.*mov_lcc	\\(r1\\+,4\\),r2.*
-.*mov_lls	\\(r1\\+,4\\),r2.*
-.*mov_leq	\\(r1\\+,4\\),r2.*
-.*mov_lne	\\(r1\\+,4\\),r2.*
-.*mov_lra	\\(r1\\+,4\\),r2.*
-.*$gdb_prompt $" { pass "autoincrement tests" }
-	-re "$gdb_prompt $" { fail "autoincrement tests" }
-	timeout { fail "(timeout) autoincrement tests" }
-    }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-call_tests
-movm_tests
-misc_tests
-mov_tests
-ext_tests
-add_tests
-sub_tests
-cmp_tests
-logical_tests
-shift_tests
-muldiv_tests
-movbu_tests
-movhu_tests
-mac_tests
-bit_tests
-dsp_add_tests
-dsp_cmp_tests
-dsp_sub_tests
-dsp_mov_tests
-dsp_logical_tests
-autoincrement_tests
-dsp_autoincrement_tests
diff --git a/gdb/testsuite/gdb.disasm/am33.s b/gdb/testsuite/gdb.disasm/am33.s
deleted file mode 100644
index a686cef2f74..00000000000
--- a/gdb/testsuite/gdb.disasm/am33.s
+++ /dev/null
@@ -1,524 +0,0 @@
-
-	.globl _main
-	.globl call_tests
-	.globl movm_tests
-	.globl misc_tests
-	.globl mov_tests
-	.globl ext_tests
-	.globl add_tests
-	.globl sub_tests
-	.globl cmp_tests
-	.globl logical_tests
-	.globl shift_tests
-	.globl muldiv_tests
-	.globl movbu_tests
-	.globl movhu_tests
-	.globl mac_tests
-	.globl bit_tests
-	.globl dsp_add_tests
-	.globl dsp_cmp_tests
-	.globl dsp_sub_tests
-	.globl dsp_mov_tests
-	.globl dsp_logical_tests
-	.globl dsp_misc_tests
-	.globl autoincrement_tests
-	.globl dsp_autoincrement_tests
-
-	.text
-	.am33
-_main:
-call_tests:
-	call 256,[a2,a3,exreg0],9
-	call 256,[a2,a3,exreg1],9
-	call 256,[a2,a3,exother],9
-	call 256,[a2,a3,all],9
-	call 131071,[a2,a3,exreg0],9
-	call 131071,[a2,a3,exreg1],9
-	call 131071,[a2,a3,exother],9
-	call 131071,[a2,a3,all],9
-
-movm_tests:
-	movm (sp),[a2,a3,exreg0]
-	movm (sp),[a2,a3,exreg1]
-	movm (sp),[a2,a3,exother]
-	movm (sp),[a2,a3,all]
-	movm [a2,a3,exreg0],(sp)
-	movm [a2,a3,exreg1],(sp)
-	movm [a2,a3,exother],(sp)
-	movm [a2,a3,all],(sp)
-	movm (usp),[a2,a3,exreg0]
-	movm (usp),[a2,a3,exreg1]
-	movm (usp),[a2,a3,exother]
-	movm (usp),[a2,a3,all]
-	movm [a2,a3,exreg0],(usp)
-	movm [a2,a3,exreg1],(usp)
-	movm [a2,a3,exother],(usp)
-	movm [a2,a3,all],(usp)
-
-misc_tests:
-	syscall 0x4
-	mcst9 d0
-	mcst48 d1
-	getchx d0
-	getclx d1
-	clr r9
-	sat16 r9,r8
-	mcste r7,r6
-	swap r5,r4
-	swaph r3,r2
-	swhw  r1,r0
-
-
-mov_tests:
-	mov r0,r1
-	mov xr0, r1
-	mov r1, xr2
-	mov (r1),r2
-	mov r3,(r4)
-	mov (sp),r5
-	mov r6,(sp)
-	mov 16,r1
-	mov 16,xr1
-	mov (16,r1),r2
-	mov r2,(16,r1)
-	mov (16,sp),r2
-	mov r2,(16,sp)
-	mov 0x1ffeff,r2
-	mov 0x1ffeff,xr2
-	mov (0x1ffeff,r1),r2
-	mov r2,(0x1ffeff,r1)
-	mov (0x1ffeff,sp),r2
-	mov r2,(0x1ffeff,sp)
-	mov (0x1ffeff),r2
-	mov r2,(0x1ffeff)
-	mov 0x7ffefdfc,r2
-	mov 0x7ffefdfc,xr2
-	mov (0x7ffefdfc,r1),r2
-	mov r2,(0x7ffefdfc,r1)
-	mov (0x7ffefdfc,sp),r2
-	mov r2,(0x7ffefdfc,sp)
-	mov (0x7ffefdfc),r2
-	mov r2,(0x7ffefdfc)
-	movu 16,r1
-	movu 0x1ffeff,r2
-	movu 0x7ffefdfc,r2
-	mov usp,a0
-	mov ssp,a1
-	mov msp,a2
-	mov pc,a3
-	mov a0,usp
-	mov a1,ssp
-	mov a2,msp
-	mov epsw,d0
-	mov d1,epsw
-	mov a0,r1
-	mov d2,r3
-	mov r5,a1
-	mov r7,d3
-
-ext_tests:
-	ext r2
-	extb r3,r4
-	extbu r4,r5
-	exth r6,r7
-	exthu r7,r8
-
-add_tests:
-	add r10,r11
-	add 16,r1
-	add 0x1ffeff,r2
-	add 0x7ffefdfc,r2
-	add r1,r2,r3
-	addc r12,r13
-	addc 16,r1
-	addc 0x1ffeff,r2
-	addc 0x7ffefdfc,r2
-	inc r13
-	inc4 r12
-
-
-sub_tests:
-	sub r14,r15
-	sub 16,r1
-	sub 0x1ffeff,r2
-	sub 0x7ffefdfc,r2
-	subc r15,r14
-	subc 16,r1
-	subc 0x1ffeff,r2
-	subc 0x7ffefdfc,r2
-
-cmp_tests:
-	cmp r11,r10
-	cmp 16,r1
-	cmp 0x1ffeff,r2
-	cmp 0x7ffefdfc,r2
-
-logical_tests:
-	and r0,r1
-	or r2,r3
-	xor r4,r5
-	not r6
-	and 16,r1
-	or 16,r1
-	xor 16,r1
-	and 0x1ffeff,r2
-	or 0x1ffeff,r2
-	xor 0x1ffeff,r2
-	and 0x7ffefdfc,r2
-	or 0x7ffefdfc,r2
-	xor 0x7ffefdfc,r2
-	and 131072,epsw
-	or 65535,epsw
-
-shift_tests:
-	asr r7,r8
-	lsr r9,r10
-	asl r11,r12
-	asl2 r13
-	ror r14
-	rol r15
-	asr 16,r1
-	lsr 16,r1
-	asl 16,r1
-	asr 0x1ffeff,r2
-	lsr 0x1ffeff,r2
-	asl 0x1ffeff,r2
-	asr 0x7ffefdfc,r2
-	lsr 0x7ffefdfc,r2
-	asl 0x7ffefdfc,r2
-
-muldiv_tests:
-	mul r1,r2
-	mulu r3,r4
-	mul 16,r1
-	mulu 16,r1
-	mul 0x1ffeff,r2
-	mulu 0x1ffeff,r2
-	mul 0x7ffefdfc,r2
-	mulu 0x7ffefdfc,r2
-	div r5,r6
-	divu r7,r8
-	dmulh r13,r12
-	dmulhu r11,r10
-	dmulh 0x7ffefdfc,r2
-	dmulhu 0x7ffefdfc,r2
-	mul r1,r2,r3,r4
-	mulu r1,r2,r3,r4
-
-movbu_tests:
-	movbu (r5),r6
-	movbu r7,(r8)
-	movbu (sp),r7
-	movbu r8,(sp)
-	movbu (16,r1),r2
-	movbu r2,(16,r1)
-	movbu (16,sp),r2
-	movbu r2,(16,sp)
-	movbu (0x1ffeff,r1),r2
-	movbu r2,(0x1ffeff,r1)
-	movbu (0x1ffeff,sp),r2
-	movbu r2,(0x1ffeff,sp)
-	movbu (0x1ffeff),r2
-	movbu r2,(0x1ffeff)
-	movbu (0x7ffefdfc,r1),r2
-	movbu r2,(0x7ffefdfc,r1)
-	movbu (0x7ffefdfc,sp),r2
-	movbu r2,(0x7ffefdfc,sp)
-	movbu (0x7ffefdfc),r2
-	movbu r2,(0x7ffefdfc)
-
-movhu_tests:
-	movhu (r9),r10
-	movhu r11,(r12)
-	movhu (sp),r9
-	movhu r10,(sp)
-	movhu (16,r1),r2
-	movhu r2,(16,r1)
-	movhu (16,sp),r2
-	movhu r2,(16,sp)
-	movhu (0x1ffeff,r1),r2
-	movhu r2,(0x1ffeff,r1)
-	movhu (0x1ffeff,sp),r2
-	movhu r2,(0x1ffeff,sp)
-	movhu (0x1ffeff),r2
-	movhu r2,(0x1ffeff)
-	movhu (0x7ffefdfc,r1),r2
-	movhu r2,(0x7ffefdfc,r1)
-	movhu (0x7ffefdfc,sp),r2
-	movhu r2,(0x7ffefdfc,sp)
-	movhu (0x7ffefdfc),r2
-	movhu r2,(0x7ffefdfc)
-
-
-mac_tests:
-	mac r1,r2
-	macu r3,r4
-	macb r5,r6
-	macbu r7,r8
-	mach r9,r10
-	machu r11,r12
-	dmach r13,r14
-	dmachu r15,r14
-	mac 16,r1
-	macu 16,r1
-	macb 16,r1
-	macbu 16,r1
-	mach 16,r1
-	machu 16,r1
-	mac 0x1ffeff,r2
-	macu 0x1ffeff,r2
-	macb 0x1ffeff,r2
-	macbu 0x1ffeff,r2
-	mach 0x1ffeff,r2
-	machu 0x1ffeff,r2
-	mac 0x7ffefdfc,r2
-	macu 0x7ffefdfc,r2
-	macb 0x7ffefdfc,r2
-	macbu 0x7ffefdfc,r2
-	mach 0x7ffefdfc,r2
-	machu 0x7ffefdfc,r2
-	dmach 0x7ffefdfc,r2
-	dmachu 0x7ffefdfc,r2
-
-bit_tests:
-	bsch r1,r2
-	btst 16,r1
-	btst 0x1ffeff,r2
-	btst 0x7ffefdfc,r2
-
-
-	
-dsp_add_tests:
-	add_add r4,r1,r2,r3
-	add_add r4,r1,2,r3
-	add_sub r4,r1,r2,r3
-	add_sub r4,r1,2,r3
-	add_cmp r4,r1,r2,r3
-	add_cmp r4,r1,2,r3
-	add_mov r4,r1,r2,r3
-	add_mov r4,r1,2,r3
-	add_asr r4,r1,r2,r3
-	add_asr r4,r1,2,r3
-	add_lsr r4,r1,r2,r3
-	add_lsr r4,r1,2,r3
-	add_asl r4,r1,r2,r3
-	add_asl r4,r1,2,r3
-	add_add 4,r1,r2,r3
-	add_add 4,r1,2,r3
-	add_sub 4,r1,r2,r3
-	add_sub 4,r1,2,r3
-	add_cmp 4,r1,r2,r3
-	add_cmp 4,r1,2,r3
-	add_mov 4,r1,r2,r3
-	add_mov 4,r1,2,r3
-	add_asr 4,r1,r2,r3
-	add_asr 4,r1,2,r3
-	add_lsr 4,r1,r2,r3
-	add_lsr 4,r1,2,r3
-	add_asl 4,r1,r2,r3
-	add_asl 4,r1,2,r3
-
-dsp_cmp_tests:
-	cmp_add r4,r1,r2,r3
-	cmp_add r4,r1,2,r3
-	cmp_sub r4,r1,r2,r3
-	cmp_sub r4,r1,2,r3
-	cmp_mov r4,r1,r2,r3
-	cmp_mov r4,r1,2,r3
-	cmp_asr r4,r1,r2,r3
-	cmp_asr r4,r1,2,r3
-	cmp_lsr r4,r1,r2,r3
-	cmp_lsr r4,r1,2,r3
-	cmp_asl r4,r1,r2,r3
-	cmp_asl r4,r1,2,r3
-	cmp_add 4,r1,r2,r3
-	cmp_add 4,r1,2,r3
-	cmp_sub 4,r1,r2,r3
-	cmp_sub 4,r1,2,r3
-	cmp_mov 4,r1,r2,r3
-	cmp_mov 4,r1,2,r3
-	cmp_asr 4,r1,r2,r3
-	cmp_asr 4,r1,2,r3
-	cmp_lsr 4,r1,r2,r3
-	cmp_lsr 4,r1,2,r3
-	cmp_asl 4,r1,r2,r3
-	cmp_asl 4,r1,2,r3
-
-dsp_sub_tests:
-	sub_add r4,r1,r2,r3
-	sub_add r4,r1,2,r3
-	sub_sub r4,r1,r2,r3
-	sub_sub r4,r1,2,r3
-	sub_cmp r4,r1,r2,r3
-	sub_cmp r4,r1,2,r3
-	sub_mov r4,r1,r2,r3
-	sub_mov r4,r1,2,r3
-	sub_asr r4,r1,r2,r3
-	sub_asr r4,r1,2,r3
-	sub_lsr r4,r1,r2,r3
-	sub_lsr r4,r1,2,r3
-	sub_asl r4,r1,r2,r3
-	sub_asl r4,r1,2,r3
-	sub_add 4,r1,r2,r3
-	sub_add 4,r1,2,r3
-	sub_sub 4,r1,r2,r3
-	sub_sub 4,r1,2,r3
-	sub_cmp 4,r1,r2,r3
-	sub_cmp 4,r1,2,r3
-	sub_mov 4,r1,r2,r3
-	sub_mov 4,r1,2,r3
-	sub_asr 4,r1,r2,r3
-	sub_asr 4,r1,2,r3
-	sub_lsr 4,r1,r2,r3
-	sub_lsr 4,r1,2,r3
-	sub_asl 4,r1,r2,r3
-	sub_asl 4,r1,2,r3
-
-dsp_mov_tests:
-	mov_add r4,r1,r2,r3
-	mov_add r4,r1,2,r3
-	mov_sub r4,r1,r2,r3
-	mov_sub r4,r1,2,r3
-	mov_cmp r4,r1,r2,r3
-	mov_cmp r4,r1,2,r3
-	mov_mov r4,r1,r2,r3
-	mov_mov r4,r1,2,r3
-	mov_asr r4,r1,r2,r3
-	mov_asr r4,r1,2,r3
-	mov_lsr r4,r1,r2,r3
-	mov_lsr r4,r1,2,r3
-	mov_asl r4,r1,r2,r3
-	mov_asl r4,r1,2,r3
-	mov_add 4,r1,r2,r3
-	mov_add 4,r1,2,r3
-	mov_sub 4,r1,r2,r3
-	mov_sub 4,r1,2,r3
-	mov_cmp 4,r1,r2,r3
-	mov_cmp 4,r1,2,r3
-	mov_mov 4,r1,r2,r3
-	mov_mov 4,r1,2,r3
-	mov_asr 4,r1,r2,r3
-	mov_asr 4,r1,2,r3
-	mov_lsr 4,r1,r2,r3
-	mov_lsr 4,r1,2,r3
-	mov_asl 4,r1,r2,r3
-	mov_asl 4,r1,2,r3
-
-dsp_logical_tests:
-	and_add r4,r1,r2,r3
-	and_add r4,r1,2,r3
-	and_sub r4,r1,r2,r3
-	and_sub r4,r1,2,r3
-	and_cmp r4,r1,r2,r3
-	and_cmp r4,r1,2,r3
-	and_mov r4,r1,r2,r3
-	and_mov r4,r1,2,r3
-	and_asr r4,r1,r2,r3
-	and_asr r4,r1,2,r3
-	and_lsr r4,r1,r2,r3
-	and_lsr r4,r1,2,r3
-	and_asl r4,r1,r2,r3
-	and_asl r4,r1,2,r3
-	xor_add r4,r1,r2,r3
-	xor_add r4,r1,2,r3
-	xor_sub r4,r1,r2,r3
-	xor_sub r4,r1,2,r3
-	xor_cmp r4,r1,r2,r3
-	xor_cmp r4,r1,2,r3
-	xor_mov r4,r1,r2,r3
-	xor_mov r4,r1,2,r3
-	xor_asr r4,r1,r2,r3
-	xor_asr r4,r1,2,r3
-	xor_lsr r4,r1,r2,r3
-	xor_lsr r4,r1,2,r3
-	xor_asl r4,r1,r2,r3
-	xor_asl r4,r1,2,r3
-	or_add r4,r1,r2,r3
-	or_add r4,r1,2,r3
-	or_sub r4,r1,r2,r3
-	or_sub r4,r1,2,r3
-	or_cmp r4,r1,r2,r3
-	or_cmp r4,r1,2,r3
-	or_mov r4,r1,r2,r3
-	or_mov r4,r1,2,r3
-	or_asr r4,r1,r2,r3
-	or_asr r4,r1,2,r3
-	or_lsr r4,r1,r2,r3
-	or_lsr r4,r1,2,r3
-	or_asl r4,r1,r2,r3
-	or_asl r4,r1,2,r3
-
-dsp_misc_tests:
-	dmach_add r4,r1,r2,r3
-	dmach_add r4,r1,2,r3
-	dmach_sub r4,r1,r2,r3
-	dmach_sub r4,r1,2,r3
-	dmach_cmp r4,r1,r2,r3
-	dmach_cmp r4,r1,2,r3
-	dmach_mov r4,r1,r2,r3
-	dmach_mov r4,r1,2,r3
-	dmach_asr r4,r1,r2,r3
-	dmach_asr r4,r1,2,r3
-	dmach_lsr r4,r1,r2,r3
-	dmach_lsr r4,r1,2,r3
-	dmach_asl r4,r1,r2,r3
-	dmach_asl r4,r1,2,r3
-	swhw_add r4,r1,r2,r3
-	swhw_add r4,r1,2,r3
-	swhw_sub r4,r1,r2,r3
-	swhw_sub r4,r1,2,r3
-	swhw_cmp r4,r1,r2,r3
-	swhw_cmp r4,r1,2,r3
-	swhw_mov r4,r1,r2,r3
-	swhw_mov r4,r1,2,r3
-	swhw_asr r4,r1,r2,r3
-	swhw_asr r4,r1,2,r3
-	swhw_lsr r4,r1,r2,r3
-	swhw_lsr r4,r1,2,r3
-	swhw_asl r4,r1,r2,r3
-	swhw_asl r4,r1,2,r3
-	sat16_add r4,r1,r2,r3
-	sat16_add r4,r1,2,r3
-	sat16_sub r4,r1,r2,r3
-	sat16_sub r4,r1,2,r3
-	sat16_cmp r4,r1,r2,r3
-	sat16_cmp r4,r1,2,r3
-	sat16_mov r4,r1,r2,r3
-	sat16_mov r4,r1,2,r3
-	sat16_asr r4,r1,r2,r3
-	sat16_asr r4,r1,2,r3
-	sat16_lsr r4,r1,r2,r3
-	sat16_lsr r4,r1,2,r3
-	sat16_asl r4,r1,r2,r3
-	sat16_asl r4,r1,2,r3
-
-autoincrement_tests:
-	mov (r1+),r2
-	mov r3,(r4+)
-	movhu (r6+),r7
-	movhu r8,(r9+)
-	mov (r1+,64),r2
-	mov r1,(r2+,64)
-	movhu (r1+,64),r2
-	movhu r1,(r2+,64)
-	mov (r1+,0x1ffef),r2
-	mov r1,(r2+,0x1ffef)
-	movhu (r1+,0x1ffef),r2
-	movhu r1,(r2+,0x1ffef)
-	mov (r1+,0x7ffefdfc),r2
-	mov r1,(r2+,0x7ffefdfc)
-	movhu (r1+,0x7ffefdfc),r2
-	movhu r1,(r2+,0x7ffefdfc)
-
-dsp_autoincrement_tests:
-	mov_llt (r1+,4),r2
-	mov_lgt (r1+,4),r2
-	mov_lge (r1+,4),r2
-	mov_lle (r1+,4),r2
-	mov_lcs (r1+,4),r2
-	mov_lhi (r1+,4),r2
-	mov_lcc (r1+,4),r2
-	mov_lls (r1+,4),r2
-	mov_leq (r1+,4),r2
-	mov_lne (r1+,4),r2
-	mov_lra (r1+,4),r2
diff --git a/gdb/testsuite/gdb.disasm/h8300s.exp b/gdb/testsuite/gdb.disasm/h8300s.exp
deleted file mode 100644
index dff165c266b..00000000000
--- a/gdb/testsuite/gdb.disasm/h8300s.exp
+++ /dev/null
@@ -1,698 +0,0 @@
-# Copyright (C) 2000 Free Software Foundation, 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 Kazu Hirata. (kazu@hxi.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "h8300s"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_flags=-ms}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc all_set_machine_h8300s { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "set machine h8300s\n"
-    gdb_expect {
-	-re "$gdb_prompt $" {}
-    }
-}
-
-proc all_movb_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/9i movb_tests\n"
-    gdb_expect {
-	-re "
-.*mov.b\tr0l,r0h.*
-.*mov.b\t#0x12,r1l.*
-.*mov.b\t@er0,r1h.*
-.*mov.b\t@\\(0x1234:16,er0\\),r2l.*
-.*mov.b\t@\\(0x12345678:32,er0\\),r2h.*
-.*mov.b\t@er0\\+,r3l.*
-.*mov.b\t@0x12:8,r3h.*
-.*mov.b\t@0x1234:16,r4l.*
-.*mov.b\t@0x12345678:32,r4h.*
-.*$gdb_prompt $" { pass "movb_tests" }
-	-re "$gdb_prompt $" { fail "movb_tests" }
-	timeout { fail "(timeout) movb_tests" }
-    }
-}
-
-proc all_movw_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/8i movw_tests\n"
-    gdb_expect {
-	-re "
-.*mov.w\te0,r0.*
-.*mov.w\t#0x1234,r1.*
-.*mov.w\t@er0,r2.*
-.*mov.w\t@\\(0x1234:16,er0\\),r3.*
-.*mov.w\t@\\(0x12345678:32,er0\\),r4.*
-.*mov.w\t@er0\\+,r5.*
-.*mov.w\t@0x1234:16,r6.*
-.*mov.w\t@0x12345678:32,r7.*
-.*$gdb_prompt $" { pass "movw_tests" }
-	-re "$gdb_prompt $" { fail "movw_tests" }
-	timeout { fail "(timeout) movw_tests" }
-    }
-}
-
-proc all_movl_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/8i movl_tests\n"
-    gdb_expect {
-	-re "
-.*mov.l\ter0,er1.*
-.*mov.l\t#0x12345678,er1.*
-.*mov.l\t@er0,er2.*
-.*mov.l\t@\\(0x1234:16,er0\\),er3.*
-.*mov.l\t@\\(0x12345678:32,er0\\),er4.*
-.*mov.l\t@er0\\+,er5.*
-.*mov.l\t@0x1234:16,er6.*
-.*mov.l\t@0x12345678:32,er7.*
-.*$gdb_prompt $" { pass "movl_tests" }
-	-re "$gdb_prompt $" { fail "movl_tests" }
-	timeout { fail "(timeout) movl_tests" }
-    }
-}
-
-proc all_ldm_stm_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/6i ldm_stm_tests\n"
-    gdb_expect {
-	-re "
-.*ldm.l\t@sp\\+,er0-er1.*
-.*ldm.l\t@sp\\+,er0-er2.*
-.*ldm.l\t@sp\\+,er0-er3.*
-.*stm.l\ter0\\-er1,@-sp.*
-.*stm.l\ter0\\-er2,@-sp.*
-.*stm.l\ter0\\-er3,@-sp.*
-.*$gdb_prompt $" { pass "ldm_stm_tests" }
-	-re "$gdb_prompt $" { fail "ldm_stm_tests" }
-	timeout { fail "(timeout) ldm_stm_tests" }
-    }
-}
-
-proc all_movfpe_movtpe_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/2i movfpe_movtpe_tests\n"
-    gdb_expect {
-	-re "
-.*movfpe\t@0x1234:16,r2l.*
-.*movtpe\tr2l,@0x1234:16.*
-.*$gdb_prompt $" { pass "movfpe_movtpe_tests" }
-	-re "$gdb_prompt $" { fail "movfpe_movtpe_tests" }
-	timeout { fail "(timeout) movfpe_movtpe_tests" }
-    }
-}
-
-proc all_add_sub_addx_subx_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/15i add_sub_addx_subx_tests\n"
-    gdb_expect {
-	-re "
-.*add.b\t#0x12,r0l.*
-.*add.b\tr1l,r1h.*
-.*add.w\t#0x1234,r2.*
-.*add.w\tr3,r4.*
-.*add.l\t#0x12345678,er5.*
-.*add.l\ter6,er7.*
-.*sub.b\tr1l,r1h.*
-.*sub.w\t#0x1234,r2.*
-.*sub.w\tr3,r4.*
-.*sub.l\t#0x12345678,er5.*
-.*sub.l\ter6,er7.*
-.*addx\t#0x12,r0l.*
-.*addx\tr1l,r1h.*
-.*subx\t#0x12,r0l.*
-.*subx\tr1l,r1h.*
-.*$gdb_prompt $" { pass "add_sub_addx_subx_tests" }
-	-re "$gdb_prompt $" { fail "add_sub_addx_subx_tests" }
-	timeout { fail "(timeout) add_sub_addx_subx_tests" }
-    }
-}
-
-proc all_inc_dec_adds_subs_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/16i inc_dec_adds_subs_tests\n"
-    gdb_expect {
-	-re "
-.*inc(.b|)\tr0l.*
-.*inc.w\t#(0x|)1,r4.*
-.*inc.w\t#(0x|)2,r3.*
-.*inc.l\t#(0x|)1,er2.*
-.*inc.l\t#(0x|)2,er1.*
-.*dec.b\tr0l.*
-.*dec.w\t#(0x|)1,r4.*
-.*dec.w\t#(0x|)2,r3.*
-.*dec.l\t#(0x|)1,er2.*
-.*dec.l\t#(0x|)2,er1.*
-.*adds\t#(0x|)1,er7.*
-.*adds\t#(0x|)2,er6.*
-.*adds\t#(0x|)4,er5.*
-.*subs\t#(0x|)1,er7.*
-.*subs\t#(0x|)2,er6.*
-.*subs\t#(0x|)4,er5.*
-.*$gdb_prompt $" { pass "inc_dec_adds_subs_tests" }
-	-re "$gdb_prompt $" { fail "inc_dec_adds_subs_tests" }
-	timeout { fail "(timeout) inc_dec_adds_subs_tests" }
-    }
-}
-
-proc all_daa_das_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/2i daa_das_tests\n"
-    gdb_expect {
-	-re "
-.*daa\tr0l.*
-.*das\tr0h.*
-.*$gdb_prompt $" { pass "daa_das_tests" }
-	-re "$gdb_prompt $" { fail "daa_das_tests" }
-	timeout { fail "(timeout) daa_das_tests" }
-    }
-}
-
-proc all_mul_div_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/8i mul_div_tests\n"
-    gdb_expect {
-	-re "
-.*mulxs.b\tr0l,r1.*
-.*mulxs.w\tr2,er3.*
-.*mulxu.b\tr0l,e1.*
-.*mulxu.w\te2,er3.*
-.*divxs.b\tr0l,r1.*
-.*divxs.w\tr2,er3.*
-.*divxu.b\tr0l,e1.*
-.*divxu.w\te2,er3.*
-.*$gdb_prompt $" { pass "mul_div_tests" }
-	-re "$gdb_prompt $" { fail "mul_div_tests" }
-	timeout { fail "(timeout) mul_div_tests" }
-    }
-}
-
-proc all_cmp_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/8i cmp_tests\n"
-    gdb_expect {
-	-re "
-.*cmp.b\t#0x12,r0l.*
-.*cmp.b\tr1l,r1h.*
-.*cmp.w\t#0x1234,r2.*
-.*cmp.w\tr3,e3.*
-.*cmp.l\t#0x12345678,er4.*
-.*cmp.l\ter5,er6.*
-.*$gdb_prompt $" { pass "cmp_tests" }
-	-re "$gdb_prompt $" { fail "cmp_tests" }
-	timeout { fail "(timeout) cmp_tests" }
-    }
-}
-
-proc all_neg_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/3i neg_tests\n"
-    gdb_expect {
-	-re "
-.*neg.b\tr0l.*
-.*neg.w\tr2.*
-.*neg.l\ter3.*
-.*$gdb_prompt $" { pass "neg_tests" }
-	-re "$gdb_prompt $" { fail "neg_tests" }
-	timeout { fail "(timeout) neg_tests" }
-    }
-}
-
-proc all_ext_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/4i ext_tests\n"
-    gdb_expect {
-	-re "
-.*exts.w\tr0.*
-.*exts.l\ter1.*
-.*extu.w\tr2.*
-.*extu.l\ter3.*
-.*$gdb_prompt $" { pass "ext_tests" }
-	-re "$gdb_prompt $" { fail "ext_tests" }
-	timeout { fail "(timeout) ext_tests" }
-    }
-}
-
-proc all_tas_mac_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/7i tas_mac_tests\n"
-    gdb_expect {
-	-re "
-.*tas\t@er0.*
-.*mac\t@er1\\+,@er2\\+.*
-.*clrmac.*
-.*ldmac\ter4,mach.*
-.*ldmac\ter5,macl.*
-.*stmac\tmach,er6.*
-.*stmac\tmacl,er7.*
-.*$gdb_prompt $" { pass "tas_mac_tests" }
-	-re "$gdb_prompt $" { fail "tas_mac_tests" }
-	timeout { fail "(timeout) tas_mac_tests" }
-    }
-}
-
-proc all_logic_operations_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/21i logic_operations_tests\n"
-    gdb_expect {
-	-re "
-.*and.b\t#0x12,r0l.*
-.*and.b\tr1l,r2h.*
-.*and.w\t#0x1234,r0.*
-.*and.w\tr1,r2.*
-.*and.l\t#0x12345678,er0.*
-.*and.l\ter1,er2.*
-.*or.b\t#0x12,r0l.*
-.*or.b\tr1l,r2h.*
-.*or.w\t#0x1234,r0.*
-.*or.w\tr1,r2.*
-.*or.l\t#0x12345678,er0.*
-.*or.l\ter1,er2.*
-.*xor(.b|)\t#0x12,r0l.*
-.*xor(.b|)\tr1l,r2h.*
-.*xor.w\t#0x1234,r0.*
-.*xor.w\tr1,r2.*
-.*xor.l\t#0x12345678,er0.*
-.*xor.l\ter1,er2.*
-.*not.b\tr0l.*
-.*not.w\tr1.*
-.*not.l\ter2.*
-.*$gdb_prompt $" { pass "logic_operations_tests" }
-	-re "$gdb_prompt $" { fail "logic_operations_tests" }
-	timeout { fail "(timeout) logic_operations_tests" }
-    }
-}
-
-proc all_sha_shl_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/12i sha_shl_tests\n"
-    gdb_expect {
-	-re "
-.*shal(.b|)\tr0l.*
-.*shal(.w|)\tr1.*
-.*shal(.l|)\ter2.*
-.*shar(.b|)\tr3l.*
-.*shar(.w|)\tr4.*
-.*shar(.l|)\ter5.*
-.*shll(.b|)\tr0l.*
-.*shll(.w|)\tr1.*
-.*shll(.l|)\ter2.*
-.*shlr(.b|)\tr3l.*
-.*shlr(.w|)\tr4.*
-.*shlr(.l|)\ter5.*
-.*$gdb_prompt $" { pass "sha_shl_tests" }
-	-re "$gdb_prompt $" { fail "sha_shl_tests" }
-	timeout { fail "(timeout) sha_shl_tests" }
-    }
-}
-
-proc all_rot_rotx_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/12i rot_rotx_tests\n"
-    gdb_expect {
-	-re "
-.*rotl(.b|)\tr0l.*
-.*rotl(.w|)\tr1.*
-.*rotl(.l|)\ter2.*
-.*rotr(.b|)\tr3l.*
-.*rotr(.w|)\tr4.*
-.*rotr(.l|)\ter5.*
-.*rotxl(.b|)\tr0l.*
-.*rotxl(.w|)\tr1.*
-.*rotxl(.l|)\ter2.*
-.*rotxr(.b|)\tr3l.*
-.*rotxr(.w|)\tr4.*
-.*rotxr(.l|)\ter5.*
-.*$gdb_prompt $" { pass "rot_rotx_tests" }
-	-re "$gdb_prompt $" { fail "rot_rotx_tests" }
-	timeout { fail "(timeout) rot_rotx_tests" }
-    }
-}
-
-proc all_bset_bclr_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/20i bset_bclr_tests\n"
-    gdb_expect {
-	-re "
-.*bset\t#0x7,r0l.*
-.*bset\t#0x6,@er1.*
-.*bset\t#0x5,@0x12:8.*
-.*bset\t#0x4,@0x1234:16.*
-.*bset\t#0x3,@0x12345678:32.*
-.*bset\tr7l,r0h.*
-.*bset\tr6l,@er1.*
-.*bset\tr5l,@0x12:8.*
-.*bset\tr4l,@0x1234:16.*
-.*bset\tr3l,@0x12345678:32.*
-.*bclr\t#0x7,r0l.*
-.*bclr\t#0x6,@er1.*
-.*bclr\t#0x5,@0x12:8.*
-.*bclr\t#0x4,@0x1234:16.*
-.*bclr\t#0x3,@0x12345678:32.*
-.*bclr\tr7h,r0h.*
-.*bclr\tr6h,@er1.*
-.*bclr\tr5h,@0x12:8.*
-.*bclr\tr4h,@0x1234:16.*
-.*bclr\tr3h,@0x12345678:32.*
-.*$gdb_prompt $" { pass "bset_bclr_tests" }
-	-re "$gdb_prompt $" { fail "bset_bclr_tests" }
-	timeout { fail "(timeout) bset_bclr_tests" }
-    }
-}
-
-proc all_bnot_btst_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/20i bnot_btst_tests\n"
-    gdb_expect {
-	-re "
-.*bnot\t#0x7,r0l.*
-.*bnot\t#0x6,@er1.*
-.*bnot\t#0x5,@0x12:8.*
-.*bnot\t#0x4,@0x1234:16.*
-.*bnot\t#0x3,@0x12345678:32.*
-.*bnot\tr7l,r0h.*
-.*bnot\tr6l,@er1.*
-.*bnot\tr5l,@0x12:8.*
-.*bnot\tr4l,@0x1234:16.*
-.*bnot\tr3l,@0x12345678:32.*
-.*btst\t#0x7,r0l.*
-.*btst\t#0x6,@er1.*
-.*btst\t#0x5,@0x12:8.*
-.*btst\t#0x4,@0x1234:16.*
-.*btst\t#0x3,@0x12345678:32.*
-.*btst\tr7h,r0h.*
-.*btst\tr6h,@er1.*
-.*btst\tr5h,@0x12:8.*
-.*btst\tr4h,@0x1234:16.*
-.*btst\tr3h,@0x12345678:32.*
-.*$gdb_prompt $" { pass "bnot_btst_tests" }
-	-re "$gdb_prompt $" { fail "bnot_btst_tests" }
-	timeout { fail "(timeout) bnot_btst_tests" }
-    }
-}
-
-proc all_band_bor_bxor_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/15i band_bor_bxor_tests\n"
-    gdb_expect {
-	-re "
-.*band\t#0x7,r0l.*
-.*band\t#0x6,@er1.*
-.*band\t#0x5,@0x12:8.*
-.*band\t#0x4,@0x1234:16.*
-.*band\t#0x3,@0x12345678:32.*
-.*bor\t#0x7,r0l.*
-.*bor\t#0x6,@er1.*
-.*bor\t#0x5,@0x12:8.*
-.*bor\t#0x4,@0x1234:16.*
-.*bor\t#0x3,@0x12345678:32.*
-.*bxor\t#0x7,r0l.*
-.*bxor\t#0x6,@er1.*
-.*bxor\t#0x5,@0x12:8.*
-.*bxor\t#0x4,@0x1234:16.*
-.*bxor\t#0x3,@0x12345678:32.*
-.*$gdb_prompt $" { pass "band_bor_bxor_tests" }
-	-re "$gdb_prompt $" { fail "band_bor_bxor_tests" }
-	timeout { fail "(timeout) band_bor_bxor_tests" }
-    }
-}
-
-proc all_bld_bst_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/20i bld_bst_tests\n"
-    gdb_expect {
-	-re "
-.*bld\t#0x7,r0l.*
-.*bld\t#0x6,@er1.*
-.*bld\t#0x5,@0x12:8.*
-.*bld\t#0x4,@0x1234:16.*
-.*bld\t#0x3,@0x12345678:32.*
-.*bild\t#0x7,r0l.*
-.*bild\t#0x6,@er1.*
-.*bild\t#0x5,@0x12:8.*
-.*bild\t#0x4,@0x1234:16.*
-.*bild\t#0x3,@0x12345678:32.*
-.*bst\t#0x7,r0l.*
-.*bst\t#0x6,@er1.*
-.*bst\t#0x5,@0x12:8.*
-.*bst\t#0x4,@0x1234:16.*
-.*bst\t#0x3,@0x12345678:32.*
-.*bist\t#0x7,r0l.*
-.*bist\t#0x6,@er1.*
-.*bist\t#0x5,@0x12:8.*
-.*bist\t#0x4,@0x1234:16.*
-.*bist\t#0x3,@0x12345678:32.*
-.*$gdb_prompt $" { pass "bld_bst_tests" }
-	-re "$gdb_prompt $" { fail "bld_bst_tests" }
-	timeout { fail "(timeout) bld_bst_tests" }
-    }
-}
-
-proc all_branch_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/25i branch_tests\n"
-    gdb_expect {
-	-re "
-.*bra\t(branch_tests|.-2 ).*
-.*brn\t(branch_tests|.-4 ).*
-.*bhi\t(branch_tests|.-6 ).*
-.*bls\t(branch_tests|.-8 ).*
-.*bcc\t(branch_tests|.-10 ).*
-.*bcs\t(branch_tests|.-12 ).*
-.*bne\t(branch_tests|.-14 ).*
-.*beq\t(branch_tests|.-16 ).*
-.*bvc\t(branch_tests|.-18 ).*
-.*bvs\t(branch_tests|.-20 ).*
-.*bpl\t(branch_tests|.-22 ).*
-.*bmi\t(branch_tests|.-24 ).*
-.*bge\t(branch_tests|.-26 ).*
-.*blt\t(branch_tests|.-28 ).*
-.*bgt\t(branch_tests|.-30 ).*
-.*ble\t(branch_tests|.-32 ).*
-.*jmp\t@er0.*
-.*jmp\t@(branch_tests|0x).*
-.*jmp\t@@0 \\((0x|)0\\).*
-.*bsr\t(branch_tests|.-42 ).*
-.*bsr\t(branch_tests|.-46 ).*
-.*jsr\t@er0.*
-.*jsr\t@(branch_tests|0x).*
-.*jsr\t@@0 \\((0x|)0\\).*
-.*rts.*
-.*$gdb_prompt $" { pass "branch_tests" }
-	-re "$gdb_prompt $" { fail "branch_tests" }
-	timeout { fail "(timeout) branch_tests" }
-    }
-}
-
-proc all_system_control_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/40i system_control_tests\n"
-    gdb_expect {
-	-re "
-.*trapa\t#0x2.*
-.*rte.*
-.*sleep.*
-.*ldc\t#0x12,ccr*.
-.*ldc\tr3l,ccr.*
-.*ldc\t@er0,ccr.*
-.*ldc\t@\\(0x1234:16,er0\\),ccr.*
-.*ldc\t@\\(0x12345678:32,er0\\),ccr.*
-.*ldc\t@er1\\+,ccr.*
-.*ldc\t@0x1234:16,ccr.*
-.*ldc\t@0x12345678:32,ccr.*
-.*stc\tccr,r3l.*
-.*stc\tccr,@er0.*
-.*stc\tccr,@\\(0x1234:16,er0\\).*
-.*stc\tccr,@\\(0x12345678:32,er0\\).*
-.*stc\tccr,@\\-er1.*
-.*stc\tccr,@0x1234:16.*
-.*stc\tccr,@0x12345678:32.*
-.*andc\t#0x12,ccr.*
-.*orc\t#0x34,ccr.*
-.*xorc\t#0x56,ccr.*
-.*ldc\t#0x12,exr*.
-.*ldc\tr3l,exr.*
-.*ldc\t@er0,exr.*
-.*ldc\t@\\(0x1234:16,er0\\),exr.*
-.*ldc\t@\\(0x12345678:32,er0\\),exr.*
-.*ldc\t@er1\\+,exr.*
-.*ldc\t@0x1234:16,exr.*
-.*ldc\t@0x12345678:32,exr.*
-.*stc\texr,r3l.*
-.*stc\texr,@er0.*
-.*stc\texr,@\\(0x1234:16,er0\\).*
-.*stc\texr,@\\(0x12345678:32,er0\\).*
-.*stc\texr,@\\-er1.*
-.*stc\texr,@0x1234:16.*
-.*stc\texr,@0x12345678:32.*
-.*andc\t#0x12,exr.*
-.*orc\t#0x34,exr.*
-.*xorc\t#0x56,exr.*
-.*nop.*
-.*$gdb_prompt $" { pass "system_control_tests" }
-	-re "$gdb_prompt $" { fail "system_control_tests" }
-	timeout { fail "(timeout) system_control_tests" }
-    }
-}
-
-proc all_block_data_transfer_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/2i block_data_transfer_tests\n"
-    gdb_expect {
-	-re "
-.*eepmov.b.*
-.*eepmov.w.*
-.*$gdb_prompt $" { pass "block_data_transfer_tests" }
-	-re "$gdb_prompt $" { fail "block_data_transfer_tests" }
-	timeout { fail "(timeout) block_data_transfer_tests" }
-    }
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-all_set_machine_h8300s
-gdb_load $binfile
-
-# Data transfer
-all_movb_tests
-all_movw_tests
-all_movl_tests
-all_ldm_stm_tests
-all_movfpe_movtpe_tests
-
-# Arithmetic operations
-all_add_sub_addx_subx_tests
-all_inc_dec_adds_subs_tests
-all_daa_das_tests
-all_mul_div_tests
-all_cmp_tests
-all_neg_tests
-all_ext_tests
-all_tas_mac_tests
-
-# Logic operations
-all_logic_operations_tests
-
-# Shift
-all_sha_shl_tests
-all_rot_rotx_tests
-
-# Bit manipulation
-all_bset_bclr_tests
-all_bnot_btst_tests
-all_band_bor_bxor_tests
-all_bld_bst_tests
-
-# Branch
-all_branch_tests
-
-# System control
-all_system_control_tests
-
-# Block data transfer
-all_block_data_transfer_tests
diff --git a/gdb/testsuite/gdb.disasm/h8300s.s b/gdb/testsuite/gdb.disasm/h8300s.s
deleted file mode 100644
index 6510d40ef4e..00000000000
--- a/gdb/testsuite/gdb.disasm/h8300s.s
+++ /dev/null
@@ -1,356 +0,0 @@
-	.h8300s
-	.section .text
-	.align 2
-	.global _main
-	.global movb_tests
-	.global movw_tests
-	.global movl_tests
-	.global ldm_stm_tests
-	.global movfpe_movtpe_tests
-	.global add_sub_addx_subx_tests
-	.global inc_dec_adds_subs_tests
-	.global daa_das_tests
-	.global mul_div_tests
-	.global cmp_tests
-	.global neg_tests
-	.global ext_tests
-	.global tas_mac_tests
-	.global logic_operations_tests
-	.global sha_shl_tests
-	.global rot_rotx_tests
-	.global bset_bclr_tests
-	.global bnot_btst_tests
-	.global band_bor_bxor_tests
-	.global bld_bst_tests
-	.global branch_tests
-	.global system_control_tests
-	.global block_data_transfer_tests
-_main:
-	nop
-
-movb_tests:
-	mov.b	r0l,r0h
-	mov.b	#0x12,r1l
-	mov.b	@er0,r1h
-	mov.b	@(0x1234:16,er0),r2l
-	mov.b	@(0x12345678:32,er0),r2h
-	mov.b	@er0+,r3l
-	mov.b	@0x12:8,r3h
-	mov.b	@0x1234:16,r4l
-	mov.b	@0x12345678:32,r4h
-
-movw_tests:
-	mov.w	e0,r0
-	mov.w	#0x1234,r1
-	mov.w	@er0,r2
-	mov.w	@(0x1234:16,er0),r3
-	mov.w	@(0x12345678:32,er0),r4
-	mov.w	@er0+,r5
-	mov.w	@0x1234:16,r6
-	mov.w	@0x12345678:32,r7
-
-movl_tests:
-	mov.l	er0,er1
-	mov.l	#0x12345678,er1
-	mov.l	@er0,er2
-	mov.l	@(0x1234:16,er0),er3
-	mov.l	@(0x12345678:32,er0),er4
-	mov.l	@er0+,er5
-	mov.l	@0x1234:16,er6
-	mov.l	@0x12345678:32,er7
-
-ldm_stm_tests:
-	ldm.l	@sp+,er0-er1
-	ldm.l	@sp+,er0-er2
-	ldm.l	@sp+,er0-er3
-	stm.l	er0-er1,@-sp
-	stm.l	er0-er2,@-sp
-	stm.l	er0-er3,@-sp
-
-movfpe_movtpe_tests:
-	movfpe	@0x1234:16,r2l
-	movtpe	r2l,@0x1234:16
-
-add_sub_addx_subx_tests:
-	add.b	#0x12,r0l
-	add.b	r1l,r1h
-	add.w	#0x1234,r2
-	add.w	r3,r4
-	add.l	#0x12345678,er5
-	add.l	er6,er7
-	sub.b	r1l,r1h
-	sub.w	#0x1234,r2
-	sub.w	r3,r4
-	sub.l	#0x12345678,er5
-	sub.l	er6,er7
-	addx	#0x12,r0l
-	addx	r1l,r1h
-	subx	#0x12,r0l
-	subx	r1l,r1h
-
-inc_dec_adds_subs_tests:
-	inc.b	r0l
-	inc.w	#0x1,r4
-	inc.w	#0x2,r3
-	inc.l	#0x1,er2
-	inc.l	#0x2,er1
-	dec.b	r0l
-	dec.w	#0x1,r4
-	dec.w	#0x2,r3
-	dec.l	#0x1,er2
-	dec.l	#0x2,er1
-	adds	#0x1,er7
-	adds	#0x2,er6
-	adds	#0x4,er5
-	subs	#0x1,er7
-	subs	#0x2,er6
-	subs	#0x4,er5
-
-daa_das_tests:
-	daa	r0l
-	das	r0h
-
-mul_div_tests:
-	mulxs.b	r0l,r1
-	mulxs.w	r2,er3
-	mulxu.b	r0l,e1
-	mulxu.w	e2,er3
-	divxs.b	r0l,r1
-	divxs.w	r2,er3
-	divxu.b	r0l,e1
-	divxu.w	e2,er3
-
-cmp_tests:
-	cmp.b	#0x12,r0l
-	cmp.b	r1l,r1h
-	cmp.w	#0x1234,r2
-	cmp.w	r3,e3
-	cmp.l	#0x12345678,er4
-	cmp.l	er5,er6
-
-neg_tests:
-	neg.b	r0l
-	neg.w	r2
-	neg.l	er3
-
-ext_tests:
-	exts.w	r0
-	exts.l	er1
-	extu.w	r2
-	extu.l	er3
-
-tas_mac_tests:
-	tas	@er0
-	mac	@er1+,@er2+
-	clrmac
-	ldmac	er4,mach
-	ldmac	er5,macl
-	stmac	mach,er6
-	stmac	macl,er7
-
-logic_operations_tests:
-	and.b	#0x12,r0l
-	and.b	r1l,r2h
-	and.w	#0x1234,r0
-	and.w	r1,r2
-	and.l	#0x12345678,er0
-	and.l	er1,er2
-	or.b	#0x12,r0l
-	or.b	r1l,r2h
-	or.w	#0x1234,r0
-	or.w	r1,r2
-	or.l	#0x12345678,er0
-	or.l	er1,er2
-	xor.b	#0x12,r0l
-	xor.b	r1l,r2h
-	xor.w	#0x1234,r0
-	xor.w	r1,r2
-	xor.l	#0x12345678,er0
-	xor.l	er1,er2
-	not.b	r0l
-	not.w	r1
-	not.l	er2
-
-sha_shl_tests:
-	shal	r0l
-	shal	r1
-	shal	er2
-	shar	r3l
-	shar	r4
-	shar	er5
-	shll	r0l
-	shll	r1
-	shll	er2
-	shlr	r3l
-	shlr	r4
-	shlr	er5
-
-rot_rotx_tests:
-	rotl	r0l
-	rotl	r1
-	rotl	er2
-	rotr	r3l
-	rotr	r4
-	rotr	er5
-	rotxl	r0l
-	rotxl	r1
-	rotxl	er2
-	rotxr	r3l
-	rotxr	r4
-	rotxr	er5
-
-bset_bclr_tests:
-	bset	#0x7,r0l
-	bset	#0x6,@er1
-	bset	#0x5,@0x12:8
-	bset	#0x4,@0x1234:16
-	bset	#0x3,@0x12345678:32
-	bset	r7l,r0h
-	bset	r6l,@er1
-	bset	r5l,@0x12:8
-	bset	r4l,@0x1234:16
-	bset	r3l,@0x12345678:32
-	bclr	#0x7,r0l
-	bclr	#0x6,@er1
-	bclr	#0x5,@0x12:8
-	bclr	#0x4,@0x1234:16
-	bclr	#0x3,@0x12345678:32
-	bclr	r7h,r0h
-	bclr	r6h,@er1
-	bclr	r5h,@0x12:8
-	bclr	r4h,@0x1234:16
-	bclr	r3h,@0x12345678:32
-
-bnot_btst_tests:
-	bnot	#0x7,r0l
-	bnot	#0x6,@er1
-	bnot	#0x5,@0x12:8
-	bnot	#0x4,@0x1234:16
-	bnot	#0x3,@0x12345678:32
-	bnot	r7l,r0h
-	bnot	r6l,@er1
-	bnot	r5l,@0x12:8
-	bnot	r4l,@0x1234:16
-	bnot	r3l,@0x12345678:32
-	btst	#0x7,r0l
-	btst	#0x6,@er1
-	btst	#0x5,@0x12:8
-	btst	#0x4,@0x1234:16
-	btst	#0x3,@0x12345678:32
-	btst	r7h,r0h
-	btst	r6h,@er1
-	btst	r5h,@0x12:8
-	btst	r4h,@0x1234:16
-	btst	r3h,@0x12345678:32
-
-band_bor_bxor_tests:
-	band	#0x7,r0l
-	band	#0x6,@er1
-	band	#0x5,@0x12:8
-	band	#0x4,@0x1234:16
-	band	#0x3,@0x12345678:32
-	bor	#0x7,r0l
-	bor	#0x6,@er1
-	bor	#0x5,@0x12:8
-	bor	#0x4,@0x1234:16
-	bor	#0x3,@0x12345678:32
-	bxor	#0x7,r0l
-	bxor	#0x6,@er1
-	bxor	#0x5,@0x12:8
-	bxor	#0x4,@0x1234:16
-	bxor	#0x3,@0x12345678:32
-
-bld_bst_tests:
-	bld	#0x7,r0l
-	bld	#0x6,@er1
-	bld	#0x5,@0x12:8
-	bld	#0x4,@0x1234:16
-	bld	#0x3,@0x12345678:32
-	bild	#0x7,r0l
-	bild	#0x6,@er1
-	bild	#0x5,@0x12:8
-	bild	#0x4,@0x1234:16
-	bild	#0x3,@0x12345678:32
-	bst	#0x7,r0l
-	bst	#0x6,@er1
-	bst	#0x5,@0x12:8
-	bst	#0x4,@0x1234:16
-	bst	#0x3,@0x12345678:32
-	bist	#0x7,r0l
-	bist	#0x6,@er1
-	bist	#0x5,@0x12:8
-	bist	#0x4,@0x1234:16
-	bist	#0x3,@0x12345678:32
-
-branch_tests:
-	bra	branch_tests
-	brn	branch_tests
-	bhi	branch_tests
-	bls	branch_tests
-	bcc	branch_tests
-	bcs	branch_tests
-	bne	branch_tests
-	beq	branch_tests
-	bvc	branch_tests
-	bvs	branch_tests
-	bpl	branch_tests
-	bmi	branch_tests
-	bge	branch_tests
-	blt	branch_tests
-	bgt	branch_tests
-	ble	branch_tests
-	jmp	@er0
-	jmp	@branch_tests
-	jmp	@@0 (0)
-	bsr	branch_tests:8
-	bsr	branch_tests:16
-	jsr	@er0
-	jsr	@branch_tests
-	jsr	@@0 (0)
-	rts
-
-system_control_tests:
-	trapa	#0x2
-	rte
-	sleep
-	ldc	#0x12,ccr
-	ldc	r3l,ccr
-	ldc	@er0,ccr
-	ldc	@(0x1234:16,er0),ccr
-	ldc	@(0x12345678:32,er0),ccr
-	ldc	@er1+,ccr
-	ldc	@0x1234:16,ccr
-	ldc	@0x12345678:32,ccr
-	stc	ccr,r3l
-	stc	ccr,@er0
-	stc	ccr,@(0x1234:16,er0)
-	stc	ccr,@(0x12345678:32,er0)
-	stc	ccr,@-er1
-	stc	ccr,@0x1234:16
-	stc	ccr,@0x12345678:32
-	andc	#0x12,ccr
-	orc	#0x34,ccr
-	xorc	#0x56,ccr
-	ldc	#0x12,exr
-	ldc	r3l,exr
-	ldc	@er0,exr
-	ldc	@(0x1234:16,er0),exr
-	ldc	@(0x12345678:32,er0),exr
-	ldc	@er1+,exr
-	ldc	@0x1234:16,exr
-	ldc	@0x12345678:32,exr
-	stc	exr,r3l
-	stc	exr,@er0
-	stc	exr,@(0x1234:16,er0)
-	stc	exr,@(0x12345678:32,er0)
-	stc	exr,@-er1
-	stc	exr,@0x1234:16
-	stc	exr,@0x12345678:32
-	andc	#0x12,exr
-	orc	#0x34,exr
-	xorc	#0x56,exr
-	nop
-
-block_data_transfer_tests:
-	eepmov.b
-	eepmov.w
diff --git a/gdb/testsuite/gdb.disasm/hppa.exp b/gdb/testsuite/gdb.disasm/hppa.exp
deleted file mode 100644
index 122e9097031..00000000000
--- a/gdb/testsuite/gdb.disasm/hppa.exp
+++ /dev/null
@@ -1,1404 +0,0 @@
-
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, 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 Jeff Law. (law@cs.utah.edu)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "hppa*-*-*"] {
-    verbose "Tests ignored for all but hppa based targets."
-    return
-}
-
-
-set prms_id 0
-set bug_id 0
-
-set testfile "hppa"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-set comp_output [gdb_compile "${srcfile}" "${binfile}" executable ""];
-if  { $comp_output != "" } {
-    if [ regexp "Opcode not defined - DIAG" $comp_output] {
-	warning "HP assembler in use--skipping disasm tests"
-	return
-    } else {
-	perror "Couldn't compile ${srcfile}"
-	return -1
-    }
-}
-
-proc all_integer_memory_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/8i integer_memory_tests\n"
-    gdb_expect {
-	-re "
-.*ldw 0\\(sr0,r4\\),r26.*
-.*ldh 0\\(sr0,r4\\),r26.*
-.*ldb 0\\(sr0,r4\\),r26.*
-.*stw r26,0\\(sr0,r4\\).*
-.*sth r26,0\\(sr0,r4\\).*
-.*stb r26,0\\(sr0,r4\\).*
-.*ldwm 0\\(sr0,r4\\),r26.*
-.*stwm r26,0\\(sr0,r4\\).*
-.*$gdb_prompt $" { pass "integer_memory_tests" }
-	-re "$gdb_prompt $" { fail "integer_memory_tests" }
-	timeout { fail "(timeout) integer memory_tests" }
-    }
-
-    send_gdb "x/20i integer_indexing_load\n"
-    gdb_expect {
-	-re "
-.*ldwx r5\\(sr0,r4\\),r26.*
-.*ldwx,s r5\\(sr0,r4\\),r26.*
-.*ldwx,m r5\\(sr0,r4\\),r26.*
-.*ldwx,sm r5\\(sr0,r4\\),r26.*
-.*ldhx r5\\(sr0,r4\\),r26.*
-.*ldhx,s r5\\(sr0,r4\\),r26.*
-.*ldhx,m r5\\(sr0,r4\\),r26.*
-.*ldhx,sm r5\\(sr0,r4\\),r26.*
-.*ldbx r5\\(sr0,r4\\),r26.*
-.*ldbx,s r5\\(sr0,r4\\),r26.*
-.*ldbx,m r5\\(sr0,r4\\),r26.*
-.*ldbx,sm r5\\(sr0,r4\\),r26.*
-.*ldwax r5\\(r4\\),r26.*
-.*ldwax,s r5\\(r4\\),r26.*
-.*ldwax,m r5\\(r4\\),r26.*
-.*ldwax,sm r5\\(r4\\),r26.*
-.*ldcwx r5\\(sr0,r4\\),r26.*
-.*ldcwx,s r5\\(sr0,r4\\),r26.*
-.*ldcwx,m r5\\(sr0,r4\\),r26.*
-.*ldcwx,sm r5\\(sr0,r4\\),r26.*
-.*$gdb_prompt $" { pass "integer_indexing_load" }
-	-re "$gdb_prompt $" { fail "integer_indexing_load" }
-	timeout { fail "(timeout) integer_indexing" }
-    }
-
-    send_gdb "x/15i integer_load_short_memory\n"
-    gdb_expect {
-	-re "
-.*ldws 0\\(sr0,r4\\),r26.*
-.*ldws,mb 0\\(sr0,r4\\),r26.*
-.*ldws,ma 0\\(sr0,r4\\),r26.*
-.*ldhs 0\\(sr0,r4\\),r26.*
-.*ldhs,mb 0\\(sr0,r4\\),r26.*
-.*ldhs,ma 0\\(sr0,r4\\),r26.*
-.*ldbs 0\\(sr0,r4\\),r26.*
-.*ldbs,mb 0\\(sr0,r4\\),r26.*
-.*ldbs,ma 0\\(sr0,r4\\),r26.*
-.*ldwas 0\\(r4\\),r26.*
-.*ldwas,mb 0\\(r4\\),r26.*
-.*ldwas,ma 0\\(r4\\),r26.*
-.*ldcws 0\\(sr0,r4\\),r26.*
-.*ldcws,mb 0\\(sr0,r4\\),r26.*
-.*ldcws,ma 0\\(sr0,r4\\),r26.*
-.*$gdb_prompt $" { pass "integer_load_short_memory" }
-	-re "$gdb_prompt $" { fail "integer_load_short_memory" }
-	timeout { fail "(timeout) integer_load_short_memory " }
-    }
-
-
-    send_gdb "x/17i integer_store_short_memory\n"
-    gdb_expect {
-	-re "
-.*stws r26,0\\(sr0,r4\\).*
-.*stws,mb r26,0\\(sr0,r4\\).*
-.*stws,ma r26,0\\(sr0,r4\\).*
-.*sths r26,0\\(sr0,r4\\).*
-.*sths,mb r26,0\\(sr0,r4\\).*
-.*sths,ma r26,0\\(sr0,r4\\).*
-.*stbs r26,0\\(sr0,r4\\).*
-.*stbs,mb r26,0\\(sr0,r4\\).*
-.*stbs,ma r26,0\\(sr0,r4\\).*
-.*stwas r26,0\\(r4\\).*
-.*stwas,mb r26,0\\(r4\\).*
-.*stwas,ma r26,0\\(r4\\).*
-.*stbys r26,0\\(sr0,r4\\).*
-.*stbys r26,0\\(sr0,r4\\).*
-.*stbys,e r26,0\\(sr0,r4\\).*
-.*stbys,b,m r26,0\\(sr0,r4\\).*
-.*stbys,e,m r26,0\\(sr0,r4\\).*
-.*$gdb_prompt $" { pass "integer_store_short_memory" }
-	-re "$gdb_prompt $" { fail "integer_store_short_memory" }
-	timeout { fail "(timeout) integer_short_memory " }
-    }
-}
-
-proc all_immediate_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/3i immediate_tests\n"
-    gdb_expect {
-	-re "
-.*ldo 5\\(r26\\),r26.*
-.*ldil -21524800,r26.*
-.*addil -21524800,r5.*
-.*$gdb_prompt $" { pass "immedate_tests" }
-	-re "$gdb_prompt $" { fail "immedate_tests" }
-	timeout { fail "(timeout) immedate_tests " }
-    }
-}
-
-proc all_branch_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/10i branch_tests_1\n"
-    gdb_expect {
-	-re "
-.*bl.*,rp.*
-.*bl,n.*,rp.*
-.*b.*
-.*b,n.*
-.*gate.*,rp.*
-.*gate,n.*,rp.*
-.*blr r4,rp.*
-.*blr,n r4,rp.*
-.*blr r4,r0.*
-.*blr,n r4,r0.*
-.*$gdb_prompt $" { pass "branch_tests_1" }
-	-re "$gdb_prompt $" { fail "branch_tests_1" }
-	timeout { fail "(timeout) branch_tests_1" }
-    }
-
-    send_gdb "x/6i branch_tests_2\n"
-    gdb_expect {
-	-re "
-.*bv r0\\(rp\\).*
-.*bv,n r0\\(rp\\).*
-.*be 1234\\(sr1,rp\\).*
-.*be,n 1234\\(sr1,rp\\).*
-.*ble 1234\\(sr1,rp\\).*
-.*ble,n 1234\\(sr1,rp\\).*
-.*$gdb_prompt $" { pass "branch_tests_2" }
-	-re "$gdb_prompt $" { fail "branch_tests_2" }
-	timeout { fail "(timeout) branch_tests_2" }
-    }
-
-
-    send_gdb "x/8i movb_tests\n"
-    gdb_expect {
-	-re "
-.*movb r4,r26,.* <movb_tests>.*
-.*movb,= r4,r26,.* <movb_tests>.*
-.*movb,< r4,r26,.* <movb_tests>.*
-.*movb,od r4,r26,.* <movb_tests>.*
-.*movb,tr r4,r26,.* <movb_tests>.*
-.*movb,<> r4,r26,.* <movb_tests>.*
-.*movb,>= r4,r26,.* <movb_tests>.*
-.*movb,ev r4,r26,.* <movb_tests>.*
-.*$gdb_prompt $" { pass "movb_tests" }
-	-re "$gdb_prompt $" { fail "movb_tests" }
-	timeout { fail "(timeout) movb_tests " }
-    }
-
-    send_gdb "x/8i movb_nullified_tests\n"
-    gdb_expect {
-	-re "
-.*movb,n.*r4,r26,.* <movb_tests>.*
-.*movb,=,n.*r4,r26,.* <movb_tests>.*
-.*movb,<,n.*r4,r26,.* <movb_tests>.*
-.*movb,od,n.*r4,r26,.* <movb_tests>.*
-.*movb,tr,n.*r4,r26,.* <movb_tests>.*
-.*movb,<>,n.*r4,r26,.* <movb_tests>.*
-.*movb,>=,n.*r4,r26,.* <movb_tests>.*
-.*movb,ev,n.*r4,r26,.* <movb_tests>.*
-.*$gdb_prompt $" { pass "movb_nullified_tests" }
-	-re "$gdb_prompt $" { fail "movb_nullified_tests" }
-	timeout { fail "(timeout) movb_nullified_tests " }
-    }
-
-    send_gdb "x/8i movib_tests\n"
-    gdb_expect {
-	-re "
-.*movib 5,r26,.* <movib_tests>.*
-.*movib,= 5,r26,.* <movib_tests>.*
-.*movib,< 5,r26,.* <movib_tests>.*
-.*movib,od 5,r26,.* <movib_tests>.*
-.*movib,tr 5,r26,.* <movib_tests>.*
-.*movib,<> 5,r26,.* <movib_tests>.*
-.*movib,>= 5,r26,.* <movib_tests>.*
-.*movib,ev 5,r26,.* <movib_tests>.*
-.*$gdb_prompt $" { pass "movib_tests" }
-	-re "$gdb_prompt $" { fail "movib_tests" }
-	timeout { fail "(timeout) movib_tests " }
-    }
-
-    send_gdb "x/8i movib_nullified_tests\n"
-    gdb_expect {
-	-re "
-.*movib,n.*5,r26,.* <movib_tests>.*
-.*movib,=,n.*5,r26,.* <movib_tests>.*
-.*movib,<,n.*5,r26,.* <movib_tests>.*
-.*movib,od,n.*5,r26,.* <movib_tests>.*
-.*movib,tr,n.*5,r26,.* <movib_tests>.*
-.*movib,<>,n.*5,r26,.* <movib_tests>.*
-.*movib,>=,n.*5,r26,.* <movib_tests>.*
-.*movib,ev,n.*5,r26,.* <movib_tests>.*
-.*$gdb_prompt $" { pass "movib_nullified_tests" }
-	-re "$gdb_prompt $" { fail "movib_nullified_tests" }
-	timeout { fail "(timeout) movib_nullified_tests " }
-    }
-
-    send_gdb "x/8i comb_tests_1\n"
-    gdb_expect {
-	-re "
-.*comb r0,r4,.* <comb_tests_1>.*
-.*comb,= r0,r4,.* <comb_tests_1>.*
-.*comb,< r0,r4,.* <comb_tests_1>.*
-.*comb,<= r0,r4,.* <comb_tests_1>.*
-.*comb,<< r0,r4,.* <comb_tests_1>.*
-.*comb,<<= r0,r4,.* <comb_tests_1>.*
-.*comb,sv r0,r4,.* <comb_tests_1>.*
-.*comb,od r0,r4,.* <comb_tests_1>.*
-.*$gdb_prompt $" { pass "comb_tests_1" }
-	-re "$gdb_prompt $" { fail "comb_tests_1" }
-	timeout { fail "(timeout) comb_tests_1" }
-    }
-
-    send_gdb "x/8i comb_tests_2\n"
-    gdb_expect {
-	-re "
-.*combf r0,r4,.* <comb_tests_2>.*
-.*combf,= r0,r4,.* <comb_tests_2>.*
-.*combf,< r0,r4,.* <comb_tests_2>.*
-.*combf,<= r0,r4,.* <comb_tests_2>.*
-.*combf,<< r0,r4,.* <comb_tests_2>.*
-.*combf,<<= r0,r4,.* <comb_tests_2>.*
-.*combf,sv r0,r4,.* <comb_tests_2>.*
-.*combf,od r0,r4,.* <comb_tests_2>.*
-.*$gdb_prompt $" { pass "comb_tests_2" }
-	-re "$gdb_prompt $" { fail "comb_tests_2" }
-	timeout { fail "(timeout) comb_tests_2" }
-    }
-
-    send_gdb "x/8i comb_nullified_tests_1\n"
-    gdb_expect {
-	-re "
-.*comb,n r0,r4,.* <comb_tests_1>.*
-.*comb,=,n r0,r4,.* <comb_tests_1>.*
-.*comb,<,n r0,r4,.* <comb_tests_1>.*
-.*comb,<=,n r0,r4,.* <comb_tests_1>.*
-.*comb,<<,n r0,r4,.* <comb_tests_1>.*
-.*comb,<<=,n r0,r4,.* <comb_tests_1>.*
-.*comb,sv,n r0,r4,.* <comb_tests_1>.*
-.*comb,od,n r0,r4,.* <comb_tests_1>.*
-.*$gdb_prompt $" { pass "comb_nullified_tests_1" }
-	-re "$gdb_prompt $" { fail "comb_nullified_tests_1" }
-	timeout { fail "(timeout) comb_nullified_tests_1" }
-    }
-
-    send_gdb "x/8i comb_nullified_tests_2\n"
-    gdb_expect {
-	-re "
-.*combf,n r0,r4,.* <comb_tests_2>.*
-.*combf,=,n r0,r4,.* <comb_tests_2>.*
-.*combf,<,n r0,r4,.* <comb_tests_2>.*
-.*combf,<=,n r0,r4,.* <comb_tests_2>.*
-.*combf,<<,n r0,r4,.* <comb_tests_2>.*
-.*combf,<<=,n r0,r4,.* <comb_tests_2>.*
-.*combf,sv,n r0,r4,.* <comb_tests_2>.*
-.*combf,od,n r0,r4,.* <comb_tests_2>.*
-.*$gdb_prompt $" { pass "comb_nullified_tests_2" }
-	-re "$gdb_prompt $" { fail "comb_nullified_tests_2" }
-	timeout { fail "(timeout) comb_nullified_tests_2" }
-    }
-
-    send_gdb "x/8i comib_tests_1\n"
-    gdb_expect {
-	-re "
-.*comib 0,r4,.* <comib_tests_1>.*
-.*comib,= 0,r4,.* <comib_tests_1>.*
-.*comib,< 0,r4,.* <comib_tests_1>.*
-.*comib,<= 0,r4,.* <comib_tests_1>.*
-.*comib,<< 0,r4,.* <comib_tests_1>.*
-.*comib,<<= 0,r4,.* <comib_tests_1>.*
-.*comib,sv 0,r4,.* <comib_tests_1>.*
-.*comib,od 0,r4,.* <comib_tests_1>.*
-.*$gdb_prompt $" { pass "comib_tests_1" }
-	-re "$gdb_prompt $" { fail "comib_tests_1" }
-	timeout { fail "(timeout) comib_tests_1" }
-    }
-
-    send_gdb "x/8i comib_tests_2\n"
-    gdb_expect {
-	-re "
-.*comibf 0,r4,.* <comib_tests_2>.*
-.*comibf,= 0,r4,.* <comib_tests_2>.*
-.*comibf,< 0,r4,.* <comib_tests_2>.*
-.*comibf,<= 0,r4,.* <comib_tests_2>.*
-.*comibf,<< 0,r4,.* <comib_tests_2>.*
-.*comibf,<<= 0,r4,.* <comib_tests_2>.*
-.*comibf,sv 0,r4,.* <comib_tests_2>.*
-.*comibf,od 0,r4,.* <comib_tests_2>.*
-.*$gdb_prompt $" { pass "comib_tests_2" }
-	-re "$gdb_prompt $" { fail "comib_tests_2" }
-	timeout { fail "(timeout) comib_tests_2" }
-    }
-
-    send_gdb "x/8i comib_nullified_tests_1\n"
-    gdb_expect {
-	-re "
-.*comib,n 0,r4,.* <comib_tests_1>.*
-.*comib,=,n 0,r4,.* <comib_tests_1>.*
-.*comib,<,n 0,r4,.* <comib_tests_1>.*
-.*comib,<=,n 0,r4,.* <comib_tests_1>.*
-.*comib,<<,n 0,r4,.* <comib_tests_1>.*
-.*comib,<<=,n 0,r4,.* <comib_tests_1>.*
-.*comib,sv,n 0,r4,.* <comib_tests_1>.*
-.*comib,od,n 0,r4,.* <comib_tests_1>.*
-.*$gdb_prompt $" { pass "comib_nullified_tests_1" }
-	-re "$gdb_prompt $" { fail "comib_nullified_tests_1" }
-	timeout { fail "(timeout) comib_nullified_tests_1" }
-    }
-
-    send_gdb "x/8i comib_nullified_tests_2\n"
-    gdb_expect {
-	-re "
-.*comibf,n 0,r4,.* <comib_tests_2>.*
-.*comibf,=,n 0,r4,.* <comib_tests_2>.*
-.*comibf,<,n 0,r4,.* <comib_tests_2>.*
-.*comibf,<=,n 0,r4,.* <comib_tests_2>.*
-.*comibf,<<,n 0,r4,.* <comib_tests_2>.*
-.*comibf,<<=,n 0,r4,.* <comib_tests_2>.*
-.*comibf,sv,n 0,r4,.* <comib_tests_2>.*
-.*comibf,od,n 0,r4,.* <comib_tests_2>.*
-.*$gdb_prompt $" { pass "comib_nullified_tests_2" }
-	-re "$gdb_prompt $" { fail "comib_nullified_tests_2" }
-	timeout { fail "(timeout) comib_nullified_tests_2" }
-    }
-
-    send_gdb "x/8i addb_tests_1\n"
-    gdb_expect {
-	-re "
-.*addb r1,r4,.* <addb_tests_1>.*
-.*addb,= r1,r4,.* <addb_tests_1>.*
-.*addb,< r1,r4,.* <addb_tests_1>.*
-.*addb,<= r1,r4,.* <addb_tests_1>.*
-.*addb,nuv r1,r4,.* <addb_tests_1>.*
-.*addb,znv r1,r4,.* <addb_tests_1>.*
-.*addb,sv r1,r4,.* <addb_tests_1>.*
-.*addb,od r1,r4,.* <addb_tests_1>.*
-.*$gdb_prompt $" { pass "addb_tests_1" }
-	-re "$gdb_prompt $" { fail "addb_tests_1" }
-	timeout { fail "(timeout) addb_tests_1" }
-    }
-
-    send_gdb "x/8i addb_tests_2\n"
-    gdb_expect {
-	-re "
-.*addbf r1,r4,.* <addb_tests_2>.*
-.*addbf,= r1,r4,.* <addb_tests_2>.*
-.*addbf,< r1,r4,.* <addb_tests_2>.*
-.*addbf,<= r1,r4,.* <addb_tests_2>.*
-.*addbf,nuv r1,r4,.* <addb_tests_2>.*
-.*addbf,znv r1,r4,.* <addb_tests_2>.*
-.*addbf,sv r1,r4,.* <addb_tests_2>.*
-.*addbf,od r1,r4,.* <addb_tests_2>.*
-.*$gdb_prompt $" { pass "addb_tests_2" }
-	-re "$gdb_prompt $" { fail "addb_tests_2" }
-	timeout { fail "(timeout) addb_tests_2" }
-    }
-
-    send_gdb "x/8i addb_nullified_tests_1\n"
-    gdb_expect {
-	-re "
-.*addb,n r1,r4,.* <addb_tests_1>.*
-.*addb,=,n r1,r4,.* <addb_tests_1>.*
-.*addb,<,n r1,r4,.* <addb_tests_1>.*
-.*addb,<=,n r1,r4,.* <addb_tests_1>.*
-.*addb,nuv,n r1,r4,.* <addb_tests_1>.*
-.*addb,znv,n r1,r4,.* <addb_tests_1>.*
-.*addb,sv,n r1,r4,.* <addb_tests_1>.*
-.*addb,od,n r1,r4,.* <addb_tests_1>.*
-.*$gdb_prompt $" { pass "addb_nullified_tests_1" }
-	-re "$gdb_prompt $" { fail "addb_nullified_tests_1" }
-	timeout { fail "(timeout) addb_nullified_tests_1" }
-    }
-
-    send_gdb "x/8i addb_nullified_tests_2\n"
-    gdb_expect {
-	-re "
-.*addbf,n r1,r4,.* <addb_tests_2>.*
-.*addbf,=,n r1,r4,.* <addb_tests_2>.*
-.*addbf,<,n r1,r4,.* <addb_tests_2>.*
-.*addbf,<=,n r1,r4,.* <addb_tests_2>.*
-.*addbf,nuv,n r1,r4,.* <addb_tests_2>.*
-.*addbf,znv,n r1,r4,.* <addb_tests_2>.*
-.*addbf,sv,n r1,r4,.* <addb_tests_2>.*
-.*addbf,od,n r1,r4,.* <addb_tests_2>.*
-.*$gdb_prompt $" { pass "addb_nullified_tests_2" }
-	-re "$gdb_prompt $" { fail "addb_nullified_tests_2" }
-	timeout { fail "(timeout) addb_nullified_tests_2" }
-    }
-
-    send_gdb "x/8i addib_tests_1\n"
-    gdb_expect {
-	-re "
-.*addib -1,r4,.* <addib_tests_1>.*
-.*addib,= -1,r4,.* <addib_tests_1>.*
-.*addib,< -1,r4,.* <addib_tests_1>.*
-.*addib,<= -1,r4,.* <addib_tests_1>.*
-.*addib,nuv -1,r4,.* <addib_tests_1>.*
-.*addib,znv -1,r4,.* <addib_tests_1>.*
-.*addib,sv -1,r4,.* <addib_tests_1>.*
-.*addib,od -1,r4,.* <addib_tests_1>.*
-.*$gdb_prompt $" { pass "addib_tests_1" }
-	-re "$gdb_prompt $" { fail "addib_tests_1" }
-	timeout { fail "(timeout) addib_tests_1" }
-    }
-
-    send_gdb "x/8i addib_tests_2\n"
-    gdb_expect {
-	-re "
-.*addibf -1,r4,.* <addib_tests_2>.*
-.*addibf,= -1,r4,.* <addib_tests_2>.*
-.*addibf,< -1,r4,.* <addib_tests_2>.*
-.*addibf,<= -1,r4,.* <addib_tests_2>.*
-.*addibf,nuv -1,r4,.* <addib_tests_2>.*
-.*addibf,znv -1,r4,.* <addib_tests_2>.*
-.*addibf,sv -1,r4,.* <addib_tests_2>.*
-.*addibf,od -1,r4,.* <addib_tests_2>.*
-.*$gdb_prompt $" { pass "addib_tests_2" }
-	-re "$gdb_prompt $" { fail "addib_tests_2" }
-	timeout { fail "(timeout) addib_tests_2" }
-    }
-
-    send_gdb "x/8i addib_nullified_tests_1\n"
-    gdb_expect {
-	-re "
-.*addib,n -1,r4,.* <addib_tests_1>.*
-.*addib,=,n -1,r4,.* <addib_tests_1>.*
-.*addib,<,n -1,r4,.* <addib_tests_1>.*
-.*addib,<=,n -1,r4,.* <addib_tests_1>.*
-.*addib,nuv,n -1,r4,.* <addib_tests_1>.*
-.*addib,znv,n -1,r4,.* <addib_tests_1>.*
-.*addib,sv,n -1,r4,.* <addib_tests_1>.*
-.*addib,od,n -1,r4,.* <addib_tests_1>.*
-.*$gdb_prompt $" { pass "addb_nullified_tests_1" }
-	-re "$gdb_prompt $" { fail "addb_nullified_tests_1" }
-	timeout { fail "(timeout) addb_nullified_tests_1" }
-    }
-
-    send_gdb "x/8i addib_nullified_tests_2\n"
-    gdb_expect {
-	-re "
-.*addibf,n -1,r4,.* <addib_tests_2>.*
-.*addibf,=,n -1,r4,.* <addib_tests_2>.*
-.*addibf,<,n -1,r4,.* <addib_tests_2>.*
-.*addibf,<=,n -1,r4,.* <addib_tests_2>.*
-.*addibf,nuv,n -1,r4,.* <addib_tests_2>.*
-.*addibf,znv,n -1,r4,.* <addib_tests_2>.*
-.*addibf,sv,n -1,r4,.* <addib_tests_2>.*
-.*addibf,od,n -1,r4,.* <addib_tests_2>.*
-.*$gdb_prompt $" { pass "addb_nullified_tests_2" }
-	-re "$gdb_prompt $" { fail "addb_nullified_tests_2" }
-	timeout { fail "(timeout) addb_nullified_tests_2" }
-    }
-
-    send_gdb "x/8i bb_tests\n"
-    gdb_expect {
-	-re "
-.*bvb,< r4,.* <bb_tests>.*
-.*bvb,>= r4,.* <bb_tests>.*
-.*bvb,<,n r4,.* <bb_tests>.*
-.*bvb,>=,n r4,.* <bb_tests>.*
-.*bb,< r4,5,.* <bb_tests>.*
-.*bb,>= r4,5,.* <bb_tests>.*
-.*bb,<,n r4,5,.* <bb_tests>.*
-.*bb,>=,n r4,5,.* <bb_tests>.*
-.*$gdb_prompt $" { pass "bb_tests" }
-	-re "$gdb_prompt $" { fail "bb_tests" }
-	timeout { fail "(timeout) bb_tests " }
-    }
-}
-
-proc all_integer_computational_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    set add_insns [list {add} {addl} {addo} {addc} {addco} \
-			{sh1add} {sh1addl} {sh1addo} \
-			{sh2add} {sh2addl} {sh2addo} \
-			{sh3add} {sh3addl} {sh3addo} ]
-
-    foreach i $add_insns {
-	send_gdb "x/16i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i r4,r5,r6.*
-.*$i,= r4,r5,r6.*
-.*$i,< r4,r5,r6.*
-.*$i,<= r4,r5,r6.*
-.*$i,nuv r4,r5,r6.*
-.*$i,znv r4,r5,r6.*
-.*$i,sv r4,r5,r6.*
-.*$i,od r4,r5,r6.*
-.*$i,tr r4,r5,r6.*
-.*$i,<> r4,r5,r6.*
-.*$i,>= r4,r5,r6.*
-.*$i,> r4,r5,r6.*
-.*$i,uv r4,r5,r6.*
-.*$i,vnz r4,r5,r6.*
-.*$i,nsv r4,r5,r6.*
-.*$i,ev r4,r5,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set sub_insns [list {sub} {subo} {subb} {subbo} {subt} {subto} \
-			{ds} {comclr} ]
-
-    foreach i $sub_insns {
-	send_gdb "x/16i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i r4,r5,r6.*
-.*$i,= r4,r5,r6.*
-.*$i,< r4,r5,r6.*
-.*$i,<= r4,r5,r6.*
-.*$i,<< r4,r5,r6.*
-.*$i,<<= r4,r5,r6.*
-.*$i,sv r4,r5,r6.*
-.*$i,od r4,r5,r6.*
-.*$i,tr r4,r5,r6.*
-.*$i,<> r4,r5,r6.*
-.*$i,>= r4,r5,r6.*
-.*$i,> r4,r5,r6.*
-.*$i,>>= r4,r5,r6.*
-.*$i,>> r4,r5,r6.*
-.*$i,nsv r4,r5,r6.*
-.*$i,ev r4,r5,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set logical_insns [list {or} {xor} {and} {andcm} ]
-
-    foreach i $logical_insns {
-	send_gdb "x/10i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i r4,r5,r6.*
-.*$i,= r4,r5,r6.*
-.*$i,< r4,r5,r6.*
-.*$i,<= r4,r5,r6.*
-.*$i,od r4,r5,r6.*
-.*$i,tr r4,r5,r6.*
-.*$i,<> r4,r5,r6.*
-.*$i,>= r4,r5,r6.*
-.*$i,> r4,r5,r6.*
-.*$i,ev r4,r5,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set unit_insns1 [list {uxor} {uaddcm} {uaddcmt} ]
-
-    foreach i $unit_insns1 {
-	send_gdb "x/12i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i r4,r5,r6.*
-.*$i,sbz r4,r5,r6.*
-.*$i,shz r4,r5,r6.*
-.*$i,sdc r4,r5,r6.*
-.*$i,sbc r4,r5,r6.*
-.*$i,shc r4,r5,r6.*
-.*$i,tr r4,r5,r6.*
-.*$i,nbz r4,r5,r6.*
-.*$i,nhz r4,r5,r6.*
-.*$i,ndc r4,r5,r6.*
-.*$i,nbc r4,r5,r6.*
-.*$i,nhc r4,r5,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set unit_insns2 [list {dcor} {idcor} ]
-
-    foreach i $unit_insns2 {
-	send_gdb "x/12i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i r4,r5.*
-.*$i,sbz r4,r5.*
-.*$i,shz r4,r5.*
-.*$i,sdc r4,r5.*
-.*$i,sbc r4,r5.*
-.*$i,shc r4,r5.*
-.*$i,tr r4,r5.*
-.*$i,nbz r4,r5.*
-.*$i,nhz r4,r5.*
-.*$i,ndc r4,r5.*
-.*$i,nbc r4,r5.*
-.*$i,nhc r4,r5.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set addi_insns [list {addi} {addio} {addit} {addito} ]
-
-    foreach i $addi_insns {
-	send_gdb "x/16i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i 7b,r5,r6.*
-.*$i,= 7b,r5,r6.*
-.*$i,< 7b,r5,r6.*
-.*$i,<= 7b,r5,r6.*
-.*$i,nuv 7b,r5,r6.*
-.*$i,znv 7b,r5,r6.*
-.*$i,sv 7b,r5,r6.*
-.*$i,od 7b,r5,r6.*
-.*$i,tr 7b,r5,r6.*
-.*$i,<> 7b,r5,r6.*
-.*$i,>= 7b,r5,r6.*
-.*$i,> 7b,r5,r6.*
-.*$i,uv 7b,r5,r6.*
-.*$i,vnz 7b,r5,r6.*
-.*$i,nsv 7b,r5,r6.*
-.*$i,ev 7b,r5,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set subi_insns [list {subi} {subio} {comiclr} ] 
-
-    foreach i $subi_insns {
-	send_gdb "x/16i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i 7b,r5,r6.*
-.*$i,= 7b,r5,r6.*
-.*$i,< 7b,r5,r6.*
-.*$i,<= 7b,r5,r6.*
-.*$i,<< 7b,r5,r6.*
-.*$i,<<= 7b,r5,r6.*
-.*$i,sv 7b,r5,r6.*
-.*$i,od 7b,r5,r6.*
-.*$i,tr 7b,r5,r6.*
-.*$i,<> 7b,r5,r6.*
-.*$i,>= 7b,r5,r6.*
-.*$i,> 7b,r5,r6.*
-.*$i,>>= 7b,r5,r6.*
-.*$i,>> 7b,r5,r6.*
-.*$i,nsv 7b,r5,r6.*
-.*$i,ev 7b,r5,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    send_gdb "x/8i vshd_tests\n"
-    gdb_expect {
-	-re "
-.*vshd r4,r5,r6.*
-.*vshd,= r4,r5,r6.*
-.*vshd,< r4,r5,r6.*
-.*vshd,od r4,r5,r6.*
-.*vshd,tr r4,r5,r6.*
-.*vshd,<> r4,r5,r6.*
-.*vshd,>= r4,r5,r6.*
-.*vshd,ev r4,r5,r6.*
-.*$gdb_prompt $" { pass "vshd tests" }
-	    -re "$gdb_prompt $" { fail "vshd tests" }
-	    timeout { fail "(timeout) "vshd tests" }
-	}
-
-    send_gdb "x/8i shd_tests\n"
-    gdb_expect {
-	-re "
-.*shd r4,r5,5,r6.*
-.*shd,= r4,r5,5,r6.*
-.*shd,< r4,r5,5,r6.*
-.*shd,od r4,r5,5,r6.*
-.*shd,tr r4,r5,5,r6.*
-.*shd,<> r4,r5,5,r6.*
-.*shd,>= r4,r5,5,r6.*
-.*shd,ev r4,r5,5,r6.*
-.*$gdb_prompt $" { pass "shd tests" }
-	    -re "$gdb_prompt $" { fail "shd tests" }
-	    timeout { fail "(timeout) "shd tests" }
-	}
-
-    set extract_insns1 [list {extru} {extrs} {zdep} {dep} ] 
-
-    foreach i $extract_insns1 {
-	send_gdb "x/8i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i r4,5,10,r6.*
-.*$i,= r4,5,10,r6.*
-.*$i,< r4,5,10,r6.*
-.*$i,od r4,5,10,r6.*
-.*$i,tr r4,5,10,r6.*
-.*$i,<> r4,5,10,r6.*
-.*$i,>= r4,5,10,r6.*
-.*$i,ev r4,5,10,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set extract_insns2 [list {vextru} {vextrs} {zvdep} {vdep} ] 
-
-    foreach i $extract_insns2 {
-	send_gdb "x/8i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i r4,5,r6.*
-.*$i,= r4,5,r6.*
-.*$i,< r4,5,r6.*
-.*$i,od r4,5,r6.*
-.*$i,tr r4,5,r6.*
-.*$i,<> r4,5,r6.*
-.*$i,>= r4,5,r6.*
-.*$i,ev r4,5,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set extract_insns3 [list {vdepi} {zvdepi} ] 
-
-    foreach i $extract_insns3 {
-	send_gdb "x/8i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i -1,5,r6.*
-.*$i,= -1,5,r6.*
-.*$i,< -1,5,r6.*
-.*$i,od -1,5,r6.*
-.*$i,tr -1,5,r6.*
-.*$i,<> -1,5,r6.*
-.*$i,>= -1,5,r6.*
-.*$i,ev -1,5,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set extract_insns4 [list {depi} {zdepi} ] 
-
-    foreach i $extract_insns4 {
-	send_gdb "x/8i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i -1,4,10,r6.*
-.*$i,= -1,4,10,r6.*
-.*$i,< -1,4,10,r6.*
-.*$i,od -1,4,10,r6.*
-.*$i,tr -1,4,10,r6.*
-.*$i,<> -1,4,10,r6.*
-.*$i,>= -1,4,10,r6.*
-.*$i,ev -1,4,10,r6.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-}
-
-proc all_system_control_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/14i system_control_tests\n"
-    gdb_expect {
-	-re "
-.*break 5,c.*
-.*rfi.*
-.*rfir.*
-.*ssm 5,r4.*
-.*rsm 5,r4.*
-.*mtsm r4.*
-.*ldsid \\(sr0,r5\\),r4.*
-.*mtsp r4,sr0.*
-.*mtctl r4,ccr.*
-.*mfsp sr0,r4.*
-.*mfctl ccr,r4.*
-.*sync.*
-.*syncdma.*
-.*diag 4d2.*
-.*$gdb_prompt $" { pass "system_constrol_tests" }
-	-re "$gdb_prompt $" { fail "system_control_tests" }
-	timeout { file "(timeout) system_control_tests" }
-    }
-
-    send_gdb "x/4i probe_tests\n"
-    gdb_expect {
-	-re "
-.*prober \\(sr0,r5\\),r6,r7.*
-.*proberi \\(sr0,r5\\),1,r7.*
-.*probew \\(sr0,r5\\),r6,r7.*
-.*probewi \\(sr0,r5\\),1,r7.*
-.*$gdb_prompt $" { pass "probe_tests" }
-	-re "$gdb_prompt $" { fail "probe_tests" }
-	timeout { file "(timeout) probe_tests" }
-    }
-
-    # lci uses the same bit pattern as lha, so accept lha.
-    send_gdb "x/5i lpa_tests\n"
-    gdb_expect {
-	-re "
-.*lpa r4\\(sr0,r5\\),r6.*
-.*lpa,m r4\\(sr0,r5\\),r6.*
-.*lha r4\\(sr0,r5\\),r6.*
-.*lha,m r4\\(sr0,r5\\),r6.*
-.*lha r4\\(sr0,r5\\),r6.*
-.*$gdb_prompt $" { pass "lpa_tests" }
-	-re "$gdb_prompt $" { fail "lpa_tests" }
-	timeout { file "(timeout) lpa_tests" }
-    }
-
-    send_gdb "x/18i purge_tests\n"
-    gdb_expect {
-	-re "
-.*pdtlb r4\\(sr0,r5\\).*
-.*pdtlb,m r4\\(sr0,r5\\).*
-.*pitlb r4\\(sr0,r5\\).*
-.*pitlb,m r4\\(sr0,r5\\).*
-.*pdtlbe r4\\(sr0,r5\\).*
-.*pdtlbe,m r4\\(sr0,r5\\).*
-.*pitlbe r4\\(sr0,r5\\).*
-.*pitlbe,m r4\\(sr0,r5\\).*
-.*pdc r4\\(sr0,r5\\).*
-.*pdc,m r4\\(sr0,r5\\).*
-.*fdc r4\\(sr0,r5\\).*
-.*fdc,m r4\\(sr0,r5\\).*
-.*fic r4\\(sr0,r5\\).*
-.*fic,m r4\\(sr0,r5\\).*
-.*fdce r4\\(sr0,r5\\).*
-.*fdce,m r4\\(sr0,r5\\).*
-.*fice r4\\(sr0,r5\\).*
-.*fice,m r4\\(sr0,r5\\).*
-.*$gdb_prompt $" { pass "purge_tests" }
-	-re "$gdb_prompt $" { fail "purge_tests" }
-	timeout { file "(timeout) purge_tests" }
-    }
-
-    send_gdb "x/4i insert_tests\n"
-    gdb_expect {
-	-re "
-.*idtlba r4,\\(sr0,r5\\).*
-.*iitlba r4,\\(sr0,r5\\).*
-.*idtlbp r4,\\(sr0,r5\\).*
-.*iitlbp r4,\\(sr0,r5\\).*
-.*$gdb_prompt $" { pass "insert_tests" }
-	-re "$gdb_prompt $" { fail "insert_tests" }
-	timeout { file "(timeout) insert_tests" }
-    }
-
-}
-
-proc all_fpu_memory_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/20i fpu_memory_indexing_tests\n"
-    gdb_expect {
-	-re "
-.*fldwx r4\\(sr0,r5\\),fr6.*
-.*fldwx,s r4\\(sr0,r5\\),fr6.*
-.*fldwx,m r4\\(sr0,r5\\),fr6.*
-.*fldwx,sm r4\\(sr0,r5\\),fr6.*
-.*flddx r4\\(sr0,r5\\),fr6.*
-.*flddx,s r4\\(sr0,r5\\),fr6.*
-.*flddx,m r4\\(sr0,r5\\),fr6.*
-.*flddx,sm r4\\(sr0,r5\\),fr6.*
-.*fstwx fr6,r4\\(sr0,r5\\).*
-.*fstwx,s fr6,r4\\(sr0,r5\\).*
-.*fstwx,m fr6,r4\\(sr0,r5\\).*
-.*fstwx,sm fr6,r4\\(sr0,r5\\).*
-.*fstdx fr6,r4\\(sr0,r5\\).*
-.*fstdx,s fr6,r4\\(sr0,r5\\).*
-.*fstdx,m fr6,r4\\(sr0,r5\\).*
-.*fstdx,sm fr6,r4\\(sr0,r5\\).*
-.*fstqx fr6,r4\\(sr0,r5\\).*
-.*fstqx,s fr6,r4\\(sr0,r5\\).*
-.*fstqx,m fr6,r4\\(sr0,r5\\).*
-.*fstqx,sm fr6,r4\\(sr0,r5\\).*
-.*$gdb_prompt $" { pass "fpu_memory_indexing_tests" }
-	-re "$gdb_prompt $" { fail "fpu_memory_indexing_tests" }
-	timeout { file "(timeout) fpu_memory_indexing_tests" }
-    }
-
-    send_gdb "x/15i fpu_short_memory_tests\n"
-    gdb_expect {
-	-re "
-.*fldws 0\\(sr0,r5\\),fr6.*
-.*fldws,mb 0\\(sr0,r5\\),fr6.*
-.*fldws,ma 0\\(sr0,r5\\),fr6.*
-.*fldds 0\\(sr0,r5\\),fr6.*
-.*fldds,mb 0\\(sr0,r5\\),fr6.*
-.*fldds,ma 0\\(sr0,r5\\),fr6.*
-.*fstws fr6,0\\(sr0,r5\\).*
-.*fstws,mb fr6,0\\(sr0,r5\\).*
-.*fstws,ma fr6,0\\(sr0,r5\\).*
-.*fstds fr6,0\\(sr0,r5\\).*
-.*fstds,mb fr6,0\\(sr0,r5\\).*
-.*fstds,ma fr6,0\\(sr0,r5\\).*
-.*fstqs fr6,0\\(sr0,r5\\).*
-.*fstqs,mb fr6,0\\(sr0,r5\\).*
-.*fstqs,ma fr6,0\\(sr0,r5\\).*
-.*$gdb_prompt $" { pass "fpu_short_memory_tests" }
-	-re "$gdb_prompt $" { fail "fpu_short_memory_tests" }
-	timeout { file "(timeout) fpu_short_memory_tests" }
-    }
-
-}
-
-proc all_fpu_computational_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/1i fpu_misc_tests\n"
-    gdb_expect {
-	-re "
-.*ftest.*
-.*$gdb_prompt $" { pass "fpu_misc_tests" }
-	-re "$gdb_prompt $" { fail "fpu_misc_tests" }
-	timeout { file "(timeout) fpu_misc_tests" }
-    }
-
-    set fpu_two_op_insns [list {fcpy} {fabs} {fsqrt} {frnd} ]
-
-    foreach i $fpu_two_op_insns {
-	send_gdb "x/5i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i,sgl fr5,fr10.*
-.*$i,dbl fr5,fr10.*
-.*$i,quad fr5,fr10.*
-.*$i,sgl fr20,fr24.*
-.*$i,dbl fr20,fr24.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set fpu_conversions [list {fcnvff} {fcnvxf} {fcnvfx} {fcnvfxt} ]
-
-    foreach i $fpu_conversions {
-	send_gdb "x/18i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i,sgl,sgl fr5,fr10.*
-.*$i,sgl,dbl fr5,fr10.*
-.*$i,sgl,quad fr5,fr10.*
-.*$i,dbl,sgl fr5,fr10.*
-.*$i,dbl,dbl fr5,fr10.*
-.*$i,dbl,quad fr5,fr10.*
-.*$i,quad,sgl fr5,fr10.*
-.*$i,quad,dbl fr5,fr10.*
-.*$i,quad,quad fr5,fr10.*
-.*$i,sgl,sgl fr20,fr24.*
-.*$i,sgl,dbl fr20,fr24.*
-.*$i,sgl,quad fr20,fr24.*
-.*$i,dbl,sgl fr20,fr24.*
-.*$i,dbl,dbl fr20,fr24.*
-.*$i,dbl,quad fr20,fr24.*
-.*$i,quad,sgl fr20,fr24.*
-.*$i,quad,dbl fr20,fr24.*
-.*$i,quad,quad fr20,fr24.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    set fpu_three_op_insns [list {fadd} {fsub} {fmpy} {fdiv} {frem} ]
-
-    foreach i $fpu_three_op_insns {
-	send_gdb "x/6i $i"; send_gdb "_tests\n"
-	gdb_expect {
-	    -re "
-.*$i,sgl fr4,fr8,fr12.*
-.*$i,dbl fr4,fr8,fr12.*
-.*$i,quad fr4,fr8,fr12.*
-.*$i,sgl fr20,fr24,fr28.*
-.*$i,dbl fr20,fr24,fr28.*
-.*$i,quad fr20,fr24,fr28.*
-.*$gdb_prompt $" { pass "$i tests" }
-	    -re "$gdb_prompt $" { fail "$i tests" }
-	    timeout { fail "(timeout) $i tests" }
-	}
-    }
-
-    send_gdb "x/4i fmpy_addsub_tests\n"
-    gdb_expect {
-	-re "
-.*fmpyadd,sgl fr16,fr17,fr18,fr19,fr20.*
-.*fmpyadd,dbl fr16,fr17,fr18,fr19,fr20.*
-.*fmpysub,sgl fr16,fr17,fr18,fr19,fr20.*
-.*fmpysub,dbl fr16,fr17,fr18,fr19,fr20.*
-.*$gdb_prompt $" { pass "fmpy_addsub_tests" }
-	-re "$gdb_prompt $" { fail "fmpy_addsub_tests" }
-	timeout { fail "(timeout) fmpy_addsub_tests" }
-    }
-
-    send_gdb "x/i xmpyu_tests\n"
-    gdb_expect {
-	-re "
-.*xmpyu fr4,fr5,fr6.*
-.*$gdb_prompt $" {pass "xmpyu_tests" }
-	-re "$gdb_prompt $" {fail "xmpyu_tests" }
-	timeout { fail "(timeout) xmpyu_tests" }
-    }
-
-}
-
-proc all_fpu_comparison_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    set fpu_comparison_formats [list {sgl} {dbl} {quad} ]
-
-    foreach i $fpu_comparison_formats {
-	send_gdb "x/8i fcmp_$i"; send_gdb "_tests_1\n"
-	gdb_expect {
-	    -re "
-.*fcmp,$i,false\\? fr4,fr5.*
-.*fcmp,$i,false fr4,fr5.*
-.*fcmp,$i,\\? fr4,fr5.*
-.*fcmp,$i,!<=> fr4,fr5.*
-.*fcmp,$i,= fr4,fr5.*
-.*fcmp,$i,=t fr4,fr5.*
-.*fcmp,$i,\\?= fr4,fr5.*
-.*fcmp,$i,!<> fr4,fr5.*
-.*$gdb_prompt $" { pass "$i tests (part1) " }
-	    -re "$gdb_prompt $" { fail "fcmp_$i tests (part1) " }
-	    timeout { fail "(timeout) fcmp_$i tests (part1) " }
-	}
-
-	send_gdb "x/8i fcmp_$i"; send_gdb "_tests_2\n"
-	gdb_expect {
-	    -re "
-.*fcmp,$i,!\\?>= fr4,fr5.*
-.*fcmp,$i,< fr4,fr5.*
-.*fcmp,$i,\\?< fr4,fr5.*
-.*fcmp,$i,!>= fr4,fr5.*
-.*fcmp,$i,!\\?> fr4,fr5.*
-.*fcmp,$i,<= fr4,fr5.*
-.*fcmp,$i,\\?<= fr4,fr5.*
-.*fcmp,$i,!> fr4,fr5.*
-.*$gdb_prompt $" { pass "$i tests (part2) " }
-	    -re "$gdb_prompt $" { fail "fcmp_$i tests (part2) " }
-	    timeout { fail "(timeout) fcmp_$i tests (part2) " }
-	}
-
-	send_gdb "x/8i fcmp_$i"; send_gdb "_tests_3\n"
-	gdb_expect {
-	    -re "
-.*fcmp,$i,!\\?<= fr4,fr5.*
-.*fcmp,$i,> fr4,fr5.*
-.*fcmp,$i,\\?> fr4,fr5.*
-.*fcmp,$i,!<= fr4,fr5.*
-.*fcmp,$i,!\\?< fr4,fr5.*
-.*fcmp,$i,>= fr4,fr5.*
-.*fcmp,$i,\\?>= fr4,fr5.*
-.*fcmp,$i,!< fr4,fr5.*
-.*$gdb_prompt $" { pass "$i tests (part3) " }
-	    -re "$gdb_prompt $" { fail "fcmp_$i tests (part3) " }
-	    timeout { fail "(timeout) fcmp_$i tests (part3) " }
-	}
-
-	send_gdb "x/8i fcmp_$i"; send_gdb "_tests_4\n"
-	gdb_expect {
-	    -re "
-.*fcmp,$i,!\\?= fr4,fr5.*
-.*fcmp,$i,<> fr4,fr5.*
-.*fcmp,$i,!= fr4,fr5.*
-.*fcmp,$i,!=t fr4,fr5.*
-.*fcmp,$i,!\\? fr4,fr5.*
-.*fcmp,$i,<=> fr4,fr5.*
-.*fcmp,$i,true\\? fr4,fr5.*
-.*fcmp,$i,true fr4,fr5.*
-.*$gdb_prompt $" { pass "$i tests (part4) " }
-	    -re "$gdb_prompt $" { fail "fcmp_$i tests (part4) " }
-	    timeout { fail "(timeout) fcmp_$i tests (part4) " }
-	}
-    }
-}
-
-proc all_special_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/4i special_tests\n"
-    gdb_expect {
-	-re "
-.*gfw r4\\(sr0,r5\\).*
-.*gfw,m r4\\(sr0,r5\\).*
-.*gfr r4\\(sr0,r5\\).*
-.*gfr,m r4\\(sr0,r5\\).*
-.*$gdb_prompt $" { pass "special tests" }
-	-re "$gdb_prompt $" { fail "special tests" }
-	timeout { fail "(timeout) special tests " }
-    }
-
-}
-
-proc all_sfu_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/16i sfu_tests\n"
-    gdb_expect {
-	-re "
-.*spop0,4,5.*
-.*spop0,4,73.*
-.*spop0,4,5,n.*
-.*spop0,4,73,n.*
-.*spop1,4,5 r5.*
-.*spop1,4,73 r5.*
-.*spop1,4,5,n r5.*
-.*spop1,4,73,n r5.*
-.*spop2,4,5 r5.*
-.*spop2,4,73 r5.*
-.*spop2,4,5,n r5.*
-.*spop2,4,73,n r5.*
-.*spop3,4,5 r5,r6.*
-.*spop3,4,73 r5,r6.*
-.*spop3,4,5,n r5,r6.*
-.*spop3,4,73,n r5,r6.*
-.*$gdb_prompt $" { pass "sfu tests" }
-	-re "$gdb_prompt $" { fail "sfu tests" }
-	timeout { fail "(timeout) sfu tests " }
-    }
-}
-
-proc all_copr_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/4i copr_tests\n"
-    gdb_expect {
-	-re "
-.*copr,4,5.*
-.*copr,4,73.*
-.*copr,4,5,n.*
-.*copr,4,73,n.*
-.*$gdb_prompt $" { pass "copr tests" }
-	-re "$gdb_prompt $" { fail "copr tests" }
-	timeout { fail "(timeout) copr tests " }
-    }
-}
-
-proc all_copr_mem_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/8i copr_indexing_load\n"
-    gdb_expect {
-	-re "
-.*cldwx,4 r5\\(sr0,r4\\),r26.*
-.*cldwx,4,s r5\\(sr0,r4\\),r26.*
-.*cldwx,4,m r5\\(sr0,r4\\),r26.*
-.*cldwx,4,sm r5\\(sr0,r4\\),r26.*
-.*clddx,4 r5\\(sr0,r4\\),r26.*
-.*clddx,4,s r5\\(sr0,r4\\),r26.*
-.*clddx,4,m r5\\(sr0,r4\\),r26.*
-.*clddx,4,sm r5\\(sr0,r4\\),r26.*
-.*$gdb_prompt $" { pass "copr indexed load tests" }
-	-re "$gdb_prompt $" { fail "copr indexed load tests" }
-	timeout { fail "(timeout) copr indexed load tests " }
-    }
-
-    send_gdb "x/8i copr_indexing_store\n"
-    gdb_expect {
-	-re "
-.*cstwx,4 r26,r5\\(sr0,r4\\).*
-.*cstwx,4,s r26,r5\\(sr0,r4\\).*
-.*cstwx,4,m r26,r5\\(sr0,r4\\).*
-.*cstwx,4,sm r26,r5\\(sr0,r4\\).*
-.*cstdx,4 r26,r5\\(sr0,r4\\).*
-.*cstdx,4,s r26,r5\\(sr0,r4\\).*
-.*cstdx,4,m r26,r5\\(sr0,r4\\).*
-.*cstdx,4,sm r26,r5\\(sr0,r4\\).*
-.*$gdb_prompt $" { pass "copr indexed store tests" }
-	-re "$gdb_prompt $" { fail "copr indexed store tests" }
-	timeout { fail "(timeout) copr indexed load tests " }
-    }
-
-    send_gdb "x/12i copr_short_memory\n"
-    gdb_expect {
-	-re "
-.*cldws,4 0\\(sr0,r4\\),r26.*
-.*cldws,4,mb 0\\(sr0,r4\\),r26.*
-.*cldws,4,ma 0\\(sr0,r4\\),r26.*
-.*cldds,4 0\\(sr0,r4\\),r26.*
-.*cldds,4,mb 0\\(sr0,r4\\),r26.*
-.*cldds,4,ma 0\\(sr0,r4\\),r26.*
-.*cstws,4 r26,0\\(sr0,r4\\).*
-.*cstws,4,mb r26,0\\(sr0,r4\\).*
-.*cstws,4,ma r26,0\\(sr0,r4\\).*
-.*cstds,4 r26,0\\(sr0,r4\\).*
-.*cstds,4,mb r26,0\\(sr0,r4\\).*
-.*cstds,4,ma r26,0\\(sr0,r4\\).*
-.*$gdb_prompt $" { pass "copr short memory tests" }
-	-re "$gdb_prompt $" { fail "copr short memory tests" }
-	timeout { fail "(timeout) copr short memory tests " }
-    }
-}
-
-proc fmemLRbug_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/12i fmemLRbug_tests_1\n"
-    gdb_expect {
-	-re "
-.*fstws fr6R,0\\(sr0,r26\\).*
-.*fstws fr6,4\\(sr0,r26\\).*
-.*fstws fr6,8\\(sr0,r26\\).*
-.*fstds fr6,0\\(sr0,r26\\).*
-.*fstds fr6,4\\(sr0,r26\\).*
-.*fstds fr6,8\\(sr0,r26\\).*
-.*fldws 0\\(sr0,r26\\),fr6R.*
-.*fldws 4\\(sr0,r26\\),fr6.*
-.*fldws 8\\(sr0,r26\\),fr6.*
-.*fldds 0\\(sr0,r26\\),fr6.*
-.*fldds 4\\(sr0,r26\\),fr6.*
-.*fldds 8\\(sr0,r26\\),fr6.*
-.*$gdb_prompt $" { pass "fmem LR register selector tests (part1)" }
-	-re "$gdb_prompt $" { fail "fmem LR register selector tests (part1)" }
-	timeout { fail "(timeout) fmem LR register selector tests  (part1)" }
-    }
-
-    send_gdb "x/12i fmemLRbug_tests_2\n"
-    gdb_expect {
-	-re "
-.*fstws fr6R,0\\(sr0,r26\\).*
-.*fstws fr6,4\\(sr0,r26\\).*
-.*fstws fr6,8\\(sr0,r26\\).*
-.*fstds fr6,0\\(sr0,r26\\).*
-.*fstds fr6,4\\(sr0,r26\\).*
-.*fstds fr6,8\\(sr0,r26\\).*
-.*fldws 0\\(sr0,r26\\),fr6R.*
-.*fldws 4\\(sr0,r26\\),fr6.*
-.*fldws 8\\(sr0,r26\\),fr6.*
-.*fldds 0\\(sr0,r26\\),fr6.*
-.*fldds 4\\(sr0,r26\\),fr6.*
-.*fldds 8\\(sr0,r26\\),fr6.*
-.*$gdb_prompt $" { pass "fmem LR register selector tests (part2)" }
-	-re "$gdb_prompt $" { fail "fmem LR register selector tests (part2)" }
-	timeout { fail "(timeout) fmem LR register selector tests  (part2)" }
-    }
-
-    send_gdb "x/12i fmemLRbug_tests_3\n"
-    gdb_expect {
-	-re "
-.*fstwx fr6R,r25\\(sr0,r26\\).*
-.*fstwx fr6,r25\\(sr0,r26\\).*
-.*fstwx fr6,r25\\(sr0,r26\\).*
-.*fstdx fr6,r25\\(sr0,r26\\).*
-.*fstdx fr6,r25\\(sr0,r26\\).*
-.*fstdx fr6,r25\\(sr0,r26\\).*
-.*fldwx r25\\(sr0,r26\\),fr6R.*
-.*fldwx r25\\(sr0,r26\\),fr6.*
-.*fldwx r25\\(sr0,r26\\),fr6.*
-.*flddx r25\\(sr0,r26\\),fr6.*
-.*flddx r25\\(sr0,r26\\),fr6.*
-.*flddx r25\\(sr0,r26\\),fr6.*
-.*$gdb_prompt $" { pass "fmem LR register selector tests (part3)" }
-	-re "$gdb_prompt $" { fail "fmem LR register selector tests (part3)" }
-	timeout { fail "(timeout) fmem LR register selector tests  (part3)" }
-    }
-
-    send_gdb "x/12i fmemLRbug_tests_4\n"
-    gdb_expect {
-	-re "
-.*fstwx fr6R,r25\\(sr0,r26\\).*
-.*fstwx fr6,r25\\(sr0,r26\\).*
-.*fstwx fr6,r25\\(sr0,r26\\).*
-.*fstdx fr6,r25\\(sr0,r26\\).*
-.*fstdx fr6,r25\\(sr0,r26\\).*
-.*fstdx fr6,r25\\(sr0,r26\\).*
-.*fldwx r25\\(sr0,r26\\),fr6R.*
-.*fldwx r25\\(sr0,r26\\),fr6.*
-.*fldwx r25\\(sr0,r26\\),fr6.*
-.*flddx r25\\(sr0,r26\\),fr6.*
-.*flddx r25\\(sr0,r26\\),fr6.*
-.*flddx r25\\(sr0,r26\\),fr6.*
-.*$gdb_prompt $" { pass "fmem LR register selector tests (part4)" }
-	-re "$gdb_prompt $" { fail "fmem LR register selector tests (part4)" }
-	timeout { fail "(timeout) fmem LR register selector tests  (part4)" }
-    }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-all_integer_memory_tests
-all_immediate_tests
-all_branch_tests
-all_integer_computational_tests
-all_system_control_tests
-all_fpu_memory_tests
-all_fpu_computational_tests
-all_fpu_comparison_tests
-all_special_tests
-all_sfu_tests
-all_copr_tests
-all_copr_mem_tests
-
-# Regression test for a bug Tege found.
-fmemLRbug_tests
diff --git a/gdb/testsuite/gdb.disasm/hppa.s b/gdb/testsuite/gdb.disasm/hppa.s
deleted file mode 100644
index 593d8bfefee..00000000000
--- a/gdb/testsuite/gdb.disasm/hppa.s
+++ /dev/null
@@ -1,1738 +0,0 @@
-	.SPACE $PRIVATE$
-	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-	.SPACE $TEXT$
-	.SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-	.SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-	.IMPORT $global$,DATA
-	.IMPORT $$dyncall,MILLICODE
-; gcc_compiled.:
-	.SPACE $TEXT$
-	.SUBSPA $CODE$
-
-	.align 4
-	.EXPORT integer_memory_tests,CODE
-	.EXPORT integer_indexing_load,CODE
-	.EXPORT integer_load_short_memory,CODE
-	.EXPORT integer_store_short_memory,CODE
-	.EXPORT immediate_tests,CODE
-	.EXPORT branch_tests_1,CODE
-	.EXPORT branch_tests_2,CODE
-	.EXPORT movb_tests,CODE
-	.EXPORT movb_nullified_tests,CODE
-	.EXPORT movib_tests,CODE
-	.EXPORT movib_nullified_tests,CODE
-	.EXPORT comb_tests_1,CODE
-	.EXPORT comb_tests_2,CODE
-	.EXPORT comb_nullified_tests_1,CODE
-	.EXPORT comb_nullified_tests_2,CODE
-	.EXPORT comib_tests_1,CODE
-	.EXPORT comib_tests_2,CODE
-	.EXPORT comib_nullified_tests_1,CODE
-	.EXPORT comib_nullified_tests_2,CODE
-	.EXPORT addb_tests_1,CODE
-	.EXPORT addb_tests_2,CODE
-	.EXPORT addb_nullified_tests_1,CODE
-	.EXPORT addb_nullified_tests_2,CODE
-	.EXPORT addib_tests_1,CODE
-	.EXPORT addib_tests_2,CODE
-	.EXPORT addib_nullified_tests_1,CODE
-	.EXPORT addib_nullified_tests_2,CODE
-	.EXPORT bb_tests,CODE
-	.EXPORT add_tests,CODE
-	.EXPORT addl_tests,CODE
-	.EXPORT addo_tests,CODE
-	.EXPORT addc_tests,CODE
-	.EXPORT addco_tests,CODE
-	.EXPORT sh1add_tests,CODE
-	.EXPORT sh1addl_tests,CODE
-	.EXPORT sh1addo_tests,CODE
-	.EXPORT sh2add_tests,CODE
-	.EXPORT sh2addl_tests,CODE
-	.EXPORT sh2addo_tests,CODE
-	.EXPORT sh3add_tests,CODE
-	.EXPORT sh3addl_tests,CODE
-	.EXPORT sh3addo_tests,CODE
-	.EXPORT sub_tests,CODE
-	.EXPORT subo_tests,CODE
-	.EXPORT subb_tests,CODE
-	.EXPORT subbo_tests,CODE
-	.EXPORT subt_tests,CODE
-	.EXPORT subto_tests,CODE
-	.EXPORT ds_tests,CODE
-	.EXPORT comclr_tests,CODE
-	.EXPORT or_tests,CODE
-	.EXPORT xor_tests,CODE
-	.EXPORT and_tests,CODE
-	.EXPORT andcm_tests,CODE
-	.EXPORT uxor_tests,CODE
-	.EXPORT uaddcm_tests,CODE
-	.EXPORT uaddcmt_tests,CODE
-	.EXPORT dcor_tests,CODE
-	.EXPORT idcor_tests,CODE
-	.EXPORT addi_tests,CODE
-	.EXPORT addio_tests,CODE
-	.EXPORT addit_tests,CODE
-	.EXPORT addito_tests,CODE
-	.EXPORT subi_tests,CODE
-	.EXPORT subio_tests,CODE
-	.EXPORT comiclr_tests,CODE
-	.EXPORT vshd_tests,CODE
-	.EXPORT shd_tests,CODE
-	.EXPORT extru_tests,CODE
-	.EXPORT extrs_tests,CODE
-	.EXPORT zdep_tests,CODE
-	.EXPORT dep_tests,CODE
-	.EXPORT vextru_tests,CODE
-	.EXPORT vextrs_tests,CODE
-	.EXPORT zvdep_tests,CODE
-	.EXPORT vdep_tests,CODE
-	.EXPORT vdepi_tests,CODE
-	.EXPORT zvdepi_tests,CODE
-	.EXPORT depi_tests,CODE
-	.EXPORT zdepi_tests,CODE
-	.EXPORT system_control_tests,CODE
-	.EXPORT probe_tests,CODE
-	.EXPORT lpa_tests,CODE
-	.EXPORT purge_tests,CODE
-	.EXPORT insert_tests,CODE
-	.EXPORT fpu_misc_tests,CODE
-	.EXPORT fpu_memory_indexing_tests,CODE
-	.EXPORT fpu_short_memory_tests,CODE
-	.EXPORT fcpy_tests,CODE
-	.EXPORT fabs_tests,CODE
-	.EXPORT fsqrt_tests,CODE
-	.EXPORT frnd_tests,CODE
-	.EXPORT fcnvff_tests,CODE
-	.EXPORT fcnvxf_tests,CODE
-	.EXPORT fcnvfx_tests,CODE
-	.EXPORT fcnvfxt_tests,CODE
-	.EXPORT fadd_tests,CODE
-	.EXPORT fsub_tests,CODE
-	.EXPORT fmpy_tests,CODE
-	.EXPORT fdiv_tests,CODE
-	.EXPORT frem_tests,CODE
-	.EXPORT fcmp_sgl_tests_1,CODE
-	.EXPORT fcmp_sgl_tests_2,CODE
-	.EXPORT fcmp_sgl_tests_3,CODE
-	.EXPORT fcmp_sgl_tests_4,CODE
-	.EXPORT fcmp_dbl_tests_1,CODE
-	.EXPORT fcmp_dbl_tests_2,CODE
-	.EXPORT fcmp_dbl_tests_3,CODE
-	.EXPORT fcmp_dbl_tests_4,CODE
-	.EXPORT fcmp_quad_tests_1,CODE
-	.EXPORT fcmp_quad_tests_2,CODE
-	.EXPORT fcmp_quad_tests_3,CODE
-	.EXPORT fcmp_quad_tests_4,CODE
-	.EXPORT fmpy_addsub_tests,CODE
-	.EXPORT xmpyu_tests,CODE
-	.EXPORT special_tests,CODE
-	.EXPORT sfu_tests,CODE
-	.EXPORT copr_tests,CODE
-	.EXPORT copr_indexing_load,CODE
-	.EXPORT copr_indexing_store,CODE
-	.EXPORT copr_short_memory,CODE
-	.EXPORT fmemLRbug_tests_1,CODE
-	.EXPORT fmemLRbug_tests_2,CODE
-	.EXPORT fmemLRbug_tests_3,CODE
-	.EXPORT fmemLRbug_tests_4,CODE
-	.EXPORT main,CODE
-	.EXPORT main,ENTRY,PRIV_LEV=3,RTNVAL=GR
-main
-	.PROC
-	.CALLINFO FRAME=64,NO_CALLS,SAVE_SP
-	.ENTRY
-	copy %r4,%r1
-	copy %r30,%r4
-	stwm %r1,64(0,%r30)
-; First memory reference instructions.
-; Should try corner cases for each field extraction.
-; Should deal with s == 0 case somehow?!?
-integer_memory_tests
-	ldw 0(0,%r4),%r26
-	ldh 0(0,%r4),%r26
-	ldb 0(0,%r4),%r26
-	stw %r26,0(0,%r4)
-	sth %r26,0(0,%r4)
-	stb %r26,0(0,%r4)
-
-; Should make sure pre/post modes are recognized correctly.
-	ldwm 0(0,%r4),%r26
-	stwm %r26,0(0,%r4)
-
-integer_indexing_load
-	ldwx %r5(0,%r4),%r26
-	ldwx,s %r5(0,%r4),%r26
-	ldwx,m %r5(0,%r4),%r26
-	ldwx,sm %r5(0,%r4),%r26
-	ldhx %r5(0,%r4),%r26
-	ldhx,s %r5(0,%r4),%r26
-	ldhx,m %r5(0,%r4),%r26
-	ldhx,sm %r5(0,%r4),%r26
-	ldbx %r5(0,%r4),%r26
-	ldbx,s %r5(0,%r4),%r26
-	ldbx,m %r5(0,%r4),%r26
-	ldbx,sm %r5(0,%r4),%r26
-	ldwax %r5(%r4),%r26
-	ldwax,s %r5(%r4),%r26
-	ldwax,m %r5(%r4),%r26
-	ldwax,sm %r5(%r4),%r26
-	ldcwx %r5(0,%r4),%r26
-	ldcwx,s %r5(0,%r4),%r26
-	ldcwx,m %r5(0,%r4),%r26
-	ldcwx,sm %r5(0,%r4),%r26
-
-integer_load_short_memory
-	ldws 0(0,%r4),%r26
-	ldws,mb 0(0,%r4),%r26
-	ldws,ma 0(0,%r4),%r26
-	ldhs 0(0,%r4),%r26
-	ldhs,mb 0(0,%r4),%r26
-	ldhs,ma 0(0,%r4),%r26
-	ldbs 0(0,%r4),%r26
-	ldbs,mb 0(0,%r4),%r26
-	ldbs,ma 0(0,%r4),%r26
-	ldwas 0(%r4),%r26
-	ldwas,mb 0(%r4),%r26
-	ldwas,ma 0(%r4),%r26
-	ldcws 0(0,%r4),%r26
-	ldcws,mb 0(0,%r4),%r26
-	ldcws,ma 0(0,%r4),%r26
-
-integer_store_short_memory
-	stws %r26,0(0,%r4)
-	stws,mb %r26,0(0,%r4)
-	stws,ma %r26,0(0,%r4)
-	sths %r26,0(0,%r4)
-	sths,mb %r26,0(0,%r4)
-	sths,ma %r26,0(0,%r4)
-	stbs %r26,0(0,%r4)
-	stbs,mb %r26,0(0,%r4)
-	stbs,ma %r26,0(0,%r4)
-	stwas %r26,0(%r4)
-	stwas,mb %r26,0(%r4)
-	stwas,ma %r26,0(%r4)
-	stbys %r26,0(0,%r4)
-	stbys,b %r26,0(0,%r4)
-	stbys,e %r26,0(0,%r4)
-	stbys,b,m %r26,0(0,%r4)
-	stbys,e,m %r26,0(0,%r4)
-
-; Immediate instructions.
-immediate_tests
-	ldo 5(%r26),%r26
-	ldil L%0xdeadbeef,%r26
-	addil L%0xdeadbeef,%r5
-
-; Lots of branch instructions.
-; blr with %r0 as return pointer should really be just br <target>,
-; but the assemblers can't handle it.
-branch_tests_1
-	bl main,%r2
-	bl,n main,%r2
-	b main
-	b,n main
-	gate main,%r2
-	gate,n main,%r2
-	blr %r4,%r2
-	blr,n %r4,%r2
-	blr %r4,%r0
-	blr,n %r4,%r0
-branch_tests_2
-	bv 0(%r2)
-	bv,n 0(%r2)
-	be 0x1234(%sr1,%r2)
-	be,n 0x1234(%sr1,%r2)
-	ble 0x1234(%sr1,%r2)
-	ble,n 0x1234(%sr1,%r2)
-
-; GAS can't assemble movb,n or movib,n.
-movb_tests
-	movb %r4,%r26,movb_tests
-	movb,= %r4,%r26,movb_tests
-	movb,< %r4,%r26,movb_tests
-	movb,od %r4,%r26,movb_tests
-	movb,tr %r4,%r26,movb_tests
-	movb,<> %r4,%r26,movb_tests
-	movb,>= %r4,%r26,movb_tests
-	movb,ev %r4,%r26,movb_tests
-movb_nullified_tests
-	movb,n %r4,%r26,movb_tests
-	movb,=,n %r4,%r26,movb_tests
-	movb,<,n %r4,%r26,movb_tests
-	movb,od,n %r4,%r26,movb_tests
-	movb,tr,n %r4,%r26,movb_tests
-	movb,<>,n %r4,%r26,movb_tests
-	movb,>=,n %r4,%r26,movb_tests
-	movb,ev,n %r4,%r26,movb_tests
-
-movib_tests
-	movib 5,%r26,movib_tests
-	movib,= 5,%r26,movib_tests
-	movib,< 5,%r26,movib_tests
-	movib,od 5,%r26,movib_tests
-	movib,tr 5,%r26,movib_tests
-	movib,<> 5,%r26,movib_tests
-	movib,>= 5,%r26,movib_tests
-	movib,ev 5,%r26,movib_tests
-movib_nullified_tests
-	movib,n 5,%r26,movib_tests
-	movib,=,n 5,%r26,movib_tests
-	movib,<,n 5,%r26,movib_tests
-	movib,od,n 5,%r26,movib_tests
-	movib,tr,n 5,%r26,movib_tests
-	movib,<>,n 5,%r26,movib_tests
-	movib,>=,n 5,%r26,movib_tests
-	movib,ev,n 5,%r26,movib_tests
-
-comb_tests_1
-	comb %r0,%r4,comb_tests_1
-	comb,= %r0,%r4,comb_tests_1
-	comb,< %r0,%r4,comb_tests_1
-	comb,<= %r0,%r4,comb_tests_1
-	comb,<< %r0,%r4,comb_tests_1
-	comb,<<= %r0,%r4,comb_tests_1
-	comb,sv %r0,%r4,comb_tests_1
-	comb,od %r0,%r4,comb_tests_1
-
-comb_tests_2
-	comb,tr %r0,%r4,comb_tests_2
-	comb,<> %r0,%r4,comb_tests_2
-	comb,>= %r0,%r4,comb_tests_2
-	comb,> %r0,%r4,comb_tests_2
-	comb,>>= %r0,%r4,comb_tests_2
-	comb,>> %r0,%r4,comb_tests_2
-	comb,nsv %r0,%r4,comb_tests_2
-	comb,ev %r0,%r4,comb_tests_2
-
-comb_nullified_tests_1
-	comb,n %r0,%r4,comb_tests_1
-	comb,=,n %r0,%r4,comb_tests_1
-	comb,<,n %r0,%r4,comb_tests_1
-	comb,<=,n %r0,%r4,comb_tests_1
-	comb,<<,n %r0,%r4,comb_tests_1
-	comb,<<=,n %r0,%r4,comb_tests_1
-	comb,sv,n %r0,%r4,comb_tests_1
-	comb,od,n %r0,%r4,comb_tests_1
-
-comb_nullified_tests_2
-	comb,tr,n %r0,%r4,comb_tests_2
-	comb,<>,n %r0,%r4,comb_tests_2
-	comb,>=,n %r0,%r4,comb_tests_2
-	comb,>,n %r0,%r4,comb_tests_2
-	comb,>>=,n %r0,%r4,comb_tests_2
-	comb,>>,n %r0,%r4,comb_tests_2
-	comb,nsv,n %r0,%r4,comb_tests_2
-	comb,ev,n %r0,%r4,comb_tests_2
-
-comib_tests_1
-	comib 0,%r4,comib_tests_1
-	comib,= 0,%r4,comib_tests_1
-	comib,< 0,%r4,comib_tests_1
-	comib,<= 0,%r4,comib_tests_1
-	comib,<< 0,%r4,comib_tests_1
-	comib,<<= 0,%r4,comib_tests_1
-	comib,sv 0,%r4,comib_tests_1
-	comib,od 0,%r4,comib_tests_1
-
-comib_tests_2
-	comib,tr 0,%r4,comib_tests_2
-	comib,<> 0,%r4,comib_tests_2
-	comib,>= 0,%r4,comib_tests_2
-	comib,> 0,%r4,comib_tests_2
-	comib,>>= 0,%r4,comib_tests_2
-	comib,>> 0,%r4,comib_tests_2
-	comib,nsv 0,%r4,comib_tests_2
-	comib,ev 0,%r4,comib_tests_2
-
-comib_nullified_tests_1
-	comib,n 0,%r4,comib_tests_1
-	comib,=,n 0,%r4,comib_tests_1
-	comib,<,n 0,%r4,comib_tests_1
-	comib,<=,n 0,%r4,comib_tests_1
-	comib,<<,n 0,%r4,comib_tests_1
-	comib,<<=,n 0,%r4,comib_tests_1
-	comib,sv,n 0,%r4,comib_tests_1
-	comib,od,n 0,%r4,comib_tests_1
-
-comib_nullified_tests_2
-	comib,tr,n 0,%r4,comib_tests_2
-	comib,<>,n 0,%r4,comib_tests_2
-	comib,>=,n 0,%r4,comib_tests_2
-	comib,>,n 0,%r4,comib_tests_2
-	comib,>>=,n 0,%r4,comib_tests_2
-	comib,>>,n 0,%r4,comib_tests_2
-	comib,nsv,n 0,%r4,comib_tests_2
-	comib,ev,n 0,%r4,comib_tests_2
-
-addb_tests_1
-	addb %r1,%r4,addb_tests_1
-	addb,= %r1,%r4,addb_tests_1
-	addb,< %r1,%r4,addb_tests_1
-	addb,<= %r1,%r4,addb_tests_1
-	addb,nuv %r1,%r4,addb_tests_1
-	addb,znv %r1,%r4,addb_tests_1
-	addb,sv %r1,%r4,addb_tests_1
-	addb,od %r1,%r4,addb_tests_1
-
-addb_tests_2
-	addb,tr %r1,%r4,addb_tests_2
-	addb,<> %r1,%r4,addb_tests_2
-	addb,>= %r1,%r4,addb_tests_2
-	addb,> %r1,%r4,addb_tests_2
-	addb,uv %r1,%r4,addb_tests_2
-	addb,vnz %r1,%r4,addb_tests_2
-	addb,nsv %r1,%r4,addb_tests_2
-	addb,ev %r1,%r4,addb_tests_2
-
-addb_nullified_tests_1
-	addb,n %r1,%r4,addb_tests_1
-	addb,=,n %r1,%r4,addb_tests_1
-	addb,<,n %r1,%r4,addb_tests_1
-	addb,<=,n %r1,%r4,addb_tests_1
-	addb,nuv,n %r1,%r4,addb_tests_1
-	addb,znv,n %r1,%r4,addb_tests_1
-	addb,sv,n %r1,%r4,addb_tests_1
-	addb,od,n %r1,%r4,addb_tests_1
-
-addb_nullified_tests_2
-	addb,tr,n %r1,%r4,addb_tests_2
-	addb,<>,n %r1,%r4,addb_tests_2
-	addb,>=,n %r1,%r4,addb_tests_2
-	addb,>,n %r1,%r4,addb_tests_2
-	addb,uv,n %r1,%r4,addb_tests_2
-	addb,vnz,n %r1,%r4,addb_tests_2
-	addb,nsv,n %r1,%r4,addb_tests_2
-	addb,ev,n %r1,%r4,addb_tests_2
-
-addib_tests_1
-	addib -1,%r4,addib_tests_1
-	addib,= -1,%r4,addib_tests_1
-	addib,< -1,%r4,addib_tests_1
-	addib,<= -1,%r4,addib_tests_1
-	addib,nuv -1,%r4,addib_tests_1
-	addib,znv -1,%r4,addib_tests_1
-	addib,sv -1,%r4,addib_tests_1
-	addib,od -1,%r4,addib_tests_1
-
-addib_tests_2
-	addib,tr -1,%r4,addib_tests_2
-	addib,<> -1,%r4,addib_tests_2
-	addib,>= -1,%r4,addib_tests_2
-	addib,> -1,%r4,addib_tests_2
-	addib,uv -1,%r4,addib_tests_2
-	addib,vnz -1,%r4,addib_tests_2
-	addib,nsv -1,%r4,addib_tests_2
-	addib,ev -1,%r4,addib_tests_2
-
-addib_nullified_tests_1
-	addib,n -1,%r4,addib_tests_1
-	addib,=,n -1,%r4,addib_tests_1
-	addib,<,n -1,%r4,addib_tests_1
-	addib,<=,n -1,%r4,addib_tests_1
-	addib,nuv,n -1,%r4,addib_tests_1
-	addib,znv,n -1,%r4,addib_tests_1
-	addib,sv,n -1,%r4,addib_tests_1
-	addib,od,n -1,%r4,addib_tests_1
-
-addib_nullified_tests_2
-	addib,tr,n -1,%r4,addib_tests_2
-	addib,<>,n -1,%r4,addib_tests_2
-	addib,>=,n -1,%r4,addib_tests_2
-	addib,>,n -1,%r4,addib_tests_2
-	addib,uv,n -1,%r4,addib_tests_2
-	addib,vnz,n -1,%r4,addib_tests_2
-	addib,nsv,n -1,%r4,addib_tests_2
-	addib,ev,n -1,%r4,addib_tests_2
-
-
-; Needs to check lots of stuff (like corner bit cases)
-bb_tests
-	bvb,< %r4,bb_tests
-	bvb,>= %r4,bb_tests
-	bvb,<,n %r4,bb_tests
-	bvb,>=,n %r4,bb_tests
-	bb,< %r4,5,bb_tests
-	bb,>= %r4,5,bb_tests
-	bb,<,n %r4,5,bb_tests
-	bb,>=,n %r4,5,bb_tests
-	
-; Computational instructions
-add_tests
-	add  %r4,%r5,%r6
-	add,=  %r4,%r5,%r6
-	add,<  %r4,%r5,%r6
-	add,<=  %r4,%r5,%r6
-	add,nuv  %r4,%r5,%r6
-	add,znv  %r4,%r5,%r6
-	add,sv  %r4,%r5,%r6
-	add,od  %r4,%r5,%r6
-	add,tr  %r4,%r5,%r6
-	add,<>  %r4,%r5,%r6
-	add,>=  %r4,%r5,%r6
-	add,>  %r4,%r5,%r6
-	add,uv  %r4,%r5,%r6
-	add,vnz  %r4,%r5,%r6
-	add,nsv  %r4,%r5,%r6
-	add,ev  %r4,%r5,%r6
-
-addl_tests
-	addl  %r4,%r5,%r6
-	addl,=  %r4,%r5,%r6
-	addl,<  %r4,%r5,%r6
-	addl,<=  %r4,%r5,%r6
-	addl,nuv  %r4,%r5,%r6
-	addl,znv  %r4,%r5,%r6
-	addl,sv  %r4,%r5,%r6
-	addl,od  %r4,%r5,%r6
-	addl,tr  %r4,%r5,%r6
-	addl,<>  %r4,%r5,%r6
-	addl,>=  %r4,%r5,%r6
-	addl,>  %r4,%r5,%r6
-	addl,uv  %r4,%r5,%r6
-	addl,vnz  %r4,%r5,%r6
-	addl,nsv  %r4,%r5,%r6
-	addl,ev  %r4,%r5,%r6
-
-addo_tests
-	addo  %r4,%r5,%r6
-	addo,=  %r4,%r5,%r6
-	addo,<  %r4,%r5,%r6
-	addo,<=  %r4,%r5,%r6
-	addo,nuv  %r4,%r5,%r6
-	addo,znv  %r4,%r5,%r6
-	addo,sv  %r4,%r5,%r6
-	addo,od  %r4,%r5,%r6
-	addo,tr  %r4,%r5,%r6
-	addo,<>  %r4,%r5,%r6
-	addo,>=  %r4,%r5,%r6
-	addo,>  %r4,%r5,%r6
-	addo,uv  %r4,%r5,%r6
-	addo,vnz  %r4,%r5,%r6
-	addo,nsv  %r4,%r5,%r6
-	addo,ev  %r4,%r5,%r6
-
-addc_tests
-	addc  %r4,%r5,%r6
-	addc,=  %r4,%r5,%r6
-	addc,<  %r4,%r5,%r6
-	addc,<=  %r4,%r5,%r6
-	addc,nuv  %r4,%r5,%r6
-	addc,znv  %r4,%r5,%r6
-	addc,sv  %r4,%r5,%r6
-	addc,od  %r4,%r5,%r6
-	addc,tr  %r4,%r5,%r6
-	addc,<>  %r4,%r5,%r6
-	addc,>=  %r4,%r5,%r6
-	addc,>  %r4,%r5,%r6
-	addc,uv  %r4,%r5,%r6
-	addc,vnz  %r4,%r5,%r6
-	addc,nsv  %r4,%r5,%r6
-	addc,ev  %r4,%r5,%r6
-
-addco_tests
-	addco  %r4,%r5,%r6
-	addco,=  %r4,%r5,%r6
-	addco,<  %r4,%r5,%r6
-	addco,<=  %r4,%r5,%r6
-	addco,nuv  %r4,%r5,%r6
-	addco,znv  %r4,%r5,%r6
-	addco,sv  %r4,%r5,%r6
-	addco,od  %r4,%r5,%r6
-	addco,tr  %r4,%r5,%r6
-	addco,<>  %r4,%r5,%r6
-	addco,>=  %r4,%r5,%r6
-	addco,>  %r4,%r5,%r6
-	addco,uv  %r4,%r5,%r6
-	addco,vnz  %r4,%r5,%r6
-	addco,nsv  %r4,%r5,%r6
-	addco,ev  %r4,%r5,%r6
-
-sh1add_tests
-	sh1add  %r4,%r5,%r6
-	sh1add,=  %r4,%r5,%r6
-	sh1add,<  %r4,%r5,%r6
-	sh1add,<=  %r4,%r5,%r6
-	sh1add,nuv  %r4,%r5,%r6
-	sh1add,znv  %r4,%r5,%r6
-	sh1add,sv  %r4,%r5,%r6
-	sh1add,od  %r4,%r5,%r6
-	sh1add,tr  %r4,%r5,%r6
-	sh1add,<>  %r4,%r5,%r6
-	sh1add,>=  %r4,%r5,%r6
-	sh1add,>  %r4,%r5,%r6
-	sh1add,uv  %r4,%r5,%r6
-	sh1add,vnz  %r4,%r5,%r6
-	sh1add,nsv  %r4,%r5,%r6
-	sh1add,ev  %r4,%r5,%r6
-
-sh1addl_tests
-	sh1addl  %r4,%r5,%r6
-	sh1addl,=  %r4,%r5,%r6
-	sh1addl,<  %r4,%r5,%r6
-	sh1addl,<=  %r4,%r5,%r6
-	sh1addl,nuv  %r4,%r5,%r6
-	sh1addl,znv  %r4,%r5,%r6
-	sh1addl,sv  %r4,%r5,%r6
-	sh1addl,od  %r4,%r5,%r6
-	sh1addl,tr  %r4,%r5,%r6
-	sh1addl,<>  %r4,%r5,%r6
-	sh1addl,>=  %r4,%r5,%r6
-	sh1addl,>  %r4,%r5,%r6
-	sh1addl,uv  %r4,%r5,%r6
-	sh1addl,vnz  %r4,%r5,%r6
-	sh1addl,nsv  %r4,%r5,%r6
-	sh1addl,ev  %r4,%r5,%r6
-
-sh1addo_tests
-	sh1addo  %r4,%r5,%r6
-	sh1addo,=  %r4,%r5,%r6
-	sh1addo,<  %r4,%r5,%r6
-	sh1addo,<=  %r4,%r5,%r6
-	sh1addo,nuv  %r4,%r5,%r6
-	sh1addo,znv  %r4,%r5,%r6
-	sh1addo,sv  %r4,%r5,%r6
-	sh1addo,od  %r4,%r5,%r6
-	sh1addo,tr  %r4,%r5,%r6
-	sh1addo,<>  %r4,%r5,%r6
-	sh1addo,>=  %r4,%r5,%r6
-	sh1addo,>  %r4,%r5,%r6
-	sh1addo,uv  %r4,%r5,%r6
-	sh1addo,vnz  %r4,%r5,%r6
-	sh1addo,nsv  %r4,%r5,%r6
-	sh1addo,ev  %r4,%r5,%r6
-
-
-sh2add_tests
-	sh2add  %r4,%r5,%r6
-	sh2add,=  %r4,%r5,%r6
-	sh2add,<  %r4,%r5,%r6
-	sh2add,<=  %r4,%r5,%r6
-	sh2add,nuv  %r4,%r5,%r6
-	sh2add,znv  %r4,%r5,%r6
-	sh2add,sv  %r4,%r5,%r6
-	sh2add,od  %r4,%r5,%r6
-	sh2add,tr  %r4,%r5,%r6
-	sh2add,<>  %r4,%r5,%r6
-	sh2add,>=  %r4,%r5,%r6
-	sh2add,>  %r4,%r5,%r6
-	sh2add,uv  %r4,%r5,%r6
-	sh2add,vnz  %r4,%r5,%r6
-	sh2add,nsv  %r4,%r5,%r6
-	sh2add,ev  %r4,%r5,%r6
-
-sh2addl_tests
-	sh2addl  %r4,%r5,%r6
-	sh2addl,=  %r4,%r5,%r6
-	sh2addl,<  %r4,%r5,%r6
-	sh2addl,<=  %r4,%r5,%r6
-	sh2addl,nuv  %r4,%r5,%r6
-	sh2addl,znv  %r4,%r5,%r6
-	sh2addl,sv  %r4,%r5,%r6
-	sh2addl,od  %r4,%r5,%r6
-	sh2addl,tr  %r4,%r5,%r6
-	sh2addl,<>  %r4,%r5,%r6
-	sh2addl,>=  %r4,%r5,%r6
-	sh2addl,>  %r4,%r5,%r6
-	sh2addl,uv  %r4,%r5,%r6
-	sh2addl,vnz  %r4,%r5,%r6
-	sh2addl,nsv  %r4,%r5,%r6
-	sh2addl,ev  %r4,%r5,%r6
-
-sh2addo_tests
-	sh2addo  %r4,%r5,%r6
-	sh2addo,=  %r4,%r5,%r6
-	sh2addo,<  %r4,%r5,%r6
-	sh2addo,<=  %r4,%r5,%r6
-	sh2addo,nuv  %r4,%r5,%r6
-	sh2addo,znv  %r4,%r5,%r6
-	sh2addo,sv  %r4,%r5,%r6
-	sh2addo,od  %r4,%r5,%r6
-	sh2addo,tr  %r4,%r5,%r6
-	sh2addo,<>  %r4,%r5,%r6
-	sh2addo,>=  %r4,%r5,%r6
-	sh2addo,>  %r4,%r5,%r6
-	sh2addo,uv  %r4,%r5,%r6
-	sh2addo,vnz  %r4,%r5,%r6
-	sh2addo,nsv  %r4,%r5,%r6
-	sh2addo,ev  %r4,%r5,%r6
-
-
-sh3add_tests
-	sh3add  %r4,%r5,%r6
-	sh3add,=  %r4,%r5,%r6
-	sh3add,<  %r4,%r5,%r6
-	sh3add,<=  %r4,%r5,%r6
-	sh3add,nuv  %r4,%r5,%r6
-	sh3add,znv  %r4,%r5,%r6
-	sh3add,sv  %r4,%r5,%r6
-	sh3add,od  %r4,%r5,%r6
-	sh3add,tr  %r4,%r5,%r6
-	sh3add,<>  %r4,%r5,%r6
-	sh3add,>=  %r4,%r5,%r6
-	sh3add,>  %r4,%r5,%r6
-	sh3add,uv  %r4,%r5,%r6
-	sh3add,vnz  %r4,%r5,%r6
-	sh3add,nsv  %r4,%r5,%r6
-	sh3add,ev  %r4,%r5,%r6
-
-sh3addl_tests
-	sh3addl  %r4,%r5,%r6
-	sh3addl,=  %r4,%r5,%r6
-	sh3addl,<  %r4,%r5,%r6
-	sh3addl,<=  %r4,%r5,%r6
-	sh3addl,nuv  %r4,%r5,%r6
-	sh3addl,znv  %r4,%r5,%r6
-	sh3addl,sv  %r4,%r5,%r6
-	sh3addl,od  %r4,%r5,%r6
-	sh3addl,tr  %r4,%r5,%r6
-	sh3addl,<>  %r4,%r5,%r6
-	sh3addl,>=  %r4,%r5,%r6
-	sh3addl,>  %r4,%r5,%r6
-	sh3addl,uv  %r4,%r5,%r6
-	sh3addl,vnz  %r4,%r5,%r6
-	sh3addl,nsv  %r4,%r5,%r6
-	sh3addl,ev  %r4,%r5,%r6
-
-sh3addo_tests
-	sh3addo  %r4,%r5,%r6
-	sh3addo,=  %r4,%r5,%r6
-	sh3addo,<  %r4,%r5,%r6
-	sh3addo,<=  %r4,%r5,%r6
-	sh3addo,nuv  %r4,%r5,%r6
-	sh3addo,znv  %r4,%r5,%r6
-	sh3addo,sv  %r4,%r5,%r6
-	sh3addo,od  %r4,%r5,%r6
-	sh3addo,tr  %r4,%r5,%r6
-	sh3addo,<>  %r4,%r5,%r6
-	sh3addo,>=  %r4,%r5,%r6
-	sh3addo,>  %r4,%r5,%r6
-	sh3addo,uv  %r4,%r5,%r6
-	sh3addo,vnz  %r4,%r5,%r6
-	sh3addo,nsv  %r4,%r5,%r6
-	sh3addo,ev  %r4,%r5,%r6
-
-
-sub_tests
-	sub %r4,%r5,%r6
-	sub,= %r4,%r5,%r6
-	sub,< %r4,%r5,%r6
-	sub,<= %r4,%r5,%r6
-	sub,<< %r4,%r5,%r6
-	sub,<<= %r4,%r5,%r6
-	sub,sv %r4,%r5,%r6
-	sub,od %r4,%r5,%r6
-	sub,tr %r4,%r5,%r6
-	sub,<> %r4,%r5,%r6
-	sub,>= %r4,%r5,%r6
-	sub,> %r4,%r5,%r6
-	sub,>>= %r4,%r5,%r6
-	sub,>> %r4,%r5,%r6
-	sub,nsv %r4,%r5,%r6
-	sub,ev %r4,%r5,%r6
-
-subo_tests
-	subo %r4,%r5,%r6
-	subo,= %r4,%r5,%r6
-	subo,< %r4,%r5,%r6
-	subo,<= %r4,%r5,%r6
-	subo,<< %r4,%r5,%r6
-	subo,<<= %r4,%r5,%r6
-	subo,sv %r4,%r5,%r6
-	subo,od %r4,%r5,%r6
-	subo,tr %r4,%r5,%r6
-	subo,<> %r4,%r5,%r6
-	subo,>= %r4,%r5,%r6
-	subo,> %r4,%r5,%r6
-	subo,>>= %r4,%r5,%r6
-	subo,>> %r4,%r5,%r6
-	subo,nsv %r4,%r5,%r6
-	subo,ev %r4,%r5,%r6
-
-subb_tests
-	subb %r4,%r5,%r6
-	subb,= %r4,%r5,%r6
-	subb,< %r4,%r5,%r6
-	subb,<= %r4,%r5,%r6
-	subb,<< %r4,%r5,%r6
-	subb,<<= %r4,%r5,%r6
-	subb,sv %r4,%r5,%r6
-	subb,od %r4,%r5,%r6
-	subb,tr %r4,%r5,%r6
-	subb,<> %r4,%r5,%r6
-	subb,>= %r4,%r5,%r6
-	subb,> %r4,%r5,%r6
-	subb,>>= %r4,%r5,%r6
-	subb,>> %r4,%r5,%r6
-	subb,nsv %r4,%r5,%r6
-	subb,ev %r4,%r5,%r6
-
-subbo_tests
-	subbo %r4,%r5,%r6
-	subbo,= %r4,%r5,%r6
-	subbo,< %r4,%r5,%r6
-	subbo,<= %r4,%r5,%r6
-	subbo,<< %r4,%r5,%r6
-	subbo,<<= %r4,%r5,%r6
-	subbo,sv %r4,%r5,%r6
-	subbo,od %r4,%r5,%r6
-	subbo,tr %r4,%r5,%r6
-	subbo,<> %r4,%r5,%r6
-	subbo,>= %r4,%r5,%r6
-	subbo,> %r4,%r5,%r6
-	subbo,>>= %r4,%r5,%r6
-	subbo,>> %r4,%r5,%r6
-	subbo,nsv %r4,%r5,%r6
-	subbo,ev %r4,%r5,%r6
-
-subt_tests
-	subt %r4,%r5,%r6
-	subt,= %r4,%r5,%r6
-	subt,< %r4,%r5,%r6
-	subt,<= %r4,%r5,%r6
-	subt,<< %r4,%r5,%r6
-	subt,<<= %r4,%r5,%r6
-	subt,sv %r4,%r5,%r6
-	subt,od %r4,%r5,%r6
-	subt,tr %r4,%r5,%r6
-	subt,<> %r4,%r5,%r6
-	subt,>= %r4,%r5,%r6
-	subt,> %r4,%r5,%r6
-	subt,>>= %r4,%r5,%r6
-	subt,>> %r4,%r5,%r6
-	subt,nsv %r4,%r5,%r6
-	subt,ev %r4,%r5,%r6
-
-subto_tests
-	subto %r4,%r5,%r6
-	subto,= %r4,%r5,%r6
-	subto,< %r4,%r5,%r6
-	subto,<= %r4,%r5,%r6
-	subto,<< %r4,%r5,%r6
-	subto,<<= %r4,%r5,%r6
-	subto,sv %r4,%r5,%r6
-	subto,od %r4,%r5,%r6
-	subto,tr %r4,%r5,%r6
-	subto,<> %r4,%r5,%r6
-	subto,>= %r4,%r5,%r6
-	subto,> %r4,%r5,%r6
-	subto,>>= %r4,%r5,%r6
-	subto,>> %r4,%r5,%r6
-	subto,nsv %r4,%r5,%r6
-	subto,ev %r4,%r5,%r6
-
-ds_tests
-	ds %r4,%r5,%r6
-	ds,= %r4,%r5,%r6
-	ds,< %r4,%r5,%r6
-	ds,<= %r4,%r5,%r6
-	ds,<< %r4,%r5,%r6
-	ds,<<= %r4,%r5,%r6
-	ds,sv %r4,%r5,%r6
-	ds,od %r4,%r5,%r6
-	ds,tr %r4,%r5,%r6
-	ds,<> %r4,%r5,%r6
-	ds,>= %r4,%r5,%r6
-	ds,> %r4,%r5,%r6
-	ds,>>= %r4,%r5,%r6
-	ds,>> %r4,%r5,%r6
-	ds,nsv %r4,%r5,%r6
-	ds,ev %r4,%r5,%r6
-
-comclr_tests
-	comclr %r4,%r5,%r6
-	comclr,= %r4,%r5,%r6
-	comclr,< %r4,%r5,%r6
-	comclr,<= %r4,%r5,%r6
-	comclr,<< %r4,%r5,%r6
-	comclr,<<= %r4,%r5,%r6
-	comclr,sv %r4,%r5,%r6
-	comclr,od %r4,%r5,%r6
-	comclr,tr %r4,%r5,%r6
-	comclr,<> %r4,%r5,%r6
-	comclr,>= %r4,%r5,%r6
-	comclr,> %r4,%r5,%r6
-	comclr,>>= %r4,%r5,%r6
-	comclr,>> %r4,%r5,%r6
-	comclr,nsv %r4,%r5,%r6
-	comclr,ev %r4,%r5,%r6
-
-or_tests
-	or %r4,%r5,%r6
-	or,= %r4,%r5,%r6
-	or,< %r4,%r5,%r6
-	or,<= %r4,%r5,%r6
-	or,od %r4,%r5,%r6
-	or,tr %r4,%r5,%r6
-	or,<> %r4,%r5,%r6
-	or,>= %r4,%r5,%r6
-	or,> %r4,%r5,%r6
-	or,ev %r4,%r5,%r6
-xor_tests
-	xor %r4,%r5,%r6
-	xor,= %r4,%r5,%r6
-	xor,< %r4,%r5,%r6
-	xor,<= %r4,%r5,%r6
-	xor,od %r4,%r5,%r6
-	xor,tr %r4,%r5,%r6
-	xor,<> %r4,%r5,%r6
-	xor,>= %r4,%r5,%r6
-	xor,> %r4,%r5,%r6
-	xor,ev %r4,%r5,%r6
-
-and_tests
-	and %r4,%r5,%r6
-	and,= %r4,%r5,%r6
-	and,< %r4,%r5,%r6
-	and,<= %r4,%r5,%r6
-	and,od %r4,%r5,%r6
-	and,tr %r4,%r5,%r6
-	and,<> %r4,%r5,%r6
-	and,>= %r4,%r5,%r6
-	and,> %r4,%r5,%r6
-	and,ev %r4,%r5,%r6
-
-andcm_tests
-	andcm %r4,%r5,%r6
-	andcm,= %r4,%r5,%r6
-	andcm,< %r4,%r5,%r6
-	andcm,<= %r4,%r5,%r6
-	andcm,od %r4,%r5,%r6
-	andcm,tr %r4,%r5,%r6
-	andcm,<> %r4,%r5,%r6
-	andcm,>= %r4,%r5,%r6
-	andcm,> %r4,%r5,%r6
-	andcm,ev %r4,%r5,%r6
-
-
-uxor_tests
-	uxor %r4,%r5,%r6
-	uxor,sbz %r4,%r5,%r6
-	uxor,shz %r4,%r5,%r6
-	uxor,sdc %r4,%r5,%r6
-	uxor,sbc %r4,%r5,%r6
-	uxor,shc %r4,%r5,%r6
-	uxor,tr %r4,%r5,%r6
-	uxor,nbz %r4,%r5,%r6
-	uxor,nhz %r4,%r5,%r6
-	uxor,ndc %r4,%r5,%r6
-	uxor,nbc %r4,%r5,%r6
-	uxor,nhc %r4,%r5,%r6
-
-uaddcm_tests
-	uaddcm %r4,%r5,%r6
-	uaddcm,sbz %r4,%r5,%r6
-	uaddcm,shz %r4,%r5,%r6
-	uaddcm,sdc %r4,%r5,%r6
-	uaddcm,sbc %r4,%r5,%r6
-	uaddcm,shc %r4,%r5,%r6
-	uaddcm,tr %r4,%r5,%r6
-	uaddcm,nbz %r4,%r5,%r6
-	uaddcm,nhz %r4,%r5,%r6
-	uaddcm,ndc %r4,%r5,%r6
-	uaddcm,nbc %r4,%r5,%r6
-	uaddcm,nhc %r4,%r5,%r6
-
-uaddcmt_tests
-	uaddcmt %r4,%r5,%r6
-	uaddcmt,sbz %r4,%r5,%r6
-	uaddcmt,shz %r4,%r5,%r6
-	uaddcmt,sdc %r4,%r5,%r6
-	uaddcmt,sbc %r4,%r5,%r6
-	uaddcmt,shc %r4,%r5,%r6
-	uaddcmt,tr %r4,%r5,%r6
-	uaddcmt,nbz %r4,%r5,%r6
-	uaddcmt,nhz %r4,%r5,%r6
-	uaddcmt,ndc %r4,%r5,%r6
-	uaddcmt,nbc %r4,%r5,%r6
-	uaddcmt,nhc %r4,%r5,%r6
-
-dcor_tests
-	dcor %r4,%r5
-	dcor,sbz %r4,%r5
-	dcor,shz %r4,%r5
-	dcor,sdc %r4,%r5
-	dcor,sbc %r4,%r5
-	dcor,shc %r4,%r5
-	dcor,tr %r4,%r5
-	dcor,nbz %r4,%r5
-	dcor,nhz %r4,%r5
-	dcor,ndc %r4,%r5
-	dcor,nbc %r4,%r5
-	dcor,nhc %r4,%r5
-
-idcor_tests
-	idcor %r4,%r5
-	idcor,sbz %r4,%r5
-	idcor,shz %r4,%r5
-	idcor,sdc %r4,%r5
-	idcor,sbc %r4,%r5
-	idcor,shc %r4,%r5
-	idcor,tr %r4,%r5
-	idcor,nbz %r4,%r5
-	idcor,nhz %r4,%r5
-	idcor,ndc %r4,%r5
-	idcor,nbc %r4,%r5
-	idcor,nhc %r4,%r5
-
-addi_tests
-	addi  123,%r5,%r6
-	addi,=  123,%r5,%r6
-	addi,<  123,%r5,%r6
-	addi,<=  123,%r5,%r6
-	addi,nuv  123,%r5,%r6
-	addi,znv  123,%r5,%r6
-	addi,sv  123,%r5,%r6
-	addi,od  123,%r5,%r6
-	addi,tr  123,%r5,%r6
-	addi,<>  123,%r5,%r6
-	addi,>=  123,%r5,%r6
-	addi,>  123,%r5,%r6
-	addi,uv  123,%r5,%r6
-	addi,vnz  123,%r5,%r6
-	addi,nsv  123,%r5,%r6
-	addi,ev  123,%r5,%r6
-
-addio_tests
-	addio  123,%r5,%r6
-	addio,=  123,%r5,%r6
-	addio,<  123,%r5,%r6
-	addio,<=  123,%r5,%r6
-	addio,nuv  123,%r5,%r6
-	addio,znv  123,%r5,%r6
-	addio,sv  123,%r5,%r6
-	addio,od  123,%r5,%r6
-	addio,tr  123,%r5,%r6
-	addio,<>  123,%r5,%r6
-	addio,>=  123,%r5,%r6
-	addio,>  123,%r5,%r6
-	addio,uv  123,%r5,%r6
-	addio,vnz  123,%r5,%r6
-	addio,nsv  123,%r5,%r6
-	addio,ev  123,%r5,%r6
-
-addit_tests
-	addit  123,%r5,%r6
-	addit,=  123,%r5,%r6
-	addit,<  123,%r5,%r6
-	addit,<=  123,%r5,%r6
-	addit,nuv  123,%r5,%r6
-	addit,znv  123,%r5,%r6
-	addit,sv  123,%r5,%r6
-	addit,od  123,%r5,%r6
-	addit,tr  123,%r5,%r6
-	addit,<>  123,%r5,%r6
-	addit,>=  123,%r5,%r6
-	addit,>  123,%r5,%r6
-	addit,uv  123,%r5,%r6
-	addit,vnz  123,%r5,%r6
-	addit,nsv  123,%r5,%r6
-	addit,ev  123,%r5,%r6
-
-addito_tests
-	addito  123,%r5,%r6
-	addito,=  123,%r5,%r6
-	addito,<  123,%r5,%r6
-	addito,<=  123,%r5,%r6
-	addito,nuv  123,%r5,%r6
-	addito,znv  123,%r5,%r6
-	addito,sv  123,%r5,%r6
-	addito,od  123,%r5,%r6
-	addito,tr  123,%r5,%r6
-	addito,<>  123,%r5,%r6
-	addito,>=  123,%r5,%r6
-	addito,>  123,%r5,%r6
-	addito,uv  123,%r5,%r6
-	addito,vnz  123,%r5,%r6
-	addito,nsv  123,%r5,%r6
-	addito,ev  123,%r5,%r6
-
-subi_tests
-	subi 123,%r5,%r6
-	subi,= 123,%r5,%r6
-	subi,< 123,%r5,%r6
-	subi,<= 123,%r5,%r6
-	subi,<< 123,%r5,%r6
-	subi,<<= 123,%r5,%r6
-	subi,sv 123,%r5,%r6
-	subi,od 123,%r5,%r6
-	subi,tr 123,%r5,%r6
-	subi,<> 123,%r5,%r6
-	subi,>= 123,%r5,%r6
-	subi,> 123,%r5,%r6
-	subi,>>= 123,%r5,%r6
-	subi,>> 123,%r5,%r6
-	subi,nsv 123,%r5,%r6
-	subi,ev 123,%r5,%r6
-
-subio_tests
-	subio 123,%r5,%r6
-	subio,= 123,%r5,%r6
-	subio,< 123,%r5,%r6
-	subio,<= 123,%r5,%r6
-	subio,<< 123,%r5,%r6
-	subio,<<= 123,%r5,%r6
-	subio,sv 123,%r5,%r6
-	subio,od 123,%r5,%r6
-	subio,tr 123,%r5,%r6
-	subio,<> 123,%r5,%r6
-	subio,>= 123,%r5,%r6
-	subio,> 123,%r5,%r6
-	subio,>>= 123,%r5,%r6
-	subio,>> 123,%r5,%r6
-	subio,nsv 123,%r5,%r6
-	subio,ev 123,%r5,%r6
-
-comiclr_tests
-	comiclr 123,%r5,%r6
-	comiclr,= 123,%r5,%r6
-	comiclr,< 123,%r5,%r6
-	comiclr,<= 123,%r5,%r6
-	comiclr,<< 123,%r5,%r6
-	comiclr,<<= 123,%r5,%r6
-	comiclr,sv 123,%r5,%r6
-	comiclr,od 123,%r5,%r6
-	comiclr,tr 123,%r5,%r6
-	comiclr,<> 123,%r5,%r6
-	comiclr,>= 123,%r5,%r6
-	comiclr,> 123,%r5,%r6
-	comiclr,>>= 123,%r5,%r6
-	comiclr,>> 123,%r5,%r6
-	comiclr,nsv 123,%r5,%r6
-	comiclr,ev 123,%r5,%r6
-
-vshd_tests
-	vshd %r4,%r5,%r6
-	vshd,= %r4,%r5,%r6
-	vshd,< %r4,%r5,%r6
-	vshd,od %r4,%r5,%r6
-	vshd,tr %r4,%r5,%r6
-	vshd,<> %r4,%r5,%r6
-	vshd,>= %r4,%r5,%r6
-	vshd,ev %r4,%r5,%r6
-
-shd_tests
-	shd %r4,%r5,5,%r6
-	shd,= %r4,%r5,5,%r6
-	shd,< %r4,%r5,5,%r6
-	shd,od %r4,%r5,5,%r6
-	shd,tr %r4,%r5,5,%r6
-	shd,<> %r4,%r5,5,%r6
-	shd,>= %r4,%r5,5,%r6
-	shd,ev %r4,%r5,5,%r6
-
-extru_tests
-	extru %r4,5,10,%r6
-	extru,= %r4,5,10,%r6
-	extru,< %r4,5,10,%r6
-	extru,od %r4,5,10,%r6
-	extru,tr %r4,5,10,%r6
-	extru,<> %r4,5,10,%r6
-	extru,>= %r4,5,10,%r6
-	extru,ev %r4,5,10,%r6
-
-extrs_tests
-	extrs %r4,5,10,%r6
-	extrs,= %r4,5,10,%r6
-	extrs,< %r4,5,10,%r6
-	extrs,od %r4,5,10,%r6
-	extrs,tr %r4,5,10,%r6
-	extrs,<> %r4,5,10,%r6
-	extrs,>= %r4,5,10,%r6
-	extrs,ev %r4,5,10,%r6
-
-zdep_tests
-	zdep %r4,5,10,%r6
-	zdep,= %r4,5,10,%r6
-	zdep,< %r4,5,10,%r6
-	zdep,od %r4,5,10,%r6
-	zdep,tr %r4,5,10,%r6
-	zdep,<> %r4,5,10,%r6
-	zdep,>= %r4,5,10,%r6
-	zdep,ev %r4,5,10,%r6
-
-dep_tests
-	dep %r4,5,10,%r6
-	dep,= %r4,5,10,%r6
-	dep,< %r4,5,10,%r6
-	dep,od %r4,5,10,%r6
-	dep,tr %r4,5,10,%r6
-	dep,<> %r4,5,10,%r6
-	dep,>= %r4,5,10,%r6
-	dep,ev %r4,5,10,%r6
-
-vextru_tests
-	vextru %r4,5,%r6
-	vextru,= %r4,5,%r6
-	vextru,< %r4,5,%r6
-	vextru,od %r4,5,%r6
-	vextru,tr %r4,5,%r6
-	vextru,<> %r4,5,%r6
-	vextru,>= %r4,5,%r6
-	vextru,ev %r4,5,%r6
-
-vextrs_tests
-	vextrs %r4,5,%r6
-	vextrs,= %r4,5,%r6
-	vextrs,< %r4,5,%r6
-	vextrs,od %r4,5,%r6
-	vextrs,tr %r4,5,%r6
-	vextrs,<> %r4,5,%r6
-	vextrs,>= %r4,5,%r6
-	vextrs,ev %r4,5,%r6
-
-zvdep_tests
-	zvdep %r4,5,%r6
-	zvdep,= %r4,5,%r6
-	zvdep,< %r4,5,%r6
-	zvdep,od %r4,5,%r6
-	zvdep,tr %r4,5,%r6
-	zvdep,<> %r4,5,%r6
-	zvdep,>= %r4,5,%r6
-	zvdep,ev %r4,5,%r6
-
-
-vdep_tests
-	vdep %r4,5,%r6
-	vdep,= %r4,5,%r6
-	vdep,< %r4,5,%r6
-	vdep,od %r4,5,%r6
-	vdep,tr %r4,5,%r6
-	vdep,<> %r4,5,%r6
-	vdep,>= %r4,5,%r6
-	vdep,ev %r4,5,%r6
-
-vdepi_tests
-	vdepi -1,5,%r6
-	vdepi,= -1,5,%r6
-	vdepi,< -1,5,%r6
-	vdepi,od -1,5,%r6
-	vdepi,tr -1,5,%r6
-	vdepi,<> -1,5,%r6
-	vdepi,>= -1,5,%r6
-	vdepi,ev -1,5,%r6
-
-zvdepi_tests
-	zvdepi -1,5,%r6
-	zvdepi,= -1,5,%r6
-	zvdepi,< -1,5,%r6
-	zvdepi,od -1,5,%r6
-	zvdepi,tr -1,5,%r6
-	zvdepi,<> -1,5,%r6
-	zvdepi,>= -1,5,%r6
-	zvdepi,ev -1,5,%r6
-
-depi_tests
-	depi -1,4,10,%r6
-	depi,= -1,4,10,%r6
-	depi,< -1,4,10,%r6
-	depi,od -1,4,10,%r6
-	depi,tr -1,4,10,%r6
-	depi,<> -1,4,10,%r6
-	depi,>= -1,4,10,%r6
-	depi,ev -1,4,10,%r6
-
-zdepi_tests
-	zdepi -1,4,10,%r6
-	zdepi,= -1,4,10,%r6
-	zdepi,< -1,4,10,%r6
-	zdepi,od -1,4,10,%r6
-	zdepi,tr -1,4,10,%r6
-	zdepi,<> -1,4,10,%r6
-	zdepi,>= -1,4,10,%r6
-	zdepi,ev -1,4,10,%r6
-
-
-system_control_tests
-	break 5,12
-	rfi
-	rfir
-	ssm 5,%r4
-	rsm 5,%r4
-	mtsm %r4
-	ldsid (%sr0,%r5),%r4
-	mtsp %r4,%sr0
-	mtctl %r4,%cr10
-	mfsp %sr0,%r4
-	mfctl %cr10,%r4
-	sync
-	syncdma
-	diag 1234
-
-probe_tests
-	prober (%sr0,%r5),%r6,%r7
-	proberi (%sr0,%r5),1,%r7
-	probew (%sr0,%r5),%r6,%r7
-	probewi (%sr0,%r5),1,%r7
-	
-lpa_tests
-	lpa %r4(%sr0,%r5),%r6
-	lpa,m %r4(%sr0,%r5),%r6
-	lha %r4(%sr0,%r5),%r6
-	lha,m %r4(%sr0,%r5),%r6
-	lci %r4(%sr0,%r5),%r6
-
-purge_tests
-	pdtlb %r4(%sr0,%r5)
-	pdtlb,m %r4(%sr0,%r5)
-	pitlb %r4(%sr0,%r5)
-	pitlb,m %r4(%sr0,%r5)
-	pdtlbe %r4(%sr0,%r5)
-	pdtlbe,m %r4(%sr0,%r5)
-	pitlbe %r4(%sr0,%r5)
-	pitlbe,m %r4(%sr0,%r5)
-	pdc %r4(%sr0,%r5)
-	pdc,m %r4(%sr0,%r5)
-	fdc %r4(%sr0,%r5)
-	fdc,m %r4(%sr0,%r5)
-	fic %r4(%sr0,%r5)
-	fic,m %r4(%sr0,%r5)
-	fdce %r4(%sr0,%r5)
-	fdce,m %r4(%sr0,%r5)
-	fice %r4(%sr0,%r5)
-	fice,m %r4(%sr0,%r5)
-
-insert_tests
-	idtlba %r4,(%sr0,%r5)
-	iitlba %r4,(%sr0,%r5)
-	idtlbp %r4,(%sr0,%r5)
-	iitlbp %r4,(%sr0,%r5)
-
-fpu_misc_tests
-	ftest
-
-fpu_memory_indexing_tests
-	fldwx %r4(%sr0,%r5),%fr6
-	fldwx,s %r4(%sr0,%r5),%fr6
-	fldwx,m %r4(%sr0,%r5),%fr6
-	fldwx,sm %r4(%sr0,%r5),%fr6
-	flddx %r4(%sr0,%r5),%fr6
-	flddx,s %r4(%sr0,%r5),%fr6
-	flddx,m %r4(%sr0,%r5),%fr6
-	flddx,sm %r4(%sr0,%r5),%fr6
-	fstwx %fr6,%r4(%sr0,%r5)
-	fstwx,s %fr6,%r4(%sr0,%r5)
-	fstwx,m %fr6,%r4(%sr0,%r5)
-	fstwx,sm %fr6,%r4(%sr0,%r5)
-	fstdx %fr6,%r4(%sr0,%r5)
-	fstdx,s %fr6,%r4(%sr0,%r5)
-	fstdx,m %fr6,%r4(%sr0,%r5)
-	fstdx,sm %fr6,%r4(%sr0,%r5)
-	fstqx %fr6,%r4(%sr0,%r5)
-	fstqx,s %fr6,%r4(%sr0,%r5)
-	fstqx,m %fr6,%r4(%sr0,%r5)
-	fstqx,sm %fr6,%r4(%sr0,%r5)
-
-fpu_short_memory_tests
-	fldws 0(%sr0,%r5),%fr6
-	fldws,mb 0(%sr0,%r5),%fr6
-	fldws,ma 0(%sr0,%r5),%fr6
-	fldds 0(%sr0,%r5),%fr6
-	fldds,mb 0(%sr0,%r5),%fr6
-	fldds,ma 0(%sr0,%r5),%fr6
-	fstws %fr6,0(%sr0,%r5)
-	fstws,mb %fr6,0(%sr0,%r5)
-	fstws,ma %fr6,0(%sr0,%r5)
-	fstds %fr6,0(%sr0,%r5)
-	fstds,mb %fr6,0(%sr0,%r5)
-	fstds,ma %fr6,0(%sr0,%r5)
-	fstqs %fr6,0(%sr0,%r5)
-	fstqs,mb %fr6,0(%sr0,%r5)
-	fstqs,ma %fr6,0(%sr0,%r5)
-
-
-fcpy_tests
-	fcpy,sgl %fr5,%fr10
-	fcpy,dbl %fr5,%fr10
-	fcpy,quad %fr5,%fr10
-	fcpy,sgl %fr20,%fr24
-	fcpy,dbl %fr20,%fr24
-
-fabs_tests
-	fabs,sgl %fr5,%fr10
-	fabs,dbl %fr5,%fr10
-	fabs,quad %fr5,%fr10
-	fabs,sgl %fr20,%fr24
-	fabs,dbl %fr20,%fr24
-
-fsqrt_tests
-	fsqrt,sgl %fr5,%fr10
-	fsqrt,dbl %fr5,%fr10
-	fsqrt,quad %fr5,%fr10
-	fsqrt,sgl %fr20,%fr24
-	fsqrt,dbl %fr20,%fr24
-
-frnd_tests
-	frnd,sgl %fr5,%fr10
-	frnd,dbl %fr5,%fr10
-	frnd,quad %fr5,%fr10
-	frnd,sgl %fr20,%fr24
-	frnd,dbl %fr20,%fr24
-	
-fcnvff_tests
-	fcnvff,sgl,sgl %fr5,%fr10
-	fcnvff,sgl,dbl %fr5,%fr10
-	fcnvff,sgl,quad %fr5,%fr10
-	fcnvff,dbl,sgl %fr5,%fr10
-	fcnvff,dbl,dbl %fr5,%fr10
-	fcnvff,dbl,quad %fr5,%fr10
-	fcnvff,quad,sgl %fr5,%fr10
-	fcnvff,quad,dbl %fr5,%fr10
-	fcnvff,quad,quad %fr5,%fr10
-	fcnvff,sgl,sgl %fr20,%fr24
-	fcnvff,sgl,dbl %fr20,%fr24
-	fcnvff,sgl,quad %fr20,%fr24
-	fcnvff,dbl,sgl %fr20,%fr24
-	fcnvff,dbl,dbl %fr20,%fr24
-	fcnvff,dbl,quad %fr20,%fr24
-	fcnvff,quad,sgl %fr20,%fr24
-	fcnvff,quad,dbl %fr20,%fr24
-	fcnvff,quad,quad %fr20,%fr24
-
-fcnvxf_tests
-	fcnvxf,sgl,sgl %fr5,%fr10
-	fcnvxf,sgl,dbl %fr5,%fr10
-	fcnvxf,sgl,quad %fr5,%fr10
-	fcnvxf,dbl,sgl %fr5,%fr10
-	fcnvxf,dbl,dbl %fr5,%fr10
-	fcnvxf,dbl,quad %fr5,%fr10
-	fcnvxf,quad,sgl %fr5,%fr10
-	fcnvxf,quad,dbl %fr5,%fr10
-	fcnvxf,quad,quad %fr5,%fr10
-	fcnvxf,sgl,sgl %fr20,%fr24
-	fcnvxf,sgl,dbl %fr20,%fr24
-	fcnvxf,sgl,quad %fr20,%fr24
-	fcnvxf,dbl,sgl %fr20,%fr24
-	fcnvxf,dbl,dbl %fr20,%fr24
-	fcnvxf,dbl,quad %fr20,%fr24
-	fcnvxf,quad,sgl %fr20,%fr24
-	fcnvxf,quad,dbl %fr20,%fr24
-	fcnvxf,quad,quad %fr20,%fr24
-
-fcnvfx_tests
-	fcnvfx,sgl,sgl %fr5,%fr10
-	fcnvfx,sgl,dbl %fr5,%fr10
-	fcnvfx,sgl,quad %fr5,%fr10
-	fcnvfx,dbl,sgl %fr5,%fr10
-	fcnvfx,dbl,dbl %fr5,%fr10
-	fcnvfx,dbl,quad %fr5,%fr10
-	fcnvfx,quad,sgl %fr5,%fr10
-	fcnvfx,quad,dbl %fr5,%fr10
-	fcnvfx,quad,quad %fr5,%fr10
-	fcnvfx,sgl,sgl %fr20,%fr24
-	fcnvfx,sgl,dbl %fr20,%fr24
-	fcnvfx,sgl,quad %fr20,%fr24
-	fcnvfx,dbl,sgl %fr20,%fr24
-	fcnvfx,dbl,dbl %fr20,%fr24
-	fcnvfx,dbl,quad %fr20,%fr24
-	fcnvfx,quad,sgl %fr20,%fr24
-	fcnvfx,quad,dbl %fr20,%fr24
-	fcnvfx,quad,quad %fr20,%fr24
-
-fcnvfxt_tests
-	fcnvfxt,sgl,sgl %fr5,%fr10
-	fcnvfxt,sgl,dbl %fr5,%fr10
-	fcnvfxt,sgl,quad %fr5,%fr10
-	fcnvfxt,dbl,sgl %fr5,%fr10
-	fcnvfxt,dbl,dbl %fr5,%fr10
-	fcnvfxt,dbl,quad %fr5,%fr10
-	fcnvfxt,quad,sgl %fr5,%fr10
-	fcnvfxt,quad,dbl %fr5,%fr10
-	fcnvfxt,quad,quad %fr5,%fr10
-	fcnvfxt,sgl,sgl %fr20,%fr24
-	fcnvfxt,sgl,dbl %fr20,%fr24
-	fcnvfxt,sgl,quad %fr20,%fr24
-	fcnvfxt,dbl,sgl %fr20,%fr24
-	fcnvfxt,dbl,dbl %fr20,%fr24
-	fcnvfxt,dbl,quad %fr20,%fr24
-	fcnvfxt,quad,sgl %fr20,%fr24
-	fcnvfxt,quad,dbl %fr20,%fr24
-	fcnvfxt,quad,quad %fr20,%fr24
-
-fadd_tests
-	fadd,sgl %fr4,%fr8,%fr12
-	fadd,dbl %fr4,%fr8,%fr12
-	fadd,quad %fr4,%fr8,%fr12
-	fadd,sgl %fr20,%fr24,%fr28
-	fadd,dbl %fr20,%fr24,%fr28
-	fadd,quad %fr20,%fr24,%fr28
-
-fsub_tests
-	fsub,sgl %fr4,%fr8,%fr12
-	fsub,dbl %fr4,%fr8,%fr12
-	fsub,quad %fr4,%fr8,%fr12
-	fsub,sgl %fr20,%fr24,%fr28
-	fsub,dbl %fr20,%fr24,%fr28
-	fsub,quad %fr20,%fr24,%fr28
-
-fmpy_tests
-	fmpy,sgl %fr4,%fr8,%fr12
-	fmpy,dbl %fr4,%fr8,%fr12
-	fmpy,quad %fr4,%fr8,%fr12
-	fmpy,sgl %fr20,%fr24,%fr28
-	fmpy,dbl %fr20,%fr24,%fr28
-	fmpy,quad %fr20,%fr24,%fr28
-
-fdiv_tests
-	fdiv,sgl %fr4,%fr8,%fr12
-	fdiv,dbl %fr4,%fr8,%fr12
-	fdiv,quad %fr4,%fr8,%fr12
-	fdiv,sgl %fr20,%fr24,%fr28
-	fdiv,dbl %fr20,%fr24,%fr28
-	fdiv,quad %fr20,%fr24,%fr28
-
-frem_tests
-	frem,sgl %fr4,%fr8,%fr12
-	frem,dbl %fr4,%fr8,%fr12
-	frem,quad %fr4,%fr8,%fr12
-	frem,sgl %fr20,%fr24,%fr28
-	frem,dbl %fr20,%fr24,%fr28
-	frem,quad %fr20,%fr24,%fr28
-
-fcmp_sgl_tests_1
-	fcmp,sgl,false? %fr4,%fr5
-	fcmp,sgl,false %fr4,%fr5
-	fcmp,sgl,? %fr4,%fr5
-	fcmp,sgl,!<=> %fr4,%fr5
-	fcmp,sgl,= %fr4,%fr5
-	fcmp,sgl,=T %fr4,%fr5
-	fcmp,sgl,?= %fr4,%fr5
-	fcmp,sgl,!<> %fr4,%fr5
-fcmp_sgl_tests_2
-	fcmp,sgl,!?>= %fr4,%fr5
-	fcmp,sgl,< %fr4,%fr5
-	fcmp,sgl,?< %fr4,%fr5
-	fcmp,sgl,!>= %fr4,%fr5
-	fcmp,sgl,!?> %fr4,%fr5
-	fcmp,sgl,<= %fr4,%fr5
-	fcmp,sgl,?<= %fr4,%fr5
-	fcmp,sgl,!> %fr4,%fr5
-fcmp_sgl_tests_3
-	fcmp,sgl,!?<= %fr4,%fr5
-	fcmp,sgl,> %fr4,%fr5
-	fcmp,sgl,?> %fr4,%fr5
-	fcmp,sgl,!<= %fr4,%fr5
-	fcmp,sgl,!?< %fr4,%fr5
-	fcmp,sgl,>= %fr4,%fr5
-	fcmp,sgl,?>= %fr4,%fr5
-	fcmp,sgl,!< %fr4,%fr5
-fcmp_sgl_tests_4
-	fcmp,sgl,!?= %fr4,%fr5
-	fcmp,sgl,<> %fr4,%fr5
-	fcmp,sgl,!= %fr4,%fr5
-	fcmp,sgl,!=T %fr4,%fr5
-	fcmp,sgl,!? %fr4,%fr5
-	fcmp,sgl,<=> %fr4,%fr5
-	fcmp,sgl,true? %fr4,%fr5
-	fcmp,sgl,true %fr4,%fr5
-
-fcmp_dbl_tests_1
-	fcmp,dbl,false? %fr4,%fr5
-	fcmp,dbl,false %fr4,%fr5
-	fcmp,dbl,? %fr4,%fr5
-	fcmp,dbl,!<=> %fr4,%fr5
-	fcmp,dbl,= %fr4,%fr5
-	fcmp,dbl,=T %fr4,%fr5
-	fcmp,dbl,?= %fr4,%fr5
-	fcmp,dbl,!<> %fr4,%fr5
-fcmp_dbl_tests_2
-	fcmp,dbl,!?>= %fr4,%fr5
-	fcmp,dbl,< %fr4,%fr5
-	fcmp,dbl,?< %fr4,%fr5
-	fcmp,dbl,!>= %fr4,%fr5
-	fcmp,dbl,!?> %fr4,%fr5
-	fcmp,dbl,<= %fr4,%fr5
-	fcmp,dbl,?<= %fr4,%fr5
-	fcmp,dbl,!> %fr4,%fr5
-fcmp_dbl_tests_3
-	fcmp,dbl,!?<= %fr4,%fr5
-	fcmp,dbl,> %fr4,%fr5
-	fcmp,dbl,?> %fr4,%fr5
-	fcmp,dbl,!<= %fr4,%fr5
-	fcmp,dbl,!?< %fr4,%fr5
-	fcmp,dbl,>= %fr4,%fr5
-	fcmp,dbl,?>= %fr4,%fr5
-	fcmp,dbl,!< %fr4,%fr5
-fcmp_dbl_tests_4
-	fcmp,dbl,!?= %fr4,%fr5
-	fcmp,dbl,<> %fr4,%fr5
-	fcmp,dbl,!= %fr4,%fr5
-	fcmp,dbl,!=T %fr4,%fr5
-	fcmp,dbl,!? %fr4,%fr5
-	fcmp,dbl,<=> %fr4,%fr5
-	fcmp,dbl,true? %fr4,%fr5
-	fcmp,dbl,true %fr4,%fr5
-
-fcmp_quad_tests_1
-	fcmp,quad,false? %fr4,%fr5
-	fcmp,quad,false %fr4,%fr5
-	fcmp,quad,? %fr4,%fr5
-	fcmp,quad,!<=> %fr4,%fr5
-	fcmp,quad,= %fr4,%fr5
-	fcmp,quad,=T %fr4,%fr5
-	fcmp,quad,?= %fr4,%fr5
-	fcmp,quad,!<> %fr4,%fr5
-fcmp_quad_tests_2
-	fcmp,quad,!?>= %fr4,%fr5
-	fcmp,quad,< %fr4,%fr5
-	fcmp,quad,?< %fr4,%fr5
-	fcmp,quad,!>= %fr4,%fr5
-	fcmp,quad,!?> %fr4,%fr5
-	fcmp,quad,<= %fr4,%fr5
-	fcmp,quad,?<= %fr4,%fr5
-	fcmp,quad,!> %fr4,%fr5
-fcmp_quad_tests_3
-	fcmp,quad,!?<= %fr4,%fr5
-	fcmp,quad,> %fr4,%fr5
-	fcmp,quad,?> %fr4,%fr5
-	fcmp,quad,!<= %fr4,%fr5
-	fcmp,quad,!?< %fr4,%fr5
-	fcmp,quad,>= %fr4,%fr5
-	fcmp,quad,?>= %fr4,%fr5
-	fcmp,quad,!< %fr4,%fr5
-fcmp_quad_tests_4
-	fcmp,quad,!?= %fr4,%fr5
-	fcmp,quad,<> %fr4,%fr5
-	fcmp,quad,!= %fr4,%fr5
-	fcmp,quad,!=T %fr4,%fr5
-	fcmp,quad,!? %fr4,%fr5
-	fcmp,quad,<=> %fr4,%fr5
-	fcmp,quad,true? %fr4,%fr5
-	fcmp,quad,true %fr4,%fr5
-
-fmpy_addsub_tests
-	fmpyadd,sgl %fr16,%fr17,%fr18,%fr19,%fr20
-	fmpyadd,dbl %fr16,%fr17,%fr18,%fr19,%fr20
-	fmpysub,sgl %fr16,%fr17,%fr18,%fr19,%fr20
-	fmpysub,dbl %fr16,%fr17,%fr18,%fr19,%fr20
-
-xmpyu_tests
-	xmpyu %fr4,%fr5,%fr6
-
-special_tests
-	gfw %r4(%sr0,%r5)
-	gfw,m %r4(%sr0,%r5)
-	gfr %r4(%sr0,%r5)
-	gfr,m %r4(%sr0,%r5)
-
-sfu_tests
-	spop0,4,5
-	spop0,4,115
-	spop0,4,5,n
-	spop0,4,115,n
-	spop1,4,5 5
-	spop1,4,115 5
-	spop1,4,5,n 5
-	spop1,4,115,n 5
-	spop2,4,5 5
-	spop2,4,115 5
-	spop2,4,5,n 5
-	spop2,4,115,n 5
-	spop3,4,5 5,6
-	spop3,4,115 5,6
-	spop3,4,5,n 5,6
-	spop3,4,115,n 5,6
-
-copr_tests
-	copr,4,5
-	copr,4,115
-	copr,4,5,n
-	copr,4,115,n
-
-copr_indexing_load 
-	cldwx,4 5(0,4),26
-	cldwx,4,s 5(0,4),26
-	cldwx,4,m 5(0,4),26
-	cldwx,4,sm 5(0,4),26
-	clddx,4 5(0,4),26
-	clddx,4,s 5(0,4),26
-	clddx,4,m 5(0,4),26
-	clddx,4,sm 5(0,4),26
-
-copr_indexing_store 
-	cstwx,4 26,5(0,4)
-	cstwx,4,s 26,5(0,4)
-	cstwx,4,m 26,5(0,4)
-	cstwx,4,sm 26,5(0,4)
-	cstdx,4 26,5(0,4)
-	cstdx,4,s 26,5(0,4)
-	cstdx,4,m 26,5(0,4)
-	cstdx,4,sm 26,5(0,4)
-
-copr_short_memory 
-	cldws,4 0(0,4),26
-	cldws,4,mb 0(0,4),26
-	cldws,4,ma 0(0,4),26
-	cldds,4 0(0,4),26
-	cldds,4,mb 0(0,4),26
-	cldds,4,ma 0(0,4),26
-	cstws,4 26,0(0,4)
-	cstws,4,mb 26,0(0,4)
-	cstws,4,ma 26,0(0,4)
-	cstds,4 26,0(0,4)
-	cstds,4,mb 26,0(0,4)
-	cstds,4,ma 26,0(0,4)
-
-fmemLRbug_tests_1
-	fstws	%fr6R,0(%r26)
-	fstws	%fr6L,4(%r26)
-	fstws	%fr6,8(%r26)
-	fstds	%fr6R,0(%r26)
-	fstds	%fr6L,4(%r26)
-	fstds	%fr6,8(%r26)
-	fldws	0(%r26),%fr6R
-	fldws	4(%r26),%fr6L
-	fldws	8(%r26),%fr6
-	fldds	0(%r26),%fr6R
-	fldds	4(%r26),%fr6L
-	fldds	8(%r26),%fr6
-
-fmemLRbug_tests_2
-	fstws	%fr6R,0(%sr0,%r26)
-	fstws	%fr6L,4(%sr0,%r26)
-	fstws	%fr6,8(%sr0,%r26)
-	fstds	%fr6R,0(%sr0,%r26)
-	fstds	%fr6L,4(%sr0,%r26)
-	fstds	%fr6,8(%sr0,%r26)
-	fldws	0(%sr0,%r26),%fr6R
-	fldws	4(%sr0,%r26),%fr6L
-	fldws	8(%sr0,%r26),%fr6
-	fldds	0(%sr0,%r26),%fr6R
-	fldds	4(%sr0,%r26),%fr6L
-	fldds	8(%sr0,%r26),%fr6
-
-fmemLRbug_tests_3
-	fstwx	%fr6R,%r25(%r26)
-	fstwx	%fr6L,%r25(%r26)
-	fstwx	%fr6,%r25(%r26)
-	fstdx	%fr6R,%r25(%r26)
-	fstdx	%fr6L,%r25(%r26)
-	fstdx	%fr6,%r25(%r26)
-	fldwx	%r25(%r26),%fr6R
-	fldwx	%r25(%r26),%fr6L
-	fldwx	%r25(%r26),%fr6
-	flddx	%r25(%r26),%fr6R
-	flddx	%r25(%r26),%fr6L
-	flddx	%r25(%r26),%fr6
-
-fmemLRbug_tests_4
-	fstwx	%fr6R,%r25(%sr0,%r26)
-	fstwx	%fr6L,%r25(%sr0,%r26)
-	fstwx	%fr6,%r25(%sr0,%r26)
-	fstdx	%fr6R,%r25(%sr0,%r26)
-	fstdx	%fr6L,%r25(%sr0,%r26)
-	fstdx	%fr6,%r25(%sr0,%r26)
-	fldwx	%r25(%sr0,%r26),%fr6R
-	fldwx	%r25(%sr0,%r26),%fr6L
-	fldwx	%r25(%sr0,%r26),%fr6
-	flddx	%r25(%sr0,%r26),%fr6R
-	flddx	%r25(%sr0,%r26),%fr6L
-	flddx	%r25(%sr0,%r26),%fr6
-
-	ldw 0(0,%r4),%r26
-	ldw 0(0,%r4),%r26
-	ldo 64(%r4),%r30
-	ldwm -64(0,%r30),%r4
-	bv,n 0(%r2)
-	.EXIT
-	.PROCEND
diff --git a/gdb/testsuite/gdb.disasm/mn10200.s b/gdb/testsuite/gdb.disasm/mn10200.s
deleted file mode 100644
index 32357b0401b..00000000000
--- a/gdb/testsuite/gdb.disasm/mn10200.s
+++ /dev/null
@@ -1,217 +0,0 @@
-	.text
-	.global _main
-	.global add_tests
-	.global bCC_tests
-	.global bCCx_tests
-	.global bit_tests
-	.global cmp_tests
-	.global extend_tests
-	.global logical_tests
-	.global mov_tests_1
-	.global mov_tests_2
-	.global mov_tests_3
-	.global mov_tests_4
-	.global movb_tests
-	.global movbu_tests
-	.global movx_tests
-	.global misc_tests
-	.global shift_tests
-	.global sub_tests
-
-_main:
-	nop
-
-add_tests:
-	add d1,d2
-	add d2,a3
-	add a2,d1
-	add a3,a2
-	add 16,d1
-	add 256,d2
-	add 131071,d3
-	add 16,a1
-	add 256,a2
-	add 131071,a3
-	addc d1,d2
-	addnf 16,a2
-
-bCC_tests:
-	beq bCC_tests
-	bne bCC_tests
-	bgt bCC_tests
-	bge bCC_tests
-	ble bCC_tests
-	blt bCC_tests
-	bhi bCC_tests
-	bcc bCC_tests
-	bls bCC_tests	
-	bcs bCC_tests
-	bvc bCC_tests
-	bvs bCC_tests
-	bnc bCC_tests
-	bns bCC_tests
-	bra bCC_tests
-
-bCCx_tests:
-	beqx bCCx_tests
-	bnex bCCx_tests
-	bgtx bCCx_tests
-	bgex bCCx_tests
-	blex bCCx_tests
-	bltx bCCx_tests
-	bhix bCCx_tests
-	bccx bCCx_tests
-	blsx bCCx_tests	
-	bcsx bCCx_tests
-	bvcx bCCx_tests
-	bvsx bCCx_tests
-	bncx bCCx_tests
-	bnsx bCCx_tests
-
-bit_tests:
-	btst 64,d1
-	btst 8192,d2
-	bset d1,(a2)
-	bclr d1,(a2)
-
-cmp_tests:
-	cmp d1,d2
-	cmp d2,a3
-	cmp a3,d3
-	cmp a3,a2
-	cmp 16,d3
-	cmp 256,d2
-	cmp 131071,d1
-	cmp 256,a2
-	cmp 131071,a1
-
-extend_tests:
-	ext d1
-	extx d2
-	extxu d3
-	extxb d2
-	extxbu d1
-	
-logical_tests:
-	and d1,d2
-	and 127,d2
-	and 32767,d3
-	and 32767,psw
-	or d1,d2
-	or 127,d2
-	or 32767,d3
-	or 32767,psw
-	xor d1,d2
-	xor 32767,d3
-	not d3
-
-mov_tests_1:
-	mov d1,a2
-	mov a2,d1
-	mov d1,d2
-	mov a2,a1
-	mov psw,d3
-	mov d2,psw
-	mov mdr,d1
-	mov d2,mdr
-	mov (a2),d1
-	mov (8,a2),d1
-	mov (256,a2),d1
-	mov (131071,a2),d1
-
-mov_tests_2:
-	mov (d1,a1),d2
-	mov (32768),d1
-	mov (131071),d1
-	mov (8,a2),a1
-	mov (256,a2),a1
-	mov (131071,a2),a1
-	mov (d1,a1),a2
-        mov (32768),a1
-        mov (131071),a1
-
-mov_tests_3:
-        mov d1,(a2)
-        mov d1,(32,a2)
-	mov d1,(256,a2)
-	mov d1,(131071,a2)
-	mov d1,(d2,a2)
-	mov d1,(128)
-	mov d1,(131071)
-	mov a1,(32,a2)
-	mov a1,(256,a2)
-	mov a1,(131071,a2)
-
-mov_tests_4:
-	mov a1,(d2,a2)
-	mov a1,(128)
-	mov a1,(131071)
-	mov 8,d1
-	mov 256,d1
-	mov 131071,d1
-	mov 256,a1
-	mov 131071,a1
-
-movb_tests:
-	movb (8,a2),d1
-	movb (256,a2),d1
-	movb (131071,a2),d1
-	movb (d2,a2),d3
-	movb (131071),d2
-	movb d1,(a2)
-	movb d1,(8,a2)
-	movb d1,(256,a2)
-	movb d1,(131071,a2)
-	movb d1,(d2,a2)
-	movb d1,(256)
-	movb d1,(131071)
-
-movbu_tests:
-	movbu (a2),d1
-	movbu (8,a2),d1
-	movbu (256,a2),d1
-	movbu (131071,a2),d1
-	movbu (d1,a1),d2
-	movbu (32768),d1
-	movbu (131071),d1
-
-movx_tests:
-	movx (8,a2),d1
-	movx (256,a2),d1
-	movx (131071,a2),d1
-	movx d1,(8,a2)
-	movx d1,(256,a2)
-	movx d1,(131071,a2)
-
-muldiv_tests:
-	mul d1,d2
-	mulu d2,d3
-	divu d3,d2
-
-misc_tests:
-	jmp _main
-	jmp _start
-	jmp (a2)
-	jsr _main
-	jsr _start
-	jsr (a2)
-	rts
-	rti
-	nop
-
-shift_tests:
-	asr d2
-	lsr d3
-	ror d1
-	rol d2
-
-sub_tests:
-	sub d1,d2
-	sub d2,a3
-	sub a3,d3
-	sub a3,a2
-	sub 32767,d2
-	sub 131071,d2
-	sub 32767,a2
-	sub 131071,a2
-	subc d1,d2
diff --git a/gdb/testsuite/gdb.disasm/mn10300.exp b/gdb/testsuite/gdb.disasm/mn10300.exp
deleted file mode 100644
index 0f12226205b..00000000000
--- a/gdb/testsuite/gdb.disasm/mn10300.exp
+++ /dev/null
@@ -1,569 +0,0 @@
-
-# Copyright 1997 Free Software Foundation, 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 Jeff Law. (law@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "mn10300*-*-*"] {
-    verbose "Tests ignored for all but mn10300 based targets."
-    return
-}
-
-global exec_output
-set prms_id 0
-set bug_id 0
-
-set testfile "mn10300"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc add_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/14i add_tests\n"
-    gdb_expect {
-	-re "
-.*add	d1,d2.*
-.*add	d2,a3.*
-.*add	a3,a2.*
-.*add	a2,d1.*
-.*add	16,d1.*
-.*add	256,d2.*
-.*add	131071,d3.*
-.*add	16,a1.*
-.*add	256,a2.*
-.*add	131071,a3.*
-.*add	16,sp.*
-.*add	256,sp.*
-.*add	131071,sp.*
-.*addc	d1,d2.*
-.*$gdb_prompt $" { pass "add tests" }
-	-re "$gdb_prompt $" { fail "add tests" }
-	timeout { fail "(timeout) add tests" }
-    }
-}
-
-proc bcc_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/15i bCC_tests\n"
-    gdb_expect {
-	-re "
-.*beq	0x\[0-9a-f]+ <bCC_tests>.*
-.*bne	0x\[0-9a-f]+ <bCC_tests>.*
-.*bgt	0x\[0-9a-f]+ <bCC_tests>.*
-.*bge	0x\[0-9a-f]+ <bCC_tests>.*
-.*ble	0x\[0-9a-f]+ <bCC_tests>.*
-.*blt	0x\[0-9a-f]+ <bCC_tests>.*
-.*bhi	0x\[0-9a-f]+ <bCC_tests>.*
-.*bcc	0x\[0-9a-f]+ <bCC_tests>.*
-.*bls	0x\[0-9a-f]+ <bCC_tests>.*
-.*bcs	0x\[0-9a-f]+ <bCC_tests>.*
-.*bvc	0x\[0-9a-f]+ <bCC_tests>.*
-.*bvs	0x\[0-9a-f]+ <bCC_tests>.*
-.*bnc	0x\[0-9a-f]+ <bCC_tests>.*
-.*bns	0x\[0-9a-f]+ <bCC_tests>.*
-.*bra	0x\[0-9a-f]+ <bCC_tests>.*
-.*$gdb_prompt $" { pass "bCC tests" }
-	-re "$gdb_prompt $" { fail "bCC tests" }
-	timeout { fail "(timeout) bCC tests" }
-    }
-}
-
-proc bit_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/11i bit_tests\n"
-    gdb_expect {
-	-re "
-.*btst	64,d1.*
-.*btst	8192,d2.*
-.*btst	131071,d3.*
-.*btst	64,\\(8,a1\\).*
-.*btst	64,\\(0x1ffff\\).*
-.*bset	d1,\\(a2\\).*
-.*bset	64,\\(8,a1\\).*
-.*bset	64,\\(0x1ffff\\).*
-.*bclr	d1,\\(a2\\).*
-.*bclr	64,\\(8,a1\\).*
-.*bclr	64,\\(0x1ffff\\).*
-.*$gdb_prompt $" { pass "bit tests" }
-	-re "$gdb_prompt $" { fail "bit tests" }
-	timeout { fail "(timeout) bit tests" }
-    }
-}
-
-proc cmp_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/10i cmp_tests\n"
-    gdb_expect {
-	-re "
-.*cmp	d1,d2.*
-.*cmp	d2,a3.*
-.*cmp	a3,d3.*
-.*cmp	a3,a2.*
-.*cmp	16,d3.*
-.*cmp	256,d2.*
-.*cmp	131071,d1.*
-.*cmp	16,a3.*
-.*cmp	256,a2.*
-.*cmp	131071,a1.*
-.*$gdb_prompt $" { pass "cmp tests" }
-	-re "$gdb_prompt $" { fail "cmp tests" }
-	timeout { fail "(timeout) cmp tests" }
-    }
-}
-
-proc extend_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/5i extend_tests\n"
-    gdb_expect {
-	-re "
-.*ext	d1.*
-.*extb	d2.*
-.*extbu	d3.*
-.*exth	d2.*
-.*exthu	d1.*
-.*$gdb_prompt $" { pass "extend tests" }
-	-re "$gdb_prompt $" { fail "extend tests" }
-	timeout { fail "(timeout) extend tests" }
-    }
-}
-
-proc extended_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/13i extended_tests\n"
-    gdb_expect {
-	-re "
-.*putx	d1.*
-.*getx	d2.*
-.*mulq	d1,d2.*
-.*mulq	16,d2.*
-.*mulq	256,d3.*
-.*mulq	131071,d3.*
-.*mulqu	d1,d2.*
-.*mulqu	16,d2.*
-.*mulqu	256,d3.*
-.*mulqu	131071,d3.*
-.*sat16	d2,d3.*
-.*sat24	d3,d2.*
-.*bsch	d1,d2.*
-.*$gdb_prompt $" { pass "extended tests" }
-	-re "$gdb_prompt $" { fail "extended tests" }
-	timeout { fail "(timeout) extended tests" }
-    }
-}
-
-proc logical_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/14i logical_tests\n"
-    gdb_expect {
-	-re "
-.*and	d1,d2.*
-.*and	127,d2.*
-.*and	32767,d3.*
-.*and	131071,d3.*
-.*and	32767,psw.*
-.*or	d1,d2.*
-.*or	127,d2.*
-.*or	32767,d3.*
-.*or	131071,d3.*
-.*or	32767,psw.*
-.*xor	d1,d2.*
-.*xor	32767,d3.*
-.*xor	131071,d3.*
-.*not	d3.*
-.*$gdb_prompt $" { pass "logical tests" }
-	-re "$gdb_prompt $" { fail "logical tests" }
-	timeout { fail "(timeout) logical tests" }
-    }
-}
-
-proc loop_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/12i loop_tests\n"
-    gdb_expect {
-	-re "
-.*leq.*
-.*lne.*
-.*lgt.*
-.*lge.*
-.*lle.*
-.*llt.*
-.*lhi.*
-.*lcc.*
-.*lls.*
-.*lcs.*
-.*lra.*
-.*setlb.*
-.*$gdb_prompt $" { pass "loop tests" }
-	-re "$gdb_prompt $" { fail "loop tests" }
-	timeout { fail "(timeout) loop tests" }
-    }
-}
-
-proc mov_tests_1 { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/16i mov_tests_1\n"
-    gdb_expect {
-	-re "
-.*mov	d1,d2.*
-.*mov	d1,a2.*
-.*mov	a2,d1.*
-.*mov	a2,a1.*
-.*mov	sp,a2.*
-.*mov	a1,sp.*
-.*mov	d2,psw.*
-.*mov	mdr,d1.*
-.*mov	d2,mdr.*
-.*mov	\\(a2\\),d1.*
-.*mov	\\(8,a2\\),d1.*
-.*mov	\\(256,a2\\),d1.*
-.*mov	\\(131071,a2\\),d1.*
-.*mov	\\(8,sp\\),d1.*
-.*mov	\\(256,sp\\),d1.*
-.*mov	psw,d3.*
-.*$gdb_prompt $" { pass "mov1 tests" }
-	-re "$gdb_prompt $" { fail "mov1 tests" }
-	timeout { fail "(timeout) mov1 tests" }
-    }
-}
-
-proc mov_tests_2 { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/15i mov_tests_2\n"
-    gdb_expect {
-	-re "
-.*mov	\\(131071,sp\\),d1.*
-.*mov	\\(d1,a1\\),d2.*
-.*mov	\\(0x8000.*\\),d1.*
-.*mov	\\(0x1ffff.*\\),d1.*
-.*mov	\\(a2\\),a1.*
-.*mov	\\(8,a2\\),a1.*
-.*mov	\\(256,a2\\),a1.*
-.*mov	\\(131071,a2\\),a1.*
-.*mov	\\(8,sp\\),a1.*
-.*mov	\\(256,sp\\),a1.*
-.*mov	\\(131071,sp\\),a1.*
-.*mov	\\(d1,a1\\),a2.*
-.*mov	\\(0x8000.*\\),a1.*
-.*mov	\\(0x1ffff.*\\),a1.*
-.*mov	\\(32,a1\\),sp.*
-.*$gdb_prompt $" { pass "mov2 tests" }
-	-re "$gdb_prompt $" { fail "mov2 tests" }
-	timeout { fail "(timeout) mov2 tests" }
-    }
-}
-
-proc mov_tests_3 { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/15i mov_tests_3\n"
-    gdb_expect {
-	-re "
-.*mov	d1,\\(a2\\).*
-.*mov	d1,\\(32,a2\\).*
-.*mov	d1,\\(256,a2\\).*
-.*mov	d1,\\(131071,a2\\).*
-.*mov	d1,\\(32,sp\\).*
-.*mov	d1,\\(32768,sp\\).*
-.*mov	d1,\\(131071,sp\\).*
-.*mov	d1,\\(d2,a2\\).*
-.*mov	d1,\\(0x80.*\\).*
-.*mov	d1,\\(0x1ffff.*\\).*
-.*mov	a1,\\(a2\\).*
-.*mov	a1,\\(32,a2\\).*
-.*mov	a1,\\(256,a2\\).*
-.*mov	a1,\\(131071,a2\\).*
-.*mov	a1,\\(32,sp\\).*
-.*$gdb_prompt $" { pass "mov3 tests" }
-	-re "$gdb_prompt $" { fail "mov3 tests" }
-	timeout { fail "(timeout) mov3 tests" }
-    }
-}
-
-proc mov_tests_4 { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/12i mov_tests_4\n"
-    gdb_expect {
-	-re "
-.*mov	a1,\\(32768,sp\\).*
-.*mov	a1,\\(131071,sp\\).*
-.*mov	a1,\\(d2,a2\\).*
-.*mov	a1,\\(0x80.*\\).*
-.*mov	a1,\\(0x1ffff.*\\).*
-.*mov	sp,\\(32,a1\\).*
-.*mov	8,d1.*
-.*mov	256,d1.*
-.*mov	131071,d1.*
-.*mov	8,a1.*
-.*mov	256,a1.*
-.*mov	131071,a1.*
-.*$gdb_prompt $" { pass "mov4 tests" }
-	-re "$gdb_prompt $" { fail "mov4 tests" }
-	timeout { fail "(timeout) mov4 tests" }
-    }
-}
-
-proc movbu_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/20i movbu_tests\n"
-    gdb_expect {
-	-re "
-.*movbu	\\(a2\\),d1.*
-.*movbu	\\(8,a2\\),d1.*
-.*movbu	\\(256,a2\\),d1.*
-.*movbu	\\(131071,a2\\),d1.*
-.*movbu	\\(8,sp\\),d1.*
-.*movbu	\\(256,sp\\),d1.*
-.*movbu	\\(131071,sp\\),d1.*
-.*movbu	\\(d1,a1\\),d2.*
-.*movbu	\\(0x8000.*\\),d1.*
-.*movbu	\\(0x1ffff.*\\),d1.*
-.*movbu	d1,\\(a2\\).*
-.*movbu	d1,\\(32,a2\\).*
-.*movbu	d1,\\(256,a2\\).*
-.*movbu	d1,\\(131071,a2\\).*
-.*movbu	d1,\\(32,sp\\).*
-.*movbu	d1,\\(32768,sp\\).*
-.*movbu	d1,\\(131071,sp\\).*
-.*movbu	d1,\\(d2,a2\\).*
-.*movbu	d1,\\(0x80.*\\).*
-.*movbu	d1,\\(0x1ffff.*\\).*
-.*$gdb_prompt $" { pass "movbu tests" }
-	-re "$gdb_prompt $" { fail "movbu tests" }
-	timeout { fail "(timeout) movbu tests" }
-    }
-}
-
-proc movhu_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/20i movhu_tests\n"
-    gdb_expect {
-	-re "
-.*movhu	\\(a2\\),d1.*
-.*movhu	\\(8,a2\\),d1.*
-.*movhu	\\(256,a2\\),d1.*
-.*movhu	\\(131071,a2\\),d1.*
-.*movhu	\\(8,sp\\),d1.*
-.*movhu	\\(256,sp\\),d1.*
-.*movhu	\\(131071,sp\\),d1.*
-.*movhu	\\(d1,a1\\),d2.*
-.*movhu	\\(0x8000.*\\),d1.*
-.*movhu	\\(0x1ffff.*\\),d1.*
-.*movhu	d1,\\(a2\\).*
-.*movhu	d1,\\(32,a2\\).*
-.*movhu	d1,\\(256,a2\\).*
-.*movhu	d1,\\(131071,a2\\).*
-.*movhu	d1,\\(32,sp\\).*
-.*movhu	d1,\\(32768,sp\\).*
-.*movhu	d1,\\(131071,sp\\).*
-.*movhu	d1,\\(d2,a2\\).*
-.*movhu	d1,\\(0x80.*\\).*
-.*movhu	d1,\\(0x1ffff.*\\).*
-.*$gdb_prompt $" { pass "movhu tests" }
-	-re "$gdb_prompt $" { fail "movhu tests" }
-	timeout { fail "(timeout) movhu tests" }
-    }
-}
-
-proc movm_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/4i movm_tests\n"
-    gdb_expect {
-	-re "
-.*movm	\\(sp\\),.a2,a3..*
-.*movm	\\(sp\\),.d2,d3,a2,a3,other..*
-.*movm	.a2,a3.,\\(sp\\).*
-.*movm	.d2,d3,a2,a3,other.,\\(sp\\).*
-.*$gdb_prompt $" { pass "movm tests" }
-	-re "$gdb_prompt $" { fail "movm tests" }
-	timeout { fail "(timeout) movm tests" }
-    }
-}
-
-proc muldiv_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/4i muldiv_tests\n"
-    gdb_expect {
-	-re "
-.*mul	d1,d2.*
-.*mulu	d2,d3.*
-.*div	d3,d3.*
-.*divu	d3,d2.*
-.*$gdb_prompt $" { pass "muldiv tests" }
-	-re "$gdb_prompt $" { fail "muldiv tests" }
-	timeout { fail "(timeout) muldiv tests" }
-    }
-}
-
-proc other_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/19i other_tests\n"
-    gdb_expect {
-	-re "
-.*clr	d2.*
-.*inc	d1.*
-.*inc	a2.*
-.*inc4	a3.*
-.*jmp	\\(a2\\).*
-.*jmp	0x\[0-9a-f]+ <main>.*
-.*jmp	0x\[0-9a-f]+ <start>.*
-.*call	0x\[0-9a-f]+ <main>,.a2,a3.,9.*
-.*call	0x\[0-9a-f]+ <start>,.a2,a3.,32.*
-.*calls	\\(a2\\).*
-.*calls	0x\[0-9a-f]+ <main>.*
-.*calls	0x\[0-9a-f]+ <start>.*
-.*ret	.a2,a3.,7.*
-.*retf	.a2,a3.,5.*
-.*rets.*
-.*rti.*
-.*trap.*
-.*nop.*
-.*rtm.*
-.*$gdb_prompt $" { pass "other tests" }
-	-re "$gdb_prompt $" { fail "other tests" }
-	timeout { fail "(timeout) other tests" }
-    }
-}
-
-proc shift_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/9i shift_tests\n"
-    gdb_expect {
-	-re "
-.*asr	d1,d2.*
-.*asr	4,d2.*
-.*lsr	d2,d3.*
-.*lsr	4,d3.*
-.*asl	d3,d2.*
-.*asl	4,d2.*
-.*asl2	d2.*
-.*ror	d1.*
-.*rol	d2.*
-.*$gdb_prompt $" { pass "shift tests" }
-	-re "$gdb_prompt $" { fail "shift tests" }
-	timeout { fail "(timeout) shift tests" }
-    }
-}
-
-proc sub_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/7i sub_tests\n"
-    gdb_expect {
-	-re "
-.*sub	d1,d2.*
-.*sub	d2,a3.*
-.*sub	a3,d3.*
-.*sub	a3,a2.*
-.*sub	131071,d2.*
-.*sub	131071,a1.*
-.*subc	d1,d2.*
-.*$gdb_prompt $" { pass "sub tests" }
-	-re "$gdb_prompt $" { fail "sub tests" }
-	timeout { fail "(timeout) sub tests" }
-    }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-add_tests
-bcc_tests
-bit_tests
-cmp_tests
-extend_tests
-extended_tests
-logical_tests
-loop_tests
-mov_tests_1
-mov_tests_2
-mov_tests_3
-mov_tests_4
-movbu_tests
-movhu_tests
-movm_tests
-muldiv_tests
-other_tests
-shift_tests
-sub_tests
diff --git a/gdb/testsuite/gdb.disasm/mn10300.s b/gdb/testsuite/gdb.disasm/mn10300.s
deleted file mode 100644
index 3ad6c95e6a1..00000000000
--- a/gdb/testsuite/gdb.disasm/mn10300.s
+++ /dev/null
@@ -1,300 +0,0 @@
-	.text
-	.global _main
-	.global add_tests
-	.global bCC_tests
-	.global bit_tests
-	.global cmp_tests
-	.global extend_tests
-	.global extended_tests
-	.global logical_tests
-	.global loop_tests
-	.global mov_tests_1
-	.global mov_tests_2
-	.global mov_tests_3
-	.global mov_tests_4
-	.global movbu_tests
-	.global movhu_tests
-	.global movm_tests
-	.global muldiv_tests
-	.global other_tests
-	.global shift_tests
-	.global sub_tests
-
-_main:
-	nop
-
-add_tests:
-	add d1,d2
-	add d2,a3
-	add a3,a2
-	add a2,d1
-	add 16,d1
-	add 256,d2
-	add 131071,d3
-	add 16,a1
-	add 256,a2
-	add 131071,a3
-	add 16,sp
-	add 256,sp
-	add 131071,sp
-	addc d1,d2
-
-bCC_tests:
-	beq bCC_tests
-	bne bCC_tests
-	bgt bCC_tests
-	bge bCC_tests
-	ble bCC_tests
-	blt bCC_tests
-	bhi bCC_tests
-	bcc bCC_tests
-	bls bCC_tests	
-	bcs bCC_tests
-	bvc bCC_tests
-	bvs bCC_tests
-	bnc bCC_tests
-	bns bCC_tests
-	bra bCC_tests
-
-bit_tests:
-	btst 64,d1
-	btst 8192,d2
-	btst 131071,d3
-	btst 64,(8,a1)
-	btst 64,(0x1ffff)
-	bset d1,(a2)
-	bset 64,(8,a1)
-	bset 64,(0x1ffff)
-	bclr d1,(a2)
-	bclr 64,(8,a1)
-	bclr 64,(0x1ffff)
-
-cmp_tests:
-	cmp d1,d2
-	cmp d2,a3
-	cmp a3,d3
-	cmp a3,a2
-	cmp 16,d3
-	cmp 256,d2
-	cmp 131071,d1
-	cmp 16,a3
-	cmp 256,a2
-	cmp 131071,a1
-
-	
-extend_tests:
-	ext d1
-	extb d2
-	extbu d3
-	exth d2
-	exthu d1
-
-extended_tests:
-	putx d1
-	getx d2
-	mulq d1,d2
-	mulq 16,d2
-	mulq 256,d3
-	mulq 131071,d3
-	mulqu d1,d2
-	mulqu 16,d2
-	mulqu 256,d3
-	mulqu 131071,d3
-	sat16 d2,d3
-	sat24 d3,d2
-	bsch d1,d2
-	
-logical_tests:
-	and d1,d2
-	and 127,d2
-	and 32767,d3
-	and 131071,d3
-	and 32767,psw
-	or d1,d2
-	or 127,d2
-	or 32767,d3
-	or 131071,d3
-	or 32767,psw
-	xor d1,d2
-	xor 32767,d3
-	xor 131071,d3
-	not d3
-
-loop_tests:
-	leq
-	lne
-	lgt
-	lge
-	lle
-	llt
-	lhi
-	lcc
-	lls	
-	lcs
-	lra
-	setlb
-
-mov_tests_1:
-	mov d1,d2
-	mov d1,a2
-	mov a2,d1
-	mov a2,a1
-	mov sp,a2
-	mov a1,sp
-	mov d2,psw
-	mov mdr,d1
-	mov d2,mdr
-	mov (a2),d1
-	mov (8,a2),d1
-	mov (256,a2),d1
-	mov (131071,a2),d1
-	mov (8,sp),d1
-	mov (256,sp),d1
-	mov psw,d3
-
-mov_tests_2:
-        mov (131071,sp),d1
-	mov (d1,a1),d2
-	mov (32768),d1
-	mov (131071),d1
-	mov (a2),a1
-	mov (8,a2),a1
-	mov (256,a2),a1
-	mov (131071,a2),a1
-	mov (8,sp),a1
-	mov (256,sp),a1
-	mov (131071,sp),a1
-	mov (d1,a1),a2
-        mov (32768),a1
-        mov (131071),a1
-        mov (32,a1),sp
-
-mov_tests_3:
-        mov d1,(a2)
-        mov d1,(32,a2)
-	mov d1,(256,a2)
-	mov d1,(131071,a2)
-	mov d1,(32,sp)
-	mov d1,(32768,sp)
-	mov d1,(131071,sp)
-	mov d1,(d2,a2)
-	mov d1,(128)
-	mov d1,(131071)
-	mov a1,(a2)
-	mov a1,(32,a2)
-	mov a1,(256,a2)
-	mov a1,(131071,a2)
-	mov a1,(32,sp)
-
-mov_tests_4:
-	mov a1,(32768,sp)
-	mov a1,(131071,sp)
-	mov a1,(d2,a2)
-	mov a1,(128)
-	mov a1,(131071)
-	mov sp,(32,a1)
-	mov 8,d1
-	mov 256,d1
-	mov 131071,d1
-	mov 8,a1
-	mov 256,a1
-	mov 131071,a1
-
-movbu_tests:
-	movbu (a2),d1
-	movbu (8,a2),d1
-	movbu (256,a2),d1
-	movbu (131071,a2),d1
-	movbu (8,sp),d1
-	movbu (256,sp),d1
-	movbu (131071,sp),d1
-	movbu (d1,a1),d2
-	movbu (32768),d1
-	movbu (131071),d1
-	movbu d1,(a2)
-	movbu d1,(32,a2)
-	movbu d1,(256,a2)
-	movbu d1,(131071,a2)
-	movbu d1,(32,sp)
-	movbu d1,(32768,sp)
-	movbu d1,(131071,sp)
-	movbu d1,(d2,a2)
-	movbu d1,(128)
-	movbu d1,(131071)
-
-movhu_tests:
-	movhu (a2),d1
-	movhu (8,a2),d1
-	movhu (256,a2),d1
-	movhu (131071,a2),d1
-	movhu (8,sp),d1
-	movhu (256,sp),d1
-	movhu (131071,sp),d1
-	movhu (d1,a1),d2
-	movhu (32768),d1
-	movhu (131071),d1
-	movhu d1,(a2)
-	movhu d1,(32,a2)
-	movhu d1,(256,a2)
-	movhu d1,(131071,a2)
-	movhu d1,(32,sp)
-	movhu d1,(32768,sp)
-	movhu d1,(131071,sp)
-	movhu d1,(d2,a2)
-	movhu d1,(128)
-	movhu d1,(131071)
-
-movm_tests:
-	movm (sp),[a2,a3]
-	movm (sp),[d2,d3,a2,a3,other]
-	movm [a2,a3],(sp)
-	movm [d2,d3,a2,a3,other],(sp)
-
-
-muldiv_tests:
-	mul d1,d2
-	mulu d2,d3
-	div d3,d3
-	divu d3,d2
-
-other_tests:
-	clr d2
-	inc d1
-	inc a2
-	inc4 a3
-	jmp (a2)
-	jmp _main
-	jmp _start
-	call _main,[a2,a3],9
-	call _start,[a2,a3],32
-	calls (a2)
-	calls _main
-	calls _start
-	ret [a2,a3],7
-	retf [a2,a3],5
-	rets
-	rti
-	trap
-	nop
-	rtm
-
-shift_tests:
-	asr d1,d2
-	asr 4,d2
-	lsr d2,d3
-	lsr 4,d3
-	asl d3,d2
-	asl 4,d2
-	asl2 d2
-	ror d1
-	rol d2
-
-sub_tests:
-	sub d1,d2
-	sub d2,a3
-	sub a3,d3
-	sub a3,a2
-	sub 131071,d2
-	sub 131071,a1
-	subc d1,d2
-
diff --git a/gdb/testsuite/gdb.disasm/sh3.exp b/gdb/testsuite/gdb.disasm/sh3.exp
deleted file mode 100644
index 6c82f9151fb..00000000000
--- a/gdb/testsuite/gdb.disasm/sh3.exp
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (C) 1992, 1997 Free Software Foundation, 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 Jeff Law. (law@cs.utah.edu)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "sh3*-*-*"] {
-    verbose "Tests ignored for all but sh3 based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "sh3"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-proc all_fp_move_and_load_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/9i fp_move_and_load_tests\n"
-    gdb_expect {
-	-re "
-.*fmov.s\t@r0,fr0.*
-.*fmov.s\tfr0,@r0.*
-.*fmov.s\t@r0\\+,fr0.*
-.*fmov.s\tfr0,@-r0.*
-.*fmov.s\t@\\(r0,r0\\),fr0.*
-.*fmov.s\tfr0,@\\(r0,r0\\).*
-.*fmov\tfr0,fr1.*
-.*fldi0\tfr0.*
-.*fldi1\tfr0.*
-.*$gdb_prompt $" { pass "fp_move_and_load_tests" }
-	-re "$gdb_prompt $" { fail "fp_move_and_load_tests" }
-	timeout { fail "(timeout) fp_move_and_load_tests" }
-    }
-}
-
-proc all_fp_arithmetic_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/13i fp_arithmetic_tests\n"
-    gdb_expect {
-	-re "
-.*fadd\tfr0,fr1.*
-.*fsub\tfr0,fr1.*
-.*fmul\tfr0,fr1.*
-.*fdiv\tfr0,fr1.*
-.*fmac\tfr0,fr0,fr1.*
-.*fcmp/eq\tfr0,fr1.*
-.*fcmp/gt\tfr0,fr1.*
-.*ftst/nan\tfr0.*
-.*fneg\tfr0.*
-.*fabs\tfr0.*
-.*fsqrt\tfr0.*
-.*float\tfpul,fr0.*
-.*ftrc\tfr0,fpul.*
-.*$gdb_prompt $" { pass "fp_arithmetic_tests" }
-	-re "$gdb_prompt $" { fail "fp_arithmetic_tests" }
-	timeout { fail "(timeout) fp_arithmetic_tests" }
-    }
-}
-
-proc all_fp_misc_tests { } {
-    global gdb_prompt
-    global hex
-    global decimal
-
-    send_gdb "x/10i fp_misc_tests\n"
-    gdb_expect {
-	-re "
-.*fsts\tfpul,fr0.*
-.*flds\tfr0,fpul.*
-.*lds\tr3,fpul.*
-.*lds\\.l\t@r3\\+,fpul.*
-.*lds\tr3,fpscr.*
-.*lds\\.l\t@r3\\+,fpscr.*
-.*sts\tfpul,r3.*
-.*sts\\.l\tfpul,@-r3.*
-.*sts\tfpscr,r3.*
-.*sts\\.l\tfpscr,@-r3.*
-.*$gdb_prompt $" { pass "fp_misc_tests" }
-	-re "$gdb_prompt $" { fail "fp_misc_tests" }
-	timeout { fail "(timeout) fp_misc_tests" }
-    }
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-all_fp_move_and_load_tests
-all_fp_arithmetic_tests
-all_fp_misc_tests
-
diff --git a/gdb/testsuite/gdb.disasm/sh3.s b/gdb/testsuite/gdb.disasm/sh3.s
deleted file mode 100644
index e5969f5ea1a..00000000000
--- a/gdb/testsuite/gdb.disasm/sh3.s
+++ /dev/null
@@ -1,54 +0,0 @@
-	.file	"test.c"
-	.data
-
-! Renesas SH cc1 (cygnus-2.7.1-950728) arguments: -O -fpeephole
-! -ffunction-cse -freg-struct-return -fdelayed-branch -fcommon -fgnu-linker
-
-gcc2_compiled.:
-___gnu_compiled_c:
-	.text
-	.align 2
-	.global	_fp_move_and_load_tests
-	.global	_fp_arithmetic_tests
-	.global _fp_misc_tests
-	.global _main
-
-_main:
-_fp_move_and_load_tests:
-	fmov.s	@r0,fr0
-	fmov.s	fr0,@r0
-	fmov.s	@r0+,fr0
-	fmov.s	fr0,@-r0
-	fmov.s	@(r0,r0),fr0
-	fmov.s	fr0,@(r0,r0)
-	fmov	fr0,fr1
-	fldi0	fr0
-	fldi1	fr0
-
-_fp_arithmetic_tests:
-	fadd	fr0,fr1
-	fsub	fr0,fr1
-	fmul	fr0,fr1
-	fdiv	fr0,fr1
-	fmac	fr0,fr0,fr1
-	fcmp/eq	fr0,fr1
-	fcmp/gt	fr0,fr1
-	ftst/nan	fr0
-	fneg	fr0
-	fabs	fr0
-	fsqrt	fr0
-	float	fpul,fr0
-	ftrc	fr0,fpul
-
-_fp_misc_tests:
-	fsts	fpul,fr0
-	flds	fr0,fpul
-	lds	r3,fpul
-	lds.l	@r3+,fpul
-	lds	r3,fpscr
-	lds.l	@r3+,fpscr
-	sts	fpul,r3
-	sts.l	fpul,@-r3
-	sts	fpscr,r3
-	sts.l	fpscr,@-r3
-
diff --git a/gdb/testsuite/gdb.disasm/t01_mov.exp b/gdb/testsuite/gdb.disasm/t01_mov.exp
deleted file mode 100644
index 50910e9a093..00000000000
--- a/gdb/testsuite/gdb.disasm/t01_mov.exp
+++ /dev/null
@@ -1,2088 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t01_mov"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x/i _start" "mov.b	#0x12(:8|),r3h" \
-	"mov.b	#0x12:8,r3h"
-gdb_test "x" "mov.b	#0x12(:8|),@er3" \
-	"mov.b	#0x12:8,@er3"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x1:2,er3\\)" \
-	"mov.b	#0x12:8,@(0x1:2,er3)"
-gdb_test "x" "mov.b	#0x12(:8|),@-er3" \
-	"mov.b	#0x12:8,@-er3"
-gdb_test "x" "mov.b	#0x12(:8|),@er3\\+" \
-	"mov.b	#0x12:8,@er3+"
-gdb_test "x" "mov.b	#0x12(:8|),@er3-" \
-	"mov.b	#0x12:8,@er3-"
-gdb_test "x" "mov.b	#0x12(:8|),@\\+er3" \
-	"mov.b	#0x12:8,@+er3"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x1234:16,er3\\)" \
-	"mov.b	#0x12:8,@(0x1234:16,er3)"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x12345678:32,er3\\)" \
-	"mov.b	#0x12:8,@(0x12345678:32,er3)"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x1234:16,r3l.b\\)" \
-	"mov.b	#0x12:8,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x1234:16,r3.w\\)" \
-	"mov.b	#0x12:8,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x1234:16,er3.l\\)" \
-	"mov.b	#0x12:8,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x12345678:32,r3l.b\\)" \
-	"mov.b	#0x12:8,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x12345678:32,r3.w\\)" \
-	"mov.b	#0x12:8,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.b	#0x12(:8|),@\\(0x12345678:32,er3.l\\)" \
-	"mov.b	#0x12:8,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.b	#0x12(:8|),@0x1234:16" \
-	"mov.b	#0x12:8,@0x1234:16"
-gdb_test "x" "mov.b	#0x12(:8|),@0x12345678:32" \
-	"mov.b	#0x12:8,@0x12345678:32"
-gdb_test "x" "mov.b	#0x1(:4|),@0x1234:16" \
-	"mov.b	#0x1:4,@0x1234:16"
-gdb_test "x" "mov.b	#0x1(:4|),@0x12345678:32" \
-	"mov.b	#0x1:4,@0x12345678:32"
-gdb_test "x" "mov.b	r3h,r1h" \
-	"mov.b	r3h,r1h"
-gdb_test "x" "mov.b	r3h,@er1" \
-	"mov.b	r3h,@er1"
-gdb_test "x" "mov.b	r3h,@\\(0x1:2,er1\\)" \
-	"mov.b	r3h,@(0x1:2,er1)"
-gdb_test "x" "mov.b	r3h,@-er1" \
-	"mov.b	r3h,@-er1"
-gdb_test "x" "mov.b	r3h,@er1\\+" \
-	"mov.b	r3h,@er1+"
-gdb_test "x" "mov.b	r3h,@er1-" \
-	"mov.b	r3h,@er1-"
-gdb_test "x" "mov.b	r3h,@\\+er1" \
-	"mov.b	r3h,@+er1"
-gdb_test "x" "mov.b	r3h,@\\(0x1234:16,er1\\)" \
-	"mov.b	r3h,@(0x1234:16,er1)"
-gdb_test "x" "mov.b	r3h,@\\(0x12345678:32,er1\\)" \
-	"mov.b	r3h,@(0x12345678:32,er1)"
-gdb_test "x" "mov.b	r3h,@\\(0x1234:16,r1l.b\\)" \
-	"mov.b	r3h,@(0x1234:16,r1l.b)"
-gdb_test "x" "mov.b	r3h,@\\(0x1234:16,r1.w\\)" \
-	"mov.b	r3h,@(0x1234:16,r1.w)"
-gdb_test "x" "mov.b	r3h,@\\(0x1234:16,er1.l\\)" \
-	"mov.b	r3h,@(0x1234:16,er1.l)"
-gdb_test "x" "mov.b	r3h,@\\(0x12345678:32,r1l.b\\)" \
-	"mov.b	r3h,@(0x12345678:32,r1l.b)"
-gdb_test "x" "mov.b	r3h,@\\(0x12345678:32,r1.w\\)" \
-	"mov.b	r3h,@(0x12345678:32,r1.w)"
-gdb_test "x" "mov.b	r3h,@\\(0x12345678:32,er1.l\\)" \
-	"mov.b	r3h,@(0x12345678:32,er1.l)"
-gdb_test "x" "mov.b	r3h,@0x12(:8|)" \
-	"mov.b	r3h,@0x12:8"
-gdb_test "x" "mov.b	r3h,@0x1234:16" \
-	"mov.b	r3h,@0x1234:16"
-gdb_test "x" "mov.b	r3h,@0x12345678:32" \
-	"mov.b	r3h,@0x12345678:32"
-gdb_test "x" "mov.b	@er3,r1h" \
-	"mov.b	@er3,r1h"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),r1h" \
-	"mov.b	@(0x1:2,er3),r1h"
-gdb_test "x" "mov.b	@er3\\+,r1h" \
-	"mov.b	@er3+,r1h"
-gdb_test "x" "mov.b	@-er3,r1h" \
-	"mov.b	@-er3,r1h"
-gdb_test "x" "mov.b	@\\+er3,r1h" \
-	"mov.b	@+er3,r1h"
-gdb_test "x" "mov.b	@er3-,r1h" \
-	"mov.b	@er3-,r1h"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),r1h" \
-	"mov.b	@(0x1234:16,er3),r1h"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),r1h" \
-	"mov.b	@(0x12345678:32,er3),r1h"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),r1h" \
-	"mov.b	@(0x1234:16,r3l.b),r1h"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),r1h" \
-	"mov.b	@(0x1234:16,r3.w),r1h"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),r1h" \
-	"mov.b	@(0x1234:16,er3.l),r1h"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),r1h" \
-	"mov.b	@(0x12345678:32,r3l.b),r1h"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),r1h" \
-	"mov.b	@(0x12345678:32,r3.w),r1h"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),r1h" \
-	"mov.b	@(0x12345678:32,er3.l),r1h"
-gdb_test "x" "mov.b	@0x12(:8|),r3h" \
-	"mov.b	@0x12:8,r3h"
-gdb_test "x" "mov.b	@0x1234:16,r3h" \
-	"mov.b	@0x1234:16,r3h"
-gdb_test "x" "mov.b	@0x12345678:32,r3h" \
-	"mov.b	@0x12345678:32,r3h"
-gdb_test "x" "mov.b	@er3,@er1" \
-	"mov.b	@er3,@er1"
-gdb_test "x" "mov.b	@er3,@\\(0x1:2,er1\\)" \
-	"mov.b	@er3,@(0x1:2,er1)"
-gdb_test "x" "mov.b	@er3,@er1\\+" \
-	"mov.b	@er3,@er1+"
-gdb_test "x" "mov.b	@er3,@-er1" \
-	"mov.b	@er3,@-er1"
-gdb_test "x" "mov.b	@er3,@\\+er1" \
-	"mov.b	@er3,@+er1"
-gdb_test "x" "mov.b	@er3,@er1-" \
-	"mov.b	@er3,@er1-"
-gdb_test "x" "mov.b	@er3,@\\(0x1234:16,er1\\)" \
-	"mov.b	@er3,@(0x1234:16,er1)"
-gdb_test "x" "mov.b	@er3,@\\(0x12345678:32,er1\\)" \
-	"mov.b	@er3,@(0x12345678:32,er1)"
-gdb_test "x" "mov.b	@er3,@\\(0x1234:16,r1l.b\\)" \
-	"mov.b	@er3,@(0x1234:16,r1l.b)"
-gdb_test "x" "mov.b	@er3,@\\(0x1234:16,r1.w\\)" \
-	"mov.b	@er3,@(0x1234:16,r1.w)"
-gdb_test "x" "mov.b	@er3,@\\(0x1234:16,er1.l\\)" \
-	"mov.b	@er3,@(0x1234:16,er1.l)"
-gdb_test "x" "mov.b	@er3,@\\(0x12345678:32,r1l.b\\)" \
-	"mov.b	@er3,@(0x12345678:32,r1l.b)"
-gdb_test "x" "mov.b	@er3,@\\(0x12345678:32,r1.w\\)" \
-	"mov.b	@er3,@(0x12345678:32,r1.w)"
-gdb_test "x" "mov.b	@er3,@\\(0x12345678:32,er1.l\\)" \
-	"mov.b	@er3,@(0x12345678:32,er1.l)"
-gdb_test "x" "mov.b	@er3,@0x1234:16" \
-	"mov.b	@er3,@0x1234:16"
-gdb_test "x" "mov.b	@er3,@0x12345678:32" \
-	"mov.b	@er3,@0x12345678:32"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@er1" \
-	"mov.b	@(0x1:2,er3),@er1"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x1:2,er3),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@er1\\+" \
-	"mov.b	@(0x1:2,er3),@er1+"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@-er1" \
-	"mov.b	@(0x1:2,er3),@-er1"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\+er1" \
-	"mov.b	@(0x1:2,er3),@+er1"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@er1-" \
-	"mov.b	@(0x1:2,er3),@er1-"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x1234:16,er1\\)" \
-	"mov.b	@(0x1:2,er3),@(0x1234:16,er1)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x12345678:32,er1\\)" \
-	"mov.b	@(0x1:2,er3),@(0x12345678:32,er1)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x1234:16,r1l.b\\)" \
-	"mov.b	@(0x1:2,er3),@(0x1234:16,r1l.b)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x1234:16,r1.w\\)" \
-	"mov.b	@(0x1:2,er3),@(0x1234:16,r1.w)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x1234:16,er1.l\\)" \
-	"mov.b	@(0x1:2,er3),@(0x1234:16,er1.l)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x12345678:32,r1l.b\\)" \
-	"mov.b	@(0x1:2,er3),@(0x12345678:32,r1l.b)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x12345678:32,r1.w\\)" \
-	"mov.b	@(0x1:2,er3),@(0x12345678:32,r1.w)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@\\(0x12345678:32,er1.l\\)" \
-	"mov.b	@(0x1:2,er3),@(0x12345678:32,er1.l)"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@0x1234:16" \
-	"mov.b	@(0x1:2,er3),@0x1234:16"
-gdb_test "x" "mov.b	@\\(0x1:2,er3\\),@0x12345678:32" \
-	"mov.b	@(0x1:2,er3),@0x12345678:32"
-gdb_test "x" "mov.b	@-er3,@er1" \
-	"mov.b	@-er3,@er1"
-gdb_test "x" "mov.b	@-er3,@\\(0x1:2,er1\\)" \
-	"mov.b	@-er3,@(0x1:2,er1)"
-gdb_test "x" "mov.b	@-er3,@er1\\+" \
-	"mov.b	@-er3,@er1+"
-gdb_test "x" "mov.b	@-er3,@-er1" \
-	"mov.b	@-er3,@-er1"
-gdb_test "x" "mov.b	@-er3,@\\+er1" \
-	"mov.b	@-er3,@+er1"
-gdb_test "x" "mov.b	@-er3,@er1-" \
-	"mov.b	@-er3,@er1-"
-gdb_test "x" "mov.b	@-er3,@\\(0x1234:16,er1\\)" \
-	"mov.b	@-er3,@(0x1234:16,er1)"
-gdb_test "x" "mov.b	@-er3,@\\(0x12345678:32,er1\\)" \
-	"mov.b	@-er3,@(0x12345678:32,er1)"
-gdb_test "x" "mov.b	@-er3,@\\(0x1234:16,r1l.b\\)" \
-	"mov.b	@-er3,@(0x1234:16,r1l.b)"
-gdb_test "x" "mov.b	@-er3,@\\(0x1234:16,r1.w\\)" \
-	"mov.b	@-er3,@(0x1234:16,r1.w)"
-gdb_test "x" "mov.b	@-er3,@\\(0x1234:16,er1.l\\)" \
-	"mov.b	@-er3,@(0x1234:16,er1.l)"
-gdb_test "x" "mov.b	@-er3,@\\(0x12345678:32,r1l.b\\)" \
-	"mov.b	@-er3,@(0x12345678:32,r1l.b)"
-gdb_test "x" "mov.b	@-er3,@\\(0x12345678:32,r1.w\\)" \
-	"mov.b	@-er3,@(0x12345678:32,r1.w)"
-gdb_test "x" "mov.b	@-er3,@\\(0x12345678:32,er1.l\\)" \
-	"mov.b	@-er3,@(0x12345678:32,er1.l)"
-gdb_test "x" "mov.b	@-er3,@0x1234:16" \
-	"mov.b	@-er3,@0x1234:16"
-gdb_test "x" "mov.b	@-er3,@0x12345678:32" \
-	"mov.b	@-er3,@0x12345678:32"
-gdb_test "x" "mov.b	@er3\\+,@er1" \
-	"mov.b	@er3+,@er1"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x1:2,er1\\)" \
-	"mov.b	@er3+,@(0x1:2,er1)"
-gdb_test "x" "mov.b	@er3\\+,@er1\\+" \
-	"mov.b	@er3+,@er1+"
-gdb_test "x" "mov.b	@er3\\+,@-er1" \
-	"mov.b	@er3+,@-er1"
-gdb_test "x" "mov.b	@er3\\+,@\\+er1" \
-	"mov.b	@er3+,@+er1"
-gdb_test "x" "mov.b	@er3\\+,@er1-" \
-	"mov.b	@er3+,@er1-"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x1234:16,er1\\)" \
-	"mov.b	@er3+,@(0x1234:16,er1)"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x12345678:32,er1\\)" \
-	"mov.b	@er3+,@(0x12345678:32,er1)"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x1234:16,r1l.b\\)" \
-	"mov.b	@er3+,@(0x1234:16,r1l.b)"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x1234:16,r1.w\\)" \
-	"mov.b	@er3+,@(0x1234:16,r1.w)"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x1234:16,er1.l\\)" \
-	"mov.b	@er3+,@(0x1234:16,er1.l)"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x12345678:32,r1l.b\\)" \
-	"mov.b	@er3+,@(0x12345678:32,r1l.b)"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x12345678:32,r1.w\\)" \
-	"mov.b	@er3+,@(0x12345678:32,r1.w)"
-gdb_test "x" "mov.b	@er3\\+,@\\(0x12345678:32,er1.l\\)" \
-	"mov.b	@er3+,@(0x12345678:32,er1.l)"
-gdb_test "x" "mov.b	@er3\\+,@0x1234:16" \
-	"mov.b	@er3+,@0x1234:16"
-gdb_test "x" "mov.b	@er3\\+,@0x12345678:32" \
-	"mov.b	@er3+,@0x12345678:32"
-gdb_test "x" "mov.b	@er3-,@er1" \
-	"mov.b	@er3-,@er1"
-gdb_test "x" "mov.b	@er3-,@\\(0x1:2,er1\\)" \
-	"mov.b	@er3-,@(0x1:2,er1)"
-gdb_test "x" "mov.b	@er3-,@er1\\+" \
-	"mov.b	@er3-,@er1+"
-gdb_test "x" "mov.b	@er3-,@-er1" \
-	"mov.b	@er3-,@-er1"
-gdb_test "x" "mov.b	@er3-,@\\+er1" \
-	"mov.b	@er3-,@+er1"
-gdb_test "x" "mov.b	@er3-,@er1-" \
-	"mov.b	@er3-,@er1-"
-gdb_test "x" "mov.b	@er3-,@\\(0x1234:16,er1\\)" \
-	"mov.b	@er3-,@(0x1234:16,er1)"
-gdb_test "x" "mov.b	@er3-,@\\(0x12345678:32,er1\\)" \
-	"mov.b	@er3-,@(0x12345678:32,er1)"
-gdb_test "x" "mov.b	@er3-,@\\(0x1234:16,r1l.b\\)" \
-	"mov.b	@er3-,@(0x1234:16,r1l.b)"
-gdb_test "x" "mov.b	@er3-,@\\(0x1234:16,r1.w\\)" \
-	"mov.b	@er3-,@(0x1234:16,r1.w)"
-gdb_test "x" "mov.b	@er3-,@\\(0x1234:16,er1.l\\)" \
-	"mov.b	@er3-,@(0x1234:16,er1.l)"
-gdb_test "x" "mov.b	@er3-,@\\(0x12345678:32,r1l.b\\)" \
-	"mov.b	@er3-,@(0x12345678:32,r1l.b)"
-gdb_test "x" "mov.b	@er3-,@\\(0x12345678:32,r1.w\\)" \
-	"mov.b	@er3-,@(0x12345678:32,r1.w)"
-gdb_test "x" "mov.b	@er3-,@\\(0x12345678:32,er1.l\\)" \
-	"mov.b	@er3-,@(0x12345678:32,er1.l)"
-gdb_test "x" "mov.b	@er3-,@0x1234:16" \
-	"mov.b	@er3-,@0x1234:16"
-gdb_test "x" "mov.b	@er3-,@0x12345678:32" \
-	"mov.b	@er3-,@0x12345678:32"
-gdb_test "x" "mov.b	@\\+er3,@er1" \
-	"mov.b	@+er3,@er1"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x1:2,er1\\)" \
-	"mov.b	@+er3,@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\+er3,@er1\\+" \
-	"mov.b	@+er3,@er1+"
-gdb_test "x" "mov.b	@\\+er3,@-er1" \
-	"mov.b	@+er3,@-er1"
-gdb_test "x" "mov.b	@\\+er3,@\\+er1" \
-	"mov.b	@+er3,@+er1"
-gdb_test "x" "mov.b	@\\+er3,@er1-" \
-	"mov.b	@+er3,@er1-"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x1234:16,er1\\)" \
-	"mov.b	@+er3,@(0x1234:16,er1)"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x12345678:32,er1\\)" \
-	"mov.b	@+er3,@(0x12345678:32,er1)"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x1234:16,r1l.b\\)" \
-	"mov.b	@+er3,@(0x1234:16,r1l.b)"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x1234:16,r1.w\\)" \
-	"mov.b	@+er3,@(0x1234:16,r1.w)"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x1234:16,er1.l\\)" \
-	"mov.b	@+er3,@(0x1234:16,er1.l)"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x12345678:32,r1l.b\\)" \
-	"mov.b	@+er3,@(0x12345678:32,r1l.b)"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x12345678:32,r1.w\\)" \
-	"mov.b	@+er3,@(0x12345678:32,r1.w)"
-gdb_test "x" "mov.b	@\\+er3,@\\(0x12345678:32,er1.l\\)" \
-	"mov.b	@+er3,@(0x12345678:32,er1.l)"
-gdb_test "x" "mov.b	@\\+er3,@0x1234:16" \
-	"mov.b	@+er3,@0x1234:16"
-gdb_test "x" "mov.b	@\\+er3,@0x12345678:32" \
-	"mov.b	@+er3,@0x12345678:32"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@er1" \
-	"mov.b	@(0x1234:16,er3),@er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@er1\\+" \
-	"mov.b	@(0x1234:16,er3),@er1+"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@-er1" \
-	"mov.b	@(0x1234:16,er3),@-er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\+er1" \
-	"mov.b	@(0x1234:16,er3),@+er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@er1-" \
-	"mov.b	@(0x1234:16,er3),@er1-"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x9abc(:16|),r1l.b\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x9abc:16,r1l.b)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x9abc(:16|),r1.w\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x9abc:16,r1.w)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x9abc(:16|),er1.l\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x9abc:16,er1.l)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x9abcdef0:32,r1l.b\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x9abcdef0:32,r1l.b)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x9abcdef0:32,r1.w\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x9abcdef0:32,r1.w)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@\\(0x9abcdef0:32,er1.l\\)" \
-	"mov.b	@(0x1234:16,er3),@(0x9abcdef0:32,er1.l)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@0x9abc(:16|)" \
-	"mov.b	@(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3\\),@0x9abcdef0:32" \
-	"mov.b	@(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@er1" \
-	"mov.b	@(0x12345678:32,er3),@er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@er1\\+" \
-	"mov.b	@(0x12345678:32,er3),@er1+"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@-er1" \
-	"mov.b	@(0x12345678:32,er3),@-er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\+er1" \
-	"mov.b	@(0x12345678:32,er3),@+er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@er1-" \
-	"mov.b	@(0x12345678:32,er3),@er1-"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x9abc(:16|),r1l.b\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x9abc:16,r1l.b)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x9abc(:16|),r1.w\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x9abc:16,r1.w)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x9abc(:16|),er1.l\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x9abc:16,er1.l)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x9abcdef0:32,r1l.b\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x9abcdef0:32,r1l.b)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x9abcdef0:32,r1.w\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x9abcdef0:32,r1.w)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@\\(0x9abcdef0:32,er1.l\\)" \
-	"mov.b	@(0x12345678:32,er3),@(0x9abcdef0:32,er1.l)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@0x9abc(:16|)" \
-	"mov.b	@(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3\\),@0x9abcdef0:32" \
-	"mov.b	@(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@er1" \
-	"mov.b	@(0x1234:16,r3l.b),@er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x1234:16,r3l.b),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@er1\\+" \
-	"mov.b	@(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@-er1" \
-	"mov.b	@(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@\\+er1" \
-	"mov.b	@(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@er1-" \
-	"mov.b	@(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),r1l.b\\)" \
-	"mov.b	@(0x1234:16,r3l.b),@(0x9abc:16,r1l.b)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),r1.w\\)" \
-	"mov.b	@(0x1234:16,r3l.b),@(0x9abc:16,r1.w)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),er1.l\\)" \
-	"mov.b	@(0x1234:16,r3l.b),@(0x9abc:16,er1.l)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,r1l.b\\)" \
-	"mov.b	@(0x1234:16,r3l.b),@(0x9abcdef0:32,r1l.b)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,r1.w\\)" \
-	"mov.b	@(0x1234:16,r3l.b),@(0x9abcdef0:32,r1.w)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,er1.l\\)" \
-	"mov.b	@(0x1234:16,r3l.b),@(0x9abcdef0:32,er1.l)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@0x9abc(:16|)" \
-	"mov.b	@(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3l.b\\),@0x9abcdef0:32" \
-	"mov.b	@(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@er1" \
-	"mov.b	@(0x1234:16,r3.w),@er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@er1\\+" \
-	"mov.b	@(0x1234:16,r3.w),@er1+"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@-er1" \
-	"mov.b	@(0x1234:16,r3.w),@-er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\+er1" \
-	"mov.b	@(0x1234:16,r3.w),@+er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@er1-" \
-	"mov.b	@(0x1234:16,r3.w),@er1-"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.b	@(0x1234:16,r3.w),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@0x9abc(:16|)" \
-	"mov.b	@(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "mov.b	@\\(0x1234:16,r3.w\\),@0x9abcdef0:32" \
-	"mov.b	@(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@er1" \
-	"mov.b	@(0x1234:16,er3.l),@er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@er1\\+" \
-	"mov.b	@(0x1234:16,er3.l),@er1+"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@-er1" \
-	"mov.b	@(0x1234:16,er3.l),@-er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\+er1" \
-	"mov.b	@(0x1234:16,er3.l),@+er1"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@er1-" \
-	"mov.b	@(0x1234:16,er3.l),@er1-"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.b	@(0x1234:16,er3.l),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@0x9abc(:16|)" \
-	"mov.b	@(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "mov.b	@\\(0x1234:16,er3.l\\),@0x9abcdef0:32" \
-	"mov.b	@(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@er1" \
-	"mov.b	@(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@er1\\+" \
-	"mov.b	@(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@-er1" \
-	"mov.b	@(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@\\+er1" \
-	"mov.b	@(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@er1-" \
-	"mov.b	@(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.b\t@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.b\t@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.b	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@0x9abc(:16|)" \
-	"mov.b	@(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3l.b\\),@0x9abcdef0:32" \
-	"mov.b	@(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@er1" \
-	"mov.b	@(0x12345678:32,r3.w),@er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@er1\\+" \
-	"mov.b	@(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@-er1" \
-	"mov.b	@(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\+er1" \
-	"mov.b	@(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@er1-" \
-	"mov.b	@(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.b	@(0x12345678:32,r3.w),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@0x9abc(:16|)" \
-	"mov.b	@(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "mov.b	@\\(0x12345678:32,r3.w\\),@0x9abcdef0:32" \
-	"mov.b	@(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@er1" \
-	"mov.b	@(0x12345678:32,er3.l),@er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x1:2,er1\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x1:2,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@er1\\+" \
-	"mov.b	@(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@-er1" \
-	"mov.b	@(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\+er1" \
-	"mov.b	@(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@er1-" \
-	"mov.b	@(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.b	@(0x12345678:32,er3.l),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@0x9abc(:16|)" \
-	"mov.b	@(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "mov.b	@\\(0x12345678:32,er3.l\\),@0x9abcdef0:32" \
-	"mov.b	@(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "mov.b	@0x1234:16,@er1" \
-	"mov.b	@0x1234:16,@er1"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x1:2,er1\\)" \
-	"mov.b	@0x1234:16,@(0x1:2,er1)"
-gdb_test "x" "mov.b	@0x1234:16,@er1\\+" \
-	"mov.b	@0x1234:16,@er1+"
-gdb_test "x" "mov.b	@0x1234:16,@-er1" \
-	"mov.b	@0x1234:16,@-er1"
-gdb_test "x" "mov.b	@0x1234:16,@\\+er1" \
-	"mov.b	@0x1234:16,@+er1"
-gdb_test "x" "mov.b	@0x1234:16,@er1-" \
-	"mov.b	@0x1234:16,@er1-"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.b	@0x1234:16,@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.b	@0x1234:16,@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.b	@0x1234:16,@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.b	@0x1234:16,@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.b	@0x1234:16,@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.b	@0x1234:16,@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.b	@0x1234:16,@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.b	@0x1234:16,@0x9abc(:16|)" \
-	"mov.b	@0x1234:16,@0x9abc:16"
-gdb_test "x" "mov.b	@0x1234:16,@0x9abcdef0:32" \
-	"mov.b	@0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "mov.b	@0x12345678:32,@er1" \
-	"mov.b	@0x12345678:32,@er1"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x1:2,er1\\)" \
-	"mov.b	@0x12345678:32,@(0x1:2,er1)"
-gdb_test "x" "mov.b	@0x12345678:32,@er1\\+" \
-	"mov.b	@0x12345678:32,@er1+"
-gdb_test "x" "mov.b	@0x12345678:32,@-er1" \
-	"mov.b	@0x12345678:32,@-er1"
-gdb_test "x" "mov.b	@0x12345678:32,@\\+er1" \
-	"mov.b	@0x12345678:32,@+er1"
-gdb_test "x" "mov.b	@0x12345678:32,@er1-" \
-	"mov.b	@0x12345678:32,@er1-"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x9abc(:16|),er1\\)" \
-	"mov.b	@0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x9abcdef0:32,er1\\)" \
-	"mov.b	@0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.b	@0x12345678:32,@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.b	@0x12345678:32,@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.b	@0x12345678:32,@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.b	@0x12345678:32,@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.b	@0x12345678:32,@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.b	@0x12345678:32,@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.b	@0x12345678:32,@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.b	@0x12345678:32,@0x9abc(:16|)" \
-	"mov.b	@0x12345678:32,@0x9abc:16"
-gdb_test "x" "mov.b	@0x12345678:32,@0x9abcdef0:32" \
-	"mov.b	@0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "mov.w	#0x1234(:16|),r1" \
-	"mov.w	#0x1234:16,r1"
-gdb_test "x" "mov.w	#0x1(:3|),r3" \
-	"mov.w	#0x1:3,r3"
-gdb_test "x" "mov.w	#0x1234(:16|),@er1" \
-	"mov.w	#0x1234:16,@er1"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x2:2,er1\\)" \
-	"mov.w	#0x1234:16,@(0x2:2,er1)"
-gdb_test "x" "mov.w	#0x1234(:16|),@er1\\+" \
-	"mov.w	#0x1234:16@er1+"
-gdb_test "x" "mov.w	#0x1234(:16|),@-er1" \
-	"mov.w	#0x1234:16,@-er1"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\+er1" \
-	"mov.w	#0x1234:16,@+er1"
-gdb_test "x" "mov.w	#0x1234(:16|),@er1-" \
-	"mov.w	#0x1234:16,@er1-"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x1234:16,er1\\)" \
-	"mov.w	#0x1234:16,@(0x1234:16,er1)"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x12345678:32,er1\\)" \
-	"mov.w	#0x1234:16,@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	#0x1234:16,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x1234:16,r3.w\\)" \
-	"mov.w	#0x1234:16,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x1234:16,er3.l\\)" \
-	"mov.w	#0x1234:16,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	#0x1234:16,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	#0x1234:16,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	#0x1234(:16|),@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	#0x1234:16,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	#0x1234(:16|),@0x1234:16" \
-	"mov.w	#0x1234:16,@0x1234:16"
-gdb_test "x" "mov.w	#0x1234(:16|),@0x12345678:32" \
-	"mov.w	#0x1234:16,@0x12345678:32"
-gdb_test "x" "mov.w	#0x12(:8|),@er1" \
-	"mov.w	#0x12:8,@er1"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x2:2,er1\\)" \
-	"mov.w	#0x12:8,@(0x2:2,er1)"
-gdb_test "x" "mov.w	#0x12(:8|),@er1\\+" \
-	"mov.w	#0x12:8,@er1+"
-gdb_test "x" "mov.w	#0x12(:8|),@-er1" \
-	"mov.w	#0x12:8,@-er1"
-gdb_test "x" "mov.w	#0x12(:8|),@\\+er1" \
-	"mov.w	#0x12:8,@+er1"
-gdb_test "x" "mov.w	#0x12(:8|),@er1-" \
-	"mov.w	#0x12:8,@er1-"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x1234:16,er1\\)" \
-	"mov.w	#0x12:8,@(0x1234:16,er1)"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x12345678:32,er1\\)" \
-	"mov.w	#0x12:8,@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	#0x12:8,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x1234:16,r3.w\\)" \
-	"mov.w	#0x12:8,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x1234:16,er3.l\\)" \
-	"mov.w	#0x12:8,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	#0x12:8,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	#0x12:8,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	#0x12(:8|),@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	#0x12:8,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	#0x12(:8|),@0x1234:16" \
-	"mov.w	#0x12:8,@0x1234:16"
-gdb_test "x" "mov.w	#0x12(:8|),@0x12345678:32" \
-	"mov.w	#0x12:8,@0x12345678:32"
-gdb_test "x" "mov.w	#0x1(:4|),@0x1234:16" \
-	"mov.w	#0x1:4,@0x1234:16"
-gdb_test "x" "mov.w	#0x1(:4|),@0x12345678:32" \
-	"mov.w	#0x1:4,@0x12345678:32"
-gdb_test "x" "mov.w	r2,r1" \
-	"mov.w	r2,r1"
-gdb_test "x" "mov.w	r2,@er1" \
-	"mov.w	r2,@er1"
-gdb_test "x" "mov.w	r2,@\\(0x2:2,er1\\)" \
-	"mov.w	r2,@(0x2:2,er1)"
-gdb_test "x" "mov.w	r2,@er1\\+" \
-	"mov.w	r2,@er1+"
-gdb_test "x" "mov.w	r2,@-er1" \
-	"mov.w	r2,@-er1"
-gdb_test "x" "mov.w	r2,@\\+er1" \
-	"mov.w	r2,@+er1"
-gdb_test "x" "mov.w	r2,@er1-" \
-	"mov.w	r2,@er1-"
-gdb_test "x" "mov.w	r2,@\\(0x1234:16,er1\\)" \
-	"mov.w	r2,@(0x1234:16,er1)"
-gdb_test "x" "mov.w	r2,@\\(0x12345678:32,er1\\)" \
-	"mov.w	r2,@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	r2,@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	r2,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	r2,@\\(0x1234:16,r3.w\\)" \
-	"mov.w	r2,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	r2,@\\(0x1234:16,er3.l\\)" \
-	"mov.w	r2,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	r2,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	r2,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	r2,@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	r2,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	r2,@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	r2,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	r2,@0x1234:16" \
-	"mov.w	r2,@0x1234:16"
-gdb_test "x" "mov.w	r2,@0x12345678:32" \
-	"mov.w	r2,@0x12345678:32"
-gdb_test "x" "mov.w	@er2,r1" \
-	"mov.w	@er2,r1"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),r1" \
-	"mov.w	@(0x2:2,er2),r1"
-gdb_test "x" "mov.w	@er2\\+,r1" \
-	"mov.w	@er2+,r1"
-gdb_test "x" "mov.w	@-er2,r1" \
-	"mov.w	@-er2,r1"
-gdb_test "x" "mov.w	@\\+er2,r1" \
-	"mov.w	@+er2,r1"
-gdb_test "x" "mov.w	@er2-,r1" \
-	"mov.w	@er2-,r1"
-gdb_test "x" "mov.w	@\\(0x1234:16,er1\\),r1" \
-	"mov.w	@(0x1234:16,er1),r1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er1\\),r1" \
-	"mov.w	@(0x12345678:32,er1),r1"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),r1" \
-	"mov.w	@(0x1234:16,r3l.b),r1"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),r1" \
-	"mov.w	@(0x1234:16,r3.w),r1"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),r1" \
-	"mov.w	@(0x1234:16,er3.l),r1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),r1" \
-	"mov.w	@(0x12345678:32,r3l.b),r1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),r1" \
-	"mov.w	@(0x12345678:32,r3.w),r1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),r1" \
-	"mov.w	@(0x12345678:32,er3.l),r1"
-gdb_test "x" "mov.w	@0x1234:16,r1" \
-	"mov.w	@0x1234:16,r1"
-gdb_test "x" "mov.w	@0x12345678:32,r1" \
-	"mov.w	@0x12345678:32,r1"
-gdb_test "x" "mov.w	@er2,@er1" \
-	"mov.w	@er2,@er1"
-gdb_test "x" "mov.w	@er2,@\\(0x2:2,er1\\)" \
-	"mov.w	@er2,@(0x2:2,er1)"
-gdb_test "x" "mov.w	@er2,@er1\\+" \
-	"mov.w	@er2,@er1+"
-gdb_test "x" "mov.w	@er2,@-er1" \
-	"mov.w	@er2,@-er1"
-gdb_test "x" "mov.w	@er2,@\\+er1" \
-	"mov.w	@er2,@+er1"
-gdb_test "x" "mov.w	@er2,@er1-" \
-	"mov.w	@er2,@er1-"
-gdb_test "x" "mov.w	@er2,@\\(0x1234:16,er1\\)" \
-	"mov.w	@er2,@(0x1234:16,er1)"
-gdb_test "x" "mov.w	@er2,@\\(0x12345678:32,er1\\)" \
-	"mov.w	@er2,@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	@er2,@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	@er2,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	@er2,@\\(0x1234:16,r3.w\\)" \
-	"mov.w	@er2,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	@er2,@\\(0x1234:16,er3.l\\)" \
-	"mov.w	@er2,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	@er2,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	@er2,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	@er2,@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	@er2,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	@er2,@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	@er2,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	@er2,@0x1234:16" \
-	"mov.w	@er2,@0x1234:16"
-gdb_test "x" "mov.w	@er2,@0x12345678:32" \
-	"mov.w	@er2,@0x12345678:32"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@er1" \
-	"mov.w	@(0x2:2,er2),@er1"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x2:2,er2),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@er1\\+" \
-	"mov.w	@(0x2:2,er2),@er1+"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@-er1" \
-	"mov.w	@(0x2:2,er2),@-er1"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\+er1" \
-	"mov.w	@(0x2:2,er2),@+er1"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@er1-" \
-	"mov.w	@(0x2:2,er2),@er1-"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x1234:16,er1\\)" \
-	"mov.w	@(0x2:2,er2),@(0x1234:16,er1)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x12345678:32,er1\\)" \
-	"mov.w	@(0x2:2,er2),@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	@(0x2:2,er2),@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x1234:16,r3.w\\)" \
-	"mov.w	@(0x2:2,er2),@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x1234:16,er3.l\\)" \
-	"mov.w	@(0x2:2,er2),@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	@(0x2:2,er2),@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	@(0x2:2,er2),@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	@(0x2:2,er2),@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@0x1234:16" \
-	"mov.w	@(0x2:2,er2),@0x1234:16"
-gdb_test "x" "mov.w	@\\(0x2:2,er2\\),@0x12345678:32" \
-	"mov.w	@(0x2:2,er2),@0x12345678:32"
-gdb_test "x" "mov.w	@-er2,@er1" \
-	"mov.w	@-er2,@er1"
-gdb_test "x" "mov.w	@-er2,@\\(0x2:2,er1\\)" \
-	"mov.w	@-er2,@(0x2:2,er1)"
-gdb_test "x" "mov.w	@-er2,@er1\\+" \
-	"mov.w	@-er2,@er1+"
-gdb_test "x" "mov.w	@-er2,@-er1" \
-	"mov.w	@-er2,@-er1"
-gdb_test "x" "mov.w	@-er2,@\\+er1" \
-	"mov.w	@-er2,@+er1"
-gdb_test "x" "mov.w	@-er2,@er1-" \
-	"mov.w	@-er2,@er1-"
-gdb_test "x" "mov.w	@-er2,@\\(0x1234:16,er1\\)" \
-	"mov.w	@-er2,@(0x1234:16,er1)"
-gdb_test "x" "mov.w	@-er2,@\\(0x12345678:32,er1\\)" \
-	"mov.w	@-er2,@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	@-er2,@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	@-er2,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	@-er2,@\\(0x1234:16,r3.w\\)" \
-	"mov.w	@-er2,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	@-er2,@\\(0x1234:16,er3.l\\)" \
-	"mov.w	@-er2,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	@-er2,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	@-er2,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	@-er2,@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	@-er2,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	@-er2,@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	@-er2,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	@-er2,@0x1234:16" \
-	"mov.w	@-er2,@0x1234:16"
-gdb_test "x" "mov.w	@-er2,@0x12345678:32" \
-	"mov.w	@-er2,@0x12345678:32"
-gdb_test "x" "mov.w	@er2\\+,@er1" \
-	"mov.w	@er2+,@er1"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x2:2,er1\\)" \
-	"mov.w	@er2+,@(0x2:2,er1)"
-gdb_test "x" "mov.w	@er2\\+,@er1\\+" \
-	"mov.w	@er2+,@er1+"
-gdb_test "x" "mov.w	@er2\\+,@-er1" \
-	"mov.w	@er2+,@-er1"
-gdb_test "x" "mov.w	@er2\\+,@\\+er1" \
-	"mov.w	@er2+,@+er1"
-gdb_test "x" "mov.w	@er2\\+,@er1-" \
-	"mov.w	@er2+,@er1-"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x1234:16,er1\\)" \
-	"mov.w	@er2+,@(0x1234:16,er1)"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x12345678:32,er1\\)" \
-	"mov.w	@er2+,@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	@er2+,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x1234:16,r3.w\\)" \
-	"mov.w	@er2+,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x1234:16,er3.l\\)" \
-	"mov.w	@er2+,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	@er2+,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	@er2+,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	@er2\\+,@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	@er2+,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	@er2\\+,@0x1234:16" \
-	"mov.w	@er2+,@0x1234:16"
-gdb_test "x" "mov.w	@er2\\+,@0x12345678:32" \
-	"mov.w	@er2+,@0x12345678:32"
-gdb_test "x" "mov.w	@er2-,@er1" \
-	"mov.w	@er2-,@er1"
-gdb_test "x" "mov.w	@er2-,@\\(0x2:2,er1\\)" \
-	"mov.w	@er2-,@(0x2:2,er1)"
-gdb_test "x" "mov.w	@er2-,@er1\\+" \
-	"mov.w	@er2-,@er1+"
-gdb_test "x" "mov.w	@er2-,@-er1" \
-	"mov.w	@er2-,@-er1"
-gdb_test "x" "mov.w	@er2-,@\\+er1" \
-	"mov.w	@er2-,@+er1"
-gdb_test "x" "mov.w	@er2-,@er1-" \
-	"mov.w	@er2-,@er1-"
-gdb_test "x" "mov.w	@er2-,@\\(0x1234:16,er1\\)" \
-	"mov.w	@er2-,@(0x1234:16,er1)"
-gdb_test "x" "mov.w	@er2-,@\\(0x12345678:32,er1\\)" \
-	"mov.w	@er2-,@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	@er2-,@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	@er2-,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	@er2-,@\\(0x1234:16,r3.w\\)" \
-	"mov.w	@er2-,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	@er2-,@\\(0x1234:16,er3.l\\)" \
-	"mov.w	@er2-,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	@er2-,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	@er2-,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	@er2-,@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	@er2-,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	@er2-,@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	@er2-,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	@er2-,@0x1234:16" \
-	"mov.w	@er2-,@0x1234:16"
-gdb_test "x" "mov.w	@er2-,@0x12345678:32" \
-	"mov.w	@er2-,@0x12345678:32"
-gdb_test "x" "mov.w	@\\+er2,@er1" \
-	"mov.w	@+er2,@er1"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x2:2,er1\\)" \
-	"mov.w	@+er2,@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\+er2,@er1\\+" \
-	"mov.w	@+er2,@er1+"
-gdb_test "x" "mov.w	@\\+er2,@-er1" \
-	"mov.w	@+er2,@-er1"
-gdb_test "x" "mov.w	@\\+er2,@\\+er1" \
-	"mov.w	@+er2,@+er1"
-gdb_test "x" "mov.w	@\\+er2,@er1-" \
-	"mov.w	@+er2,@er1-"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x1234:16,er1\\)" \
-	"mov.w	@+er2,@(0x1234:16,er1)"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x12345678:32,er1\\)" \
-	"mov.w	@+er2,@(0x12345678:32,er1)"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x1234:16,r3l.b\\)" \
-	"mov.w	@+er2,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x1234:16,r3.w\\)" \
-	"mov.w	@+er2,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x1234:16,er3.l\\)" \
-	"mov.w	@+er2,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.w	@+er2,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x12345678:32,r3.w\\)" \
-	"mov.w	@+er2,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.w	@\\+er2,@\\(0x12345678:32,er3.l\\)" \
-	"mov.w	@+er2,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.w	@\\+er2,@0x1234:16" \
-	"mov.w	@+er2,@0x1234:16"
-gdb_test "x" "mov.w	@\\+er2,@0x12345678:32" \
-	"mov.w	@+er2,@0x12345678:32"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@er1" \
-	"mov.w	@(0x1234:16,er2),@er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@er1\\+" \
-	"mov.w	@(0x1234:16,er2),@er1+"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@-er1" \
-	"mov.w	@(0x1234:16,er2),@-er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\+er1" \
-	"mov.w	@(0x1234:16,er2),@+er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@er1-" \
-	"mov.w	@(0x1234:16,er2),@er1-"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@(0x1234:16,er2),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@0x9abc(:16|)" \
-	"mov.w	@(0x1234:16,er2),@0x9abc:16"
-gdb_test "x" "mov.w	@\\(0x1234:16,er2\\),@0x9abcdef0:32" \
-	"mov.w	@(0x1234:16,er2),@0x9abcdef0:32"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@er1" \
-	"mov.w	@(0x12345678:32,er2),@er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@er1\\+" \
-	"mov.w	@(0x12345678:32,er2),@er1+"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@-er1" \
-	"mov.w	@(0x12345678:32,er2),@-er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\+er1" \
-	"mov.w	@(0x12345678:32,er2),@+er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@er1-" \
-	"mov.w	@(0x12345678:32,er2),@er1-"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@(0x12345678:32,er2),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@0x9abc(:16|)" \
-	"mov.w	@(0x12345678:32,er2),@0x9abc:16"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er2\\),@0x9abcdef0:32" \
-	"mov.w	@(0x12345678:32,er2),@0x9abcdef0:32"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@er1" \
-	"mov.w	@(0x1234:16,r3l.b),@er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@er1\\+" \
-	"mov.w	@(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@-er1" \
-	"mov.w	@(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\+er1" \
-	"mov.w	@(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@er1-" \
-	"mov.w	@(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@(0x1234:16,r3l.b),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@0x9abc(:16|)" \
-	"mov.w	@(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3l.b\\),@0x9abcdef0:32" \
-	"mov.w	@(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@er1" \
-	"mov.w	@(0x1234:16,r3.w),@er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@er1\\+" \
-	"mov.w	@(0x1234:16,r3.w),@er1+"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@-er1" \
-	"mov.w	@(0x1234:16,r3.w),@-er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\+er1" \
-	"mov.w	@(0x1234:16,r3.w),@+er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@er1-" \
-	"mov.w	@(0x1234:16,r3.w),@er1-"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@(0x1234:16,r3.w),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@0x9abc(:16|)" \
-	"mov.w	@(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "mov.w	@\\(0x1234:16,r3.w\\),@0x9abcdef0:32" \
-	"mov.w	@(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@er1" \
-	"mov.w	@(0x1234:16,er3.l),@er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@er1\\+" \
-	"mov.w	@(0x1234:16,er3.l),@er1+"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@-er1" \
-	"mov.w	@(0x1234:16,er3.l),@-er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\+er1" \
-	"mov.w	@(0x1234:16,er3.l),@+er1"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@er1-" \
-	"mov.w	@(0x1234:16,er3.l),@er1-"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@(0x1234:16,er3.l),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@0x9abc(:16|)" \
-	"mov.w	@(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "mov.w	@\\(0x1234:16,er3.l\\),@0x9abcdef0:32" \
-	"mov.w	@(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@er1" \
-	"mov.w	@(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@er1\\+" \
-	"mov.w	@(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@-er1" \
-	"mov.w	@(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@\\+er1" \
-	"mov.w	@(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@er1-" \
-	"mov.w	@(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w\t@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w\t@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@0x9abc(:16|)" \
-	"mov.w	@(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3l.b\\),@0x9abcdef0:32" \
-	"mov.w	@(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@er1" \
-	"mov.w	@(0x12345678:32,r3.w),@er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@er1\\+" \
-	"mov.w	@(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@-er1" \
-	"mov.w	@(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\+er1" \
-	"mov.w	@(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@er1-" \
-	"mov.w	@(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@(0x12345678:32,r3.w),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@0x9abc(:16|)" \
-	"mov.w	@(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "mov.w	@\\(0x12345678:32,r3.w\\),@0x9abcdef0:32" \
-	"mov.w	@(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@er1" \
-	"mov.w	@(0x12345678:32,er3.l),@er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x2:2,er1\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x2:2,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@er1\\+" \
-	"mov.w	@(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@-er1" \
-	"mov.w	@(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\+er1" \
-	"mov.w	@(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@er1-" \
-	"mov.w	@(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@(0x12345678:32,er3.l),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@0x9abc(:16|)" \
-	"mov.w	@(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "mov.w	@\\(0x12345678:32,er3.l\\),@0x9abcdef0:32" \
-	"mov.w	@(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "mov.w	@0x1234:16,@er1" \
-	"mov.w	@0x1234:16,@er1"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x2:2,er1\\)" \
-	"mov.w	@0x1234:16,@(0x2:2,er1)"
-gdb_test "x" "mov.w	@0x1234:16,@er1\\+" \
-	"mov.w	@0x1234:16,@er1+"
-gdb_test "x" "mov.w	@0x1234:16,@-er1" \
-	"mov.w	@0x1234:16,@-er1"
-gdb_test "x" "mov.w	@0x1234:16,@\\+er1" \
-	"mov.w	@0x1234:16,@+er1"
-gdb_test "x" "mov.w	@0x1234:16,@er1-" \
-	"mov.w	@0x1234:16,@er1-"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@0x1234:16,@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@0x1234:16,@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@0x1234:16,@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@0x1234:16,@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@0x1234:16,@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@0x1234:16,@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@0x1234:16,@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@0x1234:16,@0x9abc(:16|)" \
-	"mov.w	@0x1234:16,@0x9abc:16"
-gdb_test "x" "mov.w	@0x1234:16,@0x9abcdef0:32" \
-	"mov.w	@0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "mov.w	@0x12345678:32,@er1" \
-	"mov.w	@0x12345678:32,@er1"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x2:2,er1\\)" \
-	"mov.w	@0x12345678:32,@(0x2:2,er1)"
-gdb_test "x" "mov.w	@0x12345678:32,@er1\\+" \
-	"mov.w	@0x12345678:32,@er1+"
-gdb_test "x" "mov.w	@0x12345678:32,@-er1" \
-	"mov.w	@0x12345678:32,@-er1"
-gdb_test "x" "mov.w	@0x12345678:32,@\\+er1" \
-	"mov.w	@0x12345678:32,@+er1"
-gdb_test "x" "mov.w	@0x12345678:32,@er1-" \
-	"mov.w	@0x12345678:32,@er1-"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x9abc(:16|),er1\\)" \
-	"mov.w	@0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x9abcdef0:32,er1\\)" \
-	"mov.w	@0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.w	@0x12345678:32,@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.w	@0x12345678:32,@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.w	@0x12345678:32,@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.w	@0x12345678:32,@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.w	@0x12345678:32,@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.w	@0x12345678:32,@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.w	@0x12345678:32,@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.w	@0x12345678:32,@0x9abc(:16|)" \
-	"mov.w	@0x12345678:32,@0x9abc:16"
-gdb_test "x" "mov.w	@0x12345678:32,@0x9abcdef0:32" \
-	"mov.w	@0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "mov.l	#0x12345678(:32|),er1" \
-	"mov.l	#0x12345678:32,er1"
-gdb_test "x" "mov.l	#0x1234(:16|),er1" \
-	"mov.l	#0x1234:16,er1"
-gdb_test "x" "mov.l	#0x1(:3|),er3" \
-	"mov.l	#0x1:3,er3"
-gdb_test "x" "mov.l	#0x12345678(:32|),@er1" \
-	"mov.l	#0x12345678:32,@er1"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x4:2,er1\\)" \
-	"mov.l	#0x12345678:32,@(0x4:2,er1)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@-er1" \
-	"mov.l	#0x12345678:32,@-er1"
-gdb_test "x" "mov.l	#0x12345678(:32|),@er1\\+" \
-	"mov.l	#0x12345678:32,@er1+"
-gdb_test "x" "mov.l	#0x12345678(:32|),@er1-" \
-	"mov.l	#0x12345678:32,@er1-"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\+er1" \
-	"mov.l	#0x12345678:32,@+er1"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x1234:16,er1\\)" \
-	"mov.l	#0x12345678:32,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x12345678:32,er1\\)" \
-	"mov.l	#0x12345678:32,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	#0x12345678:32,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x1234:16,r3.w\\)" \
-	"mov.l	#0x12345678:32,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x1234:16,er3.l\\)" \
-	"mov.l	#0x12345678:32,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	#0x12345678:32,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	#0x12345678:32,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	#0x12345678:32,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	#0x12345678(:32|),@0x1234:16" \
-	"mov.l	#0x12345678:32,@0x1234:16"
-gdb_test "x" "mov.l	#0x12345678(:32|),@0x12345678:32" \
-	"mov.l	#0x12345678:32,@0x12345678:32"
-gdb_test "x" "mov.l	#0x1234(:16|),@er1" \
-	"mov.l	#0x1234:16,@er1"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x4:2,er1\\)" \
-	"mov.l	#0x1234:16,@\\(0x4:2,er1)"
-gdb_test "x" "mov.l	#0x1234(:16|),@-er1" \
-	"mov.l	#0x1234:16,@-er1"
-gdb_test "x" "mov.l	#0x1234(:16|),@er1\\+" \
-	"mov.l	#0x1234:16,@er1+"
-gdb_test "x" "mov.l	#0x1234(:16|),@er1-" \
-	"mov.l	#0x1234:16,@er1-"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\+er1" \
-	"mov.l	#0x1234:16,@+er1"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x1234:16,er1\\)" \
-	"mov.l	#0x1234:16,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x12345678:32,er1\\)" \
-	"mov.l	#0x1234:16,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	#0x1234:16,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x1234:16,r3.w\\)" \
-	"mov.l	#0x1234:16,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x1234:16,er3.l\\)" \
-	"mov.l	#0x1234:16,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	#0x1234:16,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	#0x1234:16,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	#0x1234(:16|),@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	#0x1234:16,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	#0x1234(:16|),@0x1234:16" \
-	"mov.l	#0x1234:16,@0x1234:16"
-gdb_test "x" "mov.l	#0x1234(:16|),@0x12345678:32" \
-	"mov.l	#0x1234:16,@0x12345678:32"
-gdb_test "x" "mov.l	#0x12(:8|),@er1" \
-	"mov.l	#0x12:8,@er1"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x4:2,er1\\)" \
-	"mov.l	#0x12:8,@(0x4:2,er1)"
-gdb_test "x" "mov.l	#0x12(:8|),@-er1" \
-	"mov.l	#0x12:8,@-er1"
-gdb_test "x" "mov.l	#0x12(:8|),@er1\\+" \
-	"mov.l	#0x12:8,@er1+"
-gdb_test "x" "mov.l	#0x12(:8|),@er1-" \
-	"mov.l	#0x12:8,@er1-"
-gdb_test "x" "mov.l	#0x12(:8|),@\\+er1" \
-	"mov.l	#0x12:8,@+er1"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x1234:16,er1\\)" \
-	"mov.l	#0x12:8,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x12345678:32,er1\\)" \
-	"mov.l	#0x12:8,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	#0x12:8,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x1234:16,r3.w\\)" \
-	"mov.l	#0x12:8,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x1234:16,er3.l\\)" \
-	"mov.l	#0x12:8,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	#0x12:8,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	#0x12:8,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	#0x12(:8|),@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	#0x12:8,@\\(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	#0x12(:8|),@0x1234:16" \
-	"mov.l	#0x12:8,@0x1234:16"
-gdb_test "x" "mov.l	#0x12(:8|),@0x12345678:32" \
-	"mov.l	#0x12:8,@0x12345678:32"
-gdb_test "x" "mov.l	er2,er1" \
-	"mov.l	er2,er1"
-gdb_test "x" "mov.l	er2,@er1" \
-	"mov.l	er2,@er1"
-gdb_test "x" "mov.l	er2,@\\(0x4:2,er1\\)" \
-	"mov.l	er2,@(0x4:2,er1)"
-gdb_test "x" "mov.l	er2,@-er1" \
-	"mov.l	er2,@-er1"
-gdb_test "x" "mov.l	er2,@er1\\+" \
-	"mov.l	er2,@er1+"
-gdb_test "x" "mov.l	er2,@er1-" \
-	"mov.l	er2,@er1-"
-gdb_test "x" "mov.l	er2,@\\+er1" \
-	"mov.l	er2,@+er1"
-gdb_test "x" "mov.l	er2,@\\(0x1234:16,er1\\)" \
-	"mov.l	er2,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	er2,@\\(0x12345678:32,er1\\)" \
-	"mov.l	er2,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	er2,@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	er2,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	er2,@\\(0x1234:16,r3.w\\)" \
-	"mov.l	er2,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	er2,@\\(0x1234:16,er3.l\\)" \
-	"mov.l	er2,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	er2,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	er2,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	er2,@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	er2,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	er2,@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	er2,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	er2,@0x1234:16" \
-	"mov.l	er2,@0x1234:16"
-gdb_test "x" "mov.l	er2,@0x12345678:32" \
-	"mov.l	er2,@0x12345678:32"
-gdb_test "x" "mov.l	@er2,er1" \
-	"mov.l	@er2,er1"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),er1" \
-	"mov.l	@(0x4:2,er2),er1"
-gdb_test "x" "mov.l	@er2\\+,er1" \
-	"mov.l	@er2+,er1"
-gdb_test "x" "mov.l	@-er2,er1" \
-	"mov.l	@-er2,er1"
-gdb_test "x" "mov.l	@\\+er2,er1" \
-	"mov.l	@+er2,er1"
-gdb_test "x" "mov.l	@er2-,er1" \
-	"mov.l	@er2-,er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,er1\\),er1" \
-	"mov.l	@(0x1234:16,er1),er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er1\\),er1" \
-	"mov.l	@(0x12345678:32,er1),er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),er1" \
-	"mov.l	@(0x1234:16,r3l.b),er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),er1" \
-	"mov.l	@(0x1234:16,r3.w),er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),er1" \
-	"mov.l	@(0x1234:16,er3.l),er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),er1" \
-	"mov.l	@(0x12345678:32,r3l.b),er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),er1" \
-	"mov.l	@(0x12345678:32,r3.w),er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),er1" \
-	"mov.l	@(0x12345678:32,er3.l),er1"
-gdb_test "x" "mov.l	@0x1234:16,er1" \
-	"mov.l	@0x1234:16,er1"
-gdb_test "x" "mov.l	@0x12345678:32,er1" \
-	"mov.l	@0x12345678:32,er1"
-gdb_test "x" "mov.l	@er2,@er1" \
-	"mov.l	@er2,@er1"
-gdb_test "x" "mov.l	@er2,@\\(0x4:2,er1\\)" \
-	"mov.l	@er2,@(0x4:2,er1)"
-gdb_test "x" "mov.l	@er2,@er1\\+" \
-	"mov.l	@er2,@er1+"
-gdb_test "x" "mov.l	@er2,@-er1" \
-	"mov.l	@er2,@-er1"
-gdb_test "x" "mov.l	@er2,@\\+er1" \
-	"mov.l	@er2,@+er1"
-gdb_test "x" "mov.l	@er2,@er1-" \
-	"mov.l	@er2,@er1-"
-gdb_test "x" "mov.l	@er2,@\\(0x1234:16,er1\\)" \
-	"mov.l	@er2,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	@er2,@\\(0x12345678:32,er1\\)" \
-	"mov.l	@er2,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	@er2,@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	@er2,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	@er2,@\\(0x1234:16,r3.w\\)" \
-	"mov.l	@er2,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	@er2,@\\(0x1234:16,er3.l\\)" \
-	"mov.l	@er2,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	@er2,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	@er2,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	@er2,@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	@er2,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	@er2,@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	@er2,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	@er2,@0x1234:16" \
-	"mov.l	@er2,@0x1234:16"
-gdb_test "x" "mov.l	@er2,@0x12345678:32" \
-	"mov.l	@er2,@0x12345678:32"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@er1" \
-	"mov.l	@(0x4:2,er2),@er1"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x4:2,er2),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@er1\\+" \
-	"mov.l	@(0x4:2,er2),@er1+"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@-er1" \
-	"mov.l	@(0x4:2,er2),@-er1"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\+er1" \
-	"mov.l	@(0x4:2,er2),@+er1"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@er1-" \
-	"mov.l	@(0x4:2,er2),@er1-"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x1234:16,er1\\)" \
-	"mov.l	@(0x4:2,er2),@(0x1234:16,er1)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x12345678:32,er1\\)" \
-	"mov.l	@(0x4:2,er2),@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	@(0x4:2,er2),@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x1234:16,r3.w\\)" \
-	"mov.l	@(0x4:2,er2),@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x1234:16,er3.l\\)" \
-	"mov.l	@(0x4:2,er2),@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	@(0x4:2,er2),@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	@(0x4:2,er2),@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	@(0x4:2,er2),@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@0x1234:16" \
-	"mov.l	@(0x4:2,er2),@0x1234:16"
-gdb_test "x" "mov.l	@\\(0x4:2,er2\\),@0x12345678:32" \
-	"mov.l	@(0x4:2,er2),@0x12345678:32"
-gdb_test "x" "mov.l	@-er2,@er1" \
-	"mov.l	@-er2,@er1"
-gdb_test "x" "mov.l	@-er2,@\\(0x4:2,er1\\)" \
-	"mov.l	@-er2,@(0x4:2,er1)"
-gdb_test "x" "mov.l	@-er2,@er1\\+" \
-	"mov.l	@-er2,@er1+"
-gdb_test "x" "mov.l	@-er2,@-er1" \
-	"mov.l	@-er2,@-er1"
-gdb_test "x" "mov.l	@-er2,@\\+er1" \
-	"mov.l	@-er2,@+er1"
-gdb_test "x" "mov.l	@-er2,@er1-" \
-	"mov.l	@-er2,@er1-"
-gdb_test "x" "mov.l	@-er2,@\\(0x1234:16,er1\\)" \
-	"mov.l	@-er2,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	@-er2,@\\(0x12345678:32,er1\\)" \
-	"mov.l	@-er2,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	@-er2,@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	@-er2,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	@-er2,@\\(0x1234:16,r3.w\\)" \
-	"mov.l	@-er2,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	@-er2,@\\(0x1234:16,er3.l\\)" \
-	"mov.l	@-er2,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	@-er2,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	@-er2,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	@-er2,@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	@-er2,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	@-er2,@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	@-er2,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	@-er2,@0x1234:16" \
-	"mov.l	@-er2,@0x1234:16"
-gdb_test "x" "mov.l	@-er2,@0x12345678:32" \
-	"mov.l	@-er2,@0x12345678:32"
-gdb_test "x" "mov.l	@er2\\+,@er1" \
-	"mov.l	@er2+,@er1"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x4:2,er1\\)" \
-	"mov.l	@er2+,@(0x4:2,er1)"
-gdb_test "x" "mov.l	@er2\\+,@er1\\+" \
-	"mov.l	@er2+,@er1+"
-gdb_test "x" "mov.l	@er2\\+,@-er1" \
-	"mov.l	@er2+,@-er1"
-gdb_test "x" "mov.l	@er2\\+,@\\+er1" \
-	"mov.l	@er2+,@+er1"
-gdb_test "x" "mov.l	@er2\\+,@er1-" \
-	"mov.l	@er2+,@er1-"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x1234:16,er1\\)" \
-	"mov.l	@er2+,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x12345678:32,er1\\)" \
-	"mov.l	@er2+,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	@er2+,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x1234:16,r3.w\\)" \
-	"mov.l	@er2+,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x1234:16,er3.l\\)" \
-	"mov.l	@er2+,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	@er2+,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	@er2+,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	@er2\\+,@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	@er2+,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	@er2\\+,@0x1234:16" \
-	"mov.l	@er2+,@0x1234:16"
-gdb_test "x" "mov.l	@er2\\+,@0x12345678:32" \
-	"mov.l	@er2+,@0x12345678:32"
-gdb_test "x" "mov.l	@er2-,@er1" \
-	"mov.l	@er2-,@er1"
-gdb_test "x" "mov.l	@er2-,@\\(0x4:2,er1\\)" \
-	"mov.l	@er2-,@(0x4:2,er1)"
-gdb_test "x" "mov.l	@er2-,@er1\\+" \
-	"mov.l	@er2-,@er1+"
-gdb_test "x" "mov.l	@er2-,@-er1" \
-	"mov.l	@er2-,@-er1"
-gdb_test "x" "mov.l	@er2-,@\\+er1" \
-	"mov.l	@er2-,@+er1"
-gdb_test "x" "mov.l	@er2-,@er1-" \
-	"mov.l	@er2-,@er1-"
-gdb_test "x" "mov.l	@er2-,@\\(0x1234:16,er1\\)" \
-	"mov.l	@er2-,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	@er2-,@\\(0x12345678:32,er1\\)" \
-	"mov.l	@er2-,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	@er2-,@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	@er2-,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	@er2-,@\\(0x1234:16,r3.w\\)" \
-	"mov.l	@er2-,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	@er2-,@\\(0x1234:16,er3.l\\)" \
-	"mov.l	@er2-,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	@er2-,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	@er2-,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	@er2-,@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	@er2-,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	@er2-,@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	@er2-,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	@er2-,@0x1234:16" \
-	"mov.l	@er2-,@0x1234:16"
-gdb_test "x" "mov.l	@er2-,@0x12345678:32" \
-	"mov.l	@er2-,@0x12345678:32"
-gdb_test "x" "mov.l	@\\+er2,@er1" \
-	"mov.l	@+er2,@er1"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x4:2,er1\\)" \
-	"mov.l	@+er2,@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\+er2,@er1\\+" \
-	"mov.l	@+er2,@er1+"
-gdb_test "x" "mov.l	@\\+er2,@-er1" \
-	"mov.l	@+er2,@-er1"
-gdb_test "x" "mov.l	@\\+er2,@\\+er1" \
-	"mov.l	@+er2,@+er1"
-gdb_test "x" "mov.l	@\\+er2,@er1-" \
-	"mov.l	@+er2,@er1-"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x1234:16,er1\\)" \
-	"mov.l	@+er2,@(0x1234:16,er1)"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x12345678:32,er1\\)" \
-	"mov.l	@+er2,@(0x12345678:32,er1)"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x1234:16,r3l.b\\)" \
-	"mov.l	@+er2,@(0x1234:16,r3l.b)"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x1234:16,r3.w\\)" \
-	"mov.l	@+er2,@(0x1234:16,r3.w)"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x1234:16,er3.l\\)" \
-	"mov.l	@+er2,@(0x1234:16,er3.l)"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x12345678:32,r3l.b\\)" \
-	"mov.l	@+er2,@(0x12345678:32,r3l.b)"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x12345678:32,r3.w\\)" \
-	"mov.l	@+er2,@(0x12345678:32,r3.w)"
-gdb_test "x" "mov.l	@\\+er2,@\\(0x12345678:32,er3.l\\)" \
-	"mov.l	@+er2,@(0x12345678:32,er3.l)"
-gdb_test "x" "mov.l	@\\+er2,@0x1234:16" \
-	"mov.l	@+er2,@0x1234:16"
-gdb_test "x" "mov.l	@\\+er2,@0x12345678:32" \
-	"mov.l	@+er2,@0x12345678:32"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@er1" \
-	"mov.l	@(0x1234:16,er2),@er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@er1\\+" \
-	"mov.l	@(0x1234:16,er2),@er1+"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@-er1" \
-	"mov.l	@(0x1234:16,er2),@-er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\+er1" \
-	"mov.l	@(0x1234:16,er2),@+er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@er1-" \
-	"mov.l	@(0x1234:16,er2),@er1-"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@(0x1234:16,er2),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@0x9abc(:16|)" \
-	"mov.l	@(0x1234:16,er2),@0x9abc:16"
-gdb_test "x" "mov.l	@\\(0x1234:16,er2\\),@0x9abcdef0:32" \
-	"mov.l	@(0x1234:16,er2),@0x9abcdef0:32"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@er1" \
-	"mov.l	@(0x12345678:32,er2),@er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@er1\\+" \
-	"mov.l	@(0x12345678:32,er2),@er1+"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@-er1" \
-	"mov.l	@(0x12345678:32,er2),@-er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\+er1" \
-	"mov.l	@(0x12345678:32,er2),@+er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@er1-" \
-	"mov.l	@(0x12345678:32,er2),@er1-"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@(0x12345678:32,er2),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@0x9abc(:16|)" \
-	"mov.l	@(0x12345678:32,er2),@0x9abc:16"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er2\\),@0x9abcdef0:32" \
-	"mov.l	@(0x12345678:32,er2),@0x9abcdef0:32"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@er1" \
-	"mov.l	@(0x1234:16,r3l.b),@er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@er1\\+" \
-	"mov.l	@(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@-er1" \
-	"mov.l	@(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\+er1" \
-	"mov.l	@(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@er1-" \
-	"mov.l	@(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@(0x1234:16,r3l.b),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@0x9abc(:16|)" \
-	"mov.l	@(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3l.b\\),@0x9abcdef0:32" \
-	"mov.l	@(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@er1" \
-	"mov.l	@(0x1234:16,r3.w),@er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@er1\\+" \
-	"mov.l	@(0x1234:16,r3.w),@er1+"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@-er1" \
-	"mov.l	@(0x1234:16,r3.w),@-er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\+er1" \
-	"mov.l	@(0x1234:16,r3.w),@+er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@er1-" \
-	"mov.l	@(0x1234:16,r3.w),@er1-"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@(0x1234:16,r3.w),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@0x9abc(:16|)" \
-	"mov.l	@(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "mov.l	@\\(0x1234:16,r3.w\\),@0x9abcdef0:32" \
-	"mov.l	@(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@er1" \
-	"mov.l	@(0x1234:16,er3.l),@er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@er1\\+" \
-	"mov.l	@(0x1234:16,er3.l),@er1+"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@-er1" \
-	"mov.l	@(0x1234:16,er3.l),@-er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\+er1" \
-	"mov.l	@(0x1234:16,er3.l),@+er1"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@er1-" \
-	"mov.l	@(0x1234:16,er3.l),@er1-"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x9abc16,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x9abc16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@(0x1234:16,er3.l),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@0x9abc(:16|)" \
-	"mov.l	@(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "mov.l	@\\(0x1234:16,er3.l\\),@0x9abcdef0:32" \
-	"mov.l	@(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@er1" \
-	"mov.l	@(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@er1\\+" \
-	"mov.l	@(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@-er1" \
-	"mov.l	@(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\+er1" \
-	"mov.l	@(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@er1-" \
-	"mov.l	@(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@(0x12345678:32,r3l.b),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@0x9abc(:16|)" \
-	"mov.l	@(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3l.b\\),@0x9abcdef0:32" \
-	"mov.l	@(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@er1" \
-	"mov.l	@(0x12345678:32,r3.w),@er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@er1\\+" \
-	"mov.l	@(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@-er1" \
-	"mov.l	@(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\+er1" \
-	"mov.l	@(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@er1-" \
-	"mov.l	@(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@(0x12345678:32,r3.w),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@0x9abc(:16|)" \
-	"mov.l	@(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "mov.l	@\\(0x12345678:32,r3.w\\),@0x9abcdef0:32" \
-	"mov.l	@(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@er1" \
-	"mov.l	@(0x12345678:32,er3.l),@er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\(0x4:2,er1\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x4:2,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@er1\\+" \
-	"mov.l	@(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@-er1" \
-	"mov.l	@(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\+er1" \
-	"mov.l	@(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@er1-" \
-	"mov.l	@(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l\t@\\(0x12345678:32,er3.l\\),@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@(0x12345678:32,er3.l),@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@0x9abc(:16|)" \
-	"mov.l	@(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "mov.l	@\\(0x12345678:32,er3.l\\),@0x9abcdef0:32" \
-	"mov.l	@(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "mov.l	@0x1234:16,@er1" \
-	"mov.l	@0x1234:16,@er1"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x4:2,er1\\)" \
-	"mov.l	@0x1234:16,@(0x4:2,er1)"
-gdb_test "x" "mov.l	@0x1234:16,@er1\\+" \
-	"mov.l	@0x1234:16,@er1+"
-gdb_test "x" "mov.l	@0x1234:16,@-er1" \
-	"mov.l	@0x1234:16,@-er1"
-gdb_test "x" "mov.l	@0x1234:16,@\\+er1" \
-	"mov.l	@0x1234:16,@+er1"
-gdb_test "x" "mov.l	@0x1234:16,@er1-" \
-	"mov.l	@0x1234:16,@er1-"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@0x1234:16,@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@0x1234:16,@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@0x1234:16,@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@0x1234:16,@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@0x1234:16,@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@0x1234:16,@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@0x1234:16,@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@0x1234:16,@0x9abc(:16|)" \
-	"mov.l	@0x1234:16,@0x9abc:16"
-gdb_test "x" "mov.l	@0x1234:16,@0x9abcdef0:32" \
-	"mov.l	@0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "mov.l	@0x12345678:32,@er1" \
-	"mov.l	@0x12345678:32,@er1"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x4:2,er1\\)" \
-	"mov.l	@0x12345678:32,@(0x4:2,er1)"
-gdb_test "x" "mov.l	@0x12345678:32,@er1\\+" \
-	"mov.l	@0x12345678:32,@er1+"
-gdb_test "x" "mov.l	@0x12345678:32,@-er1" \
-	"mov.l	@0x12345678:32,@-er1"
-gdb_test "x" "mov.l	@0x12345678:32,@\\+er1" \
-	"mov.l	@0x12345678:32,@+er1"
-gdb_test "x" "mov.l	@0x12345678:32,@er1-" \
-	"mov.l	@0x12345678:32,@er1-"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x9abc(:16|),er1\\)" \
-	"mov.l	@0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x9abcdef0:32,er1\\)" \
-	"mov.l	@0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x9abc(:16|),r3l.b\\)" \
-	"mov.l	@0x12345678:32,@(0x9abc:16,r3l.b)"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x9abc(:16|),r3.w\\)" \
-	"mov.l	@0x12345678:32,@(0x9abc:16,r3.w)"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x9abc(:16|),er3.l\\)" \
-	"mov.l	@0x12345678:32,@(0x9abc:16,er3.l)"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x9abcdef0:32,r3l.b\\)" \
-	"mov.l	@0x12345678:32,@(0x9abcdef0:32,r3l.b)"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x9abcdef0:32,r3.w\\)" \
-	"mov.l	@0x12345678:32,@(0x9abcdef0:32,r3.w)"
-gdb_test "x" "mov.l	@0x12345678:32,@\\(0x9abcdef0:32,er3.l\\)" \
-	"mov.l	@0x12345678:32,@(0x9abcdef0:32,er3.l)"
-gdb_test "x" "mov.l	@0x12345678:32,@0x9abc(:16|)" \
-	"mov.l	@0x12345678:32,@0x9abc:16"
-gdb_test "x" "mov.l	@0x12345678:32,@0x9abcdef0:32" \
-	"mov.l	@0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "movtpe(.b|)	r2h,@0x1234:16" \
-	"movtpe.b	r2h,@0x1234:16"
-gdb_test "x" "movfpe(.b|)	@0x1234:16,r1h" \
-	"movfpe.b	@0x1234:16,r1h"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er0-er1(\\)|)" \
-	"ldm.l	@sp+,er0-er1"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er1-er2(\\)|)" \
-	"ldm.l	@sp+,er1-er2"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er2-er3(\\)|)" \
-	"ldm.l	@sp+,er2-er3"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er3-er4(\\)|)" \
-	"ldm.l	@sp+,er3-er4"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er4-er5(\\)|)" \
-	"ldm.l	@sp+,er4-er5"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er5-er6(\\)|)" \
-	"ldm.l	@sp+,er5-er6"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er6-er7(\\)|)" \
-	"ldm.l	@sp+,er6-er7"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er0-er2(\\)|)" \
-	"ldm.l	@sp+,er0-er2"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er1-er3(\\)|)" \
-	"ldm.l	@sp+,er1-er3"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er2-er4(\\)|)" \
-	"ldm.l	@sp+,er2-er4"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er3-er5(\\)|)" \
-	"ldm.l	@sp+,er3-er5"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er4-er6(\\)|)" \
-	"ldm.l	@sp+,er4-er6"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er5-er7(\\)|)" \
-	"ldm.l	@sp+,er5-er7"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er0-er3(\\)|)" \
-	"ldm.l	@sp+,er0-er3"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er1-er4(\\)|)" \
-	"ldm.l	@sp+,er1-er4"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er2-er5(\\)|)" \
-	"ldm.l	@sp+,er2-er5"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er3-er6(\\)|)" \
-	"ldm.l	@sp+,er3-er6"
-gdb_test "x" "ldm(.l|)	@sp\\+,(\\(|)er4-er7(\\)|)" \
-	"ldm.l	@sp+,er4-er7"
-gdb_test "x" "stm(.l)	(\\(|)er0-er1(\\)|),@-sp" \
-	"stm.l	er0-er1,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er1-er2(\\)|),@-sp" \
-	"stm.l	er1-er2,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er2-er3(\\)|),@-sp" \
-	"stm.l	er2-er3,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er3-er4(\\)|),@-sp" \
-	"stm.l	er3-er4,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er4-er5(\\)|),@-sp" \
-	"stm.l	er4-er5,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er5-er6(\\)|),@-sp" \
-	"stm.l	er5-er6,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er6-er7(\\)|),@-sp" \
-	"stm.l	er6-er7,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er0-er2(\\)|),@-sp" \
-	"stm.l	er0-er2,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er1-er3(\\)|),@-sp" \
-	"stm.l	er1-er3,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er2-er4(\\)|),@-sp" \
-	"stm.l	er2-er4,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er3-er5(\\)|),@-sp" \
-	"stm.l	er3-er5,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er4-er6(\\)|),@-sp" \
-	"stm.l	er4-er6,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er5-er7(\\)|),@-sp" \
-	"stm.l	er5-er7,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er0-er3(\\)|),@-sp" \
-	"stm.l	er0-er3,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er1-er4(\\)|),@-sp" \
-	"stm.l	er1-er4,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er2-er5(\\)|),@-sp" \
-	"stm.l	er2-er5,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er3-er6(\\)|),@-sp" \
-	"stm.l	er3-er6,@-sp"
-gdb_test "x" "stm(.l)	(\\(|)er4-er7(\\)|),@-sp" \
-	"stm.l	er4-er7,@-sp"
-gdb_test "x" "eepmov.b(\t|)" \
-	"eepmov.b"
-gdb_test "x" "eepmov.w(\t|)" \
-	"eepmov.w"
-gdb_test "x" "movmd.b(\t|)" \
-	"movmd.b"
-gdb_test "x" "movmd.w(\t|)" \
-	"movmd.w"
-gdb_test "x" "movmd.l(\t|)" \
-	"movmd.l"
-gdb_test "x" "movsd.b\t\\.\\+4 \\($hex\\)" \
-	"movsd.b	.+4"
diff --git a/gdb/testsuite/gdb.disasm/t01_mov.s b/gdb/testsuite/gdb.disasm/t01_mov.s
deleted file mode 100644
index fab7fb9a0cd..00000000000
--- a/gdb/testsuite/gdb.disasm/t01_mov.s
+++ /dev/null
@@ -1,1107 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;mov

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    mov.b #0x12:8,r3h                   ;f312

-    mov.b #0x12:8,@er3                 ;017d0312

-    mov.b #0x12:8,@(0x1:2,er3)           ;017d1312

-    mov.b #0x12:8,@-er3                ;017db312

-    mov.b #0x12:8,@er3+                ;017d8312

-    mov.b #0x12:8,@er3-                ;017da312

-    mov.b #0x12:8,@+er3                ;017d9312

-    mov.b #0x12:8,@(0x1234:16,er3)          ;017dc3121234

-    mov.b #0x12:8,@(0x12345678:32,er3)          ;017dcb1212345678

-    mov.b #0x12:8,@(0x1234:16,r3l.b)        ;017dd3121234

-    mov.b #0x12:8,@(0x1234:16,r3.w)        ;017de3121234

-    mov.b #0x12:8,@(0x1234:16,er3.l)        ;017df3121234

-    mov.b #0x12:8,@(0x12345678:32,r3l.b)        ;017ddb1212345678

-    mov.b #0x12:8,@(0x12345678:32,r3.w)        ;017deb1212345678

-    mov.b #0x12:8,@(0x12345678:32,er3.l)        ;017dfb1212345678

-    mov.b #0x12:8,@0x1234:16               ;017d40121234

-    mov.b #0x12:8,@0x12345678:32               ;017d481212345678

-

-    mov.b #0x1:4,@0x1234:16               ;6ad11234

-    mov.b #0x1:4,@0x12345678:32               ;6af112345678

-

-    mov.b r3h,r1h                        ;0c31

-

-    mov.b r3h,@er1                      ;6893

-    mov.b r3h,@(0x1:2,er1)                ;01716893

-    mov.b r3h,@-er1                     ;6c93

-    mov.b r3h,@er1+                     ;01736c93

-    mov.b r3h,@er1-                     ;01716c93

-    mov.b r3h,@+er1                     ;01726c93

-    mov.b r3h,@(0x1234:16,er1)               ;6e931234

-    mov.b r3h,@(0x12345678:32,er1)               ;78106aa312345678

-    mov.b r3h,@(0x1234:16,r1l.b)             ;01716e931234

-    mov.b r3h,@(0x1234:16,r1.w)             ;01726e931234

-    mov.b r3h,@(0x1234:16,er1.l)             ;01736e931234

-    mov.b r3h,@(0x12345678:32,r1l.b)             ;78116aa312345678

-    mov.b r3h,@(0x12345678:32,r1.w)             ;78126aa312345678

-    mov.b r3h,@(0x12345678:32,er1.l)             ;78136aa312345678

-    mov.b r3h,@0xffffff12:8                     ;3312

-    mov.b r3h,@0x1234:16                    ;6a831234

-    mov.b r3h,@0x12345678:32                    ;6aa312345678

-

-    mov.b @er3,r1h                      ;6831

-    mov.b @(0x1:2,er3),r1h               ;01716831

-    mov.b @er3+,r1h                    ;6c31

-    mov.b @-er3,r1h                    ;01736c31

-    mov.b @+er3,r1h                    ;01716c31

-    mov.b @er3-,r1h                    ;01726c31

-    mov.b @(0x1234:16,er3),r1h               ;6e311234

-    mov.b @(0x12345678:32,er3),r1h               ;78306a2112345678

-    mov.b @(0x1234:16,r3l.b),r1h             ;01716e311234

-    mov.b @(0x1234:16,r3.w),r1h             ;01726e311234

-    mov.b @(0x1234:16,er3.l),r1h             ;01736e311234

-    mov.b @(0x12345678:32,r3l.b),r1h             ;78316a2112345678

-    mov.b @(0x12345678:32,r3.w),r1h             ;78326a2112345678

-    mov.b @(0x12345678:32,er3.l),r1h             ;78336a2112345678

-    mov.b @0xffffff12:8,r3h                     ;2312

-    mov.b @0x1234:16,r3h                    ;6a031234

-    mov.b @0x12345678:32,r3h                    ;6a2312345678

-

-    mov.b @er3,@er1                   ;01780301

-    mov.b @er3,@(0x1:2,er1)            ;01780311

-    mov.b @er3,@er1+                  ;01780381

-    mov.b @er3,@-er1                  ;017803b1

-    mov.b @er3,@+er1                  ;01780391

-    mov.b @er3,@er1-                  ;017803a1

-    mov.b @er3,@(0x1234:16,er1)           ;017803c11234

-    mov.b @er3,@(0x12345678:32,er1)           ;017803c912345678

-    mov.b @er3,@(0x1234:16,r1l.b)         ;017803d11234

-    mov.b @er3,@(0x1234:16,r1.w)         ;017803e11234

-    mov.b @er3,@(0x1234:16,er1.l)         ;017803f11234

-    mov.b @er3,@(0x12345678:32,r1l.b)         ;017803d912345678

-    mov.b @er3,@(0x12345678:32,r1.w)         ;017803e912345678

-    mov.b @er3,@(0x12345678:32,er1.l)         ;017803f912345678

-    mov.b @er3,@0x1234:16                 ;017803401234

-    mov.b @er3,@0x12345678:32                 ;0178034812345678

-

-    mov.b @(0x1:2,er3),@er1            ;01781301            

-    mov.b @(0x1:2,er3),@(0x1:2,er1)     ;01781311            

-    mov.b @(0x1:2,er3),@er1+           ;01781381            

-    mov.b @(0x1:2,er3),@-er1           ;017813b1            

-    mov.b @(0x1:2,er3),@+er1           ;01781391            

-    mov.b @(0x1:2,er3),@er1-           ;017813a1            

-    mov.b @(0x1:2,er3),@(0x1234:16,er1)    ;017813c11234

-    mov.b @(0x1:2,er3),@(0x12345678:32,er1)    ;017813c912345678

-    mov.b @(0x1:2,er3),@(0x1234:16,r1l.b)  ;017813d11234

-    mov.b @(0x1:2,er3),@(0x1234:16,r1.w)  ;017813e11234

-    mov.b @(0x1:2,er3),@(0x1234:16,er1.l)  ;017813f11234

-    mov.b @(0x1:2,er3),@(0x12345678:32,r1l.b)  ;017813d912345678

-    mov.b @(0x1:2,er3),@(0x12345678:32,r1.w)  ;017813e912345678

-    mov.b @(0x1:2,er3),@(0x12345678:32,er1.l)  ;017813f912345678

-    mov.b @(0x1:2,er3),@0x1234:16          ;017813401234

-    mov.b @(0x1:2,er3),@0x12345678:32          ;0178134812345678

-

-    mov.b @-er3,@er1                  ;0178b301

-    mov.b @-er3,@(0x1:2,er1)           ;0178b311            

-    mov.b @-er3,@er1+                 ;0178b381            

-    mov.b @-er3,@-er1                 ;0178b3b1            

-    mov.b @-er3,@+er1                 ;0178b391            

-    mov.b @-er3,@er1-                 ;0178b3a1            

-    mov.b @-er3,@(0x1234:16,er1)          ;0178b3c11234

-    mov.b @-er3,@(0x12345678:32,er1)          ;0178b3c912345678

-    mov.b @-er3,@(0x1234:16,r1l.b)        ;0178b3d11234

-    mov.b @-er3,@(0x1234:16,r1.w)        ;0178b3e11234

-    mov.b @-er3,@(0x1234:16,er1.l)        ;0178b3f11234

-    mov.b @-er3,@(0x12345678:32,r1l.b)        ;0178b3d912345678

-    mov.b @-er3,@(0x12345678:32,r1.w)        ;0178b3e912345678

-    mov.b @-er3,@(0x12345678:32,er1.l)        ;0178b3f912345678

-    mov.b @-er3,@0x1234:16                ;0178b3401234

-    mov.b @-er3,@0x12345678:32                ;0178b34812345678

-

-    mov.b @er3+,@er1                  ;01788301

-    mov.b @er3+,@(0x1:2,er1)           ;01788311            

-    mov.b @er3+,@er1+                 ;01788381            

-    mov.b @er3+,@-er1                 ;017883b1            

-    mov.b @er3+,@+er1                 ;01788391            

-    mov.b @er3+,@er1-                 ;017883a1            

-    mov.b @er3+,@(0x1234:16,er1)          ;017883c11234

-    mov.b @er3+,@(0x12345678:32,er1)          ;017883c912345678

-    mov.b @er3+,@(0x1234:16,r1l.b)        ;017883d11234

-    mov.b @er3+,@(0x1234:16,r1.w)        ;017883e11234

-    mov.b @er3+,@(0x1234:16,er1.l)        ;017883f11234

-    mov.b @er3+,@(0x12345678:32,r1l.b)        ;017883d912345678

-    mov.b @er3+,@(0x12345678:32,r1.w)        ;017883e912345678

-    mov.b @er3+,@(0x12345678:32,er1.l)        ;017883f912345678

-    mov.b @er3+,@0x1234:16                ;017883401234

-    mov.b @er3+,@0x12345678:32                ;0178834812345678

-

-    mov.b @er3-,@er1                  ;0178a301

-    mov.b @er3-,@(0x1:2,er1)           ;0178a311            

-    mov.b @er3-,@er1+                 ;0178a381            

-    mov.b @er3-,@-er1                 ;0178a3b1            

-    mov.b @er3-,@+er1                 ;0178a391            

-    mov.b @er3-,@er1-                 ;0178a3a1            

-    mov.b @er3-,@(0x1234:16,er1)          ;0178a3c11234

-    mov.b @er3-,@(0x12345678:32,er1)          ;0178a3c912345678

-    mov.b @er3-,@(0x1234:16,r1l.b)        ;0178a3d11234

-    mov.b @er3-,@(0x1234:16,r1.w)        ;0178a3e11234

-    mov.b @er3-,@(0x1234:16,er1.l)        ;0178a3f11234

-    mov.b @er3-,@(0x12345678:32,r1l.b)        ;0178a3d912345678

-    mov.b @er3-,@(0x12345678:32,r1.w)        ;0178a3e912345678

-    mov.b @er3-,@(0x12345678:32,er1.l)        ;0178a3f912345678

-    mov.b @er3-,@0x1234:16                ;0178a3401234

-    mov.b @er3-,@0x12345678:32                ;0178a34812345678

-

-    mov.b @+er3,@er1                  ;01789301

-    mov.b @+er3,@(0x1:2,er1)           ;01789311            

-    mov.b @+er3,@er1+                 ;01789381            

-    mov.b @+er3,@-er1                 ;017893b1            

-    mov.b @+er3,@+er1                 ;01789391            

-    mov.b @+er3,@er1-                 ;017893a1            

-    mov.b @+er3,@(0x1234:16,er1)          ;017893c11234

-    mov.b @+er3,@(0x12345678:32,er1)          ;017893c912345678

-    mov.b @+er3,@(0x1234:16,r1l.b)        ;017893d11234

-    mov.b @+er3,@(0x1234:16,r1.w)        ;017893e11234

-    mov.b @+er3,@(0x1234:16,er1.l)        ;017893f11234

-    mov.b @+er3,@(0x12345678:32,r1l.b)        ;017893d912345678

-    mov.b @+er3,@(0x12345678:32,r1.w)        ;017893e912345678

-    mov.b @+er3,@(0x12345678:32,er1.l)        ;017893f912345678

-    mov.b @+er3,@0x1234:16                ;017893401234

-    mov.b @+er3,@0x12345678:32                ;0178934812345678

-

-    mov.b @(0x1234:16,er3),@er1           ;0178c3011234

-    mov.b @(0x1234:16,er3),@(0x1:2,er1)    ;0178c3111234

-    mov.b @(0x1234:16,er3),@er1+          ;0178c3811234

-    mov.b @(0x1234:16,er3),@-er1          ;0178c3b11234

-    mov.b @(0x1234:16,er3),@+er1          ;0178c3911234

-    mov.b @(0x1234:16,er3),@er1-          ;0178c3a11234

-    mov.b @(0x1234:16,er3),@(0xffff9abc:16,er1)   ;0178c3c112349abc

-    mov.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)   ;0178c3c912349abcdef0

-    mov.b @(0x1234:16,er3),@(0xffff9abc:16,r1l.b) ;0178c3d112349abc

-    mov.b @(0x1234:16,er3),@(0xffff9abc:16,r1.w) ;0178c3e112349abc

-    mov.b @(0x1234:16,er3),@(0xffff9abc:16,er1.l) ;0178c3f112349abc

-    mov.b @(0x1234:16,er3),@(0x9abcdef0:32,r1l.b) ;0178c3d912349abcdef0

-    mov.b @(0x1234:16,er3),@(0x9abcdef0:32,r1.w) ;0178c3e912349abcdef0

-    mov.b @(0x1234:16,er3),@(0x9abcdef0:32,er1.l) ;0178c3f912349abcdef0

-    mov.b @(0x1234:16,er3),@0xffff9abc:16         ;0178c34012349abc

-    mov.b @(0x1234:16,er3),@0x9abcdef0:32         ;0178c34812349abcdef0

-

-    mov.b @(0x12345678:32,er3),@er1           ;0178cb0112345678

-    mov.b @(0x12345678:32,er3),@(0x1:2,er1)    ;0178cb1112345678

-    mov.b @(0x12345678:32,er3),@er1+          ;0178cb8112345678

-    mov.b @(0x12345678:32,er3),@-er1          ;0178cbb112345678

-    mov.b @(0x12345678:32,er3),@+er1          ;0178cb9112345678

-    mov.b @(0x12345678:32,er3),@er1-          ;0178cba112345678

-    mov.b @(0x12345678:32,er3),@(0xffff9abc:16,er1)   ;0178cbc1123456789abc

-    mov.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)   ;0178cbc9123456789abcdef0

-    mov.b @(0x12345678:32,er3),@(0xffff9abc:16,r1l.b) ;0178cbd1123456789abc

-    mov.b @(0x12345678:32,er3),@(0xffff9abc:16,r1.w) ;0178cbe1123456789abc

-    mov.b @(0x12345678:32,er3),@(0xffff9abc:16,er1.l) ;0178cbf1123456789abc

-    mov.b @(0x12345678:32,er3),@(0x9abcdef0:32,r1l.b) ;0178cbd9123456789abcdef0

-    mov.b @(0x12345678:32,er3),@(0x9abcdef0:32,r1.w) ;0178cbe9123456789abcdef0

-    mov.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1.l) ;0178cbf9123456789abcdef0

-    mov.b @(0x12345678:32,er3),@0xffff9abc:16         ;0178cb40123456789abc

-    mov.b @(0x12345678:32,er3),@0x9abcdef0:32         ;0178cb48123456789abcdef0

-

-    mov.b @(0x1234:16,r3l.b),@er1         ;0178d3011234

-    mov.b @(0x1234:16,r3l.b),@(0x1:2,er1)  ;0178d3111234

-    mov.b @(0x1234:16,r3l.b),@er1+        ;0178d3811234

-    mov.b @(0x1234:16,r3l.b),@-er1        ;0178d3b11234

-    mov.b @(0x1234:16,r3l.b),@+er1        ;0178d3911234

-    mov.b @(0x1234:16,r3l.b),@er1-        ;0178d3a11234

-    mov.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r1l.b)    ;0178d3d112349abc

-    mov.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r1.w)    ;0178d3e112349abc

-    mov.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er1.l)    ;0178d3f112349abc

-    mov.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r1l.b)    ;0178d3d912349abcdef0

-    mov.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r1.w)    ;0178d3e912349abcdef0

-    mov.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1.l)    ;0178d3f912349abcdef0

-    mov.b @(0x1234:16,r3l.b),@0xffff9abc:16            ;0178d34012349abc

-    mov.b @(0x1234:16,r3l.b),@0x9abcdef0:32            ;0178d34812349abcdef0

-

-    mov.b @(0x1234:16,r3.w),@er1              ;0178e3011234

-    mov.b @(0x1234:16,r3.w),@(0x1:2,er1)       ;0178e3111234

-    mov.b @(0x1234:16,r3.w),@er1+             ;0178e3811234

-    mov.b @(0x1234:16,r3.w),@-er1             ;0178e3b11234

-    mov.b @(0x1234:16,r3.w),@+er1             ;0178e3911234

-    mov.b @(0x1234:16,r3.w),@er1-             ;0178e3a11234

-    mov.b @(0x1234:16,r3.w),@(0xffff9abc:16,er1)      ;0178e3c112349abc

-    mov.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)      ;0178e3c912349abcdef0

-    mov.b @(0x1234:16,r3.w),@(0xffff9abc:16,r3l.b)    ;0178e3d312349abc

-    mov.b @(0x1234:16,r3.w),@(0xffff9abc:16,r3.w)    ;0178e3e312349abc

-    mov.b @(0x1234:16,r3.w),@(0xffff9abc:16,er3.l)    ;0178e3f312349abc

-    mov.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r3l.b)    ;0178e3db12349abcdef0

-    mov.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r3.w)    ;0178e3eb12349abcdef0

-    mov.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er3.l)    ;0178e3fb12349abcdef0

-    mov.b @(0x1234:16,r3.w),@0xffff9abc:16            ;0178e34012349abc

-    mov.b @(0x1234:16,r3.w),@0x9abcdef0:32            ;0178e34812349abcdef0

-

-    mov.b @(0x1234:16,er3.l),@er1              ;0178f3011234

-    mov.b @(0x1234:16,er3.l),@(0x1:2,er1)       ;0178f3111234

-    mov.b @(0x1234:16,er3.l),@er1+             ;0178f3811234

-    mov.b @(0x1234:16,er3.l),@-er1             ;0178f3b11234

-    mov.b @(0x1234:16,er3.l),@+er1             ;0178f3911234

-    mov.b @(0x1234:16,er3.l),@er1-             ;0178f3a11234

-    mov.b @(0x1234:16,er3.l),@(0xffff9abc:16,er1)      ;0178f3c112349abc

-    mov.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)      ;0178f3c912349abcdef0

-    mov.b @(0x1234:16,er3.l),@(0xffff9abc:16,r3l.b)    ;0178f3d312349abc

-    mov.b @(0x1234:16,er3.l),@(0xffff9abc:16,r3.w)    ;0178f3e312349abc

-    mov.b @(0x1234:16,er3.l),@(0xffff9abc:16,er3.l)    ;0178f3f312349abc

-    mov.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r3l.b)    ;0178f3db12349abcdef0

-    mov.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r3.w)    ;0178f3eb12349abcdef0

-    mov.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er3.l)    ;0178f3fb12349abcdef0

-    mov.b @(0x1234:16,er3.l),@0xffff9abc:16            ;0178f34012349abc

-    mov.b @(0x1234:16,er3.l),@0x9abcdef0:32            ;0178f34812349abcdef0

-

-    mov.b @(0x12345678:32,r3l.b),@er1              ;0178db0112345678

-    mov.b @(0x12345678:32,r3l.b),@(0x1:2,er1)       ;0178db1112345678

-    mov.b @(0x12345678:32,r3l.b),@er1+             ;0178db8112345678

-    mov.b @(0x12345678:32,r3l.b),@-er1             ;0178dbb112345678

-    mov.b @(0x12345678:32,r3l.b),@+er1             ;0178db9112345678

-    mov.b @(0x12345678:32,r3l.b),@er1-             ;0178dba112345678

-    mov.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)      ;0178dbc1123456789abc

-    mov.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)      ;0178dbc9123456789abcdef0

-    mov.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r3l.b)    ;0178dbd3123456789abc

-    mov.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r3.w)    ;0178dbe3123456789abc

-    mov.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er3.l)    ;0178dbf3123456789abc

-    mov.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3l.b)    ;0178dbdb123456789abcdef0

-    mov.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3.w)    ;0178dbeb123456789abcdef0

-    mov.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er3.l)    ;0178dbfb123456789abcdef0

-    mov.b @(0x12345678:32,r3l.b),@0xffff9abc:16            ;0178db40123456789abc

-    mov.b @(0x12345678:32,r3l.b),@0x9abcdef0:32            ;0178db48123456789abcdef0

-

-    mov.b @(0x12345678:32,r3.w),@er1              ;0178eb0112345678

-    mov.b @(0x12345678:32,r3.w),@(0x1:2,er1)       ;0178eb1112345678

-    mov.b @(0x12345678:32,r3.w),@er1+             ;0178eb8112345678

-    mov.b @(0x12345678:32,r3.w),@-er1             ;0178ebb112345678

-    mov.b @(0x12345678:32,r3.w),@+er1             ;0178eb9112345678

-    mov.b @(0x12345678:32,r3.w),@er1-             ;0178eba112345678

-    mov.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)      ;0178ebc1123456789abc

-    mov.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)      ;0178ebc9123456789abcdef0

-    mov.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r3l.b)    ;0178ebd3123456789abc

-    mov.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r3.w)    ;0178ebe3123456789abc

-    mov.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er3.l)    ;0178ebf3123456789abc

-    mov.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r3l.b)    ;0178ebdb123456789abcdef0

-    mov.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r3.w)    ;0178ebeb123456789abcdef0

-    mov.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er3.l)    ;0178ebfb123456789abcdef0

-    mov.b @(0x12345678:32,r3.w),@0xffff9abc:16            ;0178eb40123456789abc

-    mov.b @(0x12345678:32,r3.w),@0x9abcdef0:32            ;0178eb48123456789abcdef0

-

-    mov.b @(0x12345678:32,er3.l),@er1              ;0178fb0112345678

-    mov.b @(0x12345678:32,er3.l),@(0x1:2,er1)       ;0178fb1112345678

-    mov.b @(0x12345678:32,er3.l),@er1+             ;0178fb8112345678

-    mov.b @(0x12345678:32,er3.l),@-er1             ;0178fbb112345678

-    mov.b @(0x12345678:32,er3.l),@+er1             ;0178fb9112345678

-    mov.b @(0x12345678:32,er3.l),@er1-             ;0178fba112345678

-    mov.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)      ;0178fbc1123456789abc

-    mov.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)      ;0178fbc9123456789abcdef0

-    mov.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r3l.b)    ;0178fbd3123456789abc

-    mov.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r3.w)    ;0178fbe3123456789abc

-    mov.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er3.l)    ;0178fbf3123456789abc

-    mov.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r3l.b)    ;0178fbdb123456789abcdef0

-    mov.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r3.w)    ;0178fbeb123456789abcdef0

-    mov.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er3.l)    ;0178fbfb123456789abcdef0

-    mov.b @(0x12345678:32,er3.l),@0xffff9abc:16            ;0178fb40123456789abc

-    mov.b @(0x12345678:32,er3.l),@0x9abcdef0:32            ;0178fb48123456789abcdef0

-

-    mov.b @0x1234:16,@er1                      ;017840011234

-    mov.b @0x1234:16,@(0x1:2,er1)               ;017840111234

-    mov.b @0x1234:16,@er1+                     ;017840811234

-    mov.b @0x1234:16,@-er1                     ;017840b11234

-    mov.b @0x1234:16,@+er1                     ;017840911234

-    mov.b @0x1234:16,@er1-                     ;017840a11234

-    mov.b @0x1234:16,@(0xffff9abc:16,er1)              ;017840c112349abc

-    mov.b @0x1234:16,@(0x9abcdef0:32,er1)              ;017840c912349abcdef0

-    mov.b @0x1234:16,@(0xffff9abc:16,r3l.b)            ;017840d312349abc

-    mov.b @0x1234:16,@(0xffff9abc:16,r3.w)            ;017840e312349abc

-    mov.b @0x1234:16,@(0xffff9abc:16,er3.l)            ;017840f312349abc

-    mov.b @0x1234:16,@(0x9abcdef0:32,r3l.b)            ;017840db12349abcdef0

-    mov.b @0x1234:16,@(0x9abcdef0:32,r3.w)            ;017840eb12349abcdef0

-    mov.b @0x1234:16,@(0x9abcdef0:32,er3.l)            ;017840fb12349abcdef0

-    mov.b @0x1234:16,@0xffff9abc:16                    ;0178404012349abc

-    mov.b @0x1234:16,@0x9abcdef0:32                    ;0178404812349abcdef0

-

-    mov.b @0x12345678:32,@er1                      ;0178480112345678

-    mov.b @0x12345678:32,@(0x1:2,er1)               ;0178481112345678

-    mov.b @0x12345678:32,@er1+                     ;0178488112345678

-    mov.b @0x12345678:32,@-er1                     ;017848b112345678

-    mov.b @0x12345678:32,@+er1                     ;0178489112345678

-    mov.b @0x12345678:32,@er1-                     ;017848a112345678

-    mov.b @0x12345678:32,@(0xffff9abc:16,er1)              ;017848c1123456789abc

-    mov.b @0x12345678:32,@(0x9abcdef0:32,er1)              ;017848c9123456789abcdef0

-    mov.b @0x12345678:32,@(0xffff9abc:16,r3l.b)            ;017848d3123456789abc

-    mov.b @0x12345678:32,@(0xffff9abc:16,r3.w)            ;017848e3123456789abc

-    mov.b @0x12345678:32,@(0xffff9abc:16,er3.l)            ;017848f3123456789abc

-    mov.b @0x12345678:32,@(0x9abcdef0:32,r3l.b)            ;017848db123456789abcdef0

-    mov.b @0x12345678:32,@(0x9abcdef0:32,r3.w)            ;017848eb123456789abcdef0

-    mov.b @0x12345678:32,@(0x9abcdef0:32,er3.l)            ;017848fb123456789abcdef0

-    mov.b @0x12345678:32,@0xffff9abc:16                    ;01784840123456789abc

-    mov.b @0x12345678:32,@0x9abcdef0:32                    ;01784848123456789abcdef0

-

-    mov.w #0x1234:16,r1                        ;79011234

-    mov.w #0x1:3,r3                         ;0f13

-    mov.w #0x1234:16,@er1                      ;797412340100

-    mov.w #0x1234:16,@(0x2:2,er1)            ;797412341100

-    mov.w #0x1234:16,@er1+                     ;797412348100

-    mov.w #0x1234:16,@-er1                     ;79741234b100

-    mov.w #0x1234:16,@+er1                     ;797412349100

-    mov.w #0x1234:16,@er1-                     ;79741234a100

-    mov.w #0x1234:16,@(0x1234:16,er1)              ;79741234c1001234

-    mov.w #0x1234:16,@(0x12345678:32,er1)              ;79741234c90012345678

-    mov.w #0x1234:16,@(0x1234:16,r3l.b)            ;79741234d3001234

-    mov.w #0x1234:16,@(0x1234:16,r3.w)            ;79741234e3001234

-    mov.w #0x1234:16,@(0x1234:16,er3.l)            ;79741234f3001234

-    mov.w #0x1234:16,@(0x12345678:32,r3l.b)            ;79741234db0012345678

-    mov.w #0x1234:16,@(0x12345678:32,r3.w)            ;79741234eb0012345678

-    mov.w #0x1234:16,@(0x12345678:32,er3.l)            ;79741234fb0012345678

-    mov.w #0x1234:16,@0x1234:16                    ;7974123440001234

-    mov.w #0x1234:16,@0x12345678:32                    ;79741234480012345678

-

-    mov.w #0x12:8,@er1                       ;015d0112

-    mov.w #0x12:8,@(0x2:2,er1)             ;015d1112

-    mov.w #0x12:8,@er1+                      ;015d8112

-    mov.w #0x12:8,@-er1                      ;015db112

-    mov.w #0x12:8,@+er1                      ;015d9112

-    mov.w #0x12:8,@er1-                      ;015da112

-    mov.w #0x12:8,@(0x1234:16,er1)               ;015dc1121234

-    mov.w #0x12:8,@(0x12345678:32,er1)               ;015dc91212345678

-    mov.w #0x12:8,@(0x1234:16,r3l.b)             ;015dd3121234

-    mov.w #0x12:8,@(0x1234:16,r3.w)             ;015de3121234

-    mov.w #0x12:8,@(0x1234:16,er3.l)             ;015df3121234

-    mov.w #0x12:8,@(0x12345678:32,r3l.b)             ;015ddb1212345678

-    mov.w #0x12:8,@(0x12345678:32,r3.w)             ;015deb1212345678

-    mov.w #0x12:8,@(0x12345678:32,er3.l)             ;015dfb1212345678

-    mov.w #0x12:8,@0x1234:16                     ;015d40121234

-    mov.w #0x12:8,@0x12345678:32                     ;015d481212345678

-

-    mov.w #0x1:4,@0x1234:16                     ;6bd11234

-    mov.w #0x1:4,@0x12345678:32                     ;6bf112345678

-

-    mov.w r2,r1                            ;0d21

-

-    mov.w r2,@er1                          ;6992

-    mov.w r2,@(0x2:2,er1)                ;01516992

-    mov.w r2,@er1+                         ;01536d92

-    mov.w r2,@-er1                         ;6d92

-    mov.w r2,@+er1                         ;01526d92

-    mov.w r2,@er1-                         ;01516d92

-    mov.w r2,@(0x1234:16,er1)                  ;6f921234

-    mov.w r2,@(0x12345678:32,er1)                  ;78106ba212345678

-    mov.w r2,@(0x1234:16,r3l.b)                ;01516fb21234

-    mov.w r2,@(0x1234:16,r3.w)                ;01526fb21234

-    mov.w r2,@(0x1234:16,er3.l)                ;01536fb21234

-    mov.w r2,@(0x12345678:32,r3l.b)                ;78316ba212345678

-    mov.w r2,@(0x12345678:32,r3.w)                ;78326ba212345678

-    mov.w r2,@(0x12345678:32,er3.l)                ;78336ba212345678

-    mov.w r2,@0x1234:16                        ;6b821234

-    mov.w r2,@0x12345678:32                        ;6ba212345678

-

-    mov.w @er2,r1                         ;6921

-    mov.w @(0x2:2,er2),r1              ;01516921

-    mov.w @er2+,r1                       ;6d21

-    mov.w @-er2,r1                       ;01536d21

-    mov.w @+er2,r1                       ;01516d21

-    mov.w @er2-,r1                       ;01526d21

-    mov.w @(0x1234:16,er1),r1                 ;6f111234

-    mov.w @(0x12345678:32,er1),r1                 ;78106b2112345678

-    mov.w @(0x1234:16,r3l.b),r1               ;01516f311234

-    mov.w @(0x1234:16,r3.w),r1               ;01526f311234

-    mov.w @(0x1234:16,er3.l),r1               ;01536f311234

-    mov.w @(0x12345678:32,r3l.b),r1               ;78316b2112345678

-    mov.w @(0x12345678:32,r3.w),r1               ;78326b2112345678

-    mov.w @(0x12345678:32,er3.l),r1               ;78336b2112345678

-    mov.w @0x1234:16,r1                       ;6b011234

-    mov.w @0x12345678:32,r1                       ;6b2112345678

-

-    mov.w @er2,@er1                       ;01580201 

-    mov.w @er2,@(0x2:2,er1)             ;01580211

-    mov.w @er2,@er1+                      ;01580281

-    mov.w @er2,@-er1                      ;015802b1

-    mov.w @er2,@+er1                      ;01580291

-    mov.w @er2,@er1-                      ;015802a1

-    mov.w @er2,@(0x1234:16,er1)               ;015802c11234

-    mov.w @er2,@(0x12345678:32,er1)               ;015802c912345678

-    mov.w @er2,@(0x1234:16,r3l.b)             ;015802d31234

-    mov.w @er2,@(0x1234:16,r3.w)             ;015802e31234

-    mov.w @er2,@(0x1234:16,er3.l)             ;015802f31234

-    mov.w @er2,@(0x12345678:32,r3l.b)             ;015802db12345678

-    mov.w @er2,@(0x12345678:32,r3.w)             ;015802eb12345678

-    mov.w @er2,@(0x12345678:32,er3.l)             ;015802fb12345678

-    mov.w @er2,@0x1234:16                     ;015802401234

-    mov.w @er2,@0x12345678:32                     ;0158024812345678

-

-    mov.w @(0x2:2,er2),@er1             ;01581201

-    mov.w @(0x2:2,er2),@(0x2:2,er1)   ;01581211

-    mov.w @(0x2:2,er2),@er1+            ;01581281

-    mov.w @(0x2:2,er2),@-er1            ;015812b1

-    mov.w @(0x2:2,er2),@+er1            ;01581291

-    mov.w @(0x2:2,er2),@er1-            ;015812a1

-    mov.w @(0x2:2,er2),@(0x1234:16,er1)     ;015812c11234

-    mov.w @(0x2:2,er2),@(0x12345678:32,er1)     ;015812c912345678

-    mov.w @(0x2:2,er2),@(0x1234:16,r3l.b)   ;015812d31234

-    mov.w @(0x2:2,er2),@(0x1234:16,r3.w)   ;015812e31234

-    mov.w @(0x2:2,er2),@(0x1234:16,er3.l)   ;015812f31234

-    mov.w @(0x2:2,er2),@(0x12345678:32,r3l.b)   ;015812db12345678

-    mov.w @(0x2:2,er2),@(0x12345678:32,r3.w)   ;015812eb12345678

-    mov.w @(0x2:2,er2),@(0x12345678:32,er3.l)   ;015812fb12345678

-    mov.w @(0x2:2,er2),@0x1234:16           ;015812401234

-    mov.w @(0x2:2,er2),@0x12345678:32           ;0158124812345678

-

-    mov.w @-er2,@er1                      ;0158b201 

-    mov.w @-er2,@(0x2:2,er1)            ;0158b211

-    mov.w @-er2,@er1+                     ;0158b281

-    mov.w @-er2,@-er1                     ;0158b2b1

-    mov.w @-er2,@+er1                     ;0158b291

-    mov.w @-er2,@er1-                     ;0158b2a1

-    mov.w @-er2,@(0x1234:16,er1)              ;0158b2c11234

-    mov.w @-er2,@(0x12345678:32,er1)              ;0158b2c912345678

-    mov.w @-er2,@(0x1234:16,r3l.b)            ;0158b2d31234

-    mov.w @-er2,@(0x1234:16,r3.w)            ;0158b2e31234

-    mov.w @-er2,@(0x1234:16,er3.l)            ;0158b2f31234

-    mov.w @-er2,@(0x12345678:32,r3l.b)            ;0158b2db12345678

-    mov.w @-er2,@(0x12345678:32,r3.w)            ;0158b2eb12345678

-    mov.w @-er2,@(0x12345678:32,er3.l)            ;0158b2fb12345678

-    mov.w @-er2,@0x1234:16                    ;0158b2401234

-    mov.w @-er2,@0x12345678:32                    ;0158b24812345678

-

-    mov.w @er2+,@er1                      ;01588201

-    mov.w @er2+,@(0x2:2,er1)            ;01588211

-    mov.w @er2+,@er1+                     ;01588281

-    mov.w @er2+,@-er1                     ;015882b1

-    mov.w @er2+,@+er1                     ;01588291

-    mov.w @er2+,@er1-                     ;015882a1

-    mov.w @er2+,@(0x1234:16,er1)              ;015882c11234

-    mov.w @er2+,@(0x12345678:32,er1)              ;015882c912345678

-    mov.w @er2+,@(0x1234:16,r3l.b)            ;015882d31234

-    mov.w @er2+,@(0x1234:16,r3.w)            ;015882e31234

-    mov.w @er2+,@(0x1234:16,er3.l)            ;015882f31234

-    mov.w @er2+,@(0x12345678:32,r3l.b)            ;015882db12345678

-    mov.w @er2+,@(0x12345678:32,r3.w)            ;015882eb12345678

-    mov.w @er2+,@(0x12345678:32,er3.l)            ;015882fb12345678

-    mov.w @er2+,@0x1234:16                    ;015882401234

-    mov.w @er2+,@0x12345678:32                    ;0158824812345678

-

-    mov.w @er2-,@er1                      ;0158a201

-    mov.w @er2-,@(0x2:2,er1)            ;0158a211

-    mov.w @er2-,@er1+                     ;0158a281

-    mov.w @er2-,@-er1                     ;0158a2b1

-    mov.w @er2-,@+er1                     ;0158a291

-    mov.w @er2-,@er1-                     ;0158a2a1

-    mov.w @er2-,@(0x1234:16,er1)              ;0158a2c11234

-    mov.w @er2-,@(0x12345678:32,er1)              ;0158a2c912345678

-    mov.w @er2-,@(0x1234:16,r3l.b)            ;0158a2d31234

-    mov.w @er2-,@(0x1234:16,r3.w)            ;0158a2e31234

-    mov.w @er2-,@(0x1234:16,er3.l)            ;0158a2f31234

-    mov.w @er2-,@(0x12345678:32,r3l.b)            ;0158a2db12345678

-    mov.w @er2-,@(0x12345678:32,r3.w)            ;0158a2eb12345678

-    mov.w @er2-,@(0x12345678:32,er3.l)            ;0158a2fb12345678

-    mov.w @er2-,@0x1234:16                    ;0158a2401234

-    mov.w @er2-,@0x12345678:32                    ;0158a24812345678

-

-    mov.w @+er2,@er1                      ;01589201

-    mov.w @+er2,@(0x2:2,er1)            ;01589211

-    mov.w @+er2,@er1+                     ;01589281

-    mov.w @+er2,@-er1                     ;015892b1

-    mov.w @+er2,@+er1                     ;01589291

-    mov.w @+er2,@er1-                     ;015892a1

-    mov.w @+er2,@(0x1234:16,er1)              ;015892c11234

-    mov.w @+er2,@(0x12345678:32,er1)              ;015892c912345678

-    mov.w @+er2,@(0x1234:16,r3l.b)            ;015892d31234

-    mov.w @+er2,@(0x1234:16,r3.w)            ;015892e31234

-    mov.w @+er2,@(0x1234:16,er3.l)            ;015892f31234

-    mov.w @+er2,@(0x12345678:32,r3l.b)            ;015892db12345678

-    mov.w @+er2,@(0x12345678:32,r3.w)            ;015892eb12345678

-    mov.w @+er2,@(0x12345678:32,er3.l)            ;015892fb12345678

-    mov.w @+er2,@0x1234:16                    ;015892401234

-    mov.w @+er2,@0x12345678:32                    ;0158924812345678

-

-    mov.w @(0x1234:16,er2),@er1               ;0158c2011234

-    mov.w @(0x1234:16,er2),@(0x2:2,er1)     ;0158c2111234

-    mov.w @(0x1234:16,er2),@er1+              ;0158c2811234

-    mov.w @(0x1234:16,er2),@-er1              ;0158c2b11234

-    mov.w @(0x1234:16,er2),@+er1              ;0158c2911234

-    mov.w @(0x1234:16,er2),@er1-              ;0158c2a11234

-    mov.w @(0x1234:16,er2),@(0xffff9abc:16,er1)       ;0158c2c112349abc

-    mov.w @(0x1234:16,er2),@(0x9abcdef0:32,er1)       ;0158c2c912349abcdef0

-    mov.w @(0x1234:16,er2),@(0xffff9abc:16,r3l.b)     ;0158c2d312349abc

-    mov.w @(0x1234:16,er2),@(0xffff9abc:16,r3.w)     ;0158c2e312349abc

-    mov.w @(0x1234:16,er2),@(0xffff9abc:16,er3.l)     ;0158c2f312349abc

-    mov.w @(0x1234:16,er2),@(0x9abcdef0:32,r3l.b)     ;0158c2db12349abcdef0

-    mov.w @(0x1234:16,er2),@(0x9abcdef0:32,r3.w)     ;0158c2eb12349abcdef0

-    mov.w @(0x1234:16,er2),@(0x9abcdef0:32,er3.l)     ;0158c2fb12349abcdef0

-    mov.w @(0x1234:16,er2),@0xffff9abc:16             ;0158c24012349abc

-    mov.w @(0x1234:16,er2),@0x9abcdef0:32             ;0158c24812349abcdef0

-

-    mov.w @(0x12345678:32,er2),@er1               ;0158ca0112345678

-    mov.w @(0x12345678:32,er2),@(0x2:2,er1)     ;0158ca1112345678

-    mov.w @(0x12345678:32,er2),@er1+              ;0158ca8112345678

-    mov.w @(0x12345678:32,er2),@-er1              ;0158cab112345678

-    mov.w @(0x12345678:32,er2),@+er1              ;0158ca9112345678

-    mov.w @(0x12345678:32,er2),@er1-              ;0158caa112345678

-    mov.w @(0x12345678:32,er2),@(0xffff9abc:16,er1)       ;0158cac1123456789abc

-    mov.w @(0x12345678:32,er2),@(0x9abcdef0:32,er1)       ;0158cac9123456789abcdef0

-    mov.w @(0x12345678:32,er2),@(0xffff9abc:16,r3l.b)     ;0158cad3123456789abc

-    mov.w @(0x12345678:32,er2),@(0xffff9abc:16,r3.w)     ;0158cae3123456789abc

-    mov.w @(0x12345678:32,er2),@(0xffff9abc:16,er3.l)     ;0158caf3123456789abc

-    mov.w @(0x12345678:32,er2),@(0x9abcdef0:32,r3l.b)     ;0158cadb123456789abcdef0

-    mov.w @(0x12345678:32,er2),@(0x9abcdef0:32,r3.w)     ;0158caeb123456789abcdef0

-    mov.w @(0x12345678:32,er2),@(0x9abcdef0:32,er3.l)     ;0158cafb123456789abcdef0

-    mov.w @(0x12345678:32,er2),@0xffff9abc:16             ;0158ca40123456789abc

-    mov.w @(0x12345678:32,er2),@0x9abcdef0:32             ;0158ca48123456789abcdef0

-

-    mov.w @(0x1234:16,r3l.b),@er1             ;0158d3011234

-    mov.w @(0x1234:16,r3l.b),@(0x2:2,er1)   ;0158d3111234

-    mov.w @(0x1234:16,r3l.b),@er1+            ;0158d3811234

-    mov.w @(0x1234:16,r3l.b),@-er1            ;0158d3b11234

-    mov.w @(0x1234:16,r3l.b),@+er1            ;0158d3911234

-    mov.w @(0x1234:16,r3l.b),@er1-            ;0158d3a11234

-    mov.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)     ;0158d3c112349abc

-    mov.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)     ;0158d3c912349abcdef0

-    mov.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r3l.b)   ;0158d3d312349abc

-    mov.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r3.w)   ;0158d3e312349abc

-    mov.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er3.l)   ;0158d3f312349abc

-    mov.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r3l.b)   ;0158d3db12349abcdef0

-    mov.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r3.w)   ;0158d3eb12349abcdef0

-    mov.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er3.l)   ;0158d3fb12349abcdef0

-    mov.w @(0x1234:16,r3l.b),@0xffff9abc:16           ;0158d34012349abc

-    mov.w @(0x1234:16,r3l.b),@0x9abcdef0:32           ;0158d34812349abcdef0

-

-    mov.w @(0x1234:16,r3.w),@er1             ;0158e3011234

-    mov.w @(0x1234:16,r3.w),@(0x2:2,er1)   ;0158e3111234

-    mov.w @(0x1234:16,r3.w),@er1+            ;0158e3811234

-    mov.w @(0x1234:16,r3.w),@-er1            ;0158e3b11234

-    mov.w @(0x1234:16,r3.w),@+er1            ;0158e3911234

-    mov.w @(0x1234:16,r3.w),@er1-            ;0158e3a11234

-    mov.w @(0x1234:16,r3.w),@(0xffff9abc:16,er1)     ;0158e3c112349abc

-    mov.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)     ;0158e3c912349abcdef0

-    mov.w @(0x1234:16,r3.w),@(0xffff9abc:16,r3l.b)   ;0158e3d312349abc

-    mov.w @(0x1234:16,r3.w),@(0xffff9abc:16,r3.w)   ;0158e3e312349abc

-    mov.w @(0x1234:16,r3.w),@(0xffff9abc:16,er3.l)   ;0158e3f312349abc

-    mov.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r3l.b)   ;0158e3db12349abcdef0

-    mov.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r3.w)   ;0158e3eb12349abcdef0

-    mov.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er3.l)   ;0158e3fb12349abcdef0

-    mov.w @(0x1234:16,r3.w),@0xffff9abc:16           ;0158e34012349abc

-    mov.w @(0x1234:16,r3.w),@0x9abcdef0:32           ;0158e34812349abcdef0

-

-    mov.w @(0x1234:16,er3.l),@er1             ;0158f3011234

-    mov.w @(0x1234:16,er3.l),@(0x2:2,er1)   ;0158f3111234

-    mov.w @(0x1234:16,er3.l),@er1+            ;0158f3811234

-    mov.w @(0x1234:16,er3.l),@-er1            ;0158f3b11234

-    mov.w @(0x1234:16,er3.l),@+er1            ;0158f3911234

-    mov.w @(0x1234:16,er3.l),@er1-            ;0158f3a11234

-    mov.w @(0x1234:16,er3.l),@(0xffff9abc:16,er1)     ;0158f3c112349abc

-    mov.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)     ;0158f3c912349abcdef0

-    mov.w @(0x1234:16,er3.l),@(0xffff9abc:16,r3l.b)   ;0158f3d312349abc

-    mov.w @(0x1234:16,er3.l),@(0xffff9abc:16,r3.w)   ;0158f3e312349abc

-    mov.w @(0x1234:16,er3.l),@(0xffff9abc:16,er3.l)   ;0158f3f312349abc

-    mov.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r3l.b)   ;0158f3db12349abcdef0

-    mov.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r3.w)   ;0158f3eb12349abcdef0

-    mov.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er3.l)   ;0158f3fb12349abcdef0

-    mov.w @(0x1234:16,er3.l),@0xffff9abc:16           ;0158f34012349abc

-    mov.w @(0x1234:16,er3.l),@0x9abcdef0:32           ;0158f34812349abcdef0

-

-    mov.w @(0x12345678:32,r3l.b),@er1             ;0158db0112345678

-    mov.w @(0x12345678:32,r3l.b),@(0x2:2,er1)   ;0158db1112345678

-    mov.w @(0x12345678:32,r3l.b),@er1+            ;0158db8112345678

-    mov.w @(0x12345678:32,r3l.b),@-er1            ;0158dbb112345678

-    mov.w @(0x12345678:32,r3l.b),@+er1            ;0158db9112345678

-    mov.w @(0x12345678:32,r3l.b),@er1-            ;0158dba112345678

-    mov.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)     ;0158dbc1123456789abc

-    mov.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)     ;0158dbc9123456789abcdef0

-    mov.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r3l.b)   ;0158dbd3123456789abc

-    mov.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r3.w)   ;0158dbe3123456789abc

-    mov.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er3.l)   ;0158dbf3123456789abc

-    mov.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3l.b)   ;0158dbdb123456789abcdef0

-    mov.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3.w)   ;0158dbeb123456789abcdef0

-    mov.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er3.l)   ;0158dbfb123456789abcdef0

-    mov.w @(0x12345678:32,r3l.b),@0xffff9abc:16           ;0158db40123456789abc

-    mov.w @(0x12345678:32,r3l.b),@0x9abcdef0:32           ;0158db48123456789abcdef0

-

-    mov.w @(0x12345678:32,r3.w),@er1             ;0158eb0112345678

-    mov.w @(0x12345678:32,r3.w),@(0x2:2,er1)   ;0158eb1112345678

-    mov.w @(0x12345678:32,r3.w),@er1+            ;0158eb8112345678

-    mov.w @(0x12345678:32,r3.w),@-er1            ;0158ebb112345678

-    mov.w @(0x12345678:32,r3.w),@+er1            ;0158eb9112345678

-    mov.w @(0x12345678:32,r3.w),@er1-            ;0158eba112345678

-    mov.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)     ;0158ebc1123456789abc

-    mov.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)     ;0158ebc9123456789abcdef0

-    mov.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r3l.b)   ;0158ebd3123456789abc

-    mov.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r3.w)   ;0158ebe3123456789abc

-    mov.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er3.l)   ;0158ebf3123456789abc

-    mov.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r3l.b)   ;0158ebdb123456789abcdef0

-    mov.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r3.w)   ;0158ebeb123456789abcdef0

-    mov.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er3.l)   ;0158ebfb123456789abcdef0

-    mov.w @(0x12345678:32,r3.w),@0xffff9abc:16           ;0158eb40123456789abc

-    mov.w @(0x12345678:32,r3.w),@0x9abcdef0:32           ;0158eb48123456789abcdef0

-

-    mov.w @(0x12345678:32,er3.l),@er1             ;0158fb0112345678

-    mov.w @(0x12345678:32,er3.l),@(0x2:2,er1)   ;0158fb1112345678

-    mov.w @(0x12345678:32,er3.l),@er1+            ;0158fb8112345678

-    mov.w @(0x12345678:32,er3.l),@-er1            ;0158fbb112345678

-    mov.w @(0x12345678:32,er3.l),@+er1            ;0158fb9112345678

-    mov.w @(0x12345678:32,er3.l),@er1-            ;0158fba112345678

-    mov.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)     ;0158fbc1123456789abc

-    mov.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)     ;0158fbc9123456789abcdef0

-    mov.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r3l.b)   ;0158fbd3123456789abc

-    mov.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r3.w)   ;0158fbe3123456789abc

-    mov.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er3.l)   ;0158fbf3123456789abc

-    mov.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r3l.b)   ;0158fbdb123456789abcdef0

-    mov.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r3.w)   ;0158fbeb123456789abcdef0

-    mov.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er3.l)   ;0158fbfb123456789abcdef0

-    mov.w @(0x12345678:32,er3.l),@0xffff9abc:16           ;0158fb40123456789abc

-    mov.w @(0x12345678:32,er3.l),@0x9abcdef0:32           ;0158fb48123456789abcdef0

-

-    mov.w @0x1234:16,@er1                     ;015840011234

-    mov.w @0x1234:16,@(0x2:2,er1)           ;015840111234

-    mov.w @0x1234:16,@er1+                    ;015840811234

-    mov.w @0x1234:16,@-er1                    ;015840b11234

-    mov.w @0x1234:16,@+er1                    ;015840911234

-    mov.w @0x1234:16,@er1-                    ;015840a11234

-    mov.w @0x1234:16,@(0xffff9abc:16,er1)             ;015840c112349abc

-    mov.w @0x1234:16,@(0x9abcdef0:32,er1)             ;015840c912349abcdef0

-    mov.w @0x1234:16,@(0xffff9abc:16,r3l.b)           ;015840d312349abc

-    mov.w @0x1234:16,@(0xffff9abc:16,r3.w)           ;015840e312349abc

-    mov.w @0x1234:16,@(0xffff9abc:16,er3.l)           ;015840f312349abc

-    mov.w @0x1234:16,@(0x9abcdef0:32,r3l.b)           ;015840db12349abcdef0

-    mov.w @0x1234:16,@(0x9abcdef0:32,r3.w)           ;015840eb12349abcdef0

-    mov.w @0x1234:16,@(0x9abcdef0:32,er3.l)           ;015840fb12349abcdef0

-    mov.w @0x1234:16,@0xffff9abc:16                   ;0158404012349abc

-    mov.w @0x1234:16,@0x9abcdef0:32                   ;0158404812349abcdef0

-

-    mov.w @0x12345678:32,@er1                     ;0158480112345678

-    mov.w @0x12345678:32,@(0x2:2,er1)           ;0158481112345678

-    mov.w @0x12345678:32,@er1+                    ;0158488112345678

-    mov.w @0x12345678:32,@-er1                    ;015848b112345678

-    mov.w @0x12345678:32,@+er1                    ;0158489112345678

-    mov.w @0x12345678:32,@er1-                    ;015848a112345678

-    mov.w @0x12345678:32,@(0xffff9abc:16,er1)             ;015848c1123456789abc

-    mov.w @0x12345678:32,@(0x9abcdef0:32,er1)             ;015848c9123456789abcdef0

-    mov.w @0x12345678:32,@(0xffff9abc:16,r3l.b)           ;015848d3123456789abc

-    mov.w @0x12345678:32,@(0xffff9abc:16,r3.w)           ;015848e3123456789abc

-    mov.w @0x12345678:32,@(0xffff9abc:16,er3.l)           ;015848f3123456789abc

-    mov.w @0x12345678:32,@(0x9abcdef0:32,r3l.b)           ;015848db123456789abcdef0

-    mov.w @0x12345678:32,@(0x9abcdef0:32,r3.w)           ;015848eb123456789abcdef0

-    mov.w @0x12345678:32,@(0x9abcdef0:32,er3.l)           ;015848fb123456789abcdef0

-    mov.w @0x12345678:32,@0xffff9abc:16                   ;01584840123456789abc

-    mov.w @0x12345678:32,@0x9abcdef0:32                   ;01584848123456789abcdef0

-

-    mov.l #0x12345678:32,er1                      ;7a0112345678

-

-    mov.l #0x1234:16,er1                      ;7a091234

-

-    mov.l #0x1:3,er3                       ;0f9b

-

-    mov.l #0x12345678:32,@er1                     ;7a74123456780100 

-    mov.l #0x12345678:32,@(0x4:2,er1)             ;7a74123456781100

-    mov.l #0x12345678:32,@-er1                    ;7a7412345678b100 

-    mov.l #0x12345678:32,@er1+                    ;7a74123456788100 

-    mov.l #0x12345678:32,@er1-                    ;7a7412345678a100 

-    mov.l #0x12345678:32,@+er1                    ;7a74123456789100 

-    mov.l #0x12345678:32,@(0x1234:16,er1)             ;7a7412345678c1001234

-    mov.l #0x12345678:32,@(0x12345678:32,er1)             ;7a7412345678c90012345678

-    mov.l #0x12345678:32,@(0x1234:16,r3l.b)           ;7a7412345678d3001234

-    mov.l #0x12345678:32,@(0x1234:16,r3.w)           ;7a7412345678e3001234

-    mov.l #0x12345678:32,@(0x1234:16,er3.l)           ;7a7412345678f3001234

-    mov.l #0x12345678:32,@(0x12345678:32,r3l.b)           ;7a7412345678db0012345678

-    mov.l #0x12345678:32,@(0x12345678:32,r3.w)           ;7a7412345678eb0012345678

-    mov.l #0x12345678:32,@(0x12345678:32,er3.l)           ;7a7412345678fb0012345678

-    mov.l #0x12345678:32,@0x1234:16                   ;7a741234567840001234

-    mov.l #0x12345678:32,@0x12345678:32                   ;7a7412345678480012345678

-

-    mov.l #0x1234:16,@er1                     ;7a7c12340100  

-    mov.l #0x1234:16,@(0x4:2,er1)           ;7a7c12341100

-    mov.l #0x1234:16,@-er1                    ;7a7c1234b100  

-    mov.l #0x1234:16,@er1+                    ;7a7c12348100  

-    mov.l #0x1234:16,@er1-                    ;7a7c1234a100  

-    mov.l #0x1234:16,@+er1                    ;7a7c12349100  

-    mov.l #0x1234:16,@(0x1234:16,er1)             ;7a7c1234c1001234

-    mov.l #0x1234:16,@(0x12345678:32,er1)             ;7a7c1234c90012345678

-    mov.l #0x1234:16,@(0x1234:16,r3l.b)           ;7a7c1234d3001234

-    mov.l #0x1234:16,@(0x1234:16,r3.w)           ;7a7c1234e3001234

-    mov.l #0x1234:16,@(0x1234:16,er3.l)           ;7a7c1234f3001234

-    mov.l #0x1234:16,@(0x12345678:32,r3l.b)           ;7a7c1234db0012345678

-    mov.l #0x1234:16,@(0x12345678:32,r3.w)           ;7a7c1234eb0012345678

-    mov.l #0x1234:16,@(0x12345678:32,er3.l)           ;7a7c1234fb0012345678

-    mov.l #0x1234:16,@0x1234:16                   ;7a7c123440001234

-    mov.l #0x1234:16,@0x12345678:32                   ;7a7c1234480012345678

-

-    mov.l #0x12:8,@er1                      ;010d0112

-    mov.l #0x12:8,@(0x4:2,er1)            ;010d1112

-    mov.l #0x12:8,@-er1                     ;010db112

-    mov.l #0x12:8,@er1+                     ;010d8112

-    mov.l #0x12:8,@er1-                     ;010da112

-    mov.l #0x12:8,@+er1                     ;010d9112

-    mov.l #0x12:8,@(0x1234:16,er1)              ;010dc1121234

-    mov.l #0x12:8,@(0x12345678:32,er1)              ;010dc91212345678

-    mov.l #0x12:8,@(0x1234:16,r3l.b)            ;010dd3121234

-    mov.l #0x12:8,@(0x1234:16,r3.w)            ;010de3121234

-    mov.l #0x12:8,@(0x1234:16,er3.l)            ;010df3121234

-    mov.l #0x12:8,@(0x12345678:32,r3l.b)            ;010ddb1212345678

-    mov.l #0x12:8,@(0x12345678:32,r3.w)            ;010deb1212345678

-    mov.l #0x12:8,@(0x12345678:32,er3.l)            ;010dfb1212345678

-    mov.l #0x12:8,@0x1234:16                    ;010d40121234

-    mov.l #0x12:8,@0x12345678:32                    ;010d481212345678

-

-    mov.l er2,er1                         ;0fa1

-

-    mov.l er2,@er1                         ;01006992

-    mov.l er2,@(0x4:2,er1)               ;01016992

-    mov.l er2,@-er1                        ;01006d92

-    mov.l er2,@er1+                        ;01036d92

-    mov.l er2,@er1-                        ;01016d92

-    mov.l er2,@+er1                        ;01026d92

-    mov.l er2,@(0x1234:16,er1)                 ;01006f921234

-    mov.l er2,@(0x12345678:32,er1)                 ;78906ba212345678

-    mov.l er2,@(0x1234:16,r3l.b)               ;01016fb21234

-    mov.l er2,@(0x1234:16,r3.w)               ;01026fb21234

-    mov.l er2,@(0x1234:16,er3.l)               ;01036fb21234

-    mov.l er2,@(0x12345678:32,r3l.b)               ;78b16ba212345678

-    mov.l er2,@(0x12345678:32,r3.w)               ;78b26ba212345678

-    mov.l er2,@(0x12345678:32,er3.l)               ;78b36ba212345678

-    mov.l er2,@0x1234:16                       ;01006b821234

-    mov.l er2,@0x12345678:32                       ;01006ba212345678

-

-    mov.l @er2,er1                         ;01006921  

-    mov.l @(0x4:2,er2),er1              ;01016921

-    mov.l @er2+,er1                       ;01006d21  

-    mov.l @-er2,er1                       ;01036d21  

-    mov.l @+er2,er1                       ;01016d21  

-    mov.l @er2-,er1                       ;01026d21  

-    mov.l @(0x1234:16,er1),er1                 ;01006f111234

-    mov.l @(0x12345678:32,er1),er1                 ;78906b2112345678

-    mov.l @(0x1234:16,r3l.b),er1               ;01016f311234

-    mov.l @(0x1234:16,r3.w),er1               ;01026f311234

-    mov.l @(0x1234:16,er3.l),er1               ;01036f311234

-    mov.l @(0x12345678:32,r3l.b),er1               ;78b16b2112345678

-    mov.l @(0x12345678:32,r3.w),er1               ;78b26b2112345678

-    mov.l @(0x12345678:32,er3.l),er1               ;78b36b2112345678

-    mov.l @0x1234:16,er1                       ;01006b011234

-    mov.l @0x12345678:32,er1                       ;01006b2112345678

-

-    mov.l @er2,@er1                       ;01080201 

-    mov.l @er2,@(0x4:2,er1)             ;01080211

-    mov.l @er2,@er1+                      ;01080281

-    mov.l @er2,@-er1                      ;010802b1

-    mov.l @er2,@+er1                      ;01080291

-    mov.l @er2,@er1-                      ;010802a1

-    mov.l @er2,@(0x1234:16,er1)               ;010802c11234

-    mov.l @er2,@(0x12345678:32,er1)               ;010802c912345678

-    mov.l @er2,@(0x1234:16,r3l.b)             ;010802d31234

-    mov.l @er2,@(0x1234:16,r3.w)             ;010802e31234

-    mov.l @er2,@(0x1234:16,er3.l)             ;010802f31234

-    mov.l @er2,@(0x12345678:32,r3l.b)             ;010802db12345678

-    mov.l @er2,@(0x12345678:32,r3.w)             ;010802eb12345678

-    mov.l @er2,@(0x12345678:32,er3.l)             ;010802fb12345678

-    mov.l @er2,@0x1234:16                     ;010802401234

-    mov.l @er2,@0x12345678:32                     ;0108024812345678

-

-    mov.l @(0x4:2,er2),@er1             ;01081201

-    mov.l @(0x4:2,er2),@(0x4:2,er1)   ;01081211

-    mov.l @(0x4:2,er2),@er1+            ;01081281

-    mov.l @(0x4:2,er2),@-er1            ;010812b1

-    mov.l @(0x4:2,er2),@+er1            ;01081291

-    mov.l @(0x4:2,er2),@er1-            ;010812a1

-    mov.l @(0x4:2,er2),@(0x1234:16,er1)     ;010812c11234

-    mov.l @(0x4:2,er2),@(0x12345678:32,er1)     ;010812c912345678

-    mov.l @(0x4:2,er2),@(0x1234:16,r3l.b)   ;010812d31234

-    mov.l @(0x4:2,er2),@(0x1234:16,r3.w)   ;010812e31234

-    mov.l @(0x4:2,er2),@(0x1234:16,er3.l)   ;010812f31234

-    mov.l @(0x4:2,er2),@(0x12345678:32,r3l.b)   ;010812db12345678

-    mov.l @(0x4:2,er2),@(0x12345678:32,r3.w)   ;010812eb12345678

-    mov.l @(0x4:2,er2),@(0x12345678:32,er3.l)   ;010812fb12345678

-    mov.l @(0x4:2,er2),@0x1234:16           ;010812401234

-    mov.l @(0x4:2,er2),@0x12345678:32           ;0108124812345678

-

-    mov.l @-er2,@er1                      ;0108b201

-    mov.l @-er2,@(0x4:2,er1)            ;0108b211

-    mov.l @-er2,@er1+                     ;0108b281

-    mov.l @-er2,@-er1                     ;0108b2b1

-    mov.l @-er2,@+er1                     ;0108b291

-    mov.l @-er2,@er1-                     ;0108b2a1

-    mov.l @-er2,@(0x1234:16,er1)              ;0108b2c11234

-    mov.l @-er2,@(0x12345678:32,er1)              ;0108b2c912345678

-    mov.l @-er2,@(0x1234:16,r3l.b)            ;0108b2d31234

-    mov.l @-er2,@(0x1234:16,r3.w)            ;0108b2e31234

-    mov.l @-er2,@(0x1234:16,er3.l)            ;0108b2f31234

-    mov.l @-er2,@(0x12345678:32,r3l.b)            ;0108b2db12345678

-    mov.l @-er2,@(0x12345678:32,r3.w)            ;0108b2eb12345678

-    mov.l @-er2,@(0x12345678:32,er3.l)            ;0108b2fb12345678

-    mov.l @-er2,@0x1234:16                    ;0108b2401234

-    mov.l @-er2,@0x12345678:32                    ;0108b24812345678

-

-    mov.l @er2+,@er1                      ;01088201 

-    mov.l @er2+,@(0x4:2,er1)            ;01088211

-    mov.l @er2+,@er1+                     ;01088281

-    mov.l @er2+,@-er1                     ;010882b1

-    mov.l @er2+,@+er1                     ;01088291

-    mov.l @er2+,@er1-                     ;010882a1

-    mov.l @er2+,@(0x1234:16,er1)              ;010882c11234

-    mov.l @er2+,@(0x12345678:32,er1)              ;010882c912345678

-    mov.l @er2+,@(0x1234:16,r3l.b)            ;010882d31234

-    mov.l @er2+,@(0x1234:16,r3.w)            ;010882e31234

-    mov.l @er2+,@(0x1234:16,er3.l)            ;010882f31234

-    mov.l @er2+,@(0x12345678:32,r3l.b)            ;010882db12345678

-    mov.l @er2+,@(0x12345678:32,r3.w)            ;010882eb12345678

-    mov.l @er2+,@(0x12345678:32,er3.l)            ;010882fb12345678

-    mov.l @er2+,@0x1234:16                    ;010882401234

-    mov.l @er2+,@0x12345678:32                    ;0108824812345678

-

-    mov.l @er2-,@er1                      ;0108a201 

-    mov.l @er2-,@(0x4:2,er1)            ;0108a211

-    mov.l @er2-,@er1+                     ;0108a281

-    mov.l @er2-,@-er1                     ;0108a2b1

-    mov.l @er2-,@+er1                     ;0108a291

-    mov.l @er2-,@er1-                     ;0108a2a1

-    mov.l @er2-,@(0x1234:16,er1)              ;0108a2c11234

-    mov.l @er2-,@(0x12345678:32,er1)              ;0108a2c912345678

-    mov.l @er2-,@(0x1234:16,r3l.b)            ;0108a2d31234

-    mov.l @er2-,@(0x1234:16,r3.w)            ;0108a2e31234

-    mov.l @er2-,@(0x1234:16,er3.l)            ;0108a2f31234

-    mov.l @er2-,@(0x12345678:32,r3l.b)            ;0108a2db12345678

-    mov.l @er2-,@(0x12345678:32,r3.w)            ;0108a2eb12345678

-    mov.l @er2-,@(0x12345678:32,er3.l)            ;0108a2fb12345678

-    mov.l @er2-,@0x1234:16                    ;0108a2401234

-    mov.l @er2-,@0x12345678:32                    ;0108a24812345678

-

-    mov.l @+er2,@er1                      ;01089201 

-    mov.l @+er2,@(0x4:2,er1)            ;01089211

-    mov.l @+er2,@er1+                     ;01089281

-    mov.l @+er2,@-er1                     ;010892b1

-    mov.l @+er2,@+er1                     ;01089291

-    mov.l @+er2,@er1-                     ;010892a1

-    mov.l @+er2,@(0x1234:16,er1)              ;010892c11234

-    mov.l @+er2,@(0x12345678:32,er1)              ;010892c912345678

-    mov.l @+er2,@(0x1234:16,r3l.b)            ;010892d31234

-    mov.l @+er2,@(0x1234:16,r3.w)            ;010892e31234

-    mov.l @+er2,@(0x1234:16,er3.l)            ;010892f31234

-    mov.l @+er2,@(0x12345678:32,r3l.b)            ;010892db12345678

-    mov.l @+er2,@(0x12345678:32,r3.w)            ;010892eb12345678

-    mov.l @+er2,@(0x12345678:32,er3.l)            ;010892fb12345678

-    mov.l @+er2,@0x1234:16                    ;010892401234

-    mov.l @+er2,@0x12345678:32                    ;0108924812345678

-

-    mov.l @(0x1234:16,er2),@er1               ;0108c2011234

-    mov.l @(0x1234:16,er2),@(0x4:2,er1)     ;0108c2111234

-    mov.l @(0x1234:16,er2),@er1+              ;0108c2811234

-    mov.l @(0x1234:16,er2),@-er1              ;0108c2b11234

-    mov.l @(0x1234:16,er2),@+er1              ;0108c2911234

-    mov.l @(0x1234:16,er2),@er1-              ;0108c2a11234

-    mov.l @(0x1234:16,er2),@(0xffff9abc:16,er1)       ;0108c2c112349abc

-    mov.l @(0x1234:16,er2),@(0x9abcdef0:32,er1)       ;0108c2c912349abcdef0

-    mov.l @(0x1234:16,er2),@(0xffff9abc:16,r3l.b)     ;0108c2d312349abc

-    mov.l @(0x1234:16,er2),@(0xffff9abc:16,r3.w)     ;0108c2e312349abc

-    mov.l @(0x1234:16,er2),@(0xffff9abc:16,er3.l)     ;0108c2f312349abc

-    mov.l @(0x1234:16,er2),@(0x9abcdef0:32,r3l.b)     ;0108c2db12349abcdef0

-    mov.l @(0x1234:16,er2),@(0x9abcdef0:32,r3.w)     ;0108c2eb12349abcdef0

-    mov.l @(0x1234:16,er2),@(0x9abcdef0:32,er3.l)     ;0108c2fb12349abcdef0

-    mov.l @(0x1234:16,er2),@0xffff9abc:16             ;0108c24012349abc

-    mov.l @(0x1234:16,er2),@0x9abcdef0:32             ;0108c24812349abcdef0

-

-    mov.l @(0x12345678:32,er2),@er1               ;0108ca0112345678

-    mov.l @(0x12345678:32,er2),@(0x4:2,er1)     ;0108ca1112345678

-    mov.l @(0x12345678:32,er2),@er1+              ;0108ca8112345678

-    mov.l @(0x12345678:32,er2),@-er1              ;0108cab112345678

-    mov.l @(0x12345678:32,er2),@+er1              ;0108ca9112345678

-    mov.l @(0x12345678:32,er2),@er1-              ;0108caa112345678

-    mov.l @(0x12345678:32,er2),@(0xffff9abc:16,er1)       ;0108cac1123456789abc

-    mov.l @(0x12345678:32,er2),@(0x9abcdef0:32,er1)       ;0108cac9123456789abcdef0

-    mov.l @(0x12345678:32,er2),@(0xffff9abc:16,r3l.b)     ;0108cad3123456789abc

-    mov.l @(0x12345678:32,er2),@(0xffff9abc:16,r3.w)     ;0108cae3123456789abc

-    mov.l @(0x12345678:32,er2),@(0xffff9abc:16,er3.l)     ;0108caf3123456789abc

-    mov.l @(0x12345678:32,er2),@(0x9abcdef0:32,r3l.b)     ;0108cadb123456789abcdef0

-    mov.l @(0x12345678:32,er2),@(0x9abcdef0:32,r3.w)     ;0108caeb123456789abcdef0

-    mov.l @(0x12345678:32,er2),@(0x9abcdef0:32,er3.l)     ;0108cafb123456789abcdef0

-    mov.l @(0x12345678:32,er2),@0xffff9abc:16             ;0108ca40123456789abc

-    mov.l @(0x12345678:32,er2),@0x9abcdef0:32             ;0108ca48123456789abcdef0

-

-    mov.l @(0x1234:16,r3l.b),@er1             ;0108d3011234

-    mov.l @(0x1234:16,r3l.b),@(0x4:2,er1)   ;0108d3111234

-    mov.l @(0x1234:16,r3l.b),@er1+            ;0108d3811234

-    mov.l @(0x1234:16,r3l.b),@-er1            ;0108d3b11234

-    mov.l @(0x1234:16,r3l.b),@+er1            ;0108d3911234

-    mov.l @(0x1234:16,r3l.b),@er1-            ;0108d3a11234

-    mov.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)     ;0108d3c112349abc

-    mov.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)     ;0108d3c912349abcdef0

-    mov.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r3l.b)   ;0108d3d312349abc

-    mov.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r3.w)   ;0108d3e312349abc

-    mov.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er3.l)   ;0108d3f312349abc

-    mov.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r3l.b)   ;0108d3db12349abcdef0

-    mov.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r3.w)   ;0108d3eb12349abcdef0

-    mov.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er3.l)   ;0108d3fb12349abcdef0

-    mov.l @(0x1234:16,r3l.b),@0xffff9abc:16           ;0108d34012349abc

-    mov.l @(0x1234:16,r3l.b),@0x9abcdef0:32           ;0108d34812349abcdef0

-

-    mov.l @(0x1234:16,r3.w),@er1             ;0108e3011234

-    mov.l @(0x1234:16,r3.w),@(0x4:2,er1)   ;0108e3111234

-    mov.l @(0x1234:16,r3.w),@er1+            ;0108e3811234

-    mov.l @(0x1234:16,r3.w),@-er1            ;0108e3b11234

-    mov.l @(0x1234:16,r3.w),@+er1            ;0108e3911234

-    mov.l @(0x1234:16,r3.w),@er1-            ;0108e3a11234

-    mov.l @(0x1234:16,r3.w),@(0xffff9abc:16,er1)     ;0108e3c112349abc

-    mov.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)     ;0108e3c912349abcdef0

-    mov.l @(0x1234:16,r3.w),@(0xffff9abc:16,r3l.b)   ;0108e3d312349abc

-    mov.l @(0x1234:16,r3.w),@(0xffff9abc:16,r3.w)   ;0108e3e312349abc

-    mov.l @(0x1234:16,r3.w),@(0xffff9abc:16,er3.l)   ;0108e3f312349abc

-    mov.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r3l.b)   ;0108e3db12349abcdef0

-    mov.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r3.w)   ;0108e3eb12349abcdef0

-    mov.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er3.l)   ;0108e3fb12349abcdef0

-    mov.l @(0x1234:16,r3.w),@0xffff9abc:16           ;0108e34012349abc

-    mov.l @(0x1234:16,r3.w),@0x9abcdef0:32           ;0108e34812349abcdef0

-

-    mov.l @(0x1234:16,er3.l),@er1             ;0108f3011234

-    mov.l @(0x1234:16,er3.l),@(0x4:2,er1)   ;0108f3111234

-    mov.l @(0x1234:16,er3.l),@er1+            ;0108f3811234

-    mov.l @(0x1234:16,er3.l),@-er1            ;0108f3b11234

-    mov.l @(0x1234:16,er3.l),@+er1            ;0108f3911234

-    mov.l @(0x1234:16,er3.l),@er1-            ;0108f3a11234

-    mov.l @(0x1234:16,er3.l),@(0xffff9abc:16,er1)     ;0108f3c112349abc

-    mov.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)     ;0108f3c912349abcdef0

-    mov.l @(0x1234:16,er3.l),@(0xffff9abc:16,r3l.b)   ;0108f3d312349abc

-    mov.l @(0x1234:16,er3.l),@(0xffff9abc:16,r3.w)   ;0108f3e312349abc

-    mov.l @(0x1234:16,er3.l),@(0xffff9abc:16,er3.l)   ;0108f3f312349abc

-    mov.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r3l.b)   ;0108f3db12349abcdef0

-    mov.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r3.w)   ;0108f3eb12349abcdef0

-    mov.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er3.l)   ;0108f3fb12349abcdef0

-    mov.l @(0x1234:16,er3.l),@0xffff9abc:16           ;0108f34012349abc

-    mov.l @(0x1234:16,er3.l),@0x9abcdef0:32           ;0108f34812349abcdef0

-

-    mov.l @(0x12345678:32,r3l.b),@er1             ;0108db0112345678

-    mov.l @(0x12345678:32,r3l.b),@(0x4:2,er1)   ;0108db1112345678

-    mov.l @(0x12345678:32,r3l.b),@er1+            ;0108db8112345678

-    mov.l @(0x12345678:32,r3l.b),@-er1            ;0108dbb112345678

-    mov.l @(0x12345678:32,r3l.b),@+er1            ;0108db9112345678

-    mov.l @(0x12345678:32,r3l.b),@er1-            ;0108dba112345678

-    mov.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)     ;0108dbc1123456789abc

-    mov.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)     ;0108dbc9123456789abcdef0

-    mov.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r3l.b)   ;0108dbd3123456789abc

-    mov.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r3.w)   ;0108dbe3123456789abc

-    mov.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er3.l)   ;0108dbf3123456789abc

-    mov.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3l.b)   ;0108dbdb123456789abcdef0

-    mov.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r3.w)   ;0108dbeb123456789abcdef0

-    mov.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er3.l)   ;0108dbfb123456789abcdef0

-    mov.l @(0x12345678:32,r3l.b),@0xffff9abc:16           ;0108db40123456789abc

-    mov.l @(0x12345678:32,r3l.b),@0x9abcdef0:32           ;0108db48123456789abcdef0

-

-    mov.l @(0x12345678:32,r3.w),@er1             ;0108eb0112345678

-    mov.l @(0x12345678:32,r3.w),@(0x4:2,er1)   ;0108eb1112345678

-    mov.l @(0x12345678:32,r3.w),@er1+            ;0108eb8112345678

-    mov.l @(0x12345678:32,r3.w),@-er1            ;0108ebb112345678

-    mov.l @(0x12345678:32,r3.w),@+er1            ;0108eb9112345678

-    mov.l @(0x12345678:32,r3.w),@er1-            ;0108eba112345678

-    mov.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)     ;0108ebc1123456789abc

-    mov.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)     ;0108ebc9123456789abcdef0

-    mov.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r3l.b)   ;0108ebd3123456789abc

-    mov.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r3.w)   ;0108ebe3123456789abc

-    mov.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er3.l)   ;0108ebf3123456789abc

-    mov.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r3l.b)   ;0108ebdb123456789abcdef0

-    mov.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r3.w)   ;0108ebeb123456789abcdef0

-    mov.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er3.l)   ;0108ebfb123456789abcdef0

-    mov.l @(0x12345678:32,r3.w),@0xffff9abc:16           ;0108eb40123456789abc

-    mov.l @(0x12345678:32,r3.w),@0x9abcdef0:32           ;0108eb48123456789abcdef0

-

-    mov.l @(0x12345678:32,er3.l),@er1             ;0108fb0112345678

-    mov.l @(0x12345678:32,er3.l),@(0x4:2,er1)   ;0108fb1112345678

-    mov.l @(0x12345678:32,er3.l),@er1+            ;0108fb8112345678

-    mov.l @(0x12345678:32,er3.l),@-er1            ;0108fbb112345678

-    mov.l @(0x12345678:32,er3.l),@+er1            ;0108fb9112345678

-    mov.l @(0x12345678:32,er3.l),@er1-            ;0108fba112345678

-    mov.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)     ;0108fbc1123456789abc

-    mov.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)     ;0108fbc9123456789abcdef0

-    mov.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r3l.b)   ;0108fbd3123456789abc

-    mov.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r3.w)   ;0108fbe3123456789abc

-    mov.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er3.l)   ;0108fbf3123456789abc

-    mov.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r3l.b)   ;0108fbdb123456789abcdef0

-    mov.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r3.w)   ;0108fbeb123456789abcdef0

-    mov.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er3.l)   ;0108fbfb123456789abcdef0

-    mov.l @(0x12345678:32,er3.l),@0xffff9abc:16           ;0108fb40123456789abc

-    mov.l @(0x12345678:32,er3.l),@0x9abcdef0:32           ;0108fb48123456789abcdef0

-

-    mov.l @0x1234:16,@er1                     ;010840011234

-    mov.l @0x1234:16,@(0x4:2,er1)           ;010840111234

-    mov.l @0x1234:16,@er1+                    ;010840811234

-    mov.l @0x1234:16,@-er1                    ;010840b11234

-    mov.l @0x1234:16,@+er1                    ;010840911234

-    mov.l @0x1234:16,@er1-                    ;010840a11234

-    mov.l @0x1234:16,@(0xffff9abc:16,er1)             ;010840c112349abc

-    mov.l @0x1234:16,@(0x9abcdef0:32,er1)             ;010840c912349abcdef0

-    mov.l @0x1234:16,@(0xffff9abc:16,r3l.b)           ;010840d312349abc

-    mov.l @0x1234:16,@(0xffff9abc:16,r3.w)           ;010840e312349abc

-    mov.l @0x1234:16,@(0xffff9abc:16,er3.l)           ;010840f312349abc

-    mov.l @0x1234:16,@(0x9abcdef0:32,r3l.b)           ;010840db12349abcdef0

-    mov.l @0x1234:16,@(0x9abcdef0:32,r3.w)           ;010840eb12349abcdef0

-    mov.l @0x1234:16,@(0x9abcdef0:32,er3.l)           ;010840fb12349abcdef0

-    mov.l @0x1234:16,@0xffff9abc:16                   ;0108404012349abc

-    mov.l @0x1234:16,@0x9abcdef0:32                   ;0108404812349abcdef0

-

-    mov.l @0x12345678:32,@er1                     ;0108480112345678

-    mov.l @0x12345678:32,@(0x4:2,er1)           ;0108481112345678

-    mov.l @0x12345678:32,@er1+                    ;0108488112345678

-    mov.l @0x12345678:32,@-er1                    ;010848b112345678

-    mov.l @0x12345678:32,@+er1                    ;0108489112345678

-    mov.l @0x12345678:32,@er1-                    ;010848a112345678

-    mov.l @0x12345678:32,@(0xffff9abc:16,er1)             ;010848c1123456789abc

-    mov.l @0x12345678:32,@(0x9abcdef0:32,er1)             ;010848c9123456789abcdef0

-    mov.l @0x12345678:32,@(0xffff9abc:16,r3l.b)           ;010848d3123456789abc

-    mov.l @0x12345678:32,@(0xffff9abc:16,r3.w)           ;010848e3123456789abc

-    mov.l @0x12345678:32,@(0xffff9abc:16,er3.l)           ;010848f3123456789abc

-    mov.l @0x12345678:32,@(0x9abcdef0:32,r3l.b)           ;010848db123456789abcdef0

-    mov.l @0x12345678:32,@(0x9abcdef0:32,r3.w)           ;010848eb123456789abcdef0

-    mov.l @0x12345678:32,@(0x9abcdef0:32,er3.l)           ;010848fb123456789abcdef0

-    mov.l @0x12345678:32,@0xffff9abc:16                   ;01084840123456789abc

-    mov.l @0x12345678:32,@0x9abcdef0:32                   ;01084848123456789abcdef0

-

-    movtpe.b r2h,@0x1234:16                    ;6ac21234

-    movfpe.b @0x1234:16,r1h                    ;6a411234

-

-    ldm @sp+,(er0-er1)                  ;01106d71

-    ldm @sp+,(er1-er2)                  ;01106d72

-    ldm @sp+,(er2-er3)                  ;01106d73

-    ldm @sp+,(er3-er4)                  ;01106d74

-    ldm @sp+,(er4-er5)                  ;01106d75

-    ldm @sp+,(er5-er6)                  ;01106d76

-    ldm @sp+,(er6-er7)                  ;01106d77

-

-    ldm @sp+,(er0-er2)                  ;01206d72

-    ldm @sp+,(er1-er3)                  ;01206d73

-    ldm @sp+,(er2-er4)                  ;01206d74

-    ldm @sp+,(er3-er5)                  ;01206d75

-    ldm @sp+,(er4-er6)                  ;01206d76

-    ldm @sp+,(er5-er7)                  ;01206d77

-

-    ldm @sp+,(er0-er3)                  ;01306d73

-    ldm @sp+,(er1-er4)                  ;01306d74

-    ldm @sp+,(er2-er5)                  ;01306d75

-    ldm @sp+,(er3-er6)                  ;01306d76

-    ldm @sp+,(er4-er7)                  ;01306d77

-

-    stm (er0-er1),@-sp                  ;01106df0

-    stm (er1-er2),@-sp                  ;01106df1

-    stm (er2-er3),@-sp                  ;01106df2

-    stm (er3-er4),@-sp                  ;01106df3

-    stm (er4-er5),@-sp                  ;01106df4

-    stm (er5-er6),@-sp                  ;01106df5

-    stm (er6-er7),@-sp                  ;01106df6

-

-    stm (er0-er2),@-sp                  ;01206df0

-    stm (er1-er3),@-sp                  ;01206df1

-    stm (er2-er4),@-sp                  ;01206df2

-    stm (er3-er5),@-sp                  ;01206df3

-    stm (er4-er6),@-sp                  ;01206df4

-    stm (er5-er7),@-sp                  ;01206df5

-

-    stm (er0-er3),@-sp                  ;01306df0

-    stm (er1-er4),@-sp                  ;01306df1

-    stm (er2-er5),@-sp                  ;01306df2

-    stm (er3-er6),@-sp                  ;01306df3

-    stm (er4-er7),@-sp                  ;01306df4

-

-    eepmov.b                            ;7b5c598f

-

-    eepmov.w                            ;7bd4598f

-

-    movmd.b                              ;7b94

-    movmd.w                              ;7ba4

-    movmd.l                              ;7bb4

-    movsd.b  label                       ;7b840004

-    nop                                  ;0000

-    nop                                  ;0000

-label:

-

-	.end

-

diff --git a/gdb/testsuite/gdb.disasm/t02_mova.exp b/gdb/testsuite/gdb.disasm/t02_mova.exp
deleted file mode 100644
index 899bbfdbe36..00000000000
--- a/gdb/testsuite/gdb.disasm/t02_mova.exp
+++ /dev/null
@@ -1,486 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t02_mova"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "mova/b.l\t@\\(0x1234(:16|),r3l.b\\),er1" \
-	"mova/b.c @(0x1234:16,r3l.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),r3.w\\),er1" \
-	"mova/b.c @(0x1234:16,r3.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),r3l.b\\),er1" \
-	"mova/w.c @(0x1234:16,r3l.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),r3.w\\),er1" \
-	"mova/w.c @(0x1234:16,r3.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),r3l.b\\),er1" \
-	"mova/l.c @(0x1234:16,r3l.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),r3.w\\),er1" \
-	"mova/l.c @(0x1234:16,r3.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),r3l.b\\),er1" \
-	"mova/b.c @(0x12345678:32,r3l.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),r3.w\\),er1" \
-	"mova/b.c @(0x12345678:32,r3.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),r3l.b\\),er1" \
-	"mova/w.c @(0x12345678:32,r3l.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),r3.w\\),er1" \
-	"mova/w.c @(0x12345678:32,r3.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),r3l.b\\),er1" \
-	"mova/l.c @(0x12345678:32,r3l.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),r3.w\\),er1" \
-	"mova/l.c @(0x12345678:32,r3.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),r3l.b\\),er1" \
-	"mova/b.l @(0x1234:16,r3l.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),r3.w\\),er1" \
-	"mova/b.l @(0x1234:16,r3.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),r3l.b\\),er1" \
-	"mova/w.l @(0x1234:16,r3l.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),r3.w\\),er1" \
-	"mova/w.l @(0x1234:16,r3.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),r3l.b\\),er1" \
-	"mova/l.l @(0x1234:16,r3l.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),r3.w\\),er1" \
-	"mova/l.l @(0x1234:16,r3.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),r3l.b\\),er1" \
-	"mova/b.l @(0x12345678:32,r3l.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),r3.w\\),er1" \
-	"mova/b.l @(0x12345678:32,r3.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),r3l.b\\),er1" \
-	"mova/w.l @(0x12345678:32,r3l.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),r3.w\\),er1" \
-	"mova/w.l @(0x12345678:32,r3.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),r3l.b\\),er1" \
-	"mova/l.l @(0x12345678:32,r3l.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),r3.w\\),er1" \
-	"mova/l.l @(0x12345678:32,r3.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@er2.b\\),er1" \
-	"mova/b.l @(0x1234:16,@er2.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x1(:2|),er2\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x1:2,er2).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@er2\\+.b\\),er1" \
-	"mova/b.l @(0x1234:16,@er2+.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@-er2.b\\),er1" \
-	"mova/b.l @(0x1234:16,@-er2.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\+er2.b\\),er1" \
-	"mova/b.l @(0x1234:16,@+er2.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@er2-.b\\),er1" \
-	"mova/b.l @(0x1234:16,@er2-.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abc:16,er2).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abcdef0:32,er2).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abc:16,r2l.b).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2.w\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abc:16,r2.w).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2.l\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abc:16,er2.l).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abcdef0:32,r2l.b).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abcdef0:32,r2.w).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\).b\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abcdef0:32,er2.l).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@0x9abc(:16|).b\\),er1" \
-	"mova/b.l @(0x1234:16,@0x9abc:16.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@0x9abcdef0(:32|).b\\),er1" \
-	"mova/b.l @(0x1234:16,@0x9abcdef0:32.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@er2.w\\),er1" \
-	"mova/b.l @(0x1234:16,@er2.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x2(:2|),er2\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x2:2,er2).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@er2\\+.w\\),er1" \
-	"mova/b.l @(0x1234:16,@er2+.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@-er2.w\\),er1" \
-	"mova/b.l @(0x1234:16,@-er2.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\+er2.w\\),er1" \
-	"mova/b.l @(0x1234:16,@+er2.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@er2-.w\\),er1" \
-	"mova/b.l @(0x1234:16,@er2-.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abc:16,er2).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abcdef0:32,er2).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abc:16,r2l.b).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2.w\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abc:16,r2.w).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2.l\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abc:16,er2.l).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abcdef0:32,r2l.b).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abcdef0:32,r2.w).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\).w\\),er1" \
-	"mova/b.l @(0x1234:16,@(0x9abcdef0:32,er2.l).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@0x9abc(:16|).w\\),er1" \
-	"mova/b.l @(0x1234:16,@0x9abc:16.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),@0x9abcdef0(:32|).w\\),er1" \
-	"mova/b.l @(0x1234:16,@0x9abcdef0:32.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@er2.b\\),er1" \
-	"mova/w.l @(0x1234:16,@er2.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x1(:2|),er2\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x1:2,er2).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@er2\\+.b\\),er1" \
-	"mova/w.l @(0x1234:16,@er2+.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@-er2.b\\),er1" \
-	"mova/w.l @(0x1234:16,@-er2.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\+er2.b\\),er1" \
-	"mova/w.l @(0x1234:16,@+er2.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@er2-.b\\),er1" \
-	"mova/w.l @(0x1234:16,@er2-.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abc:16,er2).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abcdef0:32,er2).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abc:16,r2l.b).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2.w\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abc:16,r2.w).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2.l\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abc:16,er2.l).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abcdef0:32,r2l.b).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abcdef0:32,r2.w).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\).b\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abcdef0:32,er2.l).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@0x9abc(:16|).b\\),er1" \
-	"mova/w.l @(0x1234:16,@0x9abc:16.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@0x9abcdef0(:32|).b\\),er1" \
-	"mova/w.l @(0x1234:16,@0x9abcdef0:32.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@er2.w\\),er1" \
-	"mova/w.l @(0x1234:16,@er2.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x2(:2|),er2\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x2:2,er2).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@er2\\+.w\\),er1" \
-	"mova/w.l @(0x1234:16,@er2+.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@-er2.w\\),er1" \
-	"mova/w.l @(0x1234:16,@-er2.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\+er2.w\\),er1" \
-	"mova/w.l @(0x1234:16,@+er2.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@er2-.w\\),er1" \
-	"mova/w.l @(0x1234:16,@er2-.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abc:16,er2).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abcdef0:32,er2).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abc:16,r2l.b).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2.w\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abc:16,r2.w).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2.l\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abc:16,er2.l).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abcdef0:32,r2l.b).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abcdef0:32,r2.w).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\).w\\),er1" \
-	"mova/w.l @(0x1234:16,@(0x9abcdef0:32,er2.l).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@0x9abc(:16|).w\\),er1" \
-	"mova/w.l @(0x1234:16,@0x9abc:16.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x1234(:16|),@0x9abcdef0(:32|).w\\),er1" \
-	"mova/w.l @(0x1234:16,@0x9abcdef0:32.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@er2.b\\),er1" \
-	"mova/l.l @(0x1234:16,@er2.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x1(:2|),er2\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x1:2,er2).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@er2\\+.b\\),er1" \
-	"mova/l.l @(0x1234:16,@er2+.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@-er2.b\\),er1" \
-	"mova/l.l @(0x1234:16,@-er2.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\+er2.b\\),er1" \
-	"mova/l.l @(0x1234:16,@+er2.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@er2-.b\\),er1" \
-	"mova/l.l @(0x1234:16,@er2-.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abc:16,er2).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abcdef0:32,er2).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abc:16,r2l.b).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2.w\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abc:16,r2.w).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2.l\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abc:16,er2.l).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abcdef0:32,r2l.b).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abcdef0:32,r2.w).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\).b\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abcdef0:32,er2.l).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@0x9abc(:16|).b\\),er1" \
-	"mova/l.l @(0x1234:16,@0x9abc:16.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@0x9abcdef0(:32|).b\\),er1" \
-	"mova/l.l @(0x1234:16,@0x9abcdef0:32.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@er2.w\\),er1" \
-	"mova/l.l @(0x1234:16,@er2.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x2(:2|),er2\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x2:2,er2).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@er2\\+.w\\),er1" \
-	"mova/l.l @(0x1234:16,@er2+.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@-er2.w\\),er1" \
-	"mova/l.l @(0x1234:16,@-er2.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\+er2.w\\),er1" \
-	"mova/l.l @(0x1234:16,@+er2.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@er2-.w\\),er1" \
-	"mova/l.l @(0x1234:16,@er2-.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abc:16,er2).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abcdef0:32,er2).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abc:16,r2l.b).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),r2.w\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abc:16,r2.w).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abc(:16|),er2.l\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abc:16,er2.l).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abcdef0:32,r2l.b).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abcdef0:32,r2.w).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\).w\\),er1" \
-	"mova/l.l @(0x1234:16,@(0x9abcdef0:32,er2.l).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@0x9abc(:16|).w\\),er1" \
-	"mova/l.l @(0x1234:16,@0x9abc:16.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x1234(:16|),@0x9abcdef0(:32|).w\\),er1" \
-	"mova/l.l @(0x1234:16,@0x9abcdef0:32.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@er2.b\\),er1" \
-	"mova/b.l @(0x12345678:32,@er2.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x1(:2|),er2\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x1:2,er2).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@er2\\+.b\\),er1" \
-	"mova/b.l @(0x12345678:32,@er2+.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@-er2.b\\),er1" \
-	"mova/b.l @(0x12345678:32,@-er2.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\+er2.b\\),er1" \
-	"mova/b.l @(0x12345678:32,@+er2.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@er2-.b\\),er1" \
-	"mova/b.l @(0x12345678:32,@er2-.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abc:16,er2).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abcdef0:32,er2).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abc:16,r2l.b).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abc:16,r2.w).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abc:16,er2.l).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abcdef0:32,r2l.b).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abcdef0:32,r2.w).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abcdef0:32,er2.l).b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@0x9abc(:16|).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@0x9abc:16.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@0x9abcdef0(:32|).b\\),er1" \
-	"mova/b.l @(0x12345678:32,@0x9abcdef0:32.b),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@er2.w\\),er1" \
-	"mova/b.l @(0x12345678:32,@er2.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x2(:2|),er2\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x2:2,er2).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@er2\\+.w\\),er1" \
-	"mova/b.l @(0x12345678:32,@er2+.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@-er2.w\\),er1" \
-	"mova/b.l @(0x12345678:32,@-er2.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\+er2.w\\),er1" \
-	"mova/b.l @(0x12345678:32,@+er2.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@er2-.w\\),er1" \
-	"mova/b.l @(0x12345678:32,@er2-.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abc:16,er2).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abcdef0:32,er2).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abc:16,r2l.b).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abc:16,r2.w).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abc:16,er2.l).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abcdef0:32,r2l.b).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abcdef0:32,r2.w).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@(0x9abcdef0:32,er2.l).w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@0x9abc(:16|).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@0x9abc:16.w),er1"
-gdb_test "x" "mova/b.l\t@\\(0x12345678(:32|),@0x9abcdef0(:32|).w\\),er1" \
-	"mova/b.l @(0x12345678:32,@0x9abcdef0:32.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@er2.b\\),er1" \
-	"mova/w.l @(0x12345678:32,@er2.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x1(:2|),er2\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x1:2,er2).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@er2\\+.b\\),er1" \
-	"mova/w.l @(0x12345678:32,@er2+.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@-er2.b\\),er1" \
-	"mova/w.l @(0x12345678:32,@-er2.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\+er2.b\\),er1" \
-	"mova/w.l @(0x12345678:32,@+er2.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@er2-.b\\),er1" \
-	"mova/w.l @(0x12345678:32,@er2-.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abc:16,er2).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abcdef0:32,er2).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abc:16,r2l.b).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abc:16,r2.w).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abc:16,er2.l).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abcdef0:32,r2l.b).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abcdef0:32,r2.w).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abcdef0:32,er2.l).b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@0x9abc(:16|).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@0x9abc:16.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@0x9abcdef0(:32|).b\\),er1" \
-	"mova/w.l @(0x12345678:32,@0x9abcdef0:32.b),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@er2.w\\),er1" \
-	"mova/w.l @(0x12345678:32,@er2.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x2(:2|),er2\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x2:2,er2).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@er2\\+.w\\),er1" \
-	"mova/w.l @(0x12345678:32,@er2+.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@-er2.w\\),er1" \
-	"mova/w.l @(0x12345678:32,@-er2.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\+er2.w\\),er1" \
-	"mova/w.l @(0x12345678:32,@+er2.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@er2-.w\\),er1" \
-	"mova/w.l @(0x12345678:32,@er2-.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abc:16,er2).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abcdef0:32,er2).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abc:16,r2l.b).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abc:16,r2.w).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abc:16,er2.l).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abcdef0:32,r2l.b).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abcdef0:32,r2.w).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@(0x9abcdef0:32,er2.l).w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@0x9abc(:16|).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@0x9abc:16.w),er1"
-gdb_test "x" "mova/w.l\t@\\(0x12345678(:32|),@0x9abcdef0(:32|).w\\),er1" \
-	"mova/w.l @(0x12345678:32,@0x9abcdef0:32.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@er2.b\\),er1" \
-	"mova/l.l @(0x12345678:32,@er2.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x1(:2|),er2\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x1:2,er2).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@er2\\+.b\\),er1" \
-	"mova/l.l @(0x12345678:32,@er2+.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@-er2.b\\),er1" \
-	"mova/l.l @(0x12345678:32,@-er2.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\+er2.b\\),er1" \
-	"mova/l.l @(0x12345678:32,@+er2.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@er2-.b\\),er1" \
-	"mova/l.l @(0x12345678:32,@er2-.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abc:16,er2).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abcdef0:32,er2).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abc:16,r2l.b).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abc:16,r2.w).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abc:16,er2.l).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abcdef0:32,r2l.b).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abcdef0:32,r2.w).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abcdef0:32,er2.l).b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@0x9abc(:16|).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@0x9abc:16.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@0x9abcdef0(:32|).b\\),er1" \
-	"mova/l.l @(0x12345678:32,@0x9abcdef0:32.b),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@er2.w\\),er1" \
-	"mova/l.l @(0x12345678:32,@er2.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x2(:2|),er2\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x2:2,er2).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@er2\\+.w\\),er1" \
-	"mova/l.l @(0x12345678:32,@er2+.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@-er2.w\\),er1" \
-	"mova/l.l @(0x12345678:32,@-er2.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\+er2.w\\),er1" \
-	"mova/l.l @(0x12345678:32,@+er2.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@er2-.w\\),er1" \
-	"mova/l.l @(0x12345678:32,@er2-.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abc:16,er2).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abcdef0:32,er2).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abc:16,r2l.b).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abc:16,r2.w).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abc:16,er2.l).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abcdef0:32,r2l.b).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abcdef0:32,r2.w).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@(0x9abcdef0:32,er2.l).w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@0x9abc(:16|).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@0x9abc:16.w),er1"
-gdb_test "x" "mova/l.l\t@\\(0x12345678(:32|),@0x9abcdef0(:32|).w\\),er1" \
-	"mova/l.l @(0x12345678:32,@0x9abcdef0:32.w),er1"
diff --git a/gdb/testsuite/gdb.disasm/t02_mova.s b/gdb/testsuite/gdb.disasm/t02_mova.s
deleted file mode 100644
index 8a2e228095f..00000000000
--- a/gdb/testsuite/gdb.disasm/t02_mova.s
+++ /dev/null
@@ -1,238 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;mova

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    mova/b.c @(0x1234:16,r3l.b),er1              ;7A891234

-    mova/b.c @(0x1234:16,r3.w),er1              ;7A991234

-    mova/w.c @(0x1234:16,r3l.b),er1           ;7AA91234

-    mova/w.c @(0x1234:16,r3.w),er1           ;7AB91234

-    mova/l.c @(0x1234:16,r3l.b),er1           ;7AC91234

-    mova/l.c @(0x1234:16,r3.w),er1           ;7AD91234

-    mova/b.c @(0x12345678:32,r3l.b),er1              ;7A8112345678

-    mova/b.c @(0x12345678:32,r3.w),er1              ;7A9112345678

-    mova/w.c @(0x12345678:32,r3l.b),er1           ;7AA112345678

-    mova/w.c @(0x12345678:32,r3.w),er1           ;7AB112345678

-    mova/l.c @(0x12345678:32,r3l.b),er1           ;7AC112345678

-    mova/l.c @(0x12345678:32,r3.w),er1           ;7AD112345678

-

-    mova/b.l @(0x1234:16,r3l.b),er1              ;78B87A891234

-    mova/b.l @(0x1234:16,r3.w),er1              ;78397A991234

-    mova/w.l @(0x1234:16,r3l.b),er1           ;78B87AA91234

-    mova/w.l @(0x1234:16,r3.w),er1           ;78397AB91234

-    mova/l.l @(0x1234:16,r3l.b),er1           ;78B87AC91234

-    mova/l.l @(0x1234:16,r3.w),er1           ;78397AD91234

-    mova/b.l @(0x12345678:32,r3l.b),er1              ;78B87A8112345678

-    mova/b.l @(0x12345678:32,r3.w),er1              ;78397A9112345678

-    mova/w.l @(0x12345678:32,r3l.b),er1           ;78B87AA112345678

-    mova/w.l @(0x12345678:32,r3.w),er1           ;78397AB112345678

-    mova/l.l @(0x12345678:32,r3l.b),er1           ;78B87AC112345678

-    mova/l.l @(0x12345678:32,r3.w),er1           ;78397AD112345678

-

-    mova/b.l @(0x1234:16,@er2.b),er1              ;017F02811234

-    mova/b.l @(0x1234:16,@(0x1:2,er2).b),er1       ;017F12811234

-    mova/b.l @(0x1234:16,@er2+.b),er1             ;017F82811234

-    mova/b.l @(0x1234:16,@-er2.b),er1             ;017FB2811234

-    mova/b.l @(0x1234:16,@+er2.b),er1             ;017F92811234

-    mova/b.l @(0x1234:16,@er2-.b),er1             ;017FA2811234

-    mova/b.l @(0x1234:16,@(0xFFFF9ABC:16,er2).b),er1      ;017FC2819ABC1234

-    mova/b.l @(0x1234:16,@(0x9ABCDEF0:32,er2).b),er1      ;017FCA819ABCDEF01234

-    mova/b.l @(0x1234:16,@(0xFFFF9ABC:16,r2L.b).b),er1    ;017FD2819ABC1234

-    mova/b.l @(0x1234:16,@(0xFFFF9ABC:16,r2.w).b),er1    ;017FE2819ABC1234

-    mova/b.l @(0x1234:16,@(0xFFFF9ABC:16,er2.l).b),er1    ;017FF2819ABC1234

-    mova/b.l @(0x1234:16,@(0x9ABCDEF0:32,r2L.b).b),er1    ;017FDA819ABCDEF01234

-    mova/b.l @(0x1234:16,@(0x9ABCDEF0:32,r2.w).b),er1    ;017FEA819ABCDEF01234

-    mova/b.l @(0x1234:16,@(0x9ABCDEF0:32,er2.l).b),er1    ;017FFA819ABCDEF01234

-    mova/b.l @(0x1234:16,@0xFFFF9ABC:16.b),er1            ;017F40819ABC1234

-    mova/b.l @(0x1234:16,@0x9ABCDEF0:32.b),er1            ;017F48819ABCDEF01234

-

-    mova/b.l @(0x1234:16,@er2.w),er1              ;015F02911234

-    mova/b.l @(0x1234:16,@(0x2:2,er2).w),er1    ;015F12911234

-    mova/b.l @(0x1234:16,@er2+.w),er1             ;015F82911234

-    mova/b.l @(0x1234:16,@-er2.w),er1             ;015FB2911234

-    mova/b.l @(0x1234:16,@+er2.w),er1             ;015F92911234

-    mova/b.l @(0x1234:16,@er2-.w),er1             ;015FA2911234

-    mova/b.l @(0x1234:16,@(0xFFFF9ABC:16,er2).w),er1      ;015FC2919ABC1234

-    mova/b.l @(0x1234:16,@(0x9ABCDEF0:32,er2).w),er1      ;015FCA919ABCDEF01234

-    mova/b.l @(0x1234:16,@(0xFFFF9ABC:16,r2L.b).w),er1    ;015FD2919ABC1234

-    mova/b.l @(0x1234:16,@(0xFFFF9ABC:16,r2.w).w),er1    ;015FE2919ABC1234

-    mova/b.l @(0x1234:16,@(0xFFFF9ABC:16,er2.l).w),er1    ;015FF2919ABC1234

-    mova/b.l @(0x1234:16,@(0x9ABCDEF0:32,r2L.b).w),er1    ;015FDA919ABCDEF01234

-    mova/b.l @(0x1234:16,@(0x9ABCDEF0:32,r2.w).w),er1    ;015FEA919ABCDEF01234

-    mova/b.l @(0x1234:16,@(0x9ABCDEF0:32,er2.l).w),er1    ;015FFA919ABCDEF01234

-    mova/b.l @(0x1234:16,@0xFFFF9ABC:16.w),er1            ;015F40919ABC1234

-    mova/b.l @(0x1234:16,@0x9ABCDEF0:32.w),er1            ;015F48919ABCDEF01234

-

-    mova/w.l @(0x1234:16,@er2.b),er1           ;017F02A11234

-    mova/w.l @(0x1234:16,@(0x1:2,er2).b),er1    ;017F12A11234

-    mova/w.l @(0x1234:16,@er2+.b),er1          ;017F82A11234

-    mova/w.l @(0x1234:16,@-er2.b),er1          ;017FB2A11234

-    mova/w.l @(0x1234:16,@+er2.b),er1          ;017F92A11234

-    mova/w.l @(0x1234:16,@er2-.b),er1          ;017FA2A11234

-    mova/w.l @(0x1234:16,@(0xFFFF9ABC:16,er2).b),er1   ;017FC2A19ABC1234

-    mova/w.l @(0x1234:16,@(0x9ABCDEF0:32,er2).b),er1   ;017FCAA19ABCDEF01234

-    mova/w.l @(0x1234:16,@(0xFFFF9ABC:16,r2L.b).b),er1 ;017FD2A19ABC1234

-    mova/w.l @(0x1234:16,@(0xFFFF9ABC:16,r2.w).b),er1 ;017FE2A19ABC1234

-    mova/w.l @(0x1234:16,@(0xFFFF9ABC:16,er2.l).b),er1 ;017FF2A19ABC1234

-    mova/w.l @(0x1234:16,@(0x9ABCDEF0:32,r2L.b).b),er1 ;017FDAA19ABCDEF01234

-    mova/w.l @(0x1234:16,@(0x9ABCDEF0:32,r2.w).b),er1 ;017FEAA19ABCDEF01234

-    mova/w.l @(0x1234:16,@(0x9ABCDEF0:32,er2.l).b),er1 ;017FFAA19ABCDEF01234

-    mova/w.l @(0x1234:16,@0xFFFF9ABC:16.b),er1         ;017F40A19ABC1234

-    mova/w.l @(0x1234:16,@0x9ABCDEF0:32.b),er1         ;017F48A19ABCDEF01234

-

-    mova/w.l @(0x1234:16,@er2.w),er1           ;015F02B11234

-    mova/w.l @(0x1234:16,@(0x2:2,er2).w),er1 ;015F12B11234

-    mova/w.l @(0x1234:16,@er2+.w),er1          ;015F82B11234

-    mova/w.l @(0x1234:16,@-er2.w),er1          ;015FB2B11234

-    mova/w.l @(0x1234:16,@+er2.w),er1          ;015F92B11234

-    mova/w.l @(0x1234:16,@er2-.w),er1          ;015FA2B11234

-    mova/w.l @(0x1234:16,@(0xFFFF9ABC:16,er2).w),er1   ;015FC2B19ABC1234

-    mova/w.l @(0x1234:16,@(0x9ABCDEF0:32,er2).w),er1   ;015FCAB19ABCDEF01234

-    mova/w.l @(0x1234:16,@(0xFFFF9ABC:16,r2L.b).w),er1 ;015FD2B19ABC1234

-    mova/w.l @(0x1234:16,@(0xFFFF9ABC:16,r2.w).w),er1 ;015FE2B19ABC1234

-    mova/w.l @(0x1234:16,@(0xFFFF9ABC:16,er2.l).w),er1 ;015FF2B19ABC1234

-    mova/w.l @(0x1234:16,@(0x9ABCDEF0:32,r2L.b).w),er1 ;015FDAB19ABCDEF01234

-    mova/w.l @(0x1234:16,@(0x9ABCDEF0:32,r2.w).w),er1 ;015FEAB19ABCDEF01234

-    mova/w.l @(0x1234:16,@(0x9ABCDEF0:32,er2.l).w),er1 ;015FFAB19ABCDEF01234

-    mova/w.l @(0x1234:16,@0xFFFF9ABC:16.w),er1         ;015F40B19ABC1234

-    mova/w.l @(0x1234:16,@0x9ABCDEF0:32.w),er1         ;015F48B19ABCDEF01234

-

-    mova/l.l @(0x1234:16,@er2.b),er1           ;017F02C11234

-    mova/l.l @(0x1234:16,@(0x1:2,er2).b),er1    ;017F12C11234

-    mova/l.l @(0x1234:16,@er2+.b),er1          ;017F82C11234

-    mova/l.l @(0x1234:16,@-er2.b),er1          ;017FB2C11234

-    mova/l.l @(0x1234:16,@+er2.b),er1          ;017F92C11234

-    mova/l.l @(0x1234:16,@er2-.b),er1          ;017FA2C11234

-    mova/l.l @(0x1234:16,@(0xFFFF9ABC:16,er2).b),er1   ;017FC2C19ABC1234

-    mova/l.l @(0x1234:16,@(0x9ABCDEF0:32,er2).b),er1   ;017FCAC19ABCDEF01234

-    mova/l.l @(0x1234:16,@(0xFFFF9ABC:16,r2L.b).b),er1 ;017FD2C19ABC1234

-    mova/l.l @(0x1234:16,@(0xFFFF9ABC:16,r2.w).b),er1 ;017FE2C19ABC1234

-    mova/l.l @(0x1234:16,@(0xFFFF9ABC:16,er2.l).b),er1 ;017FF2C19ABC1234

-    mova/l.l @(0x1234:16,@(0x9ABCDEF0:32,r2L.b).b),er1 ;017FDAC19ABCDEF01234

-    mova/l.l @(0x1234:16,@(0x9ABCDEF0:32,r2.w).b),er1 ;017FEAC19ABCDEF01234

-    mova/l.l @(0x1234:16,@(0x9ABCDEF0:32,er2.l).b),er1 ;017FFAC19ABCDEF01234

-    mova/l.l @(0x1234:16,@0xFFFF9ABC:16.b),er1         ;017F40C19ABC1234

-    mova/l.l @(0x1234:16,@0x9ABCDEF0:32.b),er1         ;017F48C19ABCDEF01234

-

-    mova/l.l @(0x1234:16,@er2.w),er1           ;015F02D11234

-    mova/l.l @(0x1234:16,@(0x2:2,er2).w),er1   ;015F12D11234

-    mova/l.l @(0x1234:16,@er2+.w),er1          ;015F82D11234

-    mova/l.l @(0x1234:16,@-er2.w),er1          ;015FB2D11234

-    mova/l.l @(0x1234:16,@+er2.w),er1          ;015F92D11234

-    mova/l.l @(0x1234:16,@er2-.w),er1          ;015FA2D11234

-    mova/l.l @(0x1234:16,@(0xFFFF9ABC:16,er2).w),er1   ;015FC2D19ABC1234

-    mova/l.l @(0x1234:16,@(0x9ABCDEF0:32,er2).w),er1   ;015FCAD19ABCDEF01234

-    mova/l.l @(0x1234:16,@(0xFFFF9ABC:16,r2L.b).w),er1 ;015FD2D19ABC1234

-    mova/l.l @(0x1234:16,@(0xFFFF9ABC:16,r2.w).w),er1 ;015FE2D19ABC1234

-    mova/l.l @(0x1234:16,@(0xFFFF9ABC:16,er2.l).w),er1 ;015FF2D19ABC1234

-    mova/l.l @(0x1234:16,@(0x9ABCDEF0:32,r2L.b).w),er1 ;015FDAD19ABCDEF01234

-    mova/l.l @(0x1234:16,@(0x9ABCDEF0:32,r2.w).w),er1 ;015FEAD19ABCDEF01234

-    mova/l.l @(0x1234:16,@(0x9ABCDEF0:32,er2.l).w),er1 ;015FFAD19ABCDEF01234

-    mova/l.l @(0x1234:16,@0xFFFF9ABC:16.w),er1         ;015F40D19ABC1234

-    mova/l.l @(0x1234:16,@0x9ABCDEF0:32.w),er1         ;015F48D19ABCDEF01234

-

-    mova/b.l @(0x12345678:32,@er2.b),er1              ;017F028912345678

-    mova/b.l @(0x12345678:32,@(0x1:2,er2).b),er1       ;017F128912345678

-    mova/b.l @(0x12345678:32,@er2+.b),er1             ;017F828912345678

-    mova/b.l @(0x12345678:32,@-er2.b),er1             ;017FB28912345678

-    mova/b.l @(0x12345678:32,@+er2.b),er1             ;017F928912345678

-    mova/b.l @(0x12345678:32,@er2-.b),er1             ;017FA28912345678

-    mova/b.l @(0x12345678:32,@(0xFFFF9ABC:16,er2).b),er1      ;017FC2899ABC12345678

-    mova/b.l @(0x12345678:32,@(0x9ABCDEF0:32,er2).b),er1      ;017FCA899ABCDEF012345678

-    mova/b.l @(0x12345678:32,@(0xFFFF9ABC:16,r2L.b).b),er1    ;017FD2899ABC12345678

-    mova/b.l @(0x12345678:32,@(0xFFFF9ABC:16,r2.w).b),er1    ;017FE2899ABC12345678

-    mova/b.l @(0x12345678:32,@(0xFFFF9ABC:16,er2.l).b),er1    ;017FF2899ABC12345678

-    mova/b.l @(0x12345678:32,@(0x9ABCDEF0:32,r2L.b).b),er1    ;017FDA899ABCDEF012345678

-    mova/b.l @(0x12345678:32,@(0x9ABCDEF0:32,r2.w).b),er1    ;017FEA899ABCDEF012345678

-    mova/b.l @(0x12345678:32,@(0x9ABCDEF0:32,er2.l).b),er1    ;017FFA899ABCDEF012345678

-    mova/b.l @(0x12345678:32,@0xFFFF9ABC:16.b),er1            ;017F40899ABC12345678

-    mova/b.l @(0x12345678:32,@0x9ABCDEF0:32.b),er1            ;017F48899ABCDEF012345678

-

-    mova/b.l @(0x12345678:32,@er2.w),er1              ;015F029912345678

-    mova/b.l @(0x12345678:32,@(0x2:2,er2).w),er1      ;015F129912345678

-    mova/b.l @(0x12345678:32,@er2+.w),er1             ;015F829912345678

-    mova/b.l @(0x12345678:32,@-er2.w),er1             ;015FB29912345678

-    mova/b.l @(0x12345678:32,@+er2.w),er1             ;015F929912345678

-    mova/b.l @(0x12345678:32,@er2-.w),er1             ;015FA29912345678

-    mova/b.l @(0x12345678:32,@(0xFFFF9ABC:16,er2).w),er1      ;015FC2999ABC12345678

-    mova/b.l @(0x12345678:32,@(0x9ABCDEF0:32,er2).w),er1      ;015FCA999ABCDEF012345678

-    mova/b.l @(0x12345678:32,@(0xFFFF9ABC:16,r2L.b).w),er1    ;015FD2999ABC12345678

-    mova/b.l @(0x12345678:32,@(0xFFFF9ABC:16,r2.w).w),er1    ;015FE2999ABC12345678

-    mova/b.l @(0x12345678:32,@(0xFFFF9ABC:16,er2.l).w),er1    ;015FF2999ABC12345678

-    mova/b.l @(0x12345678:32,@(0x9ABCDEF0:32,r2L.b).w),er1    ;015FDA999ABCDEF012345678

-    mova/b.l @(0x12345678:32,@(0x9ABCDEF0:32,r2.w).w),er1    ;015FEA999ABCDEF012345678

-    mova/b.l @(0x12345678:32,@(0x9ABCDEF0:32,er2.l).w),er1    ;015FFA999ABCDEF012345678

-    mova/b.l @(0x12345678:32,@0xFFFF9ABC:16.w),er1            ;015F40999ABC12345678

-    mova/b.l @(0x12345678:32,@0x9ABCDEF0:32.w),er1            ;015F48999ABCDEF012345678

-

-    mova/w.l @(0x12345678:32,@er2.b),er1           ;017F02A912345678

-    mova/w.l @(0x12345678:32,@(0x1:2,er2).b),er1   ;017F12A912345678

-    mova/w.l @(0x12345678:32,@er2+.b),er1          ;017F82A912345678

-    mova/w.l @(0x12345678:32,@-er2.b),er1          ;017FB2A912345678

-    mova/w.l @(0x12345678:32,@+er2.b),er1          ;017F92A912345678

-    mova/w.l @(0x12345678:32,@er2-.b),er1          ;017FA2A912345678

-    mova/w.l @(0x12345678:32,@(0xFFFF9ABC:16,er2).b),er1   ;017FC2A99ABC12345678

-    mova/w.l @(0x12345678:32,@(0x9ABCDEF0:32,er2).b),er1   ;017FCAA99ABCDEF012345678

-    mova/w.l @(0x12345678:32,@(0xFFFF9ABC:16,r2L.b).b),er1 ;017FD2A99ABC12345678

-    mova/w.l @(0x12345678:32,@(0xFFFF9ABC:16,r2.w).b),er1 ;017FE2A99ABC12345678

-    mova/w.l @(0x12345678:32,@(0xFFFF9ABC:16,er2.l).b),er1 ;017FF2A99ABC12345678

-    mova/w.l @(0x12345678:32,@(0x9ABCDEF0:32,r2L.b).b),er1 ;017FDAA99ABCDEF012345678

-    mova/w.l @(0x12345678:32,@(0x9ABCDEF0:32,r2.w).b),er1 ;017FEAA99ABCDEF012345678

-    mova/w.l @(0x12345678:32,@(0x9ABCDEF0:32,er2.l).b),er1 ;017FFAA99ABCDEF012345678

-    mova/w.l @(0x12345678:32,@0xFFFF9ABC:16.b),er1         ;017F40A99ABC12345678

-    mova/w.l @(0x12345678:32,@0x9ABCDEF0:32.b),er1         ;017F48A99ABCDEF012345678

-

-    mova/w.l @(0x12345678:32,@er2.w),er1           ;015F02B912345678

-    mova/w.l @(0x12345678:32,@(0x2:2,er2).w),er1   ;015F12B912345678

-    mova/w.l @(0x12345678:32,@er2+.w),er1          ;015F82B912345678

-    mova/w.l @(0x12345678:32,@-er2.w),er1          ;015FB2B912345678

-    mova/w.l @(0x12345678:32,@+er2.w),er1          ;015F92B912345678

-    mova/w.l @(0x12345678:32,@er2-.w),er1          ;015FA2B912345678

-    mova/w.l @(0x12345678:32,@(0xFFFF9ABC:16,er2).w),er1   ;015FC2B99ABC12345678

-    mova/w.l @(0x12345678:32,@(0x9ABCDEF0:32,er2).w),er1   ;015FCAB99ABCDEF012345678

-    mova/w.l @(0x12345678:32,@(0xFFFF9ABC:16,r2L.b).w),er1 ;015FD2B99ABC12345678

-    mova/w.l @(0x12345678:32,@(0xFFFF9ABC:16,r2.w).w),er1 ;015FE2B99ABC12345678

-    mova/w.l @(0x12345678:32,@(0xFFFF9ABC:16,er2.l).w),er1 ;015FF2B99ABC12345678

-    mova/w.l @(0x12345678:32,@(0x9ABCDEF0:32,r2L.b).w),er1 ;015FDAB99ABCDEF012345678

-    mova/w.l @(0x12345678:32,@(0x9ABCDEF0:32,r2.w).w),er1 ;015FEAB99ABCDEF012345678

-    mova/w.l @(0x12345678:32,@(0x9ABCDEF0:32,er2.l).w),er1 ;015FFAB99ABCDEF012345678

-    mova/w.l @(0x12345678:32,@0xFFFF9ABC:16.w),er1         ;015F40B99ABC12345678

-    mova/w.l @(0x12345678:32,@0x9ABCDEF0:32.w),er1         ;015F48B99ABCDEF012345678

-

-    mova/l.l @(0x12345678:32,@er2.b),er1           ;017F02C912345678

-    mova/l.l @(0x12345678:32,@(0x1:2,er2).b),er1   ;017F12C912345678

-    mova/l.l @(0x12345678:32,@er2+.b),er1          ;017F82C912345678

-    mova/l.l @(0x12345678:32,@-er2.b),er1          ;017FB2C912345678

-    mova/l.l @(0x12345678:32,@+er2.b),er1          ;017F92C912345678

-    mova/l.l @(0x12345678:32,@er2-.b),er1          ;017FA2C912345678

-    mova/l.l @(0x12345678:32,@(0xFFFF9ABC:16,er2).b),er1   ;017FC2C99ABC12345678

-    mova/l.l @(0x12345678:32,@(0x9ABCDEF0:32,er2).b),er1   ;017FCAC99ABCDEF012345678

-    mova/l.l @(0x12345678:32,@(0xFFFF9ABC:16,r2L.b).b),er1 ;017FD2C99ABC12345678

-    mova/l.l @(0x12345678:32,@(0xFFFF9ABC:16,r2.w).b),er1 ;017FE2C99ABC12345678

-    mova/l.l @(0x12345678:32,@(0xFFFF9ABC:16,er2.l).b),er1 ;017FF2C99ABC12345678

-    mova/l.l @(0x12345678:32,@(0x9ABCDEF0:32,r2L.b).b),er1 ;017FDAC99ABCDEF012345678

-    mova/l.l @(0x12345678:32,@(0x9ABCDEF0:32,r2.w).b),er1 ;017FEAC99ABCDEF012345678

-    mova/l.l @(0x12345678:32,@(0x9ABCDEF0:32,er2.l).b),er1 ;017FFAC99ABCDEF012345678

-    mova/l.l @(0x12345678:32,@0xFFFF9ABC:16.b),er1         ;017F40C99ABC12345678

-    mova/l.l @(0x12345678:32,@0x9ABCDEF0:32.b),er1         ;017F48C99ABCDEF012345678

-

-    mova/l.l @(0x12345678:32,@er2.w),er1           ;015F02D912345678

-    mova/l.l @(0x12345678:32,@(0x2:2,er2).w),er1 ;015F12D912345678

-    mova/l.l @(0x12345678:32,@er2+.w),er1          ;015F82D912345678

-    mova/l.l @(0x12345678:32,@-er2.w),er1          ;015FB2D912345678

-    mova/l.l @(0x12345678:32,@+er2.w),er1          ;015F92D912345678

-    mova/l.l @(0x12345678:32,@er2-.w),er1          ;015FA2D912345678

-    mova/l.l @(0x12345678:32,@(0xFFFF9ABC:16,er2).w),er1   ;015FC2D99ABC12345678

-    mova/l.l @(0x12345678:32,@(0x9ABCDEF0:32,er2).w),er1   ;015FCAD99ABCDEF012345678

-    mova/l.l @(0x12345678:32,@(0xFFFF9ABC:16,r2L.b).w),er1 ;015FD2D99ABC12345678

-    mova/l.l @(0x12345678:32,@(0xFFFF9ABC:16,r2.w).w),er1 ;015FE2D99ABC12345678

-    mova/l.l @(0x12345678:32,@(0xFFFF9ABC:16,er2.l).w),er1 ;015FF2D99ABC12345678

-    mova/l.l @(0x12345678:32,@(0x9ABCDEF0:32,r2L.b).w),er1 ;015FDAD99ABCDEF012345678

-    mova/l.l @(0x12345678:32,@(0x9ABCDEF0:32,r2.w).w),er1 ;015FEAD99ABCDEF012345678

-    mova/l.l @(0x12345678:32,@(0x9ABCDEF0:32,er2.l).w),er1 ;015FFAD99ABCDEF012345678

-    mova/l.l @(0x12345678:32,@0xFFFF9ABC:16.w),er1         ;015F40D99ABC12345678

-    mova/l.l @(0x12345678:32,@0x9ABCDEF0:32.w),er1         ;015F48D99ABCDEF012345678

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t03_add.exp b/gdb/testsuite/gdb.disasm/t03_add.exp
deleted file mode 100644
index 5128fb92d4c..00000000000
--- a/gdb/testsuite/gdb.disasm/t03_add.exp
+++ /dev/null
@@ -1,1876 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t03_add"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "add.b\t#0x12(:8|),r1h" \
-	"add.b #0x12:8,r1h"
-gdb_test "x" "add.b\t#0x12(:8|),@er1" \
-	"add.b #0x12:8,@er1"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x3(:2|),er1\\)" \
-	"add.b #0x12:8,@(0x3:2,er1)"
-gdb_test "x" "add.b\t#0x12(:8|),@er1\\+" \
-	"add.b #0x12:8,@er1+"
-gdb_test "x" "add.b\t#0x12(:8|),@-er1" \
-	"add.b #0x12:8,@-er1"
-gdb_test "x" "add.b\t#0x12(:8|),@\\+er1" \
-	"add.b #0x12:8,@+er1"
-gdb_test "x" "add.b\t#0x12(:8|),@er1-" \
-	"add.b #0x12:8,@er1-"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x1234(:16|),er1\\)" \
-	"add.b #0x12:8,@(0x1234:16,er1)"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x12345678(:32|),er1\\)" \
-	"add.b #0x12:8,@(0x12345678:32,er1)"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x1234(:16|),r2l.b\\)" \
-	"add.b #0x12:8,@(0x1234:16,r2l.b)"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x1234(:16|),r2.w\\)" \
-	"add.b #0x12:8,@(0x1234:16,r2.w)"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x1234(:16|),er2.l\\)" \
-	"add.b #0x12:8,@(0x1234:16,er2.l)"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x12345678(:32|),r2l.b\\)" \
-	"add.b #0x12:8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x12345678(:32|),r2.w\\)" \
-	"add.b #0x12:8,@(0x12345678:32,r2.w)"
-gdb_test "x" "add.b\t#0x12(:8|),@\\(0x12345678(:32|),er2.l\\)" \
-	"add.b #0x12:8,@(0x12345678:32,er2.l)"
-gdb_test "x" "add.b\t#0x12(:8|),@0x9a(:8|)" \
-	"add.b #0x12:8,@0x9a:8"
-gdb_test "x" "add.b\t#0x12(:8|),@0x1234(:16|)" \
-	"add.b #0x12:8,@0x1234:16"
-gdb_test "x" "add.b\t#0x12(:8|),@0x12345678(:32|)" \
-	"add.b #0x12:8,@0x12345678:32"
-gdb_test "x" "add.b\tr3h,r1h" \
-	"add.b r3h,r1h"
-gdb_test "x" "add.b\tr3h,@er1" \
-	"add.b r3h,@er1"
-gdb_test "x" "add.b\tr3h,@\\(0x3(:2|),er1\\)" \
-	"add.b r3h,@(0x3:2,er1)"
-gdb_test "x" "add.b\tr3h,@er1\\+" \
-	"add.b r3h,@er1+"
-gdb_test "x" "add.b\tr3h,@-er1" \
-	"add.b r3h,@-er1"
-gdb_test "x" "add.b\tr3h,@\\+er1" \
-	"add.b r3h,@+er1"
-gdb_test "x" "add.b\tr3h,@er1-" \
-	"add.b r3h,@er1-"
-gdb_test "x" "add.b\tr3h,@\\(0x1234(:16|),er1\\)" \
-	"add.b r3h,@(0x1234:16,er1)"
-gdb_test "x" "add.b\tr3h,@\\(0x12345678(:32|),er1\\)" \
-	"add.b r3h,@(0x12345678:32,er1)"
-gdb_test "x" "add.b\tr3h,@\\(0x1234(:16|),r2l.b\\)" \
-	"add.b r3h,@(0x1234:16,r2l.b)"
-gdb_test "x" "add.b\tr3h,@\\(0x1234(:16|),r2.w\\)" \
-	"add.b r3h,@(0x1234:16,r2.w)"
-gdb_test "x" "add.b\tr3h,@\\(0x1234(:16|),er2.l\\)" \
-	"add.b r3h,@(0x1234:16,er2.l)"
-gdb_test "x" "add.b\tr3h,@\\(0x12345678(:32|),r2l.b\\)" \
-	"add.b r3h,@(0x12345678:32,r2l.b)"
-gdb_test "x" "add.b\tr3h,@\\(0x12345678(:32|),r2.w\\)" \
-	"add.b r3h,@(0x12345678:32,r2.w)"
-gdb_test "x" "add.b\tr3h,@\\(0x12345678(:32|),er2.l\\)" \
-	"add.b r3h,@(0x12345678:32,er2.l)"
-gdb_test "x" "add.b\tr3h,@0x12(:8|)" \
-	"add.b r3h,@0x12:8"
-gdb_test "x" "add.b\tr3h,@0x1234(:16|)" \
-	"add.b r3h,@0x1234:16"
-gdb_test "x" "add.b\tr3h,@0x12345678(:32|)" \
-	"add.b r3h,@0x12345678:32"
-gdb_test "x" "add.b\t@er3,r1h" \
-	"add.b @er3,r1h"
-gdb_test "x" "add.b\t@\\(0x3(:2|),er3\\),r1h" \
-	"add.b @(0x3:2,er3),r1h"
-gdb_test "x" "add.b\t@er3\\+,r1h" \
-	"add.b @er3+,r1h"
-gdb_test "x" "add.b\t@-er3,r1h" \
-	"add.b @-er3,r1h"
-gdb_test "x" "add.b\t@\\+er3,r1h" \
-	"add.b @+er3,r1h"
-gdb_test "x" "add.b\t@er3-,r1h" \
-	"add.b @er3-,r1h"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er1\\),r1h" \
-	"add.b @(0x1234:16,er1),r1h"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er1\\),r1h" \
-	"add.b @(0x12345678:32,er1),r1h"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r2l.b\\),r1h" \
-	"add.b @(0x1234:16,r2l.b),r1h"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r2.w\\),r1h" \
-	"add.b @(0x1234:16,r2.w),r1h"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er2.l\\),r1h" \
-	"add.b @(0x1234:16,er2.l),r1h"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r2l.b\\),r1h" \
-	"add.b @(0x12345678:32,r2l.b),r1h"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r2.w\\),r1h" \
-	"add.b @(0x12345678:32,r2.w),r1h"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er2.l\\),r1h" \
-	"add.b @(0x12345678:32,er2.l),r1h"
-gdb_test "x" "add.b\t@0x12(:8|),r1h" \
-	"add.b @0x12:8,r1h"
-gdb_test "x" "add.b\t@0x1234(:16|),r1h" \
-	"add.b @0x1234:16,r1h"
-gdb_test "x" "add.b\t@0x12345678(:32|),r1h" \
-	"add.b @0x12345678:32,r1h"
-gdb_test "x" "add.b\t@er3,@er1" \
-	"add.b @er3,@er1"
-gdb_test "x" "add.b\t@er3,@\\(0x3(:2|),er1\\)" \
-	"add.b @er3,@(0x3:2,er1)"
-gdb_test "x" "add.b\t@er3,@-er1" \
-	"add.b @er3,@-er1"
-gdb_test "x" "add.b\t@er3,@er1\\+" \
-	"add.b @er3,@er1+"
-gdb_test "x" "add.b\t@er3,@er1-" \
-	"add.b @er3,@er1-"
-gdb_test "x" "add.b\t@er3,@\\+er1" \
-	"add.b @er3,@+er1"
-gdb_test "x" "add.b\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.b @er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@er3,@0x9abc(:16|)" \
-	"add.b @er3,@0x9abc:16"
-gdb_test "x" "add.b\t@er3,@0x9abcdef0(:32|)" \
-	"add.b @er3,@0x9abcdef0:32"
-gdb_test "x" "add.b\t@-er3,@er1" \
-	"add.b @-er3,@er1"
-gdb_test "x" "add.b\t@-er3,@\\(0x3(:2|),er1\\)" \
-	"add.b @-er3,@(0x3:2,er1)"
-gdb_test "x" "add.b\t@-er3,@-er1" \
-	"add.b @-er3,@-er1"
-gdb_test "x" "add.b\t@-er3,@er1\\+" \
-	"add.b @-er3,@er1+"
-gdb_test "x" "add.b\t@-er3,@er1-" \
-	"add.b @-er3,@er1-"
-gdb_test "x" "add.b\t@-er3,@\\+er1" \
-	"add.b @-er3,@+er1"
-gdb_test "x" "add.b\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.b @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@-er3,@0x9abc(:16|)" \
-	"add.b @-er3,@0x9abc:16"
-gdb_test "x" "add.b\t@-er3,@0x9abcdef0(:32|)" \
-	"add.b @-er3,@0x9abcdef0:32"
-gdb_test "x" "add.b\t@er3\\+,@er1" \
-	"add.b @er3+,@er1"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x3(:2|),er1\\)" \
-	"add.b @er3+,@(0x3:2,er1)"
-gdb_test "x" "add.b\t@er3\\+,@-er1" \
-	"add.b @er3+,@-er1"
-gdb_test "x" "add.b\t@er3\\+,@er1\\+" \
-	"add.b @er3+,@er1+"
-gdb_test "x" "add.b\t@er3\\+,@er1-" \
-	"add.b @er3+,@er1-"
-gdb_test "x" "add.b\t@er3\\+,@\\+er1" \
-	"add.b @er3+,@+er1"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"add.b @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@er3\\+,@0x9abc(:16|)" \
-	"add.b @er3+,@0x9abc:16"
-gdb_test "x" "add.b\t@er3\\+,@0x9abcdef0(:32|)" \
-	"add.b @er3+,@0x9abcdef0:32"
-gdb_test "x" "add.b\t@er3-,@er1" \
-	"add.b @er3-,@er1"
-gdb_test "x" "add.b\t@er3-,@\\(0x3(:2|),er1\\)" \
-	"add.b @er3-,@(0x3:2,er1)"
-gdb_test "x" "add.b\t@er3-,@-er1" \
-	"add.b @er3-,@-er1"
-gdb_test "x" "add.b\t@er3-,@er1\\+" \
-	"add.b @er3-,@er1+"
-gdb_test "x" "add.b\t@er3-,@er1-" \
-	"add.b @er3-,@er1-"
-gdb_test "x" "add.b\t@er3-,@\\+er1" \
-	"add.b @er3-,@+er1"
-gdb_test "x" "add.b\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"add.b @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@er3-,@0x9abc(:16|)" \
-	"add.b @er3-,@0x9abc:16"
-gdb_test "x" "add.b\t@er3-,@0x9abcdef0(:32|)" \
-	"add.b @er3-,@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\+er3,@er1" \
-	"add.b @+er3,@er1"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x3(:2|),er1\\)" \
-	"add.b @+er3,@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\+er3,@-er1" \
-	"add.b @+er3,@-er1"
-gdb_test "x" "add.b\t@\\+er3,@er1\\+" \
-	"add.b @+er3,@er1+"
-gdb_test "x" "add.b\t@\\+er3,@er1-" \
-	"add.b @+er3,@er1-"
-gdb_test "x" "add.b\t@\\+er3,@\\+er1" \
-	"add.b @+er3,@+er1"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.b @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\+er3,@0x9abc(:16|)" \
-	"add.b @+er3,@0x9abc:16"
-gdb_test "x" "add.b\t@\\+er3,@0x9abcdef0(:32|)" \
-	"add.b @+er3,@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@er1" \
-	"add.b @(0x1234:16,er3),@er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"add.b @(0x1234:16,er3),@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"add.b @(0x1234:16,er3),@-er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"add.b @(0x1234:16,er3),@er1+"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"add.b @(0x1234:16,er3),@er1-"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"add.b @(0x1234:16,er3),@+er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"add.b @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"add.b @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"add.b @(0x12345678:32,er3),@er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"add.b @(0x12345678:32,er3),@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"add.b @(0x12345678:32,er3),@-er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"add.b @(0x12345678:32,er3),@er1+"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"add.b @(0x12345678:32,er3),@er1-"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"add.b @(0x12345678:32,er3),@+er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"add.b @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"add.b @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"add.b @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"add.b @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"add.b @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"add.b @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"add.b @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"add.b @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"add.b @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"add.b @(0x1234:16,r3.w),@er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"add.b @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"add.b @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"add.b @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"add.b @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"add.b @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"add.b @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"add.b @(0x1234:16,er3.l),@er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"add.b @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"add.b @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"add.b @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"add.b @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"add.b @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "add.b\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"add.b @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"add.b @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"add.b @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"add.b @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"add.b @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"add.b @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"add.b @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"add.b @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"add.b @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"add.b @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"add.b @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"add.b @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"add.b @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"add.b @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"add.b @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"add.b @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x3:2,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"add.b @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"add.b @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"add.b @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"add.b @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"add.b @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "add.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"add.b @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "add.b\t@0x1234(:16|),@er1" \
-	"add.b @0x1234:16,@er1"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x3(:2|),er1\\)" \
-	"add.b @0x1234:16,@(0x3:2,er1)"
-gdb_test "x" "add.b\t@0x1234(:16|),@-er1" \
-	"add.b @0x1234:16,@-er1"
-gdb_test "x" "add.b\t@0x1234(:16|),@er1\\+" \
-	"add.b @0x1234:16,@er1+"
-gdb_test "x" "add.b\t@0x1234(:16|),@er1-" \
-	"add.b @0x1234:16,@er1-"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\+er1" \
-	"add.b @0x1234:16,@+er1"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@0x1234(:16|),@0x9abc(:16|)" \
-	"add.b @0x1234:16,@0x9abc:16"
-gdb_test "x" "add.b\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"add.b @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "add.b\t@0x12345678(:32|),@er1" \
-	"add.b @0x12345678:32,@er1"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x3(:2|),er1\\)" \
-	"add.b @0x12345678:32,@(0x3:2,er1)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@-er1" \
-	"add.b @0x12345678:32,@-er1"
-gdb_test "x" "add.b\t@0x12345678(:32|),@er1\\+" \
-	"add.b @0x12345678:32,@er1+"
-gdb_test "x" "add.b\t@0x12345678(:32|),@er1-" \
-	"add.b @0x12345678:32,@er1-"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\+er1" \
-	"add.b @0x12345678:32,@+er1"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"add.b @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.b @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.b @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.b @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.b @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.b @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.b @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.b\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"add.b @0x12345678:32,@0x9abc:16"
-gdb_test "x" "add.b\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"add.b @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "add.w\t#0x1234(:16|),r1" \
-	"add.w #0x1234:16,r1"
-gdb_test "x" "add.w\t#0x7(:3|),r2" \
-	"add.w #0x7:3,r2"
-gdb_test "x" "add.w\t#0x1234(:16|),@er1" \
-	"add.w #0x1234:16,@er1"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"add.w #0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "add.w\t#0x1234(:16|),@er1\\+" \
-	"add.w #0x1234:16,@er1+"
-gdb_test "x" "add.w\t#0x1234(:16|),@-er1" \
-	"add.w #0x1234:16,@-er1"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\+er1" \
-	"add.w #0x1234:16,@+er1"
-gdb_test "x" "add.w\t#0x1234(:16|),@er1-" \
-	"add.w #0x1234:16,@er1-"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"add.w #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t#0x1234(:16|),@0x9abc(:16|)" \
-	"add.w #0x1234:16,@0x9abc:16"
-gdb_test "x" "add.w\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"add.w #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "add.w\t#0x7(:3|),@er1" \
-	"add.w #0x7:3,@er1"
-gdb_test "x" "add.w\t#0x7(:3|),@0x1234(:16|)" \
-	"add.w #0x7:3,@0x1234:16"
-gdb_test "x" "add.w\t#0x7(:3|),@0x12345678(:32|)" \
-	"add.w #0x7:3,@0x12345678:32"
-gdb_test "x" "add.w\tr3,r1" \
-	"add.w r3,r1"
-gdb_test "x" "add.w\tr3,@er1" \
-	"add.w r3,@er1"
-gdb_test "x" "add.w\tr3,@\\(0x6(:2|),er1\\)" \
-	"add.w r3,@(0x6:2,er1)"
-gdb_test "x" "add.w\tr3,@er1\\+" \
-	"add.w r3,@er1+"
-gdb_test "x" "add.w\tr3,@-er1" \
-	"add.w r3,@-er1"
-gdb_test "x" "add.w\tr3,@\\+er1" \
-	"add.w r3,@+er1"
-gdb_test "x" "add.w\tr3,@er1-" \
-	"add.w r3,@er1-"
-gdb_test "x" "add.w\tr3,@\\(0x1234(:16|),er1\\)" \
-	"add.w r3,@(0x1234:16,er1)"
-gdb_test "x" "add.w\tr3,@\\(0x12345678(:32|),er1\\)" \
-	"add.w r3,@(0x12345678:32,er1)"
-gdb_test "x" "add.w\tr3,@\\(0x1234(:16|),r2l.b\\)" \
-	"add.w r3,@(0x1234:16,r2l.b)"
-gdb_test "x" "add.w\tr3,@\\(0x1234(:16|),r2.w\\)" \
-	"add.w r3,@(0x1234:16,r2.w)"
-gdb_test "x" "add.w\tr3,@\\(0x1234(:16|),er2.l\\)" \
-	"add.w r3,@(0x1234:16,er2.l)"
-gdb_test "x" "add.w\tr3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"add.w r3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "add.w\tr3,@\\(0x12345678(:32|),r2.w\\)" \
-	"add.w r3,@(0x12345678:32,r2.w)"
-gdb_test "x" "add.w\tr3,@\\(0x12345678(:32|),er2.l\\)" \
-	"add.w r3,@(0x12345678:32,er2.l)"
-gdb_test "x" "add.w\tr3,@0x1234(:16|)" \
-	"add.w r3,@0x1234:16"
-gdb_test "x" "add.w\tr3,@0x12345678(:32|)" \
-	"add.w r3,@0x12345678:32"
-gdb_test "x" "add.w\t@er3,r1" \
-	"add.w @er3,r1"
-gdb_test "x" "add.w\t@\\(0x6(:2|),er1\\),r1" \
-	"add.w @(0x6:2,er1),r1"
-gdb_test "x" "add.w\t@er3\\+,r1" \
-	"add.w @er3+,r1"
-gdb_test "x" "add.w\t@-er3,r1" \
-	"add.w @-er3,r1"
-gdb_test "x" "add.w\t@\\+er3,r1" \
-	"add.w @+er3,r1"
-gdb_test "x" "add.w\t@er3-,r1" \
-	"add.w @er3-,r1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er1\\),r1" \
-	"add.w @(0x1234:16,er1),r1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er1\\),r1" \
-	"add.w @(0x12345678:32,er1),r1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r2l.b\\),r1" \
-	"add.w @(0x1234:16,r2l.b),r1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r2.w\\),r1" \
-	"add.w @(0x1234:16,r2.w),r1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er2.l\\),r1" \
-	"add.w @(0x1234:16,er2.l),r1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r2l.b\\),r1" \
-	"add.w @(0x12345678:32,r2l.b),r1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r2.w\\),r1" \
-	"add.w @(0x12345678:32,r2.w),r1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er2.l\\),r1" \
-	"add.w @(0x12345678:32,er2.l),r1"
-gdb_test "x" "add.w\t@0x1234(:16|),r1" \
-	"add.w @0x1234:16,r1"
-gdb_test "x" "add.w\t@0x12345678(:32|),r1" \
-	"add.w @0x12345678:32,r1"
-gdb_test "x" "add.w\t@er3,@er1" \
-	"add.w @er3,@er1"
-gdb_test "x" "add.w\t@er3,@\\(0x6(:2|),er1\\)" \
-	"add.w @er3,@(0x6:2,er1)"
-gdb_test "x" "add.w\t@er3,@-er1" \
-	"add.w @er3,@-er1"
-gdb_test "x" "add.w\t@er3,@er1\\+" \
-	"add.w @er3,@er1+"
-gdb_test "x" "add.w\t@er3,@er1-" \
-	"add.w @er3,@er1-"
-gdb_test "x" "add.w\t@er3,@\\+er1" \
-	"add.w @er3,@+er1"
-gdb_test "x" "add.w\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.w @er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@er3,@0x9abc(:16|)" \
-	"add.w @er3,@0x9abc:16"
-gdb_test "x" "add.w\t@er3,@0x9abcdef0(:32|)" \
-	"add.w @er3,@0x9abcdef0:32"
-gdb_test "x" "add.w\t@-er3,@er1" \
-	"add.w @-er3,@er1"
-gdb_test "x" "add.w\t@-er3,@\\(0x6(:2|),er1\\)" \
-	"add.w @-er3,@(0x6:2,er1)"
-gdb_test "x" "add.w\t@-er3,@-er1" \
-	"add.w @-er3,@-er1"
-gdb_test "x" "add.w\t@-er3,@er1\\+" \
-	"add.w @-er3,@er1+"
-gdb_test "x" "add.w\t@-er3,@er1-" \
-	"add.w @-er3,@er1-"
-gdb_test "x" "add.w\t@-er3,@\\+er1" \
-	"add.w @-er3,@+er1"
-gdb_test "x" "add.w\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.w @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@-er3,@0x9abc(:16|)" \
-	"add.w @-er3,@0x9abc:16"
-gdb_test "x" "add.w\t@-er3,@0x9abcdef0(:32|)" \
-	"add.w @-er3,@0x9abcdef0:32"
-gdb_test "x" "add.w\t@er3\\+,@er1" \
-	"add.w @er3+,@er1"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x6(:2|),er1\\)" \
-	"add.w @er3+,@(0x6:2,er1)"
-gdb_test "x" "add.w\t@er3\\+,@-er1" \
-	"add.w @er3+,@-er1"
-gdb_test "x" "add.w\t@er3\\+,@er1\\+" \
-	"add.w @er3+,@er1+"
-gdb_test "x" "add.w\t@er3\\+,@er1-" \
-	"add.w @er3+,@er1-"
-gdb_test "x" "add.w\t@er3\\+,@\\+er1" \
-	"add.w @er3+,@+er1"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"add.w @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@er3\\+,@0x9abc(:16|)" \
-	"add.w @er3+,@0x9abc:16"
-gdb_test "x" "add.w\t@er3\\+,@0x9abcdef0(:32|)" \
-	"add.w @er3+,@0x9abcdef0:32"
-gdb_test "x" "add.w\t@er3-,@er1" \
-	"add.w @er3-,@er1"
-gdb_test "x" "add.w\t@er3-,@\\(0x6(:2|),er1\\)" \
-	"add.w @er3-,@(0x6:2,er1)"
-gdb_test "x" "add.w\t@er3-,@-er1" \
-	"add.w @er3-,@-er1"
-gdb_test "x" "add.w\t@er3-,@er1\\+" \
-	"add.w @er3-,@er1+"
-gdb_test "x" "add.w\t@er3-,@er1-" \
-	"add.w @er3-,@er1-"
-gdb_test "x" "add.w\t@er3-,@\\+er1" \
-	"add.w @er3-,@+er1"
-gdb_test "x" "add.w\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"add.w @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@er3-,@0x9abc(:16|)" \
-	"add.w @er3-,@0x9abc:16"
-gdb_test "x" "add.w\t@er3-,@0x9abcdef0(:32|)" \
-	"add.w @er3-,@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\+er3,@er1" \
-	"add.w @+er3,@er1"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x6(:2|),er1\\)" \
-	"add.w @+er3,@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\+er3,@-er1" \
-	"add.w @+er3,@-er1"
-gdb_test "x" "add.w\t@\\+er3,@er1\\+" \
-	"add.w @+er3,@er1+"
-gdb_test "x" "add.w\t@\\+er3,@er1-" \
-	"add.w @+er3,@er1-"
-gdb_test "x" "add.w\t@\\+er3,@\\+er1" \
-	"add.w @+er3,@+er1"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.w @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\+er3,@0x9abc(:16|)" \
-	"add.w @+er3,@0x9abc:16"
-gdb_test "x" "add.w\t@\\+er3,@0x9abcdef0(:32|)" \
-	"add.w @+er3,@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@er1" \
-	"add.w @(0x1234:16,er3),@er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"add.w @(0x1234:16,er3),@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"add.w @(0x1234:16,er3),@-er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"add.w @(0x1234:16,er3),@er1+"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"add.w @(0x1234:16,er3),@er1-"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"add.w @(0x1234:16,er3),@+er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"add.w @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"add.w @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"add.w @(0x12345678:32,er3),@er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"add.w @(0x12345678:32,er3),@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"add.w @(0x12345678:32,er3),@-er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"add.w @(0x12345678:32,er3),@er1+"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"add.w @(0x12345678:32,er3),@er1-"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"add.w @(0x12345678:32,er3),@+er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"add.w @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"add.w @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"add.w @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"add.w @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"add.w @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"add.w @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"add.w @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"add.w @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"add.w @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"add.w @(0x1234:16,r3.w),@er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"add.w @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"add.w @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"add.w @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"add.w @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"add.w @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"add.w @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"add.w @(0x1234:16,er3.l),@er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"add.w @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"add.w @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"add.w @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"add.w @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"add.w @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "add.w\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"add.w @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"add.w @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"add.w @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"add.w @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"add.w @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"add.w @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"add.w @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"add.w @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"add.w @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"add.w @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"add.w @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"add.w @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"add.w @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"add.w @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"add.w @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"add.w @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x6:2,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"add.w @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"add.w @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"add.w @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"add.w @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"add.w @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "add.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"add.w @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "add.w\t@0x1234(:16|),@er1" \
-	"add.w @0x1234:16,@er1"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"add.w @0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "add.w\t@0x1234(:16|),@-er1" \
-	"add.w @0x1234:16,@-er1"
-gdb_test "x" "add.w\t@0x1234(:16|),@er1\\+" \
-	"add.w @0x1234:16,@er1+"
-gdb_test "x" "add.w\t@0x1234(:16|),@er1-" \
-	"add.w @0x1234:16,@er1-"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\+er1" \
-	"add.w @0x1234:16,@+er1"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@0x1234(:16|),@0x9abc(:16|)" \
-	"add.w @0x1234:16,@0x9abc:16"
-gdb_test "x" "add.w\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"add.w @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "add.w\t@0x12345678(:32|),@er1" \
-	"add.w @0x12345678:32,@er1"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x6(:2|),er1\\)" \
-	"add.w @0x12345678:32,@(0x6:2,er1)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@-er1" \
-	"add.w @0x12345678:32,@-er1"
-gdb_test "x" "add.w\t@0x12345678(:32|),@er1\\+" \
-	"add.w @0x12345678:32,@er1+"
-gdb_test "x" "add.w\t@0x12345678(:32|),@er1-" \
-	"add.w @0x12345678:32,@er1-"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\+er1" \
-	"add.w @0x12345678:32,@+er1"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"add.w @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.w @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.w @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.w @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.w @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.w @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.w @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.w\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"add.w @0x12345678:32,@0x9abc:16"
-gdb_test "x" "add.w\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"add.w @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "add.l\t#0x12345678(:32|),er1" \
-	"add.l #0x12345678:32,er1"
-gdb_test "x" "add.l\t#0x1234(:16|),er1" \
-	"add.l #0x1234:16,er1"
-gdb_test "x" "add.l\t#0x7(:3|),er2" \
-	"add.l #0x7:3,er2"
-gdb_test "x" "add.l\t#0x12345678(:32|),@er1" \
-	"add.l #0x12345678:32,@er1"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"add.l #0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@er1\\+" \
-	"add.l #0x12345678:32,@er1+"
-gdb_test "x" "add.l\t#0x12345678(:32|),@-er1" \
-	"add.l #0x12345678:32,@-er1"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\+er1" \
-	"add.l #0x12345678:32,@+er1"
-gdb_test "x" "add.l\t#0x12345678(:32|),@er1-" \
-	"add.l #0x12345678:32,@er1-"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"add.l #0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l #0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l #0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l #0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l #0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l #0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l #0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t#0x12345678(:32|),@0x9abc(:16|)" \
-	"add.l #0x12345678:32,@0x9abc:16"
-gdb_test "x" "add.l\t#0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"add.l #0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "add.l\t#0x1234(:16|),@er1" \
-	"add.l #0x1234:16,@er1"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"add.l #0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "add.l\t#0x1234(:16|),@er1\\+" \
-	"add.l #0x1234:16,@er1+"
-gdb_test "x" "add.l\t#0x1234(:16|),@-er1" \
-	"add.l #0x1234:16,@-er1"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\+er1" \
-	"add.l #0x1234:16,@+er1"
-gdb_test "x" "add.l\t#0x1234(:16|),@er1-" \
-	"add.l #0x1234:16,@er1-"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"add.l #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t#0x1234(:16|),@0x9abc(:16|)" \
-	"add.l #0x1234:16,@0x9abc:16"
-gdb_test "x" "add.l\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"add.l #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "add.l\ter3,er1" \
-	"add.l er3,er1"
-gdb_test "x" "add.l\ter3,@er1" \
-	"add.l er3,@er1"
-gdb_test "x" "add.l\ter3,@\\(0xc(:2|),er1\\)" \
-	"add.l er3,@(0xc:2,er1)"
-gdb_test "x" "add.l\ter3,@er1\\+" \
-	"add.l er3,@er1+"
-gdb_test "x" "add.l\ter3,@-er1" \
-	"add.l er3,@-er1"
-gdb_test "x" "add.l\ter3,@\\+er1" \
-	"add.l er3,@+er1"
-gdb_test "x" "add.l\ter3,@er1-" \
-	"add.l er3,@er1-"
-gdb_test "x" "add.l\ter3,@\\(0x1234(:16|),er1\\)" \
-	"add.l er3,@(0x1234:16,er1)"
-gdb_test "x" "add.l\ter3,@\\(0x12345678(:32|),er1\\)" \
-	"add.l er3,@(0x12345678:32,er1)"
-gdb_test "x" "add.l\ter3,@\\(0x1234(:16|),r2l.b\\)" \
-	"add.l er3,@(0x1234:16,r2l.b)"
-gdb_test "x" "add.l\ter3,@\\(0x1234(:16|),r2.w\\)" \
-	"add.l er3,@(0x1234:16,r2.w)"
-gdb_test "x" "add.l\ter3,@\\(0x1234(:16|),er2.l\\)" \
-	"add.l er3,@(0x1234:16,er2.l)"
-gdb_test "x" "add.l\ter3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"add.l er3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "add.l\ter3,@\\(0x12345678(:32|),r2.w\\)" \
-	"add.l er3,@(0x12345678:32,r2.w)"
-gdb_test "x" "add.l\ter3,@\\(0x12345678(:32|),er2.l\\)" \
-	"add.l er3,@(0x12345678:32,er2.l)"
-gdb_test "x" "add.l\ter3,@0x1234(:16|)" \
-	"add.l er3,@0x1234:16"
-gdb_test "x" "add.l\ter3,@0x12345678(:32|)" \
-	"add.l er3,@0x12345678:32"
-gdb_test "x" "add.l\t@er3,er1" \
-	"add.l @er3,er1"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),er1" \
-	"add.l @(0xc:2,er3),er1"
-gdb_test "x" "add.l\t@er3\\+,er1" \
-	"add.l @er3+,er1"
-gdb_test "x" "add.l\t@-er3,er1" \
-	"add.l @-er3,er1"
-gdb_test "x" "add.l\t@\\+er3,er1" \
-	"add.l @+er3,er1"
-gdb_test "x" "add.l\t@er3-,er1" \
-	"add.l @er3-,er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er1\\),er1" \
-	"add.l @(0x1234:16,er1),er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er1\\),er1" \
-	"add.l @(0x12345678:32,er1),er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r2l.b\\),er1" \
-	"add.l @(0x1234:16,r2l.b),er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r2.w\\),er1" \
-	"add.l @(0x1234:16,r2.w),er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er2.l\\),er1" \
-	"add.l @(0x1234:16,er2.l),er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r2l.b\\),er1" \
-	"add.l @(0x12345678:32,r2l.b),er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r2.w\\),er1" \
-	"add.l @(0x12345678:32,r2.w),er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er2.l\\),er1" \
-	"add.l @(0x12345678:32,er2.l),er1"
-gdb_test "x" "add.l\t@0x1234(:16|),er1" \
-	"add.l @0x1234:16,er1"
-gdb_test "x" "add.l\t@0x12345678(:32|),er1" \
-	"add.l @0x12345678:32,er1"
-gdb_test "x" "add.l\t@er3,@er1" \
-	"add.l @er3,@er1"
-gdb_test "x" "add.l\t@er3,@\\(0xc(:2|),er1\\)" \
-	"add.l @er3,@(0xc:2,er1)"
-gdb_test "x" "add.l\t@er3,@-er1" \
-	"add.l @er3,@-er1"
-gdb_test "x" "add.l\t@er3,@er1\\+" \
-	"add.l @er3,@er1+"
-gdb_test "x" "add.l\t@er3,@er1-" \
-	"add.l @er3,@er1-"
-gdb_test "x" "add.l\t@er3,@\\+er1" \
-	"add.l @er3,@+er1"
-gdb_test "x" "add.l\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.l @er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@er3,@0x9abc(:16|)" \
-	"add.l @er3,@0x9abc:16"
-gdb_test "x" "add.l\t@er3,@0x9abcdef0(:32|)" \
-	"add.l @er3,@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@er1" \
-	"add.l @(0xc:2,er3),@er1"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0xc:2,er3),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@-er1" \
-	"add.l @(0xc:2,er3),@-er1"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@er1\\+" \
-	"add.l @(0xc:2,er3),@er1+"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@er1-" \
-	"add.l @(0xc:2,er3),@er1-"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\+er1" \
-	"add.l @(0xc:2,er3),@+er1"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0xc:2,er3),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0xc:2,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0xc:2,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0xc:2,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0xc:2,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@0x9abc(:16|)" \
-	"add.l @(0xc:2,er3),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0xc(:2|),er3\\),@0x9abcdef0(:32|)" \
-	"add.l @(0xc:2,er3),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@-er3,@er1" \
-	"add.l @-er3,@er1"
-gdb_test "x" "add.l\t@-er3,@\\(0xc(:2|),er1\\)" \
-	"add.l @-er3,@(0xc:2,er1)"
-gdb_test "x" "add.l\t@-er3,@-er1" \
-	"add.l @-er3,@-er1"
-gdb_test "x" "add.l\t@-er3,@er1\\+" \
-	"add.l @-er3,@er1+"
-gdb_test "x" "add.l\t@-er3,@er1-" \
-	"add.l @-er3,@er1-"
-gdb_test "x" "add.l\t@-er3,@\\+er1" \
-	"add.l @-er3,@+er1"
-gdb_test "x" "add.l\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.l @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@-er3,@0x9abc(:16|)" \
-	"add.l @-er3,@0x9abc:16"
-gdb_test "x" "add.l\t@-er3,@0x9abcdef0(:32|)" \
-	"add.l @-er3,@0x9abcdef0:32"
-gdb_test "x" "add.l\t@er3\\+,@er1" \
-	"add.l @er3+,@er1"
-gdb_test "x" "add.l\t@er3\\+,@\\(0xc(:2|),er1\\)" \
-	"add.l @er3+,@(0xc:2,er1)"
-gdb_test "x" "add.l\t@er3\\+,@-er1" \
-	"add.l @er3+,@-er1"
-gdb_test "x" "add.l\t@er3\\+,@er1\\+" \
-	"add.l @er3+,@er1+"
-gdb_test "x" "add.l\t@er3\\+,@er1-" \
-	"add.l @er3+,@er1-"
-gdb_test "x" "add.l\t@er3\\+,@\\+er1" \
-	"add.l @er3+,@+er1"
-gdb_test "x" "add.l\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"add.l @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@er3\\+,@0x9abc(:16|)" \
-	"add.l @er3+,@0x9abc:16"
-gdb_test "x" "add.l\t@er3\\+,@0x9abcdef0(:32|)" \
-	"add.l @er3+,@0x9abcdef0:32"
-gdb_test "x" "add.l\t@er3-,@er1" \
-	"add.l @er3-,@er1"
-gdb_test "x" "add.l\t@er3-,@\\(0xc(:2|),er1\\)" \
-	"add.l @er3-,@(0xc:2,er1)"
-gdb_test "x" "add.l\t@er3-,@-er1" \
-	"add.l @er3-,@-er1"
-gdb_test "x" "add.l\t@er3-,@er1\\+" \
-	"add.l @er3-,@er1+"
-gdb_test "x" "add.l\t@er3-,@er1-" \
-	"add.l @er3-,@er1-"
-gdb_test "x" "add.l\t@er3-,@\\+er1" \
-	"add.l @er3-,@+er1"
-gdb_test "x" "add.l\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"add.l @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@er3-,@0x9abc(:16|)" \
-	"add.l @er3-,@0x9abc:16"
-gdb_test "x" "add.l\t@er3-,@0x9abcdef0(:32|)" \
-	"add.l @er3-,@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\+er3,@er1" \
-	"add.l @+er3,@er1"
-gdb_test "x" "add.l\t@\\+er3,@\\(0xc(:2|),er1\\)" \
-	"add.l @+er3,@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\+er3,@-er1" \
-	"add.l @+er3,@-er1"
-gdb_test "x" "add.l\t@\\+er3,@er1\\+" \
-	"add.l @+er3,@er1+"
-gdb_test "x" "add.l\t@\\+er3,@er1-" \
-	"add.l @+er3,@er1-"
-gdb_test "x" "add.l\t@\\+er3,@\\+er1" \
-	"add.l @+er3,@+er1"
-gdb_test "x" "add.l\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"add.l @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\+er3,@0x9abc(:16|)" \
-	"add.l @+er3,@0x9abc:16"
-gdb_test "x" "add.l\t@\\+er3,@0x9abcdef0(:32|)" \
-	"add.l @+er3,@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@er1" \
-	"add.l @(0x1234:16,er3),@er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0x1234:16,er3),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"add.l @(0x1234:16,er3),@-er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"add.l @(0x1234:16,er3),@er1+"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"add.l @(0x1234:16,er3),@er1-"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"add.l @(0x1234:16,er3),@+er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"add.l @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"add.l @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"add.l @(0x12345678:32,er3),@er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0x12345678:32,er3),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"add.l @(0x12345678:32,er3),@-er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"add.l @(0x12345678:32,er3),@er1+"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"add.l @(0x12345678:32,er3),@er1-"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"add.l @(0x12345678:32,er3),@+er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"add.l @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"add.l @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"add.l @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"add.l @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"add.l @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"add.l @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"add.l @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"add.l @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"add.l @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"add.l @(0x1234:16,r3.w),@er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0x1234:16,r3.w),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"add.l @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"add.l @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"add.l @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"add.l @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"add.l @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"add.l @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"add.l @(0x1234:16,er3.l),@er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0x1234:16,er3.l),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"add.l @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"add.l @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"add.l @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"add.l @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"add.l @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"add.l @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"add.l @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"add.l @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"add.l @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"add.l @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"add.l @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"add.l @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"add.l @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"add.l @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"add.l @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"add.l @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"add.l @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"add.l @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"add.l @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"add.l @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"add.l @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0xc:2,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"add.l @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"add.l @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"add.l @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"add.l @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"add.l @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "add.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"add.l @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "add.l\t@0x1234(:16|),@er1" \
-	"add.l @0x1234:16,@er1"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"add.l @0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "add.l\t@0x1234(:16|),@-er1" \
-	"add.l @0x1234:16,@-er1"
-gdb_test "x" "add.l\t@0x1234(:16|),@er1\\+" \
-	"add.l @0x1234:16,@er1+"
-gdb_test "x" "add.l\t@0x1234(:16|),@er1-" \
-	"add.l @0x1234:16,@er1-"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\+er1" \
-	"add.l @0x1234:16,@+er1"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@0x1234(:16|),@0x9abc(:16|)" \
-	"add.l @0x1234:16,@0x9abc:16"
-gdb_test "x" "add.l\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"add.l @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "add.l\t@0x12345678(:32|),@er1" \
-	"add.l @0x12345678:32,@er1"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"add.l @0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@-er1" \
-	"add.l @0x12345678:32,@-er1"
-gdb_test "x" "add.l\t@0x12345678(:32|),@er1\\+" \
-	"add.l @0x12345678:32,@er1+"
-gdb_test "x" "add.l\t@0x12345678(:32|),@er1-" \
-	"add.l @0x12345678:32,@er1-"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\+er1" \
-	"add.l @0x12345678:32,@+er1"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"add.l @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"add.l @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"add.l @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"add.l @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"add.l @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"add.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"add.l @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"add.l @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "add.l\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"add.l @0x12345678:32,@0x9abc:16"
-gdb_test "x" "add.l\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"add.l @0x12345678:32,@0x9abcdef0:32"
diff --git a/gdb/testsuite/gdb.disasm/t03_add.s b/gdb/testsuite/gdb.disasm/t03_add.s
deleted file mode 100644
index a20adedef79..00000000000
--- a/gdb/testsuite/gdb.disasm/t03_add.s
+++ /dev/null
@@ -1,978 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;arith_1

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    add.b #0x12:8,r1h                            ;8112

-    add.b #0x12:8,@er1                           ;7d108012

-    add.b #0x12:8,@(0x3:2,er1)               ;017768188012

-    add.b #0x12:8,@er1+                      ;01746c188012

-    add.b #0x12:8,@-er1                      ;01776c188012

-    add.b #0x12:8,@+er1                      ;01756c188012

-    add.b #0x12:8,@er1-                      ;01766c188012

-    add.b #0x12:8,@(0x1234:16,er1)           ;01746e1812348012

-    add.b #0x12:8,@(0x12345678:32,er1)       ;78146a28123456788012

-    add.b #0x12:8,@(0x1234:16,r2l.b)         ;01756e2812348012

-    add.b #0x12:8,@(0x1234:16,r2.w)         ;01766e2812348012

-    add.b #0x12:8,@(0x1234:16,er2.l)         ;01776e2812348012

-    add.b #0x12:8,@(0x12345678:32,r2l.b)     ;78256a28123456788012

-    add.b #0x12:8,@(0x12345678:32,r2.w)     ;78266a28123456788012

-    add.b #0x12:8,@(0x12345678:32,er2.l)     ;78276a28123456788012

-    add.b #0x12:8,@0xffffff9a:8                  ;7f9a8012

-    add.b #0x12:8,@0x1234:16                     ;6a1812348012

-    add.b #0x12:8,@0x12345678:32                 ;6a38123456788012

-

-    add.b r3h,r1h                                ;0831

-

-    add.b r3h,@er1                               ;7d100830

-    add.b r3h,@(0x3:2,er1)                   ;01793113

-    add.b r3h,@er1+                          ;01798113

-    add.b r3h,@-er1                          ;0179b113

-    add.b r3h,@+er1                          ;01799113

-    add.b r3h,@er1-                          ;0179a113

-    add.b r3h,@(0x1234:16,er1)               ;0179c1131234

-    add.b r3h,@(0x12345678:32,er1)           ;0179c91312345678

-    add.b r3h,@(0x1234:16,r2l.b)             ;0179d2131234

-    add.b r3h,@(0x1234:16,r2.w)             ;0179e2131234

-    add.b r3h,@(0x1234:16,er2.l)             ;0179f2131234

-    add.b r3h,@(0x12345678:32,r2l.b)         ;0179da1312345678

-    add.b r3h,@(0x12345678:32,r2.w)         ;0179ea1312345678

-    add.b r3h,@(0x12345678:32,er2.l)         ;0179fa1312345678

-    add.b r3h,@0xffffff12:8                      ;7f120830

-    add.b r3h,@0x1234:16                         ;6a1812340830

-    add.b r3h,@0x12345678:32                     ;6a38123456780830

-

-    add.b @er3,r1h                               ;7c300801

-    add.b @(0x3:2,er3),r1h                   ;017a3311

-    add.b @er3+,r1h                          ;017a8311

-    add.b @-er3,r1h                          ;017ab311

-    add.b @+er3,r1h                          ;017a9311

-    add.b @er3-,r1h                          ;017aa311

-    add.b @(0x1234:16,er1),r1h               ;017ac1111234

-    add.b @(0x12345678:32,er1),r1h           ;017ac91112345678

-    add.b @(0x1234:16,r2l.b),r1h             ;017ad2111234

-    add.b @(0x1234:16,r2.w),r1h             ;017ae2111234

-    add.b @(0x1234:16,er2.l),r1h             ;017af2111234

-    add.b @(0x12345678:32,r2l.b),r1h         ;017ada1112345678

-    add.b @(0x12345678:32,r2.w),r1h         ;017aea1112345678

-    add.b @(0x12345678:32,er2.l),r1h         ;017afa1112345678

-    add.b @0xffffff12:8,r1h                      ;7e120801

-    add.b @0x1234:16,r1h                         ;6a1012340801

-    add.b @0x12345678:32,r1h                     ;6a30123456780801

-

-    add.b @er3,@er1                                ;7c350110

-    add.b @er3,@(3:2,er1)                          ;7c353110

-    add.b @er3,@-er1                               ;7c35b110

-    add.b @er3,@er1+                               ;7c358110

-    add.b @er3,@er1-                               ;7c35a110

-    add.b @er3,@+er1                               ;7c359110

-    add.b @er3,@(0xffff9abc:16,er1)                ;7c35c1109abc

-    add.b @er3,@(0x9abcdef0:32,er1)                ;7c35c9109abcdef0

-    add.b @er3,@(0xffff9abc:16,r2l.b)              ;7c35d2109abc

-    add.b @er3,@(0xffff9abc:16,r2.w)              ;7c35e2109abc

-    add.b @er3,@(0xffff9abc:16,er2.l)              ;7c35f2109abc

-    add.b @er3,@(0x9abcdef0:32,r2l.b)              ;7c35da109abcdef0

-    add.b @er3,@(0x9abcdef0:32,r2.w)              ;7c35ea109abcdef0

-    add.b @er3,@(0x9abcdef0:32,er2.l)              ;7c35fa109abcdef0

-    add.b @er3,@0xffff9abc:16                      ;7c3540109abc

-    add.b @er3,@0x9abcdef0:32                      ;7c3548109abcdef0

-

-    add.b @-er3,@er1                               ;01776c3c0110

-    add.b @-er3,@(3:2,er1)                         ;01776c3c3110

-    add.b @-er3,@-er1                              ;01776c3cb110

-    add.b @-er3,@er1+                              ;01776c3c8110

-    add.b @-er3,@er1-                              ;01776c3ca110

-    add.b @-er3,@+er1                              ;01776c3c9110

-    add.b @-er3,@(0xffff9abc:16,er1)               ;01776c3cc1109abc

-    add.b @-er3,@(0x9abcdef0:32,er1)               ;01776c3cc9109abcdef0

-    add.b @-er3,@(0xffff9abc:16,r2l.b)             ;01776c3cd2109abc

-    add.b @-er3,@(0xffff9abc:16,r2.w)             ;01776c3ce2109abc

-    add.b @-er3,@(0xffff9abc:16,er2.l)             ;01776c3cf2109abc

-    add.b @-er3,@(0x9abcdef0:32,r2l.b)             ;01776c3cda109abcdef0

-    add.b @-er3,@(0x9abcdef0:32,r2.w)             ;01776c3cea109abcdef0

-    add.b @-er3,@(0x9abcdef0:32,er2.l)             ;01776c3cfa109abcdef0

-    add.b @-er3,@0xffff9abc:16                     ;01776c3c40109abc

-    add.b @-er3,@0x9abcdef0:32                     ;01776c3c48109abcdef0

-

-    add.b @er3+,@er1                               ;01746c3c0110

-    add.b @er3+,@(3:2,er1)                         ;01746c3c3110

-    add.b @er3+,@-er1                              ;01746c3cb110

-    add.b @er3+,@er1+                              ;01746c3c8110

-    add.b @er3+,@er1-                              ;01746c3ca110

-    add.b @er3+,@+er1                              ;01746c3c9110

-    add.b @er3+,@(0xffff9abc:16,er1)               ;01746c3cc1109abc

-    add.b @er3+,@(0x9abcdef0:32,er1)               ;01746c3cc9109abcdef0

-    add.b @er3+,@(0xffff9abc:16,r2l.b)             ;01746c3cd2109abc

-    add.b @er3+,@(0xffff9abc:16,r2.w)             ;01746c3ce2109abc

-    add.b @er3+,@(0xffff9abc:16,er2.l)             ;01746c3cf2109abc

-    add.b @er3+,@(0x9abcdef0:32,r2l.b)             ;01746c3cda109abcdef0

-    add.b @er3+,@(0x9abcdef0:32,r2.w)             ;01746c3cea109abcdef0

-    add.b @er3+,@(0x9abcdef0:32,er2.l)             ;01746c3cfa109abcdef0

-    add.b @er3+,@0xffff9abc:16                     ;01746c3c40109abc

-    add.b @er3+,@0x9abcdef0:32                     ;01746c3c48109abcdef0

-

-    add.b @er3-,@er1                               ;01766c3c0110

-    add.b @er3-,@(3:2,er1)                         ;01766c3c3110

-    add.b @er3-,@-er1                              ;01766c3cb110

-    add.b @er3-,@er1+                              ;01766c3c8110

-    add.b @er3-,@er1-                              ;01766c3ca110

-    add.b @er3-,@+er1                              ;01766c3c9110

-    add.b @er3-,@(0xffff9abc:16,er1)               ;01766c3cc1109abc

-    add.b @er3-,@(0x9abcdef0:32,er1)               ;01766c3cc9109abcdef0

-    add.b @er3-,@(0xffff9abc:16,r2l.b)             ;01766c3cd2109abc

-    add.b @er3-,@(0xffff9abc:16,r2.w)             ;01766c3ce2109abc

-    add.b @er3-,@(0xffff9abc:16,er2.l)             ;01766c3cf2109abc

-    add.b @er3-,@(0x9abcdef0:32,r2l.b)             ;01766c3cda109abcdef0

-    add.b @er3-,@(0x9abcdef0:32,r2.w)             ;01766c3cea109abcdef0

-    add.b @er3-,@(0x9abcdef0:32,er2.l)             ;01766c3cfa109abcdef0

-    add.b @er3-,@0xffff9abc:16                     ;01766c3c40109abc

-    add.b @er3-,@0x9abcdef0:32                     ;01766c3c48109abcdef0

-

-    add.b @+er3,@er1                               ;01756c3c0110

-    add.b @+er3,@(3:2,er1)                         ;01756c3c3110

-    add.b @+er3,@-er1                              ;01756c3cb110

-    add.b @+er3,@er1+                              ;01756c3c8110

-    add.b @+er3,@er1-                              ;01756c3ca110

-    add.b @+er3,@+er1                              ;01756c3c9110

-    add.b @+er3,@(0xffff9abc:16,er1)               ;01756c3cc1109abc

-    add.b @+er3,@(0x9abcdef0:32,er1)               ;01756c3cc9109abcdef0

-    add.b @+er3,@(0xffff9abc:16,r2l.b)             ;01756c3cd2109abc

-    add.b @+er3,@(0xffff9abc:16,r2.w)             ;01756c3ce2109abc

-    add.b @+er3,@(0xffff9abc:16,er2.l)             ;01756c3cf2109abc

-    add.b @+er3,@(0x9abcdef0:32,r2l.b)             ;01756c3cda109abcdef0

-    add.b @+er3,@(0x9abcdef0:32,r2.w)             ;01756c3cea109abcdef0

-    add.b @+er3,@(0x9abcdef0:32,er2.l)             ;01756c3cfa109abcdef0

-    add.b @+er3,@0xffff9abc:16                     ;01756c3c40109abc

-    add.b @+er3,@0x9abcdef0:32                     ;01756c3c48109abcdef0

-

-    add.b @(0x1234:16,er3),@er1                         ;01746e3c12340110

-    add.b @(0x1234:16,er3),@(3:2,er1)                   ;01746e3c12343110

-    add.b @(0x1234:16,er3),@-er1                        ;01746e3c1234b110

-    add.b @(0x1234:16,er3),@er1+                        ;01746e3c12348110

-    add.b @(0x1234:16,er3),@er1-                        ;01746e3c1234a110

-    add.b @(0x1234:16,er3),@+er1                        ;01746e3c12349110

-    add.b @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01746e3c1234c1109abc

-    add.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01746e3c1234c9109abcdef0

-    add.b @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01746e3c1234d2109abc

-    add.b @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01746e3c1234e2109abc

-    add.b @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01746e3c1234f2109abc

-    add.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01746e3c1234da109abcdef0

-    add.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01746e3c1234ea109abcdef0

-    add.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01746e3c1234fa109abcdef0

-    add.b @(0x1234:16,er3),@0xffff9abc:16               ;01746e3c123440109abc

-    add.b @(0x1234:16,er3),@0x9abcdef0:32               ;01746e3c123448109abcdef0

-

-    add.b @(0x12345678:32,er3),@er1                         ;78346a2c123456780110

-    add.b @(0x12345678:32,er3),@(3:2,er1)                   ;78346a2c123456783110

-    add.b @(0x12345678:32,er3),@-er1                        ;78346a2c12345678b110

-    add.b @(0x12345678:32,er3),@er1+                        ;78346a2c123456788110

-    add.b @(0x12345678:32,er3),@er1-                        ;78346a2c12345678a110

-    add.b @(0x12345678:32,er3),@+er1                        ;78346a2c123456789110

-    add.b @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346a2c12345678c1109abc

-    add.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346a2c12345678c9109abcdef0

-    add.b @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346a2c12345678d2109abc

-    add.b @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346a2c12345678e2109abc

-    add.b @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346a2c12345678f2109abc

-    add.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346a2c12345678da109abcdef0

-    add.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346a2c12345678ea109abcdef0

-    add.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346a2c12345678fa109abcdef0

-    add.b @(0x12345678:32,er3),@0xffff9abc:16               ;78346a2c1234567840109abc

-    add.b @(0x12345678:32,er3),@0x9abcdef0:32               ;78346a2c1234567848109abcdef0

-

-    add.b @(0x1234:16,r3l.b),@er1                       ;01756e3c12340110

-    add.b @(0x1234:16,r3l.b),@(3:2,er1)                 ;01756e3c12343110

-    add.b @(0x1234:16,r3l.b),@-er1                      ;01756e3c1234b110

-    add.b @(0x1234:16,r3l.b),@er1+                      ;01756e3c12348110

-    add.b @(0x1234:16,r3l.b),@er1-                      ;01756e3c1234a110

-    add.b @(0x1234:16,r3l.b),@+er1                      ;01756e3c12349110

-    add.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01756e3c1234c1109abc

-    add.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01756e3c1234c9109abcdef0

-    add.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01756e3c1234d2109abc

-    add.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01756e3c1234e2109abc

-    add.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01756e3c1234f2109abc

-    add.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01756e3c1234da109abcdef0

-    add.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01756e3c1234ea109abcdef0

-    add.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01756e3c1234fa109abcdef0

-    add.b @(0x1234:16,r3l.b),@0xffff9abc:16             ;01756e3c123440109abc

-    add.b @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01756e3c123448109abcdef0

-

-    add.b @(0x1234:16,r3.w),@er1                       ;01766e3c12340110

-    add.b @(0x1234:16,r3.w),@(3:2,er1)                 ;01766e3c12343110

-    add.b @(0x1234:16,r3.w),@-er1                      ;01766e3c1234b110

-    add.b @(0x1234:16,r3.w),@er1+                      ;01766e3c12348110

-    add.b @(0x1234:16,r3.w),@er1-                      ;01766e3c1234a110

-    add.b @(0x1234:16,r3.w),@+er1                      ;01766e3c12349110

-    add.b @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01766e3c1234c1109abc

-    add.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01766e3c1234c9109abcdef0

-    add.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01766e3c1234d2109abc

-    add.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01766e3c1234e2109abc

-    add.b @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01766e3c1234f2109abc

-    add.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01766e3c1234da109abcdef0

-    add.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01766e3c1234ea109abcdef0

-    add.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01766e3c1234fa109abcdef0

-    add.b @(0x1234:16,r3.w),@0xffff9abc:16             ;01766e3c123440109abc

-    add.b @(0x1234:16,r3.w),@0x9abcdef0:32             ;01766e3c123448109abcdef0

-

-    add.b @(0x1234:16,er3.l),@er1                       ;01776e3c12340110

-    add.b @(0x1234:16,er3.l),@(3:2,er1)                 ;01776e3c12343110

-    add.b @(0x1234:16,er3.l),@-er1                      ;01776e3c1234b110

-    add.b @(0x1234:16,er3.l),@er1+                      ;01776e3c12348110

-    add.b @(0x1234:16,er3.l),@er1-                      ;01776e3c1234a110

-    add.b @(0x1234:16,er3.l),@+er1                      ;01776e3c12349110

-    add.b @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01776e3c1234c1109abc

-    add.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01776e3c1234c9109abcdef0

-    add.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01776e3c1234d2109abc

-    add.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01776e3c1234e2109abc

-    add.b @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01776e3c1234f2109abc

-    add.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01776e3c1234da109abcdef0

-    add.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01776e3c1234ea109abcdef0

-    add.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01776e3c1234fa109abcdef0

-    add.b @(0x1234:16,er3.l),@0xffff9abc:16             ;01776e3c123440109abc

-    add.b @(0x1234:16,er3.l),@0x9abcdef0:32             ;01776e3c123448109abcdef0

-

-    add.b @(0x12345678:32,r3l.b),@er1                       ;78356a2c123456780110

-    add.b @(0x12345678:32,r3l.b),@(3:2,er1)                 ;78356a2c123456783110

-    add.b @(0x12345678:32,r3l.b),@-er1                      ;78356a2c12345678b110

-    add.b @(0x12345678:32,r3l.b),@er1+                      ;78356a2c123456788110

-    add.b @(0x12345678:32,r3l.b),@er1-                      ;78356a2c12345678a110

-    add.b @(0x12345678:32,r3l.b),@+er1                      ;78356a2c123456789110

-    add.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356a2c12345678c1109abc

-    add.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356a2c12345678c9109abcdef0

-    add.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356a2c12345678d2109abc

-    add.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356a2c12345678e2109abc

-    add.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356a2c12345678f2109abc

-    add.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356a2c12345678da109abcdef0

-    add.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356a2c12345678ea109abcdef0

-    add.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356a2c12345678fa109abcdef0

-    add.b @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356a2c1234567840109abc

-    add.b @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356a2c1234567848109abcdef0

-

-    add.b @(0x12345678:32,r3.w),@er1                       ;78366a2c123456780110

-    add.b @(0x12345678:32,r3.w),@(3:2,er1)                 ;78366a2c123456783110

-    add.b @(0x12345678:32,r3.w),@-er1                      ;78366a2c12345678b110

-    add.b @(0x12345678:32,r3.w),@er1+                      ;78366a2c123456788110

-    add.b @(0x12345678:32,r3.w),@er1-                      ;78366a2c12345678a110

-    add.b @(0x12345678:32,r3.w),@+er1                      ;78366a2c123456789110

-    add.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366a2c12345678c1109abc

-    add.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366a2c12345678c9109abcdef0

-    add.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366a2c12345678d2109abc

-    add.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366a2c12345678e2109abc

-    add.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366a2c12345678f2109abc

-    add.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366a2c12345678da109abcdef0

-    add.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366a2c12345678ea109abcdef0

-    add.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366a2c12345678fa109abcdef0

-    add.b @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366a2c1234567840109abc

-    add.b @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366a2c1234567848109abcdef0

-

-    add.b @(0x12345678:32,er3.l),@er1                       ;78376a2c123456780110

-    add.b @(0x12345678:32,er3.l),@(3:2,er1)                 ;78376a2c123456783110

-    add.b @(0x12345678:32,er3.l),@-er1                      ;78376a2c12345678b110

-    add.b @(0x12345678:32,er3.l),@er1+                      ;78376a2c123456788110

-    add.b @(0x12345678:32,er3.l),@er1-                      ;78376a2c12345678a110

-    add.b @(0x12345678:32,er3.l),@+er1                      ;78376a2c123456789110

-    add.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376a2c12345678c1109abc

-    add.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376a2c12345678c9109abcdef0

-    add.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376a2c12345678d2109abc

-    add.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376a2c12345678e2109abc

-    add.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376a2c12345678f2109abc

-    add.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376a2c12345678da109abcdef0

-    add.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376a2c12345678ea109abcdef0

-    add.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376a2c12345678fa109abcdef0

-    add.b @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376a2c1234567840109abc

-    add.b @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376a2c1234567848109abcdef0

-

-    add.b @0x1234:16,@er1                              ;6a1512340110

-    add.b @0x1234:16,@(3:2,er1)                        ;6a1512343110

-    add.b @0x1234:16,@-er1                             ;6a151234b110

-    add.b @0x1234:16,@er1+                             ;6a1512348110

-    add.b @0x1234:16,@er1-                             ;6a151234a110

-    add.b @0x1234:16,@+er1                             ;6a1512349110

-    add.b @0x1234:16,@(0xffff9abc:16,er1)              ;6a151234c1109abc

-    add.b @0x1234:16,@(0x9abcdef0:32,er1)              ;6a151234c9109abcdef0

-    add.b @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6a151234d2109abc

-    add.b @0x1234:16,@(0xffff9abc:16,r2.w)            ;6a151234e2109abc

-    add.b @0x1234:16,@(0xffff9abc:16,er2.l)            ;6a151234f2109abc

-    add.b @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6a151234da109abcdef0

-    add.b @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6a151234ea109abcdef0

-    add.b @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6a151234fa109abcdef0

-    add.b @0x1234:16,@0xffff9abc:16                    ;6a15123440109abc

-    add.b @0x1234:16,@0x9abcdef0:32                    ;6a15123448109abcdef0

-

-    add.b @0x12345678:32,@er1                              ;6a35123456780110

-    add.b @0x12345678:32,@(3:2,er1)                        ;6a35123456783110

-    add.b @0x12345678:32,@-er1                             ;6a3512345678b110

-    add.b @0x12345678:32,@er1+                             ;6a35123456788110

-    add.b @0x12345678:32,@er1-                             ;6a3512345678a110

-    add.b @0x12345678:32,@+er1                             ;6a35123456789110

-    add.b @0x12345678:32,@(0xffff9abc:16,er1)              ;6a3512345678c1109abc

-    add.b @0x12345678:32,@(0x9abcdef0:32,er1)              ;6a3512345678c9109abcdef0

-    add.b @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6a3512345678d2109abc

-    add.b @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6a3512345678e2109abc

-    add.b @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6a3512345678f2109abc

-    add.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6a3512345678da109abcdef0

-    add.b @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6a3512345678ea109abcdef0

-    add.b @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6a3512345678fa109abcdef0

-    add.b @0x12345678:32,@0xffff9abc:16                    ;6a351234567840109abc

-    add.b @0x12345678:32,@0x9abcdef0:32                    ;6a351234567848109abcdef0

-

-    add.w #0x1234:16,r1                                    ;79111234

-    add.w #0x7:3,r2                                        ;0a72

-    add.w #0x1234:16,@er1                              ;015e01101234

-    add.w #0x1234:16,@(0x6:2,er1)                      ;015e31101234

-    add.w #0x1234:16,@er1+                             ;015e81101234

-    add.w #0x1234:16,@-er1                             ;015eb1101234

-    add.w #0x1234:16,@+er1                             ;015e91101234

-    add.w #0x1234:16,@er1-                             ;015ea1101234

-    add.w #0x1234:16,@(0xffff9abc:16,er1)           ;015ec1109abc1234

-    add.w #0x1234:16,@(0x9abcdef0:32,er1)           ;015ec9109abcdef01234

-    add.w #0x1234:16,@(0xffff9abc:16,r2l.b)         ;015ed2109abc1234

-    add.w #0x1234:16,@(0xffff9abc:16,r2.w)         ;015ee2109abc1234

-    add.w #0x1234:16,@(0xffff9abc:16,er2.l)         ;015ef2109abc1234

-    add.w #0x1234:16,@(0x9abcdef0:32,r2l.b)         ;015eda109abcdef01234

-    add.w #0x1234:16,@(0x9abcdef0:32,r2.w)         ;015eea109abcdef01234

-    add.w #0x1234:16,@(0x9abcdef0:32,er2.l)         ;015efa109abcdef01234

-    add.w #0x1234:16,@0xffff9abc:16                    ;015e40109abc1234

-    add.w #0x1234:16,@0x9abcdef0:32                    ;015e48109abcdef01234

-

-    add.w #0x7:3,@er1                       ;7d900a70

-    add.w #0x7:3,@0x1234:16                     ;6b1812340a70

-    add.w #0x7:3,@0x12345678:32                     ;6b38123456780a70

-

-    add.w r3,r1                           ;0931

-

-    add.w r3,@er1                         ;7d900930

-    add.w r3,@(0x6:2,er1)                ;01593113

-    add.w r3,@er1+                        ;01598113

-    add.w r3,@-er1                        ;0159b113

-    add.w r3,@+er1                        ;01599113

-    add.w r3,@er1-                        ;0159a113

-    add.w r3,@(0x1234:16,er1)                  ;0159c1131234

-    add.w r3,@(0x12345678:32,er1)                  ;0159c91312345678

-    add.w r3,@(0x1234:16,r2l.b)                ;0159d2131234

-    add.w r3,@(0x1234:16,r2.w)                ;0159e2131234

-    add.w r3,@(0x1234:16,er2.l)                ;0159f2131234

-    add.w r3,@(0x12345678:32,r2l.b)                ;0159da1312345678

-    add.w r3,@(0x12345678:32,r2.w)                ;0159ea1312345678

-    add.w r3,@(0x12345678:32,er2.l)                ;0159fa1312345678

-    add.w r3,@0x1234:16                       ;6b1812340930

-    add.w r3,@0x12345678:32                       ;6b38123456780930

-

-    add.w @er3,r1                         ;7cb00901

-    add.w @(0x6:2,er1),r1               ;015a3111

-    add.w @er3+,r1                       ;015a8311

-    add.w @-er3,r1                       ;015ab311

-    add.w @+er3,r1                       ;015a9311

-    add.w @er3-,r1                       ;015aa311

-    add.w @(0x1234:16,er1),r1                  ;015ac1111234

-    add.w @(0x12345678:32,er1),r1                  ;015ac91112345678

-    add.w @(0x1234:16,r2l.b),r1                ;015ad2111234

-    add.w @(0x1234:16,r2.w),r1                ;015ae2111234

-    add.w @(0x1234:16,er2.l),r1                ;015af2111234

-    add.w @(0x12345678:32,r2l.b),r1                ;015ada1112345678

-    add.w @(0x12345678:32,r2.w),r1                ;015aea1112345678

-    add.w @(0x12345678:32,er2.l),r1                ;015afa1112345678

-    add.w @0x1234:16,r1                       ;6b1012340901

-    add.w @0x12345678:32,r1                       ;6b30123456780901

-

-    add.w @er3,@er1                                ;7cb50110

-    add.w @er3,@(6:2,er1)                          ;7cb53110

-    add.w @er3,@-er1                               ;7cb5b110

-    add.w @er3,@er1+                               ;7cb58110

-    add.w @er3,@er1-                               ;7cb5a110

-    add.w @er3,@+er1                               ;7cb59110

-    add.w @er3,@(0xffff9abc:16,er1)                ;7cb5c1109abc

-    add.w @er3,@(0x9abcdef0:32,er1)                ;7cb5c9109abcdef0

-    add.w @er3,@(0xffff9abc:16,r2l.b)              ;7cb5d2109abc

-    add.w @er3,@(0xffff9abc:16,r2.w)              ;7cb5e2109abc

-    add.w @er3,@(0xffff9abc:16,er2.l)              ;7cb5f2109abc

-    add.w @er3,@(0x9abcdef0:32,r2l.b)              ;7cb5da109abcdef0

-    add.w @er3,@(0x9abcdef0:32,r2.w)              ;7cb5ea109abcdef0

-    add.w @er3,@(0x9abcdef0:32,er2.l)              ;7cb5fa109abcdef0

-    add.w @er3,@0xffff9abc:16                      ;7cb540109abc

-    add.w @er3,@0x9abcdef0:32                      ;7cb548109abcdef0

-

-    add.w @-er3,@er1                               ;01576d3c0110

-    add.w @-er3,@(6:2,er1)                         ;01576d3c3110

-    add.w @-er3,@-er1                              ;01576d3cb110

-    add.w @-er3,@er1+                              ;01576d3c8110

-    add.w @-er3,@er1-                              ;01576d3ca110

-    add.w @-er3,@+er1                              ;01576d3c9110

-    add.w @-er3,@(0xffff9abc:16,er1)               ;01576d3cc1109abc

-    add.w @-er3,@(0x9abcdef0:32,er1)               ;01576d3cc9109abcdef0

-    add.w @-er3,@(0xffff9abc:16,r2l.b)             ;01576d3cd2109abc

-    add.w @-er3,@(0xffff9abc:16,r2.w)             ;01576d3ce2109abc

-    add.w @-er3,@(0xffff9abc:16,er2.l)             ;01576d3cf2109abc

-    add.w @-er3,@(0x9abcdef0:32,r2l.b)             ;01576d3cda109abcdef0

-    add.w @-er3,@(0x9abcdef0:32,r2.w)             ;01576d3cea109abcdef0

-    add.w @-er3,@(0x9abcdef0:32,er2.l)             ;01576d3cfa109abcdef0

-    add.w @-er3,@0xffff9abc:16                     ;01576d3c40109abc

-    add.w @-er3,@0x9abcdef0:32                     ;01576d3c48109abcdef0

-

-    add.w @er3+,@er1                               ;01546d3c0110

-    add.w @er3+,@(6:2,er1)                         ;01546d3c3110

-    add.w @er3+,@-er1                              ;01546d3cb110

-    add.w @er3+,@er1+                              ;01546d3c8110

-    add.w @er3+,@er1-                              ;01546d3ca110

-    add.w @er3+,@+er1                              ;01546d3c9110

-    add.w @er3+,@(0xffff9abc:16,er1)               ;01546d3cc1109abc

-    add.w @er3+,@(0x9abcdef0:32,er1)               ;01546d3cc9109abcdef0

-    add.w @er3+,@(0xffff9abc:16,r2l.b)             ;01546d3cd2109abc

-    add.w @er3+,@(0xffff9abc:16,r2.w)             ;01546d3ce2109abc

-    add.w @er3+,@(0xffff9abc:16,er2.l)             ;01546d3cf2109abc

-    add.w @er3+,@(0x9abcdef0:32,r2l.b)             ;01546d3cda109abcdef0

-    add.w @er3+,@(0x9abcdef0:32,r2.w)             ;01546d3cea109abcdef0

-    add.w @er3+,@(0x9abcdef0:32,er2.l)             ;01546d3cfa109abcdef0

-    add.w @er3+,@0xffff9abc:16                     ;01546d3c40109abc

-    add.w @er3+,@0x9abcdef0:32                     ;01546d3c48109abcdef0

-

-    add.w @er3-,@er1                               ;01566d3c0110

-    add.w @er3-,@(6:2,er1)                         ;01566d3c3110

-    add.w @er3-,@-er1                              ;01566d3cb110

-    add.w @er3-,@er1+                              ;01566d3c8110

-    add.w @er3-,@er1-                              ;01566d3ca110

-    add.w @er3-,@+er1                              ;01566d3c9110

-    add.w @er3-,@(0xffff9abc:16,er1)               ;01566d3cc1109abc

-    add.w @er3-,@(0x9abcdef0:32,er1)               ;01566d3cc9109abcdef0

-    add.w @er3-,@(0xffff9abc:16,r2l.b)             ;01566d3cd2109abc

-    add.w @er3-,@(0xffff9abc:16,r2.w)             ;01566d3ce2109abc

-    add.w @er3-,@(0xffff9abc:16,er2.l)             ;01566d3cf2109abc

-    add.w @er3-,@(0x9abcdef0:32,r2l.b)             ;01566d3cda109abcdef0

-    add.w @er3-,@(0x9abcdef0:32,r2.w)             ;01566d3cea109abcdef0

-    add.w @er3-,@(0x9abcdef0:32,er2.l)             ;01566d3cfa109abcdef0

-    add.w @er3-,@0xffff9abc:16                     ;01566d3c40109abc

-    add.w @er3-,@0x9abcdef0:32                     ;01566d3c48109abcdef0

-

-    add.w @+er3,@er1                               ;01556d3c0110

-    add.w @+er3,@(6:2,er1)                         ;01556d3c3110

-    add.w @+er3,@-er1                              ;01556d3cb110

-    add.w @+er3,@er1+                              ;01556d3c8110

-    add.w @+er3,@er1-                              ;01556d3ca110

-    add.w @+er3,@+er1                              ;01556d3c9110

-    add.w @+er3,@(0xffff9abc:16,er1)               ;01556d3cc1109abc

-    add.w @+er3,@(0x9abcdef0:32,er1)               ;01556d3cc9109abcdef0

-    add.w @+er3,@(0xffff9abc:16,r2l.b)             ;01556d3cd2109abc

-    add.w @+er3,@(0xffff9abc:16,r2.w)             ;01556d3ce2109abc

-    add.w @+er3,@(0xffff9abc:16,er2.l)             ;01556d3cf2109abc

-    add.w @+er3,@(0x9abcdef0:32,r2l.b)             ;01556d3cda109abcdef0

-    add.w @+er3,@(0x9abcdef0:32,r2.w)             ;01556d3cea109abcdef0

-    add.w @+er3,@(0x9abcdef0:32,er2.l)             ;01556d3cfa109abcdef0

-    add.w @+er3,@0xffff9abc:16                     ;01556d3c40109abc

-    add.w @+er3,@0x9abcdef0:32                     ;01556d3c48109abcdef0

-

-    add.w @(0x1234:16,er3),@er1                         ;01546f3c12340110

-    add.w @(0x1234:16,er3),@(6:2,er1)                   ;01546f3c12343110

-    add.w @(0x1234:16,er3),@-er1                        ;01546f3c1234b110

-    add.w @(0x1234:16,er3),@er1+                        ;01546f3c12348110

-    add.w @(0x1234:16,er3),@er1-                        ;01546f3c1234a110

-    add.w @(0x1234:16,er3),@+er1                        ;01546f3c12349110

-    add.w @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01546f3c1234c1109abc

-    add.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01546f3c1234c9109abcdef0

-    add.w @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01546f3c1234d2109abc

-    add.w @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01546f3c1234e2109abc

-    add.w @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01546f3c1234f2109abc

-    add.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01546f3c1234da109abcdef0

-    add.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01546f3c1234ea109abcdef0

-    add.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01546f3c1234fa109abcdef0

-    add.w @(0x1234:16,er3),@0xffff9abc:16               ;01546f3c123440109abc

-    add.w @(0x1234:16,er3),@0x9abcdef0:32               ;01546f3c123448109abcdef0

-

-    add.w @(0x12345678:32,er3),@er1                         ;78346b2c123456780110

-    add.w @(0x12345678:32,er3),@(6:2,er1)                   ;78346b2c123456783110

-    add.w @(0x12345678:32,er3),@-er1                        ;78346b2c12345678b110

-    add.w @(0x12345678:32,er3),@er1+                        ;78346b2c123456788110

-    add.w @(0x12345678:32,er3),@er1-                        ;78346b2c12345678a110

-    add.w @(0x12345678:32,er3),@+er1                        ;78346b2c123456789110

-    add.w @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346b2c12345678c1109abc

-    add.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346b2c12345678c9109abcdef0

-    add.w @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346b2c12345678d2109abc

-    add.w @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346b2c12345678e2109abc

-    add.w @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346b2c12345678f2109abc

-    add.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346b2c12345678da109abcdef0

-    add.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346b2c12345678ea109abcdef0

-    add.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346b2c12345678fa109abcdef0

-    add.w @(0x12345678:32,er3),@0xffff9abc:16               ;78346b2c1234567840109abc

-    add.w @(0x12345678:32,er3),@0x9abcdef0:32               ;78346b2c1234567848109abcdef0

-

-    add.w @(0x1234:16,r3l.b),@er1                       ;01556f3c12340110

-    add.w @(0x1234:16,r3l.b),@(6:2,er1)                 ;01556f3c12343110

-    add.w @(0x1234:16,r3l.b),@-er1                      ;01556f3c1234b110

-    add.w @(0x1234:16,r3l.b),@er1+                      ;01556f3c12348110

-    add.w @(0x1234:16,r3l.b),@er1-                      ;01556f3c1234a110

-    add.w @(0x1234:16,r3l.b),@+er1                      ;01556f3c12349110

-    add.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01556f3c1234c1109abc

-    add.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01556f3c1234c9109abcdef0

-    add.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01556f3c1234d2109abc

-    add.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01556f3c1234e2109abc

-    add.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01556f3c1234f2109abc

-    add.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01556f3c1234da109abcdef0

-    add.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01556f3c1234ea109abcdef0

-    add.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01556f3c1234fa109abcdef0

-    add.w @(0x1234:16,r3l.b),@0xffff9abc:16             ;01556f3c123440109abc

-    add.w @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01556f3c123448109abcdef0

-

-    add.w @(0x1234:16,r3.w),@er1                       ;01566f3c12340110

-    add.w @(0x1234:16,r3.w),@(6:2,er1)                 ;01566f3c12343110

-    add.w @(0x1234:16,r3.w),@-er1                      ;01566f3c1234b110

-    add.w @(0x1234:16,r3.w),@er1+                      ;01566f3c12348110

-    add.w @(0x1234:16,r3.w),@er1-                      ;01566f3c1234a110

-    add.w @(0x1234:16,r3.w),@+er1                      ;01566f3c12349110

-    add.w @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01566f3c1234c1109abc

-    add.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01566f3c1234c9109abcdef0

-    add.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01566f3c1234d2109abc

-    add.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01566f3c1234e2109abc

-    add.w @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01566f3c1234f2109abc

-    add.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01566f3c1234da109abcdef0

-    add.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01566f3c1234ea109abcdef0

-    add.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01566f3c1234fa109abcdef0

-    add.w @(0x1234:16,r3.w),@0xffff9abc:16             ;01566f3c123440109abc

-    add.w @(0x1234:16,r3.w),@0x9abcdef0:32             ;01566f3c123448109abcdef0

-

-    add.w @(0x1234:16,er3.l),@er1                       ;01576f3c12340110

-    add.w @(0x1234:16,er3.l),@(6:2,er1)                 ;01576f3c12343110

-    add.w @(0x1234:16,er3.l),@-er1                      ;01576f3c1234b110

-    add.w @(0x1234:16,er3.l),@er1+                      ;01576f3c12348110

-    add.w @(0x1234:16,er3.l),@er1-                      ;01576f3c1234a110

-    add.w @(0x1234:16,er3.l),@+er1                      ;01576f3c12349110

-    add.w @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01576f3c1234c1109abc

-    add.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01576f3c1234c9109abcdef0

-    add.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01576f3c1234d2109abc

-    add.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01576f3c1234e2109abc

-    add.w @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01576f3c1234f2109abc

-    add.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01576f3c1234da109abcdef0

-    add.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01576f3c1234ea109abcdef0

-    add.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01576f3c1234fa109abcdef0

-    add.w @(0x1234:16,er3.l),@0xffff9abc:16             ;01576f3c123440109abc

-    add.w @(0x1234:16,er3.l),@0x9abcdef0:32             ;01576f3c123448109abcdef0

-

-    add.w @(0x12345678:32,r3l.b),@er1                       ;78356b2c123456780110

-    add.w @(0x12345678:32,r3l.b),@(6:2,er1)                 ;78356b2c123456783110

-    add.w @(0x12345678:32,r3l.b),@-er1                      ;78356b2c12345678b110

-    add.w @(0x12345678:32,r3l.b),@er1+                      ;78356b2c123456788110

-    add.w @(0x12345678:32,r3l.b),@er1-                      ;78356b2c12345678a110

-    add.w @(0x12345678:32,r3l.b),@+er1                      ;78356b2c123456789110

-    add.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356b2c12345678c1109abc

-    add.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356b2c12345678c9109abcdef0

-    add.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356b2c12345678d2109abc

-    add.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356b2c12345678e2109abc

-    add.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356b2c12345678f2109abc

-    add.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356b2c12345678da109abcdef0

-    add.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356b2c12345678ea109abcdef0

-    add.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356b2c12345678fa109abcdef0

-    add.w @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356b2c1234567840109abc

-    add.w @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356b2c1234567848109abcdef0

-

-    add.w @(0x12345678:32,r3.w),@er1                       ;78366b2c123456780110

-    add.w @(0x12345678:32,r3.w),@(6:2,er1)                 ;78366b2c123456783110

-    add.w @(0x12345678:32,r3.w),@-er1                      ;78366b2c12345678b110

-    add.w @(0x12345678:32,r3.w),@er1+                      ;78366b2c123456788110

-    add.w @(0x12345678:32,r3.w),@er1-                      ;78366b2c12345678a110

-    add.w @(0x12345678:32,r3.w),@+er1                      ;78366b2c123456789110

-    add.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366b2c12345678c1109abc

-    add.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366b2c12345678c9109abcdef0

-    add.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366b2c12345678d2109abc

-    add.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366b2c12345678e2109abc

-    add.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366b2c12345678f2109abc

-    add.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366b2c12345678da109abcdef0

-    add.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366b2c12345678ea109abcdef0

-    add.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366b2c12345678fa109abcdef0

-    add.w @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366b2c1234567840109abc

-    add.w @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366b2c1234567848109abcdef0

-

-    add.w @(0x12345678:32,er3.l),@er1                       ;78376b2c123456780110

-    add.w @(0x12345678:32,er3.l),@(6:2,er1)                 ;78376b2c123456783110

-    add.w @(0x12345678:32,er3.l),@-er1                      ;78376b2c12345678b110

-    add.w @(0x12345678:32,er3.l),@er1+                      ;78376b2c123456788110

-    add.w @(0x12345678:32,er3.l),@er1-                      ;78376b2c12345678a110

-    add.w @(0x12345678:32,er3.l),@+er1                      ;78376b2c123456789110

-    add.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376b2c12345678c1109abc

-    add.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376b2c12345678c9109abcdef0

-    add.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376b2c12345678d2109abc

-    add.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376b2c12345678e2109abc

-    add.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376b2c12345678f2109abc

-    add.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376b2c12345678da109abcdef0

-    add.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376b2c12345678ea109abcdef0

-    add.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376b2c12345678fa109abcdef0

-    add.w @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376b2c1234567840109abc

-    add.w @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376b2c1234567848109abcdef0

-

-    add.w @0x1234:16,@er1                              ;6b1512340110

-    add.w @0x1234:16,@(6:2,er1)                        ;6b1512343110

-    add.w @0x1234:16,@-er1                             ;6b151234b110

-    add.w @0x1234:16,@er1+                             ;6b1512348110

-    add.w @0x1234:16,@er1-                             ;6b151234a110

-    add.w @0x1234:16,@+er1                             ;6b1512349110

-    add.w @0x1234:16,@(0xffff9abc:16,er1)              ;6b151234c1109abc

-    add.w @0x1234:16,@(0x9abcdef0:32,er1)              ;6b151234c9109abcdef0

-    add.w @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6b151234d2109abc

-    add.w @0x1234:16,@(0xffff9abc:16,r2.w)            ;6b151234e2109abc

-    add.w @0x1234:16,@(0xffff9abc:16,er2.l)            ;6b151234f2109abc

-    add.w @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6b151234da109abcdef0

-    add.w @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6b151234ea109abcdef0

-    add.w @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6b151234fa109abcdef0

-    add.w @0x1234:16,@0xffff9abc:16                    ;6b15123440109abc

-    add.w @0x1234:16,@0x9abcdef0:32                    ;6b15123448109abcdef0

-

-    add.w @0x12345678:32,@er1                              ;6b35123456780110

-    add.w @0x12345678:32,@(6:2,er1)                        ;6b35123456783110

-    add.w @0x12345678:32,@-er1                             ;6b3512345678b110

-    add.w @0x12345678:32,@er1+                             ;6b35123456788110

-    add.w @0x12345678:32,@er1-                             ;6b3512345678a110

-    add.w @0x12345678:32,@+er1                             ;6b35123456789110

-    add.w @0x12345678:32,@(0xffff9abc:16,er1)              ;6b3512345678c1109abc

-    add.w @0x12345678:32,@(0x9abcdef0:32,er1)              ;6b3512345678c9109abcdef0

-    add.w @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6b3512345678d2109abc

-    add.w @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6b3512345678e2109abc

-    add.w @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6b3512345678f2109abc

-    add.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6b3512345678da109abcdef0

-    add.w @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6b3512345678ea109abcdef0

-    add.w @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6b3512345678fa109abcdef0

-    add.w @0x12345678:32,@0xffff9abc:16                    ;6b351234567840109abc

-    add.w @0x12345678:32,@0x9abcdef0:32                    ;6b351234567848109abcdef0

-

-    add.l #0x12345678:32,er1                      ;7a1112345678

-    add.l #0x1234:16,er1                       ;7a191234

-    add.l #0x7:3,er2                         ;0afa

-    add.l #0x12345678:32,@er1                      ;010e011812345678

-    add.l #0x12345678:32,@(0xc:2,er1)             ;010e311812345678

-    add.l #0x12345678:32,@er1+                     ;010e811812345678

-    add.l #0x12345678:32,@-er1                     ;010eb11812345678

-    add.l #0x12345678:32,@+er1                     ;010e911812345678

-    add.l #0x12345678:32,@er1-                     ;010ea11812345678

-    add.l #0x12345678:32,@(0xffff9abc:16,er1)               ;010ec1189abc12345678

-    add.l #0x12345678:32,@(0x9abcdef0:32,er1)               ;010ec9189abcdef012345678

-    add.l #0x12345678:32,@(0xffff9abc:16,r2l.b)             ;010ed2189abc12345678

-    add.l #0x12345678:32,@(0xffff9abc:16,r2.w)             ;010ee2189abc12345678

-    add.l #0x12345678:32,@(0xffff9abc:16,er2.l)             ;010ef2189abc12345678

-    add.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)             ;010eda189abcdef012345678

-    add.l #0x12345678:32,@(0x9abcdef0:32,r2.w)             ;010eea189abcdef012345678

-    add.l #0x12345678:32,@(0x9abcdef0:32,er2.l)             ;010efa189abcdef012345678

-    add.l #0x12345678:32,@0xffff9abc:16                     ;010e40189abc12345678

-    add.l #0x12345678:32,@0x9abcdef0:32                     ;010e48189abcdef012345678

-    add.l #0x1234:16,@er1                      ;010e01101234

-    add.l #0x1234:16,@(0xc:2,er1)             ;010e31101234

-    add.l #0x1234:16,@er1+                     ;010e81101234

-    add.l #0x1234:16,@-er1                     ;010eb1101234

-    add.l #0x1234:16,@+er1                     ;010e91101234

-    add.l #0x1234:16,@er1-                     ;010ea1101234

-    add.l #0x1234:16,@(0xffff9abc:16,er1)               ;010ec1109abc1234

-    add.l #0x1234:16,@(0x9abcdef0:32,er1)               ;010ec9109abcdef01234

-    add.l #0x1234:16,@(0xffff9abc:16,r2l.b)             ;010ed2109abc1234

-    add.l #0x1234:16,@(0xffff9abc:16,r2.w)             ;010ee2109abc1234

-    add.l #0x1234:16,@(0xffff9abc:16,er2.l)             ;010ef2109abc1234

-    add.l #0x1234:16,@(0x9abcdef0:32,r2l.b)             ;010eda109abcdef01234

-    add.l #0x1234:16,@(0x9abcdef0:32,r2.w)             ;010eea109abcdef01234

-    add.l #0x1234:16,@(0x9abcdef0:32,er2.l)             ;010efa109abcdef01234

-    add.l #0x1234:16,@0xffff9abc:16                     ;010e40109abc1234

-    add.l #0x1234:16,@0x9abcdef0:32                     ;010e48109abcdef01234

-

-    add.l er3,er1                           ;0ab1

-

-    add.l er3,@er1                         ;01090113

-    add.l er3,@(0xc:2,er1)                ;01093113

-    add.l er3,@er1+                        ;01098113

-    add.l er3,@-er1                        ;0109b113

-    add.l er3,@+er1                        ;01099113

-    add.l er3,@er1-                        ;0109a113

-    add.l er3,@(0x1234:16,er1)                  ;0109c1131234

-    add.l er3,@(0x12345678:32,er1)                  ;0109c91312345678

-    add.l er3,@(0x1234:16,r2l.b)                ;0109d2131234

-    add.l er3,@(0x1234:16,r2.w)                ;0109e2131234

-    add.l er3,@(0x1234:16,er2.l)                ;0109f2131234

-    add.l er3,@(0x12345678:32,r2l.b)                ;0109da1312345678

-    add.l er3,@(0x12345678:32,r2.w)                ;0109ea1312345678

-    add.l er3,@(0x12345678:32,er2.l)                ;0109fa1312345678

-    add.l er3,@0x1234:16                       ;010940131234

-    add.l er3,@0x12345678:32                       ;0109481312345678

-

-    add.l @er3,er1                         ;010a0311

-    add.l @(0xc:2,er3),er1               ;010a3311

-    add.l @er3+,er1                       ;010a8311

-    add.l @-er3,er1                       ;010ab311

-    add.l @+er3,er1                       ;010a9311

-    add.l @er3-,er1                       ;010aa311

-    add.l @(0x1234:16,er1),er1                  ;010ac1111234

-    add.l @(0x12345678:32,er1),er1                  ;010ac91112345678

-    add.l @(0x1234:16,r2l.b),er1                ;010ad2111234

-    add.l @(0x1234:16,r2.w),er1                ;010ae2111234

-    add.l @(0x1234:16,er2.l),er1                ;010af2111234

-    add.l @(0x12345678:32,r2l.b),er1                ;010ada1112345678

-    add.l @(0x12345678:32,r2.w),er1                ;010aea1112345678

-    add.l @(0x12345678:32,er2.l),er1                ;010afa1112345678

-    add.l @0x1234:16,er1                       ;010a40111234

-    add.l @0x12345678:32,er1                       ;010a481112345678

-

-    add.l @er3,@er1                                ;0104693c0110

-    add.l @er3,@(0xc:2,er1)                          ;0104693c3110

-    add.l @er3,@-er1                               ;0104693cb110

-    add.l @er3,@er1+                               ;0104693c8110

-    add.l @er3,@er1-                               ;0104693ca110

-    add.l @er3,@+er1                               ;0104693c9110

-    add.l @er3,@(0xffff9abc:16,er1)                ;0104693cc1109abc

-    add.l @er3,@(0x9abcdef0:32,er1)                ;0104693cc9109abcdef0

-    add.l @er3,@(0xffff9abc:16,r2l.b)              ;0104693cd2109abc

-    add.l @er3,@(0xffff9abc:16,r2.w)              ;0104693ce2109abc

-    add.l @er3,@(0xffff9abc:16,er2.l)              ;0104693cf2109abc

-    add.l @er3,@(0x9abcdef0:32,r2l.b)              ;0104693cda109abcdef0

-    add.l @er3,@(0x9abcdef0:32,r2.w)              ;0104693cea109abcdef0

-    add.l @er3,@(0x9abcdef0:32,er2.l)              ;0104693cfa109abcdef0

-    add.l @er3,@0xffff9abc:16                      ;0104693c40109abc

-    add.l @er3,@0x9abcdef0:32                      ;0104693c48109abcdef0

-

-    add.l @(0xc:2,er3),@er1                       ;0107693c0110

-    add.l @(0xc:2,er3),@(0xc:2,er1)                 ;0107693c3110

-    add.l @(0xc:2,er3),@-er1                      ;0107693cb110

-    add.l @(0xc:2,er3),@er1+                      ;0107693c8110

-    add.l @(0xc:2,er3),@er1-                      ;0107693ca110

-    add.l @(0xc:2,er3),@+er1                      ;0107693c9110

-    add.l @(0xc:2,er3),@(0xffff9abc:16,er1)       ;0107693cc1109abc

-    add.l @(0xc:2,er3),@(0x9abcdef0:32,er1)       ;0107693cc9109abcdef0

-    add.l @(0xc:2,er3),@(0xffff9abc:16,r2l.b)     ;0107693cd2109abc

-    add.l @(0xc:2,er3),@(0xffff9abc:16,r2.w)     ;0107693ce2109abc

-    add.l @(0xc:2,er3),@(0xffff9abc:16,er2.l)     ;0107693cf2109abc

-    add.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)     ;0107693cda109abcdef0

-    add.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)     ;0107693cea109abcdef0

-    add.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)     ;0107693cfa109abcdef0

-    add.l @(0xc:2,er3),@0xffff9abc:16             ;0107693c40109abc

-    add.l @(0xc:2,er3),@0x9abcdef0:32             ;0107693c48109abcdef0

-

-    add.l @-er3,@er1                               ;01076d3c0110

-    add.l @-er3,@(0xc:2,er1)                         ;01076d3c3110

-    add.l @-er3,@-er1                              ;01076d3cb110

-    add.l @-er3,@er1+                              ;01076d3c8110

-    add.l @-er3,@er1-                              ;01076d3ca110

-    add.l @-er3,@+er1                              ;01076d3c9110

-    add.l @-er3,@(0xffff9abc:16,er1)               ;01076d3cc1109abc

-    add.l @-er3,@(0x9abcdef0:32,er1)               ;01076d3cc9109abcdef0

-    add.l @-er3,@(0xffff9abc:16,r2l.b)             ;01076d3cd2109abc

-    add.l @-er3,@(0xffff9abc:16,r2.w)             ;01076d3ce2109abc

-    add.l @-er3,@(0xffff9abc:16,er2.l)             ;01076d3cf2109abc

-    add.l @-er3,@(0x9abcdef0:32,r2l.b)             ;01076d3cda109abcdef0

-    add.l @-er3,@(0x9abcdef0:32,r2.w)             ;01076d3cea109abcdef0

-    add.l @-er3,@(0x9abcdef0:32,er2.l)             ;01076d3cfa109abcdef0

-    add.l @-er3,@0xffff9abc:16                     ;01076d3c40109abc

-    add.l @-er3,@0x9abcdef0:32                     ;01076d3c48109abcdef0

-

-    add.l @er3+,@er1                               ;01046d3c0110

-    add.l @er3+,@(0xc:2,er1)                         ;01046d3c3110

-    add.l @er3+,@-er1                              ;01046d3cb110

-    add.l @er3+,@er1+                              ;01046d3c8110

-    add.l @er3+,@er1-                              ;01046d3ca110

-    add.l @er3+,@+er1                              ;01046d3c9110

-    add.l @er3+,@(0xffff9abc:16,er1)               ;01046d3cc1109abc

-    add.l @er3+,@(0x9abcdef0:32,er1)               ;01046d3cc9109abcdef0

-    add.l @er3+,@(0xffff9abc:16,r2l.b)             ;01046d3cd2109abc

-    add.l @er3+,@(0xffff9abc:16,r2.w)             ;01046d3ce2109abc

-    add.l @er3+,@(0xffff9abc:16,er2.l)             ;01046d3cf2109abc

-    add.l @er3+,@(0x9abcdef0:32,r2l.b)             ;01046d3cda109abcdef0

-    add.l @er3+,@(0x9abcdef0:32,r2.w)             ;01046d3cea109abcdef0

-    add.l @er3+,@(0x9abcdef0:32,er2.l)             ;01046d3cfa109abcdef0

-    add.l @er3+,@0xffff9abc:16                     ;01046d3c40109abc

-    add.l @er3+,@0x9abcdef0:32                     ;01046d3c48109abcdef0

-

-    add.l @er3-,@er1                               ;01066d3c0110

-    add.l @er3-,@(0xc:2,er1)                         ;01066d3c3110

-    add.l @er3-,@-er1                              ;01066d3cb110

-    add.l @er3-,@er1+                              ;01066d3c8110

-    add.l @er3-,@er1-                              ;01066d3ca110

-    add.l @er3-,@+er1                              ;01066d3c9110

-    add.l @er3-,@(0xffff9abc:16,er1)               ;01066d3cc1109abc

-    add.l @er3-,@(0x9abcdef0:32,er1)               ;01066d3cc9109abcdef0

-    add.l @er3-,@(0xffff9abc:16,r2l.b)             ;01066d3cd2109abc

-    add.l @er3-,@(0xffff9abc:16,r2.w)             ;01066d3ce2109abc

-    add.l @er3-,@(0xffff9abc:16,er2.l)             ;01066d3cf2109abc

-    add.l @er3-,@(0x9abcdef0:32,r2l.b)             ;01066d3cda109abcdef0

-    add.l @er3-,@(0x9abcdef0:32,r2.w)             ;01066d3cea109abcdef0

-    add.l @er3-,@(0x9abcdef0:32,er2.l)             ;01066d3cfa109abcdef0

-    add.l @er3-,@0xffff9abc:16                     ;01066d3c40109abc

-    add.l @er3-,@0x9abcdef0:32                     ;01066d3c48109abcdef0

-

-    add.l @+er3,@er1                               ;01056d3c0110

-    add.l @+er3,@(0xc:2,er1)                         ;01056d3c3110

-    add.l @+er3,@-er1                              ;01056d3cb110

-    add.l @+er3,@er1+                              ;01056d3c8110

-    add.l @+er3,@er1-                              ;01056d3ca110

-    add.l @+er3,@+er1                              ;01056d3c9110

-    add.l @+er3,@(0xffff9abc:16,er1)               ;01056d3cc1109abc

-    add.l @+er3,@(0x9abcdef0:32,er1)               ;01056d3cc9109abcdef0

-    add.l @+er3,@(0xffff9abc:16,r2l.b)             ;01056d3cd2109abc

-    add.l @+er3,@(0xffff9abc:16,r2.w)             ;01056d3ce2109abc

-    add.l @+er3,@(0xffff9abc:16,er2.l)             ;01056d3cf2109abc

-    add.l @+er3,@(0x9abcdef0:32,r2l.b)             ;01056d3cda109abcdef0

-    add.l @+er3,@(0x9abcdef0:32,r2.w)             ;01056d3cea109abcdef0

-    add.l @+er3,@(0x9abcdef0:32,er2.l)             ;01056d3cfa109abcdef0

-    add.l @+er3,@0xffff9abc:16                     ;01056d3c40109abc

-    add.l @+er3,@0x9abcdef0:32                     ;01056d3c48109abcdef0

-

-    add.l @(0x1234:16,er3),@er1                         ;01046f3c12340110

-    add.l @(0x1234:16,er3),@(0xc:2,er1)                   ;01046f3c12343110

-    add.l @(0x1234:16,er3),@-er1                        ;01046f3c1234b110

-    add.l @(0x1234:16,er3),@er1+                        ;01046f3c12348110

-    add.l @(0x1234:16,er3),@er1-                        ;01046f3c1234a110

-    add.l @(0x1234:16,er3),@+er1                        ;01046f3c12349110

-    add.l @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01046f3c1234c1109abc

-    add.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01046f3c1234c9109abcdef0

-    add.l @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01046f3c1234d2109abc

-    add.l @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01046f3c1234e2109abc

-    add.l @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01046f3c1234f2109abc

-    add.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01046f3c1234da109abcdef0

-    add.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01046f3c1234ea109abcdef0

-    add.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01046f3c1234fa109abcdef0

-    add.l @(0x1234:16,er3),@0xffff9abc:16               ;01046f3c123440109abc

-    add.l @(0x1234:16,er3),@0x9abcdef0:32               ;01046f3c123448109abcdef0

-

-    add.l @(0x12345678:32,er3),@er1                         ;78b46b2c123456780110

-    add.l @(0x12345678:32,er3),@(0xc:2,er1)                   ;78b46b2c123456783110

-    add.l @(0x12345678:32,er3),@-er1                        ;78b46b2c12345678b110

-    add.l @(0x12345678:32,er3),@er1+                        ;78b46b2c123456788110

-    add.l @(0x12345678:32,er3),@er1-                        ;78b46b2c12345678a110

-    add.l @(0x12345678:32,er3),@+er1                        ;78b46b2c123456789110

-    add.l @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78b46b2c12345678c1109abc

-    add.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78b46b2c12345678c9109abcdef0

-    add.l @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78b46b2c12345678d2109abc

-    add.l @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78b46b2c12345678e2109abc

-    add.l @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78b46b2c12345678f2109abc

-    add.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78b46b2c12345678da109abcdef0

-    add.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78b46b2c12345678ea109abcdef0

-    add.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78b46b2c12345678fa109abcdef0

-    add.l @(0x12345678:32,er3),@0xffff9abc:16               ;78b46b2c1234567840109abc

-    add.l @(0x12345678:32,er3),@0x9abcdef0:32               ;78b46b2c1234567848109abcdef0

-

-    add.l @(0x1234:16,r3l.b),@er1                       ;01056f3c12340110

-    add.l @(0x1234:16,r3l.b),@(0xc:2,er1)                 ;01056f3c12343110

-    add.l @(0x1234:16,r3l.b),@-er1                      ;01056f3c1234b110

-    add.l @(0x1234:16,r3l.b),@er1+                      ;01056f3c12348110

-    add.l @(0x1234:16,r3l.b),@er1-                      ;01056f3c1234a110

-    add.l @(0x1234:16,r3l.b),@+er1                      ;01056f3c12349110

-    add.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01056f3c1234c1109abc

-    add.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01056f3c1234c9109abcdef0

-    add.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01056f3c1234d2109abc

-    add.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01056f3c1234e2109abc

-    add.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01056f3c1234f2109abc

-    add.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01056f3c1234da109abcdef0

-    add.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01056f3c1234ea109abcdef0

-    add.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01056f3c1234fa109abcdef0

-    add.l @(0x1234:16,r3l.b),@0xffff9abc:16             ;01056f3c123440109abc

-    add.l @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01056f3c123448109abcdef0

-

-    add.l @(0x1234:16,r3.w),@er1                       ;01066f3c12340110

-    add.l @(0x1234:16,r3.w),@(0xc:2,er1)                 ;01066f3c12343110

-    add.l @(0x1234:16,r3.w),@-er1                      ;01066f3c1234b110

-    add.l @(0x1234:16,r3.w),@er1+                      ;01066f3c12348110

-    add.l @(0x1234:16,r3.w),@er1-                      ;01066f3c1234a110

-    add.l @(0x1234:16,r3.w),@+er1                      ;01066f3c12349110

-    add.l @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01066f3c1234c1109abc

-    add.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01066f3c1234c9109abcdef0

-    add.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01066f3c1234d2109abc

-    add.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01066f3c1234e2109abc

-    add.l @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01066f3c1234f2109abc

-    add.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01066f3c1234da109abcdef0

-    add.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01066f3c1234ea109abcdef0

-    add.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01066f3c1234fa109abcdef0

-    add.l @(0x1234:16,r3.w),@0xffff9abc:16             ;01066f3c123440109abc

-    add.l @(0x1234:16,r3.w),@0x9abcdef0:32             ;01066f3c123448109abcdef0

-

-    add.l @(0x1234:16,er3.l),@er1                       ;01076f3c12340110

-    add.l @(0x1234:16,er3.l),@(0xc:2,er1)                 ;01076f3c12343110

-    add.l @(0x1234:16,er3.l),@-er1                      ;01076f3c1234b110

-    add.l @(0x1234:16,er3.l),@er1+                      ;01076f3c12348110

-    add.l @(0x1234:16,er3.l),@er1-                      ;01076f3c1234a110

-    add.l @(0x1234:16,er3.l),@+er1                      ;01076f3c12349110

-    add.l @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01076f3c1234c1109abc

-    add.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01076f3c1234c9109abcdef0

-    add.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01076f3c1234d2109abc

-    add.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01076f3c1234e2109abc

-    add.l @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01076f3c1234f2109abc

-    add.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01076f3c1234da109abcdef0

-    add.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01076f3c1234ea109abcdef0

-    add.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01076f3c1234fa109abcdef0

-    add.l @(0x1234:16,er3.l),@0xffff9abc:16             ;01076f3c123440109abc

-    add.l @(0x1234:16,er3.l),@0x9abcdef0:32             ;01076f3c123448109abcdef0

-

-    add.l @(0x12345678:32,r3l.b),@er1                       ;78b56b2c123456780110

-    add.l @(0x12345678:32,r3l.b),@(0xc:2,er1)                 ;78b56b2c123456783110

-    add.l @(0x12345678:32,r3l.b),@-er1                      ;78b56b2c12345678b110

-    add.l @(0x12345678:32,r3l.b),@er1+                      ;78b56b2c123456788110

-    add.l @(0x12345678:32,r3l.b),@er1-                      ;78b56b2c12345678a110

-    add.l @(0x12345678:32,r3l.b),@+er1                      ;78b56b2c123456789110

-    add.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78b56b2c12345678c1109abc

-    add.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78b56b2c12345678c9109abcdef0

-    add.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78b56b2c12345678d2109abc

-    add.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78b56b2c12345678e2109abc

-    add.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78b56b2c12345678f2109abc

-    add.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78b56b2c12345678da109abcdef0

-    add.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78b56b2c12345678ea109abcdef0

-    add.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78b56b2c12345678fa109abcdef0

-    add.l @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78b56b2c1234567840109abc

-    add.l @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78b56b2c1234567848109abcdef0

-

-    add.l @(0x12345678:32,r3.w),@er1                       ;78b66b2c123456780110

-    add.l @(0x12345678:32,r3.w),@(0xc:2,er1)                 ;78b66b2c123456783110

-    add.l @(0x12345678:32,r3.w),@-er1                      ;78b66b2c12345678b110

-    add.l @(0x12345678:32,r3.w),@er1+                      ;78b66b2c123456788110

-    add.l @(0x12345678:32,r3.w),@er1-                      ;78b66b2c12345678a110

-    add.l @(0x12345678:32,r3.w),@+er1                      ;78b66b2c123456789110

-    add.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78b66b2c12345678c1109abc

-    add.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78b66b2c12345678c9109abcdef0

-    add.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78b66b2c12345678d2109abc

-    add.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78b66b2c12345678e2109abc

-    add.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78b66b2c12345678f2109abc

-    add.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78b66b2c12345678da109abcdef0

-    add.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78b66b2c12345678ea109abcdef0

-    add.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78b66b2c12345678fa109abcdef0

-    add.l @(0x12345678:32,r3.w),@0xffff9abc:16             ;78b66b2c1234567840109abc

-    add.l @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78b66b2c1234567848109abcdef0

-

-    add.l @(0x12345678:32,er3.l),@er1                       ;78b76b2c123456780110

-    add.l @(0x12345678:32,er3.l),@(0xc:2,er1)                 ;78b76b2c123456783110

-    add.l @(0x12345678:32,er3.l),@-er1                      ;78b76b2c12345678b110

-    add.l @(0x12345678:32,er3.l),@er1+                      ;78b76b2c123456788110

-    add.l @(0x12345678:32,er3.l),@er1-                      ;78b76b2c12345678a110

-    add.l @(0x12345678:32,er3.l),@+er1                      ;78b76b2c123456789110

-    add.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78b76b2c12345678c1109abc

-    add.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78b76b2c12345678c9109abcdef0

-    add.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78b76b2c12345678d2109abc

-    add.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78b76b2c12345678e2109abc

-    add.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78b76b2c12345678f2109abc

-    add.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78b76b2c12345678da109abcdef0

-    add.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78b76b2c12345678ea109abcdef0

-    add.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78b76b2c12345678fa109abcdef0

-    add.l @(0x12345678:32,er3.l),@0xffff9abc:16             ;78b76b2c1234567840109abc

-    add.l @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78b76b2c1234567848109abcdef0

-

-    add.l @0x1234:16,@er1                              ;01046b0c12340110

-    add.l @0x1234:16,@(0xc:2,er1)                        ;01046b0c12343110

-    add.l @0x1234:16,@-er1                             ;01046b0c1234b110

-    add.l @0x1234:16,@er1+                             ;01046b0c12348110

-    add.l @0x1234:16,@er1-                             ;01046b0c1234a110

-    add.l @0x1234:16,@+er1                             ;01046b0c12349110

-    add.l @0x1234:16,@(0xffff9abc:16,er1)              ;01046b0c1234c1109abc

-    add.l @0x1234:16,@(0x9abcdef0:32,er1)              ;01046b0c1234c9109abcdef0

-    add.l @0x1234:16,@(0xffff9abc:16,r2l.b)            ;01046b0c1234d2109abc

-    add.l @0x1234:16,@(0xffff9abc:16,r2.w)            ;01046b0c1234e2109abc

-    add.l @0x1234:16,@(0xffff9abc:16,er2.l)            ;01046b0c1234f2109abc

-    add.l @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;01046b0c1234da109abcdef0

-    add.l @0x1234:16,@(0x9abcdef0:32,r2.w)            ;01046b0c1234ea109abcdef0

-    add.l @0x1234:16,@(0x9abcdef0:32,er2.l)            ;01046b0c1234fa109abcdef0

-    add.l @0x1234:16,@0xffff9abc:16                    ;01046b0c123440109abc

-    add.l @0x1234:16,@0x9abcdef0:32                    ;01046b0c123448109abcdef0

-

-    add.l @0x12345678:32,@er1                              ;01046b2c123456780110

-    add.l @0x12345678:32,@(0xc:2,er1)                        ;01046b2c123456783110

-    add.l @0x12345678:32,@-er1                             ;01046b2c12345678b110

-    add.l @0x12345678:32,@er1+                             ;01046b2c123456788110

-    add.l @0x12345678:32,@er1-                             ;01046b2c12345678a110

-    add.l @0x12345678:32,@+er1                             ;01046b2c123456789110

-    add.l @0x12345678:32,@(0xffff9abc:16,er1)              ;01046b2c12345678c1109abc

-    add.l @0x12345678:32,@(0x9abcdef0:32,er1)              ;01046b2c12345678c9109abcdef0

-    add.l @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;01046b2c12345678d2109abc

-    add.l @0x12345678:32,@(0xffff9abc:16,r2.w)            ;01046b2c12345678e2109abc

-    add.l @0x12345678:32,@(0xffff9abc:16,er2.l)            ;01046b2c12345678f2109abc

-    add.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;01046b2c12345678da109abcdef0

-    add.l @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;01046b2c12345678ea109abcdef0

-    add.l @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;01046b2c12345678fa109abcdef0

-    add.l @0x12345678:32,@0xffff9abc:16                    ;01046b2c1234567840109abc

-    add.l @0x12345678:32,@0x9abcdef0:32                    ;01046b2c1234567848109abcdef0

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t04_sub.exp b/gdb/testsuite/gdb.disasm/t04_sub.exp
deleted file mode 100644
index e3a521325fb..00000000000
--- a/gdb/testsuite/gdb.disasm/t04_sub.exp
+++ /dev/null
@@ -1,1874 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t04_sub"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "sub.b\t#0x12(:8|),@er1" \
-	"sub.b #0x12:8,@er1"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x3(:2|),er1\\)" \
-	"sub.b #0x12:8,@(0x3:2,er1)"
-gdb_test "x" "sub.b\t#0x12(:8|),@er1\\+" \
-	"sub.b #0x12:8,@er1+"
-gdb_test "x" "sub.b\t#0x12(:8|),@-er1" \
-	"sub.b #0x12:8,@-er1"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\+er1" \
-	"sub.b #0x12:8,@+er1"
-gdb_test "x" "sub.b\t#0x12(:8|),@er1-" \
-	"sub.b #0x12:8,@er1-"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x1234(:16|),er1\\)" \
-	"sub.b #0x12:8,@(0x1234:16,er1)"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x12345678(:32|),er1\\)" \
-	"sub.b #0x12:8,@(0x12345678:32,er1)"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x1234(:16|),r2l.b\\)" \
-	"sub.b #0x12:8,@(0x1234:16,r2l.b)"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x1234(:16|),r2.w\\)" \
-	"sub.b #0x12:8,@(0x1234:16,r2.w)"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x1234(:16|),er2.l\\)" \
-	"sub.b #0x12:8,@(0x1234:16,er2.l)"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x12345678(:32|),r2l.b\\)" \
-	"sub.b #0x12:8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x12345678(:32|),r2.w\\)" \
-	"sub.b #0x12:8,@(0x12345678:32,r2.w)"
-gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x12345678(:32|),er2.l\\)" \
-	"sub.b #0x12:8,@(0x12345678:32,er2.l)"
-gdb_test "x" "sub.b\t#0x12(:8|),@0x9a(:8|)" \
-	"sub.b #0x12:8,@0x9a:8"
-gdb_test "x" "sub.b\t#0x12(:8|),@0x1234(:16|)" \
-	"sub.b #0x12:8,@0x1234:16"
-gdb_test "x" "sub.b\t#0x12(:8|),@0x12345678(:32|)" \
-	"sub.b #0x12:8,@0x12345678:32"
-gdb_test "x" "sub.b\tr3h,r1h" \
-	"sub.b r3h,r1h"
-gdb_test "x" "sub.b\tr3h,@er1" \
-	"sub.b r3h,@er1"
-gdb_test "x" "sub.b\tr3h,@\\(0x3(:2|),er1\\)" \
-	"sub.b r3h,@(0x3:2,er1)"
-gdb_test "x" "sub.b\tr3h,@er1\\+" \
-	"sub.b r3h,@er1+"
-gdb_test "x" "sub.b\tr3h,@-er1" \
-	"sub.b r3h,@-er1"
-gdb_test "x" "sub.b\tr3h,@\\+er1" \
-	"sub.b r3h,@+er1"
-gdb_test "x" "sub.b\tr3h,@er1-" \
-	"sub.b r3h,@er1-"
-gdb_test "x" "sub.b\tr3h,@\\(0x1234(:16|),er1\\)" \
-	"sub.b r3h,@(0x1234:16,er1)"
-gdb_test "x" "sub.b\tr3h,@\\(0x12345678(:32|),er1\\)" \
-	"sub.b r3h,@(0x12345678:32,er1)"
-gdb_test "x" "sub.b\tr3h,@\\(0x1234(:16|),r2l.b\\)" \
-	"sub.b r3h,@(0x1234:16,r2l.b)"
-gdb_test "x" "sub.b\tr3h,@\\(0x1234(:16|),r2.w\\)" \
-	"sub.b r3h,@(0x1234:16,r2.w)"
-gdb_test "x" "sub.b\tr3h,@\\(0x1234(:16|),er2.l\\)" \
-	"sub.b r3h,@(0x1234:16,er2.l)"
-gdb_test "x" "sub.b\tr3h,@\\(0x12345678(:32|),r2l.b\\)" \
-	"sub.b r3h,@(0x12345678:32,r2l.b)"
-gdb_test "x" "sub.b\tr3h,@\\(0x12345678(:32|),r2.w\\)" \
-	"sub.b r3h,@(0x12345678:32,r2.w)"
-gdb_test "x" "sub.b\tr3h,@\\(0x12345678(:32|),er2.l\\)" \
-	"sub.b r3h,@(0x12345678:32,er2.l)"
-gdb_test "x" "sub.b\tr3h,@0x12(:8|)" \
-	"sub.b r3h,@0x12:8"
-gdb_test "x" "sub.b\tr3h,@0x1234(:16|)" \
-	"sub.b r3h,@0x1234:16"
-gdb_test "x" "sub.b\tr3h,@0x12345678(:32|)" \
-	"sub.b r3h,@0x12345678:32"
-gdb_test "x" "sub.b\t@er3,r1h" \
-	"sub.b @er3,r1h"
-gdb_test "x" "sub.b\t@\\(0x3(:2|),er3\\),r1h" \
-	"sub.b @(0x3:2,er3),r1h"
-gdb_test "x" "sub.b\t@er3\\+,r1h" \
-	"sub.b @er3+,r1h"
-gdb_test "x" "sub.b\t@-er3,r1h" \
-	"sub.b @-er3,r1h"
-gdb_test "x" "sub.b\t@\\+er3,r1h" \
-	"sub.b @+er3,r1h"
-gdb_test "x" "sub.b\t@er3-,r1h" \
-	"sub.b @er3-,r1h"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er1\\),r1h" \
-	"sub.b @(0x1234:16,er1),r1h"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er1\\),r1h" \
-	"sub.b @(0x12345678:32,er1),r1h"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r2l.b\\),r1h" \
-	"sub.b @(0x1234:16,r2l.b),r1h"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r2.w\\),r1h" \
-	"sub.b @(0x1234:16,r2.w),r1h"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er2.l\\),r1h" \
-	"sub.b @(0x1234:16,er2.l),r1h"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r2l.b\\),r1h" \
-	"sub.b @(0x12345678:32,r2l.b),r1h"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r2.w\\),r1h" \
-	"sub.b @(0x12345678:32,r2.w),r1h"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er2.l\\),r1h" \
-	"sub.b @(0x12345678:32,er2.l),r1h"
-gdb_test "x" "sub.b\t@0x12(:8|),r1h" \
-	"sub.b @0x12:8,r1h"
-gdb_test "x" "sub.b\t@0x1234(:16|),r1h" \
-	"sub.b @0x1234:16,r1h"
-gdb_test "x" "sub.b\t@0x12345678(:32|),r1h" \
-	"sub.b @0x12345678:32,r1h"
-gdb_test "x" "sub.b\t@er3,@er1" \
-	"sub.b @er3,@er1"
-gdb_test "x" "sub.b\t@er3,@\\(0x3(:2|),er1\\)" \
-	"sub.b @er3,@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@er3,@-er1" \
-	"sub.b @er3,@-er1"
-gdb_test "x" "sub.b\t@er3,@er1\\+" \
-	"sub.b @er3,@er1+"
-gdb_test "x" "sub.b\t@er3,@er1-" \
-	"sub.b @er3,@er1-"
-gdb_test "x" "sub.b\t@er3,@\\+er1" \
-	"sub.b @er3,@+er1"
-gdb_test "x" "sub.b\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@er3,@0x9abc(:16|)" \
-	"sub.b @er3,@0x9abc:16"
-gdb_test "x" "sub.b\t@er3,@0x9abcdef0(:32|)" \
-	"sub.b @er3,@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@-er3,@er1" \
-	"sub.b @-er3,@er1"
-gdb_test "x" "sub.b\t@-er3,@\\(0x3(:2|),er1\\)" \
-	"sub.b @-er3,@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@-er3,@-er1" \
-	"sub.b @-er3,@-er1"
-gdb_test "x" "sub.b\t@-er3,@er1\\+" \
-	"sub.b @-er3,@er1+"
-gdb_test "x" "sub.b\t@-er3,@er1-" \
-	"sub.b @-er3,@er1-"
-gdb_test "x" "sub.b\t@-er3,@\\+er1" \
-	"sub.b @-er3,@+er1"
-gdb_test "x" "sub.b\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@-er3,@0x9abc(:16|)" \
-	"sub.b @-er3,@0x9abc:16"
-gdb_test "x" "sub.b\t@-er3,@0x9abcdef0(:32|)" \
-	"sub.b @-er3,@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@er3\\+,@er1" \
-	"sub.b @er3+,@er1"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x3(:2|),er1\\)" \
-	"sub.b @er3+,@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@er3\\+,@-er1" \
-	"sub.b @er3+,@-er1"
-gdb_test "x" "sub.b\t@er3\\+,@er1\\+" \
-	"sub.b @er3+,@er1+"
-gdb_test "x" "sub.b\t@er3\\+,@er1-" \
-	"sub.b @er3+,@er1-"
-gdb_test "x" "sub.b\t@er3\\+,@\\+er1" \
-	"sub.b @er3+,@+er1"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@er3\\+,@0x9abc(:16|)" \
-	"sub.b @er3+,@0x9abc:16"
-gdb_test "x" "sub.b\t@er3\\+,@0x9abcdef0(:32|)" \
-	"sub.b @er3+,@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@er3-,@er1" \
-	"sub.b @er3-,@er1"
-gdb_test "x" "sub.b\t@er3-,@\\(0x3(:2|),er1\\)" \
-	"sub.b @er3-,@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@er3-,@-er1" \
-	"sub.b @er3-,@-er1"
-gdb_test "x" "sub.b\t@er3-,@er1\\+" \
-	"sub.b @er3-,@er1+"
-gdb_test "x" "sub.b\t@er3-,@er1-" \
-	"sub.b @er3-,@er1-"
-gdb_test "x" "sub.b\t@er3-,@\\+er1" \
-	"sub.b @er3-,@+er1"
-gdb_test "x" "sub.b\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@er3-,@0x9abc(:16|)" \
-	"sub.b @er3-,@0x9abc:16"
-gdb_test "x" "sub.b\t@er3-,@0x9abcdef0(:32|)" \
-	"sub.b @er3-,@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\+er3,@er1" \
-	"sub.b @+er3,@er1"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x3(:2|),er1\\)" \
-	"sub.b @+er3,@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\+er3,@-er1" \
-	"sub.b @+er3,@-er1"
-gdb_test "x" "sub.b\t@\\+er3,@er1\\+" \
-	"sub.b @+er3,@er1+"
-gdb_test "x" "sub.b\t@\\+er3,@er1-" \
-	"sub.b @+er3,@er1-"
-gdb_test "x" "sub.b\t@\\+er3,@\\+er1" \
-	"sub.b @+er3,@+er1"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\+er3,@0x9abc(:16|)" \
-	"sub.b @+er3,@0x9abc:16"
-gdb_test "x" "sub.b\t@\\+er3,@0x9abcdef0(:32|)" \
-	"sub.b @+er3,@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@er1" \
-	"sub.b @(0x1234:16,er3),@er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"sub.b @(0x1234:16,er3),@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"sub.b @(0x1234:16,er3),@-er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"sub.b @(0x1234:16,er3),@er1+"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"sub.b @(0x1234:16,er3),@er1-"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"sub.b @(0x1234:16,er3),@+er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"sub.b @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"sub.b @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"sub.b @(0x12345678:32,er3),@er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"sub.b @(0x12345678:32,er3),@-er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"sub.b @(0x12345678:32,er3),@er1+"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"sub.b @(0x12345678:32,er3),@er1-"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"sub.b @(0x12345678:32,er3),@+er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"sub.b @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"sub.b @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"sub.b @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"sub.b @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"sub.b @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"sub.b @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"sub.b @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"sub.b @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"sub.b @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"sub.b @(0x1234:16,r3.w),@er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"sub.b @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"sub.b @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"sub.b @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"sub.b @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"sub.b @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"sub.b @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"sub.b @(0x1234:16,er3.l),@er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"sub.b @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"sub.b @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"sub.b @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"sub.b @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"sub.b @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "sub.b\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"sub.b @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"sub.b @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"sub.b @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"sub.b @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"sub.b @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"sub.b @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"sub.b @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"sub.b @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"sub.b @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"sub.b @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"sub.b @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"sub.b @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"sub.b @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"sub.b @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"sub.b @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"sub.b @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"sub.b @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"sub.b @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"sub.b @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"sub.b @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"sub.b @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "sub.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"sub.b @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@0x1234(:16|),@er1" \
-	"sub.b @0x1234:16,@er1"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x3(:2|),er1\\)" \
-	"sub.b @0x1234:16,@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@-er1" \
-	"sub.b @0x1234:16,@-er1"
-gdb_test "x" "sub.b\t@0x1234(:16|),@er1\\+" \
-	"sub.b @0x1234:16,@er1+"
-gdb_test "x" "sub.b\t@0x1234(:16|),@er1-" \
-	"sub.b @0x1234:16,@er1-"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\+er1" \
-	"sub.b @0x1234:16,@+er1"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@0x1234(:16|),@0x9abc(:16|)" \
-	"sub.b @0x1234:16,@0x9abc:16"
-gdb_test "x" "sub.b\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"sub.b @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@er1" \
-	"sub.b @0x12345678:32,@er1"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x3(:2|),er1\\)" \
-	"sub.b @0x12345678:32,@(0x3:2,er1)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@-er1" \
-	"sub.b @0x12345678:32,@-er1"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@er1\\+" \
-	"sub.b @0x12345678:32,@er1+"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@er1-" \
-	"sub.b @0x12345678:32,@er1-"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\+er1" \
-	"sub.b @0x12345678:32,@+er1"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.b @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.b @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.b @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.b @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.b @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.b @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.b @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"sub.b @0x12345678:32,@0x9abc:16"
-gdb_test "x" "sub.b\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"sub.b @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "sub.w\t#0x1234(:16|),r1" \
-	"sub.w #0x1234:16,r1"
-gdb_test "x" "sub.w\t#0x7(:3|),r2" \
-	"sub.w #0x7:3,r2"
-gdb_test "x" "sub.w\t#0x1234(:16|),@er1" \
-	"sub.w #0x1234:16,@er1"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"sub.w #0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@er1\\+" \
-	"sub.w #0x1234:16,@er1+"
-gdb_test "x" "sub.w\t#0x1234(:16|),@-er1" \
-	"sub.w #0x1234:16,@-er1"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\+er1" \
-	"sub.w #0x1234:16,@+er1"
-gdb_test "x" "sub.w\t#0x1234(:16|),@er1-" \
-	"sub.w #0x1234:16,@er1-"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t#0x1234(:16|),@0x9abc(:16|)" \
-	"sub.w #0x1234:16,@0x9abc:16"
-gdb_test "x" "sub.w\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"sub.w #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "sub.w\t#0x7(:3|),@er1" \
-	"sub.w #0x7:3,@er1"
-gdb_test "x" "sub.w\t#0x7(:3|),@0x1234(:16|)" \
-	"sub.w #0x7:3,@0x1234:16"
-gdb_test "x" "sub.w\t#0x7(:3|),@0x12345678(:32|)" \
-	"sub.w #0x7:3,@0x12345678:32"
-gdb_test "x" "sub.w\tr3,r1" \
-	"sub.w r3,r1"
-gdb_test "x" "sub.w\tr3,@er1" \
-	"sub.w r3,@er1"
-gdb_test "x" "sub.w\tr3,@\\(0x6(:2|),er1\\)" \
-	"sub.w r3,@(0x6:2,er1)"
-gdb_test "x" "sub.w\tr3,@er1\\+" \
-	"sub.w r3,@er1+"
-gdb_test "x" "sub.w\tr3,@-er1" \
-	"sub.w r3,@-er1"
-gdb_test "x" "sub.w\tr3,@\\+er1" \
-	"sub.w r3,@+er1"
-gdb_test "x" "sub.w\tr3,@er1-" \
-	"sub.w r3,@er1-"
-gdb_test "x" "sub.w\tr3,@\\(0x1234(:16|),er1\\)" \
-	"sub.w r3,@(0x1234:16,er1)"
-gdb_test "x" "sub.w\tr3,@\\(0x12345678(:32|),er1\\)" \
-	"sub.w r3,@(0x12345678:32,er1)"
-gdb_test "x" "sub.w\tr3,@\\(0x1234(:16|),r2l.b\\)" \
-	"sub.w r3,@(0x1234:16,r2l.b)"
-gdb_test "x" "sub.w\tr3,@\\(0x1234(:16|),r2.w\\)" \
-	"sub.w r3,@(0x1234:16,r2.w)"
-gdb_test "x" "sub.w\tr3,@\\(0x1234(:16|),er2.l\\)" \
-	"sub.w r3,@(0x1234:16,er2.l)"
-gdb_test "x" "sub.w\tr3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"sub.w r3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "sub.w\tr3,@\\(0x12345678(:32|),r2.w\\)" \
-	"sub.w r3,@(0x12345678:32,r2.w)"
-gdb_test "x" "sub.w\tr3,@\\(0x12345678(:32|),er2.l\\)" \
-	"sub.w r3,@(0x12345678:32,er2.l)"
-gdb_test "x" "sub.w\tr3,@0x1234(:16|)" \
-	"sub.w r3,@0x1234:16"
-gdb_test "x" "sub.w\tr3,@0x12345678(:32|)" \
-	"sub.w r3,@0x12345678:32"
-gdb_test "x" "sub.w\t@er3,r1" \
-	"sub.w @er3,r1"
-gdb_test "x" "sub.w\t@\\(0x6(:2|),er3\\),r1" \
-	"sub.w @(0x6:2,er3),r1"
-gdb_test "x" "sub.w\t@er3\\+,r1" \
-	"sub.w @er3+,r1"
-gdb_test "x" "sub.w\t@-er3,r1" \
-	"sub.w @-er3,r1"
-gdb_test "x" "sub.w\t@\\+er3,r1" \
-	"sub.w @+er3,r1"
-gdb_test "x" "sub.w\t@er3-,r1" \
-	"sub.w @er3-,r1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er1\\),r1" \
-	"sub.w @(0x1234:16,er1),r1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er1\\),r1" \
-	"sub.w @(0x12345678:32,er1),r1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r2l.b\\),r1" \
-	"sub.w @(0x1234:16,r2l.b),r1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r2.w\\),r1" \
-	"sub.w @(0x1234:16,r2.w),r1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er2.l\\),r1" \
-	"sub.w @(0x1234:16,er2.l),r1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r2l.b\\),r1" \
-	"sub.w @(0x12345678:32,r2l.b),r1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r2.w\\),r1" \
-	"sub.w @(0x12345678:32,r2.w),r1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er2.l\\),r1" \
-	"sub.w @(0x12345678:32,er2.l),r1"
-gdb_test "x" "sub.w\t@0x1234(:16|),r1" \
-	"sub.w @0x1234:16,r1"
-gdb_test "x" "sub.w\t@0x12345678(:32|),r1" \
-	"sub.w @0x12345678:32,r1"
-gdb_test "x" "sub.w\t@er3,@er1" \
-	"sub.w @er3,@er1"
-gdb_test "x" "sub.w\t@er3,@\\(0x6(:2|),er1\\)" \
-	"sub.w @er3,@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@er3,@-er1" \
-	"sub.w @er3,@-er1"
-gdb_test "x" "sub.w\t@er3,@er1\\+" \
-	"sub.w @er3,@er1+"
-gdb_test "x" "sub.w\t@er3,@er1-" \
-	"sub.w @er3,@er1-"
-gdb_test "x" "sub.w\t@er3,@\\+er1" \
-	"sub.w @er3,@+er1"
-gdb_test "x" "sub.w\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@er3,@0x9abc(:16|)" \
-	"sub.w @er3,@0x9abc:16"
-gdb_test "x" "sub.w\t@er3,@0x9abcdef0(:32|)" \
-	"sub.w @er3,@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@-er3,@er1" \
-	"sub.w @-er3,@er1"
-gdb_test "x" "sub.w\t@-er3,@\\(0x6(:2|),er1\\)" \
-	"sub.w @-er3,@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@-er3,@-er1" \
-	"sub.w @-er3,@-er1"
-gdb_test "x" "sub.w\t@-er3,@er1\\+" \
-	"sub.w @-er3,@er1+"
-gdb_test "x" "sub.w\t@-er3,@er1-" \
-	"sub.w @-er3,@er1-"
-gdb_test "x" "sub.w\t@-er3,@\\+er1" \
-	"sub.w @-er3,@+er1"
-gdb_test "x" "sub.w\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@-er3,@0x9abc(:16|)" \
-	"sub.w @-er3,@0x9abc:16"
-gdb_test "x" "sub.w\t@-er3,@0x9abcdef0(:32|)" \
-	"sub.w @-er3,@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@er3\\+,@er1" \
-	"sub.w @er3+,@er1"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x6(:2|),er1\\)" \
-	"sub.w @er3+,@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@er3\\+,@-er1" \
-	"sub.w @er3+,@-er1"
-gdb_test "x" "sub.w\t@er3\\+,@er1\\+" \
-	"sub.w @er3+,@er1+"
-gdb_test "x" "sub.w\t@er3\\+,@er1-" \
-	"sub.w @er3+,@er1-"
-gdb_test "x" "sub.w\t@er3\\+,@\\+er1" \
-	"sub.w @er3+,@+er1"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@er3\\+,@0x9abc(:16|)" \
-	"sub.w @er3+,@0x9abc:16"
-gdb_test "x" "sub.w\t@er3\\+,@0x9abcdef0(:32|)" \
-	"sub.w @er3+,@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@er3-,@er1" \
-	"sub.w @er3-,@er1"
-gdb_test "x" "sub.w\t@er3-,@\\(0x6(:2|),er1\\)" \
-	"sub.w @er3-,@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@er3-,@-er1" \
-	"sub.w @er3-,@-er1"
-gdb_test "x" "sub.w\t@er3-,@er1\\+" \
-	"sub.w @er3-,@er1+"
-gdb_test "x" "sub.w\t@er3-,@er1-" \
-	"sub.w @er3-,@er1-"
-gdb_test "x" "sub.w\t@er3-,@\\+er1" \
-	"sub.w @er3-,@+er1"
-gdb_test "x" "sub.w\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@er3-,@0x9abc(:16|)" \
-	"sub.w @er3-,@0x9abc:16"
-gdb_test "x" "sub.w\t@er3-,@0x9abcdef0(:32|)" \
-	"sub.w @er3-,@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\+er3,@er1" \
-	"sub.w @+er3,@er1"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x6(:2|),er1\\)" \
-	"sub.w @+er3,@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\+er3,@-er1" \
-	"sub.w @+er3,@-er1"
-gdb_test "x" "sub.w\t@\\+er3,@er1\\+" \
-	"sub.w @+er3,@er1+"
-gdb_test "x" "sub.w\t@\\+er3,@er1-" \
-	"sub.w @+er3,@er1-"
-gdb_test "x" "sub.w\t@\\+er3,@\\+er1" \
-	"sub.w @+er3,@+er1"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\+er3,@0x9abc(:16|)" \
-	"sub.w @+er3,@0x9abc:16"
-gdb_test "x" "sub.w\t@\\+er3,@0x9abcdef0(:32|)" \
-	"sub.w @+er3,@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@er1" \
-	"sub.w @(0x1234:16,er3),@er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"sub.w @(0x1234:16,er3),@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"sub.w @(0x1234:16,er3),@-er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"sub.w @(0x1234:16,er3),@er1+"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"sub.w @(0x1234:16,er3),@er1-"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"sub.w @(0x1234:16,er3),@+er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"sub.w @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"sub.w @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"sub.w @(0x12345678:32,er3),@er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"sub.w @(0x12345678:32,er3),@-er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"sub.w @(0x12345678:32,er3),@er1+"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"sub.w @(0x12345678:32,er3),@er1-"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"sub.w @(0x12345678:32,er3),@+er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"sub.w @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"sub.w @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"sub.w @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"sub.w @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"sub.w @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"sub.w @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"sub.w @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"sub.w @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"sub.w @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"sub.w @(0x1234:16,r3.w),@er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"sub.w @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"sub.w @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"sub.w @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"sub.w @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"sub.w @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"sub.w @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"sub.w @(0x1234:16,er3.l),@er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"sub.w @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"sub.w @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"sub.w @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"sub.w @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"sub.w @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "sub.w\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"sub.w @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"sub.w @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"sub.w @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"sub.w @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"sub.w @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"sub.w @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"sub.w @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"sub.w @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"sub.w @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"sub.w @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"sub.w @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"sub.w @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"sub.w @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"sub.w @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"sub.w @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"sub.w @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"sub.w @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"sub.w @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"sub.w @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"sub.w @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"sub.w @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "sub.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"sub.w @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@0x1234(:16|),@er1" \
-	"sub.w @0x1234:16,@er1"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"sub.w @0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@-er1" \
-	"sub.w @0x1234:16,@-er1"
-gdb_test "x" "sub.w\t@0x1234(:16|),@er1\\+" \
-	"sub.w @0x1234:16,@er1+"
-gdb_test "x" "sub.w\t@0x1234(:16|),@er1-" \
-	"sub.w @0x1234:16,@er1-"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\+er1" \
-	"sub.w @0x1234:16,@+er1"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@0x1234(:16|),@0x9abc(:16|)" \
-	"sub.w @0x1234:16,@0x9abc:16"
-gdb_test "x" "sub.w\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"sub.w @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@er1" \
-	"sub.w @0x12345678:32,@er1"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x6(:2|),er1\\)" \
-	"sub.w @0x12345678:32,@(0x6:2,er1)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@-er1" \
-	"sub.w @0x12345678:32,@-er1"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@er1\\+" \
-	"sub.w @0x12345678:32,@er1+"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@er1-" \
-	"sub.w @0x12345678:32,@er1-"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\+er1" \
-	"sub.w @0x12345678:32,@+er1"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.w @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.w @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.w @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.w @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.w @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.w @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.w @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"sub.w @0x12345678:32,@0x9abc:16"
-gdb_test "x" "sub.w\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"sub.w @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "sub.l\t#0x12345678(:32|),er1" \
-	"sub.l #0x12345678:32,er1"
-gdb_test "x" "sub.l\t#0x1234(:16|),er1" \
-	"sub.l #0x1234:16,er1"
-gdb_test "x" "sub.l\t#0x7(:3|),er2" \
-	"sub.l #0x7:3,er2"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@er1" \
-	"sub.l #0x12345678:32,@er1"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"sub.l #0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@er1\\+" \
-	"sub.l #0x12345678:32,@er1+"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@-er1" \
-	"sub.l #0x12345678:32,@-er1"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\+er1" \
-	"sub.l #0x12345678:32,@+er1"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@er1-" \
-	"sub.l #0x12345678:32,@er1-"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l #0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l #0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l #0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l #0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l #0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l #0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l #0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@0x9abc(:16|)" \
-	"sub.l #0x12345678:32,@0x9abc:16"
-gdb_test "x" "sub.l\t#0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"sub.l #0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "sub.l\t#0x1234(:16|),@er1" \
-	"sub.l #0x1234:16,@er1"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"sub.l #0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@er1\\+" \
-	"sub.l #0x1234:16,@er1+"
-gdb_test "x" "sub.l\t#0x1234(:16|),@-er1" \
-	"sub.l #0x1234:16,@-er1"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\+er1" \
-	"sub.l #0x1234:16,@+er1"
-gdb_test "x" "sub.l\t#0x1234(:16|),@er1-" \
-	"sub.l #0x1234:16,@er1-"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t#0x1234(:16|),@0x9abc(:16|)" \
-	"sub.l #0x1234:16,@0x9abc:16"
-gdb_test "x" "sub.l\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"sub.l #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "sub.l\ter3,er1" \
-	"sub.l er3,er1"
-gdb_test "x" "sub.l\ter3,@er1" \
-	"sub.l er3,@er1"
-gdb_test "x" "sub.l\ter3,@\\(0xc(:2|),er1\\)" \
-	"sub.l er3,@(0xc:2,er1)"
-gdb_test "x" "sub.l\ter3,@er1\\+" \
-	"sub.l er3,@er1+"
-gdb_test "x" "sub.l\ter3,@-er1" \
-	"sub.l er3,@-er1"
-gdb_test "x" "sub.l\ter3,@\\+er1" \
-	"sub.l er3,@+er1"
-gdb_test "x" "sub.l\ter3,@er1-" \
-	"sub.l er3,@er1-"
-gdb_test "x" "sub.l\ter3,@\\(0x1234(:16|),er1\\)" \
-	"sub.l er3,@(0x1234:16,er1)"
-gdb_test "x" "sub.l\ter3,@\\(0x12345678(:32|),er1\\)" \
-	"sub.l er3,@(0x12345678:32,er1)"
-gdb_test "x" "sub.l\ter3,@\\(0x1234(:16|),r2l.b\\)" \
-	"sub.l er3,@(0x1234:16,r2l.b)"
-gdb_test "x" "sub.l\ter3,@\\(0x1234(:16|),r2.w\\)" \
-	"sub.l er3,@(0x1234:16,r2.w)"
-gdb_test "x" "sub.l\ter3,@\\(0x1234(:16|),er2.l\\)" \
-	"sub.l er3,@(0x1234:16,er2.l)"
-gdb_test "x" "sub.l\ter3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"sub.l er3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "sub.l\ter3,@\\(0x12345678(:32|),r2.w\\)" \
-	"sub.l er3,@(0x12345678:32,r2.w)"
-gdb_test "x" "sub.l\ter3,@\\(0x12345678(:32|),er2.l\\)" \
-	"sub.l er3,@(0x12345678:32,er2.l)"
-gdb_test "x" "sub.l\ter3,@0x1234(:16|)" \
-	"sub.l er3,@0x1234:16"
-gdb_test "x" "sub.l\ter3,@0x12345678(:32|)" \
-	"sub.l er3,@0x12345678:32"
-gdb_test "x" "sub.l\t@er3,er1" \
-	"sub.l @er3,er1"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),er1" \
-	"sub.l @(0xc:2,er3),er1"
-gdb_test "x" "sub.l\t@er3\\+,er1" \
-	"sub.l @er3+,er1"
-gdb_test "x" "sub.l\t@-er3,er1" \
-	"sub.l @-er3,er1"
-gdb_test "x" "sub.l\t@\\+er3,er1" \
-	"sub.l @+er3,er1"
-gdb_test "x" "sub.l\t@er3-,er1" \
-	"sub.l @er3-,er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er1\\),er1" \
-	"sub.l @(0x1234:16,er1),er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er1\\),er1" \
-	"sub.l @(0x12345678:32,er1),er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r2l.b\\),er1" \
-	"sub.l @(0x1234:16,r2l.b),er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r2.w\\),er1" \
-	"sub.l @(0x1234:16,r2.w),er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er2.l\\),er1" \
-	"sub.l @(0x1234:16,er2.l),er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r2l.b\\),er1" \
-	"sub.l @(0x12345678:32,r2l.b),er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r2.w\\),er1" \
-	"sub.l @(0x12345678:32,r2.w),er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er2.l\\),er1" \
-	"sub.l @(0x12345678:32,er2.l),er1"
-gdb_test "x" "sub.l\t@0x1234(:16|),er1" \
-	"sub.l @0x1234:16,er1"
-gdb_test "x" "sub.l\t@0x12345678(:32|),er1" \
-	"sub.l @0x12345678:32,er1"
-gdb_test "x" "sub.l\t@er3,@er1" \
-	"sub.l @er3,@er1"
-gdb_test "x" "sub.l\t@er3,@\\(0xc(:2|),er1\\)" \
-	"sub.l @er3,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@er3,@-er1" \
-	"sub.l @er3,@-er1"
-gdb_test "x" "sub.l\t@er3,@er1\\+" \
-	"sub.l @er3,@er1+"
-gdb_test "x" "sub.l\t@er3,@er1-" \
-	"sub.l @er3,@er1-"
-gdb_test "x" "sub.l\t@er3,@\\+er1" \
-	"sub.l @er3,@+er1"
-gdb_test "x" "sub.l\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@er3,@0x9abc(:16|)" \
-	"sub.l @er3,@0x9abc:16"
-gdb_test "x" "sub.l\t@er3,@0x9abcdef0(:32|)" \
-	"sub.l @er3,@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@er1" \
-	"sub.l @(0xc:2,er3),@er1"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0xc:2,er3),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@-er1" \
-	"sub.l @(0xc:2,er3),@-er1"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@er1\\+" \
-	"sub.l @(0xc:2,er3),@er1+"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@er1-" \
-	"sub.l @(0xc:2,er3),@er1-"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\+er1" \
-	"sub.l @(0xc:2,er3),@+er1"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0xc:2,er3),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0xc:2,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0xc:2,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0xc:2,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0xc:2,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@0x9abc(:16|)" \
-	"sub.l @(0xc:2,er3),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0xc(:2|),er3\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0xc:2,er3),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@-er3,@er1" \
-	"sub.l @-er3,@er1"
-gdb_test "x" "sub.l\t@-er3,@\\(0xc(:2|),er1\\)" \
-	"sub.l @-er3,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@-er3,@-er1" \
-	"sub.l @-er3,@-er1"
-gdb_test "x" "sub.l\t@-er3,@er1\\+" \
-	"sub.l @-er3,@er1+"
-gdb_test "x" "sub.l\t@-er3,@er1-" \
-	"sub.l @-er3,@er1-"
-gdb_test "x" "sub.l\t@-er3,@\\+er1" \
-	"sub.l @-er3,@+er1"
-gdb_test "x" "sub.l\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@-er3,@0x9abc(:16|)" \
-	"sub.l @-er3,@0x9abc:16"
-gdb_test "x" "sub.l\t@-er3,@0x9abcdef0(:32|)" \
-	"sub.l @-er3,@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@er3\\+,@er1" \
-	"sub.l @er3+,@er1"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0xc(:2|),er1\\)" \
-	"sub.l @er3+,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@er3\\+,@-er1" \
-	"sub.l @er3+,@-er1"
-gdb_test "x" "sub.l\t@er3\\+,@er1\\+" \
-	"sub.l @er3+,@er1+"
-gdb_test "x" "sub.l\t@er3\\+,@er1-" \
-	"sub.l @er3+,@er1-"
-gdb_test "x" "sub.l\t@er3\\+,@\\+er1" \
-	"sub.l @er3+,@+er1"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@er3\\+,@0x9abc(:16|)" \
-	"sub.l @er3+,@0x9abc:16"
-gdb_test "x" "sub.l\t@er3\\+,@0x9abcdef0(:32|)" \
-	"sub.l @er3+,@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@er3-,@er1" \
-	"sub.l @er3-,@er1"
-gdb_test "x" "sub.l\t@er3-,@\\(0xc(:2|),er1\\)" \
-	"sub.l @er3-,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@er3-,@-er1" \
-	"sub.l @er3-,@-er1"
-gdb_test "x" "sub.l\t@er3-,@er1\\+" \
-	"sub.l @er3-,@er1+"
-gdb_test "x" "sub.l\t@er3-,@er1-" \
-	"sub.l @er3-,@er1-"
-gdb_test "x" "sub.l\t@er3-,@\\+er1" \
-	"sub.l @er3-,@+er1"
-gdb_test "x" "sub.l\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@er3-,@0x9abc(:16|)" \
-	"sub.l @er3-,@0x9abc:16"
-gdb_test "x" "sub.l\t@er3-,@0x9abcdef0(:32|)" \
-	"sub.l @er3-,@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\+er3,@er1" \
-	"sub.l @+er3,@er1"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0xc(:2|),er1\\)" \
-	"sub.l @+er3,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\+er3,@-er1" \
-	"sub.l @+er3,@-er1"
-gdb_test "x" "sub.l\t@\\+er3,@er1\\+" \
-	"sub.l @+er3,@er1+"
-gdb_test "x" "sub.l\t@\\+er3,@er1-" \
-	"sub.l @+er3,@er1-"
-gdb_test "x" "sub.l\t@\\+er3,@\\+er1" \
-	"sub.l @+er3,@+er1"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\+er3,@0x9abc(:16|)" \
-	"sub.l @+er3,@0x9abc:16"
-gdb_test "x" "sub.l\t@\\+er3,@0x9abcdef0(:32|)" \
-	"sub.l @+er3,@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@er1" \
-	"sub.l @(0x1234:16,er3),@er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0x1234:16,er3),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"sub.l @(0x1234:16,er3),@-er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"sub.l @(0x1234:16,er3),@er1+"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"sub.l @(0x1234:16,er3),@er1-"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"sub.l @(0x1234:16,er3),@+er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"sub.l @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"sub.l @(0x12345678:32,er3),@er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0x12345678:32,er3),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"sub.l @(0x12345678:32,er3),@-er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"sub.l @(0x12345678:32,er3),@er1+"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"sub.l @(0x12345678:32,er3),@er1-"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"sub.l @(0x12345678:32,er3),@+er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"sub.l @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"sub.l @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"sub.l @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"sub.l @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"sub.l @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"sub.l @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"sub.l @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"sub.l @(0x1234:16,r3.w),@er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"sub.l @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"sub.l @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"sub.l @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"sub.l @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"sub.l @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"sub.l @(0x1234:16,er3.l),@er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"sub.l @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"sub.l @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"sub.l @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"sub.l @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"sub.l @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"sub.l @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"sub.l @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"sub.l @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"sub.l @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"sub.l @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"sub.l @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"sub.l @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"sub.l @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"sub.l @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"sub.l @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"sub.l @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"sub.l @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"sub.l @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"sub.l @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"sub.l @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"sub.l @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"sub.l @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"sub.l @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "sub.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"sub.l @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@0x1234(:16|),@er1" \
-	"sub.l @0x1234:16,@er1"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"sub.l @0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@-er1" \
-	"sub.l @0x1234:16,@-er1"
-gdb_test "x" "sub.l\t@0x1234(:16|),@er1\\+" \
-	"sub.l @0x1234:16,@er1+"
-gdb_test "x" "sub.l\t@0x1234(:16|),@er1-" \
-	"sub.l @0x1234:16,@er1-"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\+er1" \
-	"sub.l @0x1234:16,@+er1"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@0x1234(:16|),@0x9abc(:16|)" \
-	"sub.l @0x1234:16,@0x9abc:16"
-gdb_test "x" "sub.l\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"sub.l @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@er1" \
-	"sub.l @0x12345678:32,@er1"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"sub.l @0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@-er1" \
-	"sub.l @0x12345678:32,@-er1"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@er1\\+" \
-	"sub.l @0x12345678:32,@er1+"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@er1-" \
-	"sub.l @0x12345678:32,@er1-"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\+er1" \
-	"sub.l @0x12345678:32,@+er1"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"sub.l @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"sub.l @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"sub.l @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"sub.l @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"sub.l @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"sub.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"sub.l @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"sub.l @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"sub.l @0x12345678:32,@0x9abc:16"
-gdb_test "x" "sub.l\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"sub.l @0x12345678:32,@0x9abcdef0:32"
diff --git a/gdb/testsuite/gdb.disasm/t04_sub.s b/gdb/testsuite/gdb.disasm/t04_sub.s
deleted file mode 100644
index e89b61485f9..00000000000
--- a/gdb/testsuite/gdb.disasm/t04_sub.s
+++ /dev/null
@@ -1,977 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;arith_1

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    sub.b #0x12:8,@er1                       ;7d10a112

-    sub.b #0x12:8,@(0x3:2,er1)                 ;01776818a112

-    sub.b #0x12:8,@er1+                      ;01746c18a112

-    sub.b #0x12:8,@-er1                      ;01776c18a112

-    sub.b #0x12:8,@+er1                      ;01756c18a112

-    sub.b #0x12:8,@er1-                      ;01766c18a112

-    sub.b #0x12:8,@(0x1234:16,er1)                ;01746e181234a112

-    sub.b #0x12:8,@(0x12345678:32,er1)                ;78146a2812345678a112

-    sub.b #0x12:8,@(0x1234:16,r2l.b)              ;01756e281234a112

-    sub.b #0x12:8,@(0x1234:16,r2.w)              ;01766e281234a112

-    sub.b #0x12:8,@(0x1234:16,er2.l)              ;01776e281234a112

-    sub.b #0x12:8,@(0x12345678:32,r2l.b)              ;78256a2812345678a112

-    sub.b #0x12:8,@(0x12345678:32,r2.w)              ;78266a2812345678a112

-    sub.b #0x12:8,@(0x12345678:32,er2.l)              ;78276a2812345678a112

-    sub.b #0x12:8,@0xffffff9a:8                      ;7f9aa112

-    sub.b #0x12:8,@0x1234:16                     ;6a181234a112

-    sub.b #0x12:8,@0x12345678:32                     ;6a3812345678a112

-

-    sub.b r3h,r1h                           ;1831

-

-    sub.b r3h,@er1                         ;7d101830

-    sub.b r3h,@(0x3:2,er1)                   ;01793133

-    sub.b r3h,@er1+                        ;01798133

-    sub.b r3h,@-er1                        ;0179b133

-    sub.b r3h,@+er1                        ;01799133

-    sub.b r3h,@er1-                        ;0179a133

-    sub.b r3h,@(0x1234:16,er1)                  ;0179c1331234

-    sub.b r3h,@(0x12345678:32,er1)                  ;0179c93312345678

-    sub.b r3h,@(0x1234:16,r2l.b)                ;0179d2331234

-    sub.b r3h,@(0x1234:16,r2.w)                ;0179e2331234

-    sub.b r3h,@(0x1234:16,er2.l)                ;0179f2331234

-    sub.b r3h,@(0x12345678:32,r2l.b)                ;0179da3312345678

-    sub.b r3h,@(0x12345678:32,r2.w)                ;0179ea3312345678

-    sub.b r3h,@(0x12345678:32,er2.l)                ;0179fa3312345678

-    sub.b r3h,@0xffffff12:8                        ;7f121830

-    sub.b r3h,@0x1234:16                       ;6a1812341830

-    sub.b r3h,@0x12345678:32                        ;6a38123456781830

-

-    sub.b @er3,r1h                         ;7c301801

-    sub.b @(0x3:2,er3),r1h                  ;017a3331

-    sub.b @er3+,r1h                       ;017a8331

-    sub.b @-er3,r1h                       ;017ab331

-    sub.b @+er3,r1h                       ;017a9331

-    sub.b @er3-,r1h                       ;017aa331

-    sub.b @(0x1234:16,er1),r1h                  ;017ac1311234

-    sub.b @(0x12345678:32,er1),r1h                  ;017ac93112345678

-    sub.b @(0x1234:16,r2l.b),r1h                ;017ad2311234

-    sub.b @(0x1234:16,r2.w),r1h                ;017ae2311234

-    sub.b @(0x1234:16,er2.l),r1h                ;017af2311234

-    sub.b @(0x12345678:32,r2l.b),r1h                ;017ada3112345678

-    sub.b @(0x12345678:32,r2.w),r1h                ;017aea3112345678

-    sub.b @(0x12345678:32,er2.l),r1h                ;017afa3112345678

-    sub.b @0xffffff12:8,r1h                        ;7e121801

-    sub.b @0x1234:16,r1h                       ;6a1012341801

-    sub.b @0x12345678:32,r1h                       ;6a30123456781801

-

-    sub.b @er3,@er1                                ;7c350130

-    sub.b @er3,@(3:2,er1)                          ;7c353130

-    sub.b @er3,@-er1                               ;7c35b130

-    sub.b @er3,@er1+                               ;7c358130

-    sub.b @er3,@er1-                               ;7c35a130

-    sub.b @er3,@+er1                               ;7c359130

-    sub.b @er3,@(0xffff9abc:16,er1)                ;7c35c1309abc

-    sub.b @er3,@(0x9abcdef0:32,er1)                ;7c35c9309abcdef0

-    sub.b @er3,@(0xffff9abc:16,r2l.b)              ;7c35d2309abc

-    sub.b @er3,@(0xffff9abc:16,r2.w)              ;7c35e2309abc

-    sub.b @er3,@(0xffff9abc:16,er2.l)              ;7c35f2309abc

-    sub.b @er3,@(0x9abcdef0:32,r2l.b)              ;7c35da309abcdef0

-    sub.b @er3,@(0x9abcdef0:32,r2.w)              ;7c35ea309abcdef0

-    sub.b @er3,@(0x9abcdef0:32,er2.l)              ;7c35fa309abcdef0

-    sub.b @er3,@0xffff9abc:16                      ;7c3540309abc

-    sub.b @er3,@0x9abcdef0:32                      ;7c3548309abcdef0

-

-    sub.b @-er3,@er1                               ;01776c3c0130

-    sub.b @-er3,@(3:2,er1)                         ;01776c3c3130

-    sub.b @-er3,@-er1                              ;01776c3cb130

-    sub.b @-er3,@er1+                              ;01776c3c8130

-    sub.b @-er3,@er1-                              ;01776c3ca130

-    sub.b @-er3,@+er1                              ;01776c3c9130

-    sub.b @-er3,@(0xffff9abc:16,er1)               ;01776c3cc1309abc

-    sub.b @-er3,@(0x9abcdef0:32,er1)               ;01776c3cc9309abcdef0

-    sub.b @-er3,@(0xffff9abc:16,r2l.b)             ;01776c3cd2309abc

-    sub.b @-er3,@(0xffff9abc:16,r2.w)             ;01776c3ce2309abc

-    sub.b @-er3,@(0xffff9abc:16,er2.l)             ;01776c3cf2309abc

-    sub.b @-er3,@(0x9abcdef0:32,r2l.b)             ;01776c3cda309abcdef0

-    sub.b @-er3,@(0x9abcdef0:32,r2.w)             ;01776c3cea309abcdef0

-    sub.b @-er3,@(0x9abcdef0:32,er2.l)             ;01776c3cfa309abcdef0

-    sub.b @-er3,@0xffff9abc:16                     ;01776c3c40309abc

-    sub.b @-er3,@0x9abcdef0:32                     ;01776c3c48309abcdef0

-

-    sub.b @er3+,@er1                               ;01746c3c0130

-    sub.b @er3+,@(3:2,er1)                         ;01746c3c3130

-    sub.b @er3+,@-er1                              ;01746c3cb130

-    sub.b @er3+,@er1+                              ;01746c3c8130

-    sub.b @er3+,@er1-                              ;01746c3ca130

-    sub.b @er3+,@+er1                              ;01746c3c9130

-    sub.b @er3+,@(0xffff9abc:16,er1)               ;01746c3cc1309abc

-    sub.b @er3+,@(0x9abcdef0:32,er1)               ;01746c3cc9309abcdef0

-    sub.b @er3+,@(0xffff9abc:16,r2l.b)             ;01746c3cd2309abc

-    sub.b @er3+,@(0xffff9abc:16,r2.w)             ;01746c3ce2309abc

-    sub.b @er3+,@(0xffff9abc:16,er2.l)             ;01746c3cf2309abc

-    sub.b @er3+,@(0x9abcdef0:32,r2l.b)             ;01746c3cda309abcdef0

-    sub.b @er3+,@(0x9abcdef0:32,r2.w)             ;01746c3cea309abcdef0

-    sub.b @er3+,@(0x9abcdef0:32,er2.l)             ;01746c3cfa309abcdef0

-    sub.b @er3+,@0xffff9abc:16                     ;01746c3c40309abc

-    sub.b @er3+,@0x9abcdef0:32                     ;01746c3c48309abcdef0

-

-    sub.b @er3-,@er1                               ;01766c3c0130

-    sub.b @er3-,@(3:2,er1)                         ;01766c3c3130

-    sub.b @er3-,@-er1                              ;01766c3cb130

-    sub.b @er3-,@er1+                              ;01766c3c8130

-    sub.b @er3-,@er1-                              ;01766c3ca130

-    sub.b @er3-,@+er1                              ;01766c3c9130

-    sub.b @er3-,@(0xffff9abc:16,er1)               ;01766c3cc1309abc

-    sub.b @er3-,@(0x9abcdef0:32,er1)               ;01766c3cc9309abcdef0

-    sub.b @er3-,@(0xffff9abc:16,r2l.b)             ;01766c3cd2309abc

-    sub.b @er3-,@(0xffff9abc:16,r2.w)             ;01766c3ce2309abc

-    sub.b @er3-,@(0xffff9abc:16,er2.l)             ;01766c3cf2309abc

-    sub.b @er3-,@(0x9abcdef0:32,r2l.b)             ;01766c3cda309abcdef0

-    sub.b @er3-,@(0x9abcdef0:32,r2.w)             ;01766c3cea309abcdef0

-    sub.b @er3-,@(0x9abcdef0:32,er2.l)             ;01766c3cfa309abcdef0

-    sub.b @er3-,@0xffff9abc:16                     ;01766c3c40309abc

-    sub.b @er3-,@0x9abcdef0:32                     ;01766c3c48309abcdef0

-

-    sub.b @+er3,@er1                               ;01756c3c0130

-    sub.b @+er3,@(3:2,er1)                         ;01756c3c3130

-    sub.b @+er3,@-er1                              ;01756c3cb130

-    sub.b @+er3,@er1+                              ;01756c3c8130

-    sub.b @+er3,@er1-                              ;01756c3ca130

-    sub.b @+er3,@+er1                              ;01756c3c9130

-    sub.b @+er3,@(0xffff9abc:16,er1)               ;01756c3cc1309abc

-    sub.b @+er3,@(0x9abcdef0:32,er1)               ;01756c3cc9309abcdef0

-    sub.b @+er3,@(0xffff9abc:16,r2l.b)             ;01756c3cd2309abc

-    sub.b @+er3,@(0xffff9abc:16,r2.w)             ;01756c3ce2309abc

-    sub.b @+er3,@(0xffff9abc:16,er2.l)             ;01756c3cf2309abc

-    sub.b @+er3,@(0x9abcdef0:32,r2l.b)             ;01756c3cda309abcdef0

-    sub.b @+er3,@(0x9abcdef0:32,r2.w)             ;01756c3cea309abcdef0

-    sub.b @+er3,@(0x9abcdef0:32,er2.l)             ;01756c3cfa309abcdef0

-    sub.b @+er3,@0xffff9abc:16                     ;01756c3c40309abc

-    sub.b @+er3,@0x9abcdef0:32                     ;01756c3c48309abcdef0

-

-    sub.b @(0x1234:16,er3),@er1                         ;01746e3c12340130

-    sub.b @(0x1234:16,er3),@(3:2,er1)                   ;01746e3c12343130

-    sub.b @(0x1234:16,er3),@-er1                        ;01746e3c1234b130

-    sub.b @(0x1234:16,er3),@er1+                        ;01746e3c12348130

-    sub.b @(0x1234:16,er3),@er1-                        ;01746e3c1234a130

-    sub.b @(0x1234:16,er3),@+er1                        ;01746e3c12349130

-    sub.b @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01746e3c1234c1309abc

-    sub.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01746e3c1234c9309abcdef0

-    sub.b @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01746e3c1234d2309abc

-    sub.b @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01746e3c1234e2309abc

-    sub.b @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01746e3c1234f2309abc

-    sub.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01746e3c1234da309abcdef0

-    sub.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01746e3c1234ea309abcdef0

-    sub.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01746e3c1234fa309abcdef0

-    sub.b @(0x1234:16,er3),@0xffff9abc:16               ;01746e3c123440309abc

-    sub.b @(0x1234:16,er3),@0x9abcdef0:32               ;01746e3c123448309abcdef0

-

-    sub.b @(0x12345678:32,er3),@er1                         ;78346a2c123456780130

-    sub.b @(0x12345678:32,er3),@(3:2,er1)                   ;78346a2c123456783130

-    sub.b @(0x12345678:32,er3),@-er1                        ;78346a2c12345678b130

-    sub.b @(0x12345678:32,er3),@er1+                        ;78346a2c123456788130

-    sub.b @(0x12345678:32,er3),@er1-                        ;78346a2c12345678a130

-    sub.b @(0x12345678:32,er3),@+er1                        ;78346a2c123456789130

-    sub.b @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346a2c12345678c1309abc

-    sub.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346a2c12345678c9309abcdef0

-    sub.b @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346a2c12345678d2309abc

-    sub.b @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346a2c12345678e2309abc

-    sub.b @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346a2c12345678f2309abc

-    sub.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346a2c12345678da309abcdef0

-    sub.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346a2c12345678ea309abcdef0

-    sub.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346a2c12345678fa309abcdef0

-    sub.b @(0x12345678:32,er3),@0xffff9abc:16               ;78346a2c1234567840309abc

-    sub.b @(0x12345678:32,er3),@0x9abcdef0:32               ;78346a2c1234567848309abcdef0

-

-    sub.b @(0x1234:16,r3l.b),@er1                       ;01756e3c12340130

-    sub.b @(0x1234:16,r3l.b),@(3:2,er1)                 ;01756e3c12343130

-    sub.b @(0x1234:16,r3l.b),@-er1                      ;01756e3c1234b130

-    sub.b @(0x1234:16,r3l.b),@er1+                      ;01756e3c12348130

-    sub.b @(0x1234:16,r3l.b),@er1-                      ;01756e3c1234a130

-    sub.b @(0x1234:16,r3l.b),@+er1                      ;01756e3c12349130

-    sub.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01756e3c1234c1309abc

-    sub.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01756e3c1234c9309abcdef0

-    sub.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01756e3c1234d2309abc

-    sub.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01756e3c1234e2309abc

-    sub.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01756e3c1234f2309abc

-    sub.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01756e3c1234da309abcdef0

-    sub.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01756e3c1234ea309abcdef0

-    sub.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01756e3c1234fa309abcdef0

-    sub.b @(0x1234:16,r3l.b),@0xffff9abc:16             ;01756e3c123440309abc

-    sub.b @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01756e3c123448309abcdef0

-

-    sub.b @(0x1234:16,r3.w),@er1                       ;01766e3c12340130

-    sub.b @(0x1234:16,r3.w),@(3:2,er1)                 ;01766e3c12343130

-    sub.b @(0x1234:16,r3.w),@-er1                      ;01766e3c1234b130

-    sub.b @(0x1234:16,r3.w),@er1+                      ;01766e3c12348130

-    sub.b @(0x1234:16,r3.w),@er1-                      ;01766e3c1234a130

-    sub.b @(0x1234:16,r3.w),@+er1                      ;01766e3c12349130

-    sub.b @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01766e3c1234c1309abc

-    sub.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01766e3c1234c9309abcdef0

-    sub.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01766e3c1234d2309abc

-    sub.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01766e3c1234e2309abc

-    sub.b @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01766e3c1234f2309abc

-    sub.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01766e3c1234da309abcdef0

-    sub.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01766e3c1234ea309abcdef0

-    sub.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01766e3c1234fa309abcdef0

-    sub.b @(0x1234:16,r3.w),@0xffff9abc:16             ;01766e3c123440309abc

-    sub.b @(0x1234:16,r3.w),@0x9abcdef0:32             ;01766e3c123448309abcdef0

-

-    sub.b @(0x1234:16,er3.l),@er1                       ;01776e3c12340130

-    sub.b @(0x1234:16,er3.l),@(3:2,er1)                 ;01776e3c12343130

-    sub.b @(0x1234:16,er3.l),@-er1                      ;01776e3c1234b130

-    sub.b @(0x1234:16,er3.l),@er1+                      ;01776e3c12348130

-    sub.b @(0x1234:16,er3.l),@er1-                      ;01776e3c1234a130

-    sub.b @(0x1234:16,er3.l),@+er1                      ;01776e3c12349130

-    sub.b @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01776e3c1234c1309abc

-    sub.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01776e3c1234c9309abcdef0

-    sub.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01776e3c1234d2309abc

-    sub.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01776e3c1234e2309abc

-    sub.b @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01776e3c1234f2309abc

-    sub.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01776e3c1234da309abcdef0

-    sub.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01776e3c1234ea309abcdef0

-    sub.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01776e3c1234fa309abcdef0

-    sub.b @(0x1234:16,er3.l),@0xffff9abc:16             ;01776e3c123440309abc

-    sub.b @(0x1234:16,er3.l),@0x9abcdef0:32             ;01776e3c123448309abcdef0

-

-    sub.b @(0x12345678:32,r3l.b),@er1                       ;78356a2c123456780130

-    sub.b @(0x12345678:32,r3l.b),@(3:2,er1)                 ;78356a2c123456783130

-    sub.b @(0x12345678:32,r3l.b),@-er1                      ;78356a2c12345678b130

-    sub.b @(0x12345678:32,r3l.b),@er1+                      ;78356a2c123456788130

-    sub.b @(0x12345678:32,r3l.b),@er1-                      ;78356a2c12345678a130

-    sub.b @(0x12345678:32,r3l.b),@+er1                      ;78356a2c123456789130

-    sub.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356a2c12345678c1309abc

-    sub.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356a2c12345678c9309abcdef0

-    sub.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356a2c12345678d2309abc

-    sub.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356a2c12345678e2309abc

-    sub.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356a2c12345678f2309abc

-    sub.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356a2c12345678da309abcdef0

-    sub.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356a2c12345678ea309abcdef0

-    sub.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356a2c12345678fa309abcdef0

-    sub.b @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356a2c1234567840309abc

-    sub.b @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356a2c1234567848309abcdef0

-

-    sub.b @(0x12345678:32,r3.w),@er1                       ;78366a2c123456780130

-    sub.b @(0x12345678:32,r3.w),@(3:2,er1)                 ;78366a2c123456783130

-    sub.b @(0x12345678:32,r3.w),@-er1                      ;78366a2c12345678b130

-    sub.b @(0x12345678:32,r3.w),@er1+                      ;78366a2c123456788130

-    sub.b @(0x12345678:32,r3.w),@er1-                      ;78366a2c12345678a130

-    sub.b @(0x12345678:32,r3.w),@+er1                      ;78366a2c123456789130

-    sub.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366a2c12345678c1309abc

-    sub.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366a2c12345678c9309abcdef0

-    sub.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366a2c12345678d2309abc

-    sub.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366a2c12345678e2309abc

-    sub.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366a2c12345678f2309abc

-    sub.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366a2c12345678da309abcdef0

-    sub.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366a2c12345678ea309abcdef0

-    sub.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366a2c12345678fa309abcdef0

-    sub.b @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366a2c1234567840309abc

-    sub.b @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366a2c1234567848309abcdef0

-

-    sub.b @(0x12345678:32,er3.l),@er1                       ;78376a2c123456780130

-    sub.b @(0x12345678:32,er3.l),@(3:2,er1)                 ;78376a2c123456783130

-    sub.b @(0x12345678:32,er3.l),@-er1                      ;78376a2c12345678b130

-    sub.b @(0x12345678:32,er3.l),@er1+                      ;78376a2c123456788130

-    sub.b @(0x12345678:32,er3.l),@er1-                      ;78376a2c12345678a130

-    sub.b @(0x12345678:32,er3.l),@+er1                      ;78376a2c123456789130

-    sub.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376a2c12345678c1309abc

-    sub.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376a2c12345678c9309abcdef0

-    sub.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376a2c12345678d2309abc

-    sub.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376a2c12345678e2309abc

-    sub.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376a2c12345678f2309abc

-    sub.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376a2c12345678da309abcdef0

-    sub.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376a2c12345678ea309abcdef0

-    sub.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376a2c12345678fa309abcdef0

-    sub.b @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376a2c1234567840309abc

-    sub.b @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376a2c1234567848309abcdef0

-

-    sub.b @0x1234:16,@er1                              ;6a1512340130

-    sub.b @0x1234:16,@(3:2,er1)                        ;6a1512343130

-    sub.b @0x1234:16,@-er1                             ;6a151234b130

-    sub.b @0x1234:16,@er1+                             ;6a1512348130

-    sub.b @0x1234:16,@er1-                             ;6a151234a130

-    sub.b @0x1234:16,@+er1                             ;6a1512349130

-    sub.b @0x1234:16,@(0xffff9abc:16,er1)              ;6a151234c1309abc

-    sub.b @0x1234:16,@(0x9abcdef0:32,er1)              ;6a151234c9309abcdef0

-    sub.b @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6a151234d2309abc

-    sub.b @0x1234:16,@(0xffff9abc:16,r2.w)            ;6a151234e2309abc

-    sub.b @0x1234:16,@(0xffff9abc:16,er2.l)            ;6a151234f2309abc

-    sub.b @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6a151234da309abcdef0

-    sub.b @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6a151234ea309abcdef0

-    sub.b @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6a151234fa309abcdef0

-    sub.b @0x1234:16,@0xffff9abc:16                    ;6a15123440309abc

-    sub.b @0x1234:16,@0x9abcdef0:32                    ;6a15123448309abcdef0

-

-    sub.b @0x12345678:32,@er1                              ;6a35123456780130

-    sub.b @0x12345678:32,@(3:2,er1)                        ;6a35123456783130

-    sub.b @0x12345678:32,@-er1                             ;6a3512345678b130

-    sub.b @0x12345678:32,@er1+                             ;6a35123456788130

-    sub.b @0x12345678:32,@er1-                             ;6a3512345678a130

-    sub.b @0x12345678:32,@+er1                             ;6a35123456789130

-    sub.b @0x12345678:32,@(0xffff9abc:16,er1)              ;6a3512345678c1309abc

-    sub.b @0x12345678:32,@(0x9abcdef0:32,er1)              ;6a3512345678c9309abcdef0

-    sub.b @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6a3512345678d2309abc

-    sub.b @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6a3512345678e2309abc

-    sub.b @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6a3512345678f2309abc

-    sub.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6a3512345678da309abcdef0

-    sub.b @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6a3512345678ea309abcdef0

-    sub.b @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6a3512345678fa309abcdef0

-    sub.b @0x12345678:32,@0xffff9abc:16                    ;6a351234567840309abc

-    sub.b @0x12345678:32,@0x9abcdef0:32                    ;6a351234567848309abcdef0

-

-    sub.w #0x1234:16,r1                       ;79311234

-    sub.w #7:3,r2                         ;1a72

-    sub.w #0x1234:16,@er1                      ;015e01301234

-    sub.w #0x1234:16,@(0x6:2,er1)             ;015e31301234

-    sub.w #0x1234:16,@er1+                     ;015e81301234

-    sub.w #0x1234:16,@-er1                     ;015eb1301234

-    sub.w #0x1234:16,@+er1                     ;015e91301234

-    sub.w #0x1234:16,@er1-                     ;015ea1301234

-    sub.w #0x1234:16,@(0xffff9abc:16,er1)               ;015ec1309abc1234

-    sub.w #0x1234:16,@(0x9abcdef0:32,er1)               ;015ec9309abcdef01234

-    sub.w #0x1234:16,@(0xffff9abc:16,r2l.b)             ;015ed2309abc1234

-    sub.w #0x1234:16,@(0xffff9abc:16,r2.w)             ;015ee2309abc1234

-    sub.w #0x1234:16,@(0xffff9abc:16,er2.l)             ;015ef2309abc1234

-    sub.w #0x1234:16,@(0x9abcdef0:32,r2l.b)             ;015eda309abcdef01234

-    sub.w #0x1234:16,@(0x9abcdef0:32,r2.w)             ;015eea309abcdef01234

-    sub.w #0x1234:16,@(0x9abcdef0:32,er2.l)             ;015efa309abcdef01234

-    sub.w #0x1234:16,@0xffff9abc:16                     ;015e40309abc1234

-    sub.w #0x1234:16,@0x9abcdef0:32                     ;015e48309abcdef01234

-

-    sub.w #0x7:3,@er1                       ;7d901a70

-    sub.w #0x7:3,@0x1234:16                     ;6b1812341a70

-    sub.w #0x7:3,@0x12345678:32                     ;6b38123456781a70

-

-    sub.w r3,r1                           ;1931

-

-    sub.w r3,@er1                         ;7d901930

-    sub.w r3,@(0x6:2,er1)                ;01593133

-    sub.w r3,@er1+                        ;01598133

-    sub.w r3,@-er1                        ;0159b133

-    sub.w r3,@+er1                        ;01599133

-    sub.w r3,@er1-                        ;0159a133

-    sub.w r3,@(0x1234:16,er1)                  ;0159c1331234

-    sub.w r3,@(0x12345678:32,er1)                  ;0159c93312345678

-    sub.w r3,@(0x1234:16,r2l.b)                ;0159d2331234

-    sub.w r3,@(0x1234:16,r2.w)                ;0159e2331234

-    sub.w r3,@(0x1234:16,er2.l)                ;0159f2331234

-    sub.w r3,@(0x12345678:32,r2l.b)                ;0159da3312345678

-    sub.w r3,@(0x12345678:32,r2.w)                ;0159ea3312345678

-    sub.w r3,@(0x12345678:32,er2.l)                ;0159fa3312345678

-    sub.w r3,@0x1234:16                       ;6b1812341930

-    sub.w r3,@0x12345678:32                       ;6b38123456781930

-

-    sub.w @er3,r1                         ;7cb01901

-    sub.w @(0x6:2,er3),r1               ;015a3331

-    sub.w @er3+,r1                       ;015a8331

-    sub.w @-er3,r1                       ;015ab331

-    sub.w @+er3,r1                       ;015a9331

-    sub.w @er3-,r1                       ;015aa331

-    sub.w @(0x1234:16,er1),r1                  ;015ac1311234

-    sub.w @(0x12345678:32,er1),r1                  ;015ac93112345678

-    sub.w @(0x1234:16,r2l.b),r1                ;015ad2311234

-    sub.w @(0x1234:16,r2.w),r1                ;015ae2311234

-    sub.w @(0x1234:16,er2.l),r1                ;015af2311234

-    sub.w @(0x12345678:32,r2l.b),r1                ;015ada3112345678

-    sub.w @(0x12345678:32,r2.w),r1                ;015aea3112345678

-    sub.w @(0x12345678:32,er2.l),r1                ;015afa3112345678

-    sub.w @0x1234:16,r1                       ;6b1012341901

-    sub.w @0x12345678:32,r1                       ;6b30123456781901

-

-    sub.w @er3,@er1                                ;7cb50130

-    sub.w @er3,@(6:2,er1)                          ;7cb53130

-    sub.w @er3,@-er1                               ;7cb5b130

-    sub.w @er3,@er1+                               ;7cb58130

-    sub.w @er3,@er1-                               ;7cb5a130

-    sub.w @er3,@+er1                               ;7cb59130

-    sub.w @er3,@(0xffff9abc:16,er1)                ;7cb5c1309abc

-    sub.w @er3,@(0x9abcdef0:32,er1)                ;7cb5c9309abcdef0

-    sub.w @er3,@(0xffff9abc:16,r2l.b)              ;7cb5d2309abc

-    sub.w @er3,@(0xffff9abc:16,r2.w)              ;7cb5e2309abc

-    sub.w @er3,@(0xffff9abc:16,er2.l)              ;7cb5f2309abc

-    sub.w @er3,@(0x9abcdef0:32,r2l.b)              ;7cb5da309abcdef0

-    sub.w @er3,@(0x9abcdef0:32,r2.w)              ;7cb5ea309abcdef0

-    sub.w @er3,@(0x9abcdef0:32,er2.l)              ;7cb5fa309abcdef0

-    sub.w @er3,@0xffff9abc:16                      ;7cb540309abc

-    sub.w @er3,@0x9abcdef0:32                      ;7cb548309abcdef0

-

-    sub.w @-er3,@er1                               ;01576d3c0130

-    sub.w @-er3,@(6:2,er1)                         ;01576d3c3130

-    sub.w @-er3,@-er1                              ;01576d3cb130

-    sub.w @-er3,@er1+                              ;01576d3c8130

-    sub.w @-er3,@er1-                              ;01576d3ca130

-    sub.w @-er3,@+er1                              ;01576d3c9130

-    sub.w @-er3,@(0xffff9abc:16,er1)               ;01576d3cc1309abc

-    sub.w @-er3,@(0x9abcdef0:32,er1)               ;01576d3cc9309abcdef0

-    sub.w @-er3,@(0xffff9abc:16,r2l.b)             ;01576d3cd2309abc

-    sub.w @-er3,@(0xffff9abc:16,r2.w)             ;01576d3ce2309abc

-    sub.w @-er3,@(0xffff9abc:16,er2.l)             ;01576d3cf2309abc

-    sub.w @-er3,@(0x9abcdef0:32,r2l.b)             ;01576d3cda309abcdef0

-    sub.w @-er3,@(0x9abcdef0:32,r2.w)             ;01576d3cea309abcdef0

-    sub.w @-er3,@(0x9abcdef0:32,er2.l)             ;01576d3cfa309abcdef0

-    sub.w @-er3,@0xffff9abc:16                     ;01576d3c40309abc

-    sub.w @-er3,@0x9abcdef0:32                     ;01576d3c48309abcdef0

-

-    sub.w @er3+,@er1                               ;01546d3c0130

-    sub.w @er3+,@(6:2,er1)                         ;01546d3c3130

-    sub.w @er3+,@-er1                              ;01546d3cb130

-    sub.w @er3+,@er1+                              ;01546d3c8130

-    sub.w @er3+,@er1-                              ;01546d3ca130

-    sub.w @er3+,@+er1                              ;01546d3c9130

-    sub.w @er3+,@(0xffff9abc:16,er1)               ;01546d3cc1309abc

-    sub.w @er3+,@(0x9abcdef0:32,er1)               ;01546d3cc9309abcdef0

-    sub.w @er3+,@(0xffff9abc:16,r2l.b)             ;01546d3cd2309abc

-    sub.w @er3+,@(0xffff9abc:16,r2.w)             ;01546d3ce2309abc

-    sub.w @er3+,@(0xffff9abc:16,er2.l)             ;01546d3cf2309abc

-    sub.w @er3+,@(0x9abcdef0:32,r2l.b)             ;01546d3cda309abcdef0

-    sub.w @er3+,@(0x9abcdef0:32,r2.w)             ;01546d3cea309abcdef0

-    sub.w @er3+,@(0x9abcdef0:32,er2.l)             ;01546d3cfa309abcdef0

-    sub.w @er3+,@0xffff9abc:16                     ;01546d3c40309abc

-    sub.w @er3+,@0x9abcdef0:32                     ;01546d3c48309abcdef0

-

-    sub.w @er3-,@er1                               ;01566d3c0130

-    sub.w @er3-,@(6:2,er1)                         ;01566d3c3130

-    sub.w @er3-,@-er1                              ;01566d3cb130

-    sub.w @er3-,@er1+                              ;01566d3c8130

-    sub.w @er3-,@er1-                              ;01566d3ca130

-    sub.w @er3-,@+er1                              ;01566d3c9130

-    sub.w @er3-,@(0xffff9abc:16,er1)               ;01566d3cc1309abc

-    sub.w @er3-,@(0x9abcdef0:32,er1)               ;01566d3cc9309abcdef0

-    sub.w @er3-,@(0xffff9abc:16,r2l.b)             ;01566d3cd2309abc

-    sub.w @er3-,@(0xffff9abc:16,r2.w)             ;01566d3ce2309abc

-    sub.w @er3-,@(0xffff9abc:16,er2.l)             ;01566d3cf2309abc

-    sub.w @er3-,@(0x9abcdef0:32,r2l.b)             ;01566d3cda309abcdef0

-    sub.w @er3-,@(0x9abcdef0:32,r2.w)             ;01566d3cea309abcdef0

-    sub.w @er3-,@(0x9abcdef0:32,er2.l)             ;01566d3cfa309abcdef0

-    sub.w @er3-,@0xffff9abc:16                     ;01566d3c40309abc

-    sub.w @er3-,@0x9abcdef0:32                     ;01566d3c48309abcdef0

-

-    sub.w @+er3,@er1                               ;01556d3c0130

-    sub.w @+er3,@(6:2,er1)                         ;01556d3c3130

-    sub.w @+er3,@-er1                              ;01556d3cb130

-    sub.w @+er3,@er1+                              ;01556d3c8130

-    sub.w @+er3,@er1-                              ;01556d3ca130

-    sub.w @+er3,@+er1                              ;01556d3c9130

-    sub.w @+er3,@(0xffff9abc:16,er1)               ;01556d3cc1309abc

-    sub.w @+er3,@(0x9abcdef0:32,er1)               ;01556d3cc9309abcdef0

-    sub.w @+er3,@(0xffff9abc:16,r2l.b)             ;01556d3cd2309abc

-    sub.w @+er3,@(0xffff9abc:16,r2.w)             ;01556d3ce2309abc

-    sub.w @+er3,@(0xffff9abc:16,er2.l)             ;01556d3cf2309abc

-    sub.w @+er3,@(0x9abcdef0:32,r2l.b)             ;01556d3cda309abcdef0

-    sub.w @+er3,@(0x9abcdef0:32,r2.w)             ;01556d3cea309abcdef0

-    sub.w @+er3,@(0x9abcdef0:32,er2.l)             ;01556d3cfa309abcdef0

-    sub.w @+er3,@0xffff9abc:16                     ;01556d3c40309abc

-    sub.w @+er3,@0x9abcdef0:32                     ;01556d3c48309abcdef0

-

-    sub.w @(0x1234:16,er3),@er1                         ;01546f3c12340130

-    sub.w @(0x1234:16,er3),@(6:2,er1)                   ;01546f3c12343130

-    sub.w @(0x1234:16,er3),@-er1                        ;01546f3c1234b130

-    sub.w @(0x1234:16,er3),@er1+                        ;01546f3c12348130

-    sub.w @(0x1234:16,er3),@er1-                        ;01546f3c1234a130

-    sub.w @(0x1234:16,er3),@+er1                        ;01546f3c12349130

-    sub.w @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01546f3c1234c1309abc

-    sub.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01546f3c1234c9309abcdef0

-    sub.w @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01546f3c1234d2309abc

-    sub.w @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01546f3c1234e2309abc

-    sub.w @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01546f3c1234f2309abc

-    sub.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01546f3c1234da309abcdef0

-    sub.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01546f3c1234ea309abcdef0

-    sub.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01546f3c1234fa309abcdef0

-    sub.w @(0x1234:16,er3),@0xffff9abc:16               ;01546f3c123440309abc

-    sub.w @(0x1234:16,er3),@0x9abcdef0:32               ;01546f3c123448309abcdef0

-

-    sub.w @(0x12345678:32,er3),@er1                         ;78346b2c123456780130

-    sub.w @(0x12345678:32,er3),@(6:2,er1)                   ;78346b2c123456783130

-    sub.w @(0x12345678:32,er3),@-er1                        ;78346b2c12345678b130

-    sub.w @(0x12345678:32,er3),@er1+                        ;78346b2c123456788130

-    sub.w @(0x12345678:32,er3),@er1-                        ;78346b2c12345678a130

-    sub.w @(0x12345678:32,er3),@+er1                        ;78346b2c123456789130

-    sub.w @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346b2c12345678c1309abc

-    sub.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346b2c12345678c9309abcdef0

-    sub.w @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346b2c12345678d2309abc

-    sub.w @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346b2c12345678e2309abc

-    sub.w @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346b2c12345678f2309abc

-    sub.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346b2c12345678da309abcdef0

-    sub.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346b2c12345678ea309abcdef0

-    sub.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346b2c12345678fa309abcdef0

-    sub.w @(0x12345678:32,er3),@0xffff9abc:16               ;78346b2c1234567840309abc

-    sub.w @(0x12345678:32,er3),@0x9abcdef0:32               ;78346b2c1234567848309abcdef0

-

-    sub.w @(0x1234:16,r3l.b),@er1                       ;01556f3c12340130

-    sub.w @(0x1234:16,r3l.b),@(6:2,er1)                 ;01556f3c12343130

-    sub.w @(0x1234:16,r3l.b),@-er1                      ;01556f3c1234b130

-    sub.w @(0x1234:16,r3l.b),@er1+                      ;01556f3c12348130

-    sub.w @(0x1234:16,r3l.b),@er1-                      ;01556f3c1234a130

-    sub.w @(0x1234:16,r3l.b),@+er1                      ;01556f3c12349130

-    sub.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01556f3c1234c1309abc

-    sub.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01556f3c1234c9309abcdef0

-    sub.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01556f3c1234d2309abc

-    sub.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01556f3c1234e2309abc

-    sub.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01556f3c1234f2309abc

-    sub.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01556f3c1234da309abcdef0

-    sub.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01556f3c1234ea309abcdef0

-    sub.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01556f3c1234fa309abcdef0

-    sub.w @(0x1234:16,r3l.b),@0xffff9abc:16             ;01556f3c123440309abc

-    sub.w @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01556f3c123448309abcdef0

-

-    sub.w @(0x1234:16,r3.w),@er1                       ;01566f3c12340130

-    sub.w @(0x1234:16,r3.w),@(6:2,er1)                 ;01566f3c12343130

-    sub.w @(0x1234:16,r3.w),@-er1                      ;01566f3c1234b130

-    sub.w @(0x1234:16,r3.w),@er1+                      ;01566f3c12348130

-    sub.w @(0x1234:16,r3.w),@er1-                      ;01566f3c1234a130

-    sub.w @(0x1234:16,r3.w),@+er1                      ;01566f3c12349130

-    sub.w @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01566f3c1234c1309abc

-    sub.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01566f3c1234c9309abcdef0

-    sub.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01566f3c1234d2309abc

-    sub.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01566f3c1234e2309abc

-    sub.w @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01566f3c1234f2309abc

-    sub.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01566f3c1234da309abcdef0

-    sub.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01566f3c1234ea309abcdef0

-    sub.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01566f3c1234fa309abcdef0

-    sub.w @(0x1234:16,r3.w),@0xffff9abc:16             ;01566f3c123440309abc

-    sub.w @(0x1234:16,r3.w),@0x9abcdef0:32             ;01566f3c123448309abcdef0

-

-    sub.w @(0x1234:16,er3.l),@er1                       ;01576f3c12340130

-    sub.w @(0x1234:16,er3.l),@(6:2,er1)                 ;01576f3c12343130

-    sub.w @(0x1234:16,er3.l),@-er1                      ;01576f3c1234b130

-    sub.w @(0x1234:16,er3.l),@er1+                      ;01576f3c12348130

-    sub.w @(0x1234:16,er3.l),@er1-                      ;01576f3c1234a130

-    sub.w @(0x1234:16,er3.l),@+er1                      ;01576f3c12349130

-    sub.w @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01576f3c1234c1309abc

-    sub.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01576f3c1234c9309abcdef0

-    sub.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01576f3c1234d2309abc

-    sub.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01576f3c1234e2309abc

-    sub.w @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01576f3c1234f2309abc

-    sub.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01576f3c1234da309abcdef0

-    sub.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01576f3c1234ea309abcdef0

-    sub.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01576f3c1234fa309abcdef0

-    sub.w @(0x1234:16,er3.l),@0xffff9abc:16             ;01576f3c123440309abc

-    sub.w @(0x1234:16,er3.l),@0x9abcdef0:32             ;01576f3c123448309abcdef0

-

-    sub.w @(0x12345678:32,r3l.b),@er1                       ;78356b2c123456780130

-    sub.w @(0x12345678:32,r3l.b),@(6:2,er1)                 ;78356b2c123456783130

-    sub.w @(0x12345678:32,r3l.b),@-er1                      ;78356b2c12345678b130

-    sub.w @(0x12345678:32,r3l.b),@er1+                      ;78356b2c123456788130

-    sub.w @(0x12345678:32,r3l.b),@er1-                      ;78356b2c12345678a130

-    sub.w @(0x12345678:32,r3l.b),@+er1                      ;78356b2c123456789130

-    sub.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356b2c12345678c1309abc

-    sub.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356b2c12345678c9309abcdef0

-    sub.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356b2c12345678d2309abc

-    sub.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356b2c12345678e2309abc

-    sub.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356b2c12345678f2309abc

-    sub.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356b2c12345678da309abcdef0

-    sub.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356b2c12345678ea309abcdef0

-    sub.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356b2c12345678fa309abcdef0

-    sub.w @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356b2c1234567840309abc

-    sub.w @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356b2c1234567848309abcdef0

-

-    sub.w @(0x12345678:32,r3.w),@er1                       ;78366b2c123456780130

-    sub.w @(0x12345678:32,r3.w),@(6:2,er1)                 ;78366b2c123456783130

-    sub.w @(0x12345678:32,r3.w),@-er1                      ;78366b2c12345678b130

-    sub.w @(0x12345678:32,r3.w),@er1+                      ;78366b2c123456788130

-    sub.w @(0x12345678:32,r3.w),@er1-                      ;78366b2c12345678a130

-    sub.w @(0x12345678:32,r3.w),@+er1                      ;78366b2c123456789130

-    sub.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366b2c12345678c1309abc

-    sub.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366b2c12345678c9309abcdef0

-    sub.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366b2c12345678d2309abc

-    sub.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366b2c12345678e2309abc

-    sub.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366b2c12345678f2309abc

-    sub.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366b2c12345678da309abcdef0

-    sub.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366b2c12345678ea309abcdef0

-    sub.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366b2c12345678fa309abcdef0

-    sub.w @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366b2c1234567840309abc

-    sub.w @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366b2c1234567848309abcdef0

-

-    sub.w @(0x12345678:32,er3.l),@er1                       ;78376b2c123456780130

-    sub.w @(0x12345678:32,er3.l),@(6:2,er1)                 ;78376b2c123456783130

-    sub.w @(0x12345678:32,er3.l),@-er1                      ;78376b2c12345678b130

-    sub.w @(0x12345678:32,er3.l),@er1+                      ;78376b2c123456788130

-    sub.w @(0x12345678:32,er3.l),@er1-                      ;78376b2c12345678a130

-    sub.w @(0x12345678:32,er3.l),@+er1                      ;78376b2c123456789130

-    sub.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376b2c12345678c1309abc

-    sub.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376b2c12345678c9309abcdef0

-    sub.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376b2c12345678d2309abc

-    sub.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376b2c12345678e2309abc

-    sub.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376b2c12345678f2309abc

-    sub.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376b2c12345678da309abcdef0

-    sub.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376b2c12345678ea309abcdef0

-    sub.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376b2c12345678fa309abcdef0

-    sub.w @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376b2c1234567840309abc

-    sub.w @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376b2c1234567848309abcdef0

-

-    sub.w @0x1234:16,@er1                              ;6b1512340130

-    sub.w @0x1234:16,@(6:2,er1)                        ;6b1512343130

-    sub.w @0x1234:16,@-er1                             ;6b151234b130

-    sub.w @0x1234:16,@er1+                             ;6b1512348130

-    sub.w @0x1234:16,@er1-                             ;6b151234a130

-    sub.w @0x1234:16,@+er1                             ;6b1512349130

-    sub.w @0x1234:16,@(0xffff9abc:16,er1)              ;6b151234c1309abc

-    sub.w @0x1234:16,@(0x9abcdef0:32,er1)              ;6b151234c9309abcdef0

-    sub.w @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6b151234d2309abc

-    sub.w @0x1234:16,@(0xffff9abc:16,r2.w)            ;6b151234e2309abc

-    sub.w @0x1234:16,@(0xffff9abc:16,er2.l)            ;6b151234f2309abc

-    sub.w @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6b151234da309abcdef0

-    sub.w @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6b151234ea309abcdef0

-    sub.w @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6b151234fa309abcdef0

-    sub.w @0x1234:16,@0xffff9abc:16                    ;6b15123440309abc

-    sub.w @0x1234:16,@0x9abcdef0:32                    ;6b15123448309abcdef0

-

-    sub.w @0x12345678:32,@er1                              ;6b35123456780130

-    sub.w @0x12345678:32,@(6:2,er1)                        ;6b35123456783130

-    sub.w @0x12345678:32,@-er1                             ;6b3512345678b130

-    sub.w @0x12345678:32,@er1+                             ;6b35123456788130

-    sub.w @0x12345678:32,@er1-                             ;6b3512345678a130

-    sub.w @0x12345678:32,@+er1                             ;6b35123456789130

-    sub.w @0x12345678:32,@(0xffff9abc:16,er1)              ;6b3512345678c1309abc

-    sub.w @0x12345678:32,@(0x9abcdef0:32,er1)              ;6b3512345678c9309abcdef0

-    sub.w @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6b3512345678d2309abc

-    sub.w @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6b3512345678e2309abc

-    sub.w @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6b3512345678f2309abc

-    sub.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6b3512345678da309abcdef0

-    sub.w @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6b3512345678ea309abcdef0

-    sub.w @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6b3512345678fa309abcdef0

-    sub.w @0x12345678:32,@0xffff9abc:16                    ;6b351234567840309abc

-    sub.w @0x12345678:32,@0x9abcdef0:32                    ;6b351234567848309abcdef0

-

-    sub.l #0x12345678:32,er1                      ;7a3112345678

-    sub.l #0x1234:16,er1                       ;7a391234

-    sub.l #0x7:3,er2                        ;1afa

-    sub.l #0x12345678:32,@er1                      ;010e013812345678

-    sub.l #0x12345678:32,@(0xc:2,er1)             ;010e313812345678

-    sub.l #0x12345678:32,@er1+                     ;010e813812345678

-    sub.l #0x12345678:32,@-er1                     ;010eb13812345678

-    sub.l #0x12345678:32,@+er1                     ;010e913812345678

-    sub.l #0x12345678:32,@er1-                     ;010ea13812345678

-    sub.l #0x12345678:32,@(0xffff9abc:16,er1)               ;010ec1389abc12345678

-    sub.l #0x12345678:32,@(0x9abcdef0:32,er1)               ;010ec9389abcdef012345678

-    sub.l #0x12345678:32,@(0xffff9abc:16,r2l.b)             ;010ed2389abc12345678

-    sub.l #0x12345678:32,@(0xffff9abc:16,r2.w)             ;010ee2389abc12345678

-    sub.l #0x12345678:32,@(0xffff9abc:16,er2.l)             ;010ef2389abc12345678

-    sub.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)             ;010eda389abcdef012345678

-    sub.l #0x12345678:32,@(0x9abcdef0:32,r2.w)             ;010eea389abcdef012345678

-    sub.l #0x12345678:32,@(0x9abcdef0:32,er2.l)             ;010efa389abcdef012345678

-    sub.l #0x12345678:32,@0xffff9abc:16                    ;010e40389abc12345678

-    sub.l #0x12345678:32,@0x9abcdef0:32                    ;010e48389abcdef012345678

-    sub.l #0x1234:16,@er1                      ;010e01301234

-    sub.l #0x1234:16,@(0xc:2,er1)             ;010e31301234

-    sub.l #0x1234:16,@er1+                     ;010e81301234

-    sub.l #0x1234:16,@-er1                     ;010eb1301234

-    sub.l #0x1234:16,@+er1                     ;010e91301234

-    sub.l #0x1234:16,@er1-                     ;010ea1301234

-    sub.l #0x1234:16,@(0xffff9abc:16,er1)               ;010ec1309abc1234

-    sub.l #0x1234:16,@(0x9abcdef0:32,er1)               ;010ec9309abcdef01234

-    sub.l #0x1234:16,@(0xffff9abc:16,r2l.b)             ;010ed2309abc1234

-    sub.l #0x1234:16,@(0xffff9abc:16,r2.w)             ;010ee2309abc1234

-    sub.l #0x1234:16,@(0xffff9abc:16,er2.l)             ;010ef2309abc1234

-    sub.l #0x1234:16,@(0x9abcdef0:32,r2l.b)             ;010eda309abcdef01234

-    sub.l #0x1234:16,@(0x9abcdef0:32,r2.w)             ;010eea309abcdef01234

-    sub.l #0x1234:16,@(0x9abcdef0:32,er2.l)             ;010efa309abcdef01234

-    sub.l #0x1234:16,@0xffff9abc:16                    ;010e40309abc1234

-    sub.l #0x1234:16,@0x9abcdef0:32                    ;010e48309abcdef01234

-

-    sub.l er3,er1                         ;1ab1

-

-    sub.l er3,@er1                         ;01090133

-    sub.l er3,@(0xc:2,er1)                ;01093133

-    sub.l er3,@er1+                        ;01098133

-    sub.l er3,@-er1                        ;0109b133

-    sub.l er3,@+er1                        ;01099133

-    sub.l er3,@er1-                        ;0109a133

-    sub.l er3,@(0x1234:16,er1)                  ;0109c1331234

-    sub.l er3,@(0x12345678:32,er1)                  ;0109c93312345678

-    sub.l er3,@(0x1234:16,r2l.b)                ;0109d2331234

-    sub.l er3,@(0x1234:16,r2.w)                ;0109e2331234

-    sub.l er3,@(0x1234:16,er2.l)                ;0109f2331234

-    sub.l er3,@(0x12345678:32,r2l.b)                ;0109da3312345678

-    sub.l er3,@(0x12345678:32,r2.w)                ;0109ea3312345678

-    sub.l er3,@(0x12345678:32,er2.l)                ;0109fa3312345678

-    sub.l er3,@0x1234:16                       ;010940331234

-    sub.l er3,@0x12345678:32                       ;0109483312345678

-

-    sub.l @er3,er1                         ;010a0331

-    sub.l @(0xc:2,er3),er1               ;010a3331

-    sub.l @er3+,er1                       ;010a8331

-    sub.l @-er3,er1                       ;010ab331

-    sub.l @+er3,er1                       ;010a9331

-    sub.l @er3-,er1                       ;010aa331

-    sub.l @(0x1234:16,er1),er1                  ;010ac1311234

-    sub.l @(0x12345678:32,er1),er1                  ;010ac93112345678

-    sub.l @(0x1234:16,r2l.b),er1                ;010ad2311234

-    sub.l @(0x1234:16,r2.w),er1                ;010ae2311234

-    sub.l @(0x1234:16,er2.l),er1                ;010af2311234

-    sub.l @(0x12345678:32,r2l.b),er1                ;010ada3112345678

-    sub.l @(0x12345678:32,r2.w),er1                ;010aea3112345678

-    sub.l @(0x12345678:32,er2.l),er1                ;010afa3112345678

-    sub.l @0x1234:16,er1                       ;010a40311234

-    sub.l @0x12345678:32,er1                       ;010a483112345678

-

-    sub.l @er3,@er1                                ;0104693c0130

-    sub.l @er3,@(0xc:2,er1)                          ;0104693c3130

-    sub.l @er3,@-er1                               ;0104693cb130

-    sub.l @er3,@er1+                               ;0104693c8130

-    sub.l @er3,@er1-                               ;0104693ca130

-    sub.l @er3,@+er1                               ;0104693c9130

-    sub.l @er3,@(0xffff9abc:16,er1)                ;0104693cc1309abc

-    sub.l @er3,@(0x9abcdef0:32,er1)                ;0104693cc9309abcdef0

-    sub.l @er3,@(0xffff9abc:16,r2l.b)              ;0104693cd2309abc

-    sub.l @er3,@(0xffff9abc:16,r2.w)              ;0104693ce2309abc

-    sub.l @er3,@(0xffff9abc:16,er2.l)              ;0104693cf2309abc

-    sub.l @er3,@(0x9abcdef0:32,r2l.b)              ;0104693cda309abcdef0

-    sub.l @er3,@(0x9abcdef0:32,r2.w)              ;0104693cea309abcdef0

-    sub.l @er3,@(0x9abcdef0:32,er2.l)              ;0104693cfa309abcdef0

-    sub.l @er3,@0xffff9abc:16                      ;0104693c40309abc

-    sub.l @er3,@0x9abcdef0:32                      ;0104693c48309abcdef0

-

-    sub.l @(0xc:2,er3),@er1                       ;0107693c0130

-    sub.l @(0xc:2,er3),@(0xc:2,er1)                 ;0107693c3130

-    sub.l @(0xc:2,er3),@-er1                      ;0107693cb130

-    sub.l @(0xc:2,er3),@er1+                      ;0107693c8130

-    sub.l @(0xc:2,er3),@er1-                      ;0107693ca130

-    sub.l @(0xc:2,er3),@+er1                      ;0107693c9130

-    sub.l @(0xc:2,er3),@(0xffff9abc:16,er1)       ;0107693cc1309abc

-    sub.l @(0xc:2,er3),@(0x9abcdef0:32,er1)       ;0107693cc9309abcdef0

-    sub.l @(0xc:2,er3),@(0xffff9abc:16,r2l.b)     ;0107693cd2309abc

-    sub.l @(0xc:2,er3),@(0xffff9abc:16,r2.w)     ;0107693ce2309abc

-    sub.l @(0xc:2,er3),@(0xffff9abc:16,er2.l)     ;0107693cf2309abc

-    sub.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)     ;0107693cda309abcdef0

-    sub.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)     ;0107693cea309abcdef0

-    sub.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)     ;0107693cfa309abcdef0

-    sub.l @(0xc:2,er3),@0xffff9abc:16             ;0107693c40309abc

-    sub.l @(0xc:2,er3),@0x9abcdef0:32             ;0107693c48309abcdef0

-

-    sub.l @-er3,@er1                               ;01076d3c0130

-    sub.l @-er3,@(0xc:2,er1)                         ;01076d3c3130

-    sub.l @-er3,@-er1                              ;01076d3cb130

-    sub.l @-er3,@er1+                              ;01076d3c8130

-    sub.l @-er3,@er1-                              ;01076d3ca130

-    sub.l @-er3,@+er1                              ;01076d3c9130

-    sub.l @-er3,@(0xffff9abc:16,er1)               ;01076d3cc1309abc

-    sub.l @-er3,@(0x9abcdef0:32,er1)               ;01076d3cc9309abcdef0

-    sub.l @-er3,@(0xffff9abc:16,r2l.b)             ;01076d3cd2309abc

-    sub.l @-er3,@(0xffff9abc:16,r2.w)             ;01076d3ce2309abc

-    sub.l @-er3,@(0xffff9abc:16,er2.l)             ;01076d3cf2309abc

-    sub.l @-er3,@(0x9abcdef0:32,r2l.b)             ;01076d3cda309abcdef0

-    sub.l @-er3,@(0x9abcdef0:32,r2.w)             ;01076d3cea309abcdef0

-    sub.l @-er3,@(0x9abcdef0:32,er2.l)             ;01076d3cfa309abcdef0

-    sub.l @-er3,@0xffff9abc:16                     ;01076d3c40309abc

-    sub.l @-er3,@0x9abcdef0:32                     ;01076d3c48309abcdef0

-

-    sub.l @er3+,@er1                               ;01046d3c0130

-    sub.l @er3+,@(0xc:2,er1)                         ;01046d3c3130

-    sub.l @er3+,@-er1                              ;01046d3cb130

-    sub.l @er3+,@er1+                              ;01046d3c8130

-    sub.l @er3+,@er1-                              ;01046d3ca130

-    sub.l @er3+,@+er1                              ;01046d3c9130

-    sub.l @er3+,@(0xffff9abc:16,er1)               ;01046d3cc1309abc

-    sub.l @er3+,@(0x9abcdef0:32,er1)               ;01046d3cc9309abcdef0

-    sub.l @er3+,@(0xffff9abc:16,r2l.b)             ;01046d3cd2309abc

-    sub.l @er3+,@(0xffff9abc:16,r2.w)             ;01046d3ce2309abc

-    sub.l @er3+,@(0xffff9abc:16,er2.l)             ;01046d3cf2309abc

-    sub.l @er3+,@(0x9abcdef0:32,r2l.b)             ;01046d3cda309abcdef0

-    sub.l @er3+,@(0x9abcdef0:32,r2.w)             ;01046d3cea309abcdef0

-    sub.l @er3+,@(0x9abcdef0:32,er2.l)             ;01046d3cfa309abcdef0

-    sub.l @er3+,@0xffff9abc:16                     ;01046d3c40309abc

-    sub.l @er3+,@0x9abcdef0:32                     ;01046d3c48309abcdef0

-

-    sub.l @er3-,@er1                               ;01066d3c0130

-    sub.l @er3-,@(0xc:2,er1)                         ;01066d3c3130

-    sub.l @er3-,@-er1                              ;01066d3cb130

-    sub.l @er3-,@er1+                              ;01066d3c8130

-    sub.l @er3-,@er1-                              ;01066d3ca130

-    sub.l @er3-,@+er1                              ;01066d3c9130

-    sub.l @er3-,@(0xffff9abc:16,er1)               ;01066d3cc1309abc

-    sub.l @er3-,@(0x9abcdef0:32,er1)               ;01066d3cc9309abcdef0

-    sub.l @er3-,@(0xffff9abc:16,r2l.b)             ;01066d3cd2309abc

-    sub.l @er3-,@(0xffff9abc:16,r2.w)             ;01066d3ce2309abc

-    sub.l @er3-,@(0xffff9abc:16,er2.l)             ;01066d3cf2309abc

-    sub.l @er3-,@(0x9abcdef0:32,r2l.b)             ;01066d3cda309abcdef0

-    sub.l @er3-,@(0x9abcdef0:32,r2.w)             ;01066d3cea309abcdef0

-    sub.l @er3-,@(0x9abcdef0:32,er2.l)             ;01066d3cfa309abcdef0

-    sub.l @er3-,@0xffff9abc:16                     ;01066d3c40309abc

-    sub.l @er3-,@0x9abcdef0:32                     ;01066d3c48309abcdef0

-

-    sub.l @+er3,@er1                               ;01056d3c0130

-    sub.l @+er3,@(0xc:2,er1)                         ;01056d3c3130

-    sub.l @+er3,@-er1                              ;01056d3cb130

-    sub.l @+er3,@er1+                              ;01056d3c8130

-    sub.l @+er3,@er1-                              ;01056d3ca130

-    sub.l @+er3,@+er1                              ;01056d3c9130

-    sub.l @+er3,@(0xffff9abc:16,er1)               ;01056d3cc1309abc

-    sub.l @+er3,@(0x9abcdef0:32,er1)               ;01056d3cc9309abcdef0

-    sub.l @+er3,@(0xffff9abc:16,r2l.b)             ;01056d3cd2309abc

-    sub.l @+er3,@(0xffff9abc:16,r2.w)             ;01056d3ce2309abc

-    sub.l @+er3,@(0xffff9abc:16,er2.l)             ;01056d3cf2309abc

-    sub.l @+er3,@(0x9abcdef0:32,r2l.b)             ;01056d3cda309abcdef0

-    sub.l @+er3,@(0x9abcdef0:32,r2.w)             ;01056d3cea309abcdef0

-    sub.l @+er3,@(0x9abcdef0:32,er2.l)             ;01056d3cfa309abcdef0

-    sub.l @+er3,@0xffff9abc:16                     ;01056d3c40309abc

-    sub.l @+er3,@0x9abcdef0:32                     ;01056d3c48309abcdef0

-

-    sub.l @(0x1234:16,er3),@er1                         ;01046f3c12340130

-    sub.l @(0x1234:16,er3),@(0xc:2,er1)                   ;01046f3c12343130

-    sub.l @(0x1234:16,er3),@-er1                        ;01046f3c1234b130

-    sub.l @(0x1234:16,er3),@er1+                        ;01046f3c12348130

-    sub.l @(0x1234:16,er3),@er1-                        ;01046f3c1234a130

-    sub.l @(0x1234:16,er3),@+er1                        ;01046f3c12349130

-    sub.l @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01046f3c1234c1309abc

-    sub.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01046f3c1234c9309abcdef0

-    sub.l @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01046f3c1234d2309abc

-    sub.l @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01046f3c1234e2309abc

-    sub.l @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01046f3c1234f2309abc

-    sub.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01046f3c1234da309abcdef0

-    sub.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01046f3c1234ea309abcdef0

-    sub.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01046f3c1234fa309abcdef0

-    sub.l @(0x1234:16,er3),@0xffff9abc:16               ;01046f3c123440309abc

-    sub.l @(0x1234:16,er3),@0x9abcdef0:32               ;01046f3c123448309abcdef0

-

-    sub.l @(0x12345678:32,er3),@er1                         ;78b46b2c123456780130

-    sub.l @(0x12345678:32,er3),@(0xc:2,er1)                   ;78b46b2c123456783130

-    sub.l @(0x12345678:32,er3),@-er1                        ;78b46b2c12345678b130

-    sub.l @(0x12345678:32,er3),@er1+                        ;78b46b2c123456788130

-    sub.l @(0x12345678:32,er3),@er1-                        ;78b46b2c12345678a130

-    sub.l @(0x12345678:32,er3),@+er1                        ;78b46b2c123456789130

-    sub.l @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78b46b2c12345678c1309abc

-    sub.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78b46b2c12345678c9309abcdef0

-    sub.l @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78b46b2c12345678d2309abc

-    sub.l @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78b46b2c12345678e2309abc

-    sub.l @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78b46b2c12345678f2309abc

-    sub.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78b46b2c12345678da309abcdef0

-    sub.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78b46b2c12345678ea309abcdef0

-    sub.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78b46b2c12345678fa309abcdef0

-    sub.l @(0x12345678:32,er3),@0xffff9abc:16               ;78b46b2c1234567840309abc

-    sub.l @(0x12345678:32,er3),@0x9abcdef0:32               ;78b46b2c1234567848309abcdef0

-

-    sub.l @(0x1234:16,r3l.b),@er1                       ;01056f3c12340130

-    sub.l @(0x1234:16,r3l.b),@(0xc:2,er1)                 ;01056f3c12343130

-    sub.l @(0x1234:16,r3l.b),@-er1                      ;01056f3c1234b130

-    sub.l @(0x1234:16,r3l.b),@er1+                      ;01056f3c12348130

-    sub.l @(0x1234:16,r3l.b),@er1-                      ;01056f3c1234a130

-    sub.l @(0x1234:16,r3l.b),@+er1                      ;01056f3c12349130

-    sub.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01056f3c1234c1309abc

-    sub.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01056f3c1234c9309abcdef0

-    sub.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01056f3c1234d2309abc

-    sub.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01056f3c1234e2309abc

-    sub.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01056f3c1234f2309abc

-    sub.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01056f3c1234da309abcdef0

-    sub.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01056f3c1234ea309abcdef0

-    sub.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01056f3c1234fa309abcdef0

-    sub.l @(0x1234:16,r3l.b),@0xffff9abc:16             ;01056f3c123440309abc

-    sub.l @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01056f3c123448309abcdef0

-

-    sub.l @(0x1234:16,r3.w),@er1                       ;01066f3c12340130

-    sub.l @(0x1234:16,r3.w),@(0xc:2,er1)                 ;01066f3c12343130

-    sub.l @(0x1234:16,r3.w),@-er1                      ;01066f3c1234b130

-    sub.l @(0x1234:16,r3.w),@er1+                      ;01066f3c12348130

-    sub.l @(0x1234:16,r3.w),@er1-                      ;01066f3c1234a130

-    sub.l @(0x1234:16,r3.w),@+er1                      ;01066f3c12349130

-    sub.l @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01066f3c1234c1309abc

-    sub.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01066f3c1234c9309abcdef0

-    sub.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01066f3c1234d2309abc

-    sub.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01066f3c1234e2309abc

-    sub.l @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01066f3c1234f2309abc

-    sub.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01066f3c1234da309abcdef0

-    sub.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01066f3c1234ea309abcdef0

-    sub.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01066f3c1234fa309abcdef0

-    sub.l @(0x1234:16,r3.w),@0xffff9abc:16             ;01066f3c123440309abc

-    sub.l @(0x1234:16,r3.w),@0x9abcdef0:32             ;01066f3c123448309abcdef0

-

-    sub.l @(0x1234:16,er3.l),@er1                       ;01076f3c12340130

-    sub.l @(0x1234:16,er3.l),@(0xc:2,er1)                 ;01076f3c12343130

-    sub.l @(0x1234:16,er3.l),@-er1                      ;01076f3c1234b130

-    sub.l @(0x1234:16,er3.l),@er1+                      ;01076f3c12348130

-    sub.l @(0x1234:16,er3.l),@er1-                      ;01076f3c1234a130

-    sub.l @(0x1234:16,er3.l),@+er1                      ;01076f3c12349130

-    sub.l @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01076f3c1234c1309abc

-    sub.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01076f3c1234c9309abcdef0

-    sub.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01076f3c1234d2309abc

-    sub.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01076f3c1234e2309abc

-    sub.l @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01076f3c1234f2309abc

-    sub.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01076f3c1234da309abcdef0

-    sub.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01076f3c1234ea309abcdef0

-    sub.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01076f3c1234fa309abcdef0

-    sub.l @(0x1234:16,er3.l),@0xffff9abc:16             ;01076f3c123440309abc

-    sub.l @(0x1234:16,er3.l),@0x9abcdef0:32             ;01076f3c123448309abcdef0

-

-    sub.l @(0x12345678:32,r3l.b),@er1                       ;78b56b2c123456780130

-    sub.l @(0x12345678:32,r3l.b),@(0xc:2,er1)                 ;78b56b2c123456783130

-    sub.l @(0x12345678:32,r3l.b),@-er1                      ;78b56b2c12345678b130

-    sub.l @(0x12345678:32,r3l.b),@er1+                      ;78b56b2c123456788130

-    sub.l @(0x12345678:32,r3l.b),@er1-                      ;78b56b2c12345678a130

-    sub.l @(0x12345678:32,r3l.b),@+er1                      ;78b56b2c123456789130

-    sub.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78b56b2c12345678c1309abc

-    sub.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78b56b2c12345678c9309abcdef0

-    sub.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78b56b2c12345678d2309abc

-    sub.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78b56b2c12345678e2309abc

-    sub.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78b56b2c12345678f2309abc

-    sub.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78b56b2c12345678da309abcdef0

-    sub.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78b56b2c12345678ea309abcdef0

-    sub.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78b56b2c12345678fa309abcdef0

-    sub.l @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78b56b2c1234567840309abc

-    sub.l @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78b56b2c1234567848309abcdef0

-

-    sub.l @(0x12345678:32,r3.w),@er1                       ;78b66b2c123456780130

-    sub.l @(0x12345678:32,r3.w),@(0xc:2,er1)                 ;78b66b2c123456783130

-    sub.l @(0x12345678:32,r3.w),@-er1                      ;78b66b2c12345678b130

-    sub.l @(0x12345678:32,r3.w),@er1+                      ;78b66b2c123456788130

-    sub.l @(0x12345678:32,r3.w),@er1-                      ;78b66b2c12345678a130

-    sub.l @(0x12345678:32,r3.w),@+er1                      ;78b66b2c123456789130

-    sub.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78b66b2c12345678c1309abc

-    sub.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78b66b2c12345678c9309abcdef0

-    sub.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78b66b2c12345678d2309abc

-    sub.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78b66b2c12345678e2309abc

-    sub.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78b66b2c12345678f2309abc

-    sub.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78b66b2c12345678da309abcdef0

-    sub.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78b66b2c12345678ea309abcdef0

-    sub.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78b66b2c12345678fa309abcdef0

-    sub.l @(0x12345678:32,r3.w),@0xffff9abc:16             ;78b66b2c1234567840309abc

-    sub.l @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78b66b2c1234567848309abcdef0

-

-    sub.l @(0x12345678:32,er3.l),@er1                       ;78b76b2c123456780130

-    sub.l @(0x12345678:32,er3.l),@(0xc:2,er1)                 ;78b76b2c123456783130

-    sub.l @(0x12345678:32,er3.l),@-er1                      ;78b76b2c12345678b130

-    sub.l @(0x12345678:32,er3.l),@er1+                      ;78b76b2c123456788130

-    sub.l @(0x12345678:32,er3.l),@er1-                      ;78b76b2c12345678a130

-    sub.l @(0x12345678:32,er3.l),@+er1                      ;78b76b2c123456789130

-    sub.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78b76b2c12345678c1309abc

-    sub.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78b76b2c12345678c9309abcdef0

-    sub.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78b76b2c12345678d2309abc

-    sub.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78b76b2c12345678e2309abc

-    sub.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78b76b2c12345678f2309abc

-    sub.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78b76b2c12345678da309abcdef0

-    sub.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78b76b2c12345678ea309abcdef0

-    sub.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78b76b2c12345678fa309abcdef0

-    sub.l @(0x12345678:32,er3.l),@0xffff9abc:16             ;78b76b2c1234567840309abc

-    sub.l @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78b76b2c1234567848309abcdef0

-

-    sub.l @0x1234:16,@er1                              ;01046b0c12340130

-    sub.l @0x1234:16,@(0xc:2,er1)                        ;01046b0c12343130

-    sub.l @0x1234:16,@-er1                             ;01046b0c1234b130

-    sub.l @0x1234:16,@er1+                             ;01046b0c12348130

-    sub.l @0x1234:16,@er1-                             ;01046b0c1234a130

-    sub.l @0x1234:16,@+er1                             ;01046b0c12349130

-    sub.l @0x1234:16,@(0xffff9abc:16,er1)              ;01046b0c1234c1309abc

-    sub.l @0x1234:16,@(0x9abcdef0:32,er1)              ;01046b0c1234c9309abcdef0

-    sub.l @0x1234:16,@(0xffff9abc:16,r2l.b)            ;01046b0c1234d2309abc

-    sub.l @0x1234:16,@(0xffff9abc:16,r2.w)            ;01046b0c1234e2309abc

-    sub.l @0x1234:16,@(0xffff9abc:16,er2.l)            ;01046b0c1234f2309abc

-    sub.l @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;01046b0c1234da309abcdef0

-    sub.l @0x1234:16,@(0x9abcdef0:32,r2.w)            ;01046b0c1234ea309abcdef0

-    sub.l @0x1234:16,@(0x9abcdef0:32,er2.l)            ;01046b0c1234fa309abcdef0

-    sub.l @0x1234:16,@0xffff9abc:16                    ;01046b0c123440309abc

-    sub.l @0x1234:16,@0x9abcdef0:32                    ;01046b0c123448309abcdef0

-

-    sub.l @0x12345678:32,@er1                              ;01046b2c123456780130

-    sub.l @0x12345678:32,@(0xc:2,er1)                        ;01046b2c123456783130

-    sub.l @0x12345678:32,@-er1                             ;01046b2c12345678b130

-    sub.l @0x12345678:32,@er1+                             ;01046b2c123456788130

-    sub.l @0x12345678:32,@er1-                             ;01046b2c12345678a130

-    sub.l @0x12345678:32,@+er1                             ;01046b2c123456789130

-    sub.l @0x12345678:32,@(0xffff9abc:16,er1)              ;01046b2c12345678c1309abc

-    sub.l @0x12345678:32,@(0x9abcdef0:32,er1)              ;01046b2c12345678c9309abcdef0

-    sub.l @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;01046b2c12345678d2309abc

-    sub.l @0x12345678:32,@(0xffff9abc:16,r2.w)            ;01046b2c12345678e2309abc

-    sub.l @0x12345678:32,@(0xffff9abc:16,er2.l)            ;01046b2c12345678f2309abc

-    sub.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;01046b2c12345678da309abcdef0

-    sub.l @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;01046b2c12345678ea309abcdef0

-    sub.l @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;01046b2c12345678fa309abcdef0

-    sub.l @0x12345678:32,@0xffff9abc:16                    ;01046b2c1234567840309abc

-    sub.l @0x12345678:32,@0x9abcdef0:32                    ;01046b2c1234567848309abcdef0

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t05_cmp.exp b/gdb/testsuite/gdb.disasm/t05_cmp.exp
deleted file mode 100644
index 85780006802..00000000000
--- a/gdb/testsuite/gdb.disasm/t05_cmp.exp
+++ /dev/null
@@ -1,1770 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t05_cmp"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "cmp.b\t@er3,@er1" \
-	"cmp.b @er3,@er1"
-gdb_test "x" "cmp.b\t@er3,@\\(0x3(:2|),er1\\)" \
-	"cmp.b @er3,@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@er3,@-er1" \
-	"cmp.b @er3,@-er1"
-gdb_test "x" "cmp.b\t@er3,@er1\\+" \
-	"cmp.b @er3,@er1+"
-gdb_test "x" "cmp.b\t@er3,@er1-" \
-	"cmp.b @er3,@er1-"
-gdb_test "x" "cmp.b\t@er3,@\\+er1" \
-	"cmp.b @er3,@+er1"
-gdb_test "x" "cmp.b\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@er3,@0x9abc(:16|)" \
-	"cmp.b @er3,@0x9abc:16"
-gdb_test "x" "cmp.b\t@er3,@0x9abcdef0(:32|)" \
-	"cmp.b @er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@-er3,@er1" \
-	"cmp.b @-er3,@er1"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x3(:2|),er1\\)" \
-	"cmp.b @-er3,@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@-er3,@-er1" \
-	"cmp.b @-er3,@-er1"
-gdb_test "x" "cmp.b\t@-er3,@er1\\+" \
-	"cmp.b @-er3,@er1+"
-gdb_test "x" "cmp.b\t@-er3,@er1-" \
-	"cmp.b @-er3,@er1-"
-gdb_test "x" "cmp.b\t@-er3,@\\+er1" \
-	"cmp.b @-er3,@+er1"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@-er3,@0x9abc(:16|)" \
-	"cmp.b @-er3,@0x9abc:16"
-gdb_test "x" "cmp.b\t@-er3,@0x9abcdef0(:32|)" \
-	"cmp.b @-er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@er3\\+,@er1" \
-	"cmp.b @er3+,@er1"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x3(:2|),er1\\)" \
-	"cmp.b @er3+,@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@er3\\+,@-er1" \
-	"cmp.b @er3+,@-er1"
-gdb_test "x" "cmp.b\t@er3\\+,@er1\\+" \
-	"cmp.b @er3+,@er1+"
-gdb_test "x" "cmp.b\t@er3\\+,@er1-" \
-	"cmp.b @er3+,@er1-"
-gdb_test "x" "cmp.b\t@er3\\+,@\\+er1" \
-	"cmp.b @er3+,@+er1"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@er3\\+,@0x9abc(:16|)" \
-	"cmp.b @er3+,@0x9abc:16"
-gdb_test "x" "cmp.b\t@er3\\+,@0x9abcdef0(:32|)" \
-	"cmp.b @er3+,@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@er3-,@er1" \
-	"cmp.b @er3-,@er1"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x3(:2|),er1\\)" \
-	"cmp.b @er3-,@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@er3-,@-er1" \
-	"cmp.b @er3-,@-er1"
-gdb_test "x" "cmp.b\t@er3-,@er1\\+" \
-	"cmp.b @er3-,@er1+"
-gdb_test "x" "cmp.b\t@er3-,@er1-" \
-	"cmp.b @er3-,@er1-"
-gdb_test "x" "cmp.b\t@er3-,@\\+er1" \
-	"cmp.b @er3-,@+er1"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@er3-,@0x9abc(:16|)" \
-	"cmp.b @er3-,@0x9abc:16"
-gdb_test "x" "cmp.b\t@er3-,@0x9abcdef0(:32|)" \
-	"cmp.b @er3-,@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\+er3,@er1" \
-	"cmp.b @+er3,@er1"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x3(:2|),er1\\)" \
-	"cmp.b @+er3,@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\+er3,@-er1" \
-	"cmp.b @+er3,@-er1"
-gdb_test "x" "cmp.b\t@\\+er3,@er1\\+" \
-	"cmp.b @+er3,@er1+"
-gdb_test "x" "cmp.b\t@\\+er3,@er1-" \
-	"cmp.b @+er3,@er1-"
-gdb_test "x" "cmp.b\t@\\+er3,@\\+er1" \
-	"cmp.b @+er3,@+er1"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\+er3,@0x9abc(:16|)" \
-	"cmp.b @+er3,@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\+er3,@0x9abcdef0(:32|)" \
-	"cmp.b @+er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@er1" \
-	"cmp.b @(0x1234:16,er3),@er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"cmp.b @(0x1234:16,er3),@-er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"cmp.b @(0x1234:16,er3),@er1+"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"cmp.b @(0x1234:16,er3),@er1-"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"cmp.b @(0x1234:16,er3),@+er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"cmp.b @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"cmp.b @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"cmp.b @(0x12345678:32,er3),@er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"cmp.b @(0x12345678:32,er3),@-er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"cmp.b @(0x12345678:32,er3),@er1+"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"cmp.b @(0x12345678:32,er3),@er1-"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"cmp.b @(0x12345678:32,er3),@+er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"cmp.b @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"cmp.b @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"cmp.b @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"cmp.b @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"cmp.b @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"cmp.b @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"cmp.b @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"cmp.b @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"cmp.b @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"cmp.b @(0x1234:16,r3.w),@er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"cmp.b @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"cmp.b @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"cmp.b @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"cmp.b @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"cmp.b @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"cmp.b @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"cmp.b @(0x1234:16,er3.l),@er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"cmp.b @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"cmp.b @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"cmp.b @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"cmp.b @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"cmp.b @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"cmp.b @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"cmp.b @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"cmp.b @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"cmp.b @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"cmp.b @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"cmp.b @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"cmp.b @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"cmp.b @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"cmp.b @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"cmp.b @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"cmp.b @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"cmp.b @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"cmp.b @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"cmp.b @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"cmp.b @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"cmp.b @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"cmp.b @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"cmp.b @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"cmp.b @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"cmp.b @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"cmp.b @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "cmp.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"cmp.b @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@er1" \
-	"cmp.b @0x1234:16,@er1"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @0x1234:16,@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@-er1" \
-	"cmp.b @0x1234:16,@-er1"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@er1\\+" \
-	"cmp.b @0x1234:16,@er1+"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@er1-" \
-	"cmp.b @0x1234:16,@er1-"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\+er1" \
-	"cmp.b @0x1234:16,@+er1"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@0x9abc(:16|)" \
-	"cmp.b @0x1234:16,@0x9abc:16"
-gdb_test "x" "cmp.b\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"cmp.b @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@er1" \
-	"cmp.b @0x12345678:32,@er1"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x3(:2|),er1\\)" \
-	"cmp.b @0x12345678:32,@(0x3:2,er1)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@-er1" \
-	"cmp.b @0x12345678:32,@-er1"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@er1\\+" \
-	"cmp.b @0x12345678:32,@er1+"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@er1-" \
-	"cmp.b @0x12345678:32,@er1-"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\+er1" \
-	"cmp.b @0x12345678:32,@+er1"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.b @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.b @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.b @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.b @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.b @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.b @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.b @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"cmp.b @0x12345678:32,@0x9abc:16"
-gdb_test "x" "cmp.b\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"cmp.b @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t#0x1234(:16|),r1" \
-	"cmp.w #0x1234:16,r1"
-gdb_test "x" "cmp.w\t#0x7(:3|),r2" \
-	"cmp.w #0x7:3,r2"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@er1" \
-	"cmp.w #0x1234:16,@er1"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"cmp.w #0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@er1\\+" \
-	"cmp.w #0x1234:16,@er1+"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@-er1" \
-	"cmp.w #0x1234:16,@-er1"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\+er1" \
-	"cmp.w #0x1234:16,@+er1"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@er1-" \
-	"cmp.w #0x1234:16,@er1-"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@0x9abc(:16|)" \
-	"cmp.w #0x1234:16,@0x9abc:16"
-gdb_test "x" "cmp.w\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"cmp.w #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t#0x7(:3|),@er1" \
-	"cmp.w #0x7:3,@er1"
-gdb_test "x" "cmp.w\t#0x7(:3|),@0x1234(:16|)" \
-	"cmp.w #0x7:3,@0x1234:16"
-gdb_test "x" "cmp.w\t#0x7(:3|),@0x12345678(:32|)" \
-	"cmp.w #0x7:3,@0x12345678:32"
-gdb_test "x" "cmp.w\tr3,r1" \
-	"cmp.w r3,r1"
-gdb_test "x" "cmp.w\tr3,@er1" \
-	"cmp.w r3,@er1"
-gdb_test "x" "cmp.w\tr3,@\\(0x6(:2|),er1\\)" \
-	"cmp.w r3,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\tr3,@er1\\+" \
-	"cmp.w r3,@er1+"
-gdb_test "x" "cmp.w\tr3,@-er1" \
-	"cmp.w r3,@-er1"
-gdb_test "x" "cmp.w\tr3,@\\+er1" \
-	"cmp.w r3,@+er1"
-gdb_test "x" "cmp.w\tr3,@er1-" \
-	"cmp.w r3,@er1-"
-gdb_test "x" "cmp.w\tr3,@\\(0x1234(:16|),er1\\)" \
-	"cmp.w r3,@(0x1234:16,er1)"
-gdb_test "x" "cmp.w\tr3,@\\(0x12345678(:32|),er1\\)" \
-	"cmp.w r3,@(0x12345678:32,er1)"
-gdb_test "x" "cmp.w\tr3,@\\(0x1234(:16|),r2l.b\\)" \
-	"cmp.w r3,@(0x1234:16,r2l.b)"
-gdb_test "x" "cmp.w\tr3,@\\(0x1234(:16|),r2.w\\)" \
-	"cmp.w r3,@(0x1234:16,r2.w)"
-gdb_test "x" "cmp.w\tr3,@\\(0x1234(:16|),er2.l\\)" \
-	"cmp.w r3,@(0x1234:16,er2.l)"
-gdb_test "x" "cmp.w\tr3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"cmp.w r3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "cmp.w\tr3,@\\(0x12345678(:32|),r2.w\\)" \
-	"cmp.w r3,@(0x12345678:32,r2.w)"
-gdb_test "x" "cmp.w\tr3,@\\(0x12345678(:32|),er2.l\\)" \
-	"cmp.w r3,@(0x12345678:32,er2.l)"
-gdb_test "x" "cmp.w\tr3,@0x1234(:16|)" \
-	"cmp.w r3,@0x1234:16"
-gdb_test "x" "cmp.w\tr3,@0x12345678(:32|)" \
-	"cmp.w r3,@0x12345678:32"
-gdb_test "x" "cmp.w\t@er3,r1" \
-	"cmp.w @er3,r1"
-gdb_test "x" "cmp.w\t@\\(0x6(:2|),er3\\),r1" \
-	"cmp.w @(0x6:2,er3),r1"
-gdb_test "x" "cmp.w\t@er3\\+,r1" \
-	"cmp.w @er3+,r1"
-gdb_test "x" "cmp.w\t@-er3,r1" \
-	"cmp.w @-er3,r1"
-gdb_test "x" "cmp.w\t@\\+er3,r1" \
-	"cmp.w @+er3,r1"
-gdb_test "x" "cmp.w\t@er3-,r1" \
-	"cmp.w @er3-,r1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er1\\),r1" \
-	"cmp.w @(0x1234:16,er1),r1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er1\\),r1" \
-	"cmp.w @(0x12345678:32,er1),r1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r2l.b\\),r1" \
-	"cmp.w @(0x1234:16,r2l.b),r1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r2.w\\),r1" \
-	"cmp.w @(0x1234:16,r2.w),r1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er2.l\\),r1" \
-	"cmp.w @(0x1234:16,er2.l),r1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r2l.b\\),r1" \
-	"cmp.w @(0x12345678:32,r2l.b),r1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r2.w\\),r1" \
-	"cmp.w @(0x12345678:32,r2.w),r1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er2.l\\),r1" \
-	"cmp.w @(0x12345678:32,er2.l),r1"
-gdb_test "x" "cmp.w\t@0x1234(:16|),r1" \
-	"cmp.w @0x1234:16,r1"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),r1" \
-	"cmp.w @0x12345678:32,r1"
-gdb_test "x" "cmp.w\t@er3,@er1" \
-	"cmp.w @er3,@er1"
-gdb_test "x" "cmp.w\t@er3,@\\(0x6(:2|),er1\\)" \
-	"cmp.w @er3,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@er3,@-er1" \
-	"cmp.w @er3,@-er1"
-gdb_test "x" "cmp.w\t@er3,@er1\\+" \
-	"cmp.w @er3,@er1+"
-gdb_test "x" "cmp.w\t@er3,@er1-" \
-	"cmp.w @er3,@er1-"
-gdb_test "x" "cmp.w\t@er3,@\\+er1" \
-	"cmp.w @er3,@+er1"
-gdb_test "x" "cmp.w\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@er3,@0x9abc(:16|)" \
-	"cmp.w @er3,@0x9abc:16"
-gdb_test "x" "cmp.w\t@er3,@0x9abcdef0(:32|)" \
-	"cmp.w @er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@-er3,@er1" \
-	"cmp.w @-er3,@er1"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x6(:2|),er1\\)" \
-	"cmp.w @-er3,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@-er3,@-er1" \
-	"cmp.w @-er3,@-er1"
-gdb_test "x" "cmp.w\t@-er3,@er1\\+" \
-	"cmp.w @-er3,@er1+"
-gdb_test "x" "cmp.w\t@-er3,@er1-" \
-	"cmp.w @-er3,@er1-"
-gdb_test "x" "cmp.w\t@-er3,@\\+er1" \
-	"cmp.w @-er3,@+er1"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@-er3,@0x9abc(:16|)" \
-	"cmp.w @-er3,@0x9abc:16"
-gdb_test "x" "cmp.w\t@-er3,@0x9abcdef0(:32|)" \
-	"cmp.w @-er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@er3\\+,@er1" \
-	"cmp.w @er3+,@er1"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x6(:2|),er1\\)" \
-	"cmp.w @er3+,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@er3\\+,@-er1" \
-	"cmp.w @er3+,@-er1"
-gdb_test "x" "cmp.w\t@er3\\+,@er1\\+" \
-	"cmp.w @er3+,@er1+"
-gdb_test "x" "cmp.w\t@er3\\+,@er1-" \
-	"cmp.w @er3+,@er1-"
-gdb_test "x" "cmp.w\t@er3\\+,@\\+er1" \
-	"cmp.w @er3+,@+er1"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@er3\\+,@0x9abc(:16|)" \
-	"cmp.w @er3+,@0x9abc:16"
-gdb_test "x" "cmp.w\t@er3\\+,@0x9abcdef0(:32|)" \
-	"cmp.w @er3+,@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@er3-,@er1" \
-	"cmp.w @er3-,@er1"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x6(:2|),er1\\)" \
-	"cmp.w @er3-,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@er3-,@-er1" \
-	"cmp.w @er3-,@-er1"
-gdb_test "x" "cmp.w\t@er3-,@er1\\+" \
-	"cmp.w @er3-,@er1+"
-gdb_test "x" "cmp.w\t@er3-,@er1-" \
-	"cmp.w @er3-,@er1-"
-gdb_test "x" "cmp.w\t@er3-,@\\+er1" \
-	"cmp.w @er3-,@+er1"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@er3-,@0x9abc(:16|)" \
-	"cmp.w @er3-,@0x9abc:16"
-gdb_test "x" "cmp.w\t@er3-,@0x9abcdef0(:32|)" \
-	"cmp.w @er3-,@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\+er3,@er1" \
-	"cmp.w @+er3,@er1"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x6(:2|),er1\\)" \
-	"cmp.w @+er3,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\+er3,@-er1" \
-	"cmp.w @+er3,@-er1"
-gdb_test "x" "cmp.w\t@\\+er3,@er1\\+" \
-	"cmp.w @+er3,@er1+"
-gdb_test "x" "cmp.w\t@\\+er3,@er1-" \
-	"cmp.w @+er3,@er1-"
-gdb_test "x" "cmp.w\t@\\+er3,@\\+er1" \
-	"cmp.w @+er3,@+er1"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\+er3,@0x9abc(:16|)" \
-	"cmp.w @+er3,@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\+er3,@0x9abcdef0(:32|)" \
-	"cmp.w @+er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@er1" \
-	"cmp.w @(0x1234:16,er3),@er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"cmp.w @(0x1234:16,er3),@-er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"cmp.w @(0x1234:16,er3),@er1+"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"cmp.w @(0x1234:16,er3),@er1-"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"cmp.w @(0x1234:16,er3),@+er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"cmp.w @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"cmp.w @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"cmp.w @(0x12345678:32,er3),@er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"cmp.w @(0x12345678:32,er3),@-er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"cmp.w @(0x12345678:32,er3),@er1+"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"cmp.w @(0x12345678:32,er3),@er1-"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"cmp.w @(0x12345678:32,er3),@+er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"cmp.w @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"cmp.w @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"cmp.w @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"cmp.w @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"cmp.w @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"cmp.w @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"cmp.w @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"cmp.w @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"cmp.w @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"cmp.w @(0x1234:16,r3.w),@er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"cmp.w @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"cmp.w @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"cmp.w @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"cmp.w @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"cmp.w @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"cmp.w @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"cmp.w @(0x1234:16,er3.l),@er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"cmp.w @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"cmp.w @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"cmp.w @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"cmp.w @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"cmp.w @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"cmp.w @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"cmp.w @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"cmp.w @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"cmp.w @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"cmp.w @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"cmp.w @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"cmp.w @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"cmp.w @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"cmp.w @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"cmp.w @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"cmp.w @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"cmp.w @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"cmp.w @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"cmp.w @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"cmp.w @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"cmp.w @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"cmp.w @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"cmp.w @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"cmp.w @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"cmp.w @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"cmp.w @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "cmp.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"cmp.w @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@er1" \
-	"cmp.w @0x1234:16,@er1"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@-er1" \
-	"cmp.w @0x1234:16,@-er1"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@er1\\+" \
-	"cmp.w @0x1234:16,@er1+"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@er1-" \
-	"cmp.w @0x1234:16,@er1-"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\+er1" \
-	"cmp.w @0x1234:16,@+er1"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@0x9abc(:16|)" \
-	"cmp.w @0x1234:16,@0x9abc:16"
-gdb_test "x" "cmp.w\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"cmp.w @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@er1" \
-	"cmp.w @0x12345678:32,@er1"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x6(:2|),er1\\)" \
-	"cmp.w @0x12345678:32,@(0x6:2,er1)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@-er1" \
-	"cmp.w @0x12345678:32,@-er1"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@er1\\+" \
-	"cmp.w @0x12345678:32,@er1+"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@er1-" \
-	"cmp.w @0x12345678:32,@er1-"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\+er1" \
-	"cmp.w @0x12345678:32,@+er1"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.w @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.w @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.w @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.w @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.w @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.w @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.w @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"cmp.w @0x12345678:32,@0x9abc:16"
-gdb_test "x" "cmp.w\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"cmp.w @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),er1" \
-	"cmp.l #0x12345678:32,er1"
-gdb_test "x" "cmp.l\t#0x1234(:16|),er1" \
-	"cmp.l #0x1234:16,er1"
-gdb_test "x" "cmp.l\t#0x7(:3|),er2" \
-	"cmp.l #0x7:3,er2"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@er1" \
-	"cmp.l #0x12345678:32,@er1"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"cmp.l #0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@er1\\+" \
-	"cmp.l #0x12345678:32,@er1+"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@-er1" \
-	"cmp.l #0x12345678:32,@-er1"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\+er1" \
-	"cmp.l #0x12345678:32,@+er1"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@er1-" \
-	"cmp.l #0x12345678:32,@er1-"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l #0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l #0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l #0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l #0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l #0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l #0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l #0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@0x9abc(:16|)" \
-	"cmp.l #0x12345678:32,@0x9abc:16"
-gdb_test "x" "cmp.l\t#0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"cmp.l #0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@er1" \
-	"cmp.l #0x1234:16,@er1"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"cmp.l #0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@er1\\+" \
-	"cmp.l #0x1234:16,@er1+"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@-er1" \
-	"cmp.l #0x1234:16,@-er1"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\+er1" \
-	"cmp.l #0x1234:16,@+er1"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@er1-" \
-	"cmp.l #0x1234:16,@er1-"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@0x9abc(:16|)" \
-	"cmp.l #0x1234:16,@0x9abc:16"
-gdb_test "x" "cmp.l\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"cmp.l #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\ter3,er1" \
-	"cmp.l er3,er1"
-gdb_test "x" "cmp.l\ter3,@er1" \
-	"cmp.l er3,@er1"
-gdb_test "x" "cmp.l\ter3,@\\(0xc(:2|),er1\\)" \
-	"cmp.l er3,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\ter3,@er1\\+" \
-	"cmp.l er3,@er1+"
-gdb_test "x" "cmp.l\ter3,@-er1" \
-	"cmp.l er3,@-er1"
-gdb_test "x" "cmp.l\ter3,@\\+er1" \
-	"cmp.l er3,@+er1"
-gdb_test "x" "cmp.l\ter3,@er1-" \
-	"cmp.l er3,@er1-"
-gdb_test "x" "cmp.l\ter3,@\\(0x1234(:16|),er1\\)" \
-	"cmp.l er3,@(0x1234:16,er1)"
-gdb_test "x" "cmp.l\ter3,@\\(0x12345678(:32|),er1\\)" \
-	"cmp.l er3,@(0x12345678:32,er1)"
-gdb_test "x" "cmp.l\ter3,@\\(0x1234(:16|),r2l.b\\)" \
-	"cmp.l er3,@(0x1234:16,r2l.b)"
-gdb_test "x" "cmp.l\ter3,@\\(0x1234(:16|),r2.w\\)" \
-	"cmp.l er3,@(0x1234:16,r2.w)"
-gdb_test "x" "cmp.l\ter3,@\\(0x1234(:16|),er2.l\\)" \
-	"cmp.l er3,@(0x1234:16,er2.l)"
-gdb_test "x" "cmp.l\ter3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"cmp.l er3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "cmp.l\ter3,@\\(0x12345678(:32|),r2.w\\)" \
-	"cmp.l er3,@(0x12345678:32,r2.w)"
-gdb_test "x" "cmp.l\ter3,@\\(0x12345678(:32|),er2.l\\)" \
-	"cmp.l er3,@(0x12345678:32,er2.l)"
-gdb_test "x" "cmp.l\ter3,@0x1234(:16|)" \
-	"cmp.l er3,@0x1234:16"
-gdb_test "x" "cmp.l\ter3,@0x12345678(:32|)" \
-	"cmp.l er3,@0x12345678:32"
-gdb_test "x" "cmp.l\t@er3,er1" \
-	"cmp.l @er3,er1"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),er1" \
-	"cmp.l @(0xc:2,er3),er1"
-gdb_test "x" "cmp.l\t@er3\\+,er1" \
-	"cmp.l @er3+,er1"
-gdb_test "x" "cmp.l\t@-er3,er1" \
-	"cmp.l @-er3,er1"
-gdb_test "x" "cmp.l\t@\\+er3,er1" \
-	"cmp.l @+er3,er1"
-gdb_test "x" "cmp.l\t@er3-,er1" \
-	"cmp.l @er3-,er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er1\\),er1" \
-	"cmp.l @(0x1234:16,er1),er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er1\\),er1" \
-	"cmp.l @(0x12345678:32,er1),er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r2l.b\\),er1" \
-	"cmp.l @(0x1234:16,r2l.b),er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r2.w\\),er1" \
-	"cmp.l @(0x1234:16,r2.w),er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er2.l\\),er1" \
-	"cmp.l @(0x1234:16,er2.l),er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r2l.b\\),er1" \
-	"cmp.l @(0x12345678:32,r2l.b),er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r2.w\\),er1" \
-	"cmp.l @(0x12345678:32,r2.w),er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er2.l\\),er1" \
-	"cmp.l @(0x12345678:32,er2.l),er1"
-gdb_test "x" "cmp.l\t@0x1234(:16|),er1" \
-	"cmp.l @0x1234:16,er1"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),er1" \
-	"cmp.l @0x12345678:32,er1"
-gdb_test "x" "cmp.l\t@er3,@er1" \
-	"cmp.l @er3,@er1"
-gdb_test "x" "cmp.l\t@er3,@\\(0xc(:2|),er1\\)" \
-	"cmp.l @er3,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@er3,@-er1" \
-	"cmp.l @er3,@-er1"
-gdb_test "x" "cmp.l\t@er3,@er1\\+" \
-	"cmp.l @er3,@er1+"
-gdb_test "x" "cmp.l\t@er3,@er1-" \
-	"cmp.l @er3,@er1-"
-gdb_test "x" "cmp.l\t@er3,@\\+er1" \
-	"cmp.l @er3,@+er1"
-gdb_test "x" "cmp.l\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@er3,@0x9abc(:16|)" \
-	"cmp.l @er3,@0x9abc:16"
-gdb_test "x" "cmp.l\t@er3,@0x9abcdef0(:32|)" \
-	"cmp.l @er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@er1" \
-	"cmp.l @(0xc:2,er3),@er1"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0xc:2,er3),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@-er1" \
-	"cmp.l @(0xc:2,er3),@-er1"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@er1\\+" \
-	"cmp.l @(0xc:2,er3),@er1+"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@er1-" \
-	"cmp.l @(0xc:2,er3),@er1-"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\+er1" \
-	"cmp.l @(0xc:2,er3),@+er1"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0xc:2,er3),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0xc:2,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0xc:2,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0xc:2,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0xc:2,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@0x9abc(:16|)" \
-	"cmp.l @(0xc:2,er3),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0xc(:2|),er3\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0xc:2,er3),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@-er3,@er1" \
-	"cmp.l @-er3,@er1"
-gdb_test "x" "cmp.l\t@-er3,@\\(0xc(:2|),er1\\)" \
-	"cmp.l @-er3,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@-er3,@-er1" \
-	"cmp.l @-er3,@-er1"
-gdb_test "x" "cmp.l\t@-er3,@er1\\+" \
-	"cmp.l @-er3,@er1+"
-gdb_test "x" "cmp.l\t@-er3,@er1-" \
-	"cmp.l @-er3,@er1-"
-gdb_test "x" "cmp.l\t@-er3,@\\+er1" \
-	"cmp.l @-er3,@+er1"
-gdb_test "x" "cmp.l\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@-er3,@0x9abc(:16|)" \
-	"cmp.l @-er3,@0x9abc:16"
-gdb_test "x" "cmp.l\t@-er3,@0x9abcdef0(:32|)" \
-	"cmp.l @-er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@er3\\+,@er1" \
-	"cmp.l @er3+,@er1"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0xc(:2|),er1\\)" \
-	"cmp.l @er3+,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@er3\\+,@-er1" \
-	"cmp.l @er3+,@-er1"
-gdb_test "x" "cmp.l\t@er3\\+,@er1\\+" \
-	"cmp.l @er3+,@er1+"
-gdb_test "x" "cmp.l\t@er3\\+,@er1-" \
-	"cmp.l @er3+,@er1-"
-gdb_test "x" "cmp.l\t@er3\\+,@\\+er1" \
-	"cmp.l @er3+,@+er1"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@er3\\+,@0x9abc(:16|)" \
-	"cmp.l @er3+,@0x9abc:16"
-gdb_test "x" "cmp.l\t@er3\\+,@0x9abcdef0(:32|)" \
-	"cmp.l @er3+,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@er3-,@er1" \
-	"cmp.l @er3-,@er1"
-gdb_test "x" "cmp.l\t@er3-,@\\(0xc(:2|),er1\\)" \
-	"cmp.l @er3-,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@er3-,@-er1" \
-	"cmp.l @er3-,@-er1"
-gdb_test "x" "cmp.l\t@er3-,@er1\\+" \
-	"cmp.l @er3-,@er1+"
-gdb_test "x" "cmp.l\t@er3-,@er1-" \
-	"cmp.l @er3-,@er1-"
-gdb_test "x" "cmp.l\t@er3-,@\\+er1" \
-	"cmp.l @er3-,@+er1"
-gdb_test "x" "cmp.l\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@er3-,@0x9abc(:16|)" \
-	"cmp.l @er3-,@0x9abc:16"
-gdb_test "x" "cmp.l\t@er3-,@0x9abcdef0(:32|)" \
-	"cmp.l @er3-,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\+er3,@er1" \
-	"cmp.l @+er3,@er1"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0xc(:2|),er1\\)" \
-	"cmp.l @+er3,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\+er3,@-er1" \
-	"cmp.l @+er3,@-er1"
-gdb_test "x" "cmp.l\t@\\+er3,@er1\\+" \
-	"cmp.l @+er3,@er1+"
-gdb_test "x" "cmp.l\t@\\+er3,@er1-" \
-	"cmp.l @+er3,@er1-"
-gdb_test "x" "cmp.l\t@\\+er3,@\\+er1" \
-	"cmp.l @+er3,@+er1"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\+er3,@0x9abc(:16|)" \
-	"cmp.l @+er3,@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\+er3,@0x9abcdef0(:32|)" \
-	"cmp.l @+er3,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@er1" \
-	"cmp.l @(0x1234:16,er3),@er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0x1234:16,er3),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"cmp.l @(0x1234:16,er3),@-er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"cmp.l @(0x1234:16,er3),@er1+"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"cmp.l @(0x1234:16,er3),@er1-"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"cmp.l @(0x1234:16,er3),@+er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"cmp.l @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"cmp.l @(0x12345678:32,er3),@er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"cmp.l @(0x12345678:32,er3),@-er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"cmp.l @(0x12345678:32,er3),@er1+"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"cmp.l @(0x12345678:32,er3),@er1-"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"cmp.l @(0x12345678:32,er3),@+er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"cmp.l @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"cmp.l @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"cmp.l @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"cmp.l @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"cmp.l @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"cmp.l @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"cmp.l @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"cmp.l @(0x1234:16,r3.w),@er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"cmp.l @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"cmp.l @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"cmp.l @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"cmp.l @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"cmp.l @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"cmp.l @(0x1234:16,er3.l),@er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"cmp.l @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"cmp.l @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"cmp.l @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"cmp.l @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"cmp.l @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"cmp.l @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"cmp.l @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"cmp.l @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"cmp.l @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"cmp.l @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"cmp.l @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"cmp.l @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"cmp.l @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"cmp.l @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"cmp.l @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"cmp.l @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"cmp.l @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"cmp.l @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"cmp.l @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"cmp.l @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"cmp.l @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"cmp.l @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"cmp.l @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "cmp.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"cmp.l @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@er1" \
-	"cmp.l @0x1234:16,@er1"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@-er1" \
-	"cmp.l @0x1234:16,@-er1"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@er1\\+" \
-	"cmp.l @0x1234:16,@er1+"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@er1-" \
-	"cmp.l @0x1234:16,@er1-"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\+er1" \
-	"cmp.l @0x1234:16,@+er1"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@0x9abc(:16|)" \
-	"cmp.l @0x1234:16,@0x9abc:16"
-gdb_test "x" "cmp.l\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"cmp.l @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@er1" \
-	"cmp.l @0x12345678:32,@er1"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"cmp.l @0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@-er1" \
-	"cmp.l @0x12345678:32,@-er1"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@er1\\+" \
-	"cmp.l @0x12345678:32,@er1+"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@er1-" \
-	"cmp.l @0x12345678:32,@er1-"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\+er1" \
-	"cmp.l @0x12345678:32,@+er1"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"cmp.l @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"cmp.l @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"cmp.l @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"cmp.l @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"cmp.l @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"cmp.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"cmp.l @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"cmp.l @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"cmp.l @0x12345678:32,@0x9abc:16"
-gdb_test "x" "cmp.l\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"cmp.l @0x12345678:32,@0x9abcdef0:32"
diff --git a/gdb/testsuite/gdb.disasm/t05_cmp.s b/gdb/testsuite/gdb.disasm/t05_cmp.s
deleted file mode 100644
index eef3359de70..00000000000
--- a/gdb/testsuite/gdb.disasm/t05_cmp.s
+++ /dev/null
@@ -1,921 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;arith_1

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    cmp.b @er3,@er1                                ;7c350120

-    cmp.b @er3,@(3:2,er1)                          ;7c353120

-    cmp.b @er3,@-er1                               ;7c35b120

-    cmp.b @er3,@er1+                               ;7c358120

-    cmp.b @er3,@er1-                               ;7c35a120

-    cmp.b @er3,@+er1                               ;7c359120

-    cmp.b @er3,@(0xffff9abc:16,er1)                ;7c35c1209abc

-    cmp.b @er3,@(0x9abcdef0:32,er1)                ;7c35c9209abcdef0

-    cmp.b @er3,@(0xffff9abc:16,r2l.b)              ;7c35d2209abc

-    cmp.b @er3,@(0xffff9abc:16,r2.w)              ;7c35e2209abc

-    cmp.b @er3,@(0xffff9abc:16,er2.l)              ;7c35f2209abc

-    cmp.b @er3,@(0x9abcdef0:32,r2l.b)              ;7c35da209abcdef0

-    cmp.b @er3,@(0x9abcdef0:32,r2.w)              ;7c35ea209abcdef0

-    cmp.b @er3,@(0x9abcdef0:32,er2.l)              ;7c35fa209abcdef0

-    cmp.b @er3,@0xffff9abc:16                      ;7c3540209abc

-    cmp.b @er3,@0x9abcdef0:32                      ;7c3548209abcdef0

-

-    cmp.b @-er3,@er1                               ;01776c3c0120

-    cmp.b @-er3,@(3:2,er1)                         ;01776c3c3120

-    cmp.b @-er3,@-er1                              ;01776c3cb120

-    cmp.b @-er3,@er1+                              ;01776c3c8120

-    cmp.b @-er3,@er1-                              ;01776c3ca120

-    cmp.b @-er3,@+er1                              ;01776c3c9120

-    cmp.b @-er3,@(0xffff9abc:16,er1)               ;01776c3cc1209abc

-    cmp.b @-er3,@(0x9abcdef0:32,er1)               ;01776c3cc9209abcdef0

-    cmp.b @-er3,@(0xffff9abc:16,r2l.b)             ;01776c3cd2209abc

-    cmp.b @-er3,@(0xffff9abc:16,r2.w)             ;01776c3ce2209abc

-    cmp.b @-er3,@(0xffff9abc:16,er2.l)             ;01776c3cf2209abc

-    cmp.b @-er3,@(0x9abcdef0:32,r2l.b)             ;01776c3cda209abcdef0

-    cmp.b @-er3,@(0x9abcdef0:32,r2.w)             ;01776c3cea209abcdef0

-    cmp.b @-er3,@(0x9abcdef0:32,er2.l)             ;01776c3cfa209abcdef0

-    cmp.b @-er3,@0xffff9abc:16                     ;01776c3c40209abc

-    cmp.b @-er3,@0x9abcdef0:32                     ;01776c3c48209abcdef0

-

-    cmp.b @er3+,@er1                               ;01746c3c0120

-    cmp.b @er3+,@(3:2,er1)                         ;01746c3c3120

-    cmp.b @er3+,@-er1                              ;01746c3cb120

-    cmp.b @er3+,@er1+                              ;01746c3c8120

-    cmp.b @er3+,@er1-                              ;01746c3ca120

-    cmp.b @er3+,@+er1                              ;01746c3c9120

-    cmp.b @er3+,@(0xffff9abc:16,er1)               ;01746c3cc1209abc

-    cmp.b @er3+,@(0x9abcdef0:32,er1)               ;01746c3cc9209abcdef0

-    cmp.b @er3+,@(0xffff9abc:16,r2l.b)             ;01746c3cd2209abc

-    cmp.b @er3+,@(0xffff9abc:16,r2.w)             ;01746c3ce2209abc

-    cmp.b @er3+,@(0xffff9abc:16,er2.l)             ;01746c3cf2209abc

-    cmp.b @er3+,@(0x9abcdef0:32,r2l.b)             ;01746c3cda209abcdef0

-    cmp.b @er3+,@(0x9abcdef0:32,r2.w)             ;01746c3cea209abcdef0

-    cmp.b @er3+,@(0x9abcdef0:32,er2.l)             ;01746c3cfa209abcdef0

-    cmp.b @er3+,@0xffff9abc:16                     ;01746c3c40209abc

-    cmp.b @er3+,@0x9abcdef0:32                     ;01746c3c48209abcdef0

-

-    cmp.b @er3-,@er1                               ;01766c3c0120

-    cmp.b @er3-,@(3:2,er1)                         ;01766c3c3120

-    cmp.b @er3-,@-er1                              ;01766c3cb120

-    cmp.b @er3-,@er1+                              ;01766c3c8120

-    cmp.b @er3-,@er1-                              ;01766c3ca120

-    cmp.b @er3-,@+er1                              ;01766c3c9120

-    cmp.b @er3-,@(0xffff9abc:16,er1)               ;01766c3cc1209abc

-    cmp.b @er3-,@(0x9abcdef0:32,er1)               ;01766c3cc9209abcdef0

-    cmp.b @er3-,@(0xffff9abc:16,r2l.b)             ;01766c3cd2209abc

-    cmp.b @er3-,@(0xffff9abc:16,r2.w)             ;01766c3ce2209abc

-    cmp.b @er3-,@(0xffff9abc:16,er2.l)             ;01766c3cf2209abc

-    cmp.b @er3-,@(0x9abcdef0:32,r2l.b)             ;01766c3cda209abcdef0

-    cmp.b @er3-,@(0x9abcdef0:32,r2.w)             ;01766c3cea209abcdef0

-    cmp.b @er3-,@(0x9abcdef0:32,er2.l)             ;01766c3cfa209abcdef0

-    cmp.b @er3-,@0xffff9abc:16                     ;01766c3c40209abc

-    cmp.b @er3-,@0x9abcdef0:32                     ;01766c3c48209abcdef0

-

-    cmp.b @+er3,@er1                               ;01756c3c0120

-    cmp.b @+er3,@(3:2,er1)                         ;01756c3c3120

-    cmp.b @+er3,@-er1                              ;01756c3cb120

-    cmp.b @+er3,@er1+                              ;01756c3c8120

-    cmp.b @+er3,@er1-                              ;01756c3ca120

-    cmp.b @+er3,@+er1                              ;01756c3c9120

-    cmp.b @+er3,@(0xffff9abc:16,er1)               ;01756c3cc1209abc

-    cmp.b @+er3,@(0x9abcdef0:32,er1)               ;01756c3cc9209abcdef0

-    cmp.b @+er3,@(0xffff9abc:16,r2l.b)             ;01756c3cd2209abc

-    cmp.b @+er3,@(0xffff9abc:16,r2.w)             ;01756c3ce2209abc

-    cmp.b @+er3,@(0xffff9abc:16,er2.l)             ;01756c3cf2209abc

-    cmp.b @+er3,@(0x9abcdef0:32,r2l.b)             ;01756c3cda209abcdef0

-    cmp.b @+er3,@(0x9abcdef0:32,r2.w)             ;01756c3cea209abcdef0

-    cmp.b @+er3,@(0x9abcdef0:32,er2.l)             ;01756c3cfa209abcdef0

-    cmp.b @+er3,@0xffff9abc:16                     ;01756c3c40209abc

-    cmp.b @+er3,@0x9abcdef0:32                     ;01756c3c48209abcdef0

-

-    cmp.b @(0x1234:16,er3),@er1                         ;01746e3c12340120

-    cmp.b @(0x1234:16,er3),@(3:2,er1)                   ;01746e3c12343120

-    cmp.b @(0x1234:16,er3),@-er1                        ;01746e3c1234b120

-    cmp.b @(0x1234:16,er3),@er1+                        ;01746e3c12348120

-    cmp.b @(0x1234:16,er3),@er1-                        ;01746e3c1234a120

-    cmp.b @(0x1234:16,er3),@+er1                        ;01746e3c12349120

-    cmp.b @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01746e3c1234c1209abc

-    cmp.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01746e3c1234c9209abcdef0

-    cmp.b @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01746e3c1234d2209abc

-    cmp.b @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01746e3c1234e2209abc

-    cmp.b @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01746e3c1234f2209abc

-    cmp.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01746e3c1234da209abcdef0

-    cmp.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01746e3c1234ea209abcdef0

-    cmp.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01746e3c1234fa209abcdef0

-    cmp.b @(0x1234:16,er3),@0xffff9abc:16               ;01746e3c123440209abc

-    cmp.b @(0x1234:16,er3),@0x9abcdef0:32               ;01746e3c123448209abcdef0

-

-    cmp.b @(0x12345678:32,er3),@er1                         ;78346a2c123456780120

-    cmp.b @(0x12345678:32,er3),@(3:2,er1)                   ;78346a2c123456783120

-    cmp.b @(0x12345678:32,er3),@-er1                        ;78346a2c12345678b120

-    cmp.b @(0x12345678:32,er3),@er1+                        ;78346a2c123456788120

-    cmp.b @(0x12345678:32,er3),@er1-                        ;78346a2c12345678a120

-    cmp.b @(0x12345678:32,er3),@+er1                        ;78346a2c123456789120

-    cmp.b @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346a2c12345678c1209abc

-    cmp.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346a2c12345678c9209abcdef0

-    cmp.b @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346a2c12345678d2209abc

-    cmp.b @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346a2c12345678e2209abc

-    cmp.b @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346a2c12345678f2209abc

-    cmp.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346a2c12345678da209abcdef0

-    cmp.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346a2c12345678ea209abcdef0

-    cmp.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346a2c12345678fa209abcdef0

-    cmp.b @(0x12345678:32,er3),@0xffff9abc:16               ;78346a2c1234567840209abc

-    cmp.b @(0x12345678:32,er3),@0x9abcdef0:32               ;78346a2c1234567848209abcdef0

-

-    cmp.b @(0x1234:16,r3l.b),@er1                       ;01756e3c12340120

-    cmp.b @(0x1234:16,r3l.b),@(3:2,er1)                 ;01756e3c12343120

-    cmp.b @(0x1234:16,r3l.b),@-er1                      ;01756e3c1234b120

-    cmp.b @(0x1234:16,r3l.b),@er1+                      ;01756e3c12348120

-    cmp.b @(0x1234:16,r3l.b),@er1-                      ;01756e3c1234a120

-    cmp.b @(0x1234:16,r3l.b),@+er1                      ;01756e3c12349120

-    cmp.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01756e3c1234c1209abc

-    cmp.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01756e3c1234c9209abcdef0

-    cmp.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01756e3c1234d2209abc

-    cmp.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01756e3c1234e2209abc

-    cmp.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01756e3c1234f2209abc

-    cmp.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01756e3c1234da209abcdef0

-    cmp.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01756e3c1234ea209abcdef0

-    cmp.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01756e3c1234fa209abcdef0

-    cmp.b @(0x1234:16,r3l.b),@0xffff9abc:16             ;01756e3c123440209abc

-    cmp.b @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01756e3c123448209abcdef0

-

-    cmp.b @(0x1234:16,r3.w),@er1                       ;01766e3c12340120

-    cmp.b @(0x1234:16,r3.w),@(3:2,er1)                 ;01766e3c12343120

-    cmp.b @(0x1234:16,r3.w),@-er1                      ;01766e3c1234b120

-    cmp.b @(0x1234:16,r3.w),@er1+                      ;01766e3c12348120

-    cmp.b @(0x1234:16,r3.w),@er1-                      ;01766e3c1234a120

-    cmp.b @(0x1234:16,r3.w),@+er1                      ;01766e3c12349120

-    cmp.b @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01766e3c1234c1209abc

-    cmp.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01766e3c1234c9209abcdef0

-    cmp.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01766e3c1234d2209abc

-    cmp.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01766e3c1234e2209abc

-    cmp.b @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01766e3c1234f2209abc

-    cmp.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01766e3c1234da209abcdef0

-    cmp.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01766e3c1234ea209abcdef0

-    cmp.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01766e3c1234fa209abcdef0

-    cmp.b @(0x1234:16,r3.w),@0xffff9abc:16             ;01766e3c123440209abc

-    cmp.b @(0x1234:16,r3.w),@0x9abcdef0:32             ;01766e3c123448209abcdef0

-

-    cmp.b @(0x1234:16,er3.l),@er1                       ;01776e3c12340120

-    cmp.b @(0x1234:16,er3.l),@(3:2,er1)                 ;01776e3c12343120

-    cmp.b @(0x1234:16,er3.l),@-er1                      ;01776e3c1234b120

-    cmp.b @(0x1234:16,er3.l),@er1+                      ;01776e3c12348120

-    cmp.b @(0x1234:16,er3.l),@er1-                      ;01776e3c1234a120

-    cmp.b @(0x1234:16,er3.l),@+er1                      ;01776e3c12349120

-    cmp.b @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01776e3c1234c1209abc

-    cmp.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01776e3c1234c9209abcdef0

-    cmp.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01776e3c1234d2209abc

-    cmp.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01776e3c1234e2209abc

-    cmp.b @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01776e3c1234f2209abc

-    cmp.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01776e3c1234da209abcdef0

-    cmp.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01776e3c1234ea209abcdef0

-    cmp.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01776e3c1234fa209abcdef0

-    cmp.b @(0x1234:16,er3.l),@0xffff9abc:16             ;01776e3c123440209abc

-    cmp.b @(0x1234:16,er3.l),@0x9abcdef0:32             ;01776e3c123448209abcdef0

-

-    cmp.b @(0x12345678:32,r3l.b),@er1                       ;78356a2c123456780120

-    cmp.b @(0x12345678:32,r3l.b),@(3:2,er1)                 ;78356a2c123456783120

-    cmp.b @(0x12345678:32,r3l.b),@-er1                      ;78356a2c12345678b120

-    cmp.b @(0x12345678:32,r3l.b),@er1+                      ;78356a2c123456788120

-    cmp.b @(0x12345678:32,r3l.b),@er1-                      ;78356a2c12345678a120

-    cmp.b @(0x12345678:32,r3l.b),@+er1                      ;78356a2c123456789120

-    cmp.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356a2c12345678c1209abc

-    cmp.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356a2c12345678c9209abcdef0

-    cmp.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356a2c12345678d2209abc

-    cmp.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356a2c12345678e2209abc

-    cmp.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356a2c12345678f2209abc

-    cmp.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356a2c12345678da209abcdef0

-    cmp.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356a2c12345678ea209abcdef0

-    cmp.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356a2c12345678fa209abcdef0

-    cmp.b @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356a2c1234567840209abc

-    cmp.b @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356a2c1234567848209abcdef0

-

-    cmp.b @(0x12345678:32,r3.w),@er1                       ;78366a2c123456780120

-    cmp.b @(0x12345678:32,r3.w),@(3:2,er1)                 ;78366a2c123456783120

-    cmp.b @(0x12345678:32,r3.w),@-er1                      ;78366a2c12345678b120

-    cmp.b @(0x12345678:32,r3.w),@er1+                      ;78366a2c123456788120

-    cmp.b @(0x12345678:32,r3.w),@er1-                      ;78366a2c12345678a120

-    cmp.b @(0x12345678:32,r3.w),@+er1                      ;78366a2c123456789120

-    cmp.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366a2c12345678c1209abc

-    cmp.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366a2c12345678c9209abcdef0

-    cmp.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366a2c12345678d2209abc

-    cmp.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366a2c12345678e2209abc

-    cmp.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366a2c12345678f2209abc

-    cmp.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366a2c12345678da209abcdef0

-    cmp.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366a2c12345678ea209abcdef0

-    cmp.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366a2c12345678fa209abcdef0

-    cmp.b @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366a2c1234567840209abc

-    cmp.b @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366a2c1234567848209abcdef0

-

-    cmp.b @(0x12345678:32,er3.l),@er1                       ;78376a2c123456780120

-    cmp.b @(0x12345678:32,er3.l),@(3:2,er1)                 ;78376a2c123456783120

-    cmp.b @(0x12345678:32,er3.l),@-er1                      ;78376a2c12345678b120

-    cmp.b @(0x12345678:32,er3.l),@er1+                      ;78376a2c123456788120

-    cmp.b @(0x12345678:32,er3.l),@er1-                      ;78376a2c12345678a120

-    cmp.b @(0x12345678:32,er3.l),@+er1                      ;78376a2c123456789120

-    cmp.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376a2c12345678c1209abc

-    cmp.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376a2c12345678c9209abcdef0

-    cmp.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376a2c12345678d2209abc

-    cmp.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376a2c12345678e2209abc

-    cmp.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376a2c12345678f2209abc

-    cmp.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376a2c12345678da209abcdef0

-    cmp.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376a2c12345678ea209abcdef0

-    cmp.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376a2c12345678fa209abcdef0

-    cmp.b @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376a2c1234567840209abc

-    cmp.b @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376a2c1234567848209abcdef0

-

-    cmp.b @0x1234:16,@er1                              ;6a1512340120

-    cmp.b @0x1234:16,@(3:2,er1)                        ;6a1512343120

-    cmp.b @0x1234:16,@-er1                             ;6a151234b120

-    cmp.b @0x1234:16,@er1+                             ;6a1512348120

-    cmp.b @0x1234:16,@er1-                             ;6a151234a120

-    cmp.b @0x1234:16,@+er1                             ;6a1512349120

-    cmp.b @0x1234:16,@(0xffff9abc:16,er1)              ;6a151234c1209abc

-    cmp.b @0x1234:16,@(0x9abcdef0:32,er1)              ;6a151234c9209abcdef0

-    cmp.b @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6a151234d2209abc

-    cmp.b @0x1234:16,@(0xffff9abc:16,r2.w)            ;6a151234e2209abc

-    cmp.b @0x1234:16,@(0xffff9abc:16,er2.l)            ;6a151234f2209abc

-    cmp.b @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6a151234da209abcdef0

-    cmp.b @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6a151234ea209abcdef0

-    cmp.b @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6a151234fa209abcdef0

-    cmp.b @0x1234:16,@0xffff9abc:16                    ;6a15123440209abc

-    cmp.b @0x1234:16,@0x9abcdef0:32                    ;6a15123448209abcdef0

-

-    cmp.b @0x12345678:32,@er1                              ;6a35123456780120

-    cmp.b @0x12345678:32,@(3:2,er1)                        ;6a35123456783120

-    cmp.b @0x12345678:32,@-er1                             ;6a3512345678b120

-    cmp.b @0x12345678:32,@er1+                             ;6a35123456788120

-    cmp.b @0x12345678:32,@er1-                             ;6a3512345678a120

-    cmp.b @0x12345678:32,@+er1                             ;6a35123456789120

-    cmp.b @0x12345678:32,@(0xffff9abc:16,er1)              ;6a3512345678c1209abc

-    cmp.b @0x12345678:32,@(0x9abcdef0:32,er1)              ;6a3512345678c9209abcdef0

-    cmp.b @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6a3512345678d2209abc

-    cmp.b @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6a3512345678e2209abc

-    cmp.b @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6a3512345678f2209abc

-    cmp.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6a3512345678da209abcdef0

-    cmp.b @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6a3512345678ea209abcdef0

-    cmp.b @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6a3512345678fa209abcdef0

-    cmp.b @0x12345678:32,@0xffff9abc:16                    ;6a351234567840209abc

-    cmp.b @0x12345678:32,@0x9abcdef0:32                    ;6a351234567848209abcdef0

-

-    cmp.w #0x1234:16,r1                       ;79211234

-    cmp.w #0x7:3,r2                         ;1f72

-    cmp.w #0x1234:16,@er1                      ;015e01201234

-    cmp.w #0x1234:16,@(0x6:2,er1)             ;015e31201234

-    cmp.w #0x1234:16,@er1+                     ;015e81201234

-    cmp.w #0x1234:16,@-er1                     ;015eb1201234

-    cmp.w #0x1234:16,@+er1                     ;015e91201234

-    cmp.w #0x1234:16,@er1-                     ;015ea1201234

-    cmp.w #0x1234:16,@(0xffff9abc:16,er1)               ;015ec1209abc1234

-    cmp.w #0x1234:16,@(0x9abcdef0:32,er1)               ;015ec9209abcdef01234

-    cmp.w #0x1234:16,@(0xffff9abc:16,r2l.b)             ;015ed2209abc1234

-    cmp.w #0x1234:16,@(0xffff9abc:16,r2.w)             ;015ee2209abc1234

-    cmp.w #0x1234:16,@(0xffff9abc:16,er2.l)             ;015ef2209abc1234

-    cmp.w #0x1234:16,@(0x9abcdef0:32,r2l.b)             ;015eda209abcdef01234

-    cmp.w #0x1234:16,@(0x9abcdef0:32,r2.w)             ;015eea209abcdef01234

-    cmp.w #0x1234:16,@(0x9abcdef0:32,er2.l)             ;015efa209abcdef01234

-    cmp.w #0x1234:16,@0xffff9abc:16                     ;015e40209abc1234

-    cmp.w #0x1234:16,@0x9abcdef0:32                     ;015e48209abcdef01234

-

-    cmp.w #0x7:3,@er1                       ;7d901f70

-    cmp.w #0x7:3,@0x1234:16                     ;6b1812341f70

-    cmp.w #0x7:3,@0x12345678:32                     ;6b38123456781f70

-

-    cmp.w r3,r1                           ;1d31

-

-    cmp.w r3,@er1                         ;7d901d30

-    cmp.w r3,@(0x6:2,er1)                ;01593123

-    cmp.w r3,@er1+                        ;01598123

-    cmp.w r3,@-er1                        ;0159b123

-    cmp.w r3,@+er1                        ;01599123

-    cmp.w r3,@er1-                        ;0159a123

-    cmp.w r3,@(0x1234:16,er1)                  ;0159c1231234

-    cmp.w r3,@(0x12345678:32,er1)                  ;0159c92312345678

-    cmp.w r3,@(0x1234:16,r2l.b)                ;0159d2231234

-    cmp.w r3,@(0x1234:16,r2.w)                ;0159e2231234

-    cmp.w r3,@(0x1234:16,er2.l)                ;0159f2231234

-    cmp.w r3,@(0x12345678:32,r2l.b)                ;0159da2312345678

-    cmp.w r3,@(0x12345678:32,r2.w)                ;0159ea2312345678

-    cmp.w r3,@(0x12345678:32,er2.l)                ;0159fa2312345678

-    cmp.w r3,@0x1234:16                       ;6b1812341d30

-    cmp.w r3,@0x12345678:32                       ;6b38123456781d30

-

-    cmp.w @er3,r1                         ;7cb01d01

-    cmp.w @(0x6:2,er3),r1               ;015a3321

-    cmp.w @er3+,r1                       ;015a8321

-    cmp.w @-er3,r1                       ;015ab321

-    cmp.w @+er3,r1                       ;015a9321

-    cmp.w @er3-,r1                       ;015aa321

-    cmp.w @(0x1234:16,er1),r1                  ;015ac1211234

-    cmp.w @(0x12345678:32,er1),r1                  ;015ac92112345678

-    cmp.w @(0x1234:16,r2l.b),r1                ;015ad2211234

-    cmp.w @(0x1234:16,r2.w),r1                ;015ae2211234

-    cmp.w @(0x1234:16,er2.l),r1                ;015af2211234

-    cmp.w @(0x12345678:32,r2l.b),r1                ;015ada2112345678

-    cmp.w @(0x12345678:32,r2.w),r1                ;015aea2112345678

-    cmp.w @(0x12345678:32,er2.l),r1                ;015afa2112345678

-    cmp.w @0x1234:16,r1                       ;6b1012341d01

-    cmp.w @0x12345678:32,r1                       ;6b30123456781d01

-

-    cmp.w @er3,@er1                                ;7cb50120

-    cmp.w @er3,@(6:2,er1)                          ;7cb53120

-    cmp.w @er3,@-er1                               ;7cb5b120

-    cmp.w @er3,@er1+                               ;7cb58120

-    cmp.w @er3,@er1-                               ;7cb5a120

-    cmp.w @er3,@+er1                               ;7cb59120

-    cmp.w @er3,@(0xffff9abc:16,er1)                ;7cb5c1209abc

-    cmp.w @er3,@(0x9abcdef0:32,er1)                ;7cb5c9209abcdef0

-    cmp.w @er3,@(0xffff9abc:16,r2l.b)              ;7cb5d2209abc

-    cmp.w @er3,@(0xffff9abc:16,r2.w)              ;7cb5e2209abc

-    cmp.w @er3,@(0xffff9abc:16,er2.l)              ;7cb5f2209abc

-    cmp.w @er3,@(0x9abcdef0:32,r2l.b)              ;7cb5da209abcdef0

-    cmp.w @er3,@(0x9abcdef0:32,r2.w)              ;7cb5ea209abcdef0

-    cmp.w @er3,@(0x9abcdef0:32,er2.l)              ;7cb5fa209abcdef0

-    cmp.w @er3,@0xffff9abc:16                      ;7cb540209abc

-    cmp.w @er3,@0x9abcdef0:32                      ;7cb548209abcdef0

-

-    cmp.w @-er3,@er1                               ;01576d3c0120

-    cmp.w @-er3,@(6:2,er1)                         ;01576d3c3120

-    cmp.w @-er3,@-er1                              ;01576d3cb120

-    cmp.w @-er3,@er1+                              ;01576d3c8120

-    cmp.w @-er3,@er1-                              ;01576d3ca120

-    cmp.w @-er3,@+er1                              ;01576d3c9120

-    cmp.w @-er3,@(0xffff9abc:16,er1)               ;01576d3cc1209abc

-    cmp.w @-er3,@(0x9abcdef0:32,er1)               ;01576d3cc9209abcdef0

-    cmp.w @-er3,@(0xffff9abc:16,r2l.b)             ;01576d3cd2209abc

-    cmp.w @-er3,@(0xffff9abc:16,r2.w)             ;01576d3ce2209abc

-    cmp.w @-er3,@(0xffff9abc:16,er2.l)             ;01576d3cf2209abc

-    cmp.w @-er3,@(0x9abcdef0:32,r2l.b)             ;01576d3cda209abcdef0

-    cmp.w @-er3,@(0x9abcdef0:32,r2.w)             ;01576d3cea209abcdef0

-    cmp.w @-er3,@(0x9abcdef0:32,er2.l)             ;01576d3cfa209abcdef0

-    cmp.w @-er3,@0xffff9abc:16                     ;01576d3c40209abc

-    cmp.w @-er3,@0x9abcdef0:32                     ;01576d3c48209abcdef0

-

-    cmp.w @er3+,@er1                               ;01546d3c0120

-    cmp.w @er3+,@(6:2,er1)                         ;01546d3c3120

-    cmp.w @er3+,@-er1                              ;01546d3cb120

-    cmp.w @er3+,@er1+                              ;01546d3c8120

-    cmp.w @er3+,@er1-                              ;01546d3ca120

-    cmp.w @er3+,@+er1                              ;01546d3c9120

-    cmp.w @er3+,@(0xffff9abc:16,er1)               ;01546d3cc1209abc

-    cmp.w @er3+,@(0x9abcdef0:32,er1)               ;01546d3cc9209abcdef0

-    cmp.w @er3+,@(0xffff9abc:16,r2l.b)             ;01546d3cd2209abc

-    cmp.w @er3+,@(0xffff9abc:16,r2.w)             ;01546d3ce2209abc

-    cmp.w @er3+,@(0xffff9abc:16,er2.l)             ;01546d3cf2209abc

-    cmp.w @er3+,@(0x9abcdef0:32,r2l.b)             ;01546d3cda209abcdef0

-    cmp.w @er3+,@(0x9abcdef0:32,r2.w)             ;01546d3cea209abcdef0

-    cmp.w @er3+,@(0x9abcdef0:32,er2.l)             ;01546d3cfa209abcdef0

-    cmp.w @er3+,@0xffff9abc:16                     ;01546d3c40209abc

-    cmp.w @er3+,@0x9abcdef0:32                     ;01546d3c48209abcdef0

-

-    cmp.w @er3-,@er1                               ;01566d3c0120

-    cmp.w @er3-,@(6:2,er1)                         ;01566d3c3120

-    cmp.w @er3-,@-er1                              ;01566d3cb120

-    cmp.w @er3-,@er1+                              ;01566d3c8120

-    cmp.w @er3-,@er1-                              ;01566d3ca120

-    cmp.w @er3-,@+er1                              ;01566d3c9120

-    cmp.w @er3-,@(0xffff9abc:16,er1)               ;01566d3cc1209abc

-    cmp.w @er3-,@(0x9abcdef0:32,er1)               ;01566d3cc9209abcdef0

-    cmp.w @er3-,@(0xffff9abc:16,r2l.b)             ;01566d3cd2209abc

-    cmp.w @er3-,@(0xffff9abc:16,r2.w)             ;01566d3ce2209abc

-    cmp.w @er3-,@(0xffff9abc:16,er2.l)             ;01566d3cf2209abc

-    cmp.w @er3-,@(0x9abcdef0:32,r2l.b)             ;01566d3cda209abcdef0

-    cmp.w @er3-,@(0x9abcdef0:32,r2.w)             ;01566d3cea209abcdef0

-    cmp.w @er3-,@(0x9abcdef0:32,er2.l)             ;01566d3cfa209abcdef0

-    cmp.w @er3-,@0xffff9abc:16                     ;01566d3c40209abc

-    cmp.w @er3-,@0x9abcdef0:32                     ;01566d3c48209abcdef0

-

-    cmp.w @+er3,@er1                               ;01556d3c0120

-    cmp.w @+er3,@(6:2,er1)                         ;01556d3c3120

-    cmp.w @+er3,@-er1                              ;01556d3cb120

-    cmp.w @+er3,@er1+                              ;01556d3c8120

-    cmp.w @+er3,@er1-                              ;01556d3ca120

-    cmp.w @+er3,@+er1                              ;01556d3c9120

-    cmp.w @+er3,@(0xffff9abc:16,er1)               ;01556d3cc1209abc

-    cmp.w @+er3,@(0x9abcdef0:32,er1)               ;01556d3cc9209abcdef0

-    cmp.w @+er3,@(0xffff9abc:16,r2l.b)             ;01556d3cd2209abc

-    cmp.w @+er3,@(0xffff9abc:16,r2.w)             ;01556d3ce2209abc

-    cmp.w @+er3,@(0xffff9abc:16,er2.l)             ;01556d3cf2209abc

-    cmp.w @+er3,@(0x9abcdef0:32,r2l.b)             ;01556d3cda209abcdef0

-    cmp.w @+er3,@(0x9abcdef0:32,r2.w)             ;01556d3cea209abcdef0

-    cmp.w @+er3,@(0x9abcdef0:32,er2.l)             ;01556d3cfa209abcdef0

-    cmp.w @+er3,@0xffff9abc:16                     ;01556d3c40209abc

-    cmp.w @+er3,@0x9abcdef0:32                     ;01556d3c48209abcdef0

-

-    cmp.w @(0x1234:16,er3),@er1                         ;01546f3c12340120

-    cmp.w @(0x1234:16,er3),@(6:2,er1)                   ;01546f3c12343120

-    cmp.w @(0x1234:16,er3),@-er1                        ;01546f3c1234b120

-    cmp.w @(0x1234:16,er3),@er1+                        ;01546f3c12348120

-    cmp.w @(0x1234:16,er3),@er1-                        ;01546f3c1234a120

-    cmp.w @(0x1234:16,er3),@+er1                        ;01546f3c12349120

-    cmp.w @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01546f3c1234c1209abc

-    cmp.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01546f3c1234c9209abcdef0

-    cmp.w @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01546f3c1234d2209abc

-    cmp.w @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01546f3c1234e2209abc

-    cmp.w @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01546f3c1234f2209abc

-    cmp.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01546f3c1234da209abcdef0

-    cmp.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01546f3c1234ea209abcdef0

-    cmp.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01546f3c1234fa209abcdef0

-    cmp.w @(0x1234:16,er3),@0xffff9abc:16               ;01546f3c123440209abc

-    cmp.w @(0x1234:16,er3),@0x9abcdef0:32               ;01546f3c123448209abcdef0

-

-    cmp.w @(0x12345678:32,er3),@er1                         ;78346b2c123456780120

-    cmp.w @(0x12345678:32,er3),@(6:2,er1)                   ;78346b2c123456783120

-    cmp.w @(0x12345678:32,er3),@-er1                        ;78346b2c12345678b120

-    cmp.w @(0x12345678:32,er3),@er1+                        ;78346b2c123456788120

-    cmp.w @(0x12345678:32,er3),@er1-                        ;78346b2c12345678a120

-    cmp.w @(0x12345678:32,er3),@+er1                        ;78346b2c123456789120

-    cmp.w @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346b2c12345678c1209abc

-    cmp.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346b2c12345678c9209abcdef0

-    cmp.w @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346b2c12345678d2209abc

-    cmp.w @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346b2c12345678e2209abc

-    cmp.w @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346b2c12345678f2209abc

-    cmp.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346b2c12345678da209abcdef0

-    cmp.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346b2c12345678ea209abcdef0

-    cmp.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346b2c12345678fa209abcdef0

-    cmp.w @(0x12345678:32,er3),@0xffff9abc:16               ;78346b2c1234567840209abc

-    cmp.w @(0x12345678:32,er3),@0x9abcdef0:32               ;78346b2c1234567848209abcdef0

-

-    cmp.w @(0x1234:16,r3l.b),@er1                       ;01556f3c12340120

-    cmp.w @(0x1234:16,r3l.b),@(6:2,er1)                 ;01556f3c12343120

-    cmp.w @(0x1234:16,r3l.b),@-er1                      ;01556f3c1234b120

-    cmp.w @(0x1234:16,r3l.b),@er1+                      ;01556f3c12348120

-    cmp.w @(0x1234:16,r3l.b),@er1-                      ;01556f3c1234a120

-    cmp.w @(0x1234:16,r3l.b),@+er1                      ;01556f3c12349120

-    cmp.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01556f3c1234c1209abc

-    cmp.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01556f3c1234c9209abcdef0

-    cmp.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01556f3c1234d2209abc

-    cmp.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01556f3c1234e2209abc

-    cmp.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01556f3c1234f2209abc

-    cmp.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01556f3c1234da209abcdef0

-    cmp.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01556f3c1234ea209abcdef0

-    cmp.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01556f3c1234fa209abcdef0

-    cmp.w @(0x1234:16,r3l.b),@0xffff9abc:16             ;01556f3c123440209abc

-    cmp.w @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01556f3c123448209abcdef0

-

-    cmp.w @(0x1234:16,r3.w),@er1                       ;01566f3c12340120

-    cmp.w @(0x1234:16,r3.w),@(6:2,er1)                 ;01566f3c12343120

-    cmp.w @(0x1234:16,r3.w),@-er1                      ;01566f3c1234b120

-    cmp.w @(0x1234:16,r3.w),@er1+                      ;01566f3c12348120

-    cmp.w @(0x1234:16,r3.w),@er1-                      ;01566f3c1234a120

-    cmp.w @(0x1234:16,r3.w),@+er1                      ;01566f3c12349120

-    cmp.w @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01566f3c1234c1209abc

-    cmp.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01566f3c1234c9209abcdef0

-    cmp.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01566f3c1234d2209abc

-    cmp.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01566f3c1234e2209abc

-    cmp.w @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01566f3c1234f2209abc

-    cmp.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01566f3c1234da209abcdef0

-    cmp.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01566f3c1234ea209abcdef0

-    cmp.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01566f3c1234fa209abcdef0

-    cmp.w @(0x1234:16,r3.w),@0xffff9abc:16             ;01566f3c123440209abc

-    cmp.w @(0x1234:16,r3.w),@0x9abcdef0:32             ;01566f3c123448209abcdef0

-

-    cmp.w @(0x1234:16,er3.l),@er1                       ;01576f3c12340120

-    cmp.w @(0x1234:16,er3.l),@(6:2,er1)                 ;01576f3c12343120

-    cmp.w @(0x1234:16,er3.l),@-er1                      ;01576f3c1234b120

-    cmp.w @(0x1234:16,er3.l),@er1+                      ;01576f3c12348120

-    cmp.w @(0x1234:16,er3.l),@er1-                      ;01576f3c1234a120

-    cmp.w @(0x1234:16,er3.l),@+er1                      ;01576f3c12349120

-    cmp.w @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01576f3c1234c1209abc

-    cmp.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01576f3c1234c9209abcdef0

-    cmp.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01576f3c1234d2209abc

-    cmp.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01576f3c1234e2209abc

-    cmp.w @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01576f3c1234f2209abc

-    cmp.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01576f3c1234da209abcdef0

-    cmp.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01576f3c1234ea209abcdef0

-    cmp.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01576f3c1234fa209abcdef0

-    cmp.w @(0x1234:16,er3.l),@0xffff9abc:16             ;01576f3c123440209abc

-    cmp.w @(0x1234:16,er3.l),@0x9abcdef0:32             ;01576f3c123448209abcdef0

-

-    cmp.w @(0x12345678:32,r3l.b),@er1                       ;78356b2c123456780120

-    cmp.w @(0x12345678:32,r3l.b),@(6:2,er1)                 ;78356b2c123456783120

-    cmp.w @(0x12345678:32,r3l.b),@-er1                      ;78356b2c12345678b120

-    cmp.w @(0x12345678:32,r3l.b),@er1+                      ;78356b2c123456788120

-    cmp.w @(0x12345678:32,r3l.b),@er1-                      ;78356b2c12345678a120

-    cmp.w @(0x12345678:32,r3l.b),@+er1                      ;78356b2c123456789120

-    cmp.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356b2c12345678c1209abc

-    cmp.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356b2c12345678c9209abcdef0

-    cmp.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356b2c12345678d2209abc

-    cmp.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356b2c12345678e2209abc

-    cmp.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356b2c12345678f2209abc

-    cmp.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356b2c12345678da209abcdef0

-    cmp.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356b2c12345678ea209abcdef0

-    cmp.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356b2c12345678fa209abcdef0

-    cmp.w @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356b2c1234567840209abc

-    cmp.w @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356b2c1234567848209abcdef0

-

-    cmp.w @(0x12345678:32,r3.w),@er1                       ;78366b2c123456780120

-    cmp.w @(0x12345678:32,r3.w),@(6:2,er1)                 ;78366b2c123456783120

-    cmp.w @(0x12345678:32,r3.w),@-er1                      ;78366b2c12345678b120

-    cmp.w @(0x12345678:32,r3.w),@er1+                      ;78366b2c123456788120

-    cmp.w @(0x12345678:32,r3.w),@er1-                      ;78366b2c12345678a120

-    cmp.w @(0x12345678:32,r3.w),@+er1                      ;78366b2c123456789120

-    cmp.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366b2c12345678c1209abc

-    cmp.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366b2c12345678c9209abcdef0

-    cmp.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366b2c12345678d2209abc

-    cmp.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366b2c12345678e2209abc

-    cmp.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366b2c12345678f2209abc

-    cmp.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366b2c12345678da209abcdef0

-    cmp.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366b2c12345678ea209abcdef0

-    cmp.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366b2c12345678fa209abcdef0

-    cmp.w @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366b2c1234567840209abc

-    cmp.w @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366b2c1234567848209abcdef0

-

-    cmp.w @(0x12345678:32,er3.l),@er1                       ;78376b2c123456780120

-    cmp.w @(0x12345678:32,er3.l),@(6:2,er1)                 ;78376b2c123456783120

-    cmp.w @(0x12345678:32,er3.l),@-er1                      ;78376b2c12345678b120

-    cmp.w @(0x12345678:32,er3.l),@er1+                      ;78376b2c123456788120

-    cmp.w @(0x12345678:32,er3.l),@er1-                      ;78376b2c12345678a120

-    cmp.w @(0x12345678:32,er3.l),@+er1                      ;78376b2c123456789120

-    cmp.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376b2c12345678c1209abc

-    cmp.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376b2c12345678c9209abcdef0

-    cmp.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376b2c12345678d2209abc

-    cmp.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376b2c12345678e2209abc

-    cmp.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376b2c12345678f2209abc

-    cmp.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376b2c12345678da209abcdef0

-    cmp.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376b2c12345678ea209abcdef0

-    cmp.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376b2c12345678fa209abcdef0

-    cmp.w @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376b2c1234567840209abc

-    cmp.w @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376b2c1234567848209abcdef0

-

-    cmp.w @0x1234:16,@er1                              ;6b1512340120

-    cmp.w @0x1234:16,@(6:2,er1)                        ;6b1512343120

-    cmp.w @0x1234:16,@-er1                             ;6b151234b120

-    cmp.w @0x1234:16,@er1+                             ;6b1512348120

-    cmp.w @0x1234:16,@er1-                             ;6b151234a120

-    cmp.w @0x1234:16,@+er1                             ;6b1512349120

-    cmp.w @0x1234:16,@(0xffff9abc:16,er1)              ;6b151234c1209abc

-    cmp.w @0x1234:16,@(0x9abcdef0:32,er1)              ;6b151234c9209abcdef0

-    cmp.w @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6b151234d2209abc

-    cmp.w @0x1234:16,@(0xffff9abc:16,r2.w)            ;6b151234e2209abc

-    cmp.w @0x1234:16,@(0xffff9abc:16,er2.l)            ;6b151234f2209abc

-    cmp.w @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6b151234da209abcdef0

-    cmp.w @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6b151234ea209abcdef0

-    cmp.w @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6b151234fa209abcdef0

-    cmp.w @0x1234:16,@0xffff9abc:16                    ;6b15123440209abc

-    cmp.w @0x1234:16,@0x9abcdef0:32                    ;6b15123448209abcdef0

-

-    cmp.w @0x12345678:32,@er1                              ;6b35123456780120

-    cmp.w @0x12345678:32,@(6:2,er1)                        ;6b35123456783120

-    cmp.w @0x12345678:32,@-er1                             ;6b3512345678b120

-    cmp.w @0x12345678:32,@er1+                             ;6b35123456788120

-    cmp.w @0x12345678:32,@er1-                             ;6b3512345678a120

-    cmp.w @0x12345678:32,@+er1                             ;6b35123456789120

-    cmp.w @0x12345678:32,@(0xffff9abc:16,er1)              ;6b3512345678c1209abc

-    cmp.w @0x12345678:32,@(0x9abcdef0:32,er1)              ;6b3512345678c9209abcdef0

-    cmp.w @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6b3512345678d2209abc

-    cmp.w @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6b3512345678e2209abc

-    cmp.w @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6b3512345678f2209abc

-    cmp.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6b3512345678da209abcdef0

-    cmp.w @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6b3512345678ea209abcdef0

-    cmp.w @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6b3512345678fa209abcdef0

-    cmp.w @0x12345678:32,@0xffff9abc:16                    ;6b351234567840209abc

-    cmp.w @0x12345678:32,@0x9abcdef0:32                    ;6b351234567848209abcdef0

-

-    cmp.l #0x12345678:32,er1                      ;7a2112345678

-    cmp.l #0x1234:16,er1                       ;7a291234

-    cmp.l #0x7:3,er2                         ;1ffa

-    cmp.l #0x12345678:32,@er1                      ;010e012812345678

-    cmp.l #0x12345678:32,@(0xc:2,er1)             ;010e312812345678

-    cmp.l #0x12345678:32,@er1+                     ;010e812812345678

-    cmp.l #0x12345678:32,@-er1                     ;010eb12812345678

-    cmp.l #0x12345678:32,@+er1                     ;010e912812345678

-    cmp.l #0x12345678:32,@er1-                     ;010ea12812345678

-    cmp.l #0x12345678:32,@(0xffff9abc:16,er1)               ;010ec1289abc12345678

-    cmp.l #0x12345678:32,@(0x9abcdef0:32,er1)               ;010ec9289abcdef012345678

-    cmp.l #0x12345678:32,@(0xffff9abc:16,r2l.b)             ;010ed2289abc12345678

-    cmp.l #0x12345678:32,@(0xffff9abc:16,r2.w)             ;010ee2289abc12345678

-    cmp.l #0x12345678:32,@(0xffff9abc:16,er2.l)             ;010ef2289abc12345678

-    cmp.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)             ;010eda289abcdef012345678

-    cmp.l #0x12345678:32,@(0x9abcdef0:32,r2.w)             ;010eea289abcdef012345678

-    cmp.l #0x12345678:32,@(0x9abcdef0:32,er2.l)             ;010efa289abcdef012345678

-    cmp.l #0x12345678:32,@0xffff9abc:16                    ;010e40289abc12345678

-    cmp.l #0x12345678:32,@0x9abcdef0:32                    ;010e48289abcdef012345678

-    cmp.l #0x1234:16,@er1                      ;010e01201234

-    cmp.l #0x1234:16,@(0xc:2,er1)             ;010e31201234

-    cmp.l #0x1234:16,@er1+                     ;010e81201234

-    cmp.l #0x1234:16,@-er1                     ;010eb1201234

-    cmp.l #0x1234:16,@+er1                     ;010e91201234

-    cmp.l #0x1234:16,@er1-                     ;010ea1201234

-    cmp.l #0x1234:16,@(0xffff9abc:16,er1)               ;010ec1209abc1234

-    cmp.l #0x1234:16,@(0x9abcdef0:32,er1)               ;010ec9209abcdef01234

-    cmp.l #0x1234:16,@(0xffff9abc:16,r2l.b)             ;010ed2209abc1234

-    cmp.l #0x1234:16,@(0xffff9abc:16,r2.w)             ;010ee2209abc1234

-    cmp.l #0x1234:16,@(0xffff9abc:16,er2.l)             ;010ef2209abc1234

-    cmp.l #0x1234:16,@(0x9abcdef0:32,r2l.b)             ;010eda209abcdef01234

-    cmp.l #0x1234:16,@(0x9abcdef0:32,r2.w)             ;010eea209abcdef01234

-    cmp.l #0x1234:16,@(0x9abcdef0:32,er2.l)             ;010efa209abcdef01234

-    cmp.l #0x1234:16,@0xffff9abc:16                    ;010e40209abc1234

-    cmp.l #0x1234:16,@0x9abcdef0:32                    ;010e48209abcdef01234

-

-    cmp.l er3,er1                         ;1fb1

-

-    cmp.l er3,@er1                         ;01090123

-    cmp.l er3,@(0xc:2,er1)                ;01093123

-    cmp.l er3,@er1+                        ;01098123

-    cmp.l er3,@-er1                        ;0109b123

-    cmp.l er3,@+er1                        ;01099123

-    cmp.l er3,@er1-                        ;0109a123

-    cmp.l er3,@(0x1234:16,er1)                  ;0109c1231234

-    cmp.l er3,@(0x12345678:32,er1)                  ;0109c92312345678

-    cmp.l er3,@(0x1234:16,r2l.b)                ;0109d2231234

-    cmp.l er3,@(0x1234:16,r2.w)                ;0109e2231234

-    cmp.l er3,@(0x1234:16,er2.l)                ;0109f2231234

-    cmp.l er3,@(0x12345678:32,r2l.b)                ;0109da2312345678

-    cmp.l er3,@(0x12345678:32,r2.w)                ;0109ea2312345678

-    cmp.l er3,@(0x12345678:32,er2.l)                ;0109fa2312345678

-    cmp.l er3,@0x1234:16                       ;010940231234

-    cmp.l er3,@0x12345678:32                       ;0109482312345678

-

-    cmp.l @er3,er1                         ;010a0321

-    cmp.l @(0xc:2,er3),er1               ;010a3321

-    cmp.l @er3+,er1                       ;010a8321

-    cmp.l @-er3,er1                       ;010ab321

-    cmp.l @+er3,er1                       ;010a9321

-    cmp.l @er3-,er1                       ;010aa321

-    cmp.l @(0x1234:16,er1),er1                  ;010ac1211234

-    cmp.l @(0x12345678:32,er1),er1                  ;010ac92112345678

-    cmp.l @(0x1234:16,r2l.b),er1                ;010ad2211234

-    cmp.l @(0x1234:16,r2.w),er1                ;010ae2211234

-    cmp.l @(0x1234:16,er2.l),er1                ;010af2211234

-    cmp.l @(0x12345678:32,r2l.b),er1                ;010ada2112345678

-    cmp.l @(0x12345678:32,r2.w),er1                ;010aea2112345678

-    cmp.l @(0x12345678:32,er2.l),er1                ;010afa2112345678

-    cmp.l @0x1234:16,er1                       ;010a40211234

-    cmp.l @0x12345678:32,er1                       ;010a482112345678

-

-    cmp.l @er3,@er1                                ;0104693c0120

-    cmp.l @er3,@(0xc:2,er1)                          ;0104693c3120

-    cmp.l @er3,@-er1                               ;0104693cb120

-    cmp.l @er3,@er1+                               ;0104693c8120

-    cmp.l @er3,@er1-                               ;0104693ca120

-    cmp.l @er3,@+er1                               ;0104693c9120

-    cmp.l @er3,@(0xffff9abc:16,er1)                ;0104693cc1209abc

-    cmp.l @er3,@(0x9abcdef0:32,er1)                ;0104693cc9209abcdef0

-    cmp.l @er3,@(0xffff9abc:16,r2l.b)              ;0104693cd2209abc

-    cmp.l @er3,@(0xffff9abc:16,r2.w)              ;0104693ce2209abc

-    cmp.l @er3,@(0xffff9abc:16,er2.l)              ;0104693cf2209abc

-    cmp.l @er3,@(0x9abcdef0:32,r2l.b)              ;0104693cda209abcdef0

-    cmp.l @er3,@(0x9abcdef0:32,r2.w)              ;0104693cea209abcdef0

-    cmp.l @er3,@(0x9abcdef0:32,er2.l)              ;0104693cfa209abcdef0

-    cmp.l @er3,@0xffff9abc:16                      ;0104693c40209abc

-    cmp.l @er3,@0x9abcdef0:32                      ;0104693c48209abcdef0

-

-    cmp.l @(0xc:2,er3),@er1                       ;0107693c0120

-    cmp.l @(0xc:2,er3),@(0xc:2,er1)                 ;0107693c3120

-    cmp.l @(0xc:2,er3),@-er1                      ;0107693cb120

-    cmp.l @(0xc:2,er3),@er1+                      ;0107693c8120

-    cmp.l @(0xc:2,er3),@er1-                      ;0107693ca120

-    cmp.l @(0xc:2,er3),@+er1                      ;0107693c9120

-    cmp.l @(0xc:2,er3),@(0xffff9abc:16,er1)       ;0107693cc1209abc

-    cmp.l @(0xc:2,er3),@(0x9abcdef0:32,er1)       ;0107693cc9209abcdef0

-    cmp.l @(0xc:2,er3),@(0xffff9abc:16,r2l.b)     ;0107693cd2209abc

-    cmp.l @(0xc:2,er3),@(0xffff9abc:16,r2.w)     ;0107693ce2209abc

-    cmp.l @(0xc:2,er3),@(0xffff9abc:16,er2.l)     ;0107693cf2209abc

-    cmp.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)     ;0107693cda209abcdef0

-    cmp.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)     ;0107693cea209abcdef0

-    cmp.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)     ;0107693cfa209abcdef0

-    cmp.l @(0xc:2,er3),@0xffff9abc:16             ;0107693c40209abc

-    cmp.l @(0xc:2,er3),@0x9abcdef0:32             ;0107693c48209abcdef0

-

-    cmp.l @-er3,@er1                               ;01076d3c0120

-    cmp.l @-er3,@(0xc:2,er1)                         ;01076d3c3120

-    cmp.l @-er3,@-er1                              ;01076d3cb120

-    cmp.l @-er3,@er1+                              ;01076d3c8120

-    cmp.l @-er3,@er1-                              ;01076d3ca120

-    cmp.l @-er3,@+er1                              ;01076d3c9120

-    cmp.l @-er3,@(0xffff9abc:16,er1)               ;01076d3cc1209abc

-    cmp.l @-er3,@(0x9abcdef0:32,er1)               ;01076d3cc9209abcdef0

-    cmp.l @-er3,@(0xffff9abc:16,r2l.b)             ;01076d3cd2209abc

-    cmp.l @-er3,@(0xffff9abc:16,r2.w)             ;01076d3ce2209abc

-    cmp.l @-er3,@(0xffff9abc:16,er2.l)             ;01076d3cf2209abc

-    cmp.l @-er3,@(0x9abcdef0:32,r2l.b)             ;01076d3cda209abcdef0

-    cmp.l @-er3,@(0x9abcdef0:32,r2.w)             ;01076d3cea209abcdef0

-    cmp.l @-er3,@(0x9abcdef0:32,er2.l)             ;01076d3cfa209abcdef0

-    cmp.l @-er3,@0xffff9abc:16                     ;01076d3c40209abc

-    cmp.l @-er3,@0x9abcdef0:32                     ;01076d3c48209abcdef0

-

-    cmp.l @er3+,@er1                               ;01046d3c0120

-    cmp.l @er3+,@(0xc:2,er1)                         ;01046d3c3120

-    cmp.l @er3+,@-er1                              ;01046d3cb120

-    cmp.l @er3+,@er1+                              ;01046d3c8120

-    cmp.l @er3+,@er1-                              ;01046d3ca120

-    cmp.l @er3+,@+er1                              ;01046d3c9120

-    cmp.l @er3+,@(0xffff9abc:16,er1)               ;01046d3cc1209abc

-    cmp.l @er3+,@(0x9abcdef0:32,er1)               ;01046d3cc9209abcdef0

-    cmp.l @er3+,@(0xffff9abc:16,r2l.b)             ;01046d3cd2209abc

-    cmp.l @er3+,@(0xffff9abc:16,r2.w)             ;01046d3ce2209abc

-    cmp.l @er3+,@(0xffff9abc:16,er2.l)             ;01046d3cf2209abc

-    cmp.l @er3+,@(0x9abcdef0:32,r2l.b)             ;01046d3cda209abcdef0

-    cmp.l @er3+,@(0x9abcdef0:32,r2.w)             ;01046d3cea209abcdef0

-    cmp.l @er3+,@(0x9abcdef0:32,er2.l)             ;01046d3cfa209abcdef0

-    cmp.l @er3+,@0xffff9abc:16                     ;01046d3c40209abc

-    cmp.l @er3+,@0x9abcdef0:32                     ;01046d3c48209abcdef0

-

-    cmp.l @er3-,@er1                               ;01066d3c0120

-    cmp.l @er3-,@(0xc:2,er1)                         ;01066d3c3120

-    cmp.l @er3-,@-er1                              ;01066d3cb120

-    cmp.l @er3-,@er1+                              ;01066d3c8120

-    cmp.l @er3-,@er1-                              ;01066d3ca120

-    cmp.l @er3-,@+er1                              ;01066d3c9120

-    cmp.l @er3-,@(0xffff9abc:16,er1)               ;01066d3cc1209abc

-    cmp.l @er3-,@(0x9abcdef0:32,er1)               ;01066d3cc9209abcdef0

-    cmp.l @er3-,@(0xffff9abc:16,r2l.b)             ;01066d3cd2209abc

-    cmp.l @er3-,@(0xffff9abc:16,r2.w)             ;01066d3ce2209abc

-    cmp.l @er3-,@(0xffff9abc:16,er2.l)             ;01066d3cf2209abc

-    cmp.l @er3-,@(0x9abcdef0:32,r2l.b)             ;01066d3cda209abcdef0

-    cmp.l @er3-,@(0x9abcdef0:32,r2.w)             ;01066d3cea209abcdef0

-    cmp.l @er3-,@(0x9abcdef0:32,er2.l)             ;01066d3cfa209abcdef0

-    cmp.l @er3-,@0xffff9abc:16                     ;01066d3c40209abc

-    cmp.l @er3-,@0x9abcdef0:32                     ;01066d3c48209abcdef0

-

-    cmp.l @+er3,@er1                               ;01056d3c0120

-    cmp.l @+er3,@(0xc:2,er1)                         ;01056d3c3120

-    cmp.l @+er3,@-er1                              ;01056d3cb120

-    cmp.l @+er3,@er1+                              ;01056d3c8120

-    cmp.l @+er3,@er1-                              ;01056d3ca120

-    cmp.l @+er3,@+er1                              ;01056d3c9120

-    cmp.l @+er3,@(0xffff9abc:16,er1)               ;01056d3cc1209abc

-    cmp.l @+er3,@(0x9abcdef0:32,er1)               ;01056d3cc9209abcdef0

-    cmp.l @+er3,@(0xffff9abc:16,r2l.b)             ;01056d3cd2209abc

-    cmp.l @+er3,@(0xffff9abc:16,r2.w)             ;01056d3ce2209abc

-    cmp.l @+er3,@(0xffff9abc:16,er2.l)             ;01056d3cf2209abc

-    cmp.l @+er3,@(0x9abcdef0:32,r2l.b)             ;01056d3cda209abcdef0

-    cmp.l @+er3,@(0x9abcdef0:32,r2.w)             ;01056d3cea209abcdef0

-    cmp.l @+er3,@(0x9abcdef0:32,er2.l)             ;01056d3cfa209abcdef0

-    cmp.l @+er3,@0xffff9abc:16                     ;01056d3c40209abc

-    cmp.l @+er3,@0x9abcdef0:32                     ;01056d3c48209abcdef0

-

-    cmp.l @(0x1234:16,er3),@er1                         ;01046f3c12340120

-    cmp.l @(0x1234:16,er3),@(0xc:2,er1)                   ;01046f3c12343120

-    cmp.l @(0x1234:16,er3),@-er1                        ;01046f3c1234b120

-    cmp.l @(0x1234:16,er3),@er1+                        ;01046f3c12348120

-    cmp.l @(0x1234:16,er3),@er1-                        ;01046f3c1234a120

-    cmp.l @(0x1234:16,er3),@+er1                        ;01046f3c12349120

-    cmp.l @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01046f3c1234c1209abc

-    cmp.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01046f3c1234c9209abcdef0

-    cmp.l @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01046f3c1234d2209abc

-    cmp.l @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01046f3c1234e2209abc

-    cmp.l @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01046f3c1234f2209abc

-    cmp.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01046f3c1234da209abcdef0

-    cmp.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01046f3c1234ea209abcdef0

-    cmp.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01046f3c1234fa209abcdef0

-    cmp.l @(0x1234:16,er3),@0xffff9abc:16               ;01046f3c123440209abc

-    cmp.l @(0x1234:16,er3),@0x9abcdef0:32               ;01046f3c123448209abcdef0

-

-    cmp.l @(0x12345678:32,er3),@er1                         ;78b46b2c123456780120

-    cmp.l @(0x12345678:32,er3),@(0xc:2,er1)                   ;78b46b2c123456783120

-    cmp.l @(0x12345678:32,er3),@-er1                        ;78b46b2c12345678b120

-    cmp.l @(0x12345678:32,er3),@er1+                        ;78b46b2c123456788120

-    cmp.l @(0x12345678:32,er3),@er1-                        ;78b46b2c12345678a120

-    cmp.l @(0x12345678:32,er3),@+er1                        ;78b46b2c123456789120

-    cmp.l @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78b46b2c12345678c1209abc

-    cmp.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78b46b2c12345678c9209abcdef0

-    cmp.l @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78b46b2c12345678d2209abc

-    cmp.l @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78b46b2c12345678e2209abc

-    cmp.l @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78b46b2c12345678f2209abc

-    cmp.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78b46b2c12345678da209abcdef0

-    cmp.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78b46b2c12345678ea209abcdef0

-    cmp.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78b46b2c12345678fa209abcdef0

-    cmp.l @(0x12345678:32,er3),@0xffff9abc:16               ;78b46b2c1234567840209abc

-    cmp.l @(0x12345678:32,er3),@0x9abcdef0:32               ;78b46b2c1234567848209abcdef0

-

-    cmp.l @(0x1234:16,r3l.b),@er1                       ;01056f3c12340120

-    cmp.l @(0x1234:16,r3l.b),@(0xc:2,er1)                 ;01056f3c12343120

-    cmp.l @(0x1234:16,r3l.b),@-er1                      ;01056f3c1234b120

-    cmp.l @(0x1234:16,r3l.b),@er1+                      ;01056f3c12348120

-    cmp.l @(0x1234:16,r3l.b),@er1-                      ;01056f3c1234a120

-    cmp.l @(0x1234:16,r3l.b),@+er1                      ;01056f3c12349120

-    cmp.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01056f3c1234c1209abc

-    cmp.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01056f3c1234c9209abcdef0

-    cmp.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01056f3c1234d2209abc

-    cmp.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01056f3c1234e2209abc

-    cmp.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01056f3c1234f2209abc

-    cmp.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01056f3c1234da209abcdef0

-    cmp.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01056f3c1234ea209abcdef0

-    cmp.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01056f3c1234fa209abcdef0

-    cmp.l @(0x1234:16,r3l.b),@0xffff9abc:16             ;01056f3c123440209abc

-    cmp.l @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01056f3c123448209abcdef0

-

-    cmp.l @(0x1234:16,r3.w),@er1                       ;01066f3c12340120

-    cmp.l @(0x1234:16,r3.w),@(0xc:2,er1)                 ;01066f3c12343120

-    cmp.l @(0x1234:16,r3.w),@-er1                      ;01066f3c1234b120

-    cmp.l @(0x1234:16,r3.w),@er1+                      ;01066f3c12348120

-    cmp.l @(0x1234:16,r3.w),@er1-                      ;01066f3c1234a120

-    cmp.l @(0x1234:16,r3.w),@+er1                      ;01066f3c12349120

-    cmp.l @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01066f3c1234c1209abc

-    cmp.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01066f3c1234c9209abcdef0

-    cmp.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01066f3c1234d2209abc

-    cmp.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01066f3c1234e2209abc

-    cmp.l @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01066f3c1234f2209abc

-    cmp.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01066f3c1234da209abcdef0

-    cmp.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01066f3c1234ea209abcdef0

-    cmp.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01066f3c1234fa209abcdef0

-    cmp.l @(0x1234:16,r3.w),@0xffff9abc:16             ;01066f3c123440209abc

-    cmp.l @(0x1234:16,r3.w),@0x9abcdef0:32             ;01066f3c123448209abcdef0

-

-    cmp.l @(0x1234:16,er3.l),@er1                       ;01076f3c12340120

-    cmp.l @(0x1234:16,er3.l),@(0xc:2,er1)                 ;01076f3c12343120

-    cmp.l @(0x1234:16,er3.l),@-er1                      ;01076f3c1234b120

-    cmp.l @(0x1234:16,er3.l),@er1+                      ;01076f3c12348120

-    cmp.l @(0x1234:16,er3.l),@er1-                      ;01076f3c1234a120

-    cmp.l @(0x1234:16,er3.l),@+er1                      ;01076f3c12349120

-    cmp.l @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01076f3c1234c1209abc

-    cmp.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01076f3c1234c9209abcdef0

-    cmp.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01076f3c1234d2209abc

-    cmp.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01076f3c1234e2209abc

-    cmp.l @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01076f3c1234f2209abc

-    cmp.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01076f3c1234da209abcdef0

-    cmp.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01076f3c1234ea209abcdef0

-    cmp.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01076f3c1234fa209abcdef0

-    cmp.l @(0x1234:16,er3.l),@0xffff9abc:16             ;01076f3c123440209abc

-    cmp.l @(0x1234:16,er3.l),@0x9abcdef0:32             ;01076f3c123448209abcdef0

-

-    cmp.l @(0x12345678:32,r3l.b),@er1                       ;78b56b2c123456780120

-    cmp.l @(0x12345678:32,r3l.b),@(0xc:2,er1)                 ;78b56b2c123456783120

-    cmp.l @(0x12345678:32,r3l.b),@-er1                      ;78b56b2c12345678b120

-    cmp.l @(0x12345678:32,r3l.b),@er1+                      ;78b56b2c123456788120

-    cmp.l @(0x12345678:32,r3l.b),@er1-                      ;78b56b2c12345678a120

-    cmp.l @(0x12345678:32,r3l.b),@+er1                      ;78b56b2c123456789120

-    cmp.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78b56b2c12345678c1209abc

-    cmp.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78b56b2c12345678c9209abcdef0

-    cmp.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78b56b2c12345678d2209abc

-    cmp.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78b56b2c12345678e2209abc

-    cmp.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78b56b2c12345678f2209abc

-    cmp.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78b56b2c12345678da209abcdef0

-    cmp.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78b56b2c12345678ea209abcdef0

-    cmp.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78b56b2c12345678fa209abcdef0

-    cmp.l @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78b56b2c1234567840209abc

-    cmp.l @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78b56b2c1234567848209abcdef0

-

-    cmp.l @(0x12345678:32,r3.w),@er1                       ;78b66b2c123456780120

-    cmp.l @(0x12345678:32,r3.w),@(0xc:2,er1)                 ;78b66b2c123456783120

-    cmp.l @(0x12345678:32,r3.w),@-er1                      ;78b66b2c12345678b120

-    cmp.l @(0x12345678:32,r3.w),@er1+                      ;78b66b2c123456788120

-    cmp.l @(0x12345678:32,r3.w),@er1-                      ;78b66b2c12345678a120

-    cmp.l @(0x12345678:32,r3.w),@+er1                      ;78b66b2c123456789120

-    cmp.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78b66b2c12345678c1209abc

-    cmp.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78b66b2c12345678c9209abcdef0

-    cmp.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78b66b2c12345678d2209abc

-    cmp.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78b66b2c12345678e2209abc

-    cmp.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78b66b2c12345678f2209abc

-    cmp.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78b66b2c12345678da209abcdef0

-    cmp.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78b66b2c12345678ea209abcdef0

-    cmp.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78b66b2c12345678fa209abcdef0

-    cmp.l @(0x12345678:32,r3.w),@0xffff9abc:16             ;78b66b2c1234567840209abc

-    cmp.l @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78b66b2c1234567848209abcdef0

-

-    cmp.l @(0x12345678:32,er3.l),@er1                       ;78b76b2c123456780120

-    cmp.l @(0x12345678:32,er3.l),@(0xc:2,er1)                 ;78b76b2c123456783120

-    cmp.l @(0x12345678:32,er3.l),@-er1                      ;78b76b2c12345678b120

-    cmp.l @(0x12345678:32,er3.l),@er1+                      ;78b76b2c123456788120

-    cmp.l @(0x12345678:32,er3.l),@er1-                      ;78b76b2c12345678a120

-    cmp.l @(0x12345678:32,er3.l),@+er1                      ;78b76b2c123456789120

-    cmp.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78b76b2c12345678c1209abc

-    cmp.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78b76b2c12345678c9209abcdef0

-    cmp.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78b76b2c12345678d2209abc

-    cmp.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78b76b2c12345678e2209abc

-    cmp.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78b76b2c12345678f2209abc

-    cmp.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78b76b2c12345678da209abcdef0

-    cmp.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78b76b2c12345678ea209abcdef0

-    cmp.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78b76b2c12345678fa209abcdef0

-    cmp.l @(0x12345678:32,er3.l),@0xffff9abc:16             ;78b76b2c1234567840209abc

-    cmp.l @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78b76b2c1234567848209abcdef0

-

-    cmp.l @0x1234:16,@er1                              ;01046b0c12340120

-    cmp.l @0x1234:16,@(0xc:2,er1)                        ;01046b0c12343120

-    cmp.l @0x1234:16,@-er1                             ;01046b0c1234b120

-    cmp.l @0x1234:16,@er1+                             ;01046b0c12348120

-    cmp.l @0x1234:16,@er1-                             ;01046b0c1234a120

-    cmp.l @0x1234:16,@+er1                             ;01046b0c12349120

-    cmp.l @0x1234:16,@(0xffff9abc:16,er1)              ;01046b0c1234c1209abc

-    cmp.l @0x1234:16,@(0x9abcdef0:32,er1)              ;01046b0c1234c9209abcdef0

-    cmp.l @0x1234:16,@(0xffff9abc:16,r2l.b)            ;01046b0c1234d2209abc

-    cmp.l @0x1234:16,@(0xffff9abc:16,r2.w)            ;01046b0c1234e2209abc

-    cmp.l @0x1234:16,@(0xffff9abc:16,er2.l)            ;01046b0c1234f2209abc

-    cmp.l @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;01046b0c1234da209abcdef0

-    cmp.l @0x1234:16,@(0x9abcdef0:32,r2.w)            ;01046b0c1234ea209abcdef0

-    cmp.l @0x1234:16,@(0x9abcdef0:32,er2.l)            ;01046b0c1234fa209abcdef0

-    cmp.l @0x1234:16,@0xffff9abc:16                    ;01046b0c123440209abc

-    cmp.l @0x1234:16,@0x9abcdef0:32                    ;01046b0c123448209abcdef0

-

-    cmp.l @0x12345678:32,@er1                              ;01046b2c123456780120

-    cmp.l @0x12345678:32,@(0xc:2,er1)                        ;01046b2c123456783120

-    cmp.l @0x12345678:32,@-er1                             ;01046b2c12345678b120

-    cmp.l @0x12345678:32,@er1+                             ;01046b2c123456788120

-    cmp.l @0x12345678:32,@er1-                             ;01046b2c12345678a120

-    cmp.l @0x12345678:32,@+er1                             ;01046b2c123456789120

-    cmp.l @0x12345678:32,@(0xffff9abc:16,er1)              ;01046b2c12345678c1209abc

-    cmp.l @0x12345678:32,@(0x9abcdef0:32,er1)              ;01046b2c12345678c9209abcdef0

-    cmp.l @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;01046b2c12345678d2209abc

-    cmp.l @0x12345678:32,@(0xffff9abc:16,r2.w)            ;01046b2c12345678e2209abc

-    cmp.l @0x12345678:32,@(0xffff9abc:16,er2.l)            ;01046b2c12345678f2209abc

-    cmp.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;01046b2c12345678da209abcdef0

-    cmp.l @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;01046b2c12345678ea209abcdef0

-    cmp.l @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;01046b2c12345678fa209abcdef0

-    cmp.l @0x12345678:32,@0xffff9abc:16                    ;01046b2c1234567840209abc

-    cmp.l @0x12345678:32,@0x9abcdef0:32                    ;01046b2c1234567848209abcdef0

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t06_ari2.exp b/gdb/testsuite/gdb.disasm/t06_ari2.exp
deleted file mode 100644
index 99ad3669d60..00000000000
--- a/gdb/testsuite/gdb.disasm/t06_ari2.exp
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t06_ari2"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "addx(.b|)\t#0x12(:8|),r1h" \
-	"addx.b #0x12:8,r1h"
-gdb_test "x" "addx(.b|)\t#0x12(:8|),@er1" \
-	"addx.b #0x12:8,@er1"
-gdb_test "x" "addx(.b|)\t#0x12(:8|),@er1-" \
-	"addx.b #0x12:8,@er1-"
-gdb_test "x" "addx(.b|)\tr3h,r1h" \
-	"addx.b r3h,r1h"
-gdb_test "x" "addx(.b|)\tr3h,@er1" \
-	"addx.b r3h,@er1"
-gdb_test "x" "addx(.b|)\tr3h,@er1-" \
-	"addx.b r3h,@er1-"
-gdb_test "x" "addx(.b|)\t@er3,r1h" \
-	"addx.b @er3,r1h"
-gdb_test "x" "addx(.b|)\t@er3,@er1" \
-	"addx.b @er3,@er1"
-gdb_test "x" "addx(.b|)\t@er3-,r1h" \
-	"addx.b @er3-,r1h"
-gdb_test "x" "addx(.b|)\t@er3-,@er1-" \
-	"addx.b @er3-,@er1-"
-gdb_test "x" "addx.w\t#0x1234(:16|),r1" \
-	"addx.w #0x1234:16,r1"
-gdb_test "x" "addx.w\t#0x1234(:16|),@er1" \
-	"addx.w #0x1234:16,@er1"
-gdb_test "x" "addx.w\t#0x1234(:16|),@er1-" \
-	"addx.w #0x1234:16,@er1-"
-gdb_test "x" "addx.w\tr3,r1" \
-	"addx.w r3,r1"
-gdb_test "x" "addx.w\tr3,@er1" \
-	"addx.w r3,@er1"
-gdb_test "x" "addx.w\tr3,@er1-" \
-	"addx.w r3,@er1-"
-gdb_test "x" "addx.w\t@er3,r1" \
-	"addx.w @er3,r1"
-gdb_test "x" "addx.w\t@er3,@er1" \
-	"addx.w @er3,@er1"
-gdb_test "x" "addx.w\t@er3-,r1" \
-	"addx.w @er3-,r1"
-gdb_test "x" "addx.w\t@er3-,@er1-" \
-	"addx.w @er3-,@er1-"
-gdb_test "x" "addx.l\t#0x12345678(:32|),er1" \
-	"addx.l #0x12345678:32,er1"
-gdb_test "x" "addx.l\t#0x12345678(:32|),@er1" \
-	"addx.l #0x12345678:32,@er1"
-gdb_test "x" "addx.l\t#0x12345678(:32|),@er1-" \
-	"addx.l #0x12345678:32,@er1-"
-gdb_test "x" "addx.l\ter3,er1" \
-	"addx.l er3,er1"
-gdb_test "x" "addx.l\ter3,@er1" \
-	"addx.l er3,@er1"
-gdb_test "x" "addx.l\ter3,@er1-" \
-	"addx.l er3,@er1-"
-gdb_test "x" "addx.l\t@er3,er1" \
-	"addx.l @er3,er1"
-gdb_test "x" "addx.l\t@er3,@er1" \
-	"addx.l @er3,@er1"
-gdb_test "x" "addx.l\t@er3-,er1" \
-	"addx.l @er3-,er1"
-gdb_test "x" "addx.l\t@er3-,@er1-" \
-	"addx.l @er3-,@er1-"
-gdb_test "x" "subx(.b|)\t#0x12(:8|),r1h" \
-	"subx.b #0x12:8,r1h"
-gdb_test "x" "subx(.b|)\t#0x12(:8|),@er1" \
-	"subx.b #0x12:8,@er1"
-gdb_test "x" "subx(.b|)\t#0x12(:8|),@er1-" \
-	"subx.b #0x12:8,@er1-"
-gdb_test "x" "subx(.b|)\tr3h,r1h" \
-	"subx.b r3h,r1h"
-gdb_test "x" "subx(.b|)\tr3h,@er1" \
-	"subx.b r3h,@er1"
-gdb_test "x" "subx(.b|)\tr3h,@er1-" \
-	"subx.b r3h,@er1-"
-gdb_test "x" "subx(.b|)\t@er3,r1h" \
-	"subx.b @er3,r1h"
-gdb_test "x" "subx(.b|)\t@er3,@er1" \
-	"subx.b @er3,@er1"
-gdb_test "x" "subx(.b|)\t@er3-,r1h" \
-	"subx.b @er3-,r1h"
-gdb_test "x" "subx(.b|)\t@er3-,@er1-" \
-	"subx.b @er3-,@er1-"
-gdb_test "x" "subx.w\t#0x1234(:16|),r1" \
-	"subx.w #0x1234:16,r1"
-gdb_test "x" "subx.w\t#0x1234(:16|),@er1" \
-	"subx.w #0x1234:16,@er1"
-gdb_test "x" "subx.w\t#0x1234(:16|),@er1-" \
-	"subx.w #0x1234:16,@er1-"
-gdb_test "x" "subx.w\tr3,r1" \
-	"subx.w r3,r1"
-gdb_test "x" "subx.w\tr3,@er1" \
-	"subx.w r3,@er1"
-gdb_test "x" "subx.w\tr3,@er1-" \
-	"subx.w r3,@er1-"
-gdb_test "x" "subx.w\t@er3,r1" \
-	"subx.w @er3,r1"
-gdb_test "x" "subx.w\t@er3,@er1" \
-	"subx.w @er3,@er1"
-gdb_test "x" "subx.w\t@er3-,r1" \
-	"subx.w @er3-,r1"
-gdb_test "x" "subx.w\t@er3-,@er1-" \
-	"subx.w @er3-,@er1-"
-gdb_test "x" "subx.l\t#0x12345678(:32|),er1" \
-	"subx.l #0x12345678:32,er1"
-gdb_test "x" "subx.l\t#0x12345678(:32|),@er1" \
-	"subx.l #0x12345678:32,@er1"
-gdb_test "x" "subx.l\t#0x12345678(:32|),@er1-" \
-	"subx.l #0x12345678:32,@er1-"
-gdb_test "x" "subx.l\ter3,er1" \
-	"subx.l er3,er1"
-gdb_test "x" "subx.l\ter3,@er1" \
-	"subx.l er3,@er1"
-gdb_test "x" "subx.l\ter3,@er1-" \
-	"subx.l er3,@er1-"
-gdb_test "x" "subx.l\t@er3,er1" \
-	"subx.l @er3,er1"
-gdb_test "x" "subx.l\t@er3,@er1" \
-	"subx.l @er3,@er1"
-gdb_test "x" "subx.l\t@er3-,er1" \
-	"subx.l @er3-,er1"
-gdb_test "x" "subx.l\t@er3-,@er1-" \
-	"subx.l @er3-,@er1-"
-gdb_test "x" "inc(.b|)\tr1h" \
-	"inc.b r1h"
-gdb_test "x" "inc(.w|)\t#1,r1" \
-	"inc.w #1,r1"
-gdb_test "x" "inc(.w|)\t#2,r1" \
-	"inc.w #2,r1"
-gdb_test "x" "inc(.l|)\t#1,er1" \
-	"inc.l #1,er1"
-gdb_test "x" "inc(.l|)\t#2,er1" \
-	"inc.l #2,er1"
-gdb_test "x" "dec(.b|)\tr1h" \
-	"dec.b r1h"
-gdb_test "x" "dec(.w|)\t#1,r1" \
-	"dec.w #1,r1"
-gdb_test "x" "dec(.w|)\t#2,r1" \
-	"dec.w #2,r1"
-gdb_test "x" "dec(.l|)\t#1,er1" \
-	"dec.l #1,er1"
-gdb_test "x" "dec(.l|)\t#2,er1" \
-	"dec.l #2,er1"
-gdb_test "x" "adds(.l|)\t#1,er1" \
-	"adds.l #1,er1"
-gdb_test "x" "adds(.l|)\t#2,er1" \
-	"adds.l #2,er1"
-gdb_test "x" "adds(.l|)\t#4,er1" \
-	"adds.l #4,er1"
-gdb_test "x" "subs(.l|)\t#1,er1" \
-	"subs.l #1,er1"
-gdb_test "x" "subs(.l|)\t#2,er1" \
-	"subs.l #2,er1"
-gdb_test "x" "subs(.l|)\t#4,er1" \
-	"subs.l #4,er1"
-gdb_test "x" "daa(.b|)\tr1h" \
-	"daa.b r1h"
-gdb_test "x" "das(.b|)\tr1h" \
-	"das.b r1h"
-gdb_test "x" "mulxu.b\t#0xf(:4|),r1" \
-	"mulxu.b #0xf:4,r1"
-gdb_test "x" "mulxu.b\tr3h,r1" \
-	"mulxu.b r3h,r1"
-gdb_test "x" "mulxu.w\t#0xf(:4|),er1" \
-	"mulxu.w #0xf:4,er1"
-gdb_test "x" "mulxu.w\tr3,er1" \
-	"mulxu.w r3,er1"
-gdb_test "x" "divxu.b\t#0xf(:4|),r1" \
-	"divxu.b #0xf:4,r1"
-gdb_test "x" "divxu.b\tr3h,r1" \
-	"divxu.b r3h,r1"
-gdb_test "x" "divxu.w\t#0xf(:4|),er1" \
-	"divxu.w #0xf:4,er1"
-gdb_test "x" "divxu.w\tr3,er1" \
-	"divxu.w r3,er1"
-gdb_test "x" "mulxs.b\t#0xf(:4|),r1" \
-	"mulxs.b #0xf:4,r1"
-gdb_test "x" "mulxs.b\tr3h,r1" \
-	"mulxs.b r3h,r1"
-gdb_test "x" "mulxs.w\t#0xf(:4|),er1" \
-	"mulxs.w #0xf:4,er1"
-gdb_test "x" "mulxs.w\tr3,er1" \
-	"mulxs.w r3,er1"
-gdb_test "x" "divxs.b\t#0xf(:4|),r1" \
-	"divxs.b #0xf:4,r1"
-gdb_test "x" "divxs.b\tr3h,r1" \
-	"divxs.b r3h,r1"
-gdb_test "x" "divxs.w\t#0xf(:4|),er1" \
-	"divxs.w #0xf:4,er1"
-gdb_test "x" "divxs.w\tr3,er1" \
-	"divxs.w r3,er1"
-gdb_test "x" "mulu.w\t#0xf(:4|),r1" \
-	"mulu.w #0xf:4,r1"
-gdb_test "x" "mulu.w\tr3,r1" \
-	"mulu.w r3,r1"
-gdb_test "x" "mulu.l\t#0xf(:4|),er1" \
-	"mulu.l #0xf:4,er1"
-gdb_test "x" "mulu.l\ter3,er1" \
-	"mulu.l er3,er1"
-gdb_test "x" "mulu/u.l\t#0xf(:4|),er1" \
-	"mulu/u.l #0xf:4,er1"
-gdb_test "x" "mulu/u.l\ter3,er1" \
-	"mulu/u.l er3,er1"
-gdb_test "x" "muls.w\t#0xf(:4|),r1" \
-	"muls.w #0xf:4,r1"
-gdb_test "x" "muls.w\tr3,r1" \
-	"muls.w r3,r1"
-gdb_test "x" "muls.l\t#0xf(:4|),er1" \
-	"muls.l #0xf:4,er1"
-gdb_test "x" "muls.l\ter3,er1" \
-	"muls.l er3,er1"
-gdb_test "x" "muls/u.l\t#0xf(:4|),er1" \
-	"muls/u.l #0xf:4,er1"
-gdb_test "x" "muls/u.l\ter3,er1" \
-	"muls/u.l er3,er1"
-gdb_test "x" "divu.w\t#0xf(:4|),r1" \
-	"divu.w #0xf:4,r1"
-gdb_test "x" "divu.w\tr3,r1" \
-	"divu.w r3,r1"
-gdb_test "x" "divu.l\t#0xf(:4|),er1" \
-	"divu.l #0xf:4,er1"
-gdb_test "x" "divu.l\ter3,er1" \
-	"divu.l er3,er1"
-gdb_test "x" "divs.w\t#0xf(:4|),r1" \
-	"divs.w #0xf:4,r1"
-gdb_test "x" "divs.w\tr3,r1" \
-	"divs.w r3,r1"
-gdb_test "x" "divs.l\t#0xf(:4|),er1" \
-	"divs.l #0xf:4,er1"
-gdb_test "x" "divs.l\ter3,er1" \
-	"divs.l er3,er1"
diff --git a/gdb/testsuite/gdb.disasm/t06_ari2.s b/gdb/testsuite/gdb.disasm/t06_ari2.s
deleted file mode 100644
index 2c7c99f464a..00000000000
--- a/gdb/testsuite/gdb.disasm/t06_ari2.s
+++ /dev/null
@@ -1,188 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;arith_2

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    addx.b #0x12:8,r1h          ;9112

-    addx.b #0x12:8,@er1         ;7d109012

-    addx.b #0x12:8,@er1-        ;01766c189012

-

-    addx.b r3h,r1h             ;0e31

-    addx.b r3h,@er1           ;7d100e30

-    addx.b r3h,@er1-          ;01766c180e30

-

-    addx.b @er3,r1h           ;7c300e01

-    addx.b @er3,@er1         ;0174683d0110

-

-    addx.b @er3-,r1h         ;01766c300e01

-    addx.b @er3-,@er1-       ;01766c3da110

-

-    addx.w #0x1234:16,r1         ;015179111234

-    addx.w #0x1234:16,@er1        ;7d9179101234

-    addx.w #0x1234:16,@er1-       ;01566d1979101234

-

-    addx.w r3,r1             ;01510931

-    addx.w r3,@er1           ;7d910930

-    addx.w r3,@er1-          ;01566d190930

-

-    addx.w @er3,r1           ;7cb10901

-    addx.w @er3,@er1         ;0154693d0110

-

-    addx.w @er3-,r1         ;01566d310901

-    addx.w @er3-,@er1-       ;01566d3da110

-

-    addx.l #0x12345678:32,er1        ;01017a1112345678

-    addx.l #0x12345678:32,@er1        ;010469197a1012345678

-    addx.l #0x12345678:32,@er1-       ;01066d197a1012345678

-

-    addx.l er3,er1           ;01010ab1

-    addx.l er3,@er1           ;010469190ab0

-    addx.l er3,@er1-          ;01066d190ab0

-

-    addx.l @er3,er1           ;010469310a81

-    addx.l @er3,@er1         ;0104693d0110

-

-    addx.l @er3-,er1         ;01066d310a81

-    addx.l @er3-,@er1-       ;01066d3da110

-

-    subx.b #0x12:8,r1h          ;b112

-    subx.b #0x12:8,@er1         ;7d10b012

-    subx.b #0x12:8,@er1-        ;01766c18b012

-

-    subx.b r3h,r1h             ;1e31

-    subx.b r3h,@er1           ;7d101e30

-    subx.b r3h,@er1-          ;01766c181e30

-

-    subx.b @er3,r1h           ;7c301e01

-    subx.b @er3,@er1         ;0174683d0130

-

-    subx.b @er3-,r1h         ;01766c301e01

-    subx.b @er3-,@er1-       ;01766c3da130

-

-    subx.w #0x1234:16,r1         ;015179311234

-    subx.w #0x1234:16,@er1        ;7d9179301234

-    subx.w #0x1234:16,@er1-       ;01566d1979301234

-

-    subx.w r3,r1             ;01511931

-    subx.w r3,@er1           ;7d911930

-    subx.w r3,@er1-          ;01566d191930

-

-    subx.w @er3,r1           ;7cb11901

-    subx.w @er3,@er1         ;0154693d0130

-

-    subx.w @er3-,r1         ;01566d311901

-    subx.w @er3-,@er1-       ;01566d3da130

-

-    subx.l #0x12345678:32,er1        ;01017a3112345678

-    subx.l #0x12345678:32,@er1        ;010469197a3012345678

-    subx.l #0x12345678:32,@er1-       ;01066d197a3012345678

-

-    subx.l er3,er1           ;01011ab1

-    subx.l er3,@er1           ;010469191ab0

-    subx.l er3,@er1-          ;01066d191ab0

-

-    subx.l @er3,er1           ;010469311a81

-    subx.l @er3,@er1         ;0104693d0130

-

-    subx.l @er3-,er1         ;01066d311a81

-    subx.l @er3-,@er1-       ;01066d3da130

-

-    inc.b r1h                 ;0a01

-    inc.w #1,r1              ;0b51

-    inc.w #2,r1              ;0bd1

-    inc.l #1,er1              ;0b71

-    inc.l #2,er1              ;0bf1

-

-    dec.b r1h                 ;1a01

-    dec.w #1,r1              ;1b51

-    dec.w #2,r1              ;1bd1

-    dec.l #1,er1              ;1b71

-    dec.l #2,er1              ;1bf1

-

-    adds.l #1,er1             ;0b01

-    adds.l #2,er1             ;0b81

-    adds.l #4,er1             ;0b91

-

-    subs.l #1,er1             ;1b01

-    subs.l #2,er1             ;1b81

-    subs.l #4,er1             ;1b91

-

-    daa.b r1h                 ;0f01

-

-    das.b r1h                 ;1f01

-

-    mulxu.b #0xf:4,r1          ;01cc50f1

-

-    mulxu.b r3h,r1            ;5031

-

-    mulxu.w #0xf:4,er1         ;01cc52f1

-

-    mulxu.w r3,er1           ;5231

-

-    divxu.b #0xf:4,r1          ;01dc51f1

-

-    divxu.b r3h,r1            ;5131

-

-    divxu.w #0xf:4,er1         ;01dc53f1

-

-    divxu.w r3,er1           ;5331

-

-    mulxs.b #0xf:4,r1          ;01c450f1

-

-    mulxs.b r3h,r1            ;01c05031

-

-    mulxs.w #0xf:4,er1         ;01c452f1

-

-    mulxs.w r3,er1           ;01c05231

-

-    divxs.b #0xf:4,r1          ;01d451f1

-

-    divxs.b r3h,r1            ;01d05131

-

-    divxs.w #0xf:4,er1         ;01d453f1

-

-    divxs.w r3,er1           ;01d05331

-

-    mulu.w #0xf:4,r1           ;01ce50f1

-

-    mulu.w r3,r1             ;01ca5031

-

-    mulu.l #0xf:4,er1          ;01ce52f1

-

-    mulu.l er3,er1           ;01ca5231

-

-    mulu/u.l #0xf:4,er1          ;01cf52f1

-

-    mulu/u.l er3,er1           ;01cb5231

-

-    muls.w #0xf:4,r1           ;01c650f1

-

-    muls.w r3,r1             ;01c25031

-

-    muls.l #0xf:4,er1          ;01c652f1

-

-    muls.l er3,er1           ;01c25231

-

-    muls/u.l #0xf:4,er1          ;01c752f1

-

-    muls/u.l er3,er1           ;01c35231

-

-    divu.w #0xf:4,r1           ;01de51f1

-

-    divu.w r3,r1             ;01da5131

-

-    divu.l #0xf:4,er1          ;01de53f1

-

-    divu.l er3,er1            ;01da5331

-

-    divs.w #0xf:4,r1           ;01d651f1

-

-    divs.w r3,r1             ;01d25131

-

-    divs.l #0xf:4,er1          ;01d653f1

-

-    divs.l er3,er1            ;01d25331

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t07_ari3.exp b/gdb/testsuite/gdb.disasm/t07_ari3.exp
deleted file mode 100644
index 7084a950aad..00000000000
--- a/gdb/testsuite/gdb.disasm/t07_ari3.exp
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t07_ari3"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "neg.b\tr1h" \
-	"neg.b r1h"
-gdb_test "x" "neg.b\t@er1" \
-	"neg.b @er1"
-gdb_test "x" "neg.b\t@\\(0x3(:2|),er1\\)" \
-	"neg.b @(0x3:2,er1)"
-gdb_test "x" "neg.b\t@er1\\+" \
-	"neg.b @er1+"
-gdb_test "x" "neg.b\t@-er1" \
-	"neg.b @-er1"
-gdb_test "x" "neg.b\t@\\+er1" \
-	"neg.b @+er1"
-gdb_test "x" "neg.b\t@er1-" \
-	"neg.b @er1-"
-gdb_test "x" "neg.b\t@\\(0x1234(:16|),er1\\)" \
-	"neg.b @(0x1234:16,er1)"
-gdb_test "x" "neg.b\t@\\(0x12345678(:32|),er1\\)" \
-	"neg.b @(0x12345678:32,er1)"
-gdb_test "x" "neg.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"neg.b @(0x1234:16,r2l.b)"
-gdb_test "x" "neg.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"neg.b @(0x1234:16,r2.w)"
-gdb_test "x" "neg.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"neg.b @(0x1234:16,er2.l)"
-gdb_test "x" "neg.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"neg.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "neg.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"neg.b @(0x12345678:32,r2.w)"
-gdb_test "x" "neg.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"neg.b @(0x12345678:32,er2.l)"
-gdb_test "x" "neg.b\t@0x12(:8|)" \
-	"neg.b @0x12:8"
-gdb_test "x" "neg.b\t@0x1234(:16|)" \
-	"neg.b @0x1234:16"
-gdb_test "x" "neg.b\t@0x12345678(:32|)" \
-	"neg.b @0x12345678:32"
-gdb_test "x" "neg.w\tr1" \
-	"neg.w r1"
-gdb_test "x" "neg.w\t@er1" \
-	"neg.w @er1"
-gdb_test "x" "neg.w\t@\\(0x6(:2|),er1\\)" \
-	"neg.w @(0x6:2,er1)"
-gdb_test "x" "neg.w\t@er1\\+" \
-	"neg.w @er1+"
-gdb_test "x" "neg.w\t@-er1" \
-	"neg.w @-er1"
-gdb_test "x" "neg.w\t@\\+er1" \
-	"neg.w @+er1"
-gdb_test "x" "neg.w\t@er1-" \
-	"neg.w @er1-"
-gdb_test "x" "neg.w\t@\\(0x1234(:16|),er1\\)" \
-	"neg.w @(0x1234:16,er1)"
-gdb_test "x" "neg.w\t@\\(0x12345678(:32|),er1\\)" \
-	"neg.w @(0x12345678:32,er1)"
-gdb_test "x" "neg.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"neg.w @(0x1234:16,r2l.b)"
-gdb_test "x" "neg.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"neg.w @(0x1234:16,r2.w)"
-gdb_test "x" "neg.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"neg.w @(0x1234:16,er2.l)"
-gdb_test "x" "neg.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"neg.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "neg.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"neg.w @(0x12345678:32,r2.w)"
-gdb_test "x" "neg.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"neg.w @(0x12345678:32,er2.l)"
-gdb_test "x" "neg.w\t@0x1234(:16|)" \
-	"neg.w @0x1234:16"
-gdb_test "x" "neg.w\t@0x12345678(:32|)" \
-	"neg.w @0x12345678:32"
-gdb_test "x" "neg.l\ter1" \
-	"neg.l er1"
-gdb_test "x" "neg.l\t@er1" \
-	"neg.l @er1"
-gdb_test "x" "neg.l\t@\\(0xc(:2|),er1\\)" \
-	"neg.l @(0xc:2,er1)"
-gdb_test "x" "neg.l\t@er1\\+" \
-	"neg.l @er1+"
-gdb_test "x" "neg.l\t@-er1" \
-	"neg.l @-er1"
-gdb_test "x" "neg.l\t@\\+er1" \
-	"neg.l @+er1"
-gdb_test "x" "neg.l\t@er1-" \
-	"neg.l @er1-"
-gdb_test "x" "neg.l\t@\\(0x1234(:16|),er1\\)" \
-	"neg.l @(0x1234:16,er1)"
-gdb_test "x" "neg.l\t@\\(0x12345678(:32|),er1\\)" \
-	"neg.l @(0x12345678:32,er1)"
-gdb_test "x" "neg.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"neg.l @(0x1234:16,r2l.b)"
-gdb_test "x" "neg.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"neg.l @(0x1234:16,r2.w)"
-gdb_test "x" "neg.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"neg.l @(0x1234:16,er2.l)"
-gdb_test "x" "neg.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"neg.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "neg.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"neg.l @(0x12345678:32,r2.w)"
-gdb_test "x" "neg.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"neg.l @(0x12345678:32,er2.l)"
-gdb_test "x" "neg.l\t@0x1234(:16|)" \
-	"neg.l @0x1234:16"
-gdb_test "x" "neg.l\t@0x12345678(:32|)" \
-	"neg.l @0x12345678:32"
-gdb_test "x" "tas\t@er1" \
-	"tas @er1"
-gdb_test "x" "extu.w\tr1" \
-	"extu.w r1"
-gdb_test "x" "extu.w\t@er1" \
-	"extu.w @er1"
-gdb_test "x" "extu.w\t@\\(0x6(:2|),er1\\)" \
-	"extu.w @(0x6:2,er1)"
-gdb_test "x" "extu.w\t@er1\\+" \
-	"extu.w @er1+"
-gdb_test "x" "extu.w\t@-er1" \
-	"extu.w @-er1"
-gdb_test "x" "extu.w\t@\\+er1" \
-	"extu.w @+er1"
-gdb_test "x" "extu.w\t@er1-" \
-	"extu.w @er1-"
-gdb_test "x" "extu.w\t@\\(0x1234(:16|),er1\\)" \
-	"extu.w @(0x1234:16,er1)"
-gdb_test "x" "extu.w\t@\\(0x12345678(:32|),er1\\)" \
-	"extu.w @(0x12345678:32,er1)"
-gdb_test "x" "extu.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"extu.w @(0x1234:16,r2l.b)"
-gdb_test "x" "extu.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"extu.w @(0x1234:16,r2.w)"
-gdb_test "x" "extu.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"extu.w @(0x1234:16,er2.l)"
-gdb_test "x" "extu.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"extu.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "extu.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"extu.w @(0x12345678:32,r2.w)"
-gdb_test "x" "extu.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"extu.w @(0x12345678:32,er2.l)"
-gdb_test "x" "extu.w\t@0x1234(:16|)" \
-	"extu.w @0x1234:16"
-gdb_test "x" "extu.w\t@0x12345678(:32|)" \
-	"extu.w @0x12345678:32"
-gdb_test "x" "extu.l\ter1" \
-	"extu.l er1"
-gdb_test "x" "extu.l\t@er1" \
-	"extu.l @er1"
-gdb_test "x" "extu.l\t@\\(0xc(:2|),er1\\)" \
-	"extu.l @(0xc:2,er1)"
-gdb_test "x" "extu.l\t@er1\\+" \
-	"extu.l @er1+"
-gdb_test "x" "extu.l\t@-er1" \
-	"extu.l @-er1"
-gdb_test "x" "extu.l\t@\\+er1" \
-	"extu.l @+er1"
-gdb_test "x" "extu.l\t@er1-" \
-	"extu.l @er1-"
-gdb_test "x" "extu.l\t@\\(0x1234(:16|),er1\\)" \
-	"extu.l @(0x1234:16,er1)"
-gdb_test "x" "extu.l\t@\\(0x12345678(:32|),er1\\)" \
-	"extu.l @(0x12345678:32,er1)"
-gdb_test "x" "extu.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"extu.l @(0x1234:16,r2l.b)"
-gdb_test "x" "extu.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"extu.l @(0x1234:16,r2.w)"
-gdb_test "x" "extu.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"extu.l @(0x1234:16,er2.l)"
-gdb_test "x" "extu.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"extu.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "extu.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"extu.l @(0x12345678:32,r2.w)"
-gdb_test "x" "extu.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"extu.l @(0x12345678:32,er2.l)"
-gdb_test "x" "extu.l\t@0x1234(:16|)" \
-	"extu.l @0x1234:16"
-gdb_test "x" "extu.l\t@0x12345678(:32|)" \
-	"extu.l @0x12345678:32"
-gdb_test "x" "extu.l\t#2,er1" \
-	"extu.l #2,er1"
-gdb_test "x" "extu.l\t#2,@er1" \
-	"extu.l #2,@er1"
-gdb_test "x" "extu.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"extu.l #2,@(0xc:2,er1)"
-gdb_test "x" "extu.l\t#2,@er1\\+" \
-	"extu.l #2,@er1+"
-gdb_test "x" "extu.l\t#2,@-er1" \
-	"extu.l #2,@-er1"
-gdb_test "x" "extu.l\t#2,@\\+er1" \
-	"extu.l #2,@+er1"
-gdb_test "x" "extu.l\t#2,@er1-" \
-	"extu.l #2,@er1-"
-gdb_test "x" "extu.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"extu.l #2,@(0x1234:16,er1)"
-gdb_test "x" "extu.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"extu.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "extu.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"extu.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "extu.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"extu.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "extu.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"extu.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "extu.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"extu.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "extu.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"extu.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "extu.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"extu.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "extu.l\t#2,@0x1234(:16|)" \
-	"extu.l #2,@0x1234:16"
-gdb_test "x" "extu.l\t#2,@0x12345678(:32|)" \
-	"extu.l #2,@0x12345678:32"
-gdb_test "x" "exts.w\tr1" \
-	"exts.w r1"
-gdb_test "x" "exts.w\t@er1" \
-	"exts.w @er1"
-gdb_test "x" "exts.w\t@\\(0x6(:2|),er1\\)" \
-	"exts.w @(0x6:2,er1)"
-gdb_test "x" "exts.w\t@er1\\+" \
-	"exts.w @er1+"
-gdb_test "x" "exts.w\t@-er1" \
-	"exts.w @-er1"
-gdb_test "x" "exts.w\t@\\+er1" \
-	"exts.w @+er1"
-gdb_test "x" "exts.w\t@er1-" \
-	"exts.w @er1-"
-gdb_test "x" "exts.w\t@\\(0x1234(:16|),er1\\)" \
-	"exts.w @(0x1234:16,er1)"
-gdb_test "x" "exts.w\t@\\(0x12345678(:32|),er1\\)" \
-	"exts.w @(0x12345678:32,er1)"
-gdb_test "x" "exts.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"exts.w @(0x1234:16,r2l.b)"
-gdb_test "x" "exts.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"exts.w @(0x1234:16,r2.w)"
-gdb_test "x" "exts.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"exts.w @(0x1234:16,er2.l)"
-gdb_test "x" "exts.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"exts.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "exts.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"exts.w @(0x12345678:32,r2.w)"
-gdb_test "x" "exts.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"exts.w @(0x12345678:32,er2.l)"
-gdb_test "x" "exts.w\t@0x1234(:16|)" \
-	"exts.w @0x1234:16"
-gdb_test "x" "exts.w\t@0x12345678(:32|)" \
-	"exts.w @0x12345678:32"
-gdb_test "x" "exts.l\ter1" \
-	"exts.l er1"
-gdb_test "x" "exts.l\t@er1" \
-	"exts.l @er1"
-gdb_test "x" "exts.l\t@\\(0xc(:2|),er1\\)" \
-	"exts.l @(0xc:2,er1)"
-gdb_test "x" "exts.l\t@er1\\+" \
-	"exts.l @er1+"
-gdb_test "x" "exts.l\t@-er1" \
-	"exts.l @-er1"
-gdb_test "x" "exts.l\t@\\+er1" \
-	"exts.l @+er1"
-gdb_test "x" "exts.l\t@er1-" \
-	"exts.l @er1-"
-gdb_test "x" "exts.l\t@\\(0x1234(:16|),er1\\)" \
-	"exts.l @(0x1234:16,er1)"
-gdb_test "x" "exts.l\t@\\(0x12345678(:32|),er1\\)" \
-	"exts.l @(0x12345678:32,er1)"
-gdb_test "x" "exts.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"exts.l @(0x1234:16,r2l.b)"
-gdb_test "x" "exts.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"exts.l @(0x1234:16,r2.w)"
-gdb_test "x" "exts.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"exts.l @(0x1234:16,er2.l)"
-gdb_test "x" "exts.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"exts.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "exts.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"exts.l @(0x12345678:32,r2.w)"
-gdb_test "x" "exts.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"exts.l @(0x12345678:32,er2.l)"
-gdb_test "x" "exts.l\t@0x1234(:16|)" \
-	"exts.l @0x1234:16"
-gdb_test "x" "exts.l\t@0x12345678(:32|)" \
-	"exts.l @0x12345678:32"
-gdb_test "x" "exts.l\t#2,er1" \
-	"exts.l #2,er1"
-gdb_test "x" "exts.l\t#2,@er1" \
-	"exts.l #2,@er1"
-gdb_test "x" "exts.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"exts.l #2,@(0xc:2,er1)"
-gdb_test "x" "exts.l\t#2,@er1\\+" \
-	"exts.l #2,@er1+"
-gdb_test "x" "exts.l\t#2,@-er1" \
-	"exts.l #2,@-er1"
-gdb_test "x" "exts.l\t#2,@\\+er1" \
-	"exts.l #2,@+er1"
-gdb_test "x" "exts.l\t#2,@er1-" \
-	"exts.l #2,@er1-"
-gdb_test "x" "exts.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"exts.l #2,@(0x1234:16,er1)"
-gdb_test "x" "exts.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"exts.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "exts.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"exts.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "exts.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"exts.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "exts.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"exts.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "exts.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"exts.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "exts.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"exts.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "exts.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"exts.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "exts.l\t#2,@0x1234(:16|)" \
-	"exts.l #2,@0x1234:16"
-gdb_test "x" "exts.l\t#2,@0x12345678(:32|)" \
-	"exts.l #2,@0x12345678:32"
diff --git a/gdb/testsuite/gdb.disasm/t07_ari3.s b/gdb/testsuite/gdb.disasm/t07_ari3.s
deleted file mode 100644
index 985c6844a25..00000000000
--- a/gdb/testsuite/gdb.disasm/t07_ari3.s
+++ /dev/null
@@ -1,173 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;arith_3

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    neg.b r1h                 ;1781

-    neg.b @er1               ;7d101780

-    neg.b @(0x3:2,er1)         ;017768181780

-    neg.b @er1+              ;01746c181780

-    neg.b @-er1              ;01776c181780

-    neg.b @+er1              ;01756c181780

-    neg.b @er1-              ;01766c181780

-    neg.b @(0x1234:16,er1)        ;01746e1812341780

-    neg.b @(0x12345678:32,er1)        ;78146a28123456781780

-    neg.b @(0x1234:16,r2l.b)      ;01756e2812341780

-    neg.b @(0x1234:16,r2.w)      ;01766e2812341780

-    neg.b @(0x1234:16,er2.l)      ;01776e2812341780

-    neg.b @(0x12345678:32,r2l.b)      ;78256a28123456781780

-    neg.b @(0x12345678:32,r2.w)      ;78266a28123456781780

-    neg.b @(0x12345678:32,er2.l)      ;78276a28123456781780

-    neg.b @0xffffff12:8              ;7f121780

-    neg.b @0x1234:16             ;6a1812341780

-    neg.b @0x12345678:32             ;6a38123456781780

-

-    neg.w r1                 ;1791

-    neg.w @er1               ;7d901790

-    neg.w @(0x6:2,er1)      ;015769181790

-    neg.w @er1+              ;01546d181790

-    neg.w @-er1              ;01576d181790

-    neg.w @+er1              ;01556d181790

-    neg.w @er1-              ;01566d181790

-    neg.w @(0x1234:16,er1)        ;01546f1812341790

-    neg.w @(0x12345678:32,er1)        ;78146b28123456781790

-    neg.w @(0x1234:16,r2l.b)      ;01556f2812341790

-    neg.w @(0x1234:16,r2.w)      ;01566f2812341790

-    neg.w @(0x1234:16,er2.l)      ;01576f2812341790

-    neg.w @(0x12345678:32,r2l.b)      ;78256b28123456781790

-    neg.w @(0x12345678:32,r2.w)      ;78266b28123456781790

-    neg.w @(0x12345678:32,er2.l)      ;78276b28123456781790

-    neg.w @0x1234:16             ;6b1812341790

-    neg.w @0x12345678:32             ;6b38123456781790

-

-    neg.l er1                 ;17b1

-    neg.l @er1               ;0104691817b0

-    neg.l @(0xc:2,er1)      ;0107691817b0

-    neg.l @er1+              ;01046d1817b0

-    neg.l @-er1              ;01076d1817b0

-    neg.l @+er1              ;01056d1817b0

-    neg.l @er1-              ;01066d1817b0

-    neg.l @(0x1234:16,er1)        ;01046f18123417b0

-    neg.l @(0x12345678:32,er1)        ;78946b281234567817b0

-    neg.l @(0x1234:16,r2l.b)      ;01056f28123417b0

-    neg.l @(0x1234:16,r2.w)      ;01066f28123417b0

-    neg.l @(0x1234:16,er2.l)      ;01076f28123417b0

-    neg.l @(0x12345678:32,r2l.b)      ;78a56b281234567817b0

-    neg.l @(0x12345678:32,r2.w)      ;78a66b281234567817b0

-    neg.l @(0x12345678:32,er2.l)      ;78a76b281234567817b0

-    neg.l @0x1234:16             ;01046b08123417b0

-    neg.l @0x12345678:32             ;01046b281234567817b0

-

-    tas @er1                 ;01e07b1c

-

-    extu.w r1                ;1751

-    extu.w @er1              ;7d901750

-    extu.w @(0x6:2,er1)     ;015769181750

-    extu.w @er1+             ;01546d181750

-    extu.w @-er1             ;01576d181750

-    extu.w @+er1             ;01556d181750

-    extu.w @er1-             ;01566d181750

-    extu.w @(0x1234:16,er1)       ;01546f1812341750

-    extu.w @(0x12345678:32,er1)       ;78146b28123456781750

-    extu.w @(0x1234:16,r2l.b)     ;01556f2812341750

-    extu.w @(0x1234:16,r2.w)     ;01566f2812341750

-    extu.w @(0x1234:16,er2.l)     ;01576f2812341750

-    extu.w @(0x12345678:32,r2l.b)     ;78256b28123456781750

-    extu.w @(0x12345678:32,r2.w)     ;78266b28123456781750

-    extu.w @(0x12345678:32,er2.l)     ;78276b28123456781750

-    extu.w @0x1234:16            ;6b1812341750

-    extu.w @0x12345678:32            ;6b38123456781750

-

-    extu.l er1                ;1771

-    extu.l @er1              ;010469181770

-    extu.l @(0xc:2,er1)     ;010769181770

-    extu.l @er1+             ;01046d181770

-    extu.l @-er1             ;01076d181770

-    extu.l @+er1             ;01056d181770

-    extu.l @er1-             ;01066d181770

-    extu.l @(0x1234:16,er1)       ;01046f1812341770

-    extu.l @(0x12345678:32,er1)       ;78946b28123456781770

-    extu.l @(0x1234:16,r2l.b)     ;01056f2812341770

-    extu.l @(0x1234:16,r2.w)     ;01066f2812341770

-    extu.l @(0x1234:16,er2.l)     ;01076f2812341770

-    extu.l @(0x12345678:32,r2l.b)     ;78a56b28123456781770

-    extu.l @(0x12345678:32,r2.w)     ;78a66b28123456781770

-    extu.l @(0x12345678:32,er2.l)     ;78a76b28123456781770

-    extu.l @0x1234:16            ;01046b0812341770

-    extu.l @0x12345678:32            ;01046b28123456781770

-

-    extu.l #2,er1             ;1761

-    extu.l #2,@er1           ;010469181760

-    extu.l #2,@(0xc:2,er1)  ;010769181760

-    extu.l #2,@er1+          ;01046d181760

-    extu.l #2,@-er1          ;01076d181760

-    extu.l #2,@+er1          ;01056d181760

-    extu.l #2,@er1-          ;01066d181760

-    extu.l #2,@(0x1234:16,er1)    ;01046f1812341760

-    extu.l #2,@(0x12345678:32,er1)    ;78946b28123456781760

-    extu.l #2,@(0x1234:16,r2l.b)  ;01056f2812341760

-    extu.l #2,@(0x1234:16,r2.w)  ;01066f2812341760

-    extu.l #2,@(0x1234:16,er2.l)  ;01076f2812341760

-    extu.l #2,@(0x12345678:32,r2l.b)  ;78a56b28123456781760

-    extu.l #2,@(0x12345678:32,r2.w)  ;78a66b28123456781760

-    extu.l #2,@(0x12345678:32,er2.l)  ;78a76b28123456781760

-    extu.l #2,@0x1234:16         ;01046b0812341760

-    extu.l #2,@0x12345678:32         ;01046b28123456781760

-

-    exts.w r1                ;17d1

-    exts.w @er1              ;7d9017d0

-    exts.w @(0x6:2,er1)     ;0157691817d0

-    exts.w @er1+             ;01546d1817d0

-    exts.w @-er1             ;01576d1817d0

-    exts.w @+er1             ;01556d1817d0

-    exts.w @er1-             ;01566d1817d0

-    exts.w @(0x1234:16,er1)       ;01546f18123417d0

-    exts.w @(0x12345678:32,er1)       ;78146b281234567817d0

-    exts.w @(0x1234:16,r2l.b)     ;01556f28123417d0

-    exts.w @(0x1234:16,r2.w)     ;01566f28123417d0

-    exts.w @(0x1234:16,er2.l)     ;01576f28123417d0

-    exts.w @(0x12345678:32,r2l.b)     ;78256b281234567817d0

-    exts.w @(0x12345678:32,r2.w)     ;78266b281234567817d0

-    exts.w @(0x12345678:32,er2.l)     ;78276b281234567817d0

-    exts.w @0x1234:16            ;6b18123417d0

-    exts.w @0x12345678:32            ;6b381234567817d0

-

-    exts.l er1                ;17f1

-    exts.l @er1              ;0104691817f0

-    exts.l @(0xc:2,er1)     ;0107691817f0

-    exts.l @er1+             ;01046d1817f0

-    exts.l @-er1             ;01076d1817f0

-    exts.l @+er1             ;01056d1817f0

-    exts.l @er1-             ;01066d1817f0

-    exts.l @(0x1234:16,er1)       ;01046f18123417f0

-    exts.l @(0x12345678:32,er1)       ;78946b281234567817f0

-    exts.l @(0x1234:16,r2l.b)     ;01056f28123417f0

-    exts.l @(0x1234:16,r2.w)     ;01066f28123417f0

-    exts.l @(0x1234:16,er2.l)     ;01076f28123417f0

-    exts.l @(0x12345678:32,r2l.b)     ;78a56b281234567817f0

-    exts.l @(0x12345678:32,r2.w)     ;78a66b281234567817f0

-    exts.l @(0x12345678:32,er2.l)     ;78a76b281234567817f0

-    exts.l @0x1234:16            ;01046b08123417f0

-    exts.l @0x12345678:32            ;01046b281234567817f0

-

-    exts.l #2,er1             ;17e1

-    exts.l #2,@er1           ;0104691817e0

-    exts.l #2,@(0xc:2,er1)  ;0107691817e0

-    exts.l #2,@er1+          ;01046d1817e0

-    exts.l #2,@-er1          ;01076d1817e0

-    exts.l #2,@+er1          ;01056d1817e0

-    exts.l #2,@er1-          ;01066d1817e0

-    exts.l #2,@(0x1234:16,er1)    ;01046f18123417e0

-    exts.l #2,@(0x12345678:32,er1)    ;78946b281234567817e0

-    exts.l #2,@(0x1234:16,r2l.b)  ;01056f28123417e0

-    exts.l #2,@(0x1234:16,r2.w)  ;01066f28123417e0

-    exts.l #2,@(0x1234:16,er2.l)  ;01076f28123417e0

-    exts.l #2,@(0x12345678:32,r2l.b)  ;78a56b281234567817e0

-    exts.l #2,@(0x12345678:32,r2.w)  ;78a66b281234567817e0

-    exts.l #2,@(0x12345678:32,er2.l)  ;78a76b281234567817e0

-    exts.l #2,@0x1234:16         ;01046b08123417e0

-    exts.l #2,@0x12345678:32         ;01046b281234567817e0

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t08_or.exp b/gdb/testsuite/gdb.disasm/t08_or.exp
deleted file mode 100644
index 5652cf75550..00000000000
--- a/gdb/testsuite/gdb.disasm/t08_or.exp
+++ /dev/null
@@ -1,1866 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t08_or"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "or.b\t#0x12(:8|),r1h" \
-	"or.b #0x12:8,r1h"
-gdb_test "x" "or.b\t#0x12(:8|),@er1" \
-	"or.b #0x12:8,@er1"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x3(:2|),er1\\)" \
-	"or.b #0x12:8,@(0x3:2,er1)"
-gdb_test "x" "or.b\t#0x12(:8|),@er1\\+" \
-	"or.b #0x12:8,@er1+"
-gdb_test "x" "or.b\t#0x12(:8|),@-er1" \
-	"or.b #0x12:8,@-er1"
-gdb_test "x" "or.b\t#0x12(:8|),@\\+er1" \
-	"or.b #0x12:8,@+er1"
-gdb_test "x" "or.b\t#0x12(:8|),@er1-" \
-	"or.b #0x12:8,@er1-"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x1234(:16|),er1\\)" \
-	"or.b #0x12:8,@(0x1234:16,er1)"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x12345678(:32|),er1\\)" \
-	"or.b #0x12:8,@(0x12345678:32,er1)"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x1234(:16|),r2l.b\\)" \
-	"or.b #0x12:8,@(0x1234:16,r2l.b)"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x1234(:16|),r2.w\\)" \
-	"or.b #0x12:8,@(0x1234:16,r2.w)"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x1234(:16|),er2.l\\)" \
-	"or.b #0x12:8,@(0x1234:16,er2.l)"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x12345678(:32|),r2l.b\\)" \
-	"or.b #0x12:8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x12345678(:32|),r2.w\\)" \
-	"or.b #0x12:8,@(0x12345678:32,r2.w)"
-gdb_test "x" "or.b\t#0x12(:8|),@\\(0x12345678(:32|),er2.l\\)" \
-	"or.b #0x12:8,@(0x12345678:32,er2.l)"
-gdb_test "x" "or.b\t#0x12(:8|),@0x12(:8|)" \
-	"or.b #0x12:8,@0x12:8"
-gdb_test "x" "or.b\t#0x12(:8|),@0x1234(:16|)" \
-	"or.b #0x12:8,@0x1234:16"
-gdb_test "x" "or.b\t#0x12(:8|),@0x12345678(:32|)" \
-	"or.b #0x12:8,@0x12345678:32"
-gdb_test "x" "or.b\tr3h,r1h" \
-	"or.b r3h,r1h"
-gdb_test "x" "or.b\tr3h,@er1" \
-	"or.b r3h,@er1"
-gdb_test "x" "or.b\tr3h,@\\(0x3(:2|),er1\\)" \
-	"or.b r3h,@(0x3:2,er1)"
-gdb_test "x" "or.b\tr3h,@er1\\+" \
-	"or.b r3h,@er1+"
-gdb_test "x" "or.b\tr3h,@-er1" \
-	"or.b r3h,@-er1"
-gdb_test "x" "or.b\tr3h,@\\+er1" \
-	"or.b r3h,@+er1"
-gdb_test "x" "or.b\tr3h,@er1-" \
-	"or.b r3h,@er1-"
-gdb_test "x" "or.b\tr3h,@\\(0x1234(:16|),er1\\)" \
-	"or.b r3h,@(0x1234:16,er1)"
-gdb_test "x" "or.b\tr3h,@\\(0x12345678(:32|),er1\\)" \
-	"or.b r3h,@(0x12345678:32,er1)"
-gdb_test "x" "or.b\tr3h,@\\(0x1234(:16|),r2l.b\\)" \
-	"or.b r3h,@(0x1234:16,r2l.b)"
-gdb_test "x" "or.b\tr3h,@\\(0x1234(:16|),r2.w\\)" \
-	"or.b r3h,@(0x1234:16,r2.w)"
-gdb_test "x" "or.b\tr3h,@\\(0x1234(:16|),er2.l\\)" \
-	"or.b r3h,@(0x1234:16,er2.l)"
-gdb_test "x" "or.b\tr3h,@\\(0x12345678(:32|),r2l.b\\)" \
-	"or.b r3h,@(0x12345678:32,r2l.b)"
-gdb_test "x" "or.b\tr3h,@\\(0x12345678(:32|),r2.w\\)" \
-	"or.b r3h,@(0x12345678:32,r2.w)"
-gdb_test "x" "or.b\tr3h,@\\(0x12345678(:32|),er2.l\\)" \
-	"or.b r3h,@(0x12345678:32,er2.l)"
-gdb_test "x" "or.b\tr3h,@0x12(:8|)" \
-	"or.b r3h,@0x12:8"
-gdb_test "x" "or.b\tr3h,@0x1234(:16|)" \
-	"or.b r3h,@0x1234:16"
-gdb_test "x" "or.b\tr3h,@0x12345678(:32|)" \
-	"or.b r3h,@0x12345678:32"
-gdb_test "x" "or.b\t@er3,r1h" \
-	"or.b @er3,r1h"
-gdb_test "x" "or.b\t@\\(0x3(:2|),er3\\),r1h" \
-	"or.b @(0x3:2,er3),r1h"
-gdb_test "x" "or.b\t@er3\\+,r1h" \
-	"or.b @er3+,r1h"
-gdb_test "x" "or.b\t@-er3,r1h" \
-	"or.b @-er3,r1h"
-gdb_test "x" "or.b\t@\\+er3,r1h" \
-	"or.b @+er3,r1h"
-gdb_test "x" "or.b\t@er3-,r1h" \
-	"or.b @er3-,r1h"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er1\\),r1h" \
-	"or.b @(0x1234:16,er1),r1h"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er1\\),r1h" \
-	"or.b @(0x12345678:32,er1),r1h"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r2l.b\\),r1h" \
-	"or.b @(0x1234:16,r2l.b),r1h"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r2.w\\),r1h" \
-	"or.b @(0x1234:16,r2.w),r1h"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er2.l\\),r1h" \
-	"or.b @(0x1234:16,er2.l),r1h"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r2l.b\\),r1h" \
-	"or.b @(0x12345678:32,r2l.b),r1h"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r2.w\\),r1h" \
-	"or.b @(0x12345678:32,r2.w),r1h"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er2.l\\),r1h" \
-	"or.b @(0x12345678:32,er2.l),r1h"
-gdb_test "x" "or.b\t@0x12(:8|),r1h" \
-	"or.b @0x12:8,r1h"
-gdb_test "x" "or.b\t@0x1234(:16|),r1h" \
-	"or.b @0x1234:16,r1h"
-gdb_test "x" "or.b\t@0x12345678(:32|),r1h" \
-	"or.b @0x12345678:32,r1h"
-gdb_test "x" "or.b\t@er3,@er1" \
-	"or.b @er3,@er1"
-gdb_test "x" "or.b\t@er3,@\\(0x3(:2|),er1\\)" \
-	"or.b @er3,@(0x3:2,er1)"
-gdb_test "x" "or.b\t@er3,@-er1" \
-	"or.b @er3,@-er1"
-gdb_test "x" "or.b\t@er3,@er1\\+" \
-	"or.b @er3,@er1+"
-gdb_test "x" "or.b\t@er3,@er1-" \
-	"or.b @er3,@er1-"
-gdb_test "x" "or.b\t@er3,@\\+er1" \
-	"or.b @er3,@+er1"
-gdb_test "x" "or.b\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.b @er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@er3,@0x9abc(:16|)" \
-	"or.b @er3,@0x9abc:16"
-gdb_test "x" "or.b\t@er3,@0x9abcdef0(:32|)" \
-	"or.b @er3,@0x9abcdef0:32"
-gdb_test "x" "or.b\t@-er3,@er1" \
-	"or.b @-er3,@er1"
-gdb_test "x" "or.b\t@-er3,@\\(0x3(:2|),er1\\)" \
-	"or.b @-er3,@(0x3:2,er1)"
-gdb_test "x" "or.b\t@-er3,@-er1" \
-	"or.b @-er3,@-er1"
-gdb_test "x" "or.b\t@-er3,@er1\\+" \
-	"or.b @-er3,@er1+"
-gdb_test "x" "or.b\t@-er3,@er1-" \
-	"or.b @-er3,@er1-"
-gdb_test "x" "or.b\t@-er3,@\\+er1" \
-	"or.b @-er3,@+er1"
-gdb_test "x" "or.b\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.b @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@-er3,@0x9abc(:16|)" \
-	"or.b @-er3,@0x9abc:16"
-gdb_test "x" "or.b\t@-er3,@0x9abcdef0(:32|)" \
-	"or.b @-er3,@0x9abcdef0:32"
-gdb_test "x" "or.b\t@er3\\+,@er1" \
-	"or.b @er3+,@er1"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x3(:2|),er1\\)" \
-	"or.b @er3+,@(0x3:2,er1)"
-gdb_test "x" "or.b\t@er3\\+,@-er1" \
-	"or.b @er3+,@-er1"
-gdb_test "x" "or.b\t@er3\\+,@er1\\+" \
-	"or.b @er3+,@er1+"
-gdb_test "x" "or.b\t@er3\\+,@er1-" \
-	"or.b @er3+,@er1-"
-gdb_test "x" "or.b\t@er3\\+,@\\+er1" \
-	"or.b @er3+,@+er1"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"or.b @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@er3\\+,@0x9abc(:16|)" \
-	"or.b @er3+,@0x9abc:16"
-gdb_test "x" "or.b\t@er3\\+,@0x9abcdef0(:32|)" \
-	"or.b @er3+,@0x9abcdef0:32"
-gdb_test "x" "or.b\t@er3-,@er1" \
-	"or.b @er3-,@er1"
-gdb_test "x" "or.b\t@er3-,@\\(0x3(:2|),er1\\)" \
-	"or.b @er3-,@(0x3:2,er1)"
-gdb_test "x" "or.b\t@er3-,@-er1" \
-	"or.b @er3-,@-er1"
-gdb_test "x" "or.b\t@er3-,@er1\\+" \
-	"or.b @er3-,@er1+"
-gdb_test "x" "or.b\t@er3-,@er1-" \
-	"or.b @er3-,@er1-"
-gdb_test "x" "or.b\t@er3-,@\\+er1" \
-	"or.b @er3-,@+er1"
-gdb_test "x" "or.b\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"or.b @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@er3-,@0x9abc(:16|)" \
-	"or.b @er3-,@0x9abc:16"
-gdb_test "x" "or.b\t@er3-,@0x9abcdef0(:32|)" \
-	"or.b @er3-,@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\+er3,@er1" \
-	"or.b @+er3,@er1"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x3(:2|),er1\\)" \
-	"or.b @+er3,@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\+er3,@-er1" \
-	"or.b @+er3,@-er1"
-gdb_test "x" "or.b\t@\\+er3,@er1\\+" \
-	"or.b @+er3,@er1+"
-gdb_test "x" "or.b\t@\\+er3,@er1-" \
-	"or.b @+er3,@er1-"
-gdb_test "x" "or.b\t@\\+er3,@\\+er1" \
-	"or.b @+er3,@+er1"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.b @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\+er3,@0x9abc(:16|)" \
-	"or.b @+er3,@0x9abc:16"
-gdb_test "x" "or.b\t@\\+er3,@0x9abcdef0(:32|)" \
-	"or.b @+er3,@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@er1" \
-	"or.b @(0x1234:16,er3),@er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"or.b @(0x1234:16,er3),@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"or.b @(0x1234:16,er3),@-er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"or.b @(0x1234:16,er3),@er1+"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"or.b @(0x1234:16,er3),@er1-"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"or.b @(0x1234:16,er3),@+er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"or.b @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"or.b @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"or.b @(0x12345678:32,er3),@er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"or.b @(0x12345678:32,er3),@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"or.b @(0x12345678:32,er3),@-er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"or.b @(0x12345678:32,er3),@er1+"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"or.b @(0x12345678:32,er3),@er1-"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"or.b @(0x12345678:32,er3),@+er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"or.b @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"or.b @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"or.b @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"or.b @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"or.b @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"or.b @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"or.b @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"or.b @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"or.b @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"or.b @(0x1234:16,r3.w),@er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"or.b @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"or.b @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"or.b @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"or.b @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"or.b @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"or.b @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"or.b @(0x1234:16,er3.l),@er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"or.b @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"or.b @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"or.b @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"or.b @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"or.b @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "or.b\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"or.b @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"or.b @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"or.b @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"or.b @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"or.b @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"or.b @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"or.b @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"or.b @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"or.b @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"or.b @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"or.b @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"or.b @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"or.b @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"or.b @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"or.b @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"or.b @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x3:2,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"or.b @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"or.b @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"or.b @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"or.b @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"or.b @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "or.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"or.b @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "or.b\t@0x1234(:16|),@er1" \
-	"or.b @0x1234:16,@er1"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x3(:2|),er1\\)" \
-	"or.b @0x1234:16,@(0x3:2,er1)"
-gdb_test "x" "or.b\t@0x1234(:16|),@-er1" \
-	"or.b @0x1234:16,@-er1"
-gdb_test "x" "or.b\t@0x1234(:16|),@er1\\+" \
-	"or.b @0x1234:16,@er1+"
-gdb_test "x" "or.b\t@0x1234(:16|),@er1-" \
-	"or.b @0x1234:16,@er1-"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\+er1" \
-	"or.b @0x1234:16,@+er1"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@0x1234(:16|),@0x9abc(:16|)" \
-	"or.b @0x1234:16,@0x9abc:16"
-gdb_test "x" "or.b\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"or.b @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "or.b\t@0x12345678(:32|),@er1" \
-	"or.b @0x12345678:32,@er1"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x3(:2|),er1\\)" \
-	"or.b @0x12345678:32,@(0x3:2,er1)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@-er1" \
-	"or.b @0x12345678:32,@-er1"
-gdb_test "x" "or.b\t@0x12345678(:32|),@er1\\+" \
-	"or.b @0x12345678:32,@er1+"
-gdb_test "x" "or.b\t@0x12345678(:32|),@er1-" \
-	"or.b @0x12345678:32,@er1-"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\+er1" \
-	"or.b @0x12345678:32,@+er1"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"or.b @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.b @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.b @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.b @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.b @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.b @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.b @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.b\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"or.b @0x12345678:32,@0x9abc:16"
-gdb_test "x" "or.b\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"or.b @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "or.w\t#0x1234(:16|),r1" \
-	"or.w #0x1234:16,r1"
-gdb_test "x" "or.w\t#0x1234(:16|),@er1" \
-	"or.w #0x1234:16,@er1"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"or.w #0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "or.w\t#0x1234(:16|),@er1\\+" \
-	"or.w #0x1234:16,@er1+"
-gdb_test "x" "or.w\t#0x1234(:16|),@-er1" \
-	"or.w #0x1234:16,@-er1"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\+er1" \
-	"or.w #0x1234:16,@+er1"
-gdb_test "x" "or.w\t#0x1234(:16|),@er1-" \
-	"or.w #0x1234:16,@er1-"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"or.w #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t#0x1234(:16|),@0x9abc(:16|)" \
-	"or.w #0x1234:16,@0x9abc:16"
-gdb_test "x" "or.w\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"or.w #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "or.w\tr3,r1" \
-	"or.w r3,r1"
-gdb_test "x" "or.w\tr3,@er1" \
-	"or.w r3,@er1"
-gdb_test "x" "or.w\tr3,@\\(0x6(:2|),er1\\)" \
-	"or.w r3,@(0x6:2,er1)"
-gdb_test "x" "or.w\tr3,@er1\\+" \
-	"or.w r3,@er1+"
-gdb_test "x" "or.w\tr3,@-er1" \
-	"or.w r3,@-er1"
-gdb_test "x" "or.w\tr3,@\\+er1" \
-	"or.w r3,@+er1"
-gdb_test "x" "or.w\tr3,@er1-" \
-	"or.w r3,@er1-"
-gdb_test "x" "or.w\tr3,@\\(0x1234(:16|),er1\\)" \
-	"or.w r3,@(0x1234:16,er1)"
-gdb_test "x" "or.w\tr3,@\\(0x12345678(:32|),er1\\)" \
-	"or.w r3,@(0x12345678:32,er1)"
-gdb_test "x" "or.w\tr3,@\\(0x1234(:16|),r2l.b\\)" \
-	"or.w r3,@(0x1234:16,r2l.b)"
-gdb_test "x" "or.w\tr3,@\\(0x1234(:16|),r2.w\\)" \
-	"or.w r3,@(0x1234:16,r2.w)"
-gdb_test "x" "or.w\tr3,@\\(0x1234(:16|),er2.l\\)" \
-	"or.w r3,@(0x1234:16,er2.l)"
-gdb_test "x" "or.w\tr3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"or.w r3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "or.w\tr3,@\\(0x12345678(:32|),r2.w\\)" \
-	"or.w r3,@(0x12345678:32,r2.w)"
-gdb_test "x" "or.w\tr3,@\\(0x12345678(:32|),er2.l\\)" \
-	"or.w r3,@(0x12345678:32,er2.l)"
-gdb_test "x" "or.w\tr3,@0x1234(:16|)" \
-	"or.w r3,@0x1234:16"
-gdb_test "x" "or.w\tr3,@0x12345678(:32|)" \
-	"or.w r3,@0x12345678:32"
-gdb_test "x" "or.w\t@er3,r1" \
-	"or.w @er3,r1"
-gdb_test "x" "or.w\t@\\(0x6(:2|),er3\\),r1" \
-	"or.w @(0x6:2,er3),r1"
-gdb_test "x" "or.w\t@er3\\+,r1" \
-	"or.w @er3+,r1"
-gdb_test "x" "or.w\t@-er3,r1" \
-	"or.w @-er3,r1"
-gdb_test "x" "or.w\t@\\+er3,r1" \
-	"or.w @+er3,r1"
-gdb_test "x" "or.w\t@er3-,r1" \
-	"or.w @er3-,r1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er1\\),r1" \
-	"or.w @(0x1234:16,er1),r1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er1\\),r1" \
-	"or.w @(0x12345678:32,er1),r1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r2l.b\\),r1" \
-	"or.w @(0x1234:16,r2l.b),r1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r2.w\\),r1" \
-	"or.w @(0x1234:16,r2.w),r1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er2.l\\),r1" \
-	"or.w @(0x1234:16,er2.l),r1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r2l.b\\),r1" \
-	"or.w @(0x12345678:32,r2l.b),r1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r2.w\\),r1" \
-	"or.w @(0x12345678:32,r2.w),r1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er2.l\\),r1" \
-	"or.w @(0x12345678:32,er2.l),r1"
-gdb_test "x" "or.w\t@0x1234(:16|),r1" \
-	"or.w @0x1234:16,r1"
-gdb_test "x" "or.w\t@0x12345678(:32|),r1" \
-	"or.w @0x12345678:32,r1"
-gdb_test "x" "or.w\t@er3,@er1" \
-	"or.w @er3,@er1"
-gdb_test "x" "or.w\t@er3,@\\(0x6(:2|),er1\\)" \
-	"or.w @er3,@(0x6:2,er1)"
-gdb_test "x" "or.w\t@er3,@-er1" \
-	"or.w @er3,@-er1"
-gdb_test "x" "or.w\t@er3,@er1\\+" \
-	"or.w @er3,@er1+"
-gdb_test "x" "or.w\t@er3,@er1-" \
-	"or.w @er3,@er1-"
-gdb_test "x" "or.w\t@er3,@\\+er1" \
-	"or.w @er3,@+er1"
-gdb_test "x" "or.w\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.w @er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@er3,@0x9abc(:16|)" \
-	"or.w @er3,@0x9abc:16"
-gdb_test "x" "or.w\t@er3,@0x9abcdef0(:32|)" \
-	"or.w @er3,@0x9abcdef0:32"
-gdb_test "x" "or.w\t@-er3,@er1" \
-	"or.w @-er3,@er1"
-gdb_test "x" "or.w\t@-er3,@\\(0x6(:2|),er1\\)" \
-	"or.w @-er3,@(0x6:2,er1)"
-gdb_test "x" "or.w\t@-er3,@-er1" \
-	"or.w @-er3,@-er1"
-gdb_test "x" "or.w\t@-er3,@er1\\+" \
-	"or.w @-er3,@er1+"
-gdb_test "x" "or.w\t@-er3,@er1-" \
-	"or.w @-er3,@er1-"
-gdb_test "x" "or.w\t@-er3,@\\+er1" \
-	"or.w @-er3,@+er1"
-gdb_test "x" "or.w\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.w @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@-er3,@0x9abc(:16|)" \
-	"or.w @-er3,@0x9abc:16"
-gdb_test "x" "or.w\t@-er3,@0x9abcdef0(:32|)" \
-	"or.w @-er3,@0x9abcdef0:32"
-gdb_test "x" "or.w\t@er3\\+,@er1" \
-	"or.w @er3+,@er1"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x6(:2|),er1\\)" \
-	"or.w @er3+,@(0x6:2,er1)"
-gdb_test "x" "or.w\t@er3\\+,@-er1" \
-	"or.w @er3+,@-er1"
-gdb_test "x" "or.w\t@er3\\+,@er1\\+" \
-	"or.w @er3+,@er1+"
-gdb_test "x" "or.w\t@er3\\+,@er1-" \
-	"or.w @er3+,@er1-"
-gdb_test "x" "or.w\t@er3\\+,@\\+er1" \
-	"or.w @er3+,@+er1"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"or.w @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@er3\\+,@0x9abc(:16|)" \
-	"or.w @er3+,@0x9abc:16"
-gdb_test "x" "or.w\t@er3\\+,@0x9abcdef0(:32|)" \
-	"or.w @er3+,@0x9abcdef0:32"
-gdb_test "x" "or.w\t@er3-,@er1" \
-	"or.w @er3-,@er1"
-gdb_test "x" "or.w\t@er3-,@\\(0x6(:2|),er1\\)" \
-	"or.w @er3-,@(0x6:2,er1)"
-gdb_test "x" "or.w\t@er3-,@-er1" \
-	"or.w @er3-,@-er1"
-gdb_test "x" "or.w\t@er3-,@er1\\+" \
-	"or.w @er3-,@er1+"
-gdb_test "x" "or.w\t@er3-,@er1-" \
-	"or.w @er3-,@er1-"
-gdb_test "x" "or.w\t@er3-,@\\+er1" \
-	"or.w @er3-,@+er1"
-gdb_test "x" "or.w\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"or.w @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@er3-,@0x9abc(:16|)" \
-	"or.w @er3-,@0x9abc:16"
-gdb_test "x" "or.w\t@er3-,@0x9abcdef0(:32|)" \
-	"or.w @er3-,@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\+er3,@er1" \
-	"or.w @+er3,@er1"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x6(:2|),er1\\)" \
-	"or.w @+er3,@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\+er3,@-er1" \
-	"or.w @+er3,@-er1"
-gdb_test "x" "or.w\t@\\+er3,@er1\\+" \
-	"or.w @+er3,@er1+"
-gdb_test "x" "or.w\t@\\+er3,@er1-" \
-	"or.w @+er3,@er1-"
-gdb_test "x" "or.w\t@\\+er3,@\\+er1" \
-	"or.w @+er3,@+er1"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.w @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\+er3,@0x9abc(:16|)" \
-	"or.w @+er3,@0x9abc:16"
-gdb_test "x" "or.w\t@\\+er3,@0x9abcdef0(:32|)" \
-	"or.w @+er3,@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@er1" \
-	"or.w @(0x1234:16,er3),@er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"or.w @(0x1234:16,er3),@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"or.w @(0x1234:16,er3),@-er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"or.w @(0x1234:16,er3),@er1+"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"or.w @(0x1234:16,er3),@er1-"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"or.w @(0x1234:16,er3),@+er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"or.w @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"or.w @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"or.w @(0x12345678:32,er3),@er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"or.w @(0x12345678:32,er3),@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"or.w @(0x12345678:32,er3),@-er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"or.w @(0x12345678:32,er3),@er1+"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"or.w @(0x12345678:32,er3),@er1-"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"or.w @(0x12345678:32,er3),@+er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"or.w @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"or.w @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"or.w @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"or.w @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"or.w @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"or.w @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"or.w @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"or.w @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"or.w @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"or.w @(0x1234:16,r3.w),@er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"or.w @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"or.w @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"or.w @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"or.w @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"or.w @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"or.w @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"or.w @(0x1234:16,er3.l),@er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"or.w @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"or.w @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"or.w @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"or.w @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"or.w @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "or.w\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"or.w @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"or.w @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"or.w @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"or.w @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"or.w @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"or.w @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"or.w @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"or.w @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"or.w @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"or.w @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"or.w @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"or.w @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"or.w @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"or.w @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"or.w @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"or.w @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x6:2,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"or.w @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"or.w @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"or.w @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"or.w @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"or.w @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "or.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"or.w @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "or.w\t@0x1234(:16|),@er1" \
-	"or.w @0x1234:16,@er1"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"or.w @0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "or.w\t@0x1234(:16|),@-er1" \
-	"or.w @0x1234:16,@-er1"
-gdb_test "x" "or.w\t@0x1234(:16|),@er1\\+" \
-	"or.w @0x1234:16,@er1+"
-gdb_test "x" "or.w\t@0x1234(:16|),@er1-" \
-	"or.w @0x1234:16,@er1-"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\+er1" \
-	"or.w @0x1234:16,@+er1"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@0x1234(:16|),@0x9abc(:16|)" \
-	"or.w @0x1234:16,@0x9abc:16"
-gdb_test "x" "or.w\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"or.w @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "or.w\t@0x12345678(:32|),@er1" \
-	"or.w @0x12345678:32,@er1"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x6(:2|),er1\\)" \
-	"or.w @0x12345678:32,@(0x6:2,er1)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@-er1" \
-	"or.w @0x12345678:32,@-er1"
-gdb_test "x" "or.w\t@0x12345678(:32|),@er1\\+" \
-	"or.w @0x12345678:32,@er1+"
-gdb_test "x" "or.w\t@0x12345678(:32|),@er1-" \
-	"or.w @0x12345678:32,@er1-"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\+er1" \
-	"or.w @0x12345678:32,@+er1"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"or.w @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.w @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.w @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.w @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.w @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.w @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.w @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.w\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"or.w @0x12345678:32,@0x9abc:16"
-gdb_test "x" "or.w\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"or.w @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "or.l\t#0x12345678(:32|),er1" \
-	"or.l #0x12345678:32,er1"
-gdb_test "x" "or.l\t#0x1234(:16|),er1" \
-	"or.l #0x1234:16,er1"
-gdb_test "x" "or.l\t#0x12345678(:32|),@er1" \
-	"or.l #0x12345678:32,@er1"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"or.l #0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@er1\\+" \
-	"or.l #0x12345678:32,@er1+"
-gdb_test "x" "or.l\t#0x12345678(:32|),@-er1" \
-	"or.l #0x12345678:32,@-er1"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\+er1" \
-	"or.l #0x12345678:32,@+er1"
-gdb_test "x" "or.l\t#0x12345678(:32|),@er1-" \
-	"or.l #0x12345678:32,@er1-"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"or.l #0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l #0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l #0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l #0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l #0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l #0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l #0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t#0x12345678(:32|),@0x9abc(:16|)" \
-	"or.l #0x12345678:32,@0x9abc:16"
-gdb_test "x" "or.l\t#0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"or.l #0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "or.l\t#0x1234(:16|),@er1" \
-	"or.l #0x1234:16,@er1"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"or.l #0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "or.l\t#0x1234(:16|),@er1\\+" \
-	"or.l #0x1234:16,@er1+"
-gdb_test "x" "or.l\t#0x1234(:16|),@-er1" \
-	"or.l #0x1234:16,@-er1"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\+er1" \
-	"or.l #0x1234:16,@+er1"
-gdb_test "x" "or.l\t#0x1234(:16|),@er1-" \
-	"or.l #0x1234:16,@er1-"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"or.l #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t#0x1234(:16|),@0x9abc(:16|)" \
-	"or.l #0x1234:16,@0x9abc:16"
-gdb_test "x" "or.l\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"or.l #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "or.l\ter3,er1" \
-	"or.l er3,er1"
-gdb_test "x" "or.l\ter3,@er1" \
-	"or.l er3,@er1"
-gdb_test "x" "or.l\ter3,@\\(0xc(:2|),er1\\)" \
-	"or.l er3,@(0xc:2,er1)"
-gdb_test "x" "or.l\ter3,@er1\\+" \
-	"or.l er3,@er1+"
-gdb_test "x" "or.l\ter3,@-er1" \
-	"or.l er3,@-er1"
-gdb_test "x" "or.l\ter3,@\\+er1" \
-	"or.l er3,@+er1"
-gdb_test "x" "or.l\ter3,@er1-" \
-	"or.l er3,@er1-"
-gdb_test "x" "or.l\ter3,@\\(0x1234(:16|),er1\\)" \
-	"or.l er3,@(0x1234:16,er1)"
-gdb_test "x" "or.l\ter3,@\\(0x12345678(:32|),er1\\)" \
-	"or.l er3,@(0x12345678:32,er1)"
-gdb_test "x" "or.l\ter3,@\\(0x1234(:16|),r2l.b\\)" \
-	"or.l er3,@(0x1234:16,r2l.b)"
-gdb_test "x" "or.l\ter3,@\\(0x1234(:16|),r2.w\\)" \
-	"or.l er3,@(0x1234:16,r2.w)"
-gdb_test "x" "or.l\ter3,@\\(0x1234(:16|),er2.l\\)" \
-	"or.l er3,@(0x1234:16,er2.l)"
-gdb_test "x" "or.l\ter3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"or.l er3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "or.l\ter3,@\\(0x12345678(:32|),r2.w\\)" \
-	"or.l er3,@(0x12345678:32,r2.w)"
-gdb_test "x" "or.l\ter3,@\\(0x12345678(:32|),er2.l\\)" \
-	"or.l er3,@(0x12345678:32,er2.l)"
-gdb_test "x" "or.l\ter3,@0x1234(:16|)" \
-	"or.l er3,@0x1234:16"
-gdb_test "x" "or.l\ter3,@0x12345678(:32|)" \
-	"or.l er3,@0x12345678:32"
-gdb_test "x" "or.l\t@er3,er1" \
-	"or.l @er3,er1"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),er1" \
-	"or.l @(0xc:2,er3),er1"
-gdb_test "x" "or.l\t@er3\\+,er1" \
-	"or.l @er3+,er1"
-gdb_test "x" "or.l\t@-er3,er1" \
-	"or.l @-er3,er1"
-gdb_test "x" "or.l\t@\\+er3,er1" \
-	"or.l @+er3,er1"
-gdb_test "x" "or.l\t@er3-,er1" \
-	"or.l @er3-,er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er1\\),er1" \
-	"or.l @(0x1234:16,er1),er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er1\\),er1" \
-	"or.l @(0x12345678:32,er1),er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r2l.b\\),er1" \
-	"or.l @(0x1234:16,r2l.b),er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r2.w\\),er1" \
-	"or.l @(0x1234:16,r2.w),er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er2.l\\),er1" \
-	"or.l @(0x1234:16,er2.l),er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r2l.b\\),er1" \
-	"or.l @(0x12345678:32,r2l.b),er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r2.w\\),er1" \
-	"or.l @(0x12345678:32,r2.w),er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er2.l\\),er1" \
-	"or.l @(0x12345678:32,er2.l),er1"
-gdb_test "x" "or.l\t@0x1234(:16|),er1" \
-	"or.l @0x1234:16,er1"
-gdb_test "x" "or.l\t@0x12345678(:32|),er1" \
-	"or.l @0x12345678:32,er1"
-gdb_test "x" "or.l\t@er3,@er1" \
-	"or.l @er3,@er1"
-gdb_test "x" "or.l\t@er3,@\\(0xc(:2|),er1\\)" \
-	"or.l @er3,@(0xc:2,er1)"
-gdb_test "x" "or.l\t@er3,@-er1" \
-	"or.l @er3,@-er1"
-gdb_test "x" "or.l\t@er3,@er1\\+" \
-	"or.l @er3,@er1+"
-gdb_test "x" "or.l\t@er3,@er1-" \
-	"or.l @er3,@er1-"
-gdb_test "x" "or.l\t@er3,@\\+er1" \
-	"or.l @er3,@+er1"
-gdb_test "x" "or.l\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.l @er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@er3,@0x9abc(:16|)" \
-	"or.l @er3,@0x9abc:16"
-gdb_test "x" "or.l\t@er3,@0x9abcdef0(:32|)" \
-	"or.l @er3,@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@er1" \
-	"or.l @(0xc:2,er3),@er1"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0xc:2,er3),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@-er1" \
-	"or.l @(0xc:2,er3),@-er1"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@er1\\+" \
-	"or.l @(0xc:2,er3),@er1+"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@er1-" \
-	"or.l @(0xc:2,er3),@er1-"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\+er1" \
-	"or.l @(0xc:2,er3),@+er1"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0xc:2,er3),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0xc:2,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0xc:2,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0xc:2,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0xc:2,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@0x9abc(:16|)" \
-	"or.l @(0xc:2,er3),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0xc(:2|),er3\\),@0x9abcdef0(:32|)" \
-	"or.l @(0xc:2,er3),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@-er3,@er1" \
-	"or.l @-er3,@er1"
-gdb_test "x" "or.l\t@-er3,@\\(0xc(:2|),er1\\)" \
-	"or.l @-er3,@(0xc:2,er1)"
-gdb_test "x" "or.l\t@-er3,@-er1" \
-	"or.l @-er3,@-er1"
-gdb_test "x" "or.l\t@-er3,@er1\\+" \
-	"or.l @-er3,@er1+"
-gdb_test "x" "or.l\t@-er3,@er1-" \
-	"or.l @-er3,@er1-"
-gdb_test "x" "or.l\t@-er3,@\\+er1" \
-	"or.l @-er3,@+er1"
-gdb_test "x" "or.l\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.l @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@-er3,@0x9abc(:16|)" \
-	"or.l @-er3,@0x9abc:16"
-gdb_test "x" "or.l\t@-er3,@0x9abcdef0(:32|)" \
-	"or.l @-er3,@0x9abcdef0:32"
-gdb_test "x" "or.l\t@er3\\+,@er1" \
-	"or.l @er3+,@er1"
-gdb_test "x" "or.l\t@er3\\+,@\\(0xc(:2|),er1\\)" \
-	"or.l @er3+,@(0xc:2,er1)"
-gdb_test "x" "or.l\t@er3\\+,@-er1" \
-	"or.l @er3+,@-er1"
-gdb_test "x" "or.l\t@er3\\+,@er1\\+" \
-	"or.l @er3+,@er1+"
-gdb_test "x" "or.l\t@er3\\+,@er1-" \
-	"or.l @er3+,@er1-"
-gdb_test "x" "or.l\t@er3\\+,@\\+er1" \
-	"or.l @er3+,@+er1"
-gdb_test "x" "or.l\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"or.l @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@er3\\+,@0x9abc(:16|)" \
-	"or.l @er3+,@0x9abc:16"
-gdb_test "x" "or.l\t@er3\\+,@0x9abcdef0(:32|)" \
-	"or.l @er3+,@0x9abcdef0:32"
-gdb_test "x" "or.l\t@er3-,@er1" \
-	"or.l @er3-,@er1"
-gdb_test "x" "or.l\t@er3-,@\\(0xc(:2|),er1\\)" \
-	"or.l @er3-,@(0xc:2,er1)"
-gdb_test "x" "or.l\t@er3-,@-er1" \
-	"or.l @er3-,@-er1"
-gdb_test "x" "or.l\t@er3-,@er1\\+" \
-	"or.l @er3-,@er1+"
-gdb_test "x" "or.l\t@er3-,@er1-" \
-	"or.l @er3-,@er1-"
-gdb_test "x" "or.l\t@er3-,@\\+er1" \
-	"or.l @er3-,@+er1"
-gdb_test "x" "or.l\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"or.l @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@er3-,@0x9abc(:16|)" \
-	"or.l @er3-,@0x9abc:16"
-gdb_test "x" "or.l\t@er3-,@0x9abcdef0(:32|)" \
-	"or.l @er3-,@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\+er3,@er1" \
-	"or.l @+er3,@er1"
-gdb_test "x" "or.l\t@\\+er3,@\\(0xc(:2|),er1\\)" \
-	"or.l @+er3,@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\+er3,@-er1" \
-	"or.l @+er3,@-er1"
-gdb_test "x" "or.l\t@\\+er3,@er1\\+" \
-	"or.l @+er3,@er1+"
-gdb_test "x" "or.l\t@\\+er3,@er1-" \
-	"or.l @+er3,@er1-"
-gdb_test "x" "or.l\t@\\+er3,@\\+er1" \
-	"or.l @+er3,@+er1"
-gdb_test "x" "or.l\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"or.l @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\+er3,@0x9abc(:16|)" \
-	"or.l @+er3,@0x9abc:16"
-gdb_test "x" "or.l\t@\\+er3,@0x9abcdef0(:32|)" \
-	"or.l @+er3,@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@er1" \
-	"or.l @(0x1234:16,er3),@er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0x1234:16,er3),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"or.l @(0x1234:16,er3),@-er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"or.l @(0x1234:16,er3),@er1+"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"or.l @(0x1234:16,er3),@er1-"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"or.l @(0x1234:16,er3),@+er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"or.l @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"or.l @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"or.l @(0x12345678:32,er3),@er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0x12345678:32,er3),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"or.l @(0x12345678:32,er3),@-er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"or.l @(0x12345678:32,er3),@er1+"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"or.l @(0x12345678:32,er3),@er1-"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"or.l @(0x12345678:32,er3),@+er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"or.l @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"or.l @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"or.l @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"or.l @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"or.l @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"or.l @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"or.l @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"or.l @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"or.l @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"or.l @(0x1234:16,r3.w),@er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0x1234:16,r3.w),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"or.l @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"or.l @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"or.l @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"or.l @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"or.l @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"or.l @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"or.l @(0x1234:16,er3.l),@er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0x1234:16,er3.l),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"or.l @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"or.l @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"or.l @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"or.l @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"or.l @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"or.l @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"or.l @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"or.l @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"or.l @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"or.l @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"or.l @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"or.l @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"or.l @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"or.l @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"or.l @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"or.l @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"or.l @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"or.l @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"or.l @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"or.l @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"or.l @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0xc:2,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"or.l @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"or.l @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"or.l @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"or.l @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"or.l @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "or.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"or.l @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "or.l\t@0x1234(:16|),@er1" \
-	"or.l @0x1234:16,@er1"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"or.l @0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "or.l\t@0x1234(:16|),@-er1" \
-	"or.l @0x1234:16,@-er1"
-gdb_test "x" "or.l\t@0x1234(:16|),@er1\\+" \
-	"or.l @0x1234:16,@er1+"
-gdb_test "x" "or.l\t@0x1234(:16|),@er1-" \
-	"or.l @0x1234:16,@er1-"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\+er1" \
-	"or.l @0x1234:16,@+er1"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@0x1234(:16|),@0x9abc(:16|)" \
-	"or.l @0x1234:16,@0x9abc:16"
-gdb_test "x" "or.l\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"or.l @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "or.l\t@0x12345678(:32|),@er1" \
-	"or.l @0x12345678:32,@er1"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"or.l @0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@-er1" \
-	"or.l @0x12345678:32,@-er1"
-gdb_test "x" "or.l\t@0x12345678(:32|),@er1\\+" \
-	"or.l @0x12345678:32,@er1+"
-gdb_test "x" "or.l\t@0x12345678(:32|),@er1-" \
-	"or.l @0x12345678:32,@er1-"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\+er1" \
-	"or.l @0x12345678:32,@+er1"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"or.l @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"or.l @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"or.l @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"or.l @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"or.l @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"or.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"or.l @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"or.l @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "or.l\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"or.l @0x12345678:32,@0x9abc:16"
-gdb_test "x" "or.l\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"or.l @0x12345678:32,@0x9abcdef0:32"
diff --git a/gdb/testsuite/gdb.disasm/t08_or.s b/gdb/testsuite/gdb.disasm/t08_or.s
deleted file mode 100644
index 22d9f04177b..00000000000
--- a/gdb/testsuite/gdb.disasm/t08_or.s
+++ /dev/null
@@ -1,972 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;log_1

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    or.b #0x12:8,r1h            ;c112

-    or.b #0x12:8,@er1           ;7d10c012

-    or.b #0x12:8,@(0x3:2,er1)     ;01776818c012

-    or.b #0x12:8,@er1+          ;01746c18c012

-    or.b #0x12:8,@-er1          ;01776c18c012

-    or.b #0x12:8,@+er1          ;01756c18c012

-    or.b #0x12:8,@er1-          ;01766c18c012

-    or.b #0x12:8,@(0x1234:16,er1)    ;01746e181234c012

-    or.b #0x12:8,@(0x12345678:32,er1)    ;78146a2812345678c012

-    or.b #0x12:8,@(0x1234:16,r2l.b)  ;01756e281234c012

-    or.b #0x12:8,@(0x1234:16,r2.w)  ;01766e281234c012

-    or.b #0x12:8,@(0x1234:16,er2.l)  ;01776e281234c012

-    or.b #0x12:8,@(0x12345678:32,r2l.b)  ;78256a2812345678c012

-    or.b #0x12:8,@(0x12345678:32,r2.w)  ;78266a2812345678c012

-    or.b #0x12:8,@(0x12345678:32,er2.l)  ;78276a2812345678c012

-    or.b #0x12:8,@0xffffff12:8          ;7f12c012

-    or.b #0x12:8,@0x1234:16         ;6a181234c012

-    or.b #0x12:8,@0x12345678:32         ;6a3812345678c012

-

-    or.b r3h,r1h               ;1431

-

-    or.b r3h,@er1             ;7d101430

-    or.b r3h,@(0x3:2,er1)       ;01793143

-    or.b r3h,@er1+            ;01798143

-    or.b r3h,@-er1            ;0179b143

-    or.b r3h,@+er1            ;01799143

-    or.b r3h,@er1-            ;0179a143

-    or.b r3h,@(0x1234:16,er1)      ;0179c1431234

-    or.b r3h,@(0x12345678:32,er1)      ;0179c94312345678

-    or.b r3h,@(0x1234:16,r2l.b)    ;0179d2431234

-    or.b r3h,@(0x1234:16,r2.w)    ;0179e2431234

-    or.b r3h,@(0x1234:16,er2.l)    ;0179f2431234

-    or.b r3h,@(0x12345678:32,r2l.b)    ;0179da4312345678

-    or.b r3h,@(0x12345678:32,r2.w)    ;0179ea4312345678

-    or.b r3h,@(0x12345678:32,er2.l)    ;0179fa4312345678

-    or.b r3h,@0xffffff12:8            ;7f121430

-    or.b r3h,@0x1234:16           ;6a1812341430

-    or.b r3h,@0x12345678:32            ;6a38123456781430

-

-    or.b @er3,r1h             ;7c301401

-    or.b @(0x3:2,er3),r1h      ;017a3341

-    or.b @er3+,r1h           ;017a8341

-    or.b @-er3,r1h           ;017ab341

-    or.b @+er3,r1h           ;017a9341

-    or.b @er3-,r1h           ;017aa341

-    or.b @(0x1234:16,er1),r1h      ;017ac1411234

-    or.b @(0x12345678:32,er1),r1h      ;017ac94112345678

-    or.b @(0x1234:16,r2l.b),r1h    ;017ad2411234

-    or.b @(0x1234:16,r2.w),r1h    ;017ae2411234

-    or.b @(0x1234:16,er2.l),r1h    ;017af2411234

-    or.b @(0x12345678:32,r2l.b),r1h    ;017ada4112345678

-    or.b @(0x12345678:32,r2.w),r1h    ;017aea4112345678

-    or.b @(0x12345678:32,er2.l),r1h    ;017afa4112345678

-    or.b @0xffffff12:8,r1h            ;7e121401

-    or.b @0x1234:16,r1h           ;6a1012341401

-    or.b @0x12345678:32,r1h           ;6a30123456781401

-

-    or.b @er3,@er1                                ;7c350140

-    or.b @er3,@(3:2,er1)                          ;7c353140

-    or.b @er3,@-er1                               ;7c35b140

-    or.b @er3,@er1+                               ;7c358140

-    or.b @er3,@er1-                               ;7c35a140

-    or.b @er3,@+er1                               ;7c359140

-    or.b @er3,@(0xffff9abc:16,er1)                ;7c35c1409abc

-    or.b @er3,@(0x9abcdef0:32,er1)                ;7c35c9409abcdef0

-    or.b @er3,@(0xffff9abc:16,r2l.b)              ;7c35d2409abc

-    or.b @er3,@(0xffff9abc:16,r2.w)              ;7c35e2409abc

-    or.b @er3,@(0xffff9abc:16,er2.l)              ;7c35f2409abc

-    or.b @er3,@(0x9abcdef0:32,r2l.b)              ;7c35da409abcdef0

-    or.b @er3,@(0x9abcdef0:32,r2.w)              ;7c35ea409abcdef0

-    or.b @er3,@(0x9abcdef0:32,er2.l)              ;7c35fa409abcdef0

-    or.b @er3,@0xffff9abc:16                      ;7c3540409abc

-    or.b @er3,@0x9abcdef0:32                      ;7c3548409abcdef0

-

-    or.b @-er3,@er1                               ;01776c3c0140

-    or.b @-er3,@(3:2,er1)                         ;01776c3c3140

-    or.b @-er3,@-er1                              ;01776c3cb140

-    or.b @-er3,@er1+                              ;01776c3c8140

-    or.b @-er3,@er1-                              ;01776c3ca140

-    or.b @-er3,@+er1                              ;01776c3c9140

-    or.b @-er3,@(0xffff9abc:16,er1)               ;01776c3cc1409abc

-    or.b @-er3,@(0x9abcdef0:32,er1)               ;01776c3cc9409abcdef0

-    or.b @-er3,@(0xffff9abc:16,r2l.b)             ;01776c3cd2409abc

-    or.b @-er3,@(0xffff9abc:16,r2.w)             ;01776c3ce2409abc

-    or.b @-er3,@(0xffff9abc:16,er2.l)             ;01776c3cf2409abc

-    or.b @-er3,@(0x9abcdef0:32,r2l.b)             ;01776c3cda409abcdef0

-    or.b @-er3,@(0x9abcdef0:32,r2.w)             ;01776c3cea409abcdef0

-    or.b @-er3,@(0x9abcdef0:32,er2.l)             ;01776c3cfa409abcdef0

-    or.b @-er3,@0xffff9abc:16                     ;01776c3c40409abc

-    or.b @-er3,@0x9abcdef0:32                     ;01776c3c48409abcdef0

-

-    or.b @er3+,@er1                               ;01746c3c0140

-    or.b @er3+,@(3:2,er1)                         ;01746c3c3140

-    or.b @er3+,@-er1                              ;01746c3cb140

-    or.b @er3+,@er1+                              ;01746c3c8140

-    or.b @er3+,@er1-                              ;01746c3ca140

-    or.b @er3+,@+er1                              ;01746c3c9140

-    or.b @er3+,@(0xffff9abc:16,er1)               ;01746c3cc1409abc

-    or.b @er3+,@(0x9abcdef0:32,er1)               ;01746c3cc9409abcdef0

-    or.b @er3+,@(0xffff9abc:16,r2l.b)             ;01746c3cd2409abc

-    or.b @er3+,@(0xffff9abc:16,r2.w)             ;01746c3ce2409abc

-    or.b @er3+,@(0xffff9abc:16,er2.l)             ;01746c3cf2409abc

-    or.b @er3+,@(0x9abcdef0:32,r2l.b)             ;01746c3cda409abcdef0

-    or.b @er3+,@(0x9abcdef0:32,r2.w)             ;01746c3cea409abcdef0

-    or.b @er3+,@(0x9abcdef0:32,er2.l)             ;01746c3cfa409abcdef0

-    or.b @er3+,@0xffff9abc:16                     ;01746c3c40409abc

-    or.b @er3+,@0x9abcdef0:32                     ;01746c3c48409abcdef0

-

-    or.b @er3-,@er1                               ;01766c3c0140

-    or.b @er3-,@(3:2,er1)                         ;01766c3c3140

-    or.b @er3-,@-er1                              ;01766c3cb140

-    or.b @er3-,@er1+                              ;01766c3c8140

-    or.b @er3-,@er1-                              ;01766c3ca140

-    or.b @er3-,@+er1                              ;01766c3c9140

-    or.b @er3-,@(0xffff9abc:16,er1)               ;01766c3cc1409abc

-    or.b @er3-,@(0x9abcdef0:32,er1)               ;01766c3cc9409abcdef0

-    or.b @er3-,@(0xffff9abc:16,r2l.b)             ;01766c3cd2409abc

-    or.b @er3-,@(0xffff9abc:16,r2.w)             ;01766c3ce2409abc

-    or.b @er3-,@(0xffff9abc:16,er2.l)             ;01766c3cf2409abc

-    or.b @er3-,@(0x9abcdef0:32,r2l.b)             ;01766c3cda409abcdef0

-    or.b @er3-,@(0x9abcdef0:32,r2.w)             ;01766c3cea409abcdef0

-    or.b @er3-,@(0x9abcdef0:32,er2.l)             ;01766c3cfa409abcdef0

-    or.b @er3-,@0xffff9abc:16                     ;01766c3c40409abc

-    or.b @er3-,@0x9abcdef0:32                     ;01766c3c48409abcdef0

-

-    or.b @+er3,@er1                               ;01756c3c0140

-    or.b @+er3,@(3:2,er1)                         ;01756c3c3140

-    or.b @+er3,@-er1                              ;01756c3cb140

-    or.b @+er3,@er1+                              ;01756c3c8140

-    or.b @+er3,@er1-                              ;01756c3ca140

-    or.b @+er3,@+er1                              ;01756c3c9140

-    or.b @+er3,@(0xffff9abc:16,er1)               ;01756c3cc1409abc

-    or.b @+er3,@(0x9abcdef0:32,er1)               ;01756c3cc9409abcdef0

-    or.b @+er3,@(0xffff9abc:16,r2l.b)             ;01756c3cd2409abc

-    or.b @+er3,@(0xffff9abc:16,r2.w)             ;01756c3ce2409abc

-    or.b @+er3,@(0xffff9abc:16,er2.l)             ;01756c3cf2409abc

-    or.b @+er3,@(0x9abcdef0:32,r2l.b)             ;01756c3cda409abcdef0

-    or.b @+er3,@(0x9abcdef0:32,r2.w)             ;01756c3cea409abcdef0

-    or.b @+er3,@(0x9abcdef0:32,er2.l)             ;01756c3cfa409abcdef0

-    or.b @+er3,@0xffff9abc:16                     ;01756c3c40409abc

-    or.b @+er3,@0x9abcdef0:32                     ;01756c3c48409abcdef0

-

-    or.b @(0x1234:16,er3),@er1                         ;01746e3c12340140

-    or.b @(0x1234:16,er3),@(3:2,er1)                   ;01746e3c12343140

-    or.b @(0x1234:16,er3),@-er1                        ;01746e3c1234b140

-    or.b @(0x1234:16,er3),@er1+                        ;01746e3c12348140

-    or.b @(0x1234:16,er3),@er1-                        ;01746e3c1234a140

-    or.b @(0x1234:16,er3),@+er1                        ;01746e3c12349140

-    or.b @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01746e3c1234c1409abc

-    or.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01746e3c1234c9409abcdef0

-    or.b @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01746e3c1234d2409abc

-    or.b @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01746e3c1234e2409abc

-    or.b @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01746e3c1234f2409abc

-    or.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01746e3c1234da409abcdef0

-    or.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01746e3c1234ea409abcdef0

-    or.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01746e3c1234fa409abcdef0

-    or.b @(0x1234:16,er3),@0xffff9abc:16               ;01746e3c123440409abc

-    or.b @(0x1234:16,er3),@0x9abcdef0:32               ;01746e3c123448409abcdef0

-

-    or.b @(0x12345678:32,er3),@er1                         ;78346a2c123456780140

-    or.b @(0x12345678:32,er3),@(3:2,er1)                   ;78346a2c123456783140

-    or.b @(0x12345678:32,er3),@-er1                        ;78346a2c12345678b140

-    or.b @(0x12345678:32,er3),@er1+                        ;78346a2c123456788140

-    or.b @(0x12345678:32,er3),@er1-                        ;78346a2c12345678a140

-    or.b @(0x12345678:32,er3),@+er1                        ;78346a2c123456789140

-    or.b @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346a2c12345678c1409abc

-    or.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346a2c12345678c9409abcdef0

-    or.b @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346a2c12345678d2409abc

-    or.b @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346a2c12345678e2409abc

-    or.b @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346a2c12345678f2409abc

-    or.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346a2c12345678da409abcdef0

-    or.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346a2c12345678ea409abcdef0

-    or.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346a2c12345678fa409abcdef0

-    or.b @(0x12345678:32,er3),@0xffff9abc:16               ;78346a2c1234567840409abc

-    or.b @(0x12345678:32,er3),@0x9abcdef0:32               ;78346a2c1234567848409abcdef0

-

-    or.b @(0x1234:16,r3l.b),@er1                       ;01756e3c12340140

-    or.b @(0x1234:16,r3l.b),@(3:2,er1)                 ;01756e3c12343140

-    or.b @(0x1234:16,r3l.b),@-er1                      ;01756e3c1234b140

-    or.b @(0x1234:16,r3l.b),@er1+                      ;01756e3c12348140

-    or.b @(0x1234:16,r3l.b),@er1-                      ;01756e3c1234a140

-    or.b @(0x1234:16,r3l.b),@+er1                      ;01756e3c12349140

-    or.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01756e3c1234c1409abc

-    or.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01756e3c1234c9409abcdef0

-    or.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01756e3c1234d2409abc

-    or.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01756e3c1234e2409abc

-    or.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01756e3c1234f2409abc

-    or.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01756e3c1234da409abcdef0

-    or.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01756e3c1234ea409abcdef0

-    or.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01756e3c1234fa409abcdef0

-    or.b @(0x1234:16,r3l.b),@0xffff9abc:16             ;01756e3c123440409abc

-    or.b @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01756e3c123448409abcdef0

-

-    or.b @(0x1234:16,r3.w),@er1                       ;01766e3c12340140

-    or.b @(0x1234:16,r3.w),@(3:2,er1)                 ;01766e3c12343140

-    or.b @(0x1234:16,r3.w),@-er1                      ;01766e3c1234b140

-    or.b @(0x1234:16,r3.w),@er1+                      ;01766e3c12348140

-    or.b @(0x1234:16,r3.w),@er1-                      ;01766e3c1234a140

-    or.b @(0x1234:16,r3.w),@+er1                      ;01766e3c12349140

-    or.b @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01766e3c1234c1409abc

-    or.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01766e3c1234c9409abcdef0

-    or.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01766e3c1234d2409abc

-    or.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01766e3c1234e2409abc

-    or.b @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01766e3c1234f2409abc

-    or.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01766e3c1234da409abcdef0

-    or.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01766e3c1234ea409abcdef0

-    or.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01766e3c1234fa409abcdef0

-    or.b @(0x1234:16,r3.w),@0xffff9abc:16             ;01766e3c123440409abc

-    or.b @(0x1234:16,r3.w),@0x9abcdef0:32             ;01766e3c123448409abcdef0

-

-    or.b @(0x1234:16,er3.l),@er1                       ;01776e3c12340140

-    or.b @(0x1234:16,er3.l),@(3:2,er1)                 ;01776e3c12343140

-    or.b @(0x1234:16,er3.l),@-er1                      ;01776e3c1234b140

-    or.b @(0x1234:16,er3.l),@er1+                      ;01776e3c12348140

-    or.b @(0x1234:16,er3.l),@er1-                      ;01776e3c1234a140

-    or.b @(0x1234:16,er3.l),@+er1                      ;01776e3c12349140

-    or.b @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01776e3c1234c1409abc

-    or.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01776e3c1234c9409abcdef0

-    or.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01776e3c1234d2409abc

-    or.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01776e3c1234e2409abc

-    or.b @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01776e3c1234f2409abc

-    or.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01776e3c1234da409abcdef0

-    or.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01776e3c1234ea409abcdef0

-    or.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01776e3c1234fa409abcdef0

-    or.b @(0x1234:16,er3.l),@0xffff9abc:16             ;01776e3c123440409abc

-    or.b @(0x1234:16,er3.l),@0x9abcdef0:32             ;01776e3c123448409abcdef0

-

-    or.b @(0x12345678:32,r3l.b),@er1                       ;78356a2c123456780140

-    or.b @(0x12345678:32,r3l.b),@(3:2,er1)                 ;78356a2c123456783140

-    or.b @(0x12345678:32,r3l.b),@-er1                      ;78356a2c12345678b140

-    or.b @(0x12345678:32,r3l.b),@er1+                      ;78356a2c123456788140

-    or.b @(0x12345678:32,r3l.b),@er1-                      ;78356a2c12345678a140

-    or.b @(0x12345678:32,r3l.b),@+er1                      ;78356a2c123456789140

-    or.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356a2c12345678c1409abc

-    or.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356a2c12345678c9409abcdef0

-    or.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356a2c12345678d2409abc

-    or.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356a2c12345678e2409abc

-    or.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356a2c12345678f2409abc

-    or.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356a2c12345678da409abcdef0

-    or.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356a2c12345678ea409abcdef0

-    or.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356a2c12345678fa409abcdef0

-    or.b @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356a2c1234567840409abc

-    or.b @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356a2c1234567848409abcdef0

-

-    or.b @(0x12345678:32,r3.w),@er1                       ;78366a2c123456780140

-    or.b @(0x12345678:32,r3.w),@(3:2,er1)                 ;78366a2c123456783140

-    or.b @(0x12345678:32,r3.w),@-er1                      ;78366a2c12345678b140

-    or.b @(0x12345678:32,r3.w),@er1+                      ;78366a2c123456788140

-    or.b @(0x12345678:32,r3.w),@er1-                      ;78366a2c12345678a140

-    or.b @(0x12345678:32,r3.w),@+er1                      ;78366a2c123456789140

-    or.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366a2c12345678c1409abc

-    or.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366a2c12345678c9409abcdef0

-    or.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366a2c12345678d2409abc

-    or.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366a2c12345678e2409abc

-    or.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366a2c12345678f2409abc

-    or.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366a2c12345678da409abcdef0

-    or.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366a2c12345678ea409abcdef0

-    or.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366a2c12345678fa409abcdef0

-    or.b @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366a2c1234567840409abc

-    or.b @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366a2c1234567848409abcdef0

-

-    or.b @(0x12345678:32,er3.l),@er1                       ;78376a2c123456780140

-    or.b @(0x12345678:32,er3.l),@(3:2,er1)                 ;78376a2c123456783140

-    or.b @(0x12345678:32,er3.l),@-er1                      ;78376a2c12345678b140

-    or.b @(0x12345678:32,er3.l),@er1+                      ;78376a2c123456788140

-    or.b @(0x12345678:32,er3.l),@er1-                      ;78376a2c12345678a140

-    or.b @(0x12345678:32,er3.l),@+er1                      ;78376a2c123456789140

-    or.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376a2c12345678c1409abc

-    or.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376a2c12345678c9409abcdef0

-    or.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376a2c12345678d2409abc

-    or.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376a2c12345678e2409abc

-    or.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376a2c12345678f2409abc

-    or.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376a2c12345678da409abcdef0

-    or.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376a2c12345678ea409abcdef0

-    or.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376a2c12345678fa409abcdef0

-    or.b @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376a2c1234567840409abc

-    or.b @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376a2c1234567848409abcdef0

-

-    or.b @0x1234:16,@er1                              ;6a1512340140

-    or.b @0x1234:16,@(3:2,er1)                        ;6a1512343140

-    or.b @0x1234:16,@-er1                             ;6a151234b140

-    or.b @0x1234:16,@er1+                             ;6a1512348140

-    or.b @0x1234:16,@er1-                             ;6a151234a140

-    or.b @0x1234:16,@+er1                             ;6a1512349140

-    or.b @0x1234:16,@(0xffff9abc:16,er1)              ;6a151234c1409abc

-    or.b @0x1234:16,@(0x9abcdef0:32,er1)              ;6a151234c9409abcdef0

-    or.b @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6a151234d2409abc

-    or.b @0x1234:16,@(0xffff9abc:16,r2.w)            ;6a151234e2409abc

-    or.b @0x1234:16,@(0xffff9abc:16,er2.l)            ;6a151234f2409abc

-    or.b @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6a151234da409abcdef0

-    or.b @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6a151234ea409abcdef0

-    or.b @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6a151234fa409abcdef0

-    or.b @0x1234:16,@0xffff9abc:16                    ;6a15123440409abc

-    or.b @0x1234:16,@0x9abcdef0:32                    ;6a15123448409abcdef0

-

-    or.b @0x12345678:32,@er1                              ;6a35123456780140

-    or.b @0x12345678:32,@(3:2,er1)                        ;6a35123456783140

-    or.b @0x12345678:32,@-er1                             ;6a3512345678b140

-    or.b @0x12345678:32,@er1+                             ;6a35123456788140

-    or.b @0x12345678:32,@er1-                             ;6a3512345678a140

-    or.b @0x12345678:32,@+er1                             ;6a35123456789140

-    or.b @0x12345678:32,@(0xffff9abc:16,er1)              ;6a3512345678c1409abc

-    or.b @0x12345678:32,@(0x9abcdef0:32,er1)              ;6a3512345678c9409abcdef0

-    or.b @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6a3512345678d2409abc

-    or.b @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6a3512345678e2409abc

-    or.b @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6a3512345678f2409abc

-    or.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6a3512345678da409abcdef0

-    or.b @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6a3512345678ea409abcdef0

-    or.b @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6a3512345678fa409abcdef0

-    or.b @0x12345678:32,@0xffff9abc:16                    ;6a351234567840409abc

-    or.b @0x12345678:32,@0x9abcdef0:32                    ;6a351234567848409abcdef0

-

-    or.w #0x1234:16,r1            ;79411234

-    or.w #0x1234:16,@er1           ;015e01401234

-    or.w #0x1234:16,@(0x6:2,er1) ;015e31401234

-    or.w #0x1234:16,@er1+          ;015e81401234

-    or.w #0x1234:16,@-er1          ;015eb1401234

-    or.w #0x1234:16,@+er1          ;015e91401234

-    or.w #0x1234:16,@er1-          ;015ea1401234

-    or.w #0x1234:16,@(0xffff9abc:16,er1)    ;015ec1409abc1234

-    or.w #0x1234:16,@(0x9abcdef0:32,er1)    ;015ec9409abcdef01234

-    or.w #0x1234:16,@(0xffff9abc:16,r2l.b)  ;015ed2409abc1234

-    or.w #0x1234:16,@(0xffff9abc:16,r2.w)  ;015ee2409abc1234

-    or.w #0x1234:16,@(0xffff9abc:16,er2.l)  ;015ef2409abc1234

-    or.w #0x1234:16,@(0x9abcdef0:32,r2l.b)  ;015eda409abcdef01234

-    or.w #0x1234:16,@(0x9abcdef0:32,r2.w)  ;015eea409abcdef01234

-    or.w #0x1234:16,@(0x9abcdef0:32,er2.l)  ;015efa409abcdef01234

-    or.w #0x1234:16,@0xffff9abc:16          ;015e40409abc1234

-    or.w #0x1234:16,@0x9abcdef0:32          ;015e48409abcdef01234

-

-    or.w r3,r1               ;6431

-

-    or.w r3,@er1             ;7d906430

-    or.w r3,@(0x6:2,er1)    ;01593143

-    or.w r3,@er1+            ;01598143

-    or.w r3,@-er1            ;0159b143

-    or.w r3,@+er1            ;01599143

-    or.w r3,@er1-            ;0159a143

-    or.w r3,@(0x1234:16,er1)      ;0159c1431234

-    or.w r3,@(0x12345678:32,er1)      ;0159c94312345678

-    or.w r3,@(0x1234:16,r2l.b)    ;0159d2431234

-    or.w r3,@(0x1234:16,r2.w)    ;0159e2431234

-    or.w r3,@(0x1234:16,er2.l)    ;0159f2431234

-    or.w r3,@(0x12345678:32,r2l.b)    ;0159da4312345678

-    or.w r3,@(0x12345678:32,r2.w)    ;0159ea4312345678

-    or.w r3,@(0x12345678:32,er2.l)    ;0159fa4312345678

-    or.w r3,@0x1234:16           ;6b1812346430

-    or.w r3,@0x12345678:32           ;6b38123456786430

-

-    or.w @er3,r1             ;7cb06401

-    or.w @(0x6:2,er3),r1   ;015a3341

-    or.w @er3+,r1           ;015a8341

-    or.w @-er3,r1           ;015ab341

-    or.w @+er3,r1           ;015a9341

-    or.w @er3-,r1           ;015aa341

-    or.w @(0x1234:16,er1),r1      ;015ac1411234

-    or.w @(0x12345678:32,er1),r1      ;015ac94112345678

-    or.w @(0x1234:16,r2l.b),r1    ;015ad2411234

-    or.w @(0x1234:16,r2.w),r1    ;015ae2411234

-    or.w @(0x1234:16,er2.l),r1    ;015af2411234

-    or.w @(0x12345678:32,r2l.b),r1    ;015ada4112345678

-    or.w @(0x12345678:32,r2.w),r1    ;015aea4112345678

-    or.w @(0x12345678:32,er2.l),r1    ;015afa4112345678

-    or.w @0x1234:16,r1           ;6b1012346401

-    or.w @0x12345678:32,r1           ;6b30123456786401

-

-    or.w @er3,@er1                                ;7cb50140

-    or.w @er3,@(6:2,er1)                          ;7cb53140

-    or.w @er3,@-er1                               ;7cb5b140

-    or.w @er3,@er1+                               ;7cb58140

-    or.w @er3,@er1-                               ;7cb5a140

-    or.w @er3,@+er1                               ;7cb59140

-    or.w @er3,@(0xffff9abc:16,er1)                ;7cb5c1409abc

-    or.w @er3,@(0x9abcdef0:32,er1)                ;7cb5c9409abcdef0

-    or.w @er3,@(0xffff9abc:16,r2l.b)              ;7cb5d2409abc

-    or.w @er3,@(0xffff9abc:16,r2.w)              ;7cb5e2409abc

-    or.w @er3,@(0xffff9abc:16,er2.l)              ;7cb5f2409abc

-    or.w @er3,@(0x9abcdef0:32,r2l.b)              ;7cb5da409abcdef0

-    or.w @er3,@(0x9abcdef0:32,r2.w)              ;7cb5ea409abcdef0

-    or.w @er3,@(0x9abcdef0:32,er2.l)              ;7cb5fa409abcdef0

-    or.w @er3,@0xffff9abc:16                      ;7cb540409abc

-    or.w @er3,@0x9abcdef0:32                      ;7cb548409abcdef0

-

-    or.w @-er3,@er1                               ;01576d3c0140

-    or.w @-er3,@(6:2,er1)                         ;01576d3c3140

-    or.w @-er3,@-er1                              ;01576d3cb140

-    or.w @-er3,@er1+                              ;01576d3c8140

-    or.w @-er3,@er1-                              ;01576d3ca140

-    or.w @-er3,@+er1                              ;01576d3c9140

-    or.w @-er3,@(0xffff9abc:16,er1)               ;01576d3cc1409abc

-    or.w @-er3,@(0x9abcdef0:32,er1)               ;01576d3cc9409abcdef0

-    or.w @-er3,@(0xffff9abc:16,r2l.b)             ;01576d3cd2409abc

-    or.w @-er3,@(0xffff9abc:16,r2.w)             ;01576d3ce2409abc

-    or.w @-er3,@(0xffff9abc:16,er2.l)             ;01576d3cf2409abc

-    or.w @-er3,@(0x9abcdef0:32,r2l.b)             ;01576d3cda409abcdef0

-    or.w @-er3,@(0x9abcdef0:32,r2.w)             ;01576d3cea409abcdef0

-    or.w @-er3,@(0x9abcdef0:32,er2.l)             ;01576d3cfa409abcdef0

-    or.w @-er3,@0xffff9abc:16                     ;01576d3c40409abc

-    or.w @-er3,@0x9abcdef0:32                     ;01576d3c48409abcdef0

-

-    or.w @er3+,@er1                               ;01546d3c0140

-    or.w @er3+,@(6:2,er1)                         ;01546d3c3140

-    or.w @er3+,@-er1                              ;01546d3cb140

-    or.w @er3+,@er1+                              ;01546d3c8140

-    or.w @er3+,@er1-                              ;01546d3ca140

-    or.w @er3+,@+er1                              ;01546d3c9140

-    or.w @er3+,@(0xffff9abc:16,er1)               ;01546d3cc1409abc

-    or.w @er3+,@(0x9abcdef0:32,er1)               ;01546d3cc9409abcdef0

-    or.w @er3+,@(0xffff9abc:16,r2l.b)             ;01546d3cd2409abc

-    or.w @er3+,@(0xffff9abc:16,r2.w)             ;01546d3ce2409abc

-    or.w @er3+,@(0xffff9abc:16,er2.l)             ;01546d3cf2409abc

-    or.w @er3+,@(0x9abcdef0:32,r2l.b)             ;01546d3cda409abcdef0

-    or.w @er3+,@(0x9abcdef0:32,r2.w)             ;01546d3cea409abcdef0

-    or.w @er3+,@(0x9abcdef0:32,er2.l)             ;01546d3cfa409abcdef0

-    or.w @er3+,@0xffff9abc:16                     ;01546d3c40409abc

-    or.w @er3+,@0x9abcdef0:32                     ;01546d3c48409abcdef0

-

-    or.w @er3-,@er1                               ;01566d3c0140

-    or.w @er3-,@(6:2,er1)                         ;01566d3c3140

-    or.w @er3-,@-er1                              ;01566d3cb140

-    or.w @er3-,@er1+                              ;01566d3c8140

-    or.w @er3-,@er1-                              ;01566d3ca140

-    or.w @er3-,@+er1                              ;01566d3c9140

-    or.w @er3-,@(0xffff9abc:16,er1)               ;01566d3cc1409abc

-    or.w @er3-,@(0x9abcdef0:32,er1)               ;01566d3cc9409abcdef0

-    or.w @er3-,@(0xffff9abc:16,r2l.b)             ;01566d3cd2409abc

-    or.w @er3-,@(0xffff9abc:16,r2.w)             ;01566d3ce2409abc

-    or.w @er3-,@(0xffff9abc:16,er2.l)             ;01566d3cf2409abc

-    or.w @er3-,@(0x9abcdef0:32,r2l.b)             ;01566d3cda409abcdef0

-    or.w @er3-,@(0x9abcdef0:32,r2.w)             ;01566d3cea409abcdef0

-    or.w @er3-,@(0x9abcdef0:32,er2.l)             ;01566d3cfa409abcdef0

-    or.w @er3-,@0xffff9abc:16                     ;01566d3c40409abc

-    or.w @er3-,@0x9abcdef0:32                     ;01566d3c48409abcdef0

-

-    or.w @+er3,@er1                               ;01556d3c0140

-    or.w @+er3,@(6:2,er1)                         ;01556d3c3140

-    or.w @+er3,@-er1                              ;01556d3cb140

-    or.w @+er3,@er1+                              ;01556d3c8140

-    or.w @+er3,@er1-                              ;01556d3ca140

-    or.w @+er3,@+er1                              ;01556d3c9140

-    or.w @+er3,@(0xffff9abc:16,er1)               ;01556d3cc1409abc

-    or.w @+er3,@(0x9abcdef0:32,er1)               ;01556d3cc9409abcdef0

-    or.w @+er3,@(0xffff9abc:16,r2l.b)             ;01556d3cd2409abc

-    or.w @+er3,@(0xffff9abc:16,r2.w)             ;01556d3ce2409abc

-    or.w @+er3,@(0xffff9abc:16,er2.l)             ;01556d3cf2409abc

-    or.w @+er3,@(0x9abcdef0:32,r2l.b)             ;01556d3cda409abcdef0

-    or.w @+er3,@(0x9abcdef0:32,r2.w)             ;01556d3cea409abcdef0

-    or.w @+er3,@(0x9abcdef0:32,er2.l)             ;01556d3cfa409abcdef0

-    or.w @+er3,@0xffff9abc:16                     ;01556d3c40409abc

-    or.w @+er3,@0x9abcdef0:32                     ;01556d3c48409abcdef0

-

-    or.w @(0x1234:16,er3),@er1                         ;01546f3c12340140

-    or.w @(0x1234:16,er3),@(6:2,er1)                   ;01546f3c12343140

-    or.w @(0x1234:16,er3),@-er1                        ;01546f3c1234b140

-    or.w @(0x1234:16,er3),@er1+                        ;01546f3c12348140

-    or.w @(0x1234:16,er3),@er1-                        ;01546f3c1234a140

-    or.w @(0x1234:16,er3),@+er1                        ;01546f3c12349140

-    or.w @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01546f3c1234c1409abc

-    or.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01546f3c1234c9409abcdef0

-    or.w @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01546f3c1234d2409abc

-    or.w @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01546f3c1234e2409abc

-    or.w @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01546f3c1234f2409abc

-    or.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01546f3c1234da409abcdef0

-    or.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01546f3c1234ea409abcdef0

-    or.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01546f3c1234fa409abcdef0

-    or.w @(0x1234:16,er3),@0xffff9abc:16               ;01546f3c123440409abc

-    or.w @(0x1234:16,er3),@0x9abcdef0:32               ;01546f3c123448409abcdef0

-

-    or.w @(0x12345678:32,er3),@er1                         ;78346b2c123456780140

-    or.w @(0x12345678:32,er3),@(6:2,er1)                   ;78346b2c123456783140

-    or.w @(0x12345678:32,er3),@-er1                        ;78346b2c12345678b140

-    or.w @(0x12345678:32,er3),@er1+                        ;78346b2c123456788140

-    or.w @(0x12345678:32,er3),@er1-                        ;78346b2c12345678a140

-    or.w @(0x12345678:32,er3),@+er1                        ;78346b2c123456789140

-    or.w @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346b2c12345678c1409abc

-    or.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346b2c12345678c9409abcdef0

-    or.w @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346b2c12345678d2409abc

-    or.w @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346b2c12345678e2409abc

-    or.w @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346b2c12345678f2409abc

-    or.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346b2c12345678da409abcdef0

-    or.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346b2c12345678ea409abcdef0

-    or.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346b2c12345678fa409abcdef0

-    or.w @(0x12345678:32,er3),@0xffff9abc:16               ;78346b2c1234567840409abc

-    or.w @(0x12345678:32,er3),@0x9abcdef0:32               ;78346b2c1234567848409abcdef0

-

-    or.w @(0x1234:16,r3l.b),@er1                       ;01556f3c12340140

-    or.w @(0x1234:16,r3l.b),@(6:2,er1)                 ;01556f3c12343140

-    or.w @(0x1234:16,r3l.b),@-er1                      ;01556f3c1234b140

-    or.w @(0x1234:16,r3l.b),@er1+                      ;01556f3c12348140

-    or.w @(0x1234:16,r3l.b),@er1-                      ;01556f3c1234a140

-    or.w @(0x1234:16,r3l.b),@+er1                      ;01556f3c12349140

-    or.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01556f3c1234c1409abc

-    or.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01556f3c1234c9409abcdef0

-    or.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01556f3c1234d2409abc

-    or.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01556f3c1234e2409abc

-    or.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01556f3c1234f2409abc

-    or.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01556f3c1234da409abcdef0

-    or.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01556f3c1234ea409abcdef0

-    or.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01556f3c1234fa409abcdef0

-    or.w @(0x1234:16,r3l.b),@0xffff9abc:16             ;01556f3c123440409abc

-    or.w @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01556f3c123448409abcdef0

-

-    or.w @(0x1234:16,r3.w),@er1                       ;01566f3c12340140

-    or.w @(0x1234:16,r3.w),@(6:2,er1)                 ;01566f3c12343140

-    or.w @(0x1234:16,r3.w),@-er1                      ;01566f3c1234b140

-    or.w @(0x1234:16,r3.w),@er1+                      ;01566f3c12348140

-    or.w @(0x1234:16,r3.w),@er1-                      ;01566f3c1234a140

-    or.w @(0x1234:16,r3.w),@+er1                      ;01566f3c12349140

-    or.w @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01566f3c1234c1409abc

-    or.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01566f3c1234c9409abcdef0

-    or.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01566f3c1234d2409abc

-    or.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01566f3c1234e2409abc

-    or.w @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01566f3c1234f2409abc

-    or.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01566f3c1234da409abcdef0

-    or.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01566f3c1234ea409abcdef0

-    or.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01566f3c1234fa409abcdef0

-    or.w @(0x1234:16,r3.w),@0xffff9abc:16             ;01566f3c123440409abc

-    or.w @(0x1234:16,r3.w),@0x9abcdef0:32             ;01566f3c123448409abcdef0

-

-    or.w @(0x1234:16,er3.l),@er1                       ;01576f3c12340140

-    or.w @(0x1234:16,er3.l),@(6:2,er1)                 ;01576f3c12343140

-    or.w @(0x1234:16,er3.l),@-er1                      ;01576f3c1234b140

-    or.w @(0x1234:16,er3.l),@er1+                      ;01576f3c12348140

-    or.w @(0x1234:16,er3.l),@er1-                      ;01576f3c1234a140

-    or.w @(0x1234:16,er3.l),@+er1                      ;01576f3c12349140

-    or.w @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01576f3c1234c1409abc

-    or.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01576f3c1234c9409abcdef0

-    or.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01576f3c1234d2409abc

-    or.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01576f3c1234e2409abc

-    or.w @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01576f3c1234f2409abc

-    or.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01576f3c1234da409abcdef0

-    or.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01576f3c1234ea409abcdef0

-    or.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01576f3c1234fa409abcdef0

-    or.w @(0x1234:16,er3.l),@0xffff9abc:16             ;01576f3c123440409abc

-    or.w @(0x1234:16,er3.l),@0x9abcdef0:32             ;01576f3c123448409abcdef0

-

-    or.w @(0x12345678:32,r3l.b),@er1                       ;78356b2c123456780140

-    or.w @(0x12345678:32,r3l.b),@(6:2,er1)                 ;78356b2c123456783140

-    or.w @(0x12345678:32,r3l.b),@-er1                      ;78356b2c12345678b140

-    or.w @(0x12345678:32,r3l.b),@er1+                      ;78356b2c123456788140

-    or.w @(0x12345678:32,r3l.b),@er1-                      ;78356b2c12345678a140

-    or.w @(0x12345678:32,r3l.b),@+er1                      ;78356b2c123456789140

-    or.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356b2c12345678c1409abc

-    or.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356b2c12345678c9409abcdef0

-    or.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356b2c12345678d2409abc

-    or.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356b2c12345678e2409abc

-    or.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356b2c12345678f2409abc

-    or.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356b2c12345678da409abcdef0

-    or.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356b2c12345678ea409abcdef0

-    or.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356b2c12345678fa409abcdef0

-    or.w @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356b2c1234567840409abc

-    or.w @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356b2c1234567848409abcdef0

-

-    or.w @(0x12345678:32,r3.w),@er1                       ;78366b2c123456780140

-    or.w @(0x12345678:32,r3.w),@(6:2,er1)                 ;78366b2c123456783140

-    or.w @(0x12345678:32,r3.w),@-er1                      ;78366b2c12345678b140

-    or.w @(0x12345678:32,r3.w),@er1+                      ;78366b2c123456788140

-    or.w @(0x12345678:32,r3.w),@er1-                      ;78366b2c12345678a140

-    or.w @(0x12345678:32,r3.w),@+er1                      ;78366b2c123456789140

-    or.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366b2c12345678c1409abc

-    or.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366b2c12345678c9409abcdef0

-    or.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366b2c12345678d2409abc

-    or.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366b2c12345678e2409abc

-    or.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366b2c12345678f2409abc

-    or.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366b2c12345678da409abcdef0

-    or.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366b2c12345678ea409abcdef0

-    or.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366b2c12345678fa409abcdef0

-    or.w @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366b2c1234567840409abc

-    or.w @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366b2c1234567848409abcdef0

-

-    or.w @(0x12345678:32,er3.l),@er1                       ;78376b2c123456780140

-    or.w @(0x12345678:32,er3.l),@(6:2,er1)                 ;78376b2c123456783140

-    or.w @(0x12345678:32,er3.l),@-er1                      ;78376b2c12345678b140

-    or.w @(0x12345678:32,er3.l),@er1+                      ;78376b2c123456788140

-    or.w @(0x12345678:32,er3.l),@er1-                      ;78376b2c12345678a140

-    or.w @(0x12345678:32,er3.l),@+er1                      ;78376b2c123456789140

-    or.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376b2c12345678c1409abc

-    or.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376b2c12345678c9409abcdef0

-    or.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376b2c12345678d2409abc

-    or.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376b2c12345678e2409abc

-    or.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376b2c12345678f2409abc

-    or.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376b2c12345678da409abcdef0

-    or.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376b2c12345678ea409abcdef0

-    or.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376b2c12345678fa409abcdef0

-    or.w @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376b2c1234567840409abc

-    or.w @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376b2c1234567848409abcdef0

-

-    or.w @0x1234:16,@er1                              ;6b1512340140

-    or.w @0x1234:16,@(6:2,er1)                        ;6b1512343140

-    or.w @0x1234:16,@-er1                             ;6b151234b140

-    or.w @0x1234:16,@er1+                             ;6b1512348140

-    or.w @0x1234:16,@er1-                             ;6b151234a140

-    or.w @0x1234:16,@+er1                             ;6b1512349140

-    or.w @0x1234:16,@(0xffff9abc:16,er1)              ;6b151234c1409abc

-    or.w @0x1234:16,@(0x9abcdef0:32,er1)              ;6b151234c9409abcdef0

-    or.w @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6b151234d2409abc

-    or.w @0x1234:16,@(0xffff9abc:16,r2.w)            ;6b151234e2409abc

-    or.w @0x1234:16,@(0xffff9abc:16,er2.l)            ;6b151234f2409abc

-    or.w @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6b151234da409abcdef0

-    or.w @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6b151234ea409abcdef0

-    or.w @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6b151234fa409abcdef0

-    or.w @0x1234:16,@0xffff9abc:16                    ;6b15123440409abc

-    or.w @0x1234:16,@0x9abcdef0:32                    ;6b15123448409abcdef0

-

-    or.w @0x12345678:32,@er1                              ;6b35123456780140

-    or.w @0x12345678:32,@(6:2,er1)                        ;6b35123456783140

-    or.w @0x12345678:32,@-er1                             ;6b3512345678b140

-    or.w @0x12345678:32,@er1+                             ;6b35123456788140

-    or.w @0x12345678:32,@er1-                             ;6b3512345678a140

-    or.w @0x12345678:32,@+er1                             ;6b35123456789140

-    or.w @0x12345678:32,@(0xffff9abc:16,er1)              ;6b3512345678c1409abc

-    or.w @0x12345678:32,@(0x9abcdef0:32,er1)              ;6b3512345678c9409abcdef0

-    or.w @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6b3512345678d2409abc

-    or.w @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6b3512345678e2409abc

-    or.w @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6b3512345678f2409abc

-    or.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6b3512345678da409abcdef0

-    or.w @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6b3512345678ea409abcdef0

-    or.w @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6b3512345678fa409abcdef0

-    or.w @0x12345678:32,@0xffff9abc:16                    ;6b351234567840409abc

-    or.w @0x12345678:32,@0x9abcdef0:32                    ;6b351234567848409abcdef0

-

-    or.l #0x12345678:32,er1          ;7a4112345678

-    or.l #0x1234:16,er1           ;7a491234

-    or.l #0x12345678:32,@er1          ;010e014812345678

-    or.l #0x12345678:32,@(0xc:2,er1) ;010e314812345678

-    or.l #0x12345678:32,@er1+         ;010e814812345678

-    or.l #0x12345678:32,@-er1         ;010eb14812345678

-    or.l #0x12345678:32,@+er1         ;010e914812345678

-    or.l #0x12345678:32,@er1-         ;010ea14812345678

-    or.l #0x12345678:32,@(0xffff9abc:16,er1)   ;010ec1489abc12345678

-    or.l #0x12345678:32,@(0x9abcdef0:32,er1)   ;010ec9489abcdef012345678

-    or.l #0x12345678:32,@(0xffff9abc:16,r2l.b) ;010ed2489abc12345678

-    or.l #0x12345678:32,@(0xffff9abc:16,r2.w) ;010ee2489abc12345678

-    or.l #0x12345678:32,@(0xffff9abc:16,er2.l) ;010ef2489abc12345678

-    or.l #0x12345678:32,@(0x9abcdef0:32,r2l.b) ;010eda489abcdef012345678

-    or.l #0x12345678:32,@(0x9abcdef0:32,r2.w) ;010eea489abcdef012345678

-    or.l #0x12345678:32,@(0x9abcdef0:32,er2.l) ;010efa489abcdef012345678

-    or.l #0x12345678:32,@0xffff9abc:16         ;010e40489abc12345678

-    or.l #0x12345678:32,@0x9abcdef0:32         ;010e48489abcdef012345678

-    or.l #0x1234:16,@er1          ;010e01401234

-    or.l #0x1234:16,@(0xc:2,er1) ;010e31401234

-    or.l #0x1234:16,@er1+         ;010e81401234

-    or.l #0x1234:16,@-er1         ;010eb1401234

-    or.l #0x1234:16,@+er1         ;010e91401234

-    or.l #0x1234:16,@er1-         ;010ea1401234

-    or.l #0x1234:16,@(0xffff9abc:16,er1)   ;010ec1409abc1234

-    or.l #0x1234:16,@(0x9abcdef0:32,er1)   ;010ec9409abcdef01234

-    or.l #0x1234:16,@(0xffff9abc:16,r2l.b) ;010ed2409abc1234

-    or.l #0x1234:16,@(0xffff9abc:16,r2.w) ;010ee2409abc1234

-    or.l #0x1234:16,@(0xffff9abc:16,er2.l) ;010ef2409abc1234

-    or.l #0x1234:16,@(0x9abcdef0:32,r2l.b) ;010eda409abcdef01234

-    or.l #0x1234:16,@(0x9abcdef0:32,r2.w) ;010eea409abcdef01234

-    or.l #0x1234:16,@(0x9abcdef0:32,er2.l) ;010efa409abcdef01234

-    or.l #0x1234:16,@0xffff9abc:16         ;010e40409abc1234

-    or.l #0x1234:16,@0x9abcdef0:32         ;010e48409abcdef01234

-

-    or.l er3,er1               ;01f06431

-

-    or.l er3,@er1             ;01090143

-    or.l er3,@(0xc:2,er1)    ;01093143

-    or.l er3,@er1+            ;01098143

-    or.l er3,@-er1            ;0109b143

-    or.l er3,@+er1            ;01099143

-    or.l er3,@er1-            ;0109a143

-    or.l er3,@(0x1234:16,er1)      ;0109c1431234

-    or.l er3,@(0x12345678:32,er1)      ;0109c94312345678

-    or.l er3,@(0x1234:16,r2l.b)    ;0109d2431234

-    or.l er3,@(0x1234:16,r2.w)    ;0109e2431234

-    or.l er3,@(0x1234:16,er2.l)    ;0109f2431234

-    or.l er3,@(0x12345678:32,r2l.b)    ;0109da4312345678

-    or.l er3,@(0x12345678:32,r2.w)    ;0109ea4312345678

-    or.l er3,@(0x12345678:32,er2.l)    ;0109fa4312345678

-    or.l er3,@0x1234:16           ;010940431234

-    or.l er3,@0x12345678:32           ;0109484312345678

-

-    or.l @er3,er1             ;010a0341

-    or.l @(0xc:2,er3),er1   ;010a3341

-    or.l @er3+,er1           ;010a8341

-    or.l @-er3,er1           ;010ab341

-    or.l @+er3,er1           ;010a9341

-    or.l @er3-,er1           ;010aa341

-    or.l @(0x1234:16,er1),er1      ;010ac1411234

-    or.l @(0x12345678:32,er1),er1      ;010ac94112345678

-    or.l @(0x1234:16,r2l.b),er1    ;010ad2411234

-    or.l @(0x1234:16,r2.w),er1    ;010ae2411234

-    or.l @(0x1234:16,er2.l),er1    ;010af2411234

-    or.l @(0x12345678:32,r2l.b),er1    ;010ada4112345678

-    or.l @(0x12345678:32,r2.w),er1    ;010aea4112345678

-    or.l @(0x12345678:32,er2.l),er1    ;010afa4112345678

-    or.l @0x1234:16,er1           ;010a40411234

-    or.l @0x12345678:32,er1           ;010a484112345678

-

-    or.l @er3,@er1                                ;0104693c0140

-    or.l @er3,@(0xc:2,er1)                          ;0104693c3140

-    or.l @er3,@-er1                               ;0104693cb140

-    or.l @er3,@er1+                               ;0104693c8140

-    or.l @er3,@er1-                               ;0104693ca140

-    or.l @er3,@+er1                               ;0104693c9140

-    or.l @er3,@(0xffff9abc:16,er1)                ;0104693cc1409abc

-    or.l @er3,@(0x9abcdef0:32,er1)                ;0104693cc9409abcdef0

-    or.l @er3,@(0xffff9abc:16,r2l.b)              ;0104693cd2409abc

-    or.l @er3,@(0xffff9abc:16,r2.w)              ;0104693ce2409abc

-    or.l @er3,@(0xffff9abc:16,er2.l)              ;0104693cf2409abc

-    or.l @er3,@(0x9abcdef0:32,r2l.b)              ;0104693cda409abcdef0

-    or.l @er3,@(0x9abcdef0:32,r2.w)              ;0104693cea409abcdef0

-    or.l @er3,@(0x9abcdef0:32,er2.l)              ;0104693cfa409abcdef0

-    or.l @er3,@0xffff9abc:16                      ;0104693c40409abc

-    or.l @er3,@0x9abcdef0:32                      ;0104693c48409abcdef0

-

-    or.l @(0xc:2,er3),@er1                       ;0107693c0140

-    or.l @(0xc:2,er3),@(0xc:2,er1)                 ;0107693c3140

-    or.l @(0xc:2,er3),@-er1                      ;0107693cb140

-    or.l @(0xc:2,er3),@er1+                      ;0107693c8140

-    or.l @(0xc:2,er3),@er1-                      ;0107693ca140

-    or.l @(0xc:2,er3),@+er1                      ;0107693c9140

-    or.l @(0xc:2,er3),@(0xffff9abc:16,er1)       ;0107693cc1409abc

-    or.l @(0xc:2,er3),@(0x9abcdef0:32,er1)       ;0107693cc9409abcdef0

-    or.l @(0xc:2,er3),@(0xffff9abc:16,r2l.b)     ;0107693cd2409abc

-    or.l @(0xc:2,er3),@(0xffff9abc:16,r2.w)     ;0107693ce2409abc

-    or.l @(0xc:2,er3),@(0xffff9abc:16,er2.l)     ;0107693cf2409abc

-    or.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)     ;0107693cda409abcdef0

-    or.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)     ;0107693cea409abcdef0

-    or.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)     ;0107693cfa409abcdef0

-    or.l @(0xc:2,er3),@0xffff9abc:16             ;0107693c40409abc

-    or.l @(0xc:2,er3),@0x9abcdef0:32             ;0107693c48409abcdef0

-

-    or.l @-er3,@er1                               ;01076d3c0140

-    or.l @-er3,@(0xc:2,er1)                         ;01076d3c3140

-    or.l @-er3,@-er1                              ;01076d3cb140

-    or.l @-er3,@er1+                              ;01076d3c8140

-    or.l @-er3,@er1-                              ;01076d3ca140

-    or.l @-er3,@+er1                              ;01076d3c9140

-    or.l @-er3,@(0xffff9abc:16,er1)               ;01076d3cc1409abc

-    or.l @-er3,@(0x9abcdef0:32,er1)               ;01076d3cc9409abcdef0

-    or.l @-er3,@(0xffff9abc:16,r2l.b)             ;01076d3cd2409abc

-    or.l @-er3,@(0xffff9abc:16,r2.w)             ;01076d3ce2409abc

-    or.l @-er3,@(0xffff9abc:16,er2.l)             ;01076d3cf2409abc

-    or.l @-er3,@(0x9abcdef0:32,r2l.b)             ;01076d3cda409abcdef0

-    or.l @-er3,@(0x9abcdef0:32,r2.w)             ;01076d3cea409abcdef0

-    or.l @-er3,@(0x9abcdef0:32,er2.l)             ;01076d3cfa409abcdef0

-    or.l @-er3,@0xffff9abc:16                     ;01076d3c40409abc

-    or.l @-er3,@0x9abcdef0:32                     ;01076d3c48409abcdef0

-

-    or.l @er3+,@er1                               ;01046d3c0140

-    or.l @er3+,@(0xc:2,er1)                         ;01046d3c3140

-    or.l @er3+,@-er1                              ;01046d3cb140

-    or.l @er3+,@er1+                              ;01046d3c8140

-    or.l @er3+,@er1-                              ;01046d3ca140

-    or.l @er3+,@+er1                              ;01046d3c9140

-    or.l @er3+,@(0xffff9abc:16,er1)               ;01046d3cc1409abc

-    or.l @er3+,@(0x9abcdef0:32,er1)               ;01046d3cc9409abcdef0

-    or.l @er3+,@(0xffff9abc:16,r2l.b)             ;01046d3cd2409abc

-    or.l @er3+,@(0xffff9abc:16,r2.w)             ;01046d3ce2409abc

-    or.l @er3+,@(0xffff9abc:16,er2.l)             ;01046d3cf2409abc

-    or.l @er3+,@(0x9abcdef0:32,r2l.b)             ;01046d3cda409abcdef0

-    or.l @er3+,@(0x9abcdef0:32,r2.w)             ;01046d3cea409abcdef0

-    or.l @er3+,@(0x9abcdef0:32,er2.l)             ;01046d3cfa409abcdef0

-    or.l @er3+,@0xffff9abc:16                     ;01046d3c40409abc

-    or.l @er3+,@0x9abcdef0:32                     ;01046d3c48409abcdef0

-

-    or.l @er3-,@er1                               ;01066d3c0140

-    or.l @er3-,@(0xc:2,er1)                         ;01066d3c3140

-    or.l @er3-,@-er1                              ;01066d3cb140

-    or.l @er3-,@er1+                              ;01066d3c8140

-    or.l @er3-,@er1-                              ;01066d3ca140

-    or.l @er3-,@+er1                              ;01066d3c9140

-    or.l @er3-,@(0xffff9abc:16,er1)               ;01066d3cc1409abc

-    or.l @er3-,@(0x9abcdef0:32,er1)               ;01066d3cc9409abcdef0

-    or.l @er3-,@(0xffff9abc:16,r2l.b)             ;01066d3cd2409abc

-    or.l @er3-,@(0xffff9abc:16,r2.w)             ;01066d3ce2409abc

-    or.l @er3-,@(0xffff9abc:16,er2.l)             ;01066d3cf2409abc

-    or.l @er3-,@(0x9abcdef0:32,r2l.b)             ;01066d3cda409abcdef0

-    or.l @er3-,@(0x9abcdef0:32,r2.w)             ;01066d3cea409abcdef0

-    or.l @er3-,@(0x9abcdef0:32,er2.l)             ;01066d3cfa409abcdef0

-    or.l @er3-,@0xffff9abc:16                     ;01066d3c40409abc

-    or.l @er3-,@0x9abcdef0:32                     ;01066d3c48409abcdef0

-

-    or.l @+er3,@er1                               ;01056d3c0140

-    or.l @+er3,@(0xc:2,er1)                         ;01056d3c3140

-    or.l @+er3,@-er1                              ;01056d3cb140

-    or.l @+er3,@er1+                              ;01056d3c8140

-    or.l @+er3,@er1-                              ;01056d3ca140

-    or.l @+er3,@+er1                              ;01056d3c9140

-    or.l @+er3,@(0xffff9abc:16,er1)               ;01056d3cc1409abc

-    or.l @+er3,@(0x9abcdef0:32,er1)               ;01056d3cc9409abcdef0

-    or.l @+er3,@(0xffff9abc:16,r2l.b)             ;01056d3cd2409abc

-    or.l @+er3,@(0xffff9abc:16,r2.w)             ;01056d3ce2409abc

-    or.l @+er3,@(0xffff9abc:16,er2.l)             ;01056d3cf2409abc

-    or.l @+er3,@(0x9abcdef0:32,r2l.b)             ;01056d3cda409abcdef0

-    or.l @+er3,@(0x9abcdef0:32,r2.w)             ;01056d3cea409abcdef0

-    or.l @+er3,@(0x9abcdef0:32,er2.l)             ;01056d3cfa409abcdef0

-    or.l @+er3,@0xffff9abc:16                     ;01056d3c40409abc

-    or.l @+er3,@0x9abcdef0:32                     ;01056d3c48409abcdef0

-

-    or.l @(0x1234:16,er3),@er1                         ;01046f3c12340140

-    or.l @(0x1234:16,er3),@(0xc:2,er1)                   ;01046f3c12343140

-    or.l @(0x1234:16,er3),@-er1                        ;01046f3c1234b140

-    or.l @(0x1234:16,er3),@er1+                        ;01046f3c12348140

-    or.l @(0x1234:16,er3),@er1-                        ;01046f3c1234a140

-    or.l @(0x1234:16,er3),@+er1                        ;01046f3c12349140

-    or.l @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01046f3c1234c1409abc

-    or.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01046f3c1234c9409abcdef0

-    or.l @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01046f3c1234d2409abc

-    or.l @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01046f3c1234e2409abc

-    or.l @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01046f3c1234f2409abc

-    or.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01046f3c1234da409abcdef0

-    or.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01046f3c1234ea409abcdef0

-    or.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01046f3c1234fa409abcdef0

-    or.l @(0x1234:16,er3),@0xffff9abc:16               ;01046f3c123440409abc

-    or.l @(0x1234:16,er3),@0x9abcdef0:32               ;01046f3c123448409abcdef0

-

-    or.l @(0x12345678:32,er3),@er1                         ;78b46b2c123456780140

-    or.l @(0x12345678:32,er3),@(0xc:2,er1)                   ;78b46b2c123456783140

-    or.l @(0x12345678:32,er3),@-er1                        ;78b46b2c12345678b140

-    or.l @(0x12345678:32,er3),@er1+                        ;78b46b2c123456788140

-    or.l @(0x12345678:32,er3),@er1-                        ;78b46b2c12345678a140

-    or.l @(0x12345678:32,er3),@+er1                        ;78b46b2c123456789140

-    or.l @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78b46b2c12345678c1409abc

-    or.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78b46b2c12345678c9409abcdef0

-    or.l @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78b46b2c12345678d2409abc

-    or.l @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78b46b2c12345678e2409abc

-    or.l @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78b46b2c12345678f2409abc

-    or.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78b46b2c12345678da409abcdef0

-    or.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78b46b2c12345678ea409abcdef0

-    or.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78b46b2c12345678fa409abcdef0

-    or.l @(0x12345678:32,er3),@0xffff9abc:16               ;78b46b2c1234567840409abc

-    or.l @(0x12345678:32,er3),@0x9abcdef0:32               ;78b46b2c1234567848409abcdef0

-

-    or.l @(0x1234:16,r3l.b),@er1                       ;01056f3c12340140

-    or.l @(0x1234:16,r3l.b),@(0xc:2,er1)                 ;01056f3c12343140

-    or.l @(0x1234:16,r3l.b),@-er1                      ;01056f3c1234b140

-    or.l @(0x1234:16,r3l.b),@er1+                      ;01056f3c12348140

-    or.l @(0x1234:16,r3l.b),@er1-                      ;01056f3c1234a140

-    or.l @(0x1234:16,r3l.b),@+er1                      ;01056f3c12349140

-    or.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01056f3c1234c1409abc

-    or.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01056f3c1234c9409abcdef0

-    or.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01056f3c1234d2409abc

-    or.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01056f3c1234e2409abc

-    or.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01056f3c1234f2409abc

-    or.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01056f3c1234da409abcdef0

-    or.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01056f3c1234ea409abcdef0

-    or.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01056f3c1234fa409abcdef0

-    or.l @(0x1234:16,r3l.b),@0xffff9abc:16             ;01056f3c123440409abc

-    or.l @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01056f3c123448409abcdef0

-

-    or.l @(0x1234:16,r3.w),@er1                       ;01066f3c12340140

-    or.l @(0x1234:16,r3.w),@(0xc:2,er1)                 ;01066f3c12343140

-    or.l @(0x1234:16,r3.w),@-er1                      ;01066f3c1234b140

-    or.l @(0x1234:16,r3.w),@er1+                      ;01066f3c12348140

-    or.l @(0x1234:16,r3.w),@er1-                      ;01066f3c1234a140

-    or.l @(0x1234:16,r3.w),@+er1                      ;01066f3c12349140

-    or.l @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01066f3c1234c1409abc

-    or.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01066f3c1234c9409abcdef0

-    or.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01066f3c1234d2409abc

-    or.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01066f3c1234e2409abc

-    or.l @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01066f3c1234f2409abc

-    or.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01066f3c1234da409abcdef0

-    or.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01066f3c1234ea409abcdef0

-    or.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01066f3c1234fa409abcdef0

-    or.l @(0x1234:16,r3.w),@0xffff9abc:16             ;01066f3c123440409abc

-    or.l @(0x1234:16,r3.w),@0x9abcdef0:32             ;01066f3c123448409abcdef0

-

-    or.l @(0x1234:16,er3.l),@er1                       ;01076f3c12340140

-    or.l @(0x1234:16,er3.l),@(0xc:2,er1)                 ;01076f3c12343140

-    or.l @(0x1234:16,er3.l),@-er1                      ;01076f3c1234b140

-    or.l @(0x1234:16,er3.l),@er1+                      ;01076f3c12348140

-    or.l @(0x1234:16,er3.l),@er1-                      ;01076f3c1234a140

-    or.l @(0x1234:16,er3.l),@+er1                      ;01076f3c12349140

-    or.l @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01076f3c1234c1409abc

-    or.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01076f3c1234c9409abcdef0

-    or.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01076f3c1234d2409abc

-    or.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01076f3c1234e2409abc

-    or.l @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01076f3c1234f2409abc

-    or.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01076f3c1234da409abcdef0

-    or.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01076f3c1234ea409abcdef0

-    or.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01076f3c1234fa409abcdef0

-    or.l @(0x1234:16,er3.l),@0xffff9abc:16             ;01076f3c123440409abc

-    or.l @(0x1234:16,er3.l),@0x9abcdef0:32             ;01076f3c123448409abcdef0

-

-    or.l @(0x12345678:32,r3l.b),@er1                       ;78b56b2c123456780140

-    or.l @(0x12345678:32,r3l.b),@(0xc:2,er1)                 ;78b56b2c123456783140

-    or.l @(0x12345678:32,r3l.b),@-er1                      ;78b56b2c12345678b140

-    or.l @(0x12345678:32,r3l.b),@er1+                      ;78b56b2c123456788140

-    or.l @(0x12345678:32,r3l.b),@er1-                      ;78b56b2c12345678a140

-    or.l @(0x12345678:32,r3l.b),@+er1                      ;78b56b2c123456789140

-    or.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78b56b2c12345678c1409abc

-    or.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78b56b2c12345678c9409abcdef0

-    or.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78b56b2c12345678d2409abc

-    or.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78b56b2c12345678e2409abc

-    or.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78b56b2c12345678f2409abc

-    or.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78b56b2c12345678da409abcdef0

-    or.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78b56b2c12345678ea409abcdef0

-    or.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78b56b2c12345678fa409abcdef0

-    or.l @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78b56b2c1234567840409abc

-    or.l @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78b56b2c1234567848409abcdef0

-

-    or.l @(0x12345678:32,r3.w),@er1                       ;78b66b2c123456780140

-    or.l @(0x12345678:32,r3.w),@(0xc:2,er1)                 ;78b66b2c123456783140

-    or.l @(0x12345678:32,r3.w),@-er1                      ;78b66b2c12345678b140

-    or.l @(0x12345678:32,r3.w),@er1+                      ;78b66b2c123456788140

-    or.l @(0x12345678:32,r3.w),@er1-                      ;78b66b2c12345678a140

-    or.l @(0x12345678:32,r3.w),@+er1                      ;78b66b2c123456789140

-    or.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78b66b2c12345678c1409abc

-    or.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78b66b2c12345678c9409abcdef0

-    or.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78b66b2c12345678d2409abc

-    or.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78b66b2c12345678e2409abc

-    or.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78b66b2c12345678f2409abc

-    or.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78b66b2c12345678da409abcdef0

-    or.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78b66b2c12345678ea409abcdef0

-    or.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78b66b2c12345678fa409abcdef0

-    or.l @(0x12345678:32,r3.w),@0xffff9abc:16             ;78b66b2c1234567840409abc

-    or.l @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78b66b2c1234567848409abcdef0

-

-    or.l @(0x12345678:32,er3.l),@er1                       ;78b76b2c123456780140

-    or.l @(0x12345678:32,er3.l),@(0xc:2,er1)                 ;78b76b2c123456783140

-    or.l @(0x12345678:32,er3.l),@-er1                      ;78b76b2c12345678b140

-    or.l @(0x12345678:32,er3.l),@er1+                      ;78b76b2c123456788140

-    or.l @(0x12345678:32,er3.l),@er1-                      ;78b76b2c12345678a140

-    or.l @(0x12345678:32,er3.l),@+er1                      ;78b76b2c123456789140

-    or.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78b76b2c12345678c1409abc

-    or.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78b76b2c12345678c9409abcdef0

-    or.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78b76b2c12345678d2409abc

-    or.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78b76b2c12345678e2409abc

-    or.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78b76b2c12345678f2409abc

-    or.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78b76b2c12345678da409abcdef0

-    or.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78b76b2c12345678ea409abcdef0

-    or.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78b76b2c12345678fa409abcdef0

-    or.l @(0x12345678:32,er3.l),@0xffff9abc:16             ;78b76b2c1234567840409abc

-    or.l @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78b76b2c1234567848409abcdef0

-

-    or.l @0x1234:16,@er1                              ;01046b0c12340140

-    or.l @0x1234:16,@(0xc:2,er1)                        ;01046b0c12343140

-    or.l @0x1234:16,@-er1                             ;01046b0c1234b140

-    or.l @0x1234:16,@er1+                             ;01046b0c12348140

-    or.l @0x1234:16,@er1-                             ;01046b0c1234a140

-    or.l @0x1234:16,@+er1                             ;01046b0c12349140

-    or.l @0x1234:16,@(0xffff9abc:16,er1)              ;01046b0c1234c1409abc

-    or.l @0x1234:16,@(0x9abcdef0:32,er1)              ;01046b0c1234c9409abcdef0

-    or.l @0x1234:16,@(0xffff9abc:16,r2l.b)            ;01046b0c1234d2409abc

-    or.l @0x1234:16,@(0xffff9abc:16,r2.w)            ;01046b0c1234e2409abc

-    or.l @0x1234:16,@(0xffff9abc:16,er2.l)            ;01046b0c1234f2409abc

-    or.l @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;01046b0c1234da409abcdef0

-    or.l @0x1234:16,@(0x9abcdef0:32,r2.w)            ;01046b0c1234ea409abcdef0

-    or.l @0x1234:16,@(0x9abcdef0:32,er2.l)            ;01046b0c1234fa409abcdef0

-    or.l @0x1234:16,@0xffff9abc:16                    ;01046b0c123440409abc

-    or.l @0x1234:16,@0x9abcdef0:32                    ;01046b0c123448409abcdef0

-

-    or.l @0x12345678:32,@er1                              ;01046b2c123456780140

-    or.l @0x12345678:32,@(0xc:2,er1)                        ;01046b2c123456783140

-    or.l @0x12345678:32,@-er1                             ;01046b2c12345678b140

-    or.l @0x12345678:32,@er1+                             ;01046b2c123456788140

-    or.l @0x12345678:32,@er1-                             ;01046b2c12345678a140

-    or.l @0x12345678:32,@+er1                             ;01046b2c123456789140

-    or.l @0x12345678:32,@(0xffff9abc:16,er1)              ;01046b2c12345678c1409abc

-    or.l @0x12345678:32,@(0x9abcdef0:32,er1)              ;01046b2c12345678c9409abcdef0

-    or.l @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;01046b2c12345678d2409abc

-    or.l @0x12345678:32,@(0xffff9abc:16,r2.w)            ;01046b2c12345678e2409abc

-    or.l @0x12345678:32,@(0xffff9abc:16,er2.l)            ;01046b2c12345678f2409abc

-    or.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;01046b2c12345678da409abcdef0

-    or.l @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;01046b2c12345678ea409abcdef0

-    or.l @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;01046b2c12345678fa409abcdef0

-    or.l @0x12345678:32,@0xffff9abc:16                    ;01046b2c1234567840409abc

-    or.l @0x12345678:32,@0x9abcdef0:32                    ;01046b2c1234567848409abcdef0

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t09_xor.exp b/gdb/testsuite/gdb.disasm/t09_xor.exp
deleted file mode 100644
index 0164b330b49..00000000000
--- a/gdb/testsuite/gdb.disasm/t09_xor.exp
+++ /dev/null
@@ -1,1866 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t09_xor"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "xor.b\t#0x12(:8|),r1h" \
-	"xor.b #0x12:8,r1h"
-gdb_test "x" "xor.b\t#0x12(:8|),@er1" \
-	"xor.b #0x12:8,@er1"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x3(:2|),er1\\)" \
-	"xor.b #0x12:8,@(0x3:2,er1)"
-gdb_test "x" "xor.b\t#0x12(:8|),@er1\\+" \
-	"xor.b #0x12:8,@er1+"
-gdb_test "x" "xor.b\t#0x12(:8|),@-er1" \
-	"xor.b #0x12:8,@-er1"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\+er1" \
-	"xor.b #0x12:8,@+er1"
-gdb_test "x" "xor.b\t#0x12(:8|),@er1-" \
-	"xor.b #0x12:8,@er1-"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x1234(:16|),er1\\)" \
-	"xor.b #0x12:8,@(0x1234:16,er1)"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x12345678(:32|),er1\\)" \
-	"xor.b #0x12:8,@(0x12345678:32,er1)"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x1234(:16|),r2l.b\\)" \
-	"xor.b #0x12:8,@(0x1234:16,r2l.b)"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x1234(:16|),r2.w\\)" \
-	"xor.b #0x12:8,@(0x1234:16,r2.w)"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x1234(:16|),er2.l\\)" \
-	"xor.b #0x12:8,@(0x1234:16,er2.l)"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x12345678(:32|),r2l.b\\)" \
-	"xor.b #0x12:8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x12345678(:32|),r2.w\\)" \
-	"xor.b #0x12:8,@(0x12345678:32,r2.w)"
-gdb_test "x" "xor.b\t#0x12(:8|),@\\(0x12345678(:32|),er2.l\\)" \
-	"xor.b #0x12:8,@(0x12345678:32,er2.l)"
-gdb_test "x" "xor.b\t#0x12(:8|),@0x12(:8|)" \
-	"xor.b #0x12:8,@0x12:8"
-gdb_test "x" "xor.b\t#0x12(:8|),@0x1234(:16|)" \
-	"xor.b #0x12:8,@0x1234:16"
-gdb_test "x" "xor.b\t#0x12(:8|),@0x12345678(:32|)" \
-	"xor.b #0x12:8,@0x12345678:32"
-gdb_test "x" "xor.b\tr3h,r1h" \
-	"xor.b r3h,r1h"
-gdb_test "x" "xor.b\tr3h,@er1" \
-	"xor.b r3h,@er1"
-gdb_test "x" "xor.b\tr3h,@\\(0x3(:2|),er1\\)" \
-	"xor.b r3h,@(0x3:2,er1)"
-gdb_test "x" "xor.b\tr3h,@er1\\+" \
-	"xor.b r3h,@er1+"
-gdb_test "x" "xor.b\tr3h,@-er1" \
-	"xor.b r3h,@-er1"
-gdb_test "x" "xor.b\tr3h,@\\+er1" \
-	"xor.b r3h,@+er1"
-gdb_test "x" "xor.b\tr3h,@er1-" \
-	"xor.b r3h,@er1-"
-gdb_test "x" "xor.b\tr3h,@\\(0x1234(:16|),er1\\)" \
-	"xor.b r3h,@(0x1234:16,er1)"
-gdb_test "x" "xor.b\tr3h,@\\(0x12345678(:32|),er1\\)" \
-	"xor.b r3h,@(0x12345678:32,er1)"
-gdb_test "x" "xor.b\tr3h,@\\(0x1234(:16|),r2l.b\\)" \
-	"xor.b r3h,@(0x1234:16,r2l.b)"
-gdb_test "x" "xor.b\tr3h,@\\(0x1234(:16|),r2.w\\)" \
-	"xor.b r3h,@(0x1234:16,r2.w)"
-gdb_test "x" "xor.b\tr3h,@\\(0x1234(:16|),er2.l\\)" \
-	"xor.b r3h,@(0x1234:16,er2.l)"
-gdb_test "x" "xor.b\tr3h,@\\(0x12345678(:32|),r2l.b\\)" \
-	"xor.b r3h,@(0x12345678:32,r2l.b)"
-gdb_test "x" "xor.b\tr3h,@\\(0x12345678(:32|),r2.w\\)" \
-	"xor.b r3h,@(0x12345678:32,r2.w)"
-gdb_test "x" "xor.b\tr3h,@\\(0x12345678(:32|),er2.l\\)" \
-	"xor.b r3h,@(0x12345678:32,er2.l)"
-gdb_test "x" "xor.b\tr3h,@0x12(:8|)" \
-	"xor.b r3h,@0x12:8"
-gdb_test "x" "xor.b\tr3h,@0x1234(:16|)" \
-	"xor.b r3h,@0x1234:16"
-gdb_test "x" "xor.b\tr3h,@0x12345678(:32|)" \
-	"xor.b r3h,@0x12345678:32"
-gdb_test "x" "xor.b\t@er3,r1h" \
-	"xor.b @er3,r1h"
-gdb_test "x" "xor.b\t@\\(0x3(:2|),er3\\),r1h" \
-	"xor.b @(0x3:2,er3),r1h"
-gdb_test "x" "xor.b\t@er3\\+,r1h" \
-	"xor.b @er3+,r1h"
-gdb_test "x" "xor.b\t@-er3,r1h" \
-	"xor.b @-er3,r1h"
-gdb_test "x" "xor.b\t@\\+er3,r1h" \
-	"xor.b @+er3,r1h"
-gdb_test "x" "xor.b\t@er3-,r1h" \
-	"xor.b @er3-,r1h"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er1\\),r1h" \
-	"xor.b @(0x1234:16,er1),r1h"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er1\\),r1h" \
-	"xor.b @(0x12345678:32,er1),r1h"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r2l.b\\),r1h" \
-	"xor.b @(0x1234:16,r2l.b),r1h"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r2.w\\),r1h" \
-	"xor.b @(0x1234:16,r2.w),r1h"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er2.l\\),r1h" \
-	"xor.b @(0x1234:16,er2.l),r1h"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r2l.b\\),r1h" \
-	"xor.b @(0x12345678:32,r2l.b),r1h"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r2.w\\),r1h" \
-	"xor.b @(0x12345678:32,r2.w),r1h"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er2.l\\),r1h" \
-	"xor.b @(0x12345678:32,er2.l),r1h"
-gdb_test "x" "xor.b\t@0x12(:8|),r1h" \
-	"xor.b @0x12:8,r1h"
-gdb_test "x" "xor.b\t@0x1234(:16|),r1h" \
-	"xor.b @0x1234:16,r1h"
-gdb_test "x" "xor.b\t@0x12345678(:32|),r1h" \
-	"xor.b @0x12345678:32,r1h"
-gdb_test "x" "xor.b\t@er3,@er1" \
-	"xor.b @er3,@er1"
-gdb_test "x" "xor.b\t@er3,@\\(0x3(:2|),er1\\)" \
-	"xor.b @er3,@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@er3,@-er1" \
-	"xor.b @er3,@-er1"
-gdb_test "x" "xor.b\t@er3,@er1\\+" \
-	"xor.b @er3,@er1+"
-gdb_test "x" "xor.b\t@er3,@er1-" \
-	"xor.b @er3,@er1-"
-gdb_test "x" "xor.b\t@er3,@\\+er1" \
-	"xor.b @er3,@+er1"
-gdb_test "x" "xor.b\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@er3,@0x9abc(:16|)" \
-	"xor.b @er3,@0x9abc:16"
-gdb_test "x" "xor.b\t@er3,@0x9abcdef0(:32|)" \
-	"xor.b @er3,@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@-er3,@er1" \
-	"xor.b @-er3,@er1"
-gdb_test "x" "xor.b\t@-er3,@\\(0x3(:2|),er1\\)" \
-	"xor.b @-er3,@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@-er3,@-er1" \
-	"xor.b @-er3,@-er1"
-gdb_test "x" "xor.b\t@-er3,@er1\\+" \
-	"xor.b @-er3,@er1+"
-gdb_test "x" "xor.b\t@-er3,@er1-" \
-	"xor.b @-er3,@er1-"
-gdb_test "x" "xor.b\t@-er3,@\\+er1" \
-	"xor.b @-er3,@+er1"
-gdb_test "x" "xor.b\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@-er3,@0x9abc(:16|)" \
-	"xor.b @-er3,@0x9abc:16"
-gdb_test "x" "xor.b\t@-er3,@0x9abcdef0(:32|)" \
-	"xor.b @-er3,@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@er3\\+,@er1" \
-	"xor.b @er3+,@er1"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x3(:2|),er1\\)" \
-	"xor.b @er3+,@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@er3\\+,@-er1" \
-	"xor.b @er3+,@-er1"
-gdb_test "x" "xor.b\t@er3\\+,@er1\\+" \
-	"xor.b @er3+,@er1+"
-gdb_test "x" "xor.b\t@er3\\+,@er1-" \
-	"xor.b @er3+,@er1-"
-gdb_test "x" "xor.b\t@er3\\+,@\\+er1" \
-	"xor.b @er3+,@+er1"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@er3\\+,@0x9abc(:16|)" \
-	"xor.b @er3+,@0x9abc:16"
-gdb_test "x" "xor.b\t@er3\\+,@0x9abcdef0(:32|)" \
-	"xor.b @er3+,@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@er3-,@er1" \
-	"xor.b @er3-,@er1"
-gdb_test "x" "xor.b\t@er3-,@\\(0x3(:2|),er1\\)" \
-	"xor.b @er3-,@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@er3-,@-er1" \
-	"xor.b @er3-,@-er1"
-gdb_test "x" "xor.b\t@er3-,@er1\\+" \
-	"xor.b @er3-,@er1+"
-gdb_test "x" "xor.b\t@er3-,@er1-" \
-	"xor.b @er3-,@er1-"
-gdb_test "x" "xor.b\t@er3-,@\\+er1" \
-	"xor.b @er3-,@+er1"
-gdb_test "x" "xor.b\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@er3-,@0x9abc(:16|)" \
-	"xor.b @er3-,@0x9abc:16"
-gdb_test "x" "xor.b\t@er3-,@0x9abcdef0(:32|)" \
-	"xor.b @er3-,@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\+er3,@er1" \
-	"xor.b @+er3,@er1"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x3(:2|),er1\\)" \
-	"xor.b @+er3,@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\+er3,@-er1" \
-	"xor.b @+er3,@-er1"
-gdb_test "x" "xor.b\t@\\+er3,@er1\\+" \
-	"xor.b @+er3,@er1+"
-gdb_test "x" "xor.b\t@\\+er3,@er1-" \
-	"xor.b @+er3,@er1-"
-gdb_test "x" "xor.b\t@\\+er3,@\\+er1" \
-	"xor.b @+er3,@+er1"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\+er3,@0x9abc(:16|)" \
-	"xor.b @+er3,@0x9abc:16"
-gdb_test "x" "xor.b\t@\\+er3,@0x9abcdef0(:32|)" \
-	"xor.b @+er3,@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@er1" \
-	"xor.b @(0x1234:16,er3),@er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"xor.b @(0x1234:16,er3),@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"xor.b @(0x1234:16,er3),@-er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"xor.b @(0x1234:16,er3),@er1+"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"xor.b @(0x1234:16,er3),@er1-"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"xor.b @(0x1234:16,er3),@+er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"xor.b @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"xor.b @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"xor.b @(0x12345678:32,er3),@er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"xor.b @(0x12345678:32,er3),@-er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"xor.b @(0x12345678:32,er3),@er1+"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"xor.b @(0x12345678:32,er3),@er1-"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"xor.b @(0x12345678:32,er3),@+er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"xor.b @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"xor.b @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"xor.b @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"xor.b @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"xor.b @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"xor.b @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"xor.b @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"xor.b @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"xor.b @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"xor.b @(0x1234:16,r3.w),@er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"xor.b @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"xor.b @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"xor.b @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"xor.b @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"xor.b @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"xor.b @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"xor.b @(0x1234:16,er3.l),@er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"xor.b @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"xor.b @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"xor.b @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"xor.b @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"xor.b @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "xor.b\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"xor.b @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"xor.b @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"xor.b @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"xor.b @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"xor.b @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"xor.b @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"xor.b @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"xor.b @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"xor.b @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"xor.b @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"xor.b @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"xor.b @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"xor.b @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"xor.b @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"xor.b @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"xor.b @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"xor.b @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"xor.b @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"xor.b @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"xor.b @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"xor.b @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "xor.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"xor.b @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@0x1234(:16|),@er1" \
-	"xor.b @0x1234:16,@er1"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x3(:2|),er1\\)" \
-	"xor.b @0x1234:16,@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@-er1" \
-	"xor.b @0x1234:16,@-er1"
-gdb_test "x" "xor.b\t@0x1234(:16|),@er1\\+" \
-	"xor.b @0x1234:16,@er1+"
-gdb_test "x" "xor.b\t@0x1234(:16|),@er1-" \
-	"xor.b @0x1234:16,@er1-"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\+er1" \
-	"xor.b @0x1234:16,@+er1"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@0x1234(:16|),@0x9abc(:16|)" \
-	"xor.b @0x1234:16,@0x9abc:16"
-gdb_test "x" "xor.b\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"xor.b @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@er1" \
-	"xor.b @0x12345678:32,@er1"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x3(:2|),er1\\)" \
-	"xor.b @0x12345678:32,@(0x3:2,er1)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@-er1" \
-	"xor.b @0x12345678:32,@-er1"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@er1\\+" \
-	"xor.b @0x12345678:32,@er1+"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@er1-" \
-	"xor.b @0x12345678:32,@er1-"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\+er1" \
-	"xor.b @0x12345678:32,@+er1"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.b @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.b @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.b @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.b @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.b @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.b @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.b @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"xor.b @0x12345678:32,@0x9abc:16"
-gdb_test "x" "xor.b\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"xor.b @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "xor.w\t#0x1234(:16|),r1" \
-	"xor.w #0x1234:16,r1"
-gdb_test "x" "xor.w\t#0x1234(:16|),@er1" \
-	"xor.w #0x1234:16,@er1"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"xor.w #0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@er1\\+" \
-	"xor.w #0x1234:16,@er1+"
-gdb_test "x" "xor.w\t#0x1234(:16|),@-er1" \
-	"xor.w #0x1234:16,@-er1"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\+er1" \
-	"xor.w #0x1234:16,@+er1"
-gdb_test "x" "xor.w\t#0x1234(:16|),@er1-" \
-	"xor.w #0x1234:16,@er1-"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t#0x1234(:16|),@0x9abc(:16|)" \
-	"xor.w #0x1234:16,@0x9abc:16"
-gdb_test "x" "xor.w\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"xor.w #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "xor.w\tr3,r1" \
-	"xor.w r3,r1"
-gdb_test "x" "xor.w\tr3,@er1" \
-	"xor.w r3,@er1"
-gdb_test "x" "xor.w\tr3,@\\(0x6(:2|),er1\\)" \
-	"xor.w r3,@(0x6:2,er1)"
-gdb_test "x" "xor.w\tr3,@-er1" \
-	"xor.w r3,@-er1"
-gdb_test "x" "xor.w\tr3,@er1\\+" \
-	"xor.w r3,@er1+"
-gdb_test "x" "xor.w\tr3,@er1-" \
-	"xor.w r3,@er1-"
-gdb_test "x" "xor.w\tr3,@\\+er1" \
-	"xor.w r3,@+er1"
-gdb_test "x" "xor.w\tr3,@\\(0x1234(:16|),er1\\)" \
-	"xor.w r3,@(0x1234:16,er1)"
-gdb_test "x" "xor.w\tr3,@\\(0x12345678(:32|),er1\\)" \
-	"xor.w r3,@(0x12345678:32,er1)"
-gdb_test "x" "xor.w\tr3,@\\(0x1234(:16|),r2l.b\\)" \
-	"xor.w r3,@(0x1234:16,r2l.b)"
-gdb_test "x" "xor.w\tr3,@\\(0x1234(:16|),r2.w\\)" \
-	"xor.w r3,@(0x1234:16,r2.w)"
-gdb_test "x" "xor.w\tr3,@\\(0x1234(:16|),er2.l\\)" \
-	"xor.w r3,@(0x1234:16,er2.l)"
-gdb_test "x" "xor.w\tr3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"xor.w r3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "xor.w\tr3,@\\(0x12345678(:32|),r2.w\\)" \
-	"xor.w r3,@(0x12345678:32,r2.w)"
-gdb_test "x" "xor.w\tr3,@\\(0x12345678(:32|),er2.l\\)" \
-	"xor.w r3,@(0x12345678:32,er2.l)"
-gdb_test "x" "xor.w\tr3,@0x1234(:16|)" \
-	"xor.w r3,@0x1234:16"
-gdb_test "x" "xor.w\tr3,@0x12345678(:32|)" \
-	"xor.w r3,@0x12345678:32"
-gdb_test "x" "xor.w\t@er3,r1" \
-	"xor.w @er3,r1"
-gdb_test "x" "xor.w\t@\\(0x6(:2|),er3\\),r1" \
-	"xor.w @(0x6:2,er3),r1"
-gdb_test "x" "xor.w\t@er3\\+,r1" \
-	"xor.w @er3+,r1"
-gdb_test "x" "xor.w\t@-er3,r1" \
-	"xor.w @-er3,r1"
-gdb_test "x" "xor.w\t@\\+er3,r1" \
-	"xor.w @+er3,r1"
-gdb_test "x" "xor.w\t@er3-,r1" \
-	"xor.w @er3-,r1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er1\\),r1" \
-	"xor.w @(0x1234:16,er1),r1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er1\\),r1" \
-	"xor.w @(0x12345678:32,er1),r1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r2l.b\\),r1" \
-	"xor.w @(0x1234:16,r2l.b),r1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r2.w\\),r1" \
-	"xor.w @(0x1234:16,r2.w),r1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er2.l\\),r1" \
-	"xor.w @(0x1234:16,er2.l),r1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r2l.b\\),r1" \
-	"xor.w @(0x12345678:32,r2l.b),r1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r2.w\\),r1" \
-	"xor.w @(0x12345678:32,r2.w),r1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er2.l\\),r1" \
-	"xor.w @(0x12345678:32,er2.l),r1"
-gdb_test "x" "xor.w\t@0x1234(:16|),r1" \
-	"xor.w @0x1234:16,r1"
-gdb_test "x" "xor.w\t@0x12345678(:32|),r1" \
-	"xor.w @0x12345678:32,r1"
-gdb_test "x" "xor.w\t@er3,@er1" \
-	"xor.w @er3,@er1"
-gdb_test "x" "xor.w\t@er3,@\\(0x6(:2|),er1\\)" \
-	"xor.w @er3,@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@er3,@-er1" \
-	"xor.w @er3,@-er1"
-gdb_test "x" "xor.w\t@er3,@er1\\+" \
-	"xor.w @er3,@er1+"
-gdb_test "x" "xor.w\t@er3,@er1-" \
-	"xor.w @er3,@er1-"
-gdb_test "x" "xor.w\t@er3,@\\+er1" \
-	"xor.w @er3,@+er1"
-gdb_test "x" "xor.w\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@er3,@0x9abc(:16|)" \
-	"xor.w @er3,@0x9abc:16"
-gdb_test "x" "xor.w\t@er3,@0x9abcdef0(:32|)" \
-	"xor.w @er3,@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@-er3,@er1" \
-	"xor.w @-er3,@er1"
-gdb_test "x" "xor.w\t@-er3,@\\(0x6(:2|),er1\\)" \
-	"xor.w @-er3,@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@-er3,@-er1" \
-	"xor.w @-er3,@-er1"
-gdb_test "x" "xor.w\t@-er3,@er1\\+" \
-	"xor.w @-er3,@er1+"
-gdb_test "x" "xor.w\t@-er3,@er1-" \
-	"xor.w @-er3,@er1-"
-gdb_test "x" "xor.w\t@-er3,@\\+er1" \
-	"xor.w @-er3,@+er1"
-gdb_test "x" "xor.w\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@-er3,@0x9abc(:16|)" \
-	"xor.w @-er3,@0x9abc:16"
-gdb_test "x" "xor.w\t@-er3,@0x9abcdef0(:32|)" \
-	"xor.w @-er3,@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@er3\\+,@er1" \
-	"xor.w @er3+,@er1"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x6(:2|),er1\\)" \
-	"xor.w @er3+,@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@er3\\+,@-er1" \
-	"xor.w @er3+,@-er1"
-gdb_test "x" "xor.w\t@er3\\+,@er1\\+" \
-	"xor.w @er3+,@er1+"
-gdb_test "x" "xor.w\t@er3\\+,@er1-" \
-	"xor.w @er3+,@er1-"
-gdb_test "x" "xor.w\t@er3\\+,@\\+er1" \
-	"xor.w @er3+,@+er1"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@er3\\+,@0x9abc(:16|)" \
-	"xor.w @er3+,@0x9abc:16"
-gdb_test "x" "xor.w\t@er3\\+,@0x9abcdef0(:32|)" \
-	"xor.w @er3+,@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@er3-,@er1" \
-	"xor.w @er3-,@er1"
-gdb_test "x" "xor.w\t@er3-,@\\(0x6(:2|),er1\\)" \
-	"xor.w @er3-,@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@er3-,@-er1" \
-	"xor.w @er3-,@-er1"
-gdb_test "x" "xor.w\t@er3-,@er1\\+" \
-	"xor.w @er3-,@er1+"
-gdb_test "x" "xor.w\t@er3-,@er1-" \
-	"xor.w @er3-,@er1-"
-gdb_test "x" "xor.w\t@er3-,@\\+er1" \
-	"xor.w @er3-,@+er1"
-gdb_test "x" "xor.w\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@er3-,@0x9abc(:16|)" \
-	"xor.w @er3-,@0x9abc:16"
-gdb_test "x" "xor.w\t@er3-,@0x9abcdef0(:32|)" \
-	"xor.w @er3-,@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\+er3,@er1" \
-	"xor.w @+er3,@er1"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x6(:2|),er1\\)" \
-	"xor.w @+er3,@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\+er3,@-er1" \
-	"xor.w @+er3,@-er1"
-gdb_test "x" "xor.w\t@\\+er3,@er1\\+" \
-	"xor.w @+er3,@er1+"
-gdb_test "x" "xor.w\t@\\+er3,@er1-" \
-	"xor.w @+er3,@er1-"
-gdb_test "x" "xor.w\t@\\+er3,@\\+er1" \
-	"xor.w @+er3,@+er1"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\+er3,@0x9abc(:16|)" \
-	"xor.w @+er3,@0x9abc:16"
-gdb_test "x" "xor.w\t@\\+er3,@0x9abcdef0(:32|)" \
-	"xor.w @+er3,@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@er1" \
-	"xor.w @(0x1234:16,er3),@er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"xor.w @(0x1234:16,er3),@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"xor.w @(0x1234:16,er3),@-er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"xor.w @(0x1234:16,er3),@er1+"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"xor.w @(0x1234:16,er3),@er1-"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"xor.w @(0x1234:16,er3),@+er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"xor.w @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"xor.w @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"xor.w @(0x12345678:32,er3),@er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"xor.w @(0x12345678:32,er3),@-er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"xor.w @(0x12345678:32,er3),@er1+"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"xor.w @(0x12345678:32,er3),@er1-"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"xor.w @(0x12345678:32,er3),@+er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"xor.w @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"xor.w @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"xor.w @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"xor.w @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"xor.w @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"xor.w @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"xor.w @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"xor.w @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"xor.w @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"xor.w @(0x1234:16,r3.w),@er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"xor.w @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"xor.w @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"xor.w @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"xor.w @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"xor.w @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"xor.w @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"xor.w @(0x1234:16,er3.l),@er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"xor.w @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"xor.w @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"xor.w @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"xor.w @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"xor.w @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "xor.w\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"xor.w @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"xor.w @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"xor.w @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"xor.w @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"xor.w @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"xor.w @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"xor.w @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"xor.w @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"xor.w @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"xor.w @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"xor.w @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"xor.w @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"xor.w @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"xor.w @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"xor.w @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"xor.w @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"xor.w @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"xor.w @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"xor.w @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"xor.w @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"xor.w @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "xor.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"xor.w @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@0x1234(:16|),@er1" \
-	"xor.w @0x1234:16,@er1"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"xor.w @0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@-er1" \
-	"xor.w @0x1234:16,@-er1"
-gdb_test "x" "xor.w\t@0x1234(:16|),@er1\\+" \
-	"xor.w @0x1234:16,@er1+"
-gdb_test "x" "xor.w\t@0x1234(:16|),@er1-" \
-	"xor.w @0x1234:16,@er1-"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\+er1" \
-	"xor.w @0x1234:16,@+er1"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@0x1234(:16|),@0x9abc(:16|)" \
-	"xor.w @0x1234:16,@0x9abc:16"
-gdb_test "x" "xor.w\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"xor.w @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@er1" \
-	"xor.w @0x12345678:32,@er1"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x6(:2|),er1\\)" \
-	"xor.w @0x12345678:32,@(0x6:2,er1)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@-er1" \
-	"xor.w @0x12345678:32,@-er1"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@er1\\+" \
-	"xor.w @0x12345678:32,@er1+"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@er1-" \
-	"xor.w @0x12345678:32,@er1-"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\+er1" \
-	"xor.w @0x12345678:32,@+er1"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.w @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.w @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.w @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.w @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.w @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.w @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.w @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"xor.w @0x12345678:32,@0x9abc:16"
-gdb_test "x" "xor.w\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"xor.w @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "xor.l\t#0x12345678(:32|),er1" \
-	"xor.l #0x12345678:32,er1"
-gdb_test "x" "xor.l\t#0x1234(:16|),er1" \
-	"xor.l #0x1234:16,er1"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@er1" \
-	"xor.l #0x12345678:32,@er1"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"xor.l #0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@er1\\+" \
-	"xor.l #0x12345678:32,@er1+"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@-er1" \
-	"xor.l #0x12345678:32,@-er1"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\+er1" \
-	"xor.l #0x12345678:32,@+er1"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@er1-" \
-	"xor.l #0x12345678:32,@er1-"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l #0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l #0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l #0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l #0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l #0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l #0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l #0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@0x9abc(:16|)" \
-	"xor.l #0x12345678:32,@0x9abc:16"
-gdb_test "x" "xor.l\t#0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"xor.l #0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "xor.l\t#0x1234(:16|),@er1" \
-	"xor.l #0x1234:16,@er1"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"xor.l #0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@er1\\+" \
-	"xor.l #0x1234:16,@er1+"
-gdb_test "x" "xor.l\t#0x1234(:16|),@-er1" \
-	"xor.l #0x1234:16,@-er1"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\+er1" \
-	"xor.l #0x1234:16,@+er1"
-gdb_test "x" "xor.l\t#0x1234(:16|),@er1-" \
-	"xor.l #0x1234:16,@er1-"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t#0x1234(:16|),@0x9abc(:16|)" \
-	"xor.l #0x1234:16,@0x9abc:16"
-gdb_test "x" "xor.l\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"xor.l #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "xor.l\ter3,er1" \
-	"xor.l er3,er1"
-gdb_test "x" "xor.l\ter3,@er1" \
-	"xor.l er3,@er1"
-gdb_test "x" "xor.l\ter3,@\\(0xc(:2|),er1\\)" \
-	"xor.l er3,@(0xc:2,er1)"
-gdb_test "x" "xor.l\ter3,@er1\\+" \
-	"xor.l er3,@er1+"
-gdb_test "x" "xor.l\ter3,@-er1" \
-	"xor.l er3,@-er1"
-gdb_test "x" "xor.l\ter3,@\\+er1" \
-	"xor.l er3,@+er1"
-gdb_test "x" "xor.l\ter3,@er1-" \
-	"xor.l er3,@er1-"
-gdb_test "x" "xor.l\ter3,@\\(0x1234(:16|),er1\\)" \
-	"xor.l er3,@(0x1234:16,er1)"
-gdb_test "x" "xor.l\ter3,@\\(0x12345678(:32|),er1\\)" \
-	"xor.l er3,@(0x12345678:32,er1)"
-gdb_test "x" "xor.l\ter3,@\\(0x1234(:16|),r2l.b\\)" \
-	"xor.l er3,@(0x1234:16,r2l.b)"
-gdb_test "x" "xor.l\ter3,@\\(0x1234(:16|),r2.w\\)" \
-	"xor.l er3,@(0x1234:16,r2.w)"
-gdb_test "x" "xor.l\ter3,@\\(0x1234(:16|),er2.l\\)" \
-	"xor.l er3,@(0x1234:16,er2.l)"
-gdb_test "x" "xor.l\ter3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"xor.l er3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "xor.l\ter3,@\\(0x12345678(:32|),r2.w\\)" \
-	"xor.l er3,@(0x12345678:32,r2.w)"
-gdb_test "x" "xor.l\ter3,@\\(0x12345678(:32|),er2.l\\)" \
-	"xor.l er3,@(0x12345678:32,er2.l)"
-gdb_test "x" "xor.l\ter3,@0x1234(:16|)" \
-	"xor.l er3,@0x1234:16"
-gdb_test "x" "xor.l\ter3,@0x12345678(:32|)" \
-	"xor.l er3,@0x12345678:32"
-gdb_test "x" "xor.l\t@er3,er1" \
-	"xor.l @er3,er1"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),er1" \
-	"xor.l @(0xc:2,er3),er1"
-gdb_test "x" "xor.l\t@er3\\+,er1" \
-	"xor.l @er3+,er1"
-gdb_test "x" "xor.l\t@-er3,er1" \
-	"xor.l @-er3,er1"
-gdb_test "x" "xor.l\t@\\+er3,er1" \
-	"xor.l @+er3,er1"
-gdb_test "x" "xor.l\t@er3-,er1" \
-	"xor.l @er3-,er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er1\\),er1" \
-	"xor.l @(0x1234:16,er1),er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er1\\),er1" \
-	"xor.l @(0x12345678:32,er1),er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r2l.b\\),er1" \
-	"xor.l @(0x1234:16,r2l.b),er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r2.w\\),er1" \
-	"xor.l @(0x1234:16,r2.w),er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er2.l\\),er1" \
-	"xor.l @(0x1234:16,er2.l),er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r2l.b\\),er1" \
-	"xor.l @(0x12345678:32,r2l.b),er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r2.w\\),er1" \
-	"xor.l @(0x12345678:32,r2.w),er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er2.l\\),er1" \
-	"xor.l @(0x12345678:32,er2.l),er1"
-gdb_test "x" "xor.l\t@0x1234(:16|),er1" \
-	"xor.l @0x1234:16,er1"
-gdb_test "x" "xor.l\t@0x12345678(:32|),er1" \
-	"xor.l @0x12345678:32,er1"
-gdb_test "x" "xor.l\t@er3,@er1" \
-	"xor.l @er3,@er1"
-gdb_test "x" "xor.l\t@er3,@\\(0xc(:2|),er1\\)" \
-	"xor.l @er3,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@er3,@-er1" \
-	"xor.l @er3,@-er1"
-gdb_test "x" "xor.l\t@er3,@er1\\+" \
-	"xor.l @er3,@er1+"
-gdb_test "x" "xor.l\t@er3,@er1-" \
-	"xor.l @er3,@er1-"
-gdb_test "x" "xor.l\t@er3,@\\+er1" \
-	"xor.l @er3,@+er1"
-gdb_test "x" "xor.l\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@er3,@0x9abc(:16|)" \
-	"xor.l @er3,@0x9abc:16"
-gdb_test "x" "xor.l\t@er3,@0x9abcdef0(:32|)" \
-	"xor.l @er3,@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@er1" \
-	"xor.l @(0xc:2,er3),@er1"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0xc:2,er3),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@-er1" \
-	"xor.l @(0xc:2,er3),@-er1"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@er1\\+" \
-	"xor.l @(0xc:2,er3),@er1+"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@er1-" \
-	"xor.l @(0xc:2,er3),@er1-"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\+er1" \
-	"xor.l @(0xc:2,er3),@+er1"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0xc:2,er3),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0xc:2,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0xc:2,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0xc:2,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0xc:2,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@0x9abc(:16|)" \
-	"xor.l @(0xc:2,er3),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0xc(:2|),er3\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0xc:2,er3),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@-er3,@er1" \
-	"xor.l @-er3,@er1"
-gdb_test "x" "xor.l\t@-er3,@\\(0xc(:2|),er1\\)" \
-	"xor.l @-er3,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@-er3,@-er1" \
-	"xor.l @-er3,@-er1"
-gdb_test "x" "xor.l\t@-er3,@er1\\+" \
-	"xor.l @-er3,@er1+"
-gdb_test "x" "xor.l\t@-er3,@er1-" \
-	"xor.l @-er3,@er1-"
-gdb_test "x" "xor.l\t@-er3,@\\+er1" \
-	"xor.l @-er3,@+er1"
-gdb_test "x" "xor.l\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@-er3,@0x9abc(:16|)" \
-	"xor.l @-er3,@0x9abc:16"
-gdb_test "x" "xor.l\t@-er3,@0x9abcdef0(:32|)" \
-	"xor.l @-er3,@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@er3\\+,@er1" \
-	"xor.l @er3+,@er1"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0xc(:2|),er1\\)" \
-	"xor.l @er3+,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@er3\\+,@-er1" \
-	"xor.l @er3+,@-er1"
-gdb_test "x" "xor.l\t@er3\\+,@er1\\+" \
-	"xor.l @er3+,@er1+"
-gdb_test "x" "xor.l\t@er3\\+,@er1-" \
-	"xor.l @er3+,@er1-"
-gdb_test "x" "xor.l\t@er3\\+,@\\+er1" \
-	"xor.l @er3+,@+er1"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@er3\\+,@0x9abc(:16|)" \
-	"xor.l @er3+,@0x9abc:16"
-gdb_test "x" "xor.l\t@er3\\+,@0x9abcdef0(:32|)" \
-	"xor.l @er3+,@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@er3-,@er1" \
-	"xor.l @er3-,@er1"
-gdb_test "x" "xor.l\t@er3-,@\\(0xc(:2|),er1\\)" \
-	"xor.l @er3-,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@er3-,@-er1" \
-	"xor.l @er3-,@-er1"
-gdb_test "x" "xor.l\t@er3-,@er1\\+" \
-	"xor.l @er3-,@er1+"
-gdb_test "x" "xor.l\t@er3-,@er1-" \
-	"xor.l @er3-,@er1-"
-gdb_test "x" "xor.l\t@er3-,@\\+er1" \
-	"xor.l @er3-,@+er1"
-gdb_test "x" "xor.l\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@er3-,@0x9abc(:16|)" \
-	"xor.l @er3-,@0x9abc:16"
-gdb_test "x" "xor.l\t@er3-,@0x9abcdef0(:32|)" \
-	"xor.l @er3-,@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\+er3,@er1" \
-	"xor.l @+er3,@er1"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0xc(:2|),er1\\)" \
-	"xor.l @+er3,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\+er3,@-er1" \
-	"xor.l @+er3,@-er1"
-gdb_test "x" "xor.l\t@\\+er3,@er1\\+" \
-	"xor.l @+er3,@er1+"
-gdb_test "x" "xor.l\t@\\+er3,@er1-" \
-	"xor.l @+er3,@er1-"
-gdb_test "x" "xor.l\t@\\+er3,@\\+er1" \
-	"xor.l @+er3,@+er1"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\+er3,@0x9abc(:16|)" \
-	"xor.l @+er3,@0x9abc:16"
-gdb_test "x" "xor.l\t@\\+er3,@0x9abcdef0(:32|)" \
-	"xor.l @+er3,@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@er1" \
-	"xor.l @(0x1234:16,er3),@er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0x1234:16,er3),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"xor.l @(0x1234:16,er3),@-er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"xor.l @(0x1234:16,er3),@er1+"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"xor.l @(0x1234:16,er3),@er1-"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"xor.l @(0x1234:16,er3),@+er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"xor.l @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"xor.l @(0x12345678:32,er3),@er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0x12345678:32,er3),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"xor.l @(0x12345678:32,er3),@-er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"xor.l @(0x12345678:32,er3),@er1+"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"xor.l @(0x12345678:32,er3),@er1-"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"xor.l @(0x12345678:32,er3),@+er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"xor.l @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"xor.l @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"xor.l @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"xor.l @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"xor.l @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"xor.l @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"xor.l @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"xor.l @(0x1234:16,r3.w),@er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"xor.l @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"xor.l @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"xor.l @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"xor.l @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"xor.l @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"xor.l @(0x1234:16,er3.l),@er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"xor.l @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"xor.l @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"xor.l @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"xor.l @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"xor.l @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"xor.l @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"xor.l @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"xor.l @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"xor.l @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"xor.l @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"xor.l @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"xor.l @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"xor.l @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"xor.l @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"xor.l @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"xor.l @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"xor.l @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"xor.l @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"xor.l @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"xor.l @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"xor.l @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"xor.l @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"xor.l @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "xor.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"xor.l @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@0x1234(:16|),@er1" \
-	"xor.l @0x1234:16,@er1"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"xor.l @0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@-er1" \
-	"xor.l @0x1234:16,@-er1"
-gdb_test "x" "xor.l\t@0x1234(:16|),@er1\\+" \
-	"xor.l @0x1234:16,@er1+"
-gdb_test "x" "xor.l\t@0x1234(:16|),@er1-" \
-	"xor.l @0x1234:16,@er1-"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\+er1" \
-	"xor.l @0x1234:16,@+er1"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@0x1234(:16|),@0x9abc(:16|)" \
-	"xor.l @0x1234:16,@0x9abc:16"
-gdb_test "x" "xor.l\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"xor.l @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@er1" \
-	"xor.l @0x12345678:32,@er1"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"xor.l @0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@-er1" \
-	"xor.l @0x12345678:32,@-er1"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@er1\\+" \
-	"xor.l @0x12345678:32,@er1+"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@er1-" \
-	"xor.l @0x12345678:32,@er1-"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\+er1" \
-	"xor.l @0x12345678:32,@+er1"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"xor.l @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"xor.l @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"xor.l @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"xor.l @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"xor.l @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"xor.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"xor.l @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"xor.l @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"xor.l @0x12345678:32,@0x9abc:16"
-gdb_test "x" "xor.l\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"xor.l @0x12345678:32,@0x9abcdef0:32"
diff --git a/gdb/testsuite/gdb.disasm/t09_xor.s b/gdb/testsuite/gdb.disasm/t09_xor.s
deleted file mode 100644
index 7b9e8c4bbdb..00000000000
--- a/gdb/testsuite/gdb.disasm/t09_xor.s
+++ /dev/null
@@ -1,972 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;log_1

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    xor.b #0x12:8,r1h           ;d112

-    xor.b #0x12:8,@er1          ;7d10d012

-    xor.b #0x12:8,@(0x3:2,er1)    ;01776818d012

-    xor.b #0x12:8,@er1+         ;01746c18d012

-    xor.b #0x12:8,@-er1         ;01776c18d012

-    xor.b #0x12:8,@+er1         ;01756c18d012

-    xor.b #0x12:8,@er1-         ;01766c18d012

-    xor.b #0x12:8,@(0x1234:16,er1)   ;01746e181234d012

-    xor.b #0x12:8,@(0x12345678:32,er1)   ;78146a2812345678d012

-    xor.b #0x12:8,@(0x1234:16,r2l.b) ;01756e281234d012

-    xor.b #0x12:8,@(0x1234:16,r2.w) ;01766e281234d012

-    xor.b #0x12:8,@(0x1234:16,er2.l) ;01776e281234d012

-    xor.b #0x12:8,@(0x12345678:32,r2l.b) ;78256a2812345678d012

-    xor.b #0x12:8,@(0x12345678:32,r2.w) ;78266a2812345678d012

-    xor.b #0x12:8,@(0x12345678:32,er2.l) ;78276a2812345678d012

-    xor.b #0x12:8,@0xffffff12:8         ;7f12d012

-    xor.b #0x12:8,@0x1234:16        ;6a181234d012

-    xor.b #0x12:8,@0x12345678:32        ;6a3812345678d012

-

-    xor.b r3h,r1h              ;1531

-

-    xor.b r3h,@er1            ;7d101530

-    xor.b r3h,@(0x3:2,er1)      ;01793153

-    xor.b r3h,@er1+           ;01798153

-    xor.b r3h,@-er1           ;0179b153

-    xor.b r3h,@+er1           ;01799153

-    xor.b r3h,@er1-           ;0179a153

-    xor.b r3h,@(0x1234:16,er1)     ;0179c1531234

-    xor.b r3h,@(0x12345678:32,er1)     ;0179c95312345678

-    xor.b r3h,@(0x1234:16,r2l.b)   ;0179d2531234

-    xor.b r3h,@(0x1234:16,r2.w)   ;0179e2531234

-    xor.b r3h,@(0x1234:16,er2.l)   ;0179f2531234

-    xor.b r3h,@(0x12345678:32,r2l.b)   ;0179da5312345678

-    xor.b r3h,@(0x12345678:32,r2.w)   ;0179ea5312345678

-    xor.b r3h,@(0x12345678:32,er2.l)   ;0179fa5312345678

-    xor.b r3h,@0xffffff12:8           ;7f121530

-    xor.b r3h,@0x1234:16          ;6a1812341530

-    xor.b r3h,@0x12345678:32           ;6a38123456781530

-

-    xor.b @er3,r1h            ;7c301501

-    xor.b @(0x3:2,er3),r1h     ;017a3351

-    xor.b @er3+,r1h          ;017a8351

-    xor.b @-er3,r1h          ;017ab351

-    xor.b @+er3,r1h          ;017a9351

-    xor.b @er3-,r1h          ;017aa351

-    xor.b @(0x1234:16,er1),r1h     ;017ac1511234

-    xor.b @(0x12345678:32,er1),r1h     ;017ac95112345678

-    xor.b @(0x1234:16,r2l.b),r1h   ;017ad2511234

-    xor.b @(0x1234:16,r2.w),r1h   ;017ae2511234

-    xor.b @(0x1234:16,er2.l),r1h   ;017af2511234

-    xor.b @(0x12345678:32,r2l.b),r1h   ;017ada5112345678

-    xor.b @(0x12345678:32,r2.w),r1h   ;017aea5112345678

-    xor.b @(0x12345678:32,er2.l),r1h   ;017afa5112345678

-    xor.b @0xffffff12:8,r1h           ;7e121501

-    xor.b @0x1234:16,r1h          ;6a1012341501

-    xor.b @0x12345678:32,r1h          ;6a30123456781501

-

-    xor.b @er3,@er1                                ;7c350150

-    xor.b @er3,@(3:2,er1)                          ;7c353150

-    xor.b @er3,@-er1                               ;7c35b150

-    xor.b @er3,@er1+                               ;7c358150

-    xor.b @er3,@er1-                               ;7c35a150

-    xor.b @er3,@+er1                               ;7c359150

-    xor.b @er3,@(0xffff9abc:16,er1)                ;7c35c1509abc

-    xor.b @er3,@(0x9abcdef0:32,er1)                ;7c35c9509abcdef0

-    xor.b @er3,@(0xffff9abc:16,r2l.b)              ;7c35d2509abc

-    xor.b @er3,@(0xffff9abc:16,r2.w)              ;7c35e2509abc

-    xor.b @er3,@(0xffff9abc:16,er2.l)              ;7c35f2509abc

-    xor.b @er3,@(0x9abcdef0:32,r2l.b)              ;7c35da509abcdef0

-    xor.b @er3,@(0x9abcdef0:32,r2.w)              ;7c35ea509abcdef0

-    xor.b @er3,@(0x9abcdef0:32,er2.l)              ;7c35fa509abcdef0

-    xor.b @er3,@0xffff9abc:16                      ;7c3540509abc

-    xor.b @er3,@0x9abcdef0:32                      ;7c3548509abcdef0

-

-    xor.b @-er3,@er1                               ;01776c3c0150

-    xor.b @-er3,@(3:2,er1)                         ;01776c3c3150

-    xor.b @-er3,@-er1                              ;01776c3cb150

-    xor.b @-er3,@er1+                              ;01776c3c8150

-    xor.b @-er3,@er1-                              ;01776c3ca150

-    xor.b @-er3,@+er1                              ;01776c3c9150

-    xor.b @-er3,@(0xffff9abc:16,er1)               ;01776c3cc1509abc

-    xor.b @-er3,@(0x9abcdef0:32,er1)               ;01776c3cc9509abcdef0

-    xor.b @-er3,@(0xffff9abc:16,r2l.b)             ;01776c3cd2509abc

-    xor.b @-er3,@(0xffff9abc:16,r2.w)             ;01776c3ce2509abc

-    xor.b @-er3,@(0xffff9abc:16,er2.l)             ;01776c3cf2509abc

-    xor.b @-er3,@(0x9abcdef0:32,r2l.b)             ;01776c3cda509abcdef0

-    xor.b @-er3,@(0x9abcdef0:32,r2.w)             ;01776c3cea509abcdef0

-    xor.b @-er3,@(0x9abcdef0:32,er2.l)             ;01776c3cfa509abcdef0

-    xor.b @-er3,@0xffff9abc:16                     ;01776c3c40509abc

-    xor.b @-er3,@0x9abcdef0:32                     ;01776c3c48509abcdef0

-

-    xor.b @er3+,@er1                               ;01746c3c0150

-    xor.b @er3+,@(3:2,er1)                         ;01746c3c3150

-    xor.b @er3+,@-er1                              ;01746c3cb150

-    xor.b @er3+,@er1+                              ;01746c3c8150

-    xor.b @er3+,@er1-                              ;01746c3ca150

-    xor.b @er3+,@+er1                              ;01746c3c9150

-    xor.b @er3+,@(0xffff9abc:16,er1)               ;01746c3cc1509abc

-    xor.b @er3+,@(0x9abcdef0:32,er1)               ;01746c3cc9509abcdef0

-    xor.b @er3+,@(0xffff9abc:16,r2l.b)             ;01746c3cd2509abc

-    xor.b @er3+,@(0xffff9abc:16,r2.w)             ;01746c3ce2509abc

-    xor.b @er3+,@(0xffff9abc:16,er2.l)             ;01746c3cf2509abc

-    xor.b @er3+,@(0x9abcdef0:32,r2l.b)             ;01746c3cda509abcdef0

-    xor.b @er3+,@(0x9abcdef0:32,r2.w)             ;01746c3cea509abcdef0

-    xor.b @er3+,@(0x9abcdef0:32,er2.l)             ;01746c3cfa509abcdef0

-    xor.b @er3+,@0xffff9abc:16                     ;01746c3c40509abc

-    xor.b @er3+,@0x9abcdef0:32                     ;01746c3c48509abcdef0

-

-    xor.b @er3-,@er1                               ;01766c3c0150

-    xor.b @er3-,@(3:2,er1)                         ;01766c3c3150

-    xor.b @er3-,@-er1                              ;01766c3cb150

-    xor.b @er3-,@er1+                              ;01766c3c8150

-    xor.b @er3-,@er1-                              ;01766c3ca150

-    xor.b @er3-,@+er1                              ;01766c3c9150

-    xor.b @er3-,@(0xffff9abc:16,er1)               ;01766c3cc1509abc

-    xor.b @er3-,@(0x9abcdef0:32,er1)               ;01766c3cc9509abcdef0

-    xor.b @er3-,@(0xffff9abc:16,r2l.b)             ;01766c3cd2509abc

-    xor.b @er3-,@(0xffff9abc:16,r2.w)             ;01766c3ce2509abc

-    xor.b @er3-,@(0xffff9abc:16,er2.l)             ;01766c3cf2509abc

-    xor.b @er3-,@(0x9abcdef0:32,r2l.b)             ;01766c3cda509abcdef0

-    xor.b @er3-,@(0x9abcdef0:32,r2.w)             ;01766c3cea509abcdef0

-    xor.b @er3-,@(0x9abcdef0:32,er2.l)             ;01766c3cfa509abcdef0

-    xor.b @er3-,@0xffff9abc:16                     ;01766c3c40509abc

-    xor.b @er3-,@0x9abcdef0:32                     ;01766c3c48509abcdef0

-

-    xor.b @+er3,@er1                               ;01756c3c0150

-    xor.b @+er3,@(3:2,er1)                         ;01756c3c3150

-    xor.b @+er3,@-er1                              ;01756c3cb150

-    xor.b @+er3,@er1+                              ;01756c3c8150

-    xor.b @+er3,@er1-                              ;01756c3ca150

-    xor.b @+er3,@+er1                              ;01756c3c9150

-    xor.b @+er3,@(0xffff9abc:16,er1)               ;01756c3cc1509abc

-    xor.b @+er3,@(0x9abcdef0:32,er1)               ;01756c3cc9509abcdef0

-    xor.b @+er3,@(0xffff9abc:16,r2l.b)             ;01756c3cd2509abc

-    xor.b @+er3,@(0xffff9abc:16,r2.w)             ;01756c3ce2509abc

-    xor.b @+er3,@(0xffff9abc:16,er2.l)             ;01756c3cf2509abc

-    xor.b @+er3,@(0x9abcdef0:32,r2l.b)             ;01756c3cda509abcdef0

-    xor.b @+er3,@(0x9abcdef0:32,r2.w)             ;01756c3cea509abcdef0

-    xor.b @+er3,@(0x9abcdef0:32,er2.l)             ;01756c3cfa509abcdef0

-    xor.b @+er3,@0xffff9abc:16                     ;01756c3c40509abc

-    xor.b @+er3,@0x9abcdef0:32                     ;01756c3c48509abcdef0

-

-    xor.b @(0x1234:16,er3),@er1                         ;01746e3c12340150

-    xor.b @(0x1234:16,er3),@(3:2,er1)                   ;01746e3c12343150

-    xor.b @(0x1234:16,er3),@-er1                        ;01746e3c1234b150

-    xor.b @(0x1234:16,er3),@er1+                        ;01746e3c12348150

-    xor.b @(0x1234:16,er3),@er1-                        ;01746e3c1234a150

-    xor.b @(0x1234:16,er3),@+er1                        ;01746e3c12349150

-    xor.b @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01746e3c1234c1509abc

-    xor.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01746e3c1234c9509abcdef0

-    xor.b @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01746e3c1234d2509abc

-    xor.b @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01746e3c1234e2509abc

-    xor.b @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01746e3c1234f2509abc

-    xor.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01746e3c1234da509abcdef0

-    xor.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01746e3c1234ea509abcdef0

-    xor.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01746e3c1234fa509abcdef0

-    xor.b @(0x1234:16,er3),@0xffff9abc:16               ;01746e3c123440509abc

-    xor.b @(0x1234:16,er3),@0x9abcdef0:32               ;01746e3c123448509abcdef0

-

-    xor.b @(0x12345678:32,er3),@er1                         ;78346a2c123456780150

-    xor.b @(0x12345678:32,er3),@(3:2,er1)                   ;78346a2c123456783150

-    xor.b @(0x12345678:32,er3),@-er1                        ;78346a2c12345678b150

-    xor.b @(0x12345678:32,er3),@er1+                        ;78346a2c123456788150

-    xor.b @(0x12345678:32,er3),@er1-                        ;78346a2c12345678a150

-    xor.b @(0x12345678:32,er3),@+er1                        ;78346a2c123456789150

-    xor.b @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346a2c12345678c1509abc

-    xor.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346a2c12345678c9509abcdef0

-    xor.b @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346a2c12345678d2509abc

-    xor.b @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346a2c12345678e2509abc

-    xor.b @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346a2c12345678f2509abc

-    xor.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346a2c12345678da509abcdef0

-    xor.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346a2c12345678ea509abcdef0

-    xor.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346a2c12345678fa509abcdef0

-    xor.b @(0x12345678:32,er3),@0xffff9abc:16               ;78346a2c1234567840509abc

-    xor.b @(0x12345678:32,er3),@0x9abcdef0:32               ;78346a2c1234567848509abcdef0

-

-    xor.b @(0x1234:16,r3l.b),@er1                       ;01756e3c12340150

-    xor.b @(0x1234:16,r3l.b),@(3:2,er1)                 ;01756e3c12343150

-    xor.b @(0x1234:16,r3l.b),@-er1                      ;01756e3c1234b150

-    xor.b @(0x1234:16,r3l.b),@er1+                      ;01756e3c12348150

-    xor.b @(0x1234:16,r3l.b),@er1-                      ;01756e3c1234a150

-    xor.b @(0x1234:16,r3l.b),@+er1                      ;01756e3c12349150

-    xor.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01756e3c1234c1509abc

-    xor.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01756e3c1234c9509abcdef0

-    xor.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01756e3c1234d2509abc

-    xor.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01756e3c1234e2509abc

-    xor.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01756e3c1234f2509abc

-    xor.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01756e3c1234da509abcdef0

-    xor.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01756e3c1234ea509abcdef0

-    xor.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01756e3c1234fa509abcdef0

-    xor.b @(0x1234:16,r3l.b),@0xffff9abc:16             ;01756e3c123440509abc

-    xor.b @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01756e3c123448509abcdef0

-

-    xor.b @(0x1234:16,r3.w),@er1                       ;01766e3c12340150

-    xor.b @(0x1234:16,r3.w),@(3:2,er1)                 ;01766e3c12343150

-    xor.b @(0x1234:16,r3.w),@-er1                      ;01766e3c1234b150

-    xor.b @(0x1234:16,r3.w),@er1+                      ;01766e3c12348150

-    xor.b @(0x1234:16,r3.w),@er1-                      ;01766e3c1234a150

-    xor.b @(0x1234:16,r3.w),@+er1                      ;01766e3c12349150

-    xor.b @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01766e3c1234c1509abc

-    xor.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01766e3c1234c9509abcdef0

-    xor.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01766e3c1234d2509abc

-    xor.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01766e3c1234e2509abc

-    xor.b @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01766e3c1234f2509abc

-    xor.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01766e3c1234da509abcdef0

-    xor.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01766e3c1234ea509abcdef0

-    xor.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01766e3c1234fa509abcdef0

-    xor.b @(0x1234:16,r3.w),@0xffff9abc:16             ;01766e3c123440509abc

-    xor.b @(0x1234:16,r3.w),@0x9abcdef0:32             ;01766e3c123448509abcdef0

-

-    xor.b @(0x1234:16,er3.l),@er1                       ;01776e3c12340150

-    xor.b @(0x1234:16,er3.l),@(3:2,er1)                 ;01776e3c12343150

-    xor.b @(0x1234:16,er3.l),@-er1                      ;01776e3c1234b150

-    xor.b @(0x1234:16,er3.l),@er1+                      ;01776e3c12348150

-    xor.b @(0x1234:16,er3.l),@er1-                      ;01776e3c1234a150

-    xor.b @(0x1234:16,er3.l),@+er1                      ;01776e3c12349150

-    xor.b @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01776e3c1234c1509abc

-    xor.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01776e3c1234c9509abcdef0

-    xor.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01776e3c1234d2509abc

-    xor.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01776e3c1234e2509abc

-    xor.b @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01776e3c1234f2509abc

-    xor.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01776e3c1234da509abcdef0

-    xor.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01776e3c1234ea509abcdef0

-    xor.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01776e3c1234fa509abcdef0

-    xor.b @(0x1234:16,er3.l),@0xffff9abc:16             ;01776e3c123440509abc

-    xor.b @(0x1234:16,er3.l),@0x9abcdef0:32             ;01776e3c123448509abcdef0

-

-    xor.b @(0x12345678:32,r3l.b),@er1                       ;78356a2c123456780150

-    xor.b @(0x12345678:32,r3l.b),@(3:2,er1)                 ;78356a2c123456783150

-    xor.b @(0x12345678:32,r3l.b),@-er1                      ;78356a2c12345678b150

-    xor.b @(0x12345678:32,r3l.b),@er1+                      ;78356a2c123456788150

-    xor.b @(0x12345678:32,r3l.b),@er1-                      ;78356a2c12345678a150

-    xor.b @(0x12345678:32,r3l.b),@+er1                      ;78356a2c123456789150

-    xor.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356a2c12345678c1509abc

-    xor.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356a2c12345678c9509abcdef0

-    xor.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356a2c12345678d2509abc

-    xor.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356a2c12345678e2509abc

-    xor.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356a2c12345678f2509abc

-    xor.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356a2c12345678da509abcdef0

-    xor.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356a2c12345678ea509abcdef0

-    xor.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356a2c12345678fa509abcdef0

-    xor.b @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356a2c1234567840509abc

-    xor.b @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356a2c1234567848509abcdef0

-

-    xor.b @(0x12345678:32,r3.w),@er1                       ;78366a2c123456780150

-    xor.b @(0x12345678:32,r3.w),@(3:2,er1)                 ;78366a2c123456783150

-    xor.b @(0x12345678:32,r3.w),@-er1                      ;78366a2c12345678b150

-    xor.b @(0x12345678:32,r3.w),@er1+                      ;78366a2c123456788150

-    xor.b @(0x12345678:32,r3.w),@er1-                      ;78366a2c12345678a150

-    xor.b @(0x12345678:32,r3.w),@+er1                      ;78366a2c123456789150

-    xor.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366a2c12345678c1509abc

-    xor.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366a2c12345678c9509abcdef0

-    xor.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366a2c12345678d2509abc

-    xor.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366a2c12345678e2509abc

-    xor.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366a2c12345678f2509abc

-    xor.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366a2c12345678da509abcdef0

-    xor.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366a2c12345678ea509abcdef0

-    xor.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366a2c12345678fa509abcdef0

-    xor.b @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366a2c1234567840509abc

-    xor.b @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366a2c1234567848509abcdef0

-

-    xor.b @(0x12345678:32,er3.l),@er1                       ;78376a2c123456780150

-    xor.b @(0x12345678:32,er3.l),@(3:2,er1)                 ;78376a2c123456783150

-    xor.b @(0x12345678:32,er3.l),@-er1                      ;78376a2c12345678b150

-    xor.b @(0x12345678:32,er3.l),@er1+                      ;78376a2c123456788150

-    xor.b @(0x12345678:32,er3.l),@er1-                      ;78376a2c12345678a150

-    xor.b @(0x12345678:32,er3.l),@+er1                      ;78376a2c123456789150

-    xor.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376a2c12345678c1509abc

-    xor.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376a2c12345678c9509abcdef0

-    xor.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376a2c12345678d2509abc

-    xor.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376a2c12345678e2509abc

-    xor.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376a2c12345678f2509abc

-    xor.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376a2c12345678da509abcdef0

-    xor.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376a2c12345678ea509abcdef0

-    xor.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376a2c12345678fa509abcdef0

-    xor.b @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376a2c1234567840509abc

-    xor.b @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376a2c1234567848509abcdef0

-

-    xor.b @0x1234:16,@er1                              ;6a1512340150

-    xor.b @0x1234:16,@(3:2,er1)                        ;6a1512343150

-    xor.b @0x1234:16,@-er1                             ;6a151234b150

-    xor.b @0x1234:16,@er1+                             ;6a1512348150

-    xor.b @0x1234:16,@er1-                             ;6a151234a150

-    xor.b @0x1234:16,@+er1                             ;6a1512349150

-    xor.b @0x1234:16,@(0xffff9abc:16,er1)              ;6a151234c1509abc

-    xor.b @0x1234:16,@(0x9abcdef0:32,er1)              ;6a151234c9509abcdef0

-    xor.b @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6a151234d2509abc

-    xor.b @0x1234:16,@(0xffff9abc:16,r2.w)            ;6a151234e2509abc

-    xor.b @0x1234:16,@(0xffff9abc:16,er2.l)            ;6a151234f2509abc

-    xor.b @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6a151234da509abcdef0

-    xor.b @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6a151234ea509abcdef0

-    xor.b @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6a151234fa509abcdef0

-    xor.b @0x1234:16,@0xffff9abc:16                    ;6a15123440509abc

-    xor.b @0x1234:16,@0x9abcdef0:32                    ;6a15123448509abcdef0

-

-    xor.b @0x12345678:32,@er1                              ;6a35123456780150

-    xor.b @0x12345678:32,@(3:2,er1)                        ;6a35123456783150

-    xor.b @0x12345678:32,@-er1                             ;6a3512345678b150

-    xor.b @0x12345678:32,@er1+                             ;6a35123456788150

-    xor.b @0x12345678:32,@er1-                             ;6a3512345678a150

-    xor.b @0x12345678:32,@+er1                             ;6a35123456789150

-    xor.b @0x12345678:32,@(0xffff9abc:16,er1)              ;6a3512345678c1509abc

-    xor.b @0x12345678:32,@(0x9abcdef0:32,er1)              ;6a3512345678c9509abcdef0

-    xor.b @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6a3512345678d2509abc

-    xor.b @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6a3512345678e2509abc

-    xor.b @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6a3512345678f2509abc

-    xor.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6a3512345678da509abcdef0

-    xor.b @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6a3512345678ea509abcdef0

-    xor.b @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6a3512345678fa509abcdef0

-    xor.b @0x12345678:32,@0xffff9abc:16                    ;6a351234567840509abc

-    xor.b @0x12345678:32,@0x9abcdef0:32                    ;6a351234567848509abcdef0

-

-    xor.w #0x1234:16,r1           ;79511234

-    xor.w #0x1234:16,@er1          ;015e01501234

-    xor.w #0x1234:16,@(0x6:2,er1) ;015e31501234

-    xor.w #0x1234:16,@er1+         ;015e81501234

-    xor.w #0x1234:16,@-er1         ;015eb1501234

-    xor.w #0x1234:16,@+er1         ;015e91501234

-    xor.w #0x1234:16,@er1-         ;015ea1501234

-    xor.w #0x1234:16,@(0xffff9abc:16,er1)   ;015ec1509abc1234

-    xor.w #0x1234:16,@(0x9abcdef0:32,er1)   ;015ec9509abcdef01234

-    xor.w #0x1234:16,@(0xffff9abc:16,r2l.b) ;015ed2509abc1234

-    xor.w #0x1234:16,@(0xffff9abc:16,r2.w) ;015ee2509abc1234

-    xor.w #0x1234:16,@(0xffff9abc:16,er2.l) ;015ef2509abc1234

-    xor.w #0x1234:16,@(0x9abcdef0:32,r2l.b) ;015eda509abcdef01234

-    xor.w #0x1234:16,@(0x9abcdef0:32,r2.w) ;015eea509abcdef01234

-    xor.w #0x1234:16,@(0x9abcdef0:32,er2.l) ;015efa509abcdef01234

-    xor.w #0x1234:16,@0xffff9abc:16         ;015e40509abc1234

-    xor.w #0x1234:16,@0x9abcdef0:32         ;015e48509abcdef01234

-

-    xor.w r3,r1              ;6531

-

-    xor.w r3,@er1            ;7d906530

-    xor.w r3,@(0x6:2,er1)   ;01593153

-    xor.w r3,@-er1           ;0159b153

-    xor.w r3,@er1+           ;01598153

-    xor.w r3,@er1-           ;0159a153

-    xor.w r3,@+er1           ;01599153

-    xor.w r3,@(0x1234:16,er1)     ;0159c1531234

-    xor.w r3,@(0x12345678:32,er1)     ;0159c95312345678

-    xor.w r3,@(0x1234:16,r2l.b)   ;0159d2531234

-    xor.w r3,@(0x1234:16,r2.w)   ;0159e2531234

-    xor.w r3,@(0x1234:16,er2.l)   ;0159f2531234

-    xor.w r3,@(0x12345678:32,r2l.b)   ;0159da5312345678

-    xor.w r3,@(0x12345678:32,r2.w)   ;0159ea5312345678

-    xor.w r3,@(0x12345678:32,er2.l)   ;0159fa5312345678

-    xor.w r3,@0x1234:16          ;6b1812346530

-    xor.w r3,@0x12345678:32          ;6b38123456786530

-

-    xor.w @er3,r1            ;7cb06501

-    xor.w @(0x6:2,er3),r1  ;015a3351

-    xor.w @er3+,r1          ;015a8351

-    xor.w @-er3,r1          ;015ab351

-    xor.w @+er3,r1          ;015a9351

-    xor.w @er3-,r1          ;015aa351

-    xor.w @(0x1234:16,er1),r1     ;015ac1511234

-    xor.w @(0x12345678:32,er1),r1     ;015ac95112345678

-    xor.w @(0x1234:16,r2l.b),r1   ;015ad2511234

-    xor.w @(0x1234:16,r2.w),r1   ;015ae2511234

-    xor.w @(0x1234:16,er2.l),r1   ;015af2511234

-    xor.w @(0x12345678:32,r2l.b),r1   ;015ada5112345678

-    xor.w @(0x12345678:32,r2.w),r1   ;015aea5112345678

-    xor.w @(0x12345678:32,er2.l),r1   ;015afa5112345678

-    xor.w @0x1234:16,r1          ;6b1012346501

-    xor.w @0x12345678:32,r1          ;6b30123456786501

-

-    xor.w @er3,@er1                                ;7cb50150

-    xor.w @er3,@(6:2,er1)                          ;7cb53150

-    xor.w @er3,@-er1                               ;7cb5b150

-    xor.w @er3,@er1+                               ;7cb58150

-    xor.w @er3,@er1-                               ;7cb5a150

-    xor.w @er3,@+er1                               ;7cb59150

-    xor.w @er3,@(0xffff9abc:16,er1)                ;7cb5c1509abc

-    xor.w @er3,@(0x9abcdef0:32,er1)                ;7cb5c9509abcdef0

-    xor.w @er3,@(0xffff9abc:16,r2l.b)              ;7cb5d2509abc

-    xor.w @er3,@(0xffff9abc:16,r2.w)              ;7cb5e2509abc

-    xor.w @er3,@(0xffff9abc:16,er2.l)              ;7cb5f2509abc

-    xor.w @er3,@(0x9abcdef0:32,r2l.b)              ;7cb5da509abcdef0

-    xor.w @er3,@(0x9abcdef0:32,r2.w)              ;7cb5ea509abcdef0

-    xor.w @er3,@(0x9abcdef0:32,er2.l)              ;7cb5fa509abcdef0

-    xor.w @er3,@0xffff9abc:16                      ;7cb540509abc

-    xor.w @er3,@0x9abcdef0:32                      ;7cb548509abcdef0

-

-    xor.w @-er3,@er1                               ;01576d3c0150

-    xor.w @-er3,@(6:2,er1)                         ;01576d3c3150

-    xor.w @-er3,@-er1                              ;01576d3cb150

-    xor.w @-er3,@er1+                              ;01576d3c8150

-    xor.w @-er3,@er1-                              ;01576d3ca150

-    xor.w @-er3,@+er1                              ;01576d3c9150

-    xor.w @-er3,@(0xffff9abc:16,er1)               ;01576d3cc1509abc

-    xor.w @-er3,@(0x9abcdef0:32,er1)               ;01576d3cc9509abcdef0

-    xor.w @-er3,@(0xffff9abc:16,r2l.b)             ;01576d3cd2509abc

-    xor.w @-er3,@(0xffff9abc:16,r2.w)             ;01576d3ce2509abc

-    xor.w @-er3,@(0xffff9abc:16,er2.l)             ;01576d3cf2509abc

-    xor.w @-er3,@(0x9abcdef0:32,r2l.b)             ;01576d3cda509abcdef0

-    xor.w @-er3,@(0x9abcdef0:32,r2.w)             ;01576d3cea509abcdef0

-    xor.w @-er3,@(0x9abcdef0:32,er2.l)             ;01576d3cfa509abcdef0

-    xor.w @-er3,@0xffff9abc:16                     ;01576d3c40509abc

-    xor.w @-er3,@0x9abcdef0:32                     ;01576d3c48509abcdef0

-

-    xor.w @er3+,@er1                               ;01546d3c0150

-    xor.w @er3+,@(6:2,er1)                         ;01546d3c3150

-    xor.w @er3+,@-er1                              ;01546d3cb150

-    xor.w @er3+,@er1+                              ;01546d3c8150

-    xor.w @er3+,@er1-                              ;01546d3ca150

-    xor.w @er3+,@+er1                              ;01546d3c9150

-    xor.w @er3+,@(0xffff9abc:16,er1)               ;01546d3cc1509abc

-    xor.w @er3+,@(0x9abcdef0:32,er1)               ;01546d3cc9509abcdef0

-    xor.w @er3+,@(0xffff9abc:16,r2l.b)             ;01546d3cd2509abc

-    xor.w @er3+,@(0xffff9abc:16,r2.w)             ;01546d3ce2509abc

-    xor.w @er3+,@(0xffff9abc:16,er2.l)             ;01546d3cf2509abc

-    xor.w @er3+,@(0x9abcdef0:32,r2l.b)             ;01546d3cda509abcdef0

-    xor.w @er3+,@(0x9abcdef0:32,r2.w)             ;01546d3cea509abcdef0

-    xor.w @er3+,@(0x9abcdef0:32,er2.l)             ;01546d3cfa509abcdef0

-    xor.w @er3+,@0xffff9abc:16                     ;01546d3c40509abc

-    xor.w @er3+,@0x9abcdef0:32                     ;01546d3c48509abcdef0

-

-    xor.w @er3-,@er1                               ;01566d3c0150

-    xor.w @er3-,@(6:2,er1)                         ;01566d3c3150

-    xor.w @er3-,@-er1                              ;01566d3cb150

-    xor.w @er3-,@er1+                              ;01566d3c8150

-    xor.w @er3-,@er1-                              ;01566d3ca150

-    xor.w @er3-,@+er1                              ;01566d3c9150

-    xor.w @er3-,@(0xffff9abc:16,er1)               ;01566d3cc1509abc

-    xor.w @er3-,@(0x9abcdef0:32,er1)               ;01566d3cc9509abcdef0

-    xor.w @er3-,@(0xffff9abc:16,r2l.b)             ;01566d3cd2509abc

-    xor.w @er3-,@(0xffff9abc:16,r2.w)             ;01566d3ce2509abc

-    xor.w @er3-,@(0xffff9abc:16,er2.l)             ;01566d3cf2509abc

-    xor.w @er3-,@(0x9abcdef0:32,r2l.b)             ;01566d3cda509abcdef0

-    xor.w @er3-,@(0x9abcdef0:32,r2.w)             ;01566d3cea509abcdef0

-    xor.w @er3-,@(0x9abcdef0:32,er2.l)             ;01566d3cfa509abcdef0

-    xor.w @er3-,@0xffff9abc:16                     ;01566d3c40509abc

-    xor.w @er3-,@0x9abcdef0:32                     ;01566d3c48509abcdef0

-

-    xor.w @+er3,@er1                               ;01556d3c0150

-    xor.w @+er3,@(6:2,er1)                         ;01556d3c3150

-    xor.w @+er3,@-er1                              ;01556d3cb150

-    xor.w @+er3,@er1+                              ;01556d3c8150

-    xor.w @+er3,@er1-                              ;01556d3ca150

-    xor.w @+er3,@+er1                              ;01556d3c9150

-    xor.w @+er3,@(0xffff9abc:16,er1)               ;01556d3cc1509abc

-    xor.w @+er3,@(0x9abcdef0:32,er1)               ;01556d3cc9509abcdef0

-    xor.w @+er3,@(0xffff9abc:16,r2l.b)             ;01556d3cd2509abc

-    xor.w @+er3,@(0xffff9abc:16,r2.w)             ;01556d3ce2509abc

-    xor.w @+er3,@(0xffff9abc:16,er2.l)             ;01556d3cf2509abc

-    xor.w @+er3,@(0x9abcdef0:32,r2l.b)             ;01556d3cda509abcdef0

-    xor.w @+er3,@(0x9abcdef0:32,r2.w)             ;01556d3cea509abcdef0

-    xor.w @+er3,@(0x9abcdef0:32,er2.l)             ;01556d3cfa509abcdef0

-    xor.w @+er3,@0xffff9abc:16                     ;01556d3c40509abc

-    xor.w @+er3,@0x9abcdef0:32                     ;01556d3c48509abcdef0

-

-    xor.w @(0x1234:16,er3),@er1                         ;01546f3c12340150

-    xor.w @(0x1234:16,er3),@(6:2,er1)                   ;01546f3c12343150

-    xor.w @(0x1234:16,er3),@-er1                        ;01546f3c1234b150

-    xor.w @(0x1234:16,er3),@er1+                        ;01546f3c12348150

-    xor.w @(0x1234:16,er3),@er1-                        ;01546f3c1234a150

-    xor.w @(0x1234:16,er3),@+er1                        ;01546f3c12349150

-    xor.w @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01546f3c1234c1509abc

-    xor.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01546f3c1234c9509abcdef0

-    xor.w @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01546f3c1234d2509abc

-    xor.w @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01546f3c1234e2509abc

-    xor.w @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01546f3c1234f2509abc

-    xor.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01546f3c1234da509abcdef0

-    xor.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01546f3c1234ea509abcdef0

-    xor.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01546f3c1234fa509abcdef0

-    xor.w @(0x1234:16,er3),@0xffff9abc:16               ;01546f3c123440509abc

-    xor.w @(0x1234:16,er3),@0x9abcdef0:32               ;01546f3c123448509abcdef0

-

-    xor.w @(0x12345678:32,er3),@er1                         ;78346b2c123456780150

-    xor.w @(0x12345678:32,er3),@(6:2,er1)                   ;78346b2c123456783150

-    xor.w @(0x12345678:32,er3),@-er1                        ;78346b2c12345678b150

-    xor.w @(0x12345678:32,er3),@er1+                        ;78346b2c123456788150

-    xor.w @(0x12345678:32,er3),@er1-                        ;78346b2c12345678a150

-    xor.w @(0x12345678:32,er3),@+er1                        ;78346b2c123456789150

-    xor.w @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346b2c12345678c1509abc

-    xor.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346b2c12345678c9509abcdef0

-    xor.w @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346b2c12345678d2509abc

-    xor.w @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346b2c12345678e2509abc

-    xor.w @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346b2c12345678f2509abc

-    xor.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346b2c12345678da509abcdef0

-    xor.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346b2c12345678ea509abcdef0

-    xor.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346b2c12345678fa509abcdef0

-    xor.w @(0x12345678:32,er3),@0xffff9abc:16               ;78346b2c1234567840509abc

-    xor.w @(0x12345678:32,er3),@0x9abcdef0:32               ;78346b2c1234567848509abcdef0

-

-    xor.w @(0x1234:16,r3l.b),@er1                       ;01556f3c12340150

-    xor.w @(0x1234:16,r3l.b),@(6:2,er1)                 ;01556f3c12343150

-    xor.w @(0x1234:16,r3l.b),@-er1                      ;01556f3c1234b150

-    xor.w @(0x1234:16,r3l.b),@er1+                      ;01556f3c12348150

-    xor.w @(0x1234:16,r3l.b),@er1-                      ;01556f3c1234a150

-    xor.w @(0x1234:16,r3l.b),@+er1                      ;01556f3c12349150

-    xor.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01556f3c1234c1509abc

-    xor.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01556f3c1234c9509abcdef0

-    xor.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01556f3c1234d2509abc

-    xor.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01556f3c1234e2509abc

-    xor.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01556f3c1234f2509abc

-    xor.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01556f3c1234da509abcdef0

-    xor.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01556f3c1234ea509abcdef0

-    xor.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01556f3c1234fa509abcdef0

-    xor.w @(0x1234:16,r3l.b),@0xffff9abc:16             ;01556f3c123440509abc

-    xor.w @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01556f3c123448509abcdef0

-

-    xor.w @(0x1234:16,r3.w),@er1                       ;01566f3c12340150

-    xor.w @(0x1234:16,r3.w),@(6:2,er1)                 ;01566f3c12343150

-    xor.w @(0x1234:16,r3.w),@-er1                      ;01566f3c1234b150

-    xor.w @(0x1234:16,r3.w),@er1+                      ;01566f3c12348150

-    xor.w @(0x1234:16,r3.w),@er1-                      ;01566f3c1234a150

-    xor.w @(0x1234:16,r3.w),@+er1                      ;01566f3c12349150

-    xor.w @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01566f3c1234c1509abc

-    xor.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01566f3c1234c9509abcdef0

-    xor.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01566f3c1234d2509abc

-    xor.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01566f3c1234e2509abc

-    xor.w @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01566f3c1234f2509abc

-    xor.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01566f3c1234da509abcdef0

-    xor.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01566f3c1234ea509abcdef0

-    xor.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01566f3c1234fa509abcdef0

-    xor.w @(0x1234:16,r3.w),@0xffff9abc:16             ;01566f3c123440509abc

-    xor.w @(0x1234:16,r3.w),@0x9abcdef0:32             ;01566f3c123448509abcdef0

-

-    xor.w @(0x1234:16,er3.l),@er1                       ;01576f3c12340150

-    xor.w @(0x1234:16,er3.l),@(6:2,er1)                 ;01576f3c12343150

-    xor.w @(0x1234:16,er3.l),@-er1                      ;01576f3c1234b150

-    xor.w @(0x1234:16,er3.l),@er1+                      ;01576f3c12348150

-    xor.w @(0x1234:16,er3.l),@er1-                      ;01576f3c1234a150

-    xor.w @(0x1234:16,er3.l),@+er1                      ;01576f3c12349150

-    xor.w @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01576f3c1234c1509abc

-    xor.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01576f3c1234c9509abcdef0

-    xor.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01576f3c1234d2509abc

-    xor.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01576f3c1234e2509abc

-    xor.w @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01576f3c1234f2509abc

-    xor.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01576f3c1234da509abcdef0

-    xor.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01576f3c1234ea509abcdef0

-    xor.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01576f3c1234fa509abcdef0

-    xor.w @(0x1234:16,er3.l),@0xffff9abc:16             ;01576f3c123440509abc

-    xor.w @(0x1234:16,er3.l),@0x9abcdef0:32             ;01576f3c123448509abcdef0

-

-    xor.w @(0x12345678:32,r3l.b),@er1                       ;78356b2c123456780150

-    xor.w @(0x12345678:32,r3l.b),@(6:2,er1)                 ;78356b2c123456783150

-    xor.w @(0x12345678:32,r3l.b),@-er1                      ;78356b2c12345678b150

-    xor.w @(0x12345678:32,r3l.b),@er1+                      ;78356b2c123456788150

-    xor.w @(0x12345678:32,r3l.b),@er1-                      ;78356b2c12345678a150

-    xor.w @(0x12345678:32,r3l.b),@+er1                      ;78356b2c123456789150

-    xor.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356b2c12345678c1509abc

-    xor.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356b2c12345678c9509abcdef0

-    xor.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356b2c12345678d2509abc

-    xor.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356b2c12345678e2509abc

-    xor.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356b2c12345678f2509abc

-    xor.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356b2c12345678da509abcdef0

-    xor.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356b2c12345678ea509abcdef0

-    xor.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356b2c12345678fa509abcdef0

-    xor.w @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356b2c1234567840509abc

-    xor.w @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356b2c1234567848509abcdef0

-

-    xor.w @(0x12345678:32,r3.w),@er1                       ;78366b2c123456780150

-    xor.w @(0x12345678:32,r3.w),@(6:2,er1)                 ;78366b2c123456783150

-    xor.w @(0x12345678:32,r3.w),@-er1                      ;78366b2c12345678b150

-    xor.w @(0x12345678:32,r3.w),@er1+                      ;78366b2c123456788150

-    xor.w @(0x12345678:32,r3.w),@er1-                      ;78366b2c12345678a150

-    xor.w @(0x12345678:32,r3.w),@+er1                      ;78366b2c123456789150

-    xor.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366b2c12345678c1509abc

-    xor.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366b2c12345678c9509abcdef0

-    xor.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366b2c12345678d2509abc

-    xor.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366b2c12345678e2509abc

-    xor.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366b2c12345678f2509abc

-    xor.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366b2c12345678da509abcdef0

-    xor.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366b2c12345678ea509abcdef0

-    xor.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366b2c12345678fa509abcdef0

-    xor.w @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366b2c1234567840509abc

-    xor.w @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366b2c1234567848509abcdef0

-

-    xor.w @(0x12345678:32,er3.l),@er1                       ;78376b2c123456780150

-    xor.w @(0x12345678:32,er3.l),@(6:2,er1)                 ;78376b2c123456783150

-    xor.w @(0x12345678:32,er3.l),@-er1                      ;78376b2c12345678b150

-    xor.w @(0x12345678:32,er3.l),@er1+                      ;78376b2c123456788150

-    xor.w @(0x12345678:32,er3.l),@er1-                      ;78376b2c12345678a150

-    xor.w @(0x12345678:32,er3.l),@+er1                      ;78376b2c123456789150

-    xor.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376b2c12345678c1509abc

-    xor.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376b2c12345678c9509abcdef0

-    xor.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376b2c12345678d2509abc

-    xor.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376b2c12345678e2509abc

-    xor.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376b2c12345678f2509abc

-    xor.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376b2c12345678da509abcdef0

-    xor.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376b2c12345678ea509abcdef0

-    xor.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376b2c12345678fa509abcdef0

-    xor.w @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376b2c1234567840509abc

-    xor.w @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376b2c1234567848509abcdef0

-

-    xor.w @0x1234:16,@er1                              ;6b1512340150

-    xor.w @0x1234:16,@(6:2,er1)                        ;6b1512343150

-    xor.w @0x1234:16,@-er1                             ;6b151234b150

-    xor.w @0x1234:16,@er1+                             ;6b1512348150

-    xor.w @0x1234:16,@er1-                             ;6b151234a150

-    xor.w @0x1234:16,@+er1                             ;6b1512349150

-    xor.w @0x1234:16,@(0xffff9abc:16,er1)              ;6b151234c1509abc

-    xor.w @0x1234:16,@(0x9abcdef0:32,er1)              ;6b151234c9509abcdef0

-    xor.w @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6b151234d2509abc

-    xor.w @0x1234:16,@(0xffff9abc:16,r2.w)            ;6b151234e2509abc

-    xor.w @0x1234:16,@(0xffff9abc:16,er2.l)            ;6b151234f2509abc

-    xor.w @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6b151234da509abcdef0

-    xor.w @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6b151234ea509abcdef0

-    xor.w @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6b151234fa509abcdef0

-    xor.w @0x1234:16,@0xffff9abc:16                    ;6b15123440509abc

-    xor.w @0x1234:16,@0x9abcdef0:32                    ;6b15123448509abcdef0

-

-    xor.w @0x12345678:32,@er1                              ;6b35123456780150

-    xor.w @0x12345678:32,@(6:2,er1)                        ;6b35123456783150

-    xor.w @0x12345678:32,@-er1                             ;6b3512345678b150

-    xor.w @0x12345678:32,@er1+                             ;6b35123456788150

-    xor.w @0x12345678:32,@er1-                             ;6b3512345678a150

-    xor.w @0x12345678:32,@+er1                             ;6b35123456789150

-    xor.w @0x12345678:32,@(0xffff9abc:16,er1)              ;6b3512345678c1509abc

-    xor.w @0x12345678:32,@(0x9abcdef0:32,er1)              ;6b3512345678c9509abcdef0

-    xor.w @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6b3512345678d2509abc

-    xor.w @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6b3512345678e2509abc

-    xor.w @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6b3512345678f2509abc

-    xor.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6b3512345678da509abcdef0

-    xor.w @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6b3512345678ea509abcdef0

-    xor.w @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6b3512345678fa509abcdef0

-    xor.w @0x12345678:32,@0xffff9abc:16                    ;6b351234567840509abc

-    xor.w @0x12345678:32,@0x9abcdef0:32                    ;6b351234567848509abcdef0

-

-    xor.l #0x12345678:32,er1          ;7a5112345678

-    xor.l #0x1234:16,er1           ;7a591234

-    xor.l #0x12345678:32,@er1          ;010e015812345678

-    xor.l #0x12345678:32,@(0xc:2,er1) ;010e315812345678

-    xor.l #0x12345678:32,@er1+         ;010e815812345678

-    xor.l #0x12345678:32,@-er1         ;010eb15812345678

-    xor.l #0x12345678:32,@+er1         ;010e915812345678

-    xor.l #0x12345678:32,@er1-         ;010ea15812345678

-    xor.l #0x12345678:32,@(0xffff9abc:16,er1)   ;010ec1589abc12345678

-    xor.l #0x12345678:32,@(0x9abcdef0:32,er1)   ;010ec9589abcdef012345678

-    xor.l #0x12345678:32,@(0xffff9abc:16,r2l.b) ;010ed2589abc12345678

-    xor.l #0x12345678:32,@(0xffff9abc:16,r2.w) ;010ee2589abc12345678

-    xor.l #0x12345678:32,@(0xffff9abc:16,er2.l) ;010ef2589abc12345678

-    xor.l #0x12345678:32,@(0x9abcdef0:32,r2l.b) ;010eda589abcdef012345678

-    xor.l #0x12345678:32,@(0x9abcdef0:32,r2.w) ;010eea589abcdef012345678

-    xor.l #0x12345678:32,@(0x9abcdef0:32,er2.l) ;010efa589abcdef012345678

-    xor.l #0x12345678:32,@0xffff9abc:16        ;010e40589abc12345678

-    xor.l #0x12345678:32,@0x9abcdef0:32        ;010e48589abcdef012345678

-    xor.l #0x1234:16,@er1          ;010e01501234

-    xor.l #0x1234:16,@(0xc:2,er1) ;010e31501234

-    xor.l #0x1234:16,@er1+         ;010e81501234

-    xor.l #0x1234:16,@-er1         ;010eb1501234

-    xor.l #0x1234:16,@+er1         ;010e91501234

-    xor.l #0x1234:16,@er1-         ;010ea1501234

-    xor.l #0x1234:16,@(0xffff9abc:16,er1)   ;010ec1509abc1234

-    xor.l #0x1234:16,@(0x9abcdef0:32,er1)   ;010ec9509abcdef01234

-    xor.l #0x1234:16,@(0xffff9abc:16,r2l.b) ;010ed2509abc1234

-    xor.l #0x1234:16,@(0xffff9abc:16,r2.w) ;010ee2509abc1234

-    xor.l #0x1234:16,@(0xffff9abc:16,er2.l) ;010ef2509abc1234

-    xor.l #0x1234:16,@(0x9abcdef0:32,r2l.b) ;010eda509abcdef01234

-    xor.l #0x1234:16,@(0x9abcdef0:32,r2.w) ;010eea509abcdef01234

-    xor.l #0x1234:16,@(0x9abcdef0:32,er2.l) ;010efa509abcdef01234

-    xor.l #0x1234:16,@0xffff9abc:16        ;010e40509abc1234

-    xor.l #0x1234:16,@0x9abcdef0:32        ;010e48509abcdef01234

-

-    xor.l er3,er1            ;01f06531

-

-    xor.l er3,@er1            ;01090153

-    xor.l er3,@(0xc:2,er1)   ;01093153

-    xor.l er3,@er1+           ;01098153

-    xor.l er3,@-er1           ;0109b153

-    xor.l er3,@+er1           ;01099153

-    xor.l er3,@er1-           ;0109a153

-    xor.l er3,@(0x1234:16,er1)     ;0109c1531234

-    xor.l er3,@(0x12345678:32,er1)     ;0109c95312345678

-    xor.l er3,@(0x1234:16,r2l.b)   ;0109d2531234

-    xor.l er3,@(0x1234:16,r2.w)   ;0109e2531234

-    xor.l er3,@(0x1234:16,er2.l)   ;0109f2531234

-    xor.l er3,@(0x12345678:32,r2l.b)   ;0109da5312345678

-    xor.l er3,@(0x12345678:32,r2.w)   ;0109ea5312345678

-    xor.l er3,@(0x12345678:32,er2.l)   ;0109fa5312345678

-    xor.l er3,@0x1234:16          ;010940531234

-    xor.l er3,@0x12345678:32          ;0109485312345678

-

-    xor.l @er3,er1            ;010a0351

-    xor.l @(0xc:2,er3),er1  ;010a3351

-    xor.l @er3+,er1          ;010a8351

-    xor.l @-er3,er1          ;010ab351

-    xor.l @+er3,er1          ;010a9351

-    xor.l @er3-,er1          ;010aa351

-    xor.l @(0x1234:16,er1),er1     ;010ac1511234

-    xor.l @(0x12345678:32,er1),er1     ;010ac95112345678

-    xor.l @(0x1234:16,r2l.b),er1   ;010ad2511234

-    xor.l @(0x1234:16,r2.w),er1   ;010ae2511234

-    xor.l @(0x1234:16,er2.l),er1   ;010af2511234

-    xor.l @(0x12345678:32,r2l.b),er1   ;010ada5112345678

-    xor.l @(0x12345678:32,r2.w),er1   ;010aea5112345678

-    xor.l @(0x12345678:32,er2.l),er1   ;010afa5112345678

-    xor.l @0x1234:16,er1          ;010a40511234

-    xor.l @0x12345678:32,er1          ;010a485112345678

-

-    xor.l @er3,@er1                                ;0104693c0150

-    xor.l @er3,@(0xc:2,er1)                          ;0104693c3150

-    xor.l @er3,@-er1                               ;0104693cb150

-    xor.l @er3,@er1+                               ;0104693c8150

-    xor.l @er3,@er1-                               ;0104693ca150

-    xor.l @er3,@+er1                               ;0104693c9150

-    xor.l @er3,@(0xffff9abc:16,er1)                ;0104693cc1509abc

-    xor.l @er3,@(0x9abcdef0:32,er1)                ;0104693cc9509abcdef0

-    xor.l @er3,@(0xffff9abc:16,r2l.b)              ;0104693cd2509abc

-    xor.l @er3,@(0xffff9abc:16,r2.w)              ;0104693ce2509abc

-    xor.l @er3,@(0xffff9abc:16,er2.l)              ;0104693cf2509abc

-    xor.l @er3,@(0x9abcdef0:32,r2l.b)              ;0104693cda509abcdef0

-    xor.l @er3,@(0x9abcdef0:32,r2.w)              ;0104693cea509abcdef0

-    xor.l @er3,@(0x9abcdef0:32,er2.l)              ;0104693cfa509abcdef0

-    xor.l @er3,@0xffff9abc:16                      ;0104693c40509abc

-    xor.l @er3,@0x9abcdef0:32                      ;0104693c48509abcdef0

-

-    xor.l @(0xc:2,er3),@er1                       ;0107693c0150

-    xor.l @(0xc:2,er3),@(0xc:2,er1)                 ;0107693c3150

-    xor.l @(0xc:2,er3),@-er1                      ;0107693cb150

-    xor.l @(0xc:2,er3),@er1+                      ;0107693c8150

-    xor.l @(0xc:2,er3),@er1-                      ;0107693ca150

-    xor.l @(0xc:2,er3),@+er1                      ;0107693c9150

-    xor.l @(0xc:2,er3),@(0xffff9abc:16,er1)       ;0107693cc1509abc

-    xor.l @(0xc:2,er3),@(0x9abcdef0:32,er1)       ;0107693cc9509abcdef0

-    xor.l @(0xc:2,er3),@(0xffff9abc:16,r2l.b)     ;0107693cd2509abc

-    xor.l @(0xc:2,er3),@(0xffff9abc:16,r2.w)     ;0107693ce2509abc

-    xor.l @(0xc:2,er3),@(0xffff9abc:16,er2.l)     ;0107693cf2509abc

-    xor.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)     ;0107693cda509abcdef0

-    xor.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)     ;0107693cea509abcdef0

-    xor.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)     ;0107693cfa509abcdef0

-    xor.l @(0xc:2,er3),@0xffff9abc:16             ;0107693c40509abc

-    xor.l @(0xc:2,er3),@0x9abcdef0:32             ;0107693c48509abcdef0

-

-    xor.l @-er3,@er1                               ;01076d3c0150

-    xor.l @-er3,@(0xc:2,er1)                         ;01076d3c3150

-    xor.l @-er3,@-er1                              ;01076d3cb150

-    xor.l @-er3,@er1+                              ;01076d3c8150

-    xor.l @-er3,@er1-                              ;01076d3ca150

-    xor.l @-er3,@+er1                              ;01076d3c9150

-    xor.l @-er3,@(0xffff9abc:16,er1)               ;01076d3cc1509abc

-    xor.l @-er3,@(0x9abcdef0:32,er1)               ;01076d3cc9509abcdef0

-    xor.l @-er3,@(0xffff9abc:16,r2l.b)             ;01076d3cd2509abc

-    xor.l @-er3,@(0xffff9abc:16,r2.w)             ;01076d3ce2509abc

-    xor.l @-er3,@(0xffff9abc:16,er2.l)             ;01076d3cf2509abc

-    xor.l @-er3,@(0x9abcdef0:32,r2l.b)             ;01076d3cda509abcdef0

-    xor.l @-er3,@(0x9abcdef0:32,r2.w)             ;01076d3cea509abcdef0

-    xor.l @-er3,@(0x9abcdef0:32,er2.l)             ;01076d3cfa509abcdef0

-    xor.l @-er3,@0xffff9abc:16                     ;01076d3c40509abc

-    xor.l @-er3,@0x9abcdef0:32                     ;01076d3c48509abcdef0

-

-    xor.l @er3+,@er1                               ;01046d3c0150

-    xor.l @er3+,@(0xc:2,er1)                         ;01046d3c3150

-    xor.l @er3+,@-er1                              ;01046d3cb150

-    xor.l @er3+,@er1+                              ;01046d3c8150

-    xor.l @er3+,@er1-                              ;01046d3ca150

-    xor.l @er3+,@+er1                              ;01046d3c9150

-    xor.l @er3+,@(0xffff9abc:16,er1)               ;01046d3cc1509abc

-    xor.l @er3+,@(0x9abcdef0:32,er1)               ;01046d3cc9509abcdef0

-    xor.l @er3+,@(0xffff9abc:16,r2l.b)             ;01046d3cd2509abc

-    xor.l @er3+,@(0xffff9abc:16,r2.w)             ;01046d3ce2509abc

-    xor.l @er3+,@(0xffff9abc:16,er2.l)             ;01046d3cf2509abc

-    xor.l @er3+,@(0x9abcdef0:32,r2l.b)             ;01046d3cda509abcdef0

-    xor.l @er3+,@(0x9abcdef0:32,r2.w)             ;01046d3cea509abcdef0

-    xor.l @er3+,@(0x9abcdef0:32,er2.l)             ;01046d3cfa509abcdef0

-    xor.l @er3+,@0xffff9abc:16                     ;01046d3c40509abc

-    xor.l @er3+,@0x9abcdef0:32                     ;01046d3c48509abcdef0

-

-    xor.l @er3-,@er1                               ;01066d3c0150

-    xor.l @er3-,@(0xc:2,er1)                         ;01066d3c3150

-    xor.l @er3-,@-er1                              ;01066d3cb150

-    xor.l @er3-,@er1+                              ;01066d3c8150

-    xor.l @er3-,@er1-                              ;01066d3ca150

-    xor.l @er3-,@+er1                              ;01066d3c9150

-    xor.l @er3-,@(0xffff9abc:16,er1)               ;01066d3cc1509abc

-    xor.l @er3-,@(0x9abcdef0:32,er1)               ;01066d3cc9509abcdef0

-    xor.l @er3-,@(0xffff9abc:16,r2l.b)             ;01066d3cd2509abc

-    xor.l @er3-,@(0xffff9abc:16,r2.w)             ;01066d3ce2509abc

-    xor.l @er3-,@(0xffff9abc:16,er2.l)             ;01066d3cf2509abc

-    xor.l @er3-,@(0x9abcdef0:32,r2l.b)             ;01066d3cda509abcdef0

-    xor.l @er3-,@(0x9abcdef0:32,r2.w)             ;01066d3cea509abcdef0

-    xor.l @er3-,@(0x9abcdef0:32,er2.l)             ;01066d3cfa509abcdef0

-    xor.l @er3-,@0xffff9abc:16                     ;01066d3c40509abc

-    xor.l @er3-,@0x9abcdef0:32                     ;01066d3c48509abcdef0

-

-    xor.l @+er3,@er1                               ;01056d3c0150

-    xor.l @+er3,@(0xc:2,er1)                         ;01056d3c3150

-    xor.l @+er3,@-er1                              ;01056d3cb150

-    xor.l @+er3,@er1+                              ;01056d3c8150

-    xor.l @+er3,@er1-                              ;01056d3ca150

-    xor.l @+er3,@+er1                              ;01056d3c9150

-    xor.l @+er3,@(0xffff9abc:16,er1)               ;01056d3cc1509abc

-    xor.l @+er3,@(0x9abcdef0:32,er1)               ;01056d3cc9509abcdef0

-    xor.l @+er3,@(0xffff9abc:16,r2l.b)             ;01056d3cd2509abc

-    xor.l @+er3,@(0xffff9abc:16,r2.w)             ;01056d3ce2509abc

-    xor.l @+er3,@(0xffff9abc:16,er2.l)             ;01056d3cf2509abc

-    xor.l @+er3,@(0x9abcdef0:32,r2l.b)             ;01056d3cda509abcdef0

-    xor.l @+er3,@(0x9abcdef0:32,r2.w)             ;01056d3cea509abcdef0

-    xor.l @+er3,@(0x9abcdef0:32,er2.l)             ;01056d3cfa509abcdef0

-    xor.l @+er3,@0xffff9abc:16                     ;01056d3c40509abc

-    xor.l @+er3,@0x9abcdef0:32                     ;01056d3c48509abcdef0

-

-    xor.l @(0x1234:16,er3),@er1                         ;01046f3c12340150

-    xor.l @(0x1234:16,er3),@(0xc:2,er1)                   ;01046f3c12343150

-    xor.l @(0x1234:16,er3),@-er1                        ;01046f3c1234b150

-    xor.l @(0x1234:16,er3),@er1+                        ;01046f3c12348150

-    xor.l @(0x1234:16,er3),@er1-                        ;01046f3c1234a150

-    xor.l @(0x1234:16,er3),@+er1                        ;01046f3c12349150

-    xor.l @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01046f3c1234c1509abc

-    xor.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01046f3c1234c9509abcdef0

-    xor.l @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01046f3c1234d2509abc

-    xor.l @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01046f3c1234e2509abc

-    xor.l @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01046f3c1234f2509abc

-    xor.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01046f3c1234da509abcdef0

-    xor.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01046f3c1234ea509abcdef0

-    xor.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01046f3c1234fa509abcdef0

-    xor.l @(0x1234:16,er3),@0xffff9abc:16               ;01046f3c123440509abc

-    xor.l @(0x1234:16,er3),@0x9abcdef0:32               ;01046f3c123448509abcdef0

-

-    xor.l @(0x12345678:32,er3),@er1                         ;78b46b2c123456780150

-    xor.l @(0x12345678:32,er3),@(0xc:2,er1)                   ;78b46b2c123456783150

-    xor.l @(0x12345678:32,er3),@-er1                        ;78b46b2c12345678b150

-    xor.l @(0x12345678:32,er3),@er1+                        ;78b46b2c123456788150

-    xor.l @(0x12345678:32,er3),@er1-                        ;78b46b2c12345678a150

-    xor.l @(0x12345678:32,er3),@+er1                        ;78b46b2c123456789150

-    xor.l @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78b46b2c12345678c1509abc

-    xor.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78b46b2c12345678c9509abcdef0

-    xor.l @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78b46b2c12345678d2509abc

-    xor.l @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78b46b2c12345678e2509abc

-    xor.l @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78b46b2c12345678f2509abc

-    xor.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78b46b2c12345678da509abcdef0

-    xor.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78b46b2c12345678ea509abcdef0

-    xor.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78b46b2c12345678fa509abcdef0

-    xor.l @(0x12345678:32,er3),@0xffff9abc:16               ;78b46b2c1234567840509abc

-    xor.l @(0x12345678:32,er3),@0x9abcdef0:32               ;78b46b2c1234567848509abcdef0

-

-    xor.l @(0x1234:16,r3l.b),@er1                       ;01056f3c12340150

-    xor.l @(0x1234:16,r3l.b),@(0xc:2,er1)                 ;01056f3c12343150

-    xor.l @(0x1234:16,r3l.b),@-er1                      ;01056f3c1234b150

-    xor.l @(0x1234:16,r3l.b),@er1+                      ;01056f3c12348150

-    xor.l @(0x1234:16,r3l.b),@er1-                      ;01056f3c1234a150

-    xor.l @(0x1234:16,r3l.b),@+er1                      ;01056f3c12349150

-    xor.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01056f3c1234c1509abc

-    xor.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01056f3c1234c9509abcdef0

-    xor.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01056f3c1234d2509abc

-    xor.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01056f3c1234e2509abc

-    xor.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01056f3c1234f2509abc

-    xor.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01056f3c1234da509abcdef0

-    xor.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01056f3c1234ea509abcdef0

-    xor.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01056f3c1234fa509abcdef0

-    xor.l @(0x1234:16,r3l.b),@0xffff9abc:16             ;01056f3c123440509abc

-    xor.l @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01056f3c123448509abcdef0

-

-    xor.l @(0x1234:16,r3.w),@er1                       ;01066f3c12340150

-    xor.l @(0x1234:16,r3.w),@(0xc:2,er1)                 ;01066f3c12343150

-    xor.l @(0x1234:16,r3.w),@-er1                      ;01066f3c1234b150

-    xor.l @(0x1234:16,r3.w),@er1+                      ;01066f3c12348150

-    xor.l @(0x1234:16,r3.w),@er1-                      ;01066f3c1234a150

-    xor.l @(0x1234:16,r3.w),@+er1                      ;01066f3c12349150

-    xor.l @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01066f3c1234c1509abc

-    xor.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01066f3c1234c9509abcdef0

-    xor.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01066f3c1234d2509abc

-    xor.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01066f3c1234e2509abc

-    xor.l @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01066f3c1234f2509abc

-    xor.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01066f3c1234da509abcdef0

-    xor.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01066f3c1234ea509abcdef0

-    xor.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01066f3c1234fa509abcdef0

-    xor.l @(0x1234:16,r3.w),@0xffff9abc:16             ;01066f3c123440509abc

-    xor.l @(0x1234:16,r3.w),@0x9abcdef0:32             ;01066f3c123448509abcdef0

-

-    xor.l @(0x1234:16,er3.l),@er1                       ;01076f3c12340150

-    xor.l @(0x1234:16,er3.l),@(0xc:2,er1)                 ;01076f3c12343150

-    xor.l @(0x1234:16,er3.l),@-er1                      ;01076f3c1234b150

-    xor.l @(0x1234:16,er3.l),@er1+                      ;01076f3c12348150

-    xor.l @(0x1234:16,er3.l),@er1-                      ;01076f3c1234a150

-    xor.l @(0x1234:16,er3.l),@+er1                      ;01076f3c12349150

-    xor.l @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01076f3c1234c1509abc

-    xor.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01076f3c1234c9509abcdef0

-    xor.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01076f3c1234d2509abc

-    xor.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01076f3c1234e2509abc

-    xor.l @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01076f3c1234f2509abc

-    xor.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01076f3c1234da509abcdef0

-    xor.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01076f3c1234ea509abcdef0

-    xor.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01076f3c1234fa509abcdef0

-    xor.l @(0x1234:16,er3.l),@0xffff9abc:16             ;01076f3c123440509abc

-    xor.l @(0x1234:16,er3.l),@0x9abcdef0:32             ;01076f3c123448509abcdef0

-

-    xor.l @(0x12345678:32,r3l.b),@er1                       ;78b56b2c123456780150

-    xor.l @(0x12345678:32,r3l.b),@(0xc:2,er1)                 ;78b56b2c123456783150

-    xor.l @(0x12345678:32,r3l.b),@-er1                      ;78b56b2c12345678b150

-    xor.l @(0x12345678:32,r3l.b),@er1+                      ;78b56b2c123456788150

-    xor.l @(0x12345678:32,r3l.b),@er1-                      ;78b56b2c12345678a150

-    xor.l @(0x12345678:32,r3l.b),@+er1                      ;78b56b2c123456789150

-    xor.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78b56b2c12345678c1509abc

-    xor.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78b56b2c12345678c9509abcdef0

-    xor.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78b56b2c12345678d2509abc

-    xor.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78b56b2c12345678e2509abc

-    xor.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78b56b2c12345678f2509abc

-    xor.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78b56b2c12345678da509abcdef0

-    xor.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78b56b2c12345678ea509abcdef0

-    xor.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78b56b2c12345678fa509abcdef0

-    xor.l @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78b56b2c1234567840509abc

-    xor.l @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78b56b2c1234567848509abcdef0

-

-    xor.l @(0x12345678:32,r3.w),@er1                       ;78b66b2c123456780150

-    xor.l @(0x12345678:32,r3.w),@(0xc:2,er1)                 ;78b66b2c123456783150

-    xor.l @(0x12345678:32,r3.w),@-er1                      ;78b66b2c12345678b150

-    xor.l @(0x12345678:32,r3.w),@er1+                      ;78b66b2c123456788150

-    xor.l @(0x12345678:32,r3.w),@er1-                      ;78b66b2c12345678a150

-    xor.l @(0x12345678:32,r3.w),@+er1                      ;78b66b2c123456789150

-    xor.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78b66b2c12345678c1509abc

-    xor.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78b66b2c12345678c9509abcdef0

-    xor.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78b66b2c12345678d2509abc

-    xor.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78b66b2c12345678e2509abc

-    xor.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78b66b2c12345678f2509abc

-    xor.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78b66b2c12345678da509abcdef0

-    xor.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78b66b2c12345678ea509abcdef0

-    xor.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78b66b2c12345678fa509abcdef0

-    xor.l @(0x12345678:32,r3.w),@0xffff9abc:16             ;78b66b2c1234567840509abc

-    xor.l @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78b66b2c1234567848509abcdef0

-

-    xor.l @(0x12345678:32,er3.l),@er1                       ;78b76b2c123456780150

-    xor.l @(0x12345678:32,er3.l),@(0xc:2,er1)                 ;78b76b2c123456783150

-    xor.l @(0x12345678:32,er3.l),@-er1                      ;78b76b2c12345678b150

-    xor.l @(0x12345678:32,er3.l),@er1+                      ;78b76b2c123456788150

-    xor.l @(0x12345678:32,er3.l),@er1-                      ;78b76b2c12345678a150

-    xor.l @(0x12345678:32,er3.l),@+er1                      ;78b76b2c123456789150

-    xor.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78b76b2c12345678c1509abc

-    xor.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78b76b2c12345678c9509abcdef0

-    xor.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78b76b2c12345678d2509abc

-    xor.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78b76b2c12345678e2509abc

-    xor.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78b76b2c12345678f2509abc

-    xor.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78b76b2c12345678da509abcdef0

-    xor.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78b76b2c12345678ea509abcdef0

-    xor.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78b76b2c12345678fa509abcdef0

-    xor.l @(0x12345678:32,er3.l),@0xffff9abc:16             ;78b76b2c1234567840509abc

-    xor.l @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78b76b2c1234567848509abcdef0

-

-    xor.l @0x1234:16,@er1                              ;01046b0c12340150

-    xor.l @0x1234:16,@(0xc:2,er1)                        ;01046b0c12343150

-    xor.l @0x1234:16,@-er1                             ;01046b0c1234b150

-    xor.l @0x1234:16,@er1+                             ;01046b0c12348150

-    xor.l @0x1234:16,@er1-                             ;01046b0c1234a150

-    xor.l @0x1234:16,@+er1                             ;01046b0c12349150

-    xor.l @0x1234:16,@(0xffff9abc:16,er1)              ;01046b0c1234c1509abc

-    xor.l @0x1234:16,@(0x9abcdef0:32,er1)              ;01046b0c1234c9509abcdef0

-    xor.l @0x1234:16,@(0xffff9abc:16,r2l.b)            ;01046b0c1234d2509abc

-    xor.l @0x1234:16,@(0xffff9abc:16,r2.w)            ;01046b0c1234e2509abc

-    xor.l @0x1234:16,@(0xffff9abc:16,er2.l)            ;01046b0c1234f2509abc

-    xor.l @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;01046b0c1234da509abcdef0

-    xor.l @0x1234:16,@(0x9abcdef0:32,r2.w)            ;01046b0c1234ea509abcdef0

-    xor.l @0x1234:16,@(0x9abcdef0:32,er2.l)            ;01046b0c1234fa509abcdef0

-    xor.l @0x1234:16,@0xffff9abc:16                    ;01046b0c123440509abc

-    xor.l @0x1234:16,@0x9abcdef0:32                    ;01046b0c123448509abcdef0

-

-    xor.l @0x12345678:32,@er1                              ;01046b2c123456780150

-    xor.l @0x12345678:32,@(0xc:2,er1)                        ;01046b2c123456783150

-    xor.l @0x12345678:32,@-er1                             ;01046b2c12345678b150

-    xor.l @0x12345678:32,@er1+                             ;01046b2c123456788150

-    xor.l @0x12345678:32,@er1-                             ;01046b2c12345678a150

-    xor.l @0x12345678:32,@+er1                             ;01046b2c123456789150

-    xor.l @0x12345678:32,@(0xffff9abc:16,er1)              ;01046b2c12345678c1509abc

-    xor.l @0x12345678:32,@(0x9abcdef0:32,er1)              ;01046b2c12345678c9509abcdef0

-    xor.l @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;01046b2c12345678d2509abc

-    xor.l @0x12345678:32,@(0xffff9abc:16,r2.w)            ;01046b2c12345678e2509abc

-    xor.l @0x12345678:32,@(0xffff9abc:16,er2.l)            ;01046b2c12345678f2509abc

-    xor.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;01046b2c12345678da509abcdef0

-    xor.l @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;01046b2c12345678ea509abcdef0

-    xor.l @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;01046b2c12345678fa509abcdef0

-    xor.l @0x12345678:32,@0xffff9abc:16                    ;01046b2c1234567840509abc

-    xor.l @0x12345678:32,@0x9abcdef0:32                    ;01046b2c1234567848509abcdef0

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t10_and.exp b/gdb/testsuite/gdb.disasm/t10_and.exp
deleted file mode 100644
index 63ae907615a..00000000000
--- a/gdb/testsuite/gdb.disasm/t10_and.exp
+++ /dev/null
@@ -1,1866 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t10_and"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "and.b\t#0x12(:8|),r1h" \
-	"and.b #0x12:8,r1h"
-gdb_test "x" "and.b\t#0x12(:8|),@er1" \
-	"and.b #0x12:8,@er1"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x3(:2|),er1\\)" \
-	"and.b #0x12:8,@(0x3:2,er1)"
-gdb_test "x" "and.b\t#0x12(:8|),@er1\\+" \
-	"and.b #0x12:8,@er1+"
-gdb_test "x" "and.b\t#0x12(:8|),@-er1" \
-	"and.b #0x12:8,@-er1"
-gdb_test "x" "and.b\t#0x12(:8|),@\\+er1" \
-	"and.b #0x12:8,@+er1"
-gdb_test "x" "and.b\t#0x12(:8|),@er1-" \
-	"and.b #0x12:8,@er1-"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x1234(:16|),er1\\)" \
-	"and.b #0x12:8,@(0x1234:16,er1)"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x12345678(:32|),er1\\)" \
-	"and.b #0x12:8,@(0x12345678:32,er1)"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x1234(:16|),r2l.b\\)" \
-	"and.b #0x12:8,@(0x1234:16,r2l.b)"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x1234(:16|),r2.w\\)" \
-	"and.b #0x12:8,@(0x1234:16,r2.w)"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x1234(:16|),er2.l\\)" \
-	"and.b #0x12:8,@(0x1234:16,er2.l)"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x12345678(:32|),r2l.b\\)" \
-	"and.b #0x12:8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x12345678(:32|),r2.w\\)" \
-	"and.b #0x12:8,@(0x12345678:32,r2.w)"
-gdb_test "x" "and.b\t#0x12(:8|),@\\(0x12345678(:32|),er2.l\\)" \
-	"and.b #0x12:8,@(0x12345678:32,er2.l)"
-gdb_test "x" "and.b\t#0x12(:8|),@0x12(:8|)" \
-	"and.b #0x12:8,@0x12:8"
-gdb_test "x" "and.b\t#0x12(:8|),@0x1234(:16|)" \
-	"and.b #0x12:8,@0x1234:16"
-gdb_test "x" "and.b\t#0x12(:8|),@0x12345678(:32|)" \
-	"and.b #0x12:8,@0x12345678:32"
-gdb_test "x" "and.b\tr3h,r1h" \
-	"and.b r3h,r1h"
-gdb_test "x" "and.b\tr3h,@er1" \
-	"and.b r3h,@er1"
-gdb_test "x" "and.b\tr3h,@\\(0x3(:2|),er1\\)" \
-	"and.b r3h,@(0x3:2,er1)"
-gdb_test "x" "and.b\tr3h,@er1\\+" \
-	"and.b r3h,@er1+"
-gdb_test "x" "and.b\tr3h,@-er1" \
-	"and.b r3h,@-er1"
-gdb_test "x" "and.b\tr3h,@\\+er1" \
-	"and.b r3h,@+er1"
-gdb_test "x" "and.b\tr3h,@er1-" \
-	"and.b r3h,@er1-"
-gdb_test "x" "and.b\tr3h,@\\(0x1234(:16|),er1\\)" \
-	"and.b r3h,@(0x1234:16,er1)"
-gdb_test "x" "and.b\tr3h,@\\(0x12345678(:32|),er1\\)" \
-	"and.b r3h,@(0x12345678:32,er1)"
-gdb_test "x" "and.b\tr3h,@\\(0x1234(:16|),r2l.b\\)" \
-	"and.b r3h,@(0x1234:16,r2l.b)"
-gdb_test "x" "and.b\tr3h,@\\(0x1234(:16|),r2.w\\)" \
-	"and.b r3h,@(0x1234:16,r2.w)"
-gdb_test "x" "and.b\tr3h,@\\(0x1234(:16|),er2.l\\)" \
-	"and.b r3h,@(0x1234:16,er2.l)"
-gdb_test "x" "and.b\tr3h,@\\(0x12345678(:32|),r2l.b\\)" \
-	"and.b r3h,@(0x12345678:32,r2l.b)"
-gdb_test "x" "and.b\tr3h,@\\(0x12345678(:32|),r2.w\\)" \
-	"and.b r3h,@(0x12345678:32,r2.w)"
-gdb_test "x" "and.b\tr3h,@\\(0x12345678(:32|),er2.l\\)" \
-	"and.b r3h,@(0x12345678:32,er2.l)"
-gdb_test "x" "and.b\tr3h,@0x12(:8|)" \
-	"and.b r3h,@0x12:8"
-gdb_test "x" "and.b\tr3h,@0x1234(:16|)" \
-	"and.b r3h,@0x1234:16"
-gdb_test "x" "and.b\tr3h,@0x12345678(:32|)" \
-	"and.b r3h,@0x12345678:32"
-gdb_test "x" "and.b\t@er3,r1h" \
-	"and.b @er3,r1h"
-gdb_test "x" "and.b\t@\\(0x3(:2|),er3\\),r1h" \
-	"and.b @(0x3:2,er3),r1h"
-gdb_test "x" "and.b\t@er3\\+,r1h" \
-	"and.b @er3+,r1h"
-gdb_test "x" "and.b\t@-er3,r1h" \
-	"and.b @-er3,r1h"
-gdb_test "x" "and.b\t@\\+er3,r1h" \
-	"and.b @+er3,r1h"
-gdb_test "x" "and.b\t@er3-,r1h" \
-	"and.b @er3-,r1h"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er1\\),r1h" \
-	"and.b @(0x1234:16,er1),r1h"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er1\\),r1h" \
-	"and.b @(0x12345678:32,er1),r1h"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r2l.b\\),r1h" \
-	"and.b @(0x1234:16,r2l.b),r1h"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r2.w\\),r1h" \
-	"and.b @(0x1234:16,r2.w),r1h"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er2.l\\),r1h" \
-	"and.b @(0x1234:16,er2.l),r1h"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r2l.b\\),r1h" \
-	"and.b @(0x12345678:32,r2l.b),r1h"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r2.w\\),r1h" \
-	"and.b @(0x12345678:32,r2.w),r1h"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er2.l\\),r1h" \
-	"and.b @(0x12345678:32,er2.l),r1h"
-gdb_test "x" "and.b\t@0x12(:8|),r1h" \
-	"and.b @0x12:8,r1h"
-gdb_test "x" "and.b\t@0x1234(:16|),r1h" \
-	"and.b @0x1234:16,r1h"
-gdb_test "x" "and.b\t@0x12345678(:32|),r1h" \
-	"and.b @0x12345678:32,r1h"
-gdb_test "x" "and.b\t@er3,@er1" \
-	"and.b @er3,@er1"
-gdb_test "x" "and.b\t@er3,@\\(0x3(:2|),er1\\)" \
-	"and.b @er3,@(0x3:2,er1)"
-gdb_test "x" "and.b\t@er3,@-er1" \
-	"and.b @er3,@-er1"
-gdb_test "x" "and.b\t@er3,@er1\\+" \
-	"and.b @er3,@er1+"
-gdb_test "x" "and.b\t@er3,@er1-" \
-	"and.b @er3,@er1-"
-gdb_test "x" "and.b\t@er3,@\\+er1" \
-	"and.b @er3,@+er1"
-gdb_test "x" "and.b\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.b @er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@er3,@0x9abc(:16|)" \
-	"and.b @er3,@0x9abc:16"
-gdb_test "x" "and.b\t@er3,@0x9abcdef0(:32|)" \
-	"and.b @er3,@0x9abcdef0:32"
-gdb_test "x" "and.b\t@-er3,@er1" \
-	"and.b @-er3,@er1"
-gdb_test "x" "and.b\t@-er3,@\\(0x3(:2|),er1\\)" \
-	"and.b @-er3,@(0x3:2,er1)"
-gdb_test "x" "and.b\t@-er3,@-er1" \
-	"and.b @-er3,@-er1"
-gdb_test "x" "and.b\t@-er3,@er1\\+" \
-	"and.b @-er3,@er1+"
-gdb_test "x" "and.b\t@-er3,@er1-" \
-	"and.b @-er3,@er1-"
-gdb_test "x" "and.b\t@-er3,@\\+er1" \
-	"and.b @-er3,@+er1"
-gdb_test "x" "and.b\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.b @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@-er3,@0x9abc(:16|)" \
-	"and.b @-er3,@0x9abc:16"
-gdb_test "x" "and.b\t@-er3,@0x9abcdef0(:32|)" \
-	"and.b @-er3,@0x9abcdef0:32"
-gdb_test "x" "and.b\t@er3\\+,@er1" \
-	"and.b @er3+,@er1"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x3(:2|),er1\\)" \
-	"and.b @er3+,@(0x3:2,er1)"
-gdb_test "x" "and.b\t@er3\\+,@-er1" \
-	"and.b @er3+,@-er1"
-gdb_test "x" "and.b\t@er3\\+,@er1\\+" \
-	"and.b @er3+,@er1+"
-gdb_test "x" "and.b\t@er3\\+,@er1-" \
-	"and.b @er3+,@er1-"
-gdb_test "x" "and.b\t@er3\\+,@\\+er1" \
-	"and.b @er3+,@+er1"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"and.b @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@er3\\+,@0x9abc(:16|)" \
-	"and.b @er3+,@0x9abc:16"
-gdb_test "x" "and.b\t@er3\\+,@0x9abcdef0(:32|)" \
-	"and.b @er3+,@0x9abcdef0:32"
-gdb_test "x" "and.b\t@er3-,@er1" \
-	"and.b @er3-,@er1"
-gdb_test "x" "and.b\t@er3-,@\\(0x3(:2|),er1\\)" \
-	"and.b @er3-,@(0x3:2,er1)"
-gdb_test "x" "and.b\t@er3-,@-er1" \
-	"and.b @er3-,@-er1"
-gdb_test "x" "and.b\t@er3-,@er1\\+" \
-	"and.b @er3-,@er1+"
-gdb_test "x" "and.b\t@er3-,@er1-" \
-	"and.b @er3-,@er1-"
-gdb_test "x" "and.b\t@er3-,@\\+er1" \
-	"and.b @er3-,@+er1"
-gdb_test "x" "and.b\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"and.b @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@er3-,@0x9abc(:16|)" \
-	"and.b @er3-,@0x9abc:16"
-gdb_test "x" "and.b\t@er3-,@0x9abcdef0(:32|)" \
-	"and.b @er3-,@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\+er3,@er1" \
-	"and.b @+er3,@er1"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x3(:2|),er1\\)" \
-	"and.b @+er3,@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\+er3,@-er1" \
-	"and.b @+er3,@-er1"
-gdb_test "x" "and.b\t@\\+er3,@er1\\+" \
-	"and.b @+er3,@er1+"
-gdb_test "x" "and.b\t@\\+er3,@er1-" \
-	"and.b @+er3,@er1-"
-gdb_test "x" "and.b\t@\\+er3,@\\+er1" \
-	"and.b @+er3,@+er1"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.b @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\+er3,@0x9abc(:16|)" \
-	"and.b @+er3,@0x9abc:16"
-gdb_test "x" "and.b\t@\\+er3,@0x9abcdef0(:32|)" \
-	"and.b @+er3,@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@er1" \
-	"and.b @(0x1234:16,er3),@er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"and.b @(0x1234:16,er3),@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"and.b @(0x1234:16,er3),@-er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"and.b @(0x1234:16,er3),@er1+"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"and.b @(0x1234:16,er3),@er1-"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"and.b @(0x1234:16,er3),@+er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"and.b @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"and.b @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"and.b @(0x12345678:32,er3),@er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x3(:2|),er1\\)" \
-	"and.b @(0x12345678:32,er3),@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"and.b @(0x12345678:32,er3),@-er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"and.b @(0x12345678:32,er3),@er1+"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"and.b @(0x12345678:32,er3),@er1-"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"and.b @(0x12345678:32,er3),@+er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"and.b @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"and.b @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"and.b @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"and.b @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"and.b @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"and.b @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"and.b @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"and.b @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"and.b @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"and.b @(0x1234:16,r3.w),@er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"and.b @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"and.b @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"and.b @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"and.b @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"and.b @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"and.b @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"and.b @(0x1234:16,er3.l),@er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"and.b @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"and.b @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"and.b @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"and.b @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"and.b @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "and.b\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"and.b @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"and.b @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x3(:2|),er1\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"and.b @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"and.b @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"and.b @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"and.b @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"and.b @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"and.b @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"and.b @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x3(:2|),er1\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"and.b @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"and.b @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"and.b @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"and.b @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"and.b @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"and.b @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"and.b @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x3(:2|),er1\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x3:2,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"and.b @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"and.b @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"and.b @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"and.b @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"and.b @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "and.b\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"and.b @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "and.b\t@0x1234(:16|),@er1" \
-	"and.b @0x1234:16,@er1"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x3(:2|),er1\\)" \
-	"and.b @0x1234:16,@(0x3:2,er1)"
-gdb_test "x" "and.b\t@0x1234(:16|),@-er1" \
-	"and.b @0x1234:16,@-er1"
-gdb_test "x" "and.b\t@0x1234(:16|),@er1\\+" \
-	"and.b @0x1234:16,@er1+"
-gdb_test "x" "and.b\t@0x1234(:16|),@er1-" \
-	"and.b @0x1234:16,@er1-"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\+er1" \
-	"and.b @0x1234:16,@+er1"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@0x1234(:16|),@0x9abc(:16|)" \
-	"and.b @0x1234:16,@0x9abc:16"
-gdb_test "x" "and.b\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"and.b @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "and.b\t@0x12345678(:32|),@er1" \
-	"and.b @0x12345678:32,@er1"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x3(:2|),er1\\)" \
-	"and.b @0x12345678:32,@(0x3:2,er1)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@-er1" \
-	"and.b @0x12345678:32,@-er1"
-gdb_test "x" "and.b\t@0x12345678(:32|),@er1\\+" \
-	"and.b @0x12345678:32,@er1+"
-gdb_test "x" "and.b\t@0x12345678(:32|),@er1-" \
-	"and.b @0x12345678:32,@er1-"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\+er1" \
-	"and.b @0x12345678:32,@+er1"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"and.b @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.b @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.b @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.b @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.b @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.b @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.b @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.b\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"and.b @0x12345678:32,@0x9abc:16"
-gdb_test "x" "and.b\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"and.b @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "and.w\t#0x1234(:16|),r1" \
-	"and.w #0x1234:16,r1"
-gdb_test "x" "and.w\t#0x1234(:16|),@er1" \
-	"and.w #0x1234:16,@er1"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"and.w #0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "and.w\t#0x1234(:16|),@er1\\+" \
-	"and.w #0x1234:16,@er1+"
-gdb_test "x" "and.w\t#0x1234(:16|),@-er1" \
-	"and.w #0x1234:16,@-er1"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\+er1" \
-	"and.w #0x1234:16,@+er1"
-gdb_test "x" "and.w\t#0x1234(:16|),@er1-" \
-	"and.w #0x1234:16,@er1-"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"and.w #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t#0x1234(:16|),@0x9abc(:16|)" \
-	"and.w #0x1234:16,@0x9abc:16"
-gdb_test "x" "and.w\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"and.w #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "and.w\tr3,r1" \
-	"and.w r3,r1"
-gdb_test "x" "and.w\tr3,@er1" \
-	"and.w r3,@er1"
-gdb_test "x" "and.w\tr3,@\\(0x6(:2|),er1\\)" \
-	"and.w r3,@(0x6:2,er1)"
-gdb_test "x" "and.w\tr3,@er1\\+" \
-	"and.w r3,@er1+"
-gdb_test "x" "and.w\tr3,@-er1" \
-	"and.w r3,@-er1"
-gdb_test "x" "and.w\tr3,@\\+er1" \
-	"and.w r3,@+er1"
-gdb_test "x" "and.w\tr3,@er1-" \
-	"and.w r3,@er1-"
-gdb_test "x" "and.w\tr3,@\\(0x1234(:16|),er1\\)" \
-	"and.w r3,@(0x1234:16,er1)"
-gdb_test "x" "and.w\tr3,@\\(0x12345678(:32|),er1\\)" \
-	"and.w r3,@(0x12345678:32,er1)"
-gdb_test "x" "and.w\tr3,@\\(0x1234(:16|),r2l.b\\)" \
-	"and.w r3,@(0x1234:16,r2l.b)"
-gdb_test "x" "and.w\tr3,@\\(0x1234(:16|),r2.w\\)" \
-	"and.w r3,@(0x1234:16,r2.w)"
-gdb_test "x" "and.w\tr3,@\\(0x1234(:16|),er2.l\\)" \
-	"and.w r3,@(0x1234:16,er2.l)"
-gdb_test "x" "and.w\tr3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"and.w r3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "and.w\tr3,@\\(0x12345678(:32|),r2.w\\)" \
-	"and.w r3,@(0x12345678:32,r2.w)"
-gdb_test "x" "and.w\tr3,@\\(0x12345678(:32|),er2.l\\)" \
-	"and.w r3,@(0x12345678:32,er2.l)"
-gdb_test "x" "and.w\tr3,@0x1234(:16|)" \
-	"and.w r3,@0x1234:16"
-gdb_test "x" "and.w\tr3,@0x12345678(:32|)" \
-	"and.w r3,@0x12345678:32"
-gdb_test "x" "and.w\t@er3,r1" \
-	"and.w @er3,r1"
-gdb_test "x" "and.w\t@\\(0x6(:2|),er3\\),r1" \
-	"and.w @(0x6:2,er3),r1"
-gdb_test "x" "and.w\t@er3\\+,r1" \
-	"and.w @er3+,r1"
-gdb_test "x" "and.w\t@-er3,r1" \
-	"and.w @-er3,r1"
-gdb_test "x" "and.w\t@\\+er3,r1" \
-	"and.w @+er3,r1"
-gdb_test "x" "and.w\t@er3-,r1" \
-	"and.w @er3-,r1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er1\\),r1" \
-	"and.w @(0x1234:16,er1),r1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er1\\),r1" \
-	"and.w @(0x12345678:32,er1),r1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r2l.b\\),r1" \
-	"and.w @(0x1234:16,r2l.b),r1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r2.w\\),r1" \
-	"and.w @(0x1234:16,r2.w),r1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er2.l\\),r1" \
-	"and.w @(0x1234:16,er2.l),r1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r2l.b\\),r1" \
-	"and.w @(0x12345678:32,r2l.b),r1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r2.w\\),r1" \
-	"and.w @(0x12345678:32,r2.w),r1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er2.l\\),r1" \
-	"and.w @(0x12345678:32,er2.l),r1"
-gdb_test "x" "and.w\t@0x1234(:16|),r1" \
-	"and.w @0x1234:16,r1"
-gdb_test "x" "and.w\t@0x12345678(:32|),r1" \
-	"and.w @0x12345678:32,r1"
-gdb_test "x" "and.w\t@er3,@er1" \
-	"and.w @er3,@er1"
-gdb_test "x" "and.w\t@er3,@\\(0x6(:2|),er1\\)" \
-	"and.w @er3,@(0x6:2,er1)"
-gdb_test "x" "and.w\t@er3,@-er1" \
-	"and.w @er3,@-er1"
-gdb_test "x" "and.w\t@er3,@er1\\+" \
-	"and.w @er3,@er1+"
-gdb_test "x" "and.w\t@er3,@er1-" \
-	"and.w @er3,@er1-"
-gdb_test "x" "and.w\t@er3,@\\+er1" \
-	"and.w @er3,@+er1"
-gdb_test "x" "and.w\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.w @er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@er3,@0x9abc(:16|)" \
-	"and.w @er3,@0x9abc:16"
-gdb_test "x" "and.w\t@er3,@0x9abcdef0(:32|)" \
-	"and.w @er3,@0x9abcdef0:32"
-gdb_test "x" "and.w\t@-er3,@er1" \
-	"and.w @-er3,@er1"
-gdb_test "x" "and.w\t@-er3,@\\(0x6(:2|),er1\\)" \
-	"and.w @-er3,@(0x6:2,er1)"
-gdb_test "x" "and.w\t@-er3,@-er1" \
-	"and.w @-er3,@-er1"
-gdb_test "x" "and.w\t@-er3,@er1\\+" \
-	"and.w @-er3,@er1+"
-gdb_test "x" "and.w\t@-er3,@er1-" \
-	"and.w @-er3,@er1-"
-gdb_test "x" "and.w\t@-er3,@\\+er1" \
-	"and.w @-er3,@+er1"
-gdb_test "x" "and.w\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.w @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@-er3,@0x9abc(:16|)" \
-	"and.w @-er3,@0x9abc:16"
-gdb_test "x" "and.w\t@-er3,@0x9abcdef0(:32|)" \
-	"and.w @-er3,@0x9abcdef0:32"
-gdb_test "x" "and.w\t@er3\\+,@er1" \
-	"and.w @er3+,@er1"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x6(:2|),er1\\)" \
-	"and.w @er3+,@(0x6:2,er1)"
-gdb_test "x" "and.w\t@er3\\+,@-er1" \
-	"and.w @er3+,@-er1"
-gdb_test "x" "and.w\t@er3\\+,@er1\\+" \
-	"and.w @er3+,@er1+"
-gdb_test "x" "and.w\t@er3\\+,@er1-" \
-	"and.w @er3+,@er1-"
-gdb_test "x" "and.w\t@er3\\+,@\\+er1" \
-	"and.w @er3+,@+er1"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"and.w @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@er3\\+,@0x9abc(:16|)" \
-	"and.w @er3+,@0x9abc:16"
-gdb_test "x" "and.w\t@er3\\+,@0x9abcdef0(:32|)" \
-	"and.w @er3+,@0x9abcdef0:32"
-gdb_test "x" "and.w\t@er3-,@er1" \
-	"and.w @er3-,@er1"
-gdb_test "x" "and.w\t@er3-,@\\(0x6(:2|),er1\\)" \
-	"and.w @er3-,@(0x6:2,er1)"
-gdb_test "x" "and.w\t@er3-,@-er1" \
-	"and.w @er3-,@-er1"
-gdb_test "x" "and.w\t@er3-,@er1\\+" \
-	"and.w @er3-,@er1+"
-gdb_test "x" "and.w\t@er3-,@er1-" \
-	"and.w @er3-,@er1-"
-gdb_test "x" "and.w\t@er3-,@\\+er1" \
-	"and.w @er3-,@+er1"
-gdb_test "x" "and.w\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"and.w @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@er3-,@0x9abc(:16|)" \
-	"and.w @er3-,@0x9abc:16"
-gdb_test "x" "and.w\t@er3-,@0x9abcdef0(:32|)" \
-	"and.w @er3-,@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\+er3,@er1" \
-	"and.w @+er3,@er1"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x6(:2|),er1\\)" \
-	"and.w @+er3,@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\+er3,@-er1" \
-	"and.w @+er3,@-er1"
-gdb_test "x" "and.w\t@\\+er3,@er1\\+" \
-	"and.w @+er3,@er1+"
-gdb_test "x" "and.w\t@\\+er3,@er1-" \
-	"and.w @+er3,@er1-"
-gdb_test "x" "and.w\t@\\+er3,@\\+er1" \
-	"and.w @+er3,@+er1"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.w @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\+er3,@0x9abc(:16|)" \
-	"and.w @+er3,@0x9abc:16"
-gdb_test "x" "and.w\t@\\+er3,@0x9abcdef0(:32|)" \
-	"and.w @+er3,@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@er1" \
-	"and.w @(0x1234:16,er3),@er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"and.w @(0x1234:16,er3),@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"and.w @(0x1234:16,er3),@-er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"and.w @(0x1234:16,er3),@er1+"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"and.w @(0x1234:16,er3),@er1-"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"and.w @(0x1234:16,er3),@+er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"and.w @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"and.w @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"and.w @(0x12345678:32,er3),@er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x6(:2|),er1\\)" \
-	"and.w @(0x12345678:32,er3),@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"and.w @(0x12345678:32,er3),@-er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"and.w @(0x12345678:32,er3),@er1+"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"and.w @(0x12345678:32,er3),@er1-"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"and.w @(0x12345678:32,er3),@+er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"and.w @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"and.w @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"and.w @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"and.w @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"and.w @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"and.w @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"and.w @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"and.w @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"and.w @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"and.w @(0x1234:16,r3.w),@er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"and.w @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"and.w @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"and.w @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"and.w @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"and.w @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"and.w @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"and.w @(0x1234:16,er3.l),@er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"and.w @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"and.w @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"and.w @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"and.w @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"and.w @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "and.w\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"and.w @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"and.w @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x6(:2|),er1\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"and.w @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"and.w @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"and.w @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"and.w @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"and.w @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"and.w @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"and.w @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x6(:2|),er1\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"and.w @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"and.w @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"and.w @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"and.w @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"and.w @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"and.w @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"and.w @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x6(:2|),er1\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x6:2,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"and.w @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"and.w @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"and.w @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"and.w @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"and.w @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "and.w\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"and.w @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "and.w\t@0x1234(:16|),@er1" \
-	"and.w @0x1234:16,@er1"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x6(:2|),er1\\)" \
-	"and.w @0x1234:16,@(0x6:2,er1)"
-gdb_test "x" "and.w\t@0x1234(:16|),@-er1" \
-	"and.w @0x1234:16,@-er1"
-gdb_test "x" "and.w\t@0x1234(:16|),@er1\\+" \
-	"and.w @0x1234:16,@er1+"
-gdb_test "x" "and.w\t@0x1234(:16|),@er1-" \
-	"and.w @0x1234:16,@er1-"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\+er1" \
-	"and.w @0x1234:16,@+er1"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@0x1234(:16|),@0x9abc(:16|)" \
-	"and.w @0x1234:16,@0x9abc:16"
-gdb_test "x" "and.w\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"and.w @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "and.w\t@0x12345678(:32|),@er1" \
-	"and.w @0x12345678:32,@er1"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x6(:2|),er1\\)" \
-	"and.w @0x12345678:32,@(0x6:2,er1)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@-er1" \
-	"and.w @0x12345678:32,@-er1"
-gdb_test "x" "and.w\t@0x12345678(:32|),@er1\\+" \
-	"and.w @0x12345678:32,@er1+"
-gdb_test "x" "and.w\t@0x12345678(:32|),@er1-" \
-	"and.w @0x12345678:32,@er1-"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\+er1" \
-	"and.w @0x12345678:32,@+er1"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"and.w @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.w @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.w @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.w @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.w @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.w @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.w @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.w\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"and.w @0x12345678:32,@0x9abc:16"
-gdb_test "x" "and.w\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"and.w @0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "and.l\t#0x12345678(:32|),er1" \
-	"and.l #0x12345678:32,er1"
-gdb_test "x" "and.l\t#0x1234(:16|),er1" \
-	"and.l #0x1234:16,er1"
-gdb_test "x" "and.l\t#0x12345678(:32|),@er1" \
-	"and.l #0x12345678:32,@er1"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"and.l #0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@er1\\+" \
-	"and.l #0x12345678:32,@er1+"
-gdb_test "x" "and.l\t#0x12345678(:32|),@-er1" \
-	"and.l #0x12345678:32,@-er1"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\+er1" \
-	"and.l #0x12345678:32,@+er1"
-gdb_test "x" "and.l\t#0x12345678(:32|),@er1-" \
-	"and.l #0x12345678:32,@er1-"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"and.l #0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l #0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l #0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l #0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l #0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l #0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l #0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l #0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t#0x12345678(:32|),@0x9abc(:16|)" \
-	"and.l #0x12345678:32,@0x9abc:16"
-gdb_test "x" "and.l\t#0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"and.l #0x12345678:32,@0x9abcdef0:32"
-gdb_test "x" "and.l\t#0x1234(:16|),@er1" \
-	"and.l #0x1234:16,@er1"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"and.l #0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "and.l\t#0x1234(:16|),@er1\\+" \
-	"and.l #0x1234:16,@er1+"
-gdb_test "x" "and.l\t#0x1234(:16|),@-er1" \
-	"and.l #0x1234:16,@-er1"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\+er1" \
-	"and.l #0x1234:16,@+er1"
-gdb_test "x" "and.l\t#0x1234(:16|),@er1-" \
-	"and.l #0x1234:16,@er1-"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"and.l #0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l #0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l #0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l #0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l #0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l #0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l #0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t#0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l #0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t#0x1234(:16|),@0x9abc(:16|)" \
-	"and.l #0x1234:16,@0x9abc:16"
-gdb_test "x" "and.l\t#0x1234(:16|),@0x9abcdef0(:32|)" \
-	"and.l #0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "and.l\ter3,er1" \
-	"and.l er3,er1"
-gdb_test "x" "and.l\ter3,@er1" \
-	"and.l er3,@er1"
-gdb_test "x" "and.l\ter3,@\\(0xc(:2|),er1\\)" \
-	"and.l er3,@(0xc:2,er1)"
-gdb_test "x" "and.l\ter3,@er1\\+" \
-	"and.l er3,@er1+"
-gdb_test "x" "and.l\ter3,@-er1" \
-	"and.l er3,@-er1"
-gdb_test "x" "and.l\ter3,@\\+er1" \
-	"and.l er3,@+er1"
-gdb_test "x" "and.l\ter3,@er1-" \
-	"and.l er3,@er1-"
-gdb_test "x" "and.l\ter3,@\\(0x1234(:16|),er1\\)" \
-	"and.l er3,@(0x1234:16,er1)"
-gdb_test "x" "and.l\ter3,@\\(0x12345678(:32|),er1\\)" \
-	"and.l er3,@(0x12345678:32,er1)"
-gdb_test "x" "and.l\ter3,@\\(0x1234(:16|),r2l.b\\)" \
-	"and.l er3,@(0x1234:16,r2l.b)"
-gdb_test "x" "and.l\ter3,@\\(0x1234(:16|),r2.w\\)" \
-	"and.l er3,@(0x1234:16,r2.w)"
-gdb_test "x" "and.l\ter3,@\\(0x1234(:16|),er2.l\\)" \
-	"and.l er3,@(0x1234:16,er2.l)"
-gdb_test "x" "and.l\ter3,@\\(0x12345678(:32|),r2l.b\\)" \
-	"and.l er3,@(0x12345678:32,r2l.b)"
-gdb_test "x" "and.l\ter3,@\\(0x12345678(:32|),r2.w\\)" \
-	"and.l er3,@(0x12345678:32,r2.w)"
-gdb_test "x" "and.l\ter3,@\\(0x12345678(:32|),er2.l\\)" \
-	"and.l er3,@(0x12345678:32,er2.l)"
-gdb_test "x" "and.l\ter3,@0x1234(:16|)" \
-	"and.l er3,@0x1234:16"
-gdb_test "x" "and.l\ter3,@0x12345678(:32|)" \
-	"and.l er3,@0x12345678:32"
-gdb_test "x" "and.l\t@er3,er1" \
-	"and.l @er3,er1"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),er1" \
-	"and.l @(0xc:2,er3),er1"
-gdb_test "x" "and.l\t@er3\\+,er1" \
-	"and.l @er3+,er1"
-gdb_test "x" "and.l\t@-er3,er1" \
-	"and.l @-er3,er1"
-gdb_test "x" "and.l\t@\\+er3,er1" \
-	"and.l @+er3,er1"
-gdb_test "x" "and.l\t@er3-,er1" \
-	"and.l @er3-,er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er1\\),er1" \
-	"and.l @(0x1234:16,er1),er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er1\\),er1" \
-	"and.l @(0x12345678:32,er1),er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r2l.b\\),er1" \
-	"and.l @(0x1234:16,r2l.b),er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r2.w\\),er1" \
-	"and.l @(0x1234:16,r2.w),er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er2.l\\),er1" \
-	"and.l @(0x1234:16,er2.l),er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r2l.b\\),er1" \
-	"and.l @(0x12345678:32,r2l.b),er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r2.w\\),er1" \
-	"and.l @(0x12345678:32,r2.w),er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er2.l\\),er1" \
-	"and.l @(0x12345678:32,er2.l),er1"
-gdb_test "x" "and.l\t@0x1234(:16|),er1" \
-	"and.l @0x1234:16,er1"
-gdb_test "x" "and.l\t@0x12345678(:32|),er1" \
-	"and.l @0x12345678:32,er1"
-gdb_test "x" "and.l\t@er3,@er1" \
-	"and.l @er3,@er1"
-gdb_test "x" "and.l\t@er3,@\\(0xc(:2|),er1\\)" \
-	"and.l @er3,@(0xc:2,er1)"
-gdb_test "x" "and.l\t@er3,@-er1" \
-	"and.l @er3,@-er1"
-gdb_test "x" "and.l\t@er3,@er1\\+" \
-	"and.l @er3,@er1+"
-gdb_test "x" "and.l\t@er3,@er1-" \
-	"and.l @er3,@er1-"
-gdb_test "x" "and.l\t@er3,@\\+er1" \
-	"and.l @er3,@+er1"
-gdb_test "x" "and.l\t@er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.l @er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@er3,@0x9abc(:16|)" \
-	"and.l @er3,@0x9abc:16"
-gdb_test "x" "and.l\t@er3,@0x9abcdef0(:32|)" \
-	"and.l @er3,@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@er1" \
-	"and.l @(0xc:2,er3),@er1"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0xc:2,er3),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@-er1" \
-	"and.l @(0xc:2,er3),@-er1"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@er1\\+" \
-	"and.l @(0xc:2,er3),@er1+"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@er1-" \
-	"and.l @(0xc:2,er3),@er1-"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\+er1" \
-	"and.l @(0xc:2,er3),@+er1"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0xc:2,er3),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0xc:2,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0xc:2,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0xc:2,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0xc:2,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@0x9abc(:16|)" \
-	"and.l @(0xc:2,er3),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0xc(:2|),er3\\),@0x9abcdef0(:32|)" \
-	"and.l @(0xc:2,er3),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@-er3,@er1" \
-	"and.l @-er3,@er1"
-gdb_test "x" "and.l\t@-er3,@\\(0xc(:2|),er1\\)" \
-	"and.l @-er3,@(0xc:2,er1)"
-gdb_test "x" "and.l\t@-er3,@-er1" \
-	"and.l @-er3,@-er1"
-gdb_test "x" "and.l\t@-er3,@er1\\+" \
-	"and.l @-er3,@er1+"
-gdb_test "x" "and.l\t@-er3,@er1-" \
-	"and.l @-er3,@er1-"
-gdb_test "x" "and.l\t@-er3,@\\+er1" \
-	"and.l @-er3,@+er1"
-gdb_test "x" "and.l\t@-er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.l @-er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@-er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @-er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@-er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @-er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@-er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @-er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@-er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @-er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@-er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @-er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@-er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @-er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@-er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @-er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@-er3,@0x9abc(:16|)" \
-	"and.l @-er3,@0x9abc:16"
-gdb_test "x" "and.l\t@-er3,@0x9abcdef0(:32|)" \
-	"and.l @-er3,@0x9abcdef0:32"
-gdb_test "x" "and.l\t@er3\\+,@er1" \
-	"and.l @er3+,@er1"
-gdb_test "x" "and.l\t@er3\\+,@\\(0xc(:2|),er1\\)" \
-	"and.l @er3+,@(0xc:2,er1)"
-gdb_test "x" "and.l\t@er3\\+,@-er1" \
-	"and.l @er3+,@-er1"
-gdb_test "x" "and.l\t@er3\\+,@er1\\+" \
-	"and.l @er3+,@er1+"
-gdb_test "x" "and.l\t@er3\\+,@er1-" \
-	"and.l @er3+,@er1-"
-gdb_test "x" "and.l\t@er3\\+,@\\+er1" \
-	"and.l @er3+,@+er1"
-gdb_test "x" "and.l\t@er3\\+,@\\(0x9abc(:16|),er1\\)" \
-	"and.l @er3+,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@er3\\+,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @er3+,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@er3\\+,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @er3+,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@er3\\+,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @er3+,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@er3\\+,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @er3+,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @er3+,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@er3\\+,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @er3+,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@er3\\+,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @er3+,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@er3\\+,@0x9abc(:16|)" \
-	"and.l @er3+,@0x9abc:16"
-gdb_test "x" "and.l\t@er3\\+,@0x9abcdef0(:32|)" \
-	"and.l @er3+,@0x9abcdef0:32"
-gdb_test "x" "and.l\t@er3-,@er1" \
-	"and.l @er3-,@er1"
-gdb_test "x" "and.l\t@er3-,@\\(0xc(:2|),er1\\)" \
-	"and.l @er3-,@(0xc:2,er1)"
-gdb_test "x" "and.l\t@er3-,@-er1" \
-	"and.l @er3-,@-er1"
-gdb_test "x" "and.l\t@er3-,@er1\\+" \
-	"and.l @er3-,@er1+"
-gdb_test "x" "and.l\t@er3-,@er1-" \
-	"and.l @er3-,@er1-"
-gdb_test "x" "and.l\t@er3-,@\\+er1" \
-	"and.l @er3-,@+er1"
-gdb_test "x" "and.l\t@er3-,@\\(0x9abc(:16|),er1\\)" \
-	"and.l @er3-,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@er3-,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @er3-,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@er3-,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @er3-,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@er3-,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @er3-,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@er3-,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @er3-,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@er3-,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @er3-,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@er3-,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @er3-,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@er3-,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @er3-,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@er3-,@0x9abc(:16|)" \
-	"and.l @er3-,@0x9abc:16"
-gdb_test "x" "and.l\t@er3-,@0x9abcdef0(:32|)" \
-	"and.l @er3-,@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\+er3,@er1" \
-	"and.l @+er3,@er1"
-gdb_test "x" "and.l\t@\\+er3,@\\(0xc(:2|),er1\\)" \
-	"and.l @+er3,@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\+er3,@-er1" \
-	"and.l @+er3,@-er1"
-gdb_test "x" "and.l\t@\\+er3,@er1\\+" \
-	"and.l @+er3,@er1+"
-gdb_test "x" "and.l\t@\\+er3,@er1-" \
-	"and.l @+er3,@er1-"
-gdb_test "x" "and.l\t@\\+er3,@\\+er1" \
-	"and.l @+er3,@+er1"
-gdb_test "x" "and.l\t@\\+er3,@\\(0x9abc(:16|),er1\\)" \
-	"and.l @+er3,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\+er3,@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @+er3,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\+er3,@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @+er3,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\+er3,@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @+er3,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\+er3,@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @+er3,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @+er3,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\+er3,@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @+er3,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\+er3,@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @+er3,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\+er3,@0x9abc(:16|)" \
-	"and.l @+er3,@0x9abc:16"
-gdb_test "x" "and.l\t@\\+er3,@0x9abcdef0(:32|)" \
-	"and.l @+er3,@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@er1" \
-	"and.l @(0x1234:16,er3),@er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0x1234:16,er3),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@-er1" \
-	"and.l @(0x1234:16,er3),@-er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@er1\\+" \
-	"and.l @(0x1234:16,er3),@er1+"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@er1-" \
-	"and.l @(0x1234:16,er3),@er1-"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\+er1" \
-	"and.l @(0x1234:16,er3),@+er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0x1234:16,er3),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0x1234:16,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0x1234:16,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0x1234:16,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@0x9abc(:16|)" \
-	"and.l @(0x1234:16,er3),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3\\),@0x9abcdef0(:32|)" \
-	"and.l @(0x1234:16,er3),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@er1" \
-	"and.l @(0x12345678:32,er3),@er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0x12345678:32,er3),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@-er1" \
-	"and.l @(0x12345678:32,er3),@-er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@er1\\+" \
-	"and.l @(0x12345678:32,er3),@er1+"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@er1-" \
-	"and.l @(0x12345678:32,er3),@er1-"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\+er1" \
-	"and.l @(0x12345678:32,er3),@+er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0x12345678:32,er3),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0x12345678:32,er3),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0x12345678:32,er3),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0x12345678:32,er3),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@0x9abc(:16|)" \
-	"and.l @(0x12345678:32,er3),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3\\),@0x9abcdef0(:32|)" \
-	"and.l @(0x12345678:32,er3),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@er1" \
-	"and.l @(0x1234:16,r3l.b),@er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@-er1" \
-	"and.l @(0x1234:16,r3l.b),@-er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@er1\\+" \
-	"and.l @(0x1234:16,r3l.b),@er1+"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@er1-" \
-	"and.l @(0x1234:16,r3l.b),@er1-"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\+er1" \
-	"and.l @(0x1234:16,r3l.b),@+er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abc(:16|)" \
-	"and.l @(0x1234:16,r3l.b),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"and.l @(0x1234:16,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@er1" \
-	"and.l @(0x1234:16,r3.w),@er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0x1234:16,r3.w),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@-er1" \
-	"and.l @(0x1234:16,r3.w),@-er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@er1\\+" \
-	"and.l @(0x1234:16,r3.w),@er1+"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@er1-" \
-	"and.l @(0x1234:16,r3.w),@er1-"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\+er1" \
-	"and.l @(0x1234:16,r3.w),@+er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0x1234:16,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0x1234:16,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0x1234:16,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0x1234:16,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@0x9abc(:16|)" \
-	"and.l @(0x1234:16,r3.w),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),r3.w\\),@0x9abcdef0(:32|)" \
-	"and.l @(0x1234:16,r3.w),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@er1" \
-	"and.l @(0x1234:16,er3.l),@er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0x1234:16,er3.l),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@-er1" \
-	"and.l @(0x1234:16,er3.l),@-er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@er1\\+" \
-	"and.l @(0x1234:16,er3.l),@er1+"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@er1-" \
-	"and.l @(0x1234:16,er3.l),@er1-"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\+er1" \
-	"and.l @(0x1234:16,er3.l),@+er1"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0x1234:16,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0x1234:16,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0x1234:16,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0x1234:16,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@0x9abc(:16|)" \
-	"and.l @(0x1234:16,er3.l),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0x1234(:16|),er3.l\\),@0x9abcdef0(:32|)" \
-	"and.l @(0x1234:16,er3.l),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@er1" \
-	"and.l @(0x12345678:32,r3l.b),@er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@-er1" \
-	"and.l @(0x12345678:32,r3l.b),@-er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@er1\\+" \
-	"and.l @(0x12345678:32,r3l.b),@er1+"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@er1-" \
-	"and.l @(0x12345678:32,r3l.b),@er1-"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\+er1" \
-	"and.l @(0x12345678:32,r3l.b),@+er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abc(:16|)" \
-	"and.l @(0x12345678:32,r3l.b),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3l.b\\),@0x9abcdef0(:32|)" \
-	"and.l @(0x12345678:32,r3l.b),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@er1" \
-	"and.l @(0x12345678:32,r3.w),@er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@-er1" \
-	"and.l @(0x12345678:32,r3.w),@-er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@er1\\+" \
-	"and.l @(0x12345678:32,r3.w),@er1+"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@er1-" \
-	"and.l @(0x12345678:32,r3.w),@er1-"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\+er1" \
-	"and.l @(0x12345678:32,r3.w),@+er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abc(:16|)" \
-	"and.l @(0x12345678:32,r3.w),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),r3.w\\),@0x9abcdef0(:32|)" \
-	"and.l @(0x12345678:32,r3.w),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@er1" \
-	"and.l @(0x12345678:32,er3.l),@er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0xc(:2|),er1\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0xc:2,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@-er1" \
-	"and.l @(0x12345678:32,er3.l),@-er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@er1\\+" \
-	"and.l @(0x12345678:32,er3.l),@er1+"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@er1-" \
-	"and.l @(0x12345678:32,er3.l),@er1-"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\+er1" \
-	"and.l @(0x12345678:32,er3.l),@+er1"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abc(:16|)" \
-	"and.l @(0x12345678:32,er3.l),@0x9abc:16"
-gdb_test "x" "and.l\t@\\(0x12345678(:32|),er3.l\\),@0x9abcdef0(:32|)" \
-	"and.l @(0x12345678:32,er3.l),@0x9abcdef0:32"
-gdb_test "x" "and.l\t@0x1234(:16|),@er1" \
-	"and.l @0x1234:16,@er1"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0xc(:2|),er1\\)" \
-	"and.l @0x1234:16,@(0xc:2,er1)"
-gdb_test "x" "and.l\t@0x1234(:16|),@-er1" \
-	"and.l @0x1234:16,@-er1"
-gdb_test "x" "and.l\t@0x1234(:16|),@er1\\+" \
-	"and.l @0x1234:16,@er1+"
-gdb_test "x" "and.l\t@0x1234(:16|),@er1-" \
-	"and.l @0x1234:16,@er1-"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\+er1" \
-	"and.l @0x1234:16,@+er1"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @0x1234:16,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @0x1234:16,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @0x1234:16,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @0x1234:16,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @0x1234:16,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @0x1234:16,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @0x1234:16,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@0x1234(:16|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @0x1234:16,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@0x1234(:16|),@0x9abc(:16|)" \
-	"and.l @0x1234:16,@0x9abc:16"
-gdb_test "x" "and.l\t@0x1234(:16|),@0x9abcdef0(:32|)" \
-	"and.l @0x1234:16,@0x9abcdef0:32"
-gdb_test "x" "and.l\t@0x12345678(:32|),@er1" \
-	"and.l @0x12345678:32,@er1"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0xc(:2|),er1\\)" \
-	"and.l @0x12345678:32,@(0xc:2,er1)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@-er1" \
-	"and.l @0x12345678:32,@-er1"
-gdb_test "x" "and.l\t@0x12345678(:32|),@er1\\+" \
-	"and.l @0x12345678:32,@er1+"
-gdb_test "x" "and.l\t@0x12345678(:32|),@er1-" \
-	"and.l @0x12345678:32,@er1-"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\+er1" \
-	"and.l @0x12345678:32,@+er1"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er1\\)" \
-	"and.l @0x12345678:32,@(0x9abc:16,er1)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er1\\)" \
-	"and.l @0x12345678:32,@(0x9abcdef0:32,er1)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2l.b\\)" \
-	"and.l @0x12345678:32,@(0x9abc:16,r2l.b)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0x9abc(:16|),r2.w\\)" \
-	"and.l @0x12345678:32,@(0x9abc:16,r2.w)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0x9abc(:16|),er2.l\\)" \
-	"and.l @0x12345678:32,@(0x9abc:16,er2.l)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2l.b\\)" \
-	"and.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),r2.w\\)" \
-	"and.l @0x12345678:32,@(0x9abcdef0:32,r2.w)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@\\(0x9abcdef0(:32|),er2.l\\)" \
-	"and.l @0x12345678:32,@(0x9abcdef0:32,er2.l)"
-gdb_test "x" "and.l\t@0x12345678(:32|),@0x9abc(:16|)" \
-	"and.l @0x12345678:32,@0x9abc:16"
-gdb_test "x" "and.l\t@0x12345678(:32|),@0x9abcdef0(:32|)" \
-	"and.l @0x12345678:32,@0x9abcdef0:32"
diff --git a/gdb/testsuite/gdb.disasm/t10_and.s b/gdb/testsuite/gdb.disasm/t10_and.s
deleted file mode 100644
index 63ce383d325..00000000000
--- a/gdb/testsuite/gdb.disasm/t10_and.s
+++ /dev/null
@@ -1,972 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;log_1

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    and.b #0x12:8,r1h            ;e112

-    and.b #0x12:8,@er1          ;7d10e012

-    and.b #0x12:8,@(0x3:2,er1)    ;01776818e012

-    and.b #0x12:8,@er1+         ;01746c18e012

-    and.b #0x12:8,@-er1         ;01776c18e012

-    and.b #0x12:8,@+er1         ;01756c18e012

-    and.b #0x12:8,@er1-         ;01766c18e012

-    and.b #0x12:8,@(0x1234:16,er1)   ;01746e181234e012

-    and.b #0x12:8,@(0x12345678:32,er1)   ;78146a2812345678e012

-    and.b #0x12:8,@(0x1234:16,r2l.b) ;01756e281234e012

-    and.b #0x12:8,@(0x1234:16,r2.w) ;01766e281234e012

-    and.b #0x12:8,@(0x1234:16,er2.l) ;01776e281234e012

-    and.b #0x12:8,@(0x12345678:32,r2l.b) ;78256a2812345678e012

-    and.b #0x12:8,@(0x12345678:32,r2.w) ;78266a2812345678e012

-    and.b #0x12:8,@(0x12345678:32,er2.l) ;78276a2812345678e012

-    and.b #0x12:8,@0xffffff12:8         ;7f12e012

-    and.b #0x12:8,@0x1234:16        ;6a181234e012

-    and.b #0x12:8,@0x12345678:32        ;6a3812345678e012

-

-    and.b r3h,r1h              ;1631

-

-    and.b r3h,@er1            ;7d101630

-    and.b r3h,@(0x3:2,er1)      ;01793163

-    and.b r3h,@er1+           ;01798163

-    and.b r3h,@-er1           ;0179b163

-    and.b r3h,@+er1           ;01799163

-    and.b r3h,@er1-           ;0179a163

-    and.b r3h,@(0x1234:16,er1)     ;0179c1631234

-    and.b r3h,@(0x12345678:32,er1)     ;0179c96312345678

-    and.b r3h,@(0x1234:16,r2l.b)   ;0179d2631234

-    and.b r3h,@(0x1234:16,r2.w)   ;0179e2631234

-    and.b r3h,@(0x1234:16,er2.l)   ;0179f2631234

-    and.b r3h,@(0x12345678:32,r2l.b)   ;0179da6312345678

-    and.b r3h,@(0x12345678:32,r2.w)   ;0179ea6312345678

-    and.b r3h,@(0x12345678:32,er2.l)   ;0179fa6312345678

-    and.b r3h,@0xffffff12:8           ;7f121630

-    and.b r3h,@0x1234:16          ;6a1812341630

-    and.b r3h,@0x12345678:32           ;6a38123456781630

-

-    and.b @er3,r1h            ;7c301601

-    and.b @(0x3:2,er3),r1h     ;017a3361

-    and.b @er3+,r1h          ;017a8361

-    and.b @-er3,r1h          ;017ab361

-    and.b @+er3,r1h          ;017a9361

-    and.b @er3-,r1h          ;017aa361

-    and.b @(0x1234:16,er1),r1h     ;017ac1611234

-    and.b @(0x12345678:32,er1),r1h     ;017ac96112345678

-    and.b @(0x1234:16,r2l.b),r1h   ;017ad2611234

-    and.b @(0x1234:16,r2.w),r1h   ;017ae2611234

-    and.b @(0x1234:16,er2.l),r1h   ;017af2611234

-    and.b @(0x12345678:32,r2l.b),r1h   ;017ada6112345678

-    and.b @(0x12345678:32,r2.w),r1h   ;017aea6112345678

-    and.b @(0x12345678:32,er2.l),r1h   ;017afa6112345678

-    and.b @0xffffff12:8,r1h           ;7e121601

-    and.b @0x1234:16,r1h          ;6a1012341601

-    and.b @0x12345678:32,r1h          ;6a30123456781601

-

-    and.b @er3,@er1                                ;7c350160

-    and.b @er3,@(3:2,er1)                          ;7c353160

-    and.b @er3,@-er1                               ;7c35b160

-    and.b @er3,@er1+                               ;7c358160

-    and.b @er3,@er1-                               ;7c35a160

-    and.b @er3,@+er1                               ;7c359160

-    and.b @er3,@(0xffff9abc:16,er1)                ;7c35c1609abc

-    and.b @er3,@(0x9abcdef0:32,er1)                ;7c35c9609abcdef0

-    and.b @er3,@(0xffff9abc:16,r2l.b)              ;7c35d2609abc

-    and.b @er3,@(0xffff9abc:16,r2.w)              ;7c35e2609abc

-    and.b @er3,@(0xffff9abc:16,er2.l)              ;7c35f2609abc

-    and.b @er3,@(0x9abcdef0:32,r2l.b)              ;7c35da609abcdef0

-    and.b @er3,@(0x9abcdef0:32,r2.w)              ;7c35ea609abcdef0

-    and.b @er3,@(0x9abcdef0:32,er2.l)              ;7c35fa609abcdef0

-    and.b @er3,@0xffff9abc:16                      ;7c3540609abc

-    and.b @er3,@0x9abcdef0:32                      ;7c3548609abcdef0

-

-    and.b @-er3,@er1                               ;01776c3c0160

-    and.b @-er3,@(3:2,er1)                         ;01776c3c3160

-    and.b @-er3,@-er1                              ;01776c3cb160

-    and.b @-er3,@er1+                              ;01776c3c8160

-    and.b @-er3,@er1-                              ;01776c3ca160

-    and.b @-er3,@+er1                              ;01776c3c9160

-    and.b @-er3,@(0xffff9abc:16,er1)               ;01776c3cc1609abc

-    and.b @-er3,@(0x9abcdef0:32,er1)               ;01776c3cc9609abcdef0

-    and.b @-er3,@(0xffff9abc:16,r2l.b)             ;01776c3cd2609abc

-    and.b @-er3,@(0xffff9abc:16,r2.w)             ;01776c3ce2609abc

-    and.b @-er3,@(0xffff9abc:16,er2.l)             ;01776c3cf2609abc

-    and.b @-er3,@(0x9abcdef0:32,r2l.b)             ;01776c3cda609abcdef0

-    and.b @-er3,@(0x9abcdef0:32,r2.w)             ;01776c3cea609abcdef0

-    and.b @-er3,@(0x9abcdef0:32,er2.l)             ;01776c3cfa609abcdef0

-    and.b @-er3,@0xffff9abc:16                     ;01776c3c40609abc

-    and.b @-er3,@0x9abcdef0:32                     ;01776c3c48609abcdef0

-

-    and.b @er3+,@er1                               ;01746c3c0160

-    and.b @er3+,@(3:2,er1)                         ;01746c3c3160

-    and.b @er3+,@-er1                              ;01746c3cb160

-    and.b @er3+,@er1+                              ;01746c3c8160

-    and.b @er3+,@er1-                              ;01746c3ca160

-    and.b @er3+,@+er1                              ;01746c3c9160

-    and.b @er3+,@(0xffff9abc:16,er1)               ;01746c3cc1609abc

-    and.b @er3+,@(0x9abcdef0:32,er1)               ;01746c3cc9609abcdef0

-    and.b @er3+,@(0xffff9abc:16,r2l.b)             ;01746c3cd2609abc

-    and.b @er3+,@(0xffff9abc:16,r2.w)             ;01746c3ce2609abc

-    and.b @er3+,@(0xffff9abc:16,er2.l)             ;01746c3cf2609abc

-    and.b @er3+,@(0x9abcdef0:32,r2l.b)             ;01746c3cda609abcdef0

-    and.b @er3+,@(0x9abcdef0:32,r2.w)             ;01746c3cea609abcdef0

-    and.b @er3+,@(0x9abcdef0:32,er2.l)             ;01746c3cfa609abcdef0

-    and.b @er3+,@0xffff9abc:16                     ;01746c3c40609abc

-    and.b @er3+,@0x9abcdef0:32                     ;01746c3c48609abcdef0

-

-    and.b @er3-,@er1                               ;01766c3c0160

-    and.b @er3-,@(3:2,er1)                         ;01766c3c3160

-    and.b @er3-,@-er1                              ;01766c3cb160

-    and.b @er3-,@er1+                              ;01766c3c8160

-    and.b @er3-,@er1-                              ;01766c3ca160

-    and.b @er3-,@+er1                              ;01766c3c9160

-    and.b @er3-,@(0xffff9abc:16,er1)               ;01766c3cc1609abc

-    and.b @er3-,@(0x9abcdef0:32,er1)               ;01766c3cc9609abcdef0

-    and.b @er3-,@(0xffff9abc:16,r2l.b)             ;01766c3cd2609abc

-    and.b @er3-,@(0xffff9abc:16,r2.w)             ;01766c3ce2609abc

-    and.b @er3-,@(0xffff9abc:16,er2.l)             ;01766c3cf2609abc

-    and.b @er3-,@(0x9abcdef0:32,r2l.b)             ;01766c3cda609abcdef0

-    and.b @er3-,@(0x9abcdef0:32,r2.w)             ;01766c3cea609abcdef0

-    and.b @er3-,@(0x9abcdef0:32,er2.l)             ;01766c3cfa609abcdef0

-    and.b @er3-,@0xffff9abc:16                     ;01766c3c40609abc

-    and.b @er3-,@0x9abcdef0:32                     ;01766c3c48609abcdef0

-

-    and.b @+er3,@er1                               ;01756c3c0160

-    and.b @+er3,@(3:2,er1)                         ;01756c3c3160

-    and.b @+er3,@-er1                              ;01756c3cb160

-    and.b @+er3,@er1+                              ;01756c3c8160

-    and.b @+er3,@er1-                              ;01756c3ca160

-    and.b @+er3,@+er1                              ;01756c3c9160

-    and.b @+er3,@(0xffff9abc:16,er1)               ;01756c3cc1609abc

-    and.b @+er3,@(0x9abcdef0:32,er1)               ;01756c3cc9609abcdef0

-    and.b @+er3,@(0xffff9abc:16,r2l.b)             ;01756c3cd2609abc

-    and.b @+er3,@(0xffff9abc:16,r2.w)             ;01756c3ce2609abc

-    and.b @+er3,@(0xffff9abc:16,er2.l)             ;01756c3cf2609abc

-    and.b @+er3,@(0x9abcdef0:32,r2l.b)             ;01756c3cda609abcdef0

-    and.b @+er3,@(0x9abcdef0:32,r2.w)             ;01756c3cea609abcdef0

-    and.b @+er3,@(0x9abcdef0:32,er2.l)             ;01756c3cfa609abcdef0

-    and.b @+er3,@0xffff9abc:16                     ;01756c3c40609abc

-    and.b @+er3,@0x9abcdef0:32                     ;01756c3c48609abcdef0

-

-    and.b @(0x1234:16,er3),@er1                         ;01746e3c12340160

-    and.b @(0x1234:16,er3),@(3:2,er1)                   ;01746e3c12343160

-    and.b @(0x1234:16,er3),@-er1                        ;01746e3c1234b160

-    and.b @(0x1234:16,er3),@er1+                        ;01746e3c12348160

-    and.b @(0x1234:16,er3),@er1-                        ;01746e3c1234a160

-    and.b @(0x1234:16,er3),@+er1                        ;01746e3c12349160

-    and.b @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01746e3c1234c1609abc

-    and.b @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01746e3c1234c9609abcdef0

-    and.b @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01746e3c1234d2609abc

-    and.b @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01746e3c1234e2609abc

-    and.b @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01746e3c1234f2609abc

-    and.b @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01746e3c1234da609abcdef0

-    and.b @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01746e3c1234ea609abcdef0

-    and.b @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01746e3c1234fa609abcdef0

-    and.b @(0x1234:16,er3),@0xffff9abc:16               ;01746e3c123440609abc

-    and.b @(0x1234:16,er3),@0x9abcdef0:32               ;01746e3c123448609abcdef0

-

-    and.b @(0x12345678:32,er3),@er1                         ;78346a2c123456780160

-    and.b @(0x12345678:32,er3),@(3:2,er1)                   ;78346a2c123456783160

-    and.b @(0x12345678:32,er3),@-er1                        ;78346a2c12345678b160

-    and.b @(0x12345678:32,er3),@er1+                        ;78346a2c123456788160

-    and.b @(0x12345678:32,er3),@er1-                        ;78346a2c12345678a160

-    and.b @(0x12345678:32,er3),@+er1                        ;78346a2c123456789160

-    and.b @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346a2c12345678c1609abc

-    and.b @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346a2c12345678c9609abcdef0

-    and.b @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346a2c12345678d2609abc

-    and.b @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346a2c12345678e2609abc

-    and.b @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346a2c12345678f2609abc

-    and.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346a2c12345678da609abcdef0

-    and.b @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346a2c12345678ea609abcdef0

-    and.b @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346a2c12345678fa609abcdef0

-    and.b @(0x12345678:32,er3),@0xffff9abc:16               ;78346a2c1234567840609abc

-    and.b @(0x12345678:32,er3),@0x9abcdef0:32               ;78346a2c1234567848609abcdef0

-

-    and.b @(0x1234:16,r3l.b),@er1                       ;01756e3c12340160

-    and.b @(0x1234:16,r3l.b),@(3:2,er1)                 ;01756e3c12343160

-    and.b @(0x1234:16,r3l.b),@-er1                      ;01756e3c1234b160

-    and.b @(0x1234:16,r3l.b),@er1+                      ;01756e3c12348160

-    and.b @(0x1234:16,r3l.b),@er1-                      ;01756e3c1234a160

-    and.b @(0x1234:16,r3l.b),@+er1                      ;01756e3c12349160

-    and.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01756e3c1234c1609abc

-    and.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01756e3c1234c9609abcdef0

-    and.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01756e3c1234d2609abc

-    and.b @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01756e3c1234e2609abc

-    and.b @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01756e3c1234f2609abc

-    and.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01756e3c1234da609abcdef0

-    and.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01756e3c1234ea609abcdef0

-    and.b @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01756e3c1234fa609abcdef0

-    and.b @(0x1234:16,r3l.b),@0xffff9abc:16             ;01756e3c123440609abc

-    and.b @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01756e3c123448609abcdef0

-

-    and.b @(0x1234:16,r3.w),@er1                       ;01766e3c12340160

-    and.b @(0x1234:16,r3.w),@(3:2,er1)                 ;01766e3c12343160

-    and.b @(0x1234:16,r3.w),@-er1                      ;01766e3c1234b160

-    and.b @(0x1234:16,r3.w),@er1+                      ;01766e3c12348160

-    and.b @(0x1234:16,r3.w),@er1-                      ;01766e3c1234a160

-    and.b @(0x1234:16,r3.w),@+er1                      ;01766e3c12349160

-    and.b @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01766e3c1234c1609abc

-    and.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01766e3c1234c9609abcdef0

-    and.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01766e3c1234d2609abc

-    and.b @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01766e3c1234e2609abc

-    and.b @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01766e3c1234f2609abc

-    and.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01766e3c1234da609abcdef0

-    and.b @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01766e3c1234ea609abcdef0

-    and.b @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01766e3c1234fa609abcdef0

-    and.b @(0x1234:16,r3.w),@0xffff9abc:16             ;01766e3c123440609abc

-    and.b @(0x1234:16,r3.w),@0x9abcdef0:32             ;01766e3c123448609abcdef0

-

-    and.b @(0x1234:16,er3.l),@er1                       ;01776e3c12340160

-    and.b @(0x1234:16,er3.l),@(3:2,er1)                 ;01776e3c12343160

-    and.b @(0x1234:16,er3.l),@-er1                      ;01776e3c1234b160

-    and.b @(0x1234:16,er3.l),@er1+                      ;01776e3c12348160

-    and.b @(0x1234:16,er3.l),@er1-                      ;01776e3c1234a160

-    and.b @(0x1234:16,er3.l),@+er1                      ;01776e3c12349160

-    and.b @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01776e3c1234c1609abc

-    and.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01776e3c1234c9609abcdef0

-    and.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01776e3c1234d2609abc

-    and.b @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01776e3c1234e2609abc

-    and.b @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01776e3c1234f2609abc

-    and.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01776e3c1234da609abcdef0

-    and.b @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01776e3c1234ea609abcdef0

-    and.b @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01776e3c1234fa609abcdef0

-    and.b @(0x1234:16,er3.l),@0xffff9abc:16             ;01776e3c123440609abc

-    and.b @(0x1234:16,er3.l),@0x9abcdef0:32             ;01776e3c123448609abcdef0

-

-    and.b @(0x12345678:32,r3l.b),@er1                       ;78356a2c123456780160

-    and.b @(0x12345678:32,r3l.b),@(3:2,er1)                 ;78356a2c123456783160

-    and.b @(0x12345678:32,r3l.b),@-er1                      ;78356a2c12345678b160

-    and.b @(0x12345678:32,r3l.b),@er1+                      ;78356a2c123456788160

-    and.b @(0x12345678:32,r3l.b),@er1-                      ;78356a2c12345678a160

-    and.b @(0x12345678:32,r3l.b),@+er1                      ;78356a2c123456789160

-    and.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356a2c12345678c1609abc

-    and.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356a2c12345678c9609abcdef0

-    and.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356a2c12345678d2609abc

-    and.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356a2c12345678e2609abc

-    and.b @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356a2c12345678f2609abc

-    and.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356a2c12345678da609abcdef0

-    and.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356a2c12345678ea609abcdef0

-    and.b @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356a2c12345678fa609abcdef0

-    and.b @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356a2c1234567840609abc

-    and.b @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356a2c1234567848609abcdef0

-

-    and.b @(0x12345678:32,r3.w),@er1                       ;78366a2c123456780160

-    and.b @(0x12345678:32,r3.w),@(3:2,er1)                 ;78366a2c123456783160

-    and.b @(0x12345678:32,r3.w),@-er1                      ;78366a2c12345678b160

-    and.b @(0x12345678:32,r3.w),@er1+                      ;78366a2c123456788160

-    and.b @(0x12345678:32,r3.w),@er1-                      ;78366a2c12345678a160

-    and.b @(0x12345678:32,r3.w),@+er1                      ;78366a2c123456789160

-    and.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366a2c12345678c1609abc

-    and.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366a2c12345678c9609abcdef0

-    and.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366a2c12345678d2609abc

-    and.b @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366a2c12345678e2609abc

-    and.b @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366a2c12345678f2609abc

-    and.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366a2c12345678da609abcdef0

-    and.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366a2c12345678ea609abcdef0

-    and.b @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366a2c12345678fa609abcdef0

-    and.b @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366a2c1234567840609abc

-    and.b @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366a2c1234567848609abcdef0

-

-    and.b @(0x12345678:32,er3.l),@er1                       ;78376a2c123456780160

-    and.b @(0x12345678:32,er3.l),@(3:2,er1)                 ;78376a2c123456783160

-    and.b @(0x12345678:32,er3.l),@-er1                      ;78376a2c12345678b160

-    and.b @(0x12345678:32,er3.l),@er1+                      ;78376a2c123456788160

-    and.b @(0x12345678:32,er3.l),@er1-                      ;78376a2c12345678a160

-    and.b @(0x12345678:32,er3.l),@+er1                      ;78376a2c123456789160

-    and.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376a2c12345678c1609abc

-    and.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376a2c12345678c9609abcdef0

-    and.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376a2c12345678d2609abc

-    and.b @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376a2c12345678e2609abc

-    and.b @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376a2c12345678f2609abc

-    and.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376a2c12345678da609abcdef0

-    and.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376a2c12345678ea609abcdef0

-    and.b @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376a2c12345678fa609abcdef0

-    and.b @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376a2c1234567840609abc

-    and.b @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376a2c1234567848609abcdef0

-

-    and.b @0x1234:16,@er1                              ;6a1512340160

-    and.b @0x1234:16,@(3:2,er1)                        ;6a1512343160

-    and.b @0x1234:16,@-er1                             ;6a151234b160

-    and.b @0x1234:16,@er1+                             ;6a1512348160

-    and.b @0x1234:16,@er1-                             ;6a151234a160

-    and.b @0x1234:16,@+er1                             ;6a1512349160

-    and.b @0x1234:16,@(0xffff9abc:16,er1)              ;6a151234c1609abc

-    and.b @0x1234:16,@(0x9abcdef0:32,er1)              ;6a151234c9609abcdef0

-    and.b @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6a151234d2609abc

-    and.b @0x1234:16,@(0xffff9abc:16,r2.w)            ;6a151234e2609abc

-    and.b @0x1234:16,@(0xffff9abc:16,er2.l)            ;6a151234f2609abc

-    and.b @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6a151234da609abcdef0

-    and.b @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6a151234ea609abcdef0

-    and.b @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6a151234fa609abcdef0

-    and.b @0x1234:16,@0xffff9abc:16                    ;6a15123440609abc

-    and.b @0x1234:16,@0x9abcdef0:32                    ;6a15123448609abcdef0

-

-    and.b @0x12345678:32,@er1                              ;6a35123456780160

-    and.b @0x12345678:32,@(3:2,er1)                        ;6a35123456783160

-    and.b @0x12345678:32,@-er1                             ;6a3512345678b160

-    and.b @0x12345678:32,@er1+                             ;6a35123456788160

-    and.b @0x12345678:32,@er1-                             ;6a3512345678a160

-    and.b @0x12345678:32,@+er1                             ;6a35123456789160

-    and.b @0x12345678:32,@(0xffff9abc:16,er1)              ;6a3512345678c1609abc

-    and.b @0x12345678:32,@(0x9abcdef0:32,er1)              ;6a3512345678c9609abcdef0

-    and.b @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6a3512345678d2609abc

-    and.b @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6a3512345678e2609abc

-    and.b @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6a3512345678f2609abc

-    and.b @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6a3512345678da609abcdef0

-    and.b @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6a3512345678ea609abcdef0

-    and.b @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6a3512345678fa609abcdef0

-    and.b @0x12345678:32,@0xffff9abc:16                    ;6a351234567840609abc

-    and.b @0x12345678:32,@0x9abcdef0:32                    ;6a351234567848609abcdef0

-

-    and.w #0x1234:16,r1           ;79611234

-    and.w #0x1234:16,@er1          ;015e01601234

-    and.w #0x1234:16,@(0x6:2,er1) ;015e31601234

-    and.w #0x1234:16,@er1+         ;015e81601234

-    and.w #0x1234:16,@-er1         ;015eb1601234

-    and.w #0x1234:16,@+er1         ;015e91601234

-    and.w #0x1234:16,@er1-         ;015ea1601234

-    and.w #0x1234:16,@(0xffff9abc:16,er1)   ;015ec1609abc1234

-    and.w #0x1234:16,@(0x9abcdef0:32,er1)   ;015ec9609abcdef01234

-    and.w #0x1234:16,@(0xffff9abc:16,r2l.b) ;015ed2609abc1234

-    and.w #0x1234:16,@(0xffff9abc:16,r2.w) ;015ee2609abc1234

-    and.w #0x1234:16,@(0xffff9abc:16,er2.l) ;015ef2609abc1234

-    and.w #0x1234:16,@(0x9abcdef0:32,r2l.b) ;015eda609abcdef01234

-    and.w #0x1234:16,@(0x9abcdef0:32,r2.w) ;015eea609abcdef01234

-    and.w #0x1234:16,@(0x9abcdef0:32,er2.l) ;015efa609abcdef01234

-    and.w #0x1234:16,@0xffff9abc:16         ;015e40609abc1234

-    and.w #0x1234:16,@0x9abcdef0:32         ;015e48609abcdef01234

-

-    and.w r3,r1              ;6631

-

-    and.w r3,@er1            ;7d906630

-    and.w r3,@(0x6:2,er1)   ;01593163

-    and.w r3,@er1+           ;01598163

-    and.w r3,@-er1           ;0159b163

-    and.w r3,@+er1           ;01599163

-    and.w r3,@er1-           ;0159a163

-    and.w r3,@(0x1234:16,er1)     ;0159c1631234

-    and.w r3,@(0x12345678:32,er1)     ;0159c96312345678

-    and.w r3,@(0x1234:16,r2l.b)   ;0159d2631234

-    and.w r3,@(0x1234:16,r2.w)   ;0159e2631234

-    and.w r3,@(0x1234:16,er2.l)   ;0159f2631234

-    and.w r3,@(0x12345678:32,r2l.b)   ;0159da6312345678

-    and.w r3,@(0x12345678:32,r2.w)   ;0159ea6312345678

-    and.w r3,@(0x12345678:32,er2.l)   ;0159fa6312345678

-    and.w r3,@0x1234:16          ;6b1812346630

-    and.w r3,@0x12345678:32          ;6b38123456786630

-

-    and.w @er3,r1            ;7cb06601

-    and.w @(0x6:2,er3),r1  ;015a3361

-    and.w @er3+,r1          ;015a8361

-    and.w @-er3,r1          ;015ab361

-    and.w @+er3,r1          ;015a9361

-    and.w @er3-,r1          ;015aa361

-    and.w @(0x1234:16,er1),r1     ;015ac1611234

-    and.w @(0x12345678:32,er1),r1     ;015ac96112345678

-    and.w @(0x1234:16,r2l.b),r1   ;015ad2611234

-    and.w @(0x1234:16,r2.w),r1   ;015ae2611234

-    and.w @(0x1234:16,er2.l),r1   ;015af2611234

-    and.w @(0x12345678:32,r2l.b),r1   ;015ada6112345678

-    and.w @(0x12345678:32,r2.w),r1   ;015aea6112345678

-    and.w @(0x12345678:32,er2.l),r1   ;015afa6112345678

-    and.w @0x1234:16,r1          ;6b1012346601

-    and.w @0x12345678:32,r1          ;6b30123456786601

-

-    and.w @er3,@er1                                ;7cb50160

-    and.w @er3,@(6:2,er1)                          ;7cb53160

-    and.w @er3,@-er1                               ;7cb5b160

-    and.w @er3,@er1+                               ;7cb58160

-    and.w @er3,@er1-                               ;7cb5a160

-    and.w @er3,@+er1                               ;7cb59160

-    and.w @er3,@(0xffff9abc:16,er1)                ;7cb5c1609abc

-    and.w @er3,@(0x9abcdef0:32,er1)                ;7cb5c9609abcdef0

-    and.w @er3,@(0xffff9abc:16,r2l.b)              ;7cb5d2609abc

-    and.w @er3,@(0xffff9abc:16,r2.w)              ;7cb5e2609abc

-    and.w @er3,@(0xffff9abc:16,er2.l)              ;7cb5f2609abc

-    and.w @er3,@(0x9abcdef0:32,r2l.b)              ;7cb5da609abcdef0

-    and.w @er3,@(0x9abcdef0:32,r2.w)              ;7cb5ea609abcdef0

-    and.w @er3,@(0x9abcdef0:32,er2.l)              ;7cb5fa609abcdef0

-    and.w @er3,@0xffff9abc:16                      ;7cb540609abc

-    and.w @er3,@0x9abcdef0:32                      ;7cb548609abcdef0

-

-    and.w @-er3,@er1                               ;01576d3c0160

-    and.w @-er3,@(6:2,er1)                         ;01576d3c3160

-    and.w @-er3,@-er1                              ;01576d3cb160

-    and.w @-er3,@er1+                              ;01576d3c8160

-    and.w @-er3,@er1-                              ;01576d3ca160

-    and.w @-er3,@+er1                              ;01576d3c9160

-    and.w @-er3,@(0xffff9abc:16,er1)               ;01576d3cc1609abc

-    and.w @-er3,@(0x9abcdef0:32,er1)               ;01576d3cc9609abcdef0

-    and.w @-er3,@(0xffff9abc:16,r2l.b)             ;01576d3cd2609abc

-    and.w @-er3,@(0xffff9abc:16,r2.w)             ;01576d3ce2609abc

-    and.w @-er3,@(0xffff9abc:16,er2.l)             ;01576d3cf2609abc

-    and.w @-er3,@(0x9abcdef0:32,r2l.b)             ;01576d3cda609abcdef0

-    and.w @-er3,@(0x9abcdef0:32,r2.w)             ;01576d3cea609abcdef0

-    and.w @-er3,@(0x9abcdef0:32,er2.l)             ;01576d3cfa609abcdef0

-    and.w @-er3,@0xffff9abc:16                     ;01576d3c40609abc

-    and.w @-er3,@0x9abcdef0:32                     ;01576d3c48609abcdef0

-

-    and.w @er3+,@er1                               ;01546d3c0160

-    and.w @er3+,@(6:2,er1)                         ;01546d3c3160

-    and.w @er3+,@-er1                              ;01546d3cb160

-    and.w @er3+,@er1+                              ;01546d3c8160

-    and.w @er3+,@er1-                              ;01546d3ca160

-    and.w @er3+,@+er1                              ;01546d3c9160

-    and.w @er3+,@(0xffff9abc:16,er1)               ;01546d3cc1609abc

-    and.w @er3+,@(0x9abcdef0:32,er1)               ;01546d3cc9609abcdef0

-    and.w @er3+,@(0xffff9abc:16,r2l.b)             ;01546d3cd2609abc

-    and.w @er3+,@(0xffff9abc:16,r2.w)             ;01546d3ce2609abc

-    and.w @er3+,@(0xffff9abc:16,er2.l)             ;01546d3cf2609abc

-    and.w @er3+,@(0x9abcdef0:32,r2l.b)             ;01546d3cda609abcdef0

-    and.w @er3+,@(0x9abcdef0:32,r2.w)             ;01546d3cea609abcdef0

-    and.w @er3+,@(0x9abcdef0:32,er2.l)             ;01546d3cfa609abcdef0

-    and.w @er3+,@0xffff9abc:16                     ;01546d3c40609abc

-    and.w @er3+,@0x9abcdef0:32                     ;01546d3c48609abcdef0

-

-    and.w @er3-,@er1                               ;01566d3c0160

-    and.w @er3-,@(6:2,er1)                         ;01566d3c3160

-    and.w @er3-,@-er1                              ;01566d3cb160

-    and.w @er3-,@er1+                              ;01566d3c8160

-    and.w @er3-,@er1-                              ;01566d3ca160

-    and.w @er3-,@+er1                              ;01566d3c9160

-    and.w @er3-,@(0xffff9abc:16,er1)               ;01566d3cc1609abc

-    and.w @er3-,@(0x9abcdef0:32,er1)               ;01566d3cc9609abcdef0

-    and.w @er3-,@(0xffff9abc:16,r2l.b)             ;01566d3cd2609abc

-    and.w @er3-,@(0xffff9abc:16,r2.w)             ;01566d3ce2609abc

-    and.w @er3-,@(0xffff9abc:16,er2.l)             ;01566d3cf2609abc

-    and.w @er3-,@(0x9abcdef0:32,r2l.b)             ;01566d3cda609abcdef0

-    and.w @er3-,@(0x9abcdef0:32,r2.w)             ;01566d3cea609abcdef0

-    and.w @er3-,@(0x9abcdef0:32,er2.l)             ;01566d3cfa609abcdef0

-    and.w @er3-,@0xffff9abc:16                     ;01566d3c40609abc

-    and.w @er3-,@0x9abcdef0:32                     ;01566d3c48609abcdef0

-

-    and.w @+er3,@er1                               ;01556d3c0160

-    and.w @+er3,@(6:2,er1)                         ;01556d3c3160

-    and.w @+er3,@-er1                              ;01556d3cb160

-    and.w @+er3,@er1+                              ;01556d3c8160

-    and.w @+er3,@er1-                              ;01556d3ca160

-    and.w @+er3,@+er1                              ;01556d3c9160

-    and.w @+er3,@(0xffff9abc:16,er1)               ;01556d3cc1609abc

-    and.w @+er3,@(0x9abcdef0:32,er1)               ;01556d3cc9609abcdef0

-    and.w @+er3,@(0xffff9abc:16,r2l.b)             ;01556d3cd2609abc

-    and.w @+er3,@(0xffff9abc:16,r2.w)             ;01556d3ce2609abc

-    and.w @+er3,@(0xffff9abc:16,er2.l)             ;01556d3cf2609abc

-    and.w @+er3,@(0x9abcdef0:32,r2l.b)             ;01556d3cda609abcdef0

-    and.w @+er3,@(0x9abcdef0:32,r2.w)             ;01556d3cea609abcdef0

-    and.w @+er3,@(0x9abcdef0:32,er2.l)             ;01556d3cfa609abcdef0

-    and.w @+er3,@0xffff9abc:16                     ;01556d3c40609abc

-    and.w @+er3,@0x9abcdef0:32                     ;01556d3c48609abcdef0

-

-    and.w @(0x1234:16,er3),@er1                         ;01546f3c12340160

-    and.w @(0x1234:16,er3),@(6:2,er1)                   ;01546f3c12343160

-    and.w @(0x1234:16,er3),@-er1                        ;01546f3c1234b160

-    and.w @(0x1234:16,er3),@er1+                        ;01546f3c12348160

-    and.w @(0x1234:16,er3),@er1-                        ;01546f3c1234a160

-    and.w @(0x1234:16,er3),@+er1                        ;01546f3c12349160

-    and.w @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01546f3c1234c1609abc

-    and.w @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01546f3c1234c9609abcdef0

-    and.w @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01546f3c1234d2609abc

-    and.w @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01546f3c1234e2609abc

-    and.w @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01546f3c1234f2609abc

-    and.w @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01546f3c1234da609abcdef0

-    and.w @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01546f3c1234ea609abcdef0

-    and.w @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01546f3c1234fa609abcdef0

-    and.w @(0x1234:16,er3),@0xffff9abc:16               ;01546f3c123440609abc

-    and.w @(0x1234:16,er3),@0x9abcdef0:32               ;01546f3c123448609abcdef0

-

-    and.w @(0x12345678:32,er3),@er1                         ;78346b2c123456780160

-    and.w @(0x12345678:32,er3),@(6:2,er1)                   ;78346b2c123456783160

-    and.w @(0x12345678:32,er3),@-er1                        ;78346b2c12345678b160

-    and.w @(0x12345678:32,er3),@er1+                        ;78346b2c123456788160

-    and.w @(0x12345678:32,er3),@er1-                        ;78346b2c12345678a160

-    and.w @(0x12345678:32,er3),@+er1                        ;78346b2c123456789160

-    and.w @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78346b2c12345678c1609abc

-    and.w @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78346b2c12345678c9609abcdef0

-    and.w @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78346b2c12345678d2609abc

-    and.w @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78346b2c12345678e2609abc

-    and.w @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78346b2c12345678f2609abc

-    and.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78346b2c12345678da609abcdef0

-    and.w @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78346b2c12345678ea609abcdef0

-    and.w @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78346b2c12345678fa609abcdef0

-    and.w @(0x12345678:32,er3),@0xffff9abc:16               ;78346b2c1234567840609abc

-    and.w @(0x12345678:32,er3),@0x9abcdef0:32               ;78346b2c1234567848609abcdef0

-

-    and.w @(0x1234:16,r3l.b),@er1                       ;01556f3c12340160

-    and.w @(0x1234:16,r3l.b),@(6:2,er1)                 ;01556f3c12343160

-    and.w @(0x1234:16,r3l.b),@-er1                      ;01556f3c1234b160

-    and.w @(0x1234:16,r3l.b),@er1+                      ;01556f3c12348160

-    and.w @(0x1234:16,r3l.b),@er1-                      ;01556f3c1234a160

-    and.w @(0x1234:16,r3l.b),@+er1                      ;01556f3c12349160

-    and.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01556f3c1234c1609abc

-    and.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01556f3c1234c9609abcdef0

-    and.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01556f3c1234d2609abc

-    and.w @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01556f3c1234e2609abc

-    and.w @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01556f3c1234f2609abc

-    and.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01556f3c1234da609abcdef0

-    and.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01556f3c1234ea609abcdef0

-    and.w @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01556f3c1234fa609abcdef0

-    and.w @(0x1234:16,r3l.b),@0xffff9abc:16             ;01556f3c123440609abc

-    and.w @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01556f3c123448609abcdef0

-

-    and.w @(0x1234:16,r3.w),@er1                       ;01566f3c12340160

-    and.w @(0x1234:16,r3.w),@(6:2,er1)                 ;01566f3c12343160

-    and.w @(0x1234:16,r3.w),@-er1                      ;01566f3c1234b160

-    and.w @(0x1234:16,r3.w),@er1+                      ;01566f3c12348160

-    and.w @(0x1234:16,r3.w),@er1-                      ;01566f3c1234a160

-    and.w @(0x1234:16,r3.w),@+er1                      ;01566f3c12349160

-    and.w @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01566f3c1234c1609abc

-    and.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01566f3c1234c9609abcdef0

-    and.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01566f3c1234d2609abc

-    and.w @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01566f3c1234e2609abc

-    and.w @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01566f3c1234f2609abc

-    and.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01566f3c1234da609abcdef0

-    and.w @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01566f3c1234ea609abcdef0

-    and.w @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01566f3c1234fa609abcdef0

-    and.w @(0x1234:16,r3.w),@0xffff9abc:16             ;01566f3c123440609abc

-    and.w @(0x1234:16,r3.w),@0x9abcdef0:32             ;01566f3c123448609abcdef0

-

-    and.w @(0x1234:16,er3.l),@er1                       ;01576f3c12340160

-    and.w @(0x1234:16,er3.l),@(6:2,er1)                 ;01576f3c12343160

-    and.w @(0x1234:16,er3.l),@-er1                      ;01576f3c1234b160

-    and.w @(0x1234:16,er3.l),@er1+                      ;01576f3c12348160

-    and.w @(0x1234:16,er3.l),@er1-                      ;01576f3c1234a160

-    and.w @(0x1234:16,er3.l),@+er1                      ;01576f3c12349160

-    and.w @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01576f3c1234c1609abc

-    and.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01576f3c1234c9609abcdef0

-    and.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01576f3c1234d2609abc

-    and.w @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01576f3c1234e2609abc

-    and.w @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01576f3c1234f2609abc

-    and.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01576f3c1234da609abcdef0

-    and.w @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01576f3c1234ea609abcdef0

-    and.w @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01576f3c1234fa609abcdef0

-    and.w @(0x1234:16,er3.l),@0xffff9abc:16             ;01576f3c123440609abc

-    and.w @(0x1234:16,er3.l),@0x9abcdef0:32             ;01576f3c123448609abcdef0

-

-    and.w @(0x12345678:32,r3l.b),@er1                       ;78356b2c123456780160

-    and.w @(0x12345678:32,r3l.b),@(6:2,er1)                 ;78356b2c123456783160

-    and.w @(0x12345678:32,r3l.b),@-er1                      ;78356b2c12345678b160

-    and.w @(0x12345678:32,r3l.b),@er1+                      ;78356b2c123456788160

-    and.w @(0x12345678:32,r3l.b),@er1-                      ;78356b2c12345678a160

-    and.w @(0x12345678:32,r3l.b),@+er1                      ;78356b2c123456789160

-    and.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78356b2c12345678c1609abc

-    and.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78356b2c12345678c9609abcdef0

-    and.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78356b2c12345678d2609abc

-    and.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78356b2c12345678e2609abc

-    and.w @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78356b2c12345678f2609abc

-    and.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78356b2c12345678da609abcdef0

-    and.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78356b2c12345678ea609abcdef0

-    and.w @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78356b2c12345678fa609abcdef0

-    and.w @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78356b2c1234567840609abc

-    and.w @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78356b2c1234567848609abcdef0

-

-    and.w @(0x12345678:32,r3.w),@er1                       ;78366b2c123456780160

-    and.w @(0x12345678:32,r3.w),@(6:2,er1)                 ;78366b2c123456783160

-    and.w @(0x12345678:32,r3.w),@-er1                      ;78366b2c12345678b160

-    and.w @(0x12345678:32,r3.w),@er1+                      ;78366b2c123456788160

-    and.w @(0x12345678:32,r3.w),@er1-                      ;78366b2c12345678a160

-    and.w @(0x12345678:32,r3.w),@+er1                      ;78366b2c123456789160

-    and.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78366b2c12345678c1609abc

-    and.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78366b2c12345678c9609abcdef0

-    and.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78366b2c12345678d2609abc

-    and.w @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78366b2c12345678e2609abc

-    and.w @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78366b2c12345678f2609abc

-    and.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78366b2c12345678da609abcdef0

-    and.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78366b2c12345678ea609abcdef0

-    and.w @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78366b2c12345678fa609abcdef0

-    and.w @(0x12345678:32,r3.w),@0xffff9abc:16             ;78366b2c1234567840609abc

-    and.w @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78366b2c1234567848609abcdef0

-

-    and.w @(0x12345678:32,er3.l),@er1                       ;78376b2c123456780160

-    and.w @(0x12345678:32,er3.l),@(6:2,er1)                 ;78376b2c123456783160

-    and.w @(0x12345678:32,er3.l),@-er1                      ;78376b2c12345678b160

-    and.w @(0x12345678:32,er3.l),@er1+                      ;78376b2c123456788160

-    and.w @(0x12345678:32,er3.l),@er1-                      ;78376b2c12345678a160

-    and.w @(0x12345678:32,er3.l),@+er1                      ;78376b2c123456789160

-    and.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78376b2c12345678c1609abc

-    and.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78376b2c12345678c9609abcdef0

-    and.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78376b2c12345678d2609abc

-    and.w @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78376b2c12345678e2609abc

-    and.w @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78376b2c12345678f2609abc

-    and.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78376b2c12345678da609abcdef0

-    and.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78376b2c12345678ea609abcdef0

-    and.w @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78376b2c12345678fa609abcdef0

-    and.w @(0x12345678:32,er3.l),@0xffff9abc:16             ;78376b2c1234567840609abc

-    and.w @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78376b2c1234567848609abcdef0

-

-    and.w @0x1234:16,@er1                              ;6b1512340160

-    and.w @0x1234:16,@(6:2,er1)                        ;6b1512343160

-    and.w @0x1234:16,@-er1                             ;6b151234b160

-    and.w @0x1234:16,@er1+                             ;6b1512348160

-    and.w @0x1234:16,@er1-                             ;6b151234a160

-    and.w @0x1234:16,@+er1                             ;6b1512349160

-    and.w @0x1234:16,@(0xffff9abc:16,er1)              ;6b151234c1609abc

-    and.w @0x1234:16,@(0x9abcdef0:32,er1)              ;6b151234c9609abcdef0

-    and.w @0x1234:16,@(0xffff9abc:16,r2l.b)            ;6b151234d2609abc

-    and.w @0x1234:16,@(0xffff9abc:16,r2.w)            ;6b151234e2609abc

-    and.w @0x1234:16,@(0xffff9abc:16,er2.l)            ;6b151234f2609abc

-    and.w @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;6b151234da609abcdef0

-    and.w @0x1234:16,@(0x9abcdef0:32,r2.w)            ;6b151234ea609abcdef0

-    and.w @0x1234:16,@(0x9abcdef0:32,er2.l)            ;6b151234fa609abcdef0

-    and.w @0x1234:16,@0xffff9abc:16                    ;6b15123440609abc

-    and.w @0x1234:16,@0x9abcdef0:32                    ;6b15123448609abcdef0

-

-    and.w @0x12345678:32,@er1                              ;6b35123456780160

-    and.w @0x12345678:32,@(6:2,er1)                        ;6b35123456783160

-    and.w @0x12345678:32,@-er1                             ;6b3512345678b160

-    and.w @0x12345678:32,@er1+                             ;6b35123456788160

-    and.w @0x12345678:32,@er1-                             ;6b3512345678a160

-    and.w @0x12345678:32,@+er1                             ;6b35123456789160

-    and.w @0x12345678:32,@(0xffff9abc:16,er1)              ;6b3512345678c1609abc

-    and.w @0x12345678:32,@(0x9abcdef0:32,er1)              ;6b3512345678c9609abcdef0

-    and.w @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;6b3512345678d2609abc

-    and.w @0x12345678:32,@(0xffff9abc:16,r2.w)            ;6b3512345678e2609abc

-    and.w @0x12345678:32,@(0xffff9abc:16,er2.l)            ;6b3512345678f2609abc

-    and.w @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;6b3512345678da609abcdef0

-    and.w @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;6b3512345678ea609abcdef0

-    and.w @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;6b3512345678fa609abcdef0

-    and.w @0x12345678:32,@0xffff9abc:16                    ;6b351234567840609abc

-    and.w @0x12345678:32,@0x9abcdef0:32                    ;6b351234567848609abcdef0

-

-    and.l #0x12345678:32,er1          ;7a6112345678

-    and.l #0x1234:16,er1           ;7a691234

-    and.l #0x12345678:32,@er1          ;010e016812345678

-    and.l #0x12345678:32,@(0xc:2,er1) ;010e316812345678

-    and.l #0x12345678:32,@er1+         ;010e816812345678

-    and.l #0x12345678:32,@-er1         ;010eb16812345678

-    and.l #0x12345678:32,@+er1         ;010e916812345678

-    and.l #0x12345678:32,@er1-         ;010ea16812345678

-    and.l #0x12345678:32,@(0xffff9abc:16,er1)   ;010ec1689abc12345678

-    and.l #0x12345678:32,@(0x9abcdef0:32,er1)   ;010ec9689abcdef012345678

-    and.l #0x12345678:32,@(0xffff9abc:16,r2l.b) ;010ed2689abc12345678

-    and.l #0x12345678:32,@(0xffff9abc:16,r2.w) ;010ee2689abc12345678

-    and.l #0x12345678:32,@(0xffff9abc:16,er2.l) ;010ef2689abc12345678

-    and.l #0x12345678:32,@(0x9abcdef0:32,r2l.b) ;010eda689abcdef012345678

-    and.l #0x12345678:32,@(0x9abcdef0:32,r2.w) ;010eea689abcdef012345678

-    and.l #0x12345678:32,@(0x9abcdef0:32,er2.l) ;010efa689abcdef012345678

-    and.l #0x12345678:32,@0xffff9abc:16         ;010e40689abc12345678

-    and.l #0x12345678:32,@0x9abcdef0:32         ;010e48689abcdef012345678

-    and.l #0x1234:16,@er1          ;010e01601234

-    and.l #0x1234:16,@(0xc:2,er1) ;010e31601234

-    and.l #0x1234:16,@er1+         ;010e81601234

-    and.l #0x1234:16,@-er1         ;010eb1601234

-    and.l #0x1234:16,@+er1         ;010e91601234

-    and.l #0x1234:16,@er1-         ;010ea1601234

-    and.l #0x1234:16,@(0xffff9abc:16,er1)   ;010ec1609abc1234

-    and.l #0x1234:16,@(0x9abcdef0:32,er1)   ;010ec9609abcdef01234

-    and.l #0x1234:16,@(0xffff9abc:16,r2l.b) ;010ed2609abc1234

-    and.l #0x1234:16,@(0xffff9abc:16,r2.w) ;010ee2609abc1234

-    and.l #0x1234:16,@(0xffff9abc:16,er2.l) ;010ef2609abc1234

-    and.l #0x1234:16,@(0x9abcdef0:32,r2l.b) ;010eda609abcdef01234

-    and.l #0x1234:16,@(0x9abcdef0:32,r2.w) ;010eea609abcdef01234

-    and.l #0x1234:16,@(0x9abcdef0:32,er2.l) ;010efa609abcdef01234

-    and.l #0x1234:16,@0xffff9abc:16         ;010e40609abc1234

-    and.l #0x1234:16,@0x9abcdef0:32         ;010e48609abcdef01234

-

-    and.l er3,er1            ;01f06631

-

-    and.l er3,@er1            ;01090163

-    and.l er3,@(0xc:2,er1)   ;01093163

-    and.l er3,@er1+           ;01098163

-    and.l er3,@-er1           ;0109b163

-    and.l er3,@+er1           ;01099163

-    and.l er3,@er1-           ;0109a163

-    and.l er3,@(0x1234:16,er1)     ;0109c1631234

-    and.l er3,@(0x12345678:32,er1)     ;0109c96312345678

-    and.l er3,@(0x1234:16,r2l.b)   ;0109d2631234

-    and.l er3,@(0x1234:16,r2.w)   ;0109e2631234

-    and.l er3,@(0x1234:16,er2.l)   ;0109f2631234

-    and.l er3,@(0x12345678:32,r2l.b)   ;0109da6312345678

-    and.l er3,@(0x12345678:32,r2.w)   ;0109ea6312345678

-    and.l er3,@(0x12345678:32,er2.l)   ;0109fa6312345678

-    and.l er3,@0x1234:16          ;010940631234

-    and.l er3,@0x12345678:32          ;0109486312345678

-

-    and.l @er3,er1            ;010a0361

-    and.l @(0xc:2,er3),er1  ;010a3361

-    and.l @er3+,er1          ;010a8361

-    and.l @-er3,er1          ;010ab361

-    and.l @+er3,er1          ;010a9361

-    and.l @er3-,er1          ;010aa361

-    and.l @(0x1234:16,er1),er1     ;010ac1611234

-    and.l @(0x12345678:32,er1),er1     ;010ac96112345678

-    and.l @(0x1234:16,r2l.b),er1   ;010ad2611234

-    and.l @(0x1234:16,r2.w),er1   ;010ae2611234

-    and.l @(0x1234:16,er2.l),er1   ;010af2611234

-    and.l @(0x12345678:32,r2l.b),er1   ;010ada6112345678

-    and.l @(0x12345678:32,r2.w),er1   ;010aea6112345678

-    and.l @(0x12345678:32,er2.l),er1   ;010afa6112345678

-    and.l @0x1234:16,er1          ;010a40611234

-    and.l @0x12345678:32,er1          ;010a486112345678

-

-    and.l @er3,@er1                                ;0104693c0160

-    and.l @er3,@(0xc:2,er1)                          ;0104693c3160

-    and.l @er3,@-er1                               ;0104693cb160

-    and.l @er3,@er1+                               ;0104693c8160

-    and.l @er3,@er1-                               ;0104693ca160

-    and.l @er3,@+er1                               ;0104693c9160

-    and.l @er3,@(0xffff9abc:16,er1)                ;0104693cc1609abc

-    and.l @er3,@(0x9abcdef0:32,er1)                ;0104693cc9609abcdef0

-    and.l @er3,@(0xffff9abc:16,r2l.b)              ;0104693cd2609abc

-    and.l @er3,@(0xffff9abc:16,r2.w)              ;0104693ce2609abc

-    and.l @er3,@(0xffff9abc:16,er2.l)              ;0104693cf2609abc

-    and.l @er3,@(0x9abcdef0:32,r2l.b)              ;0104693cda609abcdef0

-    and.l @er3,@(0x9abcdef0:32,r2.w)              ;0104693cea609abcdef0

-    and.l @er3,@(0x9abcdef0:32,er2.l)              ;0104693cfa609abcdef0

-    and.l @er3,@0xffff9abc:16                      ;0104693c40609abc

-    and.l @er3,@0x9abcdef0:32                      ;0104693c48609abcdef0

-

-    and.l @(0xc:2,er3),@er1                       ;0107693c0160

-    and.l @(0xc:2,er3),@(0xc:2,er1)                 ;0107693c3160

-    and.l @(0xc:2,er3),@-er1                      ;0107693cb160

-    and.l @(0xc:2,er3),@er1+                      ;0107693c8160

-    and.l @(0xc:2,er3),@er1-                      ;0107693ca160

-    and.l @(0xc:2,er3),@+er1                      ;0107693c9160

-    and.l @(0xc:2,er3),@(0xffff9abc:16,er1)       ;0107693cc1609abc

-    and.l @(0xc:2,er3),@(0x9abcdef0:32,er1)       ;0107693cc9609abcdef0

-    and.l @(0xc:2,er3),@(0xffff9abc:16,r2l.b)     ;0107693cd2609abc

-    and.l @(0xc:2,er3),@(0xffff9abc:16,r2.w)     ;0107693ce2609abc

-    and.l @(0xc:2,er3),@(0xffff9abc:16,er2.l)     ;0107693cf2609abc

-    and.l @(0xc:2,er3),@(0x9abcdef0:32,r2l.b)     ;0107693cda609abcdef0

-    and.l @(0xc:2,er3),@(0x9abcdef0:32,r2.w)     ;0107693cea609abcdef0

-    and.l @(0xc:2,er3),@(0x9abcdef0:32,er2.l)     ;0107693cfa609abcdef0

-    and.l @(0xc:2,er3),@0xffff9abc:16             ;0107693c40609abc

-    and.l @(0xc:2,er3),@0x9abcdef0:32             ;0107693c48609abcdef0

-

-    and.l @-er3,@er1                               ;01076d3c0160

-    and.l @-er3,@(0xc:2,er1)                         ;01076d3c3160

-    and.l @-er3,@-er1                              ;01076d3cb160

-    and.l @-er3,@er1+                              ;01076d3c8160

-    and.l @-er3,@er1-                              ;01076d3ca160

-    and.l @-er3,@+er1                              ;01076d3c9160

-    and.l @-er3,@(0xffff9abc:16,er1)               ;01076d3cc1609abc

-    and.l @-er3,@(0x9abcdef0:32,er1)               ;01076d3cc9609abcdef0

-    and.l @-er3,@(0xffff9abc:16,r2l.b)             ;01076d3cd2609abc

-    and.l @-er3,@(0xffff9abc:16,r2.w)             ;01076d3ce2609abc

-    and.l @-er3,@(0xffff9abc:16,er2.l)             ;01076d3cf2609abc

-    and.l @-er3,@(0x9abcdef0:32,r2l.b)             ;01076d3cda609abcdef0

-    and.l @-er3,@(0x9abcdef0:32,r2.w)             ;01076d3cea609abcdef0

-    and.l @-er3,@(0x9abcdef0:32,er2.l)             ;01076d3cfa609abcdef0

-    and.l @-er3,@0xffff9abc:16                     ;01076d3c40609abc

-    and.l @-er3,@0x9abcdef0:32                     ;01076d3c48609abcdef0

-

-    and.l @er3+,@er1                               ;01046d3c0160

-    and.l @er3+,@(0xc:2,er1)                         ;01046d3c3160

-    and.l @er3+,@-er1                              ;01046d3cb160

-    and.l @er3+,@er1+                              ;01046d3c8160

-    and.l @er3+,@er1-                              ;01046d3ca160

-    and.l @er3+,@+er1                              ;01046d3c9160

-    and.l @er3+,@(0xffff9abc:16,er1)               ;01046d3cc1609abc

-    and.l @er3+,@(0x9abcdef0:32,er1)               ;01046d3cc9609abcdef0

-    and.l @er3+,@(0xffff9abc:16,r2l.b)             ;01046d3cd2609abc

-    and.l @er3+,@(0xffff9abc:16,r2.w)             ;01046d3ce2609abc

-    and.l @er3+,@(0xffff9abc:16,er2.l)             ;01046d3cf2609abc

-    and.l @er3+,@(0x9abcdef0:32,r2l.b)             ;01046d3cda609abcdef0

-    and.l @er3+,@(0x9abcdef0:32,r2.w)             ;01046d3cea609abcdef0

-    and.l @er3+,@(0x9abcdef0:32,er2.l)             ;01046d3cfa609abcdef0

-    and.l @er3+,@0xffff9abc:16                     ;01046d3c40609abc

-    and.l @er3+,@0x9abcdef0:32                     ;01046d3c48609abcdef0

-

-    and.l @er3-,@er1                               ;01066d3c0160

-    and.l @er3-,@(0xc:2,er1)                         ;01066d3c3160

-    and.l @er3-,@-er1                              ;01066d3cb160

-    and.l @er3-,@er1+                              ;01066d3c8160

-    and.l @er3-,@er1-                              ;01066d3ca160

-    and.l @er3-,@+er1                              ;01066d3c9160

-    and.l @er3-,@(0xffff9abc:16,er1)               ;01066d3cc1609abc

-    and.l @er3-,@(0x9abcdef0:32,er1)               ;01066d3cc9609abcdef0

-    and.l @er3-,@(0xffff9abc:16,r2l.b)             ;01066d3cd2609abc

-    and.l @er3-,@(0xffff9abc:16,r2.w)             ;01066d3ce2609abc

-    and.l @er3-,@(0xffff9abc:16,er2.l)             ;01066d3cf2609abc

-    and.l @er3-,@(0x9abcdef0:32,r2l.b)             ;01066d3cda609abcdef0

-    and.l @er3-,@(0x9abcdef0:32,r2.w)             ;01066d3cea609abcdef0

-    and.l @er3-,@(0x9abcdef0:32,er2.l)             ;01066d3cfa609abcdef0

-    and.l @er3-,@0xffff9abc:16                     ;01066d3c40609abc

-    and.l @er3-,@0x9abcdef0:32                     ;01066d3c48609abcdef0

-

-    and.l @+er3,@er1                               ;01056d3c0160

-    and.l @+er3,@(0xc:2,er1)                         ;01056d3c3160

-    and.l @+er3,@-er1                              ;01056d3cb160

-    and.l @+er3,@er1+                              ;01056d3c8160

-    and.l @+er3,@er1-                              ;01056d3ca160

-    and.l @+er3,@+er1                              ;01056d3c9160

-    and.l @+er3,@(0xffff9abc:16,er1)               ;01056d3cc1609abc

-    and.l @+er3,@(0x9abcdef0:32,er1)               ;01056d3cc9609abcdef0

-    and.l @+er3,@(0xffff9abc:16,r2l.b)             ;01056d3cd2609abc

-    and.l @+er3,@(0xffff9abc:16,r2.w)             ;01056d3ce2609abc

-    and.l @+er3,@(0xffff9abc:16,er2.l)             ;01056d3cf2609abc

-    and.l @+er3,@(0x9abcdef0:32,r2l.b)             ;01056d3cda609abcdef0

-    and.l @+er3,@(0x9abcdef0:32,r2.w)             ;01056d3cea609abcdef0

-    and.l @+er3,@(0x9abcdef0:32,er2.l)             ;01056d3cfa609abcdef0

-    and.l @+er3,@0xffff9abc:16                     ;01056d3c40609abc

-    and.l @+er3,@0x9abcdef0:32                     ;01056d3c48609abcdef0

-

-    and.l @(0x1234:16,er3),@er1                         ;01046f3c12340160

-    and.l @(0x1234:16,er3),@(0xc:2,er1)                   ;01046f3c12343160

-    and.l @(0x1234:16,er3),@-er1                        ;01046f3c1234b160

-    and.l @(0x1234:16,er3),@er1+                        ;01046f3c12348160

-    and.l @(0x1234:16,er3),@er1-                        ;01046f3c1234a160

-    and.l @(0x1234:16,er3),@+er1                        ;01046f3c12349160

-    and.l @(0x1234:16,er3),@(0xffff9abc:16,er1)         ;01046f3c1234c1609abc

-    and.l @(0x1234:16,er3),@(0x9abcdef0:32,er1)         ;01046f3c1234c9609abcdef0

-    and.l @(0x1234:16,er3),@(0xffff9abc:16,r2l.b)       ;01046f3c1234d2609abc

-    and.l @(0x1234:16,er3),@(0xffff9abc:16,r2.w)       ;01046f3c1234e2609abc

-    and.l @(0x1234:16,er3),@(0xffff9abc:16,er2.l)       ;01046f3c1234f2609abc

-    and.l @(0x1234:16,er3),@(0x9abcdef0:32,r2l.b)       ;01046f3c1234da609abcdef0

-    and.l @(0x1234:16,er3),@(0x9abcdef0:32,r2.w)       ;01046f3c1234ea609abcdef0

-    and.l @(0x1234:16,er3),@(0x9abcdef0:32,er2.l)       ;01046f3c1234fa609abcdef0

-    and.l @(0x1234:16,er3),@0xffff9abc:16               ;01046f3c123440609abc

-    and.l @(0x1234:16,er3),@0x9abcdef0:32               ;01046f3c123448609abcdef0

-

-    and.l @(0x12345678:32,er3),@er1                         ;78b46b2c123456780160

-    and.l @(0x12345678:32,er3),@(0xc:2,er1)                   ;78b46b2c123456783160

-    and.l @(0x12345678:32,er3),@-er1                        ;78b46b2c12345678b160

-    and.l @(0x12345678:32,er3),@er1+                        ;78b46b2c123456788160

-    and.l @(0x12345678:32,er3),@er1-                        ;78b46b2c12345678a160

-    and.l @(0x12345678:32,er3),@+er1                        ;78b46b2c123456789160

-    and.l @(0x12345678:32,er3),@(0xffff9abc:16,er1)         ;78b46b2c12345678c1609abc

-    and.l @(0x12345678:32,er3),@(0x9abcdef0:32,er1)         ;78b46b2c12345678c9609abcdef0

-    and.l @(0x12345678:32,er3),@(0xffff9abc:16,r2l.b)       ;78b46b2c12345678d2609abc

-    and.l @(0x12345678:32,er3),@(0xffff9abc:16,r2.w)       ;78b46b2c12345678e2609abc

-    and.l @(0x12345678:32,er3),@(0xffff9abc:16,er2.l)       ;78b46b2c12345678f2609abc

-    and.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2l.b)       ;78b46b2c12345678da609abcdef0

-    and.l @(0x12345678:32,er3),@(0x9abcdef0:32,r2.w)       ;78b46b2c12345678ea609abcdef0

-    and.l @(0x12345678:32,er3),@(0x9abcdef0:32,er2.l)       ;78b46b2c12345678fa609abcdef0

-    and.l @(0x12345678:32,er3),@0xffff9abc:16               ;78b46b2c1234567840609abc

-    and.l @(0x12345678:32,er3),@0x9abcdef0:32               ;78b46b2c1234567848609abcdef0

-

-    and.l @(0x1234:16,r3l.b),@er1                       ;01056f3c12340160

-    and.l @(0x1234:16,r3l.b),@(0xc:2,er1)                 ;01056f3c12343160

-    and.l @(0x1234:16,r3l.b),@-er1                      ;01056f3c1234b160

-    and.l @(0x1234:16,r3l.b),@er1+                      ;01056f3c12348160

-    and.l @(0x1234:16,r3l.b),@er1-                      ;01056f3c1234a160

-    and.l @(0x1234:16,r3l.b),@+er1                      ;01056f3c12349160

-    and.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er1)       ;01056f3c1234c1609abc

-    and.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er1)       ;01056f3c1234c9609abcdef0

-    and.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2l.b)     ;01056f3c1234d2609abc

-    and.l @(0x1234:16,r3l.b),@(0xffff9abc:16,r2.w)     ;01056f3c1234e2609abc

-    and.l @(0x1234:16,r3l.b),@(0xffff9abc:16,er2.l)     ;01056f3c1234f2609abc

-    and.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2l.b)     ;01056f3c1234da609abcdef0

-    and.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,r2.w)     ;01056f3c1234ea609abcdef0

-    and.l @(0x1234:16,r3l.b),@(0x9abcdef0:32,er2.l)     ;01056f3c1234fa609abcdef0

-    and.l @(0x1234:16,r3l.b),@0xffff9abc:16             ;01056f3c123440609abc

-    and.l @(0x1234:16,r3l.b),@0x9abcdef0:32             ;01056f3c123448609abcdef0

-

-    and.l @(0x1234:16,r3.w),@er1                       ;01066f3c12340160

-    and.l @(0x1234:16,r3.w),@(0xc:2,er1)                 ;01066f3c12343160

-    and.l @(0x1234:16,r3.w),@-er1                      ;01066f3c1234b160

-    and.l @(0x1234:16,r3.w),@er1+                      ;01066f3c12348160

-    and.l @(0x1234:16,r3.w),@er1-                      ;01066f3c1234a160

-    and.l @(0x1234:16,r3.w),@+er1                      ;01066f3c12349160

-    and.l @(0x1234:16,r3.w),@(0xffff9abc:16,er1)       ;01066f3c1234c1609abc

-    and.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er1)       ;01066f3c1234c9609abcdef0

-    and.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2l.b)     ;01066f3c1234d2609abc

-    and.l @(0x1234:16,r3.w),@(0xffff9abc:16,r2.w)     ;01066f3c1234e2609abc

-    and.l @(0x1234:16,r3.w),@(0xffff9abc:16,er2.l)     ;01066f3c1234f2609abc

-    and.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2l.b)     ;01066f3c1234da609abcdef0

-    and.l @(0x1234:16,r3.w),@(0x9abcdef0:32,r2.w)     ;01066f3c1234ea609abcdef0

-    and.l @(0x1234:16,r3.w),@(0x9abcdef0:32,er2.l)     ;01066f3c1234fa609abcdef0

-    and.l @(0x1234:16,r3.w),@0xffff9abc:16             ;01066f3c123440609abc

-    and.l @(0x1234:16,r3.w),@0x9abcdef0:32             ;01066f3c123448609abcdef0

-

-    and.l @(0x1234:16,er3.l),@er1                       ;01076f3c12340160

-    and.l @(0x1234:16,er3.l),@(0xc:2,er1)                 ;01076f3c12343160

-    and.l @(0x1234:16,er3.l),@-er1                      ;01076f3c1234b160

-    and.l @(0x1234:16,er3.l),@er1+                      ;01076f3c12348160

-    and.l @(0x1234:16,er3.l),@er1-                      ;01076f3c1234a160

-    and.l @(0x1234:16,er3.l),@+er1                      ;01076f3c12349160

-    and.l @(0x1234:16,er3.l),@(0xffff9abc:16,er1)       ;01076f3c1234c1609abc

-    and.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er1)       ;01076f3c1234c9609abcdef0

-    and.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2l.b)     ;01076f3c1234d2609abc

-    and.l @(0x1234:16,er3.l),@(0xffff9abc:16,r2.w)     ;01076f3c1234e2609abc

-    and.l @(0x1234:16,er3.l),@(0xffff9abc:16,er2.l)     ;01076f3c1234f2609abc

-    and.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2l.b)     ;01076f3c1234da609abcdef0

-    and.l @(0x1234:16,er3.l),@(0x9abcdef0:32,r2.w)     ;01076f3c1234ea609abcdef0

-    and.l @(0x1234:16,er3.l),@(0x9abcdef0:32,er2.l)     ;01076f3c1234fa609abcdef0

-    and.l @(0x1234:16,er3.l),@0xffff9abc:16             ;01076f3c123440609abc

-    and.l @(0x1234:16,er3.l),@0x9abcdef0:32             ;01076f3c123448609abcdef0

-

-    and.l @(0x12345678:32,r3l.b),@er1                       ;78b56b2c123456780160

-    and.l @(0x12345678:32,r3l.b),@(0xc:2,er1)                 ;78b56b2c123456783160

-    and.l @(0x12345678:32,r3l.b),@-er1                      ;78b56b2c12345678b160

-    and.l @(0x12345678:32,r3l.b),@er1+                      ;78b56b2c123456788160

-    and.l @(0x12345678:32,r3l.b),@er1-                      ;78b56b2c12345678a160

-    and.l @(0x12345678:32,r3l.b),@+er1                      ;78b56b2c123456789160

-    and.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er1)       ;78b56b2c12345678c1609abc

-    and.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er1)       ;78b56b2c12345678c9609abcdef0

-    and.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2l.b)     ;78b56b2c12345678d2609abc

-    and.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,r2.w)     ;78b56b2c12345678e2609abc

-    and.l @(0x12345678:32,r3l.b),@(0xffff9abc:16,er2.l)     ;78b56b2c12345678f2609abc

-    and.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2l.b)     ;78b56b2c12345678da609abcdef0

-    and.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,r2.w)     ;78b56b2c12345678ea609abcdef0

-    and.l @(0x12345678:32,r3l.b),@(0x9abcdef0:32,er2.l)     ;78b56b2c12345678fa609abcdef0

-    and.l @(0x12345678:32,r3l.b),@0xffff9abc:16             ;78b56b2c1234567840609abc

-    and.l @(0x12345678:32,r3l.b),@0x9abcdef0:32             ;78b56b2c1234567848609abcdef0

-

-    and.l @(0x12345678:32,r3.w),@er1                       ;78b66b2c123456780160

-    and.l @(0x12345678:32,r3.w),@(0xc:2,er1)                 ;78b66b2c123456783160

-    and.l @(0x12345678:32,r3.w),@-er1                      ;78b66b2c12345678b160

-    and.l @(0x12345678:32,r3.w),@er1+                      ;78b66b2c123456788160

-    and.l @(0x12345678:32,r3.w),@er1-                      ;78b66b2c12345678a160

-    and.l @(0x12345678:32,r3.w),@+er1                      ;78b66b2c123456789160

-    and.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er1)       ;78b66b2c12345678c1609abc

-    and.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er1)       ;78b66b2c12345678c9609abcdef0

-    and.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2l.b)     ;78b66b2c12345678d2609abc

-    and.l @(0x12345678:32,r3.w),@(0xffff9abc:16,r2.w)     ;78b66b2c12345678e2609abc

-    and.l @(0x12345678:32,r3.w),@(0xffff9abc:16,er2.l)     ;78b66b2c12345678f2609abc

-    and.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2l.b)     ;78b66b2c12345678da609abcdef0

-    and.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,r2.w)     ;78b66b2c12345678ea609abcdef0

-    and.l @(0x12345678:32,r3.w),@(0x9abcdef0:32,er2.l)     ;78b66b2c12345678fa609abcdef0

-    and.l @(0x12345678:32,r3.w),@0xffff9abc:16             ;78b66b2c1234567840609abc

-    and.l @(0x12345678:32,r3.w),@0x9abcdef0:32             ;78b66b2c1234567848609abcdef0

-

-    and.l @(0x12345678:32,er3.l),@er1                       ;78b76b2c123456780160

-    and.l @(0x12345678:32,er3.l),@(0xc:2,er1)                 ;78b76b2c123456783160

-    and.l @(0x12345678:32,er3.l),@-er1                      ;78b76b2c12345678b160

-    and.l @(0x12345678:32,er3.l),@er1+                      ;78b76b2c123456788160

-    and.l @(0x12345678:32,er3.l),@er1-                      ;78b76b2c12345678a160

-    and.l @(0x12345678:32,er3.l),@+er1                      ;78b76b2c123456789160

-    and.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er1)       ;78b76b2c12345678c1609abc

-    and.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er1)       ;78b76b2c12345678c9609abcdef0

-    and.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2l.b)     ;78b76b2c12345678d2609abc

-    and.l @(0x12345678:32,er3.l),@(0xffff9abc:16,r2.w)     ;78b76b2c12345678e2609abc

-    and.l @(0x12345678:32,er3.l),@(0xffff9abc:16,er2.l)     ;78b76b2c12345678f2609abc

-    and.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2l.b)     ;78b76b2c12345678da609abcdef0

-    and.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,r2.w)     ;78b76b2c12345678ea609abcdef0

-    and.l @(0x12345678:32,er3.l),@(0x9abcdef0:32,er2.l)     ;78b76b2c12345678fa609abcdef0

-    and.l @(0x12345678:32,er3.l),@0xffff9abc:16             ;78b76b2c1234567840609abc

-    and.l @(0x12345678:32,er3.l),@0x9abcdef0:32             ;78b76b2c1234567848609abcdef0

-

-    and.l @0x1234:16,@er1                              ;01046b0c12340160

-    and.l @0x1234:16,@(0xc:2,er1)                        ;01046b0c12343160

-    and.l @0x1234:16,@-er1                             ;01046b0c1234b160

-    and.l @0x1234:16,@er1+                             ;01046b0c12348160

-    and.l @0x1234:16,@er1-                             ;01046b0c1234a160

-    and.l @0x1234:16,@+er1                             ;01046b0c12349160

-    and.l @0x1234:16,@(0xffff9abc:16,er1)              ;01046b0c1234c1609abc

-    and.l @0x1234:16,@(0x9abcdef0:32,er1)              ;01046b0c1234c9609abcdef0

-    and.l @0x1234:16,@(0xffff9abc:16,r2l.b)            ;01046b0c1234d2609abc

-    and.l @0x1234:16,@(0xffff9abc:16,r2.w)            ;01046b0c1234e2609abc

-    and.l @0x1234:16,@(0xffff9abc:16,er2.l)            ;01046b0c1234f2609abc

-    and.l @0x1234:16,@(0x9abcdef0:32,r2l.b)            ;01046b0c1234da609abcdef0

-    and.l @0x1234:16,@(0x9abcdef0:32,r2.w)            ;01046b0c1234ea609abcdef0

-    and.l @0x1234:16,@(0x9abcdef0:32,er2.l)            ;01046b0c1234fa609abcdef0

-    and.l @0x1234:16,@0xffff9abc:16                    ;01046b0c123440609abc

-    and.l @0x1234:16,@0x9abcdef0:32                    ;01046b0c123448609abcdef0

-

-    and.l @0x12345678:32,@er1                              ;01046b2c123456780160

-    and.l @0x12345678:32,@(0xc:2,er1)                        ;01046b2c123456783160

-    and.l @0x12345678:32,@-er1                             ;01046b2c12345678b160

-    and.l @0x12345678:32,@er1+                             ;01046b2c123456788160

-    and.l @0x12345678:32,@er1-                             ;01046b2c12345678a160

-    and.l @0x12345678:32,@+er1                             ;01046b2c123456789160

-    and.l @0x12345678:32,@(0xffff9abc:16,er1)              ;01046b2c12345678c1609abc

-    and.l @0x12345678:32,@(0x9abcdef0:32,er1)              ;01046b2c12345678c9609abcdef0

-    and.l @0x12345678:32,@(0xffff9abc:16,r2l.b)            ;01046b2c12345678d2609abc

-    and.l @0x12345678:32,@(0xffff9abc:16,r2.w)            ;01046b2c12345678e2609abc

-    and.l @0x12345678:32,@(0xffff9abc:16,er2.l)            ;01046b2c12345678f2609abc

-    and.l @0x12345678:32,@(0x9abcdef0:32,r2l.b)            ;01046b2c12345678da609abcdef0

-    and.l @0x12345678:32,@(0x9abcdef0:32,r2.w)            ;01046b2c12345678ea609abcdef0

-    and.l @0x12345678:32,@(0x9abcdef0:32,er2.l)            ;01046b2c12345678fa609abcdef0

-    and.l @0x12345678:32,@0xffff9abc:16                    ;01046b2c1234567840609abc

-    and.l @0x12345678:32,@0x9abcdef0:32                    ;01046b2c1234567848609abcdef0

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t11_logs.exp b/gdb/testsuite/gdb.disasm/t11_logs.exp
deleted file mode 100644
index 85b2a9ea827..00000000000
--- a/gdb/testsuite/gdb.disasm/t11_logs.exp
+++ /dev/null
@@ -1,2258 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t11_logs"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "not.b\tr1h" \
-	"not.b r1h"
-gdb_test "x" "not.b\t@er1" \
-	"not.b @er1"
-gdb_test "x" "not.b\t@\\(0x3(:2|),er1\\)" \
-	"not.b @(0x3:2,er1)"
-gdb_test "x" "not.b\t@er1\\+" \
-	"not.b @er1+"
-gdb_test "x" "not.b\t@-er1" \
-	"not.b @-er1"
-gdb_test "x" "not.b\t@\\+er1" \
-	"not.b @+er1"
-gdb_test "x" "not.b\t@er1-" \
-	"not.b @er1-"
-gdb_test "x" "not.b\t@\\(0x1234(:16|),er1\\)" \
-	"not.b @(0x1234:16,er1)"
-gdb_test "x" "not.b\t@\\(0x12345678(:32|),er1\\)" \
-	"not.b @(0x12345678:32,er1)"
-gdb_test "x" "not.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"not.b @(0x1234:16,r2l.b)"
-gdb_test "x" "not.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"not.b @(0x1234:16,r2.w)"
-gdb_test "x" "not.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"not.b @(0x1234:16,er2.l)"
-gdb_test "x" "not.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"not.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "not.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"not.b @(0x12345678:32,r2.w)"
-gdb_test "x" "not.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"not.b @(0x12345678:32,er2.l)"
-gdb_test "x" "not.b\t@0x12(:8|)" \
-	"not.b @0x12:8"
-gdb_test "x" "not.b\t@0x1234(:16|)" \
-	"not.b @0x1234:16"
-gdb_test "x" "not.b\t@0x12345678(:32|)" \
-	"not.b @0x12345678:32"
-gdb_test "x" "not.w\tr1" \
-	"not.w r1"
-gdb_test "x" "not.w\t@er1" \
-	"not.w @er1"
-gdb_test "x" "not.w\t@\\(0x6(:2|),er1\\)" \
-	"not.w @(0x6:2,er1)"
-gdb_test "x" "not.w\t@er1\\+" \
-	"not.w @er1+"
-gdb_test "x" "not.w\t@-er1" \
-	"not.w @-er1"
-gdb_test "x" "not.w\t@\\+er1" \
-	"not.w @+er1"
-gdb_test "x" "not.w\t@er1-" \
-	"not.w @er1-"
-gdb_test "x" "not.w\t@\\(0x1234(:16|),er1\\)" \
-	"not.w @(0x1234:16,er1)"
-gdb_test "x" "not.w\t@\\(0x12345678(:32|),er1\\)" \
-	"not.w @(0x12345678:32,er1)"
-gdb_test "x" "not.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"not.w @(0x1234:16,r2l.b)"
-gdb_test "x" "not.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"not.w @(0x1234:16,r2.w)"
-gdb_test "x" "not.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"not.w @(0x1234:16,er2.l)"
-gdb_test "x" "not.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"not.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "not.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"not.w @(0x12345678:32,r2.w)"
-gdb_test "x" "not.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"not.w @(0x12345678:32,er2.l)"
-gdb_test "x" "not.w\t@0x1234(:16|)" \
-	"not.w @0x1234:16"
-gdb_test "x" "not.w\t@0x12345678(:32|)" \
-	"not.w @0x12345678:32"
-gdb_test "x" "not.l\ter1" \
-	"not.l er1"
-gdb_test "x" "not.l\t@er1" \
-	"not.l @er1"
-gdb_test "x" "not.l\t@\\(0xc(:2|),er1\\)" \
-	"not.l @(0xc:2,er1)"
-gdb_test "x" "not.l\t@er1\\+" \
-	"not.l @er1+"
-gdb_test "x" "not.l\t@-er1" \
-	"not.l @-er1"
-gdb_test "x" "not.l\t@\\+er1" \
-	"not.l @+er1"
-gdb_test "x" "not.l\t@er1-" \
-	"not.l @er1-"
-gdb_test "x" "not.l\t@\\(0x1234(:16|),er1\\)" \
-	"not.l @(0x1234:16,er1)"
-gdb_test "x" "not.l\t@\\(0x12345678(:32|),er1\\)" \
-	"not.l @(0x12345678:32,er1)"
-gdb_test "x" "not.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"not.l @(0x1234:16,r2l.b)"
-gdb_test "x" "not.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"not.l @(0x1234:16,r2.w)"
-gdb_test "x" "not.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"not.l @(0x1234:16,er2.l)"
-gdb_test "x" "not.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"not.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "not.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"not.l @(0x12345678:32,r2.w)"
-gdb_test "x" "not.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"not.l @(0x12345678:32,er2.l)"
-gdb_test "x" "not.l\t@0x1234(:16|)" \
-	"not.l @0x1234:16"
-gdb_test "x" "not.l\t@0x12345678(:32|)" \
-	"not.l @0x12345678:32"
-gdb_test "x" "shll.b\tr1h" \
-	"shll.b r1h"
-gdb_test "x" "shll.b\t@er1" \
-	"shll.b @er1"
-gdb_test "x" "shll.b\t@\\(0x3(:2|),er1\\)" \
-	"shll.b @(0x3:2,er1)"
-gdb_test "x" "shll.b\t@er1\\+" \
-	"shll.b @er1+"
-gdb_test "x" "shll.b\t@-er1" \
-	"shll.b @-er1"
-gdb_test "x" "shll.b\t@\\+er1" \
-	"shll.b @+er1"
-gdb_test "x" "shll.b\t@er1-" \
-	"shll.b @er1-"
-gdb_test "x" "shll.b\t@\\(0x1234(:16|),er1\\)" \
-	"shll.b @(0x1234:16,er1)"
-gdb_test "x" "shll.b\t@\\(0x12345678(:32|),er1\\)" \
-	"shll.b @(0x12345678:32,er1)"
-gdb_test "x" "shll.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.b @(0x1234:16,r2l.b)"
-gdb_test "x" "shll.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"shll.b @(0x1234:16,r2.w)"
-gdb_test "x" "shll.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"shll.b @(0x1234:16,er2.l)"
-gdb_test "x" "shll.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.b @(0x12345678:32,r2.w)"
-gdb_test "x" "shll.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.b @(0x12345678:32,er2.l)"
-gdb_test "x" "shll.b\t@0x12(:8|)" \
-	"shll.b @0x12:8"
-gdb_test "x" "shll.b\t@0x1234(:16|)" \
-	"shll.b @0x1234:16"
-gdb_test "x" "shll.b\t@0x12345678(:32|)" \
-	"shll.b @0x12345678:32"
-gdb_test "x" "shll.w\tr1" \
-	"shll.w r1"
-gdb_test "x" "shll.w\t@er1" \
-	"shll.w @er1"
-gdb_test "x" "shll.w\t@\\(0x6(:2|),er1\\)" \
-	"shll.w @(0x6:2,er1)"
-gdb_test "x" "shll.w\t@er1\\+" \
-	"shll.w @er1+"
-gdb_test "x" "shll.w\t@-er1" \
-	"shll.w @-er1"
-gdb_test "x" "shll.w\t@\\+er1" \
-	"shll.w @+er1"
-gdb_test "x" "shll.w\t@er1-" \
-	"shll.w @er1-"
-gdb_test "x" "shll.w\t@\\(0x1234(:16|),er1\\)" \
-	"shll.w @(0x1234:16,er1)"
-gdb_test "x" "shll.w\t@\\(0x12345678(:32|),er1\\)" \
-	"shll.w @(0x12345678:32,er1)"
-gdb_test "x" "shll.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.w @(0x1234:16,r2l.b)"
-gdb_test "x" "shll.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"shll.w @(0x1234:16,r2.w)"
-gdb_test "x" "shll.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"shll.w @(0x1234:16,er2.l)"
-gdb_test "x" "shll.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.w @(0x12345678:32,r2.w)"
-gdb_test "x" "shll.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.w @(0x12345678:32,er2.l)"
-gdb_test "x" "shll.w\t@0x1234(:16|)" \
-	"shll.w @0x1234:16"
-gdb_test "x" "shll.w\t@0x12345678(:32|)" \
-	"shll.w @0x12345678:32"
-gdb_test "x" "shll.l\ter1" \
-	"shll.l er1"
-gdb_test "x" "shll.l\t@er1" \
-	"shll.l @er1"
-gdb_test "x" "shll.l\t@\\(0xc(:2|),er1\\)" \
-	"shll.l @(0xc:2,er1)"
-gdb_test "x" "shll.l\t@er1\\+" \
-	"shll.l @er1+"
-gdb_test "x" "shll.l\t@-er1" \
-	"shll.l @-er1"
-gdb_test "x" "shll.l\t@\\+er1" \
-	"shll.l @+er1"
-gdb_test "x" "shll.l\t@er1-" \
-	"shll.l @er1-"
-gdb_test "x" "shll.l\t@\\(0x1234(:16|),er1\\)" \
-	"shll.l @(0x1234:16,er1)"
-gdb_test "x" "shll.l\t@\\(0x12345678(:32|),er1\\)" \
-	"shll.l @(0x12345678:32,er1)"
-gdb_test "x" "shll.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.l @(0x1234:16,r2l.b)"
-gdb_test "x" "shll.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"shll.l @(0x1234:16,r2.w)"
-gdb_test "x" "shll.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"shll.l @(0x1234:16,er2.l)"
-gdb_test "x" "shll.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.l @(0x12345678:32,r2.w)"
-gdb_test "x" "shll.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.l @(0x12345678:32,er2.l)"
-gdb_test "x" "shll.l\t@0x1234(:16|)" \
-	"shll.l @0x1234:16"
-gdb_test "x" "shll.l\t@0x12345678(:32|)" \
-	"shll.l @0x12345678:32"
-gdb_test "x" "shll.b\t#2,r1h" \
-	"shll.b #2,r1h"
-gdb_test "x" "shll.b\t#2,@er1" \
-	"shll.b #2,@er1"
-gdb_test "x" "shll.b\t#2,@\\(0x3(:2|),er1\\)" \
-	"shll.b #2,@(0x3:2,er1)"
-gdb_test "x" "shll.b\t#2,@er1\\+" \
-	"shll.b #2,@er1+"
-gdb_test "x" "shll.b\t#2,@-er1" \
-	"shll.b #2,@-er1"
-gdb_test "x" "shll.b\t#2,@\\+er1" \
-	"shll.b #2,@+er1"
-gdb_test "x" "shll.b\t#2,@er1-" \
-	"shll.b #2,@er1-"
-gdb_test "x" "shll.b\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shll.b #2,@(0x1234:16,er1)"
-gdb_test "x" "shll.b\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shll.b #2,@(0x12345678:32,er1)"
-gdb_test "x" "shll.b\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.b #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.b\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.b #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.b\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.b #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.b\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.b #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.b\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.b #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.b\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.b #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.b\t#2,@0x12(:8|)" \
-	"shll.b #2,@0x12:8"
-gdb_test "x" "shll.b\t#2,@0x1234(:16|)" \
-	"shll.b #2,@0x1234:16"
-gdb_test "x" "shll.b\t#2,@0x12345678(:32|)" \
-	"shll.b #2,@0x12345678:32"
-gdb_test "x" "shll.w\t#2,r1" \
-	"shll.w #2,r1"
-gdb_test "x" "shll.w\t#2,@er1" \
-	"shll.w #2,@er1"
-gdb_test "x" "shll.w\t#2,@\\(0x6(:2|),er1\\)" \
-	"shll.w #2,@(0x6:2,er1)"
-gdb_test "x" "shll.w\t#2,@er1\\+" \
-	"shll.w #2,@er1+"
-gdb_test "x" "shll.w\t#2,@-er1" \
-	"shll.w #2,@-er1"
-gdb_test "x" "shll.w\t#2,@\\+er1" \
-	"shll.w #2,@+er1"
-gdb_test "x" "shll.w\t#2,@er1-" \
-	"shll.w #2,@er1-"
-gdb_test "x" "shll.w\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shll.w #2,@(0x1234:16,er1)"
-gdb_test "x" "shll.w\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shll.w #2,@(0x12345678:32,er1)"
-gdb_test "x" "shll.w\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.w #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.w\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.w #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.w\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.w #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.w\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.w #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.w\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.w #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.w\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.w #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.w\t#2,@0x1234(:16|)" \
-	"shll.w #2,@0x1234:16"
-gdb_test "x" "shll.w\t#2,@0x12345678(:32|)" \
-	"shll.w #2,@0x12345678:32"
-gdb_test "x" "shll.l\t#2,er1" \
-	"shll.l #2,er1"
-gdb_test "x" "shll.l\t#2,@er1" \
-	"shll.l #2,@er1"
-gdb_test "x" "shll.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"shll.l #2,@(0xc:2,er1)"
-gdb_test "x" "shll.l\t#2,@er1\\+" \
-	"shll.l #2,@er1+"
-gdb_test "x" "shll.l\t#2,@-er1" \
-	"shll.l #2,@-er1"
-gdb_test "x" "shll.l\t#2,@\\+er1" \
-	"shll.l #2,@+er1"
-gdb_test "x" "shll.l\t#2,@er1-" \
-	"shll.l #2,@er1-"
-gdb_test "x" "shll.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shll.l #2,@(0x1234:16,er1)"
-gdb_test "x" "shll.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shll.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "shll.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.l\t#2,@0x1234(:16|)" \
-	"shll.l #2,@0x1234:16"
-gdb_test "x" "shll.l\t#2,@0x12345678(:32|)" \
-	"shll.l #2,@0x12345678:32"
-gdb_test "x" "shll.b\t#4,r1h" \
-	"shll.b #4,r1h"
-gdb_test "x" "shll.b\t#4,@er1" \
-	"shll.b #4,@er1"
-gdb_test "x" "shll.b\t#4,@\\(0x3(:2|),er1\\)" \
-	"shll.b #4,@(0x3:2,er1)"
-gdb_test "x" "shll.b\t#4,@er1\\+" \
-	"shll.b #4,@er1+"
-gdb_test "x" "shll.b\t#4,@-er1" \
-	"shll.b #4,@-er1"
-gdb_test "x" "shll.b\t#4,@\\+er1" \
-	"shll.b #4,@+er1"
-gdb_test "x" "shll.b\t#4,@er1-" \
-	"shll.b #4,@er1-"
-gdb_test "x" "shll.b\t#4,@\\(0x1234(:16|),er1\\)" \
-	"shll.b #4,@(0x1234:16,er1)"
-gdb_test "x" "shll.b\t#4,@\\(0x12345678(:32|),er1\\)" \
-	"shll.b #4,@(0x12345678:32,er1)"
-gdb_test "x" "shll.b\t#4,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.b #4,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.b\t#4,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.b #4,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.b\t#4,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.b #4,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.b\t#4,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.b #4,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.b\t#4,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.b #4,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.b\t#4,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.b #4,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.b\t#4,@0x12(:8|)" \
-	"shll.b #4,@0x12:8"
-gdb_test "x" "shll.b\t#4,@0x1234(:16|)" \
-	"shll.b #4,@0x1234:16"
-gdb_test "x" "shll.b\t#4,@0x12345678(:32|)" \
-	"shll.b #4,@0x12345678:32"
-gdb_test "x" "shll.w\t#4,r1" \
-	"shll.w #4,r1"
-gdb_test "x" "shll.w\t#4,@er1" \
-	"shll.w #4,@er1"
-gdb_test "x" "shll.w\t#4,@\\(0x6(:2|),er1\\)" \
-	"shll.w #4,@(0x6:2,er1)"
-gdb_test "x" "shll.w\t#4,@er1\\+" \
-	"shll.w #4,@er1+"
-gdb_test "x" "shll.w\t#4,@-er1" \
-	"shll.w #4,@-er1"
-gdb_test "x" "shll.w\t#4,@\\+er1" \
-	"shll.w #4,@+er1"
-gdb_test "x" "shll.w\t#4,@er1-" \
-	"shll.w #4,@er1-"
-gdb_test "x" "shll.w\t#4,@\\(0x1234(:16|),er1\\)" \
-	"shll.w #4,@(0x1234:16,er1)"
-gdb_test "x" "shll.w\t#4,@\\(0x12345678(:32|),er1\\)" \
-	"shll.w #4,@(0x12345678:32,er1)"
-gdb_test "x" "shll.w\t#4,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.w #4,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.w\t#4,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.w #4,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.w\t#4,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.w #4,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.w\t#4,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.w #4,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.w\t#4,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.w #4,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.w\t#4,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.w #4,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.w\t#4,@0x1234(:16|)" \
-	"shll.w #4,@0x1234:16"
-gdb_test "x" "shll.w\t#4,@0x12345678(:32|)" \
-	"shll.w #4,@0x12345678:32"
-gdb_test "x" "shll.l\t#4,er1" \
-	"shll.l #4,er1"
-gdb_test "x" "shll.l\t#4,@er1" \
-	"shll.l #4,@er1"
-gdb_test "x" "shll.l\t#4,@\\(0xc(:2|),er1\\)" \
-	"shll.l #4,@(0xc:2,er1)"
-gdb_test "x" "shll.l\t#4,@er1\\+" \
-	"shll.l #4,@er1+"
-gdb_test "x" "shll.l\t#4,@-er1" \
-	"shll.l #4,@-er1"
-gdb_test "x" "shll.l\t#4,@\\+er1" \
-	"shll.l #4,@+er1"
-gdb_test "x" "shll.l\t#4,@er1-" \
-	"shll.l #4,@er1-"
-gdb_test "x" "shll.l\t#4,@\\(0x1234(:16|),er1\\)" \
-	"shll.l #4,@(0x1234:16,er1)"
-gdb_test "x" "shll.l\t#4,@\\(0x12345678(:32|),er1\\)" \
-	"shll.l #4,@(0x12345678:32,er1)"
-gdb_test "x" "shll.l\t#4,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.l #4,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.l\t#4,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.l #4,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.l\t#4,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.l #4,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.l\t#4,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.l #4,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.l\t#4,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.l #4,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.l\t#4,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.l #4,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.l\t#4,@0x1234(:16|)" \
-	"shll.l #4,@0x1234:16"
-gdb_test "x" "shll.l\t#4,@0x12345678(:32|)" \
-	"shll.l #4,@0x12345678:32"
-gdb_test "x" "shll.w\t#8,r1" \
-	"shll.w #8,r1"
-gdb_test "x" "shll.w\t#8,@er1" \
-	"shll.w #8,@er1"
-gdb_test "x" "shll.w\t#8,@\\(0x6(:2|),er1\\)" \
-	"shll.w #8,@(0x6:2,er1)"
-gdb_test "x" "shll.w\t#8,@er1\\+" \
-	"shll.w #8,@er1+"
-gdb_test "x" "shll.w\t#8,@-er1" \
-	"shll.w #8,@-er1"
-gdb_test "x" "shll.w\t#8,@\\+er1" \
-	"shll.w #8,@+er1"
-gdb_test "x" "shll.w\t#8,@er1-" \
-	"shll.w #8,@er1-"
-gdb_test "x" "shll.w\t#8,@\\(0x1234(:16|),er1\\)" \
-	"shll.w #8,@(0x1234:16,er1)"
-gdb_test "x" "shll.w\t#8,@\\(0x12345678(:32|),er1\\)" \
-	"shll.w #8,@(0x12345678:32,er1)"
-gdb_test "x" "shll.w\t#8,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.w #8,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.w\t#8,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.w #8,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.w\t#8,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.w #8,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.w\t#8,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.w #8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.w\t#8,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.w #8,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.w\t#8,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.w #8,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.w\t#8,@0x1234(:16|)" \
-	"shll.w #8,@0x1234:16"
-gdb_test "x" "shll.w\t#8,@0x12345678(:32|)" \
-	"shll.w #8,@0x12345678:32"
-gdb_test "x" "shll.l\t#8,er1" \
-	"shll.l #8,er1"
-gdb_test "x" "shll.l\t#8,@er1" \
-	"shll.l #8,@er1"
-gdb_test "x" "shll.l\t#8,@\\(0xc(:2|),er1\\)" \
-	"shll.l #8,@(0xc:2,er1)"
-gdb_test "x" "shll.l\t#8,@er1\\+" \
-	"shll.l #8,@er1+"
-gdb_test "x" "shll.l\t#8,@-er1" \
-	"shll.l #8,@-er1"
-gdb_test "x" "shll.l\t#8,@\\+er1" \
-	"shll.l #8,@+er1"
-gdb_test "x" "shll.l\t#8,@er1-" \
-	"shll.l #8,@er1-"
-gdb_test "x" "shll.l\t#8,@\\(0x1234(:16|),er1\\)" \
-	"shll.l #8,@(0x1234:16,er1)"
-gdb_test "x" "shll.l\t#8,@\\(0x12345678(:32|),er1\\)" \
-	"shll.l #8,@(0x12345678:32,er1)"
-gdb_test "x" "shll.l\t#8,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.l #8,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.l\t#8,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.l #8,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.l\t#8,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.l #8,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.l\t#8,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.l #8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.l\t#8,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.l #8,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.l\t#8,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.l #8,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.l\t#8,@0x1234(:16|)" \
-	"shll.l #8,@0x1234:16"
-gdb_test "x" "shll.l\t#8,@0x12345678(:32|)" \
-	"shll.l #8,@0x12345678:32"
-gdb_test "x" "shll.l\t#16,er1" \
-	"shll.l #16,er1"
-gdb_test "x" "shll.l\t#16,@er1" \
-	"shll.l #16,@er1"
-gdb_test "x" "shll.l\t#16,@\\(0xc(:2|),er1\\)" \
-	"shll.l #16,@(0xc:2,er1)"
-gdb_test "x" "shll.l\t#16,@er1\\+" \
-	"shll.l #16,@er1+"
-gdb_test "x" "shll.l\t#16,@-er1" \
-	"shll.l #16,@-er1"
-gdb_test "x" "shll.l\t#16,@\\+er1" \
-	"shll.l #16,@+er1"
-gdb_test "x" "shll.l\t#16,@er1-" \
-	"shll.l #16,@er1-"
-gdb_test "x" "shll.l\t#16,@\\(0x1234(:16|),er1\\)" \
-	"shll.l #16,@(0x1234:16,er1)"
-gdb_test "x" "shll.l\t#16,@\\(0x12345678(:32|),er1\\)" \
-	"shll.l #16,@(0x12345678:32,er1)"
-gdb_test "x" "shll.l\t#16,@\\(0x1234(:16|),r2l.b\\)" \
-	"shll.l #16,@(0x1234:16,r2l.b)"
-gdb_test "x" "shll.l\t#16,@\\(0x1234(:16|),r2.w\\)" \
-	"shll.l #16,@(0x1234:16,r2.w)"
-gdb_test "x" "shll.l\t#16,@\\(0x1234(:16|),er2.l\\)" \
-	"shll.l #16,@(0x1234:16,er2.l)"
-gdb_test "x" "shll.l\t#16,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shll.l #16,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shll.l\t#16,@\\(0x12345678(:32|),r2.w\\)" \
-	"shll.l #16,@(0x12345678:32,r2.w)"
-gdb_test "x" "shll.l\t#16,@\\(0x12345678(:32|),er2.l\\)" \
-	"shll.l #16,@(0x12345678:32,er2.l)"
-gdb_test "x" "shll.l\t#16,@0x1234(:16|)" \
-	"shll.l #16,@0x1234:16"
-gdb_test "x" "shll.l\t#16,@0x12345678(:32|)" \
-	"shll.l #16,@0x12345678:32"
-gdb_test "x" "shll.b\t#0x7(:5|),r1h" \
-	"shll.b #0x7:5,r1h"
-gdb_test "x" "shll.w\t#0xf(:5|),r1" \
-	"shll.w #0xf:5,r1"
-gdb_test "x" "shll.l\t#0x1f(:5|),er1" \
-	"shll.l #0x1f:5,er1"
-gdb_test "x" "shll.b\tr3h,r1h" \
-	"shll.b r3h,r1h"
-gdb_test "x" "shll.w\tr3h,r1" \
-	"shll.w r3h,r1"
-gdb_test "x" "shll.l\tr3h,er1" \
-	"shll.l r3h,er1"
-gdb_test "x" "shlr.b\tr1h" \
-	"shlr.b r1h"
-gdb_test "x" "shlr.b\t@er1" \
-	"shlr.b @er1"
-gdb_test "x" "shlr.b\t@\\(0x3(:2|),er1\\)" \
-	"shlr.b @(0x3:2,er1)"
-gdb_test "x" "shlr.b\t@er1\\+" \
-	"shlr.b @er1+"
-gdb_test "x" "shlr.b\t@-er1" \
-	"shlr.b @-er1"
-gdb_test "x" "shlr.b\t@\\+er1" \
-	"shlr.b @+er1"
-gdb_test "x" "shlr.b\t@er1-" \
-	"shlr.b @er1-"
-gdb_test "x" "shlr.b\t@\\(0x1234(:16|),er1\\)" \
-	"shlr.b @(0x1234:16,er1)"
-gdb_test "x" "shlr.b\t@\\(0x12345678(:32|),er1\\)" \
-	"shlr.b @(0x12345678:32,er1)"
-gdb_test "x" "shlr.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.b @(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.b @(0x1234:16,r2.w)"
-gdb_test "x" "shlr.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.b @(0x1234:16,er2.l)"
-gdb_test "x" "shlr.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.b @(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.b @(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.b\t@0x12(:8|)" \
-	"shlr.b @0x12:8"
-gdb_test "x" "shlr.b\t@0x1234(:16|)" \
-	"shlr.b @0x1234:16"
-gdb_test "x" "shlr.b\t@0x12345678(:32|)" \
-	"shlr.b @0x12345678:32"
-gdb_test "x" "shlr.w\tr1" \
-	"shlr.w r1"
-gdb_test "x" "shlr.w\t@er1" \
-	"shlr.w @er1"
-gdb_test "x" "shlr.w\t@\\(0x6(:2|),er1\\)" \
-	"shlr.w @(0x6:2,er1)"
-gdb_test "x" "shlr.w\t@er1\\+" \
-	"shlr.w @er1+"
-gdb_test "x" "shlr.w\t@-er1" \
-	"shlr.w @-er1"
-gdb_test "x" "shlr.w\t@\\+er1" \
-	"shlr.w @+er1"
-gdb_test "x" "shlr.w\t@er1-" \
-	"shlr.w @er1-"
-gdb_test "x" "shlr.w\t@\\(0x1234(:16|),er1\\)" \
-	"shlr.w @(0x1234:16,er1)"
-gdb_test "x" "shlr.w\t@\\(0x12345678(:32|),er1\\)" \
-	"shlr.w @(0x12345678:32,er1)"
-gdb_test "x" "shlr.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.w @(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.w @(0x1234:16,r2.w)"
-gdb_test "x" "shlr.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.w @(0x1234:16,er2.l)"
-gdb_test "x" "shlr.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.w @(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.w @(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.w\t@0x1234(:16|)" \
-	"shlr.w @0x1234:16"
-gdb_test "x" "shlr.w\t@0x12345678(:32|)" \
-	"shlr.w @0x12345678:32"
-gdb_test "x" "shlr.l\ter1" \
-	"shlr.l er1"
-gdb_test "x" "shlr.l\t@er1" \
-	"shlr.l @er1"
-gdb_test "x" "shlr.l\t@\\(0xc(:2|),er1\\)" \
-	"shlr.l @(0xc:2,er1)"
-gdb_test "x" "shlr.l\t@er1\\+" \
-	"shlr.l @er1+"
-gdb_test "x" "shlr.l\t@-er1" \
-	"shlr.l @-er1"
-gdb_test "x" "shlr.l\t@\\+er1" \
-	"shlr.l @+er1"
-gdb_test "x" "shlr.l\t@er1-" \
-	"shlr.l @er1-"
-gdb_test "x" "shlr.l\t@\\(0x1234(:16|),er1\\)" \
-	"shlr.l @(0x1234:16,er1)"
-gdb_test "x" "shlr.l\t@\\(0x12345678(:32|),er1\\)" \
-	"shlr.l @(0x12345678:32,er1)"
-gdb_test "x" "shlr.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.l @(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.l @(0x1234:16,r2.w)"
-gdb_test "x" "shlr.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.l @(0x1234:16,er2.l)"
-gdb_test "x" "shlr.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.l @(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.l @(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.l\t@0x1234(:16|)" \
-	"shlr.l @0x1234:16"
-gdb_test "x" "shlr.l\t@0x12345678(:32|)" \
-	"shlr.l @0x12345678:32"
-gdb_test "x" "shlr.b\t#2,r1h" \
-	"shlr.b #2,r1h"
-gdb_test "x" "shlr.b\t#2,@er1" \
-	"shlr.b #2,@er1"
-gdb_test "x" "shlr.b\t#2,@\\(0x3(:2|),er1\\)" \
-	"shlr.b #2,@(0x3:2,er1)"
-gdb_test "x" "shlr.b\t#2,@er1\\+" \
-	"shlr.b #2,@er1+"
-gdb_test "x" "shlr.b\t#2,@-er1" \
-	"shlr.b #2,@-er1"
-gdb_test "x" "shlr.b\t#2,@\\+er1" \
-	"shlr.b #2,@+er1"
-gdb_test "x" "shlr.b\t#2,@er1-" \
-	"shlr.b #2,@er1-"
-gdb_test "x" "shlr.b\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shlr.b #2,@(0x1234:16,er1)"
-gdb_test "x" "shlr.b\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.b #2,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.b\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.b #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.b\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.b #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.b\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.b #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.b\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.b #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.b\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.b #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.b\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.b #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.b\t#2,@0x12(:8|)" \
-	"shlr.b #2,@0x12:8"
-gdb_test "x" "shlr.b\t#2,@0x1234(:16|)" \
-	"shlr.b #2,@0x1234:16"
-gdb_test "x" "shlr.b\t#2,@0x12345678(:32|)" \
-	"shlr.b #2,@0x12345678:32"
-gdb_test "x" "shlr.w\t#2,r1" \
-	"shlr.w #2,r1"
-gdb_test "x" "shlr.w\t#2,@er1" \
-	"shlr.w #2,@er1"
-gdb_test "x" "shlr.w\t#2,@\\(0x6(:2|),er1\\)" \
-	"shlr.w #2,@(0x6:2,er1)"
-gdb_test "x" "shlr.w\t#2,@er1\\+" \
-	"shlr.w #2,@er1+"
-gdb_test "x" "shlr.w\t#2,@-er1" \
-	"shlr.w #2,@-er1"
-gdb_test "x" "shlr.w\t#2,@\\+er1" \
-	"shlr.w #2,@+er1"
-gdb_test "x" "shlr.w\t#2,@er1-" \
-	"shlr.w #2,@er1-"
-gdb_test "x" "shlr.w\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shlr.w #2,@(0x1234:16,er1)"
-gdb_test "x" "shlr.w\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.w #2,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.w\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.w #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.w\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.w #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.w\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.w #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.w\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.w #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.w\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.w #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.w\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.w #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.w\t#2,@0x1234(:16|)" \
-	"shlr.w #2,@0x1234:16"
-gdb_test "x" "shlr.w\t#2,@0x12345678(:32|)" \
-	"shlr.w #2,@0x12345678:32"
-gdb_test "x" "shlr.l\t#2,er1" \
-	"shlr.l #2,er1"
-gdb_test "x" "shlr.l\t#2,@er1" \
-	"shlr.l #2,@er1"
-gdb_test "x" "shlr.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"shlr.l #2,@(0xc:2,er1)"
-gdb_test "x" "shlr.l\t#2,@er1\\+" \
-	"shlr.l #2,@er1+"
-gdb_test "x" "shlr.l\t#2,@-er1" \
-	"shlr.l #2,@-er1"
-gdb_test "x" "shlr.l\t#2,@\\+er1" \
-	"shlr.l #2,@+er1"
-gdb_test "x" "shlr.l\t#2,@er1-" \
-	"shlr.l #2,@er1-"
-gdb_test "x" "shlr.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shlr.l #2,@(0x1234:16,er1)"
-gdb_test "x" "shlr.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.l\t#2,@0x1234(:16|)" \
-	"shlr.l #2,@0x1234:16"
-gdb_test "x" "shlr.l\t#2,@0x12345678(:32|)" \
-	"shlr.l #2,@0x12345678:32"
-gdb_test "x" "shlr.b\t#4,r1h" \
-	"shlr.b #4,r1h"
-gdb_test "x" "shlr.b\t#4,@er1" \
-	"shlr.b #4,@er1"
-gdb_test "x" "shlr.b\t#4,@\\(0x3(:2|),er1\\)" \
-	"shlr.b #4,@(0x3:2,er1)"
-gdb_test "x" "shlr.b\t#4,@er1\\+" \
-	"shlr.b #4,@er1+"
-gdb_test "x" "shlr.b\t#4,@-er1" \
-	"shlr.b #4,@-er1"
-gdb_test "x" "shlr.b\t#4,@\\+er1" \
-	"shlr.b #4,@+er1"
-gdb_test "x" "shlr.b\t#4,@er1-" \
-	"shlr.b #4,@er1-"
-gdb_test "x" "shlr.b\t#4,@\\(0x1234(:16|),er1\\)" \
-	"shlr.b #4,@(0x1234:16,er1)"
-gdb_test "x" "shlr.b\t#4,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.b #4,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.b\t#4,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.b #4,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.b\t#4,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.b #4,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.b\t#4,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.b #4,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.b\t#4,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.b #4,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.b\t#4,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.b #4,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.b\t#4,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.b #4,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.b\t#4,@0x12(:8|)" \
-	"shlr.b #4,@0x12:8"
-gdb_test "x" "shlr.b\t#4,@0x1234(:16|)" \
-	"shlr.b #4,@0x1234:16"
-gdb_test "x" "shlr.b\t#4,@0x12345678(:32|)" \
-	"shlr.b #4,@0x12345678:32"
-gdb_test "x" "shlr.w\t#4,r1" \
-	"shlr.w #4,r1"
-gdb_test "x" "shlr.w\t#4,@er1" \
-	"shlr.w #4,@er1"
-gdb_test "x" "shlr.w\t#4,@\\(0x6(:2|),er1\\)" \
-	"shlr.w #4,@(0x6:2,er1)"
-gdb_test "x" "shlr.w\t#4,@er1\\+" \
-	"shlr.w #4,@er1+"
-gdb_test "x" "shlr.w\t#4,@-er1" \
-	"shlr.w #4,@-er1"
-gdb_test "x" "shlr.w\t#4,@\\+er1" \
-	"shlr.w #4,@+er1"
-gdb_test "x" "shlr.w\t#4,@er1-" \
-	"shlr.w #4,@er1-"
-gdb_test "x" "shlr.w\t#4,@\\(0x1234(:16|),er1\\)" \
-	"shlr.w #4,@(0x1234:16,er1)"
-gdb_test "x" "shlr.w\t#4,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.w #4,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.w\t#4,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.w #4,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.w\t#4,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.w #4,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.w\t#4,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.w #4,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.w\t#4,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.w #4,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.w\t#4,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.w #4,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.w\t#4,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.w #4,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.w\t#4,@0x1234(:16|)" \
-	"shlr.w #4,@0x1234:16"
-gdb_test "x" "shlr.w\t#4,@0x12345678(:32|)" \
-	"shlr.w #4,@0x12345678:32"
-gdb_test "x" "shlr.l\t#4,er1" \
-	"shlr.l #4,er1"
-gdb_test "x" "shlr.l\t#4,@er1" \
-	"shlr.l #4,@er1"
-gdb_test "x" "shlr.l\t#4,@\\(0xc(:2|),er1\\)" \
-	"shlr.l #4,@(0xc:2,er1)"
-gdb_test "x" "shlr.l\t#4,@er1\\+" \
-	"shlr.l #4,@er1+"
-gdb_test "x" "shlr.l\t#4,@-er1" \
-	"shlr.l #4,@-er1"
-gdb_test "x" "shlr.l\t#4,@\\+er1" \
-	"shlr.l #4,@+er1"
-gdb_test "x" "shlr.l\t#4,@er1-" \
-	"shlr.l #4,@er1-"
-gdb_test "x" "shlr.l\t#4,@\\(0x1234(:16|),er1\\)" \
-	"shlr.l #4,@(0x1234:16,er1)"
-gdb_test "x" "shlr.l\t#4,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.l #4,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.l\t#4,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.l #4,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.l\t#4,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.l #4,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.l\t#4,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.l #4,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.l\t#4,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.l #4,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.l\t#4,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.l #4,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.l\t#4,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.l #4,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.l\t#4,@0x1234(:16|)" \
-	"shlr.l #4,@0x1234:16"
-gdb_test "x" "shlr.l\t#4,@0x12345678(:32|)" \
-	"shlr.l #4,@0x12345678:32"
-gdb_test "x" "shlr.w\t#8,r1" \
-	"shlr.w #8,r1"
-gdb_test "x" "shlr.w\t#8,@er1" \
-	"shlr.w #8,@er1"
-gdb_test "x" "shlr.w\t#8,@\\(0x6(:2|),er1\\)" \
-	"shlr.w #8,@(0x6:2,er1)"
-gdb_test "x" "shlr.w\t#8,@er1\\+" \
-	"shlr.w #8,@er1+"
-gdb_test "x" "shlr.w\t#8,@-er1" \
-	"shlr.w #8,@-er1"
-gdb_test "x" "shlr.w\t#8,@\\+er1" \
-	"shlr.w #8,@+er1"
-gdb_test "x" "shlr.w\t#8,@er1-" \
-	"shlr.w #8,@er1-"
-gdb_test "x" "shlr.w\t#8,@\\(0x1234(:16|),er1\\)" \
-	"shlr.w #8,@(0x1234:16,er1)"
-gdb_test "x" "shlr.w\t#8,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.w #8,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.w\t#8,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.w #8,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.w\t#8,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.w #8,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.w\t#8,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.w #8,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.w\t#8,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.w #8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.w\t#8,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.w #8,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.w\t#8,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.w #8,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.w\t#8,@0x1234(:16|)" \
-	"shlr.w #8,@0x1234:16"
-gdb_test "x" "shlr.w\t#8,@0x12345678(:32|)" \
-	"shlr.w #8,@0x12345678:32"
-gdb_test "x" "shlr.l\t#8,er1" \
-	"shlr.l #8,er1"
-gdb_test "x" "shlr.l\t#8,@er1" \
-	"shlr.l #8,@er1"
-gdb_test "x" "shlr.l\t#8,@\\(0xc(:2|),er1\\)" \
-	"shlr.l #8,@(0xc:2,er1)"
-gdb_test "x" "shlr.l\t#8,@er1\\+" \
-	"shlr.l #8,@er1+"
-gdb_test "x" "shlr.l\t#8,@-er1" \
-	"shlr.l #8,@-er1"
-gdb_test "x" "shlr.l\t#8,@\\+er1" \
-	"shlr.l #8,@+er1"
-gdb_test "x" "shlr.l\t#8,@er1-" \
-	"shlr.l #8,@er1-"
-gdb_test "x" "shlr.l\t#8,@\\(0x1234(:16|),er1\\)" \
-	"shlr.l #8,@(0x1234:16,er1)"
-gdb_test "x" "shlr.l\t#8,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.l #8,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.l\t#8,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.l #8,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.l\t#8,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.l #8,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.l\t#8,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.l #8,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.l\t#8,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.l #8,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.l\t#8,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.l #8,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.l\t#8,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.l #8,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.l\t#8,@0x1234(:16|)" \
-	"shlr.l #8,@0x1234:16"
-gdb_test "x" "shlr.l\t#8,@0x12345678(:32|)" \
-	"shlr.l #8,@0x12345678:32"
-gdb_test "x" "shlr.l\t#16,er1" \
-	"shlr.l #16,er1"
-gdb_test "x" "shlr.l\t#16,@er1" \
-	"shlr.l #16,@er1"
-gdb_test "x" "shlr.l\t#16,@\\(0xc(:2|),er1\\)" \
-	"shlr.l #16,@(0xc:2,er1)"
-gdb_test "x" "shlr.l\t#16,@er1\\+" \
-	"shlr.l #16,@er1+"
-gdb_test "x" "shlr.l\t#16,@-er1" \
-	"shlr.l #16,@-er1"
-gdb_test "x" "shlr.l\t#16,@\\+er1" \
-	"shlr.l #16,@+er1"
-gdb_test "x" "shlr.l\t#16,@er1-" \
-	"shlr.l #16,@er1-"
-gdb_test "x" "shlr.l\t#16,@\\(0x1234(:16|),er1\\)" \
-	"shlr.l #16,@(0x1234:16,er1)"
-gdb_test "x" "shlr.l\t#16,@\\(0x12345678(:32|),er1\\)" \
-	"shlr.l #16,@(0x12345678:32,er1)"
-gdb_test "x" "shlr.l\t#16,@\\(0x1234(:16|),r2l.b\\)" \
-	"shlr.l #16,@(0x1234:16,r2l.b)"
-gdb_test "x" "shlr.l\t#16,@\\(0x1234(:16|),r2.w\\)" \
-	"shlr.l #16,@(0x1234:16,r2.w)"
-gdb_test "x" "shlr.l\t#16,@\\(0x1234(:16|),er2.l\\)" \
-	"shlr.l #16,@(0x1234:16,er2.l)"
-gdb_test "x" "shlr.l\t#16,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shlr.l #16,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shlr.l\t#16,@\\(0x12345678(:32|),r2.w\\)" \
-	"shlr.l #16,@(0x12345678:32,r2.w)"
-gdb_test "x" "shlr.l\t#16,@\\(0x12345678(:32|),er2.l\\)" \
-	"shlr.l #16,@(0x12345678:32,er2.l)"
-gdb_test "x" "shlr.l\t#16,@0x1234(:16|)" \
-	"shlr.l #16,@0x1234:16"
-gdb_test "x" "shlr.l\t#16,@0x12345678(:32|)" \
-	"shlr.l #16,@0x12345678:32"
-gdb_test "x" "shlr.b\t#0x7(:5|),r1h" \
-	"shlr.b #0x7:5,r1h"
-gdb_test "x" "shlr.w\t#0xf(:5|),r1" \
-	"shlr.w #0xf:5,r1"
-gdb_test "x" "shlr.l\t#0x1f(:5|),er1" \
-	"shlr.l #0x1f:5,er1"
-gdb_test "x" "shlr.b\tr3h,r1h" \
-	"shlr.b r3h,r1h"
-gdb_test "x" "shlr.w\tr3h,r1" \
-	"shlr.w r3h,r1"
-gdb_test "x" "shlr.l\tr3h,er1" \
-	"shlr.l r3h,er1"
-gdb_test "x" "shal.b\tr1h" \
-	"shal.b r1h"
-gdb_test "x" "shal.b\t@er1" \
-	"shal.b @er1"
-gdb_test "x" "shal.b\t@\\(0x3(:2|),er1\\)" \
-	"shal.b @(0x3:2,er1)"
-gdb_test "x" "shal.b\t@er1\\+" \
-	"shal.b @er1+"
-gdb_test "x" "shal.b\t@-er1" \
-	"shal.b @-er1"
-gdb_test "x" "shal.b\t@\\+er1" \
-	"shal.b @+er1"
-gdb_test "x" "shal.b\t@er1-" \
-	"shal.b @er1-"
-gdb_test "x" "shal.b\t@\\(0x1234(:16|),er1\\)" \
-	"shal.b @(0x1234:16,er1)"
-gdb_test "x" "shal.b\t@\\(0x12345678(:32|),er1\\)" \
-	"shal.b @(0x12345678:32,er1)"
-gdb_test "x" "shal.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shal.b @(0x1234:16,r2l.b)"
-gdb_test "x" "shal.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"shal.b @(0x1234:16,r2.w)"
-gdb_test "x" "shal.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"shal.b @(0x1234:16,er2.l)"
-gdb_test "x" "shal.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shal.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "shal.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shal.b @(0x12345678:32,r2.w)"
-gdb_test "x" "shal.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shal.b @(0x12345678:32,er2.l)"
-gdb_test "x" "shal.b\t@0x12(:8|)" \
-	"shal.b @0x12:8"
-gdb_test "x" "shal.b\t@0x1234(:16|)" \
-	"shal.b @0x1234:16"
-gdb_test "x" "shal.b\t@0x12345678(:32|)" \
-	"shal.b @0x12345678:32"
-gdb_test "x" "shal.w\tr1" \
-	"shal.w r1"
-gdb_test "x" "shal.w\t@er1" \
-	"shal.w @er1"
-gdb_test "x" "shal.w\t@\\(0x6(:2|),er1\\)" \
-	"shal.w @(0x6:2,er1)"
-gdb_test "x" "shal.w\t@er1\\+" \
-	"shal.w @er1+"
-gdb_test "x" "shal.w\t@-er1" \
-	"shal.w @-er1"
-gdb_test "x" "shal.w\t@\\+er1" \
-	"shal.w @+er1"
-gdb_test "x" "shal.w\t@er1-" \
-	"shal.w @er1-"
-gdb_test "x" "shal.w\t@\\(0x1234(:16|),er1\\)" \
-	"shal.w @(0x1234:16,er1)"
-gdb_test "x" "shal.w\t@\\(0x12345678(:32|),er1\\)" \
-	"shal.w @(0x12345678:32,er1)"
-gdb_test "x" "shal.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shal.w @(0x1234:16,r2l.b)"
-gdb_test "x" "shal.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"shal.w @(0x1234:16,r2.w)"
-gdb_test "x" "shal.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"shal.w @(0x1234:16,er2.l)"
-gdb_test "x" "shal.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shal.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "shal.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shal.w @(0x12345678:32,r2.w)"
-gdb_test "x" "shal.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shal.w @(0x12345678:32,er2.l)"
-gdb_test "x" "shal.w\t@0x1234(:16|)" \
-	"shal.w @0x1234:16"
-gdb_test "x" "shal.w\t@0x12345678(:32|)" \
-	"shal.w @0x12345678:32"
-gdb_test "x" "shal.l\ter1" \
-	"shal.l er1"
-gdb_test "x" "shal.l\t@er1" \
-	"shal.l @er1"
-gdb_test "x" "shal.l\t@\\(0xc(:2|),er1\\)" \
-	"shal.l @(0xc:2,er1)"
-gdb_test "x" "shal.l\t@er1\\+" \
-	"shal.l @er1+"
-gdb_test "x" "shal.l\t@-er1" \
-	"shal.l @-er1"
-gdb_test "x" "shal.l\t@\\+er1" \
-	"shal.l @+er1"
-gdb_test "x" "shal.l\t@er1-" \
-	"shal.l @er1-"
-gdb_test "x" "shal.l\t@\\(0x1234(:16|),er1\\)" \
-	"shal.l @(0x1234:16,er1)"
-gdb_test "x" "shal.l\t@\\(0x12345678(:32|),er1\\)" \
-	"shal.l @(0x12345678:32,er1)"
-gdb_test "x" "shal.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shal.l @(0x1234:16,r2l.b)"
-gdb_test "x" "shal.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"shal.l @(0x1234:16,r2.w)"
-gdb_test "x" "shal.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"shal.l @(0x1234:16,er2.l)"
-gdb_test "x" "shal.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shal.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "shal.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shal.l @(0x12345678:32,r2.w)"
-gdb_test "x" "shal.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shal.l @(0x12345678:32,er2.l)"
-gdb_test "x" "shal.l\t@0x1234(:16|)" \
-	"shal.l @0x1234:16"
-gdb_test "x" "shal.l\t@0x12345678(:32|)" \
-	"shal.l @0x12345678:32"
-gdb_test "x" "shal.b\t#2,r1h" \
-	"shal.b #2,r1h"
-gdb_test "x" "shal.b\t#2,@er1" \
-	"shal.b #2,@er1"
-gdb_test "x" "shal.b\t#2,@\\(0x3(:2|),er1\\)" \
-	"shal.b #2,@(0x3:2,er1)"
-gdb_test "x" "shal.b\t#2,@er1\\+" \
-	"shal.b #2,@er1+"
-gdb_test "x" "shal.b\t#2,@-er1" \
-	"shal.b #2,@-er1"
-gdb_test "x" "shal.b\t#2,@\\+er1" \
-	"shal.b #2,@+er1"
-gdb_test "x" "shal.b\t#2,@er1-" \
-	"shal.b #2,@er1-"
-gdb_test "x" "shal.b\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shal.b #2,@(0x1234:16,er1)"
-gdb_test "x" "shal.b\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shal.b #2,@(0x12345678:32,er1)"
-gdb_test "x" "shal.b\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shal.b #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shal.b\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shal.b #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shal.b\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shal.b #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shal.b\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shal.b #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shal.b\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shal.b #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shal.b\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shal.b #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shal.b\t#2,@0x12(:8|)" \
-	"shal.b #2,@0x12:8"
-gdb_test "x" "shal.b\t#2,@0x1234(:16|)" \
-	"shal.b #2,@0x1234:16"
-gdb_test "x" "shal.b\t#2,@0x12345678(:32|)" \
-	"shal.b #2,@0x12345678:32"
-gdb_test "x" "shal.w\t#2,r1" \
-	"shal.w #2,r1"
-gdb_test "x" "shal.w\t#2,@er1" \
-	"shal.w #2,@er1"
-gdb_test "x" "shal.w\t#2,@\\(0x6(:2|),er1\\)" \
-	"shal.w #2,@(0x6:2,er1)"
-gdb_test "x" "shal.w\t#2,@er1\\+" \
-	"shal.w #2,@er1+"
-gdb_test "x" "shal.w\t#2,@-er1" \
-	"shal.w #2,@-er1"
-gdb_test "x" "shal.w\t#2,@\\+er1" \
-	"shal.w #2,@+er1"
-gdb_test "x" "shal.w\t#2,@er1-" \
-	"shal.w #2,@er1-"
-gdb_test "x" "shal.w\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shal.w #2,@(0x1234:16,er1)"
-gdb_test "x" "shal.w\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shal.w #2,@(0x12345678:32,er1)"
-gdb_test "x" "shal.w\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shal.w #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shal.w\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shal.w #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shal.w\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shal.w #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shal.w\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shal.w #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shal.w\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shal.w #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shal.w\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shal.w #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shal.w\t#2,@0x1234(:16|)" \
-	"shal.w #2,@0x1234:16"
-gdb_test "x" "shal.w\t#2,@0x12345678(:32|)" \
-	"shal.w #2,@0x12345678:32"
-gdb_test "x" "shal.l\t#2,er1" \
-	"shal.l #2,er1"
-gdb_test "x" "shal.l\t#2,@er1" \
-	"shal.l #2,@er1"
-gdb_test "x" "shal.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"shal.l #2,@(0xc:2,er1)"
-gdb_test "x" "shal.l\t#2,@er1\\+" \
-	"shal.l #2,@er1+"
-gdb_test "x" "shal.l\t#2,@-er1" \
-	"shal.l #2,@-er1"
-gdb_test "x" "shal.l\t#2,@\\+er1" \
-	"shal.l #2,@+er1"
-gdb_test "x" "shal.l\t#2,@er1-" \
-	"shal.l #2,@er1-"
-gdb_test "x" "shal.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shal.l #2,@(0x1234:16,er1)"
-gdb_test "x" "shal.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shal.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "shal.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shal.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shal.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shal.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shal.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shal.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shal.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shal.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shal.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shal.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shal.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shal.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shal.l\t#2,@0x1234(:16|)" \
-	"shal.l #2,@0x1234:16"
-gdb_test "x" "shal.l\t#2,@0x12345678(:32|)" \
-	"shal.l #2,@0x12345678:32"
-gdb_test "x" "shar.b\tr1h" \
-	"shar.b r1h"
-gdb_test "x" "shar.b\t@er1" \
-	"shar.b @er1"
-gdb_test "x" "shar.b\t@\\(0x3(:2|),er1\\)" \
-	"shar.b @(0x3:2,er1)"
-gdb_test "x" "shar.b\t@er1\\+" \
-	"shar.b @er1+"
-gdb_test "x" "shar.b\t@-er1" \
-	"shar.b @-er1"
-gdb_test "x" "shar.b\t@\\+er1" \
-	"shar.b @+er1"
-gdb_test "x" "shar.b\t@er1-" \
-	"shar.b @er1-"
-gdb_test "x" "shar.b\t@\\(0x1234(:16|),er1\\)" \
-	"shar.b @(0x1234:16,er1)"
-gdb_test "x" "shar.b\t@\\(0x12345678(:32|),er1\\)" \
-	"shar.b @(0x12345678:32,er1)"
-gdb_test "x" "shar.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shar.b @(0x1234:16,r2l.b)"
-gdb_test "x" "shar.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"shar.b @(0x1234:16,r2.w)"
-gdb_test "x" "shar.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"shar.b @(0x1234:16,er2.l)"
-gdb_test "x" "shar.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shar.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "shar.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shar.b @(0x12345678:32,r2.w)"
-gdb_test "x" "shar.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shar.b @(0x12345678:32,er2.l)"
-gdb_test "x" "shar.b\t@0x12(:8|)" \
-	"shar.b @0x12:8"
-gdb_test "x" "shar.b\t@0x1234(:16|)" \
-	"shar.b @0x1234:16"
-gdb_test "x" "shar.b\t@0x12345678(:32|)" \
-	"shar.b @0x12345678:32"
-gdb_test "x" "shar.w\tr1" \
-	"shar.w r1"
-gdb_test "x" "shar.w\t@er1" \
-	"shar.w @er1"
-gdb_test "x" "shar.w\t@\\(0x6(:2|),er1\\)" \
-	"shar.w @(0x6:2,er1)"
-gdb_test "x" "shar.w\t@er1\\+" \
-	"shar.w @er1+"
-gdb_test "x" "shar.w\t@-er1" \
-	"shar.w @-er1"
-gdb_test "x" "shar.w\t@\\+er1" \
-	"shar.w @+er1"
-gdb_test "x" "shar.w\t@er1-" \
-	"shar.w @er1-"
-gdb_test "x" "shar.w\t@\\(0x1234(:16|),er1\\)" \
-	"shar.w @(0x1234:16,er1)"
-gdb_test "x" "shar.w\t@\\(0x12345678(:32|),er1\\)" \
-	"shar.w @(0x12345678:32,er1)"
-gdb_test "x" "shar.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shar.w @(0x1234:16,r2l.b)"
-gdb_test "x" "shar.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"shar.w @(0x1234:16,r2.w)"
-gdb_test "x" "shar.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"shar.w @(0x1234:16,er2.l)"
-gdb_test "x" "shar.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shar.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "shar.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shar.w @(0x12345678:32,r2.w)"
-gdb_test "x" "shar.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shar.w @(0x12345678:32,er2.l)"
-gdb_test "x" "shar.w\t@0x1234(:16|)" \
-	"shar.w @0x1234:16"
-gdb_test "x" "shar.w\t@0x12345678(:32|)" \
-	"shar.w @0x12345678:32"
-gdb_test "x" "shar.l\ter1" \
-	"shar.l er1"
-gdb_test "x" "shar.l\t@er1" \
-	"shar.l @er1"
-gdb_test "x" "shar.l\t@\\(0xc(:2|),er1\\)" \
-	"shar.l @(0xc:2,er1)"
-gdb_test "x" "shar.l\t@er1\\+" \
-	"shar.l @er1+"
-gdb_test "x" "shar.l\t@-er1" \
-	"shar.l @-er1"
-gdb_test "x" "shar.l\t@\\+er1" \
-	"shar.l @+er1"
-gdb_test "x" "shar.l\t@er1-" \
-	"shar.l @er1-"
-gdb_test "x" "shar.l\t@\\(0x1234(:16|),er1\\)" \
-	"shar.l @(0x1234:16,er1)"
-gdb_test "x" "shar.l\t@\\(0x12345678(:32|),er1\\)" \
-	"shar.l @(0x12345678:32,er1)"
-gdb_test "x" "shar.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"shar.l @(0x1234:16,r2l.b)"
-gdb_test "x" "shar.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"shar.l @(0x1234:16,r2.w)"
-gdb_test "x" "shar.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"shar.l @(0x1234:16,er2.l)"
-gdb_test "x" "shar.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"shar.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "shar.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"shar.l @(0x12345678:32,r2.w)"
-gdb_test "x" "shar.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"shar.l @(0x12345678:32,er2.l)"
-gdb_test "x" "shar.l\t@0x1234(:16|)" \
-	"shar.l @0x1234:16"
-gdb_test "x" "shar.l\t@0x12345678(:32|)" \
-	"shar.l @0x12345678:32"
-gdb_test "x" "shar.b\t#2,r1h" \
-	"shar.b #2,r1h"
-gdb_test "x" "shar.b\t#2,@er1" \
-	"shar.b #2,@er1"
-gdb_test "x" "shar.b\t#2,@\\(0x3(:2|),er1\\)" \
-	"shar.b #2,@(0x3:2,er1)"
-gdb_test "x" "shar.b\t#2,@er1\\+" \
-	"shar.b #2,@er1+"
-gdb_test "x" "shar.b\t#2,@-er1" \
-	"shar.b #2,@-er1"
-gdb_test "x" "shar.b\t#2,@\\+er1" \
-	"shar.b #2,@+er1"
-gdb_test "x" "shar.b\t#2,@er1-" \
-	"shar.b #2,@er1-"
-gdb_test "x" "shar.b\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shar.b #2,@(0x1234:16,er1)"
-gdb_test "x" "shar.b\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shar.b #2,@(0x12345678:32,er1)"
-gdb_test "x" "shar.b\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shar.b #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shar.b\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shar.b #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shar.b\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shar.b #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shar.b\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shar.b #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shar.b\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shar.b #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shar.b\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shar.b #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shar.b\t#2,@0x12(:8|)" \
-	"shar.b #2,@0x12:8"
-gdb_test "x" "shar.b\t#2,@0x1234(:16|)" \
-	"shar.b #2,@0x1234:16"
-gdb_test "x" "shar.b\t#2,@0x12345678(:32|)" \
-	"shar.b #2,@0x12345678:32"
-gdb_test "x" "shar.w\t#2,r1" \
-	"shar.w #2,r1"
-gdb_test "x" "shar.w\t#2,@er1" \
-	"shar.w #2,@er1"
-gdb_test "x" "shar.w\t#2,@\\(0x6(:2|),er1\\)" \
-	"shar.w #2,@(0x6:2,er1)"
-gdb_test "x" "shar.w\t#2,@er1\\+" \
-	"shar.w #2,@er1+"
-gdb_test "x" "shar.w\t#2,@-er1" \
-	"shar.w #2,@-er1"
-gdb_test "x" "shar.w\t#2,@\\+er1" \
-	"shar.w #2,@+er1"
-gdb_test "x" "shar.w\t#2,@er1-" \
-	"shar.w #2,@er1-"
-gdb_test "x" "shar.w\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shar.w #2,@(0x1234:16,er1)"
-gdb_test "x" "shar.w\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shar.w #2,@(0x12345678:32,er1)"
-gdb_test "x" "shar.w\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shar.w #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shar.w\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shar.w #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shar.w\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shar.w #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shar.w\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shar.w #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shar.w\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shar.w #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shar.w\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shar.w #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shar.w\t#2,@0x1234(:16|)" \
-	"shar.w #2,@0x1234:16"
-gdb_test "x" "shar.w\t#2,@0x12345678(:32|)" \
-	"shar.w #2,@0x12345678:32"
-gdb_test "x" "shar.l\t#2,er1" \
-	"shar.l #2,er1"
-gdb_test "x" "shar.l\t#2,@er1" \
-	"shar.l #2,@er1"
-gdb_test "x" "shar.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"shar.l #2,@(0xc:2,er1)"
-gdb_test "x" "shar.l\t#2,@er1\\+" \
-	"shar.l #2,@er1+"
-gdb_test "x" "shar.l\t#2,@-er1" \
-	"shar.l #2,@-er1"
-gdb_test "x" "shar.l\t#2,@\\+er1" \
-	"shar.l #2,@+er1"
-gdb_test "x" "shar.l\t#2,@er1-" \
-	"shar.l #2,@er1-"
-gdb_test "x" "shar.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"shar.l #2,@(0x1234:16,er1)"
-gdb_test "x" "shar.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"shar.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "shar.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"shar.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "shar.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"shar.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "shar.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"shar.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "shar.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"shar.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "shar.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"shar.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "shar.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"shar.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "shar.l\t#2,@0x1234(:16|)" \
-	"shar.l #2,@0x1234:16"
-gdb_test "x" "shar.l\t#2,@0x12345678(:32|)" \
-	"shar.l #2,@0x12345678:32"
-gdb_test "x" "rotxl.b\tr1h" \
-	"rotxl.b r1h"
-gdb_test "x" "rotxl.b\t@er1" \
-	"rotxl.b @er1"
-gdb_test "x" "rotxl.b\t@\\(0x3(:2|),er1\\)" \
-	"rotxl.b @(0x3:2,er1)"
-gdb_test "x" "rotxl.b\t@er1\\+" \
-	"rotxl.b @er1+"
-gdb_test "x" "rotxl.b\t@-er1" \
-	"rotxl.b @-er1"
-gdb_test "x" "rotxl.b\t@\\+er1" \
-	"rotxl.b @+er1"
-gdb_test "x" "rotxl.b\t@er1-" \
-	"rotxl.b @er1-"
-gdb_test "x" "rotxl.b\t@\\(0x1234(:16|),er1\\)" \
-	"rotxl.b @(0x1234:16,er1)"
-gdb_test "x" "rotxl.b\t@\\(0x12345678(:32|),er1\\)" \
-	"rotxl.b @(0x12345678:32,er1)"
-gdb_test "x" "rotxl.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxl.b @(0x1234:16,r2l.b)"
-gdb_test "x" "rotxl.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotxl.b @(0x1234:16,r2.w)"
-gdb_test "x" "rotxl.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotxl.b @(0x1234:16,er2.l)"
-gdb_test "x" "rotxl.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxl.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxl.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxl.b @(0x12345678:32,r2.w)"
-gdb_test "x" "rotxl.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxl.b @(0x12345678:32,er2.l)"
-gdb_test "x" "rotxl.b\t@0x12(:8|)" \
-	"rotxl.b @0x12:8"
-gdb_test "x" "rotxl.b\t@0x1234(:16|)" \
-	"rotxl.b @0x1234:16"
-gdb_test "x" "rotxl.b\t@0x12345678(:32|)" \
-	"rotxl.b @0x12345678:32"
-gdb_test "x" "rotxl.w\tr1" \
-	"rotxl.w r1"
-gdb_test "x" "rotxl.w\t@er1" \
-	"rotxl.w @er1"
-gdb_test "x" "rotxl.w\t@\\(0x6(:2|),er1\\)" \
-	"rotxl.w @(0x6:2,er1)"
-gdb_test "x" "rotxl.w\t@er1\\+" \
-	"rotxl.w @er1+"
-gdb_test "x" "rotxl.w\t@-er1" \
-	"rotxl.w @-er1"
-gdb_test "x" "rotxl.w\t@\\+er1" \
-	"rotxl.w @+er1"
-gdb_test "x" "rotxl.w\t@er1-" \
-	"rotxl.w @er1-"
-gdb_test "x" "rotxl.w\t@\\(0x1234(:16|),er1\\)" \
-	"rotxl.w @(0x1234:16,er1)"
-gdb_test "x" "rotxl.w\t@\\(0x12345678(:32|),er1\\)" \
-	"rotxl.w @(0x12345678:32,er1)"
-gdb_test "x" "rotxl.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxl.w @(0x1234:16,r2l.b)"
-gdb_test "x" "rotxl.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotxl.w @(0x1234:16,r2.w)"
-gdb_test "x" "rotxl.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotxl.w @(0x1234:16,er2.l)"
-gdb_test "x" "rotxl.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxl.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxl.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxl.w @(0x12345678:32,r2.w)"
-gdb_test "x" "rotxl.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxl.w @(0x12345678:32,er2.l)"
-gdb_test "x" "rotxl.w\t@0x1234(:16|)" \
-	"rotxl.w @0x1234:16"
-gdb_test "x" "rotxl.w\t@0x12345678(:32|)" \
-	"rotxl.w @0x12345678:32"
-gdb_test "x" "rotxl.l\ter1" \
-	"rotxl.l er1"
-gdb_test "x" "rotxl.l\t@er1" \
-	"rotxl.l @er1"
-gdb_test "x" "rotxl.l\t@\\(0xc(:2|),er1\\)" \
-	"rotxl.l @(0xc:2,er1)"
-gdb_test "x" "rotxl.l\t@er1\\+" \
-	"rotxl.l @er1+"
-gdb_test "x" "rotxl.l\t@-er1" \
-	"rotxl.l @-er1"
-gdb_test "x" "rotxl.l\t@\\+er1" \
-	"rotxl.l @+er1"
-gdb_test "x" "rotxl.l\t@er1-" \
-	"rotxl.l @er1-"
-gdb_test "x" "rotxl.l\t@\\(0x1234(:16|),er1\\)" \
-	"rotxl.l @(0x1234:16,er1)"
-gdb_test "x" "rotxl.l\t@\\(0x12345678(:32|),er1\\)" \
-	"rotxl.l @(0x12345678:32,er1)"
-gdb_test "x" "rotxl.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxl.l @(0x1234:16,r2l.b)"
-gdb_test "x" "rotxl.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotxl.l @(0x1234:16,r2.w)"
-gdb_test "x" "rotxl.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotxl.l @(0x1234:16,er2.l)"
-gdb_test "x" "rotxl.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxl.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxl.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxl.l @(0x12345678:32,r2.w)"
-gdb_test "x" "rotxl.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxl.l @(0x12345678:32,er2.l)"
-gdb_test "x" "rotxl.l\t@0x1234(:16|)" \
-	"rotxl.l @0x1234:16"
-gdb_test "x" "rotxl.l\t@0x12345678(:32|)" \
-	"rotxl.l @0x12345678:32"
-gdb_test "x" "rotxl.b\t#2,r1h" \
-	"rotxl.b #2,r1h"
-gdb_test "x" "rotxl.b\t#2,@er1" \
-	"rotxl.b #2,@er1"
-gdb_test "x" "rotxl.b\t#2,@\\(0x3(:2|),er1\\)" \
-	"rotxl.b #2,@(0x3:2,er1)"
-gdb_test "x" "rotxl.b\t#2,@er1\\+" \
-	"rotxl.b #2,@er1+"
-gdb_test "x" "rotxl.b\t#2,@-er1" \
-	"rotxl.b #2,@-er1"
-gdb_test "x" "rotxl.b\t#2,@\\+er1" \
-	"rotxl.b #2,@+er1"
-gdb_test "x" "rotxl.b\t#2,@er1-" \
-	"rotxl.b #2,@er1-"
-gdb_test "x" "rotxl.b\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotxl.b #2,@(0x1234:16,er1)"
-gdb_test "x" "rotxl.b\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotxl.b #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotxl.b\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxl.b #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotxl.b\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotxl.b #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotxl.b\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotxl.b #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotxl.b\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxl.b #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxl.b\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxl.b #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotxl.b\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxl.b #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotxl.b\t#2,@0x12(:8|)" \
-	"rotxl.b #2,@0x12:8"
-gdb_test "x" "rotxl.b\t#2,@0x1234(:16|)" \
-	"rotxl.b #2,@0x1234:16"
-gdb_test "x" "rotxl.b\t#2,@0x12345678(:32|)" \
-	"rotxl.b #2,@0x12345678:32"
-gdb_test "x" "rotxl.w\t#2,r1" \
-	"rotxl.w #2,r1"
-gdb_test "x" "rotxl.w\t#2,@er1" \
-	"rotxl.w #2,@er1"
-gdb_test "x" "rotxl.w\t#2,@\\(0x6(:2|),er1\\)" \
-	"rotxl.w #2,@(0x6:2,er1)"
-gdb_test "x" "rotxl.w\t#2,@er1\\+" \
-	"rotxl.w #2,@er1+"
-gdb_test "x" "rotxl.w\t#2,@-er1" \
-	"rotxl.w #2,@-er1"
-gdb_test "x" "rotxl.w\t#2,@\\+er1" \
-	"rotxl.w #2,@+er1"
-gdb_test "x" "rotxl.w\t#2,@er1-" \
-	"rotxl.w #2,@er1-"
-gdb_test "x" "rotxl.w\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotxl.w #2,@(0x1234:16,er1)"
-gdb_test "x" "rotxl.w\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotxl.w #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotxl.w\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxl.w #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotxl.w\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotxl.w #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotxl.w\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotxl.w #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotxl.w\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxl.w #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxl.w\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxl.w #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotxl.w\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxl.w #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotxl.w\t#2,@0x1234(:16|)" \
-	"rotxl.w #2,@0x1234:16"
-gdb_test "x" "rotxl.w\t#2,@0x12345678(:32|)" \
-	"rotxl.w #2,@0x12345678:32"
-gdb_test "x" "rotxl.l\t#2,er1" \
-	"rotxl.l #2,er1"
-gdb_test "x" "rotxl.l\t#2,@er1" \
-	"rotxl.l #2,@er1"
-gdb_test "x" "rotxl.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"rotxl.l #2,@(0xc:2,er1)"
-gdb_test "x" "rotxl.l\t#2,@er1\\+" \
-	"rotxl.l #2,@er1+"
-gdb_test "x" "rotxl.l\t#2,@-er1" \
-	"rotxl.l #2,@-er1"
-gdb_test "x" "rotxl.l\t#2,@\\+er1" \
-	"rotxl.l #2,@+er1"
-gdb_test "x" "rotxl.l\t#2,@er1-" \
-	"rotxl.l #2,@er1-"
-gdb_test "x" "rotxl.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotxl.l #2,@(0x1234:16,er1)"
-gdb_test "x" "rotxl.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotxl.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotxl.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxl.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotxl.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotxl.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotxl.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotxl.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotxl.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxl.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxl.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxl.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotxl.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxl.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotxl.l\t#2,@0x1234(:16|)" \
-	"rotxl.l #2,@0x1234:16"
-gdb_test "x" "rotxl.l\t#2,@0x12345678(:32|)" \
-	"rotxl.l #2,@0x12345678:32"
-gdb_test "x" "rotxr.b\tr1h" \
-	"rotxr.b r1h"
-gdb_test "x" "rotxr.b\t@er1" \
-	"rotxr.b @er1"
-gdb_test "x" "rotxr.b\t@\\(0x3(:2|),er1\\)" \
-	"rotxr.b @(0x3:2,er1)"
-gdb_test "x" "rotxr.b\t@er1\\+" \
-	"rotxr.b @er1+"
-gdb_test "x" "rotxr.b\t@-er1" \
-	"rotxr.b @-er1"
-gdb_test "x" "rotxr.b\t@\\+er1" \
-	"rotxr.b @+er1"
-gdb_test "x" "rotxr.b\t@er1-" \
-	"rotxr.b @er1-"
-gdb_test "x" "rotxr.b\t@\\(0x1234(:16|),er1\\)" \
-	"rotxr.b @(0x1234:16,er1)"
-gdb_test "x" "rotxr.b\t@\\(0x12345678(:32|),er1\\)" \
-	"rotxr.b @(0x12345678:32,er1)"
-gdb_test "x" "rotxr.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxr.b @(0x1234:16,r2l.b)"
-gdb_test "x" "rotxr.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotxr.b @(0x1234:16,r2.w)"
-gdb_test "x" "rotxr.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotxr.b @(0x1234:16,er2.l)"
-gdb_test "x" "rotxr.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxr.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxr.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxr.b @(0x12345678:32,r2.w)"
-gdb_test "x" "rotxr.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxr.b @(0x12345678:32,er2.l)"
-gdb_test "x" "rotxr.b\t@0x12(:8|)" \
-	"rotxr.b @0x12:8"
-gdb_test "x" "rotxr.b\t@0x1234(:16|)" \
-	"rotxr.b @0x1234:16"
-gdb_test "x" "rotxr.b\t@0x12345678(:32|)" \
-	"rotxr.b @0x12345678:32"
-gdb_test "x" "rotxr.w\tr1" \
-	"rotxr.w r1"
-gdb_test "x" "rotxr.w\t@er1" \
-	"rotxr.w @er1"
-gdb_test "x" "rotxr.w\t@\\(0x6(:2|),er1\\)" \
-	"rotxr.w @(0x6:2,er1)"
-gdb_test "x" "rotxr.w\t@er1\\+" \
-	"rotxr.w @er1+"
-gdb_test "x" "rotxr.w\t@-er1" \
-	"rotxr.w @-er1"
-gdb_test "x" "rotxr.w\t@\\+er1" \
-	"rotxr.w @+er1"
-gdb_test "x" "rotxr.w\t@er1-" \
-	"rotxr.w @er1-"
-gdb_test "x" "rotxr.w\t@\\(0x1234(:16|),er1\\)" \
-	"rotxr.w @(0x1234:16,er1)"
-gdb_test "x" "rotxr.w\t@\\(0x12345678(:32|),er1\\)" \
-	"rotxr.w @(0x12345678:32,er1)"
-gdb_test "x" "rotxr.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxr.w @(0x1234:16,r2l.b)"
-gdb_test "x" "rotxr.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotxr.w @(0x1234:16,r2.w)"
-gdb_test "x" "rotxr.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotxr.w @(0x1234:16,er2.l)"
-gdb_test "x" "rotxr.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxr.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxr.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxr.w @(0x12345678:32,r2.w)"
-gdb_test "x" "rotxr.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxr.w @(0x12345678:32,er2.l)"
-gdb_test "x" "rotxr.w\t@0x1234(:16|)" \
-	"rotxr.w @0x1234:16"
-gdb_test "x" "rotxr.w\t@0x12345678(:32|)" \
-	"rotxr.w @0x12345678:32"
-gdb_test "x" "rotxr.l\ter1" \
-	"rotxr.l er1"
-gdb_test "x" "rotxr.l\t@er1" \
-	"rotxr.l @er1"
-gdb_test "x" "rotxr.l\t@\\(0xc(:2|),er1\\)" \
-	"rotxr.l @(0xc:2,er1)"
-gdb_test "x" "rotxr.l\t@er1\\+" \
-	"rotxr.l @er1+"
-gdb_test "x" "rotxr.l\t@-er1" \
-	"rotxr.l @-er1"
-gdb_test "x" "rotxr.l\t@\\+er1" \
-	"rotxr.l @+er1"
-gdb_test "x" "rotxr.l\t@er1-" \
-	"rotxr.l @er1-"
-gdb_test "x" "rotxr.l\t@\\(0x1234(:16|),er1\\)" \
-	"rotxr.l @(0x1234:16,er1)"
-gdb_test "x" "rotxr.l\t@\\(0x12345678(:32|),er1\\)" \
-	"rotxr.l @(0x12345678:32,er1)"
-gdb_test "x" "rotxr.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxr.l @(0x1234:16,r2l.b)"
-gdb_test "x" "rotxr.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotxr.l @(0x1234:16,r2.w)"
-gdb_test "x" "rotxr.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotxr.l @(0x1234:16,er2.l)"
-gdb_test "x" "rotxr.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxr.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxr.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxr.l @(0x12345678:32,r2.w)"
-gdb_test "x" "rotxr.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxr.l @(0x12345678:32,er2.l)"
-gdb_test "x" "rotxr.l\t@0x1234(:16|)" \
-	"rotxr.l @0x1234:16"
-gdb_test "x" "rotxr.l\t@0x12345678(:32|)" \
-	"rotxr.l @0x12345678:32"
-gdb_test "x" "rotxr.b\t#2,r1h" \
-	"rotxr.b #2,r1h"
-gdb_test "x" "rotxr.b\t#2,@er1" \
-	"rotxr.b #2,@er1"
-gdb_test "x" "rotxr.b\t#2,@\\(0x3(:2|),er1\\)" \
-	"rotxr.b #2,@(0x3:2,er1)"
-gdb_test "x" "rotxr.b\t#2,@er1\\+" \
-	"rotxr.b #2,@er1+"
-gdb_test "x" "rotxr.b\t#2,@-er1" \
-	"rotxr.b #2,@-er1"
-gdb_test "x" "rotxr.b\t#2,@\\+er1" \
-	"rotxr.b #2,@+er1"
-gdb_test "x" "rotxr.b\t#2,@er1-" \
-	"rotxr.b #2,@er1-"
-gdb_test "x" "rotxr.b\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotxr.b #2,@(0x1234:16,er1)"
-gdb_test "x" "rotxr.b\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotxr.b #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotxr.b\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxr.b #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotxr.b\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotxr.b #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotxr.b\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotxr.b #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotxr.b\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxr.b #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxr.b\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxr.b #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotxr.b\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxr.b #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotxr.b\t#2,@0x12(:8|)" \
-	"rotxr.b #2,@0x12:8"
-gdb_test "x" "rotxr.b\t#2,@0x1234(:16|)" \
-	"rotxr.b #2,@0x1234:16"
-gdb_test "x" "rotxr.b\t#2,@0x12345678(:32|)" \
-	"rotxr.b #2,@0x12345678:32"
-gdb_test "x" "rotxr.w\t#2,r1" \
-	"rotxr.w #2,r1"
-gdb_test "x" "rotxr.w\t#2,@er1" \
-	"rotxr.w #2,@er1"
-gdb_test "x" "rotxr.w\t#2,@\\(0x6(:2|),er1\\)" \
-	"rotxr.w #2,@(0x6:2,er1)"
-gdb_test "x" "rotxr.w\t#2,@er1\\+" \
-	"rotxr.w #2,@er1+"
-gdb_test "x" "rotxr.w\t#2,@-er1" \
-	"rotxr.w #2,@-er1"
-gdb_test "x" "rotxr.w\t#2,@\\+er1" \
-	"rotxr.w #2,@+er1"
-gdb_test "x" "rotxr.w\t#2,@er1-" \
-	"rotxr.w #2,@er1-"
-gdb_test "x" "rotxr.w\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotxr.w #2,@(0x1234:16,er1)"
-gdb_test "x" "rotxr.w\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotxr.w #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotxr.w\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxr.w #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotxr.w\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotxr.w #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotxr.w\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotxr.w #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotxr.w\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxr.w #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxr.w\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxr.w #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotxr.w\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxr.w #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotxr.w\t#2,@0x1234(:16|)" \
-	"rotxr.w #2,@0x1234:16"
-gdb_test "x" "rotxr.w\t#2,@0x12345678(:32|)" \
-	"rotxr.w #2,@0x12345678:32"
-gdb_test "x" "rotxr.l\t#2,er1" \
-	"rotxr.l #2,er1"
-gdb_test "x" "rotxr.l\t#2,@er1" \
-	"rotxr.l #2,@er1"
-gdb_test "x" "rotxr.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"rotxr.l #2,@(0xc:2,er1)"
-gdb_test "x" "rotxr.l\t#2,@er1\\+" \
-	"rotxr.l #2,@er1+"
-gdb_test "x" "rotxr.l\t#2,@-er1" \
-	"rotxr.l #2,@-er1"
-gdb_test "x" "rotxr.l\t#2,@\\+er1" \
-	"rotxr.l #2,@+er1"
-gdb_test "x" "rotxr.l\t#2,@er1-" \
-	"rotxr.l #2,@er1-"
-gdb_test "x" "rotxr.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotxr.l #2,@(0x1234:16,er1)"
-gdb_test "x" "rotxr.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotxr.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotxr.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotxr.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotxr.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotxr.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotxr.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotxr.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotxr.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotxr.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotxr.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotxr.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotxr.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotxr.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotxr.l\t#2,@0x1234(:16|)" \
-	"rotxr.l #2,@0x1234:16"
-gdb_test "x" "rotxr.l\t#2,@0x12345678(:32|)" \
-	"rotxr.l #2,@0x12345678:32"
-gdb_test "x" "rotl.b\tr1h" \
-	"rotl.b r1h"
-gdb_test "x" "rotl.b\t@er1" \
-	"rotl.b @er1"
-gdb_test "x" "rotl.b\t@\\(0x3(:2|),er1\\)" \
-	"rotl.b @(0x3:2,er1)"
-gdb_test "x" "rotl.b\t@er1\\+" \
-	"rotl.b @er1+"
-gdb_test "x" "rotl.b\t@-er1" \
-	"rotl.b @-er1"
-gdb_test "x" "rotl.b\t@\\+er1" \
-	"rotl.b @+er1"
-gdb_test "x" "rotl.b\t@er1-" \
-	"rotl.b @er1-"
-gdb_test "x" "rotl.b\t@\\(0x1234(:16|),er1\\)" \
-	"rotl.b @(0x1234:16,er1)"
-gdb_test "x" "rotl.b\t@\\(0x12345678(:32|),er1\\)" \
-	"rotl.b @(0x12345678:32,er1)"
-gdb_test "x" "rotl.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotl.b @(0x1234:16,r2l.b)"
-gdb_test "x" "rotl.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotl.b @(0x1234:16,r2.w)"
-gdb_test "x" "rotl.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotl.b @(0x1234:16,er2.l)"
-gdb_test "x" "rotl.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotl.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotl.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotl.b @(0x12345678:32,r2.w)"
-gdb_test "x" "rotl.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotl.b @(0x12345678:32,er2.l)"
-gdb_test "x" "rotl.b\t@0x12(:8|)" \
-	"rotl.b @0x12:8"
-gdb_test "x" "rotl.b\t@0x1234(:16|)" \
-	"rotl.b @0x1234:16"
-gdb_test "x" "rotl.b\t@0x12345678(:32|)" \
-	"rotl.b @0x12345678:32"
-gdb_test "x" "rotl.w\tr1" \
-	"rotl.w r1"
-gdb_test "x" "rotl.w\t@er1" \
-	"rotl.w @er1"
-gdb_test "x" "rotl.w\t@\\(0x6(:2|),er1\\)" \
-	"rotl.w @(0x6:2,er1)"
-gdb_test "x" "rotl.w\t@-er1" \
-	"rotl.w @-er1"
-gdb_test "x" "rotl.w\t@er1\\+" \
-	"rotl.w @er1+"
-gdb_test "x" "rotl.w\t@er1-" \
-	"rotl.w @er1-"
-gdb_test "x" "rotl.w\t@\\+er1" \
-	"rotl.w @+er1"
-gdb_test "x" "rotl.w\t@\\(0x1234(:16|),er1\\)" \
-	"rotl.w @(0x1234:16,er1)"
-gdb_test "x" "rotl.w\t@\\(0x12345678(:32|),er1\\)" \
-	"rotl.w @(0x12345678:32,er1)"
-gdb_test "x" "rotl.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotl.w @(0x1234:16,r2l.b)"
-gdb_test "x" "rotl.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotl.w @(0x1234:16,r2.w)"
-gdb_test "x" "rotl.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotl.w @(0x1234:16,er2.l)"
-gdb_test "x" "rotl.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotl.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotl.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotl.w @(0x12345678:32,r2.w)"
-gdb_test "x" "rotl.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotl.w @(0x12345678:32,er2.l)"
-gdb_test "x" "rotl.w\t@0x1234(:16|)" \
-	"rotl.w @0x1234:16"
-gdb_test "x" "rotl.w\t@0x12345678(:32|)" \
-	"rotl.w @0x12345678:32"
-gdb_test "x" "rotl.l\ter1" \
-	"rotl.l er1"
-gdb_test "x" "rotl.l\t@er1" \
-	"rotl.l @er1"
-gdb_test "x" "rotl.l\t@\\(0xc(:2|),er1\\)" \
-	"rotl.l @(0xc:2,er1)"
-gdb_test "x" "rotl.l\t@er1\\+" \
-	"rotl.l @er1+"
-gdb_test "x" "rotl.l\t@-er1" \
-	"rotl.l @-er1"
-gdb_test "x" "rotl.l\t@\\+er1" \
-	"rotl.l @+er1"
-gdb_test "x" "rotl.l\t@er1-" \
-	"rotl.l @er1-"
-gdb_test "x" "rotl.l\t@\\(0x1234(:16|),er1\\)" \
-	"rotl.l @(0x1234:16,er1)"
-gdb_test "x" "rotl.l\t@\\(0x12345678(:32|),er1\\)" \
-	"rotl.l @(0x12345678:32,er1)"
-gdb_test "x" "rotl.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotl.l @(0x1234:16,r2l.b)"
-gdb_test "x" "rotl.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotl.l @(0x1234:16,r2.w)"
-gdb_test "x" "rotl.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotl.l @(0x1234:16,er2.l)"
-gdb_test "x" "rotl.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotl.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotl.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotl.l @(0x12345678:32,r2.w)"
-gdb_test "x" "rotl.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotl.l @(0x12345678:32,er2.l)"
-gdb_test "x" "rotl.l\t@0x1234(:16|)" \
-	"rotl.l @0x1234:16"
-gdb_test "x" "rotl.l\t@0x12345678(:32|)" \
-	"rotl.l @0x12345678:32"
-gdb_test "x" "rotl.b\t#2,r1h" \
-	"rotl.b #2,r1h"
-gdb_test "x" "rotl.b\t#2,@er1" \
-	"rotl.b #2,@er1"
-gdb_test "x" "rotl.b\t#2,@\\(0x3(:2|),er1\\)" \
-	"rotl.b #2,@(0x3:2,er1)"
-gdb_test "x" "rotl.b\t#2,@er1\\+" \
-	"rotl.b #2,@er1+"
-gdb_test "x" "rotl.b\t#2,@-er1" \
-	"rotl.b #2,@-er1"
-gdb_test "x" "rotl.b\t#2,@\\+er1" \
-	"rotl.b #2,@+er1"
-gdb_test "x" "rotl.b\t#2,@er1-" \
-	"rotl.b #2,@er1-"
-gdb_test "x" "rotl.b\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotl.b #2,@(0x1234:16,er1)"
-gdb_test "x" "rotl.b\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotl.b #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotl.b\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotl.b #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotl.b\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotl.b #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotl.b\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotl.b #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotl.b\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotl.b #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotl.b\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotl.b #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotl.b\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotl.b #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotl.b\t#2,@0x12(:8|)" \
-	"rotl.b #2,@0x12:8"
-gdb_test "x" "rotl.b\t#2,@0x1234(:16|)" \
-	"rotl.b #2,@0x1234:16"
-gdb_test "x" "rotl.b\t#2,@0x12345678(:32|)" \
-	"rotl.b #2,@0x12345678:32"
-gdb_test "x" "rotl.w\t#2,r1" \
-	"rotl.w #2,r1"
-gdb_test "x" "rotl.w\t#2,@er1" \
-	"rotl.w #2,@er1"
-gdb_test "x" "rotl.w\t#2,@\\(0x6(:2|),er1\\)" \
-	"rotl.w #2,@(0x6:2,er1)"
-gdb_test "x" "rotl.w\t#2,@er1\\+" \
-	"rotl.w #2,@er1+"
-gdb_test "x" "rotl.w\t#2,@-er1" \
-	"rotl.w #2,@-er1"
-gdb_test "x" "rotl.w\t#2,@\\+er1" \
-	"rotl.w #2,@+er1"
-gdb_test "x" "rotl.w\t#2,@er1-" \
-	"rotl.w #2,@er1-"
-gdb_test "x" "rotl.w\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotl.w #2,@(0x1234:16,er1)"
-gdb_test "x" "rotl.w\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotl.w #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotl.w\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotl.w #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotl.w\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotl.w #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotl.w\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotl.w #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotl.w\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotl.w #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotl.w\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotl.w #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotl.w\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotl.w #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotl.w\t#2,@0x1234(:16|)" \
-	"rotl.w #2,@0x1234:16"
-gdb_test "x" "rotl.w\t#2,@0x12345678(:32|)" \
-	"rotl.w #2,@0x12345678:32"
-gdb_test "x" "rotl.l\t#2,er1" \
-	"rotl.l #2,er1"
-gdb_test "x" "rotl.l\t#2,@er1" \
-	"rotl.l #2,@er1"
-gdb_test "x" "rotl.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"rotl.l #2,@(0xc:2,er1)"
-gdb_test "x" "rotl.l\t#2,@er1\\+" \
-	"rotl.l #2,@er1+"
-gdb_test "x" "rotl.l\t#2,@-er1" \
-	"rotl.l #2,@-er1"
-gdb_test "x" "rotl.l\t#2,@\\+er1" \
-	"rotl.l #2,@+er1"
-gdb_test "x" "rotl.l\t#2,@er1-" \
-	"rotl.l #2,@er1-"
-gdb_test "x" "rotl.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotl.l #2,@(0x1234:16,er1)"
-gdb_test "x" "rotl.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotl.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotl.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotl.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotl.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotl.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotl.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotl.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotl.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotl.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotl.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotl.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotl.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotl.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotl.l\t#2,@0x1234(:16|)" \
-	"rotl.l #2,@0x1234:16"
-gdb_test "x" "rotl.l\t#2,@0x12345678(:32|)" \
-	"rotl.l #2,@0x12345678:32"
-gdb_test "x" "rotr.b\tr1h" \
-	"rotr.b r1h"
-gdb_test "x" "rotr.b\t@er1" \
-	"rotr.b @er1"
-gdb_test "x" "rotr.b\t@\\(0x3(:2|),er1\\)" \
-	"rotr.b @(0x3:2,er1)"
-gdb_test "x" "rotr.b\t@er1\\+" \
-	"rotr.b @er1+"
-gdb_test "x" "rotr.b\t@-er1" \
-	"rotr.b @-er1"
-gdb_test "x" "rotr.b\t@\\+er1" \
-	"rotr.b @+er1"
-gdb_test "x" "rotr.b\t@er1-" \
-	"rotr.b @er1-"
-gdb_test "x" "rotr.b\t@\\(0x1234(:16|),er1\\)" \
-	"rotr.b @(0x1234:16,er1)"
-gdb_test "x" "rotr.b\t@\\(0x12345678(:32|),er1\\)" \
-	"rotr.b @(0x12345678:32,er1)"
-gdb_test "x" "rotr.b\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotr.b @(0x1234:16,r2l.b)"
-gdb_test "x" "rotr.b\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotr.b @(0x1234:16,r2.w)"
-gdb_test "x" "rotr.b\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotr.b @(0x1234:16,er2.l)"
-gdb_test "x" "rotr.b\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotr.b @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotr.b\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotr.b @(0x12345678:32,r2.w)"
-gdb_test "x" "rotr.b\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotr.b @(0x12345678:32,er2.l)"
-gdb_test "x" "rotr.b\t@0x12(:8|)" \
-	"rotr.b @0x12:8"
-gdb_test "x" "rotr.b\t@0x1234(:16|)" \
-	"rotr.b @0x1234:16"
-gdb_test "x" "rotr.b\t@0x12345678(:32|)" \
-	"rotr.b @0x12345678:32"
-gdb_test "x" "rotr.w\tr1" \
-	"rotr.w r1"
-gdb_test "x" "rotr.w\t@er1" \
-	"rotr.w @er1"
-gdb_test "x" "rotr.w\t@\\(0x6(:2|),er1\\)" \
-	"rotr.w @(0x6:2,er1)"
-gdb_test "x" "rotr.w\t@-er1" \
-	"rotr.w @-er1"
-gdb_test "x" "rotr.w\t@er1\\+" \
-	"rotr.w @er1+"
-gdb_test "x" "rotr.w\t@er1-" \
-	"rotr.w @er1-"
-gdb_test "x" "rotr.w\t@\\+er1" \
-	"rotr.w @+er1"
-gdb_test "x" "rotr.w\t@\\(0x1234(:16|),er1\\)" \
-	"rotr.w @(0x1234:16,er1)"
-gdb_test "x" "rotr.w\t@\\(0x12345678(:32|),er1\\)" \
-	"rotr.w @(0x12345678:32,er1)"
-gdb_test "x" "rotr.w\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotr.w @(0x1234:16,r2l.b)"
-gdb_test "x" "rotr.w\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotr.w @(0x1234:16,r2.w)"
-gdb_test "x" "rotr.w\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotr.w @(0x1234:16,er2.l)"
-gdb_test "x" "rotr.w\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotr.w @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotr.w\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotr.w @(0x12345678:32,r2.w)"
-gdb_test "x" "rotr.w\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotr.w @(0x12345678:32,er2.l)"
-gdb_test "x" "rotr.w\t@0x1234(:16|)" \
-	"rotr.w @0x1234:16"
-gdb_test "x" "rotr.w\t@0x12345678(:32|)" \
-	"rotr.w @0x12345678:32"
-gdb_test "x" "rotr.l\ter1" \
-	"rotr.l er1"
-gdb_test "x" "rotr.l\t@er1" \
-	"rotr.l @er1"
-gdb_test "x" "rotr.l\t@\\(0xc(:2|),er1\\)" \
-	"rotr.l @(0xc:2,er1)"
-gdb_test "x" "rotr.l\t@er1\\+" \
-	"rotr.l @er1+"
-gdb_test "x" "rotr.l\t@-er1" \
-	"rotr.l @-er1"
-gdb_test "x" "rotr.l\t@\\+er1" \
-	"rotr.l @+er1"
-gdb_test "x" "rotr.l\t@er1-" \
-	"rotr.l @er1-"
-gdb_test "x" "rotr.l\t@\\(0x1234(:16|),er1\\)" \
-	"rotr.l @(0x1234:16,er1)"
-gdb_test "x" "rotr.l\t@\\(0x12345678(:32|),er1\\)" \
-	"rotr.l @(0x12345678:32,er1)"
-gdb_test "x" "rotr.l\t@\\(0x1234(:16|),r2l.b\\)" \
-	"rotr.l @(0x1234:16,r2l.b)"
-gdb_test "x" "rotr.l\t@\\(0x1234(:16|),r2.w\\)" \
-	"rotr.l @(0x1234:16,r2.w)"
-gdb_test "x" "rotr.l\t@\\(0x1234(:16|),er2.l\\)" \
-	"rotr.l @(0x1234:16,er2.l)"
-gdb_test "x" "rotr.l\t@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotr.l @(0x12345678:32,r2l.b)"
-gdb_test "x" "rotr.l\t@\\(0x12345678(:32|),r2.w\\)" \
-	"rotr.l @(0x12345678:32,r2.w)"
-gdb_test "x" "rotr.l\t@\\(0x12345678(:32|),er2.l\\)" \
-	"rotr.l @(0x12345678:32,er2.l)"
-gdb_test "x" "rotr.l\t@0x1234(:16|)" \
-	"rotr.l @0x1234:16"
-gdb_test "x" "rotr.l\t@0x12345678(:32|)" \
-	"rotr.l @0x12345678:32"
-gdb_test "x" "rotr.b\t#2,r1h" \
-	"rotr.b #2,r1h"
-gdb_test "x" "rotr.b\t#2,@er1" \
-	"rotr.b #2,@er1"
-gdb_test "x" "rotr.b\t#2,@\\(0x3(:2|),er1\\)" \
-	"rotr.b #2,@(0x3:2,er1)"
-gdb_test "x" "rotr.b\t#2,@er1\\+" \
-	"rotr.b #2,@er1+"
-gdb_test "x" "rotr.b\t#2,@-er1" \
-	"rotr.b #2,@-er1"
-gdb_test "x" "rotr.b\t#2,@\\+er1" \
-	"rotr.b #2,@+er1"
-gdb_test "x" "rotr.b\t#2,@er1-" \
-	"rotr.b #2,@er1-"
-gdb_test "x" "rotr.b\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotr.b #2,@(0x1234:16,er1)"
-gdb_test "x" "rotr.b\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotr.b #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotr.b\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotr.b #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotr.b\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotr.b #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotr.b\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotr.b #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotr.b\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotr.b #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotr.b\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotr.b #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotr.b\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotr.b #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotr.b\t#2,@0x12(:8|)" \
-	"rotr.b #2,@0x12:8"
-gdb_test "x" "rotr.b\t#2,@0x1234(:16|)" \
-	"rotr.b #2,@0x1234:16"
-gdb_test "x" "rotr.b\t#2,@0x12345678(:32|)" \
-	"rotr.b #2,@0x12345678:32"
-gdb_test "x" "rotr.w\t#2,r1" \
-	"rotr.w #2,r1"
-gdb_test "x" "rotr.w\t#2,@er1" \
-	"rotr.w #2,@er1"
-gdb_test "x" "rotr.w\t#2,@\\(0x6(:2|),er1\\)" \
-	"rotr.w #2,@(0x6:2,er1)"
-gdb_test "x" "rotr.w\t#2,@er1\\+" \
-	"rotr.w #2,@er1+"
-gdb_test "x" "rotr.w\t#2,@-er1" \
-	"rotr.w #2,@-er1"
-gdb_test "x" "rotr.w\t#2,@\\+er1" \
-	"rotr.w #2,@+er1"
-gdb_test "x" "rotr.w\t#2,@er1-" \
-	"rotr.w #2,@er1-"
-gdb_test "x" "rotr.w\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotr.w #2,@(0x1234:16,er1)"
-gdb_test "x" "rotr.w\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotr.w #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotr.w\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotr.w #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotr.w\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotr.w #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotr.w\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotr.w #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotr.w\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotr.w #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotr.w\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotr.w #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotr.w\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotr.w #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotr.w\t#2,@0x1234(:16|)" \
-	"rotr.w #2,@0x1234:16"
-gdb_test "x" "rotr.w\t#2,@0x12345678(:32|)" \
-	"rotr.w #2,@0x12345678:32"
-gdb_test "x" "rotr.l\t#2,er1" \
-	"rotr.l #2,er1"
-gdb_test "x" "rotr.l\t#2,@er1" \
-	"rotr.l #2,@er1"
-gdb_test "x" "rotr.l\t#2,@\\(0xc(:2|),er1\\)" \
-	"rotr.l #2,@(0xc:2,er1)"
-gdb_test "x" "rotr.l\t#2,@er1\\+" \
-	"rotr.l #2,@er1+"
-gdb_test "x" "rotr.l\t#2,@-er1" \
-	"rotr.l #2,@-er1"
-gdb_test "x" "rotr.l\t#2,@\\+er1" \
-	"rotr.l #2,@+er1"
-gdb_test "x" "rotr.l\t#2,@er1-" \
-	"rotr.l #2,@er1-"
-gdb_test "x" "rotr.l\t#2,@\\(0x1234(:16|),er1\\)" \
-	"rotr.l #2,@(0x1234:16,er1)"
-gdb_test "x" "rotr.l\t#2,@\\(0x12345678(:32|),er1\\)" \
-	"rotr.l #2,@(0x12345678:32,er1)"
-gdb_test "x" "rotr.l\t#2,@\\(0x1234(:16|),r2l.b\\)" \
-	"rotr.l #2,@(0x1234:16,r2l.b)"
-gdb_test "x" "rotr.l\t#2,@\\(0x1234(:16|),r2.w\\)" \
-	"rotr.l #2,@(0x1234:16,r2.w)"
-gdb_test "x" "rotr.l\t#2,@\\(0x1234(:16|),er2.l\\)" \
-	"rotr.l #2,@(0x1234:16,er2.l)"
-gdb_test "x" "rotr.l\t#2,@\\(0x12345678(:32|),r2l.b\\)" \
-	"rotr.l #2,@(0x12345678:32,r2l.b)"
-gdb_test "x" "rotr.l\t#2,@\\(0x12345678(:32|),r2.w\\)" \
-	"rotr.l #2,@(0x12345678:32,r2.w)"
-gdb_test "x" "rotr.l\t#2,@\\(0x12345678(:32|),er2.l\\)" \
-	"rotr.l #2,@(0x12345678:32,er2.l)"
-gdb_test "x" "rotr.l\t#2,@0x1234(:16|)" \
-	"rotr.l #2,@0x1234:16"
-gdb_test "x" "rotr.l\t#2,@0x12345678(:32|)" \
-	"rotr.l #2,@0x12345678:32"
diff --git a/gdb/testsuite/gdb.disasm/t11_logs.s b/gdb/testsuite/gdb.disasm/t11_logs.s
deleted file mode 100644
index 7782754ff0a..00000000000
--- a/gdb/testsuite/gdb.disasm/t11_logs.s
+++ /dev/null
@@ -1,1177 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;log_sft

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    not.b r1h                 ;1701

-    not.b @er1               ;7d101700

-    not.b @(0x3:2,er1)         ;017768181700

-    not.b @er1+              ;01746c181700

-    not.b @-er1              ;01776c181700

-    not.b @+er1              ;01756c181700

-    not.b @er1-              ;01766c181700

-    not.b @(0x1234:16,er1)        ;01746e1812341700

-    not.b @(0x12345678:32,er1)        ;78146a28123456781700

-    not.b @(0x1234:16,r2l.b)      ;01756e2812341700

-    not.b @(0x1234:16,r2.w)      ;01766e2812341700

-    not.b @(0x1234:16,er2.l)      ;01776e2812341700

-    not.b @(0x12345678:32,r2l.b)      ;78256a28123456781700

-    not.b @(0x12345678:32,r2.w)      ;78266a28123456781700

-    not.b @(0x12345678:32,er2.l)      ;78276a28123456781700

-    not.b @0xffffff12:8              ;7f121700

-    not.b @0x1234:16             ;6a1812341700

-    not.b @0x12345678:32             ;6a38123456781700

-

-    not.w r1                 ;1711

-    not.w @er1               ;7d901710

-    not.w @(0x6:2,er1)      ;015769181710

-    not.w @er1+              ;01546d181710

-    not.w @-er1              ;01576d181710

-    not.w @+er1              ;01556d181710

-    not.w @er1-              ;01566d181710

-    not.w @(0x1234:16,er1)        ;01546f1812341710

-    not.w @(0x12345678:32,er1)        ;78146b28123456781710

-    not.w @(0x1234:16,r2l.b)      ;01556f2812341710

-    not.w @(0x1234:16,r2.w)      ;01566f2812341710

-    not.w @(0x1234:16,er2.l)      ;01576f2812341710

-    not.w @(0x12345678:32,r2l.b)      ;78256b28123456781710

-    not.w @(0x12345678:32,r2.w)      ;78266b28123456781710

-    not.w @(0x12345678:32,er2.l)      ;78276b28123456781710

-    not.w @0x1234:16             ;6b1812341710

-    not.w @0x12345678:32             ;6b38123456781710

-

-    not.l er1                 ;1731

-    not.l @er1               ;010469181730

-    not.l @(0xc:2,er1)      ;010769181730

-    not.l @er1+              ;01046d181730

-    not.l @-er1              ;01076d181730

-    not.l @+er1              ;01056d181730

-    not.l @er1-              ;01066d181730

-    not.l @(0x1234:16,er1)        ;01046f1812341730

-    not.l @(0x12345678:32,er1)        ;78946b28123456781730

-    not.l @(0x1234:16,r2l.b)      ;01056f2812341730

-    not.l @(0x1234:16,r2.w)      ;01066f2812341730

-    not.l @(0x1234:16,er2.l)      ;01076f2812341730

-    not.l @(0x12345678:32,r2l.b)      ;78a56b28123456781730

-    not.l @(0x12345678:32,r2.w)      ;78a66b28123456781730

-    not.l @(0x12345678:32,er2.l)      ;78a76b28123456781730

-    not.l @0x1234:16             ;01046b0812341730

-    not.l @0x12345678:32             ;01046b28123456781730

-

-    shll.b r1h                ;1001

-    shll.b @er1              ;7d101000

-    shll.b @(0x3:2,er1)        ;017768181000

-    shll.b @er1+             ;01746c181000

-    shll.b @-er1             ;01776c181000

-    shll.b @+er1             ;01756c181000

-    shll.b @er1-             ;01766c181000

-    shll.b @(0x1234:16,er1)       ;01746e1812341000

-    shll.b @(0x12345678:32,er1)       ;78146a28123456781000

-    shll.b @(0x1234:16,r2l.b)     ;01756e2812341000

-    shll.b @(0x1234:16,r2.w)     ;01766e2812341000

-    shll.b @(0x1234:16,er2.l)     ;01776e2812341000

-    shll.b @(0x12345678:32,r2l.b)     ;78256a28123456781000

-    shll.b @(0x12345678:32,r2.w)     ;78266a28123456781000

-    shll.b @(0x12345678:32,er2.l)     ;78276a28123456781000

-    shll.b @0xffffff12:8             ;7f121000

-    shll.b @0x1234:16            ;6a1812341000

-    shll.b @0x12345678:32            ;6a38123456781000

-

-    shll.w r1                ;1011

-    shll.w @er1              ;7d901010

-    shll.w @(0x6:2,er1)     ;015769181010

-    shll.w @er1+             ;01546d181010

-    shll.w @-er1             ;01576d181010

-    shll.w @+er1             ;01556d181010

-    shll.w @er1-             ;01566d181010

-    shll.w @(0x1234:16,er1)       ;01546f1812341010

-    shll.w @(0x12345678:32,er1)       ;78146b28123456781010

-    shll.w @(0x1234:16,r2l.b)     ;01556f2812341010

-    shll.w @(0x1234:16,r2.w)     ;01566f2812341010

-    shll.w @(0x1234:16,er2.l)     ;01576f2812341010

-    shll.w @(0x12345678:32,r2l.b)     ;78256b28123456781010

-    shll.w @(0x12345678:32,r2.w)     ;78266b28123456781010

-    shll.w @(0x12345678:32,er2.l)     ;78276b28123456781010

-    shll.w @0x1234:16            ;6b1812341010

-    shll.w @0x12345678:32            ;6b38123456781010

-

-    shll.l er1                ;1031

-    shll.l @er1              ;010469181030

-    shll.l @(0xc:2,er1)     ;010769181030

-    shll.l @er1+             ;01046d181030

-    shll.l @-er1             ;01076d181030

-    shll.l @+er1             ;01056d181030

-    shll.l @er1-             ;01066d181030

-    shll.l @(0x1234:16,er1)       ;01046f1812341030

-    shll.l @(0x12345678:32,er1)       ;78946b28123456781030

-    shll.l @(0x1234:16,r2l.b)     ;01056f2812341030

-    shll.l @(0x1234:16,r2.w)     ;01066f2812341030

-    shll.l @(0x1234:16,er2.l)     ;01076f2812341030

-    shll.l @(0x12345678:32,r2l.b)     ;78a56b28123456781030

-    shll.l @(0x12345678:32,r2.w)     ;78a66b28123456781030

-    shll.l @(0x12345678:32,er2.l)     ;78a76b28123456781030

-    shll.l @0x1234:16            ;01046b0812341030

-    shll.l @0x12345678:32            ;01046b28123456781030

-

-    shll.b #2,r1h             ;1041

-    shll.b #2,@er1           ;7d101040

-    shll.b #2,@(0x3:2,er1)     ;017768181040

-    shll.b #2,@er1+          ;01746c181040

-    shll.b #2,@-er1          ;01776c181040

-    shll.b #2,@+er1          ;01756c181040

-    shll.b #2,@er1-          ;01766c181040

-    shll.b #2,@(0x1234:16,er1)    ;01746e1812341040

-    shll.b #2,@(0x12345678:32,er1)    ;78146a28123456781040

-    shll.b #2,@(0x1234:16,r2l.b)  ;01756e2812341040

-    shll.b #2,@(0x1234:16,r2.w)  ;01766e2812341040

-    shll.b #2,@(0x1234:16,er2.l)  ;01776e2812341040

-    shll.b #2,@(0x12345678:32,r2l.b)  ;78256a28123456781040

-    shll.b #2,@(0x12345678:32,r2.w)  ;78266a28123456781040

-    shll.b #2,@(0x12345678:32,er2.l)  ;78276a28123456781040

-    shll.b #2,@0xffffff12:8          ;7f121040

-    shll.b #2,@0x1234:16         ;6a1812341040

-    shll.b #2,@0x12345678:32         ;6a38123456781040

-

-    shll.w #2,r1             ;1051

-    shll.w #2,@er1           ;7d901050

-    shll.w #2,@(0x6:2,er1)  ;015769181050

-    shll.w #2,@er1+          ;01546d181050

-    shll.w #2,@-er1          ;01576d181050

-    shll.w #2,@+er1          ;01556d181050

-    shll.w #2,@er1-          ;01566d181050

-    shll.w #2,@(0x1234:16,er1)    ;01546f1812341050

-    shll.w #2,@(0x12345678:32,er1)    ;78146b28123456781050

-    shll.w #2,@(0x1234:16,r2l.b)  ;01556f2812341050

-    shll.w #2,@(0x1234:16,r2.w)  ;01566f2812341050

-    shll.w #2,@(0x1234:16,er2.l)  ;01576f2812341050

-    shll.w #2,@(0x12345678:32,r2l.b)  ;78256b28123456781050

-    shll.w #2,@(0x12345678:32,r2.w)  ;78266b28123456781050

-    shll.w #2,@(0x12345678:32,er2.l)  ;78276b28123456781050

-    shll.w #2,@0x1234:16         ;6b1812341050

-    shll.w #2,@0x12345678:32         ;6b38123456781050

-

-    shll.l #2,er1             ;1071

-    shll.l #2,@er1           ;010469181070

-    shll.l #2,@(0xc:2,er1)  ;010769181070

-    shll.l #2,@er1+          ;01046d181070

-    shll.l #2,@-er1          ;01076d181070

-    shll.l #2,@+er1          ;01056d181070

-    shll.l #2,@er1-          ;01066d181070

-    shll.l #2,@(0x1234:16,er1)    ;01046f1812341070

-    shll.l #2,@(0x12345678:32,er1)    ;78946b28123456781070

-    shll.l #2,@(0x1234:16,r2l.b)  ;01056f2812341070

-    shll.l #2,@(0x1234:16,r2.w)  ;01066f2812341070

-    shll.l #2,@(0x1234:16,er2.l)  ;01076f2812341070

-    shll.l #2,@(0x12345678:32,r2l.b)  ;78a56b28123456781070

-    shll.l #2,@(0x12345678:32,r2.w)  ;78a66b28123456781070

-    shll.l #2,@(0x12345678:32,er2.l)  ;78a76b28123456781070

-    shll.l #2,@0x1234:16         ;01046b0812341070

-    shll.l #2,@0x12345678:32         ;01046b28123456781070

-

-    shll.b #4,r1h             ;10a1

-    shll.b #4,@er1           ;7d1010a0

-    shll.b #4,@(0x3:2,er1)     ;0177681810a0

-    shll.b #4,@er1+          ;01746c1810a0

-    shll.b #4,@-er1          ;01776c1810a0

-    shll.b #4,@+er1          ;01756c1810a0

-    shll.b #4,@er1-          ;01766c1810a0

-    shll.b #4,@(0x1234:16,er1)    ;01746e18123410a0

-    shll.b #4,@(0x12345678:32,er1)    ;78146a281234567810a0

-    shll.b #4,@(0x1234:16,r2l.b)  ;01756e28123410a0

-    shll.b #4,@(0x1234:16,r2.w)  ;01766e28123410a0

-    shll.b #4,@(0x1234:16,er2.l)  ;01776e28123410a0

-    shll.b #4,@(0x12345678:32,r2l.b)  ;78256a281234567810a0

-    shll.b #4,@(0x12345678:32,r2.w)  ;78266a281234567810a0

-    shll.b #4,@(0x12345678:32,er2.l)  ;78276a281234567810a0

-    shll.b #4,@0xffffff12:8          ;7f1210a0

-    shll.b #4,@0x1234:16         ;6a18123410a0

-    shll.b #4,@0x12345678:32         ;6a381234567810a0

-

-    shll.w #4,r1             ;1021

-    shll.w #4,@er1           ;7d901020

-    shll.w #4,@(0x6:2,er1)  ;015769181020

-    shll.w #4,@er1+          ;01546d181020

-    shll.w #4,@-er1          ;01576d181020

-    shll.w #4,@+er1          ;01556d181020

-    shll.w #4,@er1-          ;01566d181020

-    shll.w #4,@(0x1234:16,er1)    ;01546f1812341020

-    shll.w #4,@(0x12345678:32,er1)    ;78146b28123456781020

-    shll.w #4,@(0x1234:16,r2l.b)  ;01556f2812341020

-    shll.w #4,@(0x1234:16,r2.w)  ;01566f2812341020

-    shll.w #4,@(0x1234:16,er2.l)  ;01576f2812341020

-    shll.w #4,@(0x12345678:32,r2l.b)  ;78256b28123456781020

-    shll.w #4,@(0x12345678:32,r2.w)  ;78266b28123456781020

-    shll.w #4,@(0x12345678:32,er2.l)  ;78276b28123456781020

-    shll.w #4,@0x1234:16         ;6b1812341020

-    shll.w #4,@0x12345678:32         ;6b38123456781020

-

-    shll.l #4,er1             ;1039

-    shll.l #4,@er1           ;010469181038

-    shll.l #4,@(0xc:2,er1)  ;010769181038

-    shll.l #4,@er1+          ;01046d181038

-    shll.l #4,@-er1          ;01076d181038

-    shll.l #4,@+er1          ;01056d181038

-    shll.l #4,@er1-          ;01066d181038

-    shll.l #4,@(0x1234:16,er1)    ;01046f1812341038

-    shll.l #4,@(0x12345678:32,er1)    ;78946b28123456781038

-    shll.l #4,@(0x1234:16,r2l.b)  ;01056f2812341038

-    shll.l #4,@(0x1234:16,r2.w)  ;01066f2812341038

-    shll.l #4,@(0x1234:16,er2.l)  ;01076f2812341038

-    shll.l #4,@(0x12345678:32,r2l.b)  ;78a56b28123456781038

-    shll.l #4,@(0x12345678:32,r2.w)  ;78a66b28123456781038

-    shll.l #4,@(0x12345678:32,er2.l)  ;78a76b28123456781038

-    shll.l #4,@0x1234:16         ;01046b0812341038

-    shll.l #4,@0x12345678:32         ;01046b28123456781038

-

-    shll.w #8,r1             ;1061

-    shll.w #8,@er1           ;7d901060

-    shll.w #8,@(0x6:2,er1)  ;015769181060

-    shll.w #8,@er1+          ;01546d181060

-    shll.w #8,@-er1          ;01576d181060

-    shll.w #8,@+er1          ;01556d181060

-    shll.w #8,@er1-          ;01566d181060

-    shll.w #8,@(0x1234:16,er1)    ;01546f1812341060

-    shll.w #8,@(0x12345678:32,er1)    ;78146b28123456781060

-    shll.w #8,@(0x1234:16,r2l.b)  ;01556f2812341060

-    shll.w #8,@(0x1234:16,r2.w)  ;01566f2812341060

-    shll.w #8,@(0x1234:16,er2.l)  ;01576f2812341060

-    shll.w #8,@(0x12345678:32,r2l.b)  ;78256b28123456781060

-    shll.w #8,@(0x12345678:32,r2.w)  ;78266b28123456781060

-    shll.w #8,@(0x12345678:32,er2.l)  ;78276b28123456781060

-    shll.w #8,@0x1234:16         ;6b1812341060

-    shll.w #8,@0x12345678:32         ;6b38123456781060

-

-    shll.l #8,er1             ;1079

-    shll.l #8,@er1           ;010469181078

-    shll.l #8,@(0xc:2,er1)  ;010769181078

-    shll.l #8,@er1+          ;01046d181078

-    shll.l #8,@-er1          ;01076d181078

-    shll.l #8,@+er1          ;01056d181078

-    shll.l #8,@er1-          ;01066d181078

-    shll.l #8,@(0x1234:16,er1)    ;01046f1812341078

-    shll.l #8,@(0x12345678:32,er1)    ;78946b28123456781078

-    shll.l #8,@(0x1234:16,r2l.b)  ;01056f2812341078

-    shll.l #8,@(0x1234:16,r2.w)  ;01066f2812341078

-    shll.l #8,@(0x1234:16,er2.l)  ;01076f2812341078

-    shll.l #8,@(0x12345678:32,r2l.b)  ;78a56b28123456781078

-    shll.l #8,@(0x12345678:32,r2.w)  ;78a66b28123456781078

-    shll.l #8,@(0x12345678:32,er2.l)  ;78a76b28123456781078

-    shll.l #8,@0x1234:16         ;01046b0812341078

-    shll.l #8,@0x12345678:32         ;01046b28123456781078

-

-    shll.l #16,er1            ;10f9

-    shll.l #16,@er1          ;0104691810f8

-    shll.l #16,@(0xc:2,er1) ;0107691810f8

-    shll.l #16,@er1+         ;01046d1810f8

-    shll.l #16,@-er1         ;01076d1810f8

-    shll.l #16,@+er1         ;01056d1810f8

-    shll.l #16,@er1-         ;01066d1810f8

-    shll.l #16,@(0x1234:16,er1)   ;01046f18123410f8

-    shll.l #16,@(0x12345678:32,er1)   ;78946b281234567810f8

-    shll.l #16,@(0x1234:16,r2l.b) ;01056f28123410f8

-    shll.l #16,@(0x1234:16,r2.w) ;01066f28123410f8

-    shll.l #16,@(0x1234:16,er2.l) ;01076f28123410f8

-    shll.l #16,@(0x12345678:32,r2l.b) ;78a56b281234567810f8

-    shll.l #16,@(0x12345678:32,r2.w) ;78a66b281234567810f8

-    shll.l #16,@(0x12345678:32,er2.l) ;78a76b281234567810f8

-    shll.l #16,@0x1234:16        ;01046b08123410f8

-    shll.l #16,@0x12345678:32        ;01046b281234567810f8

-

-    shll.b #0x7:5,r1h        ;03871001

-    shll.w #0xf:5,r1         ;038f1011

-    shll.l #0x1f:5,er1       ;039f1031

-

-    shll.b r3h,r1h           ;78381001

-    shll.w r3h,r1            ;78381011

-    shll.l r3h,er1           ;78381031

-

-    shlr.b r1h               ;1101

-    shlr.b @er1              ;7d101100

-    shlr.b @(0x3:2,er1)      ;017768181100

-    shlr.b @er1+             ;01746c181100

-    shlr.b @-er1             ;01776c181100

-    shlr.b @+er1             ;01756c181100

-    shlr.b @er1-             ;01766c181100

-    shlr.b @(0x1234:16,er1)       ;01746e1812341100

-    shlr.b @(0x12345678:32,er1)       ;78146a28123456781100

-    shlr.b @(0x1234:16,r2l.b)     ;01756e2812341100

-    shlr.b @(0x1234:16,r2.w)     ;01766e2812341100

-    shlr.b @(0x1234:16,er2.l)     ;01776e2812341100

-    shlr.b @(0x12345678:32,r2l.b)     ;78256a28123456781100

-    shlr.b @(0x12345678:32,r2.w)     ;78266a28123456781100

-    shlr.b @(0x12345678:32,er2.l)     ;78276a28123456781100

-    shlr.b @0xffffff12:8             ;7f121100

-    shlr.b @0x1234:16            ;6a1812341100

-    shlr.b @0x12345678:32            ;6a38123456781100

-

-    shlr.w r1                ;1111

-    shlr.w @er1              ;7d901110

-    shlr.w @(0x6:2,er1)     ;015769181110

-    shlr.w @er1+             ;01546d181110

-    shlr.w @-er1             ;01576d181110

-    shlr.w @+er1             ;01556d181110

-    shlr.w @er1-             ;01566d181110

-    shlr.w @(0x1234:16,er1)       ;01546f1812341110

-    shlr.w @(0x12345678:32,er1)       ;78146b28123456781110

-    shlr.w @(0x1234:16,r2l.b)     ;01556f2812341110

-    shlr.w @(0x1234:16,r2.w)     ;01566f2812341110

-    shlr.w @(0x1234:16,er2.l)     ;01576f2812341110

-    shlr.w @(0x12345678:32,r2l.b)     ;78256b28123456781110

-    shlr.w @(0x12345678:32,r2.w)     ;78266b28123456781110

-    shlr.w @(0x12345678:32,er2.l)     ;78276b28123456781110

-    shlr.w @0x1234:16            ;6b1812341110

-    shlr.w @0x12345678:32            ;6b38123456781110

-

-    shlr.l er1                ;1131

-    shlr.l @er1              ;010469181130

-    shlr.l @(0xc:2,er1)     ;010769181130

-    shlr.l @er1+             ;01046d181130

-    shlr.l @-er1             ;01076d181130

-    shlr.l @+er1             ;01056d181130

-    shlr.l @er1-             ;01066d181130

-    shlr.l @(0x1234:16,er1)       ;01046f1812341130

-    shlr.l @(0x12345678:32,er1)       ;78946b28123456781130

-    shlr.l @(0x1234:16,r2l.b)     ;01056f2812341130

-    shlr.l @(0x1234:16,r2.w)     ;01066f2812341130

-    shlr.l @(0x1234:16,er2.l)     ;01076f2812341130

-    shlr.l @(0x12345678:32,r2l.b)     ;78a56b28123456781130

-    shlr.l @(0x12345678:32,r2.w)     ;78a66b28123456781130

-    shlr.l @(0x12345678:32,er2.l)     ;78a76b28123456781130

-    shlr.l @0x1234:16            ;01046b0812341130

-    shlr.l @0x12345678:32            ;01046b28123456781130

-

-    shlr.b #2,r1h             ;1141

-    shlr.b #2,@er1           ;7d101140

-    shlr.b #2,@(0x3:2,er1)     ;017768181140

-    shlr.b #2,@er1+          ;01746c181140

-    shlr.b #2,@-er1          ;01776c181140

-    shlr.b #2,@+er1          ;01756c181140

-    shlr.b #2,@er1-          ;01766c181140

-    shlr.b #2,@(0x1234:16,er1)    ;01746e1812341140

-    shlr.b #2,@(0x12345678:32,er1)    ;78146a28123456781140

-    shlr.b #2,@(0x1234:16,r2l.b)  ;01756e2812341140

-    shlr.b #2,@(0x1234:16,r2.w)  ;01766e2812341140

-    shlr.b #2,@(0x1234:16,er2.l)  ;01776e2812341140

-    shlr.b #2,@(0x12345678:32,r2l.b)  ;78256a28123456781140

-    shlr.b #2,@(0x12345678:32,r2.w)  ;78266a28123456781140

-    shlr.b #2,@(0x12345678:32,er2.l)  ;78276a28123456781140

-    shlr.b #2,@0xffffff12:8          ;7f121140

-    shlr.b #2,@0x1234:16         ;6a1812341140

-    shlr.b #2,@0x12345678:32         ;6a38123456781140

-

-    shlr.w #2,r1             ;1151

-    shlr.w #2,@er1           ;7d901150

-    shlr.w #2,@(0x6:2,er1)  ;015769181150

-    shlr.w #2,@er1+          ;01546d181150

-    shlr.w #2,@-er1          ;01576d181150

-    shlr.w #2,@+er1          ;01556d181150

-    shlr.w #2,@er1-          ;01566d181150

-    shlr.w #2,@(0x1234:16,er1)    ;01546f1812341150

-    shlr.w #2,@(0x12345678:32,er1)    ;78146b28123456781150

-    shlr.w #2,@(0x1234:16,r2l.b)  ;01556f2812341150

-    shlr.w #2,@(0x1234:16,r2.w)  ;01566f2812341150

-    shlr.w #2,@(0x1234:16,er2.l)  ;01576f2812341150

-    shlr.w #2,@(0x12345678:32,r2l.b)  ;78256b28123456781150

-    shlr.w #2,@(0x12345678:32,r2.w)  ;78266b28123456781150

-    shlr.w #2,@(0x12345678:32,er2.l)  ;78276b28123456781150

-    shlr.w #2,@0x1234:16         ;6b1812341150

-    shlr.w #2,@0x12345678:32         ;6b38123456781150

-

-    shlr.l #2,er1             ;1171

-    shlr.l #2,@er1           ;010469181170

-    shlr.l #2,@(0xc:2,er1)  ;010769181170

-    shlr.l #2,@er1+          ;01046d181170

-    shlr.l #2,@-er1          ;01076d181170

-    shlr.l #2,@+er1          ;01056d181170

-    shlr.l #2,@er1-          ;01066d181170

-    shlr.l #2,@(0x1234:16,er1)    ;01046f1812341170

-    shlr.l #2,@(0x12345678:32,er1)    ;78946b28123456781170

-    shlr.l #2,@(0x1234:16,r2l.b)  ;01056f2812341170

-    shlr.l #2,@(0x1234:16,r2.w)  ;01066f2812341170

-    shlr.l #2,@(0x1234:16,er2.l)  ;01076f2812341170

-    shlr.l #2,@(0x12345678:32,r2l.b)  ;78a56b28123456781170

-    shlr.l #2,@(0x12345678:32,r2.w)  ;78a66b28123456781170

-    shlr.l #2,@(0x12345678:32,er2.l)  ;78a76b28123456781170

-    shlr.l #2,@0x1234:16         ;01046b0812341170

-    shlr.l #2,@0x12345678:32         ;01046b28123456781170

-

-    shlr.b #4,r1h             ;11a1

-    shlr.b #4,@er1           ;7d1011a0

-    shlr.b #4,@(0x3:2,er1)     ;0177681811a0

-    shlr.b #4,@er1+          ;01746c1811a0

-    shlr.b #4,@-er1          ;01776c1811a0

-    shlr.b #4,@+er1          ;01756c1811a0

-    shlr.b #4,@er1-          ;01766c1811a0

-    shlr.b #4,@(0x1234:16,er1)    ;01746e18123411a0

-    shlr.b #4,@(0x12345678:32,er1)    ;78146a281234567811a0

-    shlr.b #4,@(0x1234:16,r2l.b)  ;01756e28123411a0

-    shlr.b #4,@(0x1234:16,r2.w)  ;01766e28123411a0

-    shlr.b #4,@(0x1234:16,er2.l)  ;01776e28123411a0

-    shlr.b #4,@(0x12345678:32,r2l.b)  ;78256a281234567811a0

-    shlr.b #4,@(0x12345678:32,r2.w)  ;78266a281234567811a0

-    shlr.b #4,@(0x12345678:32,er2.l)  ;78276a281234567811a0

-    shlr.b #4,@0xffffff12:8          ;7f1211a0

-    shlr.b #4,@0x1234:16         ;6a18123411a0

-    shlr.b #4,@0x12345678:32         ;6a381234567811a0

-

-    shlr.w #4,r1             ;1121

-    shlr.w #4,@er1           ;7d901120

-    shlr.w #4,@(0x6:2,er1)     ;015769181120

-    shlr.w #4,@er1+          ;01546d181120

-    shlr.w #4,@-er1          ;01576d181120

-    shlr.w #4,@+er1          ;01556d181120

-    shlr.w #4,@er1-          ;01566d181120

-    shlr.w #4,@(0x1234:16,er1)    ;01546f1812341120

-    shlr.w #4,@(0x12345678:32,er1)    ;78146b28123456781120

-    shlr.w #4,@(0x1234:16,r2l.b)  ;01556f2812341120

-    shlr.w #4,@(0x1234:16,r2.w)  ;01566f2812341120

-    shlr.w #4,@(0x1234:16,er2.l)  ;01576f2812341120

-    shlr.w #4,@(0x12345678:32,r2l.b)  ;78256b28123456781120

-    shlr.w #4,@(0x12345678:32,r2.w)  ;78266b28123456781120

-    shlr.w #4,@(0x12345678:32,er2.l)  ;78276b28123456781120

-    shlr.w #4,@0x1234:16         ;6b1812341120

-    shlr.w #4,@0x12345678:32         ;6b38123456781120

-

-    shlr.l #4,er1             ;1139

-    shlr.l #4,@er1           ;010469181138

-    shlr.l #4,@(0xc:2,er1)     ;010769181138

-    shlr.l #4,@er1+          ;01046d181138

-    shlr.l #4,@-er1          ;01076d181138

-    shlr.l #4,@+er1          ;01056d181138

-    shlr.l #4,@er1-          ;01066d181138

-    shlr.l #4,@(0x1234:16,er1)    ;01046f1812341138

-    shlr.l #4,@(0x12345678:32,er1)    ;78946b28123456781138

-    shlr.l #4,@(0x1234:16,r2l.b)  ;01056f2812341138

-    shlr.l #4,@(0x1234:16,r2.w)  ;01066f2812341138

-    shlr.l #4,@(0x1234:16,er2.l)  ;01076f2812341138

-    shlr.l #4,@(0x12345678:32,r2l.b)  ;78a56b28123456781138

-    shlr.l #4,@(0x12345678:32,r2.w)  ;78a66b28123456781138

-    shlr.l #4,@(0x12345678:32,er2.l)  ;78a76b28123456781138

-    shlr.l #4,@0x1234:16         ;01046b0812341138

-    shlr.l #4,@0x12345678:32         ;01046b28123456781138

-

-    shlr.w #8,r1             ;1161

-    shlr.w #8,@er1           ;7d901160

-    shlr.w #8,@(0x6:2,er1)  ;015769181160

-    shlr.w #8,@er1+          ;01546d181160

-    shlr.w #8,@-er1          ;01576d181160

-    shlr.w #8,@+er1          ;01556d181160

-    shlr.w #8,@er1-          ;01566d181160

-    shlr.w #8,@(0x1234:16,er1)    ;01546f1812341160

-    shlr.w #8,@(0x12345678:32,er1)    ;78146b28123456781160

-    shlr.w #8,@(0x1234:16,r2l.b)  ;01556f2812341160

-    shlr.w #8,@(0x1234:16,r2.w)  ;01566f2812341160

-    shlr.w #8,@(0x1234:16,er2.l)  ;01576f2812341160

-    shlr.w #8,@(0x12345678:32,r2l.b)  ;78256b28123456781160

-    shlr.w #8,@(0x12345678:32,r2.w)  ;78266b28123456781160

-    shlr.w #8,@(0x12345678:32,er2.l)  ;78276b28123456781160

-    shlr.w #8,@0x1234:16         ;6b1812341160

-    shlr.w #8,@0x12345678:32         ;6b38123456781160

-

-    shlr.l #8,er1             ;1179

-    shlr.l #8,@er1           ;010469181178

-    shlr.l #8,@(0xc:2,er1)  ;010769181178

-    shlr.l #8,@er1+          ;01046d181178

-    shlr.l #8,@-er1          ;01076d181178

-    shlr.l #8,@+er1          ;01056d181178

-    shlr.l #8,@er1-          ;01066d181178

-    shlr.l #8,@(0x1234:16,er1)    ;01046f1812341178

-    shlr.l #8,@(0x12345678:32,er1)    ;78946b28123456781178

-    shlr.l #8,@(0x1234:16,r2l.b)  ;01056f2812341178

-    shlr.l #8,@(0x1234:16,r2.w)  ;01066f2812341178

-    shlr.l #8,@(0x1234:16,er2.l)  ;01076f2812341178

-    shlr.l #8,@(0x12345678:32,r2l.b)  ;78a56b28123456781178

-    shlr.l #8,@(0x12345678:32,r2.w)  ;78a66b28123456781178

-    shlr.l #8,@(0x12345678:32,er2.l)  ;78a76b28123456781178

-    shlr.l #8,@0x1234:16         ;01046b0812341178

-    shlr.l #8,@0x12345678:32         ;01046b28123456781178

-

-    shlr.l #16,er1            ;11f9

-    shlr.l #16,@er1          ;0104691811f8

-    shlr.l #16,@(0xc:2,er1) ;0107691811f8

-    shlr.l #16,@er1+         ;01046d1811f8

-    shlr.l #16,@-er1         ;01076d1811f8

-    shlr.l #16,@+er1         ;01056d1811f8

-    shlr.l #16,@er1-         ;01066d1811f8

-    shlr.l #16,@(0x1234:16,er1)   ;01046f18123411f8

-    shlr.l #16,@(0x12345678:32,er1)   ;78946b281234567811f8

-    shlr.l #16,@(0x1234:16,r2l.b) ;01056f28123411f8

-    shlr.l #16,@(0x1234:16,r2.w) ;01066f28123411f8

-    shlr.l #16,@(0x1234:16,er2.l) ;01076f28123411f8

-    shlr.l #16,@(0x12345678:32,r2l.b) ;78a56b281234567811f8

-    shlr.l #16,@(0x12345678:32,r2.w) ;78a66b281234567811f8

-    shlr.l #16,@(0x12345678:32,er2.l) ;78a76b281234567811f8

-    shlr.l #16,@0x1234:16        ;01046b08123411f8

-    shlr.l #16,@0x12345678:32        ;01046b281234567811f8

-

-    shlr.b #0x7:5,r1h        ;03871101

-    shlr.w #0xf:5,r1         ;038f1111

-    shlr.l #0x1f:5,er1       ;039f1131

-

-    shlr.b r3h,r1h           ;78381101

-    shlr.w r3h,r1            ;78381111

-    shlr.l r3h,er1           ;78381131

-

-    shal.b r1h               ;1081

-    shal.b @er1              ;7d101080

-    shal.b @(0x3:2,er1)      ;017768181080

-    shal.b @er1+             ;01746c181080

-    shal.b @-er1             ;01776c181080

-    shal.b @+er1             ;01756c181080

-    shal.b @er1-             ;01766c181080

-    shal.b @(0x1234:16,er1)       ;01746e1812341080

-    shal.b @(0x12345678:32,er1)       ;78146a28123456781080

-    shal.b @(0x1234:16,r2l.b)     ;01756e2812341080

-    shal.b @(0x1234:16,r2.w)     ;01766e2812341080

-    shal.b @(0x1234:16,er2.l)     ;01776e2812341080

-    shal.b @(0x12345678:32,r2l.b)     ;78256a28123456781080

-    shal.b @(0x12345678:32,r2.w)     ;78266a28123456781080

-    shal.b @(0x12345678:32,er2.l)     ;78276a28123456781080

-    shal.b @0xffffff12:8             ;7f121080

-    shal.b @0x1234:16            ;6a1812341080

-    shal.b @0x12345678:32            ;6a38123456781080

-

-    shal.w r1                ;1091

-    shal.w @er1              ;7d901090

-    shal.w @(0x6:2,er1)     ;015769181090

-    shal.w @er1+             ;01546d181090

-    shal.w @-er1             ;01576d181090

-    shal.w @+er1             ;01556d181090

-    shal.w @er1-             ;01566d181090

-    shal.w @(0x1234:16,er1)       ;01546f1812341090

-    shal.w @(0x12345678:32,er1)       ;78146b28123456781090

-    shal.w @(0x1234:16,r2l.b)     ;01556f2812341090

-    shal.w @(0x1234:16,r2.w)     ;01566f2812341090

-    shal.w @(0x1234:16,er2.l)     ;01576f2812341090

-    shal.w @(0x12345678:32,r2l.b)     ;78256b28123456781090

-    shal.w @(0x12345678:32,r2.w)     ;78266b28123456781090

-    shal.w @(0x12345678:32,er2.l)     ;78276b28123456781090

-    shal.w @0x1234:16            ;6b1812341090

-    shal.w @0x12345678:32            ;6b38123456781090

-

-    shal.l er1                ;10b1

-    shal.l @er1              ;0104691810b0

-    shal.l @(0xc:2,er1)     ;0107691810b0

-    shal.l @er1+             ;01046d1810b0

-    shal.l @-er1             ;01076d1810b0

-    shal.l @+er1             ;01056d1810b0

-    shal.l @er1-             ;01066d1810b0

-    shal.l @(0x1234:16,er1)       ;01046f18123410b0

-    shal.l @(0x12345678:32,er1)       ;78946b281234567810b0

-    shal.l @(0x1234:16,r2l.b)     ;01056f28123410b0

-    shal.l @(0x1234:16,r2.w)     ;01066f28123410b0

-    shal.l @(0x1234:16,er2.l)     ;01076f28123410b0

-    shal.l @(0x12345678:32,r2l.b)     ;78a56b281234567810b0

-    shal.l @(0x12345678:32,r2.w)     ;78a66b281234567810b0

-    shal.l @(0x12345678:32,er2.l)     ;78a76b281234567810b0

-    shal.l @0x1234:16            ;01046b08123410b0

-    shal.l @0x12345678:32            ;01046b281234567810b0

-

-    shal.b #2,r1h             ;10c1

-    shal.b #2,@er1           ;7d1010c0

-    shal.b #2,@(0x3:2,er1)     ;0177681810c0

-    shal.b #2,@er1+          ;01746c1810c0

-    shal.b #2,@-er1          ;01776c1810c0

-    shal.b #2,@+er1          ;01756c1810c0

-    shal.b #2,@er1-          ;01766c1810c0

-    shal.b #2,@(0x1234:16,er1)    ;01746e18123410c0

-    shal.b #2,@(0x12345678:32,er1)    ;78146a281234567810c0

-    shal.b #2,@(0x1234:16,r2l.b)  ;01756e28123410c0

-    shal.b #2,@(0x1234:16,r2.w)  ;01766e28123410c0

-    shal.b #2,@(0x1234:16,er2.l)  ;01776e28123410c0

-    shal.b #2,@(0x12345678:32,r2l.b)  ;78256a281234567810c0

-    shal.b #2,@(0x12345678:32,r2.w)  ;78266a281234567810c0

-    shal.b #2,@(0x12345678:32,er2.l)  ;78276a281234567810c0

-    shal.b #2,@0xffffff12:8          ;7f1210c0

-    shal.b #2,@0x1234:16         ;6a18123410c0

-    shal.b #2,@0x12345678:32         ;6a381234567810c0

-

-    shal.w #2,r1             ;10d1

-    shal.w #2,@er1           ;7d9010d0

-    shal.w #2,@(0x6:2,er1)  ;0157691810d0

-    shal.w #2,@er1+          ;01546d1810d0

-    shal.w #2,@-er1          ;01576d1810d0

-    shal.w #2,@+er1          ;01556d1810d0

-    shal.w #2,@er1-          ;01566d1810d0

-    shal.w #2,@(0x1234:16,er1)    ;01546f18123410d0

-    shal.w #2,@(0x12345678:32,er1)    ;78146b281234567810d0

-    shal.w #2,@(0x1234:16,r2l.b)  ;01556f28123410d0

-    shal.w #2,@(0x1234:16,r2.w)  ;01566f28123410d0

-    shal.w #2,@(0x1234:16,er2.l)  ;01576f28123410d0

-    shal.w #2,@(0x12345678:32,r2l.b)  ;78256b281234567810d0

-    shal.w #2,@(0x12345678:32,r2.w)  ;78266b281234567810d0

-    shal.w #2,@(0x12345678:32,er2.l)  ;78276b281234567810d0

-    shal.w #2,@0x1234:16         ;6b18123410d0

-    shal.w #2,@0x12345678:32         ;6b381234567810d0

-

-    shal.l #2,er1             ;10f1

-    shal.l #2,@er1           ;0104691810f0

-    shal.l #2,@(0xc:2,er1)  ;0107691810f0

-    shal.l #2,@er1+          ;01046d1810f0

-    shal.l #2,@-er1          ;01076d1810f0

-    shal.l #2,@+er1          ;01056d1810f0

-    shal.l #2,@er1-          ;01066d1810f0

-    shal.l #2,@(0x1234:16,er1)    ;01046f18123410f0

-    shal.l #2,@(0x12345678:32,er1)    ;78946b281234567810f0

-    shal.l #2,@(0x1234:16,r2l.b)  ;01056f28123410f0

-    shal.l #2,@(0x1234:16,r2.w)  ;01066f28123410f0

-    shal.l #2,@(0x1234:16,er2.l)  ;01076f28123410f0

-    shal.l #2,@(0x12345678:32,r2l.b)  ;78a56b281234567810f0

-    shal.l #2,@(0x12345678:32,r2.w)  ;78a66b281234567810f0

-    shal.l #2,@(0x12345678:32,er2.l)  ;78a76b281234567810f0

-    shal.l #2,@0x1234:16         ;01046b08123410f0

-    shal.l #2,@0x12345678:32         ;01046b281234567810f0

-

-    shar.b r1h                ;1181

-    shar.b @er1              ;7d101180

-    shar.b @(0x3:2,er1)        ;017768181180

-    shar.b @er1+             ;01746c181180

-    shar.b @-er1             ;01776c181180

-    shar.b @+er1             ;01756c181180

-    shar.b @er1-             ;01766c181180

-    shar.b @(0x1234:16,er1)       ;01746e1812341180

-    shar.b @(0x12345678:32,er1)       ;78146a28123456781180

-    shar.b @(0x1234:16,r2l.b)     ;01756e2812341180

-    shar.b @(0x1234:16,r2.w)     ;01766e2812341180

-    shar.b @(0x1234:16,er2.l)     ;01776e2812341180

-    shar.b @(0x12345678:32,r2l.b)     ;78256a28123456781180

-    shar.b @(0x12345678:32,r2.w)     ;78266a28123456781180

-    shar.b @(0x12345678:32,er2.l)     ;78276a28123456781180

-    shar.b @0xffffff12:8             ;7f121180

-    shar.b @0x1234:16            ;6a1812341180

-    shar.b @0x12345678:32            ;6a38123456781180

-

-    shar.w r1                ;1191

-    shar.w @er1              ;7d901190

-    shar.w @(0x6:2,er1)     ;015769181190

-    shar.w @er1+             ;01546d181190

-    shar.w @-er1             ;01576d181190

-    shar.w @+er1             ;01556d181190

-    shar.w @er1-             ;01566d181190

-    shar.w @(0x1234:16,er1)       ;01546f1812341190

-    shar.w @(0x12345678:32,er1)       ;78146b28123456781190

-    shar.w @(0x1234:16,r2l.b)     ;01556f2812341190

-    shar.w @(0x1234:16,r2.w)     ;01566f2812341190

-    shar.w @(0x1234:16,er2.l)     ;01576f2812341190

-    shar.w @(0x12345678:32,r2l.b)     ;78256b28123456781190

-    shar.w @(0x12345678:32,r2.w)     ;78266b28123456781190

-    shar.w @(0x12345678:32,er2.l)     ;78276b28123456781190

-    shar.w @0x1234:16            ;6b1812341190

-    shar.w @0x12345678:32            ;6b38123456781190

-

-    shar.l er1                ;11b1

-    shar.l @er1              ;0104691811b0

-    shar.l @(0xc:2,er1)     ;0107691811b0

-    shar.l @er1+             ;01046d1811b0

-    shar.l @-er1             ;01076d1811b0

-    shar.l @+er1             ;01056d1811b0

-    shar.l @er1-             ;01066d1811b0

-    shar.l @(0x1234:16,er1)       ;01046f18123411b0

-    shar.l @(0x12345678:32,er1)       ;78946b281234567811b0

-    shar.l @(0x1234:16,r2l.b)     ;01056f28123411b0

-    shar.l @(0x1234:16,r2.w)     ;01066f28123411b0

-    shar.l @(0x1234:16,er2.l)     ;01076f28123411b0

-    shar.l @(0x12345678:32,r2l.b)     ;78a56b281234567811b0

-    shar.l @(0x12345678:32,r2.w)     ;78a66b281234567811b0

-    shar.l @(0x12345678:32,er2.l)     ;78a76b281234567811b0

-    shar.l @0x1234:16            ;01046b08123411b0

-    shar.l @0x12345678:32            ;01046b281234567811b0

-

-    shar.b #2,r1h             ;11c1

-    shar.b #2,@er1           ;7d1011c0

-    shar.b #2,@(0x3:2,er1)     ;0177681811c0

-    shar.b #2,@er1+          ;01746c1811c0

-    shar.b #2,@-er1          ;01776c1811c0

-    shar.b #2,@+er1          ;01756c1811c0

-    shar.b #2,@er1-          ;01766c1811c0

-    shar.b #2,@(0x1234:16,er1)    ;01746e18123411c0

-    shar.b #2,@(0x12345678:32,er1)    ;78146a281234567811c0

-    shar.b #2,@(0x1234:16,r2l.b)  ;01756e28123411c0

-    shar.b #2,@(0x1234:16,r2.w)  ;01766e28123411c0

-    shar.b #2,@(0x1234:16,er2.l)  ;01776e28123411c0

-    shar.b #2,@(0x12345678:32,r2l.b)  ;78256a281234567811c0

-    shar.b #2,@(0x12345678:32,r2.w)  ;78266a281234567811c0

-    shar.b #2,@(0x12345678:32,er2.l)  ;78276a281234567811c0

-    shar.b #2,@0xffffff12:8          ;7f1211c0

-    shar.b #2,@0x1234:16         ;6a18123411c0

-    shar.b #2,@0x12345678:32         ;6a381234567811c0

-

-    shar.w #2,r1             ;11d1

-    shar.w #2,@er1           ;7d9011d0

-    shar.w #2,@(0x6:2,er1)  ;0157691811d0

-    shar.w #2,@er1+          ;01546d1811d0

-    shar.w #2,@-er1          ;01576d1811d0

-    shar.w #2,@+er1          ;01556d1811d0

-    shar.w #2,@er1-          ;01566d1811d0

-    shar.w #2,@(0x1234:16,er1)    ;01546f18123411d0

-    shar.w #2,@(0x12345678:32,er1)    ;78146b281234567811d0

-    shar.w #2,@(0x1234:16,r2l.b)  ;01556f28123411d0

-    shar.w #2,@(0x1234:16,r2.w)  ;01566f28123411d0

-    shar.w #2,@(0x1234:16,er2.l)  ;01576f28123411d0

-    shar.w #2,@(0x12345678:32,r2l.b)  ;78256b281234567811d0

-    shar.w #2,@(0x12345678:32,r2.w)  ;78266b281234567811d0

-    shar.w #2,@(0x12345678:32,er2.l)  ;78276b281234567811d0

-    shar.w #2,@0x1234:16         ;6b18123411d0

-    shar.w #2,@0x12345678:32         ;6b381234567811d0

-

-    shar.l #2,er1             ;11f1

-    shar.l #2,@er1           ;0104691811f0

-    shar.l #2,@(0xc:2,er1)  ;0107691811f0

-    shar.l #2,@er1+          ;01046d1811f0

-    shar.l #2,@-er1          ;01076d1811f0

-    shar.l #2,@+er1          ;01056d1811f0

-    shar.l #2,@er1-          ;01066d1811f0

-    shar.l #2,@(0x1234:16,er1)    ;01046f18123411f0

-    shar.l #2,@(0x12345678:32,er1)    ;78946b281234567811f0

-    shar.l #2,@(0x1234:16,r2l.b)  ;01056f28123411f0

-    shar.l #2,@(0x1234:16,r2.w)  ;01066f28123411f0

-    shar.l #2,@(0x1234:16,er2.l)  ;01076f28123411f0

-    shar.l #2,@(0x12345678:32,r2l.b)  ;78a56b281234567811f0

-    shar.l #2,@(0x12345678:32,r2.w)  ;78a66b281234567811f0

-    shar.l #2,@(0x12345678:32,er2.l)  ;78a76b281234567811f0

-    shar.l #2,@0x1234:16         ;01046b08123411f0

-    shar.l #2,@0x12345678:32         ;01046b281234567811f0

-

-    rotxl.b r1h               ;1201

-    rotxl.b @er1             ;7d101200

-    rotxl.b @(0x3:2,er1)       ;017768181200

-    rotxl.b @er1+            ;01746c181200

-    rotxl.b @-er1            ;01776c181200

-    rotxl.b @+er1            ;01756c181200

-    rotxl.b @er1-            ;01766c181200

-    rotxl.b @(0x1234:16,er1)      ;01746e1812341200

-    rotxl.b @(0x12345678:32,er1)      ;78146a28123456781200

-    rotxl.b @(0x1234:16,r2l.b)    ;01756e2812341200

-    rotxl.b @(0x1234:16,r2.w)    ;01766e2812341200

-    rotxl.b @(0x1234:16,er2.l)    ;01776e2812341200

-    rotxl.b @(0x12345678:32,r2l.b)    ;78256a28123456781200

-    rotxl.b @(0x12345678:32,r2.w)    ;78266a28123456781200

-    rotxl.b @(0x12345678:32,er2.l)    ;78276a28123456781200

-    rotxl.b @0xffffff12:8            ;7f121200

-    rotxl.b @0x1234:16           ;6a1812341200

-    rotxl.b @0x12345678:32           ;6a38123456781200

-

-    rotxl.w r1               ;1211

-    rotxl.w @er1             ;7d901210

-    rotxl.w @(0x6:2,er1)    ;015769181210

-    rotxl.w @er1+            ;01546d181210

-    rotxl.w @-er1            ;01576d181210

-    rotxl.w @+er1            ;01556d181210

-    rotxl.w @er1-            ;01566d181210

-    rotxl.w @(0x1234:16,er1)      ;01546f1812341210

-    rotxl.w @(0x12345678:32,er1)      ;78146b28123456781210

-    rotxl.w @(0x1234:16,r2l.b)    ;01556f2812341210

-    rotxl.w @(0x1234:16,r2.w)    ;01566f2812341210

-    rotxl.w @(0x1234:16,er2.l)    ;01576f2812341210

-    rotxl.w @(0x12345678:32,r2l.b)    ;78256b28123456781210

-    rotxl.w @(0x12345678:32,r2.w)    ;78266b28123456781210

-    rotxl.w @(0x12345678:32,er2.l)    ;78276b28123456781210

-    rotxl.w @0x1234:16           ;6b1812341210

-    rotxl.w @0x12345678:32           ;6b38123456781210

-

-    rotxl.l er1               ;1231

-    rotxl.l @er1             ;010469181230

-    rotxl.l @(0xc:2,er1)    ;010769181230

-    rotxl.l @er1+            ;01046d181230

-    rotxl.l @-er1            ;01076d181230

-    rotxl.l @+er1            ;01056d181230

-    rotxl.l @er1-            ;01066d181230

-    rotxl.l @(0x1234:16,er1)      ;01046f1812341230

-    rotxl.l @(0x12345678:32,er1)      ;78946b28123456781230

-    rotxl.l @(0x1234:16,r2l.b)    ;01056f2812341230

-    rotxl.l @(0x1234:16,r2.w)    ;01066f2812341230

-    rotxl.l @(0x1234:16,er2.l)    ;01076f2812341230

-    rotxl.l @(0x12345678:32,r2l.b)    ;78a56b28123456781230

-    rotxl.l @(0x12345678:32,r2.w)    ;78a66b28123456781230

-    rotxl.l @(0x12345678:32,er2.l)    ;78a76b28123456781230

-    rotxl.l @0x1234:16           ;01046b0812341230

-    rotxl.l @0x12345678:32           ;01046b28123456781230

-

-    rotxl.b #2,r1h            ;1241

-    rotxl.b #2,@er1          ;7d101240

-    rotxl.b #2,@(0x3:2,er1)    ;017768181240

-    rotxl.b #2,@er1+         ;01746c181240

-    rotxl.b #2,@-er1         ;01776c181240

-    rotxl.b #2,@+er1         ;01756c181240

-    rotxl.b #2,@er1-         ;01766c181240

-    rotxl.b #2,@(0x1234:16,er1)   ;01746e1812341240

-    rotxl.b #2,@(0x12345678:32,er1)   ;78146a28123456781240

-    rotxl.b #2,@(0x1234:16,r2l.b) ;01756e2812341240

-    rotxl.b #2,@(0x1234:16,r2.w) ;01766e2812341240

-    rotxl.b #2,@(0x1234:16,er2.l) ;01776e2812341240

-    rotxl.b #2,@(0x12345678:32,r2l.b) ;78256a28123456781240

-    rotxl.b #2,@(0x12345678:32,r2.w) ;78266a28123456781240

-    rotxl.b #2,@(0x12345678:32,er2.l) ;78276a28123456781240

-    rotxl.b #2,@0xffffff12:8         ;7f121240

-    rotxl.b #2,@0x1234:16        ;6a1812341240

-    rotxl.b #2,@0x12345678:32        ;6a38123456781240

-

-    rotxl.w #2,r1            ;1251

-    rotxl.w #2,@er1          ;7d901250

-    rotxl.w #2,@(0x6:2,er1) ;015769181250

-    rotxl.w #2,@er1+         ;01546d181250

-    rotxl.w #2,@-er1         ;01576d181250

-    rotxl.w #2,@+er1         ;01556d181250

-    rotxl.w #2,@er1-         ;01566d181250

-    rotxl.w #2,@(0x1234:16,er1)   ;01546f1812341250

-    rotxl.w #2,@(0x12345678:32,er1)   ;78146b28123456781250

-    rotxl.w #2,@(0x1234:16,r2l.b) ;01556f2812341250

-    rotxl.w #2,@(0x1234:16,r2.w) ;01566f2812341250

-    rotxl.w #2,@(0x1234:16,er2.l) ;01576f2812341250

-    rotxl.w #2,@(0x12345678:32,r2l.b) ;78256b28123456781250

-    rotxl.w #2,@(0x12345678:32,r2.w) ;78266b28123456781250

-    rotxl.w #2,@(0x12345678:32,er2.l) ;78276b28123456781250

-    rotxl.w #2,@0x1234:16        ;6b1812341250

-    rotxl.w #2,@0x12345678:32        ;6b38123456781250

-

-    rotxl.l #2,er1            ;1271

-    rotxl.l #2,@er1          ;010469181270

-    rotxl.l #2,@(0xc:2,er1) ;010769181270

-    rotxl.l #2,@er1+         ;01046d181270

-    rotxl.l #2,@-er1         ;01076d181270

-    rotxl.l #2,@+er1         ;01056d181270

-    rotxl.l #2,@er1-         ;01066d181270

-    rotxl.l #2,@(0x1234:16,er1)   ;01046f1812341270

-    rotxl.l #2,@(0x12345678:32,er1)   ;78946b28123456781270

-    rotxl.l #2,@(0x1234:16,r2l.b) ;01056f2812341270

-    rotxl.l #2,@(0x1234:16,r2.w) ;01066f2812341270

-    rotxl.l #2,@(0x1234:16,er2.l) ;01076f2812341270

-    rotxl.l #2,@(0x12345678:32,r2l.b) ;78a56b28123456781270

-    rotxl.l #2,@(0x12345678:32,r2.w) ;78a66b28123456781270

-    rotxl.l #2,@(0x12345678:32,er2.l) ;78a76b28123456781270

-    rotxl.l #2,@0x1234:16        ;01046b0812341270

-    rotxl.l #2,@0x12345678:32        ;01046b28123456781270

-

-    rotxr.b r1h               ;1301

-    rotxr.b @er1             ;7d101300

-    rotxr.b @(0x3:2,er1)       ;017768181300

-    rotxr.b @er1+            ;01746c181300

-    rotxr.b @-er1            ;01776c181300

-    rotxr.b @+er1            ;01756c181300

-    rotxr.b @er1-            ;01766c181300

-    rotxr.b @(0x1234:16,er1)      ;01746e1812341300

-    rotxr.b @(0x12345678:32,er1)      ;78146a28123456781300

-    rotxr.b @(0x1234:16,r2l.b)    ;01756e2812341300

-    rotxr.b @(0x1234:16,r2.w)    ;01766e2812341300

-    rotxr.b @(0x1234:16,er2.l)    ;01776e2812341300

-    rotxr.b @(0x12345678:32,r2l.b)    ;78256a28123456781300

-    rotxr.b @(0x12345678:32,r2.w)    ;78266a28123456781300

-    rotxr.b @(0x12345678:32,er2.l)    ;78276a28123456781300

-    rotxr.b @0xffffff12:8            ;7f121300

-    rotxr.b @0x1234:16           ;6a1812341300

-    rotxr.b @0x12345678:32           ;6a38123456781300

-

-    rotxr.w r1               ;1311

-    rotxr.w @er1             ;7d901310

-    rotxr.w @(0x6:2,er1)    ;015769181310

-    rotxr.w @er1+            ;01546d181310

-    rotxr.w @-er1            ;01576d181310

-    rotxr.w @+er1            ;01556d181310

-    rotxr.w @er1-            ;01566d181310

-    rotxr.w @(0x1234:16,er1)      ;01546f1812341310

-    rotxr.w @(0x12345678:32,er1)      ;78146b28123456781310

-    rotxr.w @(0x1234:16,r2l.b)    ;01556f2812341310

-    rotxr.w @(0x1234:16,r2.w)    ;01566f2812341310

-    rotxr.w @(0x1234:16,er2.l)    ;01576f2812341310

-    rotxr.w @(0x12345678:32,r2l.b)    ;78256b28123456781310

-    rotxr.w @(0x12345678:32,r2.w)    ;78266b28123456781310

-    rotxr.w @(0x12345678:32,er2.l)    ;78276b28123456781310

-    rotxr.w @0x1234:16           ;6b1812341310

-    rotxr.w @0x12345678:32           ;6b38123456781310

-

-    rotxr.l er1               ;1331

-    rotxr.l @er1             ;010469181330

-    rotxr.l @(0xc:2,er1)    ;010769181330

-    rotxr.l @er1+            ;01046d181330

-    rotxr.l @-er1            ;01076d181330

-    rotxr.l @+er1            ;01056d181330

-    rotxr.l @er1-            ;01066d181330

-    rotxr.l @(0x1234:16,er1)      ;01046f1812341330

-    rotxr.l @(0x12345678:32,er1)      ;78946b28123456781330

-    rotxr.l @(0x1234:16,r2l.b)    ;01056f2812341330

-    rotxr.l @(0x1234:16,r2.w)    ;01066f2812341330

-    rotxr.l @(0x1234:16,er2.l)    ;01076f2812341330

-    rotxr.l @(0x12345678:32,r2l.b)    ;78a56b28123456781330

-    rotxr.l @(0x12345678:32,r2.w)    ;78a66b28123456781330

-    rotxr.l @(0x12345678:32,er2.l)    ;78a76b28123456781330

-    rotxr.l @0x1234:16           ;01046b0812341330

-    rotxr.l @0x12345678:32           ;01046b28123456781330

-

-    rotxr.b #2,r1h            ;1341

-    rotxr.b #2,@er1          ;7d101340

-    rotxr.b #2,@(0x3:2,er1)    ;017768181340

-    rotxr.b #2,@er1+         ;01746c181340

-    rotxr.b #2,@-er1         ;01776c181340

-    rotxr.b #2,@+er1         ;01756c181340

-    rotxr.b #2,@er1-         ;01766c181340

-    rotxr.b #2,@(0x1234:16,er1)   ;01746e1812341340

-    rotxr.b #2,@(0x12345678:32,er1)   ;78146a28123456781340

-    rotxr.b #2,@(0x1234:16,r2l.b) ;01756e2812341340

-    rotxr.b #2,@(0x1234:16,r2.w) ;01766e2812341340

-    rotxr.b #2,@(0x1234:16,er2.l) ;01776e2812341340

-    rotxr.b #2,@(0x12345678:32,r2l.b) ;78256a28123456781340

-    rotxr.b #2,@(0x12345678:32,r2.w) ;78266a28123456781340

-    rotxr.b #2,@(0x12345678:32,er2.l) ;78276a28123456781340

-    rotxr.b #2,@0xffffff12:8         ;7f121340

-    rotxr.b #2,@0x1234:16        ;6a1812341340

-    rotxr.b #2,@0x12345678:32        ;6a38123456781340

-

-    rotxr.w #2,r1            ;1351

-    rotxr.w #2,@er1          ;7d901350

-    rotxr.w #2,@(0x6:2,er1) ;015769181350

-    rotxr.w #2,@er1+         ;01546d181350

-    rotxr.w #2,@-er1         ;01576d181350

-    rotxr.w #2,@+er1         ;01556d181350

-    rotxr.w #2,@er1-         ;01566d181350

-    rotxr.w #2,@(0x1234:16,er1)   ;01546f1812341350

-    rotxr.w #2,@(0x12345678:32,er1)   ;78146b28123456781350

-    rotxr.w #2,@(0x1234:16,r2l.b) ;01556f2812341350

-    rotxr.w #2,@(0x1234:16,r2.w) ;01566f2812341350

-    rotxr.w #2,@(0x1234:16,er2.l) ;01576f2812341350

-    rotxr.w #2,@(0x12345678:32,r2l.b) ;78256b28123456781350

-    rotxr.w #2,@(0x12345678:32,r2.w) ;78266b28123456781350

-    rotxr.w #2,@(0x12345678:32,er2.l) ;78276b28123456781350

-    rotxr.w #2,@0x1234:16        ;6b1812341350

-    rotxr.w #2,@0x12345678:32        ;6b38123456781350

-

-    rotxr.l #2,er1            ;1371

-    rotxr.l #2,@er1          ;010469181370

-    rotxr.l #2,@(0xc:2,er1) ;010769181370

-    rotxr.l #2,@er1+         ;01046d181370

-    rotxr.l #2,@-er1         ;01076d181370

-    rotxr.l #2,@+er1         ;01056d181370

-    rotxr.l #2,@er1-         ;01066d181370

-    rotxr.l #2,@(0x1234:16,er1)   ;01046f1812341370

-    rotxr.l #2,@(0x12345678:32,er1)   ;78946b28123456781370

-    rotxr.l #2,@(0x1234:16,r2l.b) ;01056f2812341370

-    rotxr.l #2,@(0x1234:16,r2.w) ;01066f2812341370

-    rotxr.l #2,@(0x1234:16,er2.l) ;01076f2812341370

-    rotxr.l #2,@(0x12345678:32,r2l.b) ;78a56b28123456781370

-    rotxr.l #2,@(0x12345678:32,r2.w) ;78a66b28123456781370

-    rotxr.l #2,@(0x12345678:32,er2.l) ;78a76b28123456781370

-    rotxr.l #2,@0x1234:16        ;01046b0812341370

-    rotxr.l #2,@0x12345678:32        ;01046b28123456781370

-

-    rotl.b r1h                ;1281

-    rotl.b @er1              ;7d101280

-    rotl.b @(0x3:2,er1)        ;017768181280

-    rotl.b @er1+             ;01746c181280

-    rotl.b @-er1             ;01776c181280

-    rotl.b @+er1             ;01756c181280

-    rotl.b @er1-             ;01766c181280

-    rotl.b @(0x1234:16,er1)       ;01746e1812341280

-    rotl.b @(0x12345678:32,er1)       ;78146a28123456781280

-    rotl.b @(0x1234:16,r2l.b)     ;01756e2812341280

-    rotl.b @(0x1234:16,r2.w)     ;01766e2812341280

-    rotl.b @(0x1234:16,er2.l)     ;01776e2812341280

-    rotl.b @(0x12345678:32,r2l.b)     ;78256a28123456781280

-    rotl.b @(0x12345678:32,r2.w)     ;78266a28123456781280

-    rotl.b @(0x12345678:32,er2.l)     ;78276a28123456781280

-    rotl.b @0xffffff12:8             ;7f121280

-    rotl.b @0x1234:16            ;6a1812341280

-    rotl.b @0x12345678:32            ;6a38123456781280

-

-    rotl.w r1                ;1291

-    rotl.w @er1              ;7d901290

-    rotl.w @(0x6:2,er1)     ;015769181290

-    rotl.w @-er1             ;01576d181290

-    rotl.w @er1+             ;01546d181290

-    rotl.w @er1-             ;01566d181290

-    rotl.w @+er1             ;01556d181290

-    rotl.w @(0x1234:16,er1)       ;01546f1812341290

-    rotl.w @(0x12345678:32,er1)       ;78146b28123456781290

-    rotl.w @(0x1234:16,r2l.b)     ;01556f2812341290

-    rotl.w @(0x1234:16,r2.w)     ;01566f2812341290

-    rotl.w @(0x1234:16,er2.l)     ;01576f2812341290

-    rotl.w @(0x12345678:32,r2l.b)     ;78256b28123456781290

-    rotl.w @(0x12345678:32,r2.w)     ;78266b28123456781290

-    rotl.w @(0x12345678:32,er2.l)     ;78276b28123456781290

-    rotl.w @0x1234:16            ;6b1812341290

-    rotl.w @0x12345678:32            ;6b38123456781290

-

-    rotl.l er1                ;12b1

-    rotl.l @er1              ;0104691812b0

-    rotl.l @(0xc:2,er1)     ;0107691812b0

-    rotl.l @er1+             ;01046d1812b0

-    rotl.l @-er1             ;01076d1812b0

-    rotl.l @+er1             ;01056d1812b0

-    rotl.l @er1-             ;01066d1812b0

-    rotl.l @(0x1234:16,er1)       ;01046f18123412b0

-    rotl.l @(0x12345678:32,er1)       ;78946b281234567812b0

-    rotl.l @(0x1234:16,r2l.b)     ;01056f28123412b0

-    rotl.l @(0x1234:16,r2.w)     ;01066f28123412b0

-    rotl.l @(0x1234:16,er2.l)     ;01076f28123412b0

-    rotl.l @(0x12345678:32,r2l.b)     ;78a56b281234567812b0

-    rotl.l @(0x12345678:32,r2.w)     ;78a66b281234567812b0

-    rotl.l @(0x12345678:32,er2.l)     ;78a76b281234567812b0

-    rotl.l @0x1234:16            ;01046b08123412b0

-    rotl.l @0x12345678:32            ;01046b281234567812b0

-

-    rotl.b #2,r1h             ;12c1

-    rotl.b #2,@er1           ;7d1012c0

-    rotl.b #2,@(0x3:2,er1)     ;0177681812c0

-    rotl.b #2,@er1+          ;01746c1812c0

-    rotl.b #2,@-er1          ;01776c1812c0

-    rotl.b #2,@+er1          ;01756c1812c0

-    rotl.b #2,@er1-          ;01766c1812c0

-    rotl.b #2,@(0x1234:16,er1)    ;01746e18123412c0

-    rotl.b #2,@(0x12345678:32,er1)    ;78146a281234567812c0

-    rotl.b #2,@(0x1234:16,r2l.b)  ;01756e28123412c0

-    rotl.b #2,@(0x1234:16,r2.w)  ;01766e28123412c0

-    rotl.b #2,@(0x1234:16,er2.l)  ;01776e28123412c0

-    rotl.b #2,@(0x12345678:32,r2l.b)  ;78256a281234567812c0

-    rotl.b #2,@(0x12345678:32,r2.w)  ;78266a281234567812c0

-    rotl.b #2,@(0x12345678:32,er2.l)  ;78276a281234567812c0

-    rotl.b #2,@0xffffff12:8          ;7f1212c0

-    rotl.b #2,@0x1234:16         ;6a18123412c0

-    rotl.b #2,@0x12345678:32         ;6a381234567812c0

-

-    rotl.w #2,r1             ;12d1

-    rotl.w #2,@er1           ;7d9012d0

-    rotl.w #2,@(0x6:2,er1)  ;0157691812d0

-    rotl.w #2,@er1+          ;01546d1812d0

-    rotl.w #2,@-er1          ;01576d1812d0

-    rotl.w #2,@+er1          ;01556d1812d0

-    rotl.w #2,@er1-          ;01566d1812d0

-    rotl.w #2,@(0x1234:16,er1)    ;01546f18123412d0

-    rotl.w #2,@(0x12345678:32,er1)    ;78146b281234567812d0

-    rotl.w #2,@(0x1234:16,r2l.b)  ;01556f28123412d0

-    rotl.w #2,@(0x1234:16,r2.w)  ;01566f28123412d0

-    rotl.w #2,@(0x1234:16,er2.l)  ;01576f28123412d0

-    rotl.w #2,@(0x12345678:32,r2l.b)  ;78256b281234567812d0

-    rotl.w #2,@(0x12345678:32,r2.w)  ;78266b281234567812d0

-    rotl.w #2,@(0x12345678:32,er2.l)  ;78276b281234567812d0

-    rotl.w #2,@0x1234:16         ;6b18123412d0

-    rotl.w #2,@0x12345678:32         ;6b381234567812d0

-

-    rotl.l #2,er1             ;12f1

-    rotl.l #2,@er1           ;0104691812f0

-    rotl.l #2,@(0xc:2,er1)  ;0107691812f0

-    rotl.l #2,@er1+          ;01046d1812f0

-    rotl.l #2,@-er1          ;01076d1812f0

-    rotl.l #2,@+er1          ;01056d1812f0

-    rotl.l #2,@er1-          ;01066d1812f0

-    rotl.l #2,@(0x1234:16,er1)    ;01046f18123412f0

-    rotl.l #2,@(0x12345678:32,er1)    ;78946b281234567812f0

-    rotl.l #2,@(0x1234:16,r2l.b)  ;01056f28123412f0

-    rotl.l #2,@(0x1234:16,r2.w)  ;01066f28123412f0

-    rotl.l #2,@(0x1234:16,er2.l)  ;01076f28123412f0

-    rotl.l #2,@(0x12345678:32,r2l.b)  ;78a56b281234567812f0

-    rotl.l #2,@(0x12345678:32,r2.w)  ;78a66b281234567812f0

-    rotl.l #2,@(0x12345678:32,er2.l)  ;78a76b281234567812f0

-    rotl.l #2,@0x1234:16         ;01046b08123412f0

-    rotl.l #2,@0x12345678:32         ;01046b281234567812f0

-

-    rotr.b r1h                ;1381

-    rotr.b @er1              ;7d101380

-    rotr.b @(0x3:2,er1)        ;017768181380

-    rotr.b @er1+             ;01746c181380

-    rotr.b @-er1             ;01776c181380

-    rotr.b @+er1             ;01756c181380

-    rotr.b @er1-             ;01766c181380

-    rotr.b @(0x1234:16,er1)       ;01746e1812341380

-    rotr.b @(0x12345678:32,er1)       ;78146a28123456781380

-    rotr.b @(0x1234:16,r2l.b)     ;01756e2812341380

-    rotr.b @(0x1234:16,r2.w)     ;01766e2812341380

-    rotr.b @(0x1234:16,er2.l)     ;01776e2812341380

-    rotr.b @(0x12345678:32,r2l.b)     ;78256a28123456781380

-    rotr.b @(0x12345678:32,r2.w)     ;78266a28123456781380

-    rotr.b @(0x12345678:32,er2.l)     ;78276a28123456781380

-    rotr.b @0xffffff12:8             ;7f121380

-    rotr.b @0x1234:16            ;6a1812341380

-    rotr.b @0x12345678:32            ;6a38123456781380

-

-    rotr.w r1                ;1391

-    rotr.w @er1              ;7d901390

-    rotr.w @(0x6:2,er1)     ;015769181390

-    rotr.w @-er1             ;01576d181390

-    rotr.w @er1+             ;01546d181390

-    rotr.w @er1-             ;01566d181390

-    rotr.w @+er1             ;01556d181390

-    rotr.w @(0x1234:16,er1)       ;01546f1812341390

-    rotr.w @(0x12345678:32,er1)       ;78146b28123456781390

-    rotr.w @(0x1234:16,r2l.b)     ;01556f2812341390

-    rotr.w @(0x1234:16,r2.w)     ;01566f2812341390

-    rotr.w @(0x1234:16,er2.l)     ;01576f2812341390

-    rotr.w @(0x12345678:32,r2l.b)     ;78256b28123456781390

-    rotr.w @(0x12345678:32,r2.w)     ;78266b28123456781390

-    rotr.w @(0x12345678:32,er2.l)     ;78276b28123456781390

-    rotr.w @0x1234:16            ;6b1812341390

-    rotr.w @0x12345678:32            ;6b38123456781390

-

-    rotr.l er1                ;13b1

-    rotr.l @er1              ;0104691813b0

-    rotr.l @(0xc:2,er1)     ;0107691813b0

-    rotr.l @er1+             ;01046d1813b0

-    rotr.l @-er1             ;01076d1813b0

-    rotr.l @+er1             ;01056d1813b0

-    rotr.l @er1-             ;01066d1813b0

-    rotr.l @(0x1234:16,er1)       ;01046f18123413b0

-    rotr.l @(0x12345678:32,er1)       ;78946b281234567813b0

-    rotr.l @(0x1234:16,r2l.b)     ;01056f28123413b0

-    rotr.l @(0x1234:16,r2.w)     ;01066f28123413b0

-    rotr.l @(0x1234:16,er2.l)     ;01076f28123413b0

-    rotr.l @(0x12345678:32,r2l.b)     ;78a56b281234567813b0

-    rotr.l @(0x12345678:32,r2.w)     ;78a66b281234567813b0

-    rotr.l @(0x12345678:32,er2.l)     ;78a76b281234567813b0

-    rotr.l @0x1234:16            ;01046b08123413b0

-    rotr.l @0x12345678:32            ;01046b281234567813b0

-

-    rotr.b #2,r1h             ;13c1

-    rotr.b #2,@er1           ;7d1013c0

-    rotr.b #2,@(0x3:2,er1)     ;0177681813c0

-    rotr.b #2,@er1+          ;01746c1813c0

-    rotr.b #2,@-er1          ;01776c1813c0

-    rotr.b #2,@+er1          ;01756c1813c0

-    rotr.b #2,@er1-          ;01766c1813c0

-    rotr.b #2,@(0x1234:16,er1)    ;01746e18123413c0

-    rotr.b #2,@(0x12345678:32,er1)    ;78146a281234567813c0

-    rotr.b #2,@(0x1234:16,r2l.b)  ;01756e28123413c0

-    rotr.b #2,@(0x1234:16,r2.w)  ;01766e28123413c0

-    rotr.b #2,@(0x1234:16,er2.l)  ;01776e28123413c0

-    rotr.b #2,@(0x12345678:32,r2l.b)  ;78256a281234567813c0

-    rotr.b #2,@(0x12345678:32,r2.w)  ;78266a281234567813c0

-    rotr.b #2,@(0x12345678:32,er2.l)  ;78276a281234567813c0

-    rotr.b #2,@0xffffff12:8          ;7f1213c0

-    rotr.b #2,@0x1234:16         ;6a18123413c0

-    rotr.b #2,@0x12345678:32         ;6a381234567813c0

-

-    rotr.w #2,r1             ;13d1

-    rotr.w #2,@er1           ;7d9013d0

-    rotr.w #2,@(0x6:2,er1)  ;0157691813d0

-    rotr.w #2,@er1+          ;01546d1813d0

-    rotr.w #2,@-er1          ;01576d1813d0

-    rotr.w #2,@+er1          ;01556d1813d0

-    rotr.w #2,@er1-          ;01566d1813d0

-    rotr.w #2,@(0x1234:16,er1)    ;01546f18123413d0

-    rotr.w #2,@(0x12345678:32,er1)    ;78146b281234567813d0

-    rotr.w #2,@(0x1234:16,r2l.b)  ;01556f28123413d0

-    rotr.w #2,@(0x1234:16,r2.w)  ;01566f28123413d0

-    rotr.w #2,@(0x1234:16,er2.l)  ;01576f28123413d0

-    rotr.w #2,@(0x12345678:32,r2l.b)  ;78256b281234567813d0

-    rotr.w #2,@(0x12345678:32,r2.w)  ;78266b281234567813d0

-    rotr.w #2,@(0x12345678:32,er2.l)  ;78276b281234567813d0

-    rotr.w #2,@0x1234:16         ;6b18123413d0

-    rotr.w #2,@0x12345678:32         ;6b381234567813d0

-

-    rotr.l #2,er1             ;13f1

-    rotr.l #2,@er1           ;0104691813f0

-    rotr.l #2,@(0xc:2,er1)  ;0107691813f0

-    rotr.l #2,@er1+          ;01046d1813f0

-    rotr.l #2,@-er1          ;01076d1813f0

-    rotr.l #2,@+er1          ;01056d1813f0

-    rotr.l #2,@er1-          ;01066d1813f0

-    rotr.l #2,@(0x1234:16,er1)    ;01046f18123413f0

-    rotr.l #2,@(0x12345678:32,er1)    ;78946b281234567813f0

-    rotr.l #2,@(0x1234:16,r2l.b)  ;01056f28123413f0

-    rotr.l #2,@(0x1234:16,r2.w)  ;01066f28123413f0

-    rotr.l #2,@(0x1234:16,er2.l)  ;01076f28123413f0

-    rotr.l #2,@(0x12345678:32,r2l.b)  ;78a56b281234567813f0

-    rotr.l #2,@(0x12345678:32,r2.w)  ;78a66b281234567813f0

-    rotr.l #2,@(0x12345678:32,er2.l)  ;78a76b281234567813f0

-    rotr.l #2,@0x1234:16         ;01046b08123413f0

-    rotr.l #2,@0x12345678:32         ;01046b281234567813f0

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t12_bit.exp b/gdb/testsuite/gdb.disasm/t12_bit.exp
deleted file mode 100644
index c59cdc8bd68..00000000000
--- a/gdb/testsuite/gdb.disasm/t12_bit.exp
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t12_bit"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-gdb_test "x /i _start" "bset\t#0x7,r1h" \
-	"bset #0x7,r1h"
-gdb_test "x" "bset\t#0x7,@er1" \
-	"bset #0x7,@er1"
-gdb_test "x" "bset\t#0x7,@0x12(:8|)" \
-	"bset #0x7,@0x12:8"
-gdb_test "x" "bset\t#0x7,@0x1234(:16|)" \
-	"bset #0x7,@0x1234:16"
-gdb_test "x" "bset\t#0x7,@0x12345678(:32|)" \
-	"bset #0x7,@0x12345678:32"
-gdb_test "x" "bset\tr3h,r1h" \
-	"bset r3h,r1h"
-gdb_test "x" "bset\tr3h,@er1" \
-	"bset r3h,@er1"
-gdb_test "x" "bset\tr3h,@0x12(:8|)" \
-	"bset r3h,@0x12:8"
-gdb_test "x" "bset\tr3h,@0x1234(:16|)" \
-	"bset r3h,@0x1234:16"
-gdb_test "x" "bset\tr3h,@0x12345678(:32|)" \
-	"bset r3h,@0x12345678:32"
-gdb_test "x" "bset/eq\t#0x7,@er1" \
-	"bset/eq #0x7,@er1"
-gdb_test "x" "bset/eq\t#0x7,@0x12(:8|)" \
-	"bset/eq #0x7,@0x12:8"
-gdb_test "x" "bset/eq\t#0x7,@0x1234(:16|)" \
-	"bset/eq #0x7,@0x1234:16"
-gdb_test "x" "bset/eq\t#0x7,@0x12345678(:32|)" \
-	"bset/eq #0x7,@0x12345678:32"
-gdb_test "x" "bset/eq\tr3h,@er1" \
-	"bset/eq r3h,@er1"
-gdb_test "x" "bset/eq\tr3h,@0x12(:8|)" \
-	"bset/eq r3h,@0x12:8"
-gdb_test "x" "bset/eq\tr3h,@0x1234(:16|)" \
-	"bset/eq r3h,@0x1234:16"
-gdb_test "x" "bset/eq\tr3h,@0x12345678(:32|)" \
-	"bset/eq r3h,@0x12345678:32"
-gdb_test "x" "bset/ne\t#0x7,@er1" \
-	"bset/ne #0x7,@er1"
-gdb_test "x" "bset/ne\t#0x7,@0x12(:8|)" \
-	"bset/ne #0x7,@0x12:8"
-gdb_test "x" "bset/ne\t#0x7,@0x1234(:16|)" \
-	"bset/ne #0x7,@0x1234:16"
-gdb_test "x" "bset/ne\t#0x7,@0x12345678(:32|)" \
-	"bset/ne #0x7,@0x12345678:32"
-gdb_test "x" "bset/ne\tr3h,@er1" \
-	"bset/ne r3h,@er1"
-gdb_test "x" "bset/ne\tr3h,@0x12(:8|)" \
-	"bset/ne r3h,@0x12:8"
-gdb_test "x" "bset/ne\tr3h,@0x1234(:16|)" \
-	"bset/ne r3h,@0x1234:16"
-gdb_test "x" "bset/ne\tr3h,@0x12345678(:32|)" \
-	"bset/ne r3h,@0x12345678:32"
-gdb_test "x" "bnot\t#0x7,r1h" \
-	"bnot #0x7,r1h"
-gdb_test "x" "bnot\t#0x7,@er1" \
-	"bnot #0x7,@er1"
-gdb_test "x" "bnot\t#0x7,@0x12(:8|)" \
-	"bnot #0x7,@0x12:8"
-gdb_test "x" "bnot\t#0x7,@0x1234(:16|)" \
-	"bnot #0x7,@0x1234:16"
-gdb_test "x" "bnot\t#0x7,@0x12345678(:32|)" \
-	"bnot #0x7,@0x12345678:32"
-gdb_test "x" "bnot\tr3h,r1h" \
-	"bnot r3h,r1h"
-gdb_test "x" "bnot\tr3h,@er1" \
-	"bnot r3h,@er1"
-gdb_test "x" "bnot\tr3h,@0x12(:8|)" \
-	"bnot r3h,@0x12:8"
-gdb_test "x" "bnot\tr3h,@0x1234(:16|)" \
-	"bnot r3h,@0x1234:16"
-gdb_test "x" "bnot\tr3h,@0x12345678(:32|)" \
-	"bnot r3h,@0x12345678:32"
-gdb_test "x" "bclr\t#0x7,r1h" \
-	"bclr #0x7,r1h"
-gdb_test "x" "bclr\t#0x7,@er1" \
-	"bclr #0x7,@er1"
-gdb_test "x" "bclr\t#0x7,@0x12(:8|)" \
-	"bclr #0x7,@0x12:8"
-gdb_test "x" "bclr\t#0x7,@0x1234(:16|)" \
-	"bclr #0x7,@0x1234:16"
-gdb_test "x" "bclr\t#0x7,@0x12345678(:32|)" \
-	"bclr #0x7,@0x12345678:32"
-gdb_test "x" "bclr\tr3h,r1h" \
-	"bclr r3h,r1h"
-gdb_test "x" "bclr\tr3h,@er1" \
-	"bclr r3h,@er1"
-gdb_test "x" "bclr\tr3h,@0x12(:8|)" \
-	"bclr r3h,@0x12:8"
-gdb_test "x" "bclr\tr3h,@0x1234(:16|)" \
-	"bclr r3h,@0x1234:16"
-gdb_test "x" "bclr\tr3h,@0x12345678(:32|)" \
-	"bclr r3h,@0x12345678:32"
-gdb_test "x" "bclr/eq\t#0x7,@er1" \
-	"bclr/eq #0x7,@er1"
-gdb_test "x" "bclr/eq\t#0x7,@0x12(:8|)" \
-	"bclr/eq #0x7,@0x12:8"
-gdb_test "x" "bclr/eq\t#0x7,@0x1234(:16|)" \
-	"bclr/eq #0x7,@0x1234:16"
-gdb_test "x" "bclr/eq\t#0x7,@0x12345678(:32|)" \
-	"bclr/eq #0x7,@0x12345678:32"
-gdb_test "x" "bclr/eq\tr3h,@er1" \
-	"bclr/eq r3h,@er1"
-gdb_test "x" "bclr/eq\tr3h,@0x12(:8|)" \
-	"bclr/eq r3h,@0x12:8"
-gdb_test "x" "bclr/eq\tr3h,@0x1234(:16|)" \
-	"bclr/eq r3h,@0x1234:16"
-gdb_test "x" "bclr/eq\tr3h,@0x12345678(:32|)" \
-	"bclr/eq r3h,@0x12345678:32"
-gdb_test "x" "bclr/ne\t#0x7,@er1" \
-	"bclr/ne #0x7,@er1"
-gdb_test "x" "bclr/ne\t#0x7,@0x12(:8|)" \
-	"bclr/ne #0x7,@0x12:8"
-gdb_test "x" "bclr/ne\t#0x7,@0x1234(:16|)" \
-	"bclr/ne #0x7,@0x1234:16"
-gdb_test "x" "bclr/ne\t#0x7,@0x12345678(:32|)" \
-	"bclr/ne #0x7,@0x12345678:32"
-gdb_test "x" "bclr/ne\tr3h,@er1" \
-	"bclr/ne r3h,@er1"
-gdb_test "x" "bclr/ne\tr3h,@0x12(:8|)" \
-	"bclr/ne r3h,@0x12:8"
-gdb_test "x" "bclr/ne\tr3h,@0x1234(:16|)" \
-	"bclr/ne r3h,@0x1234:16"
-gdb_test "x" "bclr/ne\tr3h,@0x12345678(:32|)" \
-	"bclr/ne r3h,@0x12345678:32"
-gdb_test "x" "btst\t#0x7,r1h" \
-	"btst #0x7,r1h"
-gdb_test "x" "btst\t#0x7,@er1" \
-	"btst #0x7,@er1"
-gdb_test "x" "btst\t#0x7,@0x12(:8|)" \
-	"btst #0x7,@0x12:8"
-gdb_test "x" "btst\t#0x7,@0x1234(:16|)" \
-	"btst #0x7,@0x1234:16"
-gdb_test "x" "btst\t#0x7,@0x12345678(:32|)" \
-	"btst #0x7,@0x12345678:32"
-gdb_test "x" "btst\tr3h,r1h" \
-	"btst r3h,r1h"
-gdb_test "x" "btst\tr3h,@er1" \
-	"btst r3h,@er1"
-gdb_test "x" "btst\tr3h,@0x12(:8|)" \
-	"btst r3h,@0x12:8"
-gdb_test "x" "btst\tr3h,@0x1234(:16|)" \
-	"btst r3h,@0x1234:16"
-gdb_test "x" "btst\tr3h,@0x12345678(:32|)" \
-	"btst r3h,@0x12345678:32"
-gdb_test "x" "bor\t#0x7,r1h" \
-	"bor #0x7,r1h"
-gdb_test "x" "bor\t#0x7,@er1" \
-	"bor #0x7,@er1"
-gdb_test "x" "bor\t#0x7,@0x12(:8|)" \
-	"bor #0x7,@0x12:8"
-gdb_test "x" "bor\t#0x7,@0x1234(:16|)" \
-	"bor #0x7,@0x1234:16"
-gdb_test "x" "bor\t#0x7,@0x12345678(:32|)" \
-	"bor #0x7,@0x12345678:32"
-gdb_test "x" "bior\t#0x7,r1h" \
-	"bior #0x7,r1h"
-gdb_test "x" "bior\t#0x7,@er1" \
-	"bior #0x7,@er1"
-gdb_test "x" "bior\t#0x7,@0x12(:8|)" \
-	"bior #0x7,@0x12:8"
-gdb_test "x" "bior\t#0x7,@0x1234(:16|)" \
-	"bior #0x7,@0x1234:16"
-gdb_test "x" "bior\t#0x7,@0x12345678(:32|)" \
-	"bior #0x7,@0x12345678:32"
-gdb_test "x" "bxor\t#0x7,r1h" \
-	"bxor #0x7,r1h"
-gdb_test "x" "bxor\t#0x7,@er1" \
-	"bxor #0x7,@er1"
-gdb_test "x" "bxor\t#0x7,@0x12(:8|)" \
-	"bxor #0x7,@0x12:8"
-gdb_test "x" "bxor\t#0x7,@0x1234(:16|)" \
-	"bxor #0x7,@0x1234:16"
-gdb_test "x" "bxor\t#0x7,@0x12345678(:32|)" \
-	"bxor #0x7,@0x12345678:32"
-gdb_test "x" "bixor\t#0x7,r1h" \
-	"bixor #0x7,r1h"
-gdb_test "x" "bixor\t#0x7,@er1" \
-	"bixor #0x7,@er1"
-gdb_test "x" "bixor\t#0x7,@0x12(:8|)" \
-	"bixor #0x7,@0x12:8"
-gdb_test "x" "bixor\t#0x7,@0x1234(:16|)" \
-	"bixor #0x7,@0x1234:16"
-gdb_test "x" "bixor\t#0x7,@0x12345678(:32|)" \
-	"bixor #0x7,@0x12345678:32"
-gdb_test "x" "band\t#0x7,r1h" \
-	"band #0x7,r1h"
-gdb_test "x" "band\t#0x7,@er1" \
-	"band #0x7,@er1"
-gdb_test "x" "band\t#0x7,@0x12(:8|)" \
-	"band #0x7,@0x12:8"
-gdb_test "x" "band\t#0x7,@0x1234(:16|)" \
-	"band #0x7,@0x1234:16"
-gdb_test "x" "band\t#0x7,@0x12345678(:32|)" \
-	"band #0x7,@0x12345678:32"
-gdb_test "x" "biand\t#0x7,r1h" \
-	"biand #0x7,r1h"
-gdb_test "x" "biand\t#0x7,@er1" \
-	"biand #0x7,@er1"
-gdb_test "x" "biand\t#0x7,@0x12(:8|)" \
-	"biand #0x7,@0x12:8"
-gdb_test "x" "biand\t#0x7,@0x1234(:16|)" \
-	"biand #0x7,@0x1234:16"
-gdb_test "x" "biand\t#0x7,@0x12345678(:32|)" \
-	"biand #0x7,@0x12345678:32"
-gdb_test "x" "bld\t#0x7,r1h" \
-	"bld #0x7,r1h"
-gdb_test "x" "bld\t#0x7,@er1" \
-	"bld #0x7,@er1"
-gdb_test "x" "bld\t#0x7,@0x12(:8|)" \
-	"bld #0x7,@0x12:8"
-gdb_test "x" "bld\t#0x7,@0x1234(:16|)" \
-	"bld #0x7,@0x1234:16"
-gdb_test "x" "bld\t#0x7,@0x12345678(:32|)" \
-	"bld #0x7,@0x12345678:32"
-gdb_test "x" "bild\t#0x7,r1h" \
-	"bild #0x7,r1h"
-gdb_test "x" "bild\t#0x7,@er1" \
-	"bild #0x7,@er1"
-gdb_test "x" "bild\t#0x7,@0x12(:8|)" \
-	"bild #0x7,@0x12:8"
-gdb_test "x" "bild\t#0x7,@0x1234(:16|)" \
-	"bild #0x7,@0x1234:16"
-gdb_test "x" "bild\t#0x7,@0x12345678(:32|)" \
-	"bild #0x7,@0x12345678:32"
-gdb_test "x" "bst\t#0x7,r1h" \
-	"bst #0x7,r1h"
-gdb_test "x" "bst\t#0x7,@er1" \
-	"bst #0x7,@er1"
-gdb_test "x" "bst\t#0x7,@0x12(:8|)" \
-	"bst #0x7,@0x12:8"
-gdb_test "x" "bst\t#0x7,@0x1234(:16|)" \
-	"bst #0x7,@0x1234:16"
-gdb_test "x" "bst\t#0x7,@0x12345678(:32|)" \
-	"bst #0x7,@0x12345678:32"
-gdb_test "x" "bstz\t#0x7,@er1" \
-	"bstz #0x7,@er1"
-gdb_test "x" "bstz\t#0x7,@0x12(:8|)" \
-	"bstz #0x7,@0x12:8"
-gdb_test "x" "bstz\t#0x7,@0x1234(:16|)" \
-	"bstz #0x7,@0x1234:16"
-gdb_test "x" "bstz\t#0x7,@0x12345678(:32|)" \
-	"bstz #0x7,@0x12345678:32"
-gdb_test "x" "bist\t#0x7,r1h" \
-	"bist #0x7,r1h"
-gdb_test "x" "bist\t#0x7,@er1" \
-	"bist #0x7,@er1"
-gdb_test "x" "bist\t#0x7,@0x12(:8|)" \
-	"bist #0x7,@0x12:8"
-gdb_test "x" "bist\t#0x7,@0x1234(:16|)" \
-	"bist #0x7,@0x1234:16"
-gdb_test "x" "bist\t#0x7,@0x12345678(:32|)" \
-	"bist #0x7,@0x12345678:32"
-gdb_test "x" "bistz\t#0x7,@er1" \
-	"bistz #0x7,@er1"
-gdb_test "x" "bistz\t#0x7,@0x12(:8|)" \
-	"bistz #0x7,@0x12:8"
-gdb_test "x" "bistz\t#0x7,@0x1234(:16|)" \
-	"bistz #0x7,@0x1234:16"
-gdb_test "x" "bistz\t#0x7,@0x12345678(:32|)" \
-	"bistz #0x7,@0x12345678:32"
-gdb_test "x" "bfld\t#0x34(:8|),@er1,r3h" \
-	"bfld #0x34:8,@er1,r3h"
-gdb_test "x" "bfld\t#0x34(:8|),@0x12(:8|),r3h" \
-	"bfld #0x34:8,@0x12:8,r3h"
-gdb_test "x" "bfld\t#0x34(:8|),@0x1234(:16|),r3h" \
-	"bfld #0x34:8,@0x1234:16,r3h"
-gdb_test "x" "bfld\t#0x34(:8|),@0x12345678(:32|),r3h" \
-	"bfld #0x34:8,@0x12345678:32,r3h"
-gdb_test "x" "bfst\tr3h,#0x34(:8|),@er1" \
-	"bfst r3h,#0x34:8,@er1"
-gdb_test "x" "bfst\tr3h,#0x34(:8|),@0x12(:8|)" \
-	"bfst r3h,#0x34:8,@0x12:8"
-gdb_test "x" "bfst\tr3h,#0x34(:8|),@0x1234(:16|)" \
-	"bfst r3h,#0x34:8,@0x1234:16"
-gdb_test "x" "bfst\tr3h,#0x34(:8|),@0x12345678(:32|)" \
-	"bfst r3h,#0x34:8,@0x12345678:32"
diff --git a/gdb/testsuite/gdb.disasm/t12_bit.s b/gdb/testsuite/gdb.disasm/t12_bit.s
deleted file mode 100644
index cd22f2f7f5f..00000000000
--- a/gdb/testsuite/gdb.disasm/t12_bit.s
+++ /dev/null
@@ -1,176 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;bit

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.global _start

-_start:

-    bset #0x7,r1h               ;7071

-    bset #0x7,@er1             ;7d107070

-    bset #0x7,@0xffffff12:8            ;7f127070

-    bset #0x7,@0x1234:16           ;6a1812347070

-    bset #0x7,@0x12345678:32           ;6a38123456787070

-

-    bset r3h,r1h               ;6031

-    bset r3h,@er1             ;7d106030

-    bset r3h,@0xffffff12:8            ;7f126030

-    bset r3h,@0x1234:16           ;6a1812346030

-    bset r3h,@0x12345678:32           ;6a38123456786030

-

-    bset/eq #0x7,@er1             ;7d107077

-    bset/eq #0x7,@0xffffff12:8            ;7f127077

-    bset/eq #0x7,@0x1234:16           ;6a1812347077

-    bset/eq #0x7,@0x12345678:32           ;6a38123456787077

-

-    bset/eq r3h,@er1             ;7d106037

-    bset/eq r3h,@0xffffff12:8            ;7f126037

-    bset/eq r3h,@0x1234:16           ;6a1812346037

-    bset/eq r3h,@0x12345678:32           ;6a38123456786037

-

-    bset/ne #0x7,@er1             ;7d107076

-    bset/ne #0x7,@0xffffff12:8            ;7f127076

-    bset/ne #0x7,@0x1234:16           ;6a1812347076

-    bset/ne #0x7,@0x12345678:32           ;6a38123456787076

-

-    bset/ne r3h,@er1             ;7d106036

-    bset/ne r3h,@0xffffff12:8            ;7f126036

-    bset/ne r3h,@0x1234:16           ;6a1812346036

-    bset/ne r3h,@0x12345678:32           ;6a38123456786036

-

-    bnot #0x7,r1h               ;7171

-    bnot #0x7,@er1             ;7d107170

-    bnot #0x7,@0xffffff12:8            ;7f127170

-    bnot #0x7,@0x1234:16           ;6a1812347170

-    bnot #0x7,@0x12345678:32           ;6a38123456787170

-

-    bnot r3h,r1h               ;6131

-    bnot r3h,@er1             ;7d106130

-    bnot r3h,@0xffffff12:8            ;7f126130

-    bnot r3h,@0x1234:16           ;6a1812346130

-    bnot r3h,@0x12345678:32           ;6a38123456786130

-

-    bclr #0x7,r1h               ;7271

-    bclr #0x7,@er1             ;7d107270

-    bclr #0x7,@0xffffff12:8            ;7f127270

-    bclr #0x7,@0x1234:16           ;6a1812347270

-    bclr #0x7,@0x12345678:32           ;6a38123456787270

-

-    bclr r3h,r1h               ;6231

-    bclr r3h,@er1             ;7d106230

-    bclr r3h,@0xffffff12:8            ;7f126230

-    bclr r3h,@0x1234:16           ;6a1812346230

-    bclr r3h,@0x12345678:32           ;6a38123456786230

-

-    bclr/eq #0x7,@er1             ;7d107277

-    bclr/eq #0x7,@0xffffff12:8            ;7f127277

-    bclr/eq #0x7,@0x1234:16           ;6a1812347277

-    bclr/eq #0x7,@0x12345678:32           ;6a38123456787277

-

-    bclr/eq r3h,@er1             ;7d106237

-    bclr/eq r3h,@0xffffff12:8            ;7f126237

-    bclr/eq r3h,@0x1234:16           ;6a1812346237

-    bclr/eq r3h,@0x12345678:32           ;6a38123456786237

-

-    bclr/ne #0x7,@er1             ;7d107276

-    bclr/ne #0x7,@0xffffff12:8            ;7f127276

-    bclr/ne #0x7,@0x1234:16           ;6a1812347276

-    bclr/ne #0x7,@0x12345678:32           ;6a38123456787276

-

-    bclr/ne r3h,@er1             ;7d106236

-    bclr/ne r3h,@0xffffff12:8            ;7f126236

-    bclr/ne r3h,@0x1234:16           ;6a1812346236

-    bclr/ne r3h,@0x12345678:32           ;6a38123456786236

-

-    btst #0x7,r1h               ;7371

-    btst #0x7,@er1             ;7c107370

-    btst #0x7,@0xffffff12:8            ;7e127370

-    btst #0x7,@0x1234:16           ;6a1012347370

-    btst #0x7,@0x12345678:32           ;6a30123456787370

-

-    btst r3h,r1h               ;6331

-    btst r3h,@er1             ;7c106330

-    btst r3h,@0xffffff12:8            ;7e126330

-    btst r3h,@0x1234:16           ;6a1012346330

-    btst r3h,@0x12345678:32           ;6a30123456786330

-

-    bor #0x7,r1h                ;7471

-    bor #0x7,@er1              ;7c107470

-    bor #0x7,@0xffffff12:8             ;7e127470

-    bor #0x7,@0x1234:16            ;6a1012347470

-    bor #0x7,@0x12345678:32            ;6a30123456787470

-

-    bior #0x7,r1h               ;74f1

-    bior #0x7,@er1             ;7c1074f0

-    bior #0x7,@0xffffff12:8            ;7e1274f0

-    bior #0x7,@0x1234:16           ;6a10123474f0

-    bior #0x7,@0x12345678:32           ;6a301234567874f0

-

-    bxor #0x7,r1h               ;7571

-    bxor #0x7,@er1             ;7c107570

-    bxor #0x7,@0xffffff12:8            ;7e127570

-    bxor #0x7,@0x1234:16           ;6a1012347570

-    bxor #0x7,@0x12345678:32           ;6a30123456787570

-

-    bixor #0x7,r1h              ;75f1

-    bixor #0x7,@er1            ;7c1075f0

-    bixor #0x7,@0xffffff12:8           ;7e1275f0

-    bixor #0x7,@0x1234:16          ;6a10123475f0

-    bixor #0x7,@0x12345678:32          ;6a301234567875f0

-

-    band #0x7,r1h               ;7671

-    band #0x7,@er1             ;7c107670

-    band #0x7,@0xffffff12:8            ;7e127670

-    band #0x7,@0x1234:16           ;6a1012347670

-    band #0x7,@0x12345678:32           ;6a30123456787670

-

-    biand #0x7,r1h              ;76f1

-    biand #0x7,@er1            ;7c1076f0

-    biand #0x7,@0xffffff12:8           ;7e1276f0

-    biand #0x7,@0x1234:16          ;6a10123476f0

-    biand #0x7,@0x12345678:32          ;6a301234567876f0

-

-    bld #0x7,r1h                ;7771

-    bld #0x7,@er1              ;7c107770

-    bld #0x7,@0xffffff12:8             ;7e127770

-    bld #0x7,@0x1234:16            ;6a1012347770

-    bld #0x7,@0x12345678:32            ;6a30123456787770

-

-    bild #0x7,r1h               ;77f1

-    bild #0x7,@er1             ;7c1077f0

-    bild #0x7,@0xffffff12:8            ;7e1277f0

-    bild #0x7,@0x1234:16           ;6a10123477f0

-    bild #0x7,@0x12345678:32           ;6a301234567877f0

-

-    bst #0x7,r1h                ;6771

-    bst #0x7,@er1              ;7d106770

-    bst #0x7,@0xffffff12:8             ;7f126770

-    bst #0x7,@0x1234:16            ;6a1812346770

-    bst #0x7,@0x12345678:32            ;6a38123456786770

-

-    bstz #0x7,@er1              ;7d106777

-    bstz #0x7,@0xffffff12:8             ;7f126777

-    bstz #0x7,@0x1234:16            ;6a1812346777

-    bstz #0x7,@0x12345678:32            ;6a38123456786777

-

-    bist #0x7,r1h               ;67f1

-    bist #0x7,@er1             ;7d1067f0

-    bist #0x7,@0xffffff12:8            ;7f1267f0

-    bist #0x7,@0x1234:16           ;6a18123467f0

-    bist #0x7,@0x12345678:32           ;6a381234567867f0

-

-    bistz #0x7,@er1             ;7d1067f7

-    bistz #0x7,@0xffffff12:8            ;7f1267f7

-    bistz #0x7,@0x1234:16           ;6a18123467f7

-    bistz #0x7,@0x12345678:32           ;6a381234567867f7

-

-    bfld #0x34:8,@er1,r3h             ;7c10f334

-    bfld #0x34:8,@0xffffff12:8,r3h            ;7e12f334

-    bfld #0x34:8,@0x1234:16,r3h           ;6a101234f334

-    bfld #0x34:8,@0x12345678:32,r3h           ;6a3012345678f334

-

-    bfst r3h,#0x34:8,@er1             ;7d10f334

-    bfst r3h,#0x34:8,@0xffffff12:8            ;7f12f334

-    bfst r3h,#0x34:8,@0x1234:16           ;6a181234f334

-    bfst r3h,#0x34:8,@0x12345678:32           ;6a3812345678f334

-

-	.end

diff --git a/gdb/testsuite/gdb.disasm/t13_otr.exp b/gdb/testsuite/gdb.disasm/t13_otr.exp
deleted file mode 100644
index 5c018428c23..00000000000
--- a/gdb/testsuite/gdb.disasm/t13_otr.exp
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-if ![istarget "h8300*-*-*"] {
-    verbose "Tests ignored for all but h8300s based targets."
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "t13_otr"
-set srcfile ${srcdir}/${subdir}/${testfile}.s
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-set asm-flags "";
-set link-flags "-m h8300sxelf";
-
-
-if {[target_assemble $srcfile $objfile "${asm-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase assembly failed, so all tests in this file will automatically fail."
-}
-
-if {[target_link $objfile $binfile "${link-flags}"] != ""} then {
-     gdb_suppress_entire_file "Testcase link failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-global hex
-
-gdb_test "x /i _start" "bra\t.\\+18 \\($hex\\)" \
-	"bra .+18"
-gdb_test "x" "brn\t.\\+18 \\($hex\\)" \
-	"brn .+18"
-gdb_test "x" "bhi\t.\\+18 \\($hex\\)" \
-	"bhi .+18"
-gdb_test "x" "bls\t.\\+18 \\($hex\\)" \
-	"bls .+18"
-gdb_test "x" "bcc\t.\\+18 \\($hex\\)" \
-	"bcc .+18"
-gdb_test "x" "bcs\t.\\+18 \\($hex\\)" \
-	"bcs .+18"
-gdb_test "x" "bne\t.\\+18 \\($hex\\)" \
-	"bne .+18"
-gdb_test "x" "beq\t.\\+18 \\($hex\\)" \
-	"beq .+18"
-gdb_test "x" "bvc\t.\\+18 \\($hex\\)" \
-	"bvc .+18"
-gdb_test "x" "bvs\t.\\+18 \\($hex\\)" \
-	"bvs .+18"
-gdb_test "x" "bpl\t.\\+18 \\($hex\\)" \
-	"bpl .+18"
-gdb_test "x" "bmi\t.\\+18 \\($hex\\)" \
-	"bmi .+18"
-gdb_test "x" "bge\t.\\+18 \\($hex\\)" \
-	"bge .+18"
-gdb_test "x" "blt\t.\\+18 \\($hex\\)" \
-	"blt .+18"
-gdb_test "x" "bgt\t.\\+18 \\($hex\\)" \
-	"bgt .+18"
-gdb_test "x" "ble\t.\\+18 \\($hex\\)" \
-	"ble .+18"
-gdb_test "x" "bra\t.\\+4660 \\($hex\\)" \
-	"bra .+4660"
-gdb_test "x" "brn\t.\\+4660 \\($hex\\)" \
-	"brn .+4660"
-gdb_test "x" "bhi\t.\\+4660 \\($hex\\)" \
-	"bhi .+4660"
-gdb_test "x" "bls\t.\\+4660 \\($hex\\)" \
-	"bls .+4660"
-gdb_test "x" "bcc\t.\\+4660 \\($hex\\)" \
-	"bcc .+4660"
-gdb_test "x" "bcs\t.\\+4660 \\($hex\\)" \
-	"bcs .+4660"
-gdb_test "x" "bne\t.\\+4660 \\($hex\\)" \
-	"bne .+4660"
-gdb_test "x" "beq\t.\\+4660 \\($hex\\)" \
-	"beq .+4660"
-gdb_test "x" "bvc\t.\\+4660 \\($hex\\)" \
-	"bvc .+4660"
-gdb_test "x" "bvs\t.\\+4660 \\($hex\\)" \
-	"bvs .+4660"
-gdb_test "x" "bpl\t.\\+4660 \\($hex\\)" \
-	"bpl .+4660"
-gdb_test "x" "bmi\t.\\+4660 \\($hex\\)" \
-	"bmi .+4660"
-gdb_test "x" "bge\t.\\+4660 \\($hex\\)" \
-	"bge .+4660"
-gdb_test "x" "blt\t.\\+4660 \\($hex\\)" \
-	"blt .+4660"
-gdb_test "x" "bgt\t.\\+4660 \\($hex\\)" \
-	"bgt .+4660"
-gdb_test "x" "ble\t.\\+4660 \\($hex\\)" \
-	"ble .+4660"
-gdb_test "x" "bra/s\t.\\+18 \\($hex\\)" \
-	"bra/s .+18"
-gdb_test "x" "nop\[ \t\]*" \
-	"nop"
-gdb_test "x" "bra/bc\t#0x7,@er2,.\\+18 \\($hex\\)" \
-	"bra/bc #0x7,@er2,.+18"
-gdb_test "x" "bra/bc\t#0x7,@0x9a(:8|),.\\+18 \\($hex\\)" \
-	"bra/bc #0x7,@0x9a:8,.+18"
-gdb_test "x" "bra/bc\t#0x7,@0x1234(:16|),.\\+18 \\($hex\\)" \
-	"bra/bc #0x7,@0x1234:16,.+18"
-gdb_test "x" "bra/bc\t#0x7,@0x12345678(:32|),.\\+18 \\($hex\\)" \
-	"bra/bc #0x7,@0x12345678:32,.+18"
-gdb_test "x" "bra/bc\t#0x7,@er2,.\\+4660 \\($hex\\)" \
-	"bra/bc #0x7,@er2,.+4660"
-gdb_test "x" "bra/bc\t#0x7,@0x12(:8|),.\\+4660 \\($hex\\)" \
-	"bra/bc #0x7,@0x12:8,.+4660"
-gdb_test "x" "bra/bc\t#0x7,@0x9abc(:16|),.\\+4660 \\($hex\\)" \
-	"bra/bc #0x7,@0x9abc:16,.+4660"
-gdb_test "x" "bra/bc\t#0x7,@0x12345678(:32|),.\\+4660 \\($hex\\)" \
-	"bra/bc #0x7,@0x12345678:32,.+4660"
-gdb_test "x" "bra/bs\t#0x7,@er2,.\\+18 \\($hex\\)" \
-	"bra/bs #0x7,@er2,.+18"
-gdb_test "x" "bra/bs\t#0x7,@0x9a(:8|),.\\+18 \\($hex\\)" \
-	"bra/bs #0x7,@0x9a:8,.+18"
-gdb_test "x" "bra/bs\t#0x7,@0x1234(:16|),.\\+18 \\($hex\\)" \
-	"bra/bs #0x7,@0x1234:16,.+18"
-gdb_test "x" "bra/bs\t#0x7,@0x12345678(:32|),.\\+18 \\($hex\\)" \
-	"bra/bs #0x7,@0x12345678:32,.+18"
-gdb_test "x" "bra/bs\t#0x7,@er2,.\\+4660 \\($hex\\)" \
-	"bra/bs #0x7,@er2,.+4660"
-gdb_test "x" "bra/bs\t#0x7,@0x12(:8|),.\\+4660 \\($hex\\)" \
-	"bra/bs #0x7,@0x12:8,.+4660"
-gdb_test "x" "bra/bs\t#0x7,@0x9abc(:16|),.\\+4660 \\($hex\\)" \
-	"bra/bs #0x7,@0x9abc:16,.+4660"
-gdb_test "x" "bra/bs\t#0x7,@0x12345678(:32|),.\\+4660 \\($hex\\)" \
-	"bra/bs #0x7,@0x12345678:32,.+4660"
-gdb_test "x" "bsr/bc\t#0x7,@er2,.\\+4660 \\($hex\\)" \
-	"bsr/bc #0x7,@er2,.+4660"
-gdb_test "x" "bsr/bc\t#0x7,@0x12(:8|),.\\+4660 \\($hex\\)" \
-	"bsr/bc #0x7,@0x12:8,.+4660"
-gdb_test "x" "bsr/bc\t#0x7,@0x9abc(:16|),.\\+4660 \\($hex\\)" \
-	"bsr/bc #0x7,@0x9abc:16,.+4660"
-gdb_test "x" "bsr/bc\t#0x7,@0x12345678(:32|),.\\+4660 \\($hex\\)" \
-	"bsr/bc #0x7,@0x12345678:32,.+4660"
-gdb_test "x" "bsr/bs\t#0x7,@er2,.\\+4660 \\($hex\\)" \
-	"bsr/bs #0x7,@er2,.+4660"
-gdb_test "x" "bsr/bs\t#0x7,@0x12(:8|),.\\+4660 \\($hex\\)" \
-	"bsr/bs #0x7,@0x12:8,.+4660"
-gdb_test "x" "bsr/bs\t#0x7,@0x9abc(:16|),.\\+4660 \\($hex\\)" \
-	"bsr/bs #0x7,@0x9abc:16,.+4660"
-gdb_test "x" "bsr/bs\t#0x7,@0x12345678(:32|),.\\+4660 \\($hex\\)" \
-	"bsr/bs #0x7,@0x12345678:32,.+4660"
-gdb_test "x" "bra\tr2l.b" \
-	"bra r2l.b"
-gdb_test "x" "bra\tr2.w" \
-	"bra r2.w"
-gdb_test "x" "bra\ter2(.l|)" \
-	"bra er2.l"
-gdb_test "x" "bsr\t.\\+18 \\($hex\\)" \
-	"bsr .+18"
-gdb_test "x" "bsr\t.\\+4660 \\($hex\\)" \
-	"bsr .+4660"
-gdb_test "x" "bsr\tr2l.b" \
-	"bsr r2l.b"
-gdb_test "x" "bsr\tr2.w" \
-	"bsr r2.w"
-gdb_test "x" "bsr\ter2(.l|)" \
-	"bsr er2.l"
-gdb_test "x" "jmp\t@er2" \
-	"jmp @er2"
-gdb_test "x" "jmp\t@0x123456(:24|)" \
-	"jmp @0x123456:24"
-gdb_test "x" "jmp\t@0x12345678(:32|)" \
-	"jmp @0x12345678:32"
-gdb_test "x" "jmp\t@@18 \\(0x12\\)" \
-	"jmp @@18 (0x12)"
-gdb_test "x" "jmp\t@@564 \\(0x234\\)" \
-	"jmp @@564 (0x234)"
-gdb_test "x" "jsr\t@er2" \
-	"jsr @er2"
-gdb_test "x" "jsr\t@0x123456(:24|)" \
-	"jsr @0x123456:24"
-gdb_test "x" "jsr\t@0x12345678(:32|)" \
-	"jsr @0x12345678:32"
-gdb_test "x" "jsr\t@@18 \\(0x12\\)" \
-	"jsr @@18 (0x12)"
-gdb_test "x" "jsr\t@@564 \\(0x234\\)" \
-	"jsr @@564 (0x234)"
-gdb_test "x" "rts\[ \t\]*" \
-	"rts"
-gdb_test "x" "rts/l\ter3" \
-	"rts/l er3"
-gdb_test "x" "rts/l\ter1-er2" \
-	"rts/l er1-er2"
-gdb_test "x" "rts/l\ter2-er4" \
-	"rts/l er2-er4"
-gdb_test "x" "rts/l\ter3-er6" \
-	"rts/l er3-er6"
-gdb_test "x" "trapa\t#0x3" \
-	"trapa #0x3"
-gdb_test "x" "rte\[ \t\]*" \
-	"rte"
-gdb_test "x" "rte/l\ter3" \
-	"rte/l er3"
-gdb_test "x" "rte/l\ter1-er2" \
-	"rte/l er1-er2"
-gdb_test "x" "rte/l\ter2-er4" \
-	"rte/l er2-er4"
-gdb_test "x" "rte/l\ter3-er6" \
-	"rte/l er3-er6"
-gdb_test "x" "ldc(.b|)\t#0x12(:8|),ccr" \
-	"ldc.b #0x12:8,ccr"
-gdb_test "x" "ldc(.b|)\tr3h,ccr" \
-	"ldc.b r3h,ccr"
-gdb_test "x" "ldc(.w|)\t@er3,ccr" \
-	"ldc.w @er3,ccr"
-gdb_test "x" "ldc(.w|)\t@er3\\+,ccr" \
-	"ldc.w @er3+,ccr"
-gdb_test "x" "ldc(.w|)\t@\\(0x1234(:16|),er3\\),ccr" \
-	"ldc.w @(0x1234:16,er3),ccr"
-gdb_test "x" "ldc(.w|)\t@\\(0x12345678(:32|),er3\\),ccr" \
-	"ldc.w @(0x12345678:32,er3),ccr"
-gdb_test "x" "ldc(.w|)\t@0x1234(:16|),ccr" \
-	"ldc.w @0x1234:16,ccr"
-gdb_test "x" "ldc(.w|)\t@0x12345678(:32|),ccr" \
-	"ldc.w @0x12345678:32,ccr"
-gdb_test "x" "ldc(.b|)\t#0x12(:8|),exr" \
-	"ldc.b #0x12:8,exr"
-gdb_test "x" "ldc(.b|)\tr3h,exr" \
-	"ldc.b r3h,exr"
-gdb_test "x" "ldc(.w|)\t@er3,exr" \
-	"ldc.w @er3,exr"
-gdb_test "x" "ldc(.w|)\t@er3\\+,exr" \
-	"ldc.w @er3+,exr"
-gdb_test "x" "ldc(.w|)\t@\\(0x1234(:16|),er3\\),exr" \
-	"ldc.w @(0x1234:16,er3),exr"
-gdb_test "x" "ldc(.w|)\t@\\(0x12345678(:32|),er3\\),exr" \
-	"ldc.w @(0x12345678:32,er3),exr"
-gdb_test "x" "ldc(.w|)\t@0x1234(:16|),exr" \
-	"ldc.w @0x1234:16,exr"
-gdb_test "x" "ldc(.w|)\t@0x12345678(:32|),exr" \
-	"ldc.w @0x12345678:32,exr"
-gdb_test "x" "stc(.b|)\tccr,r1h" \
-	"stc.b ccr,r1h"
-gdb_test "x" "stc(.w|)\tccr,@er1" \
-	"stc.w ccr,@er1"
-gdb_test "x" "stc(.w|)\tccr,@-er1" \
-	"stc.w ccr,@-er1"
-gdb_test "x" "stc(.w|)\tccr,@\\(0x1234(:16|),er1\\)" \
-	"stc.w ccr,@(0x1234:16,er1)"
-gdb_test "x" "stc(.w|)\tccr,@\\(0x12345678(:32|),er1\\)" \
-	"stc.w ccr,@(0x12345678:32,er1)"
-gdb_test "x" "stc(.w|)\tccr,@0x1234(:16|)" \
-	"stc.w ccr,@0x1234:16"
-gdb_test "x" "stc(.w|)\tccr,@0x12345678(:32|)" \
-	"stc.w ccr,@0x12345678:32"
-gdb_test "x" "stc(.b|)\texr,r1h" \
-	"stc.b exr,r1h"
-gdb_test "x" "stc(.w|)\texr,@er1" \
-	"stc.w exr,@er1"
-gdb_test "x" "stc(.w|)\texr,@-er1" \
-	"stc.w exr,@-er1"
-gdb_test "x" "stc(.w|)\texr,@\\(0x1234(:16|),er1\\)" \
-	"stc.w exr,@(0x1234:16,er1)"
-gdb_test "x" "stc(.w|)\texr,@\\(0x12345678(:32|),er1\\)" \
-	"stc.w exr,@(0x12345678:32,er1)"
-gdb_test "x" "stc(.w|)\texr,@0x1234(:16|)" \
-	"stc.w exr,@0x1234:16"
-gdb_test "x" "stc(.w|)\texr,@0x12345678(:32|)" \
-	"stc.w exr,@0x12345678:32"
-gdb_test "x" "orc(.b|)\t#0x12(:8|),ccr" \
-	"orc.b #0x12:8,ccr"
-gdb_test "x" "orc(.b|)\t#0x12(:8|),exr" \
-	"orc.b #0x12:8,exr"
-gdb_test "x" "xorc(.b|)\t#0x12(:8|),ccr" \
-	"xorc.b #0x12:8,ccr"
-gdb_test "x" "xorc(.b|)\t#0x12(:8|),exr" \
-	"xorc.b #0x12:8,exr"
-gdb_test "x" "andc(.b|)\t#0x12(:8|),ccr" \
-	"andc.b #0x12:8,ccr"
-gdb_test "x" "andc(.b|)\t#0x12(:8|),exr" \
-	"andc.b #0x12:8,exr"
-gdb_test "x" "sleep\[ \t\]*" \
-	"sleep"
-gdb_test "x" "nop\[ \t\]*" \
-	"nop"
diff --git a/gdb/testsuite/gdb.disasm/t13_otr.s b/gdb/testsuite/gdb.disasm/t13_otr.s
deleted file mode 100644
index 6e0f8875421..00000000000
--- a/gdb/testsuite/gdb.disasm/t13_otr.s
+++ /dev/null
@@ -1,159 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;others

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-	.h8300sx

-	.text

-	.org 0x12

-lab_12:

-	.org 0x1234

-	.global	_start

-_start:

-    bra 0x12+.+2                  ;4012 

-    brn 0x12+.+2                  ;4112 

-    bhi 0x12+.+2                  ;4212 

-    bls 0x12+.+2                  ;4312 

-    bcc 0x12+.+2                  ;4412 

-    bcs 0x12+.+2                  ;4512 

-    bne 0x12+.+2                  ;4612 

-    beq 0x12+.+2                  ;4712 

-    bvc 0x12+.+2                  ;4812 

-    bvs 0x12+.+2                  ;4912 

-    bpl 0x12+.+2                  ;4a12 

-    bmi 0x12+.+2                  ;4b12 

-    bge 0x12+.+2                  ;4c12 

-    blt 0x12+.+2                  ;4d12 

-    bgt 0x12+.+2                  ;4e12 

-    ble 0x12+.+2                  ;4f12

-

-    bra 0x1234+.+4                ;58001234

-    brn 0x1234+.+4                ;58101234

-    bhi 0x1234+.+4                ;58201234

-    bls 0x1234+.+4                ;58301234

-    bcc 0x1234+.+4                ;58401234

-    bcs 0x1234+.+4                ;58501234

-    bne 0x1234+.+4                ;58601234

-    beq 0x1234+.+4                ;58701234

-    bvc 0x1234+.+4                ;58801234

-    bvs 0x1234+.+4                ;58901234

-    bpl 0x1234+.+4                ;58a01234

-    bmi 0x1234+.+4                ;58b01234

-    bge 0x1234+.+4                ;58c01234

-    blt 0x1234+.+4                ;58d01234

-    bgt 0x1234+.+4                ;58e01234

-    ble 0x1234+.+4                ;58f01234

-

-    bra/s 0x12+.+2                ;4013

-    nop                           ;0000

-

-    bra/bc #0x7,@er2,0x12+.+4            ;7c204712

-    bra/bc #0x7,@0xffffff9a:8,0x12+.+4   ;7e9a4712

-    bra/bc #0x7,@0x1234:16,0x12+.+6      ;6a1012344712

-    bra/bc #0x7,@0x12345678:32,0x12+.+8  ;6a30123456784712

-    bra/bc #0x7,@er2,0x1234+.+6              ;7c2058701234

-    bra/bc #0x7,@0xffffff12:8,0x1234+.+6     ;7e1258701234

-    bra/bc #0x7,@0xffff9abc:16,0x1234+.+8    ;6a109abc58701234

-    bra/bc #0x7,@0x12345678:32,0x1234+.+0xa  ;6a301234567858701234

-

-    bra/bs #0x7,@er2,0x12+.+4            ;7c204f12

-    bra/bs #0x7,@0xffffff9a:8,0x12+.+4   ;7e9a4f12

-    bra/bs #0x7,@0x1234:16,0x12+.+6      ;6a1012344f12

-    bra/bs #0x7,@0x12345678:32,0x12+.+8  ;6a30123456784f12

-    bra/bs #0x7,@er2,0x1234+.+6              ;7c2058f01234

-    bra/bs #0x7,@0xffffff12:8,0x1234+.+6     ;7e1258f01234

-    bra/bs #0x7,@0xffff9abc:16,0x1234+.+8    ;6a109abc58f01234

-    bra/bs #0x7,@0x12345678:32,0x1234+.+0xa  ;6a301234567858f01234

-

-    bsr/bc #0x7,@er2,0x1234+.+6             ;7c205c701234

-    bsr/bc #0x7,@0xffffff12:8,0x1234+.+6    ;7e125c701234

-    bsr/bc #0x7,@0xffff9abc:16,0x1234+.+8   ;6a109abc5c701234

-    bsr/bc #0x7,@0x12345678:32,0x1234+.+0xa ;6a30123456785c701234

-

-    bsr/bs #0x7,@er2,0x1234+.+6             ;7c205cf01234

-    bsr/bs #0x7,@0xffffff12:8,0x1234+.+6    ;7e125cf01234

-    bsr/bs #0x7,@0xffff9abc:16,0x1234+.+8   ;6a109abc5cf01234

-    bsr/bs #0x7,@0x12345678:32,0x1234+.+0xa ;6a30123456785cf01234

-

-    bra r2l.b          ;5925 

-    bra r2.w           ;5926 

-    bra er2.l          ;5927 

-

-    bsr 0x12+.+2       ;5512

-    bsr 0x1234+.+4     ;5c001234

-    bsr r2l.b          ;5d25 

-    bsr r2.w           ;5d26 

-    bsr er2.l          ;5d27 

-

-    jmp @er2             ;5920     

-    jmp @0x123456:24     ;5a123456

-    jmp @0x12345678:32   ;590812345678

-    jmp @@0x12           ;5b12

-    jmp @@0x234          ;598d

-

-    jsr @er2             ;5d20 

-    jsr @0x123456:24     ;5e123456

-    jsr @0x12345678:32   ;5d0812345678

-    jsr @@0x12           ;5f12

-    jsr @@0x234          ;5d8d

-

-    rts                      ;5470     

-    rts/l  er3               ;5403

-    rts/l  er1-er2           ;5412

-    rts/l  er2-er4           ;5424

-    rts/l  er3-er6           ;5436

-

-    trapa #0x3               ;5730 

-

-    rte                      ;5670     

-    rte/l  er3               ;5603

-    rte/l  er1-er2           ;5612

-    rte/l  er2-er4           ;5624

-    rte/l  er3-er6           ;5636

-

-    ldc.b #0x12:8,ccr        ;0712 

-    ldc.b r3h,ccr            ;0303 

-    ldc.w @er3,ccr           ;01406930 

-    ldc.w @er3+,ccr          ;01406d30 

-    ldc.w @(0x1234:16,er3),ccr        ;01406f301234

-    ldc.w @(0x12345678:32,er3),ccr    ;014078306b2012345678

-    ldc.w @0x1234:16,ccr              ;01406b001234

-    ldc.w @0x12345678:32,ccr          ;01406b2012345678

-

-    ldc.b #0x12:8,exr        ;01410712 

-    ldc.b r3h,exr            ;0313 

-    ldc.w @er3,exr           ;01416930 

-    ldc.w @er3+,exr          ;01416d30 

-    ldc.w @(0x1234:16,er3),exr        ;01416f301234

-    ldc.w @(0x12345678:32,er3),exr    ;014178306b2012345678    

-    ldc.w @0x1234:16,exr              ;01416b001234

-    ldc.w @0x12345678:32,exr          ;01416b2012345678

-

-    stc.b ccr,r1h            ;0201 

-    stc.w ccr,@er1           ;01406990 

-    stc.w ccr,@-er1          ;01406d90 

-    stc.w ccr,@(0x1234:16,er1)       ;01406f901234

-    stc.w ccr,@(0x12345678:32,er1)   ;014078106ba012345678

-    stc.w ccr,@0x1234:16             ;01406b801234

-    stc.w ccr,@0x12345678:32         ;01406ba012345678

-

-    stc.b exr,r1h            ;0211 

-    stc.w exr,@er1           ;01416990 

-    stc.w exr,@-er1          ;01416d90 

-    stc.w exr,@(0x1234:16,er1)       ;01416f901234

-    stc.w exr,@(0x12345678:32,er1)   ;014178106ba012345678

-    stc.w exr,@0x1234:16             ;01416b801234

-    stc.w exr,@0x12345678:32         ;01416ba012345678

-

-    orc.b #0x12:8,ccr          ;0412 

-    orc.b #0x12:8,exr          ;01410412 

-

-    xorc.b #0x12:8,ccr         ;0512 

-    xorc.b #0x12:8,exr         ;01410512 

-

-    andc.b #0x12:8,ccr         ;0612 

-    andc.b #0x12:8,exr         ;01410612 

-

-    sleep                      ;0180 

-

-    nop                        ;0000

-

-	.end

diff --git a/gdb/testsuite/gdb.dwarf2/Makefile.in b/gdb/testsuite/gdb.dwarf2/Makefile.in
deleted file mode 100644
index c338e0274f4..00000000000
--- a/gdb/testsuite/gdb.dwarf2/Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-# Makefile for regression testing the GNU debugger.
-# Copyright 1992, 1993, 1994, 1995, 1996, 1999, 2001, 2003, 2004
-# Free Software Foundation, Inc.
-
-# This file is part of GDB.
-
-# GDB 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.
-
-# GDB 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.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = *.x
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *~ *.o a.out *.x *.ci *.tmp
-	-rm -f core core.coremaker coremaker.core corefile
-	-rm -f $(EXECUTABLES)
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status config.log
-	-rm -f *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
diff --git a/gdb/testsuite/gdb.dwarf2/dup-psym.S b/gdb/testsuite/gdb.dwarf2/dup-psym.S
deleted file mode 100644
index a22fd381892..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dup-psym.S
+++ /dev/null
@@ -1,201 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2005 Free Software Foundation, 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.  */
-
-/* Dummy function to provide debug information for.  */
-
-	.text
-.Lbegin_text1:
-	.globl func_cu1
-	.type func_cu1, %function
-func_cu1:
-.Lbegin_func_cu1:
-	.int 0
-.Lend_func_cu1:
-	.size func_cu1, .-func_cu1
-.Lend_text1:
-
-/* Debug information */
-
-	.section .debug_info
-.Lcu1_begin:
-	/* CU header */
-	.int	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
-.Lcu1_start:
-	.short	2				/* DWARF Version */
-	.int	.Labbrev1_begin			/* Offset into abbrev section */
-	.byte	4				/* Pointer size */
-
-	/* CU die */
-	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
-	.int	.Lline1_begin			/* DW_AT_stmt_list */
-	.int	.Lend_text1			/* DW_AT_high_pc */
-	.int	.Lbegin_text1			/* DW_AT_low_pc */
-	.ascii	"foo/file1.txt\0"		/* DW_AT_name */
-        .ascii  "/tmp/dup\0"			/* DW_AT_comp_dir */
-	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
-	.byte	1				/* DW_AT_language (C) */
-
-	/* func_cu1 */
-	.uleb128	2			/* Abbrev: DW_TAG_subprogram */
-	.byte		1			/* DW_AT_external */
-	.byte		1			/* DW_AT_decl_file */
-	.byte		2			/* DW_AT_decl_line */
-	.ascii		"func_cu1\0"		/* DW_AT_name */
-	.int		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
-	.int		.Lbegin_func_cu1	/* DW_AT_low_pc */
-	.int		.Lend_func_cu1		/* DW_AT_high_pc */
-	.byte		1			/* DW_AT_frame_base: length */
-	.byte		0x55			/* DW_AT_frame_base: DW_OP_reg5 */
-
-.Ltype_int:
-	.uleb128	3			/* Abbrev: DW_TAG_base_type */
-	.ascii		"int\0"			/* DW_AT_name */
-	.byte		4			/* DW_AT_byte_size */
-	.byte		5			/* DW_AT_encoding */
-
-	.byte		0			/* End of children of CU */
-
-.Lcu1_end:
-
-/* Abbrev table */
-	.section .debug_abbrev
-.Labbrev1_begin:
-	.uleb128	1			/* Abbrev code */
-	.uleb128	0x11			/* DW_TAG_compile_unit */
-	.byte		1			/* has_children */
-	.uleb128	0x10			/* DW_AT_stmt_list */
-	.uleb128	0x6			/* DW_FORM_data4 */
-	.uleb128	0x12			/* DW_AT_high_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x11			/* DW_AT_low_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-        .uleb128        0x1b                    /* DW_AT_comp_dir */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x25			/* DW_AT_producer */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x13			/* DW_AT_language */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.uleb128	2			/* Abbrev code */
-	.uleb128	0x2e			/* DW_TAG_subprogram */
-	.byte		0			/* has_children */
-	.uleb128	0x3f			/* DW_AT_external */
-	.uleb128	0xc			/* DW_FORM_flag */
-	.uleb128	0x3a			/* DW_AT_decl_file */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3b			/* DW_AT_decl_line */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x49			/* DW_AT_type */
-	.uleb128	0x13			/* DW_FORM_ref4 */
-	.uleb128	0x11			/* DW_AT_low_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x12			/* DW_AT_high_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x40			/* DW_AT_frame_base */
-	.uleb128	0xa			/* DW_FORM_block1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.uleb128	3			/* Abbrev code */
-	.uleb128	0x24			/* DW_TAG_base_type */
-	.byte		0			/* has_children */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0xb			/* DW_AT_byte_size */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3e			/* DW_AT_encoding */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-/* Line table */
-	.section .debug_line
-.Lline1_begin:
-	.int		.Lline1_end - .Lline1_start	/* Initial length */
-.Lline1_start:
-	.short		2			/* Version */
-	.int		.Lline1_lines - .Lline1_hdr	/* header_length */
-.Lline1_hdr:
-	.byte		1			/* Minimum insn length */
-	.byte		1			/* default_is_stmt */
-	.byte		1			/* line_base */
- 	.byte		1			/* line_range */
-	.byte		0x10			/* opcode_base */
-
-	/* Standard lengths */
-	.byte		0
-	.byte		1
-	.byte		1
-	.byte		1
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		0
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		0
-
-	/* Include directories */
-        .ascii  "/tmp/dup/foo\0"
-	.byte		0
-
-	/* File names */
-	.ascii		"file1.txt\0"
-	.uleb128	1
-	.uleb128	0
-	.uleb128	0
-
-	.byte		0
-
-.Lline1_lines:
-	.byte		0	/* DW_LNE_set_address */
-	.uleb128	5
-	.byte		2
-	.int		.Lbegin_func_cu1
-
-	.byte		3	/* DW_LNS_advance_line */
-	.sleb128	3	/* ... to 4 */
-
-	.byte		1	/* DW_LNS_copy */
-
-	.byte		1	/* DW_LNS_copy (second time as an end-of-prologue marker) */
-
-	.byte		0	/* DW_LNE_set_address */
-	.uleb128	5
-	.byte		2
-	.int		.Lend_func_cu1
-
-	.byte		0	/* DW_LNE_end_of_sequence */
-	.uleb128	1
-	.byte		1
-
-.Lline1_end:
diff --git a/gdb/testsuite/gdb.dwarf2/dup-psym.exp b/gdb/testsuite/gdb.dwarf2/dup-psym.exp
deleted file mode 100644
index 60dc283389e..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dup-psym.exp
+++ /dev/null
@@ -1,59 +0,0 @@
-#   Copyright 2005
-#   Free Software Foundation, 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.
-
-# Minimal DWARF-2 unit test
-
-# This test can only be run on targets which support DWARF-2 and use gas.
-# For now pick a sampling of likely targets.
-if {![istarget *-*-linux*]
-    && ![istarget *-*-gnu*]
-    && ![istarget *-*-elf*]
-    && ![istarget arm-*-eabi*]
-    && ![istarget powerpc-*-eabi*]} {
-    return 0  
-}
-
-set testfile "dup-psym"
-set srcfile ${testfile}.S
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-if  { [gdb_compile "${srcdir}/${subdir}/main.c" "main.o" object {debug}] != "" } {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${testfile}.o" object {nodebug}] != "" } {
-    return -1
-}
-
-if  { [gdb_compile "${testfile}.o main.o" "${binfile}" executable {debug}] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-# Note that we do not change the sources search path,
-gdb_load ${binfile}
-
-set test "info sources should contain only one reference to file1.txt"
-gdb_test_multiple "info sources" "$test" {
-  -re "file1\\.txt.*file1\\.txt.*$gdb_prompt $" {
-      fail "$test (file1.txt seen more than once)"
-  }
-  -re "file1\\.txt.*$gdb_prompt $" {
-      pass "$test"
-  }
-}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.S b/gdb/testsuite/gdb.dwarf2/dw2-basic.S
deleted file mode 100644
index 1e98a4d6edf..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dw2-basic.S
+++ /dev/null
@@ -1,201 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.  */
-
-/* Test a minimal file containing DWARF-2 information.  This test also
-   serves as a skeleton for other DWARF-2 tests.  Most other tests will
-   not be this extensively itemized and commented...  */
-
-/* Dummy function to provide debug information for.  */
-
-	.text
-.Lbegin_text1:
-	.globl func_cu1
-	.type func_cu1, %function
-func_cu1:
-.Lbegin_func_cu1:
-	.int 0
-.Lend_func_cu1:
-	.size func_cu1, .-func_cu1
-.Lend_text1:
-
-/* Debug information */
-
-	.section .debug_info
-.Lcu1_begin:
-	/* CU header */
-	.int	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
-.Lcu1_start:
-	.short	2				/* DWARF Version */
-	.int	.Labbrev1_begin			/* Offset into abbrev section */
-	.byte	4				/* Pointer size */
-
-	/* CU die */
-	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
-	.int	.Lline1_begin			/* DW_AT_stmt_list */
-	.int	.Lend_text1			/* DW_AT_high_pc */
-	.int	.Lbegin_text1			/* DW_AT_low_pc */
-	.ascii	"file1.txt\0"			/* DW_AT_name */
-	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
-	.byte	1				/* DW_AT_language (C) */
-
-	/* func_cu1 */
-	.uleb128	2			/* Abbrev: DW_TAG_subprogram */
-	.byte		1			/* DW_AT_external */
-	.byte		1			/* DW_AT_decl_file */
-	.byte		2			/* DW_AT_decl_line */
-	.ascii		"func_cu1\0"		/* DW_AT_name */
-	.int		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
-	.int		.Lbegin_func_cu1	/* DW_AT_low_pc */
-	.int		.Lend_func_cu1		/* DW_AT_high_pc */
-	.byte		1			/* DW_AT_frame_base: length */
-	.byte		0x55			/* DW_AT_frame_base: DW_OP_reg5 */
-
-.Ltype_int:
-	.uleb128	3			/* Abbrev: DW_TAG_base_type */
-	.ascii		"int\0"			/* DW_AT_name */
-	.byte		4			/* DW_AT_byte_size */
-	.byte		5			/* DW_AT_encoding */
-
-	.byte		0			/* End of children of CU */
-
-.Lcu1_end:
-
-/* Abbrev table */
-	.section .debug_abbrev
-.Labbrev1_begin:
-	.uleb128	1			/* Abbrev code */
-	.uleb128	0x11			/* DW_TAG_compile_unit */
-	.byte		1			/* has_children */
-	.uleb128	0x10			/* DW_AT_stmt_list */
-	.uleb128	0x6			/* DW_FORM_data4 */
-	.uleb128	0x12			/* DW_AT_high_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x11			/* DW_AT_low_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x25			/* DW_AT_producer */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x13			/* DW_AT_language */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.uleb128	2			/* Abbrev code */
-	.uleb128	0x2e			/* DW_TAG_subprogram */
-	.byte		0			/* has_children */
-	.uleb128	0x3f			/* DW_AT_external */
-	.uleb128	0xc			/* DW_FORM_flag */
-	.uleb128	0x3a			/* DW_AT_decl_file */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3b			/* DW_AT_decl_line */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x49			/* DW_AT_type */
-	.uleb128	0x13			/* DW_FORM_ref4 */
-	.uleb128	0x11			/* DW_AT_low_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x12			/* DW_AT_high_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x40			/* DW_AT_frame_base */
-	.uleb128	0xa			/* DW_FORM_block1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.uleb128	3			/* Abbrev code */
-	.uleb128	0x24			/* DW_TAG_base_type */
-	.byte		0			/* has_children */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0xb			/* DW_AT_byte_size */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3e			/* DW_AT_encoding */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-/* Line table */
-	.section .debug_line
-.Lline1_begin:
-	.int		.Lline1_end - .Lline1_start	/* Initial length */
-.Lline1_start:
-	.short		2			/* Version */
-	.int		.Lline1_lines - .Lline1_hdr	/* header_length */
-.Lline1_hdr:
-	.byte		1			/* Minimum insn length */
-	.byte		1			/* default_is_stmt */
-	.byte		1			/* line_base */
- 	.byte		1			/* line_range */
-	.byte		0x10			/* opcode_base */
-
-	/* Standard lengths */
-	.byte		0
-	.byte		1
-	.byte		1
-	.byte		1
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		0
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		0
-
-	/* Include directories */
-	.byte		0
-
-	/* File names */
-	.ascii		"file1.txt\0"
-	.uleb128	0
-	.uleb128	0
-	.uleb128	0
-
-	.byte		0
-
-.Lline1_lines:
-	.byte		0	/* DW_LNE_set_address */
-	.uleb128	5
-	.byte		2
-	.int		.Lbegin_func_cu1
-
-	.byte		3	/* DW_LNS_advance_line */
-	.sleb128	3	/* ... to 4 */
-
-	.byte		1	/* DW_LNS_copy */
-
-	.byte		1	/* DW_LNS_copy (second time as an end-of-prologue marker) */
-
-	.byte		0	/* DW_LNE_set_address */
-	.uleb128	5
-	.byte		2
-	.int		.Lend_func_cu1
-
-	.byte		0	/* DW_LNE_end_of_sequence */
-	.uleb128	1
-	.byte		1
-
-.Lline1_end:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp
deleted file mode 100644
index 4a9d0674838..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2004, 2005 Free Software Foundation, 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.
-
-# Minimal DWARF-2 unit test
-
-# This test can only be run on targets which support DWARF-2 and use gas.
-# For now pick a sampling of likely targets.
-if {![istarget *-*-linux*]
-    && ![istarget *-*-gnu*]
-    && ![istarget *-*-elf*]
-    && ![istarget *-*-openbsd*]
-    && ![istarget arm-*-eabi*]
-    && ![istarget powerpc-*-eabi*]} {
-    return 0  
-}
-
-set testfile "dw2-basic"
-set srcfile ${testfile}.S
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-if  { [gdb_compile "${srcdir}/${subdir}/main.c" "main.o" object {debug}] != "" } {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${testfile}.o" object {nodebug}] != "" } {
-    return -1
-}
-
-if  { [gdb_compile "${testfile}.o main.o" "${binfile}" executable {debug}] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set listsize 1" ""
-gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4"
-gdb_test "ptype func_cu1" "type = int \\(\\)"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.S b/gdb/testsuite/gdb.dwarf2/dw2-intercu.S
deleted file mode 100644
index b612f85203f..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.S
+++ /dev/null
@@ -1,236 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.  */
-
-/* Test a minimal file containing DWARF-2 information.  This test also
-   serves as a skeleton for other DWARF-2 tests.  Most other tests will
-   not be this extensively itemized and commented...  */
-
-/* Dummy function to provide debug information for.  */
-
-	.text
-.Lbegin_text1:
-	.globl func_cu1
-	.type func_cu1, %function
-func_cu1:
-.Lbegin_func_cu1:
-	.int 0
-.Lend_func_cu1:
-	.size func_cu1, .-func_cu1
-.Lend_text1:
-
-/* Debug information */
-
-	.section .debug_info
-.Lcu1_begin:
-	/* CU header */
-	.int	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
-.Lcu1_start:
-	.short	2				/* DWARF Version */
-	.int	.Labbrev1_begin			/* Offset into abbrev section */
-	.byte	4				/* Pointer size */
-
-	/* CU die */
-	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
-	.int	.Lline1_begin			/* DW_AT_stmt_list */
-	.int	.Lend_text1			/* DW_AT_high_pc */
-	.int	.Lbegin_text1			/* DW_AT_low_pc */
-	.ascii	"file1.txt\0"			/* DW_AT_name */
-	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
-	.byte	1				/* DW_AT_language (C) */
-
-	/* func_cu1 */
-	.uleb128	2			/* Abbrev: DW_TAG_subprogram */
-	.byte		1			/* DW_AT_external */
-	.byte		1			/* DW_AT_decl_file */
-	.byte		2			/* DW_AT_decl_line */
-	.ascii		"func_cu1\0"		/* DW_AT_name */
-	.int		.Ltype_int		/* DW_AT_type */
-	.int		.Lbegin_func_cu1	/* DW_AT_low_pc */
-	.int		.Lend_func_cu1		/* DW_AT_high_pc */
-	.byte		1			/* DW_AT_frame_base: length */
-	.byte		0x55			/* DW_AT_frame_base: DW_OP_reg5 */
-
-	.byte		0			/* End of children of CU */
-
-.Lcu1_end:
-
-	/* Second compilation unit.  */
-.Lcu2_begin:
-	/* CU header */
-	.int	.Lcu2_end - .Lcu2_start		/* Length of Compilation Unit */
-.Lcu2_start:
-	.short	2				/* DWARF Version */
-	.int	.Labbrev2_begin			/* Offset into abbrev section */
-	.byte	4				/* Pointer size */
-
-	/* CU die */
-	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
-	.ascii	"file1.txt\0"			/* DW_AT_name */
-	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
-	.byte	1				/* DW_AT_language (C) */
-
-.Ltype_int:
-	.uleb128	2			/* Abbrev: DW_TAG_base_type */
-	.ascii		"int\0"			/* DW_AT_name */
-	.byte		4			/* DW_AT_byte_size */
-	.byte		5			/* DW_AT_encoding */
-
-	.byte		0			/* End of children of CU */
-
-.Lcu2_end:
-
-/* Abbrev table */
-	.section .debug_abbrev
-.Labbrev1_begin:
-	.uleb128	1			/* Abbrev code */
-	.uleb128	0x11			/* DW_TAG_compile_unit */
-	.byte		1			/* has_children */
-	.uleb128	0x10			/* DW_AT_stmt_list */
-	.uleb128	0x6			/* DW_FORM_data4 */
-	.uleb128	0x12			/* DW_AT_high_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x11			/* DW_AT_low_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x25			/* DW_AT_producer */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x13			/* DW_AT_language */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.uleb128	2			/* Abbrev code */
-	.uleb128	0x2e			/* DW_TAG_subprogram */
-	.byte		0			/* has_children */
-	.uleb128	0x3f			/* DW_AT_external */
-	.uleb128	0xc			/* DW_FORM_flag */
-	.uleb128	0x3a			/* DW_AT_decl_file */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3b			/* DW_AT_decl_line */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x49			/* DW_AT_type */
-	.uleb128	0x10			/* DW_FORM_ref_addr */
-	.uleb128	0x11			/* DW_AT_low_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x12			/* DW_AT_high_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x40			/* DW_AT_frame_base */
-	.uleb128	0xa			/* DW_FORM_block1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-.Labbrev2_begin:
-	.uleb128	1			/* Abbrev code */
-	.uleb128	0x11			/* DW_TAG_compile_unit */
-	.byte		1			/* has_children */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x25			/* DW_AT_producer */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x13			/* DW_AT_language */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.uleb128	2			/* Abbrev code */
-	.uleb128	0x24			/* DW_TAG_base_type */
-	.byte		0			/* has_children */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0xb			/* DW_AT_byte_size */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3e			/* DW_AT_encoding */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-/* Line table */
-	.section .debug_line
-.Lline1_begin:
-	.int		.Lline1_end - .Lline1_start	/* Initial length */
-.Lline1_start:
-	.short		2			/* Version */
-	.int		.Lline1_lines - .Lline1_hdr	/* header_length */
-.Lline1_hdr:
-	.byte		1			/* Minimum insn length */
-	.byte		1			/* default_is_stmt */
-	.byte		1			/* line_base */
- 	.byte		1			/* line_range */
-	.byte		0x10			/* opcode_base */
-
-	/* Standard lengths */
-	.byte		0
-	.byte		1
-	.byte		1
-	.byte		1
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		0
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		0
-
-	/* Include directories */
-	.byte		0
-
-	/* File names */
-	.ascii		"file1.txt\0"
-	.uleb128	0
-	.uleb128	0
-	.uleb128	0
-
-	.byte		0
-
-.Lline1_lines:
-	.byte		0	/* DW_LNE_set_address */
-	.uleb128	5
-	.byte		2
-	.int		.Lbegin_func_cu1
-
-	.byte		3	/* DW_LNS_advance_line */
-	.sleb128	3	/* ... to 4 */
-
-	.byte		1	/* DW_LNS_copy */
-
-	.byte		1	/* DW_LNS_copy (second time as an end-of-prologue marker) */
-
-	.byte		0	/* DW_LNE_set_address */
-	.uleb128	5
-	.byte		2
-	.int		.Lend_func_cu1
-
-	.byte		0	/* DW_LNE_end_of_sequence */
-	.uleb128	1
-	.byte		1
-
-.Lline1_end:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
deleted file mode 100644
index eec9a7959a6..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2004, 2005 Free Software Foundation, 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.
-
-# Minimal DWARF-2 unit test
-
-# This test can only be run on targets which support DWARF-2 and use gas.
-# For now pick a sampling of likely targets.
-if {![istarget *-*-linux*]
-    && ![istarget *-*-gnu*]
-    && ![istarget *-*-elf*]
-    && ![istarget *-*-openbsd*]
-    && ![istarget arm-*-eabi*]
-    && ![istarget powerpc-*-eabi*]} {
-    return 0  
-}
-
-set testfile "dw2-intercu"
-set srcfile ${testfile}.S
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-if  { [gdb_compile "${srcdir}/${subdir}/main.c" "main.o" object {debug}] != "" } {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${testfile}.o" object {nodebug}] != "" } {
-    return -1
-}
-
-if  { [gdb_compile "${testfile}.o main.o" "${binfile}" executable {debug}] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set listsize 1" ""
-gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4"
-gdb_test "ptype func_cu1" "type = int \\(\\)"
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.S b/gdb/testsuite/gdb.dwarf2/dw2-intermix.S
deleted file mode 100644
index f53d577731b..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.S
+++ /dev/null
@@ -1,202 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2005 Free Software Foundation, 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.  */
-
-/* Test a minimal file containing intermixed 32-bit and 64-bit DWARF
-   formats.  This is not allowed by the (draft) DWARF-3 standard, but
-   GDB should handle it gracefully nevertheless.  */
-
-/* Dummy function to provide debug information for.  */
-
-	.text
-.Lbegin_text1:
-	.globl func_cu1
-	.type func_cu1, %function
-func_cu1:
-.Lbegin_func_cu1:
-	.int 0
-.Lend_func_cu1:
-	.size func_cu1, .-func_cu1
-.Lend_text1:
-
-/* Debug information */
-
-	.section .debug_info
-.Lcu1_begin:
-	/* CU header */
-	.int	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
-.Lcu1_start:
-	.short	2				/* DWARF Version */
-	.int	.Labbrev1_begin			/* Offset into abbrev section */
-	.byte	4				/* Pointer size */
-
-	/* CU die */
-	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
-	.int	.Lline1_begin			/* DW_AT_stmt_list */
-	.int	.Lend_text1			/* DW_AT_high_pc */
-	.int	.Lbegin_text1			/* DW_AT_low_pc */
-	.ascii	"file1.txt\0"			/* DW_AT_name */
-	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
-	.byte	1				/* DW_AT_language (C) */
-
-	/* func_cu1 */
-	.uleb128	2			/* Abbrev: DW_TAG_subprogram */
-	.byte		1			/* DW_AT_external */
-	.byte		1			/* DW_AT_decl_file */
-	.byte		2			/* DW_AT_decl_line */
-	.ascii		"func_cu1\0"		/* DW_AT_name */
-	.int		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
-	.int		.Lbegin_func_cu1	/* DW_AT_low_pc */
-	.int		.Lend_func_cu1		/* DW_AT_high_pc */
-	.byte		1			/* DW_AT_frame_base: length */
-	.byte		0x55			/* DW_AT_frame_base: DW_OP_reg5 */
-
-.Ltype_int:
-	.uleb128	3			/* Abbrev: DW_TAG_base_type */
-	.ascii		"int\0"			/* DW_AT_name */
-	.byte		4			/* DW_AT_byte_size */
-	.byte		5			/* DW_AT_encoding */
-
-	.byte		0			/* End of children of CU */
-
-.Lcu1_end:
-
-/* Abbrev table */
-	.section .debug_abbrev
-.Labbrev1_begin:
-	.uleb128	1			/* Abbrev code */
-	.uleb128	0x11			/* DW_TAG_compile_unit */
-	.byte		1			/* has_children */
-	.uleb128	0x10			/* DW_AT_stmt_list */
-	.uleb128	0x6			/* DW_FORM_data4 */
-	.uleb128	0x12			/* DW_AT_high_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x11			/* DW_AT_low_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x25			/* DW_AT_producer */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x13			/* DW_AT_language */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.uleb128	2			/* Abbrev code */
-	.uleb128	0x2e			/* DW_TAG_subprogram */
-	.byte		0			/* has_children */
-	.uleb128	0x3f			/* DW_AT_external */
-	.uleb128	0xc			/* DW_FORM_flag */
-	.uleb128	0x3a			/* DW_AT_decl_file */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3b			/* DW_AT_decl_line */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0x49			/* DW_AT_type */
-	.uleb128	0x13			/* DW_FORM_ref4 */
-	.uleb128	0x11			/* DW_AT_low_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x12			/* DW_AT_high_pc */
-	.uleb128	0x1			/* DW_FORM_addr */
-	.uleb128	0x40			/* DW_AT_frame_base */
-	.uleb128	0xa			/* DW_FORM_block1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.uleb128	3			/* Abbrev code */
-	.uleb128	0x24			/* DW_TAG_base_type */
-	.byte		0			/* has_children */
-	.uleb128	0x3			/* DW_AT_name */
-	.uleb128	0x8			/* DW_FORM_string */
-	.uleb128	0xb			/* DW_AT_byte_size */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.uleb128	0x3e			/* DW_AT_encoding */
-	.uleb128	0xb			/* DW_FORM_data1 */
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-	.byte		0x0			/* Terminator */
-	.byte		0x0			/* Terminator */
-
-/* Line table */
-	.section .debug_line
-.Lline1_begin:
-	.int		0xffffffff
-	.quad		.Lline1_end - .Lline1_start	/* Initial length */
-.Lline1_start:
-	.short		2			/* Version */
-	.quad		.Lline1_lines - .Lline1_hdr	/* header_length */
-.Lline1_hdr:
-	.byte		1			/* Minimum insn length */
-	.byte		1			/* default_is_stmt */
-	.byte		1			/* line_base */
- 	.byte		1			/* line_range */
-	.byte		0x10			/* opcode_base */
-
-	/* Standard lengths */
-	.byte		0
-	.byte		1
-	.byte		1
-	.byte		1
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		0
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		1
-	.byte		0
-	.byte		0
-	.byte		0
-
-	/* Include directories */
-	.byte		0
-
-	/* File names */
-	.ascii		"file1.txt\0"
-	.uleb128	0
-	.uleb128	0
-	.uleb128	0
-
-	.byte		0
-
-.Lline1_lines:
-	.byte		0	/* DW_LNE_set_address */
-	.uleb128	5
-	.byte		2
-	.int		.Lbegin_func_cu1
-
-	.byte		3	/* DW_LNS_advance_line */
-	.sleb128	3	/* ... to 4 */
-
-	.byte		1	/* DW_LNS_copy */
-
-	.byte		1	/* DW_LNS_copy (second time as an end-of-prologue marker) */
-
-	.byte		0	/* DW_LNE_set_address */
-	.uleb128	5
-	.byte		2
-	.int		.Lend_func_cu1
-
-	.byte		0	/* DW_LNE_end_of_sequence */
-	.uleb128	1
-	.byte		1
-
-.Lline1_end:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp
deleted file mode 100644
index 63fa9afe2b9..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2005 Free Software Foundation, 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.
-
-# Intermixed 32-bit and 64-bit DWARF format tests.
-
-# This test can only be run on targets which support DWARF-2 and use gas.
-# For now pick a sampling of likely targets.
-if {![istarget *-*-linux*]
-    && ![istarget *-*-gnu*]
-    && ![istarget *-*-elf*]
-    && ![istarget *-*-openbsd*]
-    && ![istarget arm-*-eabi*]
-    && ![istarget powerpc-*-eabi*]} {
-    return 0  
-}
-
-set testfile "dw2-intermix"
-set srcfile ${testfile}.S
-set binfile ${objdir}/${subdir}/${testfile}.x
-
-if  { [gdb_compile "${srcdir}/${subdir}/main.c" "main.o" object {debug}] != "" } {
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${testfile}.o" object {nodebug}] != "" } {
-    return -1
-}
-
-if  { [gdb_compile "${testfile}.o main.o" "${binfile}" executable {debug}] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set listsize 1" ""
-gdb_test "list func_cu1" "4\[ \t\]+File 1 Line 4"
-gdb_test "ptype func_cu1" "type = int \\(\\)"
diff --git a/gdb/testsuite/gdb.dwarf2/file1.txt b/gdb/testsuite/gdb.dwarf2/file1.txt
deleted file mode 100644
index b745e3abefe..00000000000
--- a/gdb/testsuite/gdb.dwarf2/file1.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-File 1 Line 1
-File 1 Line 2
-File 1 Line 3
-File 1 Line 4
-File 1 Line 5
-File 1 Line 6
-File 1 Line 7
-File 1 Line 8
diff --git a/gdb/testsuite/gdb.dwarf2/main.c b/gdb/testsuite/gdb.dwarf2/main.c
deleted file mode 100644
index 87442ac0a59..00000000000
--- a/gdb/testsuite/gdb.dwarf2/main.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.  */
-
-/* Dummy main function.  */
-
-int
-main()
-{
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.fortran/Makefile.in b/gdb/testsuite/gdb.fortran/Makefile.in
deleted file mode 100644
index a1c3b074a07..00000000000
--- a/gdb/testsuite/gdb.fortran/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-# Makefile for regression testing the GNU debugger.
-# Copyright 1992, 1993, 1994, 1995, 1996, 1999, 2001, 2003, 2004
-# Free Software Foundation, Inc.
-
-# This file is part of GDB.
-
-# GDB 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.
-
-# GDB 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.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = 
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *~ *.o *.ci
-	-rm -f core ${EXECUTABLES}
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
diff --git a/gdb/testsuite/gdb.fortran/exprs.exp b/gdb/testsuite/gdb.fortran/exprs.exp
deleted file mode 100644
index 32742b997ec..00000000000
--- a/gdb/testsuite/gdb.fortran/exprs.exp
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright (C) 1994, 1997 Free Software Foundation, 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 adapted from old Chill tests by Stan Shebs
-# (shebs@cygnus.com).
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Set the current language to fortran.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_fortran {} {
-    global gdb_prompt
-    
-    if [gdb_test "set language fortran" ""] {
-	return 0;
-    }
-
-    if ![gdb_test "show language" ".* source language is \"fortran\".*"] {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-proc test_integer_literals_accepted {} {
-    global gdb_prompt
-
-    # Test various decimal values.
-
-    gdb_test "p 123" " = 123"
-    gdb_test "p -123" " = -123"
-}
-
-proc test_character_literals_accepted {} {
-    global gdb_prompt
-
-    # Test various character values.
-
-    gdb_test "p 'a'" " = 'a'"
-}
-
-proc test_integer_literals_rejected {} {
-    global gdb_prompt
-
-    test_print_reject "p _"
-}
-
-proc test_logical_literals_accepted {} {
-    global gdb_prompt
-
-    # Test the only possible values for a logical, TRUE and FALSE.
-
-    gdb_test "p .TRUE." " = .TRUE."
-    gdb_test "p .FALSE." " = .FALSE."
-}
-
-proc test_float_literals_accepted {} {
-    global gdb_prompt
-
-    # Test various floating point formats
-
-    gdb_test "p .44 .LT. .45" " = .TRUE."
-    gdb_test "p .44 .GT. .45" " = .FALSE."
-    gdb_test "p 0.44 .LT. 0.45" " = .TRUE."
-    gdb_test "p 0.44 .GT. 0.45" " = .FALSE."
-    gdb_test "p 44. .LT. 45." " = .TRUE."
-    gdb_test "p 44. .GT. 45." " = .FALSE."
-    gdb_test "p 44.0 .LT. 45.0" " = .TRUE."
-    gdb_test "p 44.0 .GT. 45.0" " = .FALSE."
-    gdb_test "p 10D20 .LT. 10D21" " = .TRUE."
-    gdb_test "p 10D20 .GT. 10D21" " = .FALSE."
-    gdb_test "p 10d20 .LT. 10d21" " = .TRUE."
-    gdb_test "p 10d20 .GT. 10d21" " = .FALSE."
-    gdb_test "p 10E20 .LT. 10E21" " = .TRUE."
-    gdb_test "p 10E20 .GT. 10E21" " = .FALSE."
-    gdb_test "p 10e20 .LT. 10e21" " = .TRUE."
-    gdb_test "p 10e20 .GT. 10e21" " = .FALSE."
-    gdb_test "p 10.D20 .LT. 10.D21" " = .TRUE."
-    gdb_test "p 10.D20 .GT. 10.D21" " = .FALSE."
-    gdb_test "p 10.d20 .LT. 10.d21" " = .TRUE."
-    gdb_test "p 10.d20 .GT. 10.d21" " = .FALSE."
-    gdb_test "p 10.E20 .LT. 10.E21" " = .TRUE."
-    gdb_test "p 10.E20 .GT. 10.E21" " = .FALSE."
-    gdb_test "p 10.e20 .LT. 10.e21" " = .TRUE."
-    gdb_test "p 10.e20 .GT. 10.e21" " = .FALSE."
-    gdb_test "p 10.0D20 .LT. 10.0D21" " = .TRUE."
-    gdb_test "p 10.0D20 .GT. 10.0D21" " = .FALSE."
-    gdb_test "p 10.0d20 .LT. 10.0d21" " = .TRUE."
-    gdb_test "p 10.0d20 .GT. 10.0d21" " = .FALSE."
-    gdb_test "p 10.0E20 .LT. 10.0E21" " = .TRUE."
-    gdb_test "p 10.0E20 .GT. 10.0E21" " = .FALSE."
-    gdb_test "p 10.0e20 .LT. 10.0e21" " = .TRUE."
-    gdb_test "p 10.0e20 .GT. 10.0e21" " = .FALSE."
-    gdb_test "p 10.0D+20 .LT. 10.0D+21" " = .TRUE."
-    gdb_test "p 10.0D+20 .GT. 10.0D+21" " = .FALSE."
-    gdb_test "p 10.0d+20 .LT. 10.0d+21" " = .TRUE."
-    gdb_test "p 10.0d+20 .GT. 10.0d+21" " = .FALSE."
-    gdb_test "p 10.0E+20 .LT. 10.0E+21" " = .TRUE."
-    gdb_test "p 10.0E+20 .GT. 10.0E+21" " = .FALSE."
-    gdb_test "p 10.0e+20 .LT. 10.0e+21" " = .TRUE."
-    gdb_test "p 10.0e+20 .GT. 10.0e+21" " = .FALSE."
-    gdb_test "p 10.0D-11 .LT. 10.0D-10" " = .TRUE."
-    gdb_test "p 10.0D-11 .GT. 10.0D-10" " = .FALSE."
-    gdb_test "p 10.0d-11 .LT. 10.0d-10" " = .TRUE."
-    gdb_test "p 10.0d-11 .GT. 10.0d-10" " = .FALSE."
-    gdb_test "p 10.0E-11 .LT. 10.0E-10" " = .TRUE."
-    gdb_test "p 10.0E-11 .GT. 10.0E-10" " = .FALSE."
-    gdb_test "p 10.0e-11 .LT. 10.0e-10" " = .TRUE."
-    gdb_test "p 10.0e-11 .GT. 10.0e-10" " = .FALSE."
-}
-
-proc test_convenience_variables {} {
-    global gdb_prompt
-
-    gdb_test "set \$foo = 101"	" = 101\[\r\n\]*" \
-	"Set a new convenience variable"
-
-    gdb_test "print \$foo"		" = 101" \
-	"Print contents of new convenience variable"
-
-    gdb_test "set \$foo = 301"	" = 301\[\r\n\]*" \
-	"Set convenience variable to a new value"
-
-    gdb_test "print \$foo"		" = 301" \
-	"Print new contents of convenience variable"
-
-    gdb_test "set \$_ = 11"		" = 11\[\r\n\]*" \
-	"Set convenience variable \$_"
-
-    gdb_test "print \$_"		" = 11" \
-	"Print contents of convenience variable \$_"
-
-    gdb_test "print \$foo + 10"	" = 311" \
-	"Use convenience variable in arithmetic expression"
-
-    gdb_test "print (\$foo = 32) + 4"	" = 36" \
-	"Use convenience variable assignment in arithmetic expression"
-
-    gdb_test "print \$bar"		" = VOID" \
-	"Print contents of uninitialized convenience variable"
-}
-
-proc test_value_history {} {
-    global gdb_prompt
-
-    gdb_test "print 101"	"\\\$1 = 101" \
-	"Set value-history\[1\] using \$1"
-
-    gdb_test "print 102" 	"\\\$2 = 102" \
-	"Set value-history\[2\] using \$2"
-
-    gdb_test "print 103"	"\\\$3 = 103" \
-	"Set value-history\[3\] using \$3"
-
-    gdb_test "print \$\$"	"\\\$4 = 102" \
-	"Print value-history\[MAX-1\] using inplicit index \$\$"
-
-    gdb_test "print \$\$"	"\\\$5 = 103" \
-	"Print value-history\[MAX-1\] again using implicit index \$\$"
-
-    gdb_test "print \$"	"\\\$6 = 103" \
-	"Print value-history\[MAX\] using implicit index \$"
-
-    gdb_test "print \$\$2"	"\\\$7 = 102" \
-	"Print value-history\[MAX-2\] using explicit index \$\$2"
-
-    gdb_test "print \$0"	"\\\$8 = 102" \
-	"Print value-history\[MAX\] using explicit index \$0"
-
-    gdb_test "print 108"	"\\\$9 = 108" ""
-
-    gdb_test "print \$\$0"	"\\\$10 = 108" \
-	"Print value-history\[MAX\] using explicit index \$\$0"
-
-    gdb_test "print \$1"	"\\\$11 = 101" \
-	"Print value-history\[1\] using explicit index \$1"
-
-    gdb_test "print \$2"	"\\\$12 = 102" \
-	"Print value-history\[2\] using explicit index \$2"
-
-    gdb_test "print \$3"	"\\\$13 = 103" \
-	"Print value-history\[3\] using explicit index \$3"
-
-    gdb_test "print \$-3"	"\\\$14 = 100" \
-	"Print (value-history\[MAX\] - 3) using implicit index \$"
-
-    gdb_test "print \$1 + 3"	"\\\$15 = 104" \
-	"Use value-history element in arithmetic expression"
-}
-
-proc test_arithmetic_expressions {} {
-    global gdb_prompt
-
-    # Test unary minus with various operands
-
-#    gdb_test "p -(TRUE)"	" = -1"	"unary minus applied to bool"
-#    gdb_test "p -('a')"	" = xxx"	"unary minus applied to char"
-    gdb_test "p -(1)"		" = -1"	"unary minus applied to int"
-    gdb_test "p -(1.0)"	" = -1"	"unary minus applied to real"
-
-    # Test addition with various operands
-
-    gdb_test "p .TRUE. + 1"	" = 2"	"bool plus int"
-    gdb_test "p 1 + 1"		" = 2"	"int plus int"
-    gdb_test "p 1.0 + 1"	" = 2"	"real plus int"
-    gdb_test "p 1.0 + 2.0"	" = 3"	"real plus real"
-
-    # Test subtraction with various operands
-
-    gdb_test "p .TRUE. - 1"	" = 0"	"bool minus int"
-    gdb_test "p 3 - 1"		" = 2"	"int minus int"
-    gdb_test "p 3.0 - 1"	" = 2"	"real minus int"
-    gdb_test "p 5.0 - 2.0"	" = 3"	"real minus real"
-
-    # Test multiplication with various operands
-
-    gdb_test "p .TRUE. * 1"	" = 1"	"bool times int"
-    gdb_test "p 2 * 3"		" = 6"	"int times int"
-    gdb_test "p 2.0 * 3"	" = 6"	"real times int"
-    gdb_test "p 2.0 * 3.0"	" = 6"	"real times real"
-
-    # Test division with various operands
-
-    gdb_test "p .TRUE. / 1"	" = 1"	"bool divided by int"
-    gdb_test "p 6 / 3"		" = 2"	"int divided by int"
-    gdb_test "p 6.0 / 3"	" = 2"	"real divided by int"
-    gdb_test "p 6.0 / 3.0"	" = 2"	"real divided by real"
-
-    # Test modulo with various operands
-
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "set print sevenbit-strings" ""
-
-if [set_lang_fortran] then {
-    test_value_history
-    test_convenience_variables
-    test_integer_literals_accepted
-    test_integer_literals_rejected
-    test_logical_literals_accepted
-    test_character_literals_accepted
-    test_float_literals_accepted
-    test_arithmetic_expressions
-} else {
-    warning "$test_name tests suppressed." 0
-}
diff --git a/gdb/testsuite/gdb.fortran/types.exp b/gdb/testsuite/gdb.fortran/types.exp
deleted file mode 100644
index ceb6156f5c5..00000000000
--- a/gdb/testsuite/gdb.fortran/types.exp
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1994, 1995, 1997, 1998 Free Software Foundation, 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 adapted from old Chill tests by Stan Shebs
-# (shebs@cygnus.com).
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Set the current language to fortran.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_fortran {} {
-    global gdb_prompt
-    
-    if [gdb_test "set language fortran" ""] {
-	return 0;
-    }
-
-    if ![gdb_test "show language" ".* source language is \"fortran\".*"] {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-proc test_integer_literal_types_accepted {} {
-    global gdb_prompt
-
-    # Test various decimal values.
-    # Should be integer*4 probably.
-    gdb_test "pt 123" "type = int" 
-}
-
-proc test_character_literal_types_accepted {} {
-    global gdb_prompt
-
-    # Test various character values.
-
-    gdb_test "pt 'a'" "type = character\\*1"
-}
-
-proc test_integer_literal_types_rejected {} {
-    global gdb_prompt
-
-    test_print_reject "pt _"
-}
-
-proc test_logical_literal_types_accepted {} {
-    global gdb_prompt
-
-    # Test the only possible values for a logical, TRUE and FALSE.
-
-    gdb_test "pt .TRUE." "type = logical\\*2"
-    gdb_test "pt .FALSE." "type = logical\\*2"
-}
-
-proc test_float_literal_types_accepted {} {
-    global gdb_prompt
-
-    # Test various floating point formats
-
-    # this used to guess whether to look for "real*4" or
-    # "real*8" based on a target config variable, but noone
-    # maintained it properly.
-
-    gdb_test "pt .44" "type = real\\*\[0-9\]+"
-    gdb_test "pt 44.0" "type = real\\*\[0-9\]+"
-    gdb_test "pt 10D20" "type = real\\*\[0-9\]+"
-    gdb_test "pt 10D20" "type = real\\*\[0-9\]+"
-    gdb_test "pt 10d20" "type = real\\*\[0-9\]+"
-    gdb_test "pt 10d20" "type = real\\*\[0-9\]+"
-    gdb_test "pt 10E20" "type = real\\*\[0-9\]+"
-    gdb_test "pt 10E20" "type = real\\*\[0-9\]+"
-    gdb_test "pt 10e20" "type = real\\*\[0-9\]+"
-    gdb_test "pt 10e20" "type = real\\*\[0-9\]+"
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "set print sevenbit-strings" ""
-
-if [set_lang_fortran] then {
-    test_integer_literal_types_accepted
-    test_integer_literal_types_rejected
-    test_logical_literal_types_accepted
-    test_character_literal_types_accepted
-    test_float_literal_types_accepted
-} else {
-    warning "$test_name tests suppressed." 0
-}
diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp
deleted file mode 100644
index 2dd1508fed6..00000000000
--- a/gdb/testsuite/gdb.gdb/complaints.exp
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 2002, 2004
-# Free Software Foundation, 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.  
-
-# This file was written by Andrew Cagney (cagney at redhat dot com),
-# derived from xfullpath.exp (written by Joel Brobecker), derived from
-# selftest.exp (written by Rob Savoye).
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if [is_remote target] {
-    return
-}
-
-proc setup_test { executable } {
-    global gdb_prompt
-    global timeout
-
-    # load yourself into the debugger
-    # This can take a relatively long time, particularly for testing where
-    # the executable is being accessed over a network, or where gdb does not
-    # support partial symbols for a particular target and has to load the
-    # entire symbol table.  Set the timeout to 10 minutes, which should be
-    # adequate for most environments (it *has* timed out with 5 min on a
-    # SPARCstation SLC under moderate load, so this isn't unreasonable).
-    # After gdb is started, set the timeout to 30 seconds for the duration
-    # of this test, and then back to the original value.
-
-    set oldtimeout $timeout
-    set timeout 600
-    verbose "Timeout is now $timeout seconds" 2
-
-    global gdb_file_cmd_debug_info
-    set gdb_file_cmd_debug_info "unset"
-
-    set result [gdb_load $executable]
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    if { $result != 0 } then {
-	return -1
-    }
-
-    if { $gdb_file_cmd_debug_info != "debug" } then {
-	untested "No debug information, skipping testcase."
-	return -1
-    }
-
-    # Set a breakpoint at main
-    gdb_test "break captured_command_loop" \
-            "Breakpoint.*at.* file.*, line.*" \
-            "breakpoint in captured_command_loop"
-
-    # run yourself
-    # It may take a very long time for the inferior gdb to start (lynx),
-    # so we bump it back up for the duration of this command.
-    set timeout 600
-
-    set description "run until breakpoint at captured_command_loop"
-    send_gdb "run -nw\n"
-    gdb_expect {
-        -re "Starting program.*Breakpoint \[0-9\]+,.*captured_command_loop .data.* at .*main.c:.*$gdb_prompt $" {
-            pass "$description"
-        }
-        -re "Starting program.*Breakpoint \[0-9\]+,.*captured_command_loop .data.*$gdb_prompt $" {
-            xfail "$description (line numbers scrambled?)"
-        }
-        -re "vfork: No more processes.*$gdb_prompt $" {
-            fail "$description (out of virtual memory)"
-            set timeout $oldtimeout
-            verbose "Timeout is now $timeout seconds" 2
-            return -1
-        }
-        -re ".*$gdb_prompt $" {
-            fail "$description"
-            set timeout $oldtimeout
-            verbose "Timeout is now $timeout seconds" 2
-            return -1
-        }
-        timeout {
-            fail "$description (timeout)"
-        }
-    }
-
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    return 0
-}
-
-proc test_initial_complaints { } {
-
-    global gdb_prompt
-
-    # Unsupress complaints
-    gdb_test "set stop_whining = 2"
-
-    # Prime the system
-    gdb_test "call complaint (&symfile_complaints, \"Register a complaint\")" \
-	    "During symbol reading, Register a complaint."
-
-    # Check that the complaint was inserted and where
-    gdb_test "print symfile_complaints->root->fmt" \
-	    ".\[0-9\]+ =.*\"Register a complaint\""
-
-    # Re-issue the first message #1
-    gdb_test "call complaint (&symfile_complaints, symfile_complaints->root->fmt)" \
-	    "During symbol reading, Register a complaint."
-
-    # Check that there is only one thing in the list
-    gdb_test "print symfile_complaints->root->next == &complaint_sentinel" \
-	    ".\[0-9\]+ = 1" "list has one entry"
-
-    # Add a second complaint, expect it
-    gdb_test "call complaint (&symfile_complaints, \"Testing! Testing! Testing!\")" \
-	    "During symbol reading, Testing. Testing. Testing.."
-
-    return 0
-}
-
-proc test_serial_complaints { } {
-
-    global gdb_prompt
-
-    gdb_test_exact "call clear_complaints (&symfile_complaints, 1, 0)" "" "serial start"
-
-    # Prime the system
-    send_gdb "call complaint (&symfile_complaints, \"serial line  1\")\n"
-    gdb_expect {
-	-re "During symbol reading...serial line  1...$gdb_prompt " {
-	    pass "serial line 1"
-	}
-	"$gdb_prompt" {
-	    fail "serial line  1"
-	}
-	timeout {
-	    fail "serial line  1 (timeout)"
-	}
-    }
-
-    # Add a second complaint, expect it
-    send_gdb "call complaint (&symfile_complaints, \"serial line 2\")\n"
-    gdb_expect {
-	-re "serial line 2...$gdb_prompt " {
-	    pass "serial line 2"
-	}
-	"$gdb_prompt" {
-	    fail "serial line 2"
-	}
-	timeout {
-	    fail "serial line 2 (timeout)"
-	}
-    }
-
-    send_gdb "call clear_complaints (&symfile_complaints, 1, 0)\n"
-    gdb_expect {
-	-re "\r\n\r\n$gdb_prompt " {
-	    pass "serial end"
-	}
-	"$gdb_prompt" {
-	    fail "serial end"
-	}
-	timeout {
-	    fail "serial end (timeout)"
-	}
-    }
-
-    return 0
-}
-
-# For short complaints, all are the same
-
-proc test_short_complaints { } {
-
-    global gdb_prompt
-
-    gdb_test_exact "call clear_complaints (&symfile_complaints, 1, 1)" "" "short start"
-
-    # Prime the system
-    send_gdb "call complaint (&symfile_complaints, \"short line 1\")\n"
-    gdb_expect {
-	-re "short line 1...$gdb_prompt " {
-	    pass "short line 1"
-	}
-	"$gdb_prompt" {
-	    fail "short line 1"
-	}
-	timeout {
-	    fail "short line 1 (timeout)"
-	}
-    }
-
-    # Add a second complaint, expect it
-    send_gdb "call complaint (&symfile_complaints, \"short line 2\")\n"
-    gdb_expect {
-	-re "short line 2...$gdb_prompt " {
-	    pass "short line 2"
-	}
-	"$gdb_prompt" {
-	    fail "short line 2"
-	}
-	timeout {
-	    fail "short line 2 (timeout)"
-	}
-    }
-
-    send_gdb "call clear_complaints (&symfile_complaints, 1, 0)\n"
-    gdb_expect {
-	-re "\r\n\r\n$gdb_prompt " {
-	    pass "short end"
-	}
-	"$gdb_prompt" {
-	    fail "short end"
-	}
-	timeout {
-	    fail "short end (timeout)"
-	}
-    }
-
-    return 0
-}
-
-# Check that nothing comes out when there haven't been any real
-# complaints.  Note that each test is really checking the previous
-# command.
-
-proc test_empty_complaint { cmd msg } {
-    global gdb_prompt
-    send_gdb $cmd
-    gdb_expect {
-	-re "\r\n\r\n$gdb_prompt " {
-	    fail $msg
-	}
-	"\r\n$gdb_prompt" {
-	    pass $msg
-	}
-	timeout {
-	    fail "$msg (timeout)"
-	}
-    }
-  
-}
-
-proc test_empty_complaints { } {
-
-    test_empty_complaint "call clear_complaints(&symfile_complaints,0,0)\n" \
-	    "empty non-verbose non-noisy clear"
-    test_empty_complaint "call clear_complaints(&symfile_complaints,1,0)\n" \
-	    "empty verbose non-noisy clear"
-    test_empty_complaint "call clear_complaints(&symfile_complaints,1,1)\n" \
-	    "empty verbose noisy clear"
-    test_empty_complaint "call clear_complaints(&symfile_complaints,0,1)\n" \
-	    "empty non-verbose noisy clear"
-
-    return 0
-}
-
-# Find a pathname to a file that we would execute if the shell was asked
-# to run $arg using the current PATH.
-
-proc find_gdb { arg } {
-
-    # If the arg directly specifies an existing executable file, then
-    # simply use it.
-
-    if [file executable $arg] then {
-	return $arg
-    }
-
-    set result [which $arg]
-    if [string match "/" [ string range $result 0 0 ]] then {
-	return $result
-    }
-
-    # If everything fails, just return the unqualified pathname as default
-    # and hope for best.
-
-    return $arg
-}
-
-# Run the test with self.
-# Copy the file executable file in case this OS doesn't like to edit its own
-# text space.
-
-set GDB_FULLPATH [find_gdb $GDB]
-
-# Remove any old copy lying around.
-remote_file host delete x$tool
-
-gdb_start
-
-set file [remote_download host $GDB_FULLPATH x$tool]
-
-set setup_result [setup_test $file ]
-if {$setup_result <0} then {
-    return -1
-}
-
-test_initial_complaints
-test_serial_complaints
-test_short_complaints
-test_empty_complaints
-
-gdb_exit;
-catch "remote_file host delete $file";
diff --git a/gdb/testsuite/gdb.gdb/observer.exp b/gdb/testsuite/gdb.gdb/observer.exp
deleted file mode 100644
index b6d43b57599..00000000000
--- a/gdb/testsuite/gdb.gdb/observer.exp
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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.  
-
-# This file was written by Joel Brobecker (brobecker@gnat.com), derived
-# from xfullpath.exp.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if [is_remote target] {
-    return
-}
-
-proc setup_test { executable } {
-    global gdb_prompt
-    global timeout
-
-    # load yourself into the debugger
-    # This can take a relatively long time, particularly for testing where
-    # the executable is being accessed over a network, or where gdb does not
-    # support partial symbols for a particular target and has to load the
-    # entire symbol table.  Set the timeout to 10 minutes, which should be
-    # adequate for most environments (it *has* timed out with 5 min on a
-    # SPARCstation SLC under moderate load, so this isn't unreasonable).
-    # After gdb is started, set the timeout to 30 seconds for the duration
-    # of this test, and then back to the original value.
-
-    set oldtimeout $timeout
-    set timeout 600
-    verbose "Timeout is now $timeout seconds" 2
-
-    global gdb_file_cmd_debug_info
-    set gdb_file_cmd_debug_info "unset"
-
-    set result [gdb_load $executable]
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    if { $result != 0 } then {
-	return -1
-    }
-
-    if { $gdb_file_cmd_debug_info != "debug" } then {
-	untested "No debug information, skipping testcase."
-	return -1
-    }
-
-    # Set a breakpoint at main
-    gdb_test "break captured_main" \
-            "Breakpoint.*at.* file.*, line.*" \
-            "breakpoint in captured_main"
-
-    # run yourself
-    # It may take a very long time for the inferior gdb to start (lynx),
-    # so we bump it back up for the duration of this command.
-    set timeout 600
-
-    set description "run until breakpoint at captured_main"
-    gdb_test_multiple "run -nw" "$description" {
-        -re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.* at .*main.c:.*$gdb_prompt $" {
-            pass "$description"
-        }
-        -re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.*$gdb_prompt $" {
-            xfail "$description (line numbers scrambled?)"
-        }
-        -re "vfork: No more processes.*$gdb_prompt $" {
-            fail "$description (out of virtual memory)"
-            set timeout $oldtimeout
-            verbose "Timeout is now $timeout seconds" 2
-            return -1
-        }
-        -re ".*$gdb_prompt $" {
-            fail "$description"
-            set timeout $oldtimeout
-            verbose "Timeout is now $timeout seconds" 2
-            return -1
-        }
-    }
-
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    return 0
-}
-
-proc attach_first_observer { message } {
-    gdb_test "set \$first_obs = observer_attach_normal_stop (&observer_test_first_notification_function)" \
-	"" "$message; attach first observer"
-}
-
-proc attach_second_observer { message } {
-    gdb_test "set \$second_obs = observer_attach_normal_stop (&observer_test_second_notification_function)" \
-	"" "$message; attach second observer"
-}
-
-proc attach_third_observer { message } {
-    gdb_test "set \$third_obs = observer_attach_normal_stop (&observer_test_third_notification_function)" \
-	"" "$message; attach third observer"
-}
-
-proc detach_first_observer { message } {
-    gdb_test "call observer_detach_normal_stop (\$first_obs)" \
-	"" "$message; detach first observer"
-}
-
-proc detach_second_observer { message } {
-    gdb_test "call observer_detach_normal_stop (\$second_obs)" \
-	"" "$message; detach second observer"
-}
-
-proc detach_third_observer { message } {
-    gdb_test "call observer_detach_normal_stop (\$third_obs)" \
-	"" "$message; detach third observer"
-}
-
-proc check_counters { first second third message } {
-    gdb_test "print observer_test_first_observer" \
-	".\[0-9\]+ =.*$first" \
-	"$message; check first observer counter value"
-    gdb_test "print observer_test_second_observer" \
-	".\[0-9\]+ =.*$second" \
-	"$message; check second observer counter value"
-    gdb_test "print observer_test_third_observer" \
-	".\[0-9\]+ =.*$third" \
-	"$message; check third observer counter value"
-}
-
-proc reset_counters { message } {
-    gdb_test "set variable observer_test_first_observer = 0" "" \
-	"$message; reset first observer counter"
-    gdb_test "set variable observer_test_second_observer = 0" "" \
-	"$message; reset second observer counter"
-    gdb_test "set variable observer_test_third_observer = 0" "" \
-	"$message; reset third observer counter"
-}
-
-proc test_normal_stop_notifications { first second third message args } {
-    # Do any initialization
-    for {set i 0} {$i < [llength $args]} {incr i} {
-	[lindex $args $i] $message
-    }
-    reset_counters $message
-    # Call observer_notify_normal_stop.  Note that this procedure
-    # takes one argument, but this argument is ignored by the observer
-    # callbacks we have installed.  So we just pass an arbitrary value.
-    gdb_test "call observer_notify_normal_stop (0)" "" \
-	"$message; sending notification"
-    check_counters $first $second $third $message
-}
-
-proc test_observer_normal_stop { executable } {
-
-    set setup_result [setup_test $executable]
-    if {$setup_result <0} then {
-        return -1
-    }
-
-    # First, try sending a notification without any observer attached.
-    test_normal_stop_notifications 0 0 0 "no observer attached"
-
-    # Now, attach one observer, and send a notification.
-    test_normal_stop_notifications 0 1 0 "second observer attached" \
-	attach_second_observer
-
-    # Remove the observer, and send a notification.
-    test_normal_stop_notifications 0 0 0 "second observer detached" \
-	detach_second_observer
-
-    # With a new observer.
-    test_normal_stop_notifications 1 0 0 "1st observer added" \
-	attach_first_observer
-
-    # With 2 observers.
-    test_normal_stop_notifications 1 1 0 "2nd observer added" \
-	attach_second_observer
-
-    # With 3 observers.
-    test_normal_stop_notifications 1 1 1 "3rd observer added" \
-	attach_third_observer
-
-    # Remove middle observer.
-    test_normal_stop_notifications 1 0 1 "2nd observer removed" \
-	detach_second_observer
-
-    # Remove first observer.
-    test_normal_stop_notifications 0 0 1 "1st observer removed" \
-	detach_first_observer
-
-    # Remove last observer.
-    test_normal_stop_notifications 0 0 0 "3rd observer removed" \
-	detach_third_observer
-
-    # Go back to 3 observers, and remove them in a different order...
-    test_normal_stop_notifications 1 1 1 "three observers added" \
-	attach_first_observer \
-	attach_second_observer \
-	attach_third_observer 
-
-    # Remove the third observer.
-    test_normal_stop_notifications 1 1 0 "third observer removed" \
-	detach_third_observer
-
-    # Remove the second observer.
-    test_normal_stop_notifications 1 0 0 "second observer removed" \
-	detach_second_observer
-
-    # Remove the first observer, no more observers.
-    test_normal_stop_notifications 0 0 0 "first observer removed" \
-	detach_first_observer
-
-    return 0
-}
-
-# Find a pathname to a file that we would execute if the shell was asked
-# to run $arg using the current PATH.
-
-proc find_gdb { arg } {
-
-    # If the arg directly specifies an existing executable file, then
-    # simply use it.
-
-    if [file executable $arg] then {
-	return $arg
-    }
-
-    set result [which $arg]
-    if [string match "/" [ string range $result 0 0 ]] then {
-	return $result
-    }
-
-    # If everything fails, just return the unqualified pathname as default
-    # and hope for best.
-
-    return $arg
-}
-
-# Run the test with self.
-# Copy the file executable file in case this OS doesn't like to edit its own
-# text space.
-
-set GDB_FULLPATH [find_gdb $GDB]
-
-# Remove any old copy lying around.
-remote_file host delete x$tool
-
-gdb_start
-set file [remote_download host $GDB_FULLPATH x$tool]
-set result [test_observer_normal_stop $file];
-gdb_exit;
-catch "remote_file host delete $file";
-
-if {$result <0} then {
-    warning "Couldn't test self"
-    return -1
-}
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
deleted file mode 100644
index e7d46bdc331..00000000000
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ /dev/null
@@ -1,523 +0,0 @@
-# Copyright 1988, 1990, 1991, 1992, 1994, 1997, 1999, 2000, 2002,
-# 2003, 2004 Free Software Foundation, 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.  
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if [is_remote target] {
-    return
-}
-
-# Not all of the lines of code near the start of main are executed for
-# every machine.  Also, optimization may reorder some of the lines.
-# So all we do is try to step or next over everything until we get
-# to a line that we know is always executed.
-
-proc do_steps_and_nexts {} {
-    global gdb_prompt
-    global srcdir
- 
-    gdb_reinitialize_dir $srcdir/..
-
-    for {set count 0} {$count < 32} {incr count} {
-	send_gdb "list\n"
-	# NOTE: carlton/2002-12-11: The "initial brace" and
-	# "current_directory initialization" possibilities happen to
-	# me with GCC 3.1 on i686-pc-linux-gnu when I compile with
-	# optimization.
-	gdb_expect {
-	    -re ".*context = data.*$gdb_prompt $" {
-		set description "step over context initialization"
-		set command "step"
-	    }
-	    -re ".*argc = context->argc.*$gdb_prompt $" {
-		set description "step over argc initialization"
-		set command "step"
-	    }
-	    -re ".*argv = context->argv.*$gdb_prompt $" {
-		set description "step over argv initialization"
-		set command "step"
-	    }
-	    -re ".*quiet = 0.*$gdb_prompt $" {
-		set description "step over quiet initialization"
-		set command "step"
-	    }
-	    -re ".*batch = 0.*$gdb_prompt $" {
-		set description "step over batch initialization"
-		set command "step"
-	    }
-	    -re ".*symarg = NULL.*$gdb_prompt $" {
-		set description "step over symarg initialization"
-		set command "step"
-	    }
-	    -re ".*execarg = NULL.*$gdb_prompt $" {
-		set description "step over execarg initialization"
-		set command "step"
-	    }
-	    -re ".*corearg = NULL.*$gdb_prompt $" {
-		set description "step over corearg initialization"
-		set command "step"
-	    }
-	    -re ".*cdarg = NULL.*$gdb_prompt $" {
-		set description "step over cdarg initialization"
-		set command "step"
-	    }
-	    -re ".*ttyarg = NULL.*$gdb_prompt $" {
-		set description "step over ttyarg initialization"
-		set command "step"
-	    }
-	    -re ".*time_at_startup = get_run_time.*$gdb_prompt $" {
-		set description "next over get_run_time and everything it calls"
-		set command "next"
-	    }
-	    -re ".*START_PROGRESS.*$gdb_prompt $" {
-		# Note: ezannoni/2004/02/17: This check should be
-		# removed, since as of today that source line is not
-		# in gdb anymore.
-		set description "next over START_PROGRESS and everything it calls"
-		set command "next"
-	    }
-	    -re ".*mac_init.*$gdb_prompt $" {
-		set description "next over mac_init and everything it calls"
-		set command "next"
-	    }
-	    -re ".*init_malloc.*$gdb_prompt $" {
-		# gdb 6.2.X is the last gdb which called init_malloc
-		set description "next over init_malloc and everything it calls"
-		set command "next"
-	    }
-	    -re ".*lim_at_start.*$gdb_prompt $" {
-		set description "next over lim_at_start initialization"
-		set command "next"
-	    }
-	    -re ".*count . 0x3.*$gdb_prompt $" {
-		set description "next over conditional stack alignment code 1"
-		set command "next"
-	    }
-	    -re ".*if .i != 0.*$gdb_prompt $" {
-		set description "next over conditional stack alignment code 2"
-		set command "next"
-	    }
-	    -re ".*alloca .i - 4.*$gdb_prompt $" {
-		set description "next over conditional stack alignment alloca"
-		set command "next"
-	    }
-	    -re ".*cmdsize = 1.*$gdb_prompt $" {
-		set description "step over cmdsize initialization"
-		set command "next"
-	    }
-	    -re ".*cmdarg = .* xmalloc.*$gdb_prompt $" {
-		set description "next over cmdarg initialization via xmalloc"
-		set command "next"
-	    }
-	    -re ".*ncmd = 0.*$gdb_prompt $" {
-		set description "next over ncmd initialization"
-		set command "next"
-	    }
-	    -re ".*dirsize = 1.*$gdb_prompt $" {
-		set description "next over dirsize initialization"
-		set command "next"
-	    }
-	    -re ".*dirarg = .* xmalloc.*$gdb_prompt $" {
-		return
-	    }
-	    -re ".*setlocale .LC_MESSAGES,.*$gdb_prompt $" {
-		set description "next over setlocale LC_MESSAGES"
-		set command "next"
-	    }
-	    -re ".*setlocale .LC_CTYPE,.*$gdb_prompt $" {
-		set description "next over setlocale LC_CTYPE"
-		set command "next"
-	    }
-	    -re ".*bindtextdomain .PACKAGE, LOCALEDIR.;.*$gdb_prompt $" {
-		set description "next over bindtextdomain"
-		set command "next"
-	    }
-	    -re ".*textdomain .PACKAGE.;.*$gdb_prompt $" {
-		set description "next over textdomain PACKAGE"
-		set command "next"
-	    }
-	    -re "\[0-9\]*\t\{\r\n$gdb_prompt $" {
-		set description "step over initial brace"
-		set command "step"
-	    }
-	    -re ".*current_directory = gdb_dirbuf.*$gdb_prompt $" {
-		set description "step over current_directory initialization"
-		set command "step"
-	    }
-	    -re ".*gdb_sysroot = .*$gdb_prompt $" {
-		# NOTE: carlton/2003-01-15: More optimization reordering,
-		# observed on GCC 3.1.
-		set description "step over gdb_sysroot initialization"
-		set command "step"
-	    }
-	    -re ".*ndir = 0.*$gdb_prompt $" {
-		set description "step over ndir initialization"
-		set command "step"
-	    }
-	    -re ".*instream = stdin.*$gdb_prompt $" {
-		set description "step over instream initialization"
-		set command "step"
-	    }
-	    -re ".*getcwd .gdb_dirbuf, sizeof .gdb_dirbuf..;.*$gdb_prompt $" {
-		set description "next over getcwd"
-		set command "next"
-	    }
-	    -re "\[ \t\]+\{\r\n$gdb_prompt $" {
-		setup_xfail "mips-*-irix5*"
-		fail "$description ended up at odd location"
-	    }
-	    -re ".*main.c.*No such file or directory.*$gdb_prompt $" {
-		setup_xfail "rs6000-*-aix3*"
-		fail "must be able to list source lines"
-		return
-	    }
-	    -re ".*$gdb_prompt $" {
-		fail "unknown source line after $description"
-		return
-	    }
-	    default {
-		fail "unknown source line near main"
-		return
-	    }
-	}
-	send_gdb "$command\n"
-	gdb_expect {
-	    -re ".*No such file or directory.\r\n$gdb_prompt $" {
-		fail "$description (no source available)"
-	    }
-	    -re ".*A file or directory .* does not exist..\r\n$gdb_prompt $" {
-		fail "$description (no source available)"
-	    }
-	    -re ".*$gdb_prompt $" {
-		pass "$description"
-	    }
-	    timeout {
-		fail "$description (timeout)"
-	    }
-	}
-    }
-}
-
-proc test_with_self { executable } {
-    global gdb_prompt
-    global tool
-    global det_file
-    global decimal
-    global timeout
-
-    # load yourself into the debugger
-    # This can take a relatively long time, particularly for testing where
-    # the executable is being accessed over a network, or where gdb does not
-    # support partial symbols for a particular target and has to load the
-    # entire symbol table.  Set the timeout to 10 minutes, which should be
-    # adequate for most environments (it *has* timed out with 5 min on a
-    # SPARCstation SLC under moderate load, so this isn't unreasonable).
-    # After gdb is started, set the timeout to 30 seconds for the duration
-    # of this test, and then back to the original value.
-
-    set oldtimeout $timeout
-    set timeout 600
-    verbose "Timeout is now $timeout seconds" 2
-
-    global gdb_file_cmd_debug_info
-    set gdb_file_cmd_debug_info "unset"
-
-    set result [gdb_load $executable]
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    if { $result != 0 } then {
-	return -1
-    }
-
-    if { $gdb_file_cmd_debug_info != "debug" } then {
-	untested "No debug information, skipping testcase."
-	return -1
-    }
-
-    # disassemble yourself
-    gdb_test "x/10i main" \
-	    "x/10i.*main.*main.$decimal.*main.$decimal.*" \
-	    "Disassemble main"
-
-    # Set a breakpoint at main
-    gdb_test "break captured_main" \
-	    "Breakpoint.*at.* file.*, line.*" \
-	    "breakpoint in captured_main"
-
-    # We'll need this when we send a ^C to GDB.  Need to do it before we
-    # run the program and gdb starts saving and restoring tty states.
-    # On Ultrix, we don't need it and it is really slow (because shell_escape
-    # doesn't use vfork).
-    if ![istarget "*-*-ultrix*"] then {
-	gdb_test "shell stty intr '^C'" "" \
-	    "set interrupt character in test_with_self"
-    }
-
-    # FIXME: If we put this after the run to main, the first list
-    # command doesn't print the same line as the current line where
-    # gdb is stopped.
-    gdb_test "set listsize 1" "" "set listsize to 1"
-
-    # run yourself
-    # It may take a very long time for the inferior gdb to start (lynx),
-    # so we bump it back up for the duration of this command.
-    set timeout 600
-
-    set description "run until breakpoint at captured_main"
-    send_gdb "run -nw\n"
-    gdb_expect {
-	-re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.* at .*main.c:.*$gdb_prompt $" {
-	    pass "$description"
-	}
-	-re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.*$gdb_prompt $" {
-	    xfail "$description (line numbers scrambled?)"
-	}
-	-re "vfork: No more processes.*$gdb_prompt $" {
-	    fail "$description (out of virtual memory)"
-	    set timeout $oldtimeout
-	    verbose "Timeout is now $timeout seconds" 2
-	    return -1
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$description"
-	    set timeout $oldtimeout
-	    verbose "Timeout is now $timeout seconds" 2
-	    return -1
-	}
-	timeout {
-	    fail "$description (timeout)"
-	}
-    }
-
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    # do we have a version number ?
-    send_gdb "print version\n"
-    gdb_expect {
-	-re ".\[0-9\]+ = .\[0-9.\]+.*$gdb_prompt $" {
-	    pass "printed version as string"
-	}
-	-re ".\[0-9\]+ = +0x.*\[0-9.\]+.*$gdb_prompt $" {
-	    pass "printed version as pointer"
-	}
-	-re ".\[0-9\]+ = +.+ +0x.*\[0-9.\]+.*$gdb_prompt $" {
-	    pass "printed version with cast"
-	}
-	-re ".*$gdb_prompt $"	{ fail "printed version" }
-	timeout		{ fail "(timeout) printed version" }
-    }
-
-    do_steps_and_nexts
-
-    gdb_test "print \"foo\"" ".\[0-9\]+ = \"foo\"" "print a string"
-
-    # do_steps_and_nexts left us ready to execute an xmalloc call,
-    # so give that a try.
-    # If we don't actually enter the xmalloc call when we give a
-    # step command that seems like a genuine bug.  It seems to happen
-    # on most RISC processors.
-    # NOTE drow/2003-06-22: However, if we step back to the preceding two
-    # lines, just keep stepping until we enter.
-    set stepped_back 0
-    setup_xfail "alpha-*-*" "mips-*-*"
-    set description "step into xmalloc call"
-    send_gdb "step\n"
-    gdb_expect {
-	-re "ncmd = 0;.*$gdb_prompt $" {
-	    set stepped_back 1
-	    send_gdb "step\n"
-	    exp_continue
-	}
-        -re ".*cmdarg = .* xmalloc.*$gdb_prompt $" {
-	    set stepped_back 1
-	    send_gdb "step\n"
-	    exp_continue
-        }
-	-re "dirsize = 1;.*$gdb_prompt $" {
-	    set stepped_back 1
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	-re ".*dirarg = .* xmalloc.*$gdb_prompt $" {
-	    if { $stepped_back == 1 } {
-		send_gdb "step\n"
-		exp_continue
-	    } else {
-		fail "$description"
-	    }
-	}
-	-re "xmalloc.*size=.*at.*utils.c.*$gdb_prompt $" {
-	    pass "$description"
-	}
-	-re ".*No such file or directory.\r\n$gdb_prompt $" {
-	    pass "$description (no source available)"
-	}
-	-re "A file or directory .* does not exist..\r\n$gdb_prompt $" {
-	    pass "$description (no source available)"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$description"
-	}
-	timeout {
-	    fail "$description (timeout)"
-	}
-    }
-
-    # start the "xgdb" process
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "GNU gdb \[0-9\.\]*.*
-Copyright \[0-9\]* Free Software Foundation, Inc.*
-GDB is free software, covered by the GNU General Public License, and you are.*
-welcome to change it and/or distribute copies of it under certain conditions.*
-Type \"show copying\" to see the conditions.*
-There is absolutely no warranty for GDB.  Type \"show warranty\" for details.*
-This GDB was configured as .*$gdb_prompt $"\
-	    { pass "xgdb is at prompt" }
-	-re "GDB is free software and you are welcome to distribute copies of it.*
- under certain conditions; type \"show copying\" to see the conditions..*
-There is absolutely no warranty for GDB; type \"show warranty\" for details..*
-GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $"\
-	    { pass "xgdb is at prompt (obsolescent gdb)" }
-	-re ".*$gdb_prompt $"       { fail "xgdb is at prompt" }
-	timeout	            { fail "(timeout) xgdb is at prompt" }
-    }
-    
-    # set xgdb prompt so we can tell which is which
-    send_gdb "set prompt (xgdb) \n"
-    gdb_expect {
-	-re "\[(\]xgdb\[)\].*\[(\]xgdb\[)\] $"	{ pass "Set xgdb prompt" }
-	-re ".*$gdb_prompt $"		{ fail "Set xgdb prompt" }
-	default				{ fail "(timeout) Set xgdb prompt" }
-    }
-    
-    # kill the xgdb process
-    set description "send ^C to child process"
-    send_gdb "\003"
-    gdb_expect {
-	-re "Program received signal SIGINT.*$gdb_prompt $" {
-	    pass "$description"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$description"
-	}
-	timeout {
-	    fail "$description (timeout)"
-	}
-    }
-    
-    set description "send SIGINT signal to child process"
-    send_gdb "signal SIGINT\n"
-    gdb_expect {
-	-re "Continuing with signal SIGINT.*$gdb_prompt $" {
-	    pass "$description"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$description"
-	}
-	timeout {
-	    fail "$description (timeout)"
-	}
-    }
-    
-    # get a stack trace
-    #
-    # This fails on some linux systems for unknown reasons.  On the
-    # systems where it fails, sometimes it works fine when run manually.
-    # The testsuite failures may not be limited to just aout systems.
-    setup_xfail "i*86-pc-linuxaout-gnu"
-    set description "backtrace through signal handler"
-    send_gdb "backtrace\n"
-    gdb_expect {
-	-re "#0.*(read|poll).*in main \\(.*\\) at .*gdb\\.c.*$gdb_prompt $" {
-	    pass "$description"
-	}
-	-re ".*$gdb_prompt $" {
-	    # On the alpha, we hit the infamous problem about gdb
-	    # being unable to get the frame pointer (mentioned in
-	    # gdb/README).  As it is intermittent, there is no way to
-	    # XFAIL it which will give us an XPASS if the problem goes
-	    # away.
-	    setup_xfail "alpha*-*-osf*"
-	    fail "$description"
-	}
-	timeout {
-	    fail "$description (timeout)"
-	}
-    }
-
-
-    # Set the timeout back to the value it had when we were called.
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    # Restart gdb in case next test expects it to be started already.
-    return 0
-}
-
-# Find a pathname to a file that we would execute if the shell was asked
-# to run $arg using the current PATH.
-
-proc find_gdb { arg } {
-
-    # If the arg directly specifies an existing executable file, then
-    # simply use it.
-
-    if [file executable $arg] then {
-	return $arg
-    }
-
-    set result [which $arg]
-    if [string match "/" [ string range $result 0 0 ]] then {
-	return $result
-    }
-
-    # If everything fails, just return the unqualified pathname as default
-    # and hope for best.
-
-    return $arg
-}
-
-# Run the test with self.
-# Copy the file executable file in case this OS doesn't like to edit its own
-# text space.
-
-set GDB_FULLPATH [find_gdb $GDB]
-
-# Remove any old copy lying around.
-remote_file host delete x$tool
-
-gdb_start
-set file [remote_download host $GDB_FULLPATH x$tool]
-set result [test_with_self $file];
-gdb_exit;
-catch "remote_file host delete $file";
-
-if {$result <0} then {
-    warning "Couldn't test self"
-    return -1
-}
diff --git a/gdb/testsuite/gdb.gdb/xfullpath.exp b/gdb/testsuite/gdb.gdb/xfullpath.exp
deleted file mode 100644
index 570b311295f..00000000000
--- a/gdb/testsuite/gdb.gdb/xfullpath.exp
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# This file was written by Joel Brobecker. (brobecker@gnat.com), derived
-# from selftest.exp, written by Rob Savoye.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if [is_remote target] {
-    return
-}
-
-proc setup_test { executable } {
-    global gdb_prompt
-    global timeout
-
-    # load yourself into the debugger
-    # This can take a relatively long time, particularly for testing where
-    # the executable is being accessed over a network, or where gdb does not
-    # support partial symbols for a particular target and has to load the
-    # entire symbol table.  Set the timeout to 10 minutes, which should be
-    # adequate for most environments (it *has* timed out with 5 min on a
-    # SPARCstation SLC under moderate load, so this isn't unreasonable).
-    # After gdb is started, set the timeout to 30 seconds for the duration
-    # of this test, and then back to the original value.
-
-    set oldtimeout $timeout
-    set timeout 600
-    verbose "Timeout is now $timeout seconds" 2
-
-    global gdb_file_cmd_debug_info
-    set gdb_file_cmd_debug_info "unset"
-
-    set result [gdb_load $executable]
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    if { $result != 0 } then {
-	return -1
-    }
-
-    if { $gdb_file_cmd_debug_info != "debug" } then {
-	untested "No debug information, skipping testcase."
-	return -1
-    }
-
-    # Set a breakpoint at main
-    gdb_test "break captured_main" \
-            "Breakpoint.*at.* file.*, line.*" \
-            "breakpoint in captured_main"
-
-    # run yourself
-    # It may take a very long time for the inferior gdb to start (lynx),
-    # so we bump it back up for the duration of this command.
-    set timeout 600
-
-    set description "run until breakpoint at captured_main"
-    send_gdb "run -nw\n"
-    gdb_expect {
-        -re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.* at .*main.c:.*$gdb_prompt $" {
-            pass "$description"
-        }
-        -re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.*$gdb_prompt $" {
-            xfail "$description (line numbers scrambled?)"
-        }
-        -re "vfork: No more processes.*$gdb_prompt $" {
-            fail "$description (out of virtual memory)"
-            set timeout $oldtimeout
-            verbose "Timeout is now $timeout seconds" 2
-            return -1
-        }
-        -re ".*$gdb_prompt $" {
-            fail "$description"
-            set timeout $oldtimeout
-            verbose "Timeout is now $timeout seconds" 2
-            return -1
-        }
-        timeout {
-            fail "$description (timeout)"
-        }
-    }
-
-    set timeout $oldtimeout
-    verbose "Timeout is now $timeout seconds" 2
-
-    return 0
-}
-
-proc test_with_self { executable } {
-
-    set setup_result [setup_test $executable]
-    if {$setup_result <0} then {
-        return -1
-    }
-
-    # A file which contains a directory prefix
-    gdb_test "print xfullpath (\"./xfullpath.exp\")" \
-             ".\[0-9\]+ =.*\".*/xfullpath.exp\"" \
-             "A filename with ./ as the directory prefix"
-
-    # A file which contains a directory prefix
-    gdb_test "print xfullpath (\"../../defs.h\")" \
-             ".\[0-9\]+ =.*\".*/defs.h\"" \
-             "A filename with ../ in the directory prefix"
-
-    # A one-character filename
-    gdb_test "print xfullpath (\"./a\")" \
-             ".\[0-9\]+ =.*\".*/a\"" \
-             "A one-char filename in the current directory"
-          
-    # A file in the root directory
-    gdb_test "print xfullpath (\"/root_file_which_should_exist\")" \
-             ".\[0-9\]+ =.*\"/root_file_which_should_exist\"" \
-             "A filename in the root directory"
-          
-    # A file which does not have a directory prefix
-    gdb_test "print xfullpath (\"xfullpath.exp\")" \
-             ".\[0-9\]+ =.*\"xfullpath.exp\"" \
-             "A filename without any directory prefix"
-
-    # A one-char filename without any directory prefix
-    gdb_test "print xfullpath (\"a\")" \
-             ".\[0-9\]+ =.*\"a\"" \
-             "A one-char filename without any directory prefix"
-
-    # An empty filename
-    gdb_test "print xfullpath (\"\")" \
-             ".\[0-9\]+ =.*\"\"" \
-             "An empty filename"
-
-    return 0
-}
-
-# Find a pathname to a file that we would execute if the shell was asked
-# to run $arg using the current PATH.
-
-proc find_gdb { arg } {
-
-    # If the arg directly specifies an existing executable file, then
-    # simply use it.
-
-    if [file executable $arg] then {
-	return $arg
-    }
-
-    set result [which $arg]
-    if [string match "/" [ string range $result 0 0 ]] then {
-	return $result
-    }
-
-    # If everything fails, just return the unqualified pathname as default
-    # and hope for best.
-
-    return $arg
-}
-
-# Run the test with self.
-# Copy the file executable file in case this OS doesn't like to edit its own
-# text space.
-
-set GDB_FULLPATH [find_gdb $GDB]
-
-# Remove any old copy lying around.
-remote_file host delete x$tool
-
-gdb_start
-set file [remote_download host $GDB_FULLPATH x$tool]
-set result [test_with_self $file];
-gdb_exit;
-catch "remote_file host delete $file";
-
-if {$result <0} then {
-    warning "Couldn't test self"
-    return -1
-}
diff --git a/gdb/testsuite/gdb.gdbtk/ChangeLog b/gdb/testsuite/gdb.gdbtk/ChangeLog
deleted file mode 100644
index 38a76ef64e1..00000000000
--- a/gdb/testsuite/gdb.gdbtk/ChangeLog
+++ /dev/null
@@ -1,329 +0,0 @@
-2005-01-27  Keith Seitz  <keiths@redhat.com>
-
-	* configure.in: Rename to ...
-	* configure.ac: ... this.
-	* configure: Regnerate.
-
-2004-07-19  Martin Hunt  <hunt@redhat.com>
-
-	* All: Updated load_lib calls to find new location
-	of insight-support.exp.
-
-2004-07-16  Andrew Cagney  <cagney@redhat.com>
-
-	* insight-support.exp: Moved to here from ../lib.
-
-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 475bdb506a1..00000000000
--- a/gdb/testsuite/gdb.gdbtk/browser.exp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1998, 1999, 2001, 2004 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 ../gdb.gdbtk/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 0fcd652e2be..00000000000
--- a/gdb/testsuite/gdb.gdbtk/c_variable.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999, 2001, 2004 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 ../gdb.gdbtk/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 16dc537ba46..00000000000
--- a/gdb/testsuite/gdb.gdbtk/configure
+++ /dev/null
@@ -1,2248 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="defs"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/gdb/testsuite/gdb.gdbtk/configure.ac b/gdb/testsuite/gdb.gdbtk/configure.ac
deleted file mode 100644
index 5ab12edbf15..00000000000
--- a/gdb/testsuite/gdb.gdbtk/configure.ac
+++ /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 b17eaa11ee7..00000000000
--- a/gdb/testsuite/gdb.gdbtk/console.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1998, 1999, 2001, 2004 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 ../gdb.gdbtk/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 a7764f67199..00000000000
--- a/gdb/testsuite/gdb.gdbtk/cpp_variable.exp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999, 2001, 2004 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 ../gdb.gdbtk/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/insight-support.exp b/gdb/testsuite/gdb.gdbtk/insight-support.exp
deleted file mode 100644
index e1e88896a1d..00000000000
--- a/gdb/testsuite/gdb.gdbtk/insight-support.exp
+++ /dev/null
@@ -1,319 +0,0 @@
-# GDB Testsuite Support for Insight.
-#
-# Copyright 2001, 2004 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.
-
-# Initializes the display for gdbtk testing.
-# Returns 1 if tests should run, 0 otherwise.
-proc gdbtk_initialize_display {} {
-  global _using_windows
-
-  # This is hacky, but, we don't have much choice. When running
-  # expect under Windows, tcl_platform(platform) is "unix".
-  if {![info exists _using_windows]} {
-    set _using_windows [expr {![catch {exec cygpath --help}]}]
-  }
-
-  if {![_gdbtk_xvfb_init]} {
-    if {$_using_windows} {
-      untested "No GDB_DISPLAY -- skipping tests"
-    } else {
-      untested "No GDB_DISPLAY or Xvfb -- skipping tests"
-    }
-
-    return 0
-  }
-
-  return 1
-}
-
-# From dejagnu:
-# srcdir = testsuite src dir (e.g., devo/gdb/testsuite)
-# objdir = testsuite obj dir (e.g., gdb/testsuite)
-# subdir = subdir of testsuite (e.g., gdb.gdbtk)
-#
-# To gdbtk:
-# env(DEFS)=the "defs" files (e.g., devo/gdb/testsuite/gdb.gdbtk/defs)
-# env(SRCDIR)=directory containing the test code (e.g., *.test)
-# env(OBJDIR)=directory which contains any executables
-#            (e.g., gdb/testsuite/gdb.gdbtk)
-proc gdbtk_start {test} {
-  global verbose
-  global GDB
-  global GDBFLAGS
-  global env srcdir subdir objdir
-
-  gdb_stop_suppressing_tests;
-
-  # Need to convert ::GDB to use (-)?insight...
-  if {[regsub {gdb$} $GDB insight newGDB]} {
-    set INSIGHT $newGDB
-  } else {
-    perror "Cannot find Insight executable"
-    exit 1
-  }
-
-  verbose "Starting $INSIGHT -nx -q --tclcommand=$test"
-
-  set real_test [which $test]
-  if {$real_test == 0} {
-    perror "$test is not found"
-    exit 1
-  }
-
-  if {![is_remote host]} {
-    if { [which $INSIGHT] == 0 } {
-      perror "$INSIGHT does not exist."
-      exit 1
-    }
-  }
-
-  set wd [pwd]
-
-  # Find absolute path to test
-  set test [to_tcl_path -abs $test]
-
-  # Set some environment variables
-  cd $srcdir
-  set abs_srcdir [pwd]
-  set env(DEFS) [to_tcl_path -abs [file join $abs_srcdir $subdir defs]]
-
-  cd $wd
-  cd [file join $objdir $subdir]
-  set env(OBJDIR) [pwd]
-  cd $wd
-
-  # Set info about target into env
-  _gdbtk_export_target_info
-
-  set env(SRCDIR) $abs_srcdir
-  set env(GDBTK_VERBOSE) 1
-  set env(GDBTK_LOGFILE) [to_tcl_path [file join $objdir gdb.log]]
-  unset -nocomplain env(TCL_LIBRARY)
-
-  set err [catch {exec $INSIGHT -nx -q --tclcommand=$test} res]
-  if { $err } {
-    perror "Execing $INSIGHT failed: $res"
-    append res "\nERROR gdb-crash"
-  }
-  return $res
-}
-
-# Start xvfb when using it.
-# The precedence is:
-#   1. If GDB_DISPLAY is set (and not ""), use it
-#   2. If Xvfb exists, use it (not on cygwin)
-#   3. Skip tests
-proc _gdbtk_xvfb_init {} {
-  global env spawn_id _xvfb_spawn_id _using_windows
-
-  if {[info exists env(GDB_DISPLAY)]} {
-    if {$env(GDB_DISPLAY) != ""} {
-      set env(DISPLAY) $env(GDB_DISPLAY)
-    } else {
-      # Suppress tests
-      return 0
-    }
-  } elseif {!$_using_windows && [which Xvfb] != 0} {
-    set screen ":[getpid]"
-    set pid [spawn  Xvfb $screen -ac]
-    set _xvfb_spawn_id $spawn_id
-    set env(DISPLAY) localhost$screen
-  } else {
-    # No Xvfb found -- skip test
-    return 0
-  }
-
-  return 1
-}
-
-# Kill xvfb
-proc _gdbtk_xvfb_exit {} {
-  global objdir subdir env _xvfb_spawn_id
-
-  if {[info exists _xvfb_spawn_id]} {
-    exec kill [exp_pid -i $_xvfb_spawn_id]
-    wait -i $_xvfb_spawn_id
-  }
-}
-
-# help proc for setting tcl-style paths from unix-style paths
-# pass "-abs" to make it an absolute path
-proc to_tcl_path {unix_path {arg {}}} {
-  global _using_windows
-
-  if {[string compare $unix_path "-abs"] == 0} {
-    set unix_path $arg
-    set wd [pwd]
-    cd [file dirname $unix_path]
-    set dirname [pwd]
-    set unix_name [file join $dirname [file tail $unix_path]]
-    cd $wd
-  }
-
-  if {$_using_windows} {
-    set unix_path [exec cygpath -aw $unix_path]
-    set unix_path [join [split $unix_path \\] /]
-  }
-
-  return $unix_path
-}
-  
-# Set information about the target into the environment
-# variable TARGET_INFO. This array will contain a list
-# of commands that are necessary to run a target.
-#
-# This is mostly devined from how dejagnu works, what
-# procs are defined, and analyzing unix.exp, monitor.exp,
-# and sim.exp.
-#
-# Array elements exported:
-# Index   Meaning
-# -----   -------
-# init    list of target/board initialization commands
-# target  target command for target/board
-# load    load command for target/board
-# run     run command for target_board
-proc _gdbtk_export_target_info {} {
-  global env
-
-  # Figure out what "target class" the testsuite is using,
-  # i.e., sim, monitor, native
-  if {[string compare [info proc gdb_target_monitor] gdb_target_monitor] == 0} {
-    # Using a monitor/remote target
-    set target monitor
-  } elseif {[string compare [info proc gdb_target_sim] gdb_target_sim] == 0} {
-    # Using a simulator target
-    set target simulator
-  } elseif {[string compare [info proc gdb_target_sid] gdb_target_sid] == 0} {
-    # Using sid
-    set target sid
-  } else {
-    # Assume native
-    set target native
-  }
-
-  # Now setup the array to be exported.
-  set info(init) {}
-  set info(target) {}
-  set info(load) {}
-  set info(run) {}
-
-  switch $target {
-    simulator {
-      set opts "[target_info gdb,target_sim_options]"
-      set info(target) "target sim $opts"
-      set info(load) "load"
-      set info(run) "run"
-    }
-
-    monitor {
-      # Setup options for the connection
-      if {[target_info exists baud]} {
-	lappend info(init) "set remotebaud [target_info baud]"
-      }
-      if {[target_info exists binarydownload]} {
-	lappend info(init) "set remotebinarydownload [target_info binarydownload]"
-      }
-      if {[target_info exists disable_x_packet]} {
-	lappend info(init) "set remote X-packet disable"
-      }
-      if {[target_info exists disable_z_packet]} {
-	lappend info(init) "set remote Z-packet disable"
-      }
-
-      # Get target name and connection info
-      if {[target_info exists gdb_protocol]} {
-	set targetname "[target_info gdb_protocol]"
-      } else {
-	set targetname "not_specified"
-      }
-      if {[target_info exists gdb_serial]} {
-	set serialport "[target_info gdb_serial]"
-      } elseif {[target_info exists netport]} {
-	set serialport "[target_info netport]"
-      } else {
-	set serialport "[target_info serial]"
-      }
-
-      set info(target) "target $targetname $serialport"
-      set info(load) "load"
-      set info(run) "continue"
-    }
-
-    sid {
-      # We must start sid first, since Insight won't have a clue
-      # about how to do this.
-      sid_start
-      set info(target) "target [target_info gdb_protocol] [target_info netport]"
-      set info(load) "load"
-      set info(run) "continue"
-    }
-
-    native {
-      set info(run) "run"
-    }
-  }
-
-  # Export the array to the environment
-  set env(TARGET_INFO) [array get info]
-}
-
-# gdbtk tests call this function to print out the results of the
-# tests. The argument is a proper list of lists of the form:
-# {status name description msg}. All of these things typically
-# come from the testsuite harness.
-proc gdbtk_analyze_results {results} {
-  foreach test $results {
-    set status [lindex $test 0]
-    set name [lindex $test 1]
-    set description [lindex $test 2]
-    set msg [lindex $test 3]
-
-    switch $status {
-      PASS {
-	pass "$description ($name)"
-      }
-
-      FAIL {
-	fail "$description ($name)"
-      }
-
-      ERROR {
-	perror "$name"
-      }
-
-      XFAIL {
-	xfail "$description ($name)"
-      }
-
-      XPASS {
-	xpass "$description ($name)"
-      }
-    }
-  }
-}
-
-proc gdbtk_done {{results {}}} {
-  global _xvfb_spawn_id
-  gdbtk_analyze_results $results
-
-  # Kill off xvfb if using it
-  if {[info exists _xvfb_spawn_id]} {
-    _gdbtk_xvfb_exit
-  }
-
-  # Yich. If we're using sid, we must kill it
-  if {[string compare [info proc gdb_target_sid] gdb_target_sid] == 0} {
-    sid_exit
-  }
-}
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 c9267d805e3..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 ../gdb.gdbtk/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 c5613de8b42..00000000000
--- a/gdb/testsuite/gdb.gdbtk/windows.exp
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2001, 2004 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 ../gdb.gdbtk/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/gdb/testsuite/gdb.hp/Makefile.in b/gdb/testsuite/gdb.hp/Makefile.in
deleted file mode 100644
index 2a1a9df175b..00000000000
--- a/gdb/testsuite/gdb.hp/Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-SUBDIRS = @subdirs@
-
-all:
-	@echo "Nothing to be done for all..."
-
-info:
-install-info:
-dvi:
-install:
-uninstall: force
-installcheck:
-check:
-
-clean mostlyclean:
-	-rm -f *~ core *.o
-	if [ x"${SUBDIRS}" != x ] ; then \
-	    for dir in ${SUBDIRS}; \
-	    do \
-		    echo "$$dir:"; \
-		    if [ -d $$dir ]; then \
-			    (cd $$dir; $(MAKE) clean); \
-		    fi; \
-	    done ; \
-	else true; fi
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
-	-rm -f *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-	if [ x"${SUBDIRS}" != x ] ; then \
-	    for dir in ${SUBDIRS}; \
-	    do \
-		    echo "$$dir:"; \
-		    if [ -d $$dir ]; then \
-			    (cd $$dir; $(MAKE) distclean); \
-		    fi; \
-	    done ; \
-	else true; fi
-
-Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.in
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.hp/configure b/gdb/testsuite/gdb.hp/configure
deleted file mode 100755
index c9130ac9831..00000000000
--- a/gdb/testsuite/gdb.hp/configure
+++ /dev/null
@@ -1,2430 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="gdb.aCC"
-ac_subdirs_all="$ac_subdirs_all gdb.aCC gdb.base-hp gdb.compat gdb.defects gdb.objdbg"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os subdirs LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-subdirs="$subdirs gdb.aCC gdb.base-hp gdb.compat gdb.defects gdb.objdbg"
-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@subdirs@,$subdirs,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-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=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d $srcdir/$ac_dir || continue
-
-    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
-echo "$as_me: configuring in $ac_dir" >&6;}
-    { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-    cd $ac_dir
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-    elif test -f $ac_srcdir/configure; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-    elif test -f $ac_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&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_top_builddir$cache_file ;;
-      esac
-
-      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval $ac_sub_configure $ac_sub_configure_args \
-	   --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/gdb/testsuite/gdb.hp/configure.ac b/gdb/testsuite/gdb.hp/configure.ac
deleted file mode 100644
index a725cd3a82d..00000000000
--- a/gdb/testsuite/gdb.hp/configure.ac
+++ /dev/null
@@ -1,17 +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.59)
-AC_INIT(gdb.aCC)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
-AC_CANONICAL_SYSTEM
-
-AC_CONFIG_SUBDIRS(gdb.aCC gdb.base-hp gdb.compat gdb.defects gdb.objdbg)
-
-AC_OUTPUT(Makefile)
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in b/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in
deleted file mode 100644
index 1295c1e5585..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = exception namespace optimize run
-
-all:
-	@echo "Nothing to be done for all..."
-
-info:
-install-info:
-dvi:
-install:
-uninstall: force
-installcheck:
-check:
-
-clean mostlyclean:
-	-rm -f *~ *.o *.ci
-	-rm -f core $(EXECUTABLES)
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
-	-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.hp/gdb.aCC/configure b/gdb/testsuite/gdb.hp/gdb.aCC/configure
deleted file mode 100755
index 9970fc95d59..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.aCC/configure
+++ /dev/null
@@ -1,2246 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="exception.exp"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/configure.ac b/gdb/testsuite/gdb.hp/gdb.aCC/configure.ac
deleted file mode 100644
index 8dc7ea62dd4..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.aCC/configure.ac
+++ /dev/null
@@ -1,15 +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.59)
-AC_INIT(exception.exp)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../../..)
-AC_CANONICAL_SYSTEM
-
-AC_OUTPUT(Makefile)
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/exception.exp b/gdb/testsuite/gdb.hp/gdb.aCC/exception.exp
deleted file mode 100644
index 85b0136399e..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.aCC/exception.exp
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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 exists because the configure script requires it to exist.
-# It would be nice to regenerate the configure script.  I can't do it
-# because I don't have autoconf 2.12.1, which is used to build it.
-# -- chastain 2004-01-09
-
-continue
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.c b/gdb/testsuite/gdb.hp/gdb.aCC/optimize.c
deleted file mode 100644
index 2a8daa8c7a0..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Source for debugging optimimzed code test.
-
-    cc -g -O -o optimize optimize.c
-*/
-int callee();
-int test_opt;
-
-int main()
-{
-   int a,b,c,d,e,f,g,h;
-
-   a = 10;;
-
-   /* Value propagate
-    */
-   b = 2 * a + 1;
-   c = 3 * b + 2;
-
-   /* Re-use expressions
-    */
-   d = (2 * a + 1) * (3 * b + 2);
-   e = (2 * a + 1) * (3 * b + 2);
-
-   /* Create dead stores--do lines still exist?
-    */
-   d = (2 * a + 1) * (3 * b + 2);
-   e = (2 * a + 1) * (3 * b + 2);
-   d = (2 * a + 1) * (3 * b + 2);
-   e = (2 * a + 1) * (3 * b + 2);
-
-   /* Alpha and psi motion
-    */
-   if( test_opt ) {
-       f = e - d;
-       f = f--;
-   }
-   else {
-       f = e - d;
-       f = f + d * e;
-   }
-
-   /* Chi and Rho motion
-    */
-   h = 0;
-   do {
-       h++;
-       a = b * c + d * e;  /* Chi */
-       f = f + d * e;
-       g = f + d * e;      /* Rho */
-       callee( g+1 );
-       test_opt = (test_opt != 1);  /* Cycles */
-   } while( g && h < 10);
-
-   /* Opps for tail recursion, unrolling,
-    * folding, evaporating
-    */
-   for( a = 0; a < 100; a++ ) {
-       callee( callee ( callee( a )));
-       callee( callee ( callee( a )));
-       callee( callee ( callee( a )));
-   }
-
-   return callee( test_opt );
-}
-
-/* defined late to keep line numbers the same
-*/
-int callee( x )
-    int x;      /* not used! */
-{
-    test_opt++; /* side effect */
-
-    return test_opt;
-}
-
-/* end */
\ No newline at end of file
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp b/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
deleted file mode 100644
index 84b51b6aca9..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.aCC/optimize.exp
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright (C) 1998 Free Software Foundation, 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
-
-# optimize.exp -- Expect script for testing apps compiled with -O
-
-# There is no DOC support for gdb yet, return 0 for now.
-return 0
-
-global timeout
-
-# use this to debug:
-#
-#log_user 1
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-if { [skip_hp_tests] } then { continue }
-
-set testfile optimize
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
- 
-if { $gcc_compiled } then { continue }
-
-
-# Vanilla -O, which is the same as +O2
-#
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug optimize=+O2}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-send_gdb "file $binfile\n"
-gdb_expect {
-    -re ".*no debugging symbols found.*$gdb_prompt $" {
-        fail "Didn't find debug symbols; CHFts23488" 
-    }
-    -re ".*No header section (PXDB data).*$gdb_prompt $" {
-        fail "pointless warning"
-    }
-    -re ".*done.*$gdb_prompt $" {
-        pass "load debug symbols"
-    }
-    timeout { fail "timeout on file" }
-}
-
-# Two lines at the same place after opt.
-#
-gdb_test "b 28"   ".*"
-gdb_test "b 26"   ".*also set at.*" "same line"
-
-gdb_test "b 47"   ".*"
-gdb_test "b 48"   ".*also set at.*" "same line"
-
-gdb_test "tb main" ".*"
-
-set old_timeout $timeout
-set timeout [expr "$timeout + 200"]
-send_gdb "r\n"
-gdb_expect {
-    -re ".*No header section (PXDB data).*$gdb_prompt $" {
-        fail "pointless warning"
-    }
-    -re ".*main.*2\[12].*$gdb_prompt $" {
-        # All the lines before line 21 or 22 are 
-        # evaporated by the compiler.
-        # 
-        pass "hit main"
-    }
-    -re ".*$gdb_prompt $" {
-        fail "didn't hit main"
-    }
-    timeout { fail "timeout on run" }
-}
-set timeout $old_timeout
-
-gdb_test "c" ".*Breakpoint 1.*33.*"
-gdb_test "c" ".*51.*"
-gdb_test "cle" ".*Deleted breakpoints.*" "set 2, so del 2"
-
-gdb_test "b callee" ".*"
-gdb_test "c" ".*callee.*" "hit called rtn"
-
-gdb_exit
-
-# +O4, don't use -g
-#
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {optimize=+O4}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-send_gdb "file $binfile\n"
-gdb_expect {
-    -re ".*no debugging symbols found.*$gdb_prompt $" {
-        pass "Didn't find debug symbols, as expected"
-    }
-    -re ".*No header section (PXDB data).*$gdb_prompt $" {
-        fail "pointless warning"
-    }
-    -re ".*done.*$gdb_prompt $" {
-        fail "Somehow found debug symbols--make this a pass?"
-    }
-    timeout { fail "timeout on file" }
-}
-
-gdb_test "b main"   ".*"
-gdb_test "b callee" ".*"
-gdb_test "r"        ".*Breakpoint 1.*main.*"
-gdb_test "si 3"     ".*main.*" "steps"
-gdb_test "x/4i \$pc" ".*main.*main+4.*main+8.*"
-gdb_test "c"        ".*callee.*" "hit bp"
-gdb_test "disas"    ".*callee.*callee+4.*callee+12.*"
-gdb_test "si"       ".*callee.*"
-gdb_test "fin"      ".*Run till exit.*main.*" "finish"
-gdb_test "x/i \$pc" ".*main+.*" "back in main"
-gdb_exit
-
-#remote_exec build "rm -f ${binfile}"
-return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/run.c b/gdb/testsuite/gdb.hp/gdb.aCC/run.c
deleted file mode 100644
index 6bff81ad7ee..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.aCC/run.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *	This simple classical example of recursion is useful for
- *	testing stack backtraces and such.
- */
-
-#ifdef vxworks
-
-#  include <stdio.h>
-
-/* VxWorks does not supply atoi.  */
-static int
-atoi (char *z)
-    /*  char *z;*/
-{
-  int i = 0;
-
-  while (*z >= '0' && *z <= '9')
-    i = i * 10 + (*z++ - '0');
-  return i;
-}
-
-/* I don't know of any way to pass an array to VxWorks.  This function
-   can be called directly from gdb.  */
-
-void vxmain (char *arg)
-/*char *arg;*/
-{
-  char *argv[2];
-
-  argv[0] = "";
-  argv[1] = arg;
-  main (2, argv, (char **) 0);
-}
-
-#else /* ! vxworks */
-#  include <stdio.h>
-#  include <stdlib.h>
-#endif /* ! vxworks */
-
-int main (int argc, char *argv[], char **envp)
-/*int argc;
-char *argv[], **envp;*/
-{
-    int factorial (int);
-#ifdef usestubs
-    set_debug_traps();
-    breakpoint();
-#endif
-#ifdef FAKEARGV
-    printf ("%d\n", factorial (1));
-#else    
-    if (argc != 2) {
-	printf ("usage:  factorial <number>\n");
-	return 1;
-    } else {
-	printf ("%d\n", factorial (atoi (argv[1])));
-    }
-#endif
-    return 0;
-}
-
-int factorial (int value)
-/*int value;*/
-{
-    int  local_var;
-
-    if (value > 1) {
-	value *= factorial (value - 1);
-    }
-    local_var = value;
-    return (value);
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp b/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp
deleted file mode 100644
index e447c0b5cf5..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.aCC/watch-cmd.exp
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright (C) 1998 Free Software Foundation, 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
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-#
-# test special commands
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_hp_tests] } then { continue }
-
-set testfile "run"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-if { $gcc_compiled } then { continue }
-
-
-gdb_exit
-gdb_start
-delete_breakpoints
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-
-proc watchpoint_command_test {} {
-    global gdb_prompt
-
-    if [target_info exists noargs] { 
-        verbose "Skipping watchpoint_command_test because of noargs."
-        return
-    }
-
-    if { ![runto factorial] } then { gdb_suppress_tests }
-    # Don't depend upon argument passing, since most simulators don't currently
-    # support it.  Bash value variable to be what we want.
-    gdb_test "p value=6" "" "set value to 6 in watchpoint_command_test"
-    delete_breakpoints
-
-    # Verify that we can create a watchpoint, and give it a commands
-    # list that continues the inferior.  We set the watchpoint on a
-    # local variable, too, so that it self-deletes when the watched
-    # data goes out of scope.
-    #
-    # What should happen is: Each time the watchpoint triggers, it
-    # continues the inferior.  Eventually, the watchpoint will self-
-    # delete, when the watched variable is out of scope.  But by that
-    # time, the inferior should have exited.  GDB shouldn't crash or
-    # anything untoward as a result of this.
-    #
-    send_gdb "watch local_var\n"
-    gdb_expect {
-      -re ".*\[Ww\]atchpoint (\[0-9\]*): local_var.*$gdb_prompt $"\
-              { pass "watch local_var"
-                set wp_id $expect_out(1,string)
-                send_gdb "commands $wp_id\n"
-                gdb_expect {
-                  -re "Type commands for when breakpoint $wp_id is hit, one per line.*>"\
-                          { pass "begin commands on watch"}
-                  -re "$gdb_prompt $"\
-                          {fail "begin commands on watch"}
-                  timeout {fail "(timeout) begin commands on watch"}
-                }
-              }
-    -re "$gdb_prompt $"\
-              {fail "watch local_var"}
-      timeout {fail "(timeout) watch local_var"}
-    }
-#    set wp_id $expect_out(1,string)
-#    send_gdb "commands $wp_id\n"
-#    gdb_expect {
-#      -re "Type commands for when breakpoint $wp_id is hit, one per line.*>"\
-#              {pass "begin commands on watch"}
-#      -re "$gdb_prompt $"\
-#              {fail "begin commands on watch"}
-#      timeout {fail "(timeout) begin commands on watch"}
-#    }
-    send_gdb "print value\n"
-    gdb_expect {
-      -re ">"\
-              {pass "add print command to watch"}
-      -re "$gdb_prompt $"\
-              {fail "add print command to watch"}
-      timeout {fail "(timeout) add print command to watch"}
-    }
-    send_gdb "continue\n"
-    gdb_expect {
-      -re ">"\
-              {pass "add continue command to watch"}
-      -re "$gdb_prompt $"\
-              {fail "add continue command to watch"}
-      timeout {fail "(timeout) add continue command to watch"}
-    }
-    send_gdb "end\n"
-    gdb_expect {
-      -re "$gdb_prompt $"\
-              {pass "begin commands on watch"}
-      timeout {fail "(timeout) begin commands on watch"}
-    }
-    send_gdb "continue\n"
-    gdb_expect {
-      -re "Continuing.*\[Ww\]atchpoint $wp_id deleted because the program has left the block in.*which its expression is valid.*in main.*$gdb_prompt $"\
-              {pass "continue with watch"}
-      -re "$gdb_prompt $"\
-              {fail "continue with watch"}
-      timeout {fail "(timeout) continue with watch"}
-    }
-    send_gdb "continue\n"
-    gdb_expect {
-      -re "Continuing.*$gdb_prompt $"\
-              {pass "continue until exit"}
-      -re "$gdb_prompt $"\
-              {fail "continue until exit"}
-      timeout {fail "(timeout) continue until exit"}
-    }
-}
-
-watchpoint_command_test
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in b/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in
deleted file mode 100644
index adbde9df27e..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = dollar hwwatchbus.bak pxdb reg reg-pa64 \
-	so-thresh genso-thresh sized-enum
-
-MISCELLANEOUS = so-thresh.c so-thresh.lopt so-thresh.make.out \
-	lib*-so-thresh.*
-
-all:
-	@echo "Nothing to be done for all..."
-
-info:
-install-info:
-dvi:
-install:
-uninstall: force
-installcheck:
-check:
-
-clean mostlyclean:
-	-rm -f *~ *.o *.ci
-	-rm -f core $(EXECUTABLES)
-	-rm -f $(MISCELLANEOUS)
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
-	-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.hp/gdb.base-hp/callfwmall.c b/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.c
deleted file mode 100644
index 67edb8b70d4..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* Support program for testing gdb's ability to call functions
-   in an inferior which doesn't itself call malloc, pass appropriate
-   arguments to those functions, and get the returned result. */
-
-#ifdef NO_PROTOTYPES
-#define PARAMS(paramlist) ()
-#else
-#define PARAMS(paramlist) paramlist
-#endif
-
-# include <string.h>
-
-char char_val1 = 'a';
-char char_val2 = 'b';
-
-short short_val1 = 10;
-short short_val2 = -23;
-
-int int_val1 = 87;
-int int_val2 = -26;
-
-long long_val1 = 789;
-long long_val2 = -321;
-
-float float_val1 = 3.14159;
-float float_val2 = -2.3765;
-
-double double_val1 = 45.654;
-double double_val2 = -67.66;
-
-#define DELTA (0.001)
-
-char *string_val1 = (char *)"string 1";
-char *string_val2 = (char *)"string 2";
-
-char char_array_val1[] = "carray 1";
-char char_array_val2[] = "carray 2";
-
-struct struct1 {
-  char c;
-  short s;
-  int i;
-  long l;
-  float f;
-  double d;
-  char a[4];
-} struct_val1 = { 'x', 87, 76, 51, 2.1234, 9.876, "foo" };
-
-/* Some functions that can be passed as arguments to other test
-   functions, or called directly. */
-#ifdef PROTOTYPES
-int add (int a, int b)
-#else
-int add (a, b) int a, b;
-#endif
-{
-  return (a + b);
-}
-
-#ifdef PROTOTYPES
-int doubleit (int a)
-#else
-int doubleit (a)
-int a;
-#endif
-{
-  return (a + a);
-}
-
-int (*func_val1) PARAMS((int,int)) = add;
-int (*func_val2) PARAMS((int)) = doubleit;
-
-/* An enumeration and functions that test for specific values. */
-
-enum enumtype { enumval1, enumval2, enumval3 };
-enum enumtype enum_val1 = enumval1;
-enum enumtype enum_val2 = enumval2;
-enum enumtype enum_val3 = enumval3;
-
-#ifdef PROTOTYPES
-int t_enum_value1 (enum enumtype enum_arg)
-#else
-t_enum_value1 (enum_arg)
-enum enumtype enum_arg;
-#endif
-{
-  return (enum_arg == enum_val1);
-}
-
-#ifdef PROTOTYPES
-int t_enum_value2 (enum enumtype enum_arg)
-#else
-t_enum_value2 (enum_arg)
-enum enumtype enum_arg;
-#endif
-{
-  return (enum_arg == enum_val2);
-}
-
-#ifdef PROTOTYPES
-int t_enum_value3 (enum enumtype enum_arg)
-#else
-t_enum_value3 (enum_arg)
-enum enumtype enum_arg;
-#endif
-{
-  return (enum_arg == enum_val3);
-}
-
-/* A function that takes a vector of integers (along with an explicit
-   count) and returns their sum. */
-
-#ifdef PROTOTYPES
-int sum_args (int argc, int argv[])
-#else
-int sum_args (argc, argv)
-int argc;
-int argv[];
-#endif
-{
-  int sumval = 0;
-  int idx;
-
-  for (idx = 0; idx < argc; idx++)
-    {
-      sumval += argv[idx];
-    }
-  return (sumval);
-}
-
-/* Test that we can call functions that take structs and return
-   members from that struct */
-
-#ifdef PROTOTYPES
-char   t_structs_c (struct struct1 tstruct) { return (tstruct.c); }
-short  t_structs_s (struct struct1 tstruct) { return (tstruct.s); }
-int    t_structs_i (struct struct1 tstruct) { return (tstruct.i); }
-long   t_structs_l (struct struct1 tstruct) { return (tstruct.l); }
-float  t_structs_f (struct struct1 tstruct) { return (tstruct.f); }
-double t_structs_d (struct struct1 tstruct) { return (tstruct.d); }
-char  *t_structs_a (struct struct1 tstruct)
-{
-  static char buf[8];
-  strcpy (buf, tstruct.a);
-  return buf;
-}
-#else
-char   t_structs_c (tstruct) struct struct1 tstruct; { return (tstruct.c); }
-short  t_structs_s (tstruct) struct struct1 tstruct; { return (tstruct.s); }
-int    t_structs_i (tstruct) struct struct1 tstruct; { return (tstruct.i); }
-long   t_structs_l (tstruct) struct struct1 tstruct; { return (tstruct.l); }
-float  t_structs_f (tstruct) struct struct1 tstruct; { return (tstruct.f); }
-double t_structs_d (tstruct) struct struct1 tstruct; { return (tstruct.d); }
-char  *t_structs_a (tstruct) struct struct1 tstruct;
-{
-  static char buf[8];
-  strcpy (buf, tstruct.a);
-  return buf;
-}
-#endif
-
-/* Test that calling functions works if there are a lot of arguments.  */
-#ifdef PROTOTYPES
-int sum10 (int i0, int i1, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9)
-#else
-int
-sum10 (i0, i1, i2, i3, i4, i5, i6, i7, i8, i9)
-     int i0, i1, i2, i3, i4, i5, i6, i7, i8, i9;
-#endif
-{
-  return i0 + i1 + i2 + i3 + i4 + i5 + i6 + i7 + i8 + i9;
-}
-
-/* Gotta have a main to be able to generate a linked, runnable
-   executable, and also provide a useful place to set a breakpoint. */
-
-#ifdef PROTOTYPES
-int main()
-#else
-main ()
-#endif
-{
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-  t_structs_c(struct_val1);
-  return 0;
-  
-}
-
-/* Functions that expect specific values to be passed and return 
-   either 0 or 1, depending upon whether the values were
-   passed incorrectly or correctly, respectively. */
-
-#ifdef PROTOTYPES
-int t_char_values (char char_arg1, char char_arg2)
-#else
-int t_char_values (char_arg1, char_arg2)
-char char_arg1, char_arg2;
-#endif
-{
-  return ((char_arg1 == char_val1) && (char_arg2 == char_val2));
-}
-
-int
-#ifdef PROTOTYPES
-t_small_values (char arg1, short arg2, int arg3, char arg4, short arg5,
-		char arg6, short arg7, int arg8, short arg9, short arg10)
-#else
-t_small_values (arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10)
-     char arg1;
-     short arg2;
-     int arg3;
-     char arg4;
-     short arg5;
-     char arg6;
-     short arg7;
-     int arg8;
-     short arg9;
-     short arg10;
-#endif
-{
-  return arg1 + arg2 + arg3 + arg4 + arg5 + arg6 + arg7 + arg8 + arg9 + arg10;
-}
-
-#ifdef PROTOTYPES
-int t_short_values (short short_arg1, short short_arg2)
-#else
-int t_short_values (short_arg1, short_arg2)
-short short_arg1, short_arg2;
-#endif
-{
-  return ((short_arg1 == short_val1) && (short_arg2 == short_val2));
-}
-
-#ifdef PROTOTYPES
-int t_int_values (int int_arg1, int int_arg2)
-#else
-int t_int_values (int_arg1, int_arg2)
-int int_arg1, int_arg2;
-#endif
-{
-  return ((int_arg1 == int_val1) && (int_arg2 == int_val2));
-}
-
-#ifdef PROTOTYPES
-int t_long_values (long long_arg1, long long_arg2)
-#else
-int t_long_values (long_arg1, long_arg2)
-long long_arg1, long_arg2;
-#endif
-{
-  return ((long_arg1 == long_val1) && (long_arg2 == long_val2));
-}
-
-/* NOTE: THIS FUNCTION MUST NOT BE PROTOTYPED!!!!!
-   There must be one version of "t_float_values" (this one)
-   that is not prototyped, and one (if supported) that is (following).
-   That way GDB can be tested against both cases.  */
-   
-int t_float_values (float_arg1, float_arg2)
-float float_arg1, float_arg2;
-{
-  return ((float_arg1 - float_val1) < DELTA
-	  && (float_arg1 - float_val1) > -DELTA
-	  && (float_arg2 - float_val2) < DELTA
-	  && (float_arg2 - float_val2) > -DELTA);
-}
-
-int
-#ifdef NO_PROTOTYPES
-/* In this case we are just duplicating t_float_values, but that is the
-   easiest way to deal with either ANSI or non-ANSI.  */
-t_float_values2 (float_arg1, float_arg2)
-     float float_arg1, float_arg2;
-#else
-t_float_values2 (float float_arg1, float float_arg2)
-#endif
-{
-  return ((float_arg1 - float_val1) < DELTA
-	  && (float_arg1 - float_val1) > -DELTA
-	  && (float_arg2 - float_val2) < DELTA
-	  && (float_arg2 - float_val2) > -DELTA);
-}
-
-#ifdef PROTOTYPES
-int t_double_values (double double_arg1, double double_arg2)
-#else
-int t_double_values (double_arg1, double_arg2)
-double double_arg1, double_arg2;
-#endif
-{
-  return ((double_arg1 - double_val1) < DELTA
-	  && (double_arg1 - double_val1) > -DELTA
-	  && (double_arg2 - double_val2) < DELTA
-	  && (double_arg2 - double_val2) > -DELTA);
-}
-
-#ifdef PROTOTYPES
-int t_string_values (char *string_arg1, char *string_arg2)
-#else
-int t_string_values (string_arg1, string_arg2)
-char *string_arg1, *string_arg2;
-#endif
-{
-  return (!strcmp (string_arg1, string_val1) &&
-	  !strcmp (string_arg2, string_val2));
-}
-
-#ifdef PROTOTYPES
-int t_char_array_values (char char_array_arg1[], char char_array_arg2[])
-#else
-int t_char_array_values (char_array_arg1, char_array_arg2)
-char char_array_arg1[], char_array_arg2[];
-#endif
-{
-  return (!strcmp (char_array_arg1, char_array_val1) &&
-	  !strcmp (char_array_arg2, char_array_val2));
-}
-
-
-/* This used to simply compare the function pointer arguments with
-   known values for func_val1 and func_val2.  Doing so is valid ANSI
-   code, but on some machines (RS6000, HPPA, others?) it may fail when
-   called directly by GDB.
-
-   In a nutshell, it's not possible for GDB to determine when the address
-   of a function or the address of the function's stub/trampoline should
-   be passed.
-
-   So, to avoid GDB lossage in the common case, we perform calls through the
-   various function pointers and compare the return values.  For the HPPA
-   at least, this allows the common case to work.
-
-   If one wants to try something more complicated, pass the address of
-   a function accepting a "double" as one of its first 4 arguments.  Call
-   that function indirectly through the function pointer.  This would fail
-   on the HPPA.  */
-
-#ifdef PROTOTYPES
-int t_func_values (int (*func_arg1)(int, int), int (*func_arg2)(int))
-#else
-int t_func_values (func_arg1, func_arg2)
-int (*func_arg1) PARAMS ((int, int));
-int (*func_arg2) PARAMS ((int));
-#endif
-{
-  return ((*func_arg1) (5,5)  == (*func_val1) (5,5)
-          && (*func_arg2) (6) == (*func_val2) (6));
-}
-
-#ifdef PROTOTYPES
-int t_call_add (int (*func_arg1)(int, int), int a, int b)
-#else
-int t_call_add (func_arg1, a, b)
-int (*func_arg1) PARAMS ((int, int));
-int a, b;
-#endif
-{
-  return ((*func_arg1)(a, b));
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp
deleted file mode 100644
index 0f06983b58a..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/callfwmall.exp
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1997, 1998, 1999 Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-# These tests are the same as those in callfuncs.exp, except that the
-# test program here does not call malloc.
-#
-# "What in the world does malloc have to do with calling functions in
-# the inferior?"  Well, nothing.  GDB's ability to invoke a function
-# in the inferior program works just fine in programs that have no
-# malloc function available.  It doesn't rely on the inferior's
-# malloc, directly or indirectly.  It just uses the inferior's stack
-# space.
-#
-# "Then what's the point of this test file?"  Well, it just so happens
-# that this file, in addition to testing inferior function calls, also
-# tests GDB's ability to evaluate string literals (like "string 1" and
-# "string 2" in the tests below).  Evaluating *those* sorts of
-# expressions does require malloc.
-#
-# (As an extension to C, GDB also has a syntax for literal arrays of
-# anything, not just characters.  For example, the expression
-# {2,3,4,5} (which appears in the tests below) evaluates to an array
-# of four ints.  So rather than talking just about string literals,
-# we'll use the broader term "array literals".)
-#
-# Now, in this file, we only evaluate array literals when we're about
-# to pass them to a function, but don't be confused --- this is a red
-# herring.  You can evaluate "abcdef" even if you're not about to pass
-# that to a function, and doing so requires malloc even if you're just
-# going to store a pointer to it in a variable, like this:
-#
-#    (gdb) ptype s
-#    type = char *
-#    (gdb) set variable s = "abcdef"
-#
-# According to C's rules for evaluating expressions, arrays are
-# converted into pointers to their first element.  This means that, in
-# order to evaluate an expression like "abcdef", GDB needs to actually
-# find some memory in the inferior we can plop the characters into;
-# then we use that memory's address as the address of our array
-# literal.  GDB finds this memory by calling the inferior's malloc
-# function, if it has one.  So, evaluating an array literal depends on
-# performing an inferior function call, but not vice versa.  (GDB
-# can't just allocate the space on the stack; the pointer may remain
-# live long after the current frame has been popped.)
-#
-# "But, if evaluating array literals requires malloc, what's the point
-# of testing that GDB can do so in a program that doesn't have malloc?
-# It can't work!"  On most systems, that's right, but HP-UX has some
-# sort of dynamic linking magic that ensures that *every* program has
-# malloc.  So on HP-UX, GDB can evaluate array literals even in
-# inferior programs that don't use malloc.  That's why this test is in
-# gdb.hp.
-# 
-# This file has, for some reason, led to well more than its fair share
-# of misunderstandings about the relationship between array literal
-# expressions and inferior function calls.  Folks talk as if you can
-# only evaluate array literals when you're about to pass them to a
-# function.  I think they're assuming that, since GDB is constructing
-# a new frame on the inferior's stack (correct), it's going to use
-# that space for the array literals (incorrect).  Remember that those
-# array literals may need to be live long after the inferior function
-# call returns; GDB can't tell.
-#
-# What makes the confusion worse is that there *is* a relationship
-# between array literals and inferior function calls --- GDB uses
-# inferior function calls to evaluate array literals.  But many people
-# jump to other, incorrect conclusions about this.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_hp_tests] } then { continue }
-
-set testfile "callfwmall"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-if {$hp_aCC_compiler} {
-    set prototypes 1
-} else {
-    set prototypes 0
-}
-
-
-# Some targets can't call functions, so don't even bother with this
-# test.
-if [target_info exists gdb,cannot_call_functions] {
-    setup_xfail "*-*-*" 2416
-    fail "This target can not call functions"
-    continue
-}
-
-# Set the current language to C.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_c {} {
-    global gdb_prompt
-
-    send_gdb "set language c\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {}
-	timeout { fail "set language c (timeout)" ; return 0 }
-    }
-
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"c\".*$gdb_prompt $" {
-	    pass "set language to \"c\""
-	    return 1
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "setting language to \"c\""
-	    return 0
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return 0
-	}
-    }
-}
-
-# FIXME:  Before calling this proc, we should probably verify that
-# we can call inferior functions and get a valid integral value
-# returned.
-# Note that it is OK to check for 0 or 1 as the returned values, because C
-# specifies that the numeric value of a relational or logical expression
-# (computed in the inferior) is 1 for true and 0 for false.
-
-proc do_function_calls {} {
-    global prototypes
-    global gcc_compiled
-    global gdb_prompt
-
-    # We need to up this because this can be really slow on some boards.
-    set timeout 60;
-
-    gdb_test "p t_char_values(0,0)" " = 0"
-    gdb_test "p t_char_values('a','b')" " = 1"
-    gdb_test "p t_char_values(char_val1,char_val2)" " = 1"
-    gdb_test "p t_char_values('a',char_val2)" " = 1"
-    gdb_test "p t_char_values(char_val1,'b')" " = 1"
-
-    gdb_test "p t_short_values(0,0)" " = 0"
-    gdb_test "p t_short_values(10,-23)" " = 1"
-    gdb_test "p t_short_values(short_val1,short_val2)" " = 1"
-    gdb_test "p t_short_values(10,short_val2)" " = 1"
-    gdb_test "p t_short_values(short_val1,-23)" " = 1"
-
-    gdb_test "p t_int_values(0,0)" " = 0"
-    gdb_test "p t_int_values(87,-26)" " = 1"
-    gdb_test "p t_int_values(int_val1,int_val2)" " = 1"
-    gdb_test "p t_int_values(87,int_val2)" " = 1"
-    gdb_test "p t_int_values(int_val1,-26)" " = 1"
-
-    gdb_test "p t_long_values(0,0)" " = 0"
-    gdb_test "p t_long_values(789,-321)" " = 1"
-    gdb_test "p t_long_values(long_val1,long_val2)" " = 1"
-    gdb_test "p t_long_values(789,long_val2)" " = 1"
-    gdb_test "p t_long_values(long_val1,-321)" " = 1"
-
-    if ![target_info exists gdb,skip_float_tests] {
-	gdb_test "p t_float_values(0.0,0.0)" " = 0"
-
-	# These next four tests fail on the mn10300.
-	# The first value is passed in regs, the other in memory.
-	# Gcc emits different stabs for the two parameters; the first is
-	# claimed to be a float, the second a double.
-	# dbxout.c in gcc claims this is the desired behavior.
-	setup_xfail "mn10300-*-*"
-	gdb_test "p t_float_values(3.14159,-2.3765)" " = 1"
-	setup_xfail "mn10300-*-*"
-	gdb_test "p t_float_values(float_val1,float_val2)" " = 1"
-	setup_xfail "mn10300-*-*"
-	gdb_test "p t_float_values(3.14159,float_val2)" " = 1"
-	setup_xfail "mn10300-*-*"
-	gdb_test "p t_float_values(float_val1,-2.3765)" " = 1"
-
-	# Test passing of arguments which might not be widened.
-	gdb_test "p t_float_values2(0.0,0.0)" " = 0"
-
-	# Although PR 5318 mentions SunOS specifically, this seems
-	# to be a generic problem on quite a few platforms.
-	if $prototypes then {
-	    setup_xfail "sparc-*-*" "mips*-*-*" 5318
-	    if {!$gcc_compiled} then {
-		setup_xfail "alpha-dec-osf2*" "i*86-*-sysv4*" 5318
-	    }
-	}
-	gdb_test "p t_float_values2(3.14159,float_val2)" " = 1"
-	gdb_test "p t_small_values(1,2,3,4,5,6,7,8,9,10)" " = 55"
-
-	gdb_test "p t_double_values(0.0,0.0)" " = 0"
-	gdb_test "p t_double_values(45.654,-67.66)" " = 1"
-	gdb_test "p t_double_values(double_val1,double_val2)" " = 1"
-	gdb_test "p t_double_values(45.654,double_val2)" " = 1"
-	gdb_test "p t_double_values(double_val1,-67.66)" " = 1"
-   
-    }
-
-    gdb_test "p t_string_values(string_val2,string_val1)" " = 0"
-    gdb_test "p t_string_values(string_val1,string_val2)" " = 1"
-    gdb_test "p t_string_values(\"string 1\",\"string 2\")" " = 1"
-    gdb_test "p t_string_values(\"string 1\",string_val2)" " = 1"
-    gdb_test "p t_string_values(string_val1,\"string 2\")" " = 1"
-
-    gdb_test "p t_char_array_values(char_array_val2,char_array_val1)" " = 0"
-    gdb_test "p t_char_array_values(char_array_val1,char_array_val2)" " = 1"
-    gdb_test "p t_char_array_values(\"carray 1\",\"carray 2\")" " = 1"
-    gdb_test "p t_char_array_values(\"carray 1\",char_array_val2)" " = 1"
-    gdb_test "p t_char_array_values(char_array_val1,\"carray 2\")" " = 1"
-
-    gdb_test "p doubleit(4)" " = 8"
-    gdb_test "p add(4,5)" " = 9"
-    gdb_test "p t_func_values(func_val2,func_val1)" " = 0"
-    gdb_test "p t_func_values(func_val1,func_val2)" " = 1"
-
-    # On the rs6000, we need to pass the address of the trampoline routine,
-    # not the address of add itself.  I don't know how to go from add to
-    # the address of the trampoline.  Similar problems exist on the HPPA,
-    # and in fact can present an unsolvable problem as the stubs may not
-    # even exist in the user's program.  We've slightly recoded t_func_values
-    # to avoid such problems in the common case.  This may or may not help
-    # the RS6000.
-    setup_xfail "rs6000*-*-*"
-
-    if {![istarget hppa*-*-hpux*]} then {
-	gdb_test "p t_func_values(add,func_val2)" " = 1"
-    }
-
-    setup_xfail "rs6000*-*-*"
-
-    if {![istarget hppa*-*-hpux*]} then {
-	gdb_test "p t_func_values(func_val1,doubleit)" " = 1"
-    }
-
-    gdb_test "p t_call_add(func_val1,3,4)" " = 7"
-
-    setup_xfail "rs6000*-*-*"
-
-    if {![istarget hppa*-*-hpux*]} then {
-	gdb_test "p t_call_add(add,3,4)" " = 7"
-    }
-    
-    gdb_test "p t_enum_value1(enumval1)" " = 1"
-    gdb_test "p t_enum_value1(enum_val1)" " = 1"
-    gdb_test "p t_enum_value1(enum_val2)" " = 0"
-
-    gdb_test "p t_enum_value2(enumval2)" " = 1"
-    gdb_test "p t_enum_value2(enum_val2)" " = 1"
-    gdb_test "p t_enum_value2(enum_val1)" " = 0"
-
-    gdb_test "p sum_args(1,{2})" " = 2"
-    gdb_test "p sum_args(2,{2,3})" " = 5"
-    gdb_test "p sum_args(3,{2,3,4})" " = 9"
-    gdb_test "p sum_args(4,{2,3,4,5})" " = 14"
-    gdb_test "p sum10 (1, 2, 3, 4, 5, 6, 7, 8, 9, 10)" " = 55"
-
-    gdb_test "p t_structs_c(struct_val1)" "= 120 'x'" \
-	"call inferior func with struct - returns char"
-    gdb_test "p t_structs_s(struct_val1)" "= 87" \
-	"call inferior func with struct -  returns short"
-    gdb_test "p t_structs_i(struct_val1)" "= 76" \
-	"call inferior func with struct - returns int"
-    gdb_test "p t_structs_l(struct_val1)" "= 51" \
-	"call inferior func with struct - returns long"
-    gdb_test "p t_structs_f(struct_val1)" "= 2.12.*" \
-	"call inferior func with struct - returns float"
-    gdb_test "p t_structs_d(struct_val1)" "= 9.87.*" \
-	"call inferior func with struct - returns double"
-    gdb_test "p t_structs_a(struct_val1)" "= (.unsigned char .. )?\"foo\"" \
-	"call inferior func with struct - returns char *"
-
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set print sevenbit-strings" ""
-gdb_test "set print address off" ""
-gdb_test "set width 0" ""
-
-if { $hp_aCC_compiler } {
-    # Do not set language explicitly to 'C'.  This will cause aCC
-    # tests to fail because promotion rules are different.  Just let
-    # the language be set to the default.
-
-    if { ![runto_main] } {
-	gdb_suppress_tests;
-    }
-
-    gdb_test "set overload-resolution 0" ".*"
-} else {
-    if { ![set_lang_c] } {
-	gdb_suppress_tests;
-    } else {
-	if { ![runto_main] } {
-	    gdb_suppress_tests;
-	}
-    }
-}
-
-gdb_test "next" ".*"
-do_function_calls
-
-return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/configure b/gdb/testsuite/gdb.hp/gdb.base-hp/configure
deleted file mode 100755
index 7641ba69787..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/configure
+++ /dev/null
@@ -1,2246 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="dollar.exp"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/configure.ac b/gdb/testsuite/gdb.hp/gdb.base-hp/configure.ac
deleted file mode 100644
index ff18ef0996f..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/configure.ac
+++ /dev/null
@@ -1,15 +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.59)
-AC_INIT(dollar.exp)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../../..)
-AC_CANONICAL_SYSTEM
-
-AC_OUTPUT(Makefile)
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.c b/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.c
deleted file mode 100644
index 8fd9893c704..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifdef PROTOTYPES
-int main (int argc, char **argv)
-#else
-main (argc, argv, envp)
-     int argc;
-     char **argv;
-#endif
-{
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp
deleted file mode 100644
index b3a6335a1f5..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp
+++ /dev/null
@@ -1,155 +0,0 @@
-#   Copyright (C) 1997, 1998 Free Software Foundation, 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
-
-# GDB tests for names beginning with '$'
-
-# This is aimed at HP-UX systems where a lot of system
-# routines and names begin with '$' or '$$'.  GDB 4.16 was
-# unable to deal with these names as they clashed with
-# convenience variables.  Wildebeest should accept such
-# names in preference to convenience variables.
-
-# This file was written by Satish Pai <pai@apollo.hp.com>
-# 1997-09-24
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_hp_tests] } { continue }
-
-set testfile "dollar"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-#source ${binfile}.ci
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# Test for millicode routines
-# hppa64 does not support dyncall
-if ![istarget "hppa64*-*-*"] {
-send_gdb "print \$\$dyncall\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = \\{<text variable, no debug info>\\} $hex <>.*$gdb_prompt $" { pass "print \$\$dyncall" }
-   -re "\\$\[0-9\]* = \\{<text variable, no debug info>\\} $hex <.*dyncall>.*$gdb_prompt $" { pass "print \$\$dyncall" }
-   -re "\\$\[0-9\]* = void"            { fail "print \$\$dyncall -- interpreted as convenience var" }
-   -re "$gdb_prompt $"                     { fail "print \$\$dyncall" }
-   timeout                             { fail "(timeout) print \$\$dyncall" }
-}
-send_gdb "print \$\$dyncall_external\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = \\{<text variable, no debug info>\\} $hex <>.*$gdb_prompt $" { pass "print \$\$dyncall_external" }
-	-re "\\$\[0-9\]* = \\{<text variable, no debug info>\\} $hex <.*dyncall_external>.*$gdb_prompt $" { pass "print \$\$dyncall_external" }
-   -re "\\$\[0-9\]* = void"            { fail "print \$\$dyncall_external -- interpreted as convenience var" }
-   -re "$gdb_prompt $"                     { fail "print \$\$dyncall_external" }
-   timeout                             { fail "(timeout) print \$\$dyncall_external" }
-}
-
-# Set a breakpoint on a millicode routine
-send_gdb "break \$\$dyncall\n"   
-gdb_expect {   
-   -re "Breakpoint \[0-9\]* at $hex.*$gdb_prompt $" { pass "break \$\$dyncall" }
-   -re "Function.*not defined.*$gdb_prompt $" {fail "break \$\$dyncall -- no \$\$dyncall?" }
-   -re "Convenience variables used in line specs must have integer values\\..*$gdb_prompt $" {
-             fail "break \$\$dyncall -- treated as convenince variable"
-       }          
-   -re "$gdb_prompt $"                     { fail "print break \$\$dyncall" }
-   timeout                             { fail "(timeout) print break \$\$dyncall" }
-}
-
-# Disassemble $$dyncall
-send_gdb "disassemble \$\$dyncall\n"   
-gdb_expect {   
-   -re "Dump of assembler code for function.*$gdb_prompt $" { pass "disas \$\$dyncall" }
-   -re "$gdb_prompt $"                     { fail "disas \$\$dyncall" }
-   timeout                             { fail "(timeout) disas \$\$dyncall" }
-}
-
-# Try to set $$dyncall like a convenience var.
-send_gdb "set \$\$dyncall = 77\n"   
-gdb_expect {   
-   -re "Invalid cast.*$gdb_prompt $" { pass "set \$\$dyncall = 77" }
-   -re "$gdb_prompt $"                     { fail "set \$\$dyncall = 77" }
-   timeout                             { fail "(timeout) set \$\$dyncall = 77" }
-}
-}
-
-# Try out some other $ name, not millicode
-if [istarget "hppa64*-*-*"] {
-    #hppa64 uses __argv instead of $ARGV.
-    send_gdb "print \__argv\n"   
-    gdb_expect {   
-        -re "\\$\[0-9\]* = \[0-9\]*.*$gdb_prompt $" { pass "print \__argv" }
-        -re "\\$\[0-9\]* = void.*$gdb_prompt $" {
-	    fail "print \__argv (interpreted as convenience var)"
-	}
-        -re "$gdb_prompt $" { fail "print \__argv" }
-        timeout { fail "(timeout) print \__argv" }
-    }
-
-    send_gdb "ptype \__argv\n"   
-    gdb_expect {   
-        -re "type = <data variable, no debug info>.*$gdb_prompt $" {
-	    pass "ptype \__argv"
-	}
-        -re "type = void.*$gdb_prompt $" {
-	    fail "ptype \__argv (interpreted as convenience var)"
-	}
-        -re "$gdb_prompt $" { fail "ptype \__argv" }
-        timeout { fail "(timeout) ptype \__argv" }
-    }
-} else {
-send_gdb "print \$ARGV\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = \[0-9\]*.*$gdb_prompt $" { pass "print \$ARGV" }
-   -re "\\$\[0-9\]* = void.*$gdb_prompt $" { fail "print \$ARGV (interpreted as convenience var)" }
-   -re "$gdb_prompt $"                     { fail "print \$ARGV" }
-   timeout                             { fail "(timeout) print \$ARGV" }
-}
-send_gdb "ptype \$ARGV\n"   
-gdb_expect {   
-   -re "type = <data variable, no debug info>.*$gdb_prompt $" { pass "ptype \$ARGV" }
-   -re "type = void.*$gdb_prompt $" { fail "ptype \$ARGV (interpreted as convenience var)" }
-   -re "$gdb_prompt $"                     { fail "ptype \$ARGV" }
-   timeout                             { fail "(timeout) ptype \$ARGV" }
-}
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/genso-thresh.c b/gdb/testsuite/gdb.hp/gdb.base-hp/genso-thresh.c
deleted file mode 100644
index 50756bb975d..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/genso-thresh.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Program to generate the so-thresh testcase,
- * including associated linked-against shared libraries.
- * Build as:
- *
- *        cc -g -o genso-thresh genso-thresh.c
- *
- * Invoke as:
- *
- *        genso-thresh
- *
- * It will put all the code in the current directory (".").
- *
- * A makefile can also be generated if the -makemake option is used.
- * To use the makefile:
- *
- *        make -f so-thresh.mk all
- *
- * The name of the application is
- *
- *        so-thresh
- *
- * (Revised from a program by John Bishop.  --rehrauer)
- */
-
-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-
-int main (argc, argv)
-int    argc;
-char **argv;
-{
-#define NUMBER_OF_INT_VARS 1500
-#define NUMBER_OF_LIBS 3
-    int     lib_num = NUMBER_OF_LIBS;
-    int     i;
-    int     i2;
-    FILE   *main_file;
-    FILE   *lib_file;
-    FILE   *make_file;
-    FILE   *link_file;
-
-    char  testcase_name [1000];
-    char  linkfile_name [1000];
-    char  makefile_name [1000];
-    char  mainfile_name [1000];
-
-    char    file_name[100];
-    /*
-     *        0123456789       <-- length of field
-     *  "./fil0000000002.c";   <-- typical filename
-     *   12345678901234567890  <-- length of string
-     *           10        20
-     *                     ^where null goes
-     */
-    char    file_name_core[100];
-
-    /* Verify input.
-    */
-    if ((argc < 1) || (argc > 2) || (argv == NULL) ||
-        ((argc == 2) && (strcmp (argv[1], "-makemake") != 0)))
-      {
-        printf ("** Syntax: %s [-makemake]\n", argv[0]);
-        return;
-      }
-
-    if (strncmp (argv[0], "gen", 3) != 0)
-      {
-        printf ("** This tool expected to be named \"gen<something>\"\n");
-        return;
-      }
-    strcpy (testcase_name, argv[0]+3);
-
-    strcpy (linkfile_name, testcase_name);
-    strcat (linkfile_name, ".lopt");
-    link_file = fopen (linkfile_name, "w");
-    fprintf (link_file, "# Linker options for %s test\n", testcase_name);
-    
-    /* Generate the makefile, if requested.
-       */
-    if (argc == 2)
-      {
-        strcpy (makefile_name, testcase_name);
-        strcat (makefile_name, ".mk.new");
-        make_file = fopen (makefile_name, "w");
-        printf ("  Note: New makefile (%s) generated.\n", makefile_name);
-        printf ("  May want to update existing makefile, if any.\n");
-        fprintf (make_file, "# Generated automatically by %s\n", argv[0]);
-        fprintf (make_file, "# Make file for %s test\n", testcase_name);
-        fprintf (make_file, "\n");
-        fprintf (make_file, "CFLAGS = +DA1.1 -g\n");
-        fprintf (make_file, "\n");
-        fprintf (make_file, "# This is how to build this generator.\n");
-        fprintf (make_file, "%s.o: %s.c\n", argv[0], argv[0]);
-        fprintf (make_file, "\t$(CC) $(CFLAGS) -o %s.o -c %s.c\n", argv[0], argv[0]);
-        fprintf (make_file, "%s: %s.o\n", argv[0], argv[0]);
-        fprintf (make_file, "\t$(CC) $(CFLAGS) -o %s %s.o\n", argv[0], argv[0]);
-        fprintf (make_file, "\n");
-        fprintf (make_file, "# This is how to run this generator.\n");
-        fprintf (make_file, "# This target should be made before the 'all' target,\n");
-        fprintf (make_file, "# to ensure that the shlib sources are all available.\n");
-        fprintf (make_file, "require_shlibs: %s\n", argv[0]);
-        for (i=0; i < lib_num; i++)
-          {
-            fprintf (make_file, "\tif ! [ -a lib%2.2d_%s.c ] ; then \\\n", i, testcase_name);
-            fprintf (make_file, "\t  %s ; \\\n", argv[0]);
-            fprintf (make_file, "\tfi\n");
-          }
-        fprintf (make_file, "\n");
-        fprintf (make_file, "# This is how to build all the shlibs.\n");
-        fprintf (make_file, "# Be sure to first make the require_shlibs target!\n");
-        for (i=0; i < lib_num; i++)
-          {
-            fprintf (make_file, "lib%2.2d_%s.o: lib%2.2d_%s.c\n", i, testcase_name, i, testcase_name);
-            fprintf (make_file, "\t$(CC) $(CFLAGS) +Z -o lib%2.2d_%s.o -c lib%2.2d_%s.c\n", i, testcase_name, i, testcase_name);
-            fprintf (make_file, "lib%2.2d-%s.sl: lib%2.2d-%s.o\n", i, testcase_name, i, testcase_name);
-            fprintf (make_file, "\t$(LD) $(LDFLAGS) -b -o lib%2.2d-%s.sl lib%2.2d-%s.o\n", i, testcase_name, i, testcase_name);
-          }
-        fprintf (make_file, "\n");
-fprintf (make_file, "# For convenience, here's names for all pieces of all shlibs.\n");
-        fprintf (make_file, "SHLIB_SOURCES = \\\n");
-        for (i=0; i < lib_num-1; i++)
-          fprintf (make_file, "\tlib%2.2d-%s.c \\\n", i, testcase_name);
-        fprintf (make_file, "\tlib%2.2d-%s.c\n", lib_num-1, testcase_name);
-        fprintf (make_file, "SHLIB_OBJECTS = $(SHLIB_SOURCES:.c=.o)\n");
-        fprintf (make_file, "SHLIBS = $(SHLIB_SOURCES:.c=.sl)\n");
-        fprintf (make_file, "SHLIB_NAMES = $(SHLIB_SOURCES:.c=)\n");
-        fprintf (make_file, "EXECUTABLES = $(SHLIBS) %s %s\n", argv[0], testcase_name);
-        fprintf (make_file, "OBJECT_FILES = $(SHLIB_OBJECTS) %s.o %s.o\n", argv[0], testcase_name);
-        fprintf (make_file, "\n");
-        fprintf (make_file, "shlib_objects: $(SHLIB_OBJECTS)\n");
-        fprintf (make_file, "shlibs: $(SHLIBS)\n");
-        fprintf (make_file, "\n");
-        fprintf (make_file, "# This is how to build the debuggable testcase that uses the shlibs.\n");
-        fprintf (make_file, "%s.o: %s.c\n", testcase_name, testcase_name);
-        fprintf (make_file, "\t$(CC) $(CFLAGS) -o %s.o -c %s.c\n", testcase_name, testcase_name);
-        fprintf (make_file, "%s: shlibs %s.o\n", testcase_name, testcase_name);
-        fprintf (make_file, "\t$(LD) $(LDFLAGS) -o %s -lc -L. ", testcase_name);
-        fprintf (make_file, "-c %s /opt/langtools/lib/end.o /lib/crt0.o %s.o\n", linkfile_name, testcase_name);
-        fprintf (make_file, "\n");
-        fprintf (make_file, "# Yeah, but you should first make the require_shlibs target!\n");
-        fprintf (make_file, "all: %s %s\n", testcase_name, argv[0]);
-        fprintf (make_file, "\n");
-        fprintf (make_file, "# To remove everything built via this makefile...\n");
-        fprintf (make_file, "clean:\n");
-        /* Do this carefully, to avoid hitting silly HP-UX ARG_MAX limits... */
-        fprintf (make_file, "\trm -f lib0*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib1*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib2*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib3*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib4*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib5*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib6*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib7*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib8*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f lib9*-%s.*\n", testcase_name);
-        fprintf (make_file, "\trm -f %s %s %s %s.c\n", argv[0], testcase_name, linkfile_name, testcase_name);
-        fprintf (make_file, "\n");
-        fclose (make_file);
-      }
-
-    /* Generate the code for the libraries.
-       */
-    for (i=0; i < lib_num; i++) {
-
-        /* Generate the names for the library.
-         */
-        sprintf (file_name, "lib%2.2d-%s.c", i, testcase_name);
-        sprintf (file_name_core, "lib%2.2d-%s", i, testcase_name);
-
-        /* Generate the source code.
-         */
-        lib_file = fopen (file_name, "w");
-        fprintf (lib_file, "/* Shared library file number %d */\n", i);
-        fprintf (lib_file, "#include <stdio.h>\n\n");
-        fprintf (lib_file, "/* The following variables largely exist to bloat this library's debug info. */\n");
-        fprintf (lib_file, "static char c_static_buf_%d [100];\n", i);
-        for (i2=0; i2<NUMBER_OF_INT_VARS; i2++)
-          fprintf (lib_file, "int i_%d_%d;\n", i, i2);
-        fprintf (lib_file, "\nint r_%d ()\n", i);
-        fprintf (lib_file, "{\n");
-        for (i2=0; i2<NUMBER_OF_INT_VARS; i2++)
-          fprintf (lib_file, "    i_%d_%d = %d*%d;\n", i, i2, i2, i2);
-        fprintf (lib_file, "    return 1;\n");
-        fprintf (lib_file, "}\n\n");
-        fprintf (lib_file, "/* end of generated file */\n");
-        fclose (lib_file);
-
-        /* Add a linker options line
-           */
-        fprintf (link_file, "-l%2.2d-%s\n", i, testcase_name);
-    }
-
-    /* Generate the "main" file.
-     */
-    strcpy (mainfile_name, testcase_name);
-    strcat (mainfile_name, ".c");
-    main_file = fopen (mainfile_name, "w");
-    fprintf (main_file, "/* Generated test progam with %d shared libraries. */\n\n",
-             lib_num);
-    fprintf (main_file, "#include <stdio.h>\n\n");
-
-    for (i = 0; i < lib_num; i++) {
-      fprintf (main_file, "extern int r_%d();\n", i);
-    }
-
-    fprintf (main_file, "\n");
-    fprintf (main_file, "int main()\n");
-    fprintf (main_file, "{\n");
-    fprintf (main_file, "    int accum;\n");
-    fprintf (main_file, "    int lib_num = %d;\n", lib_num);
-  
-    for (i = 0; i < lib_num; i++) {
-      fprintf (main_file, "    accum += r_%d();\n", i);
-    }
-
-    fprintf (main_file, "    printf( \"Final value: %%d, should be %%d\\n\", accum, lib_num );\n\n");
-    fprintf (main_file, "    return 0;\n");
-    fprintf (main_file, "}\n\n");
-    fprintf (main_file, "/* end of generated file */\n");
-    fclose (main_file);
-
-    /* Finish up the link file and the build file
-     */
-    fclose (link_file);
-}
-
-/* End of file */
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.c b/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.c
deleted file mode 100644
index 833d027fc87..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This program raises a SIGBUS signal on HP-UX when the
-   pointer "bogus_p" is dereferenced.
-   */
-int *  bogus_p = (int *)3;
-
-int main()
-{
-  *bogus_p = 0xdeadbeef;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
deleted file mode 100644
index 3e529f8c0e6..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/hwwatchbus.exp
+++ /dev/null
@@ -1,83 +0,0 @@
-#   Copyright (C) 1997, 1998 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_hp_tests] } then { continue }
-
-if { ![istarget "hppa*-*-hpux11.*"] } {
-    verbose "HPUX h/w watch test ignored for non-hppa or pre-HP/UX-10.30 targets."
-    return 0
-}
-
-set testfile "hwwatchbus"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# build the first test case
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-# Start with a fresh gdb
-
-gdb_exit
-remote_exec build "rm -f ${binfile}.bak"
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-
-# We ought to be able to set a hardware watchpoint, step, and
-# get a SIGBUS or SIGSEGV signal reported.
-#
-if ![runto_main] then {
-  fail "can't run to main"
-  return 0
-}
-
-send_gdb "watch bogus_p\n"
-gdb_expect {
-  -re "Hardware watchpoint \[0-9\]*: bogus_p.*$gdb_prompt $"\
-          {pass "set h/w watchpoint"}
-  -re "$gdb_prompt $"\
-          {fail "set h/w watchpoint"}
-  timeout {fail "(timeout) set h/w watchpoint"}
-}
-
-send_gdb "step\n"
-gdb_expect {
-  -re "Program received signal (SIGBUS|SIGSEGV), (Bus error|Segmentation fault).* in main .*${srcfile}:8.*$gdb_prompt $"\
-          {pass "see real signal when h/w watchpoint set"}
-  -re "$gdb_prompt $"\
-          {fail "see real signal when h/w watchpoint set"}
-  timeout {fail "(timeout) see real signal when h/w watchpoint set"}
-}
-
-remote_exec build "mv ${binfile} ${binfile}.bak"
-return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.c b/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.c
deleted file mode 100644
index 31046b5454b..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <stdio.h>
-
-#ifdef PROTOTYPES
-int callee (int x)
-#else
-int callee( x )
-int x;
-#endif
-{
-    int y = x * x;
-    return (y - 2);
-}
-
-int main()
-{
-    int i;
-    for (i = 1; i < 10; i++)
-        {
-            printf( "%d ", callee( i ));
-            
-        }
-    printf( " Goodbye!\n" );
-    return 0;
-}
-/* This routine exists only for aCC.  The way we compile this test is
-   that we use aCC for the actual compile into the object file but then
-   use ld directly for the link.  When we do this, we get an undefined
-   symbol _main().  Therefore, for aCC, we have this routine in here and
-   ld is happy.  */
-
-#ifdef __cplusplus
-extern "C" {
-void _main()
-{
-}
-}
-#endif
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
deleted file mode 100644
index 4e48107c60a..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (C) 1998 Free Software Foundation, 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 is part of the gdb testsuite
-
-
-# pxdb.exp   Test that gdb calls pxdb on an application
-#            built without it.
-#
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_hp_tests] } then { continue }
-
-set testfile pxdb
-set srcfile ${testfile}.c
-set objfile ${objdir}/${subdir}/${testfile}.o
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1;
-}
-
-if { $gcc_compiled } then { continue }
-
-# To build a non-pxdb-ed file, use
-#
-#     <compile to .o file>
-#     export LD_PXDB /dev/null
-#     ld -o hello_no_pxdb hello.o /opt/langtools/lib/end.o /usr/ccs/lib/crt0.o -lc
-#
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-#
-# use this to debug:
-#log_user 1
-
-
-# Following should get the error message:
-#
-#      ld: (Warning) Can't exec pxdb using path: /dev/null
-#
-#execute_anywhere "ksh -c \"export LD_PXDB=/dev/null\""
-
-if [istarget "hppa64-*-*"] {
-set cmdline  "ksh -c \"LD_PXDB=/dev/null ld -o ${binfile} ${objfile} /opt/langtools/lib/pa20_64/crt0.o /opt/langtools/lib/pa20_64/end.o -lc\""
-} else {
-set cmdline  "ksh -c \"LD_PXDB=/dev/null ld -o ${binfile} ${objfile} /usr/ccs/lib/crt0.o /opt/langtools/lib/end.o -lc\""
-}
-
-remote_exec build "rm ${binfile}"
-remote_exec build $cmdline
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-# We expect to see this:
-#
-#  "warning: File not processed by pxdb--about to process now.
-#  "
-#  ".
-#  "Procedures: 7
-#  "Files: 2
-#  "Reading symbols from ~/c_code.dir/hello_no_pxdb...done.
-#  "(gdb)
-#
-send_gdb "file ${binfile}\n"
-gdb_expect {
-
-    -re ".*warning: File not processed by pxdb.*Procedures: \[0-9\]+.*$gdb_prompt $"\
-                            { pass "PXDB call"        }
-
-    -re "$gdb_prompt $" {
-      if [istarget hppa*-*-hpux*] {
-        pass "Didn't call pxdb"
-      } else { 
-        fail "Didn't call pxdb"
-      }
-    }
-
-    -re ".*$gdb_prompt $"       { fail "Some other message" }
-
-    timeout                 { fail "call pxdb (timeout)" }
-}
-
-# Make sure the new data makes sense
-#
-if { ![runto callee] } then { return }
-
-send_gdb "print x\n"
-gdb_expect {
-   -re ".*= 1.*$gdb_prompt $"    { pass "Good data after pxdb call" }
-   -re ".*$gdb_prompt $"         { fail "No data after pxdb call" }
-   timeout { fail "(timeout)" }
-}
-
-gdb_exit
-return 0
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp
deleted file mode 100644
index ce42c786e3d..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp
+++ /dev/null
@@ -1,189 +0,0 @@
-# Tests of wide register displays for GDB on HPPA 2.0 machines
-#   Copyright 1994, 1995 Free Software Foundation, 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
-
-# use this to debug:
-#log_user 1
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-if { [skip_hp_tests] } { continue }
-
-if ![istarget "hppa*-*-*"] {
-    verbose "Wide register test ignored for non-hppa targets."
-    return 0
-}
-
-if ![istarget "hppa64-hp-hpux*"] {
-    verbose "reg-pa64.exp is only for PA2.0W (aka PA64)."
-    return 0
-}
-
-set testfile "reg-pa64"
-set srcfile ${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-
-# To build a pa 2.0 executable
-#
-#     as +DA2.0W -o reg-pa64 reg-pa64.s
-# or 
-#     cc +DA2.0W -g -o reg-pa64 reg-pa64.s
-#
-# Don't reject if there are warnings, as we expect this warning:
-#
-#    (Warning) At least one PA 2.0 object file (pa2.0_test2.o) was detected.
-#    The linked output may not run on a PA 1.x system.
-#
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# test machine--there's no 2.0n architecture, so we have
-# to try to run the app.
-#
-gdb_test "break main" "Breakpoint.*" "initial set-up"
-
-send_gdb "run\n"
-gdb_expect {
-    -re ".*Executable file incompatible with hardware.*$gdb_prompt $" {
-        # Not hppa2.0 machine
-        #
-        return 0
-    }
-    -re "Cannot exec.*$gdb_prompt $" {
-        # Not hppa2.0 machine
-        #
-        return 0
-    }
-    -re ".*Starting program:.*$gdb_prompt $" {
-        pass "Ready to start test"
-    }
-    timeout {
-        fail "initial set-up, part 2 (timeout)"
-        return 0
-    }
-}
-
-# Let the program set known values.  This secretly deletes
-# the breakpoint at main and re-runs to mainend.
-#
-runto mainend
-
-# Look for known values
-#
-gdb_test "info reg r1"  "r1 1"
-gdb_test "info reg r4"  "r4 2"
-gdb_test "info reg r5"  "r5 4"
-gdb_test "info reg r6"  "r6 8"
-gdb_test "info reg r7"  "r7 10"
-gdb_test "info reg r8"  "r8 20"
-gdb_test "info reg r9"  "r9 40"
-gdb_test "info reg r10" "r10 80"
-gdb_test "info reg r11" "r11 100"
-gdb_test "info reg r12" "r12 200"
-gdb_test "info reg r13" "r13 400"
-gdb_test "info reg r14" "r14 800"
-gdb_test "info reg r15" "r15 1000"
-gdb_test "info reg r16" "r16 2000"
-
-# Two odd variants that GDB supports are:
-#   "1" means "r1", and
-#   "$1" means "r1"
-#
-gdb_test "info reg 1 4" "r1 1.*r4 2"
-gdb_test "info reg \$1" "r1 1"
-
-# Verify that GDB responds gracefully to a register ID number that
-# is out of range.
-#
-gdb_test "info reg 999" "999: invalid register"
-
-# Make sure the floating point status and error registers
-# don't show up as floating point numbers!
-#
-gdb_test "info reg fpsr" ".*fpsr 0.*" "fpsr"
-gdb_test "info reg fpe1" ".*fpe1 .*" "fpe1"
-gdb_test "info reg fpe2" ".*fpe2 .*" "fpe2"
-gdb_test "info reg fpe3" ".*fpe3 .*" "fpe3"
-#DTS CLLbs16708
-#info reg should recognize fpe4..fpe7.
-setup_xfail hppa64-hp-hpux* CLLbs16708
-gdb_test "info reg fpe4" ".*fpe4 .*" "fpe4"
-setup_xfail hppa64-hp-hpux* CLLbs16708
-gdb_test "info reg fpe5" ".*fpe5 .*" "fpe5"
-setup_xfail hppa64-hp-hpux* CLLbs16708
-gdb_test "info reg fpe6" ".*fpe6 .*" "fpe6"
-setup_xfail hppa64-hp-hpux* CLLbs16708
-gdb_test "info reg fpe7" ".*fpe7 .*" "fpe7"
-
-gdb_test "info reg fr4"  ".*fr4.*(double precision).* 1.*"
-gdb_test "info reg fr5"  ".*fr5.*(double precision).* 2.*"
-gdb_test "info reg fr6"  ".*fr6.*(double precision).* 2.*"
-gdb_test "info reg fr7"  ".*fr7.*(double precision).* 4.*"
-gdb_test "info reg fr8"  ".*fr8.*(double precision).* 8.*"
-gdb_test "info reg fr9"  ".*fr9.*(double precision).* 32.*"
-gdb_test "info reg fr10" ".*fr10.*(double precision).* 256.*"
-
-gdb_test "info reg r19" "r19 deadbeefbadcadee"
-
-# Need to add test of use of $<register-name>
-#
-# Q: How do you say a literal "$" in expect?
-# A: You say "\$".   A literal "\" is "\\".
-#
-# Please note that this test will fail as long as we are running
-# in 32-bit mode: it will produce "$1 = 0xbadcadee".  To fix it
-# would require building a real 64-bit gdb (expression evaluation, 
-# in particular).
-#
-send_gdb "p/x \$r19\n"
-gdb_expect {
-    -re ".*= 0xdeadbeefbadcadee.*$gdb_prompt $" {
-        pass "64-bit works"
-    }
-    -re ".*= 0xbadcadee.*$gdb_prompt $" {
-        pass "32-bit extract when using PRINT; expected but not good"
-    }
-    -re ".*$gdb_prompt $" {
-        fail "didn't print any part of right value"
-    }
-    timeout {
-        fail "timeout on print"
-    }
-}
-
-# Need to add tests of setting wide regs too.  E.g.
-#
-# set $r4 = 0x1234567890123456
-# p/x $r4
-#
-
-# done
-#
-gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.s b/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.s
deleted file mode 100644
index 4c284d79580..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.s
+++ /dev/null
@@ -1,104 +0,0 @@
-;  assemble as "as -o reg-pa64 reg-pa64.s"
-; or
-;  cc -g -o +DA2.0W
-;
-; PA-RISC 2.0 register contents test.
-;
-        .level 2.0W
-
-        .code
-        .export main,ENTRY
-        .export mainend,CODE
-        .export lab1,CODE
-        .space $TEXT$
-        .subspa $CODE$
-one
-        .align 8
-        .stringz        "?\xF0\x00\x00\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00"
-
-main
-        .proc
-        .callinfo NO_CALLS,FRAME=0
-        .entry
-
-        ;; Test we have right register numbers
-        ;;
-        ADD             %r0,%r0,%r1             ;    0 
-        LDI             1,%r1                   ;    1
-        ;;
-        ;; Don't put anything into r2 or r3--they are special registers.
-        ;;
-        ADD             %r1,%r1,%r4             ;    2
-        ADD             %r4,%r4,%r5             ;    4
-        ADD             %r5,%r5,%r6             ;    8
-        ADD             %r6,%r6,%r7             ;   16
-        ADD             %r7,%r7,%r8             ;   32
-        ADD             %r8,%r8,%r9             ;   64
-        ADD             %r9,%r9,%r10            ;  128
-        ADD             %r10,%r10,%r11          ;  256
-        ADD             %r11,%r11,%r12          ;  512
-        ADD             %r12,%r12,%r13          ; 1024
-        ADD             %r13,%r13,%r14          ; 2048
-        ADD             %r14,%r14,%r15          ; 4096
-        ADD             %r15,%r15,%r16          ; 9192
-
-        ;; Test high bits, to be sure we show them.
-        ;;
-        LDI             0xde,%r19               ; "de"
-        DEPD,Z          %r19,55,56,%r19         ; "de00"
-        LDI             0xad,%r18               ; "ad"
-        ADD             %r18,%r19,%r19          ; "dead"
-        DEPD,Z          %r19,55,56,%r19         ; "dead00"
-        LDI             0xbe,%r18               ; "be"
-        ADD             %r18,%r19,%r19          ; "deadbe"
-        DEPD,Z          %r19,55,56,%r19         ; "deadbe00"
-        LDI             0xef,%r18               ; "ef"
-        ADD             %r18,%r19,%r19          ; "deadbeef"
-        ;
-        DEPD,Z          %r19,55,56,%r19         ; "deadbeef00"
-        LDI             0xba,%r18               ; "ba"
-        ADD             %r18,%r19,%r19          ; "deadbeefba"
-        DEPD,Z          %r19,55,56,%r19         ; "deadbeefba00"
-        LDI             0xdc,%r18               ; "dc"
-        ADD             %r18,%r19,%r19          ; "deadbeefbadc"
-        DEPD,Z          %r19,55,56,%r19         ; "deadbeefbadc00"
-        LDI             0xad,%r18               ; "ad"
-        ADD             %r18,%r19,%r19          ; "deadbeefbadcad"
-        DEPD,Z          %r19,55,56,%r19         ; "deadbeefbadcad00"
-        LDI             0xee,%r18               ; "ee"
-        ADD             %r18,%r19,%r19          ; "deadbeefbadcadee"
-        
-lab1    ;; Test floating point registers
-        ;;
-        ;; LDIL            LR'one,%r22             ;
-        ;; FLDD            RR'one(%r22),%fr4       ;   1.0
-        ;; FLDD            RR'one+8(%r22),%fr5     ;   2.0
-        ;; FLDD            RR'one+8(%r22),%fr6     ;   2.0
-	B,L		here,%r2
-	NOP
-here	DEPDI		0x0,63,2,%r2
-	LDO		one-here(%r2),%r2
-	FLDD		0(%r2),%fr4
-	FLDD		8(%r2),%fr5
-	FLDD		8(%r2),%fr6
-
-        FMPY,DBL        %fr5,%fr6,%fr7          ;   4.0
-        FMPY,DBL        %fr6,%fr7,%fr8          ;   8.0
-        FMPY,DBL        %fr7,%fr8,%fr9          ;  32.0
-        FMPY,DBL        %fr8,%fr9,%fr10         ; 256.0
-        
-        ;; The NOP prevents anything from end.o or crt0.o from
-        ;; being appended immediately after "mainend".  If that
-        ;; happens, then we may have other labels that have the
-        ;; same address as "mainend", and thus the debugger
-        ;; may symbolize this PC to something other than "mainend".
-mainend                
-        NOP
-        .exit
-        .procend
-
-        .space $TEXT$
-        .subspa $CODE$
-        .subspa $LIT$        ;; <don't use> ,QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=16
-        .end
-
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
deleted file mode 100644
index cc1028d5375..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
+++ /dev/null
@@ -1,238 +0,0 @@
-# This test script is part of GDB, the GNU debugger.
-
-# Copyright 1998, 1999, 2001, 2004,
-# Free Software Foundation, 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
-
-# Tests of wide register displays for GDB on HPPA 2.0 machines
-
-# use this to debug:
-#log_user 1
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-if { [skip_hp_tests] } then { continue }
-
-set testfile "reg"
-
-if [istarget "hppa64-hp-hpux*"] {
-    verbose "reg.exp is not for PA2.0W."
-    return 0
-}
-set srcfile ${testfile}.s
-set binfile ${objdir}/${subdir}/${testfile}
-
-# To build a pa 2.0 executable
-#
-#     as -o reg reg.s
-# or 
-#     cc -g -o reg reg.s
-#
-# The +DA2.0N flag doesn't seem to be needed.
-#
-# Don't reject if there are warnings, as we expect this warning:
-#
-#    (Warning) At least one PA 2.0 object file (pa2.0_test2.o) was detected.
-#    The linked output may not run on a PA 1.x system.
-#
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# test machine--there's no 2.0n architecture, so we have
-# to try to run the app.
-#
-send_gdb "break main\n"
-    gdb_expect {
-        -re "Breakpoint.*$gdb_prompt $" {
-            pass "initial set-up"
-        }
-        -re ".*$gdb_prompt $" {
-            fail "initial set-up"
-        }
-        timeout {
-            fail "initial set-up (timeout)"
-        }
-    }
-
-send_gdb "run\n"
-    gdb_expect {
-        -re ".*Executable file incompatible with hardware.*$gdb_prompt $" {
-            # Not hppa2.0 machine
-            #
-            return 0
-        }
-        -re "Cannot exec.*$gdb_prompt $" {
-            # Not hppa2.0 machine
-            #
-            return 0
-        }
-        -re ".*Starting program:.*$gdb_prompt $" {
-            pass "Ready to start test"
-        }
-        timeout {
-            fail "initial set-up, part 2 (timeout)"
-            return 0
-        }
-    }
-
-# Let the program set known values.  This secretly deletes
-# the breakpoint at main and re-runs to mainend.
-#
-runto mainend
-
-# Look for known values
-#
-# The output format changed between gdb 6.1.1 and gdb HEAD 2004-06-01.
-#
-#   gdb 6.1.1:
-#   (gdb) info reg r1
-#   r1 1
-#
-#   gdb HEAD 2004-06-01:
-#   (gdb) info reg r1
-#   r1             0x1     1
-#
-# For now, I accept both formats.  In the future, you can remove
-# the old gdb 6.1.1 format.
-#
-# -- chastain 2004-06-26
-
-set ws "\[\r\n\t \]+"
-
-proc hp_integer_reg {regname vhex vdec} {
-  global ws
-  set value_611 "$regname${ws}$vhex"
-  set value_new "$regname${ws}0x$vhex${ws}$vdec"
-  gdb_test "info reg $regname" "$value_611|$value_new"
-}
-
-hp_integer_reg "r1"      "1"     "1"
-hp_integer_reg "r4"      "2"     "2"
-hp_integer_reg "r5"      "4"     "4"
-hp_integer_reg "r6"      "8"     "8"
-hp_integer_reg "r7"     "10"    "16"
-hp_integer_reg "r8"     "20"    "32"
-hp_integer_reg "r9"     "40"    "64"
-hp_integer_reg "r10"    "80"   "128"
-hp_integer_reg "r11"   "100"   "256"
-hp_integer_reg "r12"   "200"   "512"
-hp_integer_reg "r13"   "400"  "1024"
-hp_integer_reg "r14"   "800"  "2048"
-hp_integer_reg "r15"  "1000"  "4096"
-hp_integer_reg "r16"  "2000"  "8192"
-
-# Two odd variants that GDB supports are:
-#   "1" means "r1", and
-#   "$1" means "r1"
-
-hp_integer_reg "1" "1" "1"
-hp_integer_reg "4" "2" "2"
-
-set name "info reg \$1"
-gdb_test_multiple "info reg \$1" "$name" {
-    -re "r1${ws}1\r\n$gdb_prompt $" {
-	pass "$name"
-    }
-    -re "r1${ws}0x1${ws}1\r\n$gdb_prompt $" {
-	pass "$name"
-    }
-}
-
-# Verify that GDB responds gracefully to a register ID number that
-# is out of range.
-
-gdb_test "info reg 999" "Invalid register.*999.*"
-
-# Make sure the floating point status and error registers
-# don't show up as floating point numbers!
-
-hp_integer_reg "fpsr" "0" "0"
-hp_integer_reg "fpe1" "0" "0"
-hp_integer_reg "fpe2" "0" "0"
-hp_integer_reg "fpe3" "0" "0"
-hp_integer_reg "fpe4" "0" "0"
-hp_integer_reg "fpe5" "0" "0"
-hp_integer_reg "fpe6" "0" "0"
-hp_integer_reg "fpe7" "0" "0"
-
-# Floating point registers.
-# TODO: these are old format only.
-
-gdb_test "info reg fr4"  ".*fr4.*(double precision).* 1"
-gdb_test "info reg fr5"  ".*fr5.*(double precision).* 2"
-gdb_test "info reg fr6"  ".*fr6.*(double precision).* 2"
-gdb_test "info reg fr7"  ".*fr7.*(double precision).* 4"
-gdb_test "info reg fr8"  ".*fr8.*(double precision).* 8"
-gdb_test "info reg fr9"  ".*fr9.*(double precision).* 32"
-gdb_test "info reg fr10" ".*fr10.*(double precision).* 256"
-
-# An integer register with a 64-bit value.
-
-set name "info reg r19"
-gdb_test_multiple "info reg r19" "$name" {
-    -re "r19${ws}deadbeefbadcadee\r\n$gdb_prompt $" {
-	# old gdb 6.1.1 format, good result
-	pass "$name"
-    }
-    -re "r19${ws}badcadee\r\n$gdb_prompt $" {
-	# old gdb 6.1.1 format, bad result
-	fail "$name (32-bit truncation)"
-    }
-    -re "r19${ws}0xdeadbeefbadcadee${ws}16045690984232431086\r\n$gdb_prompt $" {
-	# new gdb HEAD 2004-06-01 format, good result
-	pass "$name"
-    }
-    -re "r19${ws}0xbadcadee${ws}3135024622\r\n$gdb_prompt $" {
-	# new gdb HEAD 2004-06-01 format, 32 bit truncation
-	fail "$name (32-bit truncation)"
-    }
-}
-
-set name "print /x \$r19"
-gdb_test_multiple "print /x \$r19" "$name" {
-    -re "= 0xdeadbeefbadcadee\r\n$gdb_prompt $" {
-	pass "$name"
-    }
-    -re "= 0xbadcadee\r\n$gdb_prompt $" {
-	# this was a PASS in the last version so keep it PASS for now
-	# -- chastain 2004-06-26
-	pass "$name (32-bit truncation)"
-    }
-}
-
-# Need to add tests of setting wide regs too.  E.g.
-#
-# set $r4 = 0x1234567890123456
-# p/x $r4
-#
-
-# done
-#
-gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.s b/gdb/testsuite/gdb.hp/gdb.base-hp/reg.s
deleted file mode 100644
index 8cc15f8f6e6..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.s
+++ /dev/null
@@ -1,96 +0,0 @@
-;  assemble as "as -o reg reg.s"
-; or
-;  cc -g -o +DA2.0N
-;
-; PA-RISC 2.0 register contents test.
-;
-        .level 2.0
-
-        .code
-        .export main,ENTRY
-        .export mainend,CODE
-        .export lab1,CODE
-        .space $TEXT$
-        .subspa $CODE$
-
-main
-        .proc
-        .callinfo NO_CALLS,FRAME=0
-        .entry
-
-        ;; Test we have right register numbers
-        ;;
-        ADD             %r0,%r0,%r1             ;    0 
-        LDI             1,%r1                   ;    1
-        ;;
-        ;; Don't put anything into r2 or r3--they are special registers.
-        ;;
-        ADD             %r1,%r1,%r4             ;    2
-        ADD             %r4,%r4,%r5             ;    4
-        ADD             %r5,%r5,%r6             ;    8
-        ADD             %r6,%r6,%r7             ;   16
-        ADD             %r7,%r7,%r8             ;   32
-        ADD             %r8,%r8,%r9             ;   64
-        ADD             %r9,%r9,%r10            ;  128
-        ADD             %r10,%r10,%r11          ;  256
-        ADD             %r11,%r11,%r12          ;  512
-        ADD             %r12,%r12,%r13          ; 1024
-        ADD             %r13,%r13,%r14          ; 2048
-        ADD             %r14,%r14,%r15          ; 4096
-        ADD             %r15,%r15,%r16          ; 9192
-
-        ;; Test high bits, to be sure we show them.
-        ;;
-        LDI             0xde,%r19               ; "de"
-        DEPD,Z          %r19,55,56,%r19         ; "de00"
-        LDI             0xad,%r18               ; "ad"
-        ADD             %r18,%r19,%r19          ; "dead"
-        DEPD,Z          %r19,55,56,%r19         ; "dead00"
-        LDI             0xbe,%r18               ; "be"
-        ADD             %r18,%r19,%r19          ; "deadbe"
-        DEPD,Z          %r19,55,56,%r19         ; "deadbe00"
-        LDI             0xef,%r18               ; "ef"
-        ADD             %r18,%r19,%r19          ; "deadbeef"
-        ;
-        DEPD,Z          %r19,55,56,%r19         ; "deadbeef00"
-        LDI             0xba,%r18               ; "ba"
-        ADD             %r18,%r19,%r19          ; "deadbeefba"
-        DEPD,Z          %r19,55,56,%r19         ; "deadbeefba00"
-        LDI             0xdc,%r18               ; "dc"
-        ADD             %r18,%r19,%r19          ; "deadbeefbadc"
-        DEPD,Z          %r19,55,56,%r19         ; "deadbeefbadc00"
-        LDI             0xad,%r18               ; "ad"
-        ADD             %r18,%r19,%r19          ; "deadbeefbadcad"
-        DEPD,Z          %r19,55,56,%r19         ; "deadbeefbadcad00"
-        LDI             0xee,%r18               ; "ee"
-        ADD             %r18,%r19,%r19          ; "deadbeefbadcadee"
-        
-lab1    ;; Test floating point registers
-        ;;
-        LDIL            LR'one,%r22             ;
-        FLDD            RR'one(%r22),%fr4       ;   1.0
-        FLDD            RR'one+8(%r22),%fr5     ;   2.0
-        FLDD            RR'one+8(%r22),%fr6     ;   2.0
-        FMPY,DBL        %fr5,%fr6,%fr7          ;   4.0
-        FMPY,DBL        %fr6,%fr7,%fr8          ;   8.0
-        FMPY,DBL        %fr7,%fr8,%fr9          ;  32.0
-        FMPY,DBL        %fr8,%fr9,%fr10         ; 256.0
-        
-        ;; The NOP prevents anything from end.o or crt0.o from
-        ;; being appended immediately after "mainend".  If that
-        ;; happens, then we may have other labels that have the
-        ;; same address as "mainend", and thus the debugger
-        ;; may symbolize this PC to something other than "mainend".
-mainend                
-        NOP
-        .exit
-        .procend
-
-        .space $TEXT$
-        .subspa $CODE$
-        .subspa $LIT$        ;; <don't use> ,QUAD=0,ALIGN=8,ACCESS=0x2c,SORT=16
-one
-        .align 8
-        .stringz        "?\xF0\x00\x00\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00"
-        .end
-
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.c b/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.c
deleted file mode 100644
index a6d57881f48..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.c
+++ /dev/null
@@ -1,43 +0,0 @@
-
-enum Normal {
-  red,
-  blue,
-  green
-};
-
-short enum Small {
-  pink,
-  cyan,
-  grey
-};
-
-char enum Tiny {
-  orange,
-  yellow,
-  brown
-};
-
-
-main()
-{
-  enum Normal normal[3];
-  short enum Small small[3];
-  char enum Tiny tiny[3];
-  int i;
-
-  for (i=0; i < 3; i++)
-    {
-      normal[i] = (enum Normal) i;
-      small[i] = (short enum Small) i;
-      tiny[i] = (char enum Tiny) i;
-    }
-  normal[0] = 0; /* place to hang a breakpoint */ 
-}
-
-    
-  
-
-  
-
-
-  
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.exp
deleted file mode 100644
index 0b5b6871eff..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/sized-enum.exp
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright (C) 1997, 1998 Free Software Foundation, 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
-
-# GDB tests for sized enumerations
-
-# This is aimed at HP-UX systems.  The HP C compiler
-# allows specifying "char" or "short" for an enum, to
-# indicate that it is 1 or 2 bytes long.
-
-# This file was written by Satish Pai <pai@apollo.hp.com>
-# 1997-09-24
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-if { [skip_hp_tests] } then { continue }
-
-set testfile "sized-enum"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if { $gcc_compiled } then { continue }
-if {$hp_aCC_compiler} {continue}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# set it up at a breakpoint so we can play with the variable values
-#
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-# set a breakpoint and go there
-send_gdb "break 34\n"   
-gdb_expect {   
-   -re "Breakpoint.*line 34.*$gdb_prompt $" { pass "set break 34" }
-   -re "$gdb_prompt $"                     { fail "set break 34" }
-   timeout                             { fail "(timeout) set break 34" }
-}
-send_gdb "continue\n"   
-gdb_expect {   
-   -re "Continuing\\.\r\n\r\nBreakpoint \[0-9\]*, main....at.*sized-enum\\.c:34\r\n34.*\r\n$gdb_prompt $" { pass "continue" }
-   -re "$gdb_prompt $"                     { fail "continue" }
-   timeout                             { fail "(timeout) continue" }
-}
-
-# print stuff
-send_gdb "print normal\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = \\{red, blue, green\\}.*$gdb_prompt $" { pass "print normal" }
-   -re "$gdb_prompt $"                     { fail "print normal" }
-   timeout                             { fail "(timeout) print normal" }
-}
-send_gdb "print small\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = \\{pink, cyan, grey\\}.*$gdb_prompt $" { pass "print small" }
-   -re "$gdb_prompt $"                     { fail "print small" }
-   timeout                             { fail "(timeout) print small" }
-}
-send_gdb "print tiny\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = \\{orange, yellow, brown\\}.*$gdb_prompt $" { pass "print tiny" }
-   -re "$gdb_prompt $"                     { fail "print tiny" }
-   timeout                             { fail "(timeout) print tiny" }
-}
-
-# print type sizes
-send_gdb "print sizeof (Normal)\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = 4.*$gdb_prompt $" { pass "print sizeof (Normal)" }
-   -re "$gdb_prompt $"                     { fail "print sizeof (Normal)" }
-   timeout                             { fail "(timeout) print sizeof (Normal)" }
-}
-send_gdb "print sizeof (Small)\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = 2.*$gdb_prompt $" { pass "print sizeof (Small)" }
-   -re "$gdb_prompt $"                     { fail "print sizeof (Small)" }
-   timeout                             { fail "(timeout) print sizeof (Small)" }
-}
-send_gdb "print sizeof (Tiny)\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = 1.*$gdb_prompt $" { pass "print sizeof (Tiny)" }
-   -re "$gdb_prompt $"                     { fail "print sizeof (Tiny)" }
-   timeout                             { fail "(timeout) print sizeof (Tiny)" }
-}
-
-# print types
-send_gdb "ptype normal\n"   
-gdb_expect {   
-   -re "type = enum Normal \\{red, blue, green\\} \\\[3\\\].*$gdb_prompt $" { pass "ptype normal" }
-   -re "$gdb_prompt $"                     { fail "ptype normal" }
-   timeout                             { fail "(timeout) ptype normal" }
-}
-send_gdb "ptype small\n"   
-gdb_expect {   
-   -re "type = short enum Small \\{pink, cyan, grey\\} \\\[3\\\].*$gdb_prompt $" { pass "ptype small" }
-   -re "$gdb_prompt $"                     { fail "ptype small" }
-   timeout                             { fail "(timeout) ptype small" }
-}
-send_gdb "ptype tiny\n"   
-gdb_expect {   
-   -re "type = char enum Tiny \\{orange, yellow, brown\\} \\\[3\\\].*$gdb_prompt $" { pass "ptype tiny" }
-   -re "$gdb_prompt $"                     { fail "ptype tiny" }
-   timeout                             { fail "(timeout) ptype tiny" }
-}
-
-# convert to int
-send_gdb "print (int) blue\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = 1.*$gdb_prompt $" { pass "print (int) blue" }
-   -re "$gdb_prompt $"                     { fail "print (int) blue" }
-   timeout                             { fail "(timeout) print (int) blue" }
-}
-send_gdb "print (int) cyan\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = 1.*$gdb_prompt $" { pass "print (int) cyan" }
-   -re "$gdb_prompt $"                     { fail "print (int) cyan" }
-   timeout                             { fail "(timeout) print (int) cyan" }
-}
-send_gdb "print (int) yellow\n"   
-gdb_expect {   
-   -re "\\$\[0-9\]* = 1.*$gdb_prompt $" { pass "print (int) yellow" }
-   -re "$gdb_prompt $"                     { fail "print (int) yellow" }
-   timeout                             { fail "(timeout) print (int) yellow" }
-}
-
-
-
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp
deleted file mode 100644
index 0a5de66d1ef..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp
+++ /dev/null
@@ -1,341 +0,0 @@
-#   Copyright (C) 1997, 1998 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-set prms_id 0
-set bug_id 0
-
-if { [skip_hp_tests] } then { continue }
-
-set testfile "so-thresh"
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-# This testcase is relatively large, and therefore can take awhile to
-# load.  We'd best set the timeout to something suitable, or we may
-# seem to fail...
-#
-set timeout 60
-
-# Build procedure for this testcase:
-#    ${srcdir}/${subdir}/so-thresh.sh ${subdir}
-#        which calls,
-#        make -f ${srcdir}/${subdir}/so-thresh.mk <targets> <macros>
-#            which builds,
-#                genso-thresh (from genso-thresh.c)
-#                    which generates,
-#                        lib00-so-thresh.c
-#                        lib01-so-thresh.c
-#                        lib02-so-thresh.c
-#                        so-thresh.lopt (link options file)
-#                lib0*-so-thresh.sl (from .c files above)
-#                so-thresh (from so-thresh.c)
-#                    using lib0*-so-thresh.sl and so-thresh.lopt
-#
-# Since so-thresh.mk requires SRCDIR and OBJDIR macro definitions,
-# and SRCDIR / OBJDIR could be in relative path format, we use
-# so-thresh.sh script to pin down SRCDIR / OBJDIR (using $PWD/ prefix
-# when detected relative path values for srcdir / objdir), before the
-# 'cd $subdir' call (when this can be done in TCL here, we can call
-# make directly instead).
-#
-# remote_exec build "sh -c \\\"cd ${objdir}/${subdir}\\; make -v -f ${srcdir}/${subdir}/${testfile}.mk clean require_shlibs all SRCDIR=${srcdir}/${subdir} OBJDIR=${objdir}/${subdir}\\\""
-
-remote_exec build "${srcdir}/${subdir}/${testfile}.sh $subdir"
-
-# Only HP-UX (and any other platforms using SOM shared libraries, I
-# guess) interprets the auto-solib-limit variable as a threshhold,
-# rather than a boolean that strictly enables or disables automatic
-# loading of shlib symbol tables.
-#
-# On HP-UX, it is the size threshhold (in megabytes) at which to
-# stop auto loading of symbol tables.
-#
-if ![istarget "hppa*-hp-hpux*"] then {
-   setup_xfail "*-*-*"
-}
-
-# Start with a fresh gdb
-#
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# This is a test of gdb's ability on HP-UX to stop automatically
-# loading symbols of shared libraries, when the total size of the
-# debugger's symbol table reaches a specified threshhold.
-#
-
-# On HP-UX, the help text for auto-solib-limit mentions that it
-# serves as a threshhold.
-#
-send_gdb "help set auto-solib-limit\n"
-gdb_expect {
-  -re "Set threshold .in Mb. for autoloading shared library symbols.*
-When shared library autoloading is enabled, new libraries will be loaded.*
-only until the total size of shared library symbols exceeds this.*
-threshold in megabytes.  Is ignored when using .sharedlibrary.*$gdb_prompt $"\
-          {pass "help set auto-solib-limit"}
-  -re "$gdb_prompt $"\
-          {fail "help set auto-solib-limit"}
-  timeout {fail "(timeout) help set auto-solib-limit"}
-}
-
-# On HP-UX, the threshhold is by default set to 50, which means
-# 50 megabytes.
-#
-send_gdb "show auto-solib-limit\n"
-gdb_expect {
-  -re "Threshold .in Mb. for autoloading shared library symbols is $decimal.*$gdb_prompt $"\
-          {pass "show auto-solib-limit "}
-  -re "$gdb_prompt $"\
-          {fail "show auto-solib-limit "}
-  timeout {fail "(timeout) show auto-solib-limit "}
-}
-
-send_gdb "set auto-solib-limit 1\n"
-gdb_expect {
-   -re ".*$gdb_prompt $"
-            {pass "set auto-solib-limit to 1"}
-   -re ".*$gdb_prompt $"
-            {fail "set auto-solib-limit to 1"}
-   timeout {fail "(timeout) set auto-solib-limit to 1"}
-}
-
-
-# We have manually verified that our testcase exceeds 1 Mbytes
-# of heap space in GDB to hold the symbols for the main program
-# and all associated linked-against libraries.  Thus, when we
-# run to the program's main, and therefore notice all the linked-
-# against shlibs, we expect to hit the threshhold.
-#
-# (Note that we're not using the expect [runto main] function here,
-# 'cause we want to match on output from the run command.
-#
-send_gdb "break main\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]* at.*$gdb_prompt $"\
-          {pass "1 set break at main"}
-  -re "$gdb_prompt $"\
-          {fail "1 set break at main"}
-  timeout {fail "(timeout) 1 set break at main"}
-}
-
-send_gdb "run\n"
-gdb_expect {
-  -re ".*warning. Symbols for some libraries have not been loaded, because.*
-doing so would exceed the size threshold specified by auto-solib-limit.*
-To manually load symbols, use the 'sharedlibrary' command.*
-To raise the threshold, set auto-solib-limit to a larger value and rerun.*
-the program.*$gdb_prompt $"\
-          {pass "run to main hit auto-solib-limit threshold"}
-  -re "$gdb_prompt $"\
-          {fail "run to main hit auto-solib-limit threshold"}
-  timeout {fail "(timeout) run to main hit auto-solib-limit threshold"}
-}
-
-# Verify that "info share" mentions something about libraries whose
-# symbols weren't loaded.
-#
-# We'll assume that at least the last two shlib's symbols weren't
-# loaded.  As a side-effect of matching this pattern, the text start
-# address of the last one is captured in expect_out(1,string).
-# (we'll need it for the 'add-symbol-file' command in a nonce...)
-#
-send_gdb "info sharedlibrary\n"
-gdb_expect {
-  -re ".*lib01_$testfile.sl .*symbols not loaded.*0x\[0-9\]*  (0x\[0-9a-fA-F\]*).*$gdb_prompt $"\
-          { send_gdb "add-symbol-file lib02_$testfile.sl $expect_out(1,string)\n"
-            gdb_expect {
-              -re "add symbol table.*y or n.*$"\
-                      {send_gdb "y\n"
-                       gdb_expect {
-                         -re "$gdb_prompt $" {pass "add-symbol-file and info sharedlib"}
-                         timeout {fail "(timeout) add-symbol-file and info sharedlib"}
-                       }}
-              -re "$gdb_prompt $"\
-                      {fail "add-symbol-file and info sharedlib"}
-              timeout {fail "(timeout) add-symbol-file and info sharedlib"}
-            }
-          }
-  -re "$gdb_prompt $" {
-	setup_xfail hppa*-*-* CHFts24108
-	fail "info sharedlibrary shows shlibs with unloaded symbols"
-    }
-  timeout {fail "(timeout) info sharedlibrary shows shlibs with unloaded symbols"}
-}
-
-# Verify that we can manually load the symbol table of a library
-# whose symbols weren't loaded.  (We'll pick the last one.)
-#
-
-# I moved this test inside the one above, because the expect_out array is not ok if the
-# previous test has failed, and expect would error out (elz)
-#
-#send_gdb "add-symbol-file lib02_$testfile.sl $expect_out(1,string)\n"
-#gdb_expect {
-#  -re "add symbol table.*y or n.*$"\
-#          {send_gdb "y\n"
-#           gdb_expect {
-#             -re "$gdb_prompt $" {pass "add-symbol-file"}
-#             timeout {fail "(timeout) add-symbol-file"}
-#           }}
-#  -re "$gdb_prompt $"\
-#          {fail "add-symbol-file"}
-#  timeout {fail "(timeout) add-symbol-file"}
-#}
-
-# Verify that we can manually load the symbols for all libraries
-# which weren't already loaded.
-#
-# Warning!  On a machine with little free swap space, this may
-# fail!
-#
-send_gdb "sharedlibrary\n"
-gdb_expect {
-  -re "Reading symbols from.*done.*$gdb_prompt $"\
-          {pass "sharedlibrary"}
-  -re "$gdb_prompt $" {
-	setup_xfail hppa*-*-* CHFts24108
-	fail "sharedlibrary"
-    }
-  timeout {fail "(timeout) sharedlibrary"}
-}
-
-# Rerun the program, this time verifying that we can set the
-# threshhold high enough to avoid hitting it.
-#
-# It appears that gdb isn't freeing memory when rerunning, as one
-# would expect.  To avoid potentially hitting a virtual memory
-# ceiling, start with a fresh gdb.
-#
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-send_gdb "break main\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]* at.*$gdb_prompt $"\
-          {pass "2 set break at main"}
-  -re "$gdb_prompt $"\
-          {fail "2 set break at main"}
-  timeout {fail "(timeout) 2 set break at main"}
-}
-
-send_gdb "set auto-solib-limit 9999\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "set auto-solib-limit threshold to practical infinity"}
-  timeout {fail "(timeout) set auto-solib-limit threshold to practical infinity"}
-}
-send_gdb "run\n"
-gdb_expect {
-  -re ".*warning. Symbols for some libraries have not been loaded, because.*
-doing so would exceed the size threshold specified by auto-solib-limit.*
-To manually load symbols, use the 'sharedlibrary' command.*
-To raise the threshold, set auto-solib-limit to a larger value and rerun.*
-the program.*$gdb_prompt $"\
-          {fail "rerun threshold at practical infinity (still hit threshold)"}
-  -re "$gdb_prompt $"\
-          {pass "rerun with threshold at practical infinity"}
-  timeout {fail "(timeout) rerun with threshold at practical infinity"}
-}
-
-# Rerun the program, this time altogether disabling the auto loading
-# feature.  There should be no information at all about shared
-# libraries now.
-#
-# ??rehrauer: Personally, I'd call that a bug, since it doesn't give
-# you the ability to manually load single shlibs (you need the text
-# start address that 'info share' normall gives you).  On the other
-# hand, one can easily choose to load them all...
-#
-# It appears that gdb isn't freeing memory when rerunning, as one
-# would expect.  To avoid potentially hitting a virtual memory
-# ceiling, start with a fresh gdb.
-#
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-send_gdb "break main\n"
-gdb_expect {
-  -re "Breakpoint \[0-9\]* at.*$gdb_prompt $"\
-          {pass "3 set break at main"}
-  -re "$gdb_prompt $"\
-          {fail "3 set break at main"}
-  timeout {fail "(timeout) 3 set break at main"}
-}
-
-send_gdb "set auto-solib-limit 0\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "set auto-solib-limit threshold to 0"}
-  timeout {fail "(timeout) set auto-solib-limit threshold to 0"}
-}
-send_gdb "run\n"
-gdb_expect {
-  -re ".*warning. Symbols for some libraries have not been loaded, because.*
-doing so would exceed the size threshold specified by auto-solib-limit.*
-To manually load symbols, use the 'sharedlibrary' command.*
-To raise the threshold, set auto-solib-limit to a larger value and rerun.*
-the program.*$gdb_prompt $"\
-          {fail "rerun threshold at 0 (still hit threshold)"}
-  -re "$gdb_prompt $"\
-          {pass "rerun with threshold at 0"}
-  timeout {fail "(timeout) rerun with threshold at 0"}
-}
-
-# Verify that we can still manually load symbols for all libraries.
-# (We'll assume that if the last shlib's symbols are loaded, that
-# all of them were.)
-#
-# Note that we set the GDB "height" variable to prevent GDB from
-# prompting 
-#
-# Warning!  On a machine with little free swap space, this may
-# fail!
-#
-send_gdb "set height 9999\n"
-gdb_expect {
-  -re "$gdb_prompt $"\
-          {pass "set screen page height to practical infinity"}
-  timeout {fail "(timeout) set screen page height to practical infinity"}
-}
-send_gdb "sharedlibrary\n"
-gdb_expect {
-  -re ".*Reading symbols from .*/lib02-so-thresh\\.sl\\.\\.\\.done\\..*$gdb_prompt $"\
-          {pass "manually load all symbols"}
-  -re "$gdb_prompt $" {
-	setup_xfail hppa*-*-* CHFts24108
-	fail "manually load all symbols (CHFts24108)"
-    }
-  timeout {fail "(timeout) manually load all symbols"}
-}
-
-return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.mk b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.mk
deleted file mode 100644
index f71e9210c7f..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-# Make file for so-thresh test
-
-OBJDIR=.
-SRCDIR=.
-CFLAGS = +DA1.1 -g
-CC=cc
-
-# This is how to build this generator.
-genso-thresh.o: ${SRCDIR}/genso-thresh.c
-	$(CC) $(CFLAGS) -o genso-thresh.o -c ${SRCDIR}/genso-thresh.c
-genso-thresh: genso-thresh.o
-	$(CC) $(CFLAGS) -o genso-thresh genso-thresh.o
-
-# This is how to run this generator.
-# This target should be made before the 'all' target,
-# to ensure that the shlib sources are all available.
-require_shlibs: genso-thresh
-	if ! [ -a lib00-so-thresh.c ] ; then \
-	  genso-thresh ; \
-	fi
-	if ! [ -a lib01-so-thresh.c ] ; then \
-	  genso-thresh ; \
-	fi
-	if ! [ -a lib02-so-thresh.c ] ; then \
-	  genso-thresh ; \
-	fi
-
-# This is how to build all the shlibs.
-# Be sure to first make the require_shlibs target!
-lib00-so-thresh.o: lib00-so-thresh.c
-	$(CC) $(CFLAGS) +Z -o lib00-so-thresh.o -c lib00-so-thresh.c
-lib00-so-thresh.sl: lib00-so-thresh.o
-	$(LD) $(LDFLAGS) -b -o lib00-so-thresh.sl lib00-so-thresh.o
-lib01-so-thresh.o: lib01-so-thresh.c
-	$(CC) $(CFLAGS) +Z -o lib01-so-thresh.o -c lib01-so-thresh.c
-lib01-so-thresh.sl: lib01-so-thresh.o
-	$(LD) $(LDFLAGS) -b -o lib01-so-thresh.sl lib01-so-thresh.o
-lib02-so-thresh.o: lib02-so-thresh.c
-	$(CC) $(CFLAGS) +Z -o lib02-so-thresh.o -c lib02-so-thresh.c
-lib02-so-thresh.sl: lib02-so-thresh.o
-	$(LD) $(LDFLAGS) -b -o lib02-so-thresh.sl lib02-so-thresh.o
-
-
-
-
-# For convenience, here's names for all pieces of all shlibs.
-SHLIB_SOURCES = \
-	lib00-so-thresh.c \
-	lib01-so-thresh.c \
-	lib02-so-thresh.c 
-
-SHLIB_OBJECTS = $(SHLIB_SOURCES:.c=.o)
-SHLIBS = $(SHLIB_SOURCES:.c=.sl)
-SHLIB_NAMES = $(SHLIB_SOURCES:.c=)
-EXECUTABLES = $(SHLIBS) genso-thresh so-thresh
-OBJECT_FILES = $(SHLIB_OBJECTS) genso-thresh.o so-thresh.o
-
-shlib_objects: $(SHLIB_OBJECTS)
-shlibs: $(SHLIBS)
-
-# This is how to build the debuggable testcase that uses the shlibs.
-so-thresh.o: so-thresh.c
-	$(CC) $(CFLAGS) -o so-thresh.o -c so-thresh.c
-so-thresh: shlibs so-thresh.o
-	$(LD) $(LDFLAGS) -o so-thresh -lc -L${OBJDIR} -c so-thresh.lopt /opt/langtools/lib/end.o /lib/crt0.o so-thresh.o
-
-# Yeah, but you should first make the require_shlibs target!
-all: so-thresh genso-thresh
-
-# To remove everything built via this makefile...
-clean:
-	rm -f lib0*-so-thresh.*
-	rm -f *.o genso-thresh so-thresh.lopt so-thresh.c
-	rm -f so-thresh
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.sh b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.sh
deleted file mode 100755
index 6b6d6ecc3cd..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/ksh
-
-# so-thresh.sh
-#
-# This script is a "wrapper" to use the so-thresh.mk
-# Makefile.  See the comments in so-thresh.exp
-# regarding why this script exists.
-
-#set -o xtrace
-#set -o verbose
-
-if [ "$srcdir" = "${srcdir#/}" ]
-then
-    srcdir="$PWD/$srcdir"
-fi
-
-if [ "$objdir" = "${objdir#/}" ]
-then
-    objdir="$PWD/$objdir"
-fi
-
-subdir="$1"
-
-HERE=$PWD
-cd $subdir
-
-MAKEFLAGS=
-make -f ${srcdir}/${subdir}/so-thresh.mk clean require_shlibs all SRCDIR=${srcdir}/${subdir} OBJDIR=${objdir}/${subdir} > ${objdir}/${subdir}/so-thresh.make.out 2>&1
-STATUS=$?
-
-cd $HERE
-echo "return STATUS is $STATUS"
-
-exit $STATUS
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in b/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in
deleted file mode 100644
index ada0f1a23ef..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = xdb xdb-test
-
-all:
-	@echo "Nothing to be done for all..."
-
-info:
-install-info:
-dvi:
-install:
-uninstall: force
-installcheck:
-check:
-
-clean mostlyclean:
-	-rm -f *~ *.o *.ci
-	-rm -f core $(EXECUTABLES)
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
-	-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.hp/gdb.compat/average.c b/gdb/testsuite/gdb.hp/gdb.compat/average.c
deleted file mode 100644
index 25ba2ee6a6c..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/average.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This is a sample program for the HP WDB debugger. */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef PROTOTYPES
-extern int sum(int *, int, int);
-#else
-extern int sum();
-#endif
-
-#define num   10
-
-static int my_list[num] = {3,4,2,0,2,1,8,3,6,7};
-
-#ifdef __STDC__
-void print_average(int *list, int low, int high) 
-#else
-void print_average(list, low, high)
-int *list, low, high;
-#endif
-    {
-        int total = 0, num_elements = 0, average = 0;
-        total = sum(list, low, high);
-        num_elements = high - low;  /* note this is an off-by-one bug */
-
-        average = total / num_elements;
-        printf("%10.d\n", average);
-    }
-
-#ifdef __STDC__
-int main(void)
-#else
-main ()
-#endif
-{
-    char c;
-    int first = 0, last = 0;
-    last = num-1;
-
-    /* Try two test cases. */
-    print_average (my_list, first, last);
-    print_average (my_list, first, last - 3);
-
-    exit(0);
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/configure b/gdb/testsuite/gdb.hp/gdb.compat/configure
deleted file mode 100755
index fd27a1780e9..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/configure
+++ /dev/null
@@ -1,2246 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="xdb1.exp"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/configure.ac b/gdb/testsuite/gdb.hp/gdb.compat/configure.ac
deleted file mode 100644
index 05c63b7517f..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/configure.ac
+++ /dev/null
@@ -1,15 +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.59)
-AC_INIT(xdb1.exp)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../../..)
-AC_CANONICAL_SYSTEM
-
-AC_OUTPUT(Makefile)
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/sum.c b/gdb/testsuite/gdb.hp/gdb.compat/sum.c
deleted file mode 100644
index d295f7e2793..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/sum.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This is a sample program for the HP/DDE debugger. */
-#include <stdio.h>
-
-#ifdef __STDC__
-int sum(int *list, int low, int high)
-#else
-int sum(list, low, high)
-int *list, low, high;
-#endif
-    {
-        int i = 0, s = 0;
-        for (i = low; i <= high; i++)
-            s += list[i];
-        return(s);
-    }
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb.c b/gdb/testsuite/gdb.hp/gdb.compat/xdb.c
deleted file mode 100644
index e3e3fc23e9f..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <stdio.h>
-
-int callee( x )
-int x;
-{
-    int y = x * x;
-    return (y - 2);
-}
-
-main()
-{
-    int i;
-    for (i = 1; i < 10; i++)
-        {
-            printf( "%d ", callee( i ));
-            
-        }
-    printf( " Goodbye!\n" );
-    
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb0.c b/gdb/testsuite/gdb.hp/gdb.compat/xdb0.c
deleted file mode 100644
index fa5c76f7418..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb0.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "xdb0.h"
-
-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++);
-}
-
-static void
-unused ()
-{
-    /* Not used for anything */
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb0.h b/gdb/testsuite/gdb.hp/gdb.compat/xdb0.h
deleted file mode 100644
index c4d337c6770..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb0.h
+++ /dev/null
@@ -1,36 +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. */
-
-static void
-foo (x)
-int 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++);
-    bar (x++);
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb1.c b/gdb/testsuite/gdb.hp/gdb.compat/xdb1.c
deleted file mode 100644
index 51632b94d07..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb1.c
+++ /dev/null
@@ -1,33 +0,0 @@
-void
-bar (x)
-int x;
-{
-    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.  */
-
-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 */
-}
-
-oof (n)
-     int n;
-{
-  return n + 1;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp
deleted file mode 100644
index f371852c78d..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb1.exp
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (C) 1992, 1994, 1995 Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_hp_tests] } then { continue }
-
-global usestubs
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "xdb"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-if { $gcc_compiled } then { continue }
-
-global GDBFLAGS
-set saved_gdbflags $GDBFLAGS
-
-set GDBFLAGS "$GDBFLAGS --xdb"
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set pagination off" ""
-gdb_test "show pagination" "State of pagination is off."
-gdb_test "set pagination on" ""
-gdb_test "show pagination" "State of pagination is on."
-
-gdb_test "txbreak callee" "Breakpoint.*at.*"
-gdb_test "info break" "Num.*Type.*Disp.*Enb.*Address.*What\r\n.*breakpoint.*del.*y.*"
-
-gdb_test "xbreak callee" "Breakpoint.*at.*.*"
-gdb_test "info break" "Num.*Type.*Disp.*Enb.*Address.*What\r\n.*breakpoint.*keep.*y.*"
-
-gdb_exit
-set GDBFLAGS $saved_gdbflags
-return 0
-
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb2.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb2.exp
deleted file mode 100644
index 9bcdf589df8..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb2.exp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright (C) 1992, 1994, 1995 Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-        strace $tracelevel
-        }
-
-if { [skip_hp_tests] } then { continue }
-
-global message
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile "xdb"
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/xdb0.c" "${binfile}0.o" object {debug}] != "" } {
-    perror "Couldn't compile ${testfile}0.c to object"
-    return -1
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/xdb1.c" "${binfile}1.o" object {debug}] != "" } {
-    perror "Couldn't compile ${testfile}1.c to object"
-    return -1
-}
-
-if  { [gdb_compile "${binfile}0.o ${binfile}1.o" ${binfile} executable {debug}] != "" } {
-    perror "Couldn't link ${testfile}."
-    return -1
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-if { $gcc_compiled } then { continue }
-
-global GDBFLAGS
-set saved_gdbflags $GDBFLAGS
-set GDBFLAGS "$GDBFLAGS --xdb"
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-gdb_test "break main" ""
-gdb_test "run" ""
-gdb_test "go +2" "Breakpoint.*at.*file.*xdb0\.c, line 12\.\r\nContinuing at.*\r\nmain \\(\\) at.*xdb0\.c:12\r\n12\[ \t\]+foo \\(x\\+\\+\\);"
-gdb_test "go -2" "Note: breakpoint.*also set at pc.*\.\r\nBreakpoint.*at.*file.*xdb0\.c, line 10\.\r\nContinuing at.*\.\r\n\r\nBreakpoint.*, main \\(\\) at.*xdb0\.c:10.*"
-gdb_test "go 16" "Breakpoint.*at.*file.*xdb0\.c, line 16\.\r\nContinuing at.*\.\r\nmain \\(\\) at.*xdb0\.c:16\r\n16\[ \t\]+foo \\(x\\+\\+\\);"
-
-send_gdb "go bar\n"
-  gdb_expect {
-      -re ".*Line 5 is not in .main..  Jump anyway.*y or n. $" {
-          send_gdb "y\n"
-          gdb_expect {
-            -re "$gdb_prompt $"\
-                    {pass "go bar"}
-            timeout {fail "(timeout) go bar"}
-          }
-      }
-      -re "Continuing at.*\.\r\nbar \\(x=0\\) at.*xdb1\.c:5" {}
-      timeout { perror "(timeout) go bar" ; return }
-  }
-
-# Verify that GDB responds gracefully to a "go" command without
-# an argument.
-#
-gdb_test "go" "Usage: go <location>"
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "break bar" ""
-gdb_test "run" ""
-gdb_test "backtrace full" ".*bar \\(x=0\\) at.*xdb1\.c:5\r\nNo locals\.\r\n.1.* in foo \\(x=1\\) at.*xdb0\.h:8\r\nNo locals\.\r\n.2.* in main \\(\\) at.*xdb0\.c:11\r\n.*x = 1"
-gdb_test "bt 1 full" ".*bar \\(x=0\\) at.*xdb1\.c:5\r\nNo locals\.\r\n\\(More stack frames follow\.\.\.\\)"
-gdb_test "bt full 2" ".*bar \\(x=0\\) at.*xdb1\.c:5\r\nNo locals\.\r\n.1.* in foo \\(x=1\\) at.*xdb0\.h:8\r\nNo locals\.\r\n\\(More stack frames follow\.\.\.\\)"
-
-set GDBFLAGS $saved_gdbflags
-return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
deleted file mode 100644
index de983d3e9c9..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright (C) 1998 Free Software Foundation, 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
-
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-if { [skip_hp_tests] } then { continue }
-
-set testfile1 "average"
-set testfile2 "sum"
-set testfile "xdb-test"
-set binfile1 ${objdir}/${subdir}/${testfile1}
-set binfile2 ${objdir}/${subdir}/${testfile2}
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile "${srcdir}/${subdir}/average.c" "${binfile1}.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/sum.c" "${binfile2}.o" object {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if  { [gdb_compile "${binfile1}.o ${binfile2}.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-if { $gcc_compiled } then { continue }
-
-
-proc xdb_reinitialize_dir { subdir } {
-    global gdb_prompt
-
-   send_gdb "D\n"
-    gdb_expect {
-        -re "Reinitialize source path to empty.*y or n. " {
-            send_gdb "y\n"
-            gdb_expect {
-                -re "Source directories searched.*$gdb_prompt $" {
-                    send_gdb "D $subdir\n"
-                    gdb_expect {
-                        -re "Source directories searched.*$gdb_prompt $" {
-                            verbose "Dir set to $subdir"
-                        }
-                        -re ".*$gdb_prompt $" {
-                            perror "Dir \"$subdir\" failed."
-                        }
-                    }
-                }
-                -re ".*$gdb_prompt $" {
-                    perror "Dir \"$subdir\" failed."
-                }
-            }
-        }
-        -re ".*$gdb_prompt $" {
-            perror "Dir \"$subdir\" failed."
-        }
-    }
-}
-
-#
-#test_search
-#
-proc test_search { } {
-    gdb_test "set listsize 4" ""
-    gdb_test "list average.c:1" "1\[ \t\]+/. This is a sample .*"
-    gdb_test "/ print_average" "17\[ \t\]+void print_average\\(int \\*list.*"
-    gdb_test "/ print_average" "19\[ \t\]+void print_average\\(list, low, high\\)"
-    gdb_test "/ print_average" "42\[ \t\]+print_average \\(my_list, first, last\\);"
-    gdb_test "? print_average" "19\[ \t\]+void print_average\\(list, low, high\\)"
-    gdb_test "? sum" "9\[ \t]+extern int sum\\(\\);"
-}
-
-#
-#test_viewing_loc
-#
-proc test_viewing_loc { } {
-    gdb_test "L" "No stack."
-    gdb_test "break main" ""
-    gdb_test "R" ""
-    gdb_test "L" "#0\[ \t\]+main \\(\\) at.*average.c:38\r\n38\[ \t\]+int first = 0, last = 0;"
-}
-
-#
-#test_dir_list
-#
-proc test_dir_list { } {
-    gdb_test "ld" "Source directories searched: .*"
-}
-
-#
-#test_list_sources
-#
-proc test_list_sources { } {
-    if [istarget "hppa64-*-*"] {
-	gdb_test "lf" "Source files for which symbols have been read in:\r\n\r\n.*average\\.c.*Source files for which symbols will be read in on demand:\r\n\r\nglobals,.*\[se\]\[un\]\[md\]\\.c.*\[se\]\[un\]\[md\]\\.c"
-    } else {
-	gdb_test "lf" "Source files for which symbols have been read in:\r\n\r\n.*average\\.c.*\r\n\r\nSource files for which symbols will be read in on demand:\r\n\r\nglobals, end\\.c,.*sum\\.c"
-    }
-}
-#
-#test_vlist
-#
-proc test_vlist { } {
-    gdb_test "v main" "34\[ \t\]+main \\(\\)\r\n35\[ \t\]+#endif\r\n36\[ \t\]+.\r\n37\[ \t\]+char c;"
-}
-
-#
-#test_va
-#
-proc test_va { } {
-    if [istarget "hppa64-*-*"] {
-	gdb_test "va main" "Dump of assembler code for function main:\r\n.*0x.* <main>:\[ \t\]+std %rp,-0x10\\(%sp\\)\r\n0x.* <main\\+4>:\[ \t\]+std,ma %r3,0xd0\\(%sp\\)\r\n.*0x.* <main\\+8>:\[ \t\]+std %r4,-0xc8\\(%sp\\)\r\n.*0x.* <main\\+12>:\[ \t\]+copy %ret1,%r3\r\n.*"
-    } else {
-	gdb_test "va main" "Dump of assembler code for function main:\r\n.*0x.* <main>:\[ \t\]+stw %rp,-0x14\\(%sr0,%sp\\)\r\n0x.* <main\\+4>:\[ \t\]+ldo 0x\[48\]0\\(%sp\\),%sp\r\n.*0x.* <main\\+8>:\[ \t\]+stw %r0,-0x.*\\(%sr0,%sp\\)\r\n.*0x.* <main\\+12>:\[ \t\]+stw %r0,-0x.*\\(%sr0,%sp\\)\r\n.*"
-    }
-}
-
-#
-#test_list_globals
-#
-proc test_list_globals { } {
-    gdb_test "lg" "All defined variables:\r\n\r\nFile globals:.*"
-#    gdb_test "lg" "All defined variables:\r\n\r\nFile globals:\r\nchar __buffer.512.;\r\nint __d_eh_catch_catch;\r\nint __d_eh_catch_throw;.*"
-}
-
-#
-#test_list_registers
-#
-proc test_list_registers { } {
-    if [istarget "hppa64-*-*"] {
-	gdb_test "lr" "\[ \t\]+flags:.*r17:.*pcsqh:.*cr0:.*\r\n\[ \t\]+r1:.*r18:.*pcoqt:.*cr8:.*"
-    } else {
-	gdb_test "lr" "\[ \t\]+flags:.*r18:.*pcsqt:.*ccr:.*\r\n\[ \t\]+r1:.*r19:.*eiem:.*cr12:.*"
-    }
-    gdb_test "lr r1" "r1 .*"
-}
-
-#
-#test_backtrace
-#
-proc test_backtrace { } {
-    gdb_test "t" "#0  main \\(\\) at.*average.c:39"
-    gdb_test "T" "#0  main \\(\\) at.*average.c:39\r\n\[ \t\]+c = *.*\r\n\[ \t\]+first = 0\r\n\[ \t\]+last = 0"
-
-    gdb_test "break sum" ""
-    gdb_test "cont" ""
-    gdb_test "next"
-
-    gdb_test "t" "#0  sum \\(list=0x.*, low=0, high=9\\) at.*sum\.c:12\r\n#1  0x.* in print_average \\(list=0x.*, low=0, high=9\\) at.*average\.c:24\r\n#2  0x.* in main \\(\\) at.*average\.c:42"
-    gdb_test "t 1" "#0  sum \\(list=0x.*, low=0, high=9\\) at.*sum\.c:12\r\n\\(More stack frames follow\.\.\.\\)"
-    gdb_test "T" "#0  sum \\(list=0x.*, low=0, high=9\\) at.*sum\.c:12\r\n\[ \t\]+i = 0\r\n\[ \t\]+s = 0\r\n#1  0x.* in print_average \\(list=0x.*, low=0, high=9\\) at.*average\.c:24\r\n\[ \t\]+total = 0\r\n\[ \t\]+num_elements = 0\r\n\[ \t\]+average = 0\r\n#2  0x.* in main \\(\\) at.*average\.c:42\r\n\[ \t\]+c = *.*\r\n\[ \t\]+first = 0\r\n\[ \t\]+last = 9"
-    gdb_test "T 1" "#0  sum \\(list=0x.*, low=0, high=9\\) at.*sum\.c:12\r\n\[ \t\]+i = 0\r\n\[ \t\]+s = 0\r\n\\(More stack frames follow\.\.\.\\)"
-
-    gdb_test "V" "#0  sum \\(list=0x.*, low=0, high=9\\) at.*sum\.c:12\r\n\\12\[ \t\]+for \\(i = low;.*\\)"
-    gdb_test "V 1" "#1  0x.* in print_average \\(list=0x.*, low=0, high=9\\) at.*average\.c:24\r\n24\[ \t\]+total = sum\\(list, low, high\\);"
-}
-
-#
-# test_go
-#
-proc test_go { }  {
-    gdb_test "break main" ""
-    gdb_test "R" ""
-
-    gdb_test "g +1" "Breakpoint.*at 0x.*: file.*average\.c, line 39\.\r\nContinuing at 0x.*\.\r\nmain \\(\\) at.*average\.c:39\r\n39\[ \t\]+last = num-1;"
-    gdb_test "g 42" "Breakpoint.*at 0x.*: file.*average\.c, line 42\.\r\nContinuing at 0x.*\.\r\nmain \\(\\) at.*average\.c:42\r\n42\[ \t\]+print_average \\(my_list, first, last\\);"
-
-}
-
-#
-#test_breakpoints
-#
-proc test_breakpoints { } {
-    global gdb_prompt
-
-    gdb_test "sb" ""
-    gdb_test "lb" "Num.*Type.*Disp.*Enb.*Address.*What\r\n1\[ \r\]+breakpoint\[ \r\]+keep n.*in main at.*average\.c:38.*"
-    gdb_test "ab" ""
-    gdb_test "lb" "Num.*Type.*Disp.*Enb.*Address.*What\r\n1\[ \r\]+breakpoint\[ \r\]+keep y.*in main at.*average\.c:38.*"
-    gdb_test "ba sum" "Breakpoint.*at.*: file.*sum\.c, line 11\."
-    gdb_test "cont" ""
-    gdb_test "bx" "Breakpoint.*at.*: file.*sum.c, line 15\."
-    #gdb_test "bx if (1)" "Breakpoint.*at.*: file.*sum.c, line 15\."
-    gdb_test "bx 1" "Breakpoint.*at.*: file.*average.c, line 29\."
-    gdb_test "bx 1 if (1)" "Breakpoint.*at.*: file.*average.c, line 29\."
-    gdb_test "bc 1 2" "Will ignore next 2 crossings of breakpoint 1\."
-    gdb_test "lb 1" "Num.*Type.*Disp.*Enb.*Address.*What\r\n1\[ \r\]+breakpoint\[ \r\]+keep y.*in main at.*average\.c:38\r\n.*breakpoint already hit 1 time\r\n.*ignore next 2 hits.*"
-
-    send_gdb "db\n"
-    gdb_expect {
-        -re "Delete all breakpoints.*y or n. $" {
-            send_gdb "y\n"
-            exp_continue
-        }
-        -re "y\r\n$gdb_prompt $" {}
-        -re ".*$gdb_prompt $" { # This happens if there were no breakpoints
-            }
-        timeout { perror "Delete all breakpoints (timeout)" ; return }
-    }
-    send_gdb "lb\n"
-    gdb_expect {
-        -re "No breakpoints or watchpoints..*$gdb_prompt $" {}
-        -re ".*$gdb_prompt $" { perror "breakpoints not deleted" ; return }
-        timeout { perror "info breakpoints (timeout)" ; return }
-    }
-gdb_test "xbreak" "Breakpoint.*at.*file.*sum.c, line 15."
-gdb_test "xbreak print_average" "Breakpoint.*at.*file.*average.c, line 29."
-gdb_test "xbreak if (1)" "Note: breakpoint.*also set at pc.*Breakpoint.*at.*file.*sum.c, line 15."
-gdb_test "xbreak print_average if (1)" "Note: breakpoint.*also set at pc.*Breakpoint.*at.*file.*average.c, line 29."
-
-    send_gdb "lb\n"
-    gdb_expect {
-        -re "Num Type           Disp Enb Address    What.*breakpoint     keep y.*sum.c:15.*breakpoint     keep y.*average.c:29.*breakpoint     keep y.*sum.c:15.*stop only if 1.*breakpoint     keep y.*average.c:29.*stop only if 1.*$gdb_prompt $" {pass "lb on xbreaks"}
-        -re ".*$gdb_prompt $" { fail "breakpoints not deleted"}
-        timeout { fail "info breakpoints (timeout)" }
-    }
-
-}
-
-#
-# test_signals 
-#
-proc test_signals { } {
-    gdb_test "handle SIGTERM nostop noprint" ""
-    gdb_test "z 15 s" "Signal.*Stop.*Print.*Pass to program.*Description\r\nSIGTERM.*Yes.*Yes.*Yes.*Terminated"
-    gdb_test "z 15 r" "Signal.*Stop.*Print.*Pass to program.*Description\r\nSIGTERM.*No.*No.*Yes.*Terminated"
-    gdb_test "z 15 i" "Signal.*Stop.*Print.*Pass to program.*Description\r\nSIGTERM.*No.*No.*No.*Terminated"
-    gdb_test "z 15 r" "Signal.*Stop.*Print.*Pass to program.*Description\r\nSIGTERM.*No.*Yes.*No.*Terminated"
-    gdb_test "z 15 Q" "Signal.*Stop.*Print.*Pass to program.*Description\r\nSIGTERM.*No.*No.*No.*Terminated"
-    gdb_test "lz" "Signal.*Stop.*Print.*Pass to program.*Description\r\n\r\nSIGHUP.*Yes.*"
-}
-
-
-
-# Start with a fresh gdb.
-global GDBFLAGS
-set saved_gdbflags $GDBFLAGS
-
-set GDBFLAGS "$GDBFLAGS --xdb"
-
-gdb_exit
-gdb_start
-
-xdb_reinitialize_dir $srcdir/$subdir
-
-gdb_load ${binfile}
-send_gdb "set width 0\n"
-gdb_expect -re "$gdb_prompt $"
-test_search
-test_viewing_loc
-test_dir_list
-test_list_sources
-test_vlist
-test_va
-gdb_test "next"
-gdb_test "l" "No arguments.\r\nc = *.*\r\nfirst = 0\r\nlast = 0"
-#test_list_globals
-test_list_registers
-test_backtrace
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-xdb_reinitialize_dir $srcdir/$subdir
-
-gdb_load ${binfile}
-send_gdb "set width 0\n"
-gdb_expect -re "$gdb_prompt $"
-test_go
-
-
-gdb_exit
-gdb_start
-xdb_reinitialize_dir $srcdir/$subdir
-
-gdb_load ${binfile}
-send_gdb "set width 0\n"
-gdb_expect -re "$gdb_prompt $"
-gdb_test "break main" ""
-gdb_test "R" ""
-gdb_test "S" "39\[ \t\]+last = num-1;"
-test_breakpoints
-test_signals
-gdb_test "sm" ""
-gdb_test "info set" ".*pagination:  State of pagination is off.*"
-gdb_test "am" ""
-gdb_test "info set" ".*pagination:  State of pagination is on.*"
-gdb_exit
-
-set GDBFLAGS $saved_gdbflags
-
-return 0
-
-
-
-
-
-
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in b/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in
deleted file mode 100644
index f0a785837c4..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = bs14602 bs15503 solib-d solib-d1.sl solib-d2.sl
-
-all:
-	@echo "Nothing to be done for all..."
-
-info:
-install-info:
-dvi:
-install:
-uninstall: force
-installcheck:
-check:
-
-clean mostlyclean:
-	-rm -f *~ *.o *.ci
-	-rm -f core $(EXECUTABLES)
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
-	-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.hp/gdb.defects/bs14602.c b/gdb/testsuite/gdb.hp/gdb.defects/bs14602.c
deleted file mode 100644
index 232b40842ea..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/bs14602.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Test file for bs14602.exp */
-
-double      v_double = 0;
-long double v_long_double = 12345.67890;
-
-int main () {
-  v_double = 0;
-  v_long_double = 12345.67890;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp b/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp
deleted file mode 100644
index d1500f01bd0..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/bs14602.exp
+++ /dev/null
@@ -1,117 +0,0 @@
-# This file was written by Sue Kimura. (sue_kimura@hp.com)
-#
-# Test for CLLbs14602 -- problem with recognizing long double on 10.20.
-#
-# Source file: bs14602.c
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-if { [skip_hp_tests] } { continue }
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-
-set testfile bs14602
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# set up appropriate compile option to recognize long double
-if {$hp_aCC_compiler || $hp_cc_compiler} {
-    set ansi_option "-Ae"
-} else {
-    set ansi_option ""
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "$binfile" executable "debug {additional_flags=${ansi_option}}"] != "" } {
-    perror "Couldn't compile ${srcfile}"
-    return -1
-}
-
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
-
-
-# get to end of main so we can check out some stuff
-if ![runto main] {
-  perror "couldn't run to breakpoint main"
-  continue
-}
-
-gdb_test "txbreak" \
-    "Breakpoint $decimal at $hex: file .*bs14602.c, line 9." \
-    "set breakpoint at end of main"
-
-gdb_test "continue" \
-    "Continuing.\r\n$hex in main* \\(\\) at .*bs14602.c:9\r\n.*" \
-    "continue to end of main"
-
-# test some simple things about long double
-gdb_test "whatis v_long_double" \
-    "type = long double" \
-    "whatis v_long_double"
-
-gdb_test "ptype v_long_double" \
-    "type = long double" \
-    "ptype v_long_double"
-
-gdb_test "print sizeof \(long double\)" \
-    " = 16" \
-    "print sizeof long double"
-
-gdb_test "print sizeof \(v_long_double\)" \
-    " = 16" \
-    "print sizeof v_long_double"
-
-gdb_test "print v_long_double"  \
-    " = 12345.67890000000079453457146883011" \
-    "print v_long_double - 1" 
-
-gdb_test "set variable v_long_double = 98765.43210" \
-    "" \
-    "set variable v_long_double to constant value"
-
-gdb_test "print v_long_double" \
-    " = 98765.43210000000544823706150054932" \
-    "print v_long_double - 2" 
-
-gdb_test "set variable v_double = v_long_double" \
-    "" \
-    " set variable v_double with v_long_double"
-
-gdb_test "print v_double" \
-    " = 98765.432100000005" \
-    " print v_double"
-
-#reset v_long_double
-gdb_test "set variable v_long_double = 0" \
-    "" \
-    "reset v_long_double to 0"
-
-gdb_test "print v_long_double" \
-    " = 0" \
-    "print v_long_double - 3"
-
-gdb_test "set variable v_long_double = v_double" \
-    "" \
-    " set variable v_long_double with v_long_double"
-
-gdb_test "print v_long_double" \
-    " = 98765.43210000000544823706150054932" \
-    "print v_long_double - 4 "
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/configure b/gdb/testsuite/gdb.hp/gdb.defects/configure
deleted file mode 100755
index f5a30ce1ee0..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/configure
+++ /dev/null
@@ -1,2246 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="bs14602.exp"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/configure.ac b/gdb/testsuite/gdb.hp/gdb.defects/configure.ac
deleted file mode 100644
index a0706159cda..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/configure.ac
+++ /dev/null
@@ -1,15 +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.59)
-AC_INIT(bs14602.exp)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../../..)
-AC_CANONICAL_SYSTEM
-
-AC_OUTPUT(Makefile)
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/solib-d.c b/gdb/testsuite/gdb.hp/gdb.defects/solib-d.c
deleted file mode 100644
index ec803fe06a5..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/solib-d.c
+++ /dev/null
@@ -1,6 +0,0 @@
-main()
-{
-	function_from_primary();
-	function_from_secondary();
-}
-
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/solib-d.exp b/gdb/testsuite/gdb.hp/gdb.defects/solib-d.exp
deleted file mode 100644
index c0d206777e7..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/solib-d.exp
+++ /dev/null
@@ -1,278 +0,0 @@
-#   Copyright (C) 1997 Free Software Foundation, 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.  */
-
-# This file was written by srikanth (with huge chunks borrowed from old ones) 
-#
-# Regression test for 
-#
-#     CLLbs14756
-#
-#         o catch load command does not stop for implicit loads.
-#
-#     CLLbs15382  
-#
-#         o sharedlibrary command ignores its argument and ends
-#           up loading every shared library there is ...
-#
-#     CLLbs15582  
-#
-#         o info line non-existent-function dumps core
-#         o clear non-existent function dumps core
-#         o xbreak non-existent-function dumps core
-#
-#     CLLbs15725
-#
-#         o gdb prints static and extern variables in shlibs incorrectly.
-#
-#     CLLbs16090
-#
-#         o deferred breakpoints should kick in for shlibs loaded explicitly
-#           with the sharedlibrary command.
-#         o GDB confuses export stubs with actual function.
-#
-#
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-if { [skip_hp_tests] } { continue }
-
-set prms_id 0
-set bug_id 0
-
-# are we on a target board
-if ![isnative] {
-    return
-}
-
-# This test is presently only valid on HP-UX, since it requires
-# that we use HP-UX-specific compiler & linker options to build
-# the testcase.
-#
-setup_xfail "*-*-*"
-clear_xfail "hppa*-*-*hpux*"
-
-set prototypes 0
-set testfile "solib-d"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set testfile1 ${objdir}/${subdir}/${testfile}1.o
-set testfile2 ${objdir}/${subdir}/${testfile}2.o
-set libfile1 ${objdir}/${subdir}/${testfile}1.sl
-set libfile2 ${objdir}/${subdir}/${testfile}2.sl
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1;
-}
-
-# set up appropriate compile option to recognize long double
-if {$hp_aCC_compiler || $hp_cc_compiler} {
-    set picflag "+z"
-    set ansiflag "-Ae"
-} else {
-    set picflag "-fpic"
-    set ansiflag ""
-}
-
-
-# Build the shared libraries this test case needs.
-#
-#cd ${subdir}
-
-if { [gdb_compile "${srcdir}/${subdir}/${testfile}1.c" "${testfile1}" object "{debug additional_flags=${picflag}}"] != "" } {
-    perror "Couldn't compile ${testfile}1.c"
-    return -1
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${testfile}2.c" "${testfile2}" object "{debug additional_flags=${picflag}}"] != ""} {
-    perror "Couldn't compile ${testfile}2.c"
-    return -1
-}
-
-remote_exec build "ld -b ${testfile1} -o ${libfile1}"
-remote_exec build "ld -b ${testfile2} -o ${libfile2}"
-
-# Build the test case
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${libfile1} ${libfile2}" "${binfile}" executable "{debug additional_flags=${ansiflag} -Wl,-aarchive}"] != "" } {
-    perror "Couldn't build ${binfile}"
-    return -1
-}
-
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# Verify that we can set a generic catchpoint on shlib loads.  I.e., that
-# we can catch any shlib load, without specifying the name.
-#
-gdb_test "catch load" "Catchpoint \[0-9\]* .load <any library>.*" \
-    "set generic catch load"
-
-# Verify that implicit shlib loads are caught and reported.
-send_gdb "run\n"
-gdb_expect {
-    -re ".*solib-d1.*$gdb_prompt $" {
-        pass "Catch implicit load at startup"
-    }
-    -re "Program exited.*$gdb_prompt $" {
-        fail "CLLbs14756 || CLLbs16090 came back ???"
-    }
-    timeout { fail "(timeout) implicit library load" }
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] { fail "breakpoint at main did not trigger ?" }
-
-# verify that we print globals from shlibs correctly.
-gdb_test "p global_from_primary" " = 5678" \
-    "print global from shlib (CLLbs15725)"
-
-gdb_test "p global_from_secondary" " = 9012" \
-    "print global from shlib (CLLbs15725)"
-
-# verify that we print static variables from shlibs correctly.
-if { ![runto function_from_primary] } { return }
-gdb_test "p file_static" " = 1234" "print file static variable (CLLbs15725)" 
-
-if { ![runto function_from_secondary] } { return }
-gdb_test "p local_static" " = 3456" "print local static variable (CLLbs15725)" 
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set auto-solib-add 0" "" "turn off auto shlib debug loading"
-
-if ![runto_main] {
-    perror "C function calling tests suppressed"
-}
-
-# verify that "clear non-existent-symbol" does not crash
-gdb_test "clear junkfunc" "Location not found.*" \
-    "clear non-existent function does not dump core !"
-
-# verify that "info line non-existent-symbol" does not crash
-gdb_test "info line junkfunc" "Location not found.*" \
-    "info line junkfunc does not dump core !"
-
-# verify that "xbreak non-existent-symbol" does not crash
-gdb_test "xbreak junkfunc" "Function \"junkfunc\" not defined.*" \
-    "xbreak junkfunc does not dump core !"
-
-gdb_test "list function_from_primary" \
-    "No line number known for function_from_primary.*" \
-    "turning off auto shlib debug loading"
-
-send_gdb "sharedlibrary solib-d1\n" 
-gdb_expect {
-    -re "Reading symbols from.*solib-d1.*$gdb_prompt $" {
-	pass "loading primary library on demand (1)"
-    }
-    -re "--Adding symbols for shared library.*solib-d1.*$gdb_prompt $" {
-	pass "loading primary library on demand (2)"
-    }
-    -re "$gdb_prompt $" { fail "loading primary library on demand (3)" }
-    timeout { fail "(timeout) loading primary library on demand" }
-}
-
-# make sure that load above of primary also did not pull in secondary.
-send_gdb "list function_from_secondary\n" 
-gdb_expect {
-    -re "No symbol.*context.*$gdb_prompt $" {
-        pass "loaded only what we needed (1)"
-    }
-    -re "No line number known for function_from_secondary.*$gdb_prompt $" {
-        pass "loaded only what we needed (2)"
-    }
-    -re ".*9012.*$gdb_prompt $" { fail "Oops ! CLLbs15382 came back ?" }
-    timeout { fail "(timeout) printing global" }
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set auto-solib-add 0" "" "turn off auto shlib debug loading"
-
-gdb_test "set stop-on-solib-event 1" "" "stop-on-solib-event"
-
-# verify that we set breakpoint on the function and not the export stub
-# used to be that we set bp on the export stub of _start and thus miss
-# shlib loads in some cases (where the stub exists)
-send_gdb "run\n"
-gdb_expect {
-    -re "Stopped due to shared library event.*$gdb_prompt $" {
-        pass "stop for shlib event"
-    }
-    -re "Program exited.*$gdb_prompt $" {
-        fail "Bug CLLbs16090 came back ?"
-    }
-    timeout { fail "(timeout) stop for shlib event " }
-}
-
-gdb_test "b main" "Breakpoint 1 at.*" "set breakpoint on main"
-
-gdb_test "set stop-on-solib-event 0" "" "stop-on-solib-event (timeout)"
-
-# verify that we set breakpoint on the function and not the export stub
-gdb_test "cont" "Breakpoint 1.*main.*" "run to main"
-
-# On PA64 we read in the unwind info and linker symbol table which lets
-# us set the breakpoint and not defer it.
-send_gdb "b garbage\n"
-gdb_expect {
-    -re "Breakpoint.*deferred.*garbage.*library containing.*is loaded.*$gdb_prompt $" {
-        pass " set deferred breakpoint (1)"
-    }
-    -re "Breakpoint 2 at 0x.*$gdb_prompt $" {
-        pass " set deferred breakpoint (2)"
-    }
-    -re "$gdb_prompt $" { fail " set deferred breakpoint (3)" }
-    timeout { fail "(timeout) set deferred breakpoint" }
-}
-
-# make sure that the sharedlibrary command enables any deferred breakpoints
-# that it should.
-send_gdb "sharedlibrary lib\n"
-gdb_expect {
-    -re "Reading.*solib-d1.*$gdb_prompt $" {
-        pass "load up all shared libs (1)"
-    }
-    -re "Loading.*dld.sl.*--Adding symbols.*solib-d1.*$gdb_prompt $" {
-        pass "load up all shared libs (2)"
-    }
-    -re "$gdb_prompt $" { fail "load up all libraries" }
-    timeout { fail "(timeout) load all libraries " }
-}
-
-# do we stop at garbage ? If yes ok. 
-gdb_test "cont" "Breakpoint.*garbage.*" "deferred breakpoint enabled"
-
-gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/solib-d1.c b/gdb/testsuite/gdb.hp/gdb.defects/solib-d1.c
deleted file mode 100644
index b6da64d21d2..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/solib-d1.c
+++ /dev/null
@@ -1,12 +0,0 @@
-static int file_static = 1234;
-int global_from_primary = 5678;
-
-int function_from_primary()
-{
-    garbage();	
-}
-
-force_generation_of_export_stub()
-{
-    _start();   /* force main module to have an export stub for _start() */
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/solib-d2.c b/gdb/testsuite/gdb.hp/gdb.defects/solib-d2.c
deleted file mode 100644
index 024616baf28..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.defects/solib-d2.c
+++ /dev/null
@@ -1,11 +0,0 @@
-int global_from_secondary = 9012;
-int function_from_secondary()
-{
-    static int local_static = 3456;
-    return 0;
-}
-
-garbage()
-{
-	return 0;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in b/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in
deleted file mode 100644
index 5411c46fc55..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = objdbg01/test0 objdbg01/test1 objdbg02/test \
-	objdbg03/test objdbg04/test0 objdbg04/test1
-
-all:
-	@echo "Nothing to be done for all..."
-
-info:
-install-info:
-dvi:
-install:
-uninstall: force
-installcheck:
-check:
-
-clean mostlyclean:
-	-rm -f *~ objdbg*/*.o objdbg*/*.ci
-	-rm -f core $(EXECUTABLES)
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
-	-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.hp/gdb.objdbg/configure b/gdb/testsuite/gdb.hp/gdb.objdbg/configure
deleted file mode 100755
index 26742d27db4..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/configure
+++ /dev/null
@@ -1,2429 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="objdbg01.exp"
-ac_subdirs_all="$ac_subdirs_all objdbg01 objdbg02 objdbg03 objdbg04"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os subdirs LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../../.. $srcdir/\`cd $srcdir;pwd\`/../../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-subdirs="$subdirs objdbg01 objdbg02 objdbg03 objdbg04"
-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@subdirs@,$subdirs,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-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=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d $srcdir/$ac_dir || continue
-
-    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
-echo "$as_me: configuring in $ac_dir" >&6;}
-    { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-    cd $ac_dir
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-    elif test -f $ac_srcdir/configure; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-    elif test -f $ac_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&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_top_builddir$cache_file ;;
-      esac
-
-      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval $ac_sub_configure $ac_sub_configure_args \
-	   --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/configure.ac b/gdb/testsuite/gdb.hp/gdb.objdbg/configure.ac
deleted file mode 100644
index 092d024fe83..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/configure.ac
+++ /dev/null
@@ -1,16 +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.59)
-AC_INIT(objdbg01.exp)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../../..)
-AC_CANONICAL_SYSTEM
-AC_CONFIG_SUBDIRS(objdbg01 objdbg02 objdbg03 objdbg04)
-
-AC_OUTPUT(Makefile)
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
deleted file mode 100644
index 70d9d0c983d..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
+++ /dev/null
@@ -1,222 +0,0 @@
-# Test reading debug information from in object files.
-
-if { [skip_hp_tests] } { continue }
-
-if { ![istarget "hppa*-*-hpux*"] } {
-    verbose "HPUX test ignored for non-hppa targets."
-    return 0
-}
-
-set testfile "test"
-set srcsubdir ${srcdir}/${subdir}/objdbg01
-set toolssubdir ${srcdir}/${subdir}/tools
-set objdbgdir ${objdir}/${subdir}/objdbg01
-set binfile ${objdbgdir}/${testfile}
-set symaddrfile ${toolssubdir}/symaddr
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if {!$hp_aCC_compiler && !$hp_cc_compiler} {
-  return 0
-}
-
-if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
-}
-
-if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x1.cc"
-    return -1
-}
-
-if { [gdb_compile "${srcsubdir}/x2.cc" "${objdbgdir}/x2.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x2.cc"
-    return -1
-}
-
-if { [gdb_compile "${srcsubdir}/x3.cc" "${objdbgdir}/x3.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x3.cc"
-    return -1
-}
-
-if { [gdb_compile "${objdbgdir}/x1.o ${objdbgdir}/x2.o ${objdbgdir}/x3.o" "${binfile}0" executable "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile ${binfile}0"
-    return -1
-}
-
-if {[gdb_compile "${objdbgdir}/x3.o ${objdbgdir}/x2.o ${objdbgdir}/x1.o" "${binfile}1" executable "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile ${binfile}1"
-    return -1
-}
-
-# Test two executables. The first has x1.cc linked first, the second
-# has x3.cc linked first.  The difference is that in the first one,
-# the Info<PP> instantiation from x1.cc is taken, in the second, its
-# from x3.cc.
-
-for {set filenum 0} {$filenum < 2} {incr filenum 1} {
-
-    # Lets test some commons
-    # Need to restart each to to make sure objects are not loaded
-    # Also cross check the address with what is actually in the
-    #   object file (call the executable ${symaddrfile} to retrieve the
-    #   information).
-
-    set exec_output [lindex [remote_exec build "${symaddrfile} ${binfile}${filenum} acomm"] 1]
-    regsub -all "\[\r\n\]" ${exec_output} "" exec_output
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "p &acomm" "..* = \\(int \[*\]\\) 0x${exec_output}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "b main" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file ..*/x1.cc, line 20."
-    gdb_test "run" "Starting program:.*Breakpoint \[0-9\]+, main .*/x1.cc:20.*20.*acomm.*=.*1.*"
-    gdb_test "s 1" "21.*"
-    gdb_test "p acomm" ".* = 1.*"
-    gdb_test "p &acomm" "..* = \\(int \[*\]\\) 0x${exec_output}.*"
-
-    # Step through each line.
-    # Do this three times.
-    #   First round:  Test that things are okay after printing commons
-    #                 above.
-    #   Second round: Restart gdb and make sure we can walk through
-    #   Third round:  Do NOT restrart gdb to verify that the debug information
-    #                 was not messed up by loading additional object files from
-    #                 the first run through.
-    for {set i 0} {$i < 3} {incr i 1} {
-        if $i==1 then {
-            gdb_exit
-            gdb_start
-            gdb_reinitialize_dir ${srcsubdir}
-            gdb_load ${binfile}${filenum}
-        }
-        if $i!=2 then {
-            gdb_test "b main" \
-		"Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file ..*/x1.cc, line 20."
-        }
-        if $i!=0 then {
-            gdb_test "run" \
-		"Starting program:.*Breakpoint \[0-9\]+, main .*/x1.cc:20.*"
-            gdb_test "s 1" "21.*"
-        }
-        gdb_test "s 1" "Info<PP>::p .*/x3.h:11.*"
-        gdb_test "s 1" "PP::print .*/x2.cc:8.*"
-        gdb_test "s 1" ".*9.*"
-        gdb_test "s 1" "Info<PP>::p .*/x3.h:12.*"
-        gdb_test "s 1" "main .*/x1.cc:22.*"
-        gdb_test "s 1" "foo .*/x3.cc:5.*"
-        gdb_test "s 1" "Info<PP>::p .*/x3.h:11.*"
-        gdb_test "s 1" "PP::print .*/x2.cc:8.*"
-        gdb_test "s 1" ".*9.*"
-        gdb_test "s 1" "Info<PP>::p .*/x3.h:12.*"
-        gdb_test "s 1" "foo .*/x3.cc:6.*"
-        gdb_test "s 1" "Info<QQ>::p .*/x3.h:11.*"
-        gdb_test "s 1" "QQ::print .*/x2.cc:13.*"
-        gdb_test "s 1" ".*14.*"
-        gdb_test "s 1" "Info<QQ>::p .*/x3.h:12.*"
-        gdb_test "s 1" "foo .*/x3.cc:7.*"
-        gdb_test "s 1" "main .*/x1.cc:24.*"
-        gdb_test "s 1" ".*25.*"
-        if [istarget "hppa64-*-*"] {
-            gdb_test "s 1" "0x\[0-9a-f\]+ in .*"
-            gdb_test "c" ".*Program exited normally.*"
-        } else {
-            gdb_test "s 1" "0x\[0-9a-f\]+ in _start .*"
-            gdb_test "s 1" ".*Program exited normally.*"
-        }
-    }
-
-    # Test various ptypes, and combinations of them
-    # Test things multiple times in each set to make sure that the debug
-    #   information did not get messed up.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype QQ" "type = (class |)QQ {..*void print( |)..*}.*"
-    gdb_test "ptype PP" "type = (class |)PP {..*void print( |)..*}.*"
-    gdb_test "ptype QQ" "type = (class |)QQ {..*void print( |)..*}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype PP" "type = (class |)PP {..*void print( |)..*}.*"
-    gdb_test "ptype QQ" "type = (class |)QQ {..*void print( |)..*}.*"
-    gdb_test "ptype PP" "type = (class |)PP {..*void print( |)..*}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype Info<QQ>" "type = (class |)Info<QQ> {..*void p( |)..*}.*"
-    gdb_test "ptype Info<PP>" "type = (class |)Info<PP> {..*void p( |)..*}.*"
-    gdb_test "ptype Info<QQ>" "type = (class |)Info<QQ> {..*void p( |)..*}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype Info<PP>" "type = (class |)Info<PP> {..*void p( |)..*}.*"
-    gdb_test "ptype Info<QQ>" "type = (class |)Info<QQ> {..*void p( |)..*}.*"
-    gdb_test "ptype Info<PP>" "type = (class |)Info<PP> {..*void p( |)..*}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype Info" "type = template <..*> (class |)Info {..*}.*"
-    gdb_test "ptype Info<PP>" "type = (class |)Info<PP> {..*void p( |)..*}.*"
-    gdb_test "ptype Info<QQ>" "type = (class |)Info<QQ> {..*void p( |)..*}.*"
-    gdb_test "ptype Info" "type = template <..*> (class |)Info {..*}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype class QQ" "type = (class |)QQ {..*void print( |)..*}.*"
-    gdb_test "ptype class PP" "type = (class |)PP {..*void print( |)..*}.*"
-    gdb_test "ptype class QQ" "type = (class |)QQ {..*void print( |)..*}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype class PP" "type = (class |)PP {..*void print( |)..*}.*"
-    gdb_test "ptype class QQ" "type = (class |)QQ {..*void print( |)..*}.*"
-    gdb_test "ptype class PP" "type = (class |)PP {..*void print( |)..*}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype class Info<QQ>" \
-	"type = (class |)Info<QQ> {..*void p( |)..*}.*"
-    gdb_test "ptype class Info<PP>" \
-	"type = (class |)Info<PP> {..*void p( |)..*}.*"
-    gdb_test "ptype class Info<QQ>" \
-	"type = (class |)Info<QQ> {..*void p( |)..*}.*"
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir ${srcsubdir}
-    gdb_load ${binfile}${filenum}
-    gdb_test "ptype class Info<PP>" \
-	"type = (class |)Info<PP> {..*void p( |)..*}.*"
-    gdb_test "ptype class Info<QQ>" \
-	"type = (class |)Info<QQ> {..*void p( |)..*}.*"
-    gdb_test "ptype class Info<PP>" \
-	"type = (class |)Info<PP> {..*void p( |)..*}.*"
-}
-
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x1.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x1.cc
deleted file mode 100644
index 0de3153d9cc..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x1.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <stdio.h>
-#include "x3.h"
-
-extern void foo();
-
-extern int acomm;
-
-int main3()
-{
-  return 1;
-}
-
-int main2()
-{
-  return 0;
-}
-
-int main()
-{
-  acomm = 1;
-  (new Info<PP>)->p(new PP);
-  foo();
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x2.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x2.cc
deleted file mode 100644
index af588fbc00a..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x2.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "x3.h"
-#include <stdio.h>
-
-int acomm;
-
-void PP::print()
-{
-  printf("In PP::print()\n");
-}
-
-void QQ::print()
-{
-  printf("In QQ::print()\n");
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x3.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x3.cc
deleted file mode 100644
index 88fe5453ec6..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x3.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "x3.h"
-
-void foo()
-{
-  (new Info<PP>)->p(new PP);
-  (new Info<QQ>)->p(new QQ);
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x3.h b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x3.h
deleted file mode 100644
index d03a5503c5e..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01/x3.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
-template <class T>
-class Info {
-public:
-  void p(T *x);
-};
-
-template <class T>
-void Info<T>::p(T *x)
-{
-  x->print();
-}
-
-class PP {
-public:
-  void print();
-};
-
-class QQ {
-public:
-  void print();
-};
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
deleted file mode 100644
index fcd0fdc9b44..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
+++ /dev/null
@@ -1,85 +0,0 @@
-# Test reading debug information from in object files.
-
-if { [skip_hp_tests] } { continue }
-
-if { ![istarget "hppa*-*-hpux*"] } {
-    verbose "HPUX test ignored for non-hppa targets."
-    return 0
-}
-
-set testfile "test"
-set srcsubdir ${srcdir}/${subdir}/objdbg02
-set objdbgdir ${objdir}/${subdir}/objdbg02
-set binfile ${objdbgdir}/${testfile}
-set toolssubdir ${srcdir}/${subdir}/tools
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if {!$hp_aCC_compiler && !$hp_cc_compiler} {
-  return 0
-}
-
-if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
-}
-
-if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x1.cc"
-    return -1
-}
-
-if { [gdb_compile "${srcsubdir}/x2.cc" "${objdbgdir}/x2.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x2.cc"
-    return -1
-}
-
-if { [gdb_compile "${srcsubdir}/x3.cc" "${objdbgdir}/x3.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x3.cc"
-    return -1
-}
-
-remote_exec build "rm -f ${objdbgdir}/test.a"
-set status [remote_exec build "ar cr ${objdbgdir}/test.a ${objdbgdir}/x2.o ${objdbgdir}/x3.o"]
-if { [lindex $status 0] != 0 } {
-    perror "Couldn't compile test.a"
-    return -1
-}
-remote_exec build "rm -f ${objdbgdir}/x2.o ${objdbgdir}/x3.o"
-
-if { [gdb_compile "${objdbgdir}/x1.o ${objdbgdir}/test.a" "$binfile" executable "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile ${binfile}"
-    return -1
-}
-
-# Test loading debug information from an archive file
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir ${srcsubdir}
-gdb_load ${binfile}
-
-gdb_test "b main" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file ..*/x1.cc, line 12."
-gdb_test "run" "Starting program:.*Breakpoint \[0-9\]+, main .*/x1.cc:12.*"
-gdb_test "s 1" ".*13.*"
-gdb_test "s 1" "foo1 .*/x2.cc:15.*"
-gdb_test "s 1" ".*16.*"
-gdb_test "s 1" "foo2 .*/x2.cc:10.*"
-gdb_test "s 1" ".*11.*"
-gdb_test "s 1" "foo1 .*/x2.cc:17.*"
-gdb_test "s 1" "main .*/x1.cc:14.*"
-gdb_test "s 1" "foo3 .*/x3.cc:5.*"
-gdb_test "s 1" ".*6.*"
-gdb_test "s 1" "main .*/x1.cc:15.*"
-gdb_test "s 1" ".*16.*"
-if [istarget "hppa64-*-*"] {
-    gdb_test "s 1" "0x\[0-9a-f\]+ in .*START.*"
-    gdb_test "c" ".*Program exited normally.*"
-} else {
-    gdb_test "s 1" "0x\[0-9a-f\]+ in _start .*"
-    gdb_test "s 1" ".*Program exited normally.*"
-}
-
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x1.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x1.cc
deleted file mode 100644
index 7ec0cf18405..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x1.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-extern void foo1();
-extern void foo3();
-
-struct foo_type;
-
-int main()
-{
-  struct foo_type *x;
-
-  printf("In main.\n");
-  foo1();
-  foo3();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x2.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x2.cc
deleted file mode 100644
index 627f02d2baf..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x2.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-
-struct foo_type {
-  int t1;
-  int t2;
-};
-
-static void foo2()
-{
-  printf("In foo2.\n");
-}
-
-void foo1()
-{
-  printf("In foo1.\n");
-  foo2();
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x3.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x3.cc
deleted file mode 100644
index d03ea5146a9..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02/x3.cc
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-void foo3()
-{
-  printf("In foo3.\n");
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
deleted file mode 100644
index 1e549476f31..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
+++ /dev/null
@@ -1,164 +0,0 @@
-# Test reading debug information from in object files.
-
-if { [skip_hp_tests] } { continue }
-
-if { ![istarget "hppa*-*-hpux*"] } {
-    verbose "HPUX test ignored for non-hppa targets."
-    return 0
-}
-
-set testfile "test"
-set srcsubdir ${srcdir}/${subdir}/objdbg03
-set objdbgdir ${objdir}/${subdir}/objdbg03
-set binfile ${objdbgdir}/${testfile}
-set toolssubdir ${srcdir}/${subdir}/tools
-if [istarget "hppa64-*-*"] {
-  set symaddrfile ${toolssubdir}/symaddr.pa64
-} else {
-  set symaddrfile ${toolssubdir}/symaddr
-}
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if {!$hp_aCC_compiler && !$hp_cc_compiler} {
-  return 0
-}
-
-if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
-}
-
-if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x1.cc"
-    return -1
-}
-
-if { [gdb_compile "${srcsubdir}/x2.cc" "${objdbgdir}/x2.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x2.cc"
-    return -1
-}
-
-if { [gdb_compile "${srcsubdir}/x3.cc" "${objdbgdir}/x3.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x3.cc"
-    return -1
-}
-
-if { [gdb_compile "${objdbgdir}/x1.o ${objdbgdir}/x2.o ${objdbgdir}/x3.o" "${binfile}" executable "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile ${binfile}"
-    return -1
-}
-
-#
-# Test some normal commons
-#
-
-# Print the types
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir ${srcsubdir}
-gdb_load ${binfile}
-
-gdb_test "ptype common1" "type = int"
-gdb_test "ptype common2" "type = int"
-gdb_test "ptype common3" "type = int"
-gdb_test "ptype data1" "type = int"
-gdb_test "ptype data2" "type = int"
-gdb_test "ptype data3" "type = int"
-gdb_test "ptype common11" "type = int"
-gdb_test "ptype common10" "type = int"
-gdb_test "ptype data10" "type = int"
-gdb_test "ptype data11" "type = int"
-
-# Print the values
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir ${srcsubdir}
-gdb_load ${binfile}
-
-gdb_test "b main" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file ..*/x1.cc, line 11."
-gdb_test "run" "Starting program:.*Breakpoint \[0-9\]+, main .*/x1.cc:11.*"
-gdb_test "p data1" "..* = 1"
-gdb_test "p data2" "..* = 2"
-gdb_test "p data3" "..* = 3"
-gdb_test "p data10" "..* = 10"
-gdb_test "p data11" "..* = 11"
-gdb_test "n" ".*12.*"
-gdb_test "p common11" "..* = 11"
-
-gdb_test "s 1" "foo .*/x3.cc:15.*"
-gdb_test "s 4" ".*20.*"
-gdb_test "p data4" "..* = 4"
-gdb_test "p common4" "..* = 4"
-gdb_test "n" ".*21.*"
-
-gdb_test "n" "main .*/x1.cc:14.*"
-gdb_test "p common1" "..* = 1"
-gdb_test "p common2" "..* = 2"
-gdb_test "p common3" "..* = 3"
-
-# Verify that addresses match those in the executable
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir ${srcsubdir}
-gdb_load ${binfile}
-
-set exec_output_data1 [lindex [remote_exec build "${symaddrfile} ${binfile} data1"] 1]
-regsub -all "\[\r\n\]" ${exec_output_data1} "" exec_output_data1
-
-set exec_output_data2 [lindex [remote_exec build "${symaddrfile} ${binfile} data2"] 1]
-regsub -all "\[\r\n\]" ${exec_output_data2} "" exec_output_data2
-
-set exec_output_data3 [lindex [remote_exec build "${symaddrfile} ${binfile} data3"] 1]
-regsub -all "\[\r\n\]" ${exec_output_data3} "" exec_output_data3
-
-set exec_output_data10 [lindex [remote_exec build "${symaddrfile} ${binfile} data10"] 1]
-regsub -all "\[\r\n\]" ${exec_output_data10} "" exec_output_data10
-
-set exec_output_data11 [lindex [remote_exec build "${symaddrfile} ${binfile} data11"] 1]
-regsub -all "\[\r\n\]" ${exec_output_data11} "" exec_output_data11
-
-set exec_output_common1 [lindex [remote_exec build "${symaddrfile} ${binfile} common1"] 1]
-regsub -all "\[\r\n\]" ${exec_output_common1} "" exec_output_common1
-
-set exec_output_common2 [lindex [remote_exec build "${symaddrfile} ${binfile} common2"] 1]
-regsub -all "\[\r\n\]" ${exec_output_common2} "" exec_output_common2
-
-set exec_output_common3 [lindex [remote_exec build "${symaddrfile} ${binfile} common3"] 1]
-regsub -all "\[\r\n\]" ${exec_output_common3} "" exec_output_common3
-
-set exec_output_common10 [lindex [remote_exec build "${symaddrfile} ${binfile} common10"] 1]
-regsub -all "\[\r\n\]" ${exec_output_common10} "" exec_output_common10
-
-set exec_output_common11 [lindex [remote_exec build "${symaddrfile} ${binfile} common11"] 1]
-regsub -all "\[\r\n\]" ${exec_output_common11} "" exec_output_common11
-
-if [istarget "hppa64-*-*"] {
-    gdb_test "p &data1" "..* = \\(int \[*\]\\) ${exec_output_data1}"
-    gdb_test "p &data2" "..* = \\(int \[*\]\\) ${exec_output_data2}"
-    gdb_test "p &data3" "..* = \\(int \[*\]\\) ${exec_output_data3}"
-    gdb_test "p &data10" "..* = \\(int \[*\]\\) ${exec_output_data10}"
-    gdb_test "p &data11" "..* = \\(int \[*\]\\) ${exec_output_data11}"
-    gdb_test "p &common1" "..* = \\(int \[*\]\\) ${exec_output_common1}"
-    gdb_test "p &common2" "..* = \\(int \[*\]\\) ${exec_output_common2}"
-    gdb_test "p &common3" "..* = \\(int \[*\]\\) ${exec_output_common3}"
-    gdb_test "p &common10" "..* = \\(int \[*\]\\) ${exec_output_common10}"
-    gdb_test "p &common11" "..* = \\(int \[*\]\\) ${exec_output_common11}"
-} else {
-    gdb_test "p &data1" "..* = \\(int \[*\]\\) 0x${exec_output_data1}"
-    gdb_test "p &data2" "..* = \\(int \[*\]\\) 0x${exec_output_data2}"
-    gdb_test "p &data3" "..* = \\(int \[*\]\\) 0x${exec_output_data3}"
-    gdb_test "p &data10" "..* = \\(int \[*\]\\) 0x${exec_output_data10}"
-    gdb_test "p &data11" "..* = \\(int \[*\]\\) 0x${exec_output_data11}"
-    gdb_test "p &common1" "..* = \\(int \[*\]\\) 0x${exec_output_common1}"
-    gdb_test "p &common2" "..* = \\(int \[*\]\\) 0x${exec_output_common2}"
-    gdb_test "p &common3" "..* = \\(int \[*\]\\) 0x${exec_output_common3}"
-    gdb_test "p &common10" "..* = \\(int \[*\]\\) 0x${exec_output_common10}"
-    gdb_test "p &common11" "..* = \\(int \[*\]\\) 0x${exec_output_common11}"
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x1.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x1.cc
deleted file mode 100644
index 84231b08bea..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x1.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-
-extern int foo();
-extern int common3;
-extern int data3;
-extern int common11;
-extern int data11;
-
-int main()
-{
-  common11 = 11;
-  printf("In main: %d %d %d\n", data3, common3, foo(), common11, data11);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x2.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x2.cc
deleted file mode 100644
index 165cb85d2e3..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x2.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int common10;
-int common11;
-
-int data10 = 10;
-int data11 = 11;
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x3.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x3.cc
deleted file mode 100644
index 80d38c75e38..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03/x3.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-int common1;
-int common2;
-int common3;
-static int common4;
-
-int data1 = 1;
-int data2 = 2;
-int data3 = 3;
-static int data4 = 4;
-
-int foo()
-{
-  common1 = 1;
-  common2 = 2;
-  common3 = 3;
-  common4 = 4;
-
-  return data1 + data2 + data3 + data4 + common1 + common2 + common3 + common4;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp
deleted file mode 100644
index c57f4c0e056..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04.exp
+++ /dev/null
@@ -1,65 +0,0 @@
-# Test reading debug information from in object files.
-
-if { [skip_hp_tests] } { continue }
-
-if { ![istarget "hppa*-*-hpux*"] } {
-    verbose "HPUX test ignored for non-hppa targets."
-    return 0
-}
-
-set testfile "test"
-set srcsubdir ${srcdir}/${subdir}/objdbg04
-set objdbgdir ${objdir}/${subdir}/objdbg04
-set binfile ${objdbgdir}/${testfile}
-set toolssubdir ${srcdir}/${subdir}/tools
-set symaddrfile ${toolssubdir}/symaddr
-
-# Create and source the file that provides information about the compiler
-# used to compile the test case.
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if {!$hp_aCC_compiler && !$hp_cc_compiler} {
-  return 0
-}
-
-if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
-}
-
-if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x1.cc"
-    return -1
-}
-
-if { [gdb_compile "${srcsubdir}/x2.cc" "${objdbgdir}/x2.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x2.cc"
-    return -1
-}
-
-if { [gdb_compile "${objdbgdir}/x1.o ${objdbgdir}/x2.o" "${binfile}0" executable "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x1.cc"
-    return -1
-}
-
-if { [gdb_compile "${objdbgdir}/x2.o ${objdbgdir}/x1.o" "${binfile}1" executable "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
-    perror "Couldn't compile x1.cc"
-    return -1
-}
-
-# Test two executables. The first has x1.cc linked first, the second
-# has x2.cc linked first.  The difference is which COMDAT section was
-# picked.
-
-for {set filenum 0} {$filenum < 2} {incr filenum 1} {
-  gdb_exit
-  gdb_start
-  gdb_reinitialize_dir ${srcsubdir}
-  gdb_load ${binfile}${filenum}
-
-  gdb_test "ptype Adder" "type = template <class T> (class |)Adder {..*T val.*;.*}(.*template instantiations:.*Adder<int>|)"
-  gdb_test "ptype Adder<int>" "type = (class |)Adder<int> {.*private:.*int val;.*public:.*void set( |)\\(int\\);.*int get( |)\\(void\\);.*int add( |)\\(int\\);.*}"
-  gdb_test "ptype Adder" "type = template <class T> (class |)Adder {..*T val.*;.*}(.*template instantiations:.*Adder<int>|)"
-
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x.h b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x.h
deleted file mode 100644
index 9df8ef98556..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x.h
+++ /dev/null
@@ -1,30 +0,0 @@
-template <class T>
-class Adder {
-public:
-  void set(T);
-  T get();
-  T add(T);
-
-private:
-  T val;
-};
-
-template <class T>
-void Adder<T>::set(T new_val)
-{
-  val = new_val;
-}
-
-template <class T>
-T Adder<T>::get()
-{
-  return val;
-}
-
-template <class T>
-T Adder<T>::add(T new_val)
-{
-  val += new_val;
-  return val;
-}
-
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x1.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x1.cc
deleted file mode 100644
index 1f284b2ab0e..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x1.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <stdio.h>
-#include "x.h"
-
-template class Adder<int>;
-
-int main()
-{
-  Adder<int> add;
-
-  add.set(3);
-  add.add(3);
-  printf("In main: %d\n", add.get());
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x2.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x2.cc
deleted file mode 100644
index 29eea75d233..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg04/x2.cc
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "x.h"
-
-template class Adder<int>;
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/tools/symaddr b/gdb/testsuite/gdb.hp/gdb.objdbg/tools/symaddr
deleted file mode 100755
index 032bb9fdd7e..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/tools/symaddr
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/ksh
-
-# Get the address of a symbol in Hex.
-# $1 = object/executable file name
-# $2 = symbol name
-${srcdir}/gdb.hp/tools/odump -sym "$1" | grep "$2"$ | awk '{print $1}'
-
-exit 0
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/tools/symaddr.pa64 b/gdb/testsuite/gdb.hp/gdb.objdbg/tools/symaddr.pa64
deleted file mode 100755
index 43fd793c5d9..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/tools/symaddr.pa64
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/ksh
-
-# Get the address of a symbol in Hex.
-# $1 = object/executable file name
-# $2 = symbol name
-/usr/ccs/bin/elfdump -t +s .symtab "$1" | grep "$2"$ | awk '{print $6}'
-
-exit 0
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/tools/test-objdbg.cc b/gdb/testsuite/gdb.hp/gdb.objdbg/tools/test-objdbg.cc
deleted file mode 100644
index f8b643afbf2..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/tools/test-objdbg.cc
+++ /dev/null
@@ -1,4 +0,0 @@
-int main()
-{
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.hp/tools/odump b/gdb/testsuite/gdb.hp/tools/odump
deleted file mode 100755
index c96abed64db..00000000000
--- a/gdb/testsuite/gdb.hp/tools/odump
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/ksh
-
-# First source /app/appserver
-. /app/appserver
-
-# Exec the executable.
-exec $APPROOT/usr/contrib/bin/$(basename $0) "$@"
diff --git a/gdb/testsuite/gdb.java/Makefile.in b/gdb/testsuite/gdb.java/Makefile.in
deleted file mode 100644
index 5072ee19a6a..00000000000
--- a/gdb/testsuite/gdb.java/Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-.SUFFIXES: .java .class .o .exe .exp .check
-
-# Do 'make javamisc.check' to run just the javamisc.exp test.
-
-.exp.check:
-	rootme=`pwd`/; export rootme; \
-	cd .. ; \
-	$(MAKE) just-check RUNTESTFLAGS="${RUNTESTFLAGS} $*.exp" \
-	  EXPECT=${EXPECT}
-
-clean mostlyclean:
-	-rm -f *.o ${OBJS}  *.class *.exe *~ core
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
diff --git a/gdb/testsuite/gdb.java/jmain.exp b/gdb/testsuite/gdb.java/jmain.exp
deleted file mode 100644
index 49e7ca3b511..00000000000
--- a/gdb/testsuite/gdb.java/jmain.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2000, 2004 Free Software Foundation, 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.  
-
-# This file was based on jmisc.exp which in turn was written by
-# Anthony Green. (green@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-load_lib "java.exp"
-
-set testfile "jmain"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
-    untested "Couldn't compile ${srcfile}"
-    return -1
-}
-
-set prms_id 0
-set bug_id 0
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "set print sevenbit-strings" ".*"
-
-# Check that plain old "main" works.  The load should both set the
-# language to java and (since --main=jmain), some how set the scope to
-# jmain's main.
-
-# Where the breakpoint should always land
-
-set bpmain "Breakpoint .* file .*jmain.java, line 5\."
-
-gdb_load "${binfile}"
-setup_kfail *-*-* java/1567
-gdb_test "break main" "${bpmain}"
-
-# Check that an unqualified "main" works.
-
-
-gdb_load "${binfile}"
-setup_kfail *-*-* java/1565
-gdb_test "break jmain.main" "${bpmain}"
-
-# Check that a fully qualified "main" works.
-gdb_load "${binfile}"
-setup_xfail *-*-* gcc/16439
-gdb_test "break \'${testfile}.main(java.lang.String\[\])\'" "${bpmain}"
diff --git a/gdb/testsuite/gdb.java/jmain.java b/gdb/testsuite/gdb.java/jmain.java
deleted file mode 100644
index ee5c8bb00ce..00000000000
--- a/gdb/testsuite/gdb.java/jmain.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class jmain
-{
-  public static void main (String[] args)
-    {
-	return;
-    }
-}
diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp
deleted file mode 100644
index 9e32011d62b..00000000000
--- a/gdb/testsuite/gdb.java/jmisc.exp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2000, 2004 Free Software Foundation, 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 Anthony Green. (green@redhat.com)
-#
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-load_lib "java.exp"
-
-set testfile "jmisc"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
-    untested "Couldn't compile ${srcfile}"
-    return -1
-}
-
-# Set the current language to java.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_java {} {
-    global gdb_prompt
-    global binfile objdir subdir
-
-    verbose "loading file '$binfile'"
-    gdb_load $binfile
-
-    send_gdb "set language java\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {}
-	timeout { fail "set language java (timeout)" ; return 0 }
-    }
-
-    return [gdb_test "show language" ".* source language is \"java\".*" \
-	"set language to \"java\""]
-}
-
-set prms_id 0
-set bug_id 0
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "set print sevenbit-strings" ".*"
-
-if ![set_lang_java] then {
-    # Ref PR gdb:java/1565.  Don't use the simpler "break jmisc.main".
-    # As of 2004-02-24 it wasn't working and is being tested separatly.
-    runto "\'${testfile}.main(java.lang.String\[\])\'"
-
-    send_gdb "ptype jmisc\n"   
-    gdb_expect {   
-	-re "type = class jmisc  extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $"               { pass "ptype jmisc" }
-	-re ".*$gdb_prompt $"             { fail "ptype jmisc" }
-	timeout { fail "ptype jmisc (timeout)" ; return }
-    }
-
-    send_gdb "p args\n"
-    gdb_expect {   
-	-re "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+\[\r\n\ \t]+$gdb_prompt $"                                        { pass "p args" }
-	-re ".*$gdb_prompt $"             { fail "p args" }
-	timeout { fail "p args (timeout)" ; return }
-    }
-
-    send_gdb "p *args\n"
-    gdb_expect {   
-	-re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $"                                                             { pass "p *args" }
-	-re ".*$gdb_prompt $"             { fail "p *args" }
-	timeout { fail "p *args (timeout)" ; return }
-    }
-}
diff --git a/gdb/testsuite/gdb.java/jmisc.java b/gdb/testsuite/gdb.java/jmisc.java
deleted file mode 100644
index a11ba5447ec..00000000000
--- a/gdb/testsuite/gdb.java/jmisc.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class jmisc
-{
-  public static void main (String[] args)
-  {
-    return;
-  }
-}
diff --git a/gdb/testsuite/gdb.java/jmisc1.exp b/gdb/testsuite/gdb.java/jmisc1.exp
deleted file mode 100644
index dab85c8e7a8..00000000000
--- a/gdb/testsuite/gdb.java/jmisc1.exp
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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 Anthony Green. (green@redhat.com)
-#
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-load_lib "java.exp"
-
-set testfile "jmisc"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
-    untested "Couldn't compile ${srcfile}"
-    return -1
-}
-
-# Set the current language to java.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_java {} {
-    global gdb_prompt
-    global binfile objdir subdir
-
-    verbose "loading file '$binfile'"
-    gdb_load $binfile
-
-    send_gdb "set language java\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {}
-	timeout { fail "set language java (timeout)" ; return 0 }
-    }
-
-    return [gdb_test "show language" ".* source language is \"java\".*" \
-	"set language to \"java\""]
-}
-
-set prms_id 0
-set bug_id 0
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "set print sevenbit-strings" ".*"
-
-if ![set_lang_java] then {
-    runto ${testfile}.main(java.lang.String\[\])
-
-    send_gdb "ptype jmisc\n"   
-    gdb_expect {   
-	-re "type = class jmisc  extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $"               { pass "ptype jmisc" }
-	-re ".*$gdb_prompt $"             { fail "ptype jmisc" }
-	timeout { fail "ptype jmisc (timeout)" ; return }
-    }
-
-    send_gdb "p args\n"
-    gdb_expect {   
-	-re "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+\[\r\n\ \t]+$gdb_prompt $"                                        { pass "p args" }
-	-re ".*$gdb_prompt $"             { fail "p args" }
-	timeout { fail "p args (timeout)" ; return }
-    }
-
-    send_gdb "p *args\n"
-    gdb_expect {   
-	-re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $"                                                             { pass "p *args" }
-	-re ".*$gdb_prompt $"             { fail "p *args" }
-	timeout { fail "p *args (timeout)" ; return }
-    }
-
-    # The idea of running to 'exit' is that 'exit' is in a different
-    # objfile from the rest of the program (provided that program is
-    # linked normally with a shared libc).  That causes gdb to examine
-    # fresh objfiles.  There is nothing important about 'exit'
-    # semantics; it could be any symbol that is in a shared library.
-    # -- chastain 2003-08-06
-
-    gdb_test "break exit" ".*Breakpoint $decimal at .*"
-    gdb_test_multiple "continue" "continue to exit" {
-	-re ".*Breakpoint $decimal, .*exit.*$gdb_prompt $" {
-	    pass "continue to exit"
-	}
-	-re ".*internal-error: sect_index_text not initialized.*\\(y or n\\) " {
-	    # gdb choked on the "anonymous objfile" (probably).
-	    kfail "gdb/1322" "continue to exit"
-	    # get back to the gdb prompt
-	    gdb_test_multiple "no" "internal sync 1" {
-		-re ".*\\(y or n\\) " {
-		    gdb_test_multiple "no" "internal sync 2" {
-			-re ".*$gdb_prompt $" { ; }
-		    }
-		}
-	    }
-	}
-    }
-}
diff --git a/gdb/testsuite/gdb.java/jprint.exp b/gdb/testsuite/gdb.java/jprint.exp
deleted file mode 100644
index 0268f87fcd8..00000000000
--- a/gdb/testsuite/gdb.java/jprint.exp
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-# This file was written by Jeff Johnston. (jjohnstn@redhat.com)
-#
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-load_lib "java.exp"
-
-set testfile "jprint"
-set srcfile ${srcdir}/$subdir/${testfile}.java
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [compile_java_from_source ${srcfile} ${binfile} "-g"] != "" } {
-    untested "Couldn't compile ${srcfile}"
-    return -1
-}
-
-# Set the current language to java.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_java {} {
-    global gdb_prompt
-    global binfile objdir subdir
-
-    verbose "loading file '$binfile'"
-    gdb_load $binfile
-
-    send_gdb "set language java\n"
-    gdb_expect {
-	-re ".*$gdb_prompt $" {}
-	timeout { fail "set language java (timeout)" ; return 0 }
-    }
-
-    return [gdb_test "show language" ".* source language is \"java\".*" \
-	"set language to \"java\""]
-}
-
-set prms_id 0
-set bug_id 0
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "set print sevenbit-strings" ".*"
-
-if ![set_lang_java] then {
-    # Ref PR gdb:java/1565.  Don't use the simpler "break jmisc.main".
-    # As of 2004-02-24 it wasn't working and is being tested separatly.
-    runto "\'${testfile}.main(java.lang.String\[\])\'"
-
-    gdb_test "p jvclass.addprint(4,5,6)" "sum is 15\r\n.*" "unambiguous static call"
-
-    gdb_test "next" ""
-    gdb_test "next" ""
-
-    gdb_test "p x.print(44)" "x is 44\r\n.*" "single argument print call"
-    gdb_test "p x.print(22,33)" "y is 33\r\n.*" "double argument print call"
-    gdb_test "call x.dothat(55)" "new value is 58\r\n.*= 62.*" "virtual fn call"
-    gdb_test "p x.addprint(1,2,3)" "sum is 6\r\n.*" "inherited static call"
-    gdb_test "call x.addk(44)" "adding k gives 121\r\n.*= 121.*" "inherited virtual fn call"
-}
diff --git a/gdb/testsuite/gdb.java/jprint.java b/gdb/testsuite/gdb.java/jprint.java
deleted file mode 100644
index f17607efe76..00000000000
--- a/gdb/testsuite/gdb.java/jprint.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// jprint.java test program.
-//
-// Copyright 2004
-// Free Software Foundation, Inc.
-//
-// Written by Jeff Johnston <jjohnstn@redhat.com> 
-// Contributed by Red Hat
-//
-// 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.
-
-class jvclass {
-  public static int k;
-  static {
-    k = 77;
-  }
-  public static void addprint (int x, int y, int z) {
-    int sum = x + y + z;
-    System.out.println ("sum is " + sum);
-  }
-
-  public int addk (int x) {
-    int sum = x + k;
-    System.out.println ("adding k gives " + sum);
-    return sum;
-  }
-}
-    
-public class jprint extends jvclass {
-  public int dothat (int x) {
-    int y = x + 3;
-    System.out.println ("new value is " + y);
-    return y + 4;
-  }
-  public static void print (int x) {
-    System.out.println("x is " + x);
-  }
-  public static void print (int x, int y) {
-    System.out.println("y is " + y);
-  }
-  public static void main(String[] args) {
-    jprint x = new jprint ();
-    x.print (44);
-    print (k, 33);
-  }
-}
-
-
diff --git a/gdb/testsuite/gdb.java/jv-exp.exp b/gdb/testsuite/gdb.java/jv-exp.exp
deleted file mode 100644
index 1ee9bd33975..00000000000
--- a/gdb/testsuite/gdb.java/jv-exp.exp
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2000 Free Software Foundation, 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
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Set the current language to Java.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_java {} {
-    global gdb_prompt
-
-    if [gdb_test "set language java" "" "set language java"] {
-	return 0
-    }
-
-    if [gdb_test "show language" ".* source language is \"java\".*"] {
-	return 0
-    }
-    return 1;
-}
-
-proc test_comparisons {} {
-    global gdb_prompt
-
-    # Test various comparisons.
-
-    gdb_test "p 1 > 2" " = false"
-    gdb_test "p 1 < 2" " = true"
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "set print sevenbit-strings" ""
-gdb_test "set print address off" "" ""
-gdb_test "set width 0" ""
-
-if [set_lang_java] then {
-    test_comparisons
-} else {
-    fail "Java expression tests suppressed"
-}
diff --git a/gdb/testsuite/gdb.java/jv-print.exp b/gdb/testsuite/gdb.java/jv-print.exp
deleted file mode 100644
index 00da1f33ad4..00000000000
--- a/gdb/testsuite/gdb.java/jv-print.exp
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999 Free Software Foundation, 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
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Set the current language to Java.  This counts as a test.  If it
-# fails, then we skip the other tests.
-
-proc set_lang_java {} {
-    global gdb_prompt
-
-    if [gdb_test "set language java" "" "set language java"] {
-	return 0
-    }
-
-    if [gdb_test "show language" ".* source language is \"java\".*"] {
-	return 0
-    }
-    return 1;
-}
-
-proc test_integer_literals_accepted {} {
-    global gdb_prompt
-
-    # Test various decimal values.
-
-    gdb_test "p 123" " = 123"
-    gdb_test "p -123" " = -123"
-    gdb_test "p/d 123" " = 123"
-
-    # Test various octal values.
-
-    gdb_test "p 0123" " = 83"
-    gdb_test "p 00123" " = 83"
-    gdb_test "p -0123" " = -83"
-    gdb_test "p/o 0123" " = 0123"
-
-    # Test various hexadecimal values.
-
-    gdb_test "p 0x123" " = 291"
-    gdb_test "p -0x123" " = -291"
-    gdb_test "p 0x0123" " = 291"
-    gdb_test "p -0x0123" " = -291"
-    gdb_test "p 0xABCDEF" " = 11259375"
-    gdb_test "p 0xabcdef" " = 11259375"
-    gdb_test "p 0xAbCdEf" " = 11259375"
-    gdb_test "p/x 0x123" " = 0x123"
-}
-
-proc test_character_literals_accepted {} {
-    global gdb_prompt
-
-    gdb_test "p 'a'" " = 'a'"
-    gdb_test "p/c 'a'" " = 'a'"
-    gdb_test "p/c 70" " = 'F'"
-    gdb_test "p/x 'a'" " = 0x61"
-    gdb_test "p/d 'a'" " = 97"
-    gdb_test "p/t 'a'" " = 1100001"
-    gdb_test "p/x '\\377'" " = 0xff"
-    gdb_test "p '\\''" " = '\\\\''"
-    # Note "p '\\'" => "= 92 '\\'"
-    gdb_test "p '\\\\'" " = '\\\\\\\\'"
-
-    # Test the /c print format.
-}
-
-proc test_integer_literals_rejected {} {
-    global gdb_prompt
-
-    test_print_reject "p 0x" 
-    gdb_test "p ''" "Empty character constant"
-    gdb_test "p '''" "Empty character constant"
-    test_print_reject "p '\\'"
-
-    # Note that this turns into "p '\\\'" at gdb's input.
-    test_print_reject "p '\\\\\\'"
-
-    # Test various decimal values.
-
-    test_print_reject "p DEADBEEF"
-
-    test_print_reject "p 123DEADBEEF"
-    test_print_reject "p 123foobar.bazfoo3"
-    test_print_reject "p 123EEEEEEEEEEEEEEEEE33333k333"
-    gdb_test "p 123.4+56.7" "180.(099\[0-9]*|100\[0-9\]*)" "check for floating addition"
-
-    # Test various octal values.
-
-    test_print_reject "p 09" 
-    test_print_reject "p 079" 
-
-    # Test various hexadecimal values.
-
-    test_print_reject "p 0xG" 
-    test_print_reject "p 0xAG" 
-}
-
-
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_test "print \$pc" "No registers\\."
-# FIXME: should also test "print $pc" when there is an execfile but no
-# remote debugging target, process or corefile.
-
-gdb_test "set print sevenbit-strings" ""
-gdb_test "set print address off" "" ""
-gdb_test "set width 0" ""
-
-if [set_lang_java] then {
-    test_integer_literals_accepted
-    test_character_literals_accepted
-    test_integer_literals_rejected
-} else {
-    fail "Java print command tests suppressed"
-}
diff --git a/gdb/testsuite/gdb.mi/ChangeLog-1999-2003 b/gdb/testsuite/gdb.mi/ChangeLog-1999-2003
deleted file mode 100644
index 6f263c33056..00000000000
--- a/gdb/testsuite/gdb.mi/ChangeLog-1999-2003
+++ /dev/null
@@ -1,768 +0,0 @@
-2003-08-07  Andrew Cagney  <cagney@redhat.com>
-
-	* mi2-basics.exp: Copy base MI .exp file, set MIFLAGS to -i=mi2.
-	* mi2-break.exp, mi2-cli.exp, mi2-console.exp: Ditto.
-	* mi2-disassemble.exp, mi2-eval.exp, mi2-file.exp: Ditto.
-	* mi2-hack-cli.exp, mi2-pthreads.exp, mi2-read-memory.exp: Ditto.
-	* mi2-regs.exp, mi2-return.exp, mi2-simplerun.exp: Ditto.
-	* mi2-stack.exp, mi2-stepi.exp, mi2-syn-frame.exp: Ditto.
-	* mi2-until.exp, mi2-var-block.exp, mi2-var-child.exp: Ditto.
-	* mi2-var-cmd.exp, mi2-var-display.exp, mi2-watch.exp: Ditto.
-
-2003-05-03  J. Brobecker  <brobecker@gnat.com>
-
-	From Thierry Schneider  <tpschneider1@yahoo.com>:
-	* mi1-symbol.exp (-symbol-list-lines): New test file to
-	validate all symbol-related commands
-
-2003-04-08  Andrew Cagney  <cagney@redhat.com>
-
-	* gdb792.exp: Skip when C++.
-
-2003-02-23  Stephane Carrez  <stcarrez@nerim.fr>
-
-	* mi-syn-frame.exp: Don't run this test when gdb,nosignals is set.
-
-2002-12-13  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* mi-basics.exp: Change tests for -environment-directory.  Also add
-	tests for -environment-cd, -environment-pwd, and -environment-path.
-	Part of fix for PR gdb/741.
-
-2002-11-05  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* gdb792.cc: New file to test patch for PR gdb/792.
-	* gdb792.exp: Ditto.
-
-2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
-
-        * mi-console.exp: Use mi_runto, mi_run_to_main, mi_next_to,
-	mi_step_to wherever possible.  Update copyright notices.
-	* mi-disassemble.exp: Ditto.
-	* mi-eval.exp: Ditto.
-	* mi-read-memory.exp: Ditto.
-	* mi-regs.exp: Ditto.
-	* mi-return.exp: Ditto.
-	* mi-stack.exp: Ditto.
-	* mi-stepi.exp: Ditto.
-	* mi-var-block.exp: Ditto.
-	* mi-var-cmd.exp: Ditto.
-	* mi-watch.exp: Ditto.
-	* mi1-console.exp: Ditto.
-	* mi1-disassemble.exp: Ditto.
-	* mi1-eval.exp: Ditto.
-	* mi1-read-memory.exp: Ditto.
-	* mi1-regs.exp: Ditto.
-	* mi1-return.exp: Ditto.
-	* mi1-stack.exp: Ditto.
-	* mi1-stepi.exp: Ditto.
-	* mi1-var-block.exp: Ditto.
-	* mi1-var-cmd.exp: Ditto.
-        * mi1-watch.exp: Ditto.
-
-2002-10-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* mi-var-cmd.exp: Add tests to verify that a -var-assign that changes
-	a value shows up in the changelist of a -var-update.  Part of fix
-	for gdb/702.
-	* mi1-var-cmd.exp: Ditto.
-
-2002-10-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* mi-return.exp: Change expected frame output to remove extraneous
-	space in level field when frame level is single digit.  Part of
-	fix for PR gdb/192.
-	* mi-stack.exp: Ditto.
-	* mi1-return.exp: Ditto.
-	* mi1-stack.exp: Ditto.
-
-2002-10-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* mi-var-block.exp: Change expected output from -var-update
-	command to expect list format for "changelist".  Fix for
-	PR gdb/672.
-	* mi-var-cmd.exp: Ditto.
-	* mi-var-child: Ditto.
-
-2002-09-25  Keith Seitz  <keiths@redhat.com>
-
-	* mi-pthreads.exp (get_mi_thread_list): Check if expect_out
-	exists before using it.
-	(check_mi_and_console_threads): Likewise.
-	* gdb669.exp (get_mi_thread_list): Likewise.
-	(check_mi_and_console_threads): Likewise.
-
-2002-09-24  Keith Seitz  <keiths@redhat.com>
-
-	* configure.in: Add config header.
-	Check for pthread.h.
-	* configure: Regenerate.
-	* config.in: New file.
-	* pthreads.c: New file.
-	* mi-pthreads.exp: New file to test thread functionality.
-	* gdb669.exp: New file.
-
-2002-09-17  Keith Seitz  <keiths@redhat.com>
-
-	* mi-var-cmd.exp: Add tests to check when varobj pinned to a
-	selected frame changes type.
-
-2002-09-17  Keith Seitz  <keiths@redhat.com>
-
-	* mi-console.exp: Update copyright.
-	* mi-var-block.exp: Likewise.
-	* mi-var-cmd.exp: Likewise.
-	* mi-var-display.exp: Likewise.
-	* mi0-console.exp: Likewise.
-	* mi0-var-child.exp: Likewise.
-	* mi0-var-cmd.exp: Likewise.
-	* mi0-var-display.exp: Likewise.
-
-2002-09-16  Keith Seitz  <keiths@redhat.com>
-
-	* gdb701.exp: New file for testing varobj target type bug.
-	* gdb701.c: New file.
-
-2002-09-13  Keith Seitz  <keiths@redhat.com>
-
-	* mi-var-child.exp: Use mi_step_to and mi_execute_to instead
-	of a bunch of repeated send_gdb/gdb_expect statements.
-	Fix line numbers.
-
-2002-09-10  Keith Seitz  <keiths@redhat.com>
-
-	* mi-simplerun.exp (test_controlled_execution): Follow renaming of
-	mi_run_to to mi_execute_to.
-	* mi-var-cmd.exp: Likewise.
-	* mi0-simplerun.exp: Likewise.
-	* mi0-var-cmd.exp: Likewise.
-
-2002-09-03  Keith Seitz  <keiths@redhat.com>
-
-	* gdb680.exp: New file to test to check for uiout list/tuple
-	nesting bug.
-
-2002-03-04  Michael Chastain  <mec@shout.net>
-
-	* mi-var-cmd.exp: In test "create local variable func",
-	accommodate gcc v3 function signature.
-	* mi0-var-cmd-exp: Ditto.
-
-2002-02-05  Jim Blandy  <jimb@redhat.com>
-
-	* mi-regs.exp: Various cleanups for SPARC-only tests.
-	(test_breakpoints_creation_and_listing): Format of breakpoint
-	table has changed.
-	(sparc_register_tests): Expand floating-point number regexp to
-	recognize NaN values, too.  Replace ineffectual single backslash
-	before a hyphen with a double backslash.  Don't check the exact
-	numbers of the registers which have changed, since there's no way
-	to know which registers changed, exactly; just check that the
-	result is well-formed.
-	* mi0-regs.exp: (sparc_register_tests): Same as for
-	sparc_register_tests in mi-regs.exp.
-
-	* mi-var-child.exp ("get children of struct_declarations", "get
-	children of struct_declarations.s2.u2.u1s2", "get children of
-	weird"): Tolerate argument types when they appear in function
-	types.  (Dwarf 2 includes prototype info; STABS does not.)
-	* mi0-var-child.exp: Same.
-
-2001-12-19  Keith Seitz  <keiths@redhat.com>
-
-	* mi-var-display.exp: char* variables have a child. Update all
-	occurences.
-	* mi0-var-display.exp: Likewise.
-
-2001-08-29  Andrew Cagney  <cagney@redhat.com>
-
-	* mi-var-cmd.exp, mi0-var-cmd.exp: Variable lpcharacter has one
-	child.  Soften floating point tests.
-
-2001-08-09  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi0-var-block.exp, mi0-stack.exp, mi0-simplerun.exp,
-	mi0-regs.exp, mi0-watch.exp, mi0-stepi.exp, mi0-until.exp,
-	mi0-return.exp, mi0-read-memory.exp, mi0-eval.exp,
-	mi0-disassemble.exp, mi0-console.exp, mi-watch.exp,
-	mi-var-display.exp, mi-var-cmd.exp, mi-var-child.exp,
-	mi-until.exp, mi-var-block.exp, mi-stepi.exp, mi-stack.exp,
-	mi-simplerun.exp, mi-return.exp, mi-regs.exp, mi-read-memory.exp,
-	mi-disassemble.exp, mi-eval.exp, mi-console.exp: Replace pattern
-	matching thread=0 with one to also match thread=1.
-	Fix PR gdb/190.
-
-2001-08-18  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi0-until.exp, mi-until.exp, mi0-stepi.exp, mi-stepi.exp,
-	mi-simplerun.exp, mi0-simplerun.exp, mi0-return.exp,
-	mi-return.exp, mi0-console.exp, mi-console.exp: Recognize an
-	unexpected run-to-main response. Report as a fail.
-
-2001-06-27  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-disassemble.exp: Update to accept mi1 breakpoint tables.
-	* mi-basics.exp: Ditto.
-	* mi-simplerun.exp: Ditto.
-	* mi-watch.exp: Ditto. Add check for full header.
-	* mi-break.exp: Ditto. Add check for full header.
-
-2001-06-26  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-stack.exp: Update.  Output for args=... and
-	locals=... changed to a list.
-	
-2001-06-26  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-stack.exp: Update. Output for stack=..., args=... and
-	stack-args=... changed to a list.
-
-2001-06-25  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-console.exp: Update args=... part of stop-reason
-	patterns. Output changed to a list of arguments.
-	* mi-disassemble.exp: Ditto.
-	* mi-simplerun.exp: Ditto.
-	* mi-return.exp: Ditto.
-	* mi-read-memory.exp: Ditto.
-	* mi-eval.exp: Ditto.
-	* mi-watch.exp: Ditto.
-	* mi-var-display.exp: Ditto.
-	* mi-var-cmd.exp: Ditto.
-	* mi-var-child.exp: Ditto.
-	* mi-var-block.exp: Ditto.
-	* mi-until.exp: Ditto.
-	* mi-stepi.exp: Ditto.
-	* mi-stack.exp: Ditto.
-	* mi-regs.exp: Ditto.
-
-2001-06-25  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-read-memory.exp: Update patterns matching data-read-memory.
-	Outputs a list.
-
-2001-06-25  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-regs.exp: Update patterns matching register-values.  Outputs a
-	list.
-
-2001-06-25  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-regs.exp: Update patters matching register-names.  Now
-	outputs a list.
-
-2001-06-25  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-regs.exp: Update patterns matching changed-registers.  Now
-	outputs a list.
-
-2001-06-23  Andrew Cagney  <ac131313@redhat.com>
-
-	* ChangeLog-mi: Rename to ChangeLog.
-	* mi-basics.exp: Remove local emacs variable defining
-	change-log-default-name.
-	* mi-break.exp, mi-console.exp, mi-disassemble.exp: Ditto.
-	* mi-eval.exp, mi-hack-cli.exp, mi-read-memory.exp: Ditto.
-	* mi-regs.exp, mi-return.exp, mi-simplerun.exp: Ditto.
-	* mi-stack.exp, mi-stepi.exp, mi-until.exp: Ditto.
-	* mi-var-block.exp, mi-var-child.exp, mi-var-cmd.exp: Ditto.
-	* mi-var-display.exp, mi-watch.exp, mi0-basics.exp: Ditto.
-	* mi0-break.exp, mi0-console.exp, mi0-disassemble.exp: Ditto.
-	* mi0-eval.exp, mi0-hack-cli.exp, mi0-read-memory.exp: Ditto.
-	* mi0-regs.exp, mi0-return.exp, mi0-simplerun.exp: Ditto.
-	* mi0-stack.exp, mi0-stepi.exp, mi0-until.exp: Ditto.
-	* mi0-var-block.exp, mi0-var-child.exp, mi0-var-cmd.exp: Ditto.
-	* mi0-var-display.exp, mi0-watch.exp: Ditto.
-
-2001-06-23  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-disassemble.exp: Update patterns matching data-disassemble
-	output.  Now produces a list of instructions and a list of
-	source/assembly lines.
-
-2001-06-18  Andrew Cagney  <ac131313@redhat.com>
-
-	* mi-basics.exp, mi-break.exp, mi-console.exp, mi-disassemble.exp,
-	mi-eval.exp, mi-hack-cli.exp, mi-read-memory.exp, mi-regs.exp,
-	mi-return.exp, mi-simplerun.exp, mi-stack.exp, mi-stepi.exp,
-	mi-until.exp, mi-var-block.exp, mi-var-child.exp, mi-var-cmd.exp,
-	mi-var-display.exp, mi-watch.exp, mi0-basics.exp, mi0-break.exp,
-	mi0-console.exp, mi0-disassemble.exp, mi0-eval.exp,
-	mi0-hack-cli.exp, mi0-read-memory.exp, mi0-regs.exp,
-	mi0-return.exp, mi0-simplerun.exp, mi0-stack.exp, mi0-stepi.exp,
-	mi0-until.exp, mi0-var-block.exp, mi0-var-child.exp,
-	mi0-var-cmd.exp, mi0-var-display.exp, mi0-watch.exp: Use MIFLAGS
-	to explictly select an interpreter.
-
-2001-06-16  Andrew Cagney  <ac131313@redhat.com>
-
-	MI0 was the never enabled MI interface included in GDB 5.0.
-	* mi0-basics.exp: Copy mi-basics.exp.
-	* mi0-break.exp: Copy mi-break.exp.
-	* mi0-console.exp: Copy mi-console.exp.
-	* mi0-disassemble.exp: Copy mi-disassemble.exp.
-	* mi0-eval.exp: Copy mi-eval.exp.
-	* mi0-hack-cli.exp: Copy mi-hack-cli.exp.
-	* mi0-read-memory.exp: Copy mi-read-memory.exp.
-	* mi0-regs.exp: Copy mi-regs.exp.
-	* mi0-return.exp: Copy mi-return.exp.
-	* mi0-simplerun.exp: Copy mi-simplerun.exp.
-	* mi0-stack.exp: Copy mi-stack.exp.
-	* mi0-stepi.exp: Copy mi-stepi.exp.
-	* mi0-until.exp: Copy mi-until.exp.
-	* mi0-var-block.exp: Copy mi-var-block.exp.
-	* mi0-var-child.exp: Copy mi-var-child.exp.
-	* mi0-var-cmd.exp: Copy mi-var-cmd.exp.
-	* mi0-var-display.exp: Copy mi-var-display.exp.
-	* mi0-watch.exp: Copy mi-watch.exp.
-	
-2001-05-11  Fernando Nasser  <fnasser@redhat.com>
-
-	* mi-var-child.exp: Adjust for the fact that now (char *) can be
-	dereferenced.
-
-2001-03-06  Kevin Buettner  <kevinb@redhat.com>
-
-	* mi-basics.exp, mi-break.exp, mi-disassemble.exp,
-	mi-eval.exp, mi-hack-cli.exp, mi-read-memory.exp, mi-regs.exp,
-	mi-return.exp, mi-simplerun.exp, mi-stack.exp, mi-stepi.exp,
-	mi-until.exp, mi-watch.exp: Update/correct copyright notices.
-
-2001-01-20  Mark Kettenis  <kettenis@gnu.org>
-
-	* mi-support.exp (mi_gdb_start): Skip mi tests if -i flag is
-	recognized (i.e. if GDB was compiled with UI_OUT, but the mi
-	interpreter wasn't recognized (because it wasn't compiled in).
-
-Tue Apr 18 15:36:07 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* Makefile.in (clean mostlyclean): Do not delete $(MISCELLANEOUS).
-
-Tue Mar 14 15:54:57 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* basics.c: Add EMACS local variable pointing change-log at this
- 	file.
-	* Makefile.in: Ditto
-
-2000-03-13  James Ingham  <jingham@leda.cygnus.com>
-
-	* mi-var-block.exp: The error report from varobj_create changed
-	since I am now trapping parse_exp_1 errors.  Change the tests to
-	match the new error message.
-	* mi-var-child.exp: Ditto.
-	* mi-var-cmd.exp: Ditto.
-
-2000-03-06  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-disassemble.exp: Don't assume numbers for the offset
- 	values. They can be different depending on the architecture.
-
-	* mi-watch.exp (test_watchpoint_triggering): In same cases the
- 	type can be 'hw wathcpoint' not just 'watchpoint'. Adjust for that.
-
-	* basics.c (callee4): Make the function return something,
- 	otherwise the return value is undefined.
-
-2000-03-06  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-basics.exp: Comment out test for a still unimplemented operation.
-
-	* mi-disassemble.exp: Rewrite most of the tests to conform to new
- 	disassemble interface.
-
-Sat Mar  4 13:55:08 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	From Fri 3 Mar 2000 Peter Schauer:
-	* mi-support.exp (mi_gdb_start): When GDB doesn't recongize -i=mi
- 	option, assume no MI support present.
-
-2000-02-01  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-support.exp (mi_gdb_start): Update to recognize start up
- 	message with 'UI_OUT' instead of 'HEADLESS'.
-
-2000-01-27  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-regs.exp (test_running_the_program): Add global var 'hex'.
-
-	* mi-stack.exp, mi-stepi.exp, mi-until.exp, mi-watch.exp,
- 	mi-var-display.exp, mi-var-cmd.exp, mi-var-child.exp,
- 	mi-var-block.exp: Update all stopped messages.
-
-2000-01-17  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-console.exp, mi-disassemble.exp, mi-eval.exp,
- 	mi-read-memory.exp, mi-regs.exp, mi-return.exp, mi-simplerun.exp:
- 	Update stopped messages, update copyright.
-	
-	* mi-disassemble.exp: Update error messages output.
-	
-	* mi-support.exp (proc mi_step): Make gdb do a 'step' command, not
- 	a 'next'. Update stopped message.
-	(proc mi_next): Update stop message.
-	(proc mi_run_to_main): Update stopped message.
-	Update copyright.
-
-2000-01-11  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-simplerun.exp: Remove stack frames tests from here, to:
-
-	* mi-stack.exp: New file, tests for stack commands.
-
-	* mi-support.exp (mi_run_to_main, mi_next, mi_step) : Update to
- 	include thread-id in stopped message.
-
-	* mi-regs.exp: Update break-insert output.
-
-	* (mi-console.exp, mi-disassemble.exp, mi-eval.exp,
- 	mi-read-memory.exp, mi-regs.exp, mi-return.exp, mi-simplerun.exp,
- 	mi-stepi.exp, mi-until.exp, mi-var-block.exp, mi-var-child.exp,
- 	mi-var-cmd.exp, mi-var-display.exp, mi-watch.exp): Update stopped
- 	message to include thread-id.
-
-Wed Dec 29 22:06:05 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-watch.exp, mi-var-display.exp, mi-var-cmd.exp,
- 	mi-var-child.exp, mi-var-block.exp, mi-until.exp, mi-stepi.exp,
- 	mi-simplerun.exp, mi-return.exp, mi-support.exp, mi-eval.exp,
- 	mi-console.exp, mi-disassemble.exp, mi-break.exp: Update to
- 	reflect extended output from -break-insert command.
-	
-	* mi-break.exp (test_rbreak_creation_and_listing): XFAIL regexp
- 	tests.  -r flag broken by above.
-	
-Sun Dec 19 19:28:13 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* cpp_variable.cc, cpp_variable.h, c_variable.c: Delete.
-
-Fri Dec 17 20:59:55 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-read-memory.exp: Test of ``-o <offset>'' now works.
-
-1999-12-16  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-var-cmd.exp: Fix 2 tests outputs.
-
-	* mi-var-child.exp: Add many more tests.
-
-	* mi-var-display.exp: Add many more tests.
-
-	* var-cmd.c: Change type of incr_a parameter to char.
-
-1999-12-15  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-var-block.exp: Set up xfails fro known problems.
-
-	* mi-var-display.exp: Set up printing of values of 'e' and 'anone'
- 	as xfails.
-
-	* mi-var-child.exp: Fix typos.
-
-1999-12-15  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-var-child.exp: Space was missing before ``[10]''.
-
-Wed Dec 15 19:23:38 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-read-memory.exp: Add test for ``-o <offset>''.  Update checks
- 	and match next-row et.al.
-
-1999-12-14  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-var-display.exp : New file. Tests for format and type, with
- 	unions, structs and enums.
-	
-	* mi-var-cmd.exp: Add some var-assign tests.
-
-1999-12-14 Elena Zannoni <ezannoni@kwikemart.cygnus.com> 
-
-	* mi-var-cmd.exp, mi-var-block.exp, mi-var-child.exp: New files
- 	some tests for -var* commands.
-
-	* var-cmd.c: New source file for var-* commands tests.
-	* gdb.mi/Makefile.in (PROGS): Add var-cmd.
-	
-Mon Dec 13 18:06:09 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-break.exp: Fix quoting.  Changed "srcfile.c":6 to
- 	"\"srcfile.c\":6".
-	* mi-simplerun.exp: Fix quoting.
-
-Sat Dec 11 21:33:37 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-simplerun.exp (exec-finish): Fix return value was zero,
- 	should have been three.
-
-	* mi-disassemble.exp: Reduce number of wild card matches in
- 	* patterns.  Remove all numeric constants.
-
-1999-12-09  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-eval.exp: New file. Some initial tests for
- 	-data-evaluate-expression.
-
-1999-12-09  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* c_variable.c, cpp_variable.cc, cpp_variable.h: New files.  Used
-	for testing "var" operations.
-	* Makefile.in: Add reference to the above files.
-
-1999-12-08  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-regs.exp: Fix test for format 'N' for
- 	data-list-register-values.
-
-1999-12-07  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-disassemble.exp: Update expected output. Break test of
- 	disassembly in mixed mode into 2 functions.
-
-	* mi-regs.exp: Initial register tests. Works only on sparc right
- 	now.
-
-1999-12-02  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-stepi.exp: New file. Tests exec-step-instruction and
- 	exec-next-instruction.
-	* mi-until.exp: New file. Tests exec-until.
-	* until.c: New file.
-	* mi-return.exp: New file. Tests exec-return.
-
-Thu Dec  2 09:38:23 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-hack-cli.exp: New test.  Check the hacked up access to the
- 	CLI.
-
-Wed Dec  1 16:47:40 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-basics.exp: Delete calls to mi_delete_breakpoints,
- 	mi_gdb_reinitialize_dir and mi_gdb_load.  This test is checking
- 	that these can work.
-
-	* mi-support.exp (mi_step, mi_next, mi_run_to_main): New
-	procedures.
-
-	* mi-read-memory.exp, mi-read-memory.c: New files.  Test
- 	data-read-memory command.
-	
-Tue Nov 30 23:54:16 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-support.exp: Don't start SID until after GDB has been started
- 	and verified.
-	
-Tue Nov 30 22:21:33 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-support.exp (mi_uncatched_gdb_exit): When SID, call sid_exit.
-	(mi_gdb_start): When SID, call sid_start.
-	(mi_gdb_start): Add MIFLAGS to spawn-GDB command.  Check for
- 	HEADLESS gdb.  Return non-zero when GDB fails to start.
-	(mi_gdb_load): When SID or SIM, download program.
-	(mi_run_cmd): Don't do download here.  Assume target supports the
- 	00-exec-run command.
-	(skip_mi_tests, setup_gdbmi, unset_gdbmi): Delete.  Merged into
- 	mi_gdb_start.
-
-	* mi-basics.exp, mi-break.exp, mi-console.exp, mi-disassemble.exp,
- 	mi-simplerun.exp, mi-watch.exp: Update.  Check status from
- 	mi_gdb_start indicating that GDB started correctly.
-
-Tue Nov 30 15:22:08 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-support.exp (setup_gdbmi, unset_gdbmi): New
- 	procedures.  Setup/unset dejagnu for mi tests.
-	* mi-basics.exp, mi-console.exp, mi-simplerun.exp, mi-break.exp,
- 	mi-disassemble.exp, mi-watch.exp: Update.
-
-1999-11-29  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-simplerun.exp (test_running_the_program): Remove XFAIL. The
- 	output is fixed now.
-	(test_program_termination): Update output pattern.
-
-Tue Nov 30 00:19:10 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-console.c, mi-console.exp: New files. Test console output.
-
-Mon Nov 29 17:59:13 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-support.exp (mi_run_command): Check for exec-run command
- 	failure due to MI not having an active target.
-	(mi_run_command): Check for and handle a builtin simulator target.
-	(mi_run_command): Don't check/handle for ``The program has been
- 	started already'', not a valid MI response.
-	
-	* mi-simplerun.exp (test_running_the_program): Update all patterns
- 	to match async output.
-	(test_running_the_program): Mark ``step to callee4'' as XFAIL.  MI
- 	output contains {,reason="end-stepping-range"}+.
-
-	* mi-simplerun.exp: Limit the timeout for ``step to callee4'' to
- 	30 seconds.
-
-Mon Nov 29 17:30:00 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* mi-support.exp (skip_mi_tests): Print UNTESTED when MI interface
- 	isn't available.  Start/stop instead of assuming GDB is running.
-	(MIFLAGS): Define.
-	* mi-simplerun.exp, mi-disassemble.exp, mi-break.exp,
- 	mi-basics.exp, mi-watch.exp: Update.
-
-1999-11-26  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* mi-simplerun.exp: Move break-insert {-t, -r} from here.
-	* mi-break.exp: To here. New file.
-	* mi-watch.exp: New file. Tests for watchpoints.
-
-Wed Nov 24 17:42:07 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.mi/ChangeLog-mi: MI entries moved to here.
-
-Wed Nov 24 17:31:04 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* gdb.mi/mi-basics.exp, gdb.mi/mi-disassemble.exp,
- 	gdb.mi/mi-simplerun.exp: Print warning message when test isn't
- 	run.
-
-1999-11-23  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.mi/mi-simplerun.exp: Update output of break-list to account for
-	"times" field.
-
-1999-11-05  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.mi/mi-simplerun.exp: Add tests for temporary breakpoints
-	and bp based on regular expressions.
-	* gdb.mi/mi-disassemble.exp: Fix typo.
-
-1999-11-04  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.mi/mi-disassemble.exp: Update output of execution commands
- 	to reflect new 'reason' field.
-	* gdb.mi/mi-simplerun.exp: Ditto.
-
-1999-10-25  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.mi/mi-simplerun.exp: Add more stack-list-frames tests.
-
-	* gdb.mi/mi-disassemble.exp: Update 'run to main' output.  
-
-	* gdb.mi/mi-simplerun.exp: Update execution commands
- 	output. Update backtrace output.
-	
-1999-10-18  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.mi/mi-disassemble.exp: Add new tests for the new
-	disassembly command parameter, number of lines.
-
-Mon Oct 11 13:57:21 1999  Andrew Cagney  <cagney@amy.cygnus.com>
-
-	* lib/mi-support.exp: Break complicated gdb_expect containing
- 	exp_continue into a while within an expect.  Don't attempt a start
- 	more than three times.  Check return value from gdb_load.
-	
-1999-10-06  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
-
-	* gdb.mi/mi-disassemble.exp: New file.
-
-Wed Oct  6 12:05:58 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* lib/mi-support.exp (mi_run_cmd): Give up after two restart
- 	attempts.
-
-1999-09290  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.mi/mi-basics.exp: Update to current syntax and output formats.
-	* gdb.mi/mi-simplerun.exp: Ditto.
-	* lib/mi-support.exp (mi_delete_breakpoints): Ditto.
-
-1999-06-30  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.mi/basics.c (main): Fix return code.  Add a print "Hello,
-	World".
-	* gdb.mi/mi-basics.exp: Fix message texts and numbering.
-	* gdb.mi/mi-simplerun.exp: Ditto. Also, add new tests and improve
-	some patterns.
-
-1999-06-30  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* lib/mi-support.exp (mi_gdb_reinitialize_dir): Remove query as an
-	acceptable response to the environment-dir command.
-
-1999-06-30  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* lib/mi-support.exp (mi_delete_breakpoints): Remove references to
-	gdb-cli.
-	(mi_run_cmd): Ditto.
-
-1999-06-25  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* lib/mi-support.exp (skip_mi_tests): Use gdb-version to check for
-	headless output format.
-
-1999-06-24  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.mi/mi-simplerun.exp (test_controlled_execution): Add global
-	spec for hex.
-
-1999-06-24  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* lib/mi-support.exp (mi_run_cmd): Fix pattern and add a timeout
- 	clause.
-
-1999-06-24  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* lib/mi-support.exp: Use mi_gdb_prompt instead of a modified
-	gdb_prompt.  Remove uneeded loading of libgloss.
-	(mi_gdb_exit): Remove prompt argument.
-	(mi_uncatched_gdb_exit): Ditto.
-	(mi_run_cmd): New proc. MI version of gdb_run.
-	(skip_mi_tests): New proc. Check if gdb is capable of producing
-	headless formatted output.
-	* gdb.mi/mi-basics.exp: Use mi_gdb_prompt instead of a modified
-	gdb_prompt.  Eliminate parameter to mi_gdb_exit (as a result of
-	the above).  Test for skip_mi_tests before running.
-	Note: The above changes are interelated (need each other).
-	* gdb.mi/mi-simplerun.exp: Same changes as for mi-basics.exe
-	above.
-	(test_breakpoint_creation_and_listing): Remove insertion of
-	breakpoint at callee1 (and renumber tokens). Add tests for
-	break-list, break-disable and break-info.
-	(test_running_the_program): Use mi_run_cmd so it can run on remote
-	targets.
-	(test_controlled_execution): Fix broken test.
-	(test_program_termination): Test implemented.
-	* gdb.mi/basic.c (main): Small change to allow for testing of both
-	exec-next and exec-step operations.
-
-1999-06-22  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-        * lib/mi-support.exp (mi_gdb_test): New proc.  MI version of gdb_test.
-        * gdb.mi/mi-basics.exp: Use the above instead of gdb_test.
-        * gdb.mi/mi-simplerun.exp: Ditto.
-
-1999-06-22  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-        * gdb.mi/mi-simplerun.exp: New file. Tests simple debugging tasks. 
-        * gdb.mi/mi-basics.exp: Remove tests moved to above new file.
-        * lib/mi-support.exp: New file.  Support procedures for mi tests.
-
-1999-06-08  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.mi/mi-basics.exp: Skip all tests if the MI interpreter is
-	not active.
-
-1999-06-03  Fernando Nasser  <fnasser@totem.to.cygnus.com>
-
-	* gdb.mi: New directory.
-	* configure.in: Configure it.
-	* configure: Regenerate.
-	* gdb.mi/{Makefile.in,configure.in,configure}: New files.
-	* gdb.mi/{mi-basics.exp,basics.c,testcmds}: New files.
-
-
-Local Variables:
-mode: indented-text
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/gdb/testsuite/gdb.mi/Makefile.in b/gdb/testsuite/gdb.mi/Makefile.in
deleted file mode 100644
index 7bd9d5aa2d3..00000000000
--- a/gdb/testsuite/gdb.mi/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-PROGS = basics c_variable cpp_variable var-cmd
-
-MISCELLANEOUS = testcmds
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *.ci *.o $(OBJS) $(PROGS) *~ core
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
diff --git a/gdb/testsuite/gdb.mi/basics.c b/gdb/testsuite/gdb.mi/basics.c
deleted file mode 100644
index 0e3c1d8abfc..00000000000
--- a/gdb/testsuite/gdb.mi/basics.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 1999, 2000, 2004
-   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.  */
-
-/*
- *	This simple program that passes different types of arguments
- *      on function calls.  Useful to test printing frames, stepping, etc.
- */
-
-#include <stdio.h>
-
-int callee4 (void)
-{
-  int A=1;
-  int B=2;
-  int C;
-
-  C = A + B;
-  return 0;
-}
-callee3 (char *strarg)
-{
-  callee4 ();
-}
-
-callee2 (int intarg, char *strarg)
-{
-  callee3 (strarg);
-}
-
-callee1 (int intarg, char *strarg, double fltarg)
-{
-  callee2 (intarg, strarg);
-}
-
-main ()
-{
-  callee1 (2, "A string argument.", 3.5);
-  callee1 (2, "A string argument.", 3.5);
-
-  printf ("Hello, World!");
-
-  return 0;
-}
-
-/*
-Local variables: 
-change-log-default-name: "ChangeLog-mi"
-End: 
-*/
-
diff --git a/gdb/testsuite/gdb.mi/gdb669.exp b/gdb/testsuite/gdb.mi/gdb669.exp
deleted file mode 100644
index 4bdcdab7a88..00000000000
--- a/gdb/testsuite/gdb.mi/gdb669.exp
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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 checks for the bug gdb/669, where the console
-# command "info threads" and the MI command "-thread-list-ids"
-# return different threads in the system.
-
-# This only works with native configurations
-if {![isnative]} {
-  return
-}
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if {[mi_gdb_start]} {
-    continue
-}
-
-# The procs below are all stolen from mi-pthreads.exp. Any updates
-# should also be made to the procs there.
-
-proc get_mi_thread_list {name} {
-  global expect_out
-
-  # MI will return a list of thread ids:
-  #
-  # -thread-list-ids
-  # ^done,thread-ids=[thread-id="1",thread-id="2",...],number-of-threads="N"
-  # (gdb)
-  mi_gdb_test "-thread-list-ids" \
-    {\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \
-    "-thread_list_ids ($name)"
-
-  set output {}
-  if {[info exists expect_out(buffer)]} {
-    set output $expect_out(buffer)
-  }
-  set thread_list {}
-  if {![regexp {thread-ids=\{(thread-id="[0-9]+"(,)?)*\}} $output threads]} {
-    fail "finding threads in MI output ($name)"
-  } else {
-    pass "finding threads in MI output ($name)"
-
-    # Make list of console threads
-    set start [expr {[string first \{ $threads] + 1}]
-    set end   [expr {[string first \} $threads] - 1}]
-    set threads [string range $threads $start $end]
-    foreach thread [split $threads ,] {
-      if {[scan $thread {thread-id="%d"} num]} {
-	lappend thread_list $num
-      }
-    }
-  }
-
-  return $thread_list
-}
-
-# Check that MI and the console know of the same threads.
-# Appends NAME to all test names.
-proc check_mi_and_console_threads {name} {
-  global expect_out
-
-  mi_gdb_test "-thread-list-ids" \
-    {\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \
-    "-thread-list-ids ($name)"
-  set mi_output {}
-  if {[info exists expect_out(buffer)]} {
-    set mi_output $expect_out(buffer)
-  }
-
-  # GDB will return a list of thread ids and some more info:
-  #
-  # (gdb) 
-  # -interpreter-exec console "info threads"
-  # ~"  4 Thread 2051 (LWP 7734)  0x401166b1 in __libc_nanosleep () at __libc_nanosleep:-1"
-  # ~"  3 Thread 1026 (LWP 7733)   () at __libc_nanosleep:-1"
-  # ~"  2 Thread 2049 (LWP 7732)  0x401411f8 in __poll (fds=0x804bb24, nfds=1, timeout=2000) at ../sysdeps/unix/sysv/linux/poll.c:63"
-  # ~"* 1 Thread 1024 (LWP 7731)  main (argc=1, argv=0xbfffdd94) at ../../../src/gdb/testsuite/gdb.mi/pthreads.c:160"
-  # FIXME: kseitz/2002-09-05: Don't use the hack-cli method.
-  mi_gdb_test "info threads" \
-    {.*(~".*"[\r\n]*)+.*} \
-    "info threads ($name)"
-  set console_output {}
-  if {[info exists expect_out(buffer)]} {
-    set console_output $expect_out(buffer)
-  }
-
-  # Make a list of all known threads to console (gdb's thread IDs)
-  set console_thread_list {}
-  foreach line [split $console_output \n] {
-    if {[string index $line 0] == "~"} {
-      # This is a line from the console; trim off "~", " ", "*", and "\""
-      set line [string trim $line ~\ \"\*]
-      if {[scan $line "%d" id] == 1} {
-	lappend console_thread_list $id
-      }
-    }
-  }
-
-  # Now find the result string from MI
-  set mi_result ""
-  foreach line [split $mi_output \n] {
-    if {[string range $line 0 4] == "^done"} {
-      set mi_result $line
-    }
-  }
-  if {$mi_result == ""} {
-    fail "finding MI result string ($name)"
-  } else {
-    pass "finding MI result string ($name)"
-  }
-
-  # Finally, extract the thread ids and compare them to the console
-  set num_mi_threads_str ""
-  if {![regexp {number-of-threads="[0-9]+"} $mi_result num_mi_threads_str]} {
-    fail "finding number of threads in MI output ($name)"
-  } else {
-    pass "finding number of threads in MI output ($name)"
-
-    # Extract the number of threads from the MI result
-    if {![scan $num_mi_threads_str {number-of-threads="%d"} num_mi_threads]} {
-      fail "got number of threads from MI ($name)"
-    } else {
-      pass "got number of threads from MI ($name)"
-
-      # Check if MI and console have same number of threads
-      if {$num_mi_threads != [llength $console_thread_list]} {
-	fail "console and MI have same number of threads ($name)"
-      } else {
-	pass "console and MI have same number of threads ($name)"
-
-	# Get MI thread list
-	set mi_thread_list [get_mi_thread_list $name]
-
-	# Check if MI and console have the same threads
-	set fails 0
-	foreach ct [lsort $console_thread_list] mt [lsort $mi_thread_list] {
-	  if {$ct != $mt} {
-	    incr fails
-	  }
-	}
-	if {$fails > 0} {
-	  fail "MI and console have same threads ($name)"
-
-	  # Send a list of failures to the log
-	  send_log "Console has thread ids: $console_thread_list\n"
-	  send_log "MI has thread ids: $mi_thread_list\n"
-	} else {
-	  pass "MI and console have same threads ($name)"
-	}
-      }
-    }
-  }
-}
-
-#
-# Start here
-#
-set testfile "pthreads"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/gdb669-$testfile"
-
-set options [list debug incdir=$objdir]
-if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
-}
-
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load $binfile
-
-mi_run_to_main
-check_mi_and_console_threads "at main"
-
-for {set i 0} {$i < 4} {incr i} {
-  mi_next "next, try $i"
-  check_mi_and_console_threads "try $i"
-}
-
-mi_gdb_exit
-
diff --git a/gdb/testsuite/gdb.mi/gdb680.exp b/gdb/testsuite/gdb.mi/gdb680.exp
deleted file mode 100644
index eee96a69ac1..00000000000
--- a/gdb/testsuite/gdb.mi/gdb680.exp
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2002 Free Software Foundation, 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
-
-#
-# test gdb/680
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-proc do_test {count} {
-  mi_gdb_test "-data-list-register-names -1" \
-    {\^error,msg=\"bad register number\"} \
-    "-data-list-register-names -1, try $count"
-}
-
-# Tests a bug with ui-out and nested uiout types. When 
-# an error is encountered building a nest typed, like
-# lists or tuples, the uiout is not reset to some sane
-# state. As a result, uiout still thinks it is building
-# this nested type. Execute enough of these errors and
-# an assertion failure occurs. This is most obvious
-# with invalid register number and the register commands.
-
-# MAX_UIOUT_LEVELS is set to 5.
-set counter 0
-for {set i 0} {$i < 4} {incr i} {
-  do_test $i
-}
-
-#setup_kfail "gdb/680"
-do_test $i
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/gdb701.c b/gdb/testsuite/gdb.mi/gdb701.c
deleted file mode 100644
index b1e72d2bd51..00000000000
--- a/gdb/testsuite/gdb.mi/gdb701.c
+++ /dev/null
@@ -1,15 +0,0 @@
-struct _foo
-{
-  int x;
-  int y;
-  int z;
-};
-
-typedef struct _foo Foo;
-
-int
-main (int argc, char *argv[])
-{
-  Foo *foo = 0;
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.mi/gdb701.exp b/gdb/testsuite/gdb.mi/gdb701.exp
deleted file mode 100644
index 703ec6a9fc3..00000000000
--- a/gdb/testsuite/gdb.mi/gdb701.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2002 Free Software Foundation, 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
-
-#
-# test gdb/701
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile gdb701
-set srcfile "$testfile.c"
-set binfile $objdir/$subdir/$testfile
-if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] != ""} {
-  gdb_suppress_entire_file "Testcase compile failed, so all test in this file will automatically fail."
-}
-
-# When varobj reports the types of objects, it often isn't really reporting
-# the type as GDB knows it. For example, in this testcase, we have a
-# structure which has been typedefed. A varobj of this type would really have
-# a type of "TYPE_CODE_TYPEDEF". It's target type is "TYPE_CODE_STRUCT". Varobj
-# should skip over the TYPEDEF type when figuring out the varobj's children.
-# If it doesn't, Bad Things Happen(TM).
-
-# Run to main
-mi_run_to_main
-
-# Step over "foo = 0"
-mi_next "step over \"foo = 0\""
-
-mi_gdb_test "-var-create fooPtr * foo" \
-  "(&\".*\"\r\n)*\\^done,name=\"fooPtr\",numchild=\"3\",type=\"Foo \\*\"" \
-  "create fooPtr"
-
-mi_gdb_test "-var-list-children fooPtr" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"3\",.*" \
-  "list children of fooPtr"
-
-foreach i [list x y z] {
-  mi_gdb_test "-var-list-children fooPtr.$i" \
-    "(&\".*\"\r\n)*\\^done,numchild=\"0\"" \
-    "list children of fooPtr.$i"
-}
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/gdb792.cc b/gdb/testsuite/gdb.mi/gdb792.cc
deleted file mode 100644
index a698a12e0fb..00000000000
--- a/gdb/testsuite/gdb.mi/gdb792.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-
-class Q
-{
-	int v;
-	protected:
-		int qx;
-		int qy;
-	int w;
-};
-
-class B
-{
-	int k;
-	public:
-		int bx;
-		int by;
-};
-
-class A
-{
-	int u;
-
-	public:
-		A()
-		{
-		};
-		int x;
-		char buffer[10];
-	
-	protected:
-		int y;
-		B b;
-	
-	private:
-		float z;
-};
-
-class C : public A
-{
-	public:
-		C()
-		{
-		};
-		int zzzz;
-	private:
-		int ssss;
-};
-
-int main()
-{
-	A a;
-	C c;
-	Q q;
-	strcpy( a.buffer, "test" );
-	printf ( "%.10s\n", a.buffer );
-	return 0;
-}
diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
deleted file mode 100644
index 37fc3ae8daf..00000000000
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2002, 2003 Free Software Foundation, 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
-
-#
-# test gdb/792
-#
-
-if { [skip_cplus_tests] } { continue }
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile gdb792
-set srcfile "$testfile.cc"
-set binfile $objdir/$subdir/$testfile
-
-if [get_compiler_info ${binfile} "c++"] {
-    return -1;
-}
-
-if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
-  gdb_suppress_entire_file "Testcase compile failed, so all test in this file will automatically fail."
-}
-
-# Test that children of classes are properly reported
-
-# Run to main
-mi_run_to_main
-
-mi_gdb_test "-var-create - * a" \
-  "(&\".*\"\r\n)*\\^done,name=\"var1\",numchild=\"3\",type=\"A\"" \
-  "create var for class A"
-
-mi_gdb_test "-var-list-children var1" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"3\",children=\\\[child=\{name=\"var1\.public\",exp=\"public\",numchild=\"2\"\},child=\{name=\"var1\.private\",exp=\"private\",numchild=\"2\"\},child=\{name=\"var1\.protected\",exp=\"protected\",numchild=\"2\"\}\\\]" \
-  "list children of class A"
-
-mi_gdb_test "-var-list-children var1.public" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"2\",children=\\\[child=\{name=\"var1\.public\.x\",exp=\"x\",numchild=\"0\",type=\"int\"\},child=\{name=\"var1\.public\.buffer\",exp=\"buffer\",numchild=\"10\",type=\"char \\\[10\\\]\"\}\\\]" \
-  "list children of A.public"
-
-mi_gdb_test "-var-list-children var1.private" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"2\",children=\\\[child=\{name=\"var1\.private\.u\",exp=\"u\",numchild=\"0\",type=\"int\"\},child=\{name=\"var1\.private\.z\",exp=\"z\",numchild=\"0\",type=\"float\"\}\\\]" \
-  "list children of A.private"
-
-mi_gdb_test "-var-list-children var1.protected" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"2\",children=\\\[child=\{name=\"var1\.protected\.y\",exp=\"y\",numchild=\"0\",type=\"int\"\},child=\{name=\"var1\.protected\.b\",exp=\"b\",numchild=\"2\",type=\"B\"\}\\\]" \
-  "list children of A.protected"
-
-mi_gdb_test "-var-list-children var1.protected.b" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"2\",children=\\\[child=\{name=\"var1\.protected\.b\.public\",exp=\"public\",numchild=\"2\"\},child=\{name=\"var1\.protected\.b\.private\",exp=\"private\",numchild=\"1\"\}\\\]" \
-  "list children of A.protected.b"
-
-mi_gdb_test "-var-list-children var1.protected.b.public" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"2\",children=\\\[child=\{name=\"var1\.protected\.b\.public\.bx\",exp=\"bx\",numchild=\"0\",type=\"int\"\},child=\{name=\"var1\.protected\.b\.public\.by\",exp=\"by\",numchild=\"0\",type=\"int\"\}\\\]" \
-  "list children of A.protected.b.public"
-
-mi_gdb_test "-var-list-children var1.protected.b.private" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"1\",children=\\\[child=\{name=\"var1\.protected\.b\.private\.k\",exp=\"k\",numchild=\"0\",type=\"int\"\}\\\]" \
-  "list children of A.protected.b.private"
-
-mi_gdb_test "-var-create - * c" \
-  "(&\".*\"\r\n)*\\^done,name=\"var2\",numchild=\"3\",type=\"C\"" \
-  "create var for class C which has baseclass A"
-
-mi_gdb_test "-var-list-children var2" \
-  "(&\".*\"\r\n)*\\^done,numchild=\"3\",children=\\\[child=\{name=\"var2\.A\",exp=\"A\",numchild=\"3\",type=\"A\"\},child=\{name=\"var2\.public\",exp=\"public\",numchild=\"1\"\},child=\{name=\"var2\.private\",exp=\"private\",numchild=\"1\"\}\\\]" \
-  "list children of class C"
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp
deleted file mode 100644
index 39a08736910..00000000000
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, 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
-
-#
-# test basic Machine interface (MI) operations
-#
-# Verify that, using the MI, we can load a program and do
-# other basic things that are used by all test files through  mi_gdb_exit,
-# mi_gdb_start, mi_delete_breakpoints, mi_gdb_reinitialize_dir and
-# mi_gdb_load, so we can safely use those.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but the command syntax and correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set escapedobjdir [string_to_regexp ${objdir}]
-set escapedsrcdir [string_to_regexp ${srcdir}]
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# In this file we want to test if the operations needed by the following
-# procedures work, so it makes no sense using them here.
-
-# mi_delete_breakpoints
-# mi_gdb_reinitialize_dir $srcdir/$subdir
-# mi_gdb_load ${binfile}
-
-# Test if the MI interpreter has been configured
-
-proc test_mi_interpreter_selection {} {
-    global mi_gdb_prompt
-    global gdb_prompt
-
-    # All this test expects is to get the prompt back
-    # with no syntax error message
-    send_gdb "-gdb-version\n"
-    gdb_expect {
-           -re "GNU gdb .*\r\n$mi_gdb_prompt$" \
-               { pass "acceptance of MI operations" 
-                 return 1}
-           -re ".*\r\n$mi_gdb_prompt$" \
-               { fail "acceptance of MI operations"
-                 note "Skipping all other MI tests." }
-           -re "Undefined command.*$gdb_prompt $" \
-               { fail "acceptance of MI operations"
-                 note "Skipping all other MI tests." }
-           -re ".*$gdb_prompt $" \
-               { fail "acceptance of MI operations"
-                 note "Skipping all other MI tests." }
-           timeout { fail "acceptance of MI operations (timeout)"
-                     note "Skipping all other MI tests." }
-    }
-    return 0
-}
-
-proc test_exec_and_symbol_mi_operatons {} {
-    global mi_gdb_prompt
-    global binfile
-
-    # Load symbols and specify executable on a single operation
-    # Tests:
-    # -file-exec-and-symbols
-
-    # Can't use mi_gdb_test as if this doesn't work,
-    #  we must give up on the whole test file
-    send_gdb "-file-exec-and-symbols ${binfile}\n"
-    gdb_expect {
-           -re "\[\r\n\]*\\\^done\r\n$mi_gdb_prompt$" \
-               { pass "file-exec-and-symbols operation" }
-           timeout { fail "file-exec-and-symbols operation (timeout)"
-                     note "Skipping all other MI tests."
-                     return 0}
-    }
-
-    # The following is not used by mi-support.exp, but we test here so
-    # we get done with loading a program basics.
-
-    # Do it again, but now load symbols and specify executable with
-    # two separate operations
-    # Tests:
-    # -file-clear
-    # -file-exec-file
-    # -file-symbol-file
-
-    # FIXME: file-clear is not implemented yet.
-#   mi_gdb_test "-file-clear" \
-#            "\\\^done" \
-#            "file-clear operation"
-
-    mi_gdb_test "-file-exec-file ${binfile}" \
-             "\\\^done" \
-             "file-exec-file operation"
-
-    mi_gdb_test "-file-symbol-file ${binfile}" \
-             "\\\^done" \
-             "file-symbol-file operation"
-
-    # FIXME: if we cannot load we have to skip all other tests.
-}
-
-proc test_breakpoints_deletion {} {
-    global mi_gdb_prompt
-    global srcfile
-
-    # Clear all breakpoints and list to confirm
-    # Tests:
-    # -break-delete (all)
-    # -break-list
-
-    # The all parameter is actually no parameter.
-    mi_gdb_test "200-break-delete" \
-             "\\\^done" \
-             "break-delete (all) operation"
-
-    mi_gdb_test "201-break-list" \
-             ".*\\\^done,BreakpointTable=\\\{.*,body=\\\[\\\]\\\}" \
-             "all breakpoints removed"
-}
-
-proc test_dir_specification {} {
-    global mi_gdb_prompt
-    global srcdir
-    global subdir
-
-    # Add to the search directories, display, then reset back to default
-    # Tests:
-    # -environment-directory arg
-    # -environment-directory 
-    # -environment-directory -r
-
-    set envirodir [string_to_regexp ${srcdir}/${subdir}]
-
-    mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \
-             "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \
-             "environment-directory arg operation"
-
-    mi_gdb_test "203-environment-directory" \
-             "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \
-             "environment-directory empty-string operation"
-
-    mi_gdb_test "204-environment-directory -r" \
-             "\\\^done,source-path=\"\\\$cdir.\\\$cwd\"" \
-             "environment-directory operation"
-}
-
-proc test_cwd_specification {} {
-    global mi_gdb_prompt
-    global objdir
-    global escapedobjdir
-    global subdir
-
-    # Change the working directory, then print the current working directory
-    # Tests:
-    # -environment-cd ${objdir}
-    # -environment-pwd
-
-    mi_gdb_test "205-environment-cd ${objdir}" \
-             "\\\^done" \
-             "environment-cd arg operation"
-
-    mi_gdb_test "206-environment-pwd" \
-             "\\\^done,cwd=\"${escapedobjdir}\"" \
-             "environment-pwd operation"
-}
-
-proc test_path_specification {} {
-    global mi_gdb_prompt
-    global orig_path
-    global objdir
-    global srcdir
-    global escapedobjdir
-    global escapedsrcdir
-
-    # Add to the path, display, then reset 
-    # Tests:
-    # -environment-path 
-    # -environment-path dir1 dir2
-    # -environment-path -r dir
-    # -environment-path -r
-
-    send_gdb "-environment-path\n"
-    gdb_expect 20 {
-	-re "\\\^done,path=\"\(.*\)\"\r\n$mi_gdb_prompt" { 
-	  set orig_path $expect_out(1,string); 
-	}
-	timeout { 
-	  perror "-environment-path (timeout)" ; 
-	  return 
-	}
-    }
-
-    mi_gdb_test "207-environment-path" \
-             "\\\^done,path=\"$orig_path\"" \
-             "environment-path no-args operation"
-
-    mi_gdb_test "208-environment-path $srcdir $objdir" \
-             "\\\^done,path=\"$escapedsrcdir.$escapedobjdir.$orig_path\"" \
-             "environment-path dir1 dir2 operation"
-
-    mi_gdb_test "209-environment-path -r $objdir" \
-             "\\\^done,path=\"$escapedobjdir.$orig_path\"" \
-             "environment-path -r dir operation"
-
-    mi_gdb_test "210-environment-path -r" \
-             "\\\^done,path=\"$orig_path\"" \
-             "environment-path -r operation"
-
-} 
-
-if [test_mi_interpreter_selection] {
-  test_exec_and_symbol_mi_operatons
-  test_breakpoints_deletion
-  test_dir_specification
-  test_cwd_specification
-  test_path_specification
-}
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp
deleted file mode 100644
index 941317b5f8c..00000000000
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999, 2001, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-# Locate line numbers in basics.c.
-set line_callee4_head  [gdb_get_line_number "callee4 ("]
-set line_callee4_body  [expr $line_callee4_head + 2]
-set line_callee3_head  [gdb_get_line_number "callee3 ("]
-set line_callee3_body  [expr $line_callee3_head + 2]
-set line_callee2_head  [gdb_get_line_number "callee2 ("]
-set line_callee2_body  [expr $line_callee2_head + 2]
-set line_callee1_head  [gdb_get_line_number "callee1 ("]
-set line_callee1_body  [expr $line_callee1_head + 2]
-set line_main_head     [gdb_get_line_number "main ("]
-set line_main_body     [expr $line_main_head + 2]
-
-proc test_tbreak_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-    global line_callee4_head line_callee4_body
-    global line_callee3_head line_callee3_body
-    global line_callee2_head line_callee2_body
-    global line_callee1_head line_callee1_body
-    global line_main_head    line_main_body
-
-    # Insert some breakpoints and list them
-    # Also, disable some so they do not interfere with other tests
-    # Tests:
-    # -break-insert -t main
-    # -break-insert -t basics.c:callee2
-    # -break-insert -t basics.c:$line_callee3_head
-    # -break-insert -t srcfile:$line_callee4_head
-    # -break-list
-
-    mi_gdb_test "222-break-insert -t main" \
-             "222\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}" \
-             "break-insert -t operation"
-
-    mi_gdb_test "333-break-insert -t basics.c:callee2" \
-             "333\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee2\",file=\".*basics.c\",line=\"$line_callee2_body\",times=\"0\"\}" \
-             "insert temp breakpoint at basics.c:callee2"
-
-    mi_gdb_test "444-break-insert -t basics.c:$line_callee3_head" \
-             "444\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_head\",times=\"0\"\}" \
-             "insert temp breakpoint at basics.c:\$line_callee3_body"
-
-    # Getting the quoting right is tricky.  That is "\"<file>\":$line_callee4_head"
-    mi_gdb_test "555-break-insert -t \"\\\"${srcfile}\\\":$line_callee4_head\"" \
-             "555\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_head\",times=\"0\"\}" \
-             "insert temp breakpoint at \"<fullfilename>\":\$line_callee4_head"
-
-    mi_gdb_test "666-break-list" \
-	    "666\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}.*\\\]\}" \
-                "list of breakpoints"
-
-    mi_gdb_test "777-break-delete" \
-	    "777\\^done" \
-	    "delete temp breakpoints"
-}
-
-proc test_rbreak_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-    global line_callee4_head line_callee4_body
-    global line_callee3_head line_callee3_body
-    global line_callee2_head line_callee2_body
-    global line_callee1_head line_callee1_body
-    global line_main_head    line_main_body
-
-    # Insert some breakpoints and list them
-    # Also, disable some so they do not interfere with other tests
-    # Tests:
-    # -break-insert -r main
-    # -break-insert -r callee2
-    # -break-insert -r callee
-    # -break-insert -r .*llee
-    # -break-list
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "122-break-insert -r main" \
-             "122\\^done,bkpt=\{number=\"5\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_main_body\"\}" \
-             "break-insert -r operation"
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "133-break-insert -r callee2" \
-             "133\\^done,bkpt=\{number=\"6\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\}" \
-             "insert breakpoint with regexp callee2"
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "144-break-insert -r callee" \
-	    "144\\^done,bkpt=\{number=\"7\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee1_body\"\},bkpt=\{number=\"8\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\},bkpt=\{number=\"9\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee3_body\"\},bkpt=\{number=\"10\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee4_body\"\}" \
-             "insert breakpoint with regexp callee"
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "155-break-insert -r \.\*llee" \
-	    "155\\^done,bkpt=\{number=\"11\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee1_body\"\},bkpt=\{number=\"12\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\},bkpt=\{number=\"13\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee3_body\"\},bkpt=\{number=\"14\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee4_body\"\}" \
-             "insert breakpoint with regexp .*llee"
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "166-break-list" \
-	    "1\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\]\}" \
-                "list of breakpoints"
-
-    mi_gdb_test "177-break-delete" \
-	    "177\\^done" \
-	    "delete temp breakpoints"
-}
-
-test_tbreak_creation_and_listing
-test_rbreak_creation_and_listing
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
deleted file mode 100644
index b2159590fc3..00000000000
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 2002, 2003, 2004, 2005 Free Software Foundation, 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.  
-
-# This file tests that GDB's console can be accessed via the MI.
-# Specifically, we are testing the "interpreter-exec" command and that
-# the commands that are executed via this command are properly executed.
-# Console commands executed via MI should use MI output wrappers, MI event
-# handlers, etc.
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_gdb_reinitialize_dir $srcdir/$subdir
-
-mi_gdb_test "-interpreter-exec" \
-  {\^error,msg="mi_cmd_interpreter_exec: Usage: -interpreter-exec interp command"} \
-  "-interpreter-exec with no arguments"
-
-mi_gdb_test "-interpreter-exec console" \
-  {\^error,msg="mi_cmd_interpreter_exec: Usage: -interpreter-exec interp command"} \
-  "-interpreter-exec with one argument"
-
-mi_gdb_test "-interpreter-exec bogus command" \
-  {\^error,msg="mi_cmd_interpreter_exec: could not find interpreter \\\"bogus\\\""} \
-  "-interpreter-exec with bogus interpreter"
-
-set msg {Undefined command: \\\"bogus\\\"\.  Try \\\"help\\\"\.}
-mi_gdb_test "-interpreter-exec console bogus" \
-    "&\\\"$msg\\\\n\\\".*\\^error,msg=\\\"$msg\\\".*" \
-  "-interpreter-exec console bogus"
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
-#   {(=.*)+\^done} \
-#   "-interpreter-exec console \"file \$binfile\""
-mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
-  {\^done} \
-  "-interpreter-exec console \"file \$binfile\""
-
-mi_run_to_main
-
-set line_main_head   [gdb_get_line_number "main ("]
-set line_main_body   [expr $line_main_head + 2]
-set line_main_hello  [gdb_get_line_number "Hello, World!"]
-set line_main_return [expr $line_main_hello + 2]
-
-mi_gdb_test "-interpreter-exec console \"set args foobar\"" \
-  {\^done} \
-  "-interpreter-exec console \"set args foobar\""
-
-mi_gdb_test "-interpreter-exec console \"show args\"" \
-  {\~"Argument list to give program being debugged when it is started is \\\"foobar\\\"\.\\n".*\^done} \
-  "-interpreter-exec console \"show args\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-interpreter-exec console \"break callee4\"" \
-#   {(&.*)*.*~"Breakpoint 2 at.*\\n".*=breakpoint-create,number="2".*\^done} \
-#   "-interpreter-exec console \"break callee4\""
-mi_gdb_test "-interpreter-exec console \"break callee4\"" \
-  {(&.*)*.*~"Breakpoint 2 at.*\\n".*\^done} \
-  "-interpreter-exec console \"break callee4\""
-
-mi_gdb_test "-interpreter-exec console \"info break\"" \
-  {\~"Num[ \t]*Type[ \t]*Disp[ \t]*Enb[ \t]*Address[ \t]*What\\n".*~"2[ \t]*breakpoint[ \t]*keep[ \t]*y[ \t]*0x[0-9A-Fa-f]+[ \t]*in callee4 at .*basics.c:[0-9]+\\n".*\^done} \
-  "-interpreter-exec console \"info break\""
-
-mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \
-  {\^done} \
-  "-interpreter-exec console \"set listsize 1\""
-
-# {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done }
-mi_gdb_test "-interpreter-exec console \"list\"" \
-  ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
-  "-interpreter-exec console \"list\""
-
-# # NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-exec-continue" \
-#    {.*\*stopped,reason="breakpoint-hit",.*func="callee4".*file=".*basics.c",fullname="${fullname_syntax}${srcfile}",line="8"\}} \
-#    "-interpreter-exec console \"continue to callee4\""
-send_gdb "999-exec-continue\n"
-gdb_expect {
-    -re "999\\^running\[\r\n\]+$mi_gdb_prompt.*999\\*stopped,reason=.breakpoint-hit.*$mi_gdb_prompt$" {
-	pass "continue to callee4"
-    }
-    timeout {
-	fail "continue to callee4 (timeout)"
-    }
-}
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "100-interpreter-exec console \"delete 2\"" \
-#   {.*=breakpoint-delete,number=\"2\".*\^done} \
-#   "-interpreter-exec console \"delete 2\""
-mi_gdb_test "100-interpreter-exec console \"delete 2\"" \
-  {100\^done} \
-  "-interpreter-exec console \"delete 2\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "200-interpreter-exec console \"up\"" \
-#   {.*=selected-frame-level-changed,level="1".*\^done} \
-#   "-interpreter-exec console \"up\""
-mi_gdb_test "200-interpreter-exec console \"up\"" \
-  {200\^done} \
-  "-interpreter-exec console \"up\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "300-interpreter-exec console \"down\"" \
-#   {.*=selected-frame-level-changed,level="0".*\^done} \
-#   "-interpreter-exec console \"down\""
-mi_gdb_test "300-interpreter-exec console \"down\"" \
-  {300\^done} \
-  "-interpreter-exec console \"down\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-interpreter-exec console \"frame 2\"" \
-#   {.*=selected-frame-level-changed,level="2".*\^done} \
-#   "-interpreter-exec console \"frame 2\""
-mi_gdb_test "400-interpreter-exec console \"frame 2\"" \
-  {400\^done} \
-  "-interpreter-exec console \"frame 2\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-stack-select-frame 0" \
-#   {.*=selected-frame-level-changed,level="0".*\^done} \
-#   "-stack-select-frame 0"
-mi_gdb_test "500-stack-select-frame 0" \
-  {500\^done} \
-  "-stack-select-frame 0"
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-break-insert -t basics.c:$line_main_hello" \
-#   {.*=breakpoint-create,number="3".*\^done} \
-#   "-break-insert -t basics.c:\$line_main_hello"
-mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
-	{600\^done,bkpt=.number="3",type="breakpoint".*\}} \
-	"-break-insert -t basics.c:\$line_main_hello"
-
-# mi_gdb_test "-exec-continue" \
-#   {.*\*stopped.*,file=".*basics.c",fullname="${fullname_syntax}${srcfile}",line="$line_main_hello"\}} \
-#   "-exec-continue to line \$line_main_hello"
-send_gdb "700-exec-continue\n"
-gdb_expect {
-    -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=.$line_main_hello.*$mi_gdb_prompt$" {
-	pass "-exec-continue to line \$line_main_hello"
-    }
-    timeout {
-	fail "-exec-continue to line \$line_main_hello"
-    }
-}
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-exec-next" \
-#   {.*\*stopped,reason="end-stepping-range",.*,file=".*basics.c",fullname="${fullname_syntax}${srcfile}",line="$line_main_return"\}} \
-#   "-exec-next to line \$line_main_return"
-send_gdb "800-exec-next\n"
-gdb_expect {
-    -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=.end-stepping-range.*,file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=.$line_main_return.*$mi_gdb_prompt$" {
-	pass "-exec-next to line \$line_main_return"
-    }
-    timeout {
-	fail "-exec-next to line \$line_main_return"
-    }
-}
-
-mi_gdb_test "-interpreter-exec console \"list\"" \
-  "\~\"$line_main_return\[\\\\t ]*return 0;\\\\n\".*\\^done" \
-  "-interpreter-exec console \"list\" at basics.c:\$line_main_return"
-
-mi_gdb_test "-interpreter-exec console \"help set args\"" \
-  {\~"Set argument list to give program being debugged when it is started\.\\nFollow this command with any number of args, to be passed to the program\.".*\^done} \
-  "-interpreter-exec console \"help set args\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-interpreter-exec console \"set \$pc=0x0\"" \
-#   {.*=target-changed.*\^done} \
-#   "-interpreter-exec console \"set \$pc=0x0\""
-mi_gdb_test "888-interpreter-exec console \"set \$pc=0x0\"" \
-  {888\^done} \
-  "-interpreter-exec console \"set \$pc=0x0\""
-
-#mi_gdb_test "-interpreter-exec console \"\"" \
-  {} \
-  "-interpreter-exec console \"\""
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-console.c b/gdb/testsuite/gdb.mi/mi-console.c
deleted file mode 100644
index f0f2016efdf..00000000000
--- a/gdb/testsuite/gdb.mi/mi-console.c
+++ /dev/null
@@ -1,20 +0,0 @@
-void
-hello ()
-{
-  char *hello = "Hello \\\"!\r\n";
-  int i;
-  for (i = 0; hello[i]; i++)
-    write (1, hello + i, 1);
-}
-
-int
-main ()
-{
-  hello ();
-}
-/*
-Local variables: 
-change-log-default-name: "ChangeLog-mi"
-End: 
-*/
-
diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
deleted file mode 100644
index 2dbfc159377..00000000000
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, 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
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-# This test only works when talking to a target that routes its output
-# through GDB.  Check that we're either talking to a simulator or a
-# remote target.
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "mi-console"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-mi_run_to_main
-
-# Next over the hello() call which will produce lots of output
-send_gdb "47-exec-next\n"
-gdb_expect {
-    -re "47\\^running\r\n$mi_gdb_prompt" {
-	pass "Started step over hello"
-    }
-    timeout {
-	fail "Started step over hello (timeout)"
-    }
-}
-
-if { ![target_info exists gdb,noinferiorio]}  {
-    gdb_expect {
-	-re "@\"H\"\r\n.*@\"e\"\r\n.*@\"l\"\r\n.*@\"l\"\r\n.*@\"o\"\r\n.*@\" \"\r\n.*@\"\\\\\\\\\"\r\n.*@\"\\\\\"\"\r\n.*@\"!\"\r\n.*@\"\\\\r\"\r\n.*@\"\\\\n\"\r\n" {
-	    pass "Hello message"
-	}
-	-re "Hello" {
-
-	    # Probably a native system where GDB doesn't have direct #
-	    # control over the inferior console.  # For this to work,
-	    # GDB would need to run the inferior process # under a PTY
-	    # and then use the even-loops ability to wait on #
-	    # multiple event sources to channel the output back
-	    # through the # MI.
-
-	    kfail "gdb/623" "Hello message"
-	}
-	timeout {
-	    fail "Hello message (timeout)"
-	}
-    }
-}
-    
-gdb_expect {
-    -re "47\\*stopped.*$mi_gdb_prompt$" {
-	pass "Finished step over hello"
-    }
-    timeout {
-	fail "Finished step over hello (timeout)"
-    }
-}
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp
deleted file mode 100644
index 0b124976a7e..00000000000
--- a/gdb/testsuite/gdb.mi/mi-disassemble.exp
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, 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.  
-
-#
-# Test Machine interface (MI) operations for disassembly.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_disassembly_only {} {
-    global mi_gdb_prompt
-    global hex
-    global decimal
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Test disassembly more only for the current function.
-    # Tests:
-    # -data-disassemble -s $pc -e "$pc+8" -- 0
-    # -data-disassembly -f basics.c -l $line_main_body -- 0
-
-    mi_gdb_test "print/x \$pc" "" ""
-    mi_gdb_test "111-data-disassemble -s \$pc -e \"\$pc + 12\" -- 0" \
-	    "111\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\},\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}.*\]" \
-             "data-disassemble from pc to pc+12 assembly only"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -- 0" \
-	    "222\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]" \
-              "data-disassemble file & line, assembly only"
-}
-
-proc test_disassembly_lines_limit {} {
-    global mi_gdb_prompt
-    global hex
-    global decimal
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Test disassembly more only for the current function.
-    # Tests:
-    # -data-disassembly -f basics.c -l $line_main_body -n 20 -- 0
-    # -data-disassembly -f basics.c -l $line_main_body -n 0 -- 0
-    # -data-disassembly -f basics.c -l $line_main_body -n 50 -- 0
-
-    mi_gdb_test "print/x \$pc" "" ""
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 20 -- 0" \
-	    "222\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]" \
-              "data-disassemble file, line, number assembly only"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 0 -- 0" \
-	    "222\\^done,asm_insns=\\\[\\\]" \
-              "data-disassemble file, line, number (zero lines) assembly only"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 50 -- 0" \
-	    "222\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]" \
-              "data-disassemble file, line, number (more than main lines) assembly only"
-}
-
-
-proc test_disassembly_mixed {} {
-    global mi_gdb_prompt
-    global hex
-    global decimal
-
-    set line_callee2_head       [gdb_get_line_number "callee2 ("]
-    set line_callee2_open_brace [expr $line_callee2_head + 1]
-
-    # Test disassembly more only for the current function.
-    # Tests:
-    # -data-disassembly -f basics.c -l $line_callee2_open_brace -- 1
-    # -data-disassembly -s $pc -e "$pc+8" -- 1
-
-    mi_gdb_test "002-data-disassemble -f basics.c -l $line_callee2_open_brace -- 1" \
-	    "002\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$line_callee2_open_brace\",file=\".*basics.c\",line_asm_insn=\\\[\{address=\"$hex\",func-name=\"callee2\",offset=\"0\",inst=\".*\"\}.*\\\]\}.*,src_and_asm_line=\{line=\"$decimal\",file=\".*basics.c\",line_asm_insn=\\\[.*\{address=\"$hex\",func-name=\"callee2\",offset=\"$decimal\",inst=\".*\"\}\\\]\}\\\]" \
-             "data-disassemble file, line assembly mixed"
-
-    #
-    # In mixed mode, the lowest level of granularity is the source line.
-    # So we are going to get the disassembly for the source line at
-    # which we are now, even if we have specified that the range is only 2 insns.
-    #
-    mi_gdb_test "003-data-disassemble -s \$pc -e \"\$pc+4\" -- 1" \
-	    "003\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$decimal\",file=\".*basics.c\",line_asm_insn=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}.*\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]\}\\\]" \
-             "data-disassemble range assembly mixed"
-}
-
-proc test_disassembly_mixed_lines_limit {} {
-    global mi_gdb_prompt
-    global hex
-    global decimal
-
-    set line_main_head       [gdb_get_line_number "main ("]
-    set line_main_open_brace [expr $line_main_head + 1]
-    set line_main_body       [expr $line_main_head + 2]
-
-    # Test disassembly more only for the current function.
-    # Tests:
-    # -data-disassembly -f basics.c -l $line_main_body -n 20 -- 1
-    # -data-disassembly -f basics.c -l $line_main_body -n 0 -- 1
-    # -data-disassembly -f basics.c -l $line_main_body -n 50 -- 1
-
-    mi_gdb_test "print/x \$pc" "" ""
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 20 -- 1" \
-	    "222\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$decimal\",file=\".*basics.c\",line_asm_insn=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]\}\]" \
-              "data-disassemble file, line, number assembly mixed"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 0 -- 1" \
-	    "222\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$line_main_open_brace\",file=\".*basics.c\",line_asm_insn=\\\[\\\]\}\\\]" \
-              "data-disassemble file, line, number (zero lines) assembly mixed"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 50 -- 1" \
-	    "222\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$decimal\",file=\".*basics.c\",line_asm_insn=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\}.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]\}\]" \
-              "data-disassemble file, line, number (more than main lines) assembly mixed"
-}
-
-proc test_disassembly_bogus_args {} {
-    global mi_gdb_prompt
-    global hex
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Test that bogus input to disassembly command is rejected.
-    # Tests:
-    # -data-disassembly -f foo -l abc -n 0 -- 0
-    # -data-disassembly -s foo -e bar -- 0
-    # -data-disassembly -s $pc -f basics.c -- 0
-    # -data-disassembly -f basics.c -l 32 -- 9
-
-    mi_gdb_test "123-data-disassemble -f foo -l abc -n 0 -- 0" \
-             ".*123\\^error,msg=\"mi_cmd_disassemble: Invalid filename.\"" \
-             "data-disassemble bogus filename"
-
-    mi_gdb_test "321-data-disassemble -s foo -e bar -- 0" \
-             "321\\^error,msg=\"No symbol \\\\\"foo\\\\\" in current context.\"" \
-             "data-disassemble bogus address"
-
-    mi_gdb_test "456-data-disassemble -s \$pc -f basics.c -- 0" \
-             "456\\^error,msg=\"mi_cmd_disassemble: Usage: \\( .-f filename -l linenum .-n howmany.. | .-s startaddr -e endaddr.\\) .--. mixed_mode.\"" \
-             "data-disassemble mix different args"
-
-    mi_gdb_test "789-data-disassemble -f basics.c -l $line_main_body -- 9" \
-             "789\\^error,msg=\"mi_cmd_disassemble: Mixed_mode argument must be 0 or 1.\"" \
-             "data-disassemble wrong mode arg"
-
-}
-
-mi_run_to_main
-test_disassembly_only
-test_disassembly_mixed
-test_disassembly_bogus_args
-test_disassembly_lines_limit
-test_disassembly_mixed_lines_limit
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-eval.exp b/gdb/testsuite/gdb.mi/mi-eval.exp
deleted file mode 100644
index a07f607e52c..00000000000
--- a/gdb/testsuite/gdb.mi/mi-eval.exp
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify -data-evaluate-expression. There are really minimal tests.
-
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-set line_callee4_head [gdb_get_line_number "callee4 ("]
-set line_callee4_body [expr $line_callee4_head + 2]
-
-mi_runto callee4
-mi_next_to "callee4" "" "basics.c" [expr $line_callee4_body + 1] "next at callee4"
-
-mi_gdb_test "211-data-evaluate-expression A" "211\\^done,value=\"1\"" "eval A"
-
-mi_gdb_test "311-data-evaluate-expression &A" "311\\^done,value=\"$hex\"" "eval &A"
-
-mi_gdb_test "411-data-evaluate-expression A+3" "411\\^done,value=\"4\"" "eval A+3"
-
-mi_gdb_test "511-data-evaluate-expression \"A + 3\"" "511\\^done,value=\"4\"" "eval A + 3"
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp
deleted file mode 100644
index 61044663841..00000000000
--- a/gdb/testsuite/gdb.mi/mi-file.exp
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999, 2003, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_file_list_exec_source_file {} {
-    global srcfile
-    global srcdir
-    global subdir
-    global fullname_syntax
-    set srcfilepath [string_to_regexp ${srcdir}/${subdir}/${srcfile}]
-
-    # get the path and absolute path to the current executable
-    #
-    # In gdb 6.2 (at least), the default line number is set by
-    # select_source_symtab to the first line of "main" minus
-    # the value of "lines_to_list" (which defaults to 10) plus one.
-    # --chastain 2004-08-13
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-    set gdb_lines_to_list 10
-    set line_default [expr $line_main_body - $gdb_lines_to_list + 1]
-
-    mi_gdb_test "111-file-list-exec-source-file" \
-	    "111\\\^done,line=\"$line_default\",file=\"${srcfilepath}\",fullname=\"$fullname_syntax${srcfile}\"" \
-               "request path info of current source file (${srcfile})"
-}
-
-proc test_file_list_exec_source_files {} {
-    global srcfile
-    global fullname_syntax
-
-    # get the path and absolute path to the current executable
-    mi_gdb_test "222-file-list-exec-source-files" \
-	    "222\\\^done,files=\\\[\{file=\".*/${srcfile}\",fullname=\"$fullname_syntax${srcfile}\"\},\{file=\".*\"\},\{file=\".*\"\},\{file=\".*\"\},\{file=\".*\"\}\\\]" \
-              "Getting a list of source files."
-}
-
-test_file_list_exec_source_file
-test_file_list_exec_source_files
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-hack-cli.exp b/gdb/testsuite/gdb.mi/mi-hack-cli.exp
deleted file mode 100644
index 185fe9b48fb..00000000000
--- a/gdb/testsuite/gdb.mi/mi-hack-cli.exp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999, 2001 Free Software Foundation, 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
-
-
-# Some basic checks for the CLI.
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-mi_gdb_test "show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n\\^done" \
-	"show architecture"
-
-mi_gdb_test "47show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n47\\^done" \
-	"47show architecture"
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-pthreads.exp b/gdb/testsuite/gdb.mi/mi-pthreads.exp
deleted file mode 100644
index be1864798fc..00000000000
--- a/gdb/testsuite/gdb.mi/mi-pthreads.exp
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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 tests MI thread commands.
-# Specifically, we are testing the MI command set and the console (in MI)
-# command set ("interpreter-exec") and that the commands that are executed
-# via these command pathways are properly executed. Console commands
-# executed via MI should use MI output wrappers, MI event handlers, etc.
-
-# This only works with native configurations
-if {![isnative]} {
-  return
-}
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if {[mi_gdb_start]} {
-    continue
-}
-
-# The procs below dealing with parsing cli/mi output for the threadlist
-# is duplicated in gdb669.exp. Any changes here will probably need to
-# be made there as well.
-
-proc get_mi_thread_list {name} {
-  global expect_out
-
-  # MI will return a list of thread ids:
-  #
-  # -thread-list-ids
-  # ^done,thread-ids=[thread-id="1",thread-id="2",...],number-of-threads="N"
-  # (gdb)
-  mi_gdb_test "-thread-list-ids" \
-    {\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \
-    "-thread_list_ids ($name)"
-
-  set output {}
-  if {[info exists expect_out(buffer)]} {
-    set output $expect_out(buffer)
-  }
-
-  set thread_list {}
-  if {![regexp {thread-ids=\{(thread-id="[0-9]+"(,)?)*\}} $output threads]} {
-    fail "finding threads in MI output ($name)"
-  } else {
-    pass "finding threads in MI output ($name)"
-
-    # Make list of console threads
-    set start [expr {[string first \{ $threads] + 1}]
-    set end   [expr {[string first \} $threads] - 1}]
-    set threads [string range $threads $start $end]
-    foreach thread [split $threads ,] {
-      if {[scan $thread {thread-id="%d"} num]} {
-	lappend thread_list $num
-      }
-    }
-  }
-
-  return $thread_list
-}
-
-# Check that MI and the console know of the same threads.
-# Appends NAME to all test names.
-proc check_mi_and_console_threads {name} {
-  global expect_out
-
-  mi_gdb_test "-thread-list-ids" \
-    {\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \
-    "-thread-list-ids ($name)"
-  set mi_output {}
-  if {[info exists expect_out(buffer)]} {
-    set mi_output $expect_out(buffer)
-  }
-
-  # GDB will return a list of thread ids and some more info:
-  #
-  # (gdb) 
-  # -interpreter-exec console "info threads"
-  # ~"  4 Thread 2051 (LWP 7734)  0x401166b1 in __libc_nanosleep () at __libc_nanosleep:-1"
-  # ~"  3 Thread 1026 (LWP 7733)   () at __libc_nanosleep:-1"
-  # ~"  2 Thread 2049 (LWP 7732)  0x401411f8 in __poll (fds=0x804bb24, nfds=1, timeout=2000) at ../sysdeps/unix/sysv/linux/poll.c:63"
-  # ~"* 1 Thread 1024 (LWP 7731)  main (argc=1, argv=0xbfffdd94) at ../../../src/gdb/testsuite/gdb.mi/pthreads.c:160"
-  # FIXME: kseitz/2002-09-05: Don't use the hack-cli method.
-  mi_gdb_test "info threads" \
-    {.*(~".*"[\r\n]*)+.*} \
-    "info threads ($name)"
-  set console_output {}
-  if {[info exists $expect_out(buffer)]} {
-    set console_output $expect_out(buffer)
-  }
-
-  # Make a list of all known threads to console (gdb's thread IDs)
-  set console_thread_list {}
-  foreach line [split $console_output \n] {
-    if {[string index $line 0] == "~"} {
-      # This is a line from the console; trim off "~", " ", "*", and "\""
-      set line [string trim $line ~\ \"\*]
-      if {[scan $line "%d" id] == 1} {
-	lappend console_thread_list $id
-      }
-    }
-  }
-
-  # Now find the result string from MI
-  set mi_result ""
-  foreach line [split $mi_output \n] {
-    if {[string range $line 0 4] == "^done"} {
-      set mi_result $line
-    }
-  }
-  if {$mi_result == ""} {
-    fail "finding MI result string ($name)"
-  } else {
-    pass "finding MI result string ($name)"
-  }
-
-  # Finally, extract the thread ids and compare them to the console
-  set num_mi_threads_str ""
-  if {![regexp {number-of-threads="[0-9]+"} $mi_result num_mi_threads_str]} {
-    fail "finding number of threads in MI output ($name)"
-  } else {
-    pass "finding number of threads in MI output ($name)"
-
-    # Extract the number of threads from the MI result
-    if {![scan $num_mi_threads_str {number-of-threads="%d"} num_mi_threads]} {
-      fail "got number of threads from MI ($name)"
-    } else {
-      pass "got number of threads from MI ($name)"
-
-      # Check if MI and console have same number of threads
-      if {$num_mi_threads != [llength $console_thread_list]} {
-	fail "console and MI have same number of threads ($name)"
-      } else {
-	pass "console and MI have same number of threads ($name)"
-
-	# Get MI thread list
-	set mi_thread_list [get_mi_thread_list $name]
-
-	# Check if MI and console have the same threads
-	set fails 0
-	foreach ct [lsort $console_thread_list] mt [lsort $mi_thread_list] {
-	  if {$ct != $mt} {
-	    incr fails
-	  }
-	}
-	if {$fails > 0} {
-	  fail "MI and console have same threads ($name)"
-
-	  # Send a list of failures to the log
-	  send_log "Console has thread ids: $console_thread_list\n"
-	  send_log "MI has thread ids: $mi_thread_list\n"
-	} else {
-	  pass "MI and console have same threads ($name)"
-	}
-      }
-    }
-  }
-}
-
-# This procedure tests the various thread commands in MI.
-proc check_mi_thread_command_set {} {
-
-  mi_runto done_making_threads
-
-  set thread_list [get_mi_thread_list "in check_mi_thread_command_set"]
-  
-  mi_gdb_test "-thread-select" \
-    {\^error,msg="mi_cmd_thread_select: USAGE: threadnum."} \
-    "check_mi_thread_command_set: -thread-select"
-
-  mi_gdb_test "-thread-select 123456789" \
-    {\^error,msg="Thread ID 123456789 not known\."} \
-    "check_mi_thread_command_set: -thread-select 123456789"
-
-  foreach thread $thread_list {
-    # line and file are optional.
-    # many of the threads are blocked in libc calls,
-    # and many people have libc's with no symbols.
-    mi_gdb_test "-thread-select $thread" \
-      "\\^done,new-thread-id=\"$thread\",frame={.*}(,line=\"(-)?\[0-9\]+\",file=\".*\")?" \
-      "check_mi_thread_command_set: -thread-select $thread"
-  }
-}
-
-#
-# Start here
-#
-set testfile "pthreads"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
-
-set options [list debug incdir=$objdir]
-if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
-}
-
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load $binfile
-
-check_mi_thread_command_set
-
-mi_gdb_exit
-
diff --git a/gdb/testsuite/gdb.mi/mi-read-memory.c b/gdb/testsuite/gdb.mi/mi-read-memory.c
deleted file mode 100644
index 7a87c641856..00000000000
--- a/gdb/testsuite/gdb.mi/mi-read-memory.c
+++ /dev/null
@@ -1,20 +0,0 @@
-static char bytes[256];
-
-static short shorts[256];
-
-static void
-initialize (void)
-{
-  int i;
-  for (i = 0; i < sizeof (bytes); i++)
-    {
-      bytes[i] = i;
-      shorts[i] = i * 2;
-    }
-}
-
-int
-main ()
-{
-  initialize ();
-}
diff --git a/gdb/testsuite/gdb.mi/mi-read-memory.exp b/gdb/testsuite/gdb.mi/mi-read-memory.exp
deleted file mode 100644
index 2cc74dda6d4..00000000000
--- a/gdb/testsuite/gdb.mi/mi-read-memory.exp
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, 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
-
-#
-# test basic Machine interface (MI) operations
-#
-# Verify that, using the MI, we can load a program and do
-# other basic things that are used by all test files through  mi_gdb_exit,
-# mi_gdb_start, mi_delete_breakpoints, mi_gdb_reinitialize_dir and
-# mi_gdb_load, so we can safely use those.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but the command syntax and correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "mi-read-memory"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-mi_run_to_main
-mi_next_to "main" "" "mi-read-memory.c" "20" "next at main"
-
-mi_gdb_test "1-data-read-memory" \
-	"1\\^error,msg=\".*\"" \
-	"no arguments"
-
-
-mi_gdb_test "2-data-read-memory bytes x 1 3 2" \
-	"2\\^done,addr=\"$hex\",nr-bytes=\"6\",total-bytes=\"6\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0x00\",\"0x01\"\\\]},{addr=\"$hex\",data=\\\[\"0x02\",\"0x03\"\\\]},{addr=\"$hex\",data=\\\[\"0x04\",\"0x05\"\\\]}\\\]" \
-	"3x2, one byte"
-
-
-mi_gdb_test "9-data-read-memory -o -6 -- -0+bytes+6 x 1 3 2" \
-	"9\\^done,addr=\"$hex\",nr-bytes=\"6\",total-bytes=\"6\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0x00\",\"0x01\"\\\]},{addr=\"$hex\",data=\\\[\"0x02\",\"0x03\"\\\]},{addr=\"$hex\",data=\\\[\"0x04\",\"0x05\"\\\]}\\\]" \
-	"3x2, one byte offset by -6"
-
-
-mi_gdb_test "3-data-read-memory \"(shorts + 128)\" x 2 1 2" \
-	"3\\^done,addr=\"$hex\",nr-bytes=\"4\",total-bytes=\"4\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0x0100\",\"0x0102\"\\\]}\\\]" \
-	"expression in quotes"
-
-
-mi_gdb_test "4-data-read-memory bytes+16 x 1 8 4 x" \
-	"4\\^done,addr=\"$hex\",nr-bytes=\"32\",total-bytes=\"32\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0x10\",\"0x11\",\"0x12\",\"0x13\"\\\],ascii=\"xxxx\"},{addr=\"$hex\",data=\\\[\"0x14\",\"0x15\",\"0x16\",\"0x17\"\\\],ascii=\"xxxx\"},{addr=\"$hex\",data=\\\[\"0x18\",\"0x19\",\"0x1a\",\"0x1b\"\\\],ascii=\"xxxx\"},{addr=\"$hex\",data=\\\[\"0x1c\",\"0x1d\",\"0x1e\",\"0x1f\"\\\],ascii=\"xxxx\"},{addr=\"$hex\",data=\\\[\"0x20\",\"0x21\",\"0x22\",\"0x23\"\\\],ascii=\" !\\\\\"#\"},{addr=\"$hex\",data=\\\[\"0x24\",\"0x25\",\"0x26\",\"0x27\"\\\],ascii=\"\\$%&'\"},{addr=\"$hex\",data=\\\[\"0x28\",\"0x29\",\"0x2a\",\"0x2b\"\\\],ascii=\"().+\"},{addr=\"$hex\",data=\\\[\"0x2c\",\"0x2d\",\"0x2e\",\"0x2f\"\\\],ascii=\",-\./\"}\\\]" \
-	"ascii and data"
-
-
-mi_gdb_test "5-data-read-memory shorts+64 d 2 1 1" \
-	"5\\^done,addr=\"$hex\",nr-bytes=\"2\",total-bytes=\"2\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"128\"\\\]}\\\]" \
-	"decimal"
-
-mi_gdb_test "6-data-read-memory shorts+64 o 2 1 1" \
-	"6\\^done,addr=\"$hex\",nr-bytes=\"2\",total-bytes=\"2\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0200\"\\\]}\\\]" \
-	"octal"
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-regs.exp b/gdb/testsuite/gdb.mi/mi-regs.exp
deleted file mode 100644
index 5dbda48fa91..00000000000
--- a/gdb/testsuite/gdb.mi/mi-regs.exp
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, 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
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and look at registers.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc sparc_register_tests_no_exec { } {
-	# Test the generic IDT chip.
-	mi_gdb_test "111-data-list-register-values" \
-		".*111\\^error,msg=\"mi_cmd_data_list_register_values: Usage: -data-list-register-values <format> \\\[<regnum1>...<regnumN>\\\]\"" \
-		"wrong arguments"
-
-	mi_gdb_test "111-data-list-register-values x" \
-		".*111\\^error,msg=\"mi_cmd_data_list_register_values: No registers\.\"" \
-		"no executable"
-}
-
-# These tests exercise IDT-specific MIPS registers for several
-# different processor models.
-
-# This should detect the actual processor in use and change
-# the expected results appropriately.  FIXME
-
-proc sparc_register_tests { } {
-    global hex
-    global decimal
-    set octal "\[0-7\]+"
-    set binary "\[0-1\]+"
-    set float "\\-?((\[0-9\]+(\\.\[0-9\]+)?(e\[-+\]\[0-9\]+)?)|(nan\\($hex\\)))"
-    set float2 "\\-?\[0-9\]+"
-
-    mi_gdb_test "111-data-list-register-names" \
-	    "111\\^done,register-names=\\\[\"g0\",\"g1\",\"g2\",\"g3\",\"g4\",\"g5\",\"g6\",\"g7\",\"o0\",\"o1\",\"o2\",\"o3\",\"o4\",\"o5\",\"sp\",\"o7\",\"l0\",\"l1\",\"l2\",\"l3\",\"l4\",\"l5\",\"l6\",\"l7\",\"i0\",\"i1\",\"i2\",\"i3\",\"i4\",\"i5\",\"fp\",\"i7\",\"f0\",\"f1\",\"f2\",\"f3\",\"f4\",\"f5\",\"f6\",\"f7\",\"f8\",\"f9\",\"f10\",\"f11\",\"f12\",\"f13\",\"f14\",\"f15\",\"f16\",\"f17\",\"f18\",\"f19\",\"f20\",\"f21\",\"f22\",\"f23\",\"f24\",\"f25\",\"f26\",\"f27\",\"f28\",\"f29\",\"f30\",\"f31\",\"y\",\"psr\",\"wim\",\"tbr\",\"pc\",\"npc\",\"fpsr\",\"cpsr\"\\\]" \
-	    "list register names"
-
-    mi_gdb_test "222-data-list-register-values x" \
-	    "222\\^done,register-values=\\\[\{number=\"0\",value=\"$hex\"\}.*\{number=\"71\",value=\"$hex\"\}\\\]" \
-	    "register values x"
-
-    mi_gdb_test "333-data-list-register-values f" \
-	    "333\\^done,register-values=\\\[\{number=\"0\",value=\"$float\"\},\{number=\"1\",value=\"$float\"\},.*\{number=\"71\",value=\"$float\"\}\\\]" \
-	    "register values f"
-
-    mi_gdb_test "444-data-list-register-values d" \
-	    "444\\^done,register-values=\\\[\{number=\"0\",value=\"$decimal\"\}.*\{number=\"71\",value=\"$decimal\"\}\\\]" \
-	    "register values d"
-
-    mi_gdb_test "555-data-list-register-values o" \
-	    "555\\^done,register-values=\\\[\{number=\"0\",value=\"$octal\"\}.*\{number=\"71\",value=\"$octal\"\}\\\]" \
-	    "register values o"
-
-    mi_gdb_test "666-data-list-register-values t" \
-	    "666\\^done,register-values=\\\[\{number=\"0\",value=\"$binary\"\}.*\{number=\"71\",value=\"$binary\"\}\\\]" \
-	    "register values t"
-
-    # On the sparc, registers 0-31 are int, 32-63 float, 64-71 int
-
-    mi_gdb_test "777-data-list-register-values N" \
-	    "777\\^done,register-values=\\\[\{number=\"0\",value=\"$decimal\"\}.*\{number=\"31\",value=\"$decimal\"\},\{number=\"32\",value=\"$float\"\}.*\{number=\"63\",value=\"$float\"\},\{number=\"64\",value=\"$decimal\"\}.*\{number=\"71\",value=\"$decimal\"\}\\\]" \
-	    "register values N"
-
-    mi_gdb_test "888-data-list-register-values r" \
-	    "888\\^done,register-values=\\\[\{number=\"0\",value=\"$hex\"\}.*\{number=\"71\",value=\"$hex\"\}\\\]" \
-	    "register values r"
-
-    mi_gdb_test "999-data-list-register-names 68 69 70 71" \
-	    "999\\^done,register-names=\\\[\"pc\",\"npc\",\"fpsr\",\"cpsr\"\\\]" \
-	    "list names of some regs"
-
-    mi_gdb_test "001-data-list-register-values x 68 69 70 71" \
-	    "001\\^done,register-values=\\\[\{number=\"68\",value=\"$hex\"\},\{number=\"69\",value=\"$hex\"\},\{number=\"70\",value=\"$hex\"\},\{number=\"71\",value=\"$hex\"\}\\\]" \
-	    "list values of some regs"
-
-    mi_gdb_test "002-data-list-changed-registers" \
-	    "002\\^done,changed-registers=\\\[(\"${decimal}\"(,\"${decimal}\")*)?\\\]" \
-	    "list changed registers"
-}
-
-if [istarget "sparc-*-*"] then {
-    sparc_register_tests_no_exec
-    mi_run_to_main
-    sparc_register_tests
-} else {
-    verbose "mi-regs.exp tests ignored for this target"
-}
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp
deleted file mode 100644
index 5397624e392..00000000000
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, 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.  
-
-# Test Machine interface (MI) operations 
-# Verify that, using the MI, we can run a simple program and perform
-# exec-return.  
-
-# The goal is not to
-# test gdb functionality, which is done by other tests, but to verify
-# the correct output response to MI operations.  
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-
-proc test_return_simple {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    set line_callee3_head         [gdb_get_line_number "callee3 ("]
-    set line_callee3_close_brace  [expr $line_callee3_head + 3]
-
-    send_gdb "111-exec-return\n"
-    gdb_expect {
-	-re "111\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee3_close_brace\"\}\r\n$mi_gdb_prompt$" {pass "return from callee4 now"}
-	-re ".*\r\n$mi_gdb_prompt$" { fail "return from callee4 now" }
-	timeout { fail "return from callee4 now (timeout)"
-	}
-    }
-}
-
-mi_runto callee4
-
-mi_gdb_test "205-break-delete" \
-	"205\\^done.*" \
-	"delete all breakpoints"
-
-test_return_simple
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
deleted file mode 100644
index 9e9385e9571..00000000000
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_breakpoints_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-
-    set line_callee4_head  [gdb_get_line_number "callee4 ("]
-    set line_callee3_head  [gdb_get_line_number "callee3 ("]
-    set line_callee2_head  [gdb_get_line_number "callee2 ("]
-    set line_callee2_body  [expr $line_callee2_head + 2]
-    set line_main_head     [gdb_get_line_number "main ("]
-    set line_main_body     [expr $line_main_head + 2]
-
-    # Insert some breakpoints and list them
-    # Also, disable some so they do not interfere with other tests
-    # Tests:
-    # -break-insert
-    # -break-list
-    # -break-disable
-    # -break-info
-
-    mi_gdb_test "200-break-insert main" \
-             "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}" \
-             "break-insert operation"
-
-    mi_gdb_test "201-break-insert basics.c:callee2" \
-             "201\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee2\",file=\".*basics.c\",line=\"$line_callee2_body\",times=\"0\"\}" \
-             "insert breakpoint at basics.c:callee2"
-
-    mi_gdb_test "202-break-insert basics.c:$line_callee3_head" \
-             "202\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_head\",times=\"0\"\}" \
-             "insert breakpoint at basics.c:\$line_callee3_head"
-
-    mi_gdb_test "203-break-insert \"\\\"${srcfile}\\\":$line_callee4_head\"" \
-             "203\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_head\",times=\"0\"\}" \
-             "insert breakpoint at \"<fullfilename>\":\$line_callee4_head"
-
-    mi_gdb_test "204-break-list" \
-	    "204\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\]\}" \
-                "list of breakpoints"
-
-    mi_gdb_test "205-break-disable 2 3 4" \
-                "205\\^done.*" \
-                "disabling of breakpoints"
-
-    mi_gdb_test "206-break-info 2" \
-	    "206\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"2\",.*,enabled=\"n\",.*\}\\\]\}" \
-                "list of breakpoints, 16 disabled"
-}
-
-proc test_running_the_program {} {
-    global mi_gdb_prompt
-    global hex
-
-    set line_main_head     [gdb_get_line_number "main ("]
-    set line_main_body     [expr $line_main_head + 2]
-
-    # Run the program without args, then specify srgs and rerun the program
-    # Tests:
-    # -exec-run
-    # -gdb-set
-
-    # mi_gdb_test cannot be used for asynchronous commands because there are
-    # two prompts involved and this can lead to a race condition.
-    # The following is equivalent to a send_gdb "000-exec-run\n"
-    mi_run_cmd
-    gdb_expect {
-	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"$line_main_body\"\}\r\n$mi_gdb_prompt$" {
-	    pass "run to main"
-	}
-	-re ".*$mi_gdb_prompt$" {
-	    fail "run to main (2)"
-	}
-	timeout {
-	    fail "run to main (timeout)"
-	}
-    }
-}
-
-proc test_controlled_execution {} {
-    global mi_gdb_prompt
-    global hex
-
-    set line_callee4_head         [gdb_get_line_number "callee4 ("]
-    set line_callee4_body         [expr $line_callee4_head + 2]
-    set line_callee3_head         [gdb_get_line_number "callee3 ("]
-    set line_callee3_close_brace  [expr $line_callee3_head + 3]
-    set line_callee1_head         [gdb_get_line_number "callee1 ("]
-    set line_callee1_body         [expr $line_callee1_head + 2]
-    set line_main_head            [gdb_get_line_number "main ("]
-    set line_main_body            [expr $line_main_head + 2]
-
-    # Continue execution until a breakpoint is reached, step into calls, verifying
-    # if the arguments are correctly shown, continue to the end of a called
-    # function, step over a call (next).
-    # Tests:
-    # -exec-continue
-    # -exec-next
-    # -exec-step
-    # -exec-finish
-
-    mi_next_to "main" "" "basics.c" [expr $line_main_body + 1] "next at main"
-
-    # FIXME: A string argument is not printed right; should be fixed and
-    #        we should look for the right thing here.
-    # NOTE: The ``\\\\\"'' is for \".
-    mi_step_to "callee1" \
-	"\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument\.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}" \
-	"basics.c" "$line_callee1_body" "step at main"
-
-    # FIXME: A string argument is not printed right; should be fixed and
-    #        we should look for the right thing here.
-    mi_execute_to "exec-step 3" "end-stepping-range" "callee4" "" \
-	"basics.c" $line_callee4_body "" "step to callee4"
-
-    # FIXME: A string argument is not printed right; should be fixed and
-    #        we should look for the right thing here.
-    # NOTE: The ``.'' is part of ``gdb-result-var="$1"''
-    mi_finish_to "callee3" ".*" "basics.c" $line_callee3_close_brace ".1" "0" "exec-finish"
-}
-
-proc test_controlling_breakpoints {} {
-    global mi_gdb_prompt
-
-    # Enable, delete, set ignore counts in breakpoints
-    # (disable was already tested above)
-    # Tests:
-    # -break-delete
-    # -break-enable
-    # -break-after
-    # -break-condition
-
-}
-
-proc test_program_termination {} {
-    global mi_gdb_prompt
-
-    # Run to completion: normal and forced
-    # Tests:
-    # -exec-abort
-    # (normal termination of inferior)
-
-    # FIXME: "stopped" doesn't seem appropriate.
-    # mi_gdb_test cannot be used for asynchronous commands because there are
-    # two prompts involved and this can lead to a race condition.
-    send_gdb "999-exec-continue\n"
-    gdb_expect {
-      -re "999\\^running\r\n$mi_gdb_prompt" {
-        gdb_expect {
-          -re "999\\*stopped,reason=\"exited-normally\"\r\n$mi_gdb_prompt$" {
-            pass "continue to end"
-          }
-          -re ".*$mi_gdb_prompt$" {fail "continue to end (2)"}
-          timeout {fail "continue to end (timeout 2)"}
-        }
-      }
-      -re ".*$mi_gdb_prompt$" {fail "continue to end (1)"}
-      timeout {fail "continue to end (timeout 1)"}
-    }
-}
-
-test_breakpoints_creation_and_listing
-test_running_the_program
-test_controlled_execution
-test_controlling_breakpoints
-test_program_termination
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp
deleted file mode 100644
index 496db62e3f8..00000000000
--- a/gdb/testsuite/gdb.mi/mi-stack.exp
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 2000, 2001, 2002, 2004, 2005 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that stack commands work.
-
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_stack_frame_listing {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    set line_callee4_head [gdb_get_line_number "callee4 ("]
-    set line_callee4_body [expr $line_callee4_head + 2]
-
-    # Obtain a stack trace
-    # Tests:
-    # -stack-list-frames
-    # -stack-list-frames 1 1
-    # -stack-list-frames 1 3
-
-    mi_gdb_test "231-stack-list-frames" \
-	    "231\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee4_body\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"callee2\",.*\},frame=\{level=\"3\",addr=\"$hex\",func=\"callee1\",.*\},frame=\{level=\"4\",addr=\"$hex\",func=\"main\",.*\}\\\]" \
-                "stack frame listing"
-    mi_gdb_test "232-stack-list-frames 1 1" \
-	    "232\\^done,stack=\\\[frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\}\\\]" \
-                "stack frame listing 1 1"
-    mi_gdb_test "233-stack-list-frames 1 3" \
-	    "233\\^done,stack=\\\[frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"callee2\",.*\},frame=\{level=\"3\",addr=\"$hex\",func=\"callee1\",.*\}\\\]" \
-                "stack frame listing 1 3"
-
-    mi_gdb_test "234-stack-list-frames 1" \
-	    "234\\^error,msg=\"mi_cmd_stack_list_frames: Usage.*FRAME_LOW FRAME_HIGH.*\"" \
-	    "stack frame listing wrong"
-}
-
-proc test_stack_args_listing {} {
-    global mi_gdb_prompt
-    global hex
-
-    # Obtain lists for args for the stack frames
-    # Tests:
-    # -stack-list-arguments 0
-    # -stack-list-arguments 0 1 1
-    # -stack-list-arguments 0 1 3
-    # -stack-list-arguments 1
-    # -stack-list-arguments 1 1 1
-    # -stack-list-arguments 1 1 3
-    # -stack-list-arguments 
-
-    mi_gdb_test "231-stack-list-arguments 0" \
-	    "231\\^done,stack-args=\\\[frame=\{level=\"0\",args=\\\[\\\]\},frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\},frame=\{level=\"2\",args=\\\[name=\"intarg\",name=\"strarg\"\\\]\},frame=\{level=\"3\",args=\\\[name=\"intarg\",name=\"strarg\",name=\"fltarg\"\\\]\},frame=\{level=\"4\",args=\\\[\\\]\}\\\]" \
-                "stack args listing 0"
-
-    mi_gdb_test "232-stack-list-arguments 0 1 1" \
-	    "232\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\}\\\]" \
-                "stack args listing 0 1 1"
-
-    mi_gdb_test "233-stack-list-arguments 0 1 3" \
-	    "233\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\},frame=\{level=\"2\",args=\\\[name=\"intarg\",name=\"strarg\"\\\]\},frame=\{level=\"3\",args=\\\[name=\"intarg\",name=\"strarg\",name=\"fltarg\"\\\]\}\\\]" \
-                "stack args listing 0 1 3"
-
-    mi_gdb_test "231-stack-list-arguments 1" \
-	    "231\\^done,stack-args=\\\[frame=\{level=\"0\",args=\\\[\\\]\},frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"2\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"3\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\\\]\},frame=\{level=\"4\",args=\\\[\\\]\}\\\]" \
-                "stack args listing 1"
-
-    mi_gdb_test "232-stack-list-arguments 1 1 1" \
-	    "232\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\}\\\]" \
-                "stack args listing 1 1 1"
-
-    mi_gdb_test "233-stack-list-arguments 1 1 3" \
-	    "233\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"2\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"3\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\\\]\}\\\]" \
-                "stack args listing 1 1 3"
-
-    mi_gdb_test "234-stack-list-arguments" \
-	    "234\\^error,msg=\"mi_cmd_stack_list_args: Usage.*PRINT_VALUES.*FRAME_LOW FRAME_HIGH.*\"" \
-	    "stack args listing wrong"
-}
-
-proc test_stack_info_depth {} {
-    global mi_gdb_prompt
-    global hex
-
-    # Obtain depth of stack
-    # Tests:
-    # -stack-info-depth
-    # -stack-info-depth 3
-    # -stack-info-depth 99
-
-    mi_gdb_test "231-stack-info-depth" \
-	    "231\\^done,depth=\"5\"" \
-                "stack info-depth"
-
-    mi_gdb_test "231-stack-info-depth 3" \
-	    "231\\^done,depth=\"3\"" \
-                "stack info-depth 3"
-
-    mi_gdb_test "231-stack-info-depth 99" \
-	    "231\\^done,depth=\"5\"" \
-                "stack info-depth 99"
-
-    mi_gdb_test "231-stack-info-depth 99 99" \
-	    "231\\^error,msg=\"mi_cmd_stack_info_depth: Usage: .MAX_DEPTH.\"" \
-                "stack info-depth wrong usage"
-}
-
-proc test_stack_locals_listing {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    # Obtain lists for locals for the stack frames
-    # Tests:
-    # -stack-list-locals 0
-    # -stack-list-locals 1
-    # -stack-list-locals 2
-    # -stack-list-arguments 
-
-    mi_gdb_test "232-stack-list-locals 0" \
-	    "232\\^done,locals=\\\[name=\"A\",name=\"B\",name=\"C\"\\\]" \
-                "stack locals listing 0"
-
-set line_callee4_return_0 [gdb_get_line_number "return 0;"]
-
-# step until A, B, C, have some reasonable values.
-send_gdb "-exec-next 3\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" {
-	pass "next's in callee4"
-    }
-    timeout { fail "next in callee4 (timeout)" }
-}
-
-    mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\\\[\{name=\"A\",value=\"1\"\},\{name=\"B\",value=\"2\"\},\{name=\"C\",value=\"3\"\}\\\]" \
-                "stack locals listing 1"
-
-    mi_gdb_test "232-stack-list-locals 2" \
-	    "232\\^done,locals=\\\[\{name=\"A\",type=\"int\",value=\"1\"\},\{name=\"B\",type=\"int\",value=\"2\"\},\{name=\"C\",type=\"int\",value=\"3\"\}\\\]" \
-                "stack locals listing 2"
-
-    mi_gdb_test "234-stack-list-locals" \
-	    "234\\^error,msg=\"mi_cmd_stack_list_locals: Usage.*PRINT_VALUES.*\"" \
-	    "stack locals listing wrong"
-
-    mi_gdb_test "232-stack-select-frame 1" \
-	    "232\\^done" \
-                "stack select frame 1"
-
-    mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\\\[\\\]" \
-                "stack locals listing for new frame"
-
-# this should be a no-op
-
-    mi_gdb_test "232-stack-select-frame" \
-	    "232\\^done" \
-                "stack select same frame"
-
-    mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\\\[\\\]" \
-                "stack locals for same frame (level 1)"
-
-}
-
-mi_runto callee4
-test_stack_frame_listing
-test_stack_args_listing
-test_stack_locals_listing
-test_stack_info_depth
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-stepi.exp b/gdb/testsuite/gdb.mi/mi-stepi.exp
deleted file mode 100644
index 5972107162e..00000000000
--- a/gdb/testsuite/gdb.mi/mi-stepi.exp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, 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.  
-
-# Test Machine interface (MI) operations 
-# Verify that, using the MI, we can run a simple program and perform
-# exec-step-instruction and exec-next-instruction.  
-
-# The goal is not to
-# test gdb functionality, which is done by other tests, but to verify
-# the correct output response to MI operations.  
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_stepi_nexti {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    set line_main_head  [gdb_get_line_number "main ("]
-    set line_main_body  [expr $line_main_head + 2]
-    set line_main_hello [gdb_get_line_number "Hello, World!"]
-
-    send_gdb "111-exec-step-instruction\n"
-    gdb_expect {
-	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-	    set line $expect_out(2,string)
-	    if { $line >= $line_main_body && $line <= $line_main_hello } {
-		pass "step-instruction at main"
-	    } else {
-		fail "step-instruction at main"
-	    }
-	}
-	timeout {
-	    fail "step-instruction at main (timeout)"
-	}
-    }
-    send_gdb "222-exec-next-instruction\n"
-    gdb_expect {
-	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-	    set line $expect_out(2,string)
-	    if { $line >= $line_main_body && $line <= $line_main_hello } {
-		pass "next-instruction at main"
-	    } else {
-		fail "next-instruction at main"
-	    }
-	}
-	timeout {
-	    fail "next-instruction at main (timeout)"
-	}
-    }
-    send_gdb "333-exec-next-instruction\n"
-    gdb_expect {
-	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-	    set line $expect_out(2,string)
-	    if { $line >= $line_main_body && $line <= $line_main_hello } {
-		pass "next-instruction at main"
-	    } else {
-		fail "next-instruction at main"
-	    }
-	}
-	timeout {
-	    fail "next-instruction at main (timeout)"
-	}
-    }
-}
-
-mi_run_to_main
-test_stepi_nexti
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.c b/gdb/testsuite/gdb.mi/mi-syn-frame.c
deleted file mode 100644
index 580b5342716..00000000000
--- a/gdb/testsuite/gdb.mi/mi-syn-frame.c
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-void foo (void);
-void bar (void);
-
-void subroutine (int);
-void handler (int);
-void have_a_very_merry_interrupt (void);
-
-main ()
-{
-  puts ("Starting up");
-
-  foo ();   /* Put a breakpoint on foo() and call it to see a dummy frame */
-
-
-  have_a_very_merry_interrupt ();
-
-  puts ("Shutting down");
-}
-
-void
-foo (void)
-{
-  puts ("hi in foo");
-}
-
-void 
-bar (void)
-{
-  char *nuller = 0;
-
-  puts ("hi in bar");
-
-  *nuller = 'a';      /* try to cause a segfault */
-}
-
-void
-handler (int sig)
-{
-  subroutine (sig);
-}
-
-/* The first statement in subroutine () is a place for a breakpoint.  
-   Without it, the breakpoint is put on the while comparison and will
-   be hit at each iteration. */
-
-void
-subroutine (int in)
-{
-  int count = in;
-  while (count < 100)
-    count++;
-}
-
-void
-have_a_very_merry_interrupt (void)
-{
-  puts ("Waiting to get a signal");
-  signal (SIGALRM, handler);
-  alarm (1);
-  sleep (2);  /* We'll receive that signal while sleeping */
-}
-
diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
deleted file mode 100644
index 16600b417ab..00000000000
--- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2002, 2003, 2005 Free Software Foundation, 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
-
-# Test MI output with synthetic frames on the stack (call dummies,
-# signal handlers).
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping mi-syn-frame.exp because of nosignals."
-    continue
-}
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-set testfile "mi-syn-frame"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-set my_mi_gdb_prompt "\\(gdb\\)\[ \]*\[\r\n\]*"
-
-mi_gdb_exit
-mi_gdb_start
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-mi_run_to_main
-
-mi_gdb_test "400-break-insert foo" "400\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"foo\",file=\".*mi-syn-frame.c\",line=\"$decimal\",times=\"0\"\}"
-
-
-#
-# Call foo() by hand, where we'll hit a breakpoint.
-#
-
-mi_gdb_test "401-data-evaluate-expression foo()" "\\&\"The program being debugged stopped while in a function called from GDB.\\\\n\"\[\r\n\]+\\&\"When the function \\(foo\\) is done executing, GDB will silently\\\\n\"\[\r\n\]+\\&\"stop \\(instead of continuing to evaluate the expression containing\\\\n\"\[\r\n\]+\\&\"the function call\\).\\\\n\"\[\r\n\]+401\\^error,msg=\"The program being debugged stopped while in a function called from GDB.*\"" "call inferior's function with a breakpoint set in it"
-
-mi_gdb_test "402-stack-list-frames" "402\\^done,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*mi-syn-frame.c\",line=\"$decimal\"\},stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"foo\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\}.*\\\]" "backtrace from inferior function stopped at bp, showing gdb dummy frame"
-
-#
-# Continue back to main()
-#
-
-send_gdb "403-exec-continue\n"
-gdb_expect {
-  -re "403\\^running\[\r\n\]+${my_mi_gdb_prompt}hi in foo\[\r\n\]+403\\\*stopped\[\r\n\]+${my_mi_gdb_prompt}$" {
-    pass "403-exec-continue"
-  }
-  timeout {
-    fail "403-exec-continue"
-  }
-}
-
-mi_gdb_test "404-stack-list-frames 0 0" "404\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\}.*\\\]"
-
-
-#
-# Call have_a_very_merry_interrupt() which will eventually raise a signal
-# that's caught by handler() which calls subroutine().
-
-mi_gdb_test "405-break-insert subroutine" "405\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"subroutine\",file=\".*mi-syn-frame.c\",line=\"$decimal\",times=\"0\"\}"
-
-mi_gdb_test "406-data-evaluate-expression have_a_very_merry_interrupt()" "Waiting to get a signal\[\r\n\]+\\&\"The program being debugged stopped while in a function called from GDB.\\\\n\"\[\r\n\]+\\&\"When the function \\(have_a_very_merry_interrupt\\) is done executing, GDB will silently\\\\n\"\[\r\n\]+\\&\"stop \\(instead of continuing to evaluate the expression containing\\\\n\"\[\r\n\]+\\&\"the function call\\).\\\\n\"\[\r\n\]+406\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(have_a_very_merry_interrupt\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\""
-
-# We should have both a signal handler and a call dummy frame
-# in this next output.
-
-mi_gdb_test "407-stack-list-frames" "407\\^done,reason=\"breakpoint-hit\",bkptno=\"3\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"subroutine\",args=\\\[\{name=\"in\",value=\"$decimal\"\}\\\],file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"subroutine\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"handler\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"<signal handler called>\"\},.*frame=\{level=\"$decimal\",addr=\"$hex\",func=\"have_a_very_merry_interrupt\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\}.*\\\]"
-
-
-send_gdb "408-exec-continue\n"
-gdb_expect {
-  -re "408\\^running\[\r\n\]+${my_mi_gdb_prompt}408\\\*stopped\[\r\n\]+${my_mi_gdb_prompt}$" {
-    pass "408-exec-continue"
-  }
-  timeout {
-    fail "408-exec-continue"
-  }
-}
-
-mi_gdb_test "409-stack-list-frames 0 0" "409\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\}.*\\\]"
-
-#
-# Call bar() by hand, which should get an exception while running.
-# 
-
-mi_gdb_test "410-data-evaluate-expression bar()" "hi in bar\[\r\n\]+\\&\"The program being debugged was signaled while in a function called from GDB.\\\\n\"\[\r\n\]+\\&\"GDB remains in the frame where the signal was received.\\\\n\"\[\r\n\]+\\&\"To change this behavior use \\\\\"set unwindonsignal on\\\\\"\\\\n\"\[\r\n\]+\\&\"Evaluation of the expression containing the function \\(bar\\) will be abandoned.\\\\n\"\[\r\n\]+410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" "call inferior function which raises exception"
-
-mi_gdb_test "411-stack-list-frames" "411\\^done,reason=\"signal-received\",signal-name=\".*\",signal-meaning=\".*\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"bar\",args=\\\[\\\],file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"}.*\\\]" "backtrace from inferior function at exception"
-
-mi_gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp
deleted file mode 100644
index eb90d0dcd24..00000000000
--- a/gdb/testsuite/gdb.mi/mi-until.exp
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999, 2000, 2001, 2005 Free Software Foundation, 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
-
-# Test Machine interface (MI) operations 
-# Verify that, using the MI, we can run a simple program and perform
-# exec-until.  
-
-# The goal is not to
-# test gdb functionality, which is done by other tests, but to verify
-# the correct output response to MI operations.  
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "until"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_running_to_foo {} {
-    global mi_gdb_prompt
-    global hex
-
-    mi_gdb_test "200-break-insert 10" \
-             "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"foo\",file=\".*until.c\",line=\"10\",times=\"0\"\}" \
-             "break-insert operation"
-
-    mi_run_cmd
-
-    gdb_expect {
-	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"10\"\}\r\n$mi_gdb_prompt$" {
-	    pass "run to main"
-	}
-	-re ".*$mi_gdb_prompt$" {
-	    fail "run to main (2)"
-	}
-	timeout {
-	    fail "run to main (timeout)"
-	}
-    }
-
-    mi_gdb_test "100-break-delete 1" "100\\^done" "break-delete 1"
-
-}
-
-proc test_until {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    send_gdb "111-exec-until\n"
-    gdb_expect {
-	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"12\"\}\r\n$mi_gdb_prompt$" {
-	    pass "until after while loop"
-	}
-	timeout {
-	    fail "until after while loop (timeout)"
-	}
-    }
-
-    send_gdb "222-exec-until 15\n"
-    gdb_expect {
-	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"15\"\}\r\n$mi_gdb_prompt$" {
-	    pass "until line number"
-	}
-	timeout {
-	    fail "until line number (timeout)"
-	}
-    }
-
-    send_gdb "333-exec-until until.c:17\n"
-    gdb_expect {
-	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"17\"\}\r\n$mi_gdb_prompt$" {
-	    pass "until line number:file"
-	}
-	timeout {
-	    fail "until line number:file (timeout)"
-	}
-    }
-
-    # This is supposed to NOT stop at line 25. It stops right after foo is over.
-
-    send_gdb "444-exec-until until.c:25\n"
-    gdb_expect {
-	-re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"24\"\}\r\n$mi_gdb_prompt$" {
-	    pass "until after current function"
-	}
-	timeout {
-	    fail "until after current function (timeout)"
-	}
-    }
-
-}
-
-test_running_to_foo
-test_until
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp
deleted file mode 100644
index db49456a637..00000000000
--- a/gdb/testsuite/gdb.mi/mi-var-block.exp
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation, 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.
-
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can create, update, delete variables.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-mi_runto do_block_tests
-
-# Test: c_variable-3.2
-# Desc: create cb and foo
-mi_gdb_test "-var-create cb * cb" \
-	"\\^done,name=\"cb\",numchild=\"0\",type=\"int\"" \
-	"create local variable cb"
-
-mi_gdb_test "-var-create foo * foo" \
-	"&\"mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create local variable foo"
-
-# step to "foo = 123;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo = 123;"] \
-    "step at do_block_test"
-
-
-# Be paranoid and assume 3.2 created foo
-mi_gdb_test "-var-delete foo" \
-	"&\"Variable object not found\\\\n\".*\\^error,msg=\"Variable object not found\"" \
-	"delete var foo"
-
-
-# Test: c_variable-3.3
-# Desc: create foo
-mi_gdb_test "-var-create foo * foo" \
-	"\\^done,name=\"foo\",numchild=\"0\",type=\"int\"" \
-	"create local variable foo"
-
-# step to "foo2 = 123;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo2 = 123;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.4
-# Desc: check foo, cb changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"foo\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"cb\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: cb foo changed"
-
-# step to "foo = 321;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo = 321;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.5
-# Desc: create inner block foo
-mi_gdb_test "-var-create inner_foo * foo" \
-	"\\^done,name=\"inner_foo\",numchild=\"0\",type=\"int\"" \
-	"create local variable inner_foo"
-
-# step to "foo2 = 0;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo2 = 0;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.6
-# Desc: create foo2
-mi_gdb_test "-var-create foo2 * foo2" \
-	"\\^done,name=\"foo2\",numchild=\"0\",type=\"int\"" \
-	"create local variable foo2"
-
-# Test: c_variable-3.7
-# Desc: check that outer foo in scope and inner foo out of scope
-# Note: also a known gdb problem
-setup_xfail *-*-*
-mi_gdb_test "-var-update inner_foo" \
-	"\\^done,changelist=\{FIXME\}" \
-	"update inner_foo: should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-
-setup_xfail *-*-*
-mi_gdb_test "-var-evaluate-expression inner_foo" \
-	"\\^done,value=\{FIXME\}" \
-	"evaluate inner_foo: should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-
-mi_gdb_test "-var-update foo" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update foo: did not change"
-
-mi_gdb_test "-var-delete inner_foo" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var inner_foo"
-
-# step to "foo = 0;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo = 0;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.8
-# Desc: check that foo2 out of scope (known gdb problem)
-setup_xfail *-*-*
-mi_gdb_test "-var-update foo2" \
-	"\\^done,changelist=\{FIXME\}" \
-	"update foo2: should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-
-# step to "cb = 21;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "cb = 21;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.9
-# Desc: check that only cb is in scope (known gdb problem)
-setup_xfail *-*-*
-mi_gdb_test "-var-update foo2" \
-	"\\^done,changelist=\\\[FIXME\\\]" \
-	"update foo2 should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-setup_xfail *-*-*
-mi_gdb_test "-var-update foo" \
-	"\\^done,changelist=\{FIXME\}" \
-	"update foo should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-mi_gdb_test "-var-update cb" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update cb"
-
-# 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
-mi_gdb_test "-var-delete foo" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var foo"
-
-mi_gdb_test "-var-delete foo2" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var foo2"
-
-mi_gdb_test "-var-delete cb" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var cb"
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
deleted file mode 100644
index d0fb3957658..00000000000
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ /dev/null
@@ -1,1209 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004 Free Software Foundation
-
-# 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.
-
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can create, update, delete variables.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-mi_runto do_children_tests
-
-#####        #####
-#                #
-# children tests #
-#                #
-#####        #####
-
-
-# Test: c_variable-4.2
-# Desc: create variable "struct_declarations"
-mi_gdb_test "-var-create struct_declarations * struct_declarations" \
-	"\\^done,name=\"struct_declarations\",numchild=\"11\",type=\"struct _struct_decl\"" \
-	"create local variable struct_declarations"
-
-# Test: c_variable-4.3
-# Desc: children of struct_declarations
-# STABS doesn't give us argument types for the func ptr structs, but
-# Dwarf 2 does.
-mi_gdb_test "-var-list-children struct_declarations" \
-	"\\^done,numchild=\"11\",children=\\\[child=\{name=\"struct_declarations.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"struct_declarations.character\",exp=\"character\",numchild=\"0\",type=\"char\"\},child={name=\"struct_declarations.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"struct_declarations.long_int\",exp=\"long_int\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.int_ptr_ptr\",exp=\"int_ptr_ptr\",numchild=\"1\",type=\"int \\*\\*\"\},child=\{name=\"struct_declarations.long_array\",exp=\"long_array\",numchild=\"10\",type=\"long int \\\[10\\\]\"\},child=\{name=\"struct_declarations.func_ptr\",exp=\"func_ptr\",numchild=\"0\",type=\"void \\(\\*\\)\\((void)?\\)\"\},child=\{name=\"struct_declarations.func_ptr_struct\",exp=\"func_ptr_struct\",numchild=\"0\",type=\"struct _struct_decl \\(\\*\\)\\((int, char \\*, long int)?\\)\"\},child=\{name=\"struct_declarations.func_ptr_ptr\",exp=\"func_ptr_ptr\",numchild=\"0\",type=\"struct _struct_decl \\*\\(\\*\\)\\((int, char \\*, long int)?\\)\"\},child=\{name=\"struct_declarations.u1\",exp=\"u1\",numchild=\"4\",type=\"union \{\\.\\.\\.\}\"\},child=\{name=\"struct_declarations.s2\",exp=\"s2\",numchild=\"4\",type=\"struct \{\\.\\.\\.\}\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children struct_declarations" \
-	"\\^done,numchild=\"11\"" \
-	"get number of children of struct_declarations"
-
-# Test: c_variable-4.5
-# Desc: children of struct_declarations.integer
-mi_gdb_test "-var-list-children struct_declarations.integer" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.integer"
-
-# Test: c_variable-4.6
-# Desc: number of children of struct_declarations.integer
-mi_gdb_test "-var-info-num-children struct_declarations.integer" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.integer"
-
-# Test: c_variable-4.7
-# Desc: children of struct_declarations.character
-mi_gdb_test "-var-list-children struct_declarations.character" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.character"
-
-# Test: c_variable-4.8
-# Desc: number of children of struct_declarations.character
-mi_gdb_test "-var-info-num-children struct_declarations.character" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.character"
-
-# Test: c_variable-4.9
-# Desc: children of struct_declarations.char_ptr
-mi_gdb_test "-var-list-children struct_declarations.char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"struct_declarations.char_ptr.\\*char_ptr\",exp=\"\\*char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of struct_declarations.char_ptr"
-
-# Test: c_variable-4.10
-# Desc: number of children of struct_declarations.char_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of struct_declarations.char_ptr"
-
-# Test: c_variable-4.11
-# Desc: children of struct_declarations.long_int
-mi_gdb_test "-var-list-children struct_declarations.long_int" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_int"
-
-# Test: c_variable-4.12
-# Desc: number of children of struct_declarations.long_int
-mi_gdb_test "-var-info-num-children struct_declarations.long_int" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_int"
-
-# Test: c_variable-4.13
-# Desc: children of int_ptr_ptr
-mi_gdb_test "-var-list-children struct_declarations.int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"struct_declarations.int_ptr_ptr.\\*int_ptr_ptr\",exp=\"\\*int_ptr_ptr\",numchild=\"1\",type=\"int \\*\"\}\\\]" \
-	"get children of struct_declarations.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
-mi_gdb_test "-var-info-num-children struct_declarations.int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of struct_declarations.int_ptr_ptr"
-
-
-# Test: c_variable-4.15
-# Desc: children of struct_declarations.long_array
-mi_gdb_test "-var-list-children struct_declarations.long_array" \
-	"\\^done,numchild=\"10\",children=\\\[child=\{name=\"struct_declarations.long_array.0\",exp=\"0\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.1\",exp=\"1\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.2\",exp=\"2\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.3\",exp=\"3\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.4\",exp=\"4\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.5\",exp=\"5\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.6\",exp=\"6\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.7\",exp=\"7\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.8\",exp=\"8\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.9\",exp=\"9\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of struct_declarations.long_array"
-
-# Test: c_variable-4.16
-# Desc: number of children of struct_declarations.long_array
-mi_gdb_test "-var-info-num-children struct_declarations.long_array" \
-	"\\^done,numchild=\"10\"" \
-	"get number of children of struct_declarations.long_array"
-
-# Test: c_variable-4.17
-# Desc: children of struct_declarations.func_ptr
-mi_gdb_test "-var-list-children struct_declarations.func_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.func_ptr"
-
-
-# Test: c_variable-4.18
-# Desc: number of children of struct_declarations.func_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.func_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.func_ptr"
-
-
-# Test: c_variable-4.19
-# Desc: children of struct_declarations.func_ptr_struct
-mi_gdb_test "-var-list-children struct_declarations.func_ptr_struct" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.func_ptr_struct"
-
-# Test: c_variable-4.20
-# Desc: number of children of struct_declarations.func_ptr_struct
-mi_gdb_test "-var-info-num-children struct_declarations.func_ptr_struct" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.func_ptr_struct"
-
-
-# Test: c_variable-4.21
-# Desc: children of struct_declarations.func_ptr_ptr
-mi_gdb_test "-var-list-children struct_declarations.func_ptr_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.func_ptr_ptr"
-
-# Test: c_variable-4.22
-# Desc: number of children of struct_declarations.func_ptr_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.func_ptr_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.func_ptr_ptr"
-
-
-# Test: c_variable-4.23
-# Desc: children of struct_declarations.u1
-mi_gdb_test "-var-list-children struct_declarations.u1" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"struct_declarations.u1.a\",exp=\"a\",numchild=\"0\",type=\"int\"\},child=\{name=\"struct_declarations.u1.b\",exp=\"b\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"struct_declarations.u1.c\",exp=\"c\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.u1.d\",exp=\"d\",numchild=\"0\",type=\"enum foo\"\}\\\]" \
-	"get children of struct_declarations.u1"
-
-# Test: c_variable-4.24
-# Desc: number of children of struct_declarations.u1
-mi_gdb_test "-var-info-num-children struct_declarations.u1" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of struct_declarations.u1"
-
-# Test: c_variable-4.25
-# Desc: children of struct_declarations.s2
-mi_gdb_test "-var-list-children struct_declarations.s2" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"struct_declarations.s2.u2\",exp=\"u2\",numchild=\"3\",type=\"union \{\\.\\.\\.\}\"\},child=\{name=\"struct_declarations.s2.g\",exp=\"g\",numchild=\"0\",type=\"int\"\},child=\{name=\"struct_declarations.s2.h\",exp=\"h\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.i\",exp=\"i\",numchild=\"10\",type=\"long int \\\[10\\\]\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children struct_declarations.s2" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of struct_declarations.s2"
-
-
-# Test: c_variable-4.27
-# Desc: children of struct_declarations.long_array.1
-mi_gdb_test "-var-list-children struct_declarations.long_array.1" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.1"
-
-# Test: c_variable-4.28
-# Desc: number of children of struct_declarations.long_array.1
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.1" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.1"
-
-# Test: c_variable-4.29
-# Desc: children of struct_declarations.long_array.2
-mi_gdb_test "-var-list-children struct_declarations.long_array.2" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.2"
-
-# Test: c_variable-4.30
-# Desc: number of children of struct_declarations.long_array.2
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.2" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.2"
-
-# Test: c_variable-4.31
-# Desc: children of struct_declarations.long_array.3
-mi_gdb_test "-var-list-children struct_declarations.long_array.3" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.3"
-
-# Test: c_variable-4.32
-# Desc: number of children of struct_declarations.long_array.3
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.3" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.3"
-
-# Test: c_variable-4.33 
-# Desc: children of struct_declarations.long_array.4
-mi_gdb_test "-var-list-children struct_declarations.long_array.4" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.4"
-
-# Test: c_variable-4.34
-# Desc: number of children of struct_declarations.long_array.4
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.4" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.4"
-
-# Test: c_variable-4.35
-# Desc: children of struct_declarations.long_array.5
-mi_gdb_test "-var-list-children struct_declarations.long_array.5" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.5"
-
-# Test: c_variable-4.36
-# Desc: number of children of struct_declarations.long_array.5
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.5" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.5"
-
-# Test: c_variable-4.37
-# Desc: children of struct_declarations.long_array.6
-mi_gdb_test "-var-list-children struct_declarations.long_array.6" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.6"
-
-# Test: c_variable-4.38
-# Desc: number of children of struct_declarations.long_array.6
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.6" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.6"
-
-# Test: c_variable-4.39
-# Desc: children of struct_declarations.long_array.7
-mi_gdb_test "-var-list-children struct_declarations.long_array.7" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.7"
-
-# Test: c_variable-4.40
-# Desc: number of children of struct_declarations.long_array.7
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.7" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.7"
-
-# Test: c_variable-4.41
-# Desc: children of struct_declarations.long_array.8
-mi_gdb_test "-var-list-children struct_declarations.long_array.8" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.8"
-
-# Test: c_variable-4.42
-# Desc: number of children of struct_declarations.long_array.8
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.8" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.8"
-
-
-# Test: c_variable-4.43
-# Desc: children of struct_declarations.long_array.9
-mi_gdb_test "-var-list-children struct_declarations.long_array.9" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.9"
-
-# Test: c_variable-4.44
-# Desc: number of children of struct_declarations.long_array.9
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.9" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.9"
-
-# Test: c_variable-4.45
-# Desc: children of struct_declarations.u1.a
-mi_gdb_test "-var-list-children struct_declarations.u1.a" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.u1.a"
-
-# Test: c_variable-4.46
-# Desc: number of children of struct_declarations.u1.a
-mi_gdb_test "-var-info-num-children struct_declarations.u1.a" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.u1.a"
-
-# Test: c_variable-4.47
-# Desc: children of struct_declarations.u1.b
-mi_gdb_test "-var-list-children struct_declarations.u1.b" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"struct_declarations.u1.b.\\*b\",exp=\"\\*b\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of struct_declarations.u1.b"
-
-# Test: c_variable-4.48
-# Desc: number of children of struct_declarations.u1.b
-mi_gdb_test "-var-info-num-children struct_declarations.u1.b" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of struct_declarations.u1.b"
-
-# Test: c_variable-4.49
-# Desc: children of struct_declarations.u1.c
-mi_gdb_test "-var-list-children struct_declarations.u1.c" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.u1.c"
-
-# Test: c_variable-4.50
-# Desc: number of children of struct_declarations.u1.c
-mi_gdb_test "-var-info-num-children struct_declarations.u1.c" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.u1.c"
-
-# Test: c_variable-4.51
-# Desc: children of struct_declarations.u1.d
-mi_gdb_test "-var-list-children struct_declarations.u1.d" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.u1.d"
-
-
-# Test: c_variable-4.52
-# Desc: number of children of struct_declarations.u1.d
-mi_gdb_test "-var-info-num-children struct_declarations.u1.d" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.u1.d"
-
-
-# Test: c_variable-4.53
-# Desc: children of struct_declarations.s2.u2
-mi_gdb_test "-var-list-children struct_declarations.s2.u2" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s1\",exp=\"u1s1\",numchild=\"4\",type=\"struct \{\\.\\.\\.\}\"\},child=\{name=\"struct_declarations.s2.u2.f\",exp=\"f\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.u2.u1s2\",exp=\"u1s2\",numchild=\"2\",type=\"struct \{\\.\\.\\.\}\"\}\\\]" \
-	"get children of struct_declarations.s2.u2"
-
-# Test: c_variable-4.54
-# Desc: number of children of struct_declarations.s2.u2
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2" \
-	"\\^done,numchild=\"3\"" \
-	"get number of children of struct_declarations.s2.u2"
-
-# Test: c_variable-4.55
-# Desc: children of struct_declarations.s2.g
-mi_gdb_test "-var-list-children struct_declarations.s2.g" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.g"
-
-# Test: c_variable-4.56
-# Desc: number of children of struct_declarations.s2.g
-mi_gdb_test "-var-info-num-children struct_declarations.s2.g" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.g"
-
-
-# Test: c_variable-4.57
-# Desc: children of struct_declarations.s2.h
-mi_gdb_test "-var-list-children struct_declarations.s2.h" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.h"
-
-# Test: c_variable-4.58
-# Desc: number of children of struct_declarations.s2.h
-mi_gdb_test "-var-info-num-children struct_declarations.s2.h" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.h"
-
-
-# Test: c_variable-4.59
-# Desc: children of struct_declarations.s2.i
-mi_gdb_test "-var-list-children struct_declarations.s2.i" \
-	"\\^done,numchild=\"10\",children=\\\[child=\{name=\"struct_declarations.s2.i.0\",exp=\"0\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.1\",exp=\"1\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.2\",exp=\"2\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.3\",exp=\"3\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.4\",exp=\"4\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.5\",exp=\"5\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.6\",exp=\"6\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.7\",exp=\"7\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.8\",exp=\"8\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.9\",exp=\"9\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of struct_declarations.s2.i"
-
-# Test: c_variable-4.60
-# Desc: number of children of struct_declarations.s2.i
-mi_gdb_test "-var-info-num-children struct_declarations.s2.i" \
-	"\\^done,numchild=\"10\"" \
-	"get number of children of struct_declarations.s2.i"
-
-# Test: c_variable-4.61
-# Desc: children of struct_declarations.s2.u2.u1s1
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s1.d\",exp=\"d\",numchild=\"0\",type=\"int\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e\",exp=\"e\",numchild=\"10\",type=\"char \\\[10\\\]\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.func\",exp=\"func\",numchild=\"0\",type=\"int \\*\\(\\*\\)\\((void)?\\)\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.foo\",exp=\"foo\",numchild=\"0\",type=\"efoo\"\}\\\]" \
-	"get children of struct_declarations.s2.u2.u1s1"
-
-# Test: c_variable-4.62
-# Desc: number of children of struct_declarations.s2.u2.u1s1
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1"
-
-# Test: c_variable-4.63
-# Desc: children of struct_declarations.s2.u2.f
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.f" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.f"
-
-# Test: c_variable-4.64
-# Desc: number of children of struct_declarations.s2.u2.f
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.f" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.f"
-
-# Test: c_variable-4.65
-# Desc: children of struct_declarations.s2.u2.u1s2
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s2" \
-	"\\^done,numchild=\"2\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s2.array_ptr\",exp=\"array_ptr\",numchild=\"2\",type=\"char \\\[2\\\]\"\},child=\{name=\"struct_declarations.s2.u2.u1s2.func\",exp=\"func\",numchild=\"0\",type=\"int \\(\\*\\)\\((int, char \\*)?\\)\"\}\\\]" \
-	"get children of struct_declarations.s2.u2.u1s2"
-
-# Test: c_variable-4.66
-# Desc: number of children of struct_declarations.s2.u2.u1s2
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s2" \
-	"\\^done,numchild=\"2\"" \
-	"get number of children of struct_declarations.s2.u2.u1s2"
-
-# Test: c_variable-4.67
-# Desc: children of struct_declarations.s2.u2.u1s1.d
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1.d" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.u1s1.d"
-
-# Test: c_variable-4.68
-# Desc: number of children of struct_declarations.s2.u2.u1s1.d
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1.d" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1.d"
-
-# Test: c_variable-4.69
-# Desc: children of struct_declarations.s2.u2.u1s1.e
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1.e" \
-	"\\^done,numchild=\"10\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s1.e.0\",exp=\"0\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.1\",exp=\"1\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.2\",exp=\"2\",numchild=\"0\",type=\"char\"\},child={name=\"struct_declarations.s2.u2.u1s1.e.3\",exp=\"3\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.4\",exp=\"4\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.5\",exp=\"5\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.6\",exp=\"6\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.7\",exp=\"7\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.8\",exp=\"8\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.9\",exp=\"9\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of struct_declarations.s2.u2.u1s1.e"
-
-# Test: c_variable-4.70
-# Desc: number of children of struct_declarations.s2.u2.u1s1.e
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1.e" \
-	"\\^done,numchild=\"10\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1.e"
-
-
-# Test: c_variable-4.71
-# Desc: children of struct_declarations.s2.u2.u1s1.func
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1.func" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.u1s1.func"
-
-# Test: c_variable-4.72
-# Desc: number of children of struct_declarations.s2.u2.u1s1.func
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1.func" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1.func"
-
-
-# Test: c_variable-4.73
-# Desc: children of struct_declarations.s2.u2.u1s1.foo
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1.foo" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.u1s1.foo"
-
-# Test: c_variable-4.74
-# Desc: number of children of struct_declarations.s2.u2.u1s1.foo
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1.foo" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1.foo"
-
-
-# Test: c_variable-4.75
-# Desc: children of struct_declarations.s2.u2.u1s2.array_ptr
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s2.array_ptr" \
-	"\\^done,numchild=\"2\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s2.array_ptr.0\",exp=\"0\",numchild=\"0\",type=\"char\"\},child={name=\"struct_declarations.s2.u2.u1s2.array_ptr.1\",exp=\"1\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of struct_declarations.s2.u2.u1s2.array_ptr"
-
-# Test: c_variable-4.76
-# Desc: number of children of struct_declarations.s2.u2.u1s2.array_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s2.array_ptr" \
-	"\\^done,numchild=\"2\"" \
-	"get number of children of struct_declarations.s2.u2.u1s2.array_ptr"
-
-# Test: c_variable-4.77
-# Desc: children of struct_declarations.s2.u2.u1s2.func
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s2.func" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.u1s2.func"
-
-# Test: c_variable-4.78
-# Desc: number of children of struct_declarations.s2.u2.u1s2.func
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s2.func" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.u1s2.func"
-
-# Test: c_variable-4.79
-# Desc: children of struct_declarations.int_ptr_ptr.*int_ptr_ptr
-mi_gdb_test "-var-list-children struct_declarations.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"struct_declarations.int_ptr_ptr.\\*int_ptr_ptr.\\*\\*int_ptr_ptr\",exp=\"\\*\\*int_ptr_ptr\",numchild=\"0\",type=\"int\"\}\\\]" \
-	"get children of 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.*int_ptr_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of struct_declarations.int_ptr_ptr.*int_ptr_ptr"
-
-
-# Step to "struct_declarations.integer = 123;"
-set line_dct_123 [gdb_get_line_number "struct_declarations.integer = 123;"]
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-      $line_dct_123 "step to line \$line_dct_123"
-
-# Test: c_variable-4.81
-# Desc: create local variable "weird"
-mi_gdb_test "-var-create weird * weird" \
-	"\\^done,name=\"weird\",numchild=\"11\",type=\"weird_struct \\*\"" \
-	"create local variable weird"
-
-# Test: c_variable-4.82
-# Desc: children of weird
-mi_gdb_test "-var-list-children weird" \
-	"\\^done,numchild=\"11\",children=\\\[child=\{name=\"weird.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"weird.character\",exp=\"character\",numchild=\"0\",type=\"char\"\},child=\{name=\"weird.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"weird.long_int\",exp=\"long_int\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.int_ptr_ptr\",exp=\"int_ptr_ptr\",numchild=\"1\",type=\"int \\*\\*\"\},child=\{name=\"weird.long_array\",exp=\"long_array\",numchild=\"10\",type=\"long int \\\[10\\\]\"\},child=\{name=\"weird.func_ptr\",exp=\"func_ptr\",numchild=\"0\",type=\"void \\(\\*\\)\\((void)?\\)\"\},child=\{name=\"weird.func_ptr_struct\",exp=\"func_ptr_struct\",numchild=\"0\",type=\"struct _struct_decl \\(\\*\\)\\((int, char \\*, long int)?\\)\"\},child=\{name=\"weird.func_ptr_ptr\",exp=\"func_ptr_ptr\",numchild=\"0\",type=\"struct _struct_decl \\*\\(\\*\\)\\((int, char \\*, long int)?\\)\"\},child=\{name=\"weird.u1\",exp=\"u1\",numchild=\"4\",type=\"union \{\\.\\.\\.\}\"\},child=\{name=\"weird.s2\",exp=\"s2\",numchild=\"4\",type=\"struct \{\\.\\.\\.\}\"\}\\\]" \
-	"get children of weird"
-
-# Test: c_variable-4.83
-# Desc: number of children of weird
-mi_gdb_test "-var-info-num-children weird" \
-	"\\^done,numchild=\"11\"" \
-	"get number of children of weird"
-
-
-# Test: c_variable-4.84
-# Desc: children of weird->long_array
-mi_gdb_test "-var-list-children weird.long_array" \
-	"\\^done,numchild=\"10\",children=\\\[child=\{name=\"weird.long_array.0\",exp=\"0\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.1\",exp=\"1\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.2\",exp=\"2\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.3\",exp=\"3\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.4\",exp=\"4\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.5\",exp=\"5\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.6\",exp=\"6\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.7\",exp=\"7\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.8\",exp=\"8\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.9\",exp=\"9\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children weird.long_array" \
-	"\\^done,numchild=\"10\"" \
-	"get number of children of weird.long_array"
-
-# Test: c_variable-4.86
-# Desc: children of weird.int_ptr_ptr
-mi_gdb_test "-var-list-children weird.int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"weird.int_ptr_ptr.\\*int_ptr_ptr\",exp=\"\\*int_ptr_ptr\",numchild=\"1\",type=\"int \\*\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children weird.int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of weird.int_ptr_ptr"
-
-# Test: c_variable-4.88
-# Desc: children of *weird->int_ptr_ptr
-mi_gdb_test "-var-list-children weird.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"weird.int_ptr_ptr.\\*int_ptr_ptr.\\*\\*int_ptr_ptr\",exp=\"\\*\\*int_ptr_ptr\",numchild=\"0\",type=\"int\"\}\\\]" \
-	"get children of weird.int_ptr_ptr.*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
-mi_gdb_test "-var-info-num-children weird.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of weird.int_ptr_ptr.*int_ptr_ptr"
-
-# Test: c_variable-4.90
-# Desc: create weird->int_ptr_ptr
-mi_gdb_test "-var-create weird->int_ptr_ptr * weird->int_ptr_ptr" \
-	"\\^done,name=\"weird->int_ptr_ptr\",numchild=\"1\",type=\"int \\*\\*\"" \
-	"create local variable weird->int_ptr_ptr"
-
-# Test: c_variable-4.91
-# Desc: children of weird->int_ptr_ptr
-mi_gdb_test "-var-list-children weird->int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"weird->int_ptr_ptr.\\*weird->int_ptr_ptr\",exp=\"\\*weird->int_ptr_ptr\",numchild=\"1\",type=\"int \\*\"\}\\\]" \
-	"get children of weird->int_ptr_ptr"
-
-
-# Test: c_variable-4.92
-# Desc: number of children of (weird->int_ptr_ptr)
-mi_gdb_test "-var-info-num-children weird->int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of weird->int_ptr_ptr"
-
-# Test: c_variable-4.93
-# Desc: children of *(weird->int_ptr_ptr)
-mi_gdb_test "-var-list-children weird->int_ptr_ptr.*weird->int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"weird->int_ptr_ptr.\\*weird->int_ptr_ptr.\\*\\*weird->int_ptr_ptr\",exp=\"\\*\\*weird->int_ptr_ptr\",numchild=\"0\",type=\"int\"\}\\\]" \
-	"get children of weird->int_ptr_ptr.*weird->int_ptr_ptr"
-
-# Test: c_variable-4.94
-# Desc: number of children of *(weird->int_ptr_ptr)
-mi_gdb_test "-var-info-num-children weird->int_ptr_ptr.*weird->int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of weird->int_ptr_ptr.*weird->int_ptr_ptr"
-
-# Test: c_variable-4.95
-# Desc: children of *(*(weird->int_ptr_ptr))
-mi_gdb_test "-var-list-children weird->int_ptr_ptr.*weird->int_ptr_ptr.**weird->int_ptr_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of 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))
-mi_gdb_test "-var-info-num-children weird->int_ptr_ptr.*weird->int_ptr_ptr.**weird->int_ptr_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of weird->int_ptr_ptr.*weird->int_ptr_ptr.**weird->int_ptr_ptr"
-
-# Test: c_variable-4.97
-# Desc: is weird editable
-mi_gdb_test "-var-show-attributes weird" \
-	"\\^done,attr=\"editable\"" \
-	"is weird editable"
-
-# Test: c_variable-4.98
-# Desc: is weird->int_ptr_ptr editable
-mi_gdb_test "-var-show-attributes weird->int_ptr_ptr" \
-	"\\^done,attr=\"editable\"" \
-	"is weird->int_ptr_ptr editable"
-
-# Test: c_variable-4.99
-# Desc: is *(weird->int_ptr_ptr) editable
-mi_gdb_test "-var-show-attributes weird.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,attr=\"editable\"" \
-	"is weird.int_ptr_ptr.*int_ptr_ptr editable"
-
-# Test: c_variable-4.100
-# Desc: is *(*(weird->int_ptr_ptr)) editable
-mi_gdb_test "-var-show-attributes weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr" \
-	"\\^done,attr=\"editable\"" \
-	"is weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr editable"
-
-# Test: c_variable-4.101
-# Desc: is weird->u1 editable
-mi_gdb_test "-var-show-attributes weird.u1" \
-	"\\^done,attr=\"noneditable\"" \
-	"is weird.u1 editable"
-
-# Test: c_variable-4.102
-# Desc: is weird->s2 editable
-mi_gdb_test "-var-show-attributes weird.s2" \
-	"\\^done,attr=\"noneditable\"" \
-	"is weird.s2 editable"
-
-# Test: c_variable-4.103
-# Desc: is struct_declarations.u1.a editable
-mi_gdb_test "-var-show-attributes struct_declarations.u1.a" \
-	"\\^done,attr=\"editable\"" \
-	"is struct_declarations.u1.a editable"
-
-# Test: c_variable-4.104
-# Desc: is struct_declarations.u1.b editable
-mi_gdb_test "-var-show-attributes struct_declarations.u1.b" \
-	"\\^done,attr=\"editable\"" \
-	"is struct_declarations.u1.b editable"
-
-# Test: c_variable-4.105
-# Desc: is struct_declarations.u1.c editable
-mi_gdb_test "-var-show-attributes struct_declarations.u1.c" \
-	"\\^done,attr=\"editable\"" \
-	"is struct_declarations.u1.c editable"
-
-# Test: c_variable-4.106
-# Desc: is struct_declarations.long_array editable
-mi_gdb_test "-var-show-attributes struct_declarations.long_array" \
-	"\\^done,attr=\"noneditable\"" \
-	"is struct_declarations.long_array editable"
-
-# Test: c_variable-4.107
-# Desc: is struct_declarations.long_array[0] editable
-mi_gdb_test "-var-show-attributes struct_declarations.long_array.0" \
-	"\\^done,attr=\"editable\"" \
-	"is struct_declarations.long_array.0 editable"
-
-# Test: c_variable-4.108
-# Desc: is struct_declarations editable
-mi_gdb_test "-var-show-attributes struct_declarations" \
-	"\\^done,attr=\"noneditable\"" \
-	"is struct_declarations editable"
-
-mi_gdb_test "-var-delete weird" \
-	"\\^done,ndeleted=\"24\"" \
-	"delete var weird"
-
-#####                         #####
-#                                 #
-# children and update tests #
-#                                 #
-#####                         #####
-
-# Test: c_variable-5.1
-# Desc: check that nothing changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update all vars. None changed"
-
-# Step over "struct_declarations.integer = 123;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 1] "step \$line_dct_123 + 1"
-
-# Test: c_variable-5.2
-# Desc: check that integer changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.integer\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.integer"
-
-# Step over:
-#    weird->char_ptr = "hello";
-#    bar = 2121;
-#    foo = &bar;
-mi_execute_to "exec-step 3" "end-stepping-range" do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 4] {} "step \$line_dct_123 + 4"
-
-# Test: c_variable-5.3
-# Desc: check that char_ptr changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.char_ptr.\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.char_ptr"
-
-# Step over "struct_declarations.int_ptr_ptr = &foo;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 5] "step \$line_dct_123 + 5"
-
-# Test: c_variable-5.4
-# Desc: check that int_ptr_ptr and children changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"weird->int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"weird->int_ptr_ptr.\\*weird->int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"weird->int_ptr_ptr.\\*weird->int_ptr_ptr.\\*\\*weird->int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.int_ptr_ptr.\\*int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.int_ptr_ptr.\\*int_ptr_ptr.\\*\\*int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars int_ptr_ptr and children changed"
-
-# Step over "weird->long_array[0] = 1234;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 6] "step \$line_dct_123 + 6"
-
-# Test: c_variable-5.5
-# Desc: check that long_array[0] changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.long_array.0\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.long_array.0 changed"
-
-# Step over "struct_declarations.long_array[1] = 2345;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 7] "step \$line_dct_123 + 7"
-
-# Test: c_variable-5.6
-# Desc: check that long_array[1] changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.long_array.1\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.long_array.1 changed"
-
-# Step over "weird->long_array[2] = 3456;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 8] "step \$line_dct_123 + 8"
-
-# Test: c_variable-5.7
-# Desc: check that long_array[2] changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.long_array.2\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.long_array.2 changed"
-
-# 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;
-
-set line_dct_nothing [gdb_get_line_number "weird->func_ptr = nothing;"]
-mi_execute_to "exec-step 7" "end-stepping-range" do_children_tests {} {.*var-cmd.c} \
-    $line_dct_nothing {} "step \$line_dct_nothing"
-
-# Test: c_variable-5.8
-# Desc: check that long_array[3-9] changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.long_array.3\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.4\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.5\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.6\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.7\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.8\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.9\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.long_array.3-9 changed"
-
-mi_gdb_test "-var-list-children --all-values struct_declarations.long_array" \
-        "\\^done,numchild=\"10\",children=\\\[child=\{name=\"struct_declarations.long_array.0\",exp=\"0\",numchild=\"0\",value=\"1234\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.1\",exp=\"1\",numchild=\"0\",value=\"2345\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.2\",exp=\"2\",numchild=\"0\",value=\"3456\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.3\",exp=\"3\",numchild=\"0\",value=\"4567\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.4\",exp=\"4\",numchild=\"0\",value=\"5678\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.5\",exp=\"5\",numchild=\"0\",value=\"6789\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.6\",exp=\"6\",numchild=\"0\",value=\"7890\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.7\",exp=\"7\",numchild=\"0\",value=\"8901\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.8\",exp=\"8\",numchild=\"0\",value=\"9012\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.9\",exp=\"9\",numchild=\"0\",value=\"1234\",type=\"long int\"\}\\\]" \
-                "listing of names and values of children"
-
-# Step over "weird->func_ptr = nothing;"
-set line_dct_a0_0 [gdb_get_line_number "a0 = '0';"]
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    $line_dct_a0_0 "step \$line_dct_a0_0"
-
-# Test: c_variable-5.9
-# Desc: check that func_ptr changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.func_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.func_ptr changed"
-
-# Delete all variables
-mi_gdb_test "-var-delete struct_declarations" \
-	"\\^done,ndeleted=\"65\"" \
-	"delete var struct_declarations"
-
-mi_gdb_test "-var-delete weird->int_ptr_ptr" \
-	"\\^done,ndeleted=\"3\"" \
-	"delete var weird->int_ptr_ptr"
-
-# Step over all lines:
-# ...
-#   psnp = &snp0;
-
-set line_dct_snp0 [gdb_get_line_number "psnp = &snp0;"]
-mi_execute_to "exec-step 43" "end-stepping-range" do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 1] {} "step \$line_dct_snp0 + 1"
-
-# Test: c_variable-5.10
-# Desc: create psnp->char_ptr
-mi_gdb_test "-var-create  psnp->char_ptr *  psnp->char_ptr" \
-	"\\^done,name=\"psnp->char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\\*\"" \
-	"create local variable  psnp->char_ptr"
-
-# Test: c_variable-5.11
-# Desc: children of psnp->char_ptr
-mi_gdb_test "-var-list-children psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr\",exp=\"\\*psnp->char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\"\}\\\]" \
-	"get children of psnp->char_ptr"
-
-# Test: c_variable-5.12
-# Desc: number of children of psnp->char_ptr
-mi_gdb_test "-var-info-num-children psnp->char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->char_ptr"
-
-# Test: c_variable-5.13
-# Desc: children of *(psnp->char_ptr)
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr\",exp=\"\\*\\*psnp->char_ptr\",numchild=\"1\",type=\"char \\*\\*\"\}\\\]" \
-	"get children of psnp->char_ptr.*psnp->char_ptr"
-
-# Test: c_variable-5.14
-# Desc: number of children of *(psnp->char_ptr)
-mi_gdb_test "-var-info-num-children psnp->char_ptr.*psnp->char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->char_ptr.*psnp->char_ptr"
-
-# Test: c_variable-5.15
-# Desc: children of *(*(psnp->char_ptr))
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr\",exp=\"\\*\\*\\*psnp->char_ptr\",numchild=\"1\",type=\"char \\*\"\}\\\]" \
-	"get children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr"
-
-# Test: c_variable-5.15B
-# Desc: children of *(*(*(psnp->char_ptr)))
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr.\\*\\*\\*\\*psnp->char_ptr\",exp=\"\\*\\*\\*\\*psnp->char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr"
-
-# Test: c_variable-5.16
-# Desc: number of children of *(*(psnp->char_ptr))
-mi_gdb_test "-var-info-num-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr"
-
-# Test: c_variable-5.17
-# Desc: children of *(*(*(psnp->char_ptr)))
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr.\\*\\*\\*\\*psnp->char_ptr\",exp=\"\\*\\*\\*\\*psnp->char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of 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)))
-mi_gdb_test "-var-info-num-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr"
-
-# Test: c_variable-5.17B
-# Desc: children of *(*(*(*(psnp->char_ptr))))
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr"
-
-# Test: c_variable-5.18B
-# Desc: number of children of *(*(*(*(psnp->char_ptr))))
-mi_gdb_test "-var-info-num-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr"
-
-
-# Test: c_variable-5.19
-# Desc: create psnp->long_ptr
-mi_gdb_test "-var-create  psnp->long_ptr *  psnp->long_ptr" \
-	"\\^done,name=\"psnp->long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\\*\"" \
-	"create local variable  psnp->long_ptr"
-
-# Test: c_variable-5.20
-# Desc: children of psnp->long_ptr
-mi_gdb_test "-var-list-children psnp->long_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->long_ptr.\\*psnp->long_ptr\",exp=\"\\*psnp->long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\"\}\\\]" \
-	"get children of psnp->long_ptr"
-
-# Test: c_variable-5.21
-# Desc: number of children of psnp->long_ptr
-mi_gdb_test "-var-info-num-children psnp->long_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->long_ptr"
-
-# Test: c_variable-5.22
-# Desc: children of *(psnp->long_ptr)
-mi_gdb_test "-var-list-children psnp->long_ptr.*psnp->long_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr\",exp=\"\\*\\*psnp->long_ptr\",numchild=\"1\",type=\"long int \\*\\*\"\}\\\]" \
-	"get children of psnp->long_ptr.*psnp->long_ptr"
-
-
-# Test: c_variable-5.23
-# Desc: number of children of *(psnp->long_ptr)
-mi_gdb_test "-var-info-num-children psnp->long_ptr.*psnp->long_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->long_ptr.*psnp->long_ptr"
-
-# Test: c_variable-5.24
-# Desc: children of *(*(psnp->long_ptr))
-mi_gdb_test "-var-list-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr.\\*\\*\\*psnp->long_ptr\",exp=\"\\*\\*\\*psnp->long_ptr\",numchild=\"1\",type=\"long int \\*\"\}\\\]" \
-	"get children of psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr"
-
-# Test: c_variable-5.25
-# Desc: number of children of *(*(psnp->long_ptr))
-mi_gdb_test "-var-info-num-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr"
-
-# Test: c_variable-5.26
-# Desc: children of *(*(*(psnp->long_ptr)))
-mi_gdb_test "-var-list-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr.\\*\\*\\*psnp->long_ptr.\\*\\*\\*\\*psnp->long_ptr\",exp=\"\\*\\*\\*\\*psnp->long_ptr\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of 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)))
-mi_gdb_test "-var-info-num-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr"
-
-# Test: c_variable-5.28
-# Desc: children of *(*(*(*(psnp->long_ptr))))
-mi_gdb_test "-var-list-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of 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))))
-mi_gdb_test "-var-info-num-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr"
-
-# Test: c_variable-5.30
-# Desc: create psnp->ptrs
-mi_gdb_test "-var-create  psnp->ptrs *  psnp->ptrs" \
-	"\\^done,name=\"psnp->ptrs\",numchild=\"3\",type=\"struct _struct_n_pointer \\*\\\[3\\\]\"" \
-	"create local variable  psnp->ptrs"
-
-# Test: c_variable-5.31
-# Desc: children of psnp->ptrs
-mi_gdb_test "-var-list-children psnp->ptrs" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"psnp->ptrs.0\",exp=\"0\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\},child=\{name=\"psnp->ptrs.1\",exp=\"1\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\},child=\{name=\"psnp->ptrs.2\",exp=\"2\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs"
-
-# Test: c_variable-5.32
-# Desc: number of children of psnp->ptrs
-mi_gdb_test "-var-info-num-children psnp->ptrs" \
-	"\\^done,numchild=\"3\"" \
-	"get number of children of psnp->ptrs"
-
-# Test: c_variable-5.33
-# Desc: children of psnp->ptrs[0]
-mi_gdb_test "-var-list-children psnp->ptrs.0" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"psnp->ptrs.0.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.long_ptr\",exp=\"long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.ptrs\",exp=\"ptrs\",numchild=\"3\",type=\"struct _struct_n_pointer \\*\\\[3\\\]\"\},child=\{name=\"psnp->ptrs.0.next\",exp=\"next\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0"
-
-# Test: c_variable-5.34
-# Desc: number of children of psnp->ptrs[0]
-mi_gdb_test "-var-info-num-children psnp->ptrs.0" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of psnp->ptrs.0"
-
-# Test: c_variable-5.35
-# Desc: children of psnp->ptrs[0]->next
-mi_gdb_test "-var-list-children psnp->ptrs.0.next" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.next.long_ptr\",exp=\"long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.next.ptrs\",exp=\"ptrs\",numchild=\"3\",type=\"struct _struct_n_pointer \\*\\\[3\\\]\"\},child=\{name=\"psnp->ptrs.0.next.next\",exp=\"next\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next"
-
-#} {char_ptr long_ptr ptrs next}
-
-# Test: c_variable-5.36
-# Desc: number of children of psnp->ptrs[0]->next
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of psnp->ptrs.0.next"
-
-
-# Test: c_variable-5.37
-# Desc: children of psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr\",exp=\"\\*char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr"
-
-# Test: c_variable-5.39
-# Desc: children of *psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr\",exp=\"\\*\\*char_ptr\",numchild=\"1\",type=\"char \\*\\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr"
-
-# Test: c_variable-5.40
-# Desc: number of children of *psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr.*char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr.*char_ptr"
-
-# Test: c_variable-5.41
-# Desc: children of **psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr\",exp=\"\\*\\*\\*char_ptr\",numchild=\"1\",type=\"char \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr"
-
-# Test: c_variable-5.41B
-# Desc: children of ***psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr.\\*\\*\\*\\*char_ptr\",exp=\"\\*\\*\\*\\*char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr"
-
-# Test: c_variable-5.42
-# Desc: number of children of **psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr"
-
-# Test: c_variable-5.43
-# Desc: children of ***psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr.\\*\\*\\*\\*char_ptr\",exp=\"\\*\\*\\*\\*char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr"
-
-# Test: c_variable-5.44
-# Desc: number of children of ***psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr"
-
-# Test: c_variable-5.43B
-# Desc: children of ****psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr"
-
-# Test: c_variable-5.44B
-# Desc: number of children of ****psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr"
-
-# Test: c_variable-5.45
-# Desc: children of psnp->ptrs[0]->next->next
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.next" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"psnp->ptrs.0.next.next.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.next.next.long_ptr\",exp=\"long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.next.next.ptrs\",exp=\"ptrs\",numchild=\"3\",type=\"struct _struct_n_pointer \\*\\\[3\\\]\"\},child=\{name=\"psnp->ptrs.0.next.next.next\",exp=\"next\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.next"
-
-# Test: c_variable-5.46
-# Desc: children of psnp->ptrs[0]->next->next->ptrs
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.next.ptrs" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"psnp->ptrs.0.next.next.ptrs.0\",exp=\"0\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\},child=\{name=\"psnp->ptrs.0.next.next.ptrs.1\",exp=\"1\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\},child=\{name=\"psnp->ptrs.0.next.next.ptrs.2\",exp=\"2\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.next.ptrs"
-
-#  Step over "snp0.char_ptr = &b3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 2] "step \$line_dct_snp0 + 2"
-
-# Test: c_variable-5.47
-# Desc: check that psnp->char_ptr (and [0].char_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr.\\*psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr.\\*\\*\\*\\*psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->char_ptr (and 0.char_ptr) changed"
-
-#  Step over "snp1.char_ptr = &c3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 3] "step \$line_dct_snp0 + 3"
-
-# Test: c_variable-5.48
-# Desc: check that psnp->next->char_ptr (and [1].char_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr.\\*\\*\\*\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->next->char_ptr (and 1.char_ptr) changed"
-
-
-#  Step over "snp2.char_ptr = &a3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 4] "step \$line_dct_snp0 + 4"
-
-# Test: c_variable-5.49
-# Desc: check that psnp->next->next->char_ptr (and [2].char_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.next.char_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->next->next->char_ptr (and 2.char_ptr) changed"
-
-
-#  Step over "snp0.long_ptr = &y3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 5] "step \$line_dct_snp0 + 5"
-
-# Test: c_variable-5.50
-# Desc: check that psnp->long_ptr (and [0].long_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr.\\*psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr.\\*\\*\\*psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr.\\*\\*\\*psnp->long_ptr.\\*\\*\\*\\*psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->long_ptr (and 0.long_ptr) changed"
-
-
-#  Step over "snp1.long_ptr = &x3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 6] "step \$line_dct_snp0 + 6"
-
-# Test: c_variable-5.51
-# Desc: check that psnp->next->long_ptr (and [1].long_ptr) changed
-# Why does this have a FIXME?
-setup_xfail *-*-*
-mi_gdb_test "-var-update *" \
-	"FIXME\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.long_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->next->long_ptr (and 1.long_ptr) changed"
-clear_xfail *-*-*
-
-# This command produces this error message:
-# &"warning: varobj_list: assertion failed - mycount <> 0\n"
-#
-
-#  Step over "snp2.long_ptr = &z3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 7] "step \$line_dct_snp0 + 7"
-
-# Test: c_variable-5.52
-# Desc: check that psnp->next->next->long_ptr (and [2].long_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.next.long_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->next->next->long_ptr (and 2.long_ptr) changed"
-
-
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
deleted file mode 100644
index 30f060d3aec..00000000000
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004, 2005 Free Software
-# Foundation, 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.
-
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can create, update, delete variables.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-
-#####                   #####
-#                           #
-#  Variable Creation tests  #
-#                           #
-#####                   #####
-
-# Test:  c_variable-1.1
-# Desc:  Create global variable
-
-mi_gdb_test "111-var-create global_simple * global_simple" \
-	"111\\^done,name=\"global_simple\",numchild=\"6\",type=\"simpleton\"" \
-	"create global variable"
-
-# Test: c_variable-1.2
-# Desc: Create non-existent variable
-
-mi_gdb_test "112-var-create bogus_unknown_variable * bogus_unknown_variable" \
-	"&\"mi_cmd_var_create: unable to create variable object\\\\n\".*112\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create non-existent variable"
-
-# Test: c_variable-1.3
-# Desc: Create out of scope variable
-
-mi_gdb_test "113-var-create argc * argc" \
-	"&\"mi_cmd_var_create: unable to create variable object\\\\n\".*113\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create out of scope variable"
-
-mi_runto do_locals_tests
-
-# Test: c_variable-1.4
-# Desc: create local variables
-
-mi_gdb_test "-var-create linteger * linteger" \
-	"\\^done,name=\"linteger\",numchild=\"0\",type=\"int\"" \
-	"create local variable linteger"
-
-mi_gdb_test "-var-create lpinteger * lpinteger" \
-	"\\^done,name=\"lpinteger\",numchild=\"1\",type=\"int \\*\"" \
-	"create local variable lpinteger"
-
-mi_gdb_test "-var-create lcharacter * lcharacter" \
-	"\\^done,name=\"lcharacter\",numchild=\"0\",type=\"char\"" \
-	"create local variablelcharacter "
-
-mi_gdb_test "-var-create lpcharacter * lpcharacter" \
-	"\\^done,name=\"lpcharacter\",numchild=\"1\",type=\"char \\*\"" \
-	"create local variable lpcharacter"
-
-mi_gdb_test "-var-create llong * llong" \
-	"\\^done,name=\"llong\",numchild=\"0\",type=\"long int\"" \
-	"create local variable llong"
-
-mi_gdb_test "-var-create lplong * lplong" \
-	"\\^done,name=\"lplong\",numchild=\"1\",type=\"long int \\*\"" \
-	"create local variable lplong"
-
-mi_gdb_test "-var-create lfloat * lfloat" \
-	"\\^done,name=\"lfloat\",numchild=\"0\",type=\"float\"" \
-	"create local variable lfloat"
-
-mi_gdb_test "-var-create lpfloat * lpfloat" \
-	"\\^done,name=\"lpfloat\",numchild=\"1\",type=\"float \\*\"" \
-	"create local variable lpfloat"
-
-mi_gdb_test "-var-create ldouble * ldouble" \
-	"\\^done,name=\"ldouble\",numchild=\"0\",type=\"double\"" \
-	"create local variable ldouble"
-
-mi_gdb_test "-var-create lpdouble * lpdouble" \
-	"\\^done,name=\"lpdouble\",numchild=\"1\",type=\"double \\*\"" \
-	"create local variable lpdouble"
-
-mi_gdb_test "-var-create lsimple * lsimple" \
-	"\\^done,name=\"lsimple\",numchild=\"6\",type=\"struct _simple_struct\"" \
-	"create local variable lsimple"
-
-mi_gdb_test "-var-create lpsimple * lpsimple" \
-	"\\^done,name=\"lpsimple\",numchild=\"6\",type=\"struct _simple_struct \\*\"" \
-	"create local variable lpsimple"
-
-mi_gdb_test "-var-create func * func" \
-	"\\^done,name=\"func\",numchild=\"0\",type=\"void \\(\\*\\)\\((void|)\\)\"" \
-	"create local variable func"
-
-# Test: c_variable-1.5
-# Desc: create lsimple.character
-mi_gdb_test "-var-create lsimple.character * lsimple.character" \
-	"\\^done,name=\"lsimple.character\",numchild=\"0\",type=\"char\"" \
-	"create lsimple.character"
-
-# Test: c_variable-1.6
-# Desc: create lpsimple->integer
-mi_gdb_test "-var-create lsimple->integer * lsimple->integer" \
-	"\\^done,name=\"lsimple->integer\",numchild=\"0\",type=\"int\"" \
-	"create lsimple->integer"
-
-# Test: c_variable-1.7
-# Desc: ceate lsimple.integer
-mi_gdb_test "-var-create lsimple.integer * lsimple.integer" \
-	"\\^done,name=\"lsimple.integer\",numchild=\"0\",type=\"int\"" \
-	"create lsimple->integer"
-
-
-# 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.
-mi_gdb_test "-var-create int * int" \
-	"&\"Attempt to use a type name as an expression.\\\\n\".*&\"mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create int"
-
-
-#####             #####
-#                     #
-# Value changed tests #
-#                     #
-#####             #####
-
-# Test: c_variable-2.1
-# Desc: check whether values changed at do_block_tests
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update all vars"
-
-# Step over "linteger = 1234;"
-set line_dlt_linteger [gdb_get_line_number "lpinteger = &linteger;"]
-mi_step_to "do_locals_tests" "" "var-cmd.c" $line_dlt_linteger "step at do_locals_test"
-
-# Test: c_variable-2.2
-# Desc: check whether only linteger changed values
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: linteger changed"
-
-# Step over "lpinteger = &linteger;"
-mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 1] "step at do_locals_tests (2)"
-
-# Test: c_variable-2.3
-# Desc: check whether only lpinteger changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lpinteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: lpinteger changed"
-
-# Step over "lcharacter = 'a';"
-mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 2] "step at do_locals_tests (3)"
-
-# Test: c_variable-2.4
-# Desc: check whether only lcharacter changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lcharacter\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: lcharacter changed"
-
-# Step over "lpcharacter = &lcharacter;"
-mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 3] "step at do_locals_tests (4)"
-
-# Test: c_variable-2.5
-# Desc: check whether only lpcharacter changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lpcharacter\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: lpcharacter changed"
-
-
-# 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';
-
-mi_execute_to "exec-step 9" "end-stepping-range" "do_locals_tests" "" \
-	"var-cmd.c" [expr $line_dlt_linteger + 12] "" "step at do_locals_tests (5)"
-
-# Test: c_variable-2.6
-# Desc: check whether llong, lplong, lfloat, lpfloat, ldouble, lpdouble, lsimple.integer,
-#       lsimple.unsigned_character lsimple.integer lsimple.character changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lsimple.integer\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lsimple->integer\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lsimple.character\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lpdouble\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"ldouble\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lpfloat\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lfloat\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lplong\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"llong\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: many changed"
-
-# Step over:
-#  lsimple.signed_character = 21;
-#  lsimple.char_ptr = &lcharacter;
-#  lpsimple = &lsimple;
-#  func = nothing;
-
-set line_dlt_4321 [gdb_get_line_number "linteger = 4321;"]
-
-mi_execute_to "exec-step 4" "end-stepping-range" "do_locals_tests" "" \
-	"var-cmd.c" $line_dlt_4321 "" "step at do_locals_tests (6)"
-
-# Test: c_variable-2.7
-# Desc: check whether (lsimple.signed_character, lsimple.char_ptr) lpsimple, func changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"func\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lpsimple\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: func and lpsimple changed"
-
-# Step over
-#  linteger = 4321;
-#  lcharacter = 'b';
-#  llong = 1212L;
-#  lfloat = 1.2;
-#  ldouble = 5.498548281828172;
-#  lsimple.integer = 255;
-#  lsimple.unsigned_integer = 4321;
-#  lsimple.character = 'b';
-
-mi_execute_to "exec-step 8" "end-stepping-range" "do_locals_tests" "" \
-	"var-cmd.c" [expr $line_dlt_4321 + 8] "" "step at do_locals_tests (7)"
-
-# 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)
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lsimple.integer\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lsimple->integer\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lsimple.character\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"ldouble\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lfloat\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"llong\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lcharacter\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: func and lpsimple changed"
-
-
-### 
-#
-# Test assignment to variables. More tests on assignment are in other files.
-#
-###
-mi_gdb_test "-var-assign global_simple 0" \
-	"&\"mi_cmd_var_assign: Variable object is not editable\\\\n\".*\\^error,msg=\"mi_cmd_var_assign: Variable object is not editable\"" \
-	"assign to global_simple"
-
-mi_gdb_test "-var-assign linteger 3333" \
-	"\\^done,value=\"3333\"" \
-	"assign to linteger"
-
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: linteger changed after assign"
-
-mi_gdb_test "-var-assign linteger 3333" \
-	"\\^done,value=\"3333\"" \
-	"assign to linteger again, same value"
-
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update all vars: linteger not changed after same assign"
-
-mi_gdb_test "-var-evaluate-expression linteger" \
-	"\\^done,value=\"3333\"" \
-	"eval linteger"
-
-mi_gdb_test "-var-assign lpinteger \"&linteger + 3\"" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lpinteger"
-
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lpinteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: lpinteger changed after assign"
-
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update all vars: no changes on second update"
-
-mi_gdb_test "-var-evaluate-expression lpinteger" \
-	"\\^done,value=\"$hex\"" \
-	"eval lpinteger"
-
-# reset the values to the original ones so that the rest of the file doesn't suffer.
-
-mi_gdb_test "-var-assign linteger 4321" \
-	"\\^done,value=\"4321\"" \
-	"assign to linteger"
-
-mi_gdb_test "-var-assign lpinteger &linteger" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lpinteger"
-
-mi_gdb_test "-var-assign lcharacter 'z'" \
-	"\\^done,value=\"122 'z'\"" \
-	"assign to lcharacter"
-
-mi_gdb_test "-var-evaluate-expression lcharacter" \
-	"\\^done,value=\"122 'z'\"" \
-	"eval lcharacter"
-
-mi_gdb_test "-var-assign llong 1313L" \
-	"\\^done,value=\"1313\"" \
-	"assign to llong"
-mi_gdb_test "-var-evaluate-expression llong" \
-	"\\^done,value=\"1313\"" \
-	"eval llong"
-mi_gdb_test "-var-assign llong 1212L" \
-	"\\^done,value=\"1212\"" \
-	"assign to llong"
-
-mi_gdb_test "-var-assign lplong &llong+4" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lplong"
-mi_gdb_test "-var-evaluate-expression lplong" \
-	"\\^done,value=\"$hex\"" \
-	"eval lplong"
-mi_gdb_test "-var-assign lplong &llong" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lplong"
-
-mi_gdb_test "-var-assign lfloat 3.4567" \
-	"\\^done,value=\"3.45.*\"" \
-	"assign to lfloat"
-mi_gdb_test "-var-evaluate-expression lfloat" \
-	"\\^done,value=\"3.45.*\"" \
-	"eval lfloat"
-mi_gdb_test "-var-assign lfloat 1.2345" \
-	"\\^done,value=\"1.23.*\"" \
-	"assign to lfloat"
-
-mi_gdb_test "-var-assign lpfloat &lfloat+4" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lpfloat"
-
-mi_gdb_test "-var-assign ldouble 5.333318284590435" \
-	"\\^done,value=\"5.333318284590435\"" \
-	"assign to ldouble"
-
-mi_gdb_test "-var-assign func do_block_tests" \
-	"\\^done,value=\"$hex <do_block_tests>\"" \
-	"assign to func"
-
-mi_gdb_test "-var-assign lsimple.character 'd'" \
-	"\\^done,value=\"100 'd'\"" \
-	"assign to lsimple.character"
-
-mi_gdb_test "-var-assign  lsimple->integer 222" \
-	"\\^done,value=\"222\"" \
-	"assign to lsimple->integer"
-
-mi_gdb_test "-var-assign lsimple.integer 333" \
-	"\\^done,value=\"333\"" \
-	"assign to lsimple.integer"
-
-######
-# End of assign tests 
-#####
-
-set line_subroutine1_body [gdb_get_line_number "global_simple.integer = i + 3;"]
-
-mi_gdb_test "-break-insert subroutine1" \
-	"\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"subroutine1\",file=\".*var-cmd.c\",line=\"$line_subroutine1_body\",times=\"0\"\}" \
-	"break-insert subroutine1"
-mi_continue_to "2" "subroutine1" \
-	"\{name=\"i\",value=\"4321\"\},\{name=\"l\",value=\"$hex\"\}" \
-	"var-cmd.c" $line_subroutine1_body "continue to subroutine1"
-
-# Test: c_variable-2.10
-# Desc: create variable for locals i,l in subroutine1
-mi_gdb_test "-var-create i  * i" \
-	"\\^done,name=\"i\",numchild=\"0\",type=\"int\"" \
-	"create i"
-
-mi_gdb_test "-var-create l * l" \
-	"\\^done,name=\"l\",numchild=\"1\",type=\"long int \\*\"" \
-	"create l"
-
-# Test: c_variable-2.11
-# Desc: create do_locals_tests local in subroutine1
-mi_gdb_test "-var-create linteger * linteger" \
-	"&\"mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create linteger"
-
-mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
-	"var-cmd.c" [expr $line_subroutine1_body + 1] "step at subroutine1"
-
-# 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.
-
-setup_xfail *-*-*
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\{FIXME: WHAT IS CORRECT HERE\}" \
-	"update all vars: changed FIXME"
-clear_xfail *-*-*
-
-mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
-	"var-cmd.c" [expr $line_subroutine1_body + 2] "step at subroutine1 (2)"
-
-# Test: c_variable-2.13
-# Desc: change subroutine1 local i
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"i\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: i changed"
-
-mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
-	"var-cmd.c" [expr $line_subroutine1_body + 3] "step at subroutine1 (3)"
-
-# Test: c_variable-2.14
-# Desc: change do_locals_tests local llong
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"llong\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: llong changed"
-
-set line_dlt_call_subroutine1 [gdb_get_line_number "subroutine1 (linteger, &llong);"]
-mi_next_to "do_locals_tests" ""	"var-cmd.c" \
-  [expr $line_dlt_call_subroutine1 + 1] "next out of subroutine1"
-
-# Test: c_variable-2.15
-# Desc: check for out of scope subroutine1 locals
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"l\",in_scope=\"false\"\},\{name=\"i\",in_scope=\"false\"\}\\\]" \
-	"update all vars: all now out of scope"
-
-# Done with locals/globals tests. Erase all variables
-#delete_all_variables
-mi_gdb_test "-var-delete global_simple" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var"
-
-mi_gdb_test "-var-delete linteger" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var linteger"
-
-mi_gdb_test "-var-delete lpinteger" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpinteger"
-
-mi_gdb_test "-var-delete lcharacter" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lcharacter"
-
-mi_gdb_test "-var-delete lpcharacter" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpcharacter"
-
-mi_gdb_test "-var-delete llong" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var llong"
-
-mi_gdb_test "-var-delete lplong" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lplong"
-
-mi_gdb_test "-var-delete lfloat" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lfloat"
-
-mi_gdb_test "-var-delete lpfloat" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpfloat"
-
-mi_gdb_test "-var-delete ldouble" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var ldouble"
-
-mi_gdb_test "-var-delete lpdouble" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpdouble"
-
-mi_gdb_test "-var-delete lsimple" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lsimple"
-
-mi_gdb_test "-var-delete lpsimple" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpsimple"
-
-mi_gdb_test "-var-delete func" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var func"
-
-mi_gdb_test "-var-delete lsimple.character" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lsimple.character"
-
-mi_gdb_test "-var-delete  lsimple->integer" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var  lsimple->integer"
-
-mi_gdb_test "-var-delete lsimple.integer" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lsimple.integer"
-
-mi_gdb_test "-var-delete i" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var i"
-
-mi_gdb_test "-var-delete l" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var l"
-
-# Test whether we can follow the name of a variable through multiple
-# stack frames.
-mi_gdb_test "-break-insert do_special_tests" \
-  {\^done,bkpt=.*} \
-  "set breakpoint at do_special_tests"
-
-mi_continue_to {.*} do_special_tests {.*} {.*var-cmd.c} {.*} {stop in do_special_tests}
-
-mi_gdb_test "-var-create selected_a @ a" \
-  {\^done,name="selected_a",numchild="0",type="int"} \
-  "create selected_a"
-
-mi_gdb_test "-break-insert incr_a" \
-  {\^done,bkpt=.*} \
-  "set breakpoint at incr_a"
-
-mi_continue_to {.*} incr_a {.*} {.*var-cmd.c} {.*} {stop in incr_a}
-
-mi_gdb_test "-var-update selected_a" \
-	"\\^done,changelist=\\\[\{name=\"selected_a\",in_scope=\"true\",new_type=\"char\",new_num_children=\"0\"\}\\\]" \
-	"update selected_a in incr_a"
-
-mi_next "step a line in incr_a"
-mi_next "return from incr_a to do_special_tests"
-
-mi_gdb_test "-var-update selected_a" \
-	"\\^done,changelist=\\\[\{name=\"selected_a\",in_scope=\"true\",new_type=\"int\",new_num_children=\"0\"\}\\\]" \
-	"update selected_a in do_special_tests"
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
deleted file mode 100644
index 5658b298f06..00000000000
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ /dev/null
@@ -1,632 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, 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.
-
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can create, update, delete variables.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-set line_dct_close_brace [expr [gdb_get_line_number "snp2.long_ptr = &z3;"] + 1]
-
-mi_gdb_test "200-break-insert $line_dct_close_brace" \
-	"200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_children_tests\",file=\".*var-cmd.c\",line=\"$line_dct_close_brace\",times=\"0\"\}" \
-	"break-insert operation"
-
-mi_run_cmd
-# The running part has been checked already by mi_run_cmd
-gdb_expect {
-    -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_dct_close_brace\"\}\r\n$mi_gdb_prompt$" {
-	pass "run to do_children_tests"
-    }
-    -re ".*$mi_gdb_prompt$" {fail "run to do_children_tests (2)"}
-    timeout {fail "run to do_children_tests (timeout 2)"}
-}
-
-#####       #####
-#               #
-# Display tests #
-#               #
-#####       #####
-
-# Test: c_variable-6.1
-# Desc: create variable bar
-mi_gdb_test "-var-create bar * bar" \
-	"\\^done,name=\"bar\",numchild=\"0\",type=\"int\"" \
-	"create local variable bar"
-
-# Test: c_variable-6.2
-# Desc: type of variable bar
-mi_gdb_test "-var-info-type bar" \
-	"\\^done,type=\"int\"" \
-	"info type variable bar"
-
-# Test: c_variable-6.3
-# Desc: format of variable bar
-mi_gdb_test "-var-show-format bar" \
-	"\\^done,format=\"natural\"" \
-	"show format variable bar"
-
-# Test: c_variable-6.4
-# Desc: value of variable bar
-mi_gdb_test "-var-evaluate-expression bar" \
-	"\\^done,value=\"2121\"" \
-	"eval variable bar"
-
-# Test: c_variable-6.5
-# Desc: change format of bar to hex
-mi_gdb_test "-var-set-format bar hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable bar"
-
-# Test: c_variable-6.6
-# Desc: value of bar with new format
-mi_gdb_test "-var-evaluate-expression bar" \
-	"\\^done,value=\"0x849\"" \
-	"eval variable bar with new format"
-
-# Test: c_variable-6.7
-# Desc: change value of bar
-mi_gdb_test "-var-assign bar 3" \
-	"\\^done,value=\"0x3\"" \
-	"assing to variable bar"
-
-mi_gdb_test "-var-set-format bar decimal" \
-	"\\^done,format=\"decimal\"" \
-	"set format variable bar"
-
-mi_gdb_test "-var-evaluate-expression bar" \
-	"\\^done,value=\"3\"" \
-	"eval variable bar with new value"
-
-mi_gdb_test "-var-delete bar" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var bar"
-
-# Test: c_variable-6.11
-# Desc: create variable foo
-mi_gdb_test "-var-create foo * foo" \
-	"\\^done,name=\"foo\",numchild=\"1\",type=\"int \\*\"" \
-	"create local variable foo"
-
-# Test: c_variable-6.12
-# Desc: type of variable foo
-mi_gdb_test "-var-info-type foo" \
-	"\\^done,type=\"int \\*\"" \
-	"info type variable foo"
-
-# Test: c_variable-6.13
-# Desc: format of variable foo
-mi_gdb_test "-var-show-format foo" \
-	"\\^done,format=\"natural\"" \
-	"show format variable foo"
-
-# Test: c_variable-6.14
-# Desc: value of variable foo
-mi_gdb_test "-var-evaluate-expression foo" \
-	"\\^done,value=\"$hex\"" \
-	"eval variable foo"
-
-# Test: c_variable-6.15
-# Desc: change format of var to octal
-mi_gdb_test "-var-set-format foo octal" \
-	"\\^done,format=\"octal\"" \
-	"set format variable foo"
-
-mi_gdb_test "-var-show-format foo" \
-	"\\^done,format=\"octal\"" \
-	"show format variable foo"
-
-# Test: c_variable-6.16
-# Desc: value of foo with new format
-mi_gdb_test "-var-evaluate-expression foo" \
-	"\\^done,value=\"\[0-7\]+\"" \
-	"eval variable foo"
-
-# Test: c_variable-6.17
-# Desc: change value of foo
-mi_gdb_test "-var-assign foo 3" \
-	"\\^done,value=\"03\"" \
-	"assing to variable foo"
-
-mi_gdb_test "-var-set-format foo decimal" \
-	"\\^done,format=\"decimal\"" \
-	"set format variable foo"
-
-# Test: c_variable-6.18
-# Desc: check new value of foo
-mi_gdb_test "-var-evaluate-expression foo" \
-	"\\^done,value=\"3\"" \
-	"eval variable foo"
-
-mi_gdb_test "-var-delete foo" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var foo"
-
-# Test: c_variable-6.21
-# Desc: create variable weird and children
-mi_gdb_test "-var-create weird * weird" \
-	"\\^done,name=\"weird\",numchild=\"11\",type=\"weird_struct \\*\"" \
-	"create local variable weird"
-
-mi_gdb_test "-var-list-children weird" \
-	"\\^done,numchild=\"11\",children=\\\[child=\{name=\"weird.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"weird.character\",exp=\"character\",numchild=\"0\",type=\"char\"\},child={name=\"weird.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"weird.long_int\",exp=\"long_int\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.int_ptr_ptr\",exp=\"int_ptr_ptr\",numchild=\"1\",type=\"int \\*\\*\"\},child=\{name=\"weird.long_array\",exp=\"long_array\",numchild=\"10\",type=\"long int \\\[10\\\]\"\},child=\{name=\"weird.func_ptr\",exp=\"func_ptr\",numchild=\"0\",type=\"void \\(\\*\\)\\((void|)\\)\"\},child=\{name=\"weird.func_ptr_struct\",exp=\"func_ptr_struct\",numchild=\"0\",type=\"struct _struct_decl \\(\\*\\)\\((int, char \\*, long int|)\\)\"\},child=\{name=\"weird.func_ptr_ptr\",exp=\"func_ptr_ptr\",numchild=\"0\",type=\"struct _struct_decl \\*\\(\\*\\)\\((int, char \\*, long int|)\\)\"\},child=\{name=\"weird.u1\",exp=\"u1\",numchild=\"4\",type=\"union \{\\.\\.\\.\}\"\},child=\{name=\"weird.s2\",exp=\"s2\",numchild=\"4\",type=\"struct \{\\.\\.\\.\}\"\}\\\]" \
-	"get children local variable weird"
-
-
-# Test: c_variable-6.23
-# Desc: change format of weird.func_ptr and weird.func_ptr_ptr
-mi_gdb_test "-var-set-format weird.func_ptr hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable weird.func_ptr"
-
-mi_gdb_test "-var-show-format weird.func_ptr" \
-	"\\^done,format=\"hexadecimal\"" \
-	"show format variable weird.func_ptr"
-
-mi_gdb_test "-var-set-format weird.func_ptr_ptr hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable weird.func_ptr_ptr"
-
-mi_gdb_test "-var-show-format weird.func_ptr_ptr" \
-	"\\^done,format=\"hexadecimal\"" \
-	"show format variable weird.func_ptr_ptr"
-
-# Test: c_variable-6.24
-# Desc: format of weird and children
-mi_gdb_test "-var-set-format weird natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird"
-
-mi_gdb_test "-var-set-format weird.integer natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.integer"
-
-mi_gdb_test "-var-set-format weird.character natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.character"
-
-mi_gdb_test "-var-set-format weird.char_ptr natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.char_ptr"
-
-mi_gdb_test "-var-set-format weird.long_int natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.long_int"
-
-mi_gdb_test "-var-set-format weird.int_ptr_ptr natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.int_ptr_ptr"
-
-mi_gdb_test "-var-set-format weird.long_array natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.long_array"
-
-mi_gdb_test "-var-set-format weird.func_ptr hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable weird.func_ptr"
-
-mi_gdb_test "-var-set-format weird.func_ptr_struct hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable weird.func_ptr_struct"
-
-mi_gdb_test "-var-set-format weird.func_ptr_ptr natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.func_ptr_ptr"
-
-mi_gdb_test "-var-set-format weird.u1 natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.u1"
-
-mi_gdb_test "-var-set-format weird.s2 natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.s2"
-
-# 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.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.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.integer weird.character weird.char_ptr weird.long_int weird.int_ptr_ptr weird.int_ptr_ptr.*int_ptr_ptr weird.int_ptr_ptr.*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.s2.i weird.s2.u2 weird weird.s2.u2.u1s1 weird.s2.u2.u1s2 weird.s2 weird.long_array weird.u1} {}}
-
-mi_gdb_test "-var-delete weird" \
-	"\\^done,ndeleted=\"12\"" \
-	"delete var weird"
-
-
-#####               #####
-#                       #
-# Special Display Tests #
-#                       #
-#####               #####
-
-# Stop in "do_special_tests"
-
-set line_dst_a_1 [gdb_get_line_number "a = 1;"]
-
-mi_gdb_test "200-break-insert do_special_tests" \
-	"200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_a_1\",times=\"0\"\}" \
-	"break-insert operation"
-
-send_gdb "-exec-continue\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_special_tests\",args=\\\[\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_dst_a_1\"\}\r\n$mi_gdb_prompt$" {
-	pass "continue to do_special_tests"
-    }
-    timeout {
-	fail "continue to do_special_tests (timeout)"
-    }
-}
-
-# Test: c_variable-7.10
-# Desc: create union u
-mi_gdb_test "-var-create u * u" \
-	"\\^done,name=\"u\",numchild=\"2\",type=\"union named_union\"" \
-	"create local variable u"
-
-# Test: c_variable-7.11
-# Desc: value of u
-mi_gdb_test "-var-evaluate-expression u" \
-	"\\^done,value=\"\{\\.\\.\\.\}\"" \
-	"eval variable u"
-
-# Test: c_variable-7.12
-# Desc: type of u
-mi_gdb_test "-var-info-type u" \
-	"\\^done,type=\"union named_union\"" \
-	"info type variable u"
-
-# Test: c_variable-7.13
-# Desc: is u editable
-mi_gdb_test "-var-show-attributes u" \
-	"\\^done,attr=\"noneditable\"" \
-	"is u editable"
-
-# Test: c_variable-7.14
-# Desc: number of children of u
-mi_gdb_test "-var-info-num-children u" \
-	"\\^done,numchild=\"2\"" \
-	"get number of children of u"
-
-# Test: c_variable-7.15
-# Desc: children of u
-mi_gdb_test "-var-list-children u" \
-	"\\^done,numchild=\"2\",children=\\\[child=\{name=\"u.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"u.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\}\\\]" \
-	"get children of u"
-
-# Test: c_variable-7.20
-# Desc: create anonu
-mi_gdb_test "-var-create anonu * anonu" \
-	"\\^done,name=\"anonu\",numchild=\"3\",type=\"union \{\\.\\.\\.\}\"" \
-	"create local variable anonu"
-
-# Test: c_variable-7.21
-# Desc: value of anonu
-mi_gdb_test "-var-evaluate-expression anonu" \
-	"\\^done,value=\"\{\\.\\.\\.\}\"" \
-	"eval variable anonu"
-
-# Test: c_variable-7.22
-# Desc: type of anonu
-mi_gdb_test "-var-info-type anonu" \
-	"\\^done,type=\"union \{\\.\\.\\.\}\"" \
-	"info type variable anonu"
-
-# Test: c_variable-7.23
-# Desc: is anonu editable
-mi_gdb_test "-var-show-attributes anonu" \
-	"\\^done,attr=\"noneditable\"" \
-	"is anonu editable"
-
-# Test: c_variable-7.24
-# Desc: number of children of anonu
-mi_gdb_test "-var-info-num-children anonu" \
-	"\\^done,numchild=\"3\"" \
-	"get number of children of anonu"
-
-# Test: c_variable-7.25
-# Desc: children of anonu
-mi_gdb_test "-var-list-children anonu" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"anonu.a\",exp=\"a\",numchild=\"0\",type=\"int\"\},child=\{name=\"anonu.b\",exp=\"b\",numchild=\"0\",type=\"char\"\},child=\{name=\"anonu.c\",exp=\"c\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of anonu"
-
-# Test: c_variable-7.30
-# Desc: create struct s
-mi_gdb_test "-var-create s * s" \
-	"\\^done,name=\"s\",numchild=\"6\",type=\"struct _simple_struct\"" \
-	"create local variable s"
-
-
-# Test: c_variable-7.31
-# Desc: value of s
-mi_gdb_test "-var-evaluate-expression s" \
-	"\\^done,value=\"\{\\.\\.\\.\}\"" \
-	"eval variable s"
-
-# Test: c_variable-7.32
-# Desc: type of s
-mi_gdb_test "-var-info-type s" \
-	"\\^done,type=\"struct _simple_struct\"" \
-	"info type variable s"
-
-# Test: c_variable-7.33
-# Desc: is s editable
-mi_gdb_test "-var-show-attributes s" \
-	"\\^done,attr=\"noneditable\"" \
-	"is s editable"
-
-# Test: c_variable-7.34
-# Desc: number of children of s
-mi_gdb_test "-var-info-num-children s" \
-	"\\^done,numchild=\"6\"" \
-	"get number of children of s"
-
-# Test: c_variable-7.35
-# Desc: children of s
-mi_gdb_test "-var-list-children s" \
-	"\\^done,numchild=\"6\",children=\\\[child=\{name=\"s.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"s.unsigned_integer\",exp=\"unsigned_integer\",numchild=\"0\",type=\"unsigned int\"\},child=\{name=\"s.character\",exp=\"character\",numchild=\"0\",type=\"char\"\},child=\{name=\"s.signed_character\",exp=\"signed_character\",numchild=\"0\",type=\"signed char\"\},child=\{name=\"s.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"s.array_of_10\",exp=\"array_of_10\",numchild=\"10\",type=\"int \\\[10\\\]\"\}\\\]" \
-	"get children of s"
-#} {integer unsigned_integer character signed_character char_ptr array_of_10}
-
-# Test: c_variable-7.40
-# Desc: create anons
-mi_gdb_test "-var-create anons * anons" \
-	"\\^done,name=\"anons\",numchild=\"3\",type=\"struct \{\\.\\.\\.\}\"" \
-	"create local variable anons"
-
-# Test: c_variable-7.41
-# Desc: value of anons
-mi_gdb_test "-var-evaluate-expression anons" \
-	"\\^done,value=\"\{\\.\\.\\.\}\"" \
-	"eval variable anons"
-
-# Test: c_variable-7.42
-# Desc: type of anons
-mi_gdb_test "-var-info-type anons" \
-	"\\^done,type=\"struct \{\\.\\.\\.\}\"" \
-	"info type variable anons"
-
-# Test: c_variable-7.43
-# Desc: is anons editable
-mi_gdb_test "-var-show-attributes anons" \
-	"\\^done,attr=\"noneditable\"" \
-	"is anons editable"
-
-# Test: c_variable-7.44
-# Desc: number of children of anons
-mi_gdb_test "-var-info-num-children anons" \
-	"\\^done,numchild=\"3\"" \
-	"get number of children of anons"
-
-# Test: c_variable-7.45
-# Desc: children of anons
-mi_gdb_test "-var-list-children anons" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"anons.a\",exp=\"a\",numchild=\"0\",type=\"int\"\},child=\{name=\"anons.b\",exp=\"b\",numchild=\"0\",type=\"char\"\},child=\{name=\"anons.c\",exp=\"c\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of anons"
-
-
-# Test: c_variable-7.50
-# Desc: create enum e
-mi_gdb_test "-var-create e * e" \
-	"\\^done,name=\"e\",numchild=\"0\",type=\"enum foo\"" \
-	"create local variable e"
-
-setup_xfail "*-*-*"
-# Test: c_variable-7.51
-# Desc: value of e
-mi_gdb_test "-var-evaluate-expression e" \
-	"\\^done,value=\"FIXME\"" \
-	"eval variable e"
-clear_xfail "*-*-*"
-
-# Test: c_variable-7.52
-# Desc: type of e
-mi_gdb_test "-var-info-type e" \
-	"\\^done,type=\"enum foo\"" \
-	"info type variable e"
-
-# Test: c_variable-7.53
-# Desc: is e editable
-mi_gdb_test "-var-show-attributes e" \
-	"\\^done,attr=\"editable\"" \
-	"is e editable"
-
-# Test: c_variable-7.54
-# Desc: number of children of e
-mi_gdb_test "-var-info-num-children e" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of e"
-
-# Test: c_variable-7.55
-# Desc: children of e
-mi_gdb_test "-var-list-children e" \
-	"\\^done,numchild=\"0\"" \
-	"get children of e"
-
-# Test: c_variable-7.60
-# Desc: create anone
-mi_gdb_test "-var-create anone * anone" \
-	"\\^done,name=\"anone\",numchild=\"0\",type=\"enum \{\\.\\.\\.\}\"" \
-	"create local variable anone"
-
-setup_xfail "*-*-*"
-# Test: c_variable-7.61
-# Desc: value of anone
-mi_gdb_test "-var-evaluate-expression anone" \
-	"\\^done,value=\"A\"" \
-	"eval variable anone"
-clear_xfail "*-*-*"
-
-
-# Test: c_variable-7.70
-# Desc: create anone
-mi_gdb_test "-var-create anone * anone" \
-	"&\"Duplicate variable object name\\\\n\".*\\^error,msg=\"Duplicate variable object name\"" \
-	"create duplicate local variable anone"
-
-
-# Test: c_variable-7.72
-# Desc: type of anone
-mi_gdb_test "-var-info-type anone" \
-	"\\^done,type=\"enum \{\\.\\.\\.\}\"" \
-	"info type variable anone"
-
-
-# Test: c_variable-7.73
-# Desc: is anone editable
-mi_gdb_test "-var-show-attributes anone" \
-	"\\^done,attr=\"editable\"" \
-	"is anone editable"
-
-# Test: c_variable-7.74
-# Desc: number of children of anone
-mi_gdb_test "-var-info-num-children anone" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of anone"
-
-# Test: c_variable-7.75
-# Desc: children of anone
-mi_gdb_test "-var-list-children anone" \
-	"\\^done,numchild=\"0\"" \
-	"get children of anone"
-
-
-# Record fp
-
-send_gdb "p/x \$fp\n"
-gdb_expect {
-    -re ".*($hex).*\\^done\r\n$mi_gdb_prompt$" { 
-	pass "print FP register"
-	set fp $expect_out(1,string) 
-    }
-#    -re ".*" { fail "print FP register"}
-    timeout { fail "print FP register (timeout)"}
-}
-
-set line_incr_a_b_a [gdb_get_line_number "b = a;"]
-
-mi_gdb_test "200-break-insert incr_a" \
-	"200\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"incr_a\",file=\".*var-cmd.c\",line=\"$line_incr_a_b_a\",times=\"0\"\}" \
-	"break-insert operation"
-send_gdb "-exec-continue\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"3\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"incr_a\",args=\\\[\{name=\"a\",value=\"2\.*\"\}\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_incr_a_b_a\"\}\r\n$mi_gdb_prompt$" {
-	pass "continue to incr_a"
-    }
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"3\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"incr_a\",args=\\\[\{name=\"a\",value=\"\.*\"\}\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"([expr $line_incr_a_b_a - 2]|[expr $line_incr_a_b_a - 1]|$line_incr_a_b_a)\"\}\r\n$mi_gdb_prompt$" {
-	fail "continue to incr_a (compiler debug info incorrect)"
-    }
-    -re "\\^running\r\n${mi_gdb_prompt}.*\r\n$mi_gdb_prompt$" {
-	fail "continue to incr_a (unknown output)"
-    }
-    timeout {
-	fail "continue to incr_a (timeout)"
-    }
-}
-
-# Test: c_variable-7.81
-# Desc: Create variables in different scopes
-mi_gdb_test "-var-create a1 * a" \
-	"\\^done,name=\"a1\",numchild=\"0\",type=\"char\"" \
-	"create local variable a1"
-
-mi_gdb_test "-var-create a2 $fp a" \
-	"\\^done,name=\"a2\",numchild=\"0\",type=\"int\"" \
-	"create variable a2 in different scope"
-
-#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}
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi-watch.exp b/gdb/testsuite/gdb.mi/mi-watch.exp
deleted file mode 100644
index 1ef3ab0f630..00000000000
--- a/gdb/testsuite/gdb.mi/mi-watch.exp
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2004, 2005
-# Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_watchpoint_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-
-    set line_callee4_head [gdb_get_line_number "callee4 ("]
-    set line_callee4_body [expr $line_callee4_head + 2]
-
-    # Insert a watchpoint and list
-    # Tests:
-    # -break-watch C
-    # -break-list
-
-    mi_gdb_test "111-break-watch C" \
-             "111\\^done,wpt=\{number=\"2\",exp=\"C\"\}" \
-             "break-watch operation"
-
-    mi_gdb_test "222-break-list" \
-	    "222\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_body\",times=\"1\"\},bkpt=\{number=\"2\",type=\".*watchpoint\",disp=\"keep\",enabled=\"y\",addr=\"\",what=\"C\",times=\"0\"\}\\\]\}" \
-                "list of watchpoints"
-
-}
-
-# UNUSED at the time
-proc test_awatch_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Insert an access watchpoint and list it
-    # Tests:
-    # -break-watch -a A
-    # -break-list
-
-    mi_gdb_test "333-break-watch -a A" \
-             "333\\^done,bkpt=\{number=\"1\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_main_body\"\}" \
-             "break-watch -a operation"
-
-    mi_gdb_test "444-break-list" \
-	    "444\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"3\",type=\"watchpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\]\}" \
-                "list of watchpoints awatch"
-
-    mi_gdb_test "777-break-delete 3" \
-	    "777\\^done" \
-	    "delete access watchpoint"
-}
-
-# UNUSED at the time
-proc test_rwatch_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Insert a read watchpoint and list it.
-    # Tests:
-    # -break-insert -r B
-    # -break-list
-
-    mi_gdb_test "200-break-watch -r C" \
-             "200\\^done,bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}" \
-             "break-insert -r operation"
-
-    mi_gdb_test "300-break-list" \
-	    "300\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\}\}" \
-                "list of breakpoints"
-
-    mi_gdb_test "177-break-delete 4" \
-	    "177\\^done" \
-	    "delete read watchpoint"
-}
-
-proc test_watchpoint_triggering {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    set line_callee4_return_0     [gdb_get_line_number "return 0;"]
-    set line_callee3_head         [gdb_get_line_number "callee3 ("]
-    set line_callee3_close_brace  [expr $line_callee3_head + 3]
-
-    # Continue execution until the watchpoint is reached,  continue again, 
-    # to see the watchpoint go out of scope.
-    # Does:
-    # -exec-continue (Here wp triggers)
-    # -exec-continue (Here wp goes out of scope)
-
-    send_gdb "222-exec-continue\n"
-    gdb_expect {
-      -re "222\\^running\r\n$mi_gdb_prompt" {
-        gdb_expect {
-	    -re "222\\*stopped,reason=\"watchpoint-trigger\",wpt=\{number=\"2\",exp=\"C\"\},value=\{old=\".*\",new=\"3\"\},thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" {
-            pass "watchpoint trigger"
-          }
-          -re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (2)"}
-          timeout {fail "watchpoint trigger (timeout 2)"}
-        }
-      }
-      -re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (1)"}
-      timeout {fail "watchpoint trigger (timeout 1)"}
-    }
-
-    send_gdb "223-exec-continue\n"
-    gdb_expect {
-      -re "223\\^running\r\n$mi_gdb_prompt" {
-        gdb_expect {
-	    -re "\[\r\n\]*223\\*stopped,reason=\"watchpoint-scope\",wpnum=\"2\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee3_close_brace\"\}\r\n$mi_gdb_prompt$" {
-            pass "wp out of scope"
-          }
-          -re ".*$mi_gdb_prompt$" {fail "wp out of scope (2)"}
-          timeout {fail "wp out of scope (timeout 2)"}
-        }
-      }
-      -re ".*$mi_gdb_prompt$" {fail "wp out of scope (1)"}
-      timeout {fail "wp out of scope (timeout 1)"}
-    }
-}
-
-mi_runto callee4
-test_watchpoint_creation_and_listing
-#test_rwatch_creation_and_listing
-#test_awatch_creation_and_listing
-test_watchpoint_triggering
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-basics.exp b/gdb/testsuite/gdb.mi/mi2-basics.exp
deleted file mode 100644
index 0fd1c87e157..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-basics.exp
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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
-
-#
-# test basic Machine interface (MI) operations
-#
-# Verify that, using the MI, we can load a program and do
-# other basic things that are used by all test files through  mi_gdb_exit,
-# mi_gdb_start, mi_delete_breakpoints, mi_gdb_reinitialize_dir and
-# mi_gdb_load, so we can safely use those.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but the command syntax and correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set escapedobjdir [string_to_regexp ${objdir}]
-set escapedsrcdir [string_to_regexp ${srcdir}]
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# In this file we want to test if the operations needed by the following
-# procedures work, so it makes no sense using them here.
-
-# mi_delete_breakpoints
-# mi_gdb_reinitialize_dir $srcdir/$subdir
-# mi_gdb_load ${binfile}
-
-# Test if the MI interpreter has been configured
-
-proc test_mi_interpreter_selection {} {
-    global mi_gdb_prompt
-    global gdb_prompt
-
-    # All this test expects is to get the prompt back
-    # with no syntax error message
-    send_gdb "-gdb-version\n"
-    gdb_expect {
-           -re "GNU gdb .*\r\n$mi_gdb_prompt$" \
-               { pass "acceptance of MI operations" 
-                 return 1}
-           -re ".*\r\n$mi_gdb_prompt$" \
-               { fail "acceptance of MI operations"
-                 note "Skipping all other MI tests." }
-           -re "Undefined command.*$gdb_prompt $" \
-               { fail "acceptance of MI operations"
-                 note "Skipping all other MI tests." }
-           -re ".*$gdb_prompt $" \
-               { fail "acceptance of MI operations"
-                 note "Skipping all other MI tests." }
-           timeout { fail "acceptance of MI operations (timeout)"
-                     note "Skipping all other MI tests." }
-    }
-    return 0
-}
-
-proc test_exec_and_symbol_mi_operatons {} {
-    global mi_gdb_prompt
-    global binfile
-
-    # Load symbols and specify executable on a single operation
-    # Tests:
-    # -file-exec-and-symbols
-
-    # Can't use mi_gdb_test as if this doesn't work,
-    #  we must give up on the whole test file
-    send_gdb "-file-exec-and-symbols ${binfile}\n"
-    gdb_expect {
-           -re "\[\r\n\]*\\\^done\r\n$mi_gdb_prompt$" \
-               { pass "file-exec-and-symbols operation" }
-           timeout { fail "file-exec-and-symbols operation (timeout)"
-                     note "Skipping all other MI tests."
-                     return 0}
-    }
-
-    # The following is not used by mi-support.exp, but we test here so
-    # we get done with loading a program basics.
-
-    # Do it again, but now load symbols and specify executable with
-    # two separate operations
-    # Tests:
-    # -file-clear
-    # -file-exec-file
-    # -file-symbol-file
-
-    # FIXME: file-clear is not implemented yet.
-#   mi_gdb_test "-file-clear" \
-#            "\\\^done" \
-#            "file-clear operation"
-
-    mi_gdb_test "-file-exec-file ${binfile}" \
-             "\\\^done" \
-             "file-exec-file operation"
-
-    mi_gdb_test "-file-symbol-file ${binfile}" \
-             "\\\^done" \
-             "file-symbol-file operation"
-
-    # FIXME: if we cannot load we have to skip all other tests.
-}
-
-proc test_breakpoints_deletion {} {
-    global mi_gdb_prompt
-    global srcfile
-
-    # Clear all breakpoints and list to confirm
-    # Tests:
-    # -break-delete (all)
-    # -break-list
-
-    # The all parameter is actually no parameter.
-    mi_gdb_test "200-break-delete" \
-             "\\\^done" \
-             "break-delete (all) operation"
-
-    mi_gdb_test "201-break-list" \
-             ".*\\\^done,BreakpointTable=\\\{.*,body=\\\[\\\]\\\}" \
-             "all breakpoints removed"
-}
-
-proc test_dir_specification {} {
-    global mi_gdb_prompt
-    global srcdir
-    global subdir
-
-    # Add to the search directories, display, then reset back to default
-    # Tests:
-    # -environment-directory arg
-    # -environment-directory 
-    # -environment-directory -r
-
-    set envirodir [string_to_regexp ${srcdir}/${subdir}]
-
-    mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \
-             "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \
-             "environment-directory arg operation"
-
-    mi_gdb_test "203-environment-directory" \
-             "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \
-             "environment-directory empty-string operation"
-
-    mi_gdb_test "204-environment-directory -r" \
-             "\\\^done,source-path=\"\\\$cdir.\\\$cwd\"" \
-             "environment-directory operation"
-
-#exp_internal 0
-}
-
-proc test_cwd_specification {} {
-    global mi_gdb_prompt
-    global objdir
-    global subdir
-    global escapedobjdir
-
-    # Change the working directory, then print the current working directory
-    # Tests:
-    # -environment-cd ${objdir}
-    # -environment-pwd
-
-    mi_gdb_test "205-environment-cd ${objdir}" \
-             "\\\^done" \
-             "environment-cd arg operation"
-
-    mi_gdb_test "206-environment-pwd" \
-             "\\\^done,cwd=\"${escapedobjdir}\"" \
-             "environment-pwd operation"
-}
-
-proc test_path_specification {} {
-    global mi_gdb_prompt
-    global orig_path
-    global objdir
-    global srcdir
-    global escapedobjdir
-    global escapedsrcdir
-
-    # Add to the path, display, then reset 
-    # Tests:
-    # -environment-path 
-    # -environment-path dir1 dir2
-    # -environment-path -r dir
-    # -environment-path -r
-
-    send_gdb "-environment-path\n"
-    gdb_expect 20 {
-	-re "\\\^done,path=\"\(.*\)\"\r\n$mi_gdb_prompt" { 
-	  set orig_path $expect_out(1,string); 
-	}
-	timeout { 
-	  perror "-environment-path (timeout)" ; 
-	  return 
-	}
-    }
-
-    mi_gdb_test "207-environment-path" \
-             "\\\^done,path=\"$orig_path\"" \
-             "environment-path no-args operation"
-
-    mi_gdb_test "208-environment-path $srcdir $objdir" \
-             "\\\^done,path=\"$escapedsrcdir.$escapedobjdir.$orig_path\"" \
-             "environment-path dir1 dir2 operation"
-
-    mi_gdb_test "209-environment-path -r $objdir" \
-             "\\\^done,path=\"$escapedobjdir.$orig_path\"" \
-             "environment-path -r dir operation"
-
-    mi_gdb_test "210-environment-path -r" \
-             "\\\^done,path=\"$orig_path\"" \
-             "environment-path -r operation"
-
-} 
-
-if [test_mi_interpreter_selection] {
-  test_exec_and_symbol_mi_operatons
-  test_breakpoints_deletion
-  test_dir_specification
-  test_cwd_specification
-  test_path_specification
-}
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-break.exp b/gdb/testsuite/gdb.mi/mi2-break.exp
deleted file mode 100644
index e22bf1686f7..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-break.exp
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999, 2001, 2003, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-# Locate line numbers in basics.c.
-set line_callee4_head  [gdb_get_line_number "callee4 ("]
-set line_callee4_body  [expr $line_callee4_head + 2]
-set line_callee3_head  [gdb_get_line_number "callee3 ("]
-set line_callee3_body  [expr $line_callee3_head + 2]
-set line_callee2_head  [gdb_get_line_number "callee2 ("]
-set line_callee2_body  [expr $line_callee2_head + 2]
-set line_callee1_head  [gdb_get_line_number "callee1 ("]
-set line_callee1_body  [expr $line_callee1_head + 2]
-set line_main_head     [gdb_get_line_number "main ("]
-set line_main_body     [expr $line_main_head + 2]
-
-proc test_tbreak_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-    global line_callee4_head line_callee4_body
-    global line_callee3_head line_callee3_body
-    global line_callee2_head line_callee2_body
-    global line_callee1_head line_callee1_body
-    global line_main_head    line_main_body
-
-    # Insert some breakpoints and list them
-    # Also, disable some so they do not interfere with other tests
-    # Tests:
-    # -break-insert -t main
-    # -break-insert -t basics.c:callee2
-    # -break-insert -t basics.c:$line_callee3_head
-    # -break-insert -t srcfile:$line_callee4_head
-    # -break-list
-
-    mi_gdb_test "222-break-insert -t main" \
-             "222\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}" \
-             "break-insert -t operation"
-
-    mi_gdb_test "333-break-insert -t basics.c:callee2" \
-             "333\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee2\",file=\".*basics.c\",line=\"$line_callee2_body\",times=\"0\"\}" \
-             "insert temp breakpoint at basics.c:callee2"
-
-    mi_gdb_test "444-break-insert -t basics.c:$line_callee3_head" \
-             "444\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_head\",times=\"0\"\}" \
-             "insert temp breakpoint at basics.c:\$line_callee3_body"
-
-    # Getting the quoting right is tricky.  That is "\"<file>\":$line_callee4_head"
-    mi_gdb_test "555-break-insert -t \"\\\"${srcfile}\\\":$line_callee4_head\"" \
-             "555\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_head\",times=\"0\"\}" \
-             "insert temp breakpoint at \"<fullfilename>\":\$line_callee4_head"
-
-    mi_gdb_test "666-break-list" \
-	    "666\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}.*\\\]\}" \
-                "list of breakpoints"
-
-    mi_gdb_test "777-break-delete" \
-	    "777\\^done" \
-	    "delete temp breakpoints"
-}
-
-proc test_rbreak_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-    global line_callee4_head line_callee4_body
-    global line_callee3_head line_callee3_body
-    global line_callee2_head line_callee2_body
-    global line_callee1_head line_callee1_body
-    global line_main_head    line_main_body
-
-    # Insert some breakpoints and list them
-    # Also, disable some so they do not interfere with other tests
-    # Tests:
-    # -break-insert -r main
-    # -break-insert -r callee2
-    # -break-insert -r callee
-    # -break-insert -r .*llee
-    # -break-list
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "122-break-insert -r main" \
-             "122\\^done,bkpt=\{number=\"5\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_main_body\"\}" \
-             "break-insert -r operation"
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "133-break-insert -r callee2" \
-             "133\\^done,bkpt=\{number=\"6\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\}" \
-             "insert breakpoint with regexp callee2"
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "144-break-insert -r callee" \
-	    "144\\^done,bkpt=\{number=\"7\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee1_body\"\},bkpt=\{number=\"8\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\},bkpt=\{number=\"9\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee3_body\"\},bkpt=\{number=\"10\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee4_body\"\}" \
-             "insert breakpoint with regexp callee"
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "155-break-insert -r \.\*llee" \
-	    "155\\^done,bkpt=\{number=\"11\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee1_body\"\},bkpt=\{number=\"12\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee2_body\"\},bkpt=\{number=\"13\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee3_body\"\},bkpt=\{number=\"14\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_callee4_body\"\}" \
-             "insert breakpoint with regexp .*llee"
-
-    setup_xfail "*-*-*"
-    mi_gdb_test "166-break-list" \
-	    "1\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\]\}" \
-                "list of breakpoints"
-
-    mi_gdb_test "177-break-delete" \
-	    "177\\^done" \
-	    "delete temp breakpoints"
-}
-
-test_tbreak_creation_and_listing
-test_rbreak_creation_and_listing
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-cli.exp b/gdb/testsuite/gdb.mi/mi2-cli.exp
deleted file mode 100644
index 47e909ea9d2..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-cli.exp
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 2002, 2003, 2004, 2005 Free Software Foundation, 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.  
-
-# This file tests that GDB's console can be accessed via the MI.
-# Specifically, we are testing the "interpreter-exec" command and that
-# the commands that are executed via this command are properly executed.
-# Console commands executed via MI should use MI output wrappers, MI event
-# handlers, etc.
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_gdb_reinitialize_dir $srcdir/$subdir
-
-mi_gdb_test "-interpreter-exec" \
-  {\^error,msg="mi_cmd_interpreter_exec: Usage: -interpreter-exec interp command"} \
-  "-interpreter-exec with no arguments"
-
-mi_gdb_test "-interpreter-exec console" \
-  {\^error,msg="mi_cmd_interpreter_exec: Usage: -interpreter-exec interp command"} \
-  "-interpreter-exec with one argument"
-
-mi_gdb_test "-interpreter-exec bogus command" \
-  {\^error,msg="mi_cmd_interpreter_exec: could not find interpreter \\\"bogus\\\""} \
-  "-interpreter-exec with bogus interpreter"
-
-set msg {Undefined command: \\\"bogus\\\"\.  Try \\\"help\\\"\.}
-mi_gdb_test "-interpreter-exec console bogus" \
-    "&\\\"$msg\\\\n\\\".*\\^error,msg=\\\"$msg\\\".*" \
-  "-interpreter-exec console bogus"
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
-#   {(=.*)+\^done} \
-#   "-interpreter-exec console \"file \$binfile\""
-mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
-  {\^done} \
-  "-interpreter-exec console \"file \$binfile\""
-
-mi_run_to_main
-
-set line_main_head   [gdb_get_line_number "main ("]
-set line_main_body   [expr $line_main_head + 2]
-set line_main_hello  [gdb_get_line_number "Hello, World!"]
-set line_main_return [expr $line_main_hello + 2]
-
-mi_gdb_test "-interpreter-exec console \"set args foobar\"" \
-  {\^done} \
-  "-interpreter-exec console \"set args foobar\""
-
-mi_gdb_test "-interpreter-exec console \"show args\"" \
-  {\~"Argument list to give program being debugged when it is started is \\\"foobar\\\"\.\\n".*\^done} \
-  "-interpreter-exec console \"show args\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-interpreter-exec console \"break callee4\"" \
-#   {(&.*)*.*~"Breakpoint 2 at.*\\n".*=breakpoint-create,number="2".*\^done} \
-#   "-interpreter-exec console \"break callee4\""
-mi_gdb_test "-interpreter-exec console \"break callee4\"" \
-  {(&.*)*.*~"Breakpoint 2 at.*\\n".*\^done} \
-  "-interpreter-exec console \"break callee4\""
-
-mi_gdb_test "-interpreter-exec console \"info break\"" \
-  {\~"Num[ \t]*Type[ \t]*Disp[ \t]*Enb[ \t]*Address[ \t]*What\\n".*~"2[ \t]*breakpoint[ \t]*keep[ \t]*y[ \t]*0x[0-9A-Fa-f]+[ \t]*in callee4 at .*basics.c:[0-9]+\\n".*\^done} \
-  "-interpreter-exec console \"info break\""
-
-mi_gdb_test "-interpreter-exec console \"set listsize 1\"" \
-  {\^done} \
-  "-interpreter-exec console \"set listsize 1\""
-
-# {.*\~"32[ \t(\\t)]*callee1.*\\n".*\^done }
-mi_gdb_test "-interpreter-exec console \"list\"" \
-  ".*\~\"$line_main_body\[\\\\t \]*callee1.*;\\\\n\".*\\^done" \
-  "-interpreter-exec console \"list\""
-
-# # NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-exec-continue" \
-#    {.*\*stopped,reason="breakpoint-hit",.*func="callee4".*file=".*basics.c",line="8"\}} \
-#    "-interpreter-exec console \"continue to callee4\""
-send_gdb "999-exec-continue\n"
-gdb_expect {
-    -re "999\\^running\[\r\n\]+$mi_gdb_prompt.*999\\*stopped,reason=.breakpoint-hit.*$mi_gdb_prompt$" {
-	pass "continue to callee4"
-    }
-    timeout {
-	fail "continue to callee4 (timeout)"
-    }
-}
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "100-interpreter-exec console \"delete 2\"" \
-#   {.*=breakpoint-delete,number=\"2\".*\^done} \
-#   "-interpreter-exec console \"delete 2\""
-mi_gdb_test "100-interpreter-exec console \"delete 2\"" \
-  {100\^done} \
-  "-interpreter-exec console \"delete 2\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "200-interpreter-exec console \"up\"" \
-#   {.*=selected-frame-level-changed,level="1".*\^done} \
-#   "-interpreter-exec console \"up\""
-mi_gdb_test "200-interpreter-exec console \"up\"" \
-  {200\^done} \
-  "-interpreter-exec console \"up\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "300-interpreter-exec console \"down\"" \
-#   {.*=selected-frame-level-changed,level="0".*\^done} \
-#   "-interpreter-exec console \"down\""
-mi_gdb_test "300-interpreter-exec console \"down\"" \
-  {300\^done} \
-  "-interpreter-exec console \"down\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-interpreter-exec console \"frame 2\"" \
-#   {.*=selected-frame-level-changed,level="2".*\^done} \
-#   "-interpreter-exec console \"frame 2\""
-mi_gdb_test "400-interpreter-exec console \"frame 2\"" \
-  {400\^done} \
-  "-interpreter-exec console \"frame 2\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-stack-select-frame 0" \
-#   {.*=selected-frame-level-changed,level="0".*\^done} \
-#   "-stack-select-frame 0"
-mi_gdb_test "500-stack-select-frame 0" \
-  {500\^done} \
-  "-stack-select-frame 0"
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-break-insert -t basics.c:$line_main_hello" \
-#   {.*=breakpoint-create,number="3".*\^done} \
-#   "-break-insert -t basics.c:\$line_main_hello"
-mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
-	{600\^done,bkpt=.number="3",type="breakpoint".*\}} \
-	"-break-insert -t basics.c:\$line_main_hello"
-
-# mi_gdb_test "-exec-continue" \
-#   {.*\*stopped.*,file=".*basics.c",fullname="${fullname_syntax}${srcfile}",line="$line_main_hello"\}} \
-#   "-exec-continue to line \$line_main_hello"
-send_gdb "700-exec-continue\n"
-gdb_expect {
-    -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=.$line_main_hello.*$mi_gdb_prompt$" {
-	pass "-exec-continue to line \$line_main_hello"
-    }
-    timeout {
-	fail "-exec-continue to line \$line_main_hello"
-    }
-}
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-exec-next" \
-#   {.*\*stopped,reason="end-stepping-range",.*,file=".*basics.c",fullname="${fullname_syntax}${srcfile}",line="$line_main_return"\}} \
-#   "-exec-next to line \$line_main_return"
-send_gdb "800-exec-next\n"
-gdb_expect {
-    -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=.end-stepping-range.*,file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=.$line_main_return.*$mi_gdb_prompt$" {
-	pass "-exec-next to line \$line_main_return"
-    }
-    timeout {
-	fail "-exec-next to line \$line_main_return"
-    }
-}
-
-mi_gdb_test "-interpreter-exec console \"list\"" \
-  "\~\"$line_main_return\[\\\\t ]*return 0;\\\\n\".*\\^done" \
-  "-interpreter-exec console \"list\" at basics.c:\$line_main_return"
-
-mi_gdb_test "-interpreter-exec console \"help set args\"" \
-  {\~"Set argument list to give program being debugged when it is started\.\\nFollow this command with any number of args, to be passed to the program\.".*\^done} \
-  "-interpreter-exec console \"help set args\""
-
-# NOTE: cagney/2003-02-03: Not yet.
-# mi_gdb_test "-interpreter-exec console \"set \$pc=0x0\"" \
-#   {.*=target-changed.*\^done} \
-#   "-interpreter-exec console \"set \$pc=0x0\""
-mi_gdb_test "888-interpreter-exec console \"set \$pc=0x0\"" \
-  {888\^done} \
-  "-interpreter-exec console \"set \$pc=0x0\""
-
-#mi_gdb_test "-interpreter-exec console \"\"" \
-  {} \
-  "-interpreter-exec console \"\""
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp
deleted file mode 100644
index 242d791d3c8..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-console.exp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, 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
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-# This test only works when talking to a target that routes its output
-# through GDB.  Check that we're either talking to a simulator or a
-# remote target.
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "mi-console"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-mi_run_to_main
-
-# Next over the hello() call which will produce lots of output
-send_gdb "47-exec-next\n"
-gdb_expect {
-    -re "47\\^running\r\n$mi_gdb_prompt" {
-	pass "Started step over hello"
-    }
-    timeout {
-	fail "Started step over hello (timeout)"
-    }
-}
-
-if { ![target_info exists gdb,noinferiorio] } {
-    gdb_expect {
-	-re "@\"H\"\r\n.*@\"e\"\r\n.*@\"l\"\r\n.*@\"l\"\r\n.*@\"o\"\r\n.*@\" \"\r\n.*@\"\\\\\\\\\"\r\n.*@\"\\\\\"\"\r\n.*@\"!\"\r\n.*@\"\\\\r\"\r\n.*@\"\\\\n\"\r\n" {
-	    pass "Hello message"
-	}
-	-re "Hello" {
-	    
-	    # Probably a native system where GDB doesn't have direct #
-	    # control over the inferior console.  # For this to work,
-	    # GDB would need to run the inferior process # under a PTY
-	    # and then use the even-loops ability to wait on #
-	    # multiple event sources to channel the output back
-	    # through the # MI.
-
-	    kfail "gdb/623" "Hello message"
-	}
-	timeout {
-	    fail "Hello message (timeout)"
-	}
-    }
-}
-
-gdb_expect {
-    -re "47\\*stopped.*$mi_gdb_prompt$" {
-	pass "Finished step over hello"
-    }
-    timeout {
-	fail "Finished step over hello (timeout)"
-    }
-}
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-disassemble.exp b/gdb/testsuite/gdb.mi/mi2-disassemble.exp
deleted file mode 100644
index a56b027ee21..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-disassemble.exp
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, 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.  
-
-#
-# Test Machine interface (MI) operations for disassembly.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_disassembly_only {} {
-    global mi_gdb_prompt
-    global hex
-    global decimal
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Test disassembly more only for the current function.
-    # Tests:
-    # -data-disassemble -s $pc -e "$pc+8" -- 0
-    # -data-disassembly -f basics.c -l $line_main_body -- 0
-
-    mi_gdb_test "print/x \$pc" "" ""
-    mi_gdb_test "111-data-disassemble -s \$pc -e \"\$pc + 12\" -- 0" \
-	    "111\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\},\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}.*\]" \
-             "data-disassemble from pc to pc+12 assembly only"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -- 0" \
-	    "222\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]" \
-              "data-disassemble file & line, assembly only"
-}
-
-proc test_disassembly_lines_limit {} {
-    global mi_gdb_prompt
-    global hex
-    global decimal
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Test disassembly more only for the current function.
-    # Tests:
-    # -data-disassembly -f basics.c -l $line_main_body -n 20 -- 0
-    # -data-disassembly -f basics.c -l $line_main_body -n 0 -- 0
-    # -data-disassembly -f basics.c -l $line_main_body -n 50 -- 0
-
-    mi_gdb_test "print/x \$pc" "" ""
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 20 -- 0" \
-	    "222\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]" \
-              "data-disassemble file, line, number assembly only"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 0 -- 0" \
-	    "222\\^done,asm_insns=\\\[\\\]" \
-              "data-disassemble file, line, number (zero lines) assembly only"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 50 -- 0" \
-	    "222\\^done,asm_insns=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]" \
-              "data-disassemble file, line, number (more than main lines) assembly only"
-}
-
-
-proc test_disassembly_mixed {} {
-    global mi_gdb_prompt
-    global hex
-    global decimal
-
-    set line_callee2_head       [gdb_get_line_number "callee2 ("]
-    set line_callee2_open_brace [expr $line_callee2_head + 1]
-
-    # Test disassembly more only for the current function.
-    # Tests:
-    # -data-disassembly -f basics.c -l $line_callee2_open_brace -- 1
-    # -data-disassembly -s $pc -e "$pc+8" -- 1
-
-    mi_gdb_test "002-data-disassemble -f basics.c -l $line_callee2_open_brace -- 1" \
-	    "002\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$line_callee2_open_brace\",file=\".*basics.c\",line_asm_insn=\\\[\{address=\"$hex\",func-name=\"callee2\",offset=\"0\",inst=\".*\"\}.*\\\]\}.*,src_and_asm_line=\{line=\"$decimal\",file=\".*basics.c\",line_asm_insn=\\\[.*\{address=\"$hex\",func-name=\"callee2\",offset=\"$decimal\",inst=\".*\"\}\\\]\}\\\]" \
-             "data-disassemble file, line assembly mixed"
-
-    #
-    # In mixed mode, the lowest level of granularity is the source line.
-    # So we are going to get the disassembly for the source line at
-    # which we are now, even if we have specified that the range is only 2 insns.
-    #
-    mi_gdb_test "003-data-disassemble -s \$pc -e \"\$pc+4\" -- 1" \
-	    "003\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$decimal\",file=\".*basics.c\",line_asm_insn=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}.*\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]\}\\\]" \
-             "data-disassemble range assembly mixed"
-}
-
-proc test_disassembly_mixed_lines_limit {} {
-    global mi_gdb_prompt
-    global hex
-    global decimal
-
-    set line_main_head       [gdb_get_line_number "main ("]
-    set line_main_open_brace [expr $line_main_head + 1]
-    set line_main_body       [expr $line_main_head + 2]
-
-    # Test disassembly more only for the current function.
-    # Tests:
-    # -data-disassembly -f basics.c -l $line_main_body -n 20 -- 1
-    # -data-disassembly -f basics.c -l $line_main_body -n 0 -- 1
-    # -data-disassembly -f basics.c -l $line_main_body -n 50 -- 1
-
-    mi_gdb_test "print/x \$pc" "" ""
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 20 -- 1" \
-	    "222\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$decimal\",file=\".*basics.c\",line_asm_insn=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\},.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]\}\]" \
-              "data-disassemble file, line, number assembly mixed"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 0 -- 1" \
-	    "222\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$line_main_open_brace\",file=\".*basics.c\",line_asm_insn=\\\[\\\]\}\\\]" \
-              "data-disassemble file, line, number (zero lines) assembly mixed"
-
-    mi_gdb_test "222-data-disassemble  -f basics.c -l $line_main_body -n 50 -- 1" \
-	    "222\\^done,asm_insns=\\\[src_and_asm_line=\{line=\"$decimal\",file=\".*basics.c\",line_asm_insn=\\\[\{address=\"$hex\",func-name=\"main\",offset=\"0\",inst=\".*\"\}.*,\{address=\"$hex\",func-name=\"main\",offset=\"$decimal\",inst=\".*\"\}\\\]\}\]" \
-              "data-disassemble file, line, number (more than main lines) assembly mixed"
-}
-
-proc test_disassembly_bogus_args {} {
-    global mi_gdb_prompt
-    global hex
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Test that bogus input to disassembly command is rejected.
-    # Tests:
-    # -data-disassembly -f foo -l abc -n 0 -- 0
-    # -data-disassembly -s foo -e bar -- 0
-    # -data-disassembly -s $pc -f basics.c -- 0
-    # -data-disassembly -f basics.c -l 32 -- 9
-
-    mi_gdb_test "123-data-disassemble -f foo -l abc -n 0 -- 0" \
-             ".*123\\^error,msg=\"mi_cmd_disassemble: Invalid filename.\"" \
-             "data-disassemble bogus filename"
-
-    mi_gdb_test "321-data-disassemble -s foo -e bar -- 0" \
-             "321\\^error,msg=\"No symbol \\\\\"foo\\\\\" in current context.\"" \
-             "data-disassemble bogus address"
-
-    mi_gdb_test "456-data-disassemble -s \$pc -f basics.c -- 0" \
-             "456\\^error,msg=\"mi_cmd_disassemble: Usage: \\( .-f filename -l linenum .-n howmany.. | .-s startaddr -e endaddr.\\) .--. mixed_mode.\"" \
-             "data-disassemble mix different args"
-
-    mi_gdb_test "789-data-disassemble -f basics.c -l $line_main_body -- 9" \
-             "789\\^error,msg=\"mi_cmd_disassemble: Mixed_mode argument must be 0 or 1.\"" \
-             "data-disassemble wrong mode arg"
-
-}
-
-mi_run_to_main
-test_disassembly_only
-test_disassembly_mixed
-test_disassembly_bogus_args
-test_disassembly_lines_limit
-test_disassembly_mixed_lines_limit
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-eval.exp b/gdb/testsuite/gdb.mi/mi2-eval.exp
deleted file mode 100644
index 1d181913aaa..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-eval.exp
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify -data-evaluate-expression. There are really minimal tests.
-
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-set line_callee4_head [gdb_get_line_number "callee4 ("]
-set line_callee4_body [expr $line_callee4_head + 2]
-
-mi_runto callee4
-mi_next_to "callee4" "" "basics.c" [expr $line_callee4_body + 1] "next at callee4"
-
-mi_gdb_test "211-data-evaluate-expression A" "211\\^done,value=\"1\"" "eval A"
-
-mi_gdb_test "311-data-evaluate-expression &A" "311\\^done,value=\"$hex\"" "eval &A"
-
-mi_gdb_test "411-data-evaluate-expression A+3" "411\\^done,value=\"4\"" "eval A+3"
-
-mi_gdb_test "511-data-evaluate-expression \"A + 3\"" "511\\^done,value=\"4\"" "eval A + 3"
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-file.exp b/gdb/testsuite/gdb.mi/mi2-file.exp
deleted file mode 100644
index 50581ca49f5..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-file.exp
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999, 2003, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_file_list_exec_source_file {} {
-    global srcfile
-    global srcdir
-    global subdir
-    global fullname_syntax
-    set srcfilepath [string_to_regexp ${srcdir}/${subdir}/${srcfile}]
-
-    # get the path and absolute path to the current executable
-    #
-    # In gdb 6.2 (at least), the default line number is set by
-    # select_source_symtab to the first line of "main" minus
-    # the value of "lines_to_list" (which defaults to 10) plus one.
-    # --chastain 2004-08-13
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-    set gdb_lines_to_list 10
-    set line_default [expr $line_main_body - $gdb_lines_to_list + 1]
-
-    mi_gdb_test "111-file-list-exec-source-file" \
-	    "111\\\^done,line=\"$line_default\",file=\"${srcfilepath}\",fullname=\"$fullname_syntax${srcfile}\"" \
-               "request path info of current source file (${srcfile})"
-}
-
-test_file_list_exec_source_file
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-hack-cli.exp b/gdb/testsuite/gdb.mi/mi2-hack-cli.exp
deleted file mode 100644
index 2e02a71eb9c..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-hack-cli.exp
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999, 2001, 2003 Free Software Foundation, 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
-
-
-# Some basic checks for the CLI.
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-mi_gdb_test "show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n\\^done" \
-	"show architecture"
-
-mi_gdb_test "47show architecture" \
-	"&\"show architecture\\\\n\"\r\n~\"The target architecture.*\"\r\n47\\^done" \
-	"47show architecture"
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-pthreads.exp b/gdb/testsuite/gdb.mi/mi2-pthreads.exp
deleted file mode 100644
index 4067883b34f..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-pthreads.exp
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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 tests MI thread commands.
-# Specifically, we are testing the MI command set and the console (in MI)
-# command set ("interpreter-exec") and that the commands that are executed
-# via these command pathways are properly executed. Console commands
-# executed via MI should use MI output wrappers, MI event handlers, etc.
-
-# This only works with native configurations
-if {![isnative]} {
-  return
-}
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if {[mi_gdb_start]} {
-    continue
-}
-
-# The procs below dealing with parsing cli/mi output for the threadlist
-# is duplicated in gdb669.exp. Any changes here will probably need to
-# be made there as well.
-
-proc get_mi_thread_list {name} {
-  global expect_out
-
-  # MI will return a list of thread ids:
-  #
-  # -thread-list-ids
-  # ^done,thread-ids=[thread-id="1",thread-id="2",...],number-of-threads="N"
-  # (gdb)
-  mi_gdb_test "-thread-list-ids" \
-    {\^done,thread-ids={(thread-id="[0-9]+"(,)?)+},number-of-threads="[0-9]+"} \
-    "-thread_list_ids ($name)"
-
-  set output {}
-  if {[info exists expect_out(buffer)]} {
-    set output $expect_out(buffer)
-  }
-
-  set thread_list {}
-  if {![regexp {thread-ids=\{(thread-id="[0-9]+"(,)?)*\}} $output threads]} {
-    fail "finding threads in MI output ($name)"
-  } else {
-    pass "finding threads in MI output ($name)"
-
-    # Make list of console threads
-    set start [expr {[string first \{ $threads] + 1}]
-    set end   [expr {[string first \} $threads] - 1}]
-    set threads [string range $threads $start $end]
-    foreach thread [split $threads ,] {
-      if {[scan $thread {thread-id="%d"} num]} {
-	lappend thread_list $num
-      }
-    }
-  }
-
-  return $thread_list
-}
-
-# Check that MI and the console know of the same threads.
-# Appends NAME to all test names.
-proc check_mi_and_console_threads {name} {
-  global expect_out
-
-  mi_gdb_test "-thread-list-ids" \
-    {\^done,thread-ids={(thread-id="[0-9]+"(,)*)+},number-of-threads="[0-9]+"} \
-    "-thread-list-ids ($name)"
-  set mi_output {}
-  if {[info exists expect_out(buffer)]} {
-    set mi_output $expect_out(buffer)
-  }
-
-  # GDB will return a list of thread ids and some more info:
-  #
-  # (gdb) 
-  # -interpreter-exec console "info threads"
-  # ~"  4 Thread 2051 (LWP 7734)  0x401166b1 in __libc_nanosleep () at __libc_nanosleep:-1"
-  # ~"  3 Thread 1026 (LWP 7733)   () at __libc_nanosleep:-1"
-  # ~"  2 Thread 2049 (LWP 7732)  0x401411f8 in __poll (fds=0x804bb24, nfds=1, timeout=2000) at ../sysdeps/unix/sysv/linux/poll.c:63"
-  # ~"* 1 Thread 1024 (LWP 7731)  main (argc=1, argv=0xbfffdd94) at ../../../src/gdb/testsuite/gdb.mi/pthreads.c:160"
-  # FIXME: kseitz/2002-09-05: Don't use the hack-cli method.
-  mi_gdb_test "info threads" \
-    {.*(~".*"[\r\n]*)+.*} \
-    "info threads ($name)"
-  set console_output {}
-  if {[info exists $expect_out(buffer)]} {
-    set console_output $expect_out(buffer)
-  }
-
-  # Make a list of all known threads to console (gdb's thread IDs)
-  set console_thread_list {}
-  foreach line [split $console_output \n] {
-    if {[string index $line 0] == "~"} {
-      # This is a line from the console; trim off "~", " ", "*", and "\""
-      set line [string trim $line ~\ \"\*]
-      if {[scan $line "%d" id] == 1} {
-	lappend console_thread_list $id
-      }
-    }
-  }
-
-  # Now find the result string from MI
-  set mi_result ""
-  foreach line [split $mi_output \n] {
-    if {[string range $line 0 4] == "^done"} {
-      set mi_result $line
-    }
-  }
-  if {$mi_result == ""} {
-    fail "finding MI result string ($name)"
-  } else {
-    pass "finding MI result string ($name)"
-  }
-
-  # Finally, extract the thread ids and compare them to the console
-  set num_mi_threads_str ""
-  if {![regexp {number-of-threads="[0-9]+"} $mi_result num_mi_threads_str]} {
-    fail "finding number of threads in MI output ($name)"
-  } else {
-    pass "finding number of threads in MI output ($name)"
-
-    # Extract the number of threads from the MI result
-    if {![scan $num_mi_threads_str {number-of-threads="%d"} num_mi_threads]} {
-      fail "got number of threads from MI ($name)"
-    } else {
-      pass "got number of threads from MI ($name)"
-
-      # Check if MI and console have same number of threads
-      if {$num_mi_threads != [llength $console_thread_list]} {
-	fail "console and MI have same number of threads ($name)"
-      } else {
-	pass "console and MI have same number of threads ($name)"
-
-	# Get MI thread list
-	set mi_thread_list [get_mi_thread_list $name]
-
-	# Check if MI and console have the same threads
-	set fails 0
-	foreach ct [lsort $console_thread_list] mt [lsort $mi_thread_list] {
-	  if {$ct != $mt} {
-	    incr fails
-	  }
-	}
-	if {$fails > 0} {
-	  fail "MI and console have same threads ($name)"
-
-	  # Send a list of failures to the log
-	  send_log "Console has thread ids: $console_thread_list\n"
-	  send_log "MI has thread ids: $mi_thread_list\n"
-	} else {
-	  pass "MI and console have same threads ($name)"
-	}
-      }
-    }
-  }
-}
-
-# This procedure tests the various thread commands in MI.
-proc check_mi_thread_command_set {} {
-
-  mi_runto done_making_threads
-
-  set thread_list [get_mi_thread_list "in check_mi_thread_command_set"]
-  
-  mi_gdb_test "-thread-select" \
-    {\^error,msg="mi_cmd_thread_select: USAGE: threadnum."} \
-    "check_mi_thread_command_set: -thread-select"
-
-  mi_gdb_test "-thread-select 123456789" \
-    {\^error,msg="Thread ID 123456789 not known\."} \
-    "check_mi_thread_command_set: -thread-select 123456789"
-
-  foreach thread $thread_list {
-    # line and file are optional.
-    # many of the threads are blocked in libc calls,
-    # and many people have libc's with no symbols.
-    mi_gdb_test "-thread-select $thread" \
-      "\\^done,new-thread-id=\"$thread\",frame={.*}(,line=\"(-)?\[0-9\]+\",file=\".*\")?" \
-      "check_mi_thread_command_set: -thread-select $thread"
-  }
-}
-
-#
-# Start here
-#
-set testfile "pthreads"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi2-$testfile"
-
-set options [list debug incdir=$objdir]
-if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
-    return -1
-}
-
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load $binfile
-
-check_mi_thread_command_set
-
-mi_gdb_exit
-
diff --git a/gdb/testsuite/gdb.mi/mi2-read-memory.exp b/gdb/testsuite/gdb.mi/mi2-read-memory.exp
deleted file mode 100644
index c3f16774e4a..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-read-memory.exp
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, 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
-
-#
-# test basic Machine interface (MI) operations
-#
-# Verify that, using the MI, we can load a program and do
-# other basic things that are used by all test files through  mi_gdb_exit,
-# mi_gdb_start, mi_delete_breakpoints, mi_gdb_reinitialize_dir and
-# mi_gdb_load, so we can safely use those.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but the command syntax and correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "mi-read-memory"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-
-mi_run_to_main
-mi_next_to "main" "" "mi-read-memory.c" "20" "next at main"
-
-mi_gdb_test "1-data-read-memory" \
-	"1\\^error,msg=\".*\"" \
-	"no arguments"
-
-
-mi_gdb_test "2-data-read-memory bytes x 1 3 2" \
-	"2\\^done,addr=\"$hex\",nr-bytes=\"6\",total-bytes=\"6\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0x00\",\"0x01\"\\\]},{addr=\"$hex\",data=\\\[\"0x02\",\"0x03\"\\\]},{addr=\"$hex\",data=\\\[\"0x04\",\"0x05\"\\\]}\\\]" \
-	"3x2, one byte"
-
-
-mi_gdb_test "9-data-read-memory -o -6 -- -0+bytes+6 x 1 3 2" \
-	"9\\^done,addr=\"$hex\",nr-bytes=\"6\",total-bytes=\"6\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0x00\",\"0x01\"\\\]},{addr=\"$hex\",data=\\\[\"0x02\",\"0x03\"\\\]},{addr=\"$hex\",data=\\\[\"0x04\",\"0x05\"\\\]}\\\]" \
-	"3x2, one byte offset by -6"
-
-
-mi_gdb_test "3-data-read-memory \"(shorts + 128)\" x 2 1 2" \
-	"3\\^done,addr=\"$hex\",nr-bytes=\"4\",total-bytes=\"4\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0x0100\",\"0x0102\"\\\]}\\\]" \
-	"expression in quotes"
-
-
-mi_gdb_test "4-data-read-memory bytes+16 x 1 8 4 x" \
-	"4\\^done,addr=\"$hex\",nr-bytes=\"32\",total-bytes=\"32\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0x10\",\"0x11\",\"0x12\",\"0x13\"\\\],ascii=\"xxxx\"},{addr=\"$hex\",data=\\\[\"0x14\",\"0x15\",\"0x16\",\"0x17\"\\\],ascii=\"xxxx\"},{addr=\"$hex\",data=\\\[\"0x18\",\"0x19\",\"0x1a\",\"0x1b\"\\\],ascii=\"xxxx\"},{addr=\"$hex\",data=\\\[\"0x1c\",\"0x1d\",\"0x1e\",\"0x1f\"\\\],ascii=\"xxxx\"},{addr=\"$hex\",data=\\\[\"0x20\",\"0x21\",\"0x22\",\"0x23\"\\\],ascii=\" !\\\\\"#\"},{addr=\"$hex\",data=\\\[\"0x24\",\"0x25\",\"0x26\",\"0x27\"\\\],ascii=\"\\$%&'\"},{addr=\"$hex\",data=\\\[\"0x28\",\"0x29\",\"0x2a\",\"0x2b\"\\\],ascii=\"().+\"},{addr=\"$hex\",data=\\\[\"0x2c\",\"0x2d\",\"0x2e\",\"0x2f\"\\\],ascii=\",-\./\"}\\\]" \
-	"ascii and data"
-
-
-mi_gdb_test "5-data-read-memory shorts+64 d 2 1 1" \
-	"5\\^done,addr=\"$hex\",nr-bytes=\"2\",total-bytes=\"2\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"128\"\\\]}\\\]" \
-	"decimal"
-
-mi_gdb_test "6-data-read-memory shorts+64 o 2 1 1" \
-	"6\\^done,addr=\"$hex\",nr-bytes=\"2\",total-bytes=\"2\",next-row=\"$hex\",prev-row=\"$hex\",next-page=\"$hex\",prev-page=\"$hex\",memory=\\\[{addr=\"$hex\",data=\\\[\"0200\"\\\]}\\\]" \
-	"octal"
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-regs.exp b/gdb/testsuite/gdb.mi/mi2-regs.exp
deleted file mode 100644
index 546cc93bf47..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-regs.exp
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, 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
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and look at registers.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc sparc_register_tests_no_exec { } {
-	# Test the generic IDT chip.
-	mi_gdb_test "111-data-list-register-values" \
-		".*111\\^error,msg=\"mi_cmd_data_list_register_values: Usage: -data-list-register-values <format> \\\[<regnum1>...<regnumN>\\\]\"" \
-		"wrong arguments"
-
-	mi_gdb_test "111-data-list-register-values x" \
-		".*111\\^error,msg=\"mi_cmd_data_list_register_values: No registers\.\"" \
-		"no executable"
-}
-
-# These tests exercise IDT-specific MIPS registers for several
-# different processor models.
-
-# This should detect the actual processor in use and change
-# the expected results appropriately.  FIXME
-
-proc sparc_register_tests { } {
-    global hex
-    global decimal
-    set octal "\[0-7\]+"
-    set binary "\[0-1\]+"
-    set float "\\-?((\[0-9\]+(\\.\[0-9\]+)?(e\[-+\]\[0-9\]+)?)|(nan\\($hex\\)))"
-    set float2 "\\-?\[0-9\]+"
-
-    mi_gdb_test "111-data-list-register-names" \
-	    "111\\^done,register-names=\\\[\"g0\",\"g1\",\"g2\",\"g3\",\"g4\",\"g5\",\"g6\",\"g7\",\"o0\",\"o1\",\"o2\",\"o3\",\"o4\",\"o5\",\"sp\",\"o7\",\"l0\",\"l1\",\"l2\",\"l3\",\"l4\",\"l5\",\"l6\",\"l7\",\"i0\",\"i1\",\"i2\",\"i3\",\"i4\",\"i5\",\"fp\",\"i7\",\"f0\",\"f1\",\"f2\",\"f3\",\"f4\",\"f5\",\"f6\",\"f7\",\"f8\",\"f9\",\"f10\",\"f11\",\"f12\",\"f13\",\"f14\",\"f15\",\"f16\",\"f17\",\"f18\",\"f19\",\"f20\",\"f21\",\"f22\",\"f23\",\"f24\",\"f25\",\"f26\",\"f27\",\"f28\",\"f29\",\"f30\",\"f31\",\"y\",\"psr\",\"wim\",\"tbr\",\"pc\",\"npc\",\"fpsr\",\"cpsr\"\\\]" \
-	    "list register names"
-
-    mi_gdb_test "222-data-list-register-values x" \
-	    "222\\^done,register-values=\\\[\{number=\"0\",value=\"$hex\"\}.*\{number=\"71\",value=\"$hex\"\}\\\]" \
-	    "register values x"
-
-    mi_gdb_test "333-data-list-register-values f" \
-	    "333\\^done,register-values=\\\[\{number=\"0\",value=\"$float\"\},\{number=\"1\",value=\"$float\"\},.*\{number=\"71\",value=\"$float\"\}\\\]" \
-	    "register values f"
-
-    mi_gdb_test "444-data-list-register-values d" \
-	    "444\\^done,register-values=\\\[\{number=\"0\",value=\"$decimal\"\}.*\{number=\"71\",value=\"$decimal\"\}\\\]" \
-	    "register values d"
-
-    mi_gdb_test "555-data-list-register-values o" \
-	    "555\\^done,register-values=\\\[\{number=\"0\",value=\"$octal\"\}.*\{number=\"71\",value=\"$octal\"\}\\\]" \
-	    "register values o"
-
-    mi_gdb_test "666-data-list-register-values t" \
-	    "666\\^done,register-values=\\\[\{number=\"0\",value=\"$binary\"\}.*\{number=\"71\",value=\"$binary\"\}\\\]" \
-	    "register values t"
-
-    # On the sparc, registers 0-31 are int, 32-63 float, 64-71 int
-
-    mi_gdb_test "777-data-list-register-values N" \
-	    "777\\^done,register-values=\\\[\{number=\"0\",value=\"$decimal\"\}.*\{number=\"31\",value=\"$decimal\"\},\{number=\"32\",value=\"$float\"\}.*\{number=\"63\",value=\"$float\"\},\{number=\"64\",value=\"$decimal\"\}.*\{number=\"71\",value=\"$decimal\"\}\\\]" \
-	    "register values N"
-
-    mi_gdb_test "888-data-list-register-values r" \
-	    "888\\^done,register-values=\\\[\{number=\"0\",value=\"$hex\"\}.*\{number=\"71\",value=\"$hex\"\}\\\]" \
-	    "register values r"
-
-    mi_gdb_test "999-data-list-register-names 68 69 70 71" \
-	    "999\\^done,register-names=\\\[\"pc\",\"npc\",\"fpsr\",\"cpsr\"\\\]" \
-	    "list names of some regs"
-
-    mi_gdb_test "001-data-list-register-values x 68 69 70 71" \
-	    "001\\^done,register-values=\\\[\{number=\"68\",value=\"$hex\"\},\{number=\"69\",value=\"$hex\"\},\{number=\"70\",value=\"$hex\"\},\{number=\"71\",value=\"$hex\"\}\\\]" \
-	    "list values of some regs"
-
-    mi_gdb_test "002-data-list-changed-registers" \
-	    "002\\^done,changed-registers=\\\[(\"${decimal}\"(,\"${decimal}\")*)?\\\]" \
-	    "list changed registers"
-}
-
-if [istarget "sparc-*-*"] then {
-    sparc_register_tests_no_exec
-    mi_run_to_main
-    sparc_register_tests
-} else {
-    verbose "mi-regs.exp tests ignored for this target"
-}
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-return.exp b/gdb/testsuite/gdb.mi/mi2-return.exp
deleted file mode 100644
index 98a96a360e1..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-return.exp
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, 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.  
-
-# Test Machine interface (MI) operations 
-# Verify that, using the MI, we can run a simple program and perform
-# exec-return.  
-
-# The goal is not to
-# test gdb functionality, which is done by other tests, but to verify
-# the correct output response to MI operations.  
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-
-proc test_return_simple {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    set line_callee3_head         [gdb_get_line_number "callee3 ("]
-    set line_callee3_close_brace  [expr $line_callee3_head + 3]
-
-    send_gdb "111-exec-return\n"
-    gdb_expect {
-	-re "111\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee3_close_brace\"\}\r\n$mi_gdb_prompt$" {pass "return from callee4 now"}
-	-re ".*\r\n$mi_gdb_prompt$" { fail "return from callee4 now" }
-	timeout { fail "return from callee4 now (timeout)"
-	}
-    }
-}
-
-mi_runto callee4
-
-mi_gdb_test "205-break-delete" \
-	"205\\^done.*" \
-	"delete all breakpoints"
-
-test_return_simple
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-simplerun.exp b/gdb/testsuite/gdb.mi/mi2-simplerun.exp
deleted file mode 100644
index 6fdaffde056..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-simplerun.exp
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_breakpoints_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-
-    set line_callee4_head  [gdb_get_line_number "callee4 ("]
-    set line_callee3_head  [gdb_get_line_number "callee3 ("]
-    set line_callee2_head  [gdb_get_line_number "callee2 ("]
-    set line_callee2_body  [expr $line_callee2_head + 2]
-    set line_main_head     [gdb_get_line_number "main ("]
-    set line_main_body     [expr $line_main_head + 2]
-
-    # Insert some breakpoints and list them
-    # Also, disable some so they do not interfere with other tests
-    # Tests:
-    # -break-insert
-    # -break-list
-    # -break-disable
-    # -break-info
-
-    mi_gdb_test "200-break-insert main" \
-             "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}" \
-             "break-insert operation"
-
-    mi_gdb_test "201-break-insert basics.c:callee2" \
-             "201\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee2\",file=\".*basics.c\",line=\"$line_callee2_body\",times=\"0\"\}" \
-             "insert breakpoint at basics.c:callee2"
-
-    mi_gdb_test "202-break-insert basics.c:$line_callee3_head" \
-             "202\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_head\",times=\"0\"\}" \
-             "insert breakpoint at basics.c:\$line_callee3_head"
-
-    mi_gdb_test "203-break-insert \"\\\"${srcfile}\\\":$line_callee4_head\"" \
-             "203\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_head\",times=\"0\"\}" \
-             "insert breakpoint at \"<fullfilename>\":\$line_callee4_head"
-
-    mi_gdb_test "204-break-list" \
-	    "204\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\]\}" \
-                "list of breakpoints"
-
-    mi_gdb_test "205-break-disable 2 3 4" \
-                "205\\^done.*" \
-                "disabling of breakpoints"
-
-    mi_gdb_test "206-break-info 2" \
-	    "206\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"2\",.*,enabled=\"n\",.*\}\\\]\}" \
-                "list of breakpoints, 16 disabled"
-}
-
-proc test_running_the_program {} {
-    global mi_gdb_prompt
-    global hex
-
-    set line_main_head     [gdb_get_line_number "main ("]
-    set line_main_body     [expr $line_main_head + 2]
-
-    # Run the program without args, then specify srgs and rerun the program
-    # Tests:
-    # -exec-run
-    # -gdb-set
-
-    # mi_gdb_test cannot be used for asynchronous commands because there are
-    # two prompts involved and this can lead to a race condition.
-    # The following is equivalent to a send_gdb "000-exec-run\n"
-    mi_run_cmd
-    gdb_expect {
-	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",line=\"$line_main_body\"\}\r\n$mi_gdb_prompt$" {
-	    pass "run to main"
-	}
-	-re ".*$mi_gdb_prompt$" {
-	    fail "run to main (2)"
-	}
-	timeout {
-	    fail "run to main (timeout)"
-	}
-    }
-}
-
-proc test_controlled_execution {} {
-    global mi_gdb_prompt
-    global hex
-
-    set line_callee4_head         [gdb_get_line_number "callee4 ("]
-    set line_callee4_body         [expr $line_callee4_head + 2]
-    set line_callee3_head         [gdb_get_line_number "callee3 ("]
-    set line_callee3_close_brace  [expr $line_callee3_head + 3]
-    set line_callee1_head         [gdb_get_line_number "callee1 ("]
-    set line_callee1_body         [expr $line_callee1_head + 2]
-    set line_main_head            [gdb_get_line_number "main ("]
-    set line_main_body            [expr $line_main_head + 2]
-
-    # Continue execution until a breakpoint is reached, step into calls, verifying
-    # if the arguments are correctly shown, continue to the end of a called
-    # function, step over a call (next).
-    # Tests:
-    # -exec-continue
-    # -exec-next
-    # -exec-step
-    # -exec-finish
-
-    mi_next_to "main" "" "basics.c" [expr $line_main_body + 1] "next at main"
-
-    # FIXME: A string argument is not printed right; should be fixed and
-    #        we should look for the right thing here.
-    # NOTE: The ``\\\\\"'' is for \".
-    mi_step_to "callee1" \
-	"\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument\.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}" \
-	"basics.c" "$line_callee1_body" "step at main"
-
-    # FIXME: A string argument is not printed right; should be fixed and
-    #        we should look for the right thing here.
-    mi_execute_to "exec-step 3" "end-stepping-range" "callee4" "" \
-	"basics.c" $line_callee4_body "" "step to callee4"
-
-    # FIXME: A string argument is not printed right; should be fixed and
-    #        we should look for the right thing here.
-    # NOTE: The ``.'' is part of ``gdb-result-var="$1"''
-    mi_finish_to "callee3" ".*" "basics.c" $line_callee3_close_brace ".1" "0" "exec-finish"
-}
-
-proc test_controlling_breakpoints {} {
-    global mi_gdb_prompt
-
-    # Enable, delete, set ignore counts in breakpoints
-    # (disable was already tested above)
-    # Tests:
-    # -break-delete
-    # -break-enable
-    # -break-after
-    # -break-condition
-
-}
-
-proc test_program_termination {} {
-    global mi_gdb_prompt
-
-    # Run to completion: normal and forced
-    # Tests:
-    # -exec-abort
-    # (normal termination of inferior)
-
-    # FIXME: "stopped" doesn't seem appropriate.
-    # mi_gdb_test cannot be used for asynchronous commands because there are
-    # two prompts involved and this can lead to a race condition.
-    send_gdb "999-exec-continue\n"
-    gdb_expect {
-      -re "999\\^running\r\n$mi_gdb_prompt" {
-        gdb_expect {
-          -re "999\\*stopped,reason=\"exited-normally\"\r\n$mi_gdb_prompt$" {
-            pass "continue to end"
-          }
-          -re ".*$mi_gdb_prompt$" {fail "continue to end (2)"}
-          timeout {fail "continue to end (timeout 2)"}
-        }
-      }
-      -re ".*$mi_gdb_prompt$" {fail "continue to end (1)"}
-      timeout {fail "continue to end (timeout 1)"}
-    }
-}
-
-test_breakpoints_creation_and_listing
-test_running_the_program
-test_controlled_execution
-test_controlling_breakpoints
-test_program_termination
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-stack.exp b/gdb/testsuite/gdb.mi/mi2-stack.exp
deleted file mode 100644
index 5bd150dca2c..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-stack.exp
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that stack commands work.
-
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_stack_frame_listing {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    set line_callee4_head [gdb_get_line_number "callee4 ("]
-    set line_callee4_body [expr $line_callee4_head + 2]
-
-    # Obtain a stack trace
-    # Tests:
-    # -stack-list-frames
-    # -stack-list-frames 1 1
-    # -stack-list-frames 1 3
-
-    mi_gdb_test "231-stack-list-frames" \
-	    "231\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee4_body\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"callee2\",.*\},frame=\{level=\"3\",addr=\"$hex\",func=\"callee1\",.*\},frame=\{level=\"4\",addr=\"$hex\",func=\"main\",.*\}\\\]" \
-                "stack frame listing"
-    mi_gdb_test "232-stack-list-frames 1 1" \
-	    "232\\^done,stack=\\\[frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\}\\\]" \
-                "stack frame listing 1 1"
-    mi_gdb_test "233-stack-list-frames 1 3" \
-	    "233\\^done,stack=\\\[frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"callee2\",.*\},frame=\{level=\"3\",addr=\"$hex\",func=\"callee1\",.*\}\\\]" \
-                "stack frame listing 1 3"
-
-    mi_gdb_test "234-stack-list-frames 1" \
-	    "234\\^error,msg=\"mi_cmd_stack_list_frames: Usage.*FRAME_LOW FRAME_HIGH.*\"" \
-	    "stack frame listing wrong"
-}
-
-proc test_stack_args_listing {} {
-    global mi_gdb_prompt
-    global hex
-
-    # Obtain lists for args for the stack frames
-    # Tests:
-    # -stack-list-arguments 0
-    # -stack-list-arguments 0 1 1
-    # -stack-list-arguments 0 1 3
-    # -stack-list-arguments 1
-    # -stack-list-arguments 1 1 1
-    # -stack-list-arguments 1 1 3
-    # -stack-list-arguments 
-
-    mi_gdb_test "231-stack-list-arguments 0" \
-	    "231\\^done,stack-args=\\\[frame=\{level=\"0\",args=\\\[\\\]\},frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\},frame=\{level=\"2\",args=\\\[name=\"intarg\",name=\"strarg\"\\\]\},frame=\{level=\"3\",args=\\\[name=\"intarg\",name=\"strarg\",name=\"fltarg\"\\\]\},frame=\{level=\"4\",args=\\\[\\\]\}\\\]" \
-                "stack args listing 0"
-
-    mi_gdb_test "232-stack-list-arguments 0 1 1" \
-	    "232\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\}\\\]" \
-                "stack args listing 0 1 1"
-
-    mi_gdb_test "233-stack-list-arguments 0 1 3" \
-	    "233\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[name=\"strarg\"\\\]\},frame=\{level=\"2\",args=\\\[name=\"intarg\",name=\"strarg\"\\\]\},frame=\{level=\"3\",args=\\\[name=\"intarg\",name=\"strarg\",name=\"fltarg\"\\\]\}\\\]" \
-                "stack args listing 0 1 3"
-
-    mi_gdb_test "231-stack-list-arguments 1" \
-	    "231\\^done,stack-args=\\\[frame=\{level=\"0\",args=\\\[\\\]\},frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"2\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"3\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\\\]\},frame=\{level=\"4\",args=\\\[\\\]\}\\\]" \
-                "stack args listing 1"
-
-    mi_gdb_test "232-stack-list-arguments 1 1 1" \
-	    "232\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\}\\\]" \
-                "stack args listing 1 1 1"
-
-    mi_gdb_test "233-stack-list-arguments 1 1 3" \
-	    "233\\^done,stack-args=\\\[frame=\{level=\"1\",args=\\\[\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"2\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\}\\\]\},frame=\{level=\"3\",args=\\\[\{name=\"intarg\",value=\"2\"\},\{name=\"strarg\",value=\"$hex \\\\\"A string argument.\\\\\"\"\},\{name=\"fltarg\",value=\"3.5\"\}\\\]\}\\\]" \
-                "stack args listing 1 1 3"
-
-    mi_gdb_test "234-stack-list-arguments" \
-	    "234\\^error,msg=\"mi_cmd_stack_list_args: Usage.*PRINT_VALUES.*FRAME_LOW FRAME_HIGH.*\"" \
-	    "stack args listing wrong"
-}
-
-proc test_stack_info_depth {} {
-    global mi_gdb_prompt
-    global hex
-
-    # Obtain depth of stack
-    # Tests:
-    # -stack-info-depth
-    # -stack-info-depth 3
-    # -stack-info-depth 99
-
-    mi_gdb_test "231-stack-info-depth" \
-	    "231\\^done,depth=\"5\"" \
-                "stack info-depth"
-
-    mi_gdb_test "231-stack-info-depth 3" \
-	    "231\\^done,depth=\"3\"" \
-                "stack info-depth 3"
-
-    mi_gdb_test "231-stack-info-depth 99" \
-	    "231\\^done,depth=\"5\"" \
-                "stack info-depth 99"
-
-    mi_gdb_test "231-stack-info-depth 99 99" \
-	    "231\\^error,msg=\"mi_cmd_stack_info_depth: Usage: .MAX_DEPTH.\"" \
-                "stack info-depth wrong usage"
-}
-
-proc test_stack_locals_listing {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    # Obtain lists for locals for the stack frames
-    # Tests:
-    # -stack-list-locals 0
-    # -stack-list-locals 1
-    # -stack-list-arguments 
-
-    mi_gdb_test "232-stack-list-locals 0" \
-	    "232\\^done,locals=\\\[name=\"A\",name=\"B\",name=\"C\"\\\]" \
-                "stack locals listing 0"
-
-set line_callee4_return_0 [gdb_get_line_number "return 0;"]
-
-# step until A, B, C, have some reasonable values.
-send_gdb "-exec-next 3\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" {
-	pass "next's in callee4"
-    }
-    timeout { fail "next in callee4 (timeout)" }
-}
-
-    mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\\\[\{name=\"A\",value=\"1\"\},\{name=\"B\",value=\"2\"\},\{name=\"C\",value=\"3\"\}\\\]" \
-                "stack locals listing 1"
-
-    mi_gdb_test "234-stack-list-locals" \
-	    "234\\^error,msg=\"mi_cmd_stack_list_locals: Usage.*PRINT_VALUES.*\"" \
-	    "stack locals listing wrong"
-
-    mi_gdb_test "232-stack-select-frame 1" \
-	    "232\\^done" \
-                "stack select frame 1"
-
-    mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\\\[\\\]" \
-                "stack locals listing for new frame"
-
-# this should be a no-op
-
-    mi_gdb_test "232-stack-select-frame" \
-	    "232\\^done" \
-                "stack select same frame"
-
-    mi_gdb_test "232-stack-list-locals 1" \
-	    "232\\^done,locals=\\\[\\\]" \
-                "stack locals for same frame (level 1)"
-
-}
-
-mi_runto callee4
-test_stack_frame_listing
-test_stack_args_listing
-test_stack_locals_listing
-test_stack_info_depth
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-stepi.exp b/gdb/testsuite/gdb.mi/mi2-stepi.exp
deleted file mode 100644
index adfea7ac0ec..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-stepi.exp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, 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.  
-
-# Test Machine interface (MI) operations 
-# Verify that, using the MI, we can run a simple program and perform
-# exec-step-instruction and exec-next-instruction.  
-
-# The goal is not to
-# test gdb functionality, which is done by other tests, but to verify
-# the correct output response to MI operations.  
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_stepi_nexti {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    set line_main_head  [gdb_get_line_number "main ("]
-    set line_main_body  [expr $line_main_head + 2]
-    set line_main_hello [gdb_get_line_number "Hello, World!"]
-
-    send_gdb "111-exec-step-instruction\n"
-    gdb_expect {
-	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-	    set line $expect_out(2,string)
-	    if { $line >= $line_main_body && $line <= $line_main_hello } {
-		pass "step-instruction at main"
-	    } else {
-		fail "step-instruction at main"
-	    }
-	}
-	timeout {
-	    fail "step-instruction at main (timeout)"
-	}
-    }
-    send_gdb "222-exec-next-instruction\n"
-    gdb_expect {
-	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-	    set line $expect_out(2,string)
-	    if { $line >= $line_main_body && $line <= $line_main_hello } {
-		pass "next-instruction at main"
-	    } else {
-		fail "next-instruction at main"
-	    }
-	}
-	timeout {
-	    fail "next-instruction at main (timeout)"
-	}
-    }
-    send_gdb "333-exec-next-instruction\n"
-    gdb_expect {
-	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"(\[0-9\]+)\"\}\r\n$mi_gdb_prompt$" {
-	    set line $expect_out(2,string)
-	    if { $line >= $line_main_body && $line <= $line_main_hello } {
-		pass "next-instruction at main"
-	    } else {
-		fail "next-instruction at main"
-	    }
-	}
-	timeout {
-	    fail "next-instruction at main (timeout)"
-	}
-    }
-}
-
-mi_run_to_main
-test_stepi_nexti
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
deleted file mode 100644
index 0ae4ee5da09..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2002, 2003, 2005
-# Free Software Foundation, 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
-
-# Test MI output with synthetic frames on the stack (call dummies,
-# signal handlers).
-
-if [target_info exists gdb,nosignals] {
-    verbose "Skipping mi-syn-frame.exp because of nosignals."
-    continue
-}
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-set testfile "mi-syn-frame"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-set my_mi_gdb_prompt "\\(gdb\\)\[ \]*\[\r\n\]*"
-
-mi_gdb_exit
-mi_gdb_start
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-mi_run_to_main
-
-mi_gdb_test "400-break-insert foo" "400\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"foo\",file=\".*mi-syn-frame.c\",line=\"$decimal\",times=\"0\"\}"
-
-
-#
-# Call foo() by hand, where we'll hit a breakpoint.
-#
-
-mi_gdb_test "401-data-evaluate-expression foo()" "\\&\"The program being debugged stopped while in a function called from GDB.\\\\n\"\[\r\n\]+\\&\"When the function \\(foo\\) is done executing, GDB will silently\\\\n\"\[\r\n\]+\\&\"stop \\(instead of continuing to evaluate the expression containing\\\\n\"\[\r\n\]+\\&\"the function call\\).\\\\n\"\[\r\n\]+401\\^error,msg=\"The program being debugged stopped while in a function called from GDB.*\"" "call inferior's function with a breakpoint set in it"
-
-mi_gdb_test "402-stack-list-frames" "402\\^done,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*mi-syn-frame.c\",line=\"$decimal\"\},stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"foo\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\}.*\\\]" "backtrace from inferior function stopped at bp, showing gdb dummy frame"
-
-#
-# Continue back to main()
-#
-
-send_gdb "403-exec-continue\n"
-gdb_expect {
-  -re "403\\^running\[\r\n\]+${my_mi_gdb_prompt}hi in foo\[\r\n\]+403\\\*stopped\[\r\n\]+${my_mi_gdb_prompt}$" {
-    pass "403-exec-continue"
-  }
-  timeout {
-    fail "403-exec-continue"
-  }
-}
-
-mi_gdb_test "404-stack-list-frames 0 0" "404\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\}.*\\\]"
-
-
-#
-# Call have_a_very_merry_interrupt() which will eventually raise a signal
-# that's caught by handler() which calls subroutine().
-
-mi_gdb_test "405-break-insert subroutine" "405\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"subroutine\",file=\".*mi-syn-frame.c\",line=\"$decimal\",times=\"0\"\}"
-
-mi_gdb_test "406-data-evaluate-expression have_a_very_merry_interrupt()" "Waiting to get a signal\[\r\n\]+\\&\"The program being debugged stopped while in a function called from GDB.\\\\n\"\[\r\n\]+\\&\"When the function \\(have_a_very_merry_interrupt\\) is done executing, GDB will silently\\\\n\"\[\r\n\]+\\&\"stop \\(instead of continuing to evaluate the expression containing\\\\n\"\[\r\n\]+\\&\"the function call\\).\\\\n\"\[\r\n\]+406\\^error,msg=\"The program being debugged stopped while in a function called from GDB.\\\\nWhen the function \\(have_a_very_merry_interrupt\\) is done executing, GDB will silently\\\\nstop \\(instead of continuing to evaluate the expression containing\\\\nthe function call\\).\""
-
-# We should have both a signal handler and a call dummy frame
-# in this next output.
-
-mi_gdb_test "407-stack-list-frames" "407\\^done,reason=\"breakpoint-hit\",bkptno=\"3\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"subroutine\",args=\\\[\{name=\"in\",value=\"$decimal\"\}\\\],file=\".*mi-syn-frame.c\",line=\"$decimal\"\},stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"subroutine\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"handler\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"<signal handler called>\"\},.*frame=\{level=\"$decimal\",addr=\"$hex\",func=\"have_a_very_merry_interrupt\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"$decimal\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",line=\"$decimal\"\}.*\\\]"
-
-
-send_gdb "408-exec-continue\n"
-gdb_expect {
-  -re "408\\^running\[\r\n\]+${my_mi_gdb_prompt}408\\\*stopped\[\r\n\]+${my_mi_gdb_prompt}$" {
-    pass "408-exec-continue"
-  }
-  timeout {
-    fail "408-exec-continue"
-  }
-}
-
-mi_gdb_test "409-stack-list-frames 0 0" "409\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\}.*\\\]"
-
-#
-# Call bar() by hand, which should get an exception while running.
-# 
-
-mi_gdb_test "410-data-evaluate-expression bar()" "hi in bar\[\r\n\]+\\&\"The program being debugged was signaled while in a function called from GDB.\\\\n\"\[\r\n\]+\\&\"GDB remains in the frame where the signal was received.\\\\n\"\[\r\n\]+\\&\"To change this behavior use \\\\\"set unwindonsignal on\\\\\"\\\\n\"\[\r\n\]+\\&\"Evaluation of the expression containing the function \\(bar\\) will be abandoned.\\\\n\"\[\r\n\]+410\\^error,msg=\"The program being debugged was signaled while in a function called from GDB.\\\\nGDB remains in the frame where the signal was received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\\\"\\\\nEvaluation of the expression containing the function \\(bar\\) will be abandoned.\"" "call inferior function which raises exception"
-
-mi_gdb_test "411-stack-list-frames" "411\\^done,reason=\"signal-received\",signal-name=\".*\",signal-meaning=\".*\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"bar\",args=\\\[\\\],file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"\},stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"bar\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"},frame=\{level=\"1\",addr=\"$hex\",func=\"<function called from gdb>\"\},frame=\{level=\"2\",addr=\"$hex\",func=\"main\",file=\".*mi-syn-frame.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$decimal\"}.*\\\]" "backtrace from inferior function at exception"
-
-mi_gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-until.exp b/gdb/testsuite/gdb.mi/mi2-until.exp
deleted file mode 100644
index f5d949157cb..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-until.exp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, 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
-
-# Test Machine interface (MI) operations 
-# Verify that, using the MI, we can run a simple program and perform
-# exec-until.  
-
-# The goal is not to
-# test gdb functionality, which is done by other tests, but to verify
-# the correct output response to MI operations.  
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "until"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_running_to_foo {} {
-    global mi_gdb_prompt
-    global hex
-
-    mi_gdb_test "200-break-insert 10" \
-             "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"foo\",file=\".*until.c\",line=\"10\",times=\"0\"\}" \
-             "break-insert operation"
-
-    mi_run_cmd
-
-    gdb_expect {
-	-re "000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",line=\"10\"\}\r\n$mi_gdb_prompt$" {
-	    pass "run to main"
-	}
-	-re ".*$mi_gdb_prompt$" {
-	    fail "run to main (2)"
-	}
-	timeout {
-	    fail "run to main (timeout)"
-	}
-    }
-
-    mi_gdb_test "100-break-delete 1" "100\\^done" "break-delete 1"
-
-}
-
-proc test_until {} {
-    global mi_gdb_prompt
-    global hex fullname_syntax srcfile
-
-    send_gdb "111-exec-until\n"
-    gdb_expect {
-	-re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"12\"\}\r\n$mi_gdb_prompt$" {
-	    pass "until after while loop"
-	}
-	timeout {
-	    fail "until after while loop (timeout)"
-	}
-    }
-
-    send_gdb "222-exec-until 15\n"
-    gdb_expect {
-	-re "222\\^running\r\n${mi_gdb_prompt}222\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"15\"\}\r\n$mi_gdb_prompt$" {
-	    pass "until line number"
-	}
-	timeout {
-	    fail "until line number (timeout)"
-	}
-    }
-
-    send_gdb "333-exec-until until.c:17\n"
-    gdb_expect {
-	-re "333\\^running\r\n${mi_gdb_prompt}333\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"17\"\}\r\n$mi_gdb_prompt$" {
-	    pass "until line number:file"
-	}
-	timeout {
-	    fail "until line number:file (timeout)"
-	}
-    }
-
-    # This is supposed to NOT stop at line 25. It stops right after foo is over.
-
-    send_gdb "444-exec-until until.c:25\n"
-    gdb_expect {
-	-re "444\\^running\r\n${mi_gdb_prompt}444\\*stopped,reason=\"location-reached\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"main\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"24\"\}\r\n$mi_gdb_prompt$" {
-	    pass "until after current function"
-	}
-	timeout {
-	    fail "until after current function (timeout)"
-	}
-    }
-
-}
-
-test_running_to_foo
-test_until
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-var-block.exp b/gdb/testsuite/gdb.mi/mi2-var-block.exp
deleted file mode 100644
index 474891030cc..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-var-block.exp
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, 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.
-
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can create, update, delete variables.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-mi_runto do_block_tests
-
-# Test: c_variable-3.2
-# Desc: create cb and foo
-mi_gdb_test "-var-create cb * cb" \
-	"\\^done,name=\"cb\",numchild=\"0\",type=\"int\"" \
-	"create local variable cb"
-
-mi_gdb_test "-var-create foo * foo" \
-	"&\"mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create local variable foo"
-
-# step to "foo = 123;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo = 123;"] \
-    "step at do_block_test"
-
-
-# Be paranoid and assume 3.2 created foo
-mi_gdb_test "-var-delete foo" \
-	"&\"Variable object not found\\\\n\".*\\^error,msg=\"Variable object not found\"" \
-	"delete var foo"
-
-
-# Test: c_variable-3.3
-# Desc: create foo
-mi_gdb_test "-var-create foo * foo" \
-	"\\^done,name=\"foo\",numchild=\"0\",type=\"int\"" \
-	"create local variable foo"
-
-# step to "foo2 = 123;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo2 = 123;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.4
-# Desc: check foo, cb changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"foo\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"cb\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: cb foo changed"
-
-# step to "foo = 321;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo = 321;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.5
-# Desc: create inner block foo
-mi_gdb_test "-var-create inner_foo * foo" \
-	"\\^done,name=\"inner_foo\",numchild=\"0\",type=\"int\"" \
-	"create local variable inner_foo"
-
-# step to "foo2 = 0;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo2 = 0;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.6
-# Desc: create foo2
-mi_gdb_test "-var-create foo2 * foo2" \
-	"\\^done,name=\"foo2\",numchild=\"0\",type=\"int\"" \
-	"create local variable foo2"
-
-# Test: c_variable-3.7
-# Desc: check that outer foo in scope and inner foo out of scope
-# Note: also a known gdb problem
-setup_xfail *-*-*
-mi_gdb_test "-var-update inner_foo" \
-	"\\^done,changelist=\{FIXME\}" \
-	"update inner_foo: should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-
-setup_xfail *-*-*
-mi_gdb_test "-var-evaluate-expression inner_foo" \
-	"\\^done,value=\{FIXME\}" \
-	"evaluate inner_foo: should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-
-mi_gdb_test "-var-update foo" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update foo: did not change"
-
-mi_gdb_test "-var-delete inner_foo" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var inner_foo"
-
-# step to "foo = 0;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "foo = 0;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.8
-# Desc: check that foo2 out of scope (known gdb problem)
-setup_xfail *-*-*
-mi_gdb_test "-var-update foo2" \
-	"\\^done,changelist=\{FIXME\}" \
-	"update foo2: should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-
-# step to "cb = 21;"
-mi_step_to "do_block_tests" "" "var-cmd.c" \
-    [gdb_get_line_number "cb = 21;"] \
-    "step at do_block_test"
-
-# Test: c_variable-3.9
-# Desc: check that only cb is in scope (known gdb problem)
-setup_xfail *-*-*
-mi_gdb_test "-var-update foo2" \
-	"\\^done,changelist=\\\[FIXME\\\]" \
-	"update foo2 should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-setup_xfail *-*-*
-mi_gdb_test "-var-update foo" \
-	"\\^done,changelist=\{FIXME\}" \
-	"update foo should be out of scope: KNOWN PROBLEM"
-clear_xfail *-*-*
-mi_gdb_test "-var-update cb" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update cb"
-
-# 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
-mi_gdb_test "-var-delete foo" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var foo"
-
-mi_gdb_test "-var-delete foo2" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var foo2"
-
-mi_gdb_test "-var-delete cb" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var cb"
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp
deleted file mode 100644
index be2dc849214..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-var-child.exp
+++ /dev/null
@@ -1,1206 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
-
-# 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.
-
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can create, update, delete variables.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-mi_runto do_children_tests
-
-#####        #####
-#                #
-# children tests #
-#                #
-#####        #####
-
-
-# Test: c_variable-4.2
-# Desc: create variable "struct_declarations"
-mi_gdb_test "-var-create struct_declarations * struct_declarations" \
-	"\\^done,name=\"struct_declarations\",numchild=\"11\",type=\"struct _struct_decl\"" \
-	"create local variable struct_declarations"
-
-# Test: c_variable-4.3
-# Desc: children of struct_declarations
-# STABS doesn't give us argument types for the func ptr structs, but
-# Dwarf 2 does.
-mi_gdb_test "-var-list-children struct_declarations" \
-	"\\^done,numchild=\"11\",children=\\\[child=\{name=\"struct_declarations.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"struct_declarations.character\",exp=\"character\",numchild=\"0\",type=\"char\"\},child={name=\"struct_declarations.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"struct_declarations.long_int\",exp=\"long_int\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.int_ptr_ptr\",exp=\"int_ptr_ptr\",numchild=\"1\",type=\"int \\*\\*\"\},child=\{name=\"struct_declarations.long_array\",exp=\"long_array\",numchild=\"10\",type=\"long int \\\[10\\\]\"\},child=\{name=\"struct_declarations.func_ptr\",exp=\"func_ptr\",numchild=\"0\",type=\"void \\(\\*\\)\\((void)?\\)\"\},child=\{name=\"struct_declarations.func_ptr_struct\",exp=\"func_ptr_struct\",numchild=\"0\",type=\"struct _struct_decl \\(\\*\\)\\((int, char \\*, long int)?\\)\"\},child=\{name=\"struct_declarations.func_ptr_ptr\",exp=\"func_ptr_ptr\",numchild=\"0\",type=\"struct _struct_decl \\*\\(\\*\\)\\((int, char \\*, long int)?\\)\"\},child=\{name=\"struct_declarations.u1\",exp=\"u1\",numchild=\"4\",type=\"union \{\\.\\.\\.\}\"\},child=\{name=\"struct_declarations.s2\",exp=\"s2\",numchild=\"4\",type=\"struct \{\\.\\.\\.\}\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children struct_declarations" \
-	"\\^done,numchild=\"11\"" \
-	"get number of children of struct_declarations"
-
-# Test: c_variable-4.5
-# Desc: children of struct_declarations.integer
-mi_gdb_test "-var-list-children struct_declarations.integer" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.integer"
-
-# Test: c_variable-4.6
-# Desc: number of children of struct_declarations.integer
-mi_gdb_test "-var-info-num-children struct_declarations.integer" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.integer"
-
-# Test: c_variable-4.7
-# Desc: children of struct_declarations.character
-mi_gdb_test "-var-list-children struct_declarations.character" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.character"
-
-# Test: c_variable-4.8
-# Desc: number of children of struct_declarations.character
-mi_gdb_test "-var-info-num-children struct_declarations.character" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.character"
-
-# Test: c_variable-4.9
-# Desc: children of struct_declarations.char_ptr
-mi_gdb_test "-var-list-children struct_declarations.char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"struct_declarations.char_ptr.\\*char_ptr\",exp=\"\\*char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of struct_declarations.char_ptr"
-
-# Test: c_variable-4.10
-# Desc: number of children of struct_declarations.char_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of struct_declarations.char_ptr"
-
-# Test: c_variable-4.11
-# Desc: children of struct_declarations.long_int
-mi_gdb_test "-var-list-children struct_declarations.long_int" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_int"
-
-# Test: c_variable-4.12
-# Desc: number of children of struct_declarations.long_int
-mi_gdb_test "-var-info-num-children struct_declarations.long_int" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_int"
-
-# Test: c_variable-4.13
-# Desc: children of int_ptr_ptr
-mi_gdb_test "-var-list-children struct_declarations.int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"struct_declarations.int_ptr_ptr.\\*int_ptr_ptr\",exp=\"\\*int_ptr_ptr\",numchild=\"1\",type=\"int \\*\"\}\\\]" \
-	"get children of struct_declarations.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
-mi_gdb_test "-var-info-num-children struct_declarations.int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of struct_declarations.int_ptr_ptr"
-
-
-# Test: c_variable-4.15
-# Desc: children of struct_declarations.long_array
-mi_gdb_test "-var-list-children struct_declarations.long_array" \
-	"\\^done,numchild=\"10\",children=\\\[child=\{name=\"struct_declarations.long_array.0\",exp=\"0\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.1\",exp=\"1\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.2\",exp=\"2\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.3\",exp=\"3\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.4\",exp=\"4\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.5\",exp=\"5\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.6\",exp=\"6\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.7\",exp=\"7\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.8\",exp=\"8\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.long_array.9\",exp=\"9\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of struct_declarations.long_array"
-
-# Test: c_variable-4.16
-# Desc: number of children of struct_declarations.long_array
-mi_gdb_test "-var-info-num-children struct_declarations.long_array" \
-	"\\^done,numchild=\"10\"" \
-	"get number of children of struct_declarations.long_array"
-
-# Test: c_variable-4.17
-# Desc: children of struct_declarations.func_ptr
-mi_gdb_test "-var-list-children struct_declarations.func_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.func_ptr"
-
-
-# Test: c_variable-4.18
-# Desc: number of children of struct_declarations.func_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.func_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.func_ptr"
-
-
-# Test: c_variable-4.19
-# Desc: children of struct_declarations.func_ptr_struct
-mi_gdb_test "-var-list-children struct_declarations.func_ptr_struct" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.func_ptr_struct"
-
-# Test: c_variable-4.20
-# Desc: number of children of struct_declarations.func_ptr_struct
-mi_gdb_test "-var-info-num-children struct_declarations.func_ptr_struct" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.func_ptr_struct"
-
-
-# Test: c_variable-4.21
-# Desc: children of struct_declarations.func_ptr_ptr
-mi_gdb_test "-var-list-children struct_declarations.func_ptr_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.func_ptr_ptr"
-
-# Test: c_variable-4.22
-# Desc: number of children of struct_declarations.func_ptr_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.func_ptr_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.func_ptr_ptr"
-
-
-# Test: c_variable-4.23
-# Desc: children of struct_declarations.u1
-mi_gdb_test "-var-list-children struct_declarations.u1" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"struct_declarations.u1.a\",exp=\"a\",numchild=\"0\",type=\"int\"\},child=\{name=\"struct_declarations.u1.b\",exp=\"b\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"struct_declarations.u1.c\",exp=\"c\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.u1.d\",exp=\"d\",numchild=\"0\",type=\"enum foo\"\}\\\]" \
-	"get children of struct_declarations.u1"
-
-# Test: c_variable-4.24
-# Desc: number of children of struct_declarations.u1
-mi_gdb_test "-var-info-num-children struct_declarations.u1" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of struct_declarations.u1"
-
-# Test: c_variable-4.25
-# Desc: children of struct_declarations.s2
-mi_gdb_test "-var-list-children struct_declarations.s2" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"struct_declarations.s2.u2\",exp=\"u2\",numchild=\"3\",type=\"union \{\\.\\.\\.\}\"\},child=\{name=\"struct_declarations.s2.g\",exp=\"g\",numchild=\"0\",type=\"int\"\},child=\{name=\"struct_declarations.s2.h\",exp=\"h\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.i\",exp=\"i\",numchild=\"10\",type=\"long int \\\[10\\\]\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children struct_declarations.s2" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of struct_declarations.s2"
-
-
-# Test: c_variable-4.27
-# Desc: children of struct_declarations.long_array.1
-mi_gdb_test "-var-list-children struct_declarations.long_array.1" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.1"
-
-# Test: c_variable-4.28
-# Desc: number of children of struct_declarations.long_array.1
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.1" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.1"
-
-# Test: c_variable-4.29
-# Desc: children of struct_declarations.long_array.2
-mi_gdb_test "-var-list-children struct_declarations.long_array.2" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.2"
-
-# Test: c_variable-4.30
-# Desc: number of children of struct_declarations.long_array.2
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.2" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.2"
-
-# Test: c_variable-4.31
-# Desc: children of struct_declarations.long_array.3
-mi_gdb_test "-var-list-children struct_declarations.long_array.3" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.3"
-
-# Test: c_variable-4.32
-# Desc: number of children of struct_declarations.long_array.3
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.3" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.3"
-
-# Test: c_variable-4.33 
-# Desc: children of struct_declarations.long_array.4
-mi_gdb_test "-var-list-children struct_declarations.long_array.4" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.4"
-
-# Test: c_variable-4.34
-# Desc: number of children of struct_declarations.long_array.4
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.4" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.4"
-
-# Test: c_variable-4.35
-# Desc: children of struct_declarations.long_array.5
-mi_gdb_test "-var-list-children struct_declarations.long_array.5" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.5"
-
-# Test: c_variable-4.36
-# Desc: number of children of struct_declarations.long_array.5
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.5" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.5"
-
-# Test: c_variable-4.37
-# Desc: children of struct_declarations.long_array.6
-mi_gdb_test "-var-list-children struct_declarations.long_array.6" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.6"
-
-# Test: c_variable-4.38
-# Desc: number of children of struct_declarations.long_array.6
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.6" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.6"
-
-# Test: c_variable-4.39
-# Desc: children of struct_declarations.long_array.7
-mi_gdb_test "-var-list-children struct_declarations.long_array.7" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.7"
-
-# Test: c_variable-4.40
-# Desc: number of children of struct_declarations.long_array.7
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.7" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.7"
-
-# Test: c_variable-4.41
-# Desc: children of struct_declarations.long_array.8
-mi_gdb_test "-var-list-children struct_declarations.long_array.8" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.8"
-
-# Test: c_variable-4.42
-# Desc: number of children of struct_declarations.long_array.8
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.8" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.8"
-
-
-# Test: c_variable-4.43
-# Desc: children of struct_declarations.long_array.9
-mi_gdb_test "-var-list-children struct_declarations.long_array.9" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.long_array.9"
-
-# Test: c_variable-4.44
-# Desc: number of children of struct_declarations.long_array.9
-mi_gdb_test "-var-info-num-children struct_declarations.long_array.9" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.long_array.9"
-
-# Test: c_variable-4.45
-# Desc: children of struct_declarations.u1.a
-mi_gdb_test "-var-list-children struct_declarations.u1.a" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.u1.a"
-
-# Test: c_variable-4.46
-# Desc: number of children of struct_declarations.u1.a
-mi_gdb_test "-var-info-num-children struct_declarations.u1.a" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.u1.a"
-
-# Test: c_variable-4.47
-# Desc: children of struct_declarations.u1.b
-mi_gdb_test "-var-list-children struct_declarations.u1.b" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"struct_declarations.u1.b.\\*b\",exp=\"\\*b\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of struct_declarations.u1.b"
-
-# Test: c_variable-4.48
-# Desc: number of children of struct_declarations.u1.b
-mi_gdb_test "-var-info-num-children struct_declarations.u1.b" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of struct_declarations.u1.b"
-
-# Test: c_variable-4.49
-# Desc: children of struct_declarations.u1.c
-mi_gdb_test "-var-list-children struct_declarations.u1.c" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.u1.c"
-
-# Test: c_variable-4.50
-# Desc: number of children of struct_declarations.u1.c
-mi_gdb_test "-var-info-num-children struct_declarations.u1.c" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.u1.c"
-
-# Test: c_variable-4.51
-# Desc: children of struct_declarations.u1.d
-mi_gdb_test "-var-list-children struct_declarations.u1.d" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.u1.d"
-
-
-# Test: c_variable-4.52
-# Desc: number of children of struct_declarations.u1.d
-mi_gdb_test "-var-info-num-children struct_declarations.u1.d" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.u1.d"
-
-
-# Test: c_variable-4.53
-# Desc: children of struct_declarations.s2.u2
-mi_gdb_test "-var-list-children struct_declarations.s2.u2" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s1\",exp=\"u1s1\",numchild=\"4\",type=\"struct \{\\.\\.\\.\}\"\},child=\{name=\"struct_declarations.s2.u2.f\",exp=\"f\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.u2.u1s2\",exp=\"u1s2\",numchild=\"2\",type=\"struct \{\\.\\.\\.\}\"\}\\\]" \
-	"get children of struct_declarations.s2.u2"
-
-# Test: c_variable-4.54
-# Desc: number of children of struct_declarations.s2.u2
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2" \
-	"\\^done,numchild=\"3\"" \
-	"get number of children of struct_declarations.s2.u2"
-
-# Test: c_variable-4.55
-# Desc: children of struct_declarations.s2.g
-mi_gdb_test "-var-list-children struct_declarations.s2.g" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.g"
-
-# Test: c_variable-4.56
-# Desc: number of children of struct_declarations.s2.g
-mi_gdb_test "-var-info-num-children struct_declarations.s2.g" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.g"
-
-
-# Test: c_variable-4.57
-# Desc: children of struct_declarations.s2.h
-mi_gdb_test "-var-list-children struct_declarations.s2.h" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.h"
-
-# Test: c_variable-4.58
-# Desc: number of children of struct_declarations.s2.h
-mi_gdb_test "-var-info-num-children struct_declarations.s2.h" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.h"
-
-
-# Test: c_variable-4.59
-# Desc: children of struct_declarations.s2.i
-mi_gdb_test "-var-list-children struct_declarations.s2.i" \
-	"\\^done,numchild=\"10\",children=\\\[child=\{name=\"struct_declarations.s2.i.0\",exp=\"0\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.1\",exp=\"1\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.2\",exp=\"2\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.3\",exp=\"3\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.4\",exp=\"4\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.5\",exp=\"5\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.6\",exp=\"6\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.7\",exp=\"7\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.8\",exp=\"8\",numchild=\"0\",type=\"long int\"\},child=\{name=\"struct_declarations.s2.i.9\",exp=\"9\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of struct_declarations.s2.i"
-
-# Test: c_variable-4.60
-# Desc: number of children of struct_declarations.s2.i
-mi_gdb_test "-var-info-num-children struct_declarations.s2.i" \
-	"\\^done,numchild=\"10\"" \
-	"get number of children of struct_declarations.s2.i"
-
-# Test: c_variable-4.61
-# Desc: children of struct_declarations.s2.u2.u1s1
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s1.d\",exp=\"d\",numchild=\"0\",type=\"int\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e\",exp=\"e\",numchild=\"10\",type=\"char \\\[10\\\]\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.func\",exp=\"func\",numchild=\"0\",type=\"int \\*\\(\\*\\)\\((void)?\\)\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.foo\",exp=\"foo\",numchild=\"0\",type=\"efoo\"\}\\\]" \
-	"get children of struct_declarations.s2.u2.u1s1"
-
-# Test: c_variable-4.62
-# Desc: number of children of struct_declarations.s2.u2.u1s1
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1"
-
-# Test: c_variable-4.63
-# Desc: children of struct_declarations.s2.u2.f
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.f" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.f"
-
-# Test: c_variable-4.64
-# Desc: number of children of struct_declarations.s2.u2.f
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.f" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.f"
-
-# Test: c_variable-4.65
-# Desc: children of struct_declarations.s2.u2.u1s2
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s2" \
-	"\\^done,numchild=\"2\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s2.array_ptr\",exp=\"array_ptr\",numchild=\"2\",type=\"char \\\[2\\\]\"\},child=\{name=\"struct_declarations.s2.u2.u1s2.func\",exp=\"func\",numchild=\"0\",type=\"int \\(\\*\\)\\((int, char \\*)?\\)\"\}\\\]" \
-	"get children of struct_declarations.s2.u2.u1s2"
-
-# Test: c_variable-4.66
-# Desc: number of children of struct_declarations.s2.u2.u1s2
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s2" \
-	"\\^done,numchild=\"2\"" \
-	"get number of children of struct_declarations.s2.u2.u1s2"
-
-# Test: c_variable-4.67
-# Desc: children of struct_declarations.s2.u2.u1s1.d
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1.d" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.u1s1.d"
-
-# Test: c_variable-4.68
-# Desc: number of children of struct_declarations.s2.u2.u1s1.d
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1.d" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1.d"
-
-# Test: c_variable-4.69
-# Desc: children of struct_declarations.s2.u2.u1s1.e
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1.e" \
-	"\\^done,numchild=\"10\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s1.e.0\",exp=\"0\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.1\",exp=\"1\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.2\",exp=\"2\",numchild=\"0\",type=\"char\"\},child={name=\"struct_declarations.s2.u2.u1s1.e.3\",exp=\"3\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.4\",exp=\"4\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.5\",exp=\"5\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.6\",exp=\"6\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.7\",exp=\"7\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.8\",exp=\"8\",numchild=\"0\",type=\"char\"\},child=\{name=\"struct_declarations.s2.u2.u1s1.e.9\",exp=\"9\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of struct_declarations.s2.u2.u1s1.e"
-
-# Test: c_variable-4.70
-# Desc: number of children of struct_declarations.s2.u2.u1s1.e
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1.e" \
-	"\\^done,numchild=\"10\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1.e"
-
-
-# Test: c_variable-4.71
-# Desc: children of struct_declarations.s2.u2.u1s1.func
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1.func" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.u1s1.func"
-
-# Test: c_variable-4.72
-# Desc: number of children of struct_declarations.s2.u2.u1s1.func
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1.func" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1.func"
-
-
-# Test: c_variable-4.73
-# Desc: children of struct_declarations.s2.u2.u1s1.foo
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s1.foo" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.u1s1.foo"
-
-# Test: c_variable-4.74
-# Desc: number of children of struct_declarations.s2.u2.u1s1.foo
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s1.foo" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.u1s1.foo"
-
-
-# Test: c_variable-4.75
-# Desc: children of struct_declarations.s2.u2.u1s2.array_ptr
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s2.array_ptr" \
-	"\\^done,numchild=\"2\",children=\\\[child=\{name=\"struct_declarations.s2.u2.u1s2.array_ptr.0\",exp=\"0\",numchild=\"0\",type=\"char\"\},child={name=\"struct_declarations.s2.u2.u1s2.array_ptr.1\",exp=\"1\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of struct_declarations.s2.u2.u1s2.array_ptr"
-
-# Test: c_variable-4.76
-# Desc: number of children of struct_declarations.s2.u2.u1s2.array_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s2.array_ptr" \
-	"\\^done,numchild=\"2\"" \
-	"get number of children of struct_declarations.s2.u2.u1s2.array_ptr"
-
-# Test: c_variable-4.77
-# Desc: children of struct_declarations.s2.u2.u1s2.func
-mi_gdb_test "-var-list-children struct_declarations.s2.u2.u1s2.func" \
-	"\\^done,numchild=\"0\"" \
-	"get children of struct_declarations.s2.u2.u1s2.func"
-
-# Test: c_variable-4.78
-# Desc: number of children of struct_declarations.s2.u2.u1s2.func
-mi_gdb_test "-var-info-num-children struct_declarations.s2.u2.u1s2.func" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of struct_declarations.s2.u2.u1s2.func"
-
-# Test: c_variable-4.79
-# Desc: children of struct_declarations.int_ptr_ptr.*int_ptr_ptr
-mi_gdb_test "-var-list-children struct_declarations.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"struct_declarations.int_ptr_ptr.\\*int_ptr_ptr.\\*\\*int_ptr_ptr\",exp=\"\\*\\*int_ptr_ptr\",numchild=\"0\",type=\"int\"\}\\\]" \
-	"get children of 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.*int_ptr_ptr
-mi_gdb_test "-var-info-num-children struct_declarations.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of struct_declarations.int_ptr_ptr.*int_ptr_ptr"
-
-
-# Step to "struct_declarations.integer = 123;"
-set line_dct_123 [gdb_get_line_number "struct_declarations.integer = 123;"]
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-      $line_dct_123 "step to line \$line_dct_123"
-
-# Test: c_variable-4.81
-# Desc: create local variable "weird"
-mi_gdb_test "-var-create weird * weird" \
-	"\\^done,name=\"weird\",numchild=\"11\",type=\"weird_struct \\*\"" \
-	"create local variable weird"
-
-# Test: c_variable-4.82
-# Desc: children of weird
-mi_gdb_test "-var-list-children weird" \
-	"\\^done,numchild=\"11\",children=\\\[child=\{name=\"weird.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"weird.character\",exp=\"character\",numchild=\"0\",type=\"char\"\},child=\{name=\"weird.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"weird.long_int\",exp=\"long_int\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.int_ptr_ptr\",exp=\"int_ptr_ptr\",numchild=\"1\",type=\"int \\*\\*\"\},child=\{name=\"weird.long_array\",exp=\"long_array\",numchild=\"10\",type=\"long int \\\[10\\\]\"\},child=\{name=\"weird.func_ptr\",exp=\"func_ptr\",numchild=\"0\",type=\"void \\(\\*\\)\\((void)?\\)\"\},child=\{name=\"weird.func_ptr_struct\",exp=\"func_ptr_struct\",numchild=\"0\",type=\"struct _struct_decl \\(\\*\\)\\((int, char \\*, long int)?\\)\"\},child=\{name=\"weird.func_ptr_ptr\",exp=\"func_ptr_ptr\",numchild=\"0\",type=\"struct _struct_decl \\*\\(\\*\\)\\((int, char \\*, long int)?\\)\"\},child=\{name=\"weird.u1\",exp=\"u1\",numchild=\"4\",type=\"union \{\\.\\.\\.\}\"\},child=\{name=\"weird.s2\",exp=\"s2\",numchild=\"4\",type=\"struct \{\\.\\.\\.\}\"\}\\\]" \
-	"get children of weird"
-
-# Test: c_variable-4.83
-# Desc: number of children of weird
-mi_gdb_test "-var-info-num-children weird" \
-	"\\^done,numchild=\"11\"" \
-	"get number of children of weird"
-
-
-# Test: c_variable-4.84
-# Desc: children of weird->long_array
-mi_gdb_test "-var-list-children weird.long_array" \
-	"\\^done,numchild=\"10\",children=\\\[child=\{name=\"weird.long_array.0\",exp=\"0\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.1\",exp=\"1\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.2\",exp=\"2\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.3\",exp=\"3\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.4\",exp=\"4\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.5\",exp=\"5\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.6\",exp=\"6\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.7\",exp=\"7\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.8\",exp=\"8\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.long_array.9\",exp=\"9\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children weird.long_array" \
-	"\\^done,numchild=\"10\"" \
-	"get number of children of weird.long_array"
-
-# Test: c_variable-4.86
-# Desc: children of weird.int_ptr_ptr
-mi_gdb_test "-var-list-children weird.int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"weird.int_ptr_ptr.\\*int_ptr_ptr\",exp=\"\\*int_ptr_ptr\",numchild=\"1\",type=\"int \\*\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children weird.int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of weird.int_ptr_ptr"
-
-# Test: c_variable-4.88
-# Desc: children of *weird->int_ptr_ptr
-mi_gdb_test "-var-list-children weird.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"weird.int_ptr_ptr.\\*int_ptr_ptr.\\*\\*int_ptr_ptr\",exp=\"\\*\\*int_ptr_ptr\",numchild=\"0\",type=\"int\"\}\\\]" \
-	"get children of weird.int_ptr_ptr.*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
-mi_gdb_test "-var-info-num-children weird.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of weird.int_ptr_ptr.*int_ptr_ptr"
-
-# Test: c_variable-4.90
-# Desc: create weird->int_ptr_ptr
-mi_gdb_test "-var-create weird->int_ptr_ptr * weird->int_ptr_ptr" \
-	"\\^done,name=\"weird->int_ptr_ptr\",numchild=\"1\",type=\"int \\*\\*\"" \
-	"create local variable weird->int_ptr_ptr"
-
-# Test: c_variable-4.91
-# Desc: children of weird->int_ptr_ptr
-mi_gdb_test "-var-list-children weird->int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"weird->int_ptr_ptr.\\*weird->int_ptr_ptr\",exp=\"\\*weird->int_ptr_ptr\",numchild=\"1\",type=\"int \\*\"\}\\\]" \
-	"get children of weird->int_ptr_ptr"
-
-
-# Test: c_variable-4.92
-# Desc: number of children of (weird->int_ptr_ptr)
-mi_gdb_test "-var-info-num-children weird->int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of weird->int_ptr_ptr"
-
-# Test: c_variable-4.93
-# Desc: children of *(weird->int_ptr_ptr)
-mi_gdb_test "-var-list-children weird->int_ptr_ptr.*weird->int_ptr_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"weird->int_ptr_ptr.\\*weird->int_ptr_ptr.\\*\\*weird->int_ptr_ptr\",exp=\"\\*\\*weird->int_ptr_ptr\",numchild=\"0\",type=\"int\"\}\\\]" \
-	"get children of weird->int_ptr_ptr.*weird->int_ptr_ptr"
-
-# Test: c_variable-4.94
-# Desc: number of children of *(weird->int_ptr_ptr)
-mi_gdb_test "-var-info-num-children weird->int_ptr_ptr.*weird->int_ptr_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of weird->int_ptr_ptr.*weird->int_ptr_ptr"
-
-# Test: c_variable-4.95
-# Desc: children of *(*(weird->int_ptr_ptr))
-mi_gdb_test "-var-list-children weird->int_ptr_ptr.*weird->int_ptr_ptr.**weird->int_ptr_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of 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))
-mi_gdb_test "-var-info-num-children weird->int_ptr_ptr.*weird->int_ptr_ptr.**weird->int_ptr_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of weird->int_ptr_ptr.*weird->int_ptr_ptr.**weird->int_ptr_ptr"
-
-# Test: c_variable-4.97
-# Desc: is weird editable
-mi_gdb_test "-var-show-attributes weird" \
-	"\\^done,attr=\"editable\"" \
-	"is weird editable"
-
-# Test: c_variable-4.98
-# Desc: is weird->int_ptr_ptr editable
-mi_gdb_test "-var-show-attributes weird->int_ptr_ptr" \
-	"\\^done,attr=\"editable\"" \
-	"is weird->int_ptr_ptr editable"
-
-# Test: c_variable-4.99
-# Desc: is *(weird->int_ptr_ptr) editable
-mi_gdb_test "-var-show-attributes weird.int_ptr_ptr.*int_ptr_ptr" \
-	"\\^done,attr=\"editable\"" \
-	"is weird.int_ptr_ptr.*int_ptr_ptr editable"
-
-# Test: c_variable-4.100
-# Desc: is *(*(weird->int_ptr_ptr)) editable
-mi_gdb_test "-var-show-attributes weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr" \
-	"\\^done,attr=\"editable\"" \
-	"is weird.int_ptr_ptr.*int_ptr_ptr.**int_ptr_ptr editable"
-
-# Test: c_variable-4.101
-# Desc: is weird->u1 editable
-mi_gdb_test "-var-show-attributes weird.u1" \
-	"\\^done,attr=\"noneditable\"" \
-	"is weird.u1 editable"
-
-# Test: c_variable-4.102
-# Desc: is weird->s2 editable
-mi_gdb_test "-var-show-attributes weird.s2" \
-	"\\^done,attr=\"noneditable\"" \
-	"is weird.s2 editable"
-
-# Test: c_variable-4.103
-# Desc: is struct_declarations.u1.a editable
-mi_gdb_test "-var-show-attributes struct_declarations.u1.a" \
-	"\\^done,attr=\"editable\"" \
-	"is struct_declarations.u1.a editable"
-
-# Test: c_variable-4.104
-# Desc: is struct_declarations.u1.b editable
-mi_gdb_test "-var-show-attributes struct_declarations.u1.b" \
-	"\\^done,attr=\"editable\"" \
-	"is struct_declarations.u1.b editable"
-
-# Test: c_variable-4.105
-# Desc: is struct_declarations.u1.c editable
-mi_gdb_test "-var-show-attributes struct_declarations.u1.c" \
-	"\\^done,attr=\"editable\"" \
-	"is struct_declarations.u1.c editable"
-
-# Test: c_variable-4.106
-# Desc: is struct_declarations.long_array editable
-mi_gdb_test "-var-show-attributes struct_declarations.long_array" \
-	"\\^done,attr=\"noneditable\"" \
-	"is struct_declarations.long_array editable"
-
-# Test: c_variable-4.107
-# Desc: is struct_declarations.long_array[0] editable
-mi_gdb_test "-var-show-attributes struct_declarations.long_array.0" \
-	"\\^done,attr=\"editable\"" \
-	"is struct_declarations.long_array.0 editable"
-
-# Test: c_variable-4.108
-# Desc: is struct_declarations editable
-mi_gdb_test "-var-show-attributes struct_declarations" \
-	"\\^done,attr=\"noneditable\"" \
-	"is struct_declarations editable"
-
-mi_gdb_test "-var-delete weird" \
-	"\\^done,ndeleted=\"24\"" \
-	"delete var weird"
-
-#####                         #####
-#                                 #
-# children and update tests #
-#                                 #
-#####                         #####
-
-# Test: c_variable-5.1
-# Desc: check that nothing changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update all vars. None changed"
-
-# Step over "struct_declarations.integer = 123;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 1] "step \$line_dct_123 + 1"
-
-# Test: c_variable-5.2
-# Desc: check that integer changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.integer\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.integer"
-
-# Step over:
-#    weird->char_ptr = "hello";
-#    bar = 2121;
-#    foo = &bar;
-mi_execute_to "exec-step 3" "end-stepping-range" do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 4] {} "step \$line_dct_123 + 4"
-
-# Test: c_variable-5.3
-# Desc: check that char_ptr changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.char_ptr.\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.char_ptr"
-
-# Step over "struct_declarations.int_ptr_ptr = &foo;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 5] "step \$line_dct_123 + 5"
-
-# Test: c_variable-5.4
-# Desc: check that int_ptr_ptr and children changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"weird->int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"weird->int_ptr_ptr.\\*weird->int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"weird->int_ptr_ptr.\\*weird->int_ptr_ptr.\\*\\*weird->int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.int_ptr_ptr.\\*int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.int_ptr_ptr.\\*int_ptr_ptr.\\*\\*int_ptr_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars int_ptr_ptr and children changed"
-
-# Step over "weird->long_array[0] = 1234;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 6] "step \$line_dct_123 + 6"
-
-# Test: c_variable-5.5
-# Desc: check that long_array[0] changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.long_array.0\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.long_array.0 changed"
-
-# Step over "struct_declarations.long_array[1] = 2345;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 7] "step \$line_dct_123 + 7"
-
-# Test: c_variable-5.6
-# Desc: check that long_array[1] changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.long_array.1\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.long_array.1 changed"
-
-# Step over "weird->long_array[2] = 3456;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_123 + 8] "step \$line_dct_123 + 8"
-
-# Test: c_variable-5.7
-# Desc: check that long_array[2] changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.long_array.2\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.long_array.2 changed"
-
-# 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;
-
-set line_dct_nothing [gdb_get_line_number "weird->func_ptr = nothing;"]
-mi_execute_to "exec-step 7" "end-stepping-range" do_children_tests {} {.*var-cmd.c} \
-    $line_dct_nothing {} "step \$line_dct_nothing"
-
-# Test: c_variable-5.8
-# Desc: check that long_array[3-9] changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.long_array.3\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.4\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.5\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.6\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.7\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.8\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"struct_declarations.long_array.9\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.long_array.3-9 changed"
-
-
-# Step over "weird->func_ptr = nothing;"
-set line_dct_a0_0 [gdb_get_line_number "a0 = '0';"]
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    $line_dct_a0_0 "step \$line_dct_a0_0"
-
-# Test: c_variable-5.9
-# Desc: check that func_ptr changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"struct_declarations.func_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars struct_declarations.func_ptr changed"
-
-# Delete all variables
-mi_gdb_test "-var-delete struct_declarations" \
-	"\\^done,ndeleted=\"65\"" \
-	"delete var struct_declarations"
-
-mi_gdb_test "-var-delete weird->int_ptr_ptr" \
-	"\\^done,ndeleted=\"3\"" \
-	"delete var weird->int_ptr_ptr"
-
-# Step over all lines:
-# ...
-#   psnp = &snp0;
-
-set line_dct_snp0 [gdb_get_line_number "psnp = &snp0;"]
-mi_execute_to "exec-step 43" "end-stepping-range" do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 1] {} "step \$line_dct_snp0 + 1"
-
-# Test: c_variable-5.10
-# Desc: create psnp->char_ptr
-mi_gdb_test "-var-create  psnp->char_ptr *  psnp->char_ptr" \
-	"\\^done,name=\"psnp->char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\\*\"" \
-	"create local variable  psnp->char_ptr"
-
-# Test: c_variable-5.11
-# Desc: children of psnp->char_ptr
-mi_gdb_test "-var-list-children psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr\",exp=\"\\*psnp->char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\"\}\\\]" \
-	"get children of psnp->char_ptr"
-
-# Test: c_variable-5.12
-# Desc: number of children of psnp->char_ptr
-mi_gdb_test "-var-info-num-children psnp->char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->char_ptr"
-
-# Test: c_variable-5.13
-# Desc: children of *(psnp->char_ptr)
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr\",exp=\"\\*\\*psnp->char_ptr\",numchild=\"1\",type=\"char \\*\\*\"\}\\\]" \
-	"get children of psnp->char_ptr.*psnp->char_ptr"
-
-# Test: c_variable-5.14
-# Desc: number of children of *(psnp->char_ptr)
-mi_gdb_test "-var-info-num-children psnp->char_ptr.*psnp->char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->char_ptr.*psnp->char_ptr"
-
-# Test: c_variable-5.15
-# Desc: children of *(*(psnp->char_ptr))
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr\",exp=\"\\*\\*\\*psnp->char_ptr\",numchild=\"1\",type=\"char \\*\"\}\\\]" \
-	"get children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr"
-
-# Test: c_variable-5.15B
-# Desc: children of *(*(*(psnp->char_ptr)))
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr.\\*\\*\\*\\*psnp->char_ptr\",exp=\"\\*\\*\\*\\*psnp->char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr"
-
-# Test: c_variable-5.16
-# Desc: number of children of *(*(psnp->char_ptr))
-mi_gdb_test "-var-info-num-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr"
-
-# Test: c_variable-5.17
-# Desc: children of *(*(*(psnp->char_ptr)))
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr.\\*\\*\\*\\*psnp->char_ptr\",exp=\"\\*\\*\\*\\*psnp->char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of 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)))
-mi_gdb_test "-var-info-num-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr"
-
-# Test: c_variable-5.17B
-# Desc: children of *(*(*(*(psnp->char_ptr))))
-mi_gdb_test "-var-list-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr"
-
-# Test: c_variable-5.18B
-# Desc: number of children of *(*(*(*(psnp->char_ptr))))
-mi_gdb_test "-var-info-num-children psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of psnp->char_ptr.*psnp->char_ptr.**psnp->char_ptr.***psnp->char_ptr.****psnp->char_ptr"
-
-
-# Test: c_variable-5.19
-# Desc: create psnp->long_ptr
-mi_gdb_test "-var-create  psnp->long_ptr *  psnp->long_ptr" \
-	"\\^done,name=\"psnp->long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\\*\"" \
-	"create local variable  psnp->long_ptr"
-
-# Test: c_variable-5.20
-# Desc: children of psnp->long_ptr
-mi_gdb_test "-var-list-children psnp->long_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->long_ptr.\\*psnp->long_ptr\",exp=\"\\*psnp->long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\"\}\\\]" \
-	"get children of psnp->long_ptr"
-
-# Test: c_variable-5.21
-# Desc: number of children of psnp->long_ptr
-mi_gdb_test "-var-info-num-children psnp->long_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->long_ptr"
-
-# Test: c_variable-5.22
-# Desc: children of *(psnp->long_ptr)
-mi_gdb_test "-var-list-children psnp->long_ptr.*psnp->long_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr\",exp=\"\\*\\*psnp->long_ptr\",numchild=\"1\",type=\"long int \\*\\*\"\}\\\]" \
-	"get children of psnp->long_ptr.*psnp->long_ptr"
-
-
-# Test: c_variable-5.23
-# Desc: number of children of *(psnp->long_ptr)
-mi_gdb_test "-var-info-num-children psnp->long_ptr.*psnp->long_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->long_ptr.*psnp->long_ptr"
-
-# Test: c_variable-5.24
-# Desc: children of *(*(psnp->long_ptr))
-mi_gdb_test "-var-list-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr.\\*\\*\\*psnp->long_ptr\",exp=\"\\*\\*\\*psnp->long_ptr\",numchild=\"1\",type=\"long int \\*\"\}\\\]" \
-	"get children of psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr"
-
-# Test: c_variable-5.25
-# Desc: number of children of *(*(psnp->long_ptr))
-mi_gdb_test "-var-info-num-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr"
-
-# Test: c_variable-5.26
-# Desc: children of *(*(*(psnp->long_ptr)))
-mi_gdb_test "-var-list-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr.\\*\\*\\*psnp->long_ptr.\\*\\*\\*\\*psnp->long_ptr\",exp=\"\\*\\*\\*\\*psnp->long_ptr\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of 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)))
-mi_gdb_test "-var-info-num-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr"
-
-# Test: c_variable-5.28
-# Desc: children of *(*(*(*(psnp->long_ptr))))
-mi_gdb_test "-var-list-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of 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))))
-mi_gdb_test "-var-info-num-children psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of psnp->long_ptr.*psnp->long_ptr.**psnp->long_ptr.***psnp->long_ptr.****psnp->long_ptr"
-
-# Test: c_variable-5.30
-# Desc: create psnp->ptrs
-mi_gdb_test "-var-create  psnp->ptrs *  psnp->ptrs" \
-	"\\^done,name=\"psnp->ptrs\",numchild=\"3\",type=\"struct _struct_n_pointer \\*\\\[3\\\]\"" \
-	"create local variable  psnp->ptrs"
-
-# Test: c_variable-5.31
-# Desc: children of psnp->ptrs
-mi_gdb_test "-var-list-children psnp->ptrs" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"psnp->ptrs.0\",exp=\"0\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\},child=\{name=\"psnp->ptrs.1\",exp=\"1\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\},child=\{name=\"psnp->ptrs.2\",exp=\"2\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs"
-
-# Test: c_variable-5.32
-# Desc: number of children of psnp->ptrs
-mi_gdb_test "-var-info-num-children psnp->ptrs" \
-	"\\^done,numchild=\"3\"" \
-	"get number of children of psnp->ptrs"
-
-# Test: c_variable-5.33
-# Desc: children of psnp->ptrs[0]
-mi_gdb_test "-var-list-children psnp->ptrs.0" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"psnp->ptrs.0.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.long_ptr\",exp=\"long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.ptrs\",exp=\"ptrs\",numchild=\"3\",type=\"struct _struct_n_pointer \\*\\\[3\\\]\"\},child=\{name=\"psnp->ptrs.0.next\",exp=\"next\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0"
-
-# Test: c_variable-5.34
-# Desc: number of children of psnp->ptrs[0]
-mi_gdb_test "-var-info-num-children psnp->ptrs.0" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of psnp->ptrs.0"
-
-# Test: c_variable-5.35
-# Desc: children of psnp->ptrs[0]->next
-mi_gdb_test "-var-list-children psnp->ptrs.0.next" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.next.long_ptr\",exp=\"long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.next.ptrs\",exp=\"ptrs\",numchild=\"3\",type=\"struct _struct_n_pointer \\*\\\[3\\\]\"\},child=\{name=\"psnp->ptrs.0.next.next\",exp=\"next\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next"
-
-#} {char_ptr long_ptr ptrs next}
-
-# Test: c_variable-5.36
-# Desc: number of children of psnp->ptrs[0]->next
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next" \
-	"\\^done,numchild=\"4\"" \
-	"get number of children of psnp->ptrs.0.next"
-
-
-# Test: c_variable-5.37
-# Desc: children of psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr\",exp=\"\\*char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\"\}\\\]" \
-	"get 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
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr"
-
-# Test: c_variable-5.39
-# Desc: children of *psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr\",exp=\"\\*\\*char_ptr\",numchild=\"1\",type=\"char \\*\\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr"
-
-# Test: c_variable-5.40
-# Desc: number of children of *psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr.*char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr.*char_ptr"
-
-# Test: c_variable-5.41
-# Desc: children of **psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr\",exp=\"\\*\\*\\*char_ptr\",numchild=\"1\",type=\"char \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr"
-
-# Test: c_variable-5.41B
-# Desc: children of ***psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr.\\*\\*\\*\\*char_ptr\",exp=\"\\*\\*\\*\\*char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr"
-
-# Test: c_variable-5.42
-# Desc: number of children of **psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr"
-
-# Test: c_variable-5.43
-# Desc: children of ***psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr" \
-	"\\^done,numchild=\"1\",children=\\\[child=\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr.\\*\\*\\*\\*char_ptr\",exp=\"\\*\\*\\*\\*char_ptr\",numchild=\"0\",type=\"char\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr"
-
-# Test: c_variable-5.44
-# Desc: number of children of ***psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr" \
-	"\\^done,numchild=\"1\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr"
-
-# Test: c_variable-5.43B
-# Desc: children of ****psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr"
-
-# Test: c_variable-5.44B
-# Desc: number of children of ****psnp->ptrs[0]->next->char_ptr
-mi_gdb_test "-var-info-num-children psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr.****char_ptr" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of psnp->ptrs.0.next.char_ptr.*char_ptr.**char_ptr.***char_ptr"
-
-# Test: c_variable-5.45
-# Desc: children of psnp->ptrs[0]->next->next
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.next" \
-	"\\^done,numchild=\"4\",children=\\\[child=\{name=\"psnp->ptrs.0.next.next.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.next.next.long_ptr\",exp=\"long_ptr\",numchild=\"1\",type=\"long int \\*\\*\\*\\*\"\},child=\{name=\"psnp->ptrs.0.next.next.ptrs\",exp=\"ptrs\",numchild=\"3\",type=\"struct _struct_n_pointer \\*\\\[3\\\]\"\},child=\{name=\"psnp->ptrs.0.next.next.next\",exp=\"next\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.next"
-
-# Test: c_variable-5.46
-# Desc: children of psnp->ptrs[0]->next->next->ptrs
-mi_gdb_test "-var-list-children psnp->ptrs.0.next.next.ptrs" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"psnp->ptrs.0.next.next.ptrs.0\",exp=\"0\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\},child=\{name=\"psnp->ptrs.0.next.next.ptrs.1\",exp=\"1\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\},child=\{name=\"psnp->ptrs.0.next.next.ptrs.2\",exp=\"2\",numchild=\"4\",type=\"struct _struct_n_pointer \\*\"\}\\\]" \
-	"get children of psnp->ptrs.0.next.next.ptrs"
-
-#  Step over "snp0.char_ptr = &b3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 2] "step \$line_dct_snp0 + 2"
-
-# Test: c_variable-5.47
-# Desc: check that psnp->char_ptr (and [0].char_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr.\\*psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->char_ptr.\\*psnp->char_ptr.\\*\\*psnp->char_ptr.\\*\\*\\*psnp->char_ptr.\\*\\*\\*\\*psnp->char_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->char_ptr (and 0.char_ptr) changed"
-
-#  Step over "snp1.char_ptr = &c3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 3] "step \$line_dct_snp0 + 3"
-
-# Test: c_variable-5.48
-# Desc: check that psnp->next->char_ptr (and [1].char_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->ptrs.0.next.char_ptr.\\*char_ptr.\\*\\*char_ptr.\\*\\*\\*char_ptr.\\*\\*\\*\\*char_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->next->char_ptr (and 1.char_ptr) changed"
-
-
-#  Step over "snp2.char_ptr = &a3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 4] "step \$line_dct_snp0 + 4"
-
-# Test: c_variable-5.49
-# Desc: check that psnp->next->next->char_ptr (and [2].char_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.next.char_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->next->next->char_ptr (and 2.char_ptr) changed"
-
-
-#  Step over "snp0.long_ptr = &y3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 5] "step \$line_dct_snp0 + 5"
-
-# Test: c_variable-5.50
-# Desc: check that psnp->long_ptr (and [0].long_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr.\\*psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr.\\*\\*\\*psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"psnp->long_ptr.\\*psnp->long_ptr.\\*\\*psnp->long_ptr.\\*\\*\\*psnp->long_ptr.\\*\\*\\*\\*psnp->long_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->long_ptr (and 0.long_ptr) changed"
-
-
-#  Step over "snp1.long_ptr = &x3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 6] "step \$line_dct_snp0 + 6"
-
-# Test: c_variable-5.51
-# Desc: check that psnp->next->long_ptr (and [1].long_ptr) changed
-# Why does this have a FIXME?
-setup_xfail *-*-*
-mi_gdb_test "-var-update *" \
-	"FIXME\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.long_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->next->long_ptr (and 1.long_ptr) changed"
-clear_xfail *-*-*
-
-# This command produces this error message:
-# &"warning: varobj_list: assertion failed - mycount <> 0\n"
-#
-
-#  Step over "snp2.long_ptr = &z3;"
-mi_step_to do_children_tests {} {.*var-cmd.c} \
-    [expr $line_dct_snp0 + 7] "step \$line_dct_snp0 + 7"
-
-# Test: c_variable-5.52
-# Desc: check that psnp->next->next->long_ptr (and [2].long_ptr) changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"psnp->ptrs.0.next.next.long_ptr\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars psnp->next->next->long_ptr (and 2.long_ptr) changed"
-
-
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp b/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
deleted file mode 100644
index 5a8f50b014d..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2004 Free Software
-# Foundation, 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.
-
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can create, update, delete variables.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-
-#####                   #####
-#                           #
-#  Variable Creation tests  #
-#                           #
-#####                   #####
-
-# Test:  c_variable-1.1
-# Desc:  Create global variable
-
-mi_gdb_test "111-var-create global_simple * global_simple" \
-	"111\\^done,name=\"global_simple\",numchild=\"6\",type=\"simpleton\"" \
-	"create global variable"
-
-# Test: c_variable-1.2
-# Desc: Create non-existent variable
-
-mi_gdb_test "112-var-create bogus_unknown_variable * bogus_unknown_variable" \
-	"&\"mi_cmd_var_create: unable to create variable object\\\\n\".*112\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create non-existent variable"
-
-# Test: c_variable-1.3
-# Desc: Create out of scope variable
-
-mi_gdb_test "113-var-create argc * argc" \
-	"&\"mi_cmd_var_create: unable to create variable object\\\\n\".*113\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create out of scope variable"
-
-mi_runto do_locals_tests
-
-# Test: c_variable-1.4
-# Desc: create local variables
-
-mi_gdb_test "-var-create linteger * linteger" \
-	"\\^done,name=\"linteger\",numchild=\"0\",type=\"int\"" \
-	"create local variable linteger"
-
-mi_gdb_test "-var-create lpinteger * lpinteger" \
-	"\\^done,name=\"lpinteger\",numchild=\"1\",type=\"int \\*\"" \
-	"create local variable lpinteger"
-
-mi_gdb_test "-var-create lcharacter * lcharacter" \
-	"\\^done,name=\"lcharacter\",numchild=\"0\",type=\"char\"" \
-	"create local variablelcharacter "
-
-mi_gdb_test "-var-create lpcharacter * lpcharacter" \
-	"\\^done,name=\"lpcharacter\",numchild=\"1\",type=\"char \\*\"" \
-	"create local variable lpcharacter"
-
-mi_gdb_test "-var-create llong * llong" \
-	"\\^done,name=\"llong\",numchild=\"0\",type=\"long int\"" \
-	"create local variable llong"
-
-mi_gdb_test "-var-create lplong * lplong" \
-	"\\^done,name=\"lplong\",numchild=\"1\",type=\"long int \\*\"" \
-	"create local variable lplong"
-
-mi_gdb_test "-var-create lfloat * lfloat" \
-	"\\^done,name=\"lfloat\",numchild=\"0\",type=\"float\"" \
-	"create local variable lfloat"
-
-mi_gdb_test "-var-create lpfloat * lpfloat" \
-	"\\^done,name=\"lpfloat\",numchild=\"1\",type=\"float \\*\"" \
-	"create local variable lpfloat"
-
-mi_gdb_test "-var-create ldouble * ldouble" \
-	"\\^done,name=\"ldouble\",numchild=\"0\",type=\"double\"" \
-	"create local variable ldouble"
-
-mi_gdb_test "-var-create lpdouble * lpdouble" \
-	"\\^done,name=\"lpdouble\",numchild=\"1\",type=\"double \\*\"" \
-	"create local variable lpdouble"
-
-mi_gdb_test "-var-create lsimple * lsimple" \
-	"\\^done,name=\"lsimple\",numchild=\"6\",type=\"struct _simple_struct\"" \
-	"create local variable lsimple"
-
-mi_gdb_test "-var-create lpsimple * lpsimple" \
-	"\\^done,name=\"lpsimple\",numchild=\"6\",type=\"struct _simple_struct \\*\"" \
-	"create local variable lpsimple"
-
-mi_gdb_test "-var-create func * func" \
-	"\\^done,name=\"func\",numchild=\"0\",type=\"void \\(\\*\\)\\((void|)\\)\"" \
-	"create local variable func"
-
-# Test: c_variable-1.5
-# Desc: create lsimple.character
-mi_gdb_test "-var-create lsimple.character * lsimple.character" \
-	"\\^done,name=\"lsimple.character\",numchild=\"0\",type=\"char\"" \
-	"create lsimple.character"
-
-# Test: c_variable-1.6
-# Desc: create lpsimple->integer
-mi_gdb_test "-var-create lsimple->integer * lsimple->integer" \
-	"\\^done,name=\"lsimple->integer\",numchild=\"0\",type=\"int\"" \
-	"create lsimple->integer"
-
-# Test: c_variable-1.7
-# Desc: ceate lsimple.integer
-mi_gdb_test "-var-create lsimple.integer * lsimple.integer" \
-	"\\^done,name=\"lsimple.integer\",numchild=\"0\",type=\"int\"" \
-	"create lsimple->integer"
-
-
-# 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.
-mi_gdb_test "-var-create int * int" \
-	"&\"Attempt to use a type name as an expression.\\\\n\".*&\"mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create int"
-
-
-#####             #####
-#                     #
-# Value changed tests #
-#                     #
-#####             #####
-
-# Test: c_variable-2.1
-# Desc: check whether values changed at do_block_tests
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update all vars"
-
-# Step over "linteger = 1234;"
-set line_dlt_linteger [gdb_get_line_number "lpinteger = &linteger;"]
-mi_step_to "do_locals_tests" "" "var-cmd.c" $line_dlt_linteger "step at do_locals_test"
-
-# Test: c_variable-2.2
-# Desc: check whether only linteger changed values
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: linteger changed"
-
-# Step over "lpinteger = &linteger;"
-mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 1] "step at do_locals_tests (2)"
-
-# Test: c_variable-2.3
-# Desc: check whether only lpinteger changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lpinteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: lpinteger changed"
-
-# Step over "lcharacter = 'a';"
-mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 2] "step at do_locals_tests (3)"
-
-# Test: c_variable-2.4
-# Desc: check whether only lcharacter changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lcharacter\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: lcharacter changed"
-
-# Step over "lpcharacter = &lcharacter;"
-mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 3] "step at do_locals_tests (4)"
-
-# Test: c_variable-2.5
-# Desc: check whether only lpcharacter changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lpcharacter\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: lpcharacter changed"
-
-
-# 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';
-
-mi_execute_to "exec-step 9" "end-stepping-range" "do_locals_tests" "" \
-	"var-cmd.c" [expr $line_dlt_linteger + 12] "" "step at do_locals_tests (5)"
-
-# Test: c_variable-2.6
-# Desc: check whether llong, lplong, lfloat, lpfloat, ldouble, lpdouble, lsimple.integer,
-#       lsimple.unsigned_character lsimple.integer lsimple.character changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lsimple.integer\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lsimple->integer\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lsimple.character\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lpdouble\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"ldouble\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lpfloat\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lfloat\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lplong\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"llong\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: many changed"
-
-# Step over:
-#  lsimple.signed_character = 21;
-#  lsimple.char_ptr = &lcharacter;
-#  lpsimple = &lsimple;
-#  func = nothing;
-
-set line_dlt_4321 [gdb_get_line_number "linteger = 4321;"]
-
-mi_execute_to "exec-step 4" "end-stepping-range" "do_locals_tests" "" \
-	"var-cmd.c" $line_dlt_4321 "" "step at do_locals_tests (6)"
-
-# Test: c_variable-2.7
-# Desc: check whether (lsimple.signed_character, lsimple.char_ptr) lpsimple, func changed
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"func\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lpsimple\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: func and lpsimple changed"
-
-# Step over
-#  linteger = 4321;
-#  lcharacter = 'b';
-#  llong = 1212L;
-#  lfloat = 1.2;
-#  ldouble = 5.498548281828172;
-#  lsimple.integer = 255;
-#  lsimple.unsigned_integer = 4321;
-#  lsimple.character = 'b';
-
-mi_execute_to "exec-step 8" "end-stepping-range" "do_locals_tests" "" \
-	"var-cmd.c" [expr $line_dlt_4321 + 8] "" "step at do_locals_tests (7)"
-
-# 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)
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lsimple.integer\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lsimple->integer\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lsimple.character\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"ldouble\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lfloat\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"llong\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"lcharacter\",in_scope=\"true\",type_changed=\"false\"\},\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: func and lpsimple changed"
-
-
-### 
-#
-# Test assignment to variables. More tests on assignment are in other files.
-#
-###
-mi_gdb_test "-var-assign global_simple 0" \
-	"&\"mi_cmd_var_assign: Variable object is not editable\\\\n\".*\\^error,msg=\"mi_cmd_var_assign: Variable object is not editable\"" \
-	"assign to global_simple"
-
-mi_gdb_test "-var-assign linteger 3333" \
-	"\\^done,value=\"3333\"" \
-	"assign to linteger"
-
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: linteger changed after assign"
-
-mi_gdb_test "-var-assign linteger 3333" \
-	"\\^done,value=\"3333\"" \
-	"assign to linteger again, same value"
-
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update all vars: linteger not changed after same assign"
-
-mi_gdb_test "-var-evaluate-expression linteger" \
-	"\\^done,value=\"3333\"" \
-	"eval linteger"
-
-mi_gdb_test "-var-assign lpinteger \"&linteger + 3\"" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lpinteger"
-
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"lpinteger\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: lpinteger changed after assign"
-
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\\\]" \
-	"update all vars: no changes on second update"
-
-mi_gdb_test "-var-evaluate-expression lpinteger" \
-	"\\^done,value=\"$hex\"" \
-	"eval lpinteger"
-
-# reset the values to the original ones so that the rest of the file doesn't suffer.
-
-mi_gdb_test "-var-assign linteger 4321" \
-	"\\^done,value=\"4321\"" \
-	"assign to linteger"
-
-mi_gdb_test "-var-assign lpinteger &linteger" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lpinteger"
-
-mi_gdb_test "-var-assign lcharacter 'z'" \
-	"\\^done,value=\"122 'z'\"" \
-	"assign to lcharacter"
-
-mi_gdb_test "-var-evaluate-expression lcharacter" \
-	"\\^done,value=\"122 'z'\"" \
-	"eval lcharacter"
-
-mi_gdb_test "-var-assign llong 1313L" \
-	"\\^done,value=\"1313\"" \
-	"assign to llong"
-mi_gdb_test "-var-evaluate-expression llong" \
-	"\\^done,value=\"1313\"" \
-	"eval llong"
-mi_gdb_test "-var-assign llong 1212L" \
-	"\\^done,value=\"1212\"" \
-	"assign to llong"
-
-mi_gdb_test "-var-assign lplong &llong+4" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lplong"
-mi_gdb_test "-var-evaluate-expression lplong" \
-	"\\^done,value=\"$hex\"" \
-	"eval lplong"
-mi_gdb_test "-var-assign lplong &llong" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lplong"
-
-mi_gdb_test "-var-assign lfloat 3.4567" \
-	"\\^done,value=\"3.45.*\"" \
-	"assign to lfloat"
-mi_gdb_test "-var-evaluate-expression lfloat" \
-	"\\^done,value=\"3.45.*\"" \
-	"eval lfloat"
-mi_gdb_test "-var-assign lfloat 1.2345" \
-	"\\^done,value=\"1.23.*\"" \
-	"assign to lfloat"
-
-mi_gdb_test "-var-assign lpfloat &lfloat+4" \
-	"\\^done,value=\"$hex\"" \
-	"assign to lpfloat"
-
-mi_gdb_test "-var-assign ldouble 5.333318284590435" \
-	"\\^done,value=\"5.333318284590435\"" \
-	"assign to ldouble"
-
-mi_gdb_test "-var-assign func do_block_tests" \
-	"\\^done,value=\"$hex <do_block_tests>\"" \
-	"assign to func"
-
-mi_gdb_test "-var-assign lsimple.character 'd'" \
-	"\\^done,value=\"100 'd'\"" \
-	"assign to lsimple.character"
-
-mi_gdb_test "-var-assign  lsimple->integer 222" \
-	"\\^done,value=\"222\"" \
-	"assign to lsimple->integer"
-
-mi_gdb_test "-var-assign lsimple.integer 333" \
-	"\\^done,value=\"333\"" \
-	"assign to lsimple.integer"
-
-######
-# End of assign tests 
-#####
-
-set line_subroutine1_body [gdb_get_line_number "global_simple.integer = i + 3;"]
-
-mi_gdb_test "-break-insert subroutine1" \
-	"\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"subroutine1\",file=\".*var-cmd.c\",line=\"$line_subroutine1_body\",times=\"0\"\}" \
-	"break-insert subroutine1"
-mi_continue_to "2" "subroutine1" \
-	"\{name=\"i\",value=\"4321\"\},\{name=\"l\",value=\"$hex\"\}" \
-	"var-cmd.c" $line_subroutine1_body "continue to subroutine1"
-
-# Test: c_variable-2.10
-# Desc: create variable for locals i,l in subroutine1
-mi_gdb_test "-var-create i  * i" \
-	"\\^done,name=\"i\",numchild=\"0\",type=\"int\"" \
-	"create i"
-
-mi_gdb_test "-var-create l * l" \
-	"\\^done,name=\"l\",numchild=\"1\",type=\"long int \\*\"" \
-	"create l"
-
-# Test: c_variable-2.11
-# Desc: create do_locals_tests local in subroutine1
-mi_gdb_test "-var-create linteger * linteger" \
-	"&\"mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
-	"create linteger"
-
-mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
-	"var-cmd.c" [expr $line_subroutine1_body + 1] "step at subroutine1"
-
-# 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.
-
-setup_xfail *-*-*
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\{FIXME: WHAT IS CORRECT HERE\}" \
-	"update all vars: changed FIXME"
-clear_xfail *-*-*
-
-mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
-	"var-cmd.c" [expr $line_subroutine1_body + 2] "step at subroutine1 (2)"
-
-# Test: c_variable-2.13
-# Desc: change subroutine1 local i
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"i\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: i changed"
-
-mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
-	"var-cmd.c" [expr $line_subroutine1_body + 3] "step at subroutine1 (3)"
-
-# Test: c_variable-2.14
-# Desc: change do_locals_tests local llong
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"llong\",in_scope=\"true\",type_changed=\"false\"\}\\\]" \
-	"update all vars: llong changed"
-
-set line_dlt_call_subroutine1 [gdb_get_line_number "subroutine1 (linteger, &llong);"]
-mi_next_to "do_locals_tests" ""	"var-cmd.c" \
-  [expr $line_dlt_call_subroutine1 + 1] "next out of subroutine1"
-
-# Test: c_variable-2.15
-# Desc: check for out of scope subroutine1 locals
-mi_gdb_test "-var-update *" \
-	"\\^done,changelist=\\\[\{name=\"l\",in_scope=\"false\"\},\{name=\"i\",in_scope=\"false\"\}\\\]" \
-	"update all vars: all now out of scope"
-
-# Done with locals/globals tests. Erase all variables
-#delete_all_variables
-mi_gdb_test "-var-delete global_simple" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var"
-
-mi_gdb_test "-var-delete linteger" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var linteger"
-
-mi_gdb_test "-var-delete lpinteger" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpinteger"
-
-mi_gdb_test "-var-delete lcharacter" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lcharacter"
-
-mi_gdb_test "-var-delete lpcharacter" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpcharacter"
-
-mi_gdb_test "-var-delete llong" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var llong"
-
-mi_gdb_test "-var-delete lplong" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lplong"
-
-mi_gdb_test "-var-delete lfloat" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lfloat"
-
-mi_gdb_test "-var-delete lpfloat" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpfloat"
-
-mi_gdb_test "-var-delete ldouble" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var ldouble"
-
-mi_gdb_test "-var-delete lpdouble" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpdouble"
-
-mi_gdb_test "-var-delete lsimple" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lsimple"
-
-mi_gdb_test "-var-delete lpsimple" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lpsimple"
-
-mi_gdb_test "-var-delete func" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var func"
-
-mi_gdb_test "-var-delete lsimple.character" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lsimple.character"
-
-mi_gdb_test "-var-delete  lsimple->integer" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var  lsimple->integer"
-
-mi_gdb_test "-var-delete lsimple.integer" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var lsimple.integer"
-
-mi_gdb_test "-var-delete i" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var i"
-
-mi_gdb_test "-var-delete l" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var l"
-
-# Test whether we can follow the name of a variable through multiple
-# stack frames.
-mi_gdb_test "-break-insert do_special_tests" \
-  {\^done,bkpt=.*} \
-  "set breakpoint at do_special_tests"
-
-mi_continue_to {.*} do_special_tests {.*} {.*var-cmd.c} {.*} {stop in do_special_tests}
-
-mi_gdb_test "-var-create selected_a @ a" \
-  {\^done,name="selected_a",numchild="0",type="int"} \
-  "create selected_a"
-
-mi_gdb_test "-break-insert incr_a" \
-  {\^done,bkpt=.*} \
-  "set breakpoint at incr_a"
-
-mi_continue_to {.*} incr_a {.*} {.*var-cmd.c} {.*} {stop in incr_a}
-
-mi_gdb_test "-var-update selected_a" \
-	"\\^done,changelist=\\\[\{name=\"selected_a\",in_scope=\"true\",new_type=\"char\",new_num_children=\"0\"\}\\\]" \
-	"update selected_a in incr_a"
-
-mi_next "step a line in incr_a"
-mi_next "return from incr_a to do_special_tests"
-
-mi_gdb_test "-var-update selected_a" \
-	"\\^done,changelist=\\\[\{name=\"selected_a\",in_scope=\"true\",new_type=\"int\",new_num_children=\"0\"\}\\\]" \
-	"update selected_a in do_special_tests"
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-var-display.exp b/gdb/testsuite/gdb.mi/mi2-var-display.exp
deleted file mode 100644
index a19644044a8..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-var-display.exp
+++ /dev/null
@@ -1,632 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, 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.
-
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can create, update, delete variables.
-#
-
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-set line_dct_close_brace [expr [gdb_get_line_number "snp2.long_ptr = &z3;"] + 1]
-
-mi_gdb_test "200-break-insert $line_dct_close_brace" \
-	"200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_children_tests\",file=\".*var-cmd.c\",line=\"$line_dct_close_brace\",times=\"0\"\}" \
-	"break-insert operation"
-
-mi_run_cmd
-# The running part has been checked already by mi_run_cmd
-gdb_expect {
-    -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_children_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"$line_dct_close_brace\"\}\r\n$mi_gdb_prompt$" {
-	pass "run to do_children_tests"
-    }
-    -re ".*$mi_gdb_prompt$" {fail "run to do_children_tests (2)"}
-    timeout {fail "run to do_children_tests (timeout 2)"}
-}
-
-#####       #####
-#               #
-# Display tests #
-#               #
-#####       #####
-
-# Test: c_variable-6.1
-# Desc: create variable bar
-mi_gdb_test "-var-create bar * bar" \
-	"\\^done,name=\"bar\",numchild=\"0\",type=\"int\"" \
-	"create local variable bar"
-
-# Test: c_variable-6.2
-# Desc: type of variable bar
-mi_gdb_test "-var-info-type bar" \
-	"\\^done,type=\"int\"" \
-	"info type variable bar"
-
-# Test: c_variable-6.3
-# Desc: format of variable bar
-mi_gdb_test "-var-show-format bar" \
-	"\\^done,format=\"natural\"" \
-	"show format variable bar"
-
-# Test: c_variable-6.4
-# Desc: value of variable bar
-mi_gdb_test "-var-evaluate-expression bar" \
-	"\\^done,value=\"2121\"" \
-	"eval variable bar"
-
-# Test: c_variable-6.5
-# Desc: change format of bar to hex
-mi_gdb_test "-var-set-format bar hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable bar"
-
-# Test: c_variable-6.6
-# Desc: value of bar with new format
-mi_gdb_test "-var-evaluate-expression bar" \
-	"\\^done,value=\"0x849\"" \
-	"eval variable bar with new format"
-
-# Test: c_variable-6.7
-# Desc: change value of bar
-mi_gdb_test "-var-assign bar 3" \
-	"\\^done,value=\"0x3\"" \
-	"assing to variable bar"
-
-mi_gdb_test "-var-set-format bar decimal" \
-	"\\^done,format=\"decimal\"" \
-	"set format variable bar"
-
-mi_gdb_test "-var-evaluate-expression bar" \
-	"\\^done,value=\"3\"" \
-	"eval variable bar with new value"
-
-mi_gdb_test "-var-delete bar" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var bar"
-
-# Test: c_variable-6.11
-# Desc: create variable foo
-mi_gdb_test "-var-create foo * foo" \
-	"\\^done,name=\"foo\",numchild=\"1\",type=\"int \\*\"" \
-	"create local variable foo"
-
-# Test: c_variable-6.12
-# Desc: type of variable foo
-mi_gdb_test "-var-info-type foo" \
-	"\\^done,type=\"int \\*\"" \
-	"info type variable foo"
-
-# Test: c_variable-6.13
-# Desc: format of variable foo
-mi_gdb_test "-var-show-format foo" \
-	"\\^done,format=\"natural\"" \
-	"show format variable foo"
-
-# Test: c_variable-6.14
-# Desc: value of variable foo
-mi_gdb_test "-var-evaluate-expression foo" \
-	"\\^done,value=\"$hex\"" \
-	"eval variable foo"
-
-# Test: c_variable-6.15
-# Desc: change format of var to octal
-mi_gdb_test "-var-set-format foo octal" \
-	"\\^done,format=\"octal\"" \
-	"set format variable foo"
-
-mi_gdb_test "-var-show-format foo" \
-	"\\^done,format=\"octal\"" \
-	"show format variable foo"
-
-# Test: c_variable-6.16
-# Desc: value of foo with new format
-mi_gdb_test "-var-evaluate-expression foo" \
-	"\\^done,value=\"\[0-7\]+\"" \
-	"eval variable foo"
-
-# Test: c_variable-6.17
-# Desc: change value of foo
-mi_gdb_test "-var-assign foo 3" \
-	"\\^done,value=\"03\"" \
-	"assing to variable foo"
-
-mi_gdb_test "-var-set-format foo decimal" \
-	"\\^done,format=\"decimal\"" \
-	"set format variable foo"
-
-# Test: c_variable-6.18
-# Desc: check new value of foo
-mi_gdb_test "-var-evaluate-expression foo" \
-	"\\^done,value=\"3\"" \
-	"eval variable foo"
-
-mi_gdb_test "-var-delete foo" \
-	"\\^done,ndeleted=\"1\"" \
-	"delete var foo"
-
-# Test: c_variable-6.21
-# Desc: create variable weird and children
-mi_gdb_test "-var-create weird * weird" \
-	"\\^done,name=\"weird\",numchild=\"11\",type=\"weird_struct \\*\"" \
-	"create local variable weird"
-
-mi_gdb_test "-var-list-children weird" \
-	"\\^done,numchild=\"11\",children=\\\[child=\{name=\"weird.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"weird.character\",exp=\"character\",numchild=\"0\",type=\"char\"\},child={name=\"weird.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"weird.long_int\",exp=\"long_int\",numchild=\"0\",type=\"long int\"\},child=\{name=\"weird.int_ptr_ptr\",exp=\"int_ptr_ptr\",numchild=\"1\",type=\"int \\*\\*\"\},child=\{name=\"weird.long_array\",exp=\"long_array\",numchild=\"10\",type=\"long int \\\[10\\\]\"\},child=\{name=\"weird.func_ptr\",exp=\"func_ptr\",numchild=\"0\",type=\"void \\(\\*\\)\\((void|)\\)\"\},child=\{name=\"weird.func_ptr_struct\",exp=\"func_ptr_struct\",numchild=\"0\",type=\"struct _struct_decl \\(\\*\\)\\((int, char \\*, long int|)\\)\"\},child=\{name=\"weird.func_ptr_ptr\",exp=\"func_ptr_ptr\",numchild=\"0\",type=\"struct _struct_decl \\*\\(\\*\\)\\((int, char \\*, long int|)\\)\"\},child=\{name=\"weird.u1\",exp=\"u1\",numchild=\"4\",type=\"union \{\\.\\.\\.\}\"\},child=\{name=\"weird.s2\",exp=\"s2\",numchild=\"4\",type=\"struct \{\\.\\.\\.\}\"\}\\\]" \
-	"get children local variable weird"
-
-
-# Test: c_variable-6.23
-# Desc: change format of weird.func_ptr and weird.func_ptr_ptr
-mi_gdb_test "-var-set-format weird.func_ptr hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable weird.func_ptr"
-
-mi_gdb_test "-var-show-format weird.func_ptr" \
-	"\\^done,format=\"hexadecimal\"" \
-	"show format variable weird.func_ptr"
-
-mi_gdb_test "-var-set-format weird.func_ptr_ptr hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable weird.func_ptr_ptr"
-
-mi_gdb_test "-var-show-format weird.func_ptr_ptr" \
-	"\\^done,format=\"hexadecimal\"" \
-	"show format variable weird.func_ptr_ptr"
-
-# Test: c_variable-6.24
-# Desc: format of weird and children
-mi_gdb_test "-var-set-format weird natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird"
-
-mi_gdb_test "-var-set-format weird.integer natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.integer"
-
-mi_gdb_test "-var-set-format weird.character natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.character"
-
-mi_gdb_test "-var-set-format weird.char_ptr natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.char_ptr"
-
-mi_gdb_test "-var-set-format weird.long_int natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.long_int"
-
-mi_gdb_test "-var-set-format weird.int_ptr_ptr natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.int_ptr_ptr"
-
-mi_gdb_test "-var-set-format weird.long_array natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.long_array"
-
-mi_gdb_test "-var-set-format weird.func_ptr hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable weird.func_ptr"
-
-mi_gdb_test "-var-set-format weird.func_ptr_struct hexadecimal" \
-	"\\^done,format=\"hexadecimal\"" \
-	"set format variable weird.func_ptr_struct"
-
-mi_gdb_test "-var-set-format weird.func_ptr_ptr natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.func_ptr_ptr"
-
-mi_gdb_test "-var-set-format weird.u1 natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.u1"
-
-mi_gdb_test "-var-set-format weird.s2 natural" \
-	"\\^done,format=\"natural\"" \
-	"set format variable weird.s2"
-
-# 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.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.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.integer weird.character weird.char_ptr weird.long_int weird.int_ptr_ptr weird.int_ptr_ptr.*int_ptr_ptr weird.int_ptr_ptr.*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.s2.i weird.s2.u2 weird weird.s2.u2.u1s1 weird.s2.u2.u1s2 weird.s2 weird.long_array weird.u1} {}}
-
-mi_gdb_test "-var-delete weird" \
-	"\\^done,ndeleted=\"12\"" \
-	"delete var weird"
-
-
-#####               #####
-#                       #
-# Special Display Tests #
-#                       #
-#####               #####
-
-# Stop in "do_special_tests"
-
-set line_dst_a_1 [gdb_get_line_number "a = 1;"]
-
-mi_gdb_test "200-break-insert do_special_tests" \
-	"200\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_special_tests\",file=\".*var-cmd.c\",line=\"$line_dst_a_1\",times=\"0\"\}" \
-	"break-insert operation"
-
-send_gdb "-exec-continue\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"do_special_tests\",args=\\\[\\\],file=\".*var-cmd.c\",line=\"$line_dst_a_1\"\}\r\n$mi_gdb_prompt$" {
-	pass "continue to do_special_tests"
-    }
-    timeout {
-	fail "continue to do_special_tests (timeout)"
-    }
-}
-
-# Test: c_variable-7.10
-# Desc: create union u
-mi_gdb_test "-var-create u * u" \
-	"\\^done,name=\"u\",numchild=\"2\",type=\"union named_union\"" \
-	"create local variable u"
-
-# Test: c_variable-7.11
-# Desc: value of u
-mi_gdb_test "-var-evaluate-expression u" \
-	"\\^done,value=\"\{\\.\\.\\.\}\"" \
-	"eval variable u"
-
-# Test: c_variable-7.12
-# Desc: type of u
-mi_gdb_test "-var-info-type u" \
-	"\\^done,type=\"union named_union\"" \
-	"info type variable u"
-
-# Test: c_variable-7.13
-# Desc: is u editable
-mi_gdb_test "-var-show-attributes u" \
-	"\\^done,attr=\"noneditable\"" \
-	"is u editable"
-
-# Test: c_variable-7.14
-# Desc: number of children of u
-mi_gdb_test "-var-info-num-children u" \
-	"\\^done,numchild=\"2\"" \
-	"get number of children of u"
-
-# Test: c_variable-7.15
-# Desc: children of u
-mi_gdb_test "-var-list-children u" \
-	"\\^done,numchild=\"2\",children=\\\[child=\{name=\"u.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"u.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\}\\\]" \
-	"get children of u"
-
-# Test: c_variable-7.20
-# Desc: create anonu
-mi_gdb_test "-var-create anonu * anonu" \
-	"\\^done,name=\"anonu\",numchild=\"3\",type=\"union \{\\.\\.\\.\}\"" \
-	"create local variable anonu"
-
-# Test: c_variable-7.21
-# Desc: value of anonu
-mi_gdb_test "-var-evaluate-expression anonu" \
-	"\\^done,value=\"\{\\.\\.\\.\}\"" \
-	"eval variable anonu"
-
-# Test: c_variable-7.22
-# Desc: type of anonu
-mi_gdb_test "-var-info-type anonu" \
-	"\\^done,type=\"union \{\\.\\.\\.\}\"" \
-	"info type variable anonu"
-
-# Test: c_variable-7.23
-# Desc: is anonu editable
-mi_gdb_test "-var-show-attributes anonu" \
-	"\\^done,attr=\"noneditable\"" \
-	"is anonu editable"
-
-# Test: c_variable-7.24
-# Desc: number of children of anonu
-mi_gdb_test "-var-info-num-children anonu" \
-	"\\^done,numchild=\"3\"" \
-	"get number of children of anonu"
-
-# Test: c_variable-7.25
-# Desc: children of anonu
-mi_gdb_test "-var-list-children anonu" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"anonu.a\",exp=\"a\",numchild=\"0\",type=\"int\"\},child=\{name=\"anonu.b\",exp=\"b\",numchild=\"0\",type=\"char\"\},child=\{name=\"anonu.c\",exp=\"c\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of anonu"
-
-# Test: c_variable-7.30
-# Desc: create struct s
-mi_gdb_test "-var-create s * s" \
-	"\\^done,name=\"s\",numchild=\"6\",type=\"struct _simple_struct\"" \
-	"create local variable s"
-
-
-# Test: c_variable-7.31
-# Desc: value of s
-mi_gdb_test "-var-evaluate-expression s" \
-	"\\^done,value=\"\{\\.\\.\\.\}\"" \
-	"eval variable s"
-
-# Test: c_variable-7.32
-# Desc: type of s
-mi_gdb_test "-var-info-type s" \
-	"\\^done,type=\"struct _simple_struct\"" \
-	"info type variable s"
-
-# Test: c_variable-7.33
-# Desc: is s editable
-mi_gdb_test "-var-show-attributes s" \
-	"\\^done,attr=\"noneditable\"" \
-	"is s editable"
-
-# Test: c_variable-7.34
-# Desc: number of children of s
-mi_gdb_test "-var-info-num-children s" \
-	"\\^done,numchild=\"6\"" \
-	"get number of children of s"
-
-# Test: c_variable-7.35
-# Desc: children of s
-mi_gdb_test "-var-list-children s" \
-	"\\^done,numchild=\"6\",children=\\\[child=\{name=\"s.integer\",exp=\"integer\",numchild=\"0\",type=\"int\"\},child=\{name=\"s.unsigned_integer\",exp=\"unsigned_integer\",numchild=\"0\",type=\"unsigned int\"\},child=\{name=\"s.character\",exp=\"character\",numchild=\"0\",type=\"char\"\},child=\{name=\"s.signed_character\",exp=\"signed_character\",numchild=\"0\",type=\"signed char\"\},child=\{name=\"s.char_ptr\",exp=\"char_ptr\",numchild=\"1\",type=\"char \\*\"\},child=\{name=\"s.array_of_10\",exp=\"array_of_10\",numchild=\"10\",type=\"int \\\[10\\\]\"\}\\\]" \
-	"get children of s"
-#} {integer unsigned_integer character signed_character char_ptr array_of_10}
-
-# Test: c_variable-7.40
-# Desc: create anons
-mi_gdb_test "-var-create anons * anons" \
-	"\\^done,name=\"anons\",numchild=\"3\",type=\"struct \{\\.\\.\\.\}\"" \
-	"create local variable anons"
-
-# Test: c_variable-7.41
-# Desc: value of anons
-mi_gdb_test "-var-evaluate-expression anons" \
-	"\\^done,value=\"\{\\.\\.\\.\}\"" \
-	"eval variable anons"
-
-# Test: c_variable-7.42
-# Desc: type of anons
-mi_gdb_test "-var-info-type anons" \
-	"\\^done,type=\"struct \{\\.\\.\\.\}\"" \
-	"info type variable anons"
-
-# Test: c_variable-7.43
-# Desc: is anons editable
-mi_gdb_test "-var-show-attributes anons" \
-	"\\^done,attr=\"noneditable\"" \
-	"is anons editable"
-
-# Test: c_variable-7.44
-# Desc: number of children of anons
-mi_gdb_test "-var-info-num-children anons" \
-	"\\^done,numchild=\"3\"" \
-	"get number of children of anons"
-
-# Test: c_variable-7.45
-# Desc: children of anons
-mi_gdb_test "-var-list-children anons" \
-	"\\^done,numchild=\"3\",children=\\\[child=\{name=\"anons.a\",exp=\"a\",numchild=\"0\",type=\"int\"\},child=\{name=\"anons.b\",exp=\"b\",numchild=\"0\",type=\"char\"\},child=\{name=\"anons.c\",exp=\"c\",numchild=\"0\",type=\"long int\"\}\\\]" \
-	"get children of anons"
-
-
-# Test: c_variable-7.50
-# Desc: create enum e
-mi_gdb_test "-var-create e * e" \
-	"\\^done,name=\"e\",numchild=\"0\",type=\"enum foo\"" \
-	"create local variable e"
-
-setup_xfail "*-*-*"
-# Test: c_variable-7.51
-# Desc: value of e
-mi_gdb_test "-var-evaluate-expression e" \
-	"\\^done,value=\"FIXME\"" \
-	"eval variable e"
-clear_xfail "*-*-*"
-
-# Test: c_variable-7.52
-# Desc: type of e
-mi_gdb_test "-var-info-type e" \
-	"\\^done,type=\"enum foo\"" \
-	"info type variable e"
-
-# Test: c_variable-7.53
-# Desc: is e editable
-mi_gdb_test "-var-show-attributes e" \
-	"\\^done,attr=\"editable\"" \
-	"is e editable"
-
-# Test: c_variable-7.54
-# Desc: number of children of e
-mi_gdb_test "-var-info-num-children e" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of e"
-
-# Test: c_variable-7.55
-# Desc: children of e
-mi_gdb_test "-var-list-children e" \
-	"\\^done,numchild=\"0\"" \
-	"get children of e"
-
-# Test: c_variable-7.60
-# Desc: create anone
-mi_gdb_test "-var-create anone * anone" \
-	"\\^done,name=\"anone\",numchild=\"0\",type=\"enum \{\\.\\.\\.\}\"" \
-	"create local variable anone"
-
-setup_xfail "*-*-*"
-# Test: c_variable-7.61
-# Desc: value of anone
-mi_gdb_test "-var-evaluate-expression anone" \
-	"\\^done,value=\"A\"" \
-	"eval variable anone"
-clear_xfail "*-*-*"
-
-
-# Test: c_variable-7.70
-# Desc: create anone
-mi_gdb_test "-var-create anone * anone" \
-	"&\"Duplicate variable object name\\\\n\".*\\^error,msg=\"Duplicate variable object name\"" \
-	"create duplicate local variable anone"
-
-
-# Test: c_variable-7.72
-# Desc: type of anone
-mi_gdb_test "-var-info-type anone" \
-	"\\^done,type=\"enum \{\\.\\.\\.\}\"" \
-	"info type variable anone"
-
-
-# Test: c_variable-7.73
-# Desc: is anone editable
-mi_gdb_test "-var-show-attributes anone" \
-	"\\^done,attr=\"editable\"" \
-	"is anone editable"
-
-# Test: c_variable-7.74
-# Desc: number of children of anone
-mi_gdb_test "-var-info-num-children anone" \
-	"\\^done,numchild=\"0\"" \
-	"get number of children of anone"
-
-# Test: c_variable-7.75
-# Desc: children of anone
-mi_gdb_test "-var-list-children anone" \
-	"\\^done,numchild=\"0\"" \
-	"get children of anone"
-
-
-# Record fp
-
-send_gdb "p/x \$fp\n"
-gdb_expect {
-    -re ".*($hex).*\\^done\r\n$mi_gdb_prompt$" { 
-	pass "print FP register"
-	set fp $expect_out(1,string) 
-    }
-#    -re ".*" { fail "print FP register"}
-    timeout { fail "print FP register (timeout)"}
-}
-
-set line_incr_a_b_a [gdb_get_line_number "b = a;"]
-
-mi_gdb_test "200-break-insert incr_a" \
-	"200\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"incr_a\",file=\".*var-cmd.c\",line=\"$line_incr_a_b_a\",times=\"0\"\}" \
-	"break-insert operation"
-send_gdb "-exec-continue\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"3\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"incr_a\",args=\\\[\{name=\"a\",value=\"2\.*\"\}\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_incr_a_b_a\"\}\r\n$mi_gdb_prompt$" {
-	pass "continue to incr_a"
-    }
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"3\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"incr_a\",args=\\\[\{name=\"a\",value=\"\.*\"\}\\\],file=\".*var-cmd.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"([expr $line_incr_a_b_a - 2]|[expr $line_incr_a_b_a - 1]|$line_incr_a_b_a)\"\}\r\n$mi_gdb_prompt$" {
-	fail "continue to incr_a (compiler debug info incorrect)"
-    }
-    -re "\\^running\r\n${mi_gdb_prompt}.*\r\n$mi_gdb_prompt$" {
-	fail "continue to incr_a (unknown output)"
-    }
-    timeout {
-	fail "continue to incr_a (timeout)"
-    }
-}
-
-# Test: c_variable-7.81
-# Desc: Create variables in different scopes
-mi_gdb_test "-var-create a1 * a" \
-	"\\^done,name=\"a1\",numchild=\"0\",type=\"char\"" \
-	"create local variable a1"
-
-mi_gdb_test "-var-create a2 $fp a" \
-	"\\^done,name=\"a2\",numchild=\"0\",type=\"int\"" \
-	"create variable a2 in different scope"
-
-#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}
-
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-watch.exp b/gdb/testsuite/gdb.mi/mi2-watch.exp
deleted file mode 100644
index 301505e9683..00000000000
--- a/gdb/testsuite/gdb.mi/mi2-watch.exp
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, 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.  
-
-#
-# Test essential Machine interface (MI) operations
-#
-# Verify that, using the MI, we can run a simple program and perform basic
-# debugging activities like: insert breakpoints, run the program,
-# step, next, continue until it ends and, last but not least, quit.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but to verify the correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi2"
-
-gdb_exit
-if [mi_gdb_start] {
-    continue
-}
-
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-mi_delete_breakpoints
-mi_gdb_reinitialize_dir $srcdir/$subdir
-mi_gdb_load ${binfile}
-
-proc test_watchpoint_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-
-    set line_callee4_head [gdb_get_line_number "callee4 ("]
-    set line_callee4_body [expr $line_callee4_head + 2]
-
-    # Insert a watchpoint and list
-    # Tests:
-    # -break-watch C
-    # -break-list
-
-    mi_gdb_test "111-break-watch C" \
-             "111\\^done,wpt=\{number=\"2\",exp=\"C\"\}" \
-             "break-watch operation"
-
-    mi_gdb_test "222-break-list" \
-	    "222\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_body\",times=\"1\"\},bkpt=\{number=\"2\",type=\".*watchpoint\",disp=\"keep\",enabled=\"y\",addr=\"\",what=\"C\",times=\"0\"\}\\\]\}" \
-                "list of watchpoints"
-
-}
-
-# UNUSED at the time
-proc test_awatch_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Insert an access watchpoint and list it
-    # Tests:
-    # -break-watch -a A
-    # -break-list
-
-    mi_gdb_test "333-break-watch -a A" \
-             "333\\^done,bkpt=\{number=\"1\",addr=\"$hex\",file=\".*basics.c\",line=\"$line_main_body\"\}" \
-             "break-watch -a operation"
-
-    mi_gdb_test "444-break-list" \
-	    "444\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"3\",type=\"watchpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\]\}" \
-                "list of watchpoints awatch"
-
-    mi_gdb_test "777-break-delete 3" \
-	    "777\\^done" \
-	    "delete access watchpoint"
-}
-
-# UNUSED at the time
-proc test_rwatch_creation_and_listing {} {
-    global mi_gdb_prompt
-    global srcfile
-    global hex
-
-    set line_main_head [gdb_get_line_number "main ("]
-    set line_main_body [expr $line_main_head + 2]
-
-    # Insert a read watchpoint and list it.
-    # Tests:
-    # -break-insert -r B
-    # -break-list
-
-    mi_gdb_test "200-break-watch -r C" \
-             "200\\^done,bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\}" \
-             "break-insert -r operation"
-
-    mi_gdb_test "300-break-list" \
-	    "300\\^done,BreakpointTable=\{.*,hdr=\\\[.*\\\],body=\\\[bkpt=\{number=\"5\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"main\",file=\".*basics.c\",line=\"$line_main_body\",times=\"0\"\},.*\}\\\}\}" \
-                "list of breakpoints"
-
-    mi_gdb_test "177-break-delete 4" \
-	    "177\\^done" \
-	    "delete read watchpoint"
-}
-
-proc test_watchpoint_triggering {} {
-    global mi_gdb_prompt
-    global hex
-
-    set line_callee4_return_0     [gdb_get_line_number "return 0;"]
-    set line_callee3_head         [gdb_get_line_number "callee3 ("]
-    set line_callee3_close_brace  [expr $line_callee3_head + 3]
-
-    # Continue execution until the watchpoint is reached,  continue again, 
-    # to see the watchpoint go out of scope.
-    # Does:
-    # -exec-continue (Here wp triggers)
-    # -exec-continue (Here wp goes out of scope)
-
-    send_gdb "222-exec-continue\n"
-    gdb_expect {
-      -re "222\\^running\r\n$mi_gdb_prompt" {
-        gdb_expect {
-	    -re "222\\*stopped,reason=\"watchpoint-trigger\",wpt=\{number=\"2\",exp=\"C\"\},value=\{old=\".*\",new=\"3\"\},thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" {
-            pass "watchpoint trigger"
-          }
-          -re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (2)"}
-          timeout {fail "watchpoint trigger (timeout 2)"}
-        }
-      }
-      -re ".*$mi_gdb_prompt$" {fail "watchpoint trigger (1)"}
-      timeout {fail "watchpoint trigger (timeout 1)"}
-    }
-
-    send_gdb "223-exec-continue\n"
-    gdb_expect {
-      -re "223\\^running\r\n$mi_gdb_prompt" {
-        gdb_expect {
-	    -re "\[\r\n\]*223\\*stopped,reason=\"watchpoint-scope\",wpnum=\"2\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee3\",args=\\\[.*\\\],file=\".*basics.c\",line=\"$line_callee3_close_brace\"\}\r\n$mi_gdb_prompt$" {
-            pass "wp out of scope"
-          }
-          -re ".*$mi_gdb_prompt$" {fail "wp out of scope (2)"}
-          timeout {fail "wp out of scope (timeout 2)"}
-        }
-      }
-      -re ".*$mi_gdb_prompt$" {fail "wp out of scope (1)"}
-      timeout {fail "wp out of scope (timeout 1)"}
-    }
-}
-
-mi_runto callee4
-test_watchpoint_creation_and_listing
-#test_rwatch_creation_and_listing
-#test_awatch_creation_and_listing
-test_watchpoint_triggering
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/pthreads.c b/gdb/testsuite/gdb.mi/pthreads.c
deleted file mode 100644
index 701dfec8d49..00000000000
--- a/gdb/testsuite/gdb.mi/pthreads.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Pthreads test program.
-   Copyright 1996, 2002, 2003, 2004
-   Free Software Foundation, Inc.
-
-   Written by Keith Seitz of Red Hat.
-   Copied from gdb.threads/pthreads.c.
-   Contributed by Red Hat.
-
-   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 <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-/* Under OSF 2.0 & 3.0 and HPUX 10, the second arg of pthread_create
-   is prototyped to be just a "pthread_attr_t", while under Solaris it
-   is a "pthread_attr_t *".  Arg! */
-
-#if defined (__osf__) || defined (__hpux__)
-#define PTHREAD_CREATE_ARG2(arg) arg
-#define PTHREAD_CREATE_NULL_ARG2 null_attr
-static pthread_attr_t null_attr;
-#else
-#define PTHREAD_CREATE_ARG2(arg) &arg
-#define PTHREAD_CREATE_NULL_ARG2 NULL
-#endif
-
-void *
-routine (void *arg)
-{
-  /* When gdb is running, it sets hidden breakpoints in the thread
-     library.  The signals caused by these hidden breakpoints can
-     cause system calls such as 'sleep' to return early.  Pay attention
-     to the return value from 'sleep' to get the full sleep.  */
-  int unslept = 9;
-  while (unslept > 0)
-    unslept = sleep (unslept);
-
-  printf ("hello thread\n");
-}
-
-/* Marker function for the testsuite */
-void
-done_making_threads (void)
-{
-  /* Nothing */
-}
-
-void
-create_thread (void)
-{
-  pthread_t tid;
-
-  if (pthread_create (&tid, PTHREAD_CREATE_NULL_ARG2, routine, (void *) 0xfeedface))
-    {
-      perror ("pthread_create 1");
-      exit (1);
-    }
-}
-
-int
-main (int argc, char *argv[])
-{
-  int i;
-
-  /* Create a few threads */
-  for (i = 0; i < 5; i++)
-    create_thread ();
-  done_making_threads ();
-
-  printf ("hello\n");
-  printf ("hello\n");
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.mi/testcmds b/gdb/testsuite/gdb.mi/testcmds
deleted file mode 100644
index 28fa524042f..00000000000
--- a/gdb/testsuite/gdb.mi/testcmds
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is a (bogus) sample user command built to test the printing
-# of commands.
-define test
-set $a = 1
-set $b = 2
-if ($a > $b)
- set $a = 1
- set $b = 2
- while ($a > $b)
-  set $a = 1
-  set $b = 2
- end
-else
- set $a = 1
- set $b = 2
-end
-while ($a < $b)
- set $a = $a + 1
- set $c = $a
- if ($a = $b)
-  set $c = 5
- end
- set $a = 1
- set $b = 2
-end
diff --git a/gdb/testsuite/gdb.mi/until.c b/gdb/testsuite/gdb.mi/until.c
deleted file mode 100644
index df4a68d930f..00000000000
--- a/gdb/testsuite/gdb.mi/until.c
+++ /dev/null
@@ -1,26 +0,0 @@
-foo (void)
-{
- int i, x, y, z;
-
- x = 0;
- y = 1;
- i = 0;
-
- while (i < 2)
-   i++;
-
- x = i;
- y = 2 * x;
- z = x + y;
- y = x + z;
- x = 9;
- y = 10;
-}
-
-main ()
-{
-  int a = 1;
-  foo ();
-  a += 2;
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.mi/var-cmd.c b/gdb/testsuite/gdb.mi/var-cmd.c
deleted file mode 100644
index 2a297d2c02d..00000000000
--- a/gdb/testsuite/gdb.mi/var-cmd.c
+++ /dev/null
@@ -1,317 +0,0 @@
-/* Copyright 1999, 2004 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 <stdlib.h>
-
-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 (char);
-
-void incr_a (char 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.objc/Makefile.in b/gdb/testsuite/gdb.objc/Makefile.in
deleted file mode 100644
index 381e48a0789..00000000000
--- a/gdb/testsuite/gdb.objc/Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = basicclass
-
-all: 
-	@echo "Nothing to be done for all..."
-
-info:
-install-info:
-dvi:
-install:
-uninstall: force
-installcheck:
-check:
-
-clean mostlyclean:
-	-rm -f *~ *.o *.ci
-	-rm -f core ${EXECUTABLES}
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
diff --git a/gdb/testsuite/gdb.objc/basicclass.exp b/gdb/testsuite/gdb.objc/basicclass.exp
deleted file mode 100644
index c92534bdbea..00000000000
--- a/gdb/testsuite/gdb.objc/basicclass.exp
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 2003, 2004 Free Software Foundation, 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.  
-
-# This file was written by Adam Fedor (fedor@gnu.org)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "basicclass"
-set srcfile ${testfile}.m
-set binfile ${objdir}/${subdir}/${testfile}
-
-#
-# Objective-C program compilation isn't standard. We need to figure out
-# which libraries to link in. Most of the time it uses pthread
-#
-if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
-}
-
-#
-# Deduce language of main()
-#
-
-proc deduce_language_of_main {} {
-    global gdb_prompt
-
-    # See what language gdb thinks main() is, prior to reading full symbols.
-    # I think this fails for COFF targets.
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"auto; currently objective-c\".*$gdb_prompt $" {
-	    pass "deduced language is Objective-C, before full symbols"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "source language not correct for Objective-C (psymtabs only)"
-	    return
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return
-	}
-    }
-
-    runto_main
-
-    # See if our idea of the language has changed.
-
-    send_gdb "show language\n"
-    gdb_expect {
-	-re ".* source language is \"auto; currently objective-c\".*$gdb_prompt $" {
-	    pass "deduced language is Objective-C, after full symbols"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "source language not correct for Objective-C (full symbols)"
-	    return
-	}
-	timeout {
-	    fail "can't show language (timeout)"
-	    return
-	}
-    }
-}
-
-proc do_objc_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-    deduce_language_of_main
-}
-
-do_objc_tests
-
-#
-# Breakpoint tests
-#
-gdb_test "break doIt" \
-    "Breakpoint.*at.* file .*$srcfile, line.29.*" \
-    "breakpoint method"
-
-gdb_test "break takeArg:" \
-    "Breakpoint.*at.* file .*$srcfile, line.34.*" \
-    "breakpoint method with colon"
-
-gdb_test "break newWithArg:" \
-    "Breakpoint.*at.* file .*$srcfile, line.22.*" \
-    "breakpoint class method with colon"
-
-#
-# Continue until breakpoint (test re-setting breakpoint)
-#
-gdb_test continue \
-    "Continuing\\..*Breakpoint \[0-9\]+, -.BasicClass takeArg:. \\(self=.*, _cmd=.*, arg=.*\\) at .*$srcfile:34.*" \
-    "continue until method breakpoint"
-
-#
-# Test resetting breakpoints when re-running program
-#
-gdb_run_cmd
-gdb_expect {
-    -re "Breakpoint \[0-9\]+,.*main .*argc.*argv.* at .*$srcfile:.*$gdb_prompt $"\
-                            { pass "resetting breakpoints when rerunning" }
-    -re ".*$gdb_prompt $"       { fail "resetting breakpoints when rerunning" }
-    timeout                 { fail "resetting breakpoints when rerunning" }
-}
-
-#
-# Continue until breakpoint (test re-setting breakpoint)
-#
-gdb_test continue \
-    "Continuing\\..*Breakpoint \[0-9\]+, -.BasicClass takeArg:. \\(self=.*, _cmd=.*, arg=.*\\) at .*$srcfile:34.*" \
-    "continue until method breakpoint"
-
-#
-# Test printing objects
-#
-gdb_test "print object" \
-    "\\$\[0-9\] = .*0x0" \
-    " print an ivar of self"
-
-gdb_test "print self" \
-    "\\$\[0-9\] = \\(.*BasicClass \\*\\) 0x\[0-9a-f\]+" \
-    " print self"
-
-gdb_test "print \*self" \
-    "\\$\[0-9\] = \{isa = 0x\[0-9a-f\]+, object = 0x0\}" \
-    " print contents of self"
-
-#
-# Break in a category
-#
-gdb_test "break hiddenMethod" \
-    "Breakpoint.*at.* file .*$srcfile, line.61." \
-    "breakpoint in category method"
-
-
-#
-# Continue until breakpoint (test re-setting category breakpoint)
-#
-gdb_test continue \
-    "Continuing\\..*Breakpoint \[0-9\]+, -.BasicClass\\(Private\\) hiddenMethod. \\(self=.*, _cmd=.*\\) at .*$srcfile:61.*" \
-     "continue until category method"
-
-#
-# Test calling Objective-C methods
-#
-gdb_test "print \[self printHi\]" \
-    "Hi.*\\$\[0-9\] = \\(.*objc_object \\*\\) 0x\[0-9a-f\]+" \
-    "Call an Objective-C method with no arguments"
-
-gdb_test "print \[self printNumber: 42\]" \
-    "42.*\\$\[0-9\] = 43" \
-    "Call an Objective-C method with one argument"
-
-#
-# Test printing the object description
-#
-gdb_test "print-object object" \
-    "BasicClass gdb test object" \
-    "Use of the print-object command"
-
-gdb_test "po self" \
-    "BasicClass gdb test object" \
-    "Use of the po (print-object) command"
-
-
diff --git a/gdb/testsuite/gdb.objc/basicclass.m b/gdb/testsuite/gdb.objc/basicclass.m
deleted file mode 100644
index 0de12db25a1..00000000000
--- a/gdb/testsuite/gdb.objc/basicclass.m
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <objc/Object.h>
-
-@interface BasicClass: Object
-{
-  id object;
-}
-+ newWithArg: arg;
-- doIt;
-- takeArg: arg;
-- printHi;
-- (int) printNumber: (int)number;
-- (const char *) myDescription;
-@end
-
-@interface BasicClass (Private)
-- hiddenMethod;
-@end
-
-@implementation BasicClass
-+ newWithArg: arg
-{
-  id obj = [self new];
-  [obj takeArg: arg];
-  return obj;
-}
-
-- doIt
-{
-  return self;
-}
-
-- takeArg: arg
-{
-  object = arg;
-  [self hiddenMethod];
-  return self;
-}
-
-- printHi
-{
-  printf("Hi\n");
-  return self;
-}
-
-- (int) printNumber: (int)number
-{
-  printf("%d\n", number);
-  return number+1;
-}
-
-- (const char *) myDescription
-{
-  return "BasicClass gdb test object";
-}
-
-@end
-
-@implementation BasicClass (Private)
-- hiddenMethod
-{
-  return self;
-}
-@end
-
-int main (int argc, const char *argv[])
-{
-  id obj;
-  obj = [BasicClass new];
-  [obj takeArg: obj];
-  return 0;
-}
-
-const char *_NSPrintForDebugger(id object)
-{
-  /* This is not really what _NSPrintForDebugger should do, but it
-     is a simple test if gdb can call this function */
-  if (object && [object respondsTo: @selector(myDescription)])
-    return [object myDescription];
-
-  return NULL;
-}
diff --git a/gdb/testsuite/gdb.objc/nondebug.exp b/gdb/testsuite/gdb.objc/nondebug.exp
deleted file mode 100644
index 9c7a7443524..00000000000
--- a/gdb/testsuite/gdb.objc/nondebug.exp
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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.  
-
-# This file tests decoding non-debuggable Objective-C symbols
-
-# This file was written by Adam Fedor (fedor@gnu.org)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "nondebug"
-set srcfile ${testfile}.m
-set binfile ${objdir}/${subdir}/${testfile}
-
-#
-# Objective-C program compilation isn't standard. We need to figure out
-# which libraries to link in. Most of the time it uses pthread
-#
-if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list ] ] != "" } {
-  return -1
-}
-
-proc do_objc_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-}
-
-do_objc_tests
-
-#
-# Break on multiply defined non-debuggable symbol (PR objc/1236)
-#
-set name "break on non-debuggable method"
-gdb_test_multiple "break someMethod" $name \
-{
-    -re "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\]\[ \]+-.NonDebug someMethod.*\\\[3\\\]\[ \]+-.NonDebug2 someMethod.*" {
-	send_gdb "2\n"
-	exp_continue
-    }
-    -re "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n> " {
-	gdb_test "0" "" ""
-	kfail "gdb/1236" $name
-    }
-    -re "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+.*$gdb_prompt $" { pass $name }
-    -re ".*$gdb_prompt $"   { kfail "gdb/1236" $name }
-}
-
diff --git a/gdb/testsuite/gdb.objc/nondebug.m b/gdb/testsuite/gdb.objc/nondebug.m
deleted file mode 100644
index dcbdde936c7..00000000000
--- a/gdb/testsuite/gdb.objc/nondebug.m
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <objc/Object.h>
-
-@interface NonDebug: Object
-{
-}
-@end
-@interface NonDebug2: Object
-{
-}
-@end
-
-@implementation NonDebug
-
-- someMethod
-{
-  printf("method someMethod\n");
-  return self;
-}
-
-@end
-@implementation NonDebug2
-
-- someMethod
-{
-  printf("method2 someMethod\n");
-  return self;
-}
-
-@end
-
-
-int main (int argc, const char *argv[])
-{
-  id obj;
-  obj = [NonDebug new];
-  [obj someMethod];
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.objc/objcdecode.exp b/gdb/testsuite/gdb.objc/objcdecode.exp
deleted file mode 100644
index e00bffeae77..00000000000
--- a/gdb/testsuite/gdb.objc/objcdecode.exp
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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.  
-
-# This file tests decoding of Objective-C symbols
-
-# This file was written by Adam Fedor (fedor@gnu.org)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "objcdecode"
-set srcfile ${testfile}.m
-set binfile ${objdir}/${subdir}/${testfile}
-
-#
-# Objective-C program compilation isn't standard. We need to figure out
-# which libraries to link in. Most of the time it uses pthread
-#
-if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
-}
-
-proc do_objc_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $binfile
-
-}
-
-do_objc_tests
-
-#
-# Break on multiply defined method (PR objc/1236)
-#
-set name "break on multiply defined method"
-gdb_test_multiple "break multipleDef" $name \
-{
-    -re "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] -.Decode multipleDef. at .*\r\n\\\[3\\\] multipleDef at .*\r\n> $" {
-	send_gdb "3\n"
-	exp_continue
-    }
-    -re "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*\r\n$gdb_prompt $" { pass $name }
-    -re ".*$gdb_prompt $"   { kfail "gdb/1236" $name }
-}
-
-set name "continue after break on multiply defined symbol"
-gdb_test_multiple "run" $name \
-{
-    -re "Starting program.*Breakpoint \[0-9\]+, multipleDef \\\(\\\) at .*\r\n$gdb_prompt $" {
-	pass $name
-    }
-    -re "Starting program.*\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] -.Decode multipleDef. at .*\r\n\\\[3\\\] multipleDef at .*\r\n> $" {
-	send_gdb "0\n"
-	kfail "gdb/1238" $name
-	# gdb is in a bad state here.
-	# It would be difficult to do any more tests after this.
-    }
-}
diff --git a/gdb/testsuite/gdb.objc/objcdecode.m b/gdb/testsuite/gdb.objc/objcdecode.m
deleted file mode 100644
index 5e99618d115..00000000000
--- a/gdb/testsuite/gdb.objc/objcdecode.m
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <objc/Object.h>
-
-@interface Decode: Object
-{
-}
-- multipleDef;
-- (const char *) myDescription;
-@end
-
-@implementation Decode
-
-- multipleDef
-{
-  printf("method multipleDef\n");
-  return self;
-}
-
-- (const char *) myDescription
-{
-  return "Decode gdb test object";
-}
-
-@end
-
-int
-multipleDef()
-{
-  printf("function multipleDef\n");
-  return 0;
-}
-
-int main (int argc, const char *argv[])
-{
-  id obj;
-  obj = [Decode new];
-  multipleDef();
-  [obj multipleDef];
-  return 0;
-}
-
-const char *_NSPrintForDebugger(id object)
-{
-  /* This is not really what _NSPrintForDebugger should do, but it
-     is a simple test if gdb can call this function */
-  if (object && [object respondsTo: @selector(myDescription)])
-    return [object myDescription];
-
-  return NULL;
-}
diff --git a/gdb/testsuite/gdb.server/Makefile.in b/gdb/testsuite/gdb.server/Makefile.in
deleted file mode 100644
index 0633edf4b81..00000000000
--- a/gdb/testsuite/gdb.server/Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES =
-
-MISCELLANEOUS =
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-find . -name '*.o' -print | xargs rm -f
-	-find . -name '*.ali' -print | xargs rm -f
-	-find . -name 'b~*.ad[sb]' -print | xargs rm -f
-	-rm -f *~ a.out xgdb *.x *.ci *.tmp
-	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp
-	-rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES)
-	-rm -f $(MISCELLANEOUS) twice-tmp.c
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status config.log
-	-rm -f *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
diff --git a/gdb/testsuite/gdb.server/server-run.exp b/gdb/testsuite/gdb.server/server-run.exp
deleted file mode 100644
index e0085dc5936..00000000000
--- a/gdb/testsuite/gdb.server/server-run.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2005 Free Software Foundation, 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.  
-
-# Test the basic functionality of gdbserver.
-
-load_lib gdbserver-support.exp
-
-set testfile "server"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if { [skip_gdbserver_tests] } {
-    return 0
-}
-
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-
-gdbserver_load $binfile ""
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_breakpoint main
-gdb_test "continue" "Breakpoint.* main .*" "continue to main"
diff --git a/gdb/testsuite/gdb.server/server.c b/gdb/testsuite/gdb.server/server.c
deleted file mode 100644
index b6512633a9e..00000000000
--- a/gdb/testsuite/gdb.server/server.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2005 Free Software Foundation, 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.  */
-
-int
-main (int argc, char **argv)
-{
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.stabs/Makefile.in b/gdb/testsuite/gdb.stabs/Makefile.in
deleted file mode 100644
index 45d6a2fab91..00000000000
--- a/gdb/testsuite/gdb.stabs/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-all: 
-	@echo "Nothing to be done for all..."
-
-#### host, target, and site specific Makefile frags come in here.
-
-clean mostlyclean:
-	-rm -f *.o *~ core tmp.c tmp.s weird.s errs
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
-
-Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.ac
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.stabs/aout.sed b/gdb/testsuite/gdb.stabs/aout.sed
deleted file mode 100644
index bbe38bc459a..00000000000
--- a/gdb/testsuite/gdb.stabs/aout.sed
+++ /dev/null
@@ -1,16 +0,0 @@
-s/# Irix4 sed blows up if you have a sed command starting with "#"//
-s/# Avoid it by putting the comments within real sed commands.//
-s/# GDB legitimately expects a file name.//
-s/# The sun3 assembler bogusly requires that the value of this stab be a//
-s/# label.  Placate it.//
-1i\
-	.stabs "weird.c",0x64,0,0,Label0\
-Label0:
-s/N_LSYM/0x80/
-s/N_GSYM/0x20/
-s/# Replace a single backslash with a doubled backslash//
-/\.stabs/s/\\/\\\\/
-s/\.begin_common\(.*\)/.stabs \1,0xe2,0,0,0/
-s/\.end_common\(.*\)/.stabs \1,0xe4,0,0,0/
-s/\.align_it/.align 2/
-/^#/d
diff --git a/gdb/testsuite/gdb.stabs/configure b/gdb/testsuite/gdb.stabs/configure
deleted file mode 100755
index 4e5c3527fda..00000000000
--- a/gdb/testsuite/gdb.stabs/configure
+++ /dev/null
@@ -1,2246 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="weird.exp"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/gdb/testsuite/gdb.stabs/configure.ac b/gdb/testsuite/gdb.stabs/configure.ac
deleted file mode 100644
index 507acc31f01..00000000000
--- a/gdb/testsuite/gdb.stabs/configure.ac
+++ /dev/null
@@ -1,15 +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.59)
-AC_INIT(weird.exp)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
-AC_CANONICAL_SYSTEM
-
-AC_OUTPUT(Makefile)
diff --git a/gdb/testsuite/gdb.stabs/ecoff.sed b/gdb/testsuite/gdb.stabs/ecoff.sed
deleted file mode 100644
index 3411c294198..00000000000
--- a/gdb/testsuite/gdb.stabs/ecoff.sed
+++ /dev/null
@@ -1,17 +0,0 @@
-# GDB legitimately expects a file name.
-1i\
- .file	1 "weird.c"\
-\ #@stabs\
-\ #.stabs "weird.c",0x64,0,0,0
-/^#/d
-s/" *, */",/g
-s/\([0-9]\) *, */\1,/g
-s/  *$//
-s/N_LSYM/0x80/
-s/N_GSYM/0x20/
-s/\.begin_common\(.*\)/.stabs \1,0xe2,0,0,0/
-s/\.end_common\(.*\)/.stabs \1,0xe4,0,0,0/
-s/\.align_it/.align 2/
-/.if/d
-/.endif/d
-s/\.stabs/ #.stabs/
diff --git a/gdb/testsuite/gdb.stabs/exclfwd.exp b/gdb/testsuite/gdb.stabs/exclfwd.exp
deleted file mode 100644
index 05ab97c0fb0..00000000000
--- a/gdb/testsuite/gdb.stabs/exclfwd.exp
+++ /dev/null
@@ -1,72 +0,0 @@
-#   Copyright 2004 Free Software Foundation, 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@gnu.org
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-#
-# test running programs
-#
-set prms_id 0
-set bug_id 0
-
-set testfile exclfwd
-set binfile ${objdir}/${subdir}/${testfile}
-
-foreach file {exclfwd1 exclfwd2} {
-    if {[gdb_compile "${srcdir}/${subdir}/${file}.c" "${file}.o" object {debug}] != ""} {
-        gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-
-if {[gdb_compile "exclfwd1.o exclfwd2.o" ${binfile} executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    perror "couldn't run to breakpoint"
-    continue
-}
-
-get_debug_format
-
-set eol "\[ \t\]*\[\n\r\]+"
-
-gdb_test "ptype v1" "type = struct a {$eol
-    int x;$eol
-    int y;$eol
-}$eol"
-
-if { [test_debug_format "stabs"] } then {
-    setup_kfail "gdb/1602" *-*-*
-}
-gdb_test "ptype v2" "type = struct a {$eol
-    const char .c;$eol
-}$eol"
-
-if { [test_debug_format "stabs"] } then {
-    setup_kfail "gdb/1603" *-*-*
-}
-gdb_test "ptype v3" "type = const char ."
diff --git a/gdb/testsuite/gdb.stabs/exclfwd.h b/gdb/testsuite/gdb.stabs/exclfwd.h
deleted file mode 100644
index 3f064b12857..00000000000
--- a/gdb/testsuite/gdb.stabs/exclfwd.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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@gnu.org  */
-
-typedef struct a a_t;
diff --git a/gdb/testsuite/gdb.stabs/exclfwd1.c b/gdb/testsuite/gdb.stabs/exclfwd1.c
deleted file mode 100644
index a7574e5098b..00000000000
--- a/gdb/testsuite/gdb.stabs/exclfwd1.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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@gnu.org  */
-
-#include "exclfwd.h"
-
-struct a 
-{
-  int x, y;
-};
-
-a_t v1;
-
-int
-main ()
-{
-}
diff --git a/gdb/testsuite/gdb.stabs/exclfwd2.c b/gdb/testsuite/gdb.stabs/exclfwd2.c
deleted file mode 100644
index f7de01544be..00000000000
--- a/gdb/testsuite/gdb.stabs/exclfwd2.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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@gnu.org  */
-
-#include "exclfwd.h"
-
-struct a
-{
-  const char *c;
-};
-
-a_t v2;
-const char *v3;
diff --git a/gdb/testsuite/gdb.stabs/hppa.sed b/gdb/testsuite/gdb.stabs/hppa.sed
deleted file mode 100644
index 5ca1a003c37..00000000000
--- a/gdb/testsuite/gdb.stabs/hppa.sed
+++ /dev/null
@@ -1,20 +0,0 @@
-s/# Old OSF sed blows up if you have a sed command starting with "#"//
-s/# Avoid it by putting the comments within real sed commands.//
-s/# GDB legitimately expects a file name.//
-s/# The sun3 assembler bogusly requires that the value of this stab be a//
-s/# label.  Placate it.//
-1i\
-\	.stabs "weird.c",0x64,0,0,Label0\
-Label0:
-s/N_LSYM/0x80/
-s/N_GSYM/0x20/
-s/# Replace a single backslash with a doubled backslash//
-/\.stabs/s/\\/\\\\/
-s/# Only labels should be at the beginning of a line, assembler directives//
-s/# and instructions should start somewhere after column zero.//
-/^\./s/^\./	./
-s/\.begin_common\(.*\)/.stabs \1,0xe2,0,0,0/
-s/\.end_common\(.*\)/.stabs \1,0xe4,0,0,0/
-s/\.align_it/.align 4/
-s/\.globl/.export/
-/^#/d
diff --git a/gdb/testsuite/gdb.stabs/weird.def b/gdb/testsuite/gdb.stabs/weird.def
deleted file mode 100644
index 33116b4c5f3..00000000000
--- a/gdb/testsuite/gdb.stabs/weird.def
+++ /dev/null
@@ -1,882 +0,0 @@
-# We'll need an integer type.
-.stabs "inttype:t1=bu4;0;32;",N_LSYM,0,0,0
-
-# There are several kinds of tests in here.  We mix up the order to see
-# if we can test for poor handling of a stab affecting the next or previous
-# stab.
-
-# Try all possible symbol descriptors.  Note that GDB should merely
-# complain() even though these strings are totally bogus.  This allows
-# future compilers to define new syntaxes.
-.stabs "sym32:  !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-# Type descriptors.
-.stabs "type32:t32=  !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-# Note that a 'G', N_GSYM symbol needs no value.  The name of the stab
-# is used to look up a non-stab symbol with the same name.  On some
-# machines, the non-stab symbols will normally have underscores, but
-# if they lack the underscores, then GDB will simply put the symbol in
-# the minimal symbol table all the same.  So we can use them without
-# underscores and that way we don't need to worry about which machines
-# need underscores.
-
-# Type attributes.
-.stabs "attr104:G404=@h !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr105:G405=@i !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-# A few real type attributes.
-# Alignment.
-.stabs "var0:G300=@a8;1",N_GSYM,0,0, 0
-.globl var0
-.data
-.align_it
-var0:
-.long 42
-
-.stabs "sym33:! !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym35:# !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym36:$ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym37:% !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym38:& !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym39:' !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym40:( !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym41:) !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym42:* !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym43:+ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym44:, !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym45:- !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-.globl attr122
-.data
-.align_it
-attr122:
-.long 42
-.globl attr123
-.data
-.align_it
-attr123:
-.long 42
-.globl attr124
-.data
-.align_it
-attr124:
-.long 42
-
-.stabs "sym46:. !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym47:/ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym48:0 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym49:1 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym50:2 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-.stabs "attr96:G396=@` !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr97:G397=@a !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr98:G398=@b !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr99:G399=@c !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-.stabs "sym51:3 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym52:4 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym53:5 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym54:6 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym55:7 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym56:8 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym57:9 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym58:: !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym59:; !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym60:< !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym61:= !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym62:> !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym63:? !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym64:@ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym65:A !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym66:B !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym67:C !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym68:D !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym69:E !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym70:F !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym71:G !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym72:H !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym73:I !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym74:J !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym75:K !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym76:L !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym77:M !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym78:N !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym79:O !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym80:P !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym81:Q !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym82:R !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym83:S !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym84:T !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym85:U !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym86:V !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym87:W !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym88:X !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym89:Y !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym90:Z !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym91:[ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-.stabs "sym93:] !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym94:^ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym95:_ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym96:` !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym97:a !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym98:b !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym99:c !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym100:d !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym101:e !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym102:f !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym103:g !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym104:h !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym105:i !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym106:j !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym107:k !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym108:l !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym109:m !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym110:n !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym111:o !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym112:p !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym113:q !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym114:r !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym115:s !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym116:t !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym117:u !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym118:v !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym119:w !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym120:x !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym121:y !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym122:z !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym123:{ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym124:| !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym125:} !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "sym126:~ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-.stabs "type33:t33=! !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type35:t35=# !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type36:t36=$ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type37:t37=% !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type38:t38=& !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type39:t39=' !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type40:t40=( !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type41:t41=) !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type42:t42=* !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type43:t43=+ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type44:t44=, !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type45:t45=- !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type46:t46=. !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type47:t47=/ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type48:t48=0 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type49:t49=1 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type50:t50=2 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type51:t51=3 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type52:t52=4 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type53:t53=5 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type54:t54=6 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type55:t55=7 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type56:t56=8 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type57:t57=9 !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type58:t58=: !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type59:t59=; !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type60:t60=< !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type61:t61== !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type62:t62=> !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type63:t63=? !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type64:t64=@ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type65:t65=A !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type66:t66=B !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type67:t67=C !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-.globl attr66
-.data
-.align_it
-attr66:
-.long 42
-.globl attr67
-.data
-.align_it
-attr67:
-.long 42
-.globl attr68
-.data
-.align_it
-attr68:
-.long 42
-.globl attr69
-.data
-.align_it
-attr69:
-.long 42
-
-.stabs "type68:t68=D !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type69:t69=E !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type70:t70=F !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type71:t71=G !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type72:t72=H !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type73:t73=I !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type74:t74=J !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type75:t75=K !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type76:t76=L !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type77:t77=M !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type78:t78=N !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type79:t79=O !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type80:t80=P !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type81:t81=Q !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type82:t82=R !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type83:t83=S !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type84:t84=T !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type85:t85=U !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type86:t86=V !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type87:t87=W !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-.stabs "attr69:G369=@E !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr70:G370=@F !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr71:G371=@G !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-.stabs "type88:t88=X !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type89:t89=Y !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type90:t90=Z !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type91:t91=[ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-.stabs "type93:t93=] !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type94:t94=^ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type95:t95=_ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type96:t96=` !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type97:t97=a !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type98:t98=b !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type99:t99=c !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type100:t100=d !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type101:t101=e !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type102:t102=f !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type103:t103=g !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type104:t104=h !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type105:t105=i !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type106:t106=j !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type107:t107=k !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type108:t108=l !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type109:t109=m !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type110:t110=n !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type111:t111=o !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type112:t112=p !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type113:t113=q !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type114:t114=r !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type115:t115=s !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type116:t116=t !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type117:t117=u !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type118:t118=v !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type119:t119=w !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type120:t120=x !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type121:t121=y !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type122:t122=z !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type123:t123={ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type124:t124=| !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type125:t125=} !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type126:t126=~ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-
-.stabs "attr32:G332=@  !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr33:G333=@! !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr35:G334=@# !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-.stabs "attr36:G335=@$ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-.stabs "attr37:G337=@% !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-# Test 'e' constant on non-enum type.  
-.stabs "const69:c=e1,69", N_LSYM,0,0, 0
-
-# Test constant with the type embedded.  
-.stabs "const70:c=e190=bs2;0;16;,70", N_LSYM,0,0, 0
-
-.stabs "attr38:G338=@& !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-# Unrecognized negative type number.  
-.stabs "bad_neg0type:t201=s16field0:1,0,32;field2:-534,32,64;field3:-1,96,32;;", N_LSYM,0,0, 0
-
-.stabs "bad_neg0:G201", N_GSYM,0,0, 0
-
-.globl bad_neg0
-.data
-.align_it
-bad_neg0:
-.long 42
-     .long 43, 44, 45
-
-.stabs "attr39:G339=@' !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr41:G341=@) !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr42:G342=@* !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr43:G343=@+ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr44:G344=@, !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr46:G346=@. !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr47:G347=@/ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr58:G358=@: !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-# Test two type attributes for one type.  
-.stabs "attr59:G359=@;@ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-.stabs "attr60:G360=@< !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr61:G361=@= !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr62:G362=@> !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr63:G363=@? !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr64:G364=@@ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr65:G365=@A !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr66:G366=@B !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr67:G367=@C !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr68:G368=@D !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr72:G372=@H !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr73:G373=@I !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr74:G374=@J !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr75:G375=@K !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr76:G376=@L !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr77:G377=@M !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr78:G378=@N !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr79:G379=@O !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr80:G380=@P !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr81:G381=@Q !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr82:G382=@R !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr83:G383=@S !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr84:G384=@T !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr85:G385=@U !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr86:G386=@V !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr87:G387=@W !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr88:G388=@X !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr89:G389=@Y !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr90:G390=@Z !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr91:G391=@[ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-.stabs "attr93:G393=@] !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-# Do with and without underscore, so this wins regardless of whether
-# names have underscores.
-
-.globl _common0
-.data
-.align_it
-_common0:
-.long 42
-     .long 24
-     .long 22
-.globl common0
-.data
-.align_it
-common0:
-.long 42
-     .long 24
-     .long 22
-.begin_common "common0"
-.stabs "common0var0:S1", N_GSYM,0,0, 0
-.stabs "common0var1:S1", N_GSYM,0,0, 4
-.stabs "common0var2:S1", N_GSYM,0,0, 8
-.end_common "common0"
-
-.stabs "attr94:G394=@^ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr95:G395=@_ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr100:G400=@d !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr101:G401=@e !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr102:G402=@f !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr103:G403=@g !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr106:G406=@j !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr107:G407=@k !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr108:G408=@l !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr109:G409=@m !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr110:G410=@n !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr111:G411=@o !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr112:G412=@p !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr113:G413=@q !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr114:G414=@r !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr115:G415=@s !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr116:G416=@t !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr117:G417=@u !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr118:G418=@v !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr119:G419=@w !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr120:G420=@x !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr121:G421=@y !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr122:G422=@z !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr123:G423=@{ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr124:G424=@| !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr125:G425=@} !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-.stabs "attr126:G426=@~ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
-
-# Define a variable for all the above stabs.  
-.globl attr32
-.data
-.align_it
-attr32:
-.long 42
-.globl attr33
-.data
-.align_it
-attr33:
-.long 42
-.globl attr35
-.data
-.align_it
-attr35:
-.long 42
-.globl attr36
-.data
-.align_it
-attr36:
-.long 42
-.globl attr37
-.data
-.align_it
-attr37:
-.long 42
-.globl attr38
-.data
-.align_it
-attr38:
-.long 42
-.globl attr39
-.data
-.align_it
-attr39:
-.long 42
-.globl attr41
-.data
-.align_it
-attr41:
-.long 42
-.globl attr42
-.data
-.align_it
-attr42:
-.long 42
-.globl attr43
-.data
-.align_it
-attr43:
-.long 42
-.globl attr44
-.data
-.align_it
-attr44:
-.long 42
-.globl attr46
-.data
-.align_it
-attr46:
-.long 42
-.globl attr47
-.data
-.align_it
-attr47:
-.long 42
-.globl attr58
-.data
-.align_it
-attr58:
-.long 42
-.globl attr59
-.data
-.align_it
-attr59:
-.long 42
-.globl attr60
-.data
-.align_it
-attr60:
-.long 42
-.globl attr61
-.data
-.align_it
-attr61:
-.long 42
-.globl attr62
-.data
-.align_it
-attr62:
-.long 42
-.globl attr63
-.data
-.align_it
-attr63:
-.long 42
-.globl attr64
-.data
-.align_it
-attr64:
-.long 42
-.globl attr65
-.data
-.align_it
-attr65:
-.long 42
-.globl attr70
-.data
-.align_it
-attr70:
-.long 42
-.globl attr71
-.data
-.align_it
-attr71:
-.long 42
-.globl attr72
-.data
-.align_it
-attr72:
-.long 42
-.globl attr73
-.data
-.align_it
-attr73:
-.long 42
-.globl attr74
-.data
-.align_it
-attr74:
-.long 42
-.globl attr75
-.data
-.align_it
-attr75:
-.long 42
-.globl attr76
-.data
-.align_it
-attr76:
-.long 42
-.globl attr77
-.data
-.align_it
-attr77:
-.long 42
-.globl attr78
-.data
-.align_it
-attr78:
-.long 42
-.globl attr79
-.data
-.align_it
-attr79:
-.long 42
-.globl attr80
-.data
-.align_it
-attr80:
-.long 42
-.globl attr81
-.data
-.align_it
-attr81:
-.long 42
-.globl attr82
-.data
-.align_it
-attr82:
-.long 42
-.globl attr83
-.data
-.align_it
-attr83:
-.long 42
-.globl attr84
-.data
-.align_it
-attr84:
-.long 42
-
-# Unrecognized floating point code.  
-.stabs "float72type:t202=R87;9;", N_LSYM,0,0, 0
-
-# 256-bit integer.  The point is obviously not that GDB should have a
-# special case for this size, but that an integer of any size should
-# work (at least for printing in hex, not necessarily for arithmetic.  
-.stabs "int256var:G203=bu32;0;256;", N_GSYM,0,0, 0
-# The value is palindromic, so it works whether words are big or little
-# endian.  
-.globl int256var
-.data
-.align_it
-     int256var:
-.long 42
-     .long 0x2b, 0x2c, 0x2d, 0x2d, 0x2c, 0x2b, 0x2a
-
-# Huge value in constant should at least get the type right.  
-
-# This value is just big enough not to fit in 32 bits.  
-.stabs "consth:c=e1,4294967296", N_LSYM,0,0, 0
-
-.stabs "consth2:c=e1,-734723985732642758928475678987234563284937456", N_LSYM,0,0, 0
-
-# Test a struct constant using S.  
-.stabs "bad_neg0const:c=S201,128,128,11222211343434345656565677888877", N_LSYM,0,0, 0
-
-# Bad filenumbers.  
-# This one is totally bogus.  
-.stabs "bad_type0:t(-3,7)", N_LSYM,0,0, 0
-# This one probably gets interpreted as a forward reference.  
-.stabs "bad_type1:t(42,6)", N_LSYM,0,0, 0
-
-# Arrays indexed by weird things.  
-.stabs "array_index0:t205=r1;0;5;", N_LSYM,0,0, 0
-.stabs "array0:G206=a205;1", N_GSYM,0,0, 0
-.globl array0
-.data
-.align_it
-     array0:
-.long 42
-     .long 43, 44, 45, 46, 47
-
-.stabs "array_index1:t207=", N_LSYM,0,0, 0
-.stabs "array1:G208=aeai1_red:0,ai1_green:1,ai1_blue:2,;;1", N_GSYM,0,0, 0
-.globl array1
-.data
-.align_it
-     array1:
-.long 42
-     .long 43, 44
-
-# See if GDB can deal with it if the compiler gets smarter about saying
-# which variables were defined with which types.  
-.stabs "inttype_one:t209=1", N_LSYM,0,0, 0
-.stabs "inttype_two:t210=1", N_LSYM,0,0, 0
-.stabs "one_var:G209", N_GSYM,0,0, 0
-.globl one_var
-.data
-.align_it
-one_var:
-.long 42
-.stabs "two_var:G210", N_GSYM,0,0, 0
-.globl two_var
-.data
-.align_it
-two_var:
-.long 42
-
-# And see if the caddr_t hack can deal with the same thing.
-.stabs "intp:t211=*1", N_LSYM,0,0, 0
-# If it weren't for this variable, we'd need to ignore the intp name.  
-.stabs "pointer_to_int_var:G212=*1", N_LSYM,0,0, 0
-.stabs "intp_var:G211", N_GSYM,0,0, 0
-.globl intp_var
-.data
-.align_it
-intp_var:
-.long 42
-
-# Unrecognized constant code.  
-.stabs "unrecog_const:c=xjksdflskd33,4;473;", N_LSYM,0,0, 0
-
-.globl attr85
-.data
-.align_it
-attr85:
-.long 42
-.globl attr86
-.data
-.align_it
-attr86:
-.long 42
-.globl attr87
-.data
-.align_it
-attr87:
-.long 42
-.globl attr88
-.data
-.align_it
-attr88:
-.long 42
-.globl attr89
-.data
-.align_it
-attr89:
-.long 42
-.globl attr90
-.data
-.align_it
-attr90:
-.long 42
-.globl attr91
-.data
-.align_it
-attr91:
-.long 42
-.globl attr92
-.data
-.align_it
-attr92:
-.long 42
-.globl attr93
-.data
-.align_it
-attr93:
-.long 42
-.globl attr94
-.data
-.align_it
-attr94:
-.long 42
-.globl attr95
-.data
-.align_it
-attr95:
-.long 42
-.globl attr96
-.data
-.align_it
-attr96:
-.long 42
-.globl attr97
-.data
-.align_it
-attr97:
-.long 42
-.globl attr98
-.data
-.align_it
-attr98:
-.long 42
-.globl attr99
-.data
-.align_it
-attr99:
-.long 42
-.globl attr100
-.data
-.align_it
-attr100:
-.long 42
-.globl attr101
-.data
-.align_it
-attr101:
-.long 42
-.globl attr102
-.data
-.align_it
-attr102:
-.long 42
-.globl attr103
-.data
-.align_it
-attr103:
-.long 42
-.globl attr104
-.data
-.align_it
-attr104:
-.long 42
-.globl attr105
-.data
-.align_it
-attr105:
-.long 42
-.globl attr106
-.data
-.align_it
-attr106:
-.long 42
-.globl attr107
-.data
-.align_it
-attr107:
-.long 42
-.globl attr108
-.data
-.align_it
-attr108:
-.long 42
-.globl attr109
-.data
-.align_it
-attr109:
-.long 42
-.globl attr110
-.data
-.align_it
-attr110:
-.long 42
-.globl attr111
-.data
-.align_it
-attr111:
-.long 42
-.globl attr112
-.data
-.align_it
-attr112:
-.long 42
-.globl attr113
-.data
-.align_it
-attr113:
-.long 42
-.globl attr114
-.data
-.align_it
-attr114:
-.long 42
-.globl attr115
-.data
-.align_it
-attr115:
-.long 42
-.globl attr116
-.data
-.align_it
-attr116:
-.long 42
-.globl attr117
-.data
-.align_it
-attr117:
-.long 42
-.globl attr118
-.data
-.align_it
-attr118:
-.long 42
-.globl attr119
-.data
-.align_it
-attr119:
-.long 42
-.globl attr120
-.data
-.align_it
-attr120:
-.long 42
-.globl attr121
-.data
-.align_it
-attr121:
-.long 42
-.globl attr125
-.data
-.align_it
-attr125:
-.long 42
-.globl attr126
-.data
-.align_it
-attr126:
-.long 42
-
-# Size.  
-.stabs "var1:G301=@s32;1",N_GSYM,0,0, 0
-.globl var1
-.data
-.align_it
-var1:
-.long 42
-# Pointer class.  
-.stabs "var2:G302=@p42;1",N_GSYM,0,0, 0
-.globl var2
-.data
-.align_it
-var2:
-.long 42
-# Packed type.  
-.stabs "var3:G303=@P;1",N_GSYM,0,0, 0
-.globl var3
-.data
-.align_it
-var3:
-.long 42
-
-.stabs "sym92:\ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "type92:t92=\ !#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~",N_LSYM,0,0,0
-.stabs "attr92:G392=@\ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
deleted file mode 100644
index 7f67ccb132b..00000000000
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1997, 1998, 1999, 2001, 2003, 2004
-# Free Software Foundation, 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
-
-# Test that GDB properly ignores invalid stabs.
-# Also test that GDB can debug a .o file, and that it doesn't mind
-# a file that's more minimal than what a compiler normally puts out.
-if $tracelevel then {
-	strace $tracelevel
-}
-
-# If the test directory was not created by configure then skip
-# this test.
-if ![file isdirectory ${objdir}/${subdir}] then {
-    return 0
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile weird
-set srcfile ${objdir}/${subdir}/weird.s
-set binfile ${objdir}/${subdir}/weirdx.o
-
-if { [ get_compiler_info "$binfile" ] } {
-    return -1
-}
-
-if { $hp_cc_compiler || $hp_aCC_compiler } {
-    # The native hp-ux assembler does not support stabs at all.
-    # If the compiler is native hp-ux, of course the assembler is too.
-    # But if someone builds gcc with the native assembler (not recommended)
-    # rather than the gnu assembler, then this logic will not suppress it.
-    # -- chastain 2004-01-07
-    unsupported "stabs with hp-ux assembler"
-    continue
-}
-
-proc do_tests {} {
-	global binfile
-	global gdb_prompt
-
-	# Mips/alpha targets that use gcc with mips-tfile put out the stabs
-	# assembler directives embedded in comments. If the assembler
-	# file is then processed with native cc, all stabs directives
-	# will be lost.
-	# Skip the rest of the stabs tests for this case.
-	send_gdb "ptype inttype\n"
-	gdb_expect {
-		-re "^ptype inttype\r*\ntype = inttype.*$gdb_prompt $" {
-			pass "stabs found"
-		}
-		-re ".*$gdb_prompt $" {
-			setup_xfail "mips-*-*"
-			setup_xfail "alpha-*-*"
-			fail "stabs not found"
-			return
-		}
-		default { fail "checking for stabs" }
-	}
-
-	print_weird_var var0
-	print_weird_var var1
-	print_weird_var var2
-	print_weird_var var3
-
-	print_weird_var attr32
-	print_weird_var attr33
-	print_weird_var attr35
-	print_weird_var attr36
-	print_weird_var attr37
-	print_weird_var attr38
-	print_weird_var attr39
-	print_weird_var attr41
-	print_weird_var attr42
-	print_weird_var attr43
-	print_weird_var attr44
-	print_weird_var attr46
-	print_weird_var attr47
-	print_weird_var attr58
-	print_weird_var attr59
-	print_weird_var attr60
-	print_weird_var attr61
-	print_weird_var attr62
-	print_weird_var attr63
-	print_weird_var attr64
-	print_weird_var attr65
-	print_weird_var attr66
-	print_weird_var attr67
-	print_weird_var attr68
-	print_weird_var attr69
-	print_weird_var attr70
-	print_weird_var attr71
-	print_weird_var attr72
-	print_weird_var attr73
-	print_weird_var attr74
-	print_weird_var attr75
-	print_weird_var attr76
-	print_weird_var attr77
-	print_weird_var attr78
-	print_weird_var attr79
-	print_weird_var attr80
-	print_weird_var attr81
-	print_weird_var attr82
-	print_weird_var attr83
-	print_weird_var attr84
-	print_weird_var attr85
-	print_weird_var attr86
-	print_weird_var attr87
-	print_weird_var attr88
-	print_weird_var attr89
-	print_weird_var attr90
-	print_weird_var attr91
-	print_weird_var attr92
-	print_weird_var attr93
-	print_weird_var attr94
-	print_weird_var attr95
-	print_weird_var attr96
-	print_weird_var attr97
-	print_weird_var attr98
-	print_weird_var attr99
-	print_weird_var attr100
-	print_weird_var attr101
-	print_weird_var attr102
-	print_weird_var attr103
-	print_weird_var attr104
-	print_weird_var attr105
-	print_weird_var attr106
-	print_weird_var attr107
-	print_weird_var attr108
-	print_weird_var attr109
-	print_weird_var attr110
-	print_weird_var attr111
-	print_weird_var attr112
-	print_weird_var attr113
-	print_weird_var attr114
-	print_weird_var attr115
-	print_weird_var attr116
-	print_weird_var attr117
-	print_weird_var attr118
-	print_weird_var attr119
-	print_weird_var attr120
-	print_weird_var attr121
-	print_weird_var attr122
-	print_weird_var attr123
-	print_weird_var attr124
-	print_weird_var attr125
-	print_weird_var attr126
-
-	gdb_test "p const69" " = 69" "'e' constant on non-enum type"
-	gdb_test "whatis const69" "type = (unsigned int|inttype)" "whatis const69"
-
-	gdb_test "p sizeof (const70)" " = 2" "'e' constant with embedded type"
-
-	gdb_test "p bad_neg0" " = \{field0 = 42, field2 =.*field3 = 45\}" "p bad_neg0"
-
-	gdb_test "ptype inttype" "type = (unsigned int|inttype)" "ptype on inttype"
-	gdb_test "p sizeof (float72type)" " = 9" "unrecognized floating point type"
-
-	# This big number needs to be kept as one piece
-	gdb_test "p/x int256var" " = 0x0*2a0000002b0000002c0000002d0000002d0000002c0000002b0000002a" "print very big integer"
-
-	gdb_test "whatis consth" "type = inttype" "whatis consth"
-	gdb_test "whatis consth2" "type = inttype" "whatis consth2"
-
-	# GDB does not yet understand S constants
-	setup_xfail "*-*-*"
-	gdb_test "p/x bad_neg0const" " = \{field0 = 0x11222211, field2 =.*\
-field3 = 0x77888877\}" "print struct constant"
-
-	gdb_test "ptype bad_type0" "type = .*" "print bad_type0"
-	gdb_test "ptype bad_type1" "type = .*" "print bad_type1"
-
-	# GDB does not yet support arrays indexed by anything at all unusual
-	setup_xfail "*-*-*"
-	gdb_test "p array0" " = \\{42, 43, 44, 45, 46, 47\\}" "array0 with strange index"
-	setup_xfail "*-*-*"
-	gdb_test "p array1" " = \\{42, 43, 44\\}" "array1 with strange index"
-
-	# GDB does not yet support this feature
-	gdb_test "whatis one_var" "type = inttype_one" \
-	    "whatis one_var (known failure in gdb 4.10)"
-	# But do make sure that it prints as something reasonable
-	gdb_test "whatis one_var" "type = inttype(|_one)" \
-	    "whatis one_var test 2"
-
-	gdb_test "whatis two_var" "type = inttype_two" \
-	    "whatis two_var (known failure in gdb 4.10)"
-	# But do make sure that it prints as something reasonable
-	gdb_test "whatis two_var" "type = inttype(|_two)" \
-	    "whatis two_var test 2"
-
-	setup_xfail "*-*-*"
-	gdb_test "whatis pointer_to_int_var" "type = int \[*\]"
-	setup_xfail "*-*-*"
-	gdb_test "whatis intp_var" "type = intp"
-
-	gdb_test "p common0var0" "= 42"
-	# GDB seems to only understand common blocks local to a function.
-	# These variables never get relocated to be relative to the common 
-	# block.
-	# I'm not sure whether it is valid to have a common block which
-	# is not local to a function.
-	setup_xfail "*-*-*"
-	gdb_test "p common0var1" "= 24"
-	setup_xfail "*-*-*"
-	gdb_test "p common0var2" "= 22"
-}
-
-proc print_weird_var { var } {
-	global gdb_prompt
-
-	# Make sure that the variable gets printed out correctly, without
-	# any sort of warning message.
-	send_gdb "print $var\n"
-	gdb_expect {
-		-re "^print $var\r*\n.\[0-9\]* = 42.*$gdb_prompt $" {
-			pass "variable $var printed properly"
-		}
-		-re ".*$gdb_prompt $" {
-			fail "variable $var printed properly"
-		}
-		timeout { fail "variable $var printed properly (timeout)" }
-		eof { fail "variable $var printed properly (eof)" }
-	}
-
-	# Make sure that the stabs did get loaded in a sensible way.
-	# If somehow the stabs got skipped, then the above test can
-	# pass because GDB assumes int for variables without a stab.
-
-	# This doesn't work because 32=45 doesn't preserve the name in
-	# gdb (as of 14 Sep 93 anyway).
-	#gdb_test "whatis $var" "type = (unsigned int|inttype)"
-
-	# But the size should be right.
-	gdb_test "print sizeof ($var)" "= 4"
-}
-
-
-# Don't use gdb_load; it doesn't bitch if the loading produced some
-# error messages during symbol reading.
-
-global target_os
-set sedscript ${srcdir}/${subdir}/aout.sed
-switch -glob ${target_triplet} {
-    "hppa*-*-*" {
-	set sedscript ${srcdir}/${subdir}/hppa.sed
-    }
-    "mips-*-ecoff" {
-	set sedscript ${srcdir}/${subdir}/ecoff.sed
-    }
-    "powerpc-*-aix*" {
-	set sedscript ${srcdir}/${subdir}/xcoff.sed
-    }
-    "rs6000-*-aix*" {
-	set sedscript ${srcdir}/${subdir}/xcoff.sed
-    }
-    "*-*-aout" {
-	set sedscript ${srcdir}/${subdir}/aout.sed
-    }
-    "*-*-xcoff" {
-	set sedscript ${srcdir}/${subdir}/xcoff.sed
-    }
-    "alpha-*-*" {
-	set sedscript ${srcdir}/${subdir}/ecoff.sed
-    }
-}
-
-# Hope this is a Unix box.
-set exec_output [remote_exec build "sed" "-f ${sedscript}" "${srcdir}/${subdir}/weird.def" "${srcfile}"]
-if { [lindex $exec_output 0] != 0 } {
-    perror "Couldn't make test case. $exec_output"
-    return -1
-}
-
-if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-remote_file build delete ${srcfile}
-
-# Start with a fresh gdb
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-set binfile [remote_download host ${binfile} object.o]
-send_gdb "file $binfile\n"
-# If $binfile is very long, a \r (but not a \n) will echo in the
-# middle of the echo of the command.  So to match the echo, we
-# would like to match anything not containing \n
-# (we would prefer to be sure not to match any warning message).
-# But \[^\n\]* doesn't seem to work, so instead use the heuristic
-# that a filename won't contain a space and a warning message will.
-# But spaces following by backspaces aren't really spaces.
-gdb_expect 60 {
-    -re "^file (\[^ \]| +\008)*\r*\n" {
-	exp_continue
-    }
-    -re "A program is being debugged already.  Kill it\\? \\(y or n\\)" {
-	send_gdb "y\n"
-	exp_continue
-    }
-    -re "^Reading symbols from .*$binfile\\.\\.\\.done\.(|\r\nUsing host libthread_db library .*libthread_db.so.*\\.)\r\n$gdb_prompt $" {
-	pass "weirdx.o read without error"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "Errors reading weirdx.o"
-    }
-    timeout {
-	perror "couldn't load $binfile into $GDB (timed out)."
-	return -1
-    }
-    eof { fail "(eof) cannot read weirdx.o" }
-}
-
-do_tests
-
-remote_file host delete ${binfile}
-
-return 0
diff --git a/gdb/testsuite/gdb.stabs/xcoff.sed b/gdb/testsuite/gdb.stabs/xcoff.sed
deleted file mode 100644
index 8a6b4ef1986..00000000000
--- a/gdb/testsuite/gdb.stabs/xcoff.sed
+++ /dev/null
@@ -1,17 +0,0 @@
-# Put everything in this csect, which seems to make things work.
-# The compiler actually puts the stabs in .csect [PR], but that didn't
-# work here (I guess because there is no text section).
-1i\
-	.csect .data[RW]
-# .stabs string,type,0,0,value  ->  .stabx string,value,type,0
-s/^[ 	]*\.stabs[ 	]*\("[^"]*"\),[ 	]*\([^,]*\),[ 	]*0,0,[ 	]*\(.*\)$/.stabx \1,\3,\2,0/
-s/N_GSYM/128/
-# This needs to be C_DECL, which is used for types, not C_LSYM, which is
-# ignored on the initial scan.
-s/N_LSYM/140/
-s/\.begin_common/.bc/
-# The AIX assembler doesn't want the name in a .ec directive
-s/\.end_common.*/.ec/
-s/\.align_it/.align 1/
-/\.data/d
-/^#/d
diff --git a/gdb/testsuite/gdb.threads/Makefile.in b/gdb/testsuite/gdb.threads/Makefile.in
deleted file mode 100644
index 6bd7279e536..00000000000
--- a/gdb/testsuite/gdb.threads/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-EXECUTABLES = pthreads
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f *~ *.o a.out xgdb *.x *.ci *.tmp core* $(EXECUTABLES)
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log config.h
diff --git a/gdb/testsuite/gdb.threads/bp_in_thread.c b/gdb/testsuite/gdb.threads/bp_in_thread.c
deleted file mode 100644
index ae87f8cb765..00000000000
--- a/gdb/testsuite/gdb.threads/bp_in_thread.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* A small multi-threaded test case.
-
-   Copyright 2004
-   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 <pthread.h>
-#include <stdio.h>
-#include <time.h>
-
-void
-cond_wait (pthread_cond_t *cond, pthread_mutex_t *mut)
-{
-  pthread_mutex_lock(mut);
-  pthread_cond_wait (cond, mut);
-  pthread_mutex_unlock (mut);
-}
-
-void
-noreturn (void)
-{
-  pthread_mutex_t mut;
-  pthread_cond_t cond;
-
-  pthread_mutex_init (&mut, NULL);
-  pthread_cond_init (&cond, NULL);
-
-  /* Wait for a condition that will never be signaled, so we effectively
-     block the thread here.  */
-  cond_wait (&cond, &mut);
-}
-
-void *
-forever_pthread (void *unused)
-{
-  noreturn ();
-}
-
-void
-break_me (void)
-{
-  /* Just an anchor to help putting a breakpoint.  */
-}
-
-int
-main (void)
-{
-  pthread_t forever;
-  const struct timespec ts = { 0, 10000000 }; /* 0.01 sec */
-
-  pthread_create (&forever, NULL, forever_pthread, NULL);
-  for (;;)
-    {
-      nanosleep (&ts, NULL);
-      break_me();
-    }
-
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.threads/bp_in_thread.exp b/gdb/testsuite/gdb.threads/bp_in_thread.exp
deleted file mode 100644
index cd35d040fdf..00000000000
--- a/gdb/testsuite/gdb.threads/bp_in_thread.exp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (C) 2004 Free Software Foundation, 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.  
-
-# gdb 6.1.1 on AIX had a bug where the aix-threads code called
-# getthrds() incorrectly so that gdb lost track of breakpoints.
-# GDB reported a SIGTRAP signal in a random thread when hitting
-# a breakpoint.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "bp_in_thread"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-runto_main
-
-gdb_test "break noreturn" \
-         "Breakpoint 2 at .*: file .*${srcfile}, line .*" \
-         "breakpoint on noreturn"
-
-# Run the program and make sure GDB reports that we stopped after
-# hitting breakpoint 1 in noreturn().
-
-gdb_test "continue" \
-         ".*Breakpoint 2, noreturn ().*" \
-         "run to noreturn"
-
diff --git a/gdb/testsuite/gdb.threads/gcore-thread.exp b/gdb/testsuite/gdb.threads/gcore-thread.exp
deleted file mode 100644
index d7f897198b1..00000000000
--- a/gdb/testsuite/gdb.threads/gcore-thread.exp
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, 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 Michael Snyder (msnyder@redhat.com)
-# This is a test for the gdb command "generate-core-file".
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# Single-threaded test case
-set testfile "pthreads"
-set srcfile  ${testfile}.c
-set binfile  ${objdir}/${subdir}/gcore-${testfile}
-
-if [istarget "*-*-linux"] then {
-    set target_cflags "-D_MIT_POSIX_THREADS"
-} else {
-    set target_cflags ""
-}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-# Now we can proceed with the real testing.
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-# regexp for "horizontal" text (i.e. doesn't include newline or
-# carriage return)
-set horiz "\[^\n\r\]*"
-
-# regexp for newline
-set nl "\[\r\n\]+"
-
-set timeout 30
-
-send_gdb "help gcore\n"
-gdb_expect {
-    -re "Undefined command: .gcore.*$gdb_prompt $" {
-	# gcore command not supported -- nothing to test here.
-	unsupported "gdb does not support gcore on this target"
-	return -1;
-    }
-    -re "Save a core file .*$gdb_prompt $" {
-	pass "help gcore"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "help gcore"
-    }
-    timeout {
-	fail "help gcore (timeout)"
-    }
-}
-
-if { ! [ runto_main ] } then {
-    gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
-}
-
-send_gdb "info threads\n"
-gdb_expect {
-    -re ".* main .*$gdb_prompt $" {
-	# OK, threads are supported.
-    }
-    -re "${nl}$gdb_prompt $" {
-	unsupported "gdb does not support threads on this target"
-	return -1;
-    }
-}
-
-# Make sure thread 1 is running
-delete_breakpoints
-gdb_breakpoint "thread1"
-gdb_test "continue" "Continuing.*Breakpoint.* thread1 .*" "thread 1 is running"
-
-# Make sure thread 2 is running
-delete_breakpoints
-gdb_breakpoint "thread2"
-gdb_test "continue" "Continuing.*Breakpoint.* thread2 .*" "thread 2 is running"
-
-set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test]
-# Drop corefile
-gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \
-	"save a corefile" \
-{
-  -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
-    pass "save a corefile"
-    global core_supported
-    set core_supported 1
-  }
-  -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
-    unsupported "save a corefile"
-    global core_supported
-    set core_supported 0
-  }
-}
-
-global core_supported
-if {!$core_supported} {
-  return -1
-}
-
-# Now restart gdb and load the corefile.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-send_gdb "core ${objdir}/${subdir}/gcore.test\n"
-gdb_expect {
-    -re ".* is not a core dump:.*$gdb_prompt $" {
-	fail "re-load generated corefile (bad file format)"
-	# No use proceeding from here.
-	return;	
-    }
-    -re ".*: No such file or directory.*$gdb_prompt $" {
-	fail "re-load generated corefile (file not found)"
-	# No use proceeding from here.
-	return;	
-    }
-    -re ".*Couldn't find .* registers in core file.*$gdb_prompt $" {
-	fail "re-load generated corefile (incomplete note section)"
-    }
-    -re "Core was generated by .*$gdb_prompt $" {
-	pass "re-load generated corefile"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "re-load generated corefile"
-    }
-    timeout {
-	fail "re-load generated corefile (timeout)"
-    }
-}
-
-# FIXME: now what can we test about the thread state?
-# We do not know for certain that there should be at least 
-# three threads, because who knows what kind of many-to-one
-# mapping various OS's may do?  Let's assume that there must
-# be at least two threads:
-
-gdb_test "info threads" ".*${nl}  2 ${horiz}${nl}\\* 1 .*" \
-	"corefile contains at least two threads"
-
-# One thread in the corefile should be in the "thread2" function.
-
-gdb_test "info threads" ".* thread2 .*" \
-	"a corefile thread is executing thread2"
-
-# The thread2 thread should be marked as the current thread.
-
-gdb_test "info threads" ".*${nl}\\* ${horiz} thread2 .*" \
-	"thread2 is current thread in corefile"
-
diff --git a/gdb/testsuite/gdb.threads/killed.c b/gdb/testsuite/gdb.threads/killed.c
deleted file mode 100644
index 590bf206f9b..00000000000
--- a/gdb/testsuite/gdb.threads/killed.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2004 Free Software Foundation, 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.  */
-
-#include <sys/types.h>
-#include <signal.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int pid;
-
-void *
-child_func (void *dummy)
-{
-  kill (pid, SIGKILL);
-  exit (1);
-}
-
-int
-main ()
-{
-  pthread_t child;
-
-  pid = getpid ();
-  pthread_create (&child, 0, child_func, 0);
-  for (;;)
-    sleep (10000);
-}
diff --git a/gdb/testsuite/gdb.threads/killed.exp b/gdb/testsuite/gdb.threads/killed.exp
deleted file mode 100644
index 1948375155e..00000000000
--- a/gdb/testsuite/gdb.threads/killed.exp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2002, 2003 Free Software Foundation, 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@gnu.org
-
-# This is a regression test for gdb/568 in the sources.redhat.com
-# GNATS database.  As of early June 2002, GDB could get sort of wedged
-# debugging the program `killed.c':
-#
-# $ $D6/gdb/gdb -nw killed
-# GNU gdb 2002-06-11-cvs
-# Copyright 2002 Free Software Foundation, Inc.
-# GDB is free software, covered by the GNU General Public License, and you are
-# welcome to change it and/or distribute copies of it under certain conditions.
-# Type "show copying" to see the conditions.
-# There is absolutely no warranty for GDB.  Type "show warranty" for details.
-# This GDB was configured as "i686-pc-linux-gnu"...
-# (gdb) run
-# Starting program: /home/jimb/foo/play/killed 
-# [New Thread 1024 (LWP 6487)]
-# [New Thread 2049 (LWP 6488)]
-# [New Thread 1026 (LWP 6489)]
-# Cannot find user-level thread for LWP 6487: generic error
-# (gdb) quit
-# The program is running.  Exit anyway? (y or n) y
-# Cannot find thread 2049: generic error
-# (gdb) kill
-# Kill the program being debugged? (y or n) y
-# Cannot find thread 2049: generic error
-# (gdb) The program is running.  Exit anyway? (y or n) y
-# Cannot find thread 2049: generic error
-# (gdb) 
-# [7]+  Stopped                 $D6/gdb/gdb -nw killed
-# $ kill %7
-# 
-# [7]+  Stopped                 $D6/gdb/gdb -nw killed
-# $ kill -9 %7
-# 
-# [7]+  Stopped                 $D6/gdb/gdb -nw killed
-# $ 
-# [7]+  Killed                  $D6/gdb/gdb -nw killed
-# $ 
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "killed"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_run_cmd
-gdb_expect {
-  -re "$gdb_prompt $" {
-    pass "run program to completion"
-  }
-  timeout "$gdb_prompt $" {
-    fail "run program to completion (timeout)"
-  }
-}
-
-# Try to quit.
-send_gdb "quit\n"
-gdb_expect {
-    -re "The program is running.  Exit anyway\\? \\(y or n\\) $" {
-        send_gdb "y\n"
-        exp_continue
-    }
-    eof {
-        pass "GDB exits after multi-threaded program exits messily"
-    }
-    -re "Cannot find thread ${decimal}: generic error\[\r\n\]*$gdb_prompt $" {
-        kfail "gdb/568" "GDB exits after multi-threaded program exits messily"
-    }
-    timeout {
-        fail "GDB exits after multi-threaded program exits messily (timeout)"
-    }
-}
diff --git a/gdb/testsuite/gdb.threads/linux-dp.c b/gdb/testsuite/gdb.threads/linux-dp.c
deleted file mode 100644
index c3775bd62ae..00000000000
--- a/gdb/testsuite/gdb.threads/linux-dp.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* linux-dp.c --- dining philosophers, on LinuxThreads
-   Jim Blandy <jimb@cygnus.com> --- March 1999  */
-
-/* It's okay to edit this file and shift line numbers around.  The
-   tests use gdb_get_line_number to find source locations, so they
-   don't depend on having certain line numbers in certain places.  */
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <pthread.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
-/* The number of philosophers at the table.  */
-int num_philosophers;
-
-/* Mutex ordering -
-   If you want to lock a mutex M, all the mutexes you have locked
-   already must appear before M on this list.
-
-   fork_mutex[0]
-   fork_mutex[1]
-   ...
-   fork_mutex[num_philosophers - 1]
-   stdout_mutex
-   random_mutex
-*/
-
-/* You must hold this mutex while writing to stdout.  */
-pthread_mutex_t stdout_mutex;
-
-/* You must hold this mutex while calling any of the random number
-   generation routines.  */
-pthread_mutex_t random_mutex;
-
-/* array of mutexes, one for each fork; fork_mutex[i] is to the left
-   of philosopher i.  A philosopher is holding fork i iff his/her
-   thread has locked fork_mutex[i].  */
-pthread_mutex_t *fork_mutex;
-
-/* array of threads, one representing each philosopher.  */
-pthread_t *philosophers;
-
-void *
-xmalloc (size_t n)
-{
-  void *p = malloc (n);
-
-  if (! p)
-    {
-      fprintf (stderr, "out of memory\n");
-      exit (2);
-    }
-
-  return p;
-}
-
-void
-shared_printf (char *format, ...)
-{
-  va_list ap;
-
-  va_start (ap, format);
-  pthread_mutex_lock (&stdout_mutex);
-  vprintf (format, ap);
-  pthread_mutex_unlock (&stdout_mutex);
-  va_end (ap);
-}
-
-int 
-shared_random ()
-{
-  static unsigned int seed;
-  int result;
-
-  pthread_mutex_lock (&random_mutex);
-  result = rand_r (&seed);
-  pthread_mutex_unlock (&random_mutex);
-  return result;
-}
-
-void
-my_usleep (long usecs)
-{
-  struct timeval timeout;
-  
-  timeout.tv_sec = usecs / 1000000;
-  timeout.tv_usec = usecs % 1000000;
-
-  select (0, 0, 0, 0, &timeout);
-}
-
-void
-random_delay ()
-{
-  my_usleep ((shared_random () % 2000) * 100);
-}
-
-void
-print_philosopher (int n, char left, char right)
-{
-  int i;
-
-  shared_printf ("%*s%c %d %c\n", (n * 4) + 2, "", left, n, right);
-}
-
-void *
-philosopher (void *data)
-{
-  int n = * (int *) data;
-
-  print_philosopher (n, '_', '_');
-
-#if 1
-  if (n == num_philosophers - 1)
-    for (;;)
-      {
-	/* The last philosopher is different.  He goes for his right
-	   fork first, so there is no cycle in the mutex graph.  */
-
-	/* Grab the right fork.  */
-	pthread_mutex_lock (&fork_mutex[(n + 1) % num_philosophers]);
-	print_philosopher (n, '_', '!');
-	random_delay ();
-
-	/* Then grab the left fork. */
-	pthread_mutex_lock (&fork_mutex[n]);
-	print_philosopher (n, '!', '!');
-	random_delay ();
-
-	print_philosopher (n, '_', '_');
-	pthread_mutex_unlock (&fork_mutex[n]);
-	pthread_mutex_unlock (&fork_mutex[(n + 1) % num_philosophers]);
-	random_delay ();
-      }
-  else
-#endif
-    for (;;)
-      {
-	/* Grab the left fork. */
-	pthread_mutex_lock (&fork_mutex[n]);
-	print_philosopher (n, '!', '_');
-	random_delay ();
-
-	/* Then grab the right fork.  */
-	pthread_mutex_lock (&fork_mutex[(n + 1) % num_philosophers]);
-	print_philosopher (n, '!', '!');
-	random_delay ();
-
-	print_philosopher (n, '_', '_');
-	pthread_mutex_unlock (&fork_mutex[n]);
-	pthread_mutex_unlock (&fork_mutex[(n + 1) % num_philosophers]);
-	random_delay ();
-      }
-
-  return (void *) 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  num_philosophers = 5;
-
-  /* Set up the mutexes.  */
-  {
-    pthread_mutexattr_t ma;
-    int i;
-
-    pthread_mutexattr_init (&ma);
-    pthread_mutex_init (&stdout_mutex, &ma);
-    pthread_mutex_init (&random_mutex, &ma);
-    fork_mutex = xmalloc (num_philosophers * sizeof (fork_mutex[0]));
-    for (i = 0; i < num_philosophers; i++)
-      pthread_mutex_init (&fork_mutex[i], &ma);
-    pthread_mutexattr_destroy (&ma);
-  }
-
-  /* Set off the threads.  */
-  {
-    int i;
-    int *numbers = xmalloc (num_philosophers * sizeof (*numbers));
-    pthread_attr_t ta;
-
-    philosophers = xmalloc (num_philosophers * sizeof (*philosophers));
-
-    pthread_attr_init (&ta);
-    
-    for (i = 0; i < num_philosophers; i++)
-      {
-	numbers[i] = i;
-	/* linuxthreads.exp: create philosopher */
-	pthread_create (&philosophers[i], &ta, philosopher, &numbers[i]);
-      }
-    
-    pthread_attr_destroy (&ta);
-  }
-
-  /* linuxthreads.exp: info threads 2 */
-  sleep (1000000);
-
-  /* Drink yourself into oblivion.  */
-  for (;;)
-    sleep (1000000);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.threads/linux-dp.exp b/gdb/testsuite/gdb.threads/linux-dp.exp
deleted file mode 100644
index 7deae8d3a97..00000000000
--- a/gdb/testsuite/gdb.threads/linux-dp.exp
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999, 2001, 2002, 2003 Free Software Foundation, 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@gnu.org
-
-#### Dining Philosophers, on LinuxThreads - Jim Blandy <jimb@cygnus.com>
-####
-#### At the moment, GDB's support for LinuxThreads is pretty
-#### idiosyncratic --- GDB's output doesn't look much like the output
-#### it produces for other thread implementations, messages appear at
-#### different times, etc.  So these tests are specific to LinuxThreads.
-####
-#### However, if all goes well, Linux will soon have a libthread_db
-#### interface, and GDB will manage it the same way it does other
-#### libthread_db-based systems.  Then, we can adjust this file to
-#### work with any such system.
-
-### Other things we ought to test:
-### stepping a thread while others are running
-### killing and restarting
-### quitting gracefully
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# This only works with Linux configurations.
-if ![istarget *-*-linux-gnu*] then {
-    return
-}
-
-set testfile "linux-dp"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug libs=-lpthread}] != ""} {
-    return -1
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-send_gdb "set print sevenbit-strings\n" ; gdb_expect -re "$gdb_prompt $"
-runto_main
-
-# There should be no threads initially.
-gdb_test "info threads" "" "info threads 1"
-
-# Try stepping over the thread creation function.
-gdb_breakpoint [gdb_get_line_number "linuxthreads.exp: create philosopher"]
-set expect_manager -1
-for {set i 0} {$i < 5} {incr i} {
-    gdb_continue_to_breakpoint "about to create philosopher: $i"
-    send_gdb "next\n"
-    gdb_expect {
-	-re "\\\[New .*\\\].*\\\[New .*\\\].*$gdb_prompt $" {
-	    # Two threads are created the first time in LinuxThreads,
-	    # where the second is the manager thread.  In NPTL, there is none.
-	    if {$i == 0} {
-		set expect_manager 1
-	    }
-	    pass "create philosopher: $i"
-	}
-	-re "\\\[New .*\\\].*$gdb_prompt $" {
-	    if {$i == 0} {
-		set expect_manager 0
-	    }
-	    pass "create philosopher: $i"
-	}
-	-re "Program received signal.*(Unknown signal|SIGUSR|Real-time event).*$gdb_prompt $" {
-	    # It would be nice if we could catch the message that GDB prints
-	    # when it first notices that the thread library doesn't support
-	    # debugging, or if we could explicitly ask GDB somehow.
-	    unsupported "This GDB does not support threads on this system."
-	    return -1
-	}
-	-re "$gdb_prompt $" {
-	    # We used to fail here, but not all targets announce new
-	    # threads as they are created.  For example, the GDB
-	    # remote protocol target only finds out about threads when
-	    # they actually report some event like a breakpoint hit,
-	    # or when the user types 'info threads'.
-	    unresolved "create philosopher: $i"
-	}
-	timeout {
-	    fail "(timeout) create philosopher: $i"
-	}
-    }
-}
-
-set nthreads 6
-
-# Run until there are some threads.
-gdb_breakpoint [gdb_get_line_number "linuxthreads.exp: info threads 2"]
-gdb_continue_to_breakpoint "main thread's sleep"
-set info_threads_ptn ""
-for {set i $nthreads} {$i > 0} {incr i -1} {
-    append info_threads_ptn "$i Thread .*"
-}
-append info_threads_ptn "\[\r\n\]+$gdb_prompt $"
-set info_threads_manager_ptn "[expr $nthreads + 1] Thread .*$info_threads_ptn"
-
-gdb_test_multiple "info threads" "info threads 2" {
-    -re "$info_threads_manager_ptn" {
-	# We did see a manager thread.  Check that against what we expected.
-	switch -exact -- $expect_manager {
-	    -1 {
-		# We weren't sure whether to expect a manager thread.
-		pass "info threads 2"
-	    }
-	    1 {
-		# We were expecting a manager thread.
-		pass "info threads 2"
-	    }
-	    0 {
-		# We were not expecting to see the manager thread.
-		fail "info threads 2"
-	    }
-	}
-	set expect_manager 1
-	incr nthreads
-    }
-    -re "$info_threads_ptn" {
-	# We did not see a manager thread.  Check that against what we
-	# expected.
-	switch -exact -- $expect_manager {
-	    -1 {
-		# We weren't sure whether to expect a manager thread.
-		# Don't expect it from here on out.
-		pass "info threads 2"
-	    }
-	    1 {
-		# We were expecting a manager thread, but we didn't see one.
-		fail "info threads 2"
-	    }
-	    0 {
-		# We were not expecting to see the manager thread.
-		pass "info threads 2"
-	    }
-	}
-	set expect_manager 0
-    }
-}
-
-
-# Try setting a thread-specific breakpoint.
-gdb_breakpoint "print_philosopher thread 5"
-gdb_continue_to_breakpoint "thread 5's print"
-# When there is no debugging info available for the thread library,
-# the backtrace entry for philosopher's caller looks like:
-#    #1  0x4001c548 in pthread_create () from /lib/libpthread.so.0
-# If you do have debug info, the output obviously depends more on the
-# exact library in use; under NPTL, you get:
-#    #2  0x0012b7fc in start_thread (arg=0x21) at pthread_create.c:264
-gdb_test "where" "print_philosopher.*philosopher.* \(from .*libpthread\|at pthread_create\).*" \
-	"first thread-specific breakpoint hit"
-
-# Make sure it's catching the right thread.  Try hitting the
-# breakpoint ten times, and make sure we don't get anyone else.
-set only_five 1
-for {set i 0} {$only_five > 0 && $i < 10} {incr i} {
-    gdb_continue_to_breakpoint "thread 5's print, pass: $i"
-    send_gdb "info threads\n"
-    gdb_expect {
-	-re "\\* 5 Thread .*  print_philosopher .*\r\n$gdb_prompt $" {
-	    # Okay this time.
-	}
-	-re ".*$gdb_prompt $" {
-	    set only_five 0
-	}
-	timeout { 
-	    set only_five -1
-	}
-    }
-}
-
-set name "thread-specific breakpoint is thread-specific"
-if {$only_five ==  1} { pass $name }
-if {$only_five ==  0} { fail $name }
-if {$only_five == -1} { fail "$name (timeout)" }
-
-
-### Select a particular thread.
-proc select_thread {thread} {
-    global gdb_prompt
-
-    send_gdb "thread $thread\n"
-    gdb_expect {
-	-re "\\\[Switching to thread .*\\\].*\r\n$gdb_prompt $" {
-	    pass "selected thread: $thread"
-	}
-	-re "$gdb_prompt $" {
-	    fail "selected thread: $thread"
-	}
-	timeout {
-	    fail "selected thread: $thread (timeout)"
-	}
-    }
-}
-
-### Select THREAD, check for a plausible backtrace, and make sure
-### we're actually selecting a different philosopher each time.
-### Return true if the thread had a stack which was not only
-### acceptable, but interesting.  SEEN should be an array in which
-### SEEN(N) exists iff we have found philosopher number N before.
-
-set main_seen 0
-set manager_seen 0
-
-proc check_philosopher_stack {thread seen_name} {
-    global gdb_prompt
-    upvar $seen_name seen
-    global main_seen
-    global expect_manager manager_seen
-
-    set name "philosopher is distinct: $thread"
-    set interesting 0
-
-    select_thread $thread
-    send_gdb "where\n"
-    gdb_expect {
-	-re ".* in philosopher \\(data=(0x\[0-9a-f\]+).*\r\n$gdb_prompt $" {
-	    set data $expect_out(1,string)
-	    if {[info exists seen($data)]} {
-		fail $name
-	    } else {
-		pass $name
-		set seen($data) yep
-	    }
-	    set interesting 1
-	}
-	-re ".* in __pthread_manager \\(.*$gdb_prompt $" {
-	    if {$manager_seen == 1} {
-		fail "manager thread is distinct: $thread"
-	    } else {
-		set manager_seen 1
-		pass "manager thread is distinct: $thread"
-	    }
-	    set interesting 1
-	}
-	-re "pthread_start_thread.*\r\n$gdb_prompt $" {
-	    ## Maybe the thread hasn't started yet.
-	    pass $name
-	}
-	-re ".* in main \\(.*$gdb_prompt $" {
-	    if {$main_seen == 1} {
-		fail "main is distinct: $thread"
-	    } else {
-		set main_seen 1
-		pass "main is distinct: $thread"
-	    }
-	    set interesting 1
-	}
-	-re " in \\?\\?.*\r\n$gdb_prompt $" {
-	    ## Sometimes we can't get a backtrace.  I'm going to call
-	    ## this a pass, since we do verify that at least one
-	    ## thread was interesting, so we can get more consistent
-	    ## test suite totals.  But in my heart, I think it should
-	    ## be an xfail.
-	    pass $name
-	}
-	-re "$gdb_prompt $" {
-	    fail $name
-	}
-	timeout {
-	    fail "$name (timeout)" 
-	}
-    }
-
-    return $interesting
-}
-
-set any_interesting 0
-array set seen {}
-unset seen
-for {set i 1} {$i <= $nthreads} {incr i} {
-    if [check_philosopher_stack $i seen] {
-	set any_interesting 1
-    }
-}
-
-if {$any_interesting} {
-    pass "found an interesting thread"
-} else {
-    fail "found an interesting thread"
-}
-
-if {$manager_seen == $expect_manager} {
-    pass "manager thread found (not found) when expected"
-} else {
-    fail "manager thread found (not found) when expected"
-}
diff --git a/gdb/testsuite/gdb.threads/manythreads.c b/gdb/testsuite/gdb.threads/manythreads.c
deleted file mode 100644
index e39412cde8f..00000000000
--- a/gdb/testsuite/gdb.threads/manythreads.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Manythreads test program.
-   Copyright 2004
-   Free Software Foundation, Inc.
-
-   Written by Jeff Johnston <jjohnstn@redhat.com> 
-   Contributed by Red Hat
-
-   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 <pthread.h>
-#include <stdio.h>
-#include <limits.h>
-
-void *
-thread_function (void *arg)
-{
-  int x = (int)arg;
-
-  printf ("Thread <%d> executing\n", x);
-
-  return NULL;
-}
-
-int 
-main (int argc, char **argv)
-{
-  pthread_attr_t attr;
-  pthread_t threads[256];
-  int i, j;
-
-  pthread_attr_init (&attr);
-  pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
-
-  /* Create a ton of quick-executing threads, then wait for them to
-     complete.  */
-  for (i = 0; i < 1000; ++i) 
-    {
-      for (j = 0; j < 256; ++j)
-	{
-	  pthread_create (&threads[j], &attr, thread_function, 
-			  (void *)(i * 1000 + j));
-	}
-
-      for (j = 0; j < 256; ++j)
-	{
-	  pthread_join (threads[j], NULL);
-	}
-    }
-
-  pthread_attr_destroy (&attr);
-
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp
deleted file mode 100644
index a2baf846aa9..00000000000
--- a/gdb/testsuite/gdb.threads/manythreads.exp
+++ /dev/null
@@ -1,127 +0,0 @@
-# manythreads.exp -- Expect script to test stopping many threads
-# Copyright (C) 2004 Free Software Foundation, 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 Jeff Johnston. (jjohnstn@redhat.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "manythreads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-gdb_test "set print sevenbit-strings" ""
-runto_main
-
-# We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
-# run the program and gdb starts saving and restoring tty states.
-# On Ultrix, we don't need it and it is really slow (because shell_escape
-# doesn't use vfork).
-if ![istarget "*-*-ultrix*"] then {
-    gdb_test "shell stty intr '^C'" ""
-}
-
-set message "first continue"
-gdb_test_multiple "continue" "first continue" {
-  -re "error:.*$gdb_prompt $" {
-    fail "$message"
-  }
-  -re "Continuing" {
-    pass "$message"
-  }
-}
-
-# Send a Ctrl-C and verify that we can do info threads and continue
-after 1000
-send_gdb "\003"
-set message "stop threads 1"
-gdb_test_multiple "" "stop threads 1" {
-  -re "\\\[New \[^\]\]*\\\]\r\n" {
-    exp_continue
-  }
-  -re "\\\[\[^\]\]* exited\\\]\r\n" {
-    exp_continue
-  }
-  -re "Thread \[^\n\]* executing\r\n" {
-    exp_continue
-  }
-  -re "Program received signal SIGINT.*$gdb_prompt $" {
-    pass "$message"
-  }
-  timeout {
-    fail "$message (timeout)"
-  }
-}
-
-gdb_test "info threads" ".*1 Thread.*.LWP.*"
-
-set message "second continue"
-gdb_test_multiple "continue" "second continue" {
-  -re "error:.*$gdb_prompt $" {
-    fail "$message"
-  }
-  -re "Continuing" {
-    pass "$message"
-  }
-}
-
-# Send another Ctrl-C and verify that we can do info threads and quit
-after 1000
-send_gdb "\003"
-set message "stop threads 2"
-gdb_test_multiple "" "stop threads 2" {
-  -re "\\\[New \[^\]\]*\\\]\r\n" {
-    exp_continue
-  }
-  -re "\\\[\[^\]\]* exited\\\]\r\n" {
-    exp_continue
-  }
-  -re "Thread \[^\n\]* executing\r\n" {
-    exp_continue
-  }
-  -re "Program received signal SIGINT.*$gdb_prompt $" {
-    pass "stop threads 2"
-  }
-} 
-
-gdb_test_multiple "quit" "GDB exits after stopping multithreaded program" {
-    -re "The program is running.  Exit anyway\\? \\(y or n\\) $" {
-	send_gdb "y\n"
-	exp_continue
-    }
-    eof {
-        pass "GDB exits after stopping multithreaded program"
-    }
-    timeout {
-        fail "GDB exits after stopping multithreaded program (timeout)"
-    }
-}
-
diff --git a/gdb/testsuite/gdb.threads/print-threads.c b/gdb/testsuite/gdb.threads/print-threads.c
deleted file mode 100644
index 341ee0aa35a..00000000000
--- a/gdb/testsuite/gdb.threads/print-threads.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-void *thread_function(void *arg); /* Pointer to function executed by each thread */
-
-int slow = 0;
-
-#define NUM 5
-
-int main() {
-    int res;
-    pthread_t threads[NUM];
-    void *thread_result;
-    int args[NUM];
-    int i;
-
-    for (i = 0; i < NUM; i++)
-      {
-	args[i] = i;
-	res = pthread_create(&threads[i], NULL, thread_function, (void *)&args[i]);
-      }
-
-    for (i = 0; i < NUM; i++)
-      res = pthread_join(threads[i], &thread_result);
-
-    printf ("Done\n");
-
-    if (slow)
-      sleep (4);
-
-    exit(EXIT_SUCCESS);
-}
-
-void *thread_function(void *arg) {
-    int my_number = *(int *)arg;
-    int rand_num;
-
-    printf ("Print 1, thread %d\n", my_number);
-    sleep (1);
-
-    if (slow)
-      {
-	printf ("Print 2, thread %d\n", my_number);
-	sleep (1);
-	printf ("Print 3, thread %d\n", my_number);
-	sleep (1);
-	printf ("Print 4, thread %d\n", my_number);
-	sleep (1);
-	printf ("Print 5, thread %d\n", my_number);
-	sleep (1);
-      }
-
-    printf("Bye from %d\n", my_number);
-    pthread_exit(NULL);
-}
-
diff --git a/gdb/testsuite/gdb.threads/print-threads.exp b/gdb/testsuite/gdb.threads/print-threads.exp
deleted file mode 100644
index 5d6fd8d5c8b..00000000000
--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright (C) 1996, 1997, 2002, 2003 Free Software Foundation, 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 Daniel Jacobowitz <drow@mvista.com>
-# (parts based on pthreads.exp by Fred Fish (fnf@cygnus.com).
-#
-# It tests miscellaneous actions with multiple threads, including
-# handling for thread exit.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "print-threads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# regexp for "horizontal" text (i.e. doesn't include newline or
-# carriage return)
-set horiz "\[^\n\r\]*"
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-# Now we can proceed with the real testing.
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set print sevenbit-strings" ""
-#gdb_test "set print address off" ""
-gdb_test "set width 0" ""
-
-# We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
-# run the program and gdb starts saving and restoring tty states.
-# On Ultrix, we don't need it and it is really slow (because shell_escape
-# doesn't use vfork).
-if ![istarget "*-*-ultrix*"] then {
-    gdb_test "shell stty intr '^C'" ""
-}
-
-proc test_all_threads { name kill } {
-    global gdb_prompt
-
-    set i 0
-    set j 0
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "Breakpoint \[0-9\]+, thread_function \\(arg=.*\\) at .*print-threads.c:\[0-9\]+.*$gdb_prompt" {
-	    set i [expr $i + 1]
-	    pass "Hit thread_function breakpoint, $i ($name)"
-	    send_gdb "continue\n"
-	    exp_continue
-	}
-	-re "Breakpoint \[0-9\]+, .* kill \\(.*\\) .*$gdb_prompt" {
-	    set j [expr $j + 1]
-	    if { $kill == 1 } {
-		pass "Hit kill breakpoint, $j ($name)"
-	    } else {
-		fail "Hit kill breakpoint, $j ($name) (unexpected)"
-	    }
-	    send_gdb "continue\n"
-	    exp_continue
-	}
-	-re "Program exited normally\\.\[\r\n\]+$gdb_prompt" {
-	    pass "program exited normally"
-	    if {$i == 5} {
-		pass "all threads ran once ($name)"
-	    } else {
-		fail "all threads ran once ($name) (total $i threads ran)"
-	    }
-	}
-	-re "Program received signal SIGTRAP.*(Thread \[0-9\]* \\(zombie\\)|0x00000000 in ).*$gdb_prompt $" {
-	    if { $kill == 1 } {
-		kfail "gdb/1265" "Running threads ($name) (zombie thread)"
-	    } else {
-		fail "Running threads ($name) (unknown output)"
-	    }
-	}
-	-re "$gdb_prompt" {
-	    fail "Running threads ($name) (unknown output)"
-	}
-	timeout {
-	    fail "Running threads ($name) (timeout)"
-	}
-    }
-}
-
-runto_main
-gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\."
-gdb_test "set var slow = 0" ""
-test_all_threads "fast" 0
-
-runto_main
-gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." "break thread_function (2)"
-gdb_test "set var slow = 1" ""
-test_all_threads "slow" 0
-
-runto_main
-gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." "break thread_function (3)"
-gdb_test "set var slow = 1" "" "set var slow = 1 (2)"
-gdb_test "break kill" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+"
-test_all_threads "slow with kill breakpoint" 1
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/pthread_cond_wait.c b/gdb/testsuite/gdb.threads/pthread_cond_wait.c
deleted file mode 100644
index ae87f8cb765..00000000000
--- a/gdb/testsuite/gdb.threads/pthread_cond_wait.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* A small multi-threaded test case.
-
-   Copyright 2004
-   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 <pthread.h>
-#include <stdio.h>
-#include <time.h>
-
-void
-cond_wait (pthread_cond_t *cond, pthread_mutex_t *mut)
-{
-  pthread_mutex_lock(mut);
-  pthread_cond_wait (cond, mut);
-  pthread_mutex_unlock (mut);
-}
-
-void
-noreturn (void)
-{
-  pthread_mutex_t mut;
-  pthread_cond_t cond;
-
-  pthread_mutex_init (&mut, NULL);
-  pthread_cond_init (&cond, NULL);
-
-  /* Wait for a condition that will never be signaled, so we effectively
-     block the thread here.  */
-  cond_wait (&cond, &mut);
-}
-
-void *
-forever_pthread (void *unused)
-{
-  noreturn ();
-}
-
-void
-break_me (void)
-{
-  /* Just an anchor to help putting a breakpoint.  */
-}
-
-int
-main (void)
-{
-  pthread_t forever;
-  const struct timespec ts = { 0, 10000000 }; /* 0.01 sec */
-
-  pthread_create (&forever, NULL, forever_pthread, NULL);
-  for (;;)
-    {
-      nanosleep (&ts, NULL);
-      break_me();
-    }
-
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.threads/pthread_cond_wait.exp b/gdb/testsuite/gdb.threads/pthread_cond_wait.exp
deleted file mode 100644
index 91b695f32e0..00000000000
--- a/gdb/testsuite/gdb.threads/pthread_cond_wait.exp
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (C) 2004 Free Software Foundation, 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@gnu.org
-
-# This file verifies that GDB is able to compute a backtrace for a thread
-# being blocked on a call to pthread_cond_wait(). 
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "pthread_cond_wait"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-runto_main
-
-gdb_test "break break_me" \
-    "Breakpoint 2 at .*: file .*${srcfile}, line .*" \
-         "breakpoint on break_me"
-
-gdb_test "continue" \
-         ".*Breakpoint 2, break_me ().*" \
-         "run to break_me"
-
-# 
-# Backtrace all threads, find the one running noreturn, and
-# verify that we are able to get a sensible backtrace, including
-# the frame for the pthread_cond_wait() call.
-#
-# The string below will only match if the functions named
-# occur in a single thread's backtrace, in the given order.
-#
-
-global hex
-global decimal
-
-#
-# This is a "backtrace break" ("btb"):
-#
-set btb "\[^\r\n\]+\[\r\n\]+\#${decimal}\[ \t\]+${hex} in "
-
-# One of the threads is blocked on a call to pthread_cond_wait, and
-# we want to verify that we are able to get a sensible backtrace for
-# that thread.  Because we don't know its thread ID, we can't switch
-# to it before doing the backtrace. So we get a backtrace for all
-# threads, and verify that one them returns the expected backtrace.
-gdb_test "thread apply all backtrace" \
-    "pthread_cond_wait${btb}cond_wait${btb}noreturn${btb}forever_pthread.*" \
-    "backtrace in blocked thread"
-
diff --git a/gdb/testsuite/gdb.threads/pthreads.c b/gdb/testsuite/gdb.threads/pthreads.c
deleted file mode 100644
index abedb248b3e..00000000000
--- a/gdb/testsuite/gdb.threads/pthreads.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Pthreads test program.
-   Copyright 1996, 2002, 2003, 2004
-   Free Software Foundation, Inc.
-
-   Written by Fred Fish of Cygnus Support
-   Contributed by 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 <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-/* Under OSF 2.0 & 3.0 and HPUX 10, the second arg of pthread_create
-   is prototyped to be just a "pthread_attr_t", while under Solaris it
-   is a "pthread_attr_t *".  Arg! */
-
-#if defined (__osf__) || defined (__hpux__)
-#define PTHREAD_CREATE_ARG2(arg) arg
-#define PTHREAD_CREATE_NULL_ARG2 null_attr
-static pthread_attr_t null_attr;
-#else
-#define PTHREAD_CREATE_ARG2(arg) &arg
-#define PTHREAD_CREATE_NULL_ARG2 NULL
-#endif
-
-static int verbose = 0;
-
-static void
-common_routine (arg)
-     int arg;
-{
-  static int from_thread1;
-  static int from_thread2;
-  static int from_main;
-  static int hits;
-  static int full_coverage;
-
-  if (verbose) printf("common_routine (%d)\n", arg);
-  hits++;
-  switch (arg)
-    {
-    case 0:
-      from_main++;
-      break;
-    case 1:
-      from_thread1++;
-      break;
-    case 2:
-      from_thread2++;
-      break;
-    }
-  if (from_main && from_thread1 && from_thread2)
-    full_coverage = 1;
-}
-
-static void *
-thread1 (void *arg)
-{
-  int i;
-  int z = 0;
-
-  if (verbose) printf ("thread1 (%0x) ; pid = %d\n", arg, getpid ());
-  for (i=1; i <= 10000000; i++)
-    {
-      if (verbose) printf("thread1 %d\n", pthread_self ());
-      z += i;
-      common_routine (1);
-      sleep(1);
-    }
-  return (void *) 0;
-}
-
-static void *
-thread2 (void * arg)
-{
-  int i;
-  int k = 0;
-
-  if (verbose) printf ("thread2 (%0x) ; pid = %d\n", arg, getpid ());
-  for (i=1; i <= 10000000; i++)
-    {
-      if (verbose) printf("thread2 %d\n", pthread_self ());
-      k += i;
-      common_routine (2);
-      sleep(1);
-    }
-  sleep(100);
-  return (void *) 0;
-}
-
-void
-foo (a, b, c)
-     int a, b, c;
-{
-  int d, e, f;
-
-  if (verbose) printf("a=%d\n", a);
-}
-
-main(argc, argv)
-     int argc;
-     char **argv;
-{
-  pthread_t tid1, tid2;
-  int j;
-  int t = 0;
-  void (*xxx) ();
-  pthread_attr_t attr;
-
-  if (verbose) printf ("pid = %d\n", getpid());
-
-  foo (1, 2, 3);
-
-#ifndef __osf__
-  if (pthread_attr_init (&attr))
-    {
-      perror ("pthread_attr_init 1");
-      exit (1);
-    }
-#endif
-
-#ifdef PTHREAD_SCOPE_SYSTEM
-  if (pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM))
-    {
-      perror ("pthread_attr_setscope 1");
-      exit (1);
-    }
-#endif
-
-  if (pthread_create (&tid1, PTHREAD_CREATE_ARG2(attr), thread1, (void *) 0xfeedface))
-    {
-      perror ("pthread_create 1");
-      exit (1);
-    }
-  if (verbose) printf ("Made thread %d\n", tid1);
-  sleep (1);
-
-  if (pthread_create (&tid2, PTHREAD_CREATE_NULL_ARG2, thread2, (void *) 0xdeadbeef))
-    {
-      perror ("pthread_create 2");
-      exit (1);
-    }
-  if (verbose) printf("Made thread %d\n", tid2);
-
-  sleep (1);
-
-  for (j = 1; j <= 10000000; j++)
-    {
-      if (verbose) printf("top %d\n", pthread_self ());
-      common_routine (0);
-      sleep(1);
-      t += j;
-    }
-  
-  exit(0);
-}
-
diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.threads/pthreads.exp
deleted file mode 100644
index a60a3d372fe..00000000000
--- a/gdb/testsuite/gdb.threads/pthreads.exp
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, 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 Fred Fish. (fnf@cygnus.com)
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# This only works with native configurations
-if ![isnative] then {
-    return
-}
-
-set testfile "pthreads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-# regexp for "horizontal" text (i.e. doesn't include newline or
-# carriage return)
-set horiz "\[^\n\r\]*"
-
-if [istarget "*-*-linux"] then {
-    set target_cflags "-D_MIT_POSIX_THREADS"
-} else {
-    set target_cflags ""
-}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set print sevenbit-strings" ""
-#gdb_test "set print address off" ""
-gdb_test "set width 0" ""
-
-# We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
-# run the program and gdb starts saving and restoring tty states.
-# On Ultrix, we don't need it and it is really slow (because shell_escape
-# doesn't use vfork).
-if ![istarget "*-*-ultrix*"] then {
-    gdb_test "shell stty intr '^C'" ""
-}
-
-proc all_threads_running {} {
-    global gdb_prompt
-    global srcfile
-
-    # Reset all the counters to zero.
-    gdb_test "set var common_routine::hits=0" ""
-    gdb_test "set var common_routine::from_thread1=0" ""
-    gdb_test "set var common_routine::from_thread2=0" ""
-    gdb_test "set var common_routine::from_main=0" ""
-    gdb_test "set var common_routine::full_coverage=0" ""
-
-    # Disable all breakpoints.
-    gdb_test "disable" ""
-
-    # Set up a breakpoint that will cause us to stop when we have
-    # been called 15 times.  This should be plenty of time to allow
-    # every thread to run at least once, since each thread sleeps for
-    # one second between calls to common_routine.
-    gdb_test "tbreak common_routine if hits >= 15" ""
-
-    # Start all the threads running again and wait for the inferior
-    # to stop.  Since no other breakpoints are set at this time
-    # we should stop only when we have been previously called 15 times.
-
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "Continuing.*common_routine.*at.*$srcfile.*$gdb_prompt $" {}
-	default {
-	    fail "continue until common routine run 15 times"
-	    return 0
-	}
-	timeout {
-	    fail "continue until common routine run 15 times (timeout)"
-	    return 0
-	}
-    }
-
-    # Check that we stopped when we actually expected to stop, by
-    # verifying that there have been 15 previous hits.
-
-    # NOTE: Because of synchronization behavior, it is possible for
-    # more than one thread to increment "hits" between one breakpoint
-    # trap and the next.  So stopping after 16 or 17 hits should be
-    # considered acceptable.
-
-    send_gdb "p common_routine::hits\n"
-    gdb_expect {
-	-re ".*= 15\r\n$gdb_prompt $" {
-	    pass "stopped before calling common_routine 15 times"
-	}
-	-re ".*= 16\r\n$gdb_prompt $" {
-	    pass "stopped before calling common_routine 15 times (16 times)"
-	}
-	-re ".*= 17\r\n$gdb_prompt $" {
-	    pass "stopped before calling common_routine 15 times (17 times)"
-	}
-	default {
-	    fail "stopped before calling common_routine 15 times"
-	    return 0
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "stopped before calling common_routine 15 times"
-	    return 0
-	}
-	timeout {
-	    fail "stopped before calling common_routine 15 times (timeout)"
-	    return 0
-	}
-    }
-
-    # Also check that all of the threads have run, which will only be true
-    # if the full_coverage variable is set.
-
-    send_gdb "p common_routine::full_coverage\n"
-    gdb_expect {
-	-re ".* = 1.*$gdb_prompt $" {}
-	-re ".* = 0.*$gdb_prompt $" {
-	    fail "some threads didn't run"
-	    return 0
-	}
-	default {
-	    fail "some threads didn't run"
-	    return 0
-	}
-	timeout {
-	    fail "some threads didn't run (timeout)"
-	    return 0
-	}
-    }
-
-    # Looks fine, return success.
-    return 1
-}
-
-proc test_startup {} {
-    global srcdir srcfile gdb_prompt expect_out
-    global horiz
-    global main_id thread1_id thread2_id
-
-    # We should be able to do an info threads before starting any others.
-    send_gdb "info threads\n"
-    gdb_expect {
-	-re ".*Thread.*main.*$gdb_prompt $" {
-	    pass "info threads"
-	}
-	-re "\r\n$gdb_prompt $" {
-	    unsupported "gdb does not support pthreads for this machine"
-	    return 0
-	}
-    }
-
-    # Extract the thread id number of main thread from "info threads" output.
-    send_gdb "info threads\n"
-    gdb_expect -re "(\[0-9\]+)(${horiz}Thread${horiz}main.*)($gdb_prompt $)"
-    set main_id $expect_out(1,string)
-
-    # Check that we can continue and create the first thread.
-    gdb_test "break thread1" "Breakpoint .* file .*$srcfile.*"
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint .*, thread1 \\(arg=0xfeedface\\).*at.*$srcfile.*" \
-	    "Continue to creation of first thread"
-    gdb_test "disable" ""
-
-    # Extract the thread id number of thread 1 from "info threads" output.
-    send_gdb "info threads\n"
-    gdb_expect -re "(\[0-9\]+)(${horiz}Thread${horiz}thread1.*)($gdb_prompt $)"
-    set thread1_id $expect_out(1,string)
-
-    # Check that we can continue and create the second thread,
-    # ignoring the first thread for the moment.
-    gdb_test "break thread2" "Breakpoint .* file .*$srcfile.*"
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint .*, thread2 \\(arg=0xdeadbeef\\).*at.*$srcfile.*" \
-	    "Continue to creation of second thread"
-
-    # Extract the thread id number of thread 2 from "info threads" output.
-    send_gdb "info threads\n"
-    gdb_expect -re "(\[0-9\]+)(${horiz}Thread${horiz}thread2.*)($gdb_prompt $)"
-    set thread2_id $expect_out(1,string)
-
-    return 1
-}
-
-proc check_control_c {} {
-    global gdb_prompt
-
-    # Verify that all threads are running.
-    if [all_threads_running] then {
-	pass "All threads running after startup"
-    }
-
-    # Send a continue followed by ^C to the process to stop it.
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "Continuing." {
-	    pass "Continue with all threads running"
-	}
-	timeout {
-	    fail "Continue with all threads running (timeout)"
-	}
-    }
-    after 2000
-    send_gdb "\003"
-    set description "Stopped with a ^C"
-    gdb_expect {
-	-re "Program received signal SIGINT.*$gdb_prompt $" {
-	    pass $description
-	}
-	-re "Quit.*$gdb_prompt $" {
-	    pass $description
-	}
-	timeout {
-	    fail "$description (timeout)"
-	    return 1;
-	}
-    }
-    gdb_test "bt" ""
-
-    # Verify that all threads can be run again after a ^C stop.
-    if [all_threads_running] then {
-	pass "All threads running after continuing from ^C stop"
-    }
-    return 0;
-}
-
-proc check_backtraces {} {
-    global gdb_prompt main_id thread1_id thread2_id
-
-    # Check that the "thread apply N backtrace" command works
-
-    gdb_test "thread apply $main_id backtrace" \
-	    ".* in main \\(argc=.*, argv=.*\\).*" \
-	    "check backtrace from main thread"
-    gdb_test "thread apply $thread1_id backtrace" \
-	    ".* in thread1 \\(arg=0xfeedface\\).*" \
-	    "check backtrace from thread 1"
-    gdb_test "thread apply $thread2_id backtrace" \
-	    ".* in thread2 \\(arg=0xdeadbeef\\).*" \
-	    "check backtrace from thread 2"
-
-    # Check that we can apply the backtrace command to all
-    # three threads with a single gdb command
-
-    gdb_test "thread apply $main_id $thread1_id $thread2_id bt" \
-	    ".* in main .* in thread1 .* in thread2.*" \
-	    "apply backtrace command to all three threads"
-
-    # Check that we can do thread specific backtraces
-    # This also tests that we can do thread specific breakpoints.
-
-    gdb_test "break common_routine thread $thread2_id" \
-	    "Breakpoint .* at 0x.* file .* line .*" \
-	    "set break at common_routine in thread 2"
-
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "Breakpoint .* common_routine \\(arg=2\\).*" {
-	    pass "continue to bkpt at common_routine in thread 2"
-	    send_gdb "backtrace\n"
-	    gdb_expect {
-		-re "#0.*common_routine \\(arg=2\\).*#1.*thread2.*" {
-		    pass "backtrace from thread 2 bkpt in common_routine"
-		}
-		default {
-		    fail "backtrace from thread 2 bkpt in common_routine"
-		}
-		timeout {
-		    fail "backtrace from thread 2 bkpt in common_routine (timeout)"
-		}
-	    }
-	}
-	-re "Breakpoint .* common_routine \\(arg=0\\).*" {
-	    fail "continue to bkpt at common_routine in thread 2 (arg=0)"
-	}
-	-re "Breakpoint .* common_routine \\(arg=1\\).*" {
-	    fail "continue to bkpt at common_routine in thread 2 (arg=1)"
-	}
-	-re ".*$gdb_prompt" {
-	    fail "continue to bkpt at common_routine in thread 2"
-	}
-	default {
-	    fail "continue to bkpt at common_routine in thread 2 (default)"
-	}
-	timeout {
-	    fail "continue to bkpt at common_routine in thread 2 (timeout)"
-	}
-    }
-}
-
-setup_xfail "alpha-*-osf*"
-if [runto_main] then {
-    clear_xfail "alpha-*-osf*"
-    if [test_startup] then {
-	if [check_control_c] then {
-	    warning "Could not stop child with ^C; skipping rest of tests.\n"
-	    return;
-	}
-	check_backtraces
-    }
-}
-clear_xfail "alpha-*-osf*"
diff --git a/gdb/testsuite/gdb.threads/schedlock.c b/gdb/testsuite/gdb.threads/schedlock.c
deleted file mode 100644
index 29022824d26..00000000000
--- a/gdb/testsuite/gdb.threads/schedlock.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2003, 2004 Free Software Foundation, 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.  */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-void *thread_function(void *arg); /* Pointer to function executed by each thread */
-
-#define NUM 5
-
-unsigned int args[NUM+1];
-
-int main() {
-    int res;
-    pthread_t threads[NUM];
-    void *thread_result;
-    long i;
-
-    for (i = 0; i < NUM; i++)
-      {
-	args[i] = 1;
-	res = pthread_create(&threads[i],
-		             NULL,
-			     thread_function,
-			     (void *) i);
-      }
-
-    /* schedlock.exp: last thread start.  */
-    args[i] = 1;
-    thread_function ((void *) i);
-
-    exit(EXIT_SUCCESS);
-}
-
-void *thread_function(void *arg) {
-    int my_number =  (long) arg;
-    int *myp = (int *) &args[my_number];
-
-    /* Don't run forever.  Run just short of it :)  */
-    while (*myp > 0)
-      {
-	/* schedlock.exp: main loop.  */
-	(*myp) ++;
-      }
-
-    pthread_exit(NULL);
-}
-
diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp
deleted file mode 100644
index 44785808ce3..00000000000
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright (C) 1996, 1997, 2002, 2003 Free Software Foundation, 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 Daniel Jacobowitz <drow@mvista.com>
-# (parts based on pthreads.exp by Fred Fish (fnf@cygnus.com).
-#
-# This test covers the various forms of "set scheduler-locking".
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "schedlock"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-# Now we can proceed with the real testing.
-
-proc get_args { } {
-  global list_count
-  global gdb_prompt
-
-  send_gdb "print args\n"
-  gdb_expect {
-    -re "\\\$\[0-9\]+ = {(\[0-9\]+), (\[0-9\]+), (\[0-9\]+), (\[0-9\]+), (\[0-9\]+), (\[0-9\]+)}.*$gdb_prompt"
-      {
-	set list_count [expr $list_count + 1]
-	pass "listed args ($list_count)"
-	return [list $expect_out(1,string) $expect_out(2,string) $expect_out(3,string) $expect_out(4,string) $expect_out(5,string) $expect_out(6,string)]
-      }
-    -re "$gdb_prompt"
-      {
-	fail "listed args ($list_count) (unknown output)"
-      }
-    timeout
-      {
-	fail "listed args ($list_count) (timeout)"
-      }
-  }
-}
-
-proc stop_process { description } {
-  global gdb_prompt
-
-  # For this to work we must be sure to consume the "Continuing."
-  # message first, or GDB's signal handler may not be in place.
-  after 1000 {send_gdb "\003"}
-  gdb_expect {
-    -re "Program received signal SIGINT.*$gdb_prompt $"
-      {
-	pass $description
-      }
-    timeout
-      {
-	fail "$description (timeout)"
-      }
-  }
-}
-
-proc get_current_thread { description } {
-  global gdb_prompt
-
-  send_gdb "bt\n"
-  gdb_expect {
-    -re "thread_function \\(arg=0x(\[0-9\])\\).*$gdb_prompt $"
-      {
-	pass $description
-	return $expect_out(1,string)
-      }
-    -re "$gdb_prompt $"
-      {
-	fail "$description (unknown output)"
-      }
-    timeout
-      {
-	fail "$description (timeout)"
-      }
-  }
-}
-
-proc my_continue { msg } {
-  send_gdb "continue\n"
-  gdb_expect {
-    -re "Continuing"
-      { pass "continue ($msg)" }
-    timeout
-      { fail "continue ($msg) (timeout)" }
-  }
-
-  stop_process "stop all threads ($msg)"
-
-  # Make sure we're in one of the non-main looping threads.
-  gdb_breakpoint [concat [gdb_get_line_number "schedlock.exp: main loop"] " if arg != 5"]
-  gdb_continue_to_breakpoint "return to loop ($msg)"
-  delete_breakpoints
-}
-
-proc step_ten_loops { msg } {
-    global gdb_prompt
-
-    for {set i 0} {[expr $i < 10]} {set i [expr $i + 1]} {
-	send_gdb "step\n"
-	set other_step 0
-	gdb_expect {
-	    -re ".*myp\\) \\+\\+;\[\r\n\]+$gdb_prompt $" {
-		pass "step to increment ($msg $i)"
-	    }
-	    -re "$gdb_prompt $" {
-		if {$other_step == 0} {
-		    set other_step 1
-		    send_gdb "step\n"
-		    exp_continue
-		} else {
-		    fail "step to increment ($msg $i)"
-		    # FIXME cascade?
-		}
-	    }
-	    timeout {
-		fail "step to increment ($msg $i) (timeout)"
-	    }
-	}
-    }
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-# We'll need this when we send_gdb a ^C to GDB.  Need to do it before we
-# run the program and gdb starts saving and restoring tty states.
-# On Ultrix, we don't need it and it is really slow (because shell_escape
-# doesn't use vfork).
-if ![istarget "*-*-ultrix*"] then {
-    gdb_test "shell stty intr '^C'" ""
-}
-
-gdb_load ${binfile}
-
-gdb_test "set print sevenbit-strings" ""
-gdb_test "set width 0" ""
-
-runto_main
-
-# See if scheduler locking is available on this target.
-send_gdb "set scheduler-locking off\n"
-global gdb_prompt
-gdb_expect {
-  -re "Target .* cannot support this command"
-    {
-      unsupported "target does not support scheduler locking"
-      return
-    }
-  -re "$gdb_prompt $"
-    {
-      pass "scheduler locking set to none"
-    }
-  timeout
-    {
-      unsupported "target does not support scheduler locking (timeout)"
-      return
-    }
-}
-
-gdb_breakpoint [gdb_get_line_number "schedlock.exp: last thread start"]
-gdb_continue_to_breakpoint "all threads started"
-
-global list_count
-set list_count 0
-
-set start_args [get_args]
-
-# First make sure that all threads are alive.
-my_continue "initial"
-
-set cont_args [get_args]
-
-for {set i 0} {[expr $i < 6]} {set i [expr $i + 1]} {
-  if {[lindex $start_args $i] == [lindex $cont_args $i]} {
-    fail "thread $i ran (didn't run)"
-  } else {
-    pass "thread $i ran"
-  }
-}
-
-# We can't change threads, unfortunately, in current GDB.  Use
-# whichever we stopped in.
-set curthread [get_current_thread "find current thread (1)"]
-
-
-
-
-# Test stepping without scheduler locking.
-gdb_test "set scheduler-locking off"  ""
-
-step_ten_loops "unlocked"
-
-# Make sure we're still in the same thread.
-set newthread [get_current_thread "find current thread (2)"]
-if {$curthread == $newthread} {
-    pass "step without lock does not change thread"
-} else {
-    fail "step without lock does not change thread (switched to thread $newthread)"
-}
-
-set start_args $cont_args
-set cont_args [get_args]
-
-set num_other_threads 0
-for {set i 0} {[expr $i < 6]} {set i [expr $i + 1]} {
-  if {[lindex $start_args $i] == [lindex $cont_args $i]} {
-    if {$i == $curthread} {
-      fail "current thread stepped (didn't run)"
-    }
-  } else {
-    if {$i == $curthread} {
-	if {[lindex $start_args $i] == [expr [lindex $cont_args $i] - 10]} {
-	    pass "current thread stepped"
-	} else {
-	    fail "current thread stepped (wrong amount)"
-	}
-    } else {
-      set num_other_threads [expr $num_other_threads + 1]
-    }
-  }
-}
-if {$num_other_threads > 0} {
-  pass "other threads ran (1)"
-} else {
-  fail "other threads ran (no other threads ran) (1)"
-}
-
-# Test continue with scheduler locking
-gdb_test "set scheduler-locking on"  ""
-
-my_continue "with lock"
-
-# Make sure we're still in the same thread.
-set newthread [get_current_thread "find current thread (3)"]
-if {$curthread == $newthread} {
-    pass "continue with lock does not change thread"
-} else {
-    fail "continue with lock does not change thread (switched to thread $newthread)"
-}
-
-set start_args $cont_args
-set cont_args [get_args]
-
-for {set i 0} {[expr $i < 6]} {set i [expr $i + 1]} {
-  if {[lindex $start_args $i] == [lindex $cont_args $i]} {
-    if {$i == $curthread} {
-      fail "current thread ran (didn't run)"
-    } else {
-      pass "other thread $i didn't run"
-    }
-  } else {
-    if {$i == $curthread} {
-      pass "current thread ran"
-    } else {
-      fail "other thread $i didn't run (ran)"
-    }
-  }
-}
-
-# Test stepping with scheduler locking
-step_ten_loops "locked"
-
-# Make sure we're still in the same thread.
-set newthread [get_current_thread "find current thread (2)"]
-if {$curthread == $newthread} {
-    pass "step with lock does not change thread"
-} else {
-    fail "step with lock does not change thread (switched to thread $newthread)"
-}
-
-set start_args $cont_args
-set cont_args [get_args]
-
-for {set i 0} {[expr $i < 6]} {set i [expr $i + 1]} {
-  if {[lindex $start_args $i] == [lindex $cont_args $i]} {
-    if {$i == $curthread} {
-      fail "current thread stepped locked (didn't run)"
-    } else {
-      pass "other thread $i didn't run (stepping)"
-    }
-  } else {
-    if {$i == $curthread} {
-	if {[lindex $start_args $i] == [expr [lindex $cont_args $i] - 10]} {
-	    pass "current thread stepped locked"
-	} else {
-	    fail "current thread stepped locked (wrong amount)"
-	}
-    } else {
-      fail "other thread $i didn't run (stepping) (ran)"
-    }
-  }
-}
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/staticthreads.c b/gdb/testsuite/gdb.threads/staticthreads.c
deleted file mode 100644
index 57defefcae4..00000000000
--- a/gdb/testsuite/gdb.threads/staticthreads.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* This test program is part of GDB, The GNU debugger.
-
-   Copyright 2004 Free Software Foundation, Inc.
-
-   Originally written by Jeff Johnston <jjohnstn@redhat.com>,
-   contributed by Red Hat
-
-   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 <pthread.h>
-#include <semaphore.h>
-#include <stdio.h>
-#include <limits.h>
-#include <errno.h>
-
-sem_t semaphore;
-
-void *
-thread_function (void *arg)
-{
-  printf ("Thread executing\n");
-  while (sem_wait (&semaphore) != 0)
-    {
-      if (errno != EINTR)
-	{
-	  perror ("thread_function");
-	  return;
-	}
-    }
-  return NULL;
-}
-
-int 
-main (int argc, char **argv)
-{
-  pthread_attr_t attr;
-
-  pthread_attr_init (&attr);
-  pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
-
-  if (sem_init (&semaphore, 0, 0) == -1)
-    {
-      perror ("semaphore");
-      return -1;
-    }
-
-
-  /* Create a thread, wait for it to complete.  */
-  {
-    pthread_t thread;
-    pthread_create (&thread, &attr, thread_function, NULL);
-    sem_post (&semaphore);
-    pthread_join (thread, NULL);
-  }
-
-  pthread_attr_destroy (&attr);
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp
deleted file mode 100644
index 53ceaa06fa6..00000000000
--- a/gdb/testsuite/gdb.threads/staticthreads.exp
+++ /dev/null
@@ -1,102 +0,0 @@
-# static.exp -- test script, for GDB, the GNU debugger.
-
-# Copyright 2004, 2005 Free Software Foundation, 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.  
-
-# Based on manythreads written by Jeff Johnston, contributed by Red
-# Hat.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "staticthreads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-set static_flag "-static"
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
-	 executable \
-	 [list debug "incdir=${objdir}" "additional_flags=${static_flag}" \
-	     ]] != "" } {
-    return -1
-}
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-gdb_test "set print sevenbit-strings" ""
-
-
-# See if the static multi-threaded program runs.
-
-runto_main
-gdb_test "break sem_post"
-set test "Continue to main's call of sem_post"
-gdb_test_multiple "continue" "$test" {
-    -re " sem_post .*$gdb_prompt " {
-	pass "$test"
-    }
-    -re "Program received signal .*$gdb_prompt " {
-	kfail gdb/1328 "$test"
-    }
-}
-    
-
-# See if handle SIG32 helps (a little) with a static multi-threaded
-# program.
-
-set sig "SIG32"
-
-# SIGRTMIN is 37 on hppa-linux and hpux
-if [istarget hppa*-*-*] {
-  set sig "SIG37"
-}
-
-rerun_to_main
-gdb_test "handle $sig nostop noprint pass"
-set test "Handle $sig helps"
-gdb_test "continue" " .*sem_post .*" "handle $sig helps"
-
-
-# See if info threads produces anything approaching a thread list.
-
-set test "info threads"
-gdb_test_multiple "info threads" "$test" {
-    -re " Thread .*$gdb_prompt " {
-	pass "$test"
-    }
-    -re "$gdb_prompt " {
-	kfail gdb/1328 "$test"
-    }
-}
-
-
-# Check that the program can be quit.
-
-set test "GDB exits with static thread program"
-gdb_test_multiple "quit" "$test" {
-    -re "The program is running.  Exit anyway\\? \\(y or n\\) $" {
-	send_gdb "y\n"
-	exp_continue
-    }
-    eof {
-        pass "$test"
-    }
-}
diff --git a/gdb/testsuite/gdb.threads/step.c b/gdb/testsuite/gdb.threads/step.c
deleted file mode 100644
index 1b18a4b07ad..00000000000
--- a/gdb/testsuite/gdb.threads/step.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*    step.c for step.exp    */
-#include <ipc.h>
-#include <pthread.h>
-#include <st.h>
-#include <signal.h>
-#include <stdio.h>
-
-void alarm_handler ();
-void alarm_handler1 ();
-void alarm_handler2 ();
-void thread1 ();
-void thread2 ();
-
-#define TIME_LIMIT 30
-
-
-int count1 = 0;
-int count2 = 0;
-
-pthread_t tid1, tid2;
-pthread_attr_t attr1, attr2;
-
-pthread_mutex_t mut;
-pthread_mutexattr_t mut_attr;
-
-pthread_condattr_t cv_attr_a, cv_attr_b;
-pthread_cond_t cv_a, cv_b;
-
-struct cv_struct
-  {
-    char a;
-    char b;
-  }
-test_struct;
-
-main ()
-{
-  /*init la struct */
-  test_struct.a = 0;
-  test_struct.b = 1;
-
-  /* create le mutex */
-  if (pthread_mutexattr_create (&mut_attr) == -1)
-    {
-      perror ("mutexattr_create");
-      exit (1);
-    }
-
-
-  if (pthread_mutex_init (&mut, mut_attr) == -1)
-    {
-      perror ("mutex_init");
-      exit (1);
-    }
-
-  /* create 2 cv */
-  if (pthread_condattr_create (&cv_attr_a) == -1)
-    {
-      perror ("condattr_create(1)");
-      exit (1);
-    }
-
-  if (pthread_cond_init (&cv_a, cv_attr_a) == -1)
-    {
-      perror ("cond_init(1)");
-      exit (1);
-    }
-
-  if (pthread_condattr_create (&cv_attr_b) == -1)
-    {
-      perror ("condattr_create(2)");
-      exit (1);
-    }
-
-  if (pthread_cond_init (&cv_b, cv_attr_b) == -1)
-    {
-      perror ("cond_init(2)");
-      exit (1);
-    }
-
-  /* create 2 threads of execution */
-  if (pthread_attr_create (&attr1) == -1)
-    {
-      perror ("attr_create(1)");
-      exit (1);
-    }
-
-  if (pthread_create (&tid1, attr1, thread1, &count1) == -1)
-    {
-      perror ("pthread_create(1)");
-      exit (1);
-    }
-
-  if (pthread_attr_create (&attr2) == -1)
-    {
-      perror ("attr_create(2)");
-      exit (1);
-    }
-
-  if (pthread_create (&tid2, attr2, thread2, &count2) == -1)
-    {
-      perror ("pthread_create(2)");
-      exit (1);
-    }
-
-  /* set alarm to print out data and exit */
-  signal (SIGALRM, alarm_handler);
-  alarm (TIME_LIMIT);
-
-  for (;;)
-    pause ();
-}
-
-void 
-thread1 (count)
-     int *count;
-{
-  tid_t tid;
-
-  tid = getstid ();
-  printf ("Thread1 tid 0x%x  (%d) \n", tid, tid);
-  printf ("Thread1 @tid=0x%x \n", &tid);
-  signal (SIGALRM, alarm_handler1);
-
-  for (;;)
-    {
-      if (pthread_mutex_lock (&mut) == -1)
-	{
-	  perror ("pthread_mutex_lock(1)");
-	  pthread_exit ((void *) 0);
-	}
-
-      while (test_struct.a == 0)
-	{
-	  if (pthread_cond_wait (&cv_a, &mut) == -1)
-	    {
-	      perror ("pthread_cond_wait(1)");
-	      pthread_exit ((void *) -1);
-	    }
-	}
-
-      (*count)++;
-      printf ("*******thread1 count %d\n", *count);
-
-      test_struct.a = 0;
-
-      test_struct.b = 1;
-      pthread_cond_signal (&cv_b);
-
-      if (pthread_mutex_unlock (&mut) == -1)
-	{
-	  perror ("pthread_mutex_unlock(1)");
-	  pthread_exit ((void *) -1);
-	}
-    }
-}
-
-void 
-thread2 (count)
-     int *count;
-{
-  tid_t tid;
-
-  tid = getstid ();
-  printf ("Thread2 tid 0x%x  (%d) \n", tid, tid);
-  printf ("Thread1 @tid=0x%x \n", &tid);
-  signal (SIGALRM, alarm_handler2);
-
-  for (;;)
-    {
-      if (pthread_mutex_lock (&mut) == -1)
-	{
-	  perror ("pthread_mutex_lock(2)");
-	  pthread_exit ((void *) 0);
-	}
-
-      while (test_struct.b == 0)
-	{
-	  if (pthread_cond_wait (&cv_b, &mut) == -1)
-	    {
-	      perror ("pthread_cond_wait(2)");
-	      pthread_exit ((void *) -1);
-	    }
-	}
-
-      (*count)++;
-      printf ("*******thread2 count %d\n", *count);
-
-      test_struct.b = 0;
-
-      test_struct.a = 1;
-      pthread_cond_signal (&cv_a);
-
-      if (pthread_mutex_unlock (&mut) == -1)
-	{
-	  perror ("pthread_mutex_unlock(2)");
-	  pthread_exit ((void *) -1);
-	}
-    }
-}
-
-
-void 
-alarm_handler ()
-{
-  printf ("\tcount1 (%d) \n\tcount2 (%d)\n", count1, count2);
-  exit (0);
-}
-
-void 
-alarm_handler1 ()
-{
-  printf ("ALARM thread 1\n");
-}
-
-void 
-alarm_handler2 ()
-{
-  printf ("ALARM thread 2\n");
-  pthread_exit ((void *) 0);
-}
diff --git a/gdb/testsuite/gdb.threads/step.exp b/gdb/testsuite/gdb.threads/step.exp
deleted file mode 100644
index aa5639347b7..00000000000
--- a/gdb/testsuite/gdb.threads/step.exp
+++ /dev/null
@@ -1,200 +0,0 @@
-# step.exp -- Expect script to test gdb with step.c
-# Copyright (C) 1992, 1997 Free Software Foundation, 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 Hiro Sugawara. (hiro@lynx.com)
-#
-# This test really needs some major surgery to be acceptable, but
-# I'm just about burnt out on lynx work, so I'm not doing it now.
-#
-#	* The test has an indeterminate number of pass/fails
-#	for each run (it runs a small group of tests until
-#	it's timer kicks off).  This is very bad for nightly
-#	automated regression testing.
-#
-#	* It tries to "step" from withint he prologue of a
-# 	function.  This isn't support in gdb (it's going
-#	to act like a continue).
-#
-#	* This test rarely check that it stopped in sensible
-#	places.  (see previous bullet -- this test doesn't
-#	catch the fact it continued rather than stepped)
-
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set program_exited 0
-
-proc set_bp { where } {
-    global gdb_prompt
-
-    send_gdb "break $where\n"
-    # The first regexp is what we get with -g, the second without -g.
-    gdb_expect {
-	-re "Break.* at .*: file .*, line \[0-9\]*.*$gdb_prompt $" {}
-	-re "Breakpoint \[0-9\]* at 0x\[0-9a-f\]*.*$gdb_prompt $" {}
-	-re "$gdb_prompt $" { fail "setting breakpoint at $where" ; return 0 }
-	timeout { fail "setting breakpoint at $where (timeout)" ; return 0 }
-    }
-    pass "set_bp"
-}
-
-proc step_it { cmd } {
-    global gdb_prompt
-    global program_exited
-
-    send_gdb "$cmd\n"
-    gdb_expect {
-	-re "0x\[0-9A-Fa-f\]* *in.*\r\n$gdb_prompt $" { pass "step_it"; return 0 }
-	-re "0x\[0-9A-Fa-f\]* *\[0-9\]*.*\r\n$gdb_prompt $" { pass "step_it"; return 1 }
-	-re "Program exited .*\n$gdb_prompt $" {
-		set program_exited 1
-		return -1
-	    }
-	-re "$gdb_prompt $"	{ fail "single-stepping ($cmd).\n" ; return -1 }
-	timeout	{ fail "single-stepping ($cmd) timout.\n" ; return -1 }
-    }
-}
-
-proc step_inst {} {
-    step_it "stepi"
-}
-
-proc step_source {} {
-    step_it "step"
-}
-
-proc continue_all {} {
-    global gdb_prompt
-
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "Breakpoint \[0-9\]*, thread\[0-9\]* .*$gdb_prompt $" { 
-	    pass "continue_all"
-	    return 0
-	}
-	-re "Program exited .*\n$gdb_prompt $" {
-	    set program_exited 1
-	    return 1;
-	}
-	-re "$gdb_prompt $" { fail "continue" ; return -1 }
-	timeout { fail "continue (timeout)" ; return -1 }
-    }
-}
-
-proc check_threads { num_threads } {
-    global gdb_prompt
-
-    set curr_thread 0
-    send_gdb "info threads\n"
-    while { $num_threads > 0 } {
-	gdb_expect {
-	    -re "\\* *\[0-9\]* process \[0-9\]* thread \[0-9\]* .*\n" {
-		incr curr_thread
-		set num_threads [expr $num_threads - 1]
-	    }
-	    -re " *\[0-9\]* process \[0-9\]* thread \[0-9\]* .*\n" {
-		set num_threads [expr $num_threads - 1]
-	    }
-	    -re "$gdb_prompt $" {
-		if { $num_threads < 0 } {
-		    fail "check_threads (too many)" ; return -1
-		}
-		break
-	    }
-	    timeout { fail "check_threads (timeout)" ; return -1 }
-	}
-    }
-
-    if { $curr_thread == 0 } {
-	fail "check_threads (no current thread)\n"
-	return -1
-    }
-    if { $curr_thread > 1 } {
-	fail "check_threads (more than one current thread)\n"
-	return -1
-    }
-    return 0
-}
-
-proc test_cond_wait {} {
-    global program_exited
-
-    set_bp	135
-    runto	179
-    while { 1 } {
-	set stepi_counter 0
-	while { [step_inst] } {
-		if { $program_exited } { break }
-		incr stepi_counter
-		if { $stepi_counter > 30 } {
-			fail "too many stepi's per line\n"
-			return -1
-		}
-	}
-	if { $program_exited } { break }
-	step_source
-	if { $program_exited } { break }
-	continue_all
-	if { $program_exited } { break }
-	check_threads 3
-    }
-}
-
-proc do_tests {} {
-    global prms_id
-    global bug_id
-    global subdir
-    global objdir
-    global srcdir
-    global binfile
-    global gdb_prompt
-
-    set prms_id 0
-    set bug_id 0
-
-    # Start with a fresh gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load $objdir/$subdir/$binfile
-
-    send_gdb "set width 0\n"
-    gdb_expect -re "$gdb_prompt $"
-
-    test_cond_wait
-}
-
-# Check to see if we have an executable to test.  If not, then either we
-# haven't tried to compile one, or the compilation failed for some reason.
-# In either case, just notify the user and skip the tests in this file.
-
-set binfile "step"
-set srcfile "step.c"
-
-if ![file exists $objdir/$subdir/$binfile] then {
-    if $all_flag then {
-	warning "$binfile does not exist; tests suppressed."
-    }
-} else {
-    do_tests
-}
diff --git a/gdb/testsuite/gdb.threads/step2.exp b/gdb/testsuite/gdb.threads/step2.exp
deleted file mode 100644
index 5442e6aef6f..00000000000
--- a/gdb/testsuite/gdb.threads/step2.exp
+++ /dev/null
@@ -1,150 +0,0 @@
-# step2.exp -- Expect script to test gdb step.c
-# Copyright (C) 1992, 1997 Free Software Foundation, 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 Jeff Law. (law@cygnus.com)
-#
-
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set program_exited 0
-
-# A simple and crude test to see that we can step two threads independently
-proc test_multi_threaded_stepping {} {
-    global gdb_prompt
-    global hex
-    global srcfile
-    global decimal
-
-    # Set breakpoints in code that we know is executed in only
-    # thread of control.
-    gdb_test "break thread1" \
-	     "Break.* at $hex: file .*$srcfile, line $decimal\\."
-    gdb_test "break thread2" \
-	     "Break.* at $hex: file .*$srcfile, line $decimal\\."
-
-    # the order in which things happen is indeterminate.  So we basically
-    # look for a set of events and note that each one happens and that
-    # all of the required events have happened when we're done.
-    #
-    # Right now we only verify that both threads start and that they
-    # both call pthread_cond_wait twice.
-    set thread1started 0
-    set thread1condwait 0
-    set thread2started 0
-    set thread2condwait 0
-    
-    send_gdb "run\n"
-    gdb_expect {
-	-re "The program .* has been started already.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-	-re ".*Breakpoint \[0-9\]+,.*thread1.* at .*$srcfile:.*\[\t \].*$gdb_prompt $" {
-	    if { $thread1started != 0 } then {
-		fail "thread1 started"
-		return
-	    } else {
-		set thread1started 1
-		pass "thread1 started"
-	    }
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	-re ".*Breakpoint \[0-9\]+,.*thread2.* at .*$srcfile:.*\[\t \].*$gdb_prompt $" {
-	    if { $thread2started != 0 } then {
-		fail "thread2 started"
-		return
-	    } else {
-		set thread2started 1
-		pass "thread2 started"
-	    }
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	-re ".*pthread_cond_wait.*cv_a.*$gdb_prompt" {
-	    if { $thread1started == 0 } then {
-		fail "thread1 condwait"
-		return
-	    }
-	    if { $thread1condwait < 2 } then {
-		pass "thread1 condwait"
-		incr thread1condwait
-	    }
-	    if { $thread2condwait == 2 } then {
-		pass "multi threaded stepping"
-		return
-	    }
-	    send_gdb "step\n"
-	    exp_continue
-	}
-		    
-	-re ".*pthread_cond_wait.*cv_b.*$gdb_prompt" {
-	    if { $thread2started == 0 } then {
-		fail "thread2 condwait"
-		return
-	    }
-	    if { $thread2condwait < 2 } then {
-		pass "thread2 condwait"
-		incr thread2condwait
-	    }
-	    if { $thread1condwait == 2 } then {
-		pass "multi threaded stepping"
-		return
-	    }
-	    send_gdb "step\n"
-	    exp_continue
-	}
-		    
-	-re "$gdb_prompt" {
-	    send_gdb "step\n"
-	    exp_continue
-	}
-	default { fail "multi threaded stepping" }
-    }
-}
-
-# Check to see if we have an executable to test.  If not, then either we
-# haven't tried to compile one, or the compilation failed for some reason.
-# In either case, just notify the user and skip the tests in this file.
-
-set binfile "step"
-set srcfile "step.c"
-
-if ![file exists $objdir/$subdir/$binfile] then {
-    if $all_flag then {
-	warning "$binfile does not exist; tests suppressed."
-    }
-    return
-}
-
-set prms_id 0
-set bug_id 0
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $objdir/$subdir/$binfile
-
-test_multi_threaded_stepping
diff --git a/gdb/testsuite/gdb.threads/switch-threads.c b/gdb/testsuite/gdb.threads/switch-threads.c
deleted file mode 100644
index 3e5a825f487..00000000000
--- a/gdb/testsuite/gdb.threads/switch-threads.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* A minimal multi-threaded test case.
-
-   Copyright 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 <pthread.h>
-
-void foo (void)
-{
-}
-
-void *thread_func (void *arg)
-{
-  int x;
-  for (x = 0; x < 10; x++)
-    foo ();
-  return 0;
-}
-
-int main()
-{
-  pthread_t thr;
-  void *ret;
-  int x;
-
-  pthread_create (&thr, NULL, thread_func, NULL);
-  pthread_join (thr, &ret);
-  for (x = 0; x < 10; x++)
-    foo ();  
-}
diff --git a/gdb/testsuite/gdb.threads/switch-threads.exp b/gdb/testsuite/gdb.threads/switch-threads.exp
deleted file mode 100644
index d5608cfe7f1..00000000000
--- a/gdb/testsuite/gdb.threads/switch-threads.exp
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2003 Free Software Foundation, 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 Daniel Jacobowitz <drow@mvista.com>.
-#
-# It tests that the correct thread is single-stepped.  Prior to the
-# introduction of vCont, we didn't pass enough information to remote
-# multi-threaded stubs to reliably get this correct; gdbserver defaulted
-# to the first thread.
-
-# TODO: we should also test explicitly changing threads with the "thread"
-# command.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "switch-threads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-runto_main
-
-gdb_breakpoint thread_func
-gdb_continue_to_breakpoint "continue to thread_func"
-gdb_test "next" ".*foo \\(\\);"
-
diff --git a/gdb/testsuite/gdb.threads/thread-specific.c b/gdb/testsuite/gdb.threads/thread-specific.c
deleted file mode 100644
index 8839d72e176..00000000000
--- a/gdb/testsuite/gdb.threads/thread-specific.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2004 Free Software Foundation, 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.  */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-void *thread_function(void *arg);
-
-unsigned int args[1];
-
-int main() {
-    int res;
-    pthread_t threads[2];
-    void *thread_result;
-    long i = 1;
-
-    args[0] = 1;
-    res = pthread_create(&threads[0],
-			 NULL,
-			 thread_function,
-			 (void *) 0);
-
-    /* thread-specific.exp: last thread start.  */
-    args[1] = 1;
-
-    /* Don't run forever.  Run just short of it :)  */
-    while (i > 0)
-      {
-	/* thread-specific.exp: main loop.  */
-	(i) ++;
-      }
-
-    exit(EXIT_SUCCESS);
-}
-
-void *thread_function(void *arg) {
-    int my_number =  (long) arg;
-    int *myp = (int *) &args[my_number];
-
-    /* Don't run forever.  Run just short of it :)  */
-    while (*myp > 0)
-      {
-	/* thread-specific.exp: thread loop.  */
-	(*myp) ++;
-      }
-
-    pthread_exit(NULL);
-}
diff --git a/gdb/testsuite/gdb.threads/thread-specific.exp b/gdb/testsuite/gdb.threads/thread-specific.exp
deleted file mode 100644
index 66f0bd2261c..00000000000
--- a/gdb/testsuite/gdb.threads/thread-specific.exp
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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 Daniel Jacobowitz <drow@mvista.com>.
-# It tests that the correct breakpoint is reported when we hit a
-# thread-specific breakpoint inserted for several threads.
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "thread-specific"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-# Return a list of the valid thread IDs, with the initial thread first.
-proc get_thread_list { } {
-  global gdb_prompt
-  global expect_out
-
-  set thr_list ""
-
-  gdb_test_multiple "info threads" "get threads list" {
-    -re "info threads\r\n" {
-      exp_continue
-    }
-    -re "^\\*  *(\[0-9\]*) Thread \[^\n\]*main\[^\n\]*\n" {
-      set thr_list "$expect_out(1,string) $thr_list"
-      exp_continue
-    }
-    -re "^  *(\[0-9\]*) Thread \[^\n\]*\n" {
-      lappend thr_list $expect_out(1,string)
-      exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-      if { [llength $thr_list] != 0 } {
-	pass "get threads list"
-      } else {
-	fail "get threads list (no threads)"
-      }
-    }
-  }
-
-  return $thr_list
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_load ${binfile}
-
-gdb_test "set print sevenbit-strings" ""
-gdb_test "set width 0" ""
-
-runto_main
-
-gdb_breakpoint [gdb_get_line_number "thread-specific.exp: last thread start"]
-gdb_continue_to_breakpoint "all threads started"
-
-set line [gdb_get_line_number "thread-specific.exp: thread loop"]
-set threads [get_thread_list]
-
-if {[llength $threads] == 0} {
-  # We have already issued a FAIL above.
-  return 1
-}
-
-gdb_test_multiple "break $line thread [lindex $threads 0]" \
-  "breakpoint $line main thread" {
-    -re "Breakpoint (\[0-9\]*) at.* file .*$srcfile, line.*$gdb_prompt $" {
-      set main_breakpoint $expect_out(1,string)
-      pass "breakpoint $line main thread"
-    }
-}
-
-foreach thread [lrange $threads 1 end] {
-  gdb_breakpoint "$line thread $thread"
-}
-
-gdb_test_multiple "continue" "continue to thread-specific breakpoint" {
-	-re "Breakpoint $main_breakpoint, .* at .*\r\n$gdb_prompt $" {
-	    fail "continue to thread-specific breakpoint (wrong breakpoint)"
-	}
-	-re "Breakpoint .* at .*\r\n$gdb_prompt $" {
-	    pass "continue to thread-specific breakpoint"
-	}
-}
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/thread_check.c b/gdb/testsuite/gdb.threads/thread_check.c
deleted file mode 100644
index 58cb79e01fa..00000000000
--- a/gdb/testsuite/gdb.threads/thread_check.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-* Copyright (C) 2004 Free Software Foundation, 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.
-
-* This file was written by Steve Munroe. (sjmunroe@us.ibm.com)
-* Test break points and single step on thread functions.
-*/
-
-#include <string.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-#define N       2
-
-static void *
-tf (void *arg)
-{
-    int n = (int) (long int) arg;
-    char number[160];
-    int unslept = 10;
-
-    sprintf(number, "tf(%ld): begin", (long)arg);
-    puts (number);
-
-    while (unslept > 0)
-        unslept = sleep(unslept);
-
-    sprintf(number, "tf(%ld): end", (long)arg);
-    puts (number);
-    return NULL;
-}
-
-int main (int argc, char *argv[])
-{
-    int n;
-    int unslept = 2;
-    pthread_t th[N];
-
-    for (n = 0; n < N; ++n)
-    if (pthread_create (&th[n], NULL, tf, (void *) (long int) n) != 0)
-    {
-        while (unslept > 0)
-           unslept = sleep(2);
-        puts ("create failed");
-        exit (1);
-    }
-
-    puts("after create");
-
-    for (n = 0; n < N; ++n)
-    if (pthread_join (th[n], NULL) != 0)
-    {
-        puts ("join failed");
-        exit (1);
-    }
-
-    puts("after join");
-    return 0;
-}
diff --git a/gdb/testsuite/gdb.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
deleted file mode 100644
index 7f6a3d8bc0a..00000000000
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (C) 2004 Free Software Foundation, 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 Manoj Iyer. (manjo@austin.ibm.com)
-# Test break points and single step on thread functions.
-# 
-# Test Purpose:
-# - Test that breakpoints, continue in a threaded  application works. 
-#   On powerpc64-unknown-linux-gnu system, running kernel version
-#   2.6.5-7.71-pseries64 this test is known to fail due to kernel bug
-#   in ptrace system call.
-#
-# Test Strategy:
-# - thread_check.c creates 2 threads
-# - start gdb 
-# - create 2 breakpoints #1 main() #2 tf() (the thread function)
-# - run gdb till #1 main() breakpoint is reached
-# - continue to breakpoint #2 tf()
-# - delete all breakpoints 
-# - exit gdb.
-
-if $tracelevel then {
-        strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "thread_check"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-   fail "Can't run to main"
-      return 1;
-}
-
-
-#
-# set breakpoint at thread fucntion tf
-#
-gdb_test "break tf" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
-    "breakpoint at tf"
-
-
-#
-#
-# continue to tf() breakpoint #2
-#
-gdb_test "continue" \
-     ".*Breakpoint 2,.*tf.*at.*$srcfile:.*" \
-     "continue to tf"
-
-#   
-# backtrace from thread function.
-#
-gdb_test "backtrace" \
-    "#0 .*tf .*at .*$srcfile:.*" \
-    "backtrace from thread function"
-
-
-#
-# delete all breakpoints
-#
-delete_breakpoints
-
-#
-# exit gdb
-#
-gdb_exit
diff --git a/gdb/testsuite/gdb.threads/threadapply.c b/gdb/testsuite/gdb.threads/threadapply.c
deleted file mode 100644
index ccebd6e931b..00000000000
--- a/gdb/testsuite/gdb.threads/threadapply.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2003, 2004 Free Software Foundation, 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.  
- 
-   This file is copied from schedlock.c.  */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-void *thread_function(void *arg); /* Pointer to function executed by each thread */
-
-#define NUM 5
-
-unsigned int args[NUM+1];
-
-int main() {
-    int res;
-    int all_started;
-    pthread_t threads[NUM];
-    void *thread_result;
-    long i;
-
-    for (i = 0; i < NUM; i++)
-      {
-	args[i] = 1; /* Init value.  */
-	res = pthread_create(&threads[i],
-		             NULL,
-			     thread_function,
-			     (void *) i);
-      }
-
-    all_started = 0;
-    while (!all_started)
-      {
-	all_started = 1;
-        for (i = 0; i < NUM; i++)
-          {
-            if (args[i] == 1)
-	      {
-	        all_started = 0;
-	        break;
-	      }
-          }  
-      }
-	
-    args[i] = 1;
-    /* Break here */
-    thread_function ((void *) i);
-
-    exit(EXIT_SUCCESS);
-}
-
-void *thread_function(void *arg) {
-    int my_number =  (long) arg;
-    int *myp = (int *) &args[my_number];
-
-    /* Don't run forever.  Run just short of it :)  */
-    while (*myp > 0)
-      {
-	(*myp) ++;  /* Loop increment.  */
-      }
-
-    pthread_exit(NULL);
-}
-
diff --git a/gdb/testsuite/gdb.threads/threadapply.exp b/gdb/testsuite/gdb.threads/threadapply.exp
deleted file mode 100644
index fa8d02fd0f3..00000000000
--- a/gdb/testsuite/gdb.threads/threadapply.exp
+++ /dev/null
@@ -1,71 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2004 Free Software Foundation, 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.  
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# This test verifies that a macro using backtrace can be applied to all threads
-# and will continue for each thread even though an error may occur in
-# backtracing one of the threads.
-
-set testfile "threadapply"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-# Break after all threads have been started.
-set break_line [gdb_get_line_number "Break here"]
-gdb_test "b $break_line" ""
-gdb_test "continue"
-
-gdb_test_multiple "define backthread" "defining macro" {
-  -re "Type commands for definition of \"backthread\".\r\nEnd with a line saying just \"end\".\r\n>$" {
-    gdb_test_multiple "bt\np/x 20\nend" "macro details" {
-      -re "$gdb_prompt $" {
-        pass "macro details"
-      }
-    }
-    pass "defining macro"
-  }
-}
-
-# Cause backtraces to fail by setting a limit.  This allows us to
-# verify that the macro can get past the backtrace error and perform
-# subsequent commands.
-gdb_test "set backtrace limit 3" ""
-gdb_test "thread apply all backthread" "Thread ..*\\\$1 = 0x14.*Thread ..*\\\$2 = 0x14.*Thread ..*\\\$3 = 0x14.*Thread ..*\\\$4 = 0x14.*Thread ..*\\\$5 = 0x14.*Thread ..*\\\$. = 0x14"
-
diff --git a/gdb/testsuite/gdb.threads/tls-main.c b/gdb/testsuite/gdb.threads/tls-main.c
deleted file mode 100644
index eec5d50bcf4..00000000000
--- a/gdb/testsuite/gdb.threads/tls-main.c
+++ /dev/null
@@ -1,9 +0,0 @@
-__thread int i_tls = 2;
-int main ()
-{
-  int result;
-  result = foo (); /* Call to foo should return 2, not 1.  */
-  result ++;
-  return 0; /* break here to check result */
-}
-
diff --git a/gdb/testsuite/gdb.threads/tls-shared.c b/gdb/testsuite/gdb.threads/tls-shared.c
deleted file mode 100644
index d4f8e5cc6e0..00000000000
--- a/gdb/testsuite/gdb.threads/tls-shared.c
+++ /dev/null
@@ -1,6 +0,0 @@
-__thread int i_tls = 1;
-int foo ()
-{
-  return i_tls;
-}
-
diff --git a/gdb/testsuite/gdb.threads/tls-shared.exp b/gdb/testsuite/gdb.threads/tls-shared.exp
deleted file mode 100644
index fc5c0862cc0..00000000000
--- a/gdb/testsuite/gdb.threads/tls-shared.exp
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2003 Free Software Foundation, 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
-
-# tls-shared.exp -- Expect script to test thread local storage in gdb, with
-# shared libraries.
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set testfile tls-main
-set libfile tls-shared
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-remote_exec build "rm -f ${binfile}"
-
-# get the value of gcc_compiled
-if [get_compiler_info ${binfile}] {
-    return -1
-}
-
-if  { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}.o" object {debug}] != "" } {
-    return -1
-}
-
-# Build the shared libraries this test case needs.
-#
-
-if {$gcc_compiled == 0} {
-    if [istarget "hppa*-hp-hpux*"] then {
-        set additional_flags "additional_flags=+z"
-    } elseif { [istarget "mips-sgi-irix*"] } {
-        # Disable SGI compiler's implicit -Dsgi
-        set additional_flags "additional_flags=-Usgi"
-    } else {
-        # don't know what the compiler is...
-        set additional_flags ""
-    }
-} else {
-    if { ([istarget "powerpc*-*-aix*"]
-    || [istarget "rs6000*-*-aix*"]) } {
-        set additional_flags ""
-    } else {
-        set additional_flags "additional_flags=-fpic"
-    }
-}
-
-set additional_flags "$additional_flags -shared"
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${libfile}.c" "${objdir}/${subdir}/${libfile}.so" executable [list debug $additional_flags "incdir=${objdir}"]] != ""} {
-    return -1
-}
-
-if { ($gcc_compiled 
-&&  ([istarget "powerpc*-*-aix*"]
-|| [istarget "rs6000*-*-aix*"] )) } {
-    set additional_flags "additional_flags=-L${objdir}/${subdir}"
-} elseif { [istarget "mips-sgi-irix*"] } {
-    set additional_flags "additional_flags=-rpath ${objdir}/${subdir}"
-} else {
-    set additional_flags ""
-}
-
-if {[gdb_compile_pthreads "${objdir}/${subdir}/${testfile}.o ${objdir}/${subdir}/${libfile}.so" "${binfile}" executable [list debug $additional_flags]] != ""} {
-    return -1
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if ![runto_main] then {
-    fail "Can't run to main"
-    return 0
-}
-
-gdb_test "print i_tls" "2" "print thread local storage variable"
-
-gdb_test "ptype i_tls" "int" "ptype of thread local storage variable"
-
-gdb_test "info address i_tls" \
-	"Symbol \\\"i_tls\\\" is a thread-local variable at offset 0 in the thread-local storage for .*tls-main.." \
-	"print storage info for thread local storage variable"
-
-set line_number [gdb_get_line_number "break here to check result"]
-
-gdb_test "break $line_number" \
-	"Breakpoint.*at.*file.*tls-main.c.*line ${line_number}." \
-	"break at and of main"
-gdb_test "continue" \
-	"main .* at .*:.*return 0.*break here to check result.*" \
-        "continue to break"
-# This is more of a gcc/glibc test, really. 
-#
-gdb_test "print result" "3" "print result"
-
-
diff --git a/gdb/testsuite/gdb.threads/tls.c b/gdb/testsuite/gdb.threads/tls.c
deleted file mode 100644
index 9b2145e652f..00000000000
--- a/gdb/testsuite/gdb.threads/tls.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/* BeginSourceFile tls.c
-
-  This file creates and deletes threads. It uses thread local storage
-  variables too. */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <errno.h>
-
-#define N_THREADS 3
-
-/* Uncomment to turn on debugging output */
-/*#define START_DEBUG*/
-
-/* Thread-local storage.  */
-__thread int a_thread_local;
-__thread int another_thread_local;
-
-/* Global variable just for info addr in gdb.  */
-int a_global;
-
-/* Print the results of thread-local storage.  */
-int thread_local_val[ N_THREADS ];
-int another_thread_local_val[ N_THREADS ];
-
-/* Semaphores to make sure the threads are alive when we print the TLS
-   variables from gdb.  */
-sem_t tell_main, tell_thread;
-
-
-void print_error ()
-{
-  switch (errno)
-  {
-    case EAGAIN:
-      fprintf (stderr, "EAGAIN\n");
-      break;
-    case EINTR:
-      fprintf (stderr, "EINTR\n");
-      break;
-    case EINVAL:
-      fprintf (stderr, "EINVAL\n");
-      break;
-    case ENOSYS:
-      fprintf (stderr, "ENOSYS\n");
-      break;
-    case ENOENT:
-      fprintf (stderr, "ENOENT\n");
-      break;
-    case EDEADLK:
-      fprintf (stderr, "EDEADLK\n");
-      break;
-    default:
-      fprintf (stderr, "Unknown error\n");
-      break;
-   } 
-}
-
-/* Routine for each thread to run, does nothing.  */
-void *spin( vp )
-    void * vp;
-{
-    int me = (long) vp;
-    int i;
-    
-    /* Use a_global. */
-    a_global++;
-
-    a_thread_local = 0;
-    another_thread_local = me;
-    for( i = 0; i <= me; i++ ) {
-        a_thread_local += i;
-    }
-
-    another_thread_local_val[me] = another_thread_local;
-    thread_local_val[ me ] = a_thread_local; /* here we know tls value */
-
-    if (sem_post (&tell_main) == -1)
-     {
-        fprintf (stderr, "th %d post on sem tell_main failed\n", me);
-        print_error ();
-        return;
-     }
-#ifdef START_DEBUG
-    fprintf (stderr, "th %d post on tell main\n", me);
-#endif
-
-    while (1)
-      {
-#ifdef START_DEBUG
-        fprintf (stderr, "th %d start wait on tell_thread\n", me);
-#endif
-        if (sem_wait (&tell_thread) == 0)
-          break;
-
-        if (errno == EINTR)
-          {
-#ifdef START_DEBUG
-            fprintf (stderr, "th %d wait tell_thread got EINTR, rewaiting\n", me);
-#endif
-            continue;
-          }
-        else
-          {  
-            fprintf (stderr, "th %d wait on sem tell_thread failed\n", me);
-            print_error ();
-            return;
-         }
-      }
-
-#ifdef START_DEBUG
-      fprintf (stderr, "th %d Wait on tell_thread\n", me);
-#endif
-
-}
-
-void
-do_pass()
-{
-    int i;
-    pthread_t t[ N_THREADS ];
-    int err;
-
-    for( i = 0; i < N_THREADS; i++)
-    {
-        thread_local_val[i] = 0;
-        another_thread_local_val[i] = 0;
-    }
-   
-    if (sem_init (&tell_main, 0, 0) == -1)
-    {
-      fprintf (stderr, "tell_main semaphore init failed\n");
-      return;
-    }
-
-    if (sem_init (&tell_thread, 0, 0) == -1)
-    {
-      fprintf (stderr, "tell_thread semaphore init failed\n");
-      return;
-    }
-
-    /* Start N_THREADS threads, then join them so that they are terminated.  */
-    for( i = 0; i < N_THREADS; i++ )
-     {
-        err = pthread_create( &t[i], NULL, spin, (void *) (long) i );
-        if( err != 0 ) {
-            fprintf(stderr, "Error in thread %d create\n", i );
-        }
-     }
-
-    for( i = 0; i < N_THREADS; i++ )
-      {
-        while (1)
-          {
-#ifdef START_DEBUG
-            fprintf (stderr, "main %d start wait on tell_main\n", i);
-#endif
-            if (sem_wait (&tell_main) == 0)
-              break;
-
-            if (errno == EINTR)
-              {
-#ifdef START_DEBUG
-                fprintf (stderr, "main %d wait tell_main got EINTR, rewaiting\n", i);
-#endif
-                continue;
-              }
-            else
-              {
-                fprintf (stderr, "main %d wait on sem tell_main failed\n", i);
-                print_error ();
-                return;
-              }
-            }
-       }
-
-#ifdef START_DEBUG
-    fprintf (stderr, "main done waiting on tell_main\n");
-#endif
-
-    i = 10;  /* Here all threads should be still alive. */
-
-    for( i = 0; i < N_THREADS; i++ )
-     {
-       if (sem_post (&tell_thread) == -1)
-        {
-           fprintf (stderr, "main %d post on sem tell_thread failed\n", i);
-           print_error ();
-           return;
-        }
-#ifdef START_DEBUG
-      fprintf (stderr, "main %d post on tell_thread\n", i);
-#endif
-     }
-
-    for( i = 0; i < N_THREADS; i++ )
-     {
-        err = pthread_join(t[i], NULL );
-        if( err != 0 )
-         { 
-           fprintf (stderr, "error in thread %d join\n", i );
-         }
-    }
-
-    i = 10;  /* Null line for setting bpts on. */
-   
-}
-
-int
-main()
-{
-   do_pass ();
-
-   return 0;  /* Set breakpoint here before exit. */
-}
-
-/* EndSourceFile */
diff --git a/gdb/testsuite/gdb.threads/tls.exp b/gdb/testsuite/gdb.threads/tls.exp
deleted file mode 100644
index 3f74993daa0..00000000000
--- a/gdb/testsuite/gdb.threads/tls.exp
+++ /dev/null
@@ -1,291 +0,0 @@
-# tls.exp -- Expect script to test thread-local storage
-# Copyright (C) 1992, 2003 Free Software Foundation, 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
-
-set testfile tls
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-if [istarget "*-*-linux"] then {
-    set target_cflags "-D_MIT_POSIX_THREADS"
-} else {
-    set target_cflags ""
-}
-
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-### Compute the value of the a_thread_local variable.
-proc compute_expected_value {value} {
-    set expected_value 0
-    set i 0
-    while { $i <= $value} {
-        incr expected_value $i
-        incr i
-    }
-    return $expected_value
-}
-
-### Get the value of the variable 'me' for the current thread.
-proc get_me_variable {tnum} {
-    global expect_out
-    global gdb_prompt
-    global decimal
-
-    set value_of_me -1
-    send_gdb "print me\n"
-    gdb_expect {
-	-re ".*= ($decimal).*\r\n$gdb_prompt $" {
-	    set value_of_me $expect_out(1,string)
-	    pass "$tnum thread print me"
-        }
-	-re "$gdb_prompt $" {
-	    fail "$tnum thread print me"
-	}
-	timeout {
-	    fail "$tnum thread print me (timeout)" 
-	}
-    }
-    return ${value_of_me}
-}
-
-### Check the values of the thread local variables in the thread.
-### Also check that info address print the right things.
-proc check_thread_local {number} {
-    set me_variable [get_me_variable $number]
-    set expected_value [compute_expected_value ${me_variable}]
-
-    gdb_test "p a_thread_local" \
-	    "= $expected_value" \
-	    "${number} thread local storage"
-
-    gdb_test "p another_thread_local" \
-	    "= $me_variable" \
-	    "${number} another thread local storage"
-
-    gdb_test "info address a_thread_local" \
-	    ".*a_thread_local.*a thread-local variable at offset.*" \
-	    "${number} info address a_thread_local"
-
-    gdb_test "info address another_thread_local" \
-    	    ".*another_thread_local.*a thread-local variable at offset.*" \
-	    "${number} info address another_thread_local"
-}
-
-### Select a particular thread.
-proc select_thread {thread} {
-    global gdb_prompt
-
-    send_gdb "thread $thread\n"
-    gdb_expect {
-	-re "\\\[Switching to thread .*\\\].*\r\n$gdb_prompt $" {
-	    pass "selected thread: $thread"
-	}
-	-re "$gdb_prompt $" {
-	    fail "selected thread: $thread"
-	}
-	timeout {
-	    fail "selected thread: $thread (timeout)"
-	}
-    }
-}
-
-### Do a backtrace for the current thread, and check that the 'spin' routine
-### is in it. This means we have one of the threads we created, rather
-### than the main thread. Record the thread in the spin_threads 
-### array. Also remember the level of the 'spin' routine in the backtrace, for 
-### later use.
-proc check_thread_stack {number spin_threads spin_threads_level} {
-    global gdb_prompt
-    global expect_out
-    global decimal
-    global hex
-    upvar $spin_threads tarr
-    upvar $spin_threads_level tarrl
-
-    select_thread $number
-    send_gdb "where\n"
-    gdb_expect {
-	-re ".*(\[0-9\]+)\[ \t\]+$hex in spin \\(vp=(0x\[0-9a-f\]+).*\r\n$gdb_prompt $" {
-	    if {[info exists tarr($number)]} {
-		fail "backtrace of thread number $number in spin"
-	    } else {
-		pass "backtrace of thread number $number in spin"
-                set level $expect_out(1,string)
-		set tarrl($number) $level
-		set tarr($number) 1
-	    }
-	}
-	-re ".*$gdb_prompt $" {
-	 set tarr($number) 0
-	 set tarrl($number) 0
-	 pass "backtrace of thread number $number not relevant"
-	}
-	timeout {
-	    fail "backtrace of thread number $number (timeout)" 
-	}
-    }
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-
-gdb_load ${binfile}
-if ![runto_main] then {
-   fail "Can't run to main"
-   return 0
-}
-
-# Set a breakpoint at the "spin" routine to
-# test the thread local's value.  
-#
-gdb_test "b [gdb_get_line_number "here we know tls value"]" \
-         ".*Breakpoint 2.*tls.*"   "set breakpoint at all threads"
-
-# Set a bp at a point where we know all threads are alive.
-#
-gdb_test "b [gdb_get_line_number "still alive"]" \
-         ".*Breakpoint 3.*tls.*" "set breakpoint at synch point"
-
-# Set a bp at the end to see if all threads are finished.
-#
-gdb_test "b [gdb_get_line_number "before exit"]" \
-         ".*Breakpoint 4.*tls.*" "set breakpoint at exit"
-
-send_gdb "continue\n"
-gdb_expect {
-    -re ".*Program received signal SIGSEGV.*a_thread_local = 0;.*$gdb_prompt $" {
-        # This is the first symptom if the gcc and binutils versions
-        # in use support TLS, but the system glibc does not.
-        unsupported "continue to first thread: system does not support TLS"
-        return -1
-    }
-    -re ".*Program exited normally.*$gdb_prompt $" {
-        fail "continue to first thread: program runaway"
-    }
-    -re ".*Pass 0 done.*Pass 1 done.*$gdb_prompt $" {
-        fail "continue to first thread: program runaway 2"
-    }
-    -re ".*Breakpoint 2.*tls value.*$gdb_prompt $" {
-        pass "continue to first thread: get to thread"
-    }
-    -re ".*$gdb_prompt $" {
-        fail "continue to first thread: no progress?"
-    }
-    timeout { fail "continue to first thread (timeout)" }
-}
-
-gdb_test "info thread" ".*Thread.*spin.*" \
-	"at least one th in spin while stopped at first th"
-
-check_thread_local "first"
-
-gdb_test "continue" ".*Breakpoint 2.*tls value.*" "continue to second thread"
-gdb_test "info thread" "Thread.*spin.*" \
-	"at least one th in spin while stopped at second th"
-
-check_thread_local "second"
-
-gdb_test "continue" ".*Breakpoint 2.*tls value.*" "continue to third thread"
-gdb_test "info thread" ".*Thread.*spin.*" \
-	"at least one th in spin while stopped at third th"
-
-check_thread_local "third"
-
-gdb_test "continue" ".*Breakpoint 3.*still alive.*" "continue to synch point"
-
-set no_of_threads 0
-send_gdb "info thread\n"
-gdb_expect {
-	-re "^info thread\[ \t\r\n\]+(\[0-9\]+) Thread.*$gdb_prompt $" {
-	   set no_of_threads $expect_out(1,string)
-	   pass "get number of threads"
-        }
-	-re "$gdb_prompt $" {
-	    fail "get number of threads"
-	}
-	timeout {
-	    fail "get number of threads (timeout)"
-	}
-}
-
-array set spin_threads {}
-unset spin_threads
-array set spin_threads_level {}
-unset spin_threads_level
-
-# For each thread check its backtrace to see if it is stopped at the
-# spin routine. 
-for {set i 1} {$i <= $no_of_threads} {incr i} {
-    check_thread_stack $i spin_threads spin_threads_level
-}
-
-### Loop through the threads and check the values of the tls variables.
-### keep track of how many threads we find in the spin routine.
-set thrs_in_spin 0
-foreach i [array names spin_threads] {
-    if {$spin_threads($i) == 1} {
-      incr thrs_in_spin
-      select_thread $i
-      set level $spin_threads_level($i)
-      gdb_test "up $level" ".*spin.*sem_wait.*" "thread $i up"
-      check_thread_local $i 
-    }
-}
-
-if {$thrs_in_spin == 0} {
-  fail "No thread backtrace reported spin (vsyscall kernel problem?)"
-}
-
-gdb_test "continue" ".*Breakpoint 4.*before exit.*" "threads exited"
-
-send_gdb "info thread\n" 
-gdb_expect {
-    -re ".* 1 Thread.*2 Thread.*$gdb_prompt $" {
-        fail "Too many threads left at end"
-    }
-    -re ".*\\\* 1 Thread.*main.*$gdb_prompt $" {
-        pass "Expect only base thread at end"
-    }
-    -re ".*No stack.*$gdb_prompt $" {
-        fail "runaway at end"
-    }
-    -re ".*$gdb_prompt $" {
-        fail "mess at end"
-    }
-    timeout { fail "at end (timeout)" }
-}
-
-# Start over and do some "info address" stuff
-#
-runto spin
-
-gdb_test "info address a_global" \
-	".*a_global.*static storage at address.*" "info address a_global"
-
-setup_kfail "gdb/1294" "*-*-*"
-gdb_test "info address me" ".*me.*is a variable at offset.*" "info address me"
-
-# Done!
-#
-gdb_exit
-
-return 0
diff --git a/gdb/testsuite/gdb.threads/watchthreads.c b/gdb/testsuite/gdb.threads/watchthreads.c
deleted file mode 100644
index e19fe0759d5..00000000000
--- a/gdb/testsuite/gdb.threads/watchthreads.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2002, 2003, 2004 Free Software Foundation, 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.  
- 
-   This file is copied from schedlock.c.  */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-void *thread_function(void *arg); /* Pointer to function executed by each thread */
-
-#define NUM 5
-
-unsigned int args[NUM+1];
-
-int main() {
-    int res;
-    pthread_t threads[NUM];
-    void *thread_result;
-    long i;
-
-    for (i = 0; i < NUM; i++)
-      {
-	args[i] = 1; /* Init value.  */
-	res = pthread_create(&threads[i],
-		             NULL,
-			     thread_function,
-			     (void *) i);
-      }
-
-    args[i] = 1;
-    thread_function ((void *) i);
-
-    exit(EXIT_SUCCESS);
-}
-
-void *thread_function(void *arg) {
-    int my_number =  (long) arg;
-    int *myp = (int *) &args[my_number];
-
-    /* Don't run forever.  Run just short of it :)  */
-    while (*myp > 0)
-      {
-	(*myp) ++;  /* Loop increment.  */
-      }
-
-    pthread_exit(NULL);
-}
-
diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
deleted file mode 100644
index 0bb940f6e31..00000000000
--- a/gdb/testsuite/gdb.threads/watchthreads.exp
+++ /dev/null
@@ -1,128 +0,0 @@
-# This testcase is part of GDB, the GNU debugger.
-
-# Copyright 2004 Free Software Foundation, 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.  
-
-# Check that GDB can support multiple watchpoints across threads.
-
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-# This test verifies that a watchpoint is detected in the proper thread
-# so the test is only meaningful on a system with hardware watchpoints.
-if [target_info exists gdb,no_hardware_watchpoints] {
-    return 0;
-}
-
-set testfile "watchthreads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
-    return -1
-}
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set can-use-hw-watchpoints 1" "" ""
-
-#
-# Run to `main' where we begin our tests.
-#
-
-if ![runto_main] then {
-    gdb_suppress_tests
-}
-
-set args_0 0
-set args_1 0
-
-# Watch values that will be modified by distinct threads.
-gdb_test "watch args\[0\]" "Hardware watchpoint 2: args\\\[0\\\]"
-gdb_test "watch args\[1\]" "Hardware watchpoint 3: args\\\[1\\\]"
-
-set init_line [expr [gdb_get_line_number "Init value"]+1]
-set inc_line [gdb_get_line_number "Loop increment"]
-
-# Loop and continue to allow both watchpoints to be triggered.
-for {set i 0} {$i < 30} {incr i} {
-  set test_flag 0
-  gdb_test_multiple "continue" "threaded watch loop" {
-    -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads.c:$init_line.*$gdb_prompt $"
-       { set args_0 1; set test_flag 1 }
-    -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads.c:$init_line.*$gdb_prompt $"
-       { set args_1 1; set test_flag 1 }
-    -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = $args_0.*New value = [expr $args_0+1].*in thread_function \\\(arg=0x0\\\) at .*watchthreads.c:$inc_line.*$gdb_prompt $"
-       { set args_0 [expr $args_0+1]; set test_flag 1 }
-    -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = $args_1.*New value = [expr $args_1+1].*in thread_function \\\(arg=0x1\\\) at .*watchthreads.c:$inc_line.*$gdb_prompt $"
-       { set args_1 [expr $args_1+1]; set test_flag 1 }
-  }
-  # If we fail above, don't bother continuing loop
-  if { $test_flag == 0 } {
-    set i 30;
-  }
-}
-
-# Print success message if loop succeeded.
-if { $test_flag == 1 } {
-  pass "threaded watch loop"
-}
-
-# Verify that we hit first watchpoint in main thread.
-set message "first watchpoint on args\[0\] hit"
-if { $args_0 > 0 } {
-  pass $message 
-} else {
-  fail $message 
-}
-
-# Verify that we hit second watchpoint in main thread.
-set message "first watchpoint on args\[1\] hit"
-if { $args_1 > 0 } {
-  pass $message 
-} else {
-  fail $message 
-}
-
-# Verify that we hit first watchpoint in child thread.
-set message "watchpoint on args\[0\] hit in thread"
-if { $args_0 > 1 } {
-  pass $message 
-} else {
-  fail $message
-}
-
-# Verify that we hit second watchpoint in child thread.
-set message "watchpoint on args\[1\] hit in thread"
-if { $args_1 > 1 } {
-  pass $message 
-} else {
-  fail $message 
-}
-
-# Verify that all watchpoint hits are accounted for.
-set message "combination of threaded watchpoints = 30"
-if { [expr $args_0+$args_1] == 30 } {
-  pass $message 
-} else {
-  fail $message 
-}
diff --git a/gdb/testsuite/gdb.trace/Makefile.in b/gdb/testsuite/gdb.trace/Makefile.in
deleted file mode 100644
index 89bd1851b77..00000000000
--- a/gdb/testsuite/gdb.trace/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-VPATH = @srcdir@
-srcdir = @srcdir@
-
-.PHONY: all clean mostlyclean distclean realclean
-
-all info install-info dvi install uninstall installcheck check:
-	@echo "Nothing to be done for $@..."
-
-clean mostlyclean:
-	-rm -f actions circ collection limits
-	-rm -f *.o *.diff *~ *.bad core sh3 hppa mn10300
-
-distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log
diff --git a/gdb/testsuite/gdb.trace/actions.c b/gdb/testsuite/gdb.trace/actions.c
deleted file mode 100644
index ae3c1c38c1c..00000000000
--- a/gdb/testsuite/gdb.trace/actions.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Test program for trace action commands
- */
-
-static char   gdb_char_test;
-static short  gdb_short_test;
-static long   gdb_long_test;
-static char   gdb_arr_test[25];
-static struct GDB_STRUCT_TEST
-{
-  char   c;
-  short  s;
-  long   l;
-  int    bfield : 11;	/* collect bitfield */
-  char   arr[25];
-  struct GDB_STRUCT_TEST *next;
-} gdb_struct1_test, gdb_struct2_test, *gdb_structp_test, **gdb_structpp_test;
-
-static union GDB_UNION_TEST
-{
-  char   c;
-  short  s;
-  long   l;
-  int    bfield : 11;	/* collect bitfield */
-  char   arr[4];
-  union GDB_UNION_TEST *next;
-} gdb_union1_test;
-
-void gdb_recursion_test (int, int, int, int,  int,  int,  int);
-
-void gdb_recursion_test (int depth, 
-			 int q1, 
-			 int q2, 
-			 int q3, 
-			 int q4, 
-			 int q5, 
-			 int q6)
-{	/* gdb_recursion_test line 0 */
-  int q = q1;						/* gdbtestline 1 */
-
-  q1 = q2;						/* gdbtestline 2 */
-  q2 = q3;						/* gdbtestline 3 */
-  q3 = q4;						/* gdbtestline 4 */
-  q4 = q5;						/* gdbtestline 5 */
-  q5 = q6;						/* gdbtestline 6 */
-  q6 = q;						/* gdbtestline 7 */
-  if (depth--)						/* gdbtestline 8 */
-    gdb_recursion_test (depth, q1, q2, q3, q4, q5, q6);	/* gdbtestline 9 */
-}
-
-
-unsigned long   gdb_c_test( unsigned long *parm )
-
-{
-   char *p = "gdb_c_test";
-   char *ridiculously_long_variable_name_with_equally_long_string_assignment;
-   register long local_reg = 7;
-   static unsigned long local_static, local_static_sizeof;
-   long local_long;
-   unsigned long *stack_ptr;
-   unsigned long end_of_stack;
-
-   ridiculously_long_variable_name_with_equally_long_string_assignment = 
-     "ridiculously long variable name with equally long string assignment";
-   local_static = 9;
-   local_static_sizeof = sizeof (struct GDB_STRUCT_TEST);
-   local_long = local_reg + 1;
-   stack_ptr  = (unsigned long *) &local_long;
-   end_of_stack = 
-     (unsigned long) &stack_ptr + sizeof(stack_ptr) + sizeof(end_of_stack) - 1;
-
-   gdb_char_test   = gdb_struct1_test.c = (char)   ((long) parm[1] & 0xff);
-   gdb_short_test  = gdb_struct1_test.s = (short)  ((long) parm[2] & 0xffff);
-   gdb_long_test   = gdb_struct1_test.l = (long)   ((long) parm[3] & 0xffffffff);
-   gdb_union1_test.l = (long) parm[4];
-   gdb_arr_test[0] = gdb_struct1_test.arr[0] = (char) ((long) parm[1] & 0xff);
-   gdb_arr_test[1] = gdb_struct1_test.arr[1] = (char) ((long) parm[2] & 0xff);
-   gdb_arr_test[2] = gdb_struct1_test.arr[2] = (char) ((long) parm[3] & 0xff);
-   gdb_arr_test[3] = gdb_struct1_test.arr[3] = (char) ((long) parm[4] & 0xff);
-   gdb_arr_test[4] = gdb_struct1_test.arr[4] = (char) ((long) parm[5] & 0xff);
-   gdb_arr_test[5] = gdb_struct1_test.arr[5] = (char) ((long) parm[6] & 0xff);
-   gdb_struct1_test.bfield = 144;
-   gdb_struct1_test.next = &gdb_struct2_test;
-   gdb_structp_test      = &gdb_struct1_test;
-   gdb_structpp_test     = &gdb_structp_test;
-
-   gdb_recursion_test (3, (long) parm[1], (long) parm[2], (long) parm[3],
-		       (long) parm[4], (long) parm[5], (long) parm[6]);
-
-   gdb_char_test = gdb_short_test = gdb_long_test = 0;
-   gdb_structp_test  = (void *) 0;
-   gdb_structpp_test = (void *) 0;
-   memset ((char *) &gdb_struct1_test, 0, sizeof (gdb_struct1_test));
-   memset ((char *) &gdb_struct2_test, 0, sizeof (gdb_struct2_test));
-   local_static_sizeof = 0;
-   local_static = 0;
-   return ( (unsigned long) 0 );
-}
-
-static void gdb_asm_test (void)
-{
-}
-
-static void begin ()	/* called before anything else */
-{
-}
-
-static void end ()	/* called after everything else */
-{
-}
-
-int
-main (argc, argv, envp)
-     int argc;
-     char *argv[], **envp;
-{
-  int i;
-  unsigned long myparms[10];
-
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-
-  begin ();
-  for (i = 0; i < sizeof (myparms) / sizeof (myparms[0]); i++)
-    myparms[i] = i;
-
-  gdb_c_test (&myparms[0]);
-
-  end ();
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
deleted file mode 100644
index 66d3d87d22e..00000000000
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ /dev/null
@@ -1,207 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    set binfile [board_info target d490_binfile];
-    set srcfile gdb_c_test.c
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-gdb_file_cmd $binfile
-
-# define relative source line numbers:
-# all subsequent line numbers are relative to this first one (baseline)
-
-set baseline  [gdb_find_recursion_test_baseline $srcfile];
-if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-set testline1 [expr $baseline + 7]
-
-#
-# test actions command
-#
-
-gdb_delete_tracepoints
-set trcpt1 [gdb_gettpnum gdb_c_test];
-set trcpt2 [gdb_gettpnum gdb_asm_test];
-set trcpt3 [gdb_gettpnum $testline1];
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
-    fail "setting tracepoints"
-    return;
-}
-
-# 5.1 actions of specified tracepoint
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "Actions for tracepoint \[0-9\]+:.*$gdb_prompt $" {
-	fail "5.1a: testsuite failure (tracepoint already has action)!"
-    }
-    -re "No tracepoints.*$gdb_prompt $" {
-	fail "5.1a: set three tracepoints, no actions (No tracepoints!)"
-    }
-    -re "$gdb_prompt $" {
-	pass "5.1a: set three tracepoints, no actions"
-    }
-}
-
-gdb_trace_setactions "5.1b: set actions for first tracepoint" \
-	"$trcpt1" \
-	"collect gdb_char_test" "^$"
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "Actions for.* $trcpt1:.*collect gdb_char_test.*$gdb_prompt $" {
-	pass "5.1c: verify actions set for first tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	fail "5.1c: verify actions set for first tracepoint"
-    }
-}
-
-gdb_trace_setactions "5.1d: set actions for second tracepoint" \
-	"$trcpt2" \
-	"collect gdb_short_test" "^$"
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "Actions for.* $trcpt2:.*collect gdb_short_test.*$gdb_prompt $" {
-	pass "5.1e: verify actions set for second tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	fail "5.1e: verify actions set for second tracepoint"
-    }
-}
-
-gdb_trace_setactions "5.2a: set actions for last (default) tracepoint" \
-	"" \
-	"collect gdb_long_test" "^$"
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "Actions for.* $trcpt3:.*collect gdb_long_test.*$gdb_prompt $" {
-	pass "5.2b: verify actions set for last (default) tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	fail "5.2b: verify actions set for last (default) tracepoint"
-    }
-}
-
-# 5.3 replace actions set earlier
-
-gdb_trace_setactions "5.3a: reset actions for first tracepoint" \
-	"$trcpt1" \
-	"collect gdb_struct1_test" "^$"
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "Actions for.* $trcpt1:.*collect gdb_struct1_test.*$gdb_prompt $" {
-	pass "5.3b: verify actions set for first tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	fail "5.3b: verify actions set for first tracepoint"
-    }
-}
-
-#
-# test end command (all by itself)
-#
-
-# 5.4 end outside of context
-
-gdb_test "end" "This command cannot be used at the top level." \
-			"5.4: 'end' command out of context"
-
-# 5.5 empty actions (just an end with no other actions)
-
-gdb_trace_setactions "5.5a: set empty actions for first tracepoint" \
-	"$trcpt1"
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "No tracepoints.*$gdb_prompt $" {
-	fail "5.5c: verify NO actions for first tracepoint"
-    }
-    -re "Actions for.* $trcpt1:.*$gdb_prompt $" {
-	fail "5.5c: verify NO actions for first tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	pass "5.5c: verify NO actions for first tracepoint"
-    }
-}
-
-# 5.6 actions for invalid tracepoint number
-
-gdb_test "actions [expr $trcpt2 + $trcpt3]" \
-    "No tracepoint number [expr $trcpt2 + $trcpt3]." \
-			"5.6: actions for invalid tracepoint number"
-
-# 5.7 invalid action (other than 'collect', 'while-stepping' or 'end')
-#	    "warning: .print gdb_c_test. is not a supported trace.*> $" \
-
-gdb_trace_setactions "5.7: invalid action" \
-	"$trcpt1" \
-	"print gdb_c_test" \
-	"warning: .print gdb_c_test. is not a supported trace"
-
-# 5.8 help actions (collect, while-stepping, end)
-
-gdb_test "help actions" \
-    "Specify the actions to be taken at a tracepoint.*" \
-			"5.8a: help actions"
-
-gdb_test "help collect" \
-    "Specify one or more data items to be collected at a tracepoint.*" \
-			"5.8b: help collect"
-
-gdb_test "help while-stepping" \
-    "Specify single-stepping behavior at a tracepoint.*" \
-			"5.8c: help while-stepping"
-
-gdb_test "help end" "Ends a list of commands or actions.*" \
-			"5.8d: help end"
-
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
deleted file mode 100644
index e217f955cd8..00000000000
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ /dev/null
@@ -1,376 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    load_lib "emc-support.exp";
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-    gdb_test "set remotetimeout 6" "" ""
-    set timeout 500
-    gdb_target_monitor "$binfile"
-    # Give a TSTOP and ignore errors, to make sure any previous trace is off
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none"  "" ""
-    send_gdb "compare-sections CS\n"
-    gdb_expect {
-	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
-	    all tests in this module will fail.";
-	}
-	-re ".*$gdb_prompt $" { }
-    }
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-    gdb_load $binfile
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
-    runto_main
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# We generously give ourselves one "pass" if we successfully 
-# detect that this test cannot be run on this target!
-if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not supporst trace"
-    return 1;
-
-}
-
-#
-# test backtraces in trace frames
-#
-
-set testline1 0
-set testline2 0
-set testline3 0
-set testline4 0
-set testline5 0
-set testline6 0
-
-set arg1 1
-set arg2 2
-set arg3 3
-set arg4 4
-set arg5 5
-set arg6 6
-
-set baseline [gdb_find_recursion_test_baseline $srcfile];
-if { $baseline == -1 } {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-send_gdb "list $baseline, +12\n"
-gdb_expect {
-    -re "\[\r\n\](\[0-9\]+).*gdbtestline 1 " {
-	set testline1 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+).*gdbtestline 2 " {
-	set testline2 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+).*gdbtestline 3 " {
-	set testline3 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+).*gdbtestline 4 " {
-	set testline4 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+).*gdbtestline 5 " {
-	set testline5 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+).*gdbtestline 6 " {
-	set testline6 $expect_out(1,string)
-	exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    gdb_suppress_entire_file "failed to locate test source lines:
-all tests in this module will fail."
-	}
-    }
-    default {
-	    gdb_suppress_entire_file "failed to locate test source lines (def):
-all tests in this module will fail."
-    } 
-}
-
-#
-# Setup backtrace experiment.  This will involve:
-#   1) a tracepoint where nothing is collected
-#   2) a tracepoint where only regs are collected
-#   3) a tracepoint where regs, locals and args are collected
-#   4) a tracepoint where regs plus some amount of stack are collected.
-#
-
-gdb_delete_tracepoints
-set tdp2 [gdb_gettpnum $testline2]
-set tdp3 [gdb_gettpnum $testline3]
-set tdp4 [gdb_gettpnum $testline4]
-set tdp5 [gdb_gettpnum $testline5]
-set tdp6 [gdb_gettpnum $testline6]
-if {    $tdp2 <= 0 || $tdp3 <= 0 || \
-	$tdp4 <= 0 || $tdp5 <= 0 || $tdp6 <= 0 } then {
-    fail "setting tracepoints failed"
-    return;
-}
-
-#gdb_trace_setactions "setup TP to collect FP" \
-#	"$tdp2" \
-#	"collect \$fp" ""
-#
-
-gdb_trace_setactions "8.6: setup TP to collect regs" \
-	"$tdp3" \
-	"collect \$regs" "^$"
-
-gdb_trace_setactions "8.6: setup TP to collect regs, args, and locals" \
-	"$tdp4" \
-	"collect \$regs, \$args, \$locs" "^$"
-
-gdb_trace_setactions "8.6: setup TP to collect stack mem cast expr" \
-	"$tdp6" \
-	"collect \$fp, \(\*\(void \*\*\) \(\$sp\)\) @ 64" "^$"
-
-gdb_test "tstart" "" ""
-
-if [istarget "m68k-*-elf"] then {
-    gdb_emclaptop_command "85,$arg1,$arg2,$arg3,$arg4,$arg5,$arg6"
-    sleep 5
-} else {
-    gdb_test "break end" "" ""
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint $decimal, end.*" \
-	    "run trace experiment"
-}
-
-gdb_test "tstop" "" ""
-
-proc gdb_backtrace_tdp_1 { msg } {
-    global gdb_prompt
-    
-    # We are in a trace frame at which we didn't collect anything
-    # except $PC.  Therefore we expect to be able to identify stack
-    # frame #0, but that's about all.  In particular we do not expect
-    # to be able to display the function's arguments or locals, and we
-    # do not expect to be able to identify the caller of this function.
-    
-    send_gdb "backtrace\n"
-    gdb_expect {
-	-re "#0\[\t \]+gdb_recursion_test.*depth=.*$gdb_prompt $" {
-	    pass "$msg"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$msg"
-	}
-	timeout { fail "$msg (timeout)" }
-    }
-}
-
-proc gdb_backtrace_tdp_2 { msg } {
-    global gdb_prompt
-
-    # We are in a trace frame at which we collected only the registers
-    # Therefore we expect to be able to identify stack frame #0, but
-    # we don't expect to be able to display its args unles they are
-    # passed in registers (which isn't the case for m68k), and we
-    # don't expect to be able to identify the caller's stack frame.
-
-    send_gdb "backtrace\n"
-    gdb_expect {
-	-re "#0\[\t \]+gdb_recursion_test.*depth=.*$gdb_prompt $" {
-	    pass "$msg"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$msg"
-	}
-	timeout { fail "$msg (timeout)" }
-    }
-}
-
-proc gdb_backtrace_tdp_3 { msg } {
-    global gdb_prompt
-
-    # We are in a trace frame at which we collected all registers, all
-    # arguments and all locals.  This means that the display of
-    # stack frame #0 should be complete (including argument values).
-
-    send_gdb "backtrace\n"
-    gdb_expect {
-	-re "#0\[\t \]+gdb_recursion_test.*depth=\[0-9\]+.*q1=\[0-9\]+.*q2=\[0-9\]+.*q3=\[0-9\]+.*q4=\[0-9\]+.*q5=\[0-9\]+.*q6=\[0-9\]+.*$gdb_prompt $" {
-	    pass "$msg"
-	}
-	-re "#0\[\t \]+gdb_recursion_test.*depth=Cannot access.*$gdb_prompt $" {
-	    fail "$msg (failed to collect arguments)"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$msg"
-	}
-	timeout { fail "$msg (timeout)" }
-    }
-}
-
-proc gdb_backtrace_tdp_4 { msg depth } {
-    global gdb_prompt
-
-    # We are in a trace frame at which we collected all registers,
-    # plus a sizeable hunk of stack memory.  This should enable us to
-    # display at least several stack frames worth of backtrace.  We'll
-    # assume that if we can't display at least "depth" levels (with
-    # args), it counts as an error.
-
-    send_gdb "backtrace\n"
-    gdb_expect {
-	-re "#$depth\[\t \].*gdb_recursion_test.*depth=\[0-9\]+.*q1=\[0-9\]+.*q2=\[0-9\]+.*q3=\[0-9\]+.*q4=\[0-9\]+.*q5=\[0-9\]+.*q6=\[0-9\]+.*$gdb_prompt $" {
-	    pass "$msg"
-	}
-	-re "#$depth\[\t \].*gdb_recursion_test.*depth=.*$gdb_prompt $" {
-	    fail "$msg (args missing from #$depth stack frame)"
-	}
-	-re "#\[0-9\]+\[\t \].*gdb_recursion_test.*depth=.*$gdb_prompt $" {
-	    fail "$msg (fewer than $depth stack frames found)"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$msg"
-	}
-	timeout { fail "$msg (timeout)" }
-    }
-}
-
-#
-# begin backtrace test
-#
-
-set timeout 60
-
-gdb_tfind_test "init: make sure not debugging any trace frame" "none" "-1"
-
-gdb_tfind_test "8.6: find start frame" "start" "0"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp2:" ""
-gdb_backtrace_tdp_1 "8.6: Backtrace, depth == 1, collect nothing"
-
-gdb_tfind_test "8.6: find frame 1"     "1" "1"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp3:" ""
-gdb_backtrace_tdp_2 "8.6: Backtrace, depth == 1, collect regs"
-
-gdb_tfind_test "8.6: find frame 2"     "2" "2"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp4:" ""
-gdb_backtrace_tdp_3 "8.6: Backtrace, depth == 1, collect args and locals"
-
-
-gdb_tfind_test "8.6: find frame 4"     "4" "4"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp6:" ""
-gdb_backtrace_tdp_4 "8.6: Backtrace, depth == 1, collect stack mem expr" "0"
-
-gdb_tfind_test "8.6: find frame 5"     "5" "5"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp2:" ""
-gdb_backtrace_tdp_1 "8.6: Backtrace, depth == 2, collect nothing"
-
-gdb_tfind_test "8.6: find frame 6"     "6" "6"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp3:" ""
-gdb_backtrace_tdp_2 "8.6: Backtrace, depth == 2, collect regs"
-
-gdb_tfind_test "8.6: find frame 7"     "7" "7"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp4:" ""
-gdb_backtrace_tdp_3 "8.6: Backtrace, depth == 2, collect args and locals"
-
-
-gdb_tfind_test "8.6: find frame 9"     "9" "9"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp6:" ""
-gdb_backtrace_tdp_4 "8.6: Backtrace, depth == 1, collect stack mem expr" "0"
-
-gdb_tfind_test "8.6: find frame 10"    "10" "10"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp2:" ""
-gdb_backtrace_tdp_1 "8.6: Backtrace, depth == 3, collect nothing"
-
-gdb_tfind_test "8.6: find frame 11"    "11" "11"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp3:" ""
-gdb_backtrace_tdp_2 "8.6: Backtrace, depth == 3, collect regs"
-
-gdb_tfind_test "8.6: find frame 12"    "12" "12"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp4:" ""
-gdb_backtrace_tdp_3 "8.6: Backtrace, depth == 3, collect args and locals"
-
-
-gdb_tfind_test "8.6: find frame 14"    "14" "14"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp6:" ""
-gdb_backtrace_tdp_4 "8.6: Backtrace, depth == 1, collect stack mem expr" "0"
-
-gdb_tfind_test "8.6: find frame 15"    "15" "15"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp2:" ""
-gdb_backtrace_tdp_1 "8.6: Backtrace, depth == 4, collect nothing"
-
-gdb_tfind_test "8.6: find frame 16"    "16" "16"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp3:" ""
-gdb_backtrace_tdp_2 "8.6: Backtrace, depth == 4, collect regs"
-
-gdb_tfind_test "8.6: find frame 17"    "17" "17"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp4:" ""
-gdb_backtrace_tdp_3 "8.6: Backtrace, depth == 4, collect args and locals"
-
-
-gdb_tfind_test "8.6: find frame 19"    "19" "19"
-gdb_test "printf \"TDP \%d:\\n\", \$tracepoint" \
-	"TDP $tdp6:" ""
-gdb_backtrace_tdp_4 "8.6: Backtrace, depth == 1, collect stack mem expr" "0"
-
-gdb_test "printf \"x \%d x\\n\", depth == 3" \
-	"x 0 x" \
-	"1.13: trace in recursion: depth not equal to 3"
-
-# Finished!
-gdb_test "tfind none" "" ""
diff --git a/gdb/testsuite/gdb.trace/circ.c b/gdb/testsuite/gdb.trace/circ.c
deleted file mode 100644
index 98a2ce6be54..00000000000
--- a/gdb/testsuite/gdb.trace/circ.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Test program for tracing; circular buffer
- */
-
-int n = 6;
-
-int testload[13];
-
-static void func0(void)
-{
-}
-
-static void func1(void)
-{
-}
-
-static void func2(void)
-{
-}
-
-static void func3(void)
-{
-}
-
-static void func4(void)
-{
-}
-
-static void func5(void)
-{
-}
-
-static void func6(void)
-{
-}
-
-static void func7(void)
-{
-}
-
-static void func8(void)
-{
-}
-
-static void func9(void)
-{
-}
-
-static void begin ()	/* called before anything else */
-{
-}
-
-static void end ()	/* called after everything else */
-{
-}
-
-int
-main (argc, argv, envp)
-     int argc;
-     char *argv[], **envp;
-{
-  int i;
-
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-
-  begin ();
-  for (i = 0; i < sizeof(testload) / sizeof(testload[0]); i++)
-    testload[i] = i + 1;
-
-  func0 ();
-  func1 ();
-  func2 ();
-  func3 ();
-  func4 ();
-  func5();
-  func6 ();
-  func7 ();
-  func8 ();
-  func9 ();
-
-  end ();
-
-#ifdef usestubs
-  breakpoint ();
-#endif
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.trace/circ.exp b/gdb/testsuite/gdb.trace/circ.exp
deleted file mode 100644
index 2bfb7a67b70..00000000000
--- a/gdb/testsuite/gdb.trace/circ.exp
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1998 Free Software Foundation, 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
-
-if [istarget "m68k-*-elf"] then {
-    pass "Test not supported on this target"
-    return;
-}
-
-load_lib "trace-support.exp"
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "circ"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/$testfile
-
-if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Tests:
-# 1) Set up a trace experiment that will collect approximately 10 frames,
-#    requiring more than 512 but less than 1024 bytes of cache buffer.
-#    (most targets should have at least 1024 bytes of cache buffer!)
-#    Run and confirm that it collects all 10 frames.
-# 2) Artificially limit the trace buffer to 512 bytes, and rerun the
-#    experiment.  Confirm that the first several frames are collected,
-#    but that the last several are not.
-# 3) Set trace buffer to circular mode, still with the artificial limit
-#    of 512 bytes, and rerun the experiment.  Confirm that the last 
-#    several frames are collected, but the first several are not.
-#
-
-# return 0 for success, 1 for failure
-proc run_trace_experiment { pass } {
-    gdb_run_cmd 
-
-    if [gdb_test "tstart" \
-	    "\[\r\n\]*" \
-	    "start trace experiment, pass $pass"] then { return 1; }
-    if [gdb_test "continue" \
-	    "Continuing.*Breakpoint \[0-9\]+, end.*" \
-	    "run to end, pass $pass"] then { return 1; }
-    if [gdb_test "tstop" \
-	    "\[\r\n\]*" \
-	    "stop trace experiment, pass $pass"] then { return 1; }
-    return 0;
-}
-
-# return 0 for success, 1 for failure
-proc set_a_tracepoint { func } {
-    if [gdb_test "trace $func" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "set tracepoint at $func"] then {
-	return 1;
-    }
-    if [gdb_trace_setactions "set actions for $func" \
-	    "" \
-	    "collect testload" "^$"] then {
-	return 1;
-    }
-    return 0;
-}
-
-# return 0 for success, 1 for failure
-proc setup_tracepoints { } {
-    gdb_delete_tracepoints
-    if [set_a_tracepoint func0] then { return 1; }
-    if [set_a_tracepoint func1] then { return 1; }
-    if [set_a_tracepoint func2] then { return 1; }
-    if [set_a_tracepoint func3] then { return 1; }
-    if [set_a_tracepoint func4] then { return 1; }
-    if [set_a_tracepoint func5] then { return 1; }
-    if [set_a_tracepoint func6] then { return 1; }
-    if [set_a_tracepoint func7] then { return 1; }
-    if [set_a_tracepoint func8] then { return 1; }
-    if [set_a_tracepoint func9] then { return 1; }
-    return 0;
-}
-
-# return 0 for success, 1 for failure
-proc trace_buffer_normal { } {
-    if [gdb_test "maint packet QTBuffer:size:ffffffff" \
-	    "received: .OK." ""] then { 
-	pass "This test cannot be run on this target"
-	return 1;
-    }
-    if [gdb_test "maint packet QTBuffer:circular:0" \
-	    "received: .OK." ""] then { 
-	pass "This test cannot be run on this target"
-	return 1;
-    }
-    return 0;
-}
-
-# return 0 for success, 1 for failure
-proc gdb_trace_circular_tests { } {
-
-    # We generously give ourselves one "pass" if we successfully 
-    # detect that this test cannot be run on this target!
-    if { ![gdb_target_supports_trace] } then { 
-	pass "Current target does not supporst trace"
-	return 1;
-    }
-
-    if [trace_buffer_normal] then { return 1; }
-
-    gdb_test "break begin" "" ""
-    gdb_test "break end"   "" ""
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
-
-    if [setup_tracepoints] then { return 1; }
-
-    # First, run the trace experiment with default attributes:
-    # Make sure it behaves as expected.
-    if [run_trace_experiment 1] then { return 1; }
-    if [gdb_test "tfind start" \
-	    "#0  func0 .*" \
-	    "find frame zero, pass 1"] then { return 1; }
-
-    if [gdb_test "tfind 9" \
-	    "#0  func9 .*" \
-	    "find frame nine, pass 1"] then { return 1; }
-
-    if [gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "quit trace debugging, pass 1"] then { return 1; }
-
-    # Then, shrink the trace buffer so that it will not hold
-    # all ten trace frames.  Verify that frame zero is still
-    # collected, but frame nine is not.
-    if [gdb_test "maint packet QTBuffer:size:200" \
-	    "received: .OK." "shrink the target trace buffer"] then { 
-	return 1;
-    }
-    if [run_trace_experiment 2] then { return 1; }
-    if [gdb_test "tfind start" \
-	    "#0  func0 .*" \
-	    "find frame zero, pass 2"] then { return 1; }
-
-    if [gdb_test "tfind 9" \
-	    ".* failed to find .*" \
-	    "fail to find frame nine, pass 2"] then { return 1; }
-
-    if [gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "quit trace debugging, pass 2"] then { return 1; }
-
-    # Finally, make the buffer circular.  Now when it runs out of
-    # space, it should wrap around and overwrite the earliest frames.
-    # This means that:
-    #   1) frame zero will be overwritten and therefore unavailable
-    #   2) the earliest frame in the buffer will be other-than-zero
-    #   3) frame nine will be available (unlike on pass 2).
-    if [gdb_test "maint packet QTBuffer:circular:1" \
-	    "received: .OK." "make the target trace buffer circular"] then { 
-	return 1;
-    }
-    if [run_trace_experiment 3] then { return 1; }
-    if [gdb_test "tfind start" \
-	    "#0  func\[1-9\] .*" \
-	    "first frame is NOT frame zero, pass 3"] then { return 1; }
-
-    if [gdb_test "tfind 9" \
-	    "#0  func9 .*" \
-	    "find frame nine, pass 3"] then { return 1; }
-
-    if [gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "quit trace debugging, pass 3"] then { return 1; }
-
-    return 0;
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
- 
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-# Body of test encased in a proc so we can return prematurely.
-if { ![gdb_trace_circular_tests] } then {
-    # Set trace buffer attributes back to normal
-    trace_buffer_normal;
-}
-
-# Finished!
-gdb_test "tfind none" "" ""
diff --git a/gdb/testsuite/gdb.trace/collection.c b/gdb/testsuite/gdb.trace/collection.c
deleted file mode 100644
index 39863325b0a..00000000000
--- a/gdb/testsuite/gdb.trace/collection.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Test program for trace collection
- */
-
-/*
- * Typedefs
- */
-
-typedef struct TEST_STRUCT {
-  char   memberc;
-  int    memberi;
-  float  memberf;
-  double memberd;
-} test_struct;
-
-typedef int test_array [4];
-
-/* 
- * Global variables to be collected
- */
-
-char         globalc;
-int          globali;
-float        globalf;
-double       globald;
-test_struct  globalstruct;
-test_struct *globalp;
-int          globalarr[16];
-
-/*
- * Additional globals used in arithmetic tests
- */
-
-signed char  c0,  c1,  c2,  c3,  c4,  c5,  c6,  c7, 
-             c8,  c9,  c10, c11, c12, c13, c14, c15, cminus;
-signed short s0,  s1,  s2,  s3,  s4,  s5,  s6,  s7,
-             s8,  s9,  s10, s11, s12, s13, s14, s15, sminus;
-signed long  l0,  l1,  l2,  l3,  l4,  l5,  l6,  l7,
-             l8,  l9,  l10, l11, l12, l13, l14, l15, lminus;
-
-
-/*
- * Test functions
- */
-
-static void begin ()	/* called before anything else */
-{
-}
-
-static void end ()	/* called after everything else */
-{
-}
-
-/* Test collecting args. */
-int args_test_func (argc, argi, argf, argd, argstruct, argarray)
-     char   argc;
-     int    argi;
-     float  argf;
-     double argd;
-     test_struct argstruct;
-     int argarray[4];
-{
-  int i;
-
-  i =  (int) argc + argi + argf + argd + argstruct.memberi + argarray[1];
-
-  return i;
-}
-
-/* Test collecting struct args. */
-int argstruct_test_func (argstruct)
-     test_struct argstruct;
-{
-  return (int) argstruct.memberc + argstruct.memberi + 
-                 argstruct.memberf + argstruct.memberd;
-}
-
-/* Test collecting array args. */
-int argarray_test_func (argarray)
-     int argarray[4];
-{
-  return (int) argarray[0] + argarray[1] + argarray[2] + argarray[3];
-}
-
-
-
-int local_test_func ()			/* test collecting locals */
-{
-  char        locc  = 11;
-  int         loci  = 12;
-  float       locf  = 13.3;
-  double      locd  = 14.4;
-  test_struct locst;
-  int         locar[4];
-  int         i;
-
-  locst.memberc  = 15;
-  locst.memberi  = 16;
-  locst.memberf  = 17.7;
-  locst.memberd  = 18.8;
-  locar[0] = 121;
-  locar[1] = 122;
-  locar[2] = 123;
-  locar[3] = 124;
-
-  i = /* Set_Tracepoint_Here */
-    (int) locc + loci + locf + locd + locst.memberi + locar[1];
-
-  return i;
-}
-
-int reglocal_test_func ()		/* test collecting register locals */
-{
-  register char        locc = 11;
-  register int         loci = 12;
-  register float       locf = 13.3;
-  register double      locd = 14.4;
-  register test_struct locst;
-  register int         locar[4];
-  int                  i;
-
-  locst.memberc  = 15;
-  locst.memberi  = 16;
-  locst.memberf  = 17.7;
-  locst.memberd  = 18.8;
-  locar[0] = 121;
-  locar[1] = 122;
-  locar[2] = 123;
-  locar[3] = 124;
-
-  i = /* Set_Tracepoint_Here */
-    (int) locc + loci + locf + locd + locst.memberi + locar[1];
-
-  return i;
-}
-
-int statlocal_test_func ()		/* test collecting static locals */
-{
-  static   char        locc;
-  static   int         loci;
-  static   float       locf;
-  static   double      locd;
-  static   test_struct locst;
-  static   int         locar[4];
-  int                  i;
-
-  locc = 11;
-  loci = 12;
-  locf = 13.3;
-  locd = 14.4;
-  locst.memberc = 15;
-  locst.memberi = 16;
-  locst.memberf = 17.7;
-  locst.memberd = 18.8;
-  locar[0] = 121;
-  locar[1] = 122;
-  locar[2] = 123;
-  locar[3] = 124;
-
-  i = /* Set_Tracepoint_Here */
-    (int) locc + loci + locf + locd + locst.memberi + locar[1];
-
-  /* Set static locals back to zero so collected values are clearly special. */
-  locc = 0;
-  loci = 0;
-  locf = 0;
-  locd = 0;
-  locst.memberc = 0;
-  locst.memberi = 0;
-  locst.memberf = 0;
-  locst.memberd = 0;
-  locar[0] = 0;
-  locar[1] = 0;
-  locar[2] = 0;
-  locar[3] = 0;
-
-  return i;
-}
-
-
-int globals_test_func ()
-{
-  int i = 0;
-
-  i += globalc + globali + globalf + globald;
-  i += globalstruct.memberc + globalstruct.memberi;
-  i += globalstruct.memberf + globalstruct.memberd;
-  i += globalarr[1];
-
-  return i;	/* Set_Tracepoint_Here */
-}
-
-int
-main (argc, argv, envp)
-     int argc;
-     char *argv[], **envp;
-{
-  int         i = 0;
-  test_struct mystruct;
-  int         myarray[4];
-
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-
-  begin ();
-  /* Assign collectable values to global variables. */
-  l0  = s0  = c0  = 0;     l1  = s1  = c1  = 1;
-  l2  = s2  = c2  = 2;     l3  = s3  = c3  = 3;
-  l4  = s4  = c4  = 4;     l5  = s5  = c5  = 5;
-  l6  = s6  = c6  = 6;     l7  = s7  = c7  = 7;
-  l8  = s8  = c8  = 8;     l9  = s9  = c9  = 9;
-  l10 = s10 = c10 = 10;    l11 = s11 = c11 = 11;
-  l12 = s12 = c12 = 12;    l13 = s13 = c13 = 13;
-  l14 = s14 = c14 = 14;    l15 = s15 = c15 = 15;
-  lminus = sminus = cminus = -2;
-  globalc = 71;
-  globali = 72;
-  globalf = 73.3;
-  globald = 74.4;
-  globalstruct.memberc = 81;
-  globalstruct.memberi = 82;
-  globalstruct.memberf = 83.3;
-  globalstruct.memberd = 84.4;
-  globalp = &globalstruct;
-
-  for (i = 0; i < 15; i++)
-    globalarr[i] = i;
-
-  mystruct.memberc = 101;
-  mystruct.memberi = 102;
-  mystruct.memberf = 103.3;
-  mystruct.memberd = 104.4;
-  myarray[0] = 111;
-  myarray[1] = 112;
-  myarray[2] = 113;
-  myarray[3] = 114;
-
-  /* Call test functions, so they can be traced and data collected.  */
-  i = 0;
-  i += args_test_func (1, 2, 3.3, 4.4, mystruct, myarray);
-  i += argstruct_test_func (mystruct);
-  i += argarray_test_func (myarray);
-  i += local_test_func ();
-  i += reglocal_test_func ();
-  i += statlocal_test_func ();
-  i += globals_test_func ();
-
-  /* Values of globals at end of test should be different from
-     values that they had when trace data was captured.  */
-
-  l0  = s0  = c0  = 0;     l1  = s1  = c1  = 0;
-  l2  = s2  = c2  = 0;     l3  = s3  = c3  = 0;
-  l4  = s4  = c4  = 0;     l5  = s5  = c5  = 0;
-  l6  = s6  = c6  = 0;     l7  = s7  = c7  = 0;
-  l8  = s8  = c8  = 0;     l9  = s9  = c9  = 0;
-  l10 = s10 = c10 = 0;     l11 = s11 = c11 = 0;
-  l12 = s12 = c12 = 0;     l13 = s13 = c13 = 0;
-  l14 = s14 = c14 = 0;     l15 = s15 = c15 = 0;
-  lminus = sminus = cminus = 0;
-
-  /* Set 'em back to zero, so that the collected values will be
-     distinctly different from the "realtime" (end of test) values.  */
-
-  globalc = 0;
-  globali = 0;
-  globalf = 0;
-  globald = 0;
-  globalstruct.memberc = 0;
-  globalstruct.memberi = 0;
-  globalstruct.memberf = 0;
-  globalstruct.memberd = 0;
-  globalp = 0;
-  for (i = 0; i < 15; i++)
-    globalarr[i] = 0;
-
-  end ();
-  return 0;
-}
diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
deleted file mode 100644
index e62b6945bfa..00000000000
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ /dev/null
@@ -1,634 +0,0 @@
-# Copyright 1998, 2005 Free Software Foundation, 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
-
-if [istarget "m68k-*-elf"] then {
-    pass "Test not supported on this target"
-    return;
-}
-
-load_lib "trace-support.exp"
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "collection"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/$testfile
-
-if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Tests: 
-# 1) $args
-# 2) function args by name
-# 3) $locs
-# 4) function locals by name
-# 5) $regs
-# 6) registers by name ($sp, $fp?)
-# 7) globals by name
-# 8) expressions (lots of different kinds: local and global)
-
-set ws "\[\r\n\t \]+"
-set cr "\[\r\n\]+"
-
-#
-# Utility procs
-#
-
-proc test_register { reg test_id } {
-    global cr
-    global gdb_prompt
-
-    send_gdb "print $reg\n"
-    gdb_expect {
-	-re "\\$\[0-9\]+ = \[x0\]+$cr$gdb_prompt " {
-	    fail "collect $test_id: collected $reg (zero)"
-	}
-	-re "\\$\[0-9\]+ = \[x0-9a-fA-F\]+$cr$gdb_prompt " {
-	    pass "collect $test_id: collected $reg"
-	}
-	-re "\[Ee\]rror.*$gdb_prompt " {
-	    fail "collect $test_id: collected $reg (error)"
-	}
-	timeout {
-	    fail "collect $test_id: collected $reg (timeout)"
-	}
-    }
-}
-
-proc run_trace_experiment { msg test_func } {
-    global gdb_prompt
-    gdb_run_cmd
-    gdb_expect {
-	-re ".*Breakpoint \[0-9\]+, begin .*$gdb_prompt $" { 
-	}
-	-re ".*$gdb_prompt $" { 
-	    fail "collect $msg: advance to go"
-	}
-	timeout { 
-	    fail "collect $msg: advance to go (timeout)"
-	}
-    }
-    gdb_test "tstart" \
-	    "\[\r\n\]+" \
-	    "collect $msg: start trace experiment"
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint \[0-9\]+, end.*" \
-	    "collect $msg: run trace experiment"
-    gdb_test "tstop" \
-	    "\[\r\n\]+" \
-	    "collect $msg: stop trace experiment"
-    gdb_test "tfind start" \
-	    "#0  $test_func .*" \
-	    "collect $msg: tfind test frame"
-}
-
-
-#
-# Test procs
-#
-
-proc gdb_collect_args_test { myargs msg } {
-    global cr
-    global gdb_prompt
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    gdb_test "trace args_test_func" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "collect $msg: set tracepoint"
-    gdb_trace_setactions "collect $msg: define actions" \
-	    "" \
-	    "collect $myargs" "^$"
-
-    # Begin the test.
-    run_trace_experiment $msg args_test_func
-
-    gdb_test "print argc" \
-	    "\\$\[0-9\]+ = 1 '.001'$cr" \
-	    "collect $msg: collected arg char"
-    gdb_test "print argi" \
-	    "\\$\[0-9\]+ = 2$cr" \
-	    "collect $msg: collected arg int"
-    gdb_test "print argf" \
-	    "\\$\[0-9\]+ = 3.\[23\]\[0-9\]*$cr" \
-	    "collect $msg: collected arg float"
-    gdb_test "print argd" \
-	    "\\$\[0-9\]+ = 4.\[34\]\[0-9\]*$cr" \
-	    "collect $msg: collected arg double"
-
-    # struct arg as one of several args (near end of list)
-    gdb_test "print argstruct.memberc" \
-	    "\\$\[0-9\]+ = 101 'e'$cr" \
-	    "collect $msg: collected arg struct member char"
-    gdb_test "print argstruct.memberi" \
-	    "\\$\[0-9\]+ = 102$cr" \
-	    "collect $msg: collected arg struct member int"
-    gdb_test "print argstruct.memberf" \
-	    "\\$\[0-9\]+ = 103.\[23\]\[0-9\]*$cr" \
-	    "collect $msg: collected arg struct member float"
-    gdb_test "print argstruct.memberd" \
-	    "\\$\[0-9\]+ = 104.\[34\]\[0-9\]*$cr" \
-	    "collect $msg: collected arg struct member double"
-
-    # array arg as one of several args (near end of list)
-    gdb_test "print argarray\[0\]" \
-	    "\\$\[0-9\]+ = 111$cr" \
-	    "collect $msg: collected argarray #0"
-    gdb_test "print argarray\[1\]" \
-	    "\\$\[0-9\]+ = 112$cr" \
-	    "collect $msg: collected argarray #1"
-    gdb_test "print argarray\[2\]" \
-	    "\\$\[0-9\]+ = 113$cr" \
-	    "collect $msg: collected argarray #2"
-    gdb_test "print argarray\[3\]" \
-	    "\\$\[0-9\]+ = 114$cr" \
-	    "collect $msg: collected argarray #3"
-
-    gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "collect $msg: cease trace debugging"
-}
-
-proc gdb_collect_argstruct_test { myargs msg } {
-    global cr
-    global gdb_prompt
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    gdb_test "trace argstruct_test_func" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "collect $msg: set tracepoint"
-    gdb_trace_setactions "collect $msg: define actions" \
-	    "" \
-	    "collect $myargs" "^$"
-
-    # Begin the test.
-    run_trace_experiment $msg argstruct_test_func
-
-    # struct argument as only argument
-    gdb_test "print argstruct.memberc" \
-	    "\\$\[0-9\]+ = 101 'e'$cr" \
-	    "collect $msg: collected arg struct member char"
-    gdb_test "print argstruct.memberi" \
-	    "\\$\[0-9\]+ = 102$cr" \
-	    "collect $msg: collected arg struct member int"
-    gdb_test "print argstruct.memberf" \
-	    "\\$\[0-9\]+ = 103.\[23\]\[0-9\]*$cr" \
-	    "collect $msg: collected arg struct member float"
-    gdb_test "print argstruct.memberd" \
-	    "\\$\[0-9\]+ = 104.\[34\]\[0-9\]*$cr" \
-	    "collect $msg: collected arg struct member double"
-
-    gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "collect $msg: cease trace debugging"
-}
-
-
-proc gdb_collect_argarray_test { myargs msg } {
-    global cr
-    global gdb_prompt
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    gdb_test "trace argarray_test_func" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "collect $msg: set tracepoint"
-    gdb_trace_setactions "collect $msg: define actions" \
-	    "" \
-	    "collect $myargs" "^$"
-
-    # Begin the test.
-    run_trace_experiment $msg argarray_test_func
-
-    # array arg as only argument
-    gdb_test "print argarray\[0\]" \
-	    "\\$\[0-9\]+ = 111$cr" \
-	    "collect $msg: collected argarray #0"
-    gdb_test "print argarray\[1\]" \
-	    "\\$\[0-9\]+ = 112$cr" \
-	    "collect $msg: collected argarray #1"
-    gdb_test "print argarray\[2\]" \
-	    "\\$\[0-9\]+ = 113$cr" \
-	    "collect $msg: collected argarray #2"
-    gdb_test "print argarray\[3\]" \
-	    "\\$\[0-9\]+ = 114$cr" \
-	    "collect $msg: collected argarray #3"
-
-    gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "collect $msg: cease trace debugging"
-}
-
-
-proc gdb_collect_locals_test { func mylocs msg } {
-    global cr
-    global gdb_prompt
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    # Find the comment-identified line for setting this tracepoint.
-    set testline 0
-    send_gdb "list $func, +30\n"
-    gdb_expect {
-	-re "\[\r\n\](\[0-9\]+)\[^\r\n\]+ Set_Tracepoint_Here .*$gdb_prompt" {
-	    set testline $expect_out(1,string)
-	    pass "collect $msg: find tracepoint line"
-	}
-	-re ".*$gdb_prompt " {
-	    fail "collect $msg: find tracepoint line (skipping locals test)"
-	    return
-	}
-	timeout {
-	    fail "collect $msg: find tracepoint line (skipping locals test)"
-	    return
-	}
-    }
-
-    gdb_test "trace $testline" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "collect $msg: set tracepoint"
-    gdb_trace_setactions "collect $msg: define actions" \
-	    "" \
-	    "collect $mylocs" "^$"
-
-    # Begin the test.
-    run_trace_experiment $msg $func
-
-    gdb_test "print locc" \
-	"\\$\[0-9\]+ = 11 '.\[a-z0-7\]+'$cr" \
-	    "collect $msg: collected local char"
-    gdb_test "print loci" \
-	    "\\$\[0-9\]+ = 12$cr" \
-	    "collect $msg: collected local int"
-    gdb_test "print locf" \
-	    "\\$\[0-9\]+ = 13.\[23\]\[0-9\]*$cr" \
-	    "collect $msg: collected local float"
-    gdb_test "print locd" \
-	    "\\$\[0-9\]+ = 14.\[34\]\[0-9\]*$cr" \
-	    "collect $msg: collected local double"
-
-    gdb_test "print locst.memberc" \
-	    "\\$\[0-9\]+ = 15 '.017'$cr" \
-	    "collect $msg: collected local member char"
-    gdb_test "print locst.memberi" \
-	    "\\$\[0-9\]+ = 16$cr" \
-	    "collect $msg: collected local member int"
-    gdb_test "print locst.memberf" \
-	    "\\$\[0-9\]+ = 17.\[67\]\[0-9\]*$cr" \
-	    "collect $msg: collected local member float"
-    gdb_test "print locst.memberd" \
-	    "\\$\[0-9\]+ = 18.\[78\]\[0-9\]*$cr" \
-	    "collect $msg: collected local member double"
-
-    gdb_test "print locar\[0\]" \
-	    "\\$\[0-9\]+ = 121$cr" \
-	    "collect $msg: collected locarray #0"
-    gdb_test "print locar\[1\]" \
-	    "\\$\[0-9\]+ = 122$cr" \
-	    "collect $msg: collected locarray #1"
-    gdb_test "print locar\[2\]" \
-	    "\\$\[0-9\]+ = 123$cr" \
-	    "collect $msg: collected locarray #2"
-    gdb_test "print locar\[3\]" \
-	    "\\$\[0-9\]+ = 124$cr" \
-	    "collect $msg: collected locarray #3"
-	    
-
-    gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "collect $msg: cease trace debugging"
-}
-
-proc gdb_collect_registers_test { myregs } {
-    global cr
-    global gdb_prompt
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    # We'll simply re-use the args_test_function for this test
-    gdb_test "trace args_test_func" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "collect $myregs: set tracepoint"
-    gdb_trace_setactions "collect $myregs: define actions" \
-	    "" \
-	    "collect $myregs" "^$"
-
-    # Begin the test.
-    run_trace_experiment $myregs args_test_func
-
-    test_register "\$fp" $myregs
-    test_register "\$sp" $myregs
-    test_register "\$pc" $myregs
-
-    gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "collect $myregs: cease trace debugging"
-}
-
-proc gdb_collect_expression_test { func expr val msg } {
-    global cr
-    global gdb_prompt
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    # Find the comment-identified line for setting this tracepoint.
-    set testline 0
-    send_gdb "list $func, +30\n"
-    gdb_expect {
-	-re "\[\r\n\](\[0-9\]+)\[^\r\n\]+ Set_Tracepoint_Here .*$gdb_prompt" {
-	    set testline $expect_out(1,string)
-	    pass "collect $msg: find tracepoint line"
-	}
-	-re ".*$gdb_prompt " {
-	    fail "collect $msg: find tracepoint line (skipping locals test)"
-	    return
-	}
-	timeout {
-	    fail "collect $msg: find tracepoint line (skipping locals test)"
-	    return
-	}
-    }
-
-    gdb_test "trace $testline" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "collect $msg: set tracepoint"
-    gdb_trace_setactions "collect $msg: define actions" \
-	    "" \
-	    "collect $expr" "^$"
-
-    # Begin the test.
-    run_trace_experiment $msg $func
-
-    gdb_test "print $expr" \
-	    "\\$\[0-9\]+ = $val$cr" \
-	    "collect $msg: got expected value '$val'"
-
-    gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "collect $msg: cease trace debugging"
-}
-
-proc gdb_collect_globals_test { } {
-    global cr
-    global gdb_prompt
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    # Find the comment-identified line for setting this tracepoint.
-    set testline 0
-    send_gdb "list globals_test_func, +30\n"
-    gdb_expect {
-	-re "\[\r\n\](\[0-9\]+)\[^\r\n\]+ Set_Tracepoint_Here .*$gdb_prompt" {
-	    set testline $expect_out(1,string)
-	    pass "collect globals: find tracepoint line"
-	}
-	-re ".*$gdb_prompt " {
-	    fail "collect globals: find tracepoint line (skipping global test)"
-	    return
-	}
-	timeout {
-	    fail "collect globals: find tracepoint line (skipping global test)"
-	    return
-	}
-    }
-
-    gdb_test "trace $testline" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "collect globals: set tracepoint"
-    gdb_trace_setactions "collect globals: define actions" \
-	    "" \
-	    "collect globalc, globali, globalf, globald" "^$" \
-	    "collect globalstruct, globalp, globalarr" "^$"
-
-    # Begin the test.
-    run_trace_experiment "globals" globals_test_func
-
-    gdb_test "print globalc" \
-	    "\\$\[0-9\]+ = 71 'G'$cr" \
-	    "collect globals: collected global char"
-    gdb_test "print globali" \
-	    "\\$\[0-9\]+ = 72$cr" \
-	    "collect globals: collected global int"
-    gdb_test "print globalf" \
-	    "\\$\[0-9\]+ = 73.\[23\]\[0-9\]*$cr" \
-	    "collect globals: collected global float"
-    gdb_test "print globald" \
-	    "\\$\[0-9\]+ = 74.\[34\]\[0-9\]*$cr" \
-	    "collect globals: collected global double"
-
-    gdb_test "print globalstruct.memberc" \
-	    "\\$\[0-9\]+ = 81 'Q'$cr" \
-	    "collect globals: collected struct char member"
-    gdb_test "print globalstruct.memberi" \
-	    "\\$\[0-9\]+ = 82$cr" \
-	    "collect globals: collected struct member int"
-    gdb_test "print globalstruct.memberf" \
-	    "\\$\[0-9\]+ = 83.\[23\]\[0-9\]*$cr" \
-	    "collect globals: collected struct member float"
-    gdb_test "print globalstruct.memberd" \
-	    "\\$\[0-9\]+ = 84.\[34\]\[0-9\]*$cr" \
-	    "collect globals: collected struct member double"
-
-    gdb_test "print globalp == &globalstruct" \
-	    "\\$\[0-9\]+ = 1$cr" \
-	    "collect globals: collected global pointer"
-
-    gdb_test "print globalarr\[1\]" \
-	    "\\$\[0-9\]+ = 1$cr" \
-	    "collect globals: collected global array element #1"
-    gdb_test "print globalarr\[2\]" \
-	    "\\$\[0-9\]+ = 2$cr" \
-	    "collect globals: collected global array element #2"
-    gdb_test "print globalarr\[3\]" \
-	    "\\$\[0-9\]+ = 3$cr" \
-	    "collect globals: collected global array element #3"
-
-    gdb_test "tfind none" \
-	    "#0  end .*" \
-	    "collect globals: cease trace debugging"
-}
-
-proc gdb_trace_collection_test { } {
-    global gdb_prompt;
-
-    gdb_test "set width 0" "" ""
-    delete_breakpoints
-
-    # We generously give ourselves one "pass" if we successfully 
-    # detect that this test cannot be run on this target!
-    if { ![gdb_target_supports_trace] } then { 
-	pass "Current target does not supporst trace"
-	return 1;
-    }
-
-    gdb_test "break begin" "" ""
-    gdb_test "break end"   "" ""
-    gdb_collect_args_test "\$args" \
-	    "args collectively"
-    gdb_collect_args_test "argc, argi, argf, argd, argstruct, argarray" \
-	    "args individually"
-    gdb_collect_argstruct_test "\$args" \
-	    "argstruct collectively"
-    gdb_collect_argstruct_test "argstruct" \
-	    "argstruct individually"
-    gdb_collect_argarray_test "\$args" \
-	    "argarray collectively"
-    gdb_collect_argarray_test "argarray" \
-	    "argarray individually"
-    gdb_collect_locals_test local_test_func "\$locals" \
-	    "auto locals collectively"
-    gdb_collect_locals_test local_test_func \
-	    "locc, loci, locf, locd, locst, locar" \
-	    "auto locals individually"
-    gdb_collect_locals_test reglocal_test_func "\$locals" \
-	    "register locals collectively"
-    gdb_collect_locals_test reglocal_test_func \
-	    "locc, loci, locf, locd, locst, locar" \
-	    "register locals individually"
-    gdb_collect_locals_test statlocal_test_func "\$locals" \
-	    "static locals collectively"
-    gdb_collect_locals_test statlocal_test_func \
-	    "locc, loci, locf, locd, locst, locar" \
-	    "static locals individually"
-    
-    gdb_collect_registers_test "\$regs"
-    gdb_collect_registers_test "\$fp, \$sp, \$pc"
-    gdb_collect_globals_test
-    
-    #
-    # Expression tests:
-    #
-    # *x	(**x, ...)
-    # x.y	(x.y.z, ...)
-    # x->y	(x->y->z, ...)
-    # x[2]	(x[2][3], ...) (const index)
-    # x[y]	(x[y][z], ...) (index to be char, short, long, float, double)
-    #  NOTE:
-    #  We test the following operators by using them in an array index
-    #  expression -- because the naked result of an operator is not really
-    #  collected.  To be sure the operator was evaluated correctly on the
-    #  target, we have to actually use the result eg. in an array offset
-    #  calculation.
-    # x[y +  z] (tests addition: y and z various combos of types, sclasses)
-    # x[y -  z] (tests subtraction) (ditto)
-    # x[y *  z] (tests multiplication) (ditto)
-    # x[y /  z] (tests division) (ditto)
-    # x[y %  z] (tests modulo division) (ditto)
-    # x[y == z] (tests equality relation) (ditto)              UNSUPPORTED
-    # x[y != z] (tests inequality relation) (ditto)            UNSUPPORTED
-    # x[y >  z] (tests greater-than relation) (ditto)          UNSUPPORTED
-    # x[y <  z] (tests less-than relation) (ditto)             UNSUPPORTED
-    # x[y >= z] (tests greater-than-or-equal relation) (ditto) UNSUPPORTED
-    # x[y <= z] (tests less-than-or-equal relation) (ditto)    UNSUPPORTED
-    # x[y && z] (tests logical and) (ditto)                    UNSUPPORTED
-    # x[y || z] (tests logical or) (ditto)                     UNSUPPORTED
-    # x[y &  z] (tests binary and) (ditto)                     UNSUPPORTED
-    # x[y |  z] (tests binary or) (ditto)                      UNSUPPORTED
-    # x[y ^  z] (tests binary xor) (ditto)                     UNSUPPORTED
-    # x[y ? z1 : z2] (tests ternary operator) (ditto)          UNSUPPORTED
-    # x[y << z] (tests shift-left) (ditto)                     UNSUPPORTED
-    # x[y >> z] (tests shift-right) (ditto)                    UNSUPPORTED
-    # x[y =  z] (tests assignment operator) (ditto)            UNSUPPORTED
-    # x[++y]    (tests pre-increment operator) (ditto)         UNSUPPORTED
-    # x[--y]    (tests pre-decrement operator) (ditto)         UNSUPPORTED
-    # x[y++]    (tests post-increment operator) (ditto)        UNSUPPORTED
-    # x[y--]    (tests post-decrement operator) (ditto)        UNSUPPORTED
-    # x[+y]     (tests unary plus) (ditto)
-    # x[-y]     (tests unary minus) (ditto)
-    # x[!y]     (tests logical not) (ditto)                    UNSUPPORTED
-    # x[~y]     (tests binary not) (ditto)                     UNSUPPORTED
-    # x[(y, z)] (tests comma expression) (ditto)
-    # cast expr
-    # stack data
-    
-    gdb_collect_expression_test globals_test_func \
-	    "globalstruct.memberi"  "82"     "a.b"
-    gdb_collect_expression_test globals_test_func \
-	    "globalp->memberc"      "81 'Q'" "a->b"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[2\]"        "2"      "a\[2\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[l3\]"       "3"      "a\[b\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[l3 + l2\]"  "5"      "a\[b + c\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[l3 - l2\]"  "1"      "a\[b - c\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[l3 * l2\]"  "6"      "a\[b * c\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[l6 / l3\]"  "2"      "a\[b / c\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[l7 % l3\]"  "1"      "a\[b % c\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[+l1\]"      "1"      "a\[+b\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[-lminus\]"  "2"      "a\[-b\]"
-    gdb_collect_expression_test globals_test_func \
-	    "globalarr\[\(l6, l7\)\]" "7"    "a\[\(b, c\)\]"
-
-}
-
-# Start with a fresh gdb.
- 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
- 
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
- 
-# Body of test encased in a proc so we can return prematurely.
-gdb_trace_collection_test
-
-# Finished!
-gdb_test "tfind none" "" ""
-
-
-
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
deleted file mode 100644
index 58a69ba2442..00000000000
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ /dev/null
@@ -1,269 +0,0 @@
-#   Copyright 1998, 1999 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-gdb_file_cmd $binfile
-
-# define relative source line numbers:
-# all subsequent line numbers are relative to this first one (baseline)
-set baseline [gdb_find_recursion_test_baseline $srcfile];
-if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-set testline1 [expr $baseline + 4]
-
-#
-# test "delete tracepoints" command
-#
-
-# 3.1 delete tracepoints (all)
-gdb_delete_tracepoints
-gdb_test "trace gdb_c_test"   "Tracepoint \[0-9\]+ at .*" "set tracepoint 1"
-gdb_test "trace gdb_asm_test" "Tracepoint \[0-9\]+ at .*" "set tracepoint 2"
-gdb_test "trace $testline1"   "Tracepoint \[0-9\]+ at .*" "set tracepoint 3"
-
-gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*\[0-9\]+\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_recursion_test.*" \
-			"3.1a: set three tracepoints"
-
-send_gdb "delete tracepoints\n"
-gdb_expect 30 {
-    -re "Delete all tracepoints.*y or n.*$" {
-	send_gdb "y\n"
-	gdb_expect 30 {
-	    -re "$gdb_prompt $" {
-		pass "3.1b: delete all tracepoints"
-	    }
-	    timeout { fail "3.1b: delete all tracepoints (timeout)" }
-	}
-    }
-    -re "$gdb_prompt $" { # This should only happen if there are no tracepoints
-	fail "3.1b: delete all tracepoints (no tracepoints?)"
-    }
-    timeout { fail "3.1b: delete all tracepoints (timeout)" }
-}
-
-# 3.2 delete tracepoint <n>
-gdb_delete_tracepoints
-set trcpt1 [gdb_gettpnum gdb_c_test];
-set trcpt2 [gdb_gettpnum gdb_asm_test];
-set trcpt3 [gdb_gettpnum $testline1];
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
-    fail "setting tracepoints"
-    return;
-}
-
-gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in.*gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in.*gdb_recursion_test.*" \
-			"3.2a: set three tracepoints"
-
-#gdb_test "delete tracepoint $trcpt1" "" ""
-send_gdb "delete tracepoint $trcpt1\n"
-gdb_expect {
-    -re "No tracepoint number.*$gdb_prompt $" {
-	fail "3.2b: delete first tracepoint"
-    }
-    -re ".*\[Ee\]rror.*$gdb_prompt $" {
-	fail "3.2b: delete first tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	pass "3.2b: delete first tracepoint"
-    }
-    timeout {
-	fail "3.2b: delete first tracepoint (timeout)"
-    }
-}
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "$trcpt1\[\t \]+y\[\t \]+0x.*in.*gdb_c_test.*$gdb_prompt $" {
-	fail "3.2c: verify delete first tracepoint (argh)"
-    }
-    -re "$trcpt2\[\t \]+y.*gdb_asm_test.*\[\r\n\t ]+$trcpt3\[\t \]+y.* in gdb_recursion_test at .*$gdb_prompt $" {
-	pass "3.2c: verify delete first tracepoint"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "3.2c: verify delete first tracepoint (mumble)" 
-    }
-    timeout {
-	fail "3.2c: verify delete first tracepoint (timeout)"
-    }
-}
-
-#gdb_test "delete tracepoint $trcpt2" "" ""
-send_gdb "delete tracepoint $trcpt2\n"
-gdb_expect {
-    -re "No tracepoint number.*$gdb_prompt $" {
-	fail "3.2d: delete second tracepoint"
-    }
-    -re ".*\[Ee\]rror.*$gdb_prompt $" {
-	fail "3.2d: delete second tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	pass "3.2d: delete second tracepoint"
-    }
-    timeout {
-	fail "3.2d: delete second tracepoint (timeout)"
-    }
-}
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "$trcpt1\[\t \]+y\[\t \]+0x.*in.*gdb_c_test.*$gdb_prompt $" {
-	fail "3.2e: verify delete second tracepoint"
-    }
-    -re "$trcpt2\[\t \]+y\[\t \]+0x.*in gdb_asm_test.*$gdb_prompt $" {
-	fail "3.2e: verify delete second tracepoint"
-    }
-    -re "$trcpt3\[\t \]+y\[\t \]+0x.*in gdb_recursion_test.*$gdb_prompt $" {
-	pass "3.2e: verify delete second tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	fail "3.2e: verify delete second tracepoint" 
-    }
-    timeout {
-	fail "3.2e: verify delete second tracepoint (timeout)"
-    }
-}
-
-#gdb_test "delete tracepoint $trcpt3" "" ""
-send_gdb "delete tracepoint $trcpt3\n"
-gdb_expect {
-    -re "No tracepoint number.*$gdb_prompt $" {
-	fail "3.2f: delete third tracepoint"
-    }
-    -re ".*\[Ee\]rror.*$gdb_prompt $" {
-	fail "3.2f: delete third tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	pass "3.2f: delete third tracepoint"
-    }
-    timeout {
-	fail "3.2f: delete third tracepoint (timeout)"
-    }
-}
-
-# send_gdb "ARF! \\n\n"
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "$trcpt3\[\t \]+y\[\t \]+0x.*in gdb_recursion_test.*$gdb_prompt $" {
-	fail "3.2g: verify delete third tracepoint"
-    }
-    -re "$gdb_prompt $" {
-	pass "3.2g: verify delete third tracepoint"
-    }
-    timeout {
-	fail "3.2g: verify delete third tracepoint (timeout)" 
-    }
-}
-
-# 3.3 delete three tracepoints at once
-gdb_delete_tracepoints
-set trcpt1 [gdb_gettpnum gdb_c_test];
-set trcpt2 [gdb_gettpnum gdb_asm_test];
-set trcpt3 [gdb_gettpnum $testline1];
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
-    fail "setting tracepoints"
-    return;
-}
-
-gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_recursion_test.*" \
-			"3.3a: set three tracepoints"
-
-#gdb_test "delete tracepoint $trcpt1 $trcpt2 $trcpt3" "" ""
-send_gdb "delete tracepoint $trcpt1 $trcpt2 $trcpt3\n"
-gdb_expect {
-    -re "No tracepoint number.*$gdb_prompt $" {
-	fail "3.3b: delete three tracepoints"
-    }
-    -re ".*\[Ee\]rror.*$gdb_prompt $" {
-	fail "3.3b: delete three tracepoints"
-    }
-    -re "$gdb_prompt $" {
-	pass "3.3b: delete three tracepoints"
-    }
-    timeout {
-	fail "3.3b: delete three tracepoint (timeout)"
-    }
-}
-
-send_gdb "info tracepoints\n"
-gdb_expect {
-    -re "$trcpt1\[\t \]+y\[\t \]+0x.*in gdb_c_test.*$gdb_prompt $" {
-	fail "3.3c: verify delete three tracepoints (first one persists)"
-    }
-    -re "$trcpt2\[\t \]+y\[\t \]+0x.*in gdb_asm_test.*$gdb_prompt $" {
-	fail "3.3c: verify delete three tracepoints (second one persists)"
-    }
-    -re "$trcpt3\[\t \]+y\[\t \]+0x.*in gdb_recursion_test.*$gdb_prompt $" {
-	fail "3.3c: verify delete three tracepoints (third one persists)"
-    }
-    -re "$gdb_prompt $" {
-	pass "3.3c: verify delete three tracepoints" 
-    }
-    timeout { 
-	fail "3.3c: verify delete three tracepoints (timeout)"
-    }
-}
-
-# 3.4 delete invalid tracepoint number
-gdb_test "delete tracepoint [expr $trcpt2 + $trcpt3]" \
-    "No tracepoint number [expr $trcpt2 + $trcpt3]." \
-			"3.4: delete invalid tracepoint number"
-
-# 3.5 delete tracepoint number zero
-gdb_test "delete tracepoint 0" "bad tracepoint number at or near '0'" \
-			"3.5: delete tracepoint number zero"
-
-# 3.6 help delete tracepoints
-gdb_test "help delete tracepoints" \
-    "Delete specified tracepoints.*" \
-			"3.6: help delete tracepoints"
diff --git a/gdb/testsuite/gdb.trace/gdb_c_test.c b/gdb/testsuite/gdb.trace/gdb_c_test.c
deleted file mode 100644
index a5fdd9f4e8d..00000000000
--- a/gdb/testsuite/gdb.trace/gdb_c_test.c
+++ /dev/null
@@ -1,3792 +0,0 @@
-/*
- ******************************************************************************
- ******************************************************************************
- *
- * COPYRIGHT (C) by EMC Corporation, 1997 All rights reserved.
- * $Id: gdb_c_test.c,v 1.1 1998/09/15 22:25:00 msnyder Exp $
- * DESCRIPTION: This module has been provided for the purpose of testing GDB.
- *
- * NOTES:
- *
- ******************************************************************************
- *****************************************************************************/
-
-/*=============================================================================
- *                                  INCLUDE  FILES
- *===========================================================================*/
-
-
-#ifdef DO_IT_BY_THE_BOOK
-
-
-#include "symtypes_defs.h"
-#include "printp.h"
-
-#include "adbg_expression.h"
-#include "common_hw_ds.h"
-#include "common_hw_defs.h"
-#include "evnttrac.h"
-#include "sym_scratch_ds.h"
-#include "symglob_ds.h"
-#include "sym_protglob_ds.h"
-
-#include "ether.h"
-
-#include <ctype.h>
-
-
-#else
-
-#include "adbg_dtc.h"
-
-#define YES             1
-#define NO              0
-
-#define TRUE            1
-#define FALSE           0
-
-#define ENABLED         1
-#define DISABLED        0
-
-#define CONTROL_C       3   /* ASCII 'ETX' */
-
-
-/*
- * Faked after ctype.h
- */
-
-#define isxdigit(X) (((X) >= '0' && (X) <= '9') || \
-                     ((X) >= 'A' && (X) <= 'F') || \
-                     ((X) >= 'a' && (X) <= 'f'))
-/*
- * Borrowed from string.h
- */
-
-extern unsigned int strlen ( const char * );
-
-/*
- * Extracted from symtypes.h:
- */
-
-typedef char                    BOOL;     /*  8 Bits */
-typedef unsigned char           UCHAR;    /*  8 Bits */
-typedef unsigned short          USHORT;   /* 16 Bits */
-typedef unsigned long           ULONG;    /* 32 Bits */
-
-/*
- * for struct t_expr_tag and
- * decl of build_and_add_expression
- */
-#include "adbg_expression.h"
-#define NULL	0
-
-/*
- * Extracted from printp.h:
- */
-
-extern void printp ( const char * fptr, ... );
-extern void sprintp ( const char * fptr, ... );
-
-/*
- * Extracted from ether.h:
- */
-
-extern long eth_to_gdb ( UCHAR *buf, long length );
-
-
-/*
- * Derived from hwequs.s:
- */
-
-#define CS_CODE_START           0x100000
-#define CS_CODE_SIZE            0x200000
-#define LAST_CS_WORD            (CS_CODE_START + CS_CODE_SIZE - 2)
-
-#define sh_genstat1             (*((volatile ULONG *) 0xFFFFFE54))
-
-#define rs232_mode1             0               /* rs-232 mode 1 reg. */
-#define rs232_mode2             rs232_mode1     /* rs-232 mode 2 reg. */
-#define rs232_stat              4               /* rs-232 status reg. */
-#define rs232_clk               rs232_stat      /* rs-232 clock select reg. */
-#define rs232_cmd               8               /* rs-232 command reg */
-#define rs232_transmit          12              /* rs-232 transmit reg. */
-#define rs232_receive           rs232_transmit  /* rs-232 transmit reg. */
-#define rs232_aux               16              /* rs-232 aux control reg. */
-#define rs232_isr               20              /* rs-232 interrupt status reg. */
-#define rs232_imr               rs232_isr       /* rs-232 interrupt mask reg. */
-#define rs232_tc_high           24              /* rs-232 timer/counter high reg. */
-#define rs232_tc_low            28              /* rs-232 timer/counter low reg.  */
-
-
-#endif
-
-
-/*============================================================================
- *                                 MODULE  DEFINES
- *===========================================================================*/
-
-#define P_RST_LAN_UART_REG      ((volatile UCHAR  *) 0xFFFFFE45)
-#define M_RST_LAN_UART          0x80          /* Bit  7 */
-
-#define P_LAN0TR_REG            P_RST_LAN_UART_REG
-#define M_LAN0TR                0x20          /* Bit  5 */
-
-#define M_SH_GENCON_LAN0TR      0x00200000    /* Bit 21 */
-
-#define MAX_RS232_CHARS         512
-
-#define LAN_Q_MOD(X)            ((X) % MAX_RS232_CHARS)
-
-/*---------------------------------------*
- *           LAN  UART  Registers        *
- *---------------------------------------*/
-
-#define LAN_UART_BASE               ((ULONG) 0xfffffc22)
-
-/*  Write-Read  */
-
-#define P_LAN_MR1                   ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_mode1   )))
-#define P_LAN_MR2                   ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_mode2   )))
-
-/*  Write-Only  */
-
-#define P_LAN_ACR                   ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_aux     )))
-#define P_LAN_CR                    ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_cmd     )))
-#define P_LAN_CSR                   ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_clk     )))
-#define P_LAN_CTLR                  ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_tc_low  )))
-#define P_LAN_CTUR                  ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_tc_high )))
-#define P_LAN_IMR                   ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_imr     )))
-
-/*  Read-Only */
-
-#define P_LAN_SR                    ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_stat    )))
-#define P_LAN_ISR                   ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_isr     )))
-#define P_LAN_XMT                   ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_transmit)))
-#define P_LAN_RCV                   ((volatile UCHAR *) (LAN_UART_BASE + ((ULONG) rs232_receive )))
-
-/*
- *   Bit Values for Write-Read and Write-Only Registers
- */
-
-#define DEFAULT_LAN_MR1             ((UCHAR) 0x13)
-#define DEFAULT_LAN_MR2             ((UCHAR) 0x07)
-#define DEFAULT_LAN_CSR             ((UCHAR) 0xcc)
-#define DEFAULT_LAN_ACR             ((UCHAR) 0x38)
-#define DEFAULT_LAN_CTUR            ((UCHAR) 0xff)
-#define DEFAULT_LAN_CTLR            ((UCHAR) 0xff)
-
-#define LAN_ACR_SELECT_BRG_0        DEFAULT_LAN_ACR
-#define LAN_ACR_SELECT_BRG_1        (DEFAULT_LAN_ACR | 0x80)
-
-#define UART_CR_RESET_MR_PTR        ((UCHAR) 0x10) /* Reset MR pointer (points to MR1). */
-#define UART_CR_RESET_RVCR          ((UCHAR) 0x20) /* Reset receiver (disabled).        */
-#define UART_CR_RESET_XMTR          ((UCHAR) 0x30) /* Reset transmitter (disabled).     */
-#define UART_CR_RESET_ERROR_STATUS  ((UCHAR) 0x40) /* Reset error status.               */
-#define UART_CR_RESET_BRK_CHG_INT   ((UCHAR) 0x50) /* Reset break change interrupt.     */
-#define UART_CR_START_CNTR_TIMER    ((UCHAR) 0x80) /* Start counter/timer.              */
-#define UART_CR_STOP_CNTR           ((UCHAR) 0x90) /* Stop counter.                     */
-
-#define UART_CR_DISABLE_XMTR        ((UCHAR) 0x08) /* Disable transmitter.              */
-#define UART_CR_ENABLE_XMTR         ((UCHAR) 0x04) /* Enable transmitter.               */
-#define UART_CR_DISABLE_RCVR        ((UCHAR) 0x02) /* Disable receiver.                 */
-#define UART_CR_ENABLE_RCVR         ((UCHAR) 0x01) /* Enable receiver.                  */
-
-#define UART_CSR_BR_4800            ((UCHAR) 0x99) /* With either BRG Set selected (via ACR). */
-#define UART_CSR_BR_9600            ((UCHAR) 0xbb) /* With either BRG Set selected (via ACR). */
-#define UART_CSR_BR_19200           ((UCHAR) 0xcc) /* With BRG Set '1' selected (via ACR). */
-#define UART_CSR_BR_38400           ((UCHAR) 0xcc) /* With BRG Set '0' selected (via ACR). */
-
-#define UART_IMR_RxRDY              ((UCHAR) 0x04) /* Enable 'RxRDY' interrupt. */
-#define UART_IMR_TxEMT              ((UCHAR) 0x02) /* Enable 'TxEMT' interrupt. */
-#define UART_IMR_TxRDY              ((UCHAR) 0x01) /* Enable 'TxRDY' interrupt. */
-
-/*
- *   Bit Masks for Read-Only Registers
- */
-
-#define M_UART_SR_RCVD_BRK      0x80    /* Bit 7 */
-#define M_UART_SR_FE            0x40    /* Bit 6 */
-#define M_UART_SR_PE            0x20    /* Bit 5 */
-#define M_UART_SR_OE            0x10    /* Bit 4 */
-#define M_UART_SR_TxEMT         0x08    /* Bit 3 */
-#define M_UART_SR_TxRDY         0x04    /* Bit 2 */
-#define M_UART_SR_FFULL         0x02    /* Bit 1 */
-#define M_UART_SR_RxRDY         0x01    /* Bit 0 */
-
-#define M_UART_ISR_RxRDY        0x04    /* Bit 2 */
-#define M_UART_ISR_TxEMT        0x02    /* Bit 1 */
-#define M_UART_ISR_TxRDY        0x01    /* Bit 0 */
-
-/*---------------------------------------*
- *       Support for 'Utility 83'.       *
- *---------------------------------------*/
-
-#define LAN_UTIL_CODE           0x83
-
-#define LAN_INIT                ((ULONG) (('I' << 24) | ('N' << 16) | ('I' << 8) | 'T'))
-#define LAN_BAUD                ((ULONG) (('B' << 24) | ('A' << 16) | ('U' << 8) | 'D'))
-#define LAN_INTR                ((ULONG) (('I' << 24) | ('N' << 16) | ('T' << 8) | 'R'))
-#define LAN_XMT                 ((ULONG)               (('X' << 16) | ('M' << 8) | 'T'))
-#define LAN_ECHO                ((ULONG) (('E' << 24) | ('C' << 16) | ('H' << 8) | 'O'))
-#define LAN_STAT                ((ULONG) (('S' << 24) | ('T' << 16) | ('A' << 8) | 'T'))
-#define LAN_IN                  ((ULONG)                             (('I' << 8) | 'N'))
-#define LAN_OUT                 ((ULONG)               (('O' << 16) | ('U' << 8) | 'T'))
-
-#define LAN_PUTC                ((ULONG) (('P' << 24) | ('U' << 16) | ('T' << 8) | 'C'))
-#define LAN_WPM                 ((ULONG)               (('W' << 16) | ('P' << 8) | 'M'))
-
-#define STATUS(X)               ( ( ( X ) == 0 ) ? "disabled" : "enabled" )
-
-#define XMT_VIA_BP_ENABLED()    ( *P_LAN0TR_REG & M_LAN0TR  ?  1 : 0 )
-
-#define TRAP_1_INST             0x4E41
-
-/*
- *   Bit #13 of shared genstat 1 indicates
- *   which processor we are as follows.
- *
- *           0 => X (side A)
- *           1 => Y (side B)
- */
-
-#define M_PROC_ID               0x00002000
-
-#define IS_SIDE_A()             ( ( (sh_genstat1) & M_PROC_ID ) == 0 )
-#define IS_SIDE_B()             ( (sh_genstat1) & M_PROC_ID )
-
-
-#ifdef STANDALONE       /* Compile this module stand-alone for debugging */
-#define LAN_PUT_CHAR(X) printf("%c", X)
-#else
-#define LAN_PUT_CHAR(X) while ( lan_put_char( X ) )
-#endif
-
-
-
-
-#define VIA_RS232             0
-#define VIA_ETHERNET          1
-
-#define MAX_IO_BUF_SIZE       400
-
-#define MAX_BYTE_CODES        200 /* maximum length for bytecode string */
-
-
-static  ULONG           gdb_host_comm;
-
-static  ULONG           gdb_cat_ack;
-
-static  char            eth_outbuffer[ MAX_IO_BUF_SIZE + 1 ];
-
-
-#ifdef STANDALONE
-
-#define ACK_PKT()       LAN_PUT_CHAR( '+' )
-#define NACK_PKT()      LAN_PUT_CHAR( '-' )
-
-#else
-
-#define ACK_PKT()       {                                             \
-                          if ( VIA_ETHERNET == gdb_host_comm )        \
-                          {                                           \
-                            gdb_cat_ack = YES;                        \
-                          }                                           \
-                          else                                        \
-                          {                                           \
-                            LAN_PUT_CHAR( '+' );                      \
-                          }                                           \
-                        }
-
-
-
-#define NACK_PKT()      {                                             \
-                          if ( VIA_ETHERNET == gdb_host_comm )        \
-                          {                                           \
-                            eth_outbuffer[ 0 ] = '-';                 \
-                            eth_to_gdb( (UCHAR *) eth_outbuffer, 1 ); \
-                          }                                           \
-                          else                                        \
-                          {                                           \
-                            LAN_PUT_CHAR( '-' );                      \
-                          }                                           \
-                        }
-
-#endif
-
-
-
-
-/*============================================================================
- *                                 MODULE  TYPEDEFS
- *===========================================================================*/
-
-typedef struct rs232_queue {
-
-  long    head_index;
-
-  long    tail_index;
-
-  ULONG   overflows;
-
-  long    gdb_packet_start;
-  long    gdb_packet_end;
-  long    gdb_packet_csum1;
-  long    gdb_packet_csum2;
-
-  UCHAR   buf[ MAX_RS232_CHARS ];
-
-} T_RS232_QUEUE;
-
-
-
-
-/*=============================================================================
- *                        EXTERNAL GLOBAL VARIABLES
- *===========================================================================*/
-
-extern volatile UCHAR         sss_trace_flag;
-
-
-/*=============================================================================
- *                           STATIC  MODULE  DECLARATIONS
- *===========================================================================*/
-
-static  T_RS232_QUEUE lan_input_queue,
-                      lan_output_queue;
-
-static  BOOL          test_echo;
-
-#if 0
-/* The stub no longer seems to use this.  */
-static  BOOL          write_access_enabled;
-#endif
-
-static  int           baud_rate_idx;
-
-static  ULONG         tx_by_intr,
-                      tx_by_poll;
-
-static  UCHAR         lan_shadow_imr;
-
-
-/*=============================================================================
- *                        EXTERNAL FUNCTION PROTOTYPES
- *===========================================================================*/
-
-extern  long  write_to_protected_mem( void *address, unsigned short value );
-
-
-/*=============================================================================
- *                      MODULE GLOBAL FUNCTIONS PROTOTYPES
- *===========================================================================*/
-
-ULONG gdb_c_test( ULONG *parm );
-
-
-void  lan_init( void );
-
-void  lan_isr( void );
-
-long  lan_get_char( void );
-
-long  lan_put_char( UCHAR c );
-
-ULONG lan_util( ULONG *parm );
-
-
-/*=============================================================================
- *                      MODULE LOCAL FUNCTION PROTOTYPES
- *===========================================================================*/
-
-static  void  lan_reset( void );
-
-static  void  lan_configure( void );
-
-static  void  lan_init_queue( T_RS232_QUEUE *p_queue );
-
-static  void  lan_add_to_queue( long c, T_RS232_QUEUE *p_queue );
-
-static  UCHAR lan_next_queue_char( T_RS232_QUEUE *p_queue );
-
-static  void  lan_util_menu( void );
-
-static  long  get_gdb_input( long c, T_RS232_QUEUE *p_input_q );
-
-
-/*=============================================================================
- *                      GDB STUB FUNCTION PROTOTYPES
- *===========================================================================*/
-
-void  gdb_trap_1_handler( void );
-void  gdb_trace_handler ( void );
-
-void  gdb_get_eth_input( unsigned char *buf, long length );
-
-static void getpacket ( void );
-static void putpacket ( char * );
-static void discard_packet ( void );
-
-#ifdef    STANDALONE    /* Compile this module stand-alone for debugging */
-#include <stdio.h>
-#define printp printf   /* easier than declaring a local varargs stub func.  */
-#endif /* STANDALONE */
-
-
-/*=============================================================================
- *                              MODULE BODY
- *===========================================================================*/
-
-/* ------------------- Things that belong in a header file --------------- */
-extern char *memset (char *, int, int);
-
-                  /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*
-                  *                                     *
-                  *       Global Module Functions       *
-                  *                                     *
-                  *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-
-static char   gdb_char_test;
-static short  gdb_short_test;
-static long   gdb_long_test;
-static char   gdb_arr_test[25];
-static struct GDB_STRUCT_TEST
-{
-  char   c;
-  short  s;
-  long   l;
-  int    bfield : 11;	/* collect bitfield */
-  char   arr[25];
-  struct GDB_STRUCT_TEST *next;
-} gdb_struct1_test, gdb_struct2_test, *gdb_structp_test, **gdb_structpp_test;
-
-static union GDB_UNION_TEST
-{
-  char   c;
-  short  s;
-  long   l;
-  int    bfield : 11;	/* collect bitfield */
-  char   arr[4];
-  union GDB_UNION_TEST *next;
-} gdb_union1_test;
-
-void gdb_recursion_test (int, int, int, int,  int,  int,  int);
-
-void gdb_recursion_test (int depth, 
-			 int q1, 
-			 int q2, 
-			 int q3, 
-			 int q4, 
-			 int q5, 
-			 int q6)
-{	/* gdb_recursion_test line 0 */
-  int q = q1;						/* gdbtestline 1 */
-
-  q1 = q2;						/* gdbtestline 2 */
-  q2 = q3;						/* gdbtestline 3 */
-  q3 = q4;						/* gdbtestline 4 */
-  q4 = q5;						/* gdbtestline 5 */
-  q5 = q6;						/* gdbtestline 6 */
-  q6 = q;						/* gdbtestline 7 */
-  if (depth--)						/* gdbtestline 8 */
-    gdb_recursion_test (depth, q1, q2, q3, q4, q5, q6);	/* gdbtestline 9 */
-}
-
-
-ULONG   gdb_c_test( ULONG *parm )
-
-{
-   char *p = "gdb_c_test";
-   char *ridiculously_long_variable_name_with_equally_long_string_assignment;
-   register long local_reg = 7;
-   static unsigned long local_static, local_static_sizeof;
-   long local_long;
-   unsigned long *stack_ptr;
-   unsigned long end_of_stack;
-
-   ridiculously_long_variable_name_with_equally_long_string_assignment = 
-     "ridiculously long variable name with equally long string assignment";
-   local_static = 9;
-   local_static_sizeof = sizeof (struct GDB_STRUCT_TEST);
-   local_long = local_reg + 1;
-   stack_ptr  = (unsigned long *) &local_long;
-   end_of_stack = 
-     (unsigned long) &stack_ptr + sizeof(stack_ptr) + sizeof(end_of_stack) - 1;
-
-   printp ("\n$Id: gdb_c_test.c,v 1.1 1998/09/15 22:25:00 msnyder Exp $\n");
-
-   printp( "%s: arguments = %X, %X, %X, %X, %X, %X\n",
-           p, parm[ 1 ], parm[ 2 ], parm[ 3 ], parm[ 4 ], parm[ 5 ], parm[ 6 ] );
-
-   gdb_char_test   = gdb_struct1_test.c = (char)   ((long) parm[1] & 0xff);
-   gdb_short_test  = gdb_struct1_test.s = (short)  ((long) parm[2] & 0xffff);
-   gdb_long_test   = gdb_struct1_test.l = (long)   ((long) parm[3] & 0xffffffff);
-   gdb_union1_test.l = (long) parm[4];
-   gdb_arr_test[0] = gdb_struct1_test.arr[0] = (char) ((long) parm[1] & 0xff);
-   gdb_arr_test[1] = gdb_struct1_test.arr[1] = (char) ((long) parm[2] & 0xff);
-   gdb_arr_test[2] = gdb_struct1_test.arr[2] = (char) ((long) parm[3] & 0xff);
-   gdb_arr_test[3] = gdb_struct1_test.arr[3] = (char) ((long) parm[4] & 0xff);
-   gdb_arr_test[4] = gdb_struct1_test.arr[4] = (char) ((long) parm[5] & 0xff);
-   gdb_arr_test[5] = gdb_struct1_test.arr[5] = (char) ((long) parm[6] & 0xff);
-   gdb_struct1_test.bfield = 144;
-   gdb_struct1_test.next = &gdb_struct2_test;
-   gdb_structp_test      = &gdb_struct1_test;
-   gdb_structpp_test     = &gdb_structp_test;
-
-   gdb_recursion_test (3, (long) parm[1], (long) parm[2], (long) parm[3],
-		       (long) parm[4], (long) parm[5], (long) parm[6]);
-
-   gdb_char_test = gdb_short_test = gdb_long_test = 0;
-   gdb_structp_test  = (void *) 0;
-   gdb_structpp_test = (void *) 0;
-   memset ((char *) &gdb_struct1_test, 0, sizeof (gdb_struct1_test));
-   memset ((char *) &gdb_struct2_test, 0, sizeof (gdb_struct2_test));
-   local_static_sizeof = 0;
-   local_static = 0;
-   return ( (ULONG) 0 );
-}
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_init
- *
- *
- * DESCRIPTION:
- *
- *
- * RETURN VALUE:
- *
- *
- * USED GLOBAL VARIABLES:
- *
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- *
- * NOTES:
- *
- *
- *
- *---------------------------------------------------------------------------*/
-
-void    lan_init( void )
-
-{
-
-  if ( IS_SIDE_A( ) )
-  {
-
-    lan_reset( );
-
-    lan_init_queue( &lan_input_queue );
-
-    lan_init_queue( &lan_output_queue );
-
-    lan_configure( );
-  }
-
-  return;
-}
-/* end of 'lan_init'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_isr
- *
- *
- * DESCRIPTION:
- *
- *
- * RETURN VALUE:    None.
- *
- *
- * USED GLOBAL VARIABLES:
- *
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- *
- * NOTES:
- *
- *
- *---------------------------------------------------------------------------*/
-
-void      lan_isr( void )
-
-{
-  UCHAR   c;
-
-
-  lan_shadow_imr = 0;           /*  Disable all UART interrupts.  */
-  *P_LAN_IMR = lan_shadow_imr;
-
-
-  if ( *P_LAN_ISR & M_UART_ISR_RxRDY )
-  {
-
-    gdb_host_comm = VIA_RS232;
-
-    c = *P_LAN_RCV;
-
-    if ( test_echo )
-    {
-      /* ????? */
-    }
-
-    if ( c == CONTROL_C )
-    {
-        /* can't stop the target, but we can tell gdb to stop waiting... */
-      discard_packet( );
-      putpacket( "S03" );       /* send back SIGINT to the debugger */
-    }
-
-    else
-    {
-      lan_add_to_queue( (long) c, &lan_input_queue );
-      get_gdb_input( (long) c, &lan_input_queue );
-    }
-
-  }
-
-  if ( XMT_VIA_BP_ENABLED( ) )
-  {
-
-    c = 0;
-
-    while ( (*P_LAN_ISR & M_UART_ISR_TxRDY)  &&  (c = lan_next_queue_char( &lan_output_queue )) )
-    {
-      *P_LAN_XMT = c;
-      ++tx_by_intr;
-    }
-
-    if ( c )
-    {
-      lan_shadow_imr |= UART_IMR_TxRDY;   /*  (Re-)Enable 'TxRDY' interrupt from UART.  */
-    }
-
-  }
-
-
-  lan_shadow_imr |= UART_IMR_RxRDY;       /*  Re-Enable 'RxRDY' interrupt from UART.  */
-  *P_LAN_IMR = lan_shadow_imr;
-
-
-
-  return;
-}
-/* end of 'lan_isr'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_get_char
- *
- *
- * DESCRIPTION:     Fetches a character from the UART.
- *
- *
- * RETURN VALUE:    0 on success, -1 on failure.
- *
- *
- * USED GLOBAL VARIABLES:
- *
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- *
- * NOTES:
- *
- *
- *---------------------------------------------------------------------------*/
-
-long    lan_get_char( void )
-
-{
-  long status = -2; /* AGD: nothing found in rcv buffer */
-
-  if ( *P_LAN_SR & M_UART_SR_RxRDY )
-  {
-    char c = (char) *P_LAN_RCV;
-
-    if ( test_echo )
-    {
-      LAN_PUT_CHAR ( c );
-    }
-
-    if ( c == CONTROL_C )
-    {
-        /* can't stop the target, but we can tell gdb to stop waiting... */
-      discard_packet( );
-      putpacket( "S03" );       /* send back SIGINT to the debugger */
-      status = 0;               /* success */
-    }
-
-    else
-    {
-      lan_add_to_queue( (long) c, &lan_input_queue );
-      status = get_gdb_input( (long) c, &lan_input_queue );
-    }
-
-  }
-
-  return( status );
-}
-/* end of 'lan_get_char'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_put_char
- *
- * DESCRIPTION:     Puts a character out via the UART.
- *
- * RETURN VALUE:    0 on success, -1 on failure.
- *
- * USED GLOBAL VARIABLES: none.
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- * NOTES: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- *        !!                                                                  !!
- *        !!  If 'XMT_VIA_BP_ENABLED()' is FALSE then output is THROWN AWAY.  !!
- *        !!  This prevents anyone infinite-looping on this function.         !!
- *        !!                                                                  !!
- *        !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- *
- *---------------------------------------------------------------------------*/
-
-long    lan_put_char( UCHAR c )
-
-{
-  long    status = -1;
-
-  if ( XMT_VIA_BP_ENABLED( ) )
-  {
-
-    if ( *P_LAN_SR & M_UART_SR_TxRDY )
-    {
-      lan_add_to_queue( (long) c, &lan_output_queue );
-
-      c = lan_next_queue_char( &lan_output_queue );
-
-      *P_LAN_XMT = c;
-      ++tx_by_poll;
-      status = 0;
-    }
-#if 0
-    else
-    {
-      status = 0;
-      lan_shadow_imr |= UART_IMR_TxRDY;   /*  Enable 'TxRDY' interrupt from UART. */
-      *P_LAN_IMR = lan_shadow_imr;
-    }
-#endif
-  }
-
-  else
-  {
-    status = 0;   /* You lose: input character goes to the bit bucket. */
-  }
-
-  return( status );
-}
-/* end of 'lan_put_char'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_util
- *
- * DESCRIPTION:
- *
- * RETURN VALUE:
- *
- * USED GLOBAL VARIABLES:
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- * NOTES:
- *
- *---------------------------------------------------------------------------*/
-
-ULONG   lan_util( ULONG *parm )
-
-{
-
-
-  static const struct {
-
-    ULONG rate_code;
-    UCHAR acr_setting;
-    UCHAR csr_setting;
-
-  } baud_rate_setting [] = {
-
-    { 0x38400, LAN_ACR_SELECT_BRG_0, UART_CSR_BR_38400 },
-    { 0x19200, LAN_ACR_SELECT_BRG_1, UART_CSR_BR_19200 },
-    { 0x9600,  LAN_ACR_SELECT_BRG_0, UART_CSR_BR_9600  },
-    { 0x4800,  LAN_ACR_SELECT_BRG_0, UART_CSR_BR_4800  }
-  };
-
-
-#define BOGUS_P1        0xE1
-#define BOGUS_P2        0xE2
-
-  ULONG   not_done_code;
-
-
-  ULONG   opcode;
-  ULONG   parm_1;
-  ULONG   parm_2;
-
-  int     i;
-  UCHAR   c;
-
-
-  not_done_code = 0;
-
-  opcode = parm[ 1 ];
-  parm_1 = parm[ 2 ];
-  parm_2 = parm[ 3 ];
-
-
-  switch ( opcode )
-  {
-
-    case LAN_INIT:
-      {
-
-        lan_init( );
-        printp( "\n\n  Interface (Re)Initialized ...\n\n" );
-
-        break;
-      }
-
-
-    case LAN_BAUD:
-      {
-
-        for ( i = 0; i < (int)(sizeof(baud_rate_setting) / sizeof(baud_rate_setting[0])); i ++ )
-        {
-          if ( baud_rate_setting[i].rate_code == parm_1 )
-          {
-            baud_rate_idx = i;
-            *P_LAN_ACR = baud_rate_setting[i].acr_setting;
-            *P_LAN_CSR = baud_rate_setting[i].csr_setting;
-            printp ( "Baud rate set to %X!\n", baud_rate_setting[i].rate_code );
-            return( not_done_code );
-          }
-        }
-
-        printp( "\n\n  *** SYNTAX Error  -  Invalid baudrate (P2)\n\n" );
-        not_done_code = BOGUS_P2;
-
-        break;
-      }
-
-
-    case LAN_INTR:
-      {
-
-        switch ( parm_1 )
-        {
-
-          case 0x0D: /* Disable 'RxRDY' Interrupts */
-            {
-              lan_shadow_imr &= ~UART_IMR_RxRDY;
-              *P_LAN_IMR = lan_shadow_imr;
-              printp( "\n\n  Receive Ready Interrupts DISABLED ...\n\n" );
-              break;
-            }
-
-          case 0x0E: /* Enable 'RxRDY' Interrupts */
-            {
-              lan_shadow_imr |= UART_IMR_RxRDY;
-              *P_LAN_IMR = lan_shadow_imr;
-              printp( "\n\n  Receive Ready Interrupts ENABLED ...\n\n" );
-              break;
-            }
-
-          default:
-            {
-              printp( "\n\n  *** SYNTAX Error  -  Invalid P2 (use D or E)\n\n" );
-              not_done_code = BOGUS_P2;
-            }
-        }
-
-        break;
-      }
-
-
-    case LAN_XMT:
-      {
-
-        switch ( parm_1 )
-        {
-
-          case 0x0E: /* Enable Transmission-via-Backplane */
-            {
-              if ( !(*P_LAN0TR_REG & M_LAN0TR) )
-              {
-                *P_LAN0TR_REG |= M_LAN0TR;  /* 0 -> 1 */
-              }
-
-              printp( "\n\n  Transmit-via-Backplane ENABLED ...\n\n" );
-              break;
-            }
-
-          case 0x0D: /* Disable Transmission-via-Backplane */
-            {
-              if ( *P_LAN0TR_REG & M_LAN0TR )
-              {
-                *P_LAN0TR_REG &= ~M_LAN0TR; /* 1 -> 0 */
-              }
-
-              printp( "\n\n  Transmit-via-Backplane DISABLED ...\n\n" );
-              break;
-            }
-
-          default:
-            {
-              printp( "\n\n  *** SYNTAX Error  -  Invalid P2 (use D or E)\n\n" );
-              not_done_code = BOGUS_P2;
-              lan_util_menu( );
-            }
-        }
-
-        break;
-      }
-
-
-    case LAN_STAT:
-      {
-
-      printp( "\n              -- Status --\n\n" );
-
-        printp( "          Baud Rate: %X *\n",   baud_rate_setting[ baud_rate_idx ].rate_code );
-        printp( "         Xmt-via-BP: %s *\n",   STATUS( XMT_VIA_BP_ENABLED( ) ) );
-        printp( "         RxRdy Intr: %s *\n",   STATUS( (lan_shadow_imr & M_UART_ISR_RxRDY) ) );
-   /*** printp( "         TxRdy Intr: %s\n",     STATUS( (lan_shadow_imr & M_UART_ISR_TxRDY) ) ); ***/
-        printp( "               Echo: %s *\n\n", STATUS( test_echo ) );
-
-        printp( "                IMR: %02X\n", (ULONG) lan_shadow_imr );
-        printp( "                ISR: %02X\n", (ULONG) *P_LAN_ISR );
-        printp( "                 SR: %02X\n\n", (ULONG) *P_LAN_SR );
-
-        printp( "    Input Overflows: %d\n\n", lan_input_queue.overflows );
-
-        printp( "         Tx by Intr: %d\n", tx_by_intr  );
-        printp( "         Tx by Poll: %d\n\n", tx_by_poll );
-
-        printp( "         *  Can be set or toggled via Utility %2X.\n\n", (ULONG) LAN_UTIL_CODE );
-
-        break;
-      }
-
-
-    case LAN_IN:
-      {
-
-        switch ( parm_1 )
-        {
-
-          case 0x0C: /* Clear and Reset Queue */
-            {
-              lan_init_queue( &lan_input_queue );
-              printp( "\n\n  Queue CLEARED/RESET ...\n\n" );
-              break;
-            }
-
-          case 0x0D: /* Display Queue */
-            {
-              printp( "\n                        -- Input Queue --\n" );
-              printp( "\n        Head Index: %8X     Tail Index: %8X\n\n    ",
-                     (ULONG) lan_input_queue.head_index, (ULONG) lan_input_queue.tail_index );
-
-              for ( i = 0; i < MAX_RS232_CHARS; ++i )
-              {
-                printp( " %02X", (ULONG) lan_input_queue.buf[ i ] );
-
-                if ( 15 == (i % 16) )
-                {
-                  int j;
-
-                  printp ( "    " );
-                  for ( j = i - 15; j <= i; j++ )
-                    {
-                      if ( lan_input_queue.buf[ j ] >= ' ' &&
-                          lan_input_queue.buf[ j ] < 127 )
-                        printp ( "%c", lan_input_queue.buf[ j ] );
-                      else
-                        printp ( "." );
-                    }
-                  printp( "\n    " );
-                }
-
-                else if ( 7 == (i % 8) )
-                {
-                  printp( " " );
-                }
-
-              }
-
-              printp( "\n" );
-
-              break;
-            }
-
-          case 0x0F: /* Fetch next character in Queue */
-            {
-              c = lan_next_queue_char( &lan_input_queue );
-
-              if ( c )
-              {
-                printp( "\n\n  Next Character: " );
-                if (  0x21 <= c  &&  c <= 0x7F )
-                {
-                  printp( "%c\n\n", (ULONG) c );
-                }
-
-                else if ( 0x20 == ((UCHAR) c) )
-                {
-                  printp( "<space>\n\n" );
-                }
-
-                else
-                {
-                  printp( "%02X\n\n", (ULONG) c );
-                }
-              }
-
-              else
-              {
-                printp( "\n\n  Input Queue EMPTY ...\n\n" );
-              }
-
-            break;
-            }
-
-          default:
-            {
-            printp( "\n\n  *** SYNTAX Error  -  Invalid P2 ...\n\n" );
-            not_done_code = BOGUS_P2;
-            break;
-            }
-        }
-
-      break;
-      }
-
-
-    case LAN_OUT:
-      {
-
-        switch ( parm_1 )
-        {
-
-          case 0x0C: /* Clear and Reset Queue */
-            {
-              lan_init_queue( &lan_output_queue );
-              printp( "\n\n  Queue CLEARED/RESET ...\n\n" );
-              break;
-            }
-
-          case 0x0D: /* Display Queue */
-            {
-              printp( "\n                       -- Output Queue --\n" );
-              printp( "\n        Head Index: %8X     Tail Index: %8X\n\n    ",
-                     (ULONG) lan_output_queue.head_index, (ULONG) lan_output_queue.tail_index );
-
-              for ( i = 0; i < MAX_RS232_CHARS; ++i )
-              {
-                printp( " %02X", (ULONG) lan_output_queue.buf[ i ] );
-
-                if ( 15 == (i % 16) )
-                {
-                  int j;
-
-                  printp ( "    " );
-                  for ( j = i - 15; j <= i; j++ )
-                    {
-                      if ( lan_output_queue.buf[ j ] >= ' ' &&
-                          lan_output_queue.buf[ j ] < 127 )
-                        printp ( "%c", lan_output_queue.buf[ j ] );
-                      else
-                        printp ( "." );
-                    }
-                  printp( "\n    " );
-                }
-
-                else if ( 7 == (i % 8) )
-                {
-                  printp( " " );
-                }
-
-              }
-
-              printp( "\n" );
-
-              break;
-            }
-
-          case 0x0F: /* Fetch next character in Queue */
-            {
-              c = lan_next_queue_char( &lan_output_queue );
-
-              if ( c )
-              {
-                printp( "\n\n  Next Character: " );
-                if (  0x21 <= c  &&  c <= 0x7F )
-                {
-                  printp( "%c\n\n", (ULONG) c );
-                }
-
-                else if ( 0x20 == c )
-                {
-                  printp( "<space>\n\n" );
-                }
-
-                else
-                {
-                  printp( "%02X\n\n", (ULONG) c );
-                }
-              }
-
-              else
-              {
-                printp( "\n\n  Input Queue EMPTY ...\n\n" );
-              }
-
-              break;
-            }
-
-          default:
-            {
-            printp( "\n\n  *** SYNTAX Error  -  Invalid P2 ...\n\n" );
-            not_done_code = BOGUS_P2;
-            break;
-            }
-        }
-
-        break;
-      }
-
-
-    case LAN_ECHO:
-      {
-
-        switch ( parm_1 )
-        {
-
-          case 0x0E:
-            {
-              test_echo = ENABLED;
-              printp( "\n\n  Test echo ENABLED ...\n\n" );
-              break;
-            }
-
-          case 0x0D:
-            {
-              test_echo = DISABLED;
-              printp( "\n\n  Test echo DISABLED ...\n\n" );
-              break;
-            }
-
-          default:
-            {
-              printp( "\n\n  *** SYNTAX Error  -  Invalid P2 ...\n\n" );
-              not_done_code = BOGUS_P2;
-              break;
-            }
-        }
-
-        break;
-      }
-
-
-    case LAN_PUTC:
-      {
-
-        if ( 0x20 < parm_1  &&  parm_1 < 0x7F )
-        {
-          if ( lan_put_char( (UCHAR) parm_1 ) )
-          {
-            printp( "\n\n  *** 'lan_put_char' Error ...\n" );
-          }
-
-          else
-          {
-            printp( "\n\n  O.K. ...\n" );
-          }
-
-        }
-
-        else
-        {
-          printp( "\n\n  *** Error  -  character must be in the 0x21-0x7E range ...\n" );
-          not_done_code = BOGUS_P2;
-        }
-
-        break;
-      }
-
-/***
-    case LAN_WPM:
-      {
-
-        if ( write_to_protected_mem( (void *) parm_1, (unsigned short) parm_2 ) )
-        {
-          printp( "\n  Write to protected memory FAILED ...\n" );
-        }
-
-        break;
-      }
-***/
-
-    case 0: /* no argument -- print menu */
-      {
-        lan_util_menu( );
-        break;
-      }
-
-
-    default:
-      {
-        parm_2 = 0;  /* to supress compiler warning with 'LAN_WPM' case disabled */
-
-        printp( "\n\n  *** SYNTAX Error  -  Invalid P1 ...\n\n" );
-        not_done_code = BOGUS_P1;
-        break;
-      }
-
-
-  } /*  End of 'switch ( opcode )'. */
-
-
-return( not_done_code );
-}
-/* end of 'lan_util'
- *===========================================================================*/
-
-
-                  /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*
-                  *                                     *
-                  *         Local Module Functions      *
-                  *                                     *
-                  *%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_reset
- *
- * DESCRIPTION:     Resets the LAN UART by strobing the 'RST_LAN_UART' bit in the
- *                  Shared Control 1 area.
- *
- *                             1 _|       ______
- *                                |      |      |
- *                          Bit   |      |      |
- *                                |      |      |
- *                             0 _|______|      |______
- *                                |---------------------> t
- *
- * RETURN VALUE:    None.
- *
- * USED GLOBAL VARIABLES:
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- * NOTES:           H/W configuration requires that a byte in the shared
- *                  control 1 area must be read before being written.
- *
- *---------------------------------------------------------------------------*/
-
-static  void    lan_reset( void )
-
-{
-
-  while ( *P_RST_LAN_UART_REG & M_RST_LAN_UART )
-  {
-    *P_RST_LAN_UART_REG &= ~M_RST_LAN_UART;     /* 0 */
-  }
-
-  while ( !(*P_RST_LAN_UART_REG & M_RST_LAN_UART) )
-  {
-    *P_RST_LAN_UART_REG |= M_RST_LAN_UART;      /* 1 */
-  }
-
-  while ( *P_RST_LAN_UART_REG & M_RST_LAN_UART )
-  {
-    *P_RST_LAN_UART_REG &= ~M_RST_LAN_UART;     /* 0 */
-  }
-
-}
-/* end of 'lan_reset'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_configure
- *
- *
- * DESCRIPTION:
- *
- *
- * RETURN VALUE:
- *
- *
- * USED GLOBAL VARIABLES:
- *
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- *
- * NOTES:
- *
- *
- *
- *---------------------------------------------------------------------------*/
-
-static  void    lan_configure( void )
-
-{
-
-  *P_LAN_CR = UART_CR_RESET_MR_PTR;       /*  Points to MR1.        */
-  *P_LAN_CR = UART_CR_RESET_RVCR;         /*  Receiver disabled.    */
-  *P_LAN_CR = UART_CR_RESET_XMTR;         /*  Transmitter disabled. */
-  *P_LAN_CR = UART_CR_RESET_ERROR_STATUS;
-  *P_LAN_CR = UART_CR_RESET_BRK_CHG_INT;
-
-  *P_LAN_MR1 = DEFAULT_LAN_MR1;
-  *P_LAN_MR2 = DEFAULT_LAN_MR2;
-
-  *P_LAN_ACR = DEFAULT_LAN_ACR;
-
-  *P_LAN_CSR = UART_CSR_BR_9600;
-  baud_rate_idx = 2;
-
-  *P_LAN_CTUR = DEFAULT_LAN_CTUR;
-  *P_LAN_CTLR = DEFAULT_LAN_CTLR;
-
-  *P_LAN_CR = (UART_CR_START_CNTR_TIMER | UART_CR_ENABLE_XMTR | UART_CR_ENABLE_RCVR);
-
-  lan_shadow_imr = UART_IMR_RxRDY;        /*  Enable only 'RxRDY' interrupt from UART. */
-  *P_LAN_IMR = lan_shadow_imr;
-
-  tx_by_intr = 0;
-  tx_by_poll = 0;
-
-  return;
-}
-/* end of 'lan_configure'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_init_queue
- *
- * DESCRIPTION:
- *
- * RETURN VALUE:    None.
- *
- * USED GLOBAL VARIABLES:
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- * NOTES:
- *
- *---------------------------------------------------------------------------*/
-
-static  void    lan_init_queue( T_RS232_QUEUE *p_queue )
-
-{
-  long i;
-
-    /*
-    *   We set "head" equal to "tail" implying the queue is empty,
-    *   BUT the "head" and "tail" should each point to valid queue
-    *   positions.
-    */
-
-  p_queue->head_index = 0;
-  p_queue->tail_index = 0;
-
-  p_queue->overflows = 0;
-
-  p_queue->gdb_packet_start = -1;
-  p_queue->gdb_packet_end   = -1;
-
-  p_queue->gdb_packet_csum1 = -1;
-  p_queue->gdb_packet_csum2 = -1;
-
-  for ( i = 0; i < MAX_RS232_CHARS; ++i )
-  {
-    p_queue->buf[ i ] = 0;
-  }
-
-  return;
-}
-/* end of 'lan_init_queue'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_add_to_queue
- *
- *
- * DESCRIPTION:     Adds the specified character to the tail of the
- *                  specified queue.  Observes "oldest thrown on floor"
- *                  rule (i.e. the queue is allowed to "wrap" and the
- *                  input character is unconditionally placed at the
- *                  tail of the queue.
- *
- *
- * RETURN VALUE:    None.
- *
- *
- * USED GLOBAL VARIABLES:
- *
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- *
- * NOTES:
- *
- *
- *---------------------------------------------------------------------------*/
-
-static  void    lan_add_to_queue( long c, T_RS232_QUEUE *p_queue )
-
-{
-
-  if ( p_queue )    /*  Sanity check. */
-  {
-
-    if ( c & 0x000000FF )   /*  We don't allow NULL characters to be added to a queue.  */
-    {
-        /*  Insert the new character at the tail of the queue.  */
-
-      p_queue->buf[ p_queue->tail_index ] = (UCHAR) (c & 0x000000FF);
-
-        /*  Increment the tail index. */
-
-      if ( MAX_RS232_CHARS <= ++(p_queue->tail_index) )
-      {
-        p_queue->tail_index = 0;
-      }
-
-        /*  Check for wrapping (i.e. overflow). */
-
-      if ( p_queue->head_index == p_queue->tail_index )
-      {
-          /*  If the tail has caught up to the head record the overflow . . . */
-
-        ++(p_queue->overflows);
-
-          /*  . . . then increment the head index.  */
-
-        if ( MAX_RS232_CHARS <= ++(p_queue->head_index) )
-        {
-          p_queue->head_index = 0;
-        }
-
-      }
-
-    } /*  End of 'if ( c & 0x000000FF )'. */
-
-  } /*  End of 'if ( p_queue )'.  */
-
-
-  return;
-}
-/* end of 'lan_add_to_queue'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_next_queue_char
- *
- * DESCRIPTION:
- *
- * RETURN VALUE:
- *
- * USED GLOBAL VARIABLES:
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- * NOTES:
- *
- *---------------------------------------------------------------------------*/
-
-static  UCHAR   lan_next_queue_char( T_RS232_QUEUE *p_queue )
-
-{
-  UCHAR   c;
-
-
-  c = 0;
-
-  if ( p_queue )
-  {
-
-    if ( p_queue->head_index != p_queue->tail_index )
-    {
-        /*  Return the 'oldest' character in the queue. */
-
-      c = p_queue->buf[ p_queue->head_index ];
-
-        /*  Increment the head index. */
-
-      if ( MAX_RS232_CHARS <= ++(p_queue->head_index) )
-      {
-        p_queue->head_index = 0;
-      }
-
-    }
-
-  } /*  End of 'if ( p_queue )'.  */
-
-
-  return( c );
-}
-
-/* end of 'lan_next_queue_char'
- *===========================================================================*/
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   lan_util_menu
- *
- * DESCRIPTION:     Prints out a brief help on the LAN UART control utility.
- *
- * RETURN VALUE:    None.
- *
- * USED GLOBAL VARIABLES: None.
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS: None.
- *
- * NOTES: None.
- *
- *---------------------------------------------------------------------------*/
-
-static  void    lan_util_menu( void )
-
-{
-
-  /*
-   * Multiply calling printp() below is made due to the limitations
-   * of printp(), incapable of handling long formatting constants:
-   */
-
- printp( "\n               -- Options --\n\n" );
-
-  printp( "    %2X,'INIT' ............... Reset & (Re)INITIALIZE Interface.\n", (ULONG) LAN_UTIL_CODE );
-  printp( "    %2X,'BAUD',<rate> ........ Set BAUD Rate.\n", (ULONG) LAN_UTIL_CODE );
-  printp( "    %2X,'INTR',<mode> ........ Toggle 'RxRDY' Interrupts.\n", (ULONG) LAN_UTIL_CODE );
-  printp( "    %2X,'XMT',<mode> ......... Toggle TRANSMIT-via-backplane.\n", (ULONG) LAN_UTIL_CODE );
-  printp( "    %2X,'STAT' ............... Display STATUS.\n", (ULONG) LAN_UTIL_CODE );
-  printp( "    %2X,'ECHO',<mode> ........ Enable/Disable Test ECHO.\n", (ULONG) LAN_UTIL_CODE );
-  printp( "    %2X,'IN',<action> ........ Access INPUT Queue.\n", (ULONG) LAN_UTIL_CODE );
-  printp( "    %2X,'OUT',<action> ....... Access OUTPUT Queue.\n\n", (ULONG) LAN_UTIL_CODE );
-
-  printp( "    %2X,'PUTC',<char> ........ Output a Character (i.e. <char>).\n\n", (ULONG) LAN_UTIL_CODE );
-
-/***
-  printp( "    %2X,'WPM',address,word ... Write Protected Memory Test.\n\n", (ULONG) LAN_UTIL_CODE );
-***/
-
-  printp( "    <rate>:  4800  <mode>:  E - enable   <action>:  C - clear/reset\n" );
-  printp( "             9600           D - disable             D - display\n" );
-  printp( "            19200                                   F - fetch next char\n" );
-  printp( "            38400\n" );
-}
-/* end of 'lan_util_menu'
- *===========================================================================*/
-
-
-/* Thu Feb  5 17:14:41 EST 1998  CYGNUS...CYGNUS...CYGNUS...CYGNUS...CYGNUS...CYGNUS...CYGNUS...CYGNUS */
-
-
-static  long    get_gdb_input( long c, T_RS232_QUEUE * p_input_q )
-
-{
-
-  /* Now to detect when we've got a gdb packet... */
-
-  if ( '$' == c ) { /* char marks beginning of a packet */
-
-      if ( -1 != p_input_q->gdb_packet_start ||
-           -1 != p_input_q->gdb_packet_end   ||
-           -1 != p_input_q->gdb_packet_csum1 ||
-           -1 != p_input_q->gdb_packet_csum2 ) { /* PROTOCOL ERROR */
-
-        /* NEW: Actually, this probably means that we muffed a packet,
-           and GDB has already resent it.  The thing to do now is to
-           throw away the one we WERE working on, but immediately start
-           accepting the new one.  Don't NAK, or GDB will have to try
-           and send it yet a third time!  */
-
-          /*NACK_PKT( );*/    /*<ETHERNET>*/
-          discard_packet( );                    /* throw away old packet */
-          lan_add_to_queue ('$', p_input_q);    /* put the new "$" back in */
-          return 0;
-      } else {          /* match new "$" */
-        p_input_q->gdb_packet_start = p_input_q->tail_index;
-        p_input_q->gdb_packet_end =
-          p_input_q->gdb_packet_csum1 =
-            p_input_q->gdb_packet_csum2 = -1;
-      }
-    } else if ( '#' == c ) { /* # marks end of packet (except for checksum) */
-
-      if ( -1 == p_input_q->gdb_packet_start ||
-           -1 != p_input_q->gdb_packet_end   ||
-           -1 != p_input_q->gdb_packet_csum1 ||
-           -1 != p_input_q->gdb_packet_csum2 ) { /* PROTOCOL ERROR */
-
-          /* Garbled packet.  Discard, but do not NAK.  */
-
-          /*NACK_PKT( );*/    /*<ETHERNET>*/
-          discard_packet( );
-          return -1;
-      }
-      p_input_q->gdb_packet_end = p_input_q->tail_index;
-      p_input_q->gdb_packet_csum1 = p_input_q->gdb_packet_csum2 = -1;
-
-  } else if ( -1 != p_input_q->gdb_packet_start &&
-              -1 != p_input_q->gdb_packet_end) {
-
-    if ( isxdigit( c ) ) { /* char is one of two checksum digits for packet */
-
-      if ( -1 == p_input_q->gdb_packet_csum1 &&
-           LAN_Q_MOD( p_input_q->gdb_packet_end + 1 ) ==
-           p_input_q->tail_index ) {
-
-        /* first checksum digit */
-
-        p_input_q->gdb_packet_csum1 = p_input_q->tail_index;
-        p_input_q->gdb_packet_csum2 = -1;
-
-      } else if ( -1 == p_input_q->gdb_packet_csum2 &&
-                  LAN_Q_MOD( p_input_q->gdb_packet_end + 2 ) ==
-                  p_input_q->tail_index ) {
-
-        /* second checksum digit: packet is complete! */
-
-        p_input_q->gdb_packet_csum2 = p_input_q->tail_index;
-        getpacket();    /* got a packet -- extract it */
-
-      } else { /* probably can't happen (um... three hex digits?) */
-
-        /* PROTOCOL ERROR */
-        /* Not sure how this can happen, but ...
-           discard it, but do not NAK it.  */
-        /*NACK_PKT( );*/    /*<ETHERNET>*/
-        discard_packet( );
-        return -1;
-      }
-
-    } else { /* '#' followed by non-hex char */
-
-      /* PROTOCOL ERROR */
-      /* Bad packet -- discard but do not NAK */
-      /*NACK_PKT( );*/    /*<ETHERNET>*/
-      discard_packet( );
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-
-
-
-#ifdef    STANDALONE
-
-/* stand-alone stand-alone stand-alone stand-alone stand-alone stand-alone
-   stand-alone                                                 stand-alone
-   stand-alone Enable stand-alone build, for ease of debugging stand-alone
-   stand-alone                                                 stand-alone
-   stand-alone stand-alone stand-alone stand-alone stand-alone stand-alone */
-
-long write_to_protected_mem (addr, word)
-     void *addr;
-     unsigned short word;
-{
-  return 0;
-}
-
-
-char dummy_memory[0x4000];
-
-int main ( void )
-{
-  long c;
-
-  lan_init_queue( &lan_input_queue );
-  printf( "Stand-alone EMC 'stub', pid = %d\n", getpid( ) );
-  printf( "Start of simulated 'memory': 0x%08x\n", &dummy_memory);
-  while ( (c = getc( stdin ) ) != EOF )
-    {
-      if ( c == '\\' )  /* escape char */
-        break;
-
-      lan_add_to_queue( c, &lan_input_queue );
-      get_gdb_input (c, &lan_input_queue);
-      fflush( stdout );
-    }
-
-  printf( "Goodbye!\n" );
-  exit( 0 );
-}
-
-#define SRAM_START      ((void *) (&dummy_memory[0] + 0x00000000))
-#define SRAM_END        ((void *) (&dummy_memory[0] + 0x00000400))
-
-#define RO_AREA_START   ((void *) (&dummy_memory[0] + 0x00000100))
-#define RO_AREA_END     ((void *) (&dummy_memory[0] + 0x00000300))
-
-#define NVD_START       ((void *) (&dummy_memory[0] + 0x00003000))
-#define NVD_END         ((void *) (&dummy_memory[0] + 0x00003100))
-
-#else   /* normal stub (not stand-alone) */
-
-#define SRAM_START              ((void *) 0x00000000)
-#define SRAM_END                ((void *) 0x00400000)
-
-#define RO_AREA_START           ((void *) 0x00100000)
-#define RO_AREA_END             ((void *) 0x00300000)
-
-#define NVD_START               ((void *) 0x03000000)
-#define NVD_END                 ((void *) 0x03100000)
-
-#endif /* STANDALONE */
-
-
-
-
-/* gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb
-   gdb                                                                 gdb
-   gdb                Here begins the gdb stub section.                gdb
-   gdb          The following functions were added by Cygnus,          gdb
-   gdb             to make this thing act like a gdb stub.             gdb
-   gdb                                                                 gdb
-   gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb gdb */
-
-
-/* ------------------- global defines and data decl's -------------------- */
-
-#define hexchars        "0123456789abcdef"
-
-/* there are 180 bytes of registers on a 68020 w/68881      */
-/* many of the fpa registers are 12 byte (96 bit) registers */
-#define NUMREGBYTES          180
-#define NUMREGS              29
-#define REGISTER_BYTE(regno) regno
-
-enum regnames { D0, D1, D2, D3, D4, D5, D6, D7,
-                A0, A1, A2, A3, A4, A5, A6, A7,
-                PS, PC,
-                FP0, FP1,
-                FP2, FP3,
-                FP4, FP5,
-                FP6, FP7,
-                FPCONTROL, FPSTATUS, FPIADDR
-              };
-
-unsigned long registers[NUMREGBYTES/4];
-
-static long remote_debug;
-
-#define BUFMAX                MAX_IO_BUF_SIZE
-static char inbuffer[BUFMAX], outbuffer[BUFMAX];
-static char spare_buffer[BUFMAX];
-
-
-struct stub_trace_frame
-{
-  int                    valid;
-  unsigned long          frame_id;
-  unsigned long          tdp_id;
-  FRAME_DEF             *frame_data;
-  COLLECTION_FORMAT_DEF *format;
-  unsigned long          traceregs[NUMREGBYTES/4];
-  unsigned char         *stack_data;
-  unsigned char         *memrange_data;
-} curframe;
-
-/* -------------------      function prototypes       -------------------- */
-
-void handle_request ( char * );
-
-/* -------------------         Implementation         -------------------- */
-
-static void
-discard_packet( void )
-{
-  lan_input_queue.head_index = lan_input_queue.tail_index;
-
-  lan_input_queue.gdb_packet_start =
-    lan_input_queue.gdb_packet_end   =
-      lan_input_queue.gdb_packet_csum1 =
-        lan_input_queue.gdb_packet_csum2 = -1;
-}
-
-/* Utility function: convert an ASCII isxdigit to a hex nybble */
-
-static long
-hex( char ch )
-{
-  if ( (ch >= 'A') && (ch <= 'F') )
-    return ch - 'A' + 10;
-  if ( (ch >= 'a') && (ch <= 'f') )
-    return ch - 'a' + 10;
-  if ( (ch >= '0') && (ch <= '9') )
-    return ch - '0';
-  return -1;
-}
-
-static void
-getpacket( void )
-{
-  unsigned char our_checksum, their_checksum;
-  char *copy = inbuffer;
-  unsigned char c;
-
-  our_checksum = 0;
-
-  /* first find the '$' */
-  while ((c = lan_next_queue_char ( &lan_input_queue )) != '$')
-    if (c == 0)                 /* ??? Protocol error? (paranoia) */
-      {
-          /* PROTOCOL ERROR (missing '$') */
-        /*NACK_PKT( );*/    /*<ETHERNET>*/
-        return;
-      }
-
-  /* Now copy the message (up to the '#') */
-  for (c = lan_next_queue_char ( &lan_input_queue );    /* skip  the   '$' */
-       c != 0 && c != '#';              /* stop at the '#' */
-       c = lan_next_queue_char ( &lan_input_queue ))
-    {
-      *copy++ = c;
-      our_checksum += c;
-    }
-  *copy++ = '\0';               /* terminate the copy */
-
-  if (c == 0)                   /* ??? Protocol error? (paranoia) */
-    {
-        /* PROTOCOL ERROR (missing '#') */
-      /*NACK_PKT( );*/    /*<ETHERNET>*/
-      return;
-    }
-  their_checksum  = hex( lan_next_queue_char ( &lan_input_queue ) ) << 4;
-  their_checksum += hex( lan_next_queue_char ( &lan_input_queue ) );
-
-  /* Now reset the queue packet-recognition bits */
-  discard_packet( );
-
-  if ( remote_debug ||
-      our_checksum == their_checksum )
-    {
-      ACK_PKT( );      /* good packet */
-      /* Parse and process the packet */
-      handle_request( inbuffer );
-    }
-  else
-      /* PROTOCOL ERROR (bad check sum) */
-    NACK_PKT( );
-}
-
-/* EMC will provide a better implementation
-   (perhaps just of LAN_PUT_CHAR) that does not block.
-   For now, this works.  */
-
-
-static void
-putpacket( char *str )
-{
-  unsigned char checksum;
-
-  /* '$'<packet>'#'<checksum> */
-
-  if ( VIA_ETHERNET == gdb_host_comm )
-  {
-    char  *p_out;
-    long  length;
-
-    p_out  = eth_outbuffer;
-    length = 0;
-
-
-    if ( YES == gdb_cat_ack )
-    {
-      *p_out++ = '+';
-      ++length;
-    }
-
-    gdb_cat_ack = NO;
-
-
-    *p_out++ = '$';
-    ++length;
-
-    checksum = 0;
-
-    while ( *str )
-    {
-      *p_out++ = *str;
-      ++length;
-      checksum += *str++;
-    }
-
-    *p_out++ = '#';
-    *p_out++ = hexchars[checksum >> 4];
-    *p_out = hexchars[checksum % 16];
-    length += 3;
-
-    eth_to_gdb( (UCHAR *) eth_outbuffer, length );
-  }
-
-  else
-  {
-
-      /* via RS-232 */
-    do {
-      LAN_PUT_CHAR( '$' );
-      checksum = 0;
-
-      while ( *str )
-        {
-          LAN_PUT_CHAR( *str );
-          checksum += *str++;
-        }
-
-      LAN_PUT_CHAR( '#' );
-      LAN_PUT_CHAR( hexchars[checksum >> 4] );
-      LAN_PUT_CHAR( hexchars[checksum % 16] );
-    } while ( 0 /* get_debug_char( ) != '+' */ );
-    /* XXX FIXME: not waiting for the ack. */
-
-  }
-
-}
-
-
-/*-----------------------------------------------------------------------------
- *
- * FUNCTION NAME:   gdb_get_eth_input
- *
- *
- * DESCRIPTION:
- *
- *
- * RETURN VALUE:    None.
- *
- *
- * USED GLOBAL VARIABLES:
- *
- *
- * AFFECTED GLOBAL VARIABLES/SIDE EFFECTS:
- *
- *
- * NOTES:
- *
- *
- *---------------------------------------------------------------------------*/
-
-void    gdb_get_eth_input( unsigned char *buf, long length )
-
-{
-
-  gdb_host_comm = VIA_ETHERNET;
-
-  for ( ; 0 < length; ++buf, --length)
-  {
-
-    if ( *buf == CONTROL_C )
-    {
-        /* can't stop the target, but we can tell gdb to stop waiting... */
-      discard_packet( );
-      putpacket( "S03" );       /* send back SIGINT to the debugger */
-    }
-
-    else
-    {
-      lan_add_to_queue( (long) *buf, &lan_input_queue );
-      get_gdb_input( (long) *buf, &lan_input_queue );
-    }
-
-  }
-
-
-  return;
-}
-/* end of 'gdb_get_eth_input'
- *===========================================================================*/
-
-
-
-
-/* STDOUT STDOUT STDOUT STDOUT STDOUT STDOUT STDOUT STDOUT STDOUT STDOUT
-   Stuff pertaining to simulating stdout by sending chars to gdb to be echoed.
-
-   Dear reader:
-       This code is based on the premise that if GDB receives a packet
-   from the stub that begins with the character CAPITAL-OH, GDB will
-   echo the rest of the packet to GDB's console / stdout.  This gives
-   the stub a way to send a message directly to the user.  In practice,
-   (as currently implemented), GDB will only accept such a packet when
-   it believes the target to be running (ie. when you say STEP or
-   CONTINUE); at other times it does not expect it.  This will probably
-   change as a side effect of the "asynchronous" behavior.
-
-   Functions: gdb_putchar(char ch)
-              gdb_write(char *str, int len)
-              gdb_puts(char *str)
-              gdb_error(char *format, char *parm)
- */
-
-#if 0 /* avoid compiler warning while this is not used */
-
-/* Function: gdb_putchar(int)
-   Make gdb write a char to stdout.
-   Returns: the char */
-
-static int
-gdb_putchar( long ch )
-{
-  char buf[4];
-
-  buf[0] = 'O';
-  buf[1] = hexchars[ch >> 4];
-  buf[2] = hexchars[ch & 0x0F];
-  buf[3] = 0;
-  putpacket( buf );
-  return ch;
-}
-#endif
-
-/* Function: gdb_write(char *, int)
-   Make gdb write n bytes to stdout (not assumed to be null-terminated).
-   Returns: number of bytes written */
-
-static int
-gdb_write( char *data, long len )
-{
-  char *buf, *cpy;
-  long i;
-
-  buf = outbuffer;
-  buf[0] = 'O';
-  i = 0;
-  while ( i < len )
-    {
-      for ( cpy = buf+1;
-           i < len && cpy < buf + BUFMAX - 3;
-           i++ )
-        {
-          *cpy++ = hexchars[data[i] >> 4];
-          *cpy++ = hexchars[data[i] & 0x0F];
-        }
-      *cpy = 0;
-      putpacket( buf );
-    }
-  return len;
-}
-
-/* Function: gdb_puts(char *)
-   Make gdb write a null-terminated string to stdout.
-   Returns: the length of the string */
-
-static int
-gdb_puts( char *str )
-{
-  return gdb_write( str, strlen( str ) );
-}
-
-/* Function: gdb_error(char *, char *)
-   Send an error message to gdb's stdout.
-   First string may have 1 (one) optional "%s" in it, which
-   will cause the optional second string to be inserted.  */
-
-#if 0
-static void
-gdb_error( char *format, char *parm )
-{
-  static char buf[400];
-  char *cpy;
-  long len;
-
-  if ( remote_debug )
-    {
-      if ( format && *format )
-        len = strlen( format );
-      else
-        return;             /* empty input */
-
-      if ( parm && *parm )
-        len += strlen( parm );
-
-      for ( cpy = buf; *format; )
-        {
-          if ( format[0] == '%' && format[1] == 's' ) /* include 2nd string */
-            {
-              format += 2;          /* advance two chars instead of just one */
-              while ( parm && *parm )
-                *cpy++ = *parm++;
-            }
-          else
-            *cpy++ = *format++;
-        }
-      *cpy = '\0';
-      gdb_puts( buf );
-    }
-}
-#endif
-
-static void gdb_note (char *, int);
-static int  error_ret (int, char *, int);
-
-static unsigned long
-elinum_to_index (unsigned long elinum)
-{
-  if ((elinum & 0xf0) == 0xd0)
-    return (elinum & 0x0f);
-  else if ((elinum & 0xf0) == 0xa0)
-    return (elinum & 0x0f) + 8;
-  else
-    return -1;
-}
-
-static long
-index_to_elinum (unsigned long index)
-{
-  if (index <= 7)
-    return index + 0xd0;
-  else if (index <= 15)
-    return (index - 8) + 0xa0;
-  else
-    return -1;
-}
-
-
-/*
-  READMEM READMEM READMEM READMEM READMEM READMEM READMEM READMEM READMEM
-
-  The following code pertains to reading memory from the target.
-  Some sort of exception handling should be added to make it safe.
-
-  READMEM READMEM READMEM READMEM READMEM READMEM READMEM READMEM READMEM
-
-  Safe Memory Access:
-
-  All reads and writes into the application's memory will pass thru
-  get_uchar() or set_uchar(), which check whether accessing their
-  argument is legal before actual access (thus avoiding a bus error).
-
-  */
-
-enum { SUCCESS = 0, FAIL = -1 };
-
-#if 0
-static long get_uchar ( const unsigned char * );
-#endif
-static long set_uchar ( unsigned char *, unsigned char );
-static long read_access_violation ( const void * );
-static long write_access_violation ( const void * );
-static long read_access_range(const void *, long);
-static DTC_RESPONSE find_memory(unsigned char *,long,unsigned char **,long *);
-
-static int
-dtc_error_ret (int ret, char *src, DTC_RESPONSE code)
-{
-  if (src)
-    sprintp (spare_buffer,
-             "'%s' returned DTC error '%s'.\n", src, get_err_text (code));
-  else
-    sprintp (spare_buffer, "DTC error '%s'.\n", get_err_text (code));
-
-  gdb_puts (spare_buffer);
-  return ret;
-}
-
-
-#if 0
-/* I think this function is unnecessary since the introduction of
-   adbg_find_memory_addr_in_frame.  */
-
-/* Return the number of expressions in the format associated with a
-   given trace frame.  */
-static int
-count_frame_exprs (FRAME_DEF *frame)
-{
-  CFD *format;
-  T_EXPR *expr;
-  int num_exprs;
-
-  /* Get the format from the frame.  */
-  get_frame_format_pointer (frame, &format);
-
-  /* Walk the linked list of expressions, and count the number of
-     expressions we find there.  */
-  num_exprs = 0;
-  for (expr = format->p_cfd_expr; expr; expr = expr->next)
-    num_exprs++;
-
-  return num_exprs;
-}
-#endif
-
-#if 0
-/* Function: get_frame_addr
- *
- * Description: If the input memory address was collected in the
- *     current trace frame, then lookup and return the address
- *     from within the trace buffer from which the collected byte
- * may be retrieved.  Else return -1.  */
-
-unsigned char *
-get_frame_addr ( const unsigned char *addr )
-{
-  unsigned char *base, *regs, *stack, *mem;
-  CFD *dummy;
-  DTC_RESPONSE ret;
-
-  /* first, see if addr is on the saved piece of stack for curframe */
-  if (curframe.format->stack_size > 0 &&
-      (base = (unsigned char *) curframe.traceregs[A7]) <= addr  &&
-      addr < base + curframe.format->stack_size)
-    {
-      gdb_puts("STUB: get_frame_addr: call get_addr_to_frame_regs_stack_mem\n");
-      if ((ret = get_addr_to_frame_regs_stack_mem (curframe.frame_data,
-						   &dummy,
-						   (void *) &regs,
-						   (void *) &stack,
-                                                   (void *) &mem))
-          != OK_TARGET_RESPONSE)
-        return (void *) dtc_error_ret (-1,
-                                       "get_addr_to_frame_regs_stack_mem",
-                                       ret);
-      else
-        return stack + (addr - base);
-    }
-
-  /* Next, try to find addr in the current frame's expression-
-     collected memory blocks.  I'm sure this is at least quadradic in
-     time.  */
-  {
-    int num_exprs = count_frame_exprs (curframe.frame_data);
-    int expr, block;
-
-    /* Try each expression in turn.  */
-    for (expr = 0; expr < num_exprs; expr++)
-      {
-	for (block = 0; ; block++)
-	  {
-	    T_EXPR_DATA *data;
-	    if (adbg_get_expr_data (curframe.frame_data,
-				    'x', expr, block,
-				    &data)
-		!= OK_TARGET_RESPONSE)
-	      break;
-	    else if ((unsigned char *) data->address <= addr
-		     && addr < ((unsigned char *) data->address + data->size))
-	      {
-		/* We have found the right block; is it valid data?
-		   Upper-case stamps mean bad data.  */
-		if ('A' <= data->stamp && data->stamp <= 'Z')
-		  {
-		    gdb_puts("STUB: get_frame_addr: adbg_get_expr_data INVALID\n");
-		    return (unsigned char *) -1;
-		  }
-		else
-		  {
-		    if (remote_debug > 1)
-		      {
-			sprintp(spare_buffer,
-				"STUB: get_frame_addr: got it [%x,%x)\n",
-				data->address, data->address + data->size);
-			gdb_puts(spare_buffer);
-		      }
-
-		    return (((unsigned char *) &data->data)
-			    + (addr - (unsigned char *) data->address));
-		  }
-	      }
-	  }
-      }
-  }
-
-  /* not found, return error */
-  return (unsigned char *) -1;
-}
-
-/*============================================================*/
-
-static long get_uchar ( const unsigned char * addr )
-{
-  unsigned char *frame_addr;
-
-  if ( read_access_violation ( addr ) )
-    return ( -1 ); /* Access error */
-
-  if (curframe.valid)   /* if debugging a trace frame? */
-    {
-      /* If the requested address was collected in the current frame,
-       * then fetch and return the data from the trace buffer.
-       */
-      if ((frame_addr = get_frame_addr (addr)) != (unsigned char *) -1)
-        return ( *frame_addr );
-      /* If the requested address is in the Code Section,
-       * let's be magnanimous and read it anyway (else we shall
-       * not be able to disassemble, find function prologues, etc.)
-       */
-      else if (CS_CODE_START <= (unsigned long) addr &&
-               (unsigned long) addr < CS_CODE_START + CS_CODE_SIZE)
-        return (*addr);
-      else
-        return ( -1 );  /* "Access error" (the data was not collected) */
-    }
-  else
-    /* Not debugging a trace frame, read the data from live memory. */
-    return ( *addr ); /* Meaningful result >= 0 */
-}
-#endif
-
-/*============================================================*/
-
-static long set_uchar ( unsigned char * addr, unsigned char val )
-{
-  long check_result = write_access_violation ( addr );
-
-  if ( check_result != 0L )
-    return ( check_result ); /* Access error */
-
-  return ( *addr = val );    /* Successful writing */
-}
-
-/*============================================================*/
-
-/*
- * Function read_access_violation() below returns TRUE if dereferencing
- * its argument for reading would cause a bus error - and FALSE otherwise:
- */
-
-static long read_access_violation ( const void * addr )
-{
-  return ( ( ( addr < SRAM_START ) || ( addr >= SRAM_END ) ) &&
-           ( ( addr < NVD_START )  || ( addr >= NVD_END ) ) );
-}
-
-/*============================================================*/
-
-/*
- * Function write_access_violation() below returns zero if dereferencing
- * its argument for writing is safe, -1 on a soft error (the argument
- * falls into the write-protected area), -2 on a hard error (the argument
- * points to a non-existent memory location). In other words, it returns
- * FALSE when no bus error is expected - and an error code otherwise:
- */
-
-static long write_access_violation ( const void * addr )
-{
-  /*
-   * The boundaries of the write-protected area have to be received via
-   * an API provided in the Symmetrix core code. For now, these limits
-   * are hard-coded:
-   */
-
-  if ( ( addr >= RO_AREA_START ) && ( addr < RO_AREA_END ) )
-    return ( -1 ); /* soft error */
-
-  if ( ( ( addr < SRAM_START ) || ( addr >= SRAM_END ) ) &&
-       ( ( addr < NVD_START )  || ( addr >= NVD_END ) ) )
-    return ( -2 ); /* hard error */
-
-  return ( 0 );
-}
-
-
-/* read_access_range is like read_access_violation,
-   but returns the number of bytes we can read w/o faulting.
-   that is, it checks an address range and tells us what portion
-   (if any) of the prefix is safe to read without a bus error */
-static long
-read_access_range(const void *addr, long count)
-{
-  if ((addr >= SRAM_START) && (addr < SRAM_END))
-    {
-      if ((char *)addr + count < (char *)SRAM_END)
-	return (count);
-      else
-	return ((char *)SRAM_END - (char *)addr);
-    }
-  else if (((char *)addr >= (char *)NVD_START) &&
-	   ((char *)addr < (char *)NVD_END))
-    {
-      if ((char *)addr + count < (char *)NVD_END)
-	return (count);
-      else
-	return ((char *)NVD_END - (char *)addr);
-    }
-  else
-    return (0);
-}
-
-/* Convert the memory pointed to by mem into hex, placing result in buf.
-   Return SUCCESS or FAIL.
-   If MAY_FAULT is non-zero, then we should return FAIL in response to
-   a fault; if zero treat a fault like any other fault in the stub.  */
-
-static long
-mem2hex(unsigned char *mem, char *buf, long count, long may_fault)
-{
-  long ndx;
-  long ndx2;
-  long ch;
-  long incr;
-  unsigned char *location;
-  DTC_RESPONSE status;
-
-  if (may_fault)
-    {
-      for (ndx = 0, incr = 1; (ndx < count) && (incr > 0); ndx += incr)
-	{
-	  status = find_memory(mem, count - ndx, &location, &incr);
-
-	  if (status == OK_TARGET_RESPONSE)
-	    {
-	      if (incr > 0)
-		{
-		  for (ndx2 = 0; ndx2 < incr; ndx2++)
-		    {
-		      ch = *location++;
-		      *buf++ = hexchars[ch >> 4];
-		      *buf++ = hexchars[ch & 0xf];
-		    }
-		  mem += incr;
-		}
-	      else if (incr <= 0) /* should never happen */
-		{
-		  *buf = 0;
-		  return (0);
-		}
-	    }
-	  else if (status == NOT_FOUND_TARGET_RESPONSE)
-	    {
-	      *buf = 0;
-	      return (ndx);	/* return amount copied */
-	    }
-	  else
-	    {
-	      *buf = 0;
-	      return (0);	/* XXX: how do we tell the user the status? */
-	    }
-	}
-      *buf = 0;
-      return (count);
-    }
-  else
-    {
-      for (ndx = 0; ndx < count; ndx++)
-	{
-	  ch = *mem++;
-	  *buf++ = hexchars[ch >> 4];
-	  *buf++ = hexchars[ch & 0xf];
-	}
-      *buf = 0;
-      return (count);		/* we copied everything */
-    }
-}
-
-static DTC_RESPONSE
-find_memory(unsigned char *mem, long count,
-	    unsigned char **location, long *incr)
-{
-  DTC_RESPONSE retval;
-  long length;
-
-  /* figure out how much of the memory range we can read w/o faulting */
-  count = read_access_range(mem, count);
-  if (count == 0)
-    return (NOT_FOUND_TARGET_RESPONSE);
-
-  if (curframe.valid)
-    {
-      unsigned char *mem_block;
-      unsigned char *mem_addr;
-      unsigned long mem_size;
-      unsigned long mem_stamp;
-
-      retval = adbg_find_memory_addr_in_frame(curframe.frame_data, mem,
-					      (unsigned long **)&mem_block,
-					      (unsigned long **)&mem_addr,
-					      &mem_size, &mem_stamp);
-
-      switch (retval)
-	{
-	case OK_TARGET_RESPONSE:
-#if 0
-	  printp("FOUND: mem %x block %x addr %x size %d stamp %x\n",
-		 mem, mem_block, mem_addr, mem_size, mem_stamp);
-#endif
-	  *location = mem_block + (mem - mem_addr);
-	  length = mem_size - (mem - mem_addr);
-
-	  if (length < count)
-	    *incr = length;
-	  else
-	    *incr = count;
-
-	  break;
-
-	case NOT_FOUND_TARGET_RESPONSE:
-	case NEAR_FOUND_TARGET_RESPONSE:
-#if 0
-	  printp("NOT FOUND: mem %x, checking code region\n", mem);
-#endif
-	  /* check to see if it's in the code region */
-	  if ((CS_CODE_START <= (long)mem) &&
-	      ((long)mem < CS_CODE_START + CS_CODE_SIZE))
-	    {
-	      /* some or all of the address range is in the code */
-	      *location = mem;
-	      if ((long)mem + count <= CS_CODE_START + CS_CODE_SIZE)
-		*incr = count; /* it's totally in the code */
-	      else
-		/* how much is in the code? */
-		*incr = CS_CODE_START + CS_CODE_SIZE - (long)mem;
-#if 0
-	      printp("FOUND in code region: %x\n", mem);
-#endif
-	      retval = OK_TARGET_RESPONSE;
-	    }
-	  else
-	    retval = NOT_FOUND_TARGET_RESPONSE;
-
-	  break;
-
-	default:
-#if 0
-	  printp("BAD RETURN: %d\n", retval);
-#endif
-	  retval = NOT_FOUND_TARGET_RESPONSE;
-	  break;
-	}
-    }
-  else
-    {
-      *location = mem;
-      *incr = count;
-      retval = OK_TARGET_RESPONSE;
-    }
-
-  return (retval);
-}
-
-/* Convert the hex array pointed to by buf into binary to be placed in mem.
-   Return SUCCESS or FAIL.  */
-
-static long
-hex2mem( char *buf, unsigned char *mem, long count, long may_fault )
-{
-  long i, ch;
-
-  for ( i=0; i<count; i++ )
-    {
-      ch = hex( *buf++ ) << 4;
-      ch = ch + hex( *buf++ );
-      if ( may_fault )
-        {
-          ch = set_uchar( mem++, ch );
-          if ( ch < 0 )    /* negative return indicates error */
-            return FAIL;
-        }
-      else
-        *mem++ = ch;
-    }
-  return SUCCESS;
-}
-
-/**********************************************/
-/* WHILE WE FIND NICE HEX CHARS, BUILD AN INT */
-/* RETURN NUMBER OF CHARS PROCESSED           */
-/**********************************************/
-
-static int
-hexToInt( char **ptr, unsigned long *intValue )
-{
-  long numChars = 0;
-  long hexValue;
-
-  *intValue = 0;
-  while ( **ptr )
-    {
-      hexValue = hex( **ptr );
-      if ( hexValue >=0 )
-        {
-          *intValue = (*intValue << 4) | hexValue;
-          numChars ++;
-        }
-      else
-        break;
-      (*ptr)++;
-    }
-  return numChars;
-}
-
-static volatile long gdb_handling_trap1;
-static volatile long gdb_handling_sstrace;
-static volatile long gdb_signo;
-
-/*
-   Here is the "callable" stub entry point.
-   Call this function with a GDB request as an argument,
-   and it will service the request and return.
-
-   May be further broken up as we go along, with individual requests
-   broken out as separate functions.
- */
-
-static char * handle_trace_query (char *);
-static char * handle_trace_set (char *);
-static int    handle_format (char **request, CFD *format);
-static unsigned long crc32 (unsigned char *buf, int len, unsigned long crc);
-static char * crc_query (char *);
-static char * handle_test (char *);
-
-void
-handle_request( char *request )
-{
-#if 0
-  remote_debug = 2;
-#endif
-  switch( *request++ )
-    {
-    case 'k':		/* "kill" */
-      curframe.valid = FALSE;
-      putpacket ("");
-      break;
-    case 'D':		/* "detach" */
-      curframe.valid = FALSE;
-      putpacket ("");
-      break;
-    default:            /* Unknown code.  Return an empty reply message. */
-      putpacket( "" );  /* return empty packet */
-      break;
-
-    case 'H':           /* Set thread for subsequent operations.
-    Hct...                 c = 'c' for thread used in step and continue;
-                           t... can be -1 for all threads.
-                           c = 'g' for thread used in other operations.
-                           If zero, pick a thread, any thread.  */
-
-      putpacket( "OK" );
-      break;
-
-    case 'g':           /* Read registers.
-                           Each byte of register data is described by
-                           two hex digits.  registers are in the
-                           internal order for GDB, and the bytes in a
-                           register are in the same order the machine
-                           uses.  */
-      {
-        /* Return the values in (one of) the registers cache(s).
-           Several situations may pertain:
-           1) We're synchronous, in which case the "registers" array
-              should actually be current.
-           2) We're asynchronous, in which case the "registers" array
-              holds whatever was cached most recently.
-           3) We're looking at a trace frame that was collected earlier:
-              we will return those earlier registers.
-         */
-
-        /* all registers default to zero */
-        memset (outbuffer, '0', NUMREGBYTES);
-        outbuffer[NUMREGBYTES] = '\0';
-
-        if (curframe.valid)     /* debugging a trace frame */
-          mem2hex( (unsigned char*) curframe.traceregs,
-                  outbuffer, NUMREGBYTES, 0 );
-        else
-          mem2hex( (unsigned char*) registers, outbuffer, NUMREGBYTES, 0 );
-
-        putpacket( outbuffer );
-      }
-      break;
-    case 'G':           /* Write registers.
-    Gxxxxxxxx              Each byte of register data is described by
-                           two hex digits.  */
-      if (curframe.valid)       /* debugging a trace frame */
-        putpacket ("E03");      /* can't write regs into a trace frame! */
-      else
-        {
-          /* Write the values into the local registers cache...
-             Note that no actual registers are being changed.  */
-
-          hex2mem( request,
-                  (unsigned char *) registers, NUMREGBYTES, 0 );
-          putpacket( "OK" );
-        }
-      break;
-    case 'P':           /* Write (single) register.
-    Pnn=xxxxxxxx           register nn gets value xxxxxxxx;
-                           two hex digits for each byte in the register
-                           (target byte order).  */
-
-      if (curframe.valid)
-        putpacket ("E03");      /* can't write regs into a trace frame! */
-      else
-        {
-          unsigned long regno;
-
-          if ( hexToInt( &request, &regno ) && *(request++) == '=' )
-            {
-              if ( regno < NUMREGS )
-                {
-                  hexToInt( &request,
-                           (unsigned long *) &registers[REGISTER_BYTE(regno)]);
-
-                  putpacket( "OK" );
-                }
-              else
-                putpacket( "E01" );   /* bad packet or regno */
-            }
-        }
-      break;
-    case 'm':           /* Read memory.
-    mAAAAAAAA,LLLL         AAAAAAAA is address, LLLL is length.
-                           Reply can be fewer bytes than requested
-                           if able to read only part of the data.  */
-      {
-        unsigned long addr, len;
-
-        if ( hexToInt( &request, &addr )    &&
-             *(request++) == ','            &&
-             hexToInt( &request, &len ) )
-          {
-            /* better not overwrite outbuffer! */
-            if ( len > (BUFMAX / 2) - 5 )
-              len = (BUFMAX / 2) - 5;
-            if (mem2hex((unsigned char *) addr, outbuffer, len, 1) == 0) /* XXX: eventually use returned value */
-              putpacket( "E03" );       /* read fault (access denied) */
-            else
-              putpacket( outbuffer );   /* read succeeded */
-          }
-        else
-          putpacket( "E01" );           /* badly formed read request */
-
-      }
-      break;
-    case 'M':           /* Write memory.
-    Maaaaaaaa,llll:xxxx    aaaaaaaa is address, llll is length;
-                           xxxx is data to write.  */
-
-      {
-        unsigned long addr, len;
-
-        if (curframe.valid)     /* can't write memory into a trace frame! */
-          putpacket ("E03");    /* "access denied" */
-        else /*** if ( write_access_enabled ) ***/
-          {
-            if ( hexToInt( &request, &addr )  &&
-                 *(request++) == ','          &&
-                 hexToInt( &request, &len )   &&
-                 *(request++) == ':' )
-              {
-                if (len == 2 &&
-                    addr >= CS_CODE_START &&
-                    addr <= LAST_CS_WORD)
-                  {
-                    unsigned long val;
-
-                    if ( !hexToInt( &request, &val ) ||
-                         write_to_protected_mem( (void *)addr, val ) )
-                      putpacket( "E03" );   /* write fault (access denied) */
-                    else
-                      putpacket( "OK" );    /* write succeeded */
-                  }
-                else
-                  {
-                    if ( hex2mem( request, (unsigned char*) addr, len, 1 ) )
-                      putpacket( "E03" );   /* write fault (access denied) */
-                    else
-                      putpacket( "OK" );    /* write succeeded */
-                  }
-              }
-            else
-                putpacket( "E02" );     /* badly formed write request */
-          }
-      }
-      break;
-    case 'c':           /* Continue.
-    cAAAAAAAA              AAAAAAAA is address from which to resume.
-                           If omitted, resume at current PC.  */
-
-      {
-        unsigned long addr;
-
-	if (curframe.valid)
-	  {
-	    /* Don't continue if debugging a trace frame! */
-	    gdb_puts ("Error: can't continue!\n");
-	    putpacket ("S03");
-	  }
-	else
-	  {
-	    gdb_signo = 3;
-	    if (isxdigit(request[0]))
-	      {
-		hexToInt(&request, &addr);
-		registers[REGISTER_BYTE(PC)] = addr;
-	      }
-
-	    gdb_handling_trap1 = FALSE;
-	    gdb_handling_sstrace = FALSE;
-	    sss_trace_flag = '\0';
-	  }
-      }
-      break;
-    case 's':           /* Step.
-    sAAAAAAAA              AAAAAAAA is address from which to begin stepping.
-                           If omitted, begin stepping at current PC.  */
-      {
-        unsigned long addr;
-
-	if (curframe.valid)
-	  {
-	    /* Don't step if debugging a trace frame! */
-	    gdb_puts ("Error: can't step!\n");
-	    putpacket ("S03");
-	  }
-	else
-	  {
-	    gdb_signo = 3;
-	    if (isxdigit(request[0]))
-	      {
-		hexToInt(&request, &addr);
-		registers[REGISTER_BYTE(PC)] = addr;
-	      }
-
-	    gdb_handling_trap1 = FALSE;
-	    gdb_handling_sstrace = FALSE;
-	    sss_trace_flag = 't';
-	  }
-      }
-      break;
-    case 'C':           /* Continue with signal.
-    Cxx;AAAAAAAA           xx is signal number in hex;
-                           AAAAAAAA is adddress from which to resume.
-                           If ;AAAAAAAA omitted, continue from PC.   */
-
-      {
-        unsigned long addr = 0;
-
-        if (!gdb_handling_trap1 || curframe.valid)
-          {
-	    /* Don't continue if not currently in synchronous mode,
-	       or if currently debugging a trace frame!  */
-            gdb_puts( "Error: can't continue!\n" );
-            putpacket( "S03" );       /* "sigquit"  (better idea?) */
-          }
-        else
-          {
-	    gdb_signo = 3;
-            if ( isxdigit( *request ) )
-              {
-                hex2mem( request, (unsigned char *) &gdb_signo, 2, 0 );
-                request += 2;
-                if ( *request == ';' && isxdigit( *++request ) )
-                  {
-                    hexToInt( &request, &addr );
-                    registers[REGISTER_BYTE(PC)] = addr;
-                  }
-              }
-            gdb_handling_trap1 = FALSE;
-            gdb_handling_sstrace = FALSE;
-            sss_trace_flag = '\0';
-          }
-      }
-      break;
-    case 'S':           /* Step with signal.
-    Sxx;AAAAAAAA           xx is signal number in hex;
-                           AAAAAAAA is adddress from which to begin stepping.
-                           If ;AAAAAAAA omitted, begin stepping from PC.   */
-      {
-        unsigned long addr = 0;
-
-        if (!gdb_handling_trap1 || curframe.valid)
-          {
-	    /* Don't step if not currently in synchronous mode,
-	       or if currently debugging a trace frame!  */
-            gdb_puts( "Error: can't step!\n" );
-            putpacket( "S03" );       /* "sigquit"  (better idea?) */
-          }
-        else
-          {
-	    gdb_signo = 3;
-            if ( isxdigit( *request ) )
-              {
-                hex2mem( request, (unsigned char *) &gdb_signo, 2, 0 );
-                request += 2;
-                if ( *request == ';' && isxdigit( *++request ) )
-                  {
-                    hexToInt( &request, &addr );
-                    registers[REGISTER_BYTE(PC)] = addr;
-                  }
-              }
-            gdb_handling_trap1 = FALSE;
-            gdb_handling_sstrace = FALSE;
-            sss_trace_flag = 't';
-          }
-      }
-      break;
-    case '?':           /* Query the latest reason for stopping.
-                           Should be same reply as was last generated
-                           for step or continue.  */
-
-      if ( gdb_signo == 0 )
-        gdb_signo = 3;  /* default to SIGQUIT */
-      outbuffer[ 0 ] = 'S';
-      outbuffer[ 1 ] = hexchars[ gdb_signo >>  4 ];
-      outbuffer[ 2 ] = hexchars[ gdb_signo & 0xf ];
-      outbuffer[ 3 ] = 0;
-      putpacket( outbuffer );
-      break;
-
-    case 'd':           /* Toggle debug mode
-                           I'm sure we can think of something interesting.  */
-
-      remote_debug = !remote_debug;
-      putpacket( "" );  /* return empty packet */
-      break;
-
-    case 'q':           /* general query */
-      switch (*request++)
-        {
-        default:
-          putpacket ("");       /* nak a request which we don't handle */
-          break;
-        case 'T':               /* trace query */
-          putpacket (handle_trace_query (request));
-          break;
-	case 'C':		/* crc query (?) */
-	  if (*request++ == 'R' &&
-	      *request++ == 'C' &&
-	      *request++ == ':')
-	    putpacket (crc_query (request));
-	  else
-	    putpacket ("");	/* unknown query */
-	  break;
-        }
-      break;
-
-    case 'Q':                   /* general set */
-      switch (*request++)
-        {
-        default:
-          putpacket ("");       /* nak a request which we don't handle */
-          break;
-        case 'T':               /* trace */
-          putpacket (handle_trace_set (request));
-          break;
-        }
-      break;
-
-    case 'T':
-      /* call test function: TAAA,BBB,CCC 
-	 A, B, and C are arguments to pass to gdb_c_test.  Reply is
-	 "E01" (bad arguments) or "OK" (test function called).  */
-      putpacket (handle_test (request));
-      break;
-    }
-}
-
-static TDP_SETUP_INFO tdp_temp;
-static int trace_running;
-
-/*
- * Function msgcmp:
- *
- * If second argument (str) is matched in first argument,
- *    then advance first argument past end of str and return "SAME"
- * else return "DIFFERENT" without changing first argument.
- *
- * Return: zero for DIFFERENT, non-zero for SUCCESS
- */
-
-static int
-msgcmp (char **msgp, char *str)
-{
-  char *next;
-
-  if (msgp != 0 && str != 0)    /* input validation */
-    if ((next = *msgp) != 0)
-      {
-        for (;
-             *next && *str && *next == *str;
-             next++, str++)
-          ;
-
-        if (*str == 0)                  /* matched all of str in msg */
-          return (int) (*msgp = next);  /* advance msg ptr past str  */
-      }
-  return 0;                             /* failure */
-}
-
-static char *
-handle_trace_query (char *request)
-{
-  if (msgcmp (&request, "Status"))
-    {
-      if (adbg_check_if_active ())
-	{
-	  gdb_puts ("Target trace is running.\n");
-	  return "T1";
-	}
-      else
-	{
-	  gdb_puts ("Target trace not running.\n");
-	  trace_running = 0;
-	  return "T0";
-	}
-    }
-  else                  /* unknown trace query */
-    {
-      return "";
-    }
-}
-
-static void
-gdb_note (char *fmt, int arg1)
-{
-  if (remote_debug > 1)
-    {
-      sprintp (spare_buffer, fmt, arg1);
-      gdb_puts (spare_buffer);
-    }
-}
-
-static int
-error_ret (int ret, char *fmt, int arg1)
-{
-  if (remote_debug > 0)
-    {
-      sprintp (spare_buffer, fmt, arg1);
-      gdb_puts (spare_buffer);
-    }
-  return ret;
-}
-
-static int
-handle_format (char **request, COLLECTION_FORMAT_DEF *format)
-{
-  MEMRANGE_DEF m;
-  DTC_RESPONSE ret;
-  int elinum;
-  unsigned long regnum;
-  long bytecodes[(MAX_BYTE_CODES + sizeof (struct t_expr_tag))/ 4];
-  struct t_expr_tag *t_expr = (struct t_expr_tag *)bytecodes;
-
-  if (format->id == 0)
-    {
-      if ((ret = get_unused_format_id (&format->id)) != OK_TARGET_RESPONSE)
-	return dtc_error_ret (-1, "get_unused_format_id", ret);
-
-      if (**request == 'R')
-	{
-	  (*request)++;
-	  hexToInt (request, &format->regs_mask);
-	}
-      gdb_note ("STUB: call define_format (id = %d, ", format->id);
-      gdb_note ("regs_mask = 0x%X);\n", format->regs_mask);
-
-      if ((ret = define_format (format)) != OK_TARGET_RESPONSE)
-	{
-	  sprintp (spare_buffer,
-		   "'define_format': DTC error '%s' for format id %d.\n",
-		   get_err_text (ret),
-		   format->id);
-	  gdb_puts (spare_buffer);
-	  return -1;
-	}
-    }
-
-  while ((**request == 'M') || (**request == 'X'))
-    {
-      switch (**request)
-	{
-	case 'M':		/* M<regnum>,<offset>,<size> */
-	  (*request)++;
-	  hexToInt(request, &regnum);
-
-	  if (regnum == 0 || regnum == (unsigned long) -1)
-	    m.typecode = -1;
-	  else if ((elinum = index_to_elinum (regnum)) > 0)
-	    m.typecode = elinum;
-	  else
-	    return error_ret (-1,
-			      "Memrange register %d is not between 0 and 15\n",
-			      regnum);
-
-	  if (*(*request)++ != ',')
-	    return error_ret (-1,"Malformed memrange (comma #%d missing)\n",1);
-	  hexToInt(request, &m.offset);
-	  if (*(*request)++ != ',')
-	    return error_ret (-1,"Malformed memrange (comma #%d missing)\n",2);
-	  hexToInt(request, &m.size);
-
-	  gdb_note ("STUB: call add_format_mem_range (typecode =  0x%x, ",
-		    m.typecode);
-	  gdb_note ("offset = 0x%X, ", m.offset);
-	  gdb_note ("size = %d);\n", m.size);
-	  if ((ret = add_format_mem_ranges (format->id, &m)) != 
-	      OK_TARGET_RESPONSE)
-	    {
-	      dtc_error_ret (-1, "add_format_mem_ranges", ret);
-	      sprintp (spare_buffer,
-		       "format id %d: memrange (0x%x, 0x%x, 0x%x).\n",
-		       format->id, m.typecode, m.offset, m.size);
-	      gdb_puts (spare_buffer);
-	      return -1;
-	    }
-	  break;
-
-	case 'X':		/* X<length>,<bytecodes> */
-	  {
-	    unsigned long length;
-
-	    (*request)++;
-	    hexToInt(request, &length);
-
-	    if ((length <= 0) || (length > MAX_BYTE_CODES))
-	      return error_ret (-1, 
-				"Bytecode expression length (%d) too large\n",
-				length);
-
-	    if (*(*request)++ != ',')
-	      return error_ret (-1, 
-				"Malformed bytecode expr (comma#%d missing)\n",
-				1);
-	    t_expr->next = NULL;
-	    /* subtract one to account for expr[0] in header */
-	    t_expr->size = sizeof(struct t_expr_tag) + length - 1;
-	    t_expr->expr_size = length;
-
-	    hex2mem(*request, &t_expr->expr[0], length, 0);
-	    *request += 2 * length;
-	    build_and_add_expression(format->id, t_expr);
-	  }
-	  break;
-	}
-    }
-  return 0;
-}
-
-static char *
-handle_trace_set (char *request)
-{
-  long n_frame;
-  unsigned long frameno, tdp, pc, start, stop;
-  DTC_RESPONSE ret = -1;
-  static COLLECTION_FORMAT_DEF tempfmt1;
-  static char enable;
-  static char retbuf[20];
-
-  if (msgcmp (&request, "init"))
-    {
-      gdb_note ("STUB: call clear_trace_state();\n", 0);
-      curframe.valid = 0;       /* all old frames become invalid now */
-      if ((ret = clear_trace_state ()) == OK_TARGET_RESPONSE)
-        return "OK";
-      else
-        {
-          sprintp (retbuf, "E2%x", ret);
-          return (char *) dtc_error_ret ((int) &retbuf,
-                                         "clear_trace_state",
-                                         ret);
-        }
-    }
-  else if (msgcmp (&request, "Start"))
-    {
-      trace_running = 1;
-      curframe.valid = 0;       /* all old frames become invalid now */
-      gdb_note ("STUB: call start_trace_experiment();\n", 0);
-      adbg_save_trace_in_nvd ();
-      if ((ret = start_trace_experiment ()) == OK_TARGET_RESPONSE)
-        return "OK";
-      else
-        {
-          sprintp (retbuf, "E2%x", ret);
-          return (char *) dtc_error_ret ((int) &retbuf,
-                                         "start_trace_experiment",
-                                         ret);
-        }
-    }
-  else if (msgcmp (&request, "Stop"))
-    {
-      trace_running = 0;
-      if (adbg_check_if_active ())
-	{
-	  gdb_note ("STUB: call end_trace_experiment();\n", 0);
-	  if ((ret = end_trace_experiment ()) == OK_TARGET_RESPONSE)
-	    return "OK";
-	  else
-	    {
-	      sprintp (retbuf, "E2%x", ret);
-	      return (char *) dtc_error_ret ((int) &retbuf,
-					     "end_trace_experiment",
-					     ret);
-	    }
-	}
-      else return "OK";
-    }
-  /* "TDP:" (The 'T' was consumed in handle_request.)  */
-  else if (msgcmp (&request, "DP:"))
-    {
-      /* TDP:<id>:<addr>:{D,E}:<stepcount>:<pass_limit>{R[M,X]+}<tdp-format>
-                                                     {S{R[M,X]+}}<tp-format>
-
-	 D -- disable tracepoint (illegal from EMC's point of view)
-	 E -- enable tracepoint?
-
-	 R -- regs format: R<regs-mask>
-	 M -- memory format: M<regnum>,<offset>,<size>
-	 X -- expr format: X<size>,<bytecodes>
-	 S -- fencepost between trap formats and stepping formats.
-	 */
-
-      /* state variable, required for splitting TDP packets. */
-      static int doing_step_formats;
-
-      /* 
-       * TDP: packets may now be split into multiple packets.
-       * If a TDP packet is to be continued in another packet, it
-       * must end in a "-" character.  The subsequent continuation
-       * packet will then begin with a "-" character, between the
-       * token "TDP:" and the tdp_id field.  The ID and address
-       * will be repeated in each sub-packet.  The step_count, 
-       * pass_count, and 'enabled' field must appear in the first
-       * packet.  The boundary between sub-packets may not appear
-       * between the "S" that denotes the start of stepping "formats",
-       * and the regs_mask that follows it.  The split may also not
-       * occur in the middle of either a memrange description or a
-       * bytecode string.  -- MVS
-       */
-
-      if (*request == '-')	/* this is a continuation of a 
-				   trace definition in progress */
-	{
-	  unsigned long temp_id, temp_addr;
-
-	  request++;
-	  if (!(hexToInt (&request, &temp_id) &&
-		*request++ == ':'))
-	    return "E11";           /* badly formed packet, field 1 */
-
-	  if (!(hexToInt (&request, (unsigned long *) &temp_addr) &&
-		*request++ == ':'))
-	    return "E12";           /* badly formed packet, field 2 */
-
-	  if (temp_id   != tdp_temp.id)
-	    return "E11";	/* something wrong: field 1 doesn't match */
-	  if (temp_addr != (unsigned long) tdp_temp.addr)
-	    return "E12";	/* something wrong: field 2 doesn't match */
-	}
-      else			/* This is a new TDP definition */
-	{
-	  memset ((char *) &tdp_temp, 0, sizeof (tdp_temp));
-	  memset ((char *) &tempfmt1, 0, sizeof (tempfmt1));
-	  doing_step_formats = FALSE;
-
-	  if (!(hexToInt (&request, &tdp_temp.id) &&
-		*request++ == ':'))
-	    return "E11";           /* badly formed packet, field 1 */
-
-	  if (!(hexToInt (&request, (unsigned long *) &tdp_temp.addr) &&
-		*request++ == ':'))
-	    return "E12";           /* badly formed packet, field 2 */
-
-	  if (!(((enable = *request++) == 'D' || enable == 'E') &&
-		*request++ == ':'))
-	    return "E13";           /* badly formed packet, field 3 */
-#if 0
-	  if (enable == 'D')
-	    {
-	      gdb_puts ("Disabling of tracepoints not supported by EMC target\n");
-	      return "E20";
-	    }
-#endif
-	  if (!(hexToInt (&request, &tdp_temp.stepcount) &&
-		*request++ == ':'))
-	    return "E14";           /* badly formed packet, field 4 */
-
-	  if (!hexToInt (&request, &tdp_temp.pass_limit))
-	    return "E15";           /* badly formed packet, field 5 */
-
-	}
-
-      /* Typically, the first group of collection descriptors
-	 refers to the trap collection.  There is an "S" token
-	 to act as a fencepost between collection descriptors for
-	 the trap, and those for the single-stepping.
-
-	 However, when the packet is split up into several packets,
-	 this "S" token may already have been seen in a previous
-	 sub-packet; so we have to remember it in a state variable.  */
-
-      if (*request == 'R' || *request == 'M' || *request == 'X')
-        {
-          if (handle_format (&request, &tempfmt1))
-            return "E16";
-	  if (doing_step_formats)
-	    tdp_temp.tp_format_p  = tempfmt1.id;
-	  else
-	    tdp_temp.tdp_format_p = tempfmt1.id;
-        }
-
-      /* When we see the "S" token, we remember it in a state variable
-         (in case the packet is split up and continued in another message),
-	 and discard all current state from the collection "format".  */
-      if (*request == 'S')
-	{
-	  doing_step_formats = TRUE;
-	  /* discard prev format and start a new one */
-	  memset ((char *) &tempfmt1, 0, sizeof (tempfmt1));
-	  request++;
-
-	  /* Having seen the "S" fencepost, it is now possible that
-	     we will see some more collection descriptors pertaining
-	     to the stepping collection.  */
-	  if (*request   == 'R' || *request == 'M' || *request == 'X')
-	    {
-	      if (handle_format (&request, &tempfmt1))
-		return "E17";
-	      /* new format ID is tp_format */
-	      tdp_temp.tp_format_p = tempfmt1.id;
-	    }
-	}
-
-      if (*request == '-')	/* this TDP definition will be continued. */
-	sprintp (retbuf, "OK");
-      else if (enable == 'E')	/* end of TDP definition: pass to ADBG (if enabled!) */
-	{
-	  gdb_note ("STUB: call define_tdp (id %d, ", tdp_temp.id);
-	  gdb_note ("addr 0x%X, ", (int) tdp_temp.addr);
-	  gdb_note ("passc %d, ",        tdp_temp.pass_limit);
-	  gdb_note ("stepc %d, ",        tdp_temp.stepcount);
-	  gdb_note ("TDP fmt #%d, ",     tdp_temp.tdp_format_p);
-	  gdb_note ("TP fmt #%d);\n",    tdp_temp.tp_format_p);
-	  
-	  ret = define_tdp (tdp_temp.id, &tdp_temp, 0);
-
-	  if (ret == OK_TARGET_RESPONSE)
-	    {
-	      sprintp (retbuf, "OK");
-	    }
-	  else
-	    {
-	      sprintp (spare_buffer,
-		       "'define_tdp' returned DTC error '%s' for tracepoint %d.\n",
-		       get_err_text (ret),
-		       tdp_temp.id);
-	      gdb_puts (spare_buffer);
-	      sprintp (retbuf, "E2%x", ret);
-	    }
-	  /* Redundant, but let's try to make sure this state gets discarded. */
-	  {
-	    memset ((char *) &tdp_temp, 0, sizeof (tdp_temp));
-	    memset ((char *) &tempfmt1, 0, sizeof (tempfmt1));
-	  }
-	}
-      else /* ADBG_DTC does not support disabled tracepoints -- ignore it.  */
-	gdb_note ("STUB: ignoring disabled tracepoint %d.\n", tdp_temp.id);
-
-      return retbuf;
-    }
-  else if (msgcmp (&request, "Frame:"))
-    {
-      ret = OK_TARGET_RESPONSE;
-
-      if (msgcmp (&request, "pc:"))
-        {
-          if (!hexToInt (&request, &pc))
-            return "E10";       /* badly formed packet */
-          n_frame = curframe.valid ? curframe.frame_id + 1 : 0;
-          gdb_note ("STUB: call fetch_trace_frame_pc (id %d, ", n_frame);
-          gdb_note ("pc 0x%X);\n", pc);
-          ret = fetch_trace_frame_with_pc (&n_frame,
-                                           (void *) pc,
-                                           &curframe.format,
-                                           &curframe.frame_data);
-        }
-      else if (msgcmp (&request, "tdp:"))
-        {
-          if (!hexToInt (&request, &tdp))
-            return "E10";       /* badly formed packet */
-          n_frame = curframe.valid ? curframe.frame_id + 1: 0;
-          gdb_note ("STUB: call fetch_trace_frame_tdp (id %d, ", n_frame);
-          gdb_note ("tdp 0x%X);\n", tdp);
-          ret = fetch_trace_frame_with_tdp (&n_frame,
-                                            tdp,
-                                            &curframe.format,
-                                            &curframe.frame_data);
-        }
-      else if (msgcmp (&request, "range:"))
-        {
-          if (!(hexToInt (&request, &start) &&
-                *request++ == ':'))
-            return "E11";      /* badly formed packet, field 1 */
-          else if (!hexToInt (&request, &stop))
-            return "E12";       /* badly formed packet, field 2 */
-          n_frame = curframe.valid ? curframe.frame_id + 1: 0;
-          gdb_note ("STUB: call fetch_trace_frame_range (id %d, ", n_frame);
-          gdb_note ("start 0x%X, ",   start);
-          gdb_note ("stop  0x%X);\n", stop);
-          ret = fetch_trace_frame_with_pc_in_range (&n_frame,
-                                                    (void *) start,
-                                                    (void *) stop,
-                                                    &curframe.format,
-                                                    &curframe.frame_data);
-        }
-      else if (msgcmp (&request, "outside:"))
-        {
-          if (!(hexToInt (&request, &start) &&
-                *request++ == ':'))
-            return "E11";       /* badly formed packet, field 1 */
-          else if (!hexToInt (&request, &stop))
-            return "E12";       /* badly formed packet, field 2 */
-          n_frame = curframe.valid ? curframe.frame_id + 1: 0;
-          gdb_note ("STUB: call fetch_trace_frame_outside (id %d, ", n_frame);
-          gdb_note ("start 0x%X, ",   start);
-          gdb_note ("stop  0x%X);\n", stop);
-          ret = fetch_trace_frame_with_pc_outside (&n_frame,
-                                                   (void *) start,
-                                                   (void *) stop,
-                                                   &curframe.format,
-                                                   &curframe.frame_data);
-        }
-      else /* simple TFind by frame number: */
-        {
-          if (!hexToInt (&request, &frameno))
-            return "E10";       /* badly formed packet */
-          if (frameno != (unsigned long) -1)
-            {
-              gdb_note ("STUB: call fetch_trace_frame (id %d);\n", frameno);
-              ret = fetch_trace_frame (n_frame = frameno,
-                                       &curframe.format,
-                                       &curframe.frame_data);
-#if 0
-	      printp("STUB: fetch_trace_frame: return %d\n", ret);
-#endif
-            }
-          else  /* discard any trace frame, debug "the real world" */
-            {
-              if (curframe.valid)
-                gdb_note ("STUB: discard current trace frame #%d.\n",
-                          curframe.frame_id);
-              curframe.valid = 0;
-              return "OK";
-            }
-        }
-      if (ret == OK_TARGET_RESPONSE)    /* fetch_trace_frame succeeded */
-        { /* setup for debugging the trace frame */
-          curframe.valid    = 1;
-          curframe.frame_id = n_frame;
-          curframe.tdp_id   = curframe.frame_data->id;
-
-          memset ((char *) &curframe.traceregs, 0,
-                  sizeof (curframe.traceregs));
-          curframe.traceregs[PC] = (unsigned long)
-            curframe.frame_data->program_counter;
-
-          if (curframe.format)
-            {
-              unsigned long regs_mask = curframe.format->regs_mask;
-              unsigned long *regs, *stack, *mem;
-              unsigned long regno, index = 0;
-              CFD *dummy;
-
-              if ((ret = get_addr_to_frame_regs_stack_mem
-                   (curframe.frame_data, &dummy, &regs, &stack, &mem))
-                  != OK_TARGET_RESPONSE)
-                {
-                  curframe.valid = 0;
-                  sprintp (retbuf, "E2%x", ret);
-                  return (char *)
-                    dtc_error_ret ((int) &retbuf,
-                                   "get_addr_to_frame_regs_stack_mem",
-                                   ret);
-                }
-
-              if (remote_debug > 1)
-                { /* echo what we've found to gdb console */
-                  sprintp (spare_buffer,
-                           "STUB: Found frame %d, TDP %d, format %d (%s):\n",
-                           curframe.frame_id,
-                           curframe.tdp_id & 0x7fffffff,
-                           curframe.format->id,
-                           curframe.tdp_id & 0x80000000 ?
-                           "trap frame" : "stepping frame");
-                  gdb_puts (spare_buffer);
-                }
-              /* copy trace frame regs into stub's data format */
-              for (regno = 0, index = 0;
-                   regno < 16;
-                   regno++, regs_mask >>= 1)
-                if (regs_mask & 1)      /* got a collected register */
-                  {
-                    curframe.traceregs[regno] = regs[index++];
-                    if (remote_debug > 1)
-                      {
-                        sprintp (spare_buffer,
-                                 "      Collected 0x%08x for register %d.\n",
-                                 curframe.traceregs[regno], regno);
-                        gdb_puts (spare_buffer);
-                      }
-                  }
-              if (remote_debug > 1)
-                {
-                  long           midx, ridx, len;
-                  MEMRANGE_DEF  *mrange;
-                  unsigned char *data, *base;
-
-                  if (curframe.format->stack_size > 0)
-                    {
-                      len = curframe.format->stack_size;
-                      sprintp (spare_buffer,
-                               "      Collected %d bytes of stack at 0x%x:\n",
-                               len, curframe.traceregs[A7]);
-                      gdb_puts (spare_buffer);
-
-                      /* print stack data, but stay under msg len */
-                      if (len >= (NUMREGBYTES/2 - 2))
-                        len =    (NUMREGBYTES/2 - 3);
-                      mem2hex ((unsigned char *) stack,
-                               spare_buffer, len, 0);
-                      spare_buffer [len * 2] = '\n';
-                      spare_buffer [len * 2 + 1] = '\0'; /* EOS */
-                      gdb_puts (spare_buffer);
-                    }
-		  else
-		    gdb_puts ("Stack not collected\n");
-
-                  for (midx = 0;
-                       get_addr_to_a_mem_range (curframe.frame_data,
-                                                midx,
-                                                &mrange,
-                                                (void **) &data)
-                       == OK_TARGET_RESPONSE;
-                       midx++)
-                    {
-                      if ((mrange->typecode == 0) ||
-                          (mrange->typecode == (unsigned long) -1))
-                        {
-                          sprintp (spare_buffer,
-                                   "      Collected %d bytes at MEM: 0x%x:\n",
-                                   mrange->size, mrange->offset);
-                          base = (unsigned char *) mrange->offset;
-                        }
-                      else
-                        {
-                          if ((ridx = elinum_to_index (mrange->typecode)) > 0)
-                            base = (unsigned char *) curframe.traceregs[ridx]
-                              + (long) mrange->offset;
-                          else
-                            {
-                              sprintp (spare_buffer,
-                   "STUB: bad typecode in memrange #%d: (0x%x,0x%x,0x%x).\n",
-                                       midx,
-                                       mrange->typecode,
-                                       mrange->offset,
-                                       mrange->size);
-                              gdb_puts (spare_buffer);
-                              continue;
-                            }
-                          sprintp (spare_buffer,
-                   "      Collected %d bytes at 0x%x (REG %X + %d):\n",
-                                   mrange->size,
-                                   base,
-                                   mrange->typecode,
-                                   mrange->offset);
-                        }
-                      gdb_puts (spare_buffer);
-                      len = mrange->size;
-                      if (len >= (NUMREGBYTES/2 - 2))
-                        len =    (NUMREGBYTES/2 - 3);
-                      mem2hex (data, spare_buffer, len, 0);
-                      spare_buffer [len * 2] = '\n';
-                      spare_buffer [len * 2 + 1] = '\0'; /* EOS */
-                      gdb_puts (spare_buffer);
-                    }
-                }
-            }
-          sprintp (retbuf, "F%xT%x", n_frame, curframe.tdp_id & 0x7fffffff);
-          return   retbuf;
-        }
-      else if (ret == NOT_FOUND_TARGET_RESPONSE)
-        {
-          /* Here's a question: if the fetch_trace_frame call failed
-             (which probably means a bad "TFIND" command from GDB),
-             should we remain focused on the previous frame (if any),
-             or should we revert to "no current frame"?
-           */
-          return "F-1";
-        }
-      else
-        {
-          sprintp (retbuf, "E2%x", ret);
-          return (char *) dtc_error_ret ((int) &retbuf,
-                                         "fetch_trace_frame[...]",
-                                         ret);
-        }
-    }
-  else                  /* unknown trace command */
-    {
-      return "";
-    }
-}
-
-/* Table used by the crc32 function to calcuate the checksum. */
-static unsigned long crc32_table[256];
-
-static int crc_mem_err;
-
-static unsigned long
-crc32 (buf, len, crc)
-     unsigned char *buf;
-     int len;
-     unsigned long crc;
-{
-  crc_mem_err = FALSE;
-
-  if (! crc32_table[1])
-    {
-      /* Initialize the CRC table and the decoding table. */
-      int i, j;
-      unsigned int c;
-
-      for (i = 0; i < 256; i++)
-	{
-	  for (c = i << 24, j = 8; j > 0; --j)
-	    c = c & 0x80000000 ? (c << 1) ^ 0x04c11db7 : (c << 1);
-	  crc32_table[i] = c;
-	}
-    }
-
-  while (len--)
-    {
-      if (read_access_violation (buf))
-	{
-	  crc_mem_err = TRUE;
-	  return -1;
-	}
-      crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buf++) & 255];
-    }
-  return crc;
-}
-
-static char *
-crc_query (cmd)
-     char *cmd;
-{
-  unsigned long startmem, len, crc;
-  static char buf[32];
-
-  if (hexToInt (&cmd, &startmem) &&
-      *cmd++ == ','              &&
-      hexToInt (&cmd, &len))
-    {
-      crc = crc32  ((unsigned char *) startmem, len, 0xffffffff);
-      if (!crc_mem_err)
-	{
-	  sprintp (buf, "C%08x", crc);
-	  return buf;
-	}
-      /* else error, fall thru */
-    }
-  sprintp (buf, "E01");
-  return buf;
-}
-
-
-static char *
-handle_test (request)
-     char *request;
-{
-  ULONG args[7];
-  int i;
-
-  /* Parse the arguments, a comma-separated list of hex numbers, into
-     ARGS.  Parse at most six arguments.  */
-  i = 1;
-  if (*request != '\0')
-    while (i < 7)
-      {
-	if (! hexToInt (&request, &args[i++]))
-	  return "E01";
-	if (*request == '\0')
-	  break;
-	if (*request++ != ',')
-	  return "E01";
-      }
-
-  /* Fill the rest of the args array with zeros.  This is what the
-     INLINES command processor does with omitted arguments.  */
-  for (; i < 7; i++)
-    args[i] = 0;
-
-  gdb_c_test (args);
-
-  return "OK";
-}
-
-
-/* GDB_TRAP_1_HANDLER
-
-   By the time this is called, the registers have been saved in "registers",
-   and the interrupt priority has been set to permit serial UART interrupts.
-
-   However, since no gdb request has yet been received, and there is no
-   equivalent of getpacket for us to wait on, we can't sit here waiting
-   for packets and processing them.
-
-   In fact, the ONLY thing for us to do here is sit and wait.
-   As gdb sends packet requests, they will handle themselves at the
-   interrupt level.  When gdb decides we can continue, it will reset
-   the global variable "gdb_handling_trap1", and we will return
-   (whereupon registers will be restored etc.)   */
-
-void  gdb_trap_1_handler( void )
-{
-  gdb_handling_trap1 = TRUE;
-  sss_trace_flag = '\0';        /* shut off "trace bit" (indirectly) */
-  gdb_signo = 5;
-  putpacket( "S05" );
-  while ( gdb_handling_trap1 )
-    ;
-  return;
-}
-
-void  gdb_trace_handler( void )
-{
-  sss_trace_flag = '\0';        /* shut off "trace bit" (indirectly) */
-  gdb_handling_trap1 = TRUE;
-  gdb_handling_sstrace = TRUE;
-  gdb_signo = 5;
-  putpacket( "S05" );
-  while ( gdb_handling_trap1 )
-    ;
-  return;
-}
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
deleted file mode 100644
index 6a117d319ef..00000000000
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ /dev/null
@@ -1,99 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-gdb_file_cmd $binfile
-
-#
-# test "info tracepoints" command
-#
-
-gdb_delete_tracepoints
-set c_test_num [gdb_gettpnum gdb_c_test];
-set asm_test_num [gdb_gettpnum gdb_asm_test];
-if { $c_test_num <= 0 || $asm_test_num <= 0 } then {
-    fail "setting tracepoints"
-    return;
-}
-
-# 2.1 info tracepoints (all)
-gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*$c_test_num\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*$asm_test_num\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*" \
-    "2.1: info tracepoints (all)"
-
-# 2.2 info tracepoint (specific)
-gdb_test "info tracepoint $c_test_num" \
-    "$c_test_num\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*in gdb_c_test.*" \
-    "2.2a: info tracepoint $c_test_num (gdb_c_test)"
-
-gdb_test "info tracepoint $asm_test_num" \
-    "$asm_test_num\[\t \]+y\[\t \]+0x\[0-9a-fA-F\]+.*gdb_asm_test.*" \
-    "2.2b: info tracepoint $asm_test_num (gdb_asm_test)"
-
-# 2.3 info tracepoint (invalid tracepoint number)
-gdb_test "info tracepoint [expr $c_test_num + $asm_test_num]" \
-    "No tracepoint number [expr $c_test_num + $asm_test_num]." \
-    "2.3: info tracepoint (invalid tracepoint number)"
-
-# 2.4 info tracepoints (list of numbers)
-send_gdb "info tracepoints $c_test_num $asm_test_num \n"
-gdb_expect {
-    -re "Num Enb .*$gdb_prompt $" {
-	fail "2.4: info trace rejects multiple tracepoint numbers"
-    }
-    -re ".*$gdb_prompt $" {
-	pass "2.4: info trace rejects multiple tracepoint numbers"
-    }
-}
-
-# 2.5 help info trace
-gdb_test "help info tracepoints" \
-    "Status of tracepoints, or tracepoint number NUMBER.*" \
-    "2.5: help info tracepoints"
-
diff --git a/gdb/testsuite/gdb.trace/limits.c b/gdb/testsuite/gdb.trace/limits.c
deleted file mode 100644
index d9c02e74bac..00000000000
--- a/gdb/testsuite/gdb.trace/limits.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Test program for tracing internal limits (number of tracepoints etc.)
- */
-
-int n = 6;
-
-int arr[64];
-
-static void foo(int x)
-{
-}
-
-static void bar(int y)
-{
-}
-
-static void baz(int z)
-{
-}
-
-static void begin ()	/* called before anything else */
-{
-}
-
-static void end ()	/* called after everything else */
-{
-}
-
-int
-main (argc, argv, envp)
-     int argc;
-     char *argv[], **envp;
-{
-  int i;
-
-#ifdef usestubs
-  set_debug_traps ();
-  breakpoint ();
-#endif
-
-  begin ();
-  for (i = 0; i < sizeof(arr) / sizeof(arr[0]); i++)
-    arr[i] = i + 1;
-
-  foo (1);
-  bar (2);
-  baz (3);
-  end ();
-  return 0;
-}
-
diff --git a/gdb/testsuite/gdb.trace/limits.exp b/gdb/testsuite/gdb.trace/limits.exp
deleted file mode 100644
index eed178084bb..00000000000
--- a/gdb/testsuite/gdb.trace/limits.exp
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1998 Free Software Foundation, 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
-
-if [istarget "m68k-*-elf"] then {
-    pass "Test not supported on this target"
-    return;
-}
-
-load_lib "trace-support.exp"
-
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-set testfile "limits"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/$testfile
-
-if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
-# Tests:
-# 1) Meet and exceed artificial limit on number of tracepoints
-# 2) Meet and exceed artificial limit on number of memranges
-# 3) Meet and exceed artificial limit on bytes  of bytecode data
-# [NOTE: number four is moved out into its own separate test module.]
-# 4) Meet and exceed artificial limit on bytes  of trace buffer storage
-#    (circular and non-circular modes).  However note that a more 
-#    thorough test of the circular mode can be made separately.
-
-set cr "\[\r\n\]+"
-
-proc gdb_tracepoint_limit_test { } {
-    global gdb_prompt
-    global cr
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    # Set three tracepoints
-    gdb_test "trace foo" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "tracepoint limit test: set first tracepoint"
-
-    gdb_test "trace bar" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "tracepoint limit test: set second tracepoint"
-
-    gdb_test "trace baz" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "tracepoint limit test: set third tracepoint"
-
-    # Set secret artificial tracepoint limit to four
-    gdb_test "maint packet QTLimit:tp:4" \
-	    "received: .OK." \
-	    "tracepoint limit test: set limit to four"
-
-    # Now sending three tracepoints should succeed.
-    send_gdb "tstart\n"
-    gdb_expect {
-	-re "$cr$gdb_prompt" {
-	    pass "tracepoint limit test: send fewer than limit"
-	}
-	default {
-	    fail "tracepoint limit test: send fewer than limit"
-	}
-    }
-
-    # Set secret artificial tracepoint limit to three
-    gdb_test "maint packet QTLimit:tp:3" \
-	    "received: .OK." \
-	    "tracepoint limit test: set limit to three"
-
-    # Now sending three tracepoints should still succeed.
-    send_gdb "tstart\n"
-    gdb_expect {
-	-re "$cr$gdb_prompt" {
-	    pass "tracepoint limit test: send equal to limit"
-	}
-	default {
-	    fail "tracepoint limit test: send equal to limit"
-	}
-    }
-
-    # Set secret artificial tracepoint limit to two
-    gdb_test "maint packet QTLimit:tp:2" \
-	    "received: .OK." \
-	    "tracepoint limit test: set limit to two"
-
-    # Now sending three tracepoints should fail.
-    gdb_test "tstart" \
-	    ".*\[Ee\]rror.*" \
-	    "tracepoint limit test: send more than limit"
-
-    # Clean up:
-    gdb_test "tstop" "" ""
-    gdb_test "maint packet QTLimit:tp:FFFFFFFF" "" ""
-}
-
-proc gdb_memrange_limit_test { } {
-    global gdb_prompt
-    global cr
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    # Set three tracepoints, and make 'em collect memranges
-    gdb_test "trace foo" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "memrange limit test: set first tracepoint"
-
-    gdb_trace_setactions "memrange limit test: set first actions" \
-	    "" \
-	    "collect \$arg" "^$"
-
-    gdb_test "trace bar" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "memrange limit test: set second tracepoint"
-
-    gdb_trace_setactions "memrange limit test: set second actions" \
-	    "" \
-	    "collect \$arg" "^$"
-
-    gdb_test "trace baz" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "memrange limit test: set third tracepoint"
-
-    gdb_trace_setactions "memrange limit test: set third actions" \
-	    "" \
-	    "collect \$arg" "^$"
-
-    # Set secret artificial memrange limit to four
-    gdb_test "maint packet QTLimit:memrange:4" \
-	    "received: .OK." \
-	    "memrange limit test: set limit to four"
-
-    # Now sending three memranges should still succeed.
-    send_gdb "tstart\n"
-    gdb_expect {
-	-re "$cr$gdb_prompt" {
-	    pass "memrange limit test: send fewer than limit"
-	}
-	default {
-	    fail "memrange limit test: send fewer than limit"
-	}
-    }
-
-    # Set secret artificial memrange limit to three
-    gdb_test "maint packet QTLimit:memrange:3" \
-	    "received: .OK." \
-	    "memrange limit test: set limit to three"
-
-    # Now sending three memranges should still succeed.
-    send_gdb "tstart\n"
-    gdb_expect {
-	-re "$cr$gdb_prompt" {
-	    pass "memrange limit test: send equal to limit"
-	}
-	default {
-	    fail "memrange limit test: send equal to limit"
-	}
-    }
-
-    # Set secret artificial memrange limit to two
-    gdb_test "maint packet QTLimit:memrange:2" \
-	    "received: .OK." \
-	    "memrange limit test: set limit to two"
-
-    # Now sending three memranges should fail.
-    gdb_test "tstart" \
-	    ".*\[Ee\]rror.*" \
-	    "memrange limit test: send more than limit"
-
-    # Clean up:
-    gdb_test "tstop" "" ""
-    gdb_test "maint packet QTLimit:memrange:FFFFFFFF" "" ""
-}
-
-
-proc gdb_bytecode_limit_test { } {
-    global gdb_prompt
-    global cr
-
-    # Make sure we're in a sane starting state.
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    gdb_delete_tracepoints
-
-    # Set three tracepoints
-    gdb_test "trace foo" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "bytecode limit test: set first tracepoint"
-
-    gdb_trace_setactions "bytecode limit test: set first actions" \
-	    "" \
-	    "collect x + n" "^$"
-
-    gdb_test "trace bar" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "bytecode limit test: set second tracepoint"
-
-    gdb_trace_setactions "bytecode limit test: set second actions" \
-	    "" \
-	    "collect y + n" "^$"
-
-    gdb_test "trace baz" \
-	    "Tracepoint \[0-9\]+ at .*" \
-	    "bytecode limit test: set third tracepoint"
-
-    gdb_trace_setactions "bytecode limit test: set third actions" \
-	    "" \
-	    "collect z + n" "^$"
-
-    # Set secret artificial bytecode limit to a large number
-    gdb_test "maint packet QTLimit:bytecode:400" \
-	    "received: .OK." \
-	    "bytecode limit test: set limit to large"
-
-    # Now sending three bytecodes should still succeed.
-    send_gdb "tstart\n"
-    gdb_expect {
-	-re "$cr$gdb_prompt" {
-	    pass "bytecode limit test: send fewer than limit"
-	}
-	default {
-	    fail "bytecode limit test: send fewer than limit"
-	}
-    }
-
-    # Set secret artificial bytecode limit to a small number
-    gdb_test "maint packet QTLimit:bytecode:40" \
-	    "received: .OK." \
-	    "bytecode limit test: set limit to small"
-
-    # Now sending three bytecodes should fail.
-    gdb_test "tstart" \
-	    ".*\[Ee\]rror.*" \
-	    "bytecode limit test: send more than limit"
-
-
-    # Clean up:
-    gdb_test "tstop" "" ""
-    gdb_test "maint packet QTLimit:bytecode:FFFFFFFF" "" ""
-}
-
-proc gdb_trace_limits_tests { } {
-    global gdb_prompt
-
-    # We generously give ourselves one "pass" if we successfully 
-    # detect that this test cannot be run on this target!
-
-    if { ![gdb_target_supports_trace] } then { 
-	pass "Current target does not supporst trace"
-	return 1;
-    }
-
-    if [gdb_test "maint packet QTLimit:tp:ffffffff" \
-	    "received: .OK." ""] then { 
-	pass "This test cannot be run on this target"
-	return 1;
-    }
-
-    if [gdb_test "maint packet QTLimit:memrange:ffffffff" \
-	    "received: .OK." ""] then { 
-	pass "This test cannot be run on this target"
-	return 1;
-    }
-
-    if [gdb_test "maint packet QTLimit:bytecode:ffffffff" \
-	    "received: .OK." ""] then { 
-	pass "This test cannot be run on this target"
-	return;
-    }
-
-    gdb_tracepoint_limit_test
-    gdb_memrange_limit_test
-    gdb_bytecode_limit_test
-}
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load $binfile
- 
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-# Body of test encased in a proc so we can return prematurely.
-gdb_trace_limits_tests
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
deleted file mode 100644
index 458f732477e..00000000000
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ /dev/null
@@ -1,100 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp"
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    load_lib "emc-support.exp"
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-    gdb_test "set remotetimeout 6" "" ""
-    set timeout 500
-    gdb_target_monitor "$binfile"
-    # Give a TSTOP and ignore errors, to make sure any previous trace is off
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none"  "" ""
-    send_gdb "compare-sections CS\n"
-    gdb_expect {
-	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
-	    all tests in this module will fail.";
-	}
-	-re ".*$gdb_prompt $" { }
-    }
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-    gdb_load $binfile
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
-    runto_main
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-#
-# Test collecting a whole bunch of stuff at a single tracepoint.
-# The test is whether this crashes GDB.
-#
-
-gdb_delete_tracepoints
-gdb_test "trace gdb_c_test" "" ""
-gdb_trace_setactions "setup collect actions" \
-	"" \
-	"collect parm\[0\], parm\[1\], parm\[2\], parm\[3\]" "^$" \
-	"collect parm\[4\], parm\[5\], parm\[6\], parm\[7\]" "^$" \
-	"collect p, local_reg, local_static, local_static_sizeof" "^$" \
-	"collect local_long, stack_ptr, end_of_stack" "^$" \
-	"collect gdb_char_test, gdb_short_test, gdb_long_test" "^$" \
-	"collect gdb_arr_test, gdb_struct1_test, gdb_struct2_test" "^$" \
-	"collect gdb_structp_test, gdb_structpp_test, gdb_union1_test" "^$" \
-	"end" ""
-
-gdb_test "tstart" "" "survive the long packet send"
-if [istarget "m68k-*-elf"] then {
-    gdb_emclaptop_command "85,1,2,3,4,5,6"
-    sleep 5
-} else {
-    gdb_test "break end" "" ""
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint $decimal, end.*" \
-	    "run trace experiment"
-}
-
-gdb_test "tstop" "" "confirm: survived the long packet send"
-
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
deleted file mode 100644
index 8b2899ef601..00000000000
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ /dev/null
@@ -1,181 +0,0 @@
-#   Copyright 1998, 2005 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-if [istarget "m68k-*-elf"] then {
-    load_lib "emc-support.exp";
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-    gdb_test "set remotetimeout 6" "" ""
-    set timeout 500
-    gdb_target_monitor $binfile
-    # Give a TSTOP and ignore errors, to make sure any previous trace is off
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    send_gdb "compare-sections CS\n"
-    gdb_expect {
-	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
-	    all tests in this module will fail.";
-	}
-	-re ".*$gdb_prompt $" { }
-    }
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-    gdb_load $binfile
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
-    runto_main
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# We generously give ourselves one "pass" if we successfully 
-# detect that this test cannot be run on this target!
-if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not support trace"
-    return 1;
-
-}
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-
-#
-# test passcount dynamically (live target)
-#
-
-set baseline [gdb_find_recursion_test_baseline $srcfile];
-
-if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-# define relative source line numbers:
-# all subsequent line numbers are relative to this first one (baseline)
-
-set testline2  [expr $baseline +  4]
-set testline3  [expr $baseline +  5]
-set testline4  [expr $baseline +  6]
-
-#
-# test passcount command semantics (live test)
-#
-
-## Set three tracepoints with three different passcounts.
-## Verify that the experiment stops after the one with the 
-## lowest passcount is hit.
-
-gdb_delete_tracepoints
-set tdp2 [gdb_gettpnum "$testline2"]
-set tdp3 [gdb_gettpnum "$testline3"]
-set tdp4 [gdb_gettpnum "$testline4"]
-if { $tdp2 <= 0 || $tdp3 <= 0 || $tdp4 <= 0 } then {
-    fail "setting tracepoints"
-    return;
-}
-
-gdb_test "passcount 4 $tdp2" "Setting tracepoint $tdp2's passcount to 4" \
-	"4.5: set passcount for tracepoint $tdp2"
-gdb_test "passcount 2 $tdp3" "Setting tracepoint $tdp3's passcount to 2" \
-	"4.5: set passcount for tracepoint $tdp3"
-gdb_test "passcount 3 $tdp4" "Setting tracepoint $tdp4's passcount to 3" \
-	"4.5: set passcount for tracepoint $tdp4"
-
-gdb_test "tstart" "" ""
-
-if [istarget "m68k-*-elf"] then {
-    gdb_emclaptop_command "85,1,2,3,4,5,6"
-    sleep 5
-    gdb_emclaptop_command "85,7,8,9,A,B,C"
-    sleep 5
-    gdb_emclaptop_command "85,D,E,F,10,11,12"
-    sleep 5
-    # gdb_test "tstop"
-    ##
-    ## Note! Must NOT give the tstop command, because the passcount
-    ##       has already stopped the experiment.  You would not
-    ##       think this would be an error, but in EMC's mind it is...
-    ##
-} else {
-    gdb_test "break end" "" ""
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint $decimal, end.*" \
-	    "run trace experiment"
-    gdb_test "tstop" "" ""
-}
-
-gdb_test "tfind none" "" ""
-if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x -1 x" ""] {
-    gdb_suppress_entire_file "0: tfind none failed"
-}
-
-gdb_test "tfind tracepoint $tdp2" "" ""
-if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 0 x" ""] {
-    gdb_suppress_entire_file "1: first tfind failed"
-}
-
-gdb_test "tfind tracepoint $tdp3" "" ""
-if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 1 x" ""] {
-    gdb_suppress_entire_file "2: second tfind failed"
-}
-
-gdb_test "tfind tracepoint $tdp4" "" ""
-if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 2 x" ""] {
-    gdb_suppress_entire_file "3: third tfind failed"
-}
-
-gdb_test "tfind tracepoint $tdp2" "" ""
-if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 3 x" ""] {
-    gdb_suppress_entire_file "4: fourth tfind failed"
-}
-
-gdb_test "tfind tracepoint $tdp3" "" ""
-if [gdb_test "printf \"x \%d x\\n\", \$trace_frame" "x 4 x" ""] {
-    gdb_suppress_entire_file "5: fifth tfind failed"
-}
-
-## We should now be at the last frame, because this frame's passcount
-## should have caused collection to stop.  If we do a tfind now, 
-## it should fail.
-
-gdb_test "tfind" "failed to find.*" "4.5: dynamic passcount test"
-
-# Finished!
-gdb_test "tfind none" "" ""
-
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
deleted file mode 100644
index 1777693ff55..00000000000
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ /dev/null
@@ -1,178 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-if [istarget "m68k-*-elf"] then {
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-gdb_file_cmd $binfile
-
-# define relative source line numbers:
-# all subsequent line numbers are relative to this first one (baseline)
-set baseline  [gdb_find_recursion_test_baseline $srcfile];
-if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-set testline1  [expr $baseline + 3]
-
-#
-# test "passcount" command
-#
-
-gdb_delete_tracepoints
-set trcpt1 [gdb_gettpnum gdb_c_test];
-set trcpt2 [gdb_gettpnum gdb_asm_test];
-set trcpt3 [gdb_gettpnum $testline1];
-if { $trcpt1 <= 0 || $trcpt2 <= 0 || $trcpt3 <= 0 } then {
-    fail "setting tracepoints"
-    return;
-}
-
-# 4.1 passcount of specified tracepoint
-
-gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
-			"4.1a: set three tracepoints, passcounts all zero"
-
-gdb_test "passcount 2 $trcpt1" \
-	"Setting tracepoint $trcpt1.s passcount to 2" \
-	"4.1b: set 1st tracepoint's passcount to two"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
-	"4.1c: verify 1st tracepoint's passcount set to two"
-
-gdb_test "passcount 4 $trcpt2" \
-	"Setting tracepoint $trcpt2.s passcount to 4" \
-	"4.1d: set 2nd tracepoint's passcount to four"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_recursion_test.*" \
-	"4.1c: verify 2nd tracepoint's passcount set to four"
-
-# 4.2 passcount of last (default) tracepoint
-
-gdb_test "passcount 6" \
-	"Setting tracepoint $trcpt3.s passcount to 6" \
-	"4.2b: set last (default) tp's passcount to six"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+6\[\t \]+.*in gdb_recursion_test.*" \
-	"4.2b: verify last (default) tp's passcount set to six"
-
-# 4.3 run until stopped explicitly by user
-#     [deferred to dynamic test section]
-
-# 4.4 reset the previously set passcounts to new values
-
-gdb_test "passcount 7" \
-	"Setting tracepoint $trcpt3.s passcount to 7" \
-	"4.4a: reset last (default) tp's passcount to seven"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+7\[\t \]+.*in gdb_recursion_test.*" \
-	"4.4a: verify reset last (default) tp's passcount to seven"
-
-gdb_test "passcount 5 $trcpt2" \
-	"Setting tracepoint $trcpt2.s passcount to 5" \
-	"4.4b: reset second tracepoint's passcount to five"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+2\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+5\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+7\[\t \]+.*in gdb_recursion_test.*" \
-	"4.4c: verify reset second tracepoint's passcount to five"
-
-# 4.20 <FIXME test number> passcount for "all"
-
-gdb_test "passcount 3 all" \
-	".*$trcpt1.s pass.* 3.*$trcpt2.s pass.* 3.*$trcpt3.s pass.* 3" \
-	"4.20a: set all three passcounts to three"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+3\[\t \]+.*in gdb_recursion_test.*" \
-	"4.20a: set all three passcounts to three"
-
-gdb_test "passcount 4 all" \
-	".*$trcpt1.s pass.* 4.*$trcpt2.s pass.* 4.*$trcpt3.s pass.* 4" \
-	"4.20a: reset all three passcounts to four"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
-	"4.20b: reset all three passcounts to four"
-
-# 4.5 Verify trace stops on first "satisfied" passcount
-#     [deferred to dynamic test section]
-
-# 4.6 minimum passcount boundary condition
-
-gdb_test "passcount 0 $trcpt1" \
-	"Setting tracepoint $trcpt1.s passcount to 0" \
-	"4.6: set passcount to zero"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+0\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
-	"4.6: set passcount to zero"
-
-# 4.7 (test a very large passcount)
-
-gdb_test "passcount 32767 $trcpt1" \
-	"Setting tracepoint $trcpt1.s passcount to 32767" \
-	"4.7: set passcount to large number (32767)"
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1\[\t \]+y\[\t \]+$hex\[\t \]+32767\[\t \]+.*in gdb_c_test.*$trcpt2\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*gdb_asm_test.*$trcpt3\[\t \]+y\[\t \]+$hex\[\t \]+4\[\t \]+.*in gdb_recursion_test.*" \
-	"4.7: set passcount to large number (32767)"
-
-# 4.8 set passcount for invalid tracepoint
-
-gdb_test "passcount 1 [expr $trcpt2 + $trcpt3]" \
-	"No tracepoint number [expr $trcpt2 + $trcpt3]." \
-	"4.8: invalid tracepoint number in passcount"
-
-# 4.9 help passcount
-gdb_test "help passcount" "Set the passcount for a tracepoint.*" \
-	"4.9: help passcount"
-
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
deleted file mode 100644
index 28449fa0ab6..00000000000
--- a/gdb/testsuite/gdb.trace/report.exp
+++ /dev/null
@@ -1,421 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    load_lib "emc-support.exp";
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-    gdb_test "set remotetimeout 6" "" ""
-    set timeout 500
-    gdb_target_monitor $binfile
-    # Give a TSTOP and ignore errors, to make sure any previous trace is off
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none"  "" ""
-    send_gdb "compare-sections CS\n"
-    gdb_expect {
-	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
-	    all tests in this module will fail.";
-	}
-	-re ".*$gdb_prompt $" { }
-    }
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	     executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-    gdb_load $binfile
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
-    runto_main
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# We generously give ourselves one "pass" if we successfully 
-# detect that this test cannot be run on this target!
-if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not supporst trace"
-    return 1;
-
-}
-
-set cr "\[\r\n\]+"
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-#
-# test general reporting of trace experiment results
-#
-
-set testline1 0
-set testline2 0
-set testline3 0
-set testline4 0
-set testline5 0
-set testline6 0
-
-set arg1 1
-set arg2 2
-set arg3 3
-set arg4 4
-set arg5 5
-set arg6 6
-
-set gdb_recursion_test_baseline [gdb_find_recursion_test_baseline $srcfile];
-if { $gdb_recursion_test_baseline == -1 } {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-send_gdb "list $gdb_recursion_test_baseline, +12\n"
-gdb_expect {
-    -re "\[\r\n\](\[0-9\]+)\[^\r\n\]+gdbtestline 1 " {
-	set testline1 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+)\[^\r\n\]+gdbtestline 2 " {
-	set testline2 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+)\[^\r\n\]+gdbtestline 3 " {
-	set testline3 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+)\[^\r\n\]+gdbtestline 4 " {
-	set testline4 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+)\[^\r\n\]+gdbtestline 5 " {
-	set testline5 $expect_out(1,string)
-	exp_continue
-    }
-    -re "\[\r\n\](\[0-9\]+)\[^\r\n\]+gdbtestline 6 " {
-	set testline6 $expect_out(1,string)
-	exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    gdb_suppress_entire_file "failed to locate test source lines:
-all tests in this module will fail."
-	}
-    }
-    default {
-	    gdb_suppress_entire_file "failed to locate test source lines (def):
-all tests in this module will fail."
-    } 
-}
-
-#
-# Setup trace experiment.  This will involve:
-#   1) a tracepoint where nothing is collected
-#   2) a tracepoint where only regs are collected
-#   3) a tracepoint where only args are collected
-#   4) a tracepoint where only locals are collected
-#   5) a tracepoint where some amount of stack memory is collected.
-#   6) a tracepoint where some expressions are collected.
-#
-
-gdb_delete_tracepoints
-set tdp1 [gdb_gettpnum $testline1]
-set tdp2 [gdb_gettpnum $testline2]
-set tdp3 [gdb_gettpnum $testline3]
-set tdp4 [gdb_gettpnum $testline4]
-set tdp5 [gdb_gettpnum $testline5]
-set tdp6 [gdb_gettpnum $testline6]
-
-if {    $tdp1 <= 0 || $tdp2 <= 0 || $tdp3 <= 0 || \
-	$tdp4 <= 0 || $tdp5 <= 0 || $tdp6 <= 0 } then {
-    fail "setting tracepoints failed"
-    return;
-}
-
-gdb_trace_setactions "9.x: setup TP to collect regs" \
-	"$tdp2" \
-	"collect \$regs" "^$"
-
-
-gdb_trace_setactions "9.x: setup TP to collect args" \
-	"$tdp3" \
-	"collect \$args" "^$"
-
-gdb_trace_setactions "9.x: setup TP to collect locals" \
-	"$tdp4" \
-	"collect \$locs" "^$"
-
-gdb_trace_setactions "9.x: setup TP to collect stack memory" \
-	"$tdp5" \
-	"collect \$fp, \*\(void \*\*\) \$sp @ 64" "^$"
-
-gdb_trace_setactions "9.x: setup TP to collect expressions" \
-	"$tdp6" \
-	"collect gdb_char_test, gdb_short_test, gdb_long_test" "^$"
-
-gdb_test "tstart" "" ""
-
-if [istarget "m68k-*-elf"] then {
-    gdb_emclaptop_command "85,$arg1,$arg2,$arg3,$arg4,$arg5,$arg6"
-    sleep 5
-    
-} else {
-    gdb_test "break end" "" ""
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint $decimal, end.*" \
-	    "run trace experiment"
-}
-
-gdb_test "tstop" "" ""
-
-#
-# 9.1 test the tdump command
-#
-
-set timeout 60
-
-gdb_tfind_test "9.1: init: make sure not debugging any trace frame" "none" "-1"
-
-gdb_tfind_test "9.1: find frame for TP $tdp1" "tracepoint $tdp1" \
-	"\$tracepoint" "$tdp1"
-
-# Nothing was collected at tdp1, so this tdump should be empty.
-gdb_test "tdump" \
-	"Data collected at tracepoint $tdp1, trace frame $decimal:" \
-	"9.1: tdump, nothing collected"
-
-gdb_tfind_test "9.1: find frame for TP $tdp2" "tracepoint $tdp2" \
-	"\$tracepoint" "$tdp2"
-
-# regs were collected at tdp2.
-# How to match for the output of "info registers" on an unknown architecture?
-# For now, assume that every architecture has a register called "pc".
-gdb_test "tdump" \
-	"\[\r\n\]pc .*" \
-	"9.1: tdump, regs collected"
-
-gdb_tfind_test "9.1: find frame for TP $tdp3" "tracepoint $tdp3" \
-	"\$tracepoint" "$tdp3"
-
-# args were collected at tdp3
-gdb_test "tdump" \
-	"depth = 3.*q1 = 2.*q2 = 2.*q3 = 3.*q4 = 4.*q5 = 5.*q6 = 6" \
-	"9.1: tdump, args collected"
-
-gdb_tfind_test "9.1: find frame for TP $tdp4" "tracepoint $tdp4" \
-	"\$tracepoint" "$tdp4"
-
-# locals were collected at tdp4
-gdb_test "tdump" \
-	"q = 1" \
-	"9.1: tdump, locals collected"
-
-gdb_tfind_test "9.1: find frame for TP $tdp5" "tracepoint $tdp5" \
-	"\$tracepoint" "$tdp5"
-
-# stack was collected at tdp5, plus the frame pointer
-gdb_test "tdump" \
-	".fp = .*sp @ 64 = .*" \
-	"9.1: tdump, memrange collected"
-
-gdb_tfind_test "9.1: find frame for TP $tdp6" "tracepoint $tdp6" \
-	"\$tracepoint" "$tdp6"
-
-# globals were collected at tdp6
-gdb_test "tdump" \
-	"gdb_char_test = 1.*gdb_short_test = 2.*gdb_long_test = 3" \
-	"9.1: tdump, global variables collected"
-
-# 9.2 test tdump with arguments
-#     [no go, tdump doesn't have any arguments]
-
-# 9.3 help tdump
-
-gdb_test "help tdump" "Print everything collected at the current.*" \
-	"9.3: help tdump"
-
-set linecount1 0
-set linecount2 0
-set linecount3 0
-set linecount4 0
-set linecount5 0
-set linecount6 0
-
-gdb_tfind_test "11.x, 12.1: find start frame" "start" "0"
-
-#
-# 11.x test built-in trace variables $trace_frame, $trace_line etc.
-#
-
-gdb_test "printf \"x %d x\\n\", \$trace_frame" "x 0 x" \
-	"11.1: test \$trace_frame"
-
-gdb_test "printf \"x %d x\\n\", \$tracepoint" "x $tdp1 x" \
-	"11.2: test \$tracepoint"
-
-gdb_test "printf \"x %d x\\n\", \$trace_line" "x $testline1 x" \
-	"11.3: test \$trace_line"
-
-send_gdb "print \$trace_file\n"
-gdb_expect {
-    -re "\\$\[0-9\]+ = \"$srcfile\"\[\r\n\]+$gdb_prompt $" {
-	pass "11.4: test \$trace_file"
-    }
-    -re "\\$\[0-9\]+ = \"$srcdir/$subdir/$srcfile\"\[\r\n\]+$gdb_prompt $" {
-	pass "11.4: test \$trace_file"
-    }
-    -re "$gdb_prompt $" {
-	fail "11.4: test \$trace_file"
-    }
-    timeout {
-	fail "11.4: test \$trace_file (timeout)"
-    }
-}
-
-#gdb_test "print \$trace_file" "\"$srcdir/$subdir/$srcfile\"" \
-#	"11.4: test \$trace_file"
-
-#
-# 12.x test report generation using arbitrary GDB commands, loops etc.
-#
-
-send_gdb "while \$trace_frame != -1\n  output \$trace_file\n  printf \", line \%d \(tracepoint #\%d\)\\n\", \$trace_line, \$tracepoint\n  tfind\n  end\n"
-gdb_expect {
-    -re " line $testline1 .tracepoint .$tdp1" {
-	set linecount1 [expr $linecount1 + 1]
-	exp_continue
-    }
-    -re " line $testline2 .tracepoint .$tdp2" {
-	set linecount2 [expr $linecount2 + 1]
-	exp_continue
-    }
-    -re " line $testline3 .tracepoint .$tdp3" {
-	set linecount3 [expr $linecount3 + 1]
-	exp_continue
-    }
-    -re " line $testline4 .tracepoint .$tdp4" {
-	set linecount4 [expr $linecount4 + 1]
-	exp_continue
-    }
-    -re " line $testline5 .tracepoint .$tdp5" {
-	set linecount5 [expr $linecount5 + 1]
-	exp_continue
-    }
-    -re " line $testline6 .tracepoint .$tdp6" {
-	set linecount6 [expr $linecount6 + 1]
-	exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-	if { ($linecount1 < 4) || ($linecount2 < 4) || ($linecount3 < 4) || ($linecount4 < 4) || ($linecount5 < 4) || ($linecount6 < 4) } {
-	    fail "12.1: trace report #1"
-	} else {
-	    pass "12.1: trace report #1"
-	}
-    }
-    timeout {
-	fail "12.1: trace report #1 (timeout)"
-    }
-}
-
-gdb_tfind_test "12.2: find first TDP #2 frame" "tracepoint $tdp2" \
-	"\$tracepoint" "$tdp2"
-
-set linecount2 0
-
-send_gdb "while \$trace_frame != -1\n printf \"tracepoint #\%d, FP 0x\%08x, SP 0x\%08x, PC 0x%08x\\n\", \$tracepoint, \$fp, \$sp, \$pc\n tfind tracepoint\n end\n"
-gdb_expect {
-    -re "tracepoint #$tdp2, FP $hex, SP $hex, PC $hex" {
-	set linecount2 [expr $linecount2 + 1]
-	exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-	if { ($linecount2 < 4) } {
-	    fail "12.2: trace report #2"
-	} else {
-	    pass "12.2: trace report #2"
-	}
-    }
-    timeout {
-	fail "12.2: trace report #2 (timeout)"
-    }
-}
-
-gdb_tfind_test "12.3: find first TDP #3 frame" "tracepoint $tdp3" \
-	"\$tracepoint" "$tdp3"
-
-set linecount3 0
-
-send_gdb "while \$trace_frame != -1\n printf \"TDP #\%d, frame \%d: depth = \%d, q1 = \%d\\n\", \$tracepoint, \$trace_frame, depth, q1\n tfind tracepoint\n end\n"
-gdb_expect {
-    -re "TDP #$tdp3, frame $decimal: depth = $decimal, q1 = $decimal" {
-	set linecount3 [expr $linecount3 + 1]
-	exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-	if { ($linecount3 < 4) } {
-	    fail "12.3: trace report #3"
-	} else {
-	    pass "12.3: trace report #3"
-	}
-    }
-    timeout {
-	fail "12.3: trace report #3 (timeout)"
-    }
-}
-
-gdb_tfind_test "12.4: find first TDP #6 frame" "tracepoint $tdp6" \
-	"\$tracepoint" "$tdp6"
-
-set linecount6 0
-
-send_gdb "while \$trace_frame != -1\n printf \"TDP #\%d, frame %d: char_test = \%d, long_test = \%d\\n\", \$tracepoint, \$trace_frame, gdb_char_test, gdb_long_test\n tfind tracepoint\n end\n"
-gdb_expect {
-    -re "TDP #$tdp6, frame $decimal: char_test = $arg1, long_test = $arg3" {
-	set linecount6 [expr $linecount6 + 1]
-	exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-	if { ($linecount6 < 4) } {
-	    fail "12.4: trace report #4"
-	} else {
-	    pass "12.4: trace report #4"
-	}
-    }
-    timeout {
-	fail "12.4: trace report #4 (timeout)"
-    }
-}
-
-# Finished!
-gdb_tfind_test "finished: make sure not debugging any trace frame" "none" "-1"
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
deleted file mode 100644
index a5b7cf0ccde..00000000000
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ /dev/null
@@ -1,172 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-gdb_file_cmd $binfile
-
-# define relative source line numbers:
-# all subsequent line numbers are relative to this first one (baseline)
-set baseline  [gdb_find_recursion_test_baseline $srcfile];
-if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-set testline1 [expr $baseline + 4]
-set testline2 [expr $baseline + 5]
-set testline3 [expr $baseline + 6]
-set testline4 [expr $baseline + 7]
-set testline5 [expr $baseline + 8]
-set testline6 [expr $baseline + 9]
-
-#
-# test save-trace command
-#
-
-# setup a set of tracepoints to save
-
-gdb_delete_tracepoints
-
-foreach x { 1 2 3 4 5 6 } {
-    set testline [expr \$testline$x];
-    set trcpt [gdb_gettpnum $testline];
-    set trcpt$x $trcpt;
-    gdb_test "passcount $x" \
-	     "Setting tracepoint $trcpt.* to $x" \
-	     "10.x: set passcount for tracepoint $trcpt"
-
-    gdb_trace_setactions "10.x: set actions for tracepoint $x" \
-	    "" \
-	    "collect q$x" "^$" \
-	    "while-stepping $x" "^$" \
-	    "collect q$x" "^$" \
-	    "end" "^$"
-}
-
-
-proc gdb_verify_tracepoints { testname } {
-    global gdb_prompt;
-
-    set ws "\[\t \]+"
-    set nl "\[\r\n\]+"
-    set ourstate 1;
-    set result "pass";
-    send_gdb "info tracepoints\n";
-    gdb_expect 10 {
-	-re "y\[\t \]+0x\[0-9a-fA-F\]+\[\t \]+(\[0-9\]+)\[\t \]+(\[0-9\]+)\[\t \]+in gdb_recursion_test\[^\r\n\]+" {
-	    if { $expect_out(1,string) != $expect_out(2,string) } {
-		#set result "fail";
-	    }
-	    if { $expect_out(1,string) != $ourstate } {
-		set result "fail";
-	    }
-	    incr ourstate;
-	    exp_continue;
-	}
-	-re "$gdb_prompt $" {
-	    if { $ourstate >= 6 } {
-		set result "pass";
-	    } else {
-		set result "fail";
-	    }
-	}
-	default {
-	    set result "fail";
-	}
-    }
-    $result $testname;
-    return $result;
-}
-
-gdb_verify_tracepoints "10.x: verify trace setup";
-
-# 10.1 Save current tracepoint definitions to a file
-
-remote_file host delete savetrace.tr
-gdb_test "save-tracepoints savetrace.tr" \
-	"Tracepoints saved to file 'savetrace.tr'." \
-	"10.1: save tracepoint definitions"
-
-# 10.2 Read back tracepoint definitions
-
-gdb_delete_tracepoints
-gdb_test "info tracepoints" "No tracepoints." "10.2: delete tracepoints"
-gdb_test "source savetrace.tr" \
-	"Tracepoint \[0-9\]+ at .*" \
-	"10.2: read back saved tracepoints"
-gdb_verify_tracepoints "10.2: verify recovered tracepoints";
-remote_file host delete savetrace.tr
-
-# 10.3 repeat with a path to the file
-
-set escapedfilename [string_to_regexp $objdir/savetrace.tr]
-remote_file host delete $objdir/savetrace.tr
-gdb_test "save-tracepoints $objdir/savetrace.tr" \
-	"Tracepoints saved to file '${escapedfilename}'." \
-	"10.3: save tracepoint definitions, full path"
-
-gdb_delete_tracepoints
-gdb_test "info tracepoints" "No tracepoints." "10.3: delete tracepoints"
-gdb_test "source $objdir/savetrace.tr" \
-	"Tracepoint \[0-9\]+ at .*" \
-	"10.4: read saved tracepoints, full path"
-gdb_verify_tracepoints "10.3: verify recovered tracepoints, full path";
-remote_file host delete $objdir/savetrace.tr
-
-# 10.5 invalid filename
-#      [deferred -- not sure what a good invalid filename would be]
-
-# 10.6 save-trace (file already exists)
-#      [expect it to clobber the old one]
-
-# 10.7 help save-tracepoints
-
-gdb_test "help save-tracepoints" \
-	"Save current tracepoint definitions as a script.*" \
-	"10.7: help save-tracepoints"
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
deleted file mode 100644
index 930382083ce..00000000000
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ /dev/null
@@ -1,406 +0,0 @@
-#   Copyright 1998, 2002, 2005 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    load_lib "emc-support.exp";
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-    gdb_test "set remotetimeout 6" "" ""
-    set timeout 500
-    gdb_target_monitor $binfile
-    # Give a TSTOP and ignore errors, to make sure any previous trace is off
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    send_gdb "compare-sections CS\n"
-    gdb_expect {
-	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
-	    all tests in this module will fail.";
-	}
-	-re ".*$gdb_prompt $" { }
-    }
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-    gdb_load $binfile
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
-    runto_main
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# We generously give ourselves one "pass" if we successfully 
-# detect that this test cannot be run on this target!
-if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not supporst trace"
-    return 1;
-
-}
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-# define relative source line numbers:
-# all subsequent line numbers are relative to this first one (baseline)
-set baseline  [gdb_find_recursion_test_baseline $srcfile];
-if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-set testline1 [expr $baseline + 1]
-set testline2 [expr $baseline + 5]
-set testline3 [expr $baseline + 6]
-set testline4 [expr $baseline + 7]
-set testline5 [expr $baseline + 8]
-
-#
-# test tfind command
-#
-
-gdb_delete_tracepoints
-set tdp1 [gdb_gettpnum "\*gdb_recursion_test"]
-set tdp2 [gdb_gettpnum $testline2]
-set tdp3 [gdb_gettpnum $testline3]
-set tdp4 [gdb_gettpnum $testline4]
-set tdp5 [gdb_gettpnum $testline5]
-if { $tdp1 <= 0 || $tdp2 <= 0 || $tdp3 <= 0 || \
-     $tdp4 <= 0 || $tdp5 <= 0 } then {
-    fail "setting tracepoints"
-    return;
-}
-
-# 6.1 test tstart command
-send_gdb "tstart\n"
-gdb_expect {
-    -re "Trace can only be run on remote targets.*$gdb_prompt $" {
-	fail "6.1: tstart (not connected to remote?)"
-	return;
-    }
-    -re "Target does not support this command.*$gdb_prompt $" {
-	fail "6.1: tstart (connected to wrong target?)"
-	return;
-    }
-    -re "Target returns error code.*$gdb_prompt $" {
-	fail "6.1: tstart (connected to wrong target?)"
-	return;
-    }
-    -re "$gdb_prompt $" {
-	pass "6.1: tstart"
-    }
-    default {
-	fail "6.1: tstart (default)"
-	return;
-    }
-}
-
-# test tstatus (when trace on)
-gdb_test "tstatus" "\[Tt\]race is running.*" "test tstatus on"
-
-# 6.2 test help tstart
-gdb_test "help tstart" "Start trace data collection." "6.2: help tstart"
-
-if [istarget "m68k-*-elf"] then {
-    gdb_emclaptop_command "85,1,2,3,4,5,6"
-    sleep 5
-    
-    gdb_emclaptop_command "85,7,8,9,A,B,C"
-    sleep 5
-} else {
-    gdb_test "break end" "" ""
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint $decimal, end.*" \
-	    "run trace experiment"
-}
-
-# 7.1 test tstop command
-send_gdb "tstop\n"
-gdb_expect {
-    -re "Trace can only be run on remote targets.*$gdb_prompt $" {
-	fail "7.1: tstop (not connected to remote?)"
-	return;
-    }
-    -re "Target does not support this command.*$gdb_prompt $" {
-	fail "7.1: tstop (connected to wrong target?)"
-	return;
-    }
-    -re "Target returns error code.*$gdb_prompt $" {
-	fail "7.1: tstop (connected to wrong target?)"
-	return;
-    }
-    -re "$gdb_prompt $" {
-	pass "7.1: tstop"
-    }
-    default {
-	fail "7.1: tstop (default)"
-	return;
-    }
-}
-
-# 7.2 test help tstop
-gdb_test "help tstop" "Stop trace data collection." "7.2: help tstop"
-
-# test tstatus (when trace off)
-gdb_test "tstatus" "\[Tt\]race.* not running.*" "test tstatus off"
-
-## record starting PC
-set save_pc [gdb_readexpr "(unsigned long) \$pc"];
-if { $save_pc == -1 } then {
-    fail "could not read PC"
-    return;
-}
-
-# 8.7  tfind start
-## check $trace_frame == 0
-gdb_tfind_test "8.7: tfind start command" "start" "0";
-## check $pc != startPC
-gdb_test "printf \"x \%d x\\n\", \$pc != $save_pc" \
-	"x 1 x" \
-	"8.7b: tfind start"
-
-# 8.8  tfind none
-## check $trace_frame == -1
-gdb_tfind_test "8.8: tfind none" "none" "-1";
-## check $pc == startPC
-gdb_test "printf \"x \%d x\\n\", \$pc == $save_pc" \
-	"x 1 x" \
-	"8.8b: tfind none (restores non-trace PC)"
-
-# 8.9  tfind end
-## check $trace_frame == -1
-gdb_tfind_test "8.9: tfind end, selects no frame" "end" "-1";
-## check $pc == startPC
-gdb_test "printf \"x \%d x\\n\", \$pc == $save_pc" \
-	"x 1 x" \
-	"8.9b: tfind end (restores non-tracing PC)"
-
-# 8.1  tfind n
-## check $trace_frame == n
-gdb_tfind_test "8.1: tfind 1" "1" "1"
-## check $trace_line corresponds to tracepoint for frame n
-gdb_test "print \$trace_line" "$testline2" "8.1b: tfind 1 (correct line)"
-
-# 8.28 tfind invalid n (big number)
-## check "not found" error
-## check $trace_frame != n
-gdb_test "tfind 32767" \
-	"failed to find.*" \
-	"8.28: tfind <n> command rejects invalid frame number"
-
-gdb_test "printf \"x \%d x\\n\", \$trace_frame == 32767" \
-	"x 0 x" \
-	"8.28: tfind <n> rejected bad input (32767)"
-
-# 8.31 tfind negative n
-## check error
-gdb_test "tfind -3" "invalid input.*" "8.31: tfind <n> rejects negative input"
-## check $trace_frame != -n
-gdb_test "printf \"x \%d x\\n\", \$trace_frame == -3" "x 0 x" \
-	"8.31: tfind <n> rejected negative input (-3)"
-
-# 8.10 tfind <no arg>
-## check $trace_frame += 1
-
-gdb_tfind_test "8.10: tfind start" "start" "0";
-gdb_test "print \$trace_line" "$baseline"  \
-	"8.10: tfind 0 (correct line $baseline)"
-gdb_tfind_test "8.10: tfind noargument 1" "" "1";
-gdb_test "print \$trace_line" "$testline2" \
-	"8.10: tfind 1 (correct line $testline2)"
-gdb_tfind_test "8.10: tfind noargument 2" "" "2";
-gdb_test "print \$trace_line" "$testline3" \
-	"8.10: tfind 2 (correct line $testline3)"
-gdb_tfind_test "8.10: tfind noargument 3" "" "3";
-gdb_test "print \$trace_line" "$testline4" \
-	"8.10: tfind 3 (correct line $testline4)"
-
-gdb_tfind_test "8.11: tfind 3" "3" "3";
-gdb_test "print \$trace_line" "$testline4" \
-	"8.11: tfind 3 (correct line $testline4)"
-gdb_tfind_test "8.11: tfind backward 2" "-" "2";
-gdb_test "print \$trace_line" "$testline3" \
-	"8.11: tfind 2 (correct line $testline3)"
-gdb_tfind_test "8.11: tfind backward 1" "-" "1";
-gdb_test "print \$trace_line" "$testline2" \
-	"8.11: tfind 1 (correct line $testline2)"
-gdb_tfind_test "8.11: tfind backward 0" "-" "0";
-gdb_test "print \$trace_line" "$baseline"  \
-	"8.11: tfind 0 (correct line $baseline)"
-
-gdb_tfind_test "8.12: tfind none" "none" "-1";
-gdb_tfind_test "8.12: tfind tracepoint <n>" "tracepoint $tdp2" \
-	"\$tracepoint" "$tdp2";
-gdb_test "print \$trace_line" "$testline2" \
-	"8.12: tfind tracepoint <n> (line $testline2)"
-
-gdb_tfind_test "8.25: tfind none" "none" "-1";
-gdb_test "tfind tracepoint 0" "failed to find.*" \
-	"8.25: tfind tracepoint rejects zero"
-gdb_test "tfind tracepoint 32767" "failed to find.*" \
-	"8.25: tfind tracepoint rejects nonexistant tracepoint (32767)"
-gdb_test "tfind tracepoint -1" "failed to find.*" \
-	"8.25: tfind tracepoint rejects nonexistant tracepoint (-1)"
-
-# 8.37 tfind tracepoint n where n no longer exists (but used to)
-gdb_test "delete trace $tdp2" "" ""
-gdb_tfind_test "8.37: tfind none" "none" "-1";
-gdb_tfind_test "8.37: tfind deleted tracepoint" \
-	"tracepoint $tdp2" \
-	"\$tracepoint" "$tdp2";
-gdb_test "print \$trace_line" "$testline2" \
-	"8.37: tfind deleted tracepoint (line $testline2)"
-
-# 8.13 tfind tracepoint <no arg>
-## check $tracepoint same before and after, $trace_frame changed
-
-gdb_tfind_test "8.13: tfind none" "none" "-1";
-gdb_tfind_test "8.13: tracepoint $tdp1" "tracepoint $tdp1" \
-	"\$tracepoint" "$tdp1";
-gdb_test "print \$trace_line" "$baseline" \
-	"8.13: tfind tracepoint $tdp1 (line $baseline)"
-gdb_test "set \$save_frame = \$trace_frame" "" ""
-gdb_tfind_test "8.13: tracepoint <no arg>" "tracepoint" \
-	"\$tracepoint" "$tdp1";
-gdb_test "printf \"x \%d x\\n\", \$trace_frame == \$save_frame" \
-	"x 0 x" \
-	"8.13: tracepoint <no arg>, tracepoint number unchanged"
-
-# 1.12 set tracepoint in prologue
-#
-# tdp1 was set at *gdb_recursion_test (ie. the hard address of the
-# function, before the prologue).  Test to see that it succeeded.
-# Current pc should be equal to the address of the function.
-
-gdb_test "printf \"x \%d x\\n\", \$pc == gdb_recursion_test" \
-	"x 1 x" \
-	"1.12: set tracepoint in prologue"
-
-# 8.14 tfind pc x
-## check pc == x, $trace_frame != -1
-gdb_tfind_test "8.14: tfind 3" "3" "3"
-gdb_test "print \$trace_line" "$testline4" \
-	"8.14: tfind 3 (line $testline4)"
-
-gdb_test "set \$test_pc = \$pc" "" ""
-gdb_tfind_test "8.14: tfind none" "none" "-1"
-gdb_tfind_test "8.14: tfind pc" "pc \$test_pc" "\$trace_frame != -1" "1";
-gdb_test "print \$trace_line" "$testline4" \
-	"8.14: tfind pc x (line $testline4)"
-gdb_test "printf \"x \%d x\\n\", \$pc == \$test_pc" \
-	"x 1 x" \
-	"8.14: tfind pc x"
-
-# 8.15 tfind pc <no arg>
-## check pc same before and after, $trace_frame changed
-gdb_tfind_test "8.15: tfind 3" "3" "3"
-gdb_test "print \$trace_line" "$testline4" \
-	"8.15: tfind 3 (line $testline4)"
-gdb_test "set \$test_pc = \$pc" "" ""
-gdb_tfind_test "8.15: tfind pc" "pc" "\$pc == \$test_pc" "1"
-gdb_test "print \$trace_line" "$testline4" \
-	"8.15: tfind pc (line $testline4)"
-gdb_test "printf \"x \%d x\\n\", \$trace_frame != 3" "x 1 x" \
-	"8.15: trace frame didn't change"
-
-# 8.26 tfind pc invalid x
-## check error, pc != x (trace_frame unchanged?)
-gdb_tfind_test "8.26: tfind start" "start" "0"
-gdb_test "tfind pc  0" "failed to find.*" "8.26: tfind pc zero"
-gdb_test "tfind pc -1" "failed to find.*" "8.26: tfind pc -1"
-
-# 8.16 tfind line n
-## check #trace_frame != -1, $trace_line == n
-gdb_tfind_test "8.16: tfind none" "none" "-1"
-gdb_tfind_test "8.16: tfind line $testline3" \
-	"line $testline3" \
-	"\$trace_line == $testline3" "1"
-
-# 8.17 tfind line <no arg> (# 8.19, 8.20)
-## check $trace_line changed, no error, pc changed, frame changed, tdp changed
-gdb_tfind_test "8.17: tfind none" "none" "-1"
-gdb_tfind_test "8.17: tfind line $testline3" "line $testline3" "\$trace_line == $testline3" "1"
-gdb_tfind_test "8.17: tfind line <no arg>" "line" "\$trace_line != $testline3" "1"
-
-# 8.36 tfind and disassembly
-gdb_tfind_test "8.36: tfind start" "start" "0"
-set timeout 60
-send_gdb "disassemble gdb_c_test\n"
-# look for disassembly of function label
-gdb_expect {
-    -re "<gdb_c_test>:.*$gdb_prompt $"      { pass "8.36: trace disassembly" }
-    -re ".*$gdb_prompt $"                   { fail "8.36: trace disassembly" }
-    timeout                       { fail "8.36: trace disassembly (timeout)" }
-}
-
-gdb_test "tfind line 0" \
-	"out of range.*|failed to find.*" \
-	"8.18: tfind line 0";
-gdb_test "tfind line 32767" \
-	"out of range.*|failed to find.*" \
-	"8.27: tfind line 32767";
-gdb_test "tfind line NoSuChFiLe.c:$baseline" \
-	"No source file named.*" \
-	"8.27: tfind line in bad source file";
-
-# 8.32 tfind invalid subcommand (tfind foo) 
-## check error
-gdb_test "tfind NoSuChOpTiOn 21" \
-	"No symbol.*|\[Ww\]arning.*|\[Ee\]rror.*" \
-	"8.32: tfind with bad subcommand"
-
-# 8.38 test help tfind
-gdb_test "help tfind"       "Select a trace frame.*"      \
-	"8.38: help tfind"
-gdb_test "help tfind pc"    "Select a trace frame by PC.*" \
-	"8.38: help tfind PC"
-gdb_test "help tfind end"   "Synonym for 'none'.*"        \
-	"8.38: help tfind end"
-gdb_test "help tfind none"  "De-select any trace frame.*" \
-	"8.38: help tfind none"
-gdb_test "help tfind line"  "Select a trace frame by source line.*" \
-	"8.38: help tfind line"
-gdb_test "help tfind start" "Select the first trace frame.*" \
-	"8.38: help tfind start"
-gdb_test "help tfind range" "Select a trace frame whose PC is in.*" \
-	"8.38: help tfind range"
-gdb_test "help tfind trace" "Select a trace frame by tracepoint number.*" \
-	"8.38: help tfind tracepoint"
-
-# Finished!
-gdb_tfind_test "8.17: tfind none" "none" "-1"
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
deleted file mode 100644
index d79c98edbf5..00000000000
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ /dev/null
@@ -1,269 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-if [istarget "m68k-*-elf"] then {
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-gdb_file_cmd $binfile
-
-# define relative source line numbers:
-# all subsequent line numbers are relative to this first one (baseline)
-set baseline  [gdb_find_recursion_test_baseline $srcfile];
-if { $baseline == -1 } then {
-    fail "Could not find gdb_recursion_test function"
-    return;
-}
-
-set testline1 [expr $baseline + 1]
-set testline2 [expr $baseline + 3]
-
-#
-# test "help tracepoints"
-#
-
-set helpcnt 0;
-send_gdb "help tracepoints\n"
-gdb_expect {
-    -re "Tracing of program execution without stopping the program." {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "actions -- Specify the actions to be taken at a tracepoint" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "collect -- Specify one or more data items to be collected" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "delete tracepoints -- Delete specified tracepoints" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "end -- Ends a list of.*actions" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "info tracepoints -- Status of tracepoints" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "passcount -- Set the passcount for a tracepoint" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "save-tracepoints -- Save current tracepoint definitions" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tdump -- Print everything collected at the current tracepoint" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind -- Select a trace frame" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind end -- Synonym for 'none'" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind line -- Select a trace frame by line number" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind none -- De-select any trace frame and resume 'live' debugging" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind outside -- Select a trace frame whose PC is outside" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind pc -- Select a trace frame by PC" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind range -- Select a trace frame whose PC is in the given" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind start -- Select the first trace frame in the trace buffer" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tfind tracepoint -- Select a trace frame by tracepoint number" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "trace -- Set a tracepoint at a specified line or function or addr" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tstart -- Start trace data collection" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tstatus -- Display the status of the current trace data collection" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "tstop -- Stop trace data collection" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re "while-stepping -- Specify single-stepping behavior at a tracepoint" {
-	incr helpcnt;
-	exp_continue
-    }
-    -re ".*$gdb_prompt $" {
-	if { $helpcnt == 21 } {
-	    pass "1.0: help tracepoints"
-	} else {
-	    warning "$helpcnt";
-	    fail "1.0: help tracepoints"
-	}
-    }
-}
-
-#
-# test trace command:
-#
-
-# 1.1 trace source line
-gdb_delete_tracepoints
-gdb_test "trace $srcfile:$testline2" \
-	"Tracepoint $decimal at $hex: file.*$srcfile, line $testline2." \
-	"1.1a: set tracepoint at sourceline"
-gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline2" \
-	"1.1b: trace sourcefile:line"
-
-# 1.2 trace invalid source line
-gdb_delete_tracepoints
-gdb_test "trace $srcfile:99999" "No line 99999 in file \".*$srcfile\"." \
-	"1.2a: trace invalid line in sourcefile"
-gdb_test "info trace" "No tracepoints.*" \
-	"1.2b: reject invalid line in srcfile"
-
-# 1.3 trace line in invalid source file
-gdb_delete_tracepoints
-gdb_test "trace NoSuChFiLe.c:1" "No source file named NoSuChFiLe.c." \
-	"1.3a: trace invalid source file"
-gdb_test "info trace" "No tracepoints.*" \
-	"1.3b: reject invalid srcfile"
-
-# 1.4 trace function by name
-gdb_delete_tracepoints
-gdb_test "trace gdb_recursion_test" \
-	"Tracepoint $decimal at $hex: file.*$srcfile, line $testline1." \
-	"1.4a: trace function by name"
-gdb_test "info trace" "in gdb_recursion_test.*$srcfile:$testline1" \
-	"1.4b: trace function by name"
-
-# 1.5 trace non-existant function
-gdb_delete_tracepoints
-gdb_test "trace NoSuChFuNc" "Function \"NoSuChFuNc\" not defined." \
-	"1.5a: trace invalid function"
-gdb_test "info trace" "No tracepoints.*" \
-	"1.5b: reject invalid srcfile"
-
-# 1.6 trace at a specific address
-#     Collect the address of "gdb_asm_test", and use that.
-send_gdb "print gdb_asm_test\n"
-gdb_expect {
-    -re "\[$\]\[0-9\].*0x(\[0-9a-fA-F\]+).*$gdb_prompt $" {
-	set asm_test_addr $expect_out(1,string)
-    }
-    timeout { }
-}
-
-gdb_delete_tracepoints
-gdb_test "trace \*0x$asm_test_addr" \
-	"Tracepoint $decimal at .*$asm_test_addr.*" \
-	"1.6a: trace at specific address"
-gdb_test "info trace" "$asm_test_addr.*gdb_asm_test.*" \
-	"1.6b: verify trace at specific address"
-
-# 1.7 trace at function's exact address
-#     Collect the address of the function for comparison
-send_gdb "print gdb_recursion_test\n"
-gdb_expect {
-    -re "\[$\]\[0-9\].*0x(\[0-9a-fA-F\]+).*$gdb_prompt $" {
-	set c_test_addr $expect_out(1,string)
-    }
-    timeout { }
-}
-
-gdb_delete_tracepoints
-gdb_test "trace \*gdb_recursion_test" \
-	"Tracepoint $decimal at .*$c_test_addr.*" \
-	"1.7a: trace at function label (before prologue)"
-gdb_test "info trace" "$c_test_addr.*in gdb_recursion_test.*:$baseline" \
-	"1.7b: verify trace at specific address"
-
-# 1.8 trace at invalid address
-# no address is invalid
-
-# 1.9 trace no arguments
-gdb_test "trace" "trace command requires an argument" \
-	"1.9: trace <no arguments>"
-
-# 1.10 set large number of tracepoints
-# deferred to limits test module
-
-# 1.11 tracepoint conditions
-# conditions on tracepoints not implemented
-
-# 1.12 set tracepoint in prologue
-# [see tfind.exp]
-
-# 1.13 trace on recursion
-# interesting only in "live" session: see backtrace.exp for live test.
-
-# 1.14 help trace
-gdb_test "help trace" "Set a tracepoint at .*" "1.14: help trace"
-
-
diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
deleted file mode 100644
index 84ab14b9409..00000000000
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ /dev/null
@@ -1,124 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp"
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    load_lib "emc-support.exp"
-    set testfile "gdb_c_test"
-    set srcfile  $testfile.c
-    set binfile [board_info target d490_binfile];
-    gdb_test "set remotetimeout 6" "" ""
-    set timeout 500
-    gdb_target_monitor "$binfile"
-    # Give a TSTOP and ignore errors, to make sure any previous trace is off
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none"  "" ""
-    send_gdb "compare-section CS\n"
-    gdb_expect {
-	-re "MIS-MATCHED.*$gdb_prompt $" {
-	    gdb_suppress_entire_file "Symbol file does not match target!
-	    all tests in this module will fail.";
-	}
-	-re ".*$gdb_prompt $" { }
-    }
-} else {
-    set testfile "actions"
-    set srcfile $testfile.c
-    set binfile $objdir/$subdir/$testfile
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-    gdb_load $binfile
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
-    runto_main
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# We generously give ourselves one "pass" if we successfully 
-# detect that this test cannot be run on this target!
-if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not supporst trace"
-    return 1;
-
-}
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-#
-# test while-stepping dynamically (live target)
-#
-
-## verify number of trace frames collected matches stepcount
-
-gdb_delete_tracepoints
-gdb_test "trace gdb_c_test" \
-	"Tracepoint $decimal at .*" \
-	"Set tracepoint at gdb_c_test"
-
-gdb_trace_setactions "5.12: define while-stepping <stepcount>" \
-	"" \
-	"collect \$fp" "^$" \
-	"while-stepping 5" "^$" \
-	"collect p" "^$" \
-	"end" "^$" \
-	"end" ""
-
-gdb_test "tstart" "" ""
-
-if [istarget "m68k-*-elf"] then {
-    gdb_emclaptop_command "85,1,2,3,4,5,6"
-    sleep 5
-} else {
-    gdb_test "break end" "" ""
-    gdb_test "continue" \
-	    "Continuing.*Breakpoint $decimal, end.*" \
-	    "run trace experiment"
-}
-
-gdb_test "tstop" "" ""
-
-gdb_tfind_test "5.12: frame 5 should be the last one collected" "5" "5"
-
-send_gdb "tfind 6\n"
-gdb_expect {
-    -re "failed to find.*$gdb_prompt $" {
-	pass "5.12: trace stopped after 5 stepping frames"
-    }
-    -re ".*$gdb_prompt $" {
-	fail "5.12: trace stopped after 5 stepping frames"
-    }
-}
-
-gdb_test "tfind none" "" ""
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
deleted file mode 100644
index 4c87d5cf214..00000000000
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ /dev/null
@@ -1,116 +0,0 @@
-#   Copyright 1998 Free Software Foundation, 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 Michael Snyder (msnyder@cygnus.com)
-
-load_lib "trace-support.exp";
-
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
-
-gdb_exit
-gdb_start
-
-if [istarget "m68k-*-elf"] then {
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile ${objdir}/${subdir}/${testfile}
-    if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
-	    executable {debug additional_flags=-w}] != "" } {
-	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
-}
-gdb_reinitialize_dir $srcdir/$subdir
-
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
-gdb_file_cmd $binfile
-
-#
-# test while-stepping command
-#
-
-gdb_delete_tracepoints
-set trcpt1 [gdb_gettpnum gdb_c_test]
-if { $trcpt1 <= 0 } then {
-    fail "Could not find gdb_c_test function"
-    return;
-}
-
-# 5.12 basic while-stepping command (collect regs)
-
-gdb_test "info tracepoints" \
-	"Num Enb Address\[ \]+PassC StepC What.*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+0\[\t \]+.*in gdb_c_test.*" \
-	"5.12: set a tracepoint, stepcount is zero"
-
-set stepcount 12
-
-gdb_trace_setactions "5.12: set stepcount to $stepcount" \
-	"" \
-	"while-stepping $stepcount" "" \
-	"collect \$regs" "^$" \
-	"end" ""
-
-gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+$stepcount\[\t \]+.*in gdb_c_test.*" \
-	"5.12: confirm stepcount set to $stepcount"
-
-gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*
-.*while-stepping $stepcount.*" \
-	"5.12: info trace shows \"while-stepping\""
-
-
-# 5.13 step out of context while collecting local variable
-#      [deferred to dynamic test section]
-
-proc while_stepping_bogus_arg { bogus msgstring } {
-    global gdb_prompt;
-
-    gdb_trace_setactions "$msgstring" \
-	    "" \
-	    "while-stepping $bogus" "\[Ee\]rror|\[Ww\]arning"
-}
-
-# 5.14 while-stepping (no argument)
-
-while_stepping_bogus_arg "" "5.14: while-stepping null stepcount"
-
-# 5.15 while-stepping (zero stepcount)
-
-while_stepping_bogus_arg "0" "5.15: while-stepping rejects zero stepcount"
-
-# 5.16 while-stepping without collecting anything
-gdb_trace_setactions "5.16: step without collecting anything" \
-	"" \
-	"while-stepping $stepcount" "^$" \
-	"end" ""
-
-gdb_test "info tracepoints" \
-	".*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+$stepcount\[\t \]+.*in gdb_c_test.*\[ \t\]+Actions for tracepoint $trcpt1:.*\[ \t\]+while-stepping $stepcount.*\[ \t\]+end.*\[ \t\]+end.*" \
-	"5.16: confirm actions, step without collecting anything"
-
diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp
deleted file mode 100644
index 647114ae14b..00000000000
--- a/gdb/testsuite/lib/ada.exp
+++ /dev/null
@@ -1,433 +0,0 @@
-# Copyright 2004 Free Software Foundation, 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.  
-
-load_lib libgloss.exp
-
-# FIXME:brobecker/2004-03-31:
-# The following function should eventually be part of dejagnu. Even after
-# this function becomes available in dejagnu, we will keep for a while
-# a copy of this function here in order to avoid increasing the dejagnu
-# version requirement.
-
-proc gdb_find_gnatmake {} {
-    global tool_root_dir
-
-    set root "$tool_root_dir/gcc"
-    set GM ""
-
-    if ![is_remote host] {
-        set file [lookfor_file $root gnatmake]
-        if { $file != "" } {
-            set GM "$file -I$root/ada/rts --GCC=$root/xgcc --GNATBIND=$root/gnatbind --GNATLINK=$root/gnatlink -cargs -B$root -largs --GCC=$root/xgcc -margs";
-        }   
-    }
-
-    if {$GM == ""} {
-        set GM [transform gnatmake]
-    }
-
-    return $GM
-}   
-
-# FIXME:brobecker/2004-03-31:
-# The following function is a copy of the function of the same name provided
-# by dejagnu, except that it has been modified to add support for building
-# Ada programs.  This copy is temporarily placed here until the changes
-# are merged into the dejagnu official release. Once the changes are merged,
-# we will likely keep this local copy for a while to avoid increasing the
-# dejagnu version requirement.
-
-proc gdb_default_target_compile {source destfile type options} {
-    global target_triplet
-    global tool_root_dir
-    global CFLAGS_FOR_TARGET
-    global compiler_flags
-
-    if { $destfile == "" && $type != "preprocess" && $type != "none" } {
-	error "Must supply an output filename for the compile to default_target_compile"
-    }
-
-    set add_flags ""
-    set libs ""
-    set compiler_type "c"
-    set compiler ""
-    set ldflags ""
-    set dest [target_info name]
-
-    if [info exists CFLAGS_FOR_TARGET] {
-	append add_flags " $CFLAGS_FOR_TARGET"
-    }
-
-    if [info exists target_info(host,name)] {
-	set host [host_info name];
-    } else {
-	set host "unix";
-    }
-
-    foreach i $options {
-	if { $i == "ada" } {
-	    set compiler_type "ada"
-	    if [board_info $dest exists adaflags] {
-		append add_flags " [target_info adaflags]"
-	    }
-	    # append add_flags " [gnatmake_include_flags]";
-	    if [board_info $dest exists gnatmake] {
-		set compiler [target_info gnatmake];
-	    } else {
-		set compiler [find_gnatmake];
-	    }
-	}
-
-	if { $i == "c++" } {
-	    set compiler_type "c++"
-	    if [board_info $dest exists cxxflags] {
-		append add_flags " [target_info cxxflags]"
-	    }
-	    append add_flags " [g++_include_flags]";
-	    if [board_info $dest exists c++compiler] {
-		set compiler [target_info c++compiler];
-	    } else {
-		set compiler [find_g++];
-	    }
-	}
-
-	if { $i == "f77" } {
-	    set compiler_type "f77"
-	    if [board_info $dest exists f77flags] {
-		append add_flags " [target_info f77flags]"
-	    }
-#	    append add_flags " [f77_include_flags]"
-	    if [board_info $dest exists f77compiler] {
-		set compiler [target_info f77compiler]
-	    } else {
-		set compiler [find_g77]
-	    }
-	}
-
-	if [regexp "^dest=" $i] {
-	    regsub "^dest=" $i "" tmp
-	    if [board_info $tmp exists name] {
-		set dest [board_info $tmp name];
-	    } else {
-		set dest $tmp;
-	    }
-	}
-	if [regexp "^compiler=" $i] {
-	    regsub "^compiler=" $i "" tmp
-	    set compiler $tmp
-	}
-	if [regexp "^additional_flags=" $i] {
-	    regsub "^additional_flags=" $i "" tmp
-	    append add_flags " $tmp"
-	}
-	if [regexp "^ldflags=" $i] {
-	    regsub "^ldflags=" $i "" tmp
-	    append ldflags " $tmp"
-	}
-	if [regexp "^libs=" $i] {
-	    regsub "^libs=" $i "" tmp
-	    append libs " $tmp"
-	}
-	if [regexp "^incdir=" $i] {
-	    regsub "^incdir=" $i "-I" tmp
-	    append add_flags " $tmp"
-	}
-	if [regexp "^libdir=" $i] {
-	    regsub "^libdir=" $i "-L" tmp
-	    append add_flags " $tmp"
-	}
-	if [regexp "^ldscript=" $i] {
-	    regsub "^ldscript=" $i "" ldscript
-	}
- 	if [regexp "^redirect=" $i] {
- 	    regsub "^redirect=" $i "" redirect
- 	}
- 	if [regexp "^optimize=" $i] {
- 	    regsub "^optimize=" $i "" optimize
- 	}
- 	if [regexp "^timeout=" $i] {
- 	    regsub "^timeout=" $i "" timeout
- 	}
-    }
-
-    if [board_info $host exists cflags_for_target] {
-	append add_flags " [board_info $host cflags_for_target]";
-    }
-
-    global CC_FOR_TARGET
-    global CXX_FOR_TARGET
-    global F77_FOR_TARGET
-    global GNATMAKE_FOR_TARGET
-    
-    if [info exists CC_FOR_TARGET] {
-	if { $compiler == "" } {
-	    set compiler $CC_FOR_TARGET
-	}
-    }
-
-    if [info exists CXX_FOR_TARGET] {
-	if { $compiler_type == "c++" } {
-	    set compiler $CXX_FOR_TARGET
-	}
-    }
-
-    if [info exists F77_FOR_TARGET] {
-	if { $compiler_type == "f77" } {
-	    set compiler $F77_FOR_TARGET
-	}
-    }
-
-    if [info exists GNATMAKE_FOR_TARGET] {
-	if { $compiler_type == "ada" } {
-	    set compiler $GNATMAKE_FOR_TARGET
-	}
-    }
-
-    if { $compiler == "" } {
-	set compiler [board_info $dest compiler];
-	if { $compiler == "" } {
-	    return "default_target_compile: No compiler to compile with";
-	}
-    }
-
-    if ![is_remote host] {
-	if { [which $compiler] == 0 } {
-	    return "default_target_compile: Can't find $compiler."
-	}
-    }
-
-    if {$type == "object"} {
-	append add_flags " -c"
-    }
-
-    if { $type == "preprocess" } {
-	append add_flags " -E"
-    }
-    
-    if { $type == "assembly" } {
-	append add_flags " -S"
-    }
-
-    if [board_info $dest exists cflags] {
-	append add_flags " [board_info $dest cflags]"
-    }
-
-    if { $type == "executable" } {
-	# This must be added here.
-	# if [board_info $dest exists ldscript] {
-	#     append add_flags " [board_info $dest ldscript]"
-	# }
-
-	if [board_info $dest exists ldflags] {
-	    append add_flags " [board_info $dest ldflags]"
-	}
-	if { $compiler_type == "c++" } {
-	    append add_flags " [g++_link_flags]";
-	}
-	if [isnative] {
-	    # This is a lose.
-	    catch "glob -nocomplain $tool_root_dir/libstdc++/libstdc++.so* $tool_root_dir/libstdc++/libstdc++.sl" tmp
-	    if { ${tmp} != "" } {
-		if [regexp ".*solaris2.*" $target_triplet] {
-		    # Solaris 2
-		    append add_flags " -R$tool_root_dir/libstdc++"
-		} elseif [regexp ".*(osf|irix5|linux).*" $target_triplet] {
-		    # OSF/1 or Irix5
-		    append add_flags " -Wl,-rpath,$tool_root_dir/libstdc++"
-		} elseif [regexp ".*hppa.*" $target_triplet] {
-		    # HP/UX
-		    append add_flags " -Wl,-a,shared_archive"
-		}
-	    }
-	}
-    }
-
-    if ![info exists ldscript] {
-	set ldscript [board_info $dest ldscript]
-    }
-
-    foreach i $options {
-	if { $i == "debug" } {
-	    if [board_info $dest exists debug_flags] {
-		append add_flags " [board_info $dest debug_flags]";
-	    } else {
-		append add_flags " -g"
-	    }
-	}
-    }
-
-    if [info exists optimize] {
-	append add_flags " $optimize";
-    }
-
-    if { $type == "executable" } {
-	append add_flags " $ldflags"
-	foreach x $libs {
-	    if [file exists $x] {
-		append source " $x"
-	    } else {
-		append add_flags " $x";
-	    }
-	}
-
-	if [board_info $dest exists libs] {
-	    append add_flags " [board_info $dest libs]"
-	}
-
-	# This probably isn't such a good idea, but it avoids nasty
-	# hackiness in the testsuites.
-	# The math library must be linked in before the C library.  The C
-	# library is linked in by the linker script, so this must be before
-	# the linker script.
-	if [board_info $dest exists mathlib] {
-	    append add_flags " [board_info $dest mathlib]"
-	} else {
-	    append add_flags " -lm"
-	}
-
-	# This must be added here.
-	append add_flags " $ldscript";
-
-	if [board_info $dest exists remote_link] {
-	    # Relink option.
-	    append add_flags " -Wl,-r"
-	}
-	if [board_info $dest exists output_format] {
-	    append add_flags " -Wl,-oformat,[board_info $dest output_format]";
-	}
-    }
-
-    if [board_info $dest exists multilib_flags] {
-	append add_flags " [board_info $dest multilib_flags]";
-    }
-
-    verbose "doing compile"
-
-    set sources ""
-    if [is_remote host] {
-	foreach x $source {
-	    set file [remote_download host $x];
-	    if { $file == "" } {
-		warning "Unable to download $x to host."
-		return "Unable to download $x to host."
-	    } else {
-		append sources " $file";
-	    }
-	}
-    } else {
-	set sources $source
-    }
-
-    if [is_remote host] {
-	append add_flags " -o a.out"
-	remote_file host delete a.out;
-    } else {
-	if { $destfile != "" } {
-	    append add_flags " -o $destfile";
-	}
-    }
-
-    # This is obscure: we put SOURCES at the end when building an
-    # object, because otherwise, in some situations, libtool will
-    # become confused about the name of the actual source file.
-    if {$type == "object"} {
-        set opts "$add_flags $sources"
-    } else {
-        set opts "$sources $add_flags"
-    }
-
-    if [is_remote host] {
-	if [host_info exists use_at] {
-	    set fid [open "atfile" "w"];
-	    puts $fid "$opts";
-	    close $fid;
-	    set opts "@[remote_download host atfile]"
-	    remote_file build delete atfile
-	}
-    }
-
-    verbose "Invoking the compiler as $compiler $opts" 2
-
-    if [info exists redirect] {
-	verbose "Redirecting output to $redirect" 2
-	set status [remote_exec host "$compiler $opts" "" "" $redirect];
-    } else {
-	if [info exists timeout] {
-	    verbose "Setting timeout to $timeout" 2
-	    set status [remote_exec host "$compiler $opts" "" "" "" $timeout];
-	} else {
-	    set status [remote_exec host "$compiler $opts"];
-	}
-    }
-
-    set compiler_flags $opts
-    if [is_remote host] {
-	remote_upload host a.out $destfile;
-	remote_file host delete a.out;
-    }
-    set comp_output [prune_warnings [lindex $status 1]];
-    regsub "^\[\r\n\]+" $comp_output "" comp_output;
-    if { [lindex $status 0] != 0 } {
-	verbose -log "compiler exited with status [lindex $status 0]";
-    }
-    if { [lindex $status 1] != "" } {
-	verbose -log "output is:\n[lindex $status 1]" 2;
-    }
-    if { [lindex $status 0] != 0 && "${comp_output}" == "" } {
-	set comp_output "exit status is [lindex $status 0]";
-    }
-    return ${comp_output};
-}
-
-# See if the version of dejaGNU being used to run the testsuite is
-# recent enough to contain support for building Ada programs or not.
-# If not, then use the functions above in place of the ones provided
-# by dejaGNU. This is only temporary (brobecker/2004-03-31).
-
-if {[info procs find_gnatmake] == ""} {
-  proc find_gnatmake { } { return [gdb_find_gnatmake] }
-  proc default_target_compile { source destfile type options } {
-    return [gdb_default_target_compile $source $destfile $type $options]
-  }
-}
-
-# Compile some Ada code.
-
-proc gdb_compile_ada {source dest type options} {
-
-    set srcdir [file dirname $source]
-    set gprdir [file dirname $srcdir]
-    set objdir [file dirname $dest]
-
-    append options " ada"
-    append options " additional_flags=-P$gprdir/gnat_ada"
-    append options " additional_flags=-XSRC=[file tail $srcdir]"
-    append options " additional_flags=-XOBJ=$objdir"
-
-    set result [target_compile [file tail $source] $dest $type $options]
-
-    # The Ada build always produces some output, even when the build
-    # succeeds. Thus, we can not use the output the same way we do in
-    # gdb_compile to determine whether the build has succeeded or not.
-    # We therefore simply check whether the dest file has been created
-    # or not. Unless not present, the build has succeeded.
-    if ![file exists $dest] {
-        unsupported "Ada compilation failed: $result"
-        return "Ada compilation failed."
-    }
-}
-
diff --git a/gdb/testsuite/lib/compiler.c b/gdb/testsuite/lib/compiler.c
deleted file mode 100644
index 7160591a93c..00000000000
--- a/gdb/testsuite/lib/compiler.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* This test file is part of GDB, the GNU debugger.
-
-   Copyright 1995, 1997, 1999, 2003, 2004 Free Software Foundation, 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.
-
-   */
-
-/* Sometimes the behavior of a test depends upon the compiler used to
-   compile the test program.  A test script can call get_compiler_info
-   to figure out the compiler version and test_compiler_info to test it.
-
-   get_compiler_info runs the preprocessor on this file and then eval's
-   the result.  This sets various symbols for use by test_compiler_info.
-
-   TODO: make compiler_info a local variable for get_compiler_info and
-   test_compiler_info.
-
-   TODO: all clients should use test_compiler_info and should not
-   use gcc_compiled, hp_cc_compiler, or hp_aCC_compiler.
-
-   */
-
-/* Note the semicolon at the end of this line.  Older versions of
-   hp c++ have a bug in string preprocessing: if the last token on a
-   line is a string, then the preprocessor concatenates the next line
-   onto the current line and eats the newline!  That messes up TCL of
-   course.  That happens with HP aC++ A.03.13, but it no longer happens
-   with HP aC++ A.03.45. */
-
-set compiler_info "unknown" ;
-
-#if defined (__GNUC__)
-#if defined (__GNUC_PATCHLEVEL__)
-/* Only GCC versions >= 3.0 define the __GNUC_PATCHLEVEL__ macro.  */
-set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__} -]
-#else
-set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ "unknown"} -]
-#endif
-#endif
-
-#if defined (__HP_CXD_SPP)
-/* older hp ansi c, such as A.11.01.25171.gp, defines this */
-set compiler_info [join {hpcc __HP_CXD_SPP} -]
-#endif
-
-#if defined (__HP_cc)
-/* newer hp ansi c, such as B.11.11.28706.gp, defines this */
-set compiler_info [join {hpcc __HP_cc} -]
-#endif
-
-#if defined (__HP_aCC)
-set compiler_info [join {hpacc __HP_aCC} -]
-#endif
-
-#if defined (__xlc__)
-/* IBM'x xlc compiler. NOTE:  __xlc__ expands to a double quoted string of four
-   numbers seperated by '.'s: currently "7.0.0.0" */
-set need_a_set [regsub -all {\.} [join {xlc __xlc__} -] - compiler_info]
-#endif
diff --git a/gdb/testsuite/lib/compiler.cc b/gdb/testsuite/lib/compiler.cc
deleted file mode 100644
index 60319007bc1..00000000000
--- a/gdb/testsuite/lib/compiler.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-/* This test file is part of GDB, the GNU debugger.
-
-   Copyright 1995, 1999, 2003, 2004 Free Software Foundation, 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.
-
-   */
-
-/* This file is exactly like compiler.c.  I could just use compiler.c if
-   I could be sure that every C++ compiler accepted extensions of ".c".  */
-
-/* Note the semicolon at the end of this line.  Older versions of
-   hp c++ have a bug in string preprocessing: if the last token on a
-   line is a string, then the preprocessor concatenates the next line
-   onto the current line and eats the newline!  That messes up TCL of
-   course.  That happens with HP aC++ A.03.13, but it no longer happens
-   with HP aC++ A.03.45. */
-
-set compiler_info "unknown" ;
-
-#if defined (__GNUC__)
-#if defined (__GNUC_PATCHLEVEL__)
-/* Only GCC versions >= 3.0 define the __GNUC_PATCHLEVEL__ macro.  */
-set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__} -]
-#else
-set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ "unknown"} -]
-#endif
-#endif
-
-#if defined (__HP_CXD_SPP)
-/* older hp ansi c, such as A.11.01.25171.gp, defines this */
-set compiler_info [join {hpcc __HP_CXD_SPP} -]
-#endif
-
-#if defined (__HP_cc)
-/* newer hp ansi c, such as B.11.11.28706.gp, defines this */
-set compiler_info [join {hpcc __HP_cc} -]
-#endif
-
-#if defined (__HP_aCC)
-set compiler_info [join {hpacc __HP_aCC} -]
-#endif
-
-#if defined (__xlc__)
-/* IBM'x xlc compiler. NOTE:  __xlc__ expands to a double quoted string of four
-   numbers seperated by '.'s: currently "7.0.0.0" */
-set need_a_set [regsub -all {\.} [join {xlc __xlc__} -] - compiler_info]
-#endif
diff --git a/gdb/testsuite/lib/cp-support.exp b/gdb/testsuite/lib/cp-support.exp
deleted file mode 100644
index 7ce1e4806a7..00000000000
--- a/gdb/testsuite/lib/cp-support.exp
+++ /dev/null
@@ -1,469 +0,0 @@
-# This test code is part of GDB, the GNU debugger.
-
-# Copyright 2003, 2004 Free Software Foundation, 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.  
-
-# Auxiliary function to check for known problems.
-#
-# EXPECTED_STRING is the string expected by the test.
-#
-# ACTUAL_STRING is the actual string output by gdb.
-#
-# ERRATA_TABLE is a list of lines of the form:
-#
-#  { expected-string broken-string {eval-block} }
-#
-# If there is a line for the given EXPECTED_STRING, and if the
-# ACTUAL_STRING output by gdb is the same as the BROKEN_STRING in the
-# table, then I eval the eval-block.
-
-proc cp_check_errata { expected_string actual_string errata_table } {
-    foreach erratum $errata_table {
-	if { "$expected_string" == [lindex $erratum 0]
-	&&   "$actual_string"   == [lindex $erratum 1] } then {
-	    eval [lindex $erratum 2]
-	}
-    }
-}
-
-# Test ptype of a class.
-#
-# Different C++ compilers produce different output.  To accommodate all
-# the variations listed below, I read the output of "ptype" and process
-# each line, matching it to the class description given in the
-# parameters.
-#
-# IN_COMMAND and IN_TESTNAME are the command and testname for
-# gdb_test_multiple.  If IN_TESTNAME is the empty string, then it
-# defaults to IN_COMMAND.
-#
-# IN_KEY is "class" or "struct".  For now, I ignore it, and allow either
-# "class" or "struct" in the output, as long as the access specifiers all
-# work out okay.
-#
-# IN_TAG is the class tag or structure tag.
-#
-# IN_CLASS_TABLE is a list of class information.  Each entry contains a
-# keyword and some values.  The keywords and their values are:
-#
-#   { base "base-declaration" }
-#
-#      the class has a base with the given declaration.
-#
-#   { vbase "name" }
-#
-#      the class has a virtual base pointer with the given name.  this
-#      is for gcc 2.95.3, which emits ptype entries for the virtual base
-#      pointers.  the vbase list includes both indirect and direct
-#      virtual base classes (indeed, a virtual base is usually
-#      indirect), so this information cannot be derived from the base
-#      declarations.
-#
-#   { field "access" "declaration" }
-#
-#      the class has a data field with the given access type and the
-#      given declaration.
-#
-#   { method "access" "declaration" }
-#
-#      the class has a member function with the given access type
-#      and the given declaration.
-#
-# If you test the same class declaration more than once, you can specify
-# IN_CLASS_TABLE as "ibid".  "ibid" means: look for a previous class
-# table that had the same IN_KEY and IN_TAG, and re-use that table.
-#
-# IN_TAIL is the expected text after the close brace, specifically the "*"
-# in "struct { ... } *".  This is an optional parameter.  The default
-# value is "", for no tail.
-#
-# IN_ERRATA_TABLE is a list of errata entries.  See cp_check_errata for the
-# format of the errata table.  Note: the errata entries are not subject to
-# demangler syntax adjustment, so you have to make a bigger table
-# with lines for each output variation.
-# 
-# gdb can vary the output of ptype in several ways:
-#
-# . CLASS/STRUCT
-#
-#   The output can start with either "class" or "struct", depending on
-#   what the symbol table reader in gdb decides.  This is usually
-#   unrelated to the original source code.
-#
-#     dwarf-2  debug info distinguishes class/struct, but gdb ignores it
-#     stabs+   debug info does not distinguish class/struct
-#     hp       debug info distinguishes class/struct, and gdb honors it
-#
-#   I tried to accommodate this with regular expressions such as
-#   "((class|struct) A \{ public:|struct A \{)", but that turns into a
-#   hairy mess because of optional private virtual base pointers and
-#   optional public synthetic operators.  This is the big reason I gave
-#   up on regular expressions and started parsing the output.
-#
-# . REDUNDANT ACCESS SPECIFIER
-#
-#   In "class { private: ... }" or "struct { public: ... }", gdb might
-#   or might not emit a redundant initial access specifier, depending
-#   on the gcc version.
-#
-# . VIRTUAL BASE POINTERS
-#
-#   If a class has virtual bases, either direct or indirect, the class
-#   will have virtual base pointers.  With gcc 2.95.3, gdb prints lines
-#   for these virtual base pointers.  This does not happen with gcc
-#   3.3.4, gcc 3.4.1, or hp acc A.03.45.
-#
-#   I accept these lines.  These lines are optional; but if I see one of
-#   these lines, then I expect to see all of them.
-#
-#   Note: drow considers printing these lines to be a bug in gdb.
-#
-# . SYNTHETIC METHODS
-#
-#   A C++ compiler may synthesize some methods: an assignment
-#   operator, a copy constructor, a constructor, and a destructor.  The
-#   compiler might include debug information for these methods.
-#
-#     dwarf-2  gdb does not show these methods
-#     stabs+   gdb shows these methods
-#     hp       gdb does not show these methods
-#
-#   I accept these methods.  These lines are optional, and any or
-#   all of them might appear, mixed in anywhere in the regular methods.
-#
-#   With gcc v2, the synthetic copy-ctor and ctor have an additional
-#   "int" parameter at the beginning, the "in-charge" flag.
-#
-# . DEMANGLER SYNTAX VARIATIONS
-#
-#   Different demanglers produce "int foo(void)" versus "int foo()",
-#   "const A&" versus "const A &", and so on.
-#
-# TESTED WITH
-#
-#   gcc 2.95.3 -gdwarf-2
-#   gcc 2.95.3 -gstabs+
-#   gcc 3.3.4 -gdwarf-2
-#   gcc 3.3.4 -gstabs+
-#   gcc 3.4.1 -gdwarf-2
-#   gcc 3.4.1 -gstabs+
-#   gcc HEAD 20040731 -gdwarf-2
-#   gcc HEAD 20040731 -gstabs+
-# 
-# TODO
-#
-# Tagless structs.
-#
-# "A*" versus "A *" and "A&" versus "A &" in user methods.
-#
-# Test with hp ACC.
-#
-# -- chastain 2004-08-07
-
-proc cp_test_ptype_class { in_command in_testname in_key in_tag in_class_table { in_tail "" } { in_errata_table { } } } {
-    global gdb_prompt
-    set wsopt "\[\r\n\t \]*"
-
-    # The test name defaults to the command.
-
-    if { "$in_testname" == "" } then { set in_testname "$in_command" }
-
-    # Save class tables in a history array for reuse.
-
-    global cp_class_table_history
-    if { $in_class_table == "ibid" } then {
-	if { ! [info exists cp_class_table_history("$in_key,$in_tag") ] } then {
-	    fail "$in_testname // bad ibid"
-	    return
-	}
-	set in_class_table $cp_class_table_history("$in_key,$in_tag")
-    } else {
-	set cp_class_table_history("$in_key,$in_tag") $in_class_table
-    }
-
-    # Split the class table into separate tables.
-
-    set list_bases   { }
-    set list_vbases  { }
-    set list_fields  { }
-    set list_methods { }
-
-    foreach class_line $in_class_table {
-	switch [lindex $class_line 0] {
-	    "base"   { lappend list_bases   [lindex $class_line 1] }
-	    "vbase"  { lappend list_vbases  [lindex $class_line 1] }
-	    "field"  { lappend list_fields  [lrange $class_line 1 2] }
-	    "method" { lappend list_methods [lrange $class_line 1 2] }
-	    default  { fail "$in_testname // bad line in class table: $class_line"; return; }
-	}
-    }
-
-    # Construct a list of synthetic operators.
-    # These are: { count ccess-type regular-expression }.
-
-    set list_synth { }
-    lappend list_synth [list 0 "public" "$in_tag & operator=\\($in_tag const ?&\\);"]
-    lappend list_synth [list 0 "public" "$in_tag\\((int,|) ?$in_tag const ?&\\);"]
-    lappend list_synth [list 0 "public" "$in_tag\\((int|void|)\\);"]
-
-    # Actually do the ptype.
-
-    set parse_okay 0
-    gdb_test_multiple "$in_command" "$in_testname // parse failed" {
-	-re "type = (struct|class)${wsopt}(\[A-Za-z0-9_\]*)${wsopt}((:\[^\{\]*)?)${wsopt}\{(.*)\}${wsopt}(\[^\r\n\]*)\[\r\n\]+$gdb_prompt $" {
-	    set parse_okay          1
-	    set actual_key          $expect_out(1,string)
-	    set actual_tag          $expect_out(2,string)
-	    set actual_base_string  $expect_out(3,string)
-	    set actual_body         $expect_out(5,string)
-	    set actual_tail         $expect_out(6,string)
-	}
-    }
-    if { ! $parse_okay } then { return }
-
-    # Check the actual key.  It would be nice to require that it match
-    # the input key, but gdb does not support that.  For now, accept any
-    # $actual_key as long as the access property of each field/method
-    # matches.
-
-    switch "$actual_key" {
-	"class"  { set access "private" }
-	"struct" { set access "public"  }
-	default  {
-	    cp_check_errata "class"  "$actual_key" $in_errata_table
-	    cp_check_errata "struct" "$actual_key" $in_errata_table
-	    fail "$in_testname // wrong key: $actual_key"
-	    return
-	}
-    }
-
-    # Check the actual tag.
-
-    if { "$actual_tag" != "$in_tag" } then {
-	cp_check_errata "$in_tag" "$actual_tag" $in_errata_table
-	fail "$in_testname // wrong tag: $actual_tag"
-	return
-    }
-
-    # Check the actual bases.
-    # First parse them into a list.
-
-    set list_actual_bases { }
-    if { "$actual_base_string" != "" } then {
-	regsub "^:${wsopt}" $actual_base_string "" actual_base_string
-	set list_actual_bases [split $actual_base_string ","]
-    }
-
-    # Check the base count.
-
-    if { [llength $list_actual_bases] < [llength $list_bases] } then {
-	fail "$in_testname // too few bases"
-	return
-    }
-    if { [llength $list_actual_bases] > [llength $list_bases] } then {
-	fail "$in_testname // too many bases"
-	return
-    }
-
-    # Check each base.
-
-    foreach actual_base $list_actual_bases {
-	set actual_base [string trim $actual_base]
-	set base [lindex $list_bases 0]
-	if { "$actual_base" != "$base" } then {
-	    cp_check_errata "$base" "$actual_base" $in_errata_table
-	    fail "$in_testname // wrong base: $actual_base"
-	    return
-	}
-	set list_bases [lreplace $list_bases 0 0]
-    }
-
-    # Parse each line in the body.
-
-    set last_was_access 0
-    set vbase_match 0
-
-    foreach actual_line [split $actual_body "\r\n"] {
-
-	# Chomp the line.
-
-	set actual_line [string trim $actual_line]
-	if { "$actual_line" == "" } then { continue }
-
-	# Access specifiers.
-
-	if { [regexp "^(public|protected|private)${wsopt}:\$" "$actual_line" s0 s1] } then {
-	    set access "$s1"
-	    if { $last_was_access } then {
-		fail "$in_testname // redundant access specifier"
-		return
-	    }
-	    set last_was_access 1
-	    continue
-	} else {
-	    set last_was_access 0
-	}
-
-	# Optional virtual base pointer.
-
-	if { [ llength $list_vbases ] > 0 } then {
-	    set vbase [lindex $list_vbases 0]
-	    if { [ regexp "$vbase \\*(_vb.|_vb\\\$|__vb_)\[0-9\]*$vbase;" $actual_line ] } then {
-		if { "$access" != "private" } then {
-		    cp_check_errata "private" "$access" $in_errata_table
-		    fail "$in_testname // wrong access specifier for virtual base: $access"
-		    return
-		}
-		set list_vbases [lreplace $list_vbases 0 0]
-		set vbase_match 1
-		continue
-	    }
-	}
-
-	# Data field.
-
-	if { [llength $list_fields] > 0 } then {
-	    set field_access [lindex [lindex $list_fields 0] 0]
-	    set field_decl   [lindex [lindex $list_fields 0] 1]
-	    if { "$actual_line" == "$field_decl" } then {
-		if { "$access" != "$field_access" } then {
-		    cp_check_errata "$field_access" "$access" $in_errata_table
-		    fail "$in_testname // wrong access specifier for field: $access"
-		    return
-		}
-		set list_fields [lreplace $list_fields 0 0]
-		continue
-	    }
-
-	    # Data fields must appear before synths and methods.
-	    cp_check_errata "$field_decl" "$actual_line" $in_errata_table
-	    fail "$in_testname // unrecognized line type 1: $actual_line"
-	    return
-	}
-
-	# Method function.
-
-	if { [llength $list_methods] > 0 } then {
-	    set method_access [lindex [lindex $list_methods 0] 0]
-	    set method_decl   [lindex [lindex $list_methods 0] 1]
-	    if { "$actual_line" == "$method_decl" } then {
-		if { "$access" != "$method_access" } then {
-		    cp_check_errata "$method_access" "$access" $in_errata_table
-		    fail "$in_testname // wrong access specifier for method: $access"
-		    return
-		}
-		set list_methods [lreplace $list_methods 0 0]
-		continue
-	    }
-
-	    # gcc 2.95.3 shows "foo()" as "foo(void)".
-	    regsub -all "\\(\\)" $method_decl "(void)" method_decl
-	    if { "$actual_line" == "$method_decl" } then {
-		if { "$access" != "$method_access" } then {
-		    cp_check_errata "$method_access" "$access" $in_errata_table
-		    fail "$in_testname // wrong access specifier for method: $access"
-		    return
-		}
-		set list_methods [lreplace $list_methods 0 0]
-		continue
-	    }
-	}
-
-	# Synthetic operators.  These are optional and can be mixed in
-	# with the methods in any order, but duplicates are wrong.
-	#
-	# This test must come after the user methods, so that a user
-	# method which matches a synth-method pattern is treated
-	# properly as a user method.
-
-	set synth_match 0
-	for { set isynth 0 } { $isynth < [llength $list_synth] } { incr isynth } {
-	    set synth         [lindex $list_synth $isynth]
-	    set synth_count   [lindex $synth 0]
-	    set synth_access  [lindex $synth 1]
-	    set synth_re      [lindex $synth 2]
-
-	    if { [ regexp "$synth_re" "$actual_line" ] } then {
-
-		if { "$access" != "$synth_access" } then {
-		    cp_check_errata "$synth_access" "$access" $in_errata_table
-		    fail "$in_testname // wrong access specifier for synthetic operator: $access"
-		    return
-		}
-
-		if { $synth_count > 0 } then {
-		    cp_check_errata "$actual_line" "$actual_line" $in_errata_table
-		    fail "$in_testname // duplicate synthetic operator: $actual_line"
-		}
-
-		# Update the count in list_synth.
-
-		incr synth_count 
-		set synth [list $synth_count $synth_access "$synth_re"]
-		set list_synth [lreplace $list_synth $isynth $isynth $synth]
-
-		# Match found.
-
-		set synth_match 1
-		break
-	    }
-	}
-	if { $synth_match } then { continue }
-
-	# Unrecognized line.
-
-	if { [llength $list_methods] > 0 } then {
-	    set method_decl [lindex [lindex $list_methods 0] 1]
-	    cp_check_errata "$method_decl" "$actual_line" $in_errata_table
-	}
-
-	fail "$in_testname // unrecognized line type 2: $actual_line"
-	return
-    }
-
-    # Check for missing elements.
-
-    if { $vbase_match } then {
-	if { [llength $list_vbases] > 0 } then {
-	    fail "$in_testname // missing virtual base pointers"
-	    return
-	}
-    }
-
-    if { [llength $list_fields] > 0 } then {
-	fail "$in_testname // missing fields"
-	return
-    }
-
-    if { [llength $list_methods] > 0 } then {
-	fail "$in_testname // missing methods"
-	return
-    }
-
-    # Check the tail.
-
-    set actual_tail [string trim $actual_tail]
-    if { "$actual_tail" != "$in_tail" } then {
-	cp_check_errata "$in_tail" "$actual_tail" $in_errata_table
-	fail "$in_testname // wrong tail: $actual_tail"
-	return
-    }
-
-    # It all worked!
-
-    pass "$in_testname"
-    return
-}
diff --git a/gdb/testsuite/lib/emc-support.exp b/gdb/testsuite/lib/emc-support.exp
deleted file mode 100644
index 70bf2df0690..00000000000
--- a/gdb/testsuite/lib/emc-support.exp
+++ /dev/null
@@ -1,223 +0,0 @@
-proc gdb_emc_readvar { varname } {
-    global gdb_prompt;
-
-    set result -1;
-    send_gdb "print $varname\n"
-    gdb_expect 5 {
-	-re "\[$\].*= (\[0-9\]+).*$gdb_prompt $" {
-	    set result $expect_out(1,string);
-	}
-	-re "$gdb_prompt $" { }
-	default { }
-    }
-    return $result;
-}
-    
-proc gdb_emc_gettpnum { testname } {
-    global gdb_prompt;
-
-    if { $testname != "" } {
-	gdb_test "trace $testname" "" ""
-    }
-    return [gdb_emc_readvar "\$tpnum"];
-}
-
-proc gdb_emc_setactions { testname actionname args } {
-    global gdb_prompt;
-
-    set state 0;
-    set status "pass";
-    send_gdb "actions $actionname\n";
-    set expected_result "";
-    gdb_expect 5 {
-	-re "No tracepoint number .*$gdb_prompt $" {
-	    fail $testname
-	    return 1;
-	}
-	-re "Enter actions for tracepoint $actionname.*>" {
-	    if { [llength $args] > 0 } {
-		set lastcommand "[lindex $args $state]";
-		send_gdb "[lindex $args $state]\n";
-		incr state;
-		set expected_result [lindex $args $state];
-		incr state;
-	    } else {
-		send_gdb "end\n";
-	    }
-	    exp_continue;
-	}
-	-re "\(.*\[\r\n\]+)\[ \t]*> $" {
-	    if { $expected_result != "" } {
-		# Remove echoed command and its associated newline.
-		regsub "^\[^\r\n\]+\[\r\n\]+" "$expect_out(1,string)" "" out;
-		# Strip off any newlines at the end of the string.
-		regsub "\[\r\n\]+$" "$out" "" out;
-		verbose "expected '$expected_result', got '$out', expect_out is '$expect_out(1,string)'";
-		if ![regexp $expected_result $out] {
-		    set status "fail";
-		}
-		set expected_result "";
-	    }
-	    if { $state < [llength $args] } {
-		send_gdb "[lindex $args $state]\n";
-		incr state;
-		set expected_result [lindex $args $state];
-		incr state;
-	    } else {
-		send_gdb "end\n";
-		set expected_result "";
-	    }
-	    exp_continue;
-	}
-	-re "\(.*\)$gdb_prompt $" {
-	    if { $expected_result != "" } {
-		if ![regexp $expected_result $expect_out(1,string)] {
-		    set status "fail";
-		}
-		set expected_result "";
-	    }
-	    if { [llength $args] < $state } {
-		set status "fail";
-	    }
-	}
-	default {
-	    set status "fail";
-	}
-    }
-    if { $testname != "" } {
-	$status $testname;
-    }
-    if { $status == "pass" } then { 
-	return 0;
-    } else {
-	return 1;
-    }
-}
-
-#
-# test collect command
-#
-
-proc gdb_emc_tracetest_collect { arg1 msgstring } {
-    global decimal
-    global gdb_prompt;
-
-    set teststate 0
-    gdb_expect 30 {
-        -re "Enter actions for tracepoint $decimal.*> $" {
-            send_gdb "collect $arg1\n"
-            incr teststate;
-            exp_continue
-        }
-        -re "> $" {
-            if { $teststate == 1 } {
-                send_gdb "end\n"
-		incr teststate;
-                exp_continue
-            } else { 
-                fail "$msgstring"
-            }
-        }
-        -re ".*$gdb_prompt $" {
-            if { $teststate == 2 } {
-                pass "$msgstring";
-            } else { 
-                fail "$msgstring";
-            }
-        }
-        default { 
-            fail "$msgstring (default)";
-        }
-    }
-    regsub -all "(\[($@*+)\])" "collect $arg1" "\[\\1\]" arg1_regexp;
-    gdb_test "info tracepoints" ".*$arg1_regexp.*" "$msgstring info tracepoint"
-}
-
-proc gdb_delete_tracepoints { } {
-    global gdb_prompt;
-
-    send_gdb "delete tracepoints\n"
-    gdb_expect 30 {
-	-re "Delete all tracepoints.*y or n.*$" {
-	    send_gdb "y\n"
-	    exp_continue;
-	}
-	-re "$gdb_prompt $" { }
-	timeout { fail "delete all tracepoints (timeout)" }
-    }
-}
-
-
-# Send each command in the list CMDLIST to gdb. If we see the string
-# "error" or "warning" from gdb, we assume an error has occured and
-# return a non-zero result. All of the commands in CMDLIST are always
-# sent, even if an error occurs.
-# If TESTNAME is non-null, we call pass or fail with the string in TESTNAME
-# depending on whether or not an error/warning has occurred.
-#
-proc gdb_do_cmdlist { cmdlist testname } {
-    global gdb_prompt;
-
-    set status 0;
-
-    foreach x $cmdlist {
-	send_gdb "$x\n";
-	gdb_expect 60 {
-	    -re "\[Ee\]rror|\[Ww\]arning" {
-		set status 1;
-		exp_continue;
-	    }
-	    -re "$gdb_prompt $" { }
-	    -re "\[\r\n\]\[ \t\]*> *$" { }
-	}
-    }
-    if { $testname != "" } {
-	if { $status == 0 } {
-	    pass "$testname";
-	} else {
-	    fail "$testname";
-	}
-    }
-    return $status;
-}
-
-#
-# Given the file FILENAME, we read it as a list of commands and generate
-# a list suitable for use by gdb_do_cmdlist. Lines beginning with # are
-# ignored; blank lines are interpreted as empty lines to be sent to gdb.
-#
-proc gdb_process_cmdfile { filename } {
-    set id [open $filename "r"];
-    if { $id < 0 } {
-	return "";
-    }
-    set result {};
-    while { [gets $id line] >= 0 } {
-	if [regexp "^#" $line] {
-	    continue;
-	}
-	set result [concat $result [list "$line"]];
-    }
-    close $id;
-    return $result;
-}
-
-# gdb_find_c_test_baseline
-# returns -1 on failure (CALLER MUST CHECK RETURN!)
-proc gdb_find_c_test_baseline { } {
-    global gdb_prompt;
-
-    set gdb_c_test_baseline -1;
-
-    send_gdb "list gdb_c_test\n"
-    gdb_expect {
-	-re "void.*p5,.*void.*p6.*\[\r\n\](\[0-9\]+)\[\t \]+\{.*$gdb_prompt $" {
-	    set gdb_c_test_baseline $expect_out(1,string)
-	}
-	-re "$gdb_prompt $" { }
-	default { }
-    }
-    return $gdb_c_test_baseline;
-}
-
-
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
deleted file mode 100644
index c2c0b153681..00000000000
--- a/gdb/testsuite/lib/gdb.exp
+++ /dev/null
@@ -1,2293 +0,0 @@
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004
-# Free Software Foundation, 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.  
-
-# This file was written by Fred Fish. (fnf@cygnus.com)
-
-# Generic gdb subroutines that should work for any target.  If these
-# need to be modified for any target, it can be done with a variable
-# or by passing arguments.
-
-load_lib libgloss.exp
-
-global GDB
-
-if [info exists TOOL_EXECUTABLE] {
-    set GDB $TOOL_EXECUTABLE;
-}
-if ![info exists GDB] {
-    if ![is_remote host] {
-	set GDB [findfile $base_dir/../../gdb/gdb "$base_dir/../../gdb/gdb" [transform gdb]]
-    } else {
-	set GDB [transform gdb];
-    }
-}
-verbose "using GDB = $GDB" 2
-
-global GDBFLAGS
-if ![info exists GDBFLAGS] {
-    set GDBFLAGS "-nx"
-}
-verbose "using GDBFLAGS = $GDBFLAGS" 2
-
-# The variable gdb_prompt is a regexp which matches the gdb prompt.
-# Set it if it is not already set.
-global gdb_prompt
-if ![info exists gdb_prompt] then {
-    set gdb_prompt "\[(\]gdb\[)\]"
-}
-
-# The variable fullname_syntax_POSIX is a regexp which matches a POSIX 
-# absolute path ie. /foo/ 
-set fullname_syntax_POSIX "/.*/"
-# The variable fullname_syntax_UNC is a regexp which matches a Windows 
-# UNC path ie. \\D\foo\ 
-set fullname_syntax_UNC {\\\\[^\\]+\\.+\\}
-# The variable fullname_syntax_DOS_CASE is a regexp which matches a 
-# particular DOS case that GDB most likely will output
-# ie. \foo\, but don't match \\.*\ 
-set fullname_syntax_DOS_CASE {\\[^\\].*\\}
-# The variable fullname_syntax_DOS is a regexp which matches a DOS path
-# ie. a:\foo\ && a:foo\ 
-set fullname_syntax_DOS {[a-zA-Z]:.*\\}
-# The variable fullname_syntax is a regexp which matches what GDB considers
-# an absolute path. It is currently debatable if the Windows style paths 
-# d:foo and \abc should be considered valid as an absolute path.
-# Also, the purpse of this regexp is not to recognize a well formed 
-# absolute path, but to say with certainty that a path is absolute.
-set fullname_syntax "($fullname_syntax_POSIX|$fullname_syntax_UNC|$fullname_syntax_DOS_CASE|$fullname_syntax_DOS)"
-
-# Needed for some tests under Cygwin.
-global EXEEXT
-global env
-
-if ![info exists env(EXEEXT)] {
-    set EXEEXT ""
-} else {
-    set EXEEXT $env(EXEEXT)
-}
-
-### Only procedures should come after this point.
-
-#
-# gdb_version -- extract and print the version number of GDB
-#
-proc default_gdb_version {} {
-    global GDB
-    global GDBFLAGS
-    global gdb_prompt
-    set fileid [open "gdb_cmd" w];
-    puts $fileid "q";
-    close $fileid;
-    set cmdfile [remote_download host "gdb_cmd"];
-    set output [remote_exec host "$GDB -nw --command $cmdfile"]
-    remote_file build delete "gdb_cmd";
-    remote_file host delete "$cmdfile";
-    set tmp [lindex $output 1];
-    set version ""
-    regexp " \[0-9\]\[^ \t\n\r\]+" "$tmp" version
-    if ![is_remote host] {
-	clone_output "[which $GDB] version $version $GDBFLAGS\n"
-    } else {
-	clone_output "$GDB on remote host version $version $GDBFLAGS\n"
-    }
-}
-
-proc gdb_version { } {
-    return [default_gdb_version];
-}
-
-#
-# gdb_unload -- unload a file if one is loaded
-#
-
-proc gdb_unload {} {
-    global verbose
-    global GDB
-    global gdb_prompt
-    send_gdb "file\n"
-    gdb_expect 60 {
-	-re "No executable file now\[^\r\n\]*\[\r\n\]" { exp_continue }
-	-re "No symbol file now\[^\r\n\]*\[\r\n\]" { exp_continue }
-	-re "A program is being debugged already..*Kill it.*y or n. $"\
-	    { send_gdb "y\n"
-		verbose "\t\tKilling previous program being debugged"
-	    exp_continue
-	}
-	-re "Discard symbol table from .*y or n.*$" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-	-re "$gdb_prompt $" {}
-	timeout {
-	    perror "couldn't unload file in $GDB (timed out)."
-	    return -1
-	}
-    }
-}
-
-# Many of the tests depend on setting breakpoints at various places and
-# running until that breakpoint is reached.  At times, we want to start
-# with a clean-slate with respect to breakpoints, so this utility proc 
-# lets us do this without duplicating this code everywhere.
-#
-
-proc delete_breakpoints {} {
-    global gdb_prompt
-
-    # we need a larger timeout value here or this thing just confuses
-    # itself.  May need a better implementation if possible. - guo
-    #
-    send_gdb "delete breakpoints\n"
-    gdb_expect 100 {
-	 -re "Delete all breakpoints.*y or n.*$" {
-	    send_gdb "y\n";
-	    exp_continue
-	}
-	 -re "$gdb_prompt $" { # This happens if there were no breakpoints
-	    }
-	 timeout { perror "Delete all breakpoints in delete_breakpoints (timeout)" ; return }
-    }
-    send_gdb "info breakpoints\n"
-    gdb_expect 100 {
-	 -re "No breakpoints or watchpoints..*$gdb_prompt $" {}
-	 -re "$gdb_prompt $" { perror "breakpoints not deleted" ; return }
-	 -re "Delete all breakpoints.*or n.*$" {
-	    send_gdb "y\n";
-	    exp_continue
-	}
-	 timeout { perror "info breakpoints (timeout)" ; return }
-    }
-}
-
-
-#
-# Generic run command.
-#
-# The second pattern below matches up to the first newline *only*.
-# Using ``.*$'' could swallow up output that we attempt to match
-# elsewhere.
-#
-proc gdb_run_cmd {args} {
-    global gdb_prompt
-
-    if [target_info exists gdb_init_command] {
-	send_gdb "[target_info gdb_init_command]\n";
-	gdb_expect 30 {
-	    -re "$gdb_prompt $" { }
-	    default {
-		perror "gdb_init_command for target failed";
-		return;
-	    }
-	}
-    }
-
-    if [target_info exists use_gdb_stub] {
-	if [target_info exists gdb,do_reload_on_run] {
-	    # Specifying no file, defaults to the executable
-	    # currently being debugged.
-	    if { [gdb_load ""] != 0 } {
-		return;
-	    }
-	    send_gdb "continue\n";
-	    gdb_expect 60 {
-		-re "Continu\[^\r\n\]*\[\r\n\]" {}
-		default {}
-	    }
-	    return;
-	}
-
-	if [target_info exists gdb,start_symbol] {
-	    set start [target_info gdb,start_symbol];
-	} else {
-	    set start "start";
-	}
-	send_gdb  "jump *$start\n"
-	set start_attempt 1;
-	while { $start_attempt } {
-	    # Cap (re)start attempts at three to ensure that this loop
-	    # always eventually fails.  Don't worry about trying to be
-	    # clever and not send a command when it has failed.
-	    if [expr $start_attempt > 3] {
-		perror "Jump to start() failed (retry count exceeded)";
-		return;
-	    }
-	    set start_attempt [expr $start_attempt + 1];
-	    gdb_expect 30 {
-		-re "Continuing at \[^\r\n\]*\[\r\n\]" {
-		    set start_attempt 0;
-		}
-		-re "No symbol \"_start\" in current.*$gdb_prompt $" {
-		    perror "Can't find start symbol to run in gdb_run";
-		    return;
-		}
-		-re "No symbol \"start\" in current.*$gdb_prompt $" {
-		    send_gdb "jump *_start\n";
-		}
-		-re "No symbol.*context.*$gdb_prompt $" {
-		    set start_attempt 0;
-		}
-		-re "Line.* Jump anyway.*y or n. $" {
-		    send_gdb "y\n"
-		}
-		-re "The program is not being run.*$gdb_prompt $" {
-		    if { [gdb_load ""] != 0 } {
-			return;
-		    }
-		    send_gdb "jump *$start\n";
-		}
-		timeout {
-		    perror "Jump to start() failed (timeout)"; 
-		    return
-		}
-	    }
-	}
-	if [target_info exists gdb_stub] {
-	    gdb_expect 60 {
-		-re "$gdb_prompt $" {
-		    send_gdb "continue\n"
-		}
-	    }
-	}
-	return
-    }
-
-    if [target_info exists gdb,do_reload_on_run] {
-	if { [gdb_load ""] != 0 } {
-	    return;
-	}
-    }
-    send_gdb "run $args\n"
-# This doesn't work quite right yet.
-    gdb_expect 60 {
-	-re "The program .* has been started already.*y or n. $" {
-	    send_gdb "y\n"
-	    exp_continue
-	}
-	-re "Starting program: \[^\r\n\]*" {}
-    }
-}
-
-# Set a breakpoint at FUNCTION.  If there is an additional argument it is
-# a list of options; the only currently supported option is allow-pending.
-
-proc gdb_breakpoint { function args } {
-    global gdb_prompt
-    global decimal
-
-    set pending_response n
-    if {[lsearch -exact [lindex $args 0] allow-pending] != -1} {
-	set pending_response y
-    }
-
-    send_gdb "break $function\n"
-    # The first two regexps are what we get with -g, the third is without -g.
-    gdb_expect 30 {
-	-re "Breakpoint \[0-9\]* at .*: file .*, line $decimal.\r\n$gdb_prompt $" {}
-	-re "Breakpoint \[0-9\]*: file .*, line $decimal.\r\n$gdb_prompt $" {}
-	-re "Breakpoint \[0-9\]* at .*$gdb_prompt $" {}
-	-re "Breakpoint \[0-9\]* \\(.*\\) pending.*$gdb_prompt $" {
-		if {$pending_response == "n"} {
-			fail "setting breakpoint at $function"
-			return 0
-		}
-	}
-	-re "Make breakpoint pending.*y or \\\[n\\\]. $" { 
-		send_gdb "$pending_response\n"
-		exp_continue
-	}
-	-re "$gdb_prompt $" { fail "setting breakpoint at $function" ; return 0 }
-	timeout { fail "setting breakpoint at $function (timeout)" ; return 0 }
-    }
-    return 1;
-}    
-
-# Set breakpoint at function and run gdb until it breaks there.
-# Since this is the only breakpoint that will be set, if it stops
-# at a breakpoint, we will assume it is the one we want.  We can't
-# just compare to "function" because it might be a fully qualified,
-# single quoted C++ function specifier.  If there's an additional argument,
-# pass it to gdb_breakpoint.
-
-proc runto { function args } {
-    global gdb_prompt
-    global decimal
-
-    delete_breakpoints
-
-    if ![gdb_breakpoint $function [lindex $args 0]] {
-	return 0;
-    }
-
-    gdb_run_cmd
-    
-    # the "at foo.c:36" output we get with -g.
-    # the "in func" output we get without -g.
-    gdb_expect 30 {
-	-re "Break.* at .*:$decimal.*$gdb_prompt $" {
-	    return 1
-	}
-	-re "Breakpoint \[0-9\]*, \[0-9xa-f\]* in .*$gdb_prompt $" { 
-	    return 1
-	}
-	-re "$gdb_prompt $" { 
-	    fail "running to $function in runto"
-	    return 0
-	}
-	timeout { 
-	    fail "running to $function in runto (timeout)"
-	    return 0
-	}
-    }
-    return 1
-}
-
-#
-# runto_main -- ask gdb to run until we hit a breakpoint at main.
-#		The case where the target uses stubs has to be handled
-#		specially--if it uses stubs, assuming we hit
-#		breakpoint() and just step out of the function.
-#
-proc runto_main { } {
-    global gdb_prompt
-    global decimal
-
-    if ![target_info exists gdb_stub] {
-	return [runto main]
-    }			
-
-    delete_breakpoints
-
-    gdb_step_for_stub;
-
-    return 1
-}
-
-
-### Continue, and expect to hit a breakpoint.
-### Report a pass or fail, depending on whether it seems to have
-### worked.  Use NAME as part of the test name; each call to
-### continue_to_breakpoint should use a NAME which is unique within
-### that test file.
-proc gdb_continue_to_breakpoint {name} {
-    global gdb_prompt
-    set full_name "continue to breakpoint: $name"
-
-    send_gdb "continue\n"
-    gdb_expect {
-	-re "Breakpoint .* at .*\r\n$gdb_prompt $" {
-	    pass $full_name
-	}
-	-re ".*$gdb_prompt $" {
-	    fail $full_name
-	}
-	timeout { 
-	    fail "$full_name (timeout)"
-	}
-    }
-}
-
-
-# gdb_internal_error_resync:
-#
-# Answer the questions GDB asks after it reports an internal error
-# until we get back to a GDB prompt.  Decline to quit the debugging
-# session, and decline to create a core file.  Return non-zero if the
-# resync succeeds.
-#
-# This procedure just answers whatever questions come up until it sees
-# a GDB prompt; it doesn't require you to have matched the input up to
-# any specific point.  However, it only answers questions it sees in
-# the output itself, so if you've matched a question, you had better
-# answer it yourself before calling this.
-#
-# You can use this function thus:
-#
-# gdb_expect {
-#     ...
-#     -re ".*A problem internal to GDB has been detected" {
-#         gdb_internal_error_resync
-#     }
-#     ...
-# }
-#
-proc gdb_internal_error_resync {} {
-    global gdb_prompt
-
-    set count 0
-    while {$count < 10} {
-	gdb_expect {
-	    -re "Quit this debugging session\\? \\(y or n\\) $" {
-		send_gdb "n\n"
-		incr count
-	    }
-	    -re "Create a core file of GDB\\? \\(y or n\\) $" {
-		send_gdb "n\n"
-		incr count
-	    }
-	    -re "$gdb_prompt $" {
-		# We're resynchronized.
-		return 1
-	    }
-	    timeout {
-		perror "Could not resync from internal error (timeout)"
-		return 0
-	    }
-	}
-    }
-    perror "Could not resync from internal error (resync count exceeded)"
-    return 0
-}
-
-
-# gdb_test_multiple COMMAND MESSAGE EXPECT_ARGUMENTS
-# Send a command to gdb; test the result.
-#
-# COMMAND is the command to execute, send to GDB with send_gdb.  If
-#   this is the null string no command is sent.
-# MESSAGE is a message to be printed with the built-in failure patterns
-#   if one of them matches.  If MESSAGE is empty COMMAND will be used.
-# EXPECT_ARGUMENTS will be fed to expect in addition to the standard
-#   patterns.  Pattern elements will be evaluated in the caller's
-#   context; action elements will be executed in the caller's context.
-#   Unlike patterns for gdb_test, these patterns should generally include
-#   the final newline and prompt.
-#
-# Returns:
-#    1 if the test failed, according to a built-in failure pattern
-#    0 if only user-supplied patterns matched
-#   -1 if there was an internal error.
-#  
-# You can use this function thus:
-#
-# gdb_test_multiple "print foo" "test foo" {
-#    -re "expected output 1" {
-#        pass "print foo"
-#    }
-#    -re "expected output 2" {
-#        fail "print foo"
-#    }
-# }
-#
-# The standard patterns, such as "Program exited..." and "A problem
-# ...", all being implicitly appended to that list.
-#
-proc gdb_test_multiple { command message user_code } {
-    global verbose
-    global gdb_prompt
-    global GDB
-    upvar timeout timeout
-    upvar expect_out expect_out
-
-    if { $message == "" } {
-	set message $command
-    }
-
-    # TCL/EXPECT WART ALERT
-    # Expect does something very strange when it receives a single braced
-    # argument.  It splits it along word separators and performs substitutions.
-    # This means that { "[ab]" } is evaluated as "[ab]", but { "\[ab\]" } is
-    # evaluated as "\[ab\]".  But that's not how TCL normally works; inside a
-    # double-quoted list item, "\[ab\]" is just a long way of representing
-    # "[ab]", because the backslashes will be removed by lindex.
-
-    # Unfortunately, there appears to be no easy way to duplicate the splitting
-    # that expect will do from within TCL.  And many places make use of the
-    # "\[0-9\]" construct, so we need to support that; and some places make use
-    # of the "[func]" construct, so we need to support that too.  In order to
-    # get this right we have to substitute quoted list elements differently
-    # from braced list elements.
-
-    # We do this roughly the same way that Expect does it.  We have to use two
-    # lists, because if we leave unquoted newlines in the argument to uplevel
-    # they'll be treated as command separators, and if we escape newlines
-    # we mangle newlines inside of command blocks.  This assumes that the
-    # input doesn't contain a pattern which contains actual embedded newlines
-    # at this point!
-
-    regsub -all {\n} ${user_code} { } subst_code
-    set subst_code [uplevel list $subst_code]
-
-    set processed_code ""
-    set patterns ""
-    set expecting_action 0
-    foreach item $user_code subst_item $subst_code {
-	if { $item == "-n" || $item == "-notransfer" || $item == "-nocase" } {
-	    lappend processed_code $item
-	    continue
-	}
-	if {$item == "-indices" || $item == "-re" || $item == "-ex"} {
-	    lappend processed_code $item
-	    continue
-	}
-	if { $expecting_action } {
-	    lappend processed_code "uplevel [list $item]"
-	    set expecting_action 0
-	    # Cosmetic, no effect on the list.
-	    append processed_code "\n"
-	    continue
-	}
-	set expecting_action 1
-	lappend processed_code $subst_item
-	if {$patterns != ""} {
-	    append patterns "; "
-	}
-	append patterns "\"$subst_item\""
-    }
-
-    # Also purely cosmetic.
-    regsub -all {\r} $patterns {\\r} patterns
-    regsub -all {\n} $patterns {\\n} patterns
-
-    if $verbose>2 then {
-	send_user "Sending \"$command\" to gdb\n"
-	send_user "Looking to match \"$patterns\"\n"
-	send_user "Message is \"$message\"\n"
-    }
-
-    set result -1
-    set string "${command}\n";
-    if { $command != "" } {
-	while { "$string" != "" } {
-	    set foo [string first "\n" "$string"];
-	    set len [string length "$string"];
-	    if { $foo < [expr $len - 1] } {
-		set str [string range "$string" 0 $foo];
-		if { [send_gdb "$str"] != "" } {
-		    global suppress_flag;
-
-		    if { ! $suppress_flag } {
-			perror "Couldn't send $command to GDB.";
-		    }
-		    fail "$message";
-		    return $result;
-		}
-		# since we're checking if each line of the multi-line
-		# command are 'accepted' by GDB here,
-		# we need to set -notransfer expect option so that
-		# command output is not lost for pattern matching
-		# - guo
-		gdb_expect 2 {
-		    -notransfer -re "\[\r\n\]" { verbose "partial: match" 3 }
-		    timeout { verbose "partial: timeout" 3 }
-		}
-		set string [string range "$string" [expr $foo + 1] end];
-	    } else {
-		break;
-	    }
-	}
-	if { "$string" != "" } {
-	    if { [send_gdb "$string"] != "" } {
-		global suppress_flag;
-
-		if { ! $suppress_flag } {
-		    perror "Couldn't send $command to GDB.";
-		}
-		fail "$message";
-		return $result;
-	    }
-	}
-    }
-
-    if [target_info exists gdb,timeout] {
-	set tmt [target_info gdb,timeout];
-    } else {
-	if [info exists timeout] {
-	    set tmt $timeout;
-	} else {
-	    global timeout;
-	    if [info exists timeout] {
-		set tmt $timeout;
-	    } else {
-		set tmt 60;
-	    }
-	}
-    }
-
-    set code {
-         -re ".*A problem internal to GDB has been detected" {
-             fail "$message (GDB internal error)"
-             gdb_internal_error_resync
-         }
-	 -re "\\*\\*\\* DOSEXIT code.*" {
-	     if { $message != "" } {
-		 fail "$message";
-	     }
-	     gdb_suppress_entire_file "GDB died";
-	     set result -1;
-	 }
-	 -re "Ending remote debugging.*$gdb_prompt $" {
-	    if ![isnative] then {
-		warning "Can`t communicate to remote target."
-	    }
-	    gdb_exit
-	    gdb_start
-	    set result -1
-	}
-    }
-    append code $processed_code
-    append code {
-	 -re "Undefined\[a-z\]* command:.*$gdb_prompt $" {
-	    perror "Undefined command \"$command\"."
-            fail "$message"
-	    set result 1
-	}
-	 -re "Ambiguous command.*$gdb_prompt $" {
-	    perror "\"$command\" is not a unique command name."
-            fail "$message"
-	    set result 1
-	}
-	 -re "Program exited with code \[0-9\]+.*$gdb_prompt $" {
-	    if ![string match "" $message] then {
-		set errmsg "$message (the program exited)"
-	    } else {
-		set errmsg "$command (the program exited)"
-	    }
-	    fail "$errmsg"
-	    set result -1
-	}
-	 -re "EXIT code \[0-9\r\n\]+Program exited normally.*$gdb_prompt $" {
-	    if ![string match "" $message] then {
-		set errmsg "$message (the program exited)"
-	    } else {
-		set errmsg "$command (the program exited)"
-	    }
-	    fail "$errmsg"
-	    set result -1
-	}
-	 -re "The program is not being run.*$gdb_prompt $" {
-	    if ![string match "" $message] then {
-		set errmsg "$message (the program is no longer running)"
-	    } else {
-		set errmsg "$command (the program is no longer running)"
-	    }
-	    fail "$errmsg"
-	    set result -1
-	}
-	 -re "\r\n$gdb_prompt $" {
-	    if ![string match "" $message] then {
-		fail "$message"
-	    }
-	    set result 1
-	}
-	 "<return>" {
-	    send_gdb "\n"
-	    perror "Window too small."
-            fail "$message"
-	    set result -1
-	}
-	 -re "\\(y or n\\) " {
-	    send_gdb "n\n"
-	    perror "Got interactive prompt."
-            fail "$message"
-	    set result -1
-	}
-	 eof {
-	     perror "Process no longer exists"
-	     if { $message != "" } {
-		 fail "$message"
-	     }
-	     return -1
-	}
-	 full_buffer {
-	    perror "internal buffer is full."
-            fail "$message"
-	    set result -1
-	}
-	timeout	{
-	    if ![string match "" $message] then {
-		fail "$message (timeout)"
-	    }
-	    set result 1
-	}
-    }
-
-    set result 0
-    set code [catch {gdb_expect $tmt $code} string]
-    if {$code == 1} {
-	global errorInfo errorCode;
-	return -code error -errorinfo $errorInfo -errorcode $errorCode $string
-    } elseif {$code == 2} {
-	return -code return $string
-    } elseif {$code == 3} {
-	return
-    } elseif {$code > 4} {
-	return -code $code $string
-    }
-    return $result
-}
-
-# gdb_test COMMAND PATTERN MESSAGE QUESTION RESPONSE
-# Send a command to gdb; test the result.
-#
-# COMMAND is the command to execute, send to GDB with send_gdb.  If
-#   this is the null string no command is sent.
-# PATTERN is the pattern to match for a PASS, and must NOT include
-#   the \r\n sequence immediately before the gdb prompt.
-# MESSAGE is an optional message to be printed.  If this is
-#   omitted, then the pass/fail messages use the command string as the
-#   message.  (If this is the empty string, then sometimes we don't
-#   call pass or fail at all; I don't understand this at all.)
-# QUESTION is a question GDB may ask in response to COMMAND, like
-#   "are you sure?"
-# RESPONSE is the response to send if QUESTION appears.
-#
-# Returns:
-#    1 if the test failed,
-#    0 if the test passes,
-#   -1 if there was an internal error.
-#  
-proc gdb_test { args } {
-    global verbose
-    global gdb_prompt
-    global GDB
-    upvar timeout timeout
-
-    if [llength $args]>2 then {
-	set message [lindex $args 2]
-    } else {
-	set message [lindex $args 0]
-    }
-    set command [lindex $args 0]
-    set pattern [lindex $args 1]
-
-    if [llength $args]==5 {
-	set question_string [lindex $args 3];
-	set response_string [lindex $args 4];
-    } else {
-	set question_string "^FOOBAR$"
-    }
-
-    return [gdb_test_multiple $command $message {
-	-re "\[\r\n\]*($pattern)\[\r\n\]+$gdb_prompt $" {
-	    if ![string match "" $message] then {
-		pass "$message"
-            }
-        }
-	-re "(${question_string})$" {
-	    send_gdb "$response_string\n";
-	    exp_continue;
-	}
-     }]
-}
-
-# Test that a command gives an error.  For pass or fail, return
-# a 1 to indicate that more tests can proceed.  However a timeout
-# is a serious error, generates a special fail message, and causes
-# a 0 to be returned to indicate that more tests are likely to fail
-# as well.
-
-proc test_print_reject { args } {
-    global gdb_prompt
-    global verbose
-
-    if [llength $args]==2 then {
-	set expectthis [lindex $args 1]
-    } else {
-	set expectthis "should never match this bogus string"
-    }
-    set sendthis [lindex $args 0]
-    if $verbose>2 then {
-	send_user "Sending \"$sendthis\" to gdb\n"
-	send_user "Looking to match \"$expectthis\"\n"
-    }
-    send_gdb "$sendthis\n"
-    #FIXME: Should add timeout as parameter.
-    gdb_expect {
-	-re "A .* in expression.*\\.*$gdb_prompt $" {
-	    pass "reject $sendthis"
-	    return 1
-	}
-	-re "Invalid syntax in expression.*$gdb_prompt $" {
-	    pass "reject $sendthis"
-	    return 1
-	}
-	-re "Junk after end of expression.*$gdb_prompt $" {
-	    pass "reject $sendthis"
-	    return 1
-	}
-	-re "Invalid number.*$gdb_prompt $" {
-	    pass "reject $sendthis"
-	    return 1
-	}
-	-re "Invalid character constant.*$gdb_prompt $" {
-	    pass "reject $sendthis"
-	    return 1
-	}
-	-re "No symbol table is loaded.*$gdb_prompt $" {
-	    pass "reject $sendthis"
-	    return 1
-	}
-	-re "No symbol .* in current context.*$gdb_prompt $" {
-	    pass "reject $sendthis"
-	    return 1
-	}
-        -re "Unmatched single quote.*$gdb_prompt $" {
-            pass "reject $sendthis"
-            return 1
-        }
-        -re "A character constant must contain at least one character.*$gdb_prompt $" {
-            pass "reject $sendthis"
-            return 1
-        }
-	-re "$expectthis.*$gdb_prompt $" {
-	    pass "reject $sendthis"
-	    return 1
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "reject $sendthis"
-	    return 1
-	}
-	default {
-	    fail "reject $sendthis (eof or timeout)"
-	    return 0
-	}
-    }
-}
-
-# Given an input string, adds backslashes as needed to create a
-# regexp that will match the string.
-
-proc string_to_regexp {str} {
-    set result $str
-    regsub -all {[]*+.|()^$\[]} $str {\\&} result
-    return $result
-}
-
-# Same as gdb_test, but the second parameter is not a regexp,
-# but a string that must match exactly.
-
-proc gdb_test_exact { args } {
-    upvar timeout timeout
-
-    set command [lindex $args 0]
-
-    # This applies a special meaning to a null string pattern.  Without
-    # this, "$pattern\r\n$gdb_prompt $" will match anything, including error
-    # messages from commands that should have no output except a new
-    # prompt.  With this, only results of a null string will match a null
-    # string pattern.
-
-    set pattern [lindex $args 1]
-    if [string match $pattern ""] {
-	set pattern [string_to_regexp [lindex $args 0]]
-    } else {
-	set pattern [string_to_regexp [lindex $args 1]]
-    }
-
-    # It is most natural to write the pattern argument with only
-    # embedded \n's, especially if you are trying to avoid Tcl quoting
-    # problems.  But gdb_expect really wants to see \r\n in patterns.  So
-    # transform the pattern here.  First transform \r\n back to \n, in
-    # case some users of gdb_test_exact already do the right thing.
-    regsub -all "\r\n" $pattern "\n" pattern
-    regsub -all "\n" $pattern "\r\n" pattern
-    if [llength $args]==3 then {
-	set message [lindex $args 2]
-    } else {
-	set message $command
-    }
-
-    return [gdb_test $command $pattern $message]
-}
-
-proc gdb_reinitialize_dir { subdir } {
-    global gdb_prompt
-
-    if [is_remote host] {
-	return "";
-    }
-    send_gdb "dir\n"
-    gdb_expect 60 {
-	-re "Reinitialize source path to empty.*y or n. " {
-	    send_gdb "y\n"
-	    gdb_expect 60 {
-		-re "Source directories searched.*$gdb_prompt $" {
-		    send_gdb "dir $subdir\n"
-		    gdb_expect 60 {
-			-re "Source directories searched.*$gdb_prompt $" {
-			    verbose "Dir set to $subdir"
-			}
-			-re "$gdb_prompt $" {
-			    perror "Dir \"$subdir\" failed."
-			}
-		    }
-		}
-		-re "$gdb_prompt $" {
-		    perror "Dir \"$subdir\" failed."
-		}
-	    }
-	}
-	-re "$gdb_prompt $" {
-	    perror "Dir \"$subdir\" failed."
-	}
-    }
-}
-
-#
-# gdb_exit -- exit the GDB, killing the target program if necessary
-#
-proc default_gdb_exit {} {
-    global GDB
-    global GDBFLAGS
-    global verbose
-    global gdb_spawn_id;
-
-    gdb_stop_suppressing_tests;
-
-    if ![info exists gdb_spawn_id] {
-	return;
-    }
-
-    verbose "Quitting $GDB $GDBFLAGS"
-
-    if { [is_remote host] && [board_info host exists fileid] } {
-	send_gdb "quit\n";
-	gdb_expect 10 {
-	    -re "y or n" {
-		send_gdb "y\n";
-		exp_continue;
-	    }
-	    -re "DOSEXIT code" { }
-	    default { }
-	}
-    }
-
-    if ![is_remote host] {
-	remote_close host;
-    }
-    unset gdb_spawn_id
-}
-
-# Load a file into the debugger.
-# The return value is 0 for success, -1 for failure.
-#
-# This procedure also set the global variable GDB_FILE_CMD_DEBUG_INFO
-# to one of these values:
-#
-#   debug    file was loaded successfully and has debug information
-#   nodebug  file was loaded successfully and has no debug information
-#   fail     file was not loaded
-#
-# I tried returning this information as part of the return value,
-# but ran into a mess because of the many re-implementations of
-# gdb_load in config/*.exp.
-#
-# TODO: gdb.base/sepdebug.exp and gdb.stabs/weird.exp might be able to use
-# this if they can get more information set.
-
-proc gdb_file_cmd { arg } {
-    global gdb_prompt
-    global verbose
-    global GDB
-
-    # Set whether debug info was found.
-    # Default to "fail".
-    global gdb_file_cmd_debug_info
-    set gdb_file_cmd_debug_info "fail"
-
-    if [is_remote host] {
-	set arg [remote_download host $arg]
-	if { $arg == "" } {
-	    perror "download failed"
-	    return -1
-	}
-    }
-
-    send_gdb "file $arg\n"
-    gdb_expect 120 {
-	-re "Reading symbols from.*no debugging symbols found.*done.*$gdb_prompt $" {
-	    verbose "\t\tLoaded $arg into the $GDB with no debugging symbols"
-	    set gdb_file_cmd_debug_info "nodebug"
-	    return 0
-	}
-        -re "Reading symbols from.*done.*$gdb_prompt $" {
-            verbose "\t\tLoaded $arg into the $GDB"
-	    set gdb_file_cmd_debug_info "debug"
-	    return 0
-        }
-        -re "A program is being debugged already.*Kill it.*y or n. $" {
-            send_gdb "y\n"
-	    verbose "\t\tKilling previous program being debugged"
-            exp_continue
-        }
-        -re "Load new symbol table from \".*\".*y or n. $" {
-            send_gdb "y\n"
-            gdb_expect 120 {
-                -re "Reading symbols from.*done.*$gdb_prompt $" {
-                    verbose "\t\tLoaded $arg with new symbol table into $GDB"
-		    set gdb_file_cmd_debug_info "debug"
-		    return 0
-                }
-                timeout {
-                    perror "(timeout) Couldn't load $arg, other program already loaded."
-		    return -1
-                }
-            }
-	}
-        -re "No such file or directory.*$gdb_prompt $" {
-            perror "($arg) No such file or directory"
-	    return -1
-        }
-        -re "$gdb_prompt $" {
-            perror "couldn't load $arg into $GDB."
-	    return -1
-            }
-        timeout {
-            perror "couldn't load $arg into $GDB (timed out)."
-	    return -1
-        }
-        eof {
-            # This is an attempt to detect a core dump, but seems not to
-            # work.  Perhaps we need to match .* followed by eof, in which
-            # gdb_expect does not seem to have a way to do that.
-            perror "couldn't load $arg into $GDB (end of file)."
-	    return -1
-        }
-    }
-}
-
-#
-# start gdb -- start gdb running, default procedure
-#
-# When running over NFS, particularly if running many simultaneous
-# tests on different hosts all using the same server, things can
-# get really slow.  Give gdb at least 3 minutes to start up.
-#
-proc default_gdb_start { } {
-    global verbose
-    global GDB
-    global GDBFLAGS
-    global gdb_prompt
-    global timeout
-    global gdb_spawn_id;
-
-    gdb_stop_suppressing_tests;
-
-    verbose "Spawning $GDB -nw $GDBFLAGS"
-
-    if [info exists gdb_spawn_id] {
-	return 0;
-    }
-
-    if ![is_remote host] {
-	if { [which $GDB] == 0 } then {
-	    perror "$GDB does not exist."
-	    exit 1
-	}
-    }
-    set res [remote_spawn host "$GDB -nw $GDBFLAGS [host_info gdb_opts]"];
-    if { $res < 0 || $res == "" } {
-	perror "Spawning $GDB failed."
-	return 1;
-    }
-    gdb_expect 360 {
-	-re "\[\r\n\]$gdb_prompt $" {
-	    verbose "GDB initialized."
-	}
-	-re "$gdb_prompt $"	{
-	    perror "GDB never initialized."
-	    return -1
-	}
-	timeout	{
-	    perror "(timeout) GDB never initialized after 10 seconds."
-	    remote_close host;
-	    return -1
-	}
-    }
-    set gdb_spawn_id -1;
-    # force the height to "unlimited", so no pagers get used
-
-    send_gdb "set height 0\n"
-    gdb_expect 10 {
-	-re "$gdb_prompt $" { 
-	    verbose "Setting height to 0." 2
-	}
-	timeout {
-	    warning "Couldn't set the height to 0"
-	}
-    }
-    # force the width to "unlimited", so no wraparound occurs
-    send_gdb "set width 0\n"
-    gdb_expect 10 {
-	-re "$gdb_prompt $" {
-	    verbose "Setting width to 0." 2
-	}
-	timeout {
-	    warning "Couldn't set the width to 0."
-	}
-    }
-    return 0;
-}
-
-# Return a 1 for configurations for which we don't even want to try to
-# test C++.
-
-proc skip_cplus_tests {} {
-    if { [istarget "d10v-*-*"] } {
-	return 1
-    }
-    if { [istarget "h8300-*-*"] } {
-	return 1
-    }
-
-    # The C++ IO streams are too large for HC11/HC12 and are thus not
-    # available.  The gdb C++ tests use them and don't compile.
-    if { [istarget "m6811-*-*"] } {
-	return 1
-    }
-    if { [istarget "m6812-*-*"] } {
-	return 1
-    }
-    return 0
-}
-
-# Return a 1 if I don't even want to try to test FORTRAN.
-
-proc skip_fortran_tests {} {
-    return 0
-}
-
-# Run a test on the target to see if it supports vmx hardware.  Return 0 if so, 
-# 1 if it does not.  Based on 'check_vmx_hw_available' from the GCC testsuite.
-
-proc skip_altivec_tests {} {
-    global skip_vmx_tests_saved
-    global srcdir subdir gdb_prompt
-
-    # Use the cached value, if it exists.
-    set me "skip_altivec_tests"
-    if [info exists skip_vmx_tests_saved] {
-        verbose "$me:  returning saved $skip_vmx_tests_saved" 2
-        return $skip_vmx_tests_saved
-    }
-
-    # Some simulators are known to not support VMX instructions.
-    if { [istarget powerpc-*-eabi] || [istarget powerpc*-*-eabispe] } {
-        verbose "$me:  target known to not support VMX, returning 1" 2
-        return [set $skip_vmx_tests_saved 1]
-    }
-
-    # Make sure we have a compiler that understands altivec.
-    set compile_flags {debug additional_flags=-w}
-    if [get_compiler_info not-used] {
-       warning "Could not get compiler info"
-       return 1
-    }
-    if [test_compiler_info gcc*] {
-        set compile_flags "$compile_flags additional_flags=-maltivec"
-    } elseif [test_compiler_info xlc*] {
-        set compile_flags "$compile_flags additional_flags=-qaltivec"
-    } else {
-        verbose "Could not compile with altivec support, returning 1" 2
-        return 1
-    }
-
-    # Set up, compile, and execute a test program containing VMX instructions.
-    # Include the current process ID in the file names to prevent conflicts
-    # with invocations for multiple testsuites.
-    set src vmx[pid].c
-    set exe vmx[pid].x
-
-    set f [open $src "w"]
-    puts $f "int main() {"
-    puts $f "#ifdef __MACH__"
-    puts $f "  asm volatile (\"vor v0,v0,v0\");"
-    puts $f "#else"
-    puts $f "  asm volatile (\"vor 0,0,0\");"
-    puts $f "#endif"
-    puts $f "  return 0; }"
-    close $f
-
-    verbose "$me:  compiling testfile $src" 2
-    set lines [gdb_compile $src $exe executable $compile_flags]
-    file delete $src
-
-    if ![string match "" $lines] then {
-        verbose "$me:  testfile compilation failed, returning 1" 2
-        return [set skip_vmx_tests_saved 1]
-    }
-
-    # No error message, compilation succeeded so now run it via gdb.
-
-    gdb_exit
-    gdb_start
-    gdb_reinitialize_dir $srcdir/$subdir
-    gdb_load "$exe"
-    gdb_run_cmd
-    gdb_expect {
-        -re ".*Illegal instruction.*${gdb_prompt} $" {
-            verbose -log "\n$me altivec hardware not detected" 
-            set skip_vmx_tests_saved 1
-        }
-        -re ".*Program exited normally.*${gdb_prompt} $" {
-            verbose -log "\n$me: altivec hardware detected" 
-            set skip_vmx_tests_saved 0
-        }
-        default {
-          warning "\n$me: default case taken"
-            set skip_vmx_tests_saved 1
-        }
-    }
-    gdb_exit
-    remote_file build delete $exe
-
-    verbose "$me:  returning $skip_vmx_tests_saved" 2
-    return $skip_vmx_tests_saved
-}
-
-# Skip all the tests in the file if you are not on an hppa running
-# hpux target.
-
-proc skip_hp_tests {} {
-    eval set skip_hp [ expr ![isnative] || ![istarget "hppa*-*-hpux*"] ]
-    verbose "Skip hp tests is $skip_hp"
-    return $skip_hp
-}
-
-set compiler_info		"unknown"
-set gcc_compiled		0
-set hp_cc_compiler		0
-set hp_aCC_compiler		0
-
-# Figure out what compiler I am using.
-#
-# BINFILE is a "compiler information" output file.  This implementation
-# does not use BINFILE.
-#
-# ARGS can be empty or "C++".  If empty, "C" is assumed.
-#
-# There are several ways to do this, with various problems.
-#
-# [ gdb_compile -E $ifile -o $binfile.ci ]
-# source $binfile.ci
-#
-#   Single Unix Spec v3 says that "-E -o ..." together are not
-#   specified.  And in fact, the native compiler on hp-ux 11 (among
-#   others) does not work with "-E -o ...".  Most targets used to do
-#   this, and it mostly worked, because it works with gcc.
-#
-# [ catch "exec $compiler -E $ifile > $binfile.ci" exec_output ]
-# source $binfile.ci
-# 
-#   This avoids the problem with -E and -o together.  This almost works
-#   if the build machine is the same as the host machine, which is
-#   usually true of the targets which are not gcc.  But this code does
-#   not figure which compiler to call, and it always ends up using the C
-#   compiler.  Not good for setting hp_aCC_compiler.  Targets
-#   hppa*-*-hpux* and mips*-*-irix* used to do this.
-#
-# [ gdb_compile -E $ifile > $binfile.ci ]
-# source $binfile.ci
-#
-#   dejagnu target_compile says that it supports output redirection,
-#   but the code is completely different from the normal path and I
-#   don't want to sweep the mines from that path.  So I didn't even try
-#   this.
-#
-# set cppout [ gdb_compile $ifile "" preprocess $args quiet ]
-# eval $cppout
-#
-#   I actually do this for all targets now.  gdb_compile runs the right
-#   compiler, and TCL captures the output, and I eval the output.
-#
-#   Unfortunately, expect logs the output of the command as it goes by,
-#   and dejagnu helpfully prints a second copy of it right afterwards.
-#   So I turn off expect logging for a moment.
-#   
-# [ gdb_compile $ifile $ciexe_file executable $args ]
-# [ remote_exec $ciexe_file ]
-# [ source $ci_file.out ]
-#
-#   I could give up on -E and just do this.
-#   I didn't get desperate enough to try this.
-#
-# -- chastain 2004-01-06
-
-proc get_compiler_info {binfile args} {
-    # For compiler.c and compiler.cc
-    global srcdir
-
-    # I am going to play with the log to keep noise out.
-    global outdir
-    global tool
-
-    # These come from compiler.c or compiler.cc
-    global compiler_info
-
-    # Legacy global data symbols.
-    global gcc_compiled
-    global hp_cc_compiler
-    global hp_aCC_compiler
-
-    # Choose which file to preprocess.
-    set ifile "${srcdir}/lib/compiler.c"
-    if { [llength $args] > 0 && [lindex $args 0] == "c++" } {
-	set ifile "${srcdir}/lib/compiler.cc"
-    }
-
-    # Run $ifile through the right preprocessor.
-    # Toggle gdb.log to keep the compiler output out of the log.
-    log_file
-    set cppout [ gdb_compile "${ifile}" "" preprocess [list "$args" quiet] ]
-    log_file -a "$outdir/$tool.log" 
-
-    # Eval the output.
-    set unknown 0
-    foreach cppline [ split "$cppout" "\n" ] {
-	if { [ regexp "^#" "$cppline" ] } {
-	    # line marker
-	} elseif { [ regexp "^\[\n\r\t \]*$" "$cppline" ] } {
-	    # blank line
-	} elseif { [ regexp "^\[\n\r\t \]*set\[\n\r\t \]" "$cppline" ] } {
-	    # eval this line
-	    verbose "get_compiler_info: $cppline" 2
-	    eval "$cppline"
-	} else {
-	    # unknown line
-	    verbose -log "get_compiler_info: $cppline"
-	    set unknown 1
-	}
-    }
-
-    # Reset to unknown compiler if any diagnostics happened.
-    if { $unknown } {
-	set compiler_info "unknown"
-    }
-
-    # Set the legacy symbols.
-    set gcc_compiled     0
-    set hp_cc_compiler   0
-    set hp_aCC_compiler  0
-    if { [regexp "^gcc-1-" "$compiler_info" ] } { set gcc_compiled 1 }
-    if { [regexp "^gcc-2-" "$compiler_info" ] } { set gcc_compiled 2 }
-    if { [regexp "^gcc-3-" "$compiler_info" ] } { set gcc_compiled 3 }
-    if { [regexp "^gcc-4-" "$compiler_info" ] } { set gcc_compiled 4 }
-    if { [regexp "^gcc-5-" "$compiler_info" ] } { set gcc_compiled 5 }
-    if { [regexp "^hpcc-"  "$compiler_info" ] } { set hp_cc_compiler 1 }
-    if { [regexp "^hpacc-" "$compiler_info" ] } { set hp_aCC_compiler 1 }
-
-    # Log what happened.
-    verbose -log "get_compiler_info: $compiler_info"
-
-    # Most compilers will evaluate comparisons and other boolean
-    # operations to 0 or 1.
-    uplevel \#0 { set true 1 }
-    uplevel \#0 { set false 0 }
-
-    # Use of aCC results in boolean results being displayed as
-    # "true" or "false"
-    if { $hp_aCC_compiler } {
-      uplevel \#0 { set true true }
-      uplevel \#0 { set false false }
-    }
-
-    return 0;
-}
-
-proc test_compiler_info { {compiler ""} } {
-    global compiler_info
-
-     # if no arg, return the compiler_info string
-
-     if [string match "" $compiler] {
-         if [info exists compiler_info] {
-             return $compiler_info
-         } else {
-             perror "No compiler info found."
-         }
-     }
-
-    return [string match $compiler $compiler_info]
-}
-
-set gdb_wrapper_initialized 0
-
-proc gdb_wrapper_init { args } {
-    global gdb_wrapper_initialized;
-    global gdb_wrapper_file;
-    global gdb_wrapper_flags;
-
-    if { $gdb_wrapper_initialized == 1 } { return; }
-
-    if {[target_info exists needs_status_wrapper] && \
-	    [target_info needs_status_wrapper] != "0"} {
-	set result [build_wrapper "testglue.o"];
-	if { $result != "" } {
-	    set gdb_wrapper_file [lindex $result 0];
-	    set gdb_wrapper_flags [lindex $result 1];
-	} else {
-	    warning "Status wrapper failed to build."
-	}
-    }
-    set gdb_wrapper_initialized 1
-}
-
-proc gdb_compile {source dest type options} {
-    global GDB_TESTCASE_OPTIONS;
-    global gdb_wrapper_file;
-    global gdb_wrapper_flags;
-    global gdb_wrapper_initialized;
-
-     # Add platform-specific options if a shared library was specified using
-     # "shlib=librarypath" in OPTIONS.
-     set new_options ""
-     set shlib_found 0
-     foreach opt $options {
-        if [regexp {^shlib=(.*)} $opt dummy_var shlib_name] {
-            if [test_compiler_info "xlc-*"] {
-               # IBM xlc compiler doesn't accept shared library named other  
-               # than .so: use "-Wl," to bypass this
-               lappend source "-Wl,$shlib_name"
-            } else {
-               lappend source $shlib_name
-            }
-            if {$shlib_found == 0} {
-                set shlib_found 1
-                if { ([test_compiler_info "gcc-*"]
-                      &&  ([istarget "powerpc*-*-aix*"]
-                        || [istarget "rs6000*-*-aix*"] )) } {
-                    lappend options "additional_flags=-L${objdir}/${subdir}"
-                } elseif { [istarget "mips-sgi-irix*"] } {
-                    lappend options "additional_flags=-rpath ${objdir}/${subdir}"
-                }
-            }
-        } else {
-            lappend new_options $opt
-        }
-     }
-     set options $new_options
-
-    if [target_info exists gdb_stub] {
-	set options2 { "additional_flags=-Dusestubs" }
-	lappend options "libs=[target_info gdb_stub]";
-	set options [concat $options2 $options]
-    }
-    if [target_info exists is_vxworks] {
-	set options2 { "additional_flags=-Dvxworks" }
-	lappend options "libs=[target_info gdb_stub]";
-	set options [concat $options2 $options]
-    }
-    if [info exists GDB_TESTCASE_OPTIONS] {
-	lappend options "additional_flags=$GDB_TESTCASE_OPTIONS";
-    }
-    verbose "options are $options"
-    verbose "source is $source $dest $type $options"
-
-    if { $gdb_wrapper_initialized == 0 } { gdb_wrapper_init }
-
-    if {[target_info exists needs_status_wrapper] && \
-	    [target_info needs_status_wrapper] != "0" && \
-	    [info exists gdb_wrapper_file]} {
-	lappend options "libs=${gdb_wrapper_file}"
-	lappend options "ldflags=${gdb_wrapper_flags}"
-    }
-
-    set result [target_compile $source $dest $type $options];
-    regsub "\[\r\n\]*$" "$result" "" result;
-    regsub "^\[\r\n\]*" "$result" "" result;
-    if { $result != "" && [lsearch $options quiet] == -1} {
-	clone_output "gdb compile failed, $result"
-    }
-    return $result;
-}
-
-
-# This is just like gdb_compile, above, except that it tries compiling
-# against several different thread libraries, to see which one this
-# system has.
-proc gdb_compile_pthreads {source dest type options} {
-    set built_binfile 0
-    set why_msg "unrecognized error"
-    foreach lib {-lpthreads -lpthread -lthread} {
-        # This kind of wipes out whatever libs the caller may have
-        # set.  Or maybe theirs will override ours.  How infelicitous.
-        set options_with_lib [concat $options [list libs=$lib quiet]]
-        set ccout [gdb_compile $source $dest $type $options_with_lib]
-        switch -regexp -- $ccout {
-            ".*no posix threads support.*" {
-                set why_msg "missing threads include file"
-                break
-            }
-            ".*cannot open -lpthread.*" {
-                set why_msg "missing runtime threads library"
-            }
-            ".*Can't find library for -lpthread.*" {
-                set why_msg "missing runtime threads library"
-            }
-            {^$} {
-                pass "successfully compiled posix threads test case"
-                set built_binfile 1
-                break
-            }
-        }
-    }
-    if {!$built_binfile} {
-        unsupported "Couldn't compile $source: ${why_msg}"
-        return -1
-    }
-}
-
-# Build a shared library from SOURCES.  You must use get_compiler_info
-# first.
-
-proc gdb_compile_shlib {sources dest options} {
-    set obj_options $options
-
-    switch -glob [test_compiler_info] {
-        "xlc-*" {
-            lappend obj_options "additional_flags=-qpic"
-        }
-        "gcc-*" {
-            if { !([istarget "powerpc*-*-aix*"]
-                   || [istarget "rs6000*-*-aix*"]) } {
-                lappend obj_options "additional_flags=-fpic"
-            }
-        }
-        default {
-            switch -glob [istarget] {
-                "hppa*-hp-hpux*" {
-                    lappend obj_options "additional_flags=+z"
-                }
-                "mips-sgi-irix*" {
-                    # Disable SGI compiler's implicit -Dsgi
-                    lappend obj_options "additional_flags=-Usgi"
-                } 
-                default {
-                    # don't know what the compiler is...
-                }
-            }
-        }
-    }
-
-    set outdir [file dirname $dest]
-    set objects ""
-    foreach source $sources {
-       set sourcebase [file tail $source]
-       if {[gdb_compile $source "${outdir}/${sourcebase}.o" object $obj_options] != ""} {
-           return -1
-       }
-       lappend objects ${outdir}/${sourcebase}.o
-    }
-
-    if [istarget "hppa*-*-hpux*"] {
-       remote_exec build "ld -b ${objects} -o ${dest}"
-    } else {
-       set link_options $options
-       if [test_compiler_info "xlc-*"] {
-          lappend link_options "additional_flags=-qmkshrobj"
-       } else {
-          lappend link_options "additional_flags=-shared"
-       }
-       if {[gdb_compile "${objects}" "${dest}" executable $link_options] != ""} {
-           return -1
-       }
-    }
-}
-
-# This is just like gdb_compile_pthreads, above, except that we always add the
-# objc library for compiling Objective-C programs
-proc gdb_compile_objc {source dest type options} {
-    set built_binfile 0
-    set why_msg "unrecognized error"
-    foreach lib {-lobjc -lpthreads -lpthread -lthread solaris} {
-        # This kind of wipes out whatever libs the caller may have
-        # set.  Or maybe theirs will override ours.  How infelicitous.
-        if { $lib == "solaris" } {
-            set lib "-lpthread -lposix4"
-	}
-        if { $lib != "-lobjc" } {
-	  set lib "-lobjc $lib"
-	}
-        set options_with_lib [concat $options [list libs=$lib quiet]]
-        set ccout [gdb_compile $source $dest $type $options_with_lib]
-        switch -regexp -- $ccout {
-            ".*no posix threads support.*" {
-                set why_msg "missing threads include file"
-                break
-            }
-            ".*cannot open -lpthread.*" {
-                set why_msg "missing runtime threads library"
-            }
-            ".*Can't find library for -lpthread.*" {
-                set why_msg "missing runtime threads library"
-            }
-            {^$} {
-                pass "successfully compiled objc with posix threads test case"
-                set built_binfile 1
-                break
-            }
-        }
-    }
-    if {!$built_binfile} {
-        unsupported "Couldn't compile $source: ${why_msg}"
-        return -1
-    }
-}
-
-proc send_gdb { string } {
-    global suppress_flag;
-    if { $suppress_flag } {
-	return "suppressed";
-    }
-    return [remote_send host "$string"];
-}
-
-#
-#
-
-proc gdb_expect { args } {
-    if { [llength $args] == 2  && [lindex $args 0] != "-re" } {
-	set gtimeout [lindex $args 0];
-	set expcode [list [lindex $args 1]];
-    } else {
-	upvar timeout timeout;
-
-	set expcode $args;
-	if [target_info exists gdb,timeout] {
-	    if [info exists timeout] {
-		if { $timeout < [target_info gdb,timeout] } {
-		    set gtimeout [target_info gdb,timeout];
-		} else {
-		    set gtimeout $timeout;
-		}
-	    } else {
-		set gtimeout [target_info gdb,timeout];
-	    }
-	}
-
-	if ![info exists gtimeout] {
-	    global timeout;
-	    if [info exists timeout] {
-		set gtimeout $timeout;
-	    } else {
-		# Eeeeew.
-		set gtimeout 60;
-	    }
-	}
-    }
-    global suppress_flag;
-    global remote_suppress_flag;
-    if [info exists remote_suppress_flag] {
-	set old_val $remote_suppress_flag;
-    }
-    if [info exists suppress_flag] {
-	if { $suppress_flag } {
-	    set remote_suppress_flag 1;
-	}
-    }
-    set code [catch \
-	{uplevel remote_expect host $gtimeout $expcode} string];
-    if [info exists old_val] {
-	set remote_suppress_flag $old_val;
-    } else {
-	if [info exists remote_suppress_flag] {
-	    unset remote_suppress_flag;
-	}
-    }
-
-    if {$code == 1} {
-        global errorInfo errorCode;
-
-	return -code error -errorinfo $errorInfo -errorcode $errorCode $string
-    } elseif {$code == 2} {
-	return -code return $string
-    } elseif {$code == 3} {
-	return
-    } elseif {$code > 4} {
-	return -code $code $string
-    }
-}
-
-# gdb_expect_list MESSAGE SENTINEL LIST -- expect a sequence of outputs
-#
-# Check for long sequence of output by parts.
-# MESSAGE: is the test message to be printed with the test success/fail.
-# SENTINEL: Is the terminal pattern indicating that output has finished.
-# LIST: is the sequence of outputs to match.
-# If the sentinel is recognized early, it is considered an error.
-#
-# Returns:
-#    1 if the test failed,
-#    0 if the test passes,
-#   -1 if there was an internal error.
-#
-proc gdb_expect_list {test sentinel list} {
-    global gdb_prompt
-    global suppress_flag
-    set index 0
-    set ok 1
-    if { $suppress_flag } {
-	set ok 0
-	unresolved "${test}"
-    }
-    while { ${index} < [llength ${list}] } {
-	set pattern [lindex ${list} ${index}]
-        set index [expr ${index} + 1]
-	if { ${index} == [llength ${list}] } {
-	    if { ${ok} } {
-		gdb_expect {
-		    -re "${pattern}${sentinel}" {
-			# pass "${test}, pattern ${index} + sentinel"
-		    }
-		    -re "${sentinel}" {
-			fail "${test} (pattern ${index} + sentinel)"
-			set ok 0
-		    }
-		    -re ".*A problem internal to GDB has been detected" {
-			fail "${test} (GDB internal error)"
-			set ok 0
-			gdb_internal_error_resync
-		    }
-		    timeout {
-			fail "${test} (pattern ${index} + sentinel) (timeout)"
-			set ok 0
-		    }
-		}
-	    } else {
-		# unresolved "${test}, pattern ${index} + sentinel"
-	    }
-	} else {
-	    if { ${ok} } {
-		gdb_expect {
-		    -re "${pattern}" {
-			# pass "${test}, pattern ${index}"
-		    }
-		    -re "${sentinel}" {
-			fail "${test} (pattern ${index})"
-			set ok 0
-		    }
-		    -re ".*A problem internal to GDB has been detected" {
-			fail "${test} (GDB internal error)"
-			set ok 0
-			gdb_internal_error_resync
-		    }
-		    timeout {
-			fail "${test} (pattern ${index}) (timeout)"
-			set ok 0
-		    }
-		}
-	    } else {
-		# unresolved "${test}, pattern ${index}"
-	    }
-	}
-    }
-    if { ${ok} } {
-	pass "${test}"
-	return 0
-    } else {
-	return 1
-    }
-}
-
-#
-#
-proc gdb_suppress_entire_file { reason } {
-    global suppress_flag;
-
-    warning "$reason\n";
-    set suppress_flag -1;
-}
-
-#
-# Set suppress_flag, which will cause all subsequent calls to send_gdb and
-# gdb_expect to fail immediately (until the next call to 
-# gdb_stop_suppressing_tests).
-#
-proc gdb_suppress_tests { args } {
-    global suppress_flag;
-
-    return;  # fnf - disable pending review of results where
-             # testsuite ran better without this
-    incr suppress_flag;
-
-    if { $suppress_flag == 1 } {
-	if { [llength $args] > 0 } {
-	    warning "[lindex $args 0]\n";
-	} else {
-	    warning "Because of previous failure, all subsequent tests in this group will automatically fail.\n";
-	}
-    }
-}
-
-#
-# Clear suppress_flag.
-#
-proc gdb_stop_suppressing_tests { } {
-    global suppress_flag;
-
-    if [info exists suppress_flag] {
-	if { $suppress_flag > 0 } {
-	    set suppress_flag 0;
-	    clone_output "Tests restarted.\n";
-	}
-    } else {
-	set suppress_flag 0;
-    }
-}
-
-proc gdb_clear_suppressed { } {
-    global suppress_flag;
-
-    set suppress_flag 0;
-}
-
-proc gdb_start { } {
-    default_gdb_start
-}
-
-proc gdb_exit { } {
-    catch default_gdb_exit
-}
-
-#
-# gdb_load -- load a file into the debugger.
-# Many files in config/*.exp override this procedure.
-#
-proc gdb_load { arg } {
-    return [gdb_file_cmd $arg]
-}
-
-proc gdb_continue { function } {
-    global decimal
-
-    return [gdb_test "continue" ".*Breakpoint $decimal, $function .*" "continue to $function"];
-}
-
-proc default_gdb_init { args } {
-    global gdb_wrapper_initialized
-    
-    gdb_clear_suppressed;
-
-    # Make sure that the wrapper is rebuilt
-    # with the appropriate multilib option.
-    set gdb_wrapper_initialized 0
-    
-    # Uh, this is lame. Really, really, really lame. But there's this *one*
-    # testcase that will fail in random places if we don't increase this.
-    match_max -d 20000
-
-    # We want to add the name of the TCL testcase to the PASS/FAIL messages.
-    if { [llength $args] > 0 } {
-	global pf_prefix
-
-	set file [lindex $args 0];
-
-	set pf_prefix "[file tail [file dirname $file]]/[file tail $file]:";
-    }
-    global gdb_prompt;
-    if [target_info exists gdb_prompt] {
-	set gdb_prompt [target_info gdb_prompt];
-    } else {
-	set gdb_prompt "\\(gdb\\)"
-    }
-}
-
-proc gdb_init { args } {
-    return [eval default_gdb_init $args];
-}
-
-proc gdb_finish { } {
-    gdb_exit;
-}
-
-global debug_format
-set debug_format "unknown"
-
-# Run the gdb command "info source" and extract the debugging format
-# information from the output and save it in debug_format.
-
-proc get_debug_format { } {
-    global gdb_prompt
-    global verbose
-    global expect_out
-    global debug_format
-
-    set debug_format "unknown"
-    send_gdb "info source\n"
-    gdb_expect 10 {
-	-re "Compiled with (.*) debugging format.\r\n.*$gdb_prompt $" {
-	    set debug_format $expect_out(1,string)
-	    verbose "debug format is $debug_format"
-	    return 1;
-	}
-	-re "No current source file.\r\n$gdb_prompt $" {
-	    perror "get_debug_format used when no current source file"
-	    return 0;
-	}
-	-re "$gdb_prompt $" {
-	    warning "couldn't check debug format (no valid response)."
-	    return 1;
-	}
-	timeout {
-	    warning "couldn't check debug format (timed out)."
-	    return 1;
-	}
-    }
-}
-
-# Return true if FORMAT matches the debug format the current test was
-# compiled with.  FORMAT is a shell-style globbing pattern; it can use
-# `*', `[...]', and so on.
-#
-# This function depends on variables set by `get_debug_format', above.
-
-proc test_debug_format {format} {
-    global debug_format
-
-    return [expr [string match $format $debug_format] != 0]
-}
-
-# Like setup_xfail, but takes the name of a debug format (DWARF 1,
-# COFF, stabs, etc).  If that format matches the format that the
-# current test was compiled with, then the next test is expected to
-# fail for any target.  Returns 1 if the next test or set of tests is
-# expected to fail, 0 otherwise (or if it is unknown).  Must have
-# previously called get_debug_format.
-proc setup_xfail_format { format } {
-    set ret [test_debug_format $format];
-
-    if {$ret} then {
-	setup_xfail "*-*-*"
-    }
-    return $ret;
-}
-
-proc gdb_step_for_stub { } {
-    global gdb_prompt;
-
-    if ![target_info exists gdb,use_breakpoint_for_stub] {
-	if [target_info exists gdb_stub_step_command] {
-	    set command [target_info gdb_stub_step_command];
-	} else {
-	    set command "step";
-	}
-	send_gdb "${command}\n";
-	set tries 0;
-	gdb_expect 60 {
-	    -re "(main.* at |.*in .*start).*$gdb_prompt" {
-		return;
-	    }
-	    -re ".*$gdb_prompt" {
-		incr tries;
-		if { $tries == 5 } {
-		    fail "stepping out of breakpoint function";
-		    return;
-		}
-		send_gdb "${command}\n";
-		exp_continue;
-	    }
-	    default {
-		fail "stepping out of breakpoint function";
-		return;
-	    }
-	}
-    }
-    send_gdb "where\n";
-    gdb_expect {
-	-re "main\[^\r\n\]*at \(\[^:]+\):\(\[0-9\]+\)" {
-	    set file $expect_out(1,string);
-	    set linenum [expr $expect_out(2,string) + 1];
-	    set breakplace "${file}:${linenum}";
-	}
-	default {}
-    }
-    send_gdb "break ${breakplace}\n";
-    gdb_expect 60 {
-	-re "Breakpoint (\[0-9\]+) at.*$gdb_prompt" {
-	    set breakpoint $expect_out(1,string);
-	}
-	-re "Breakpoint (\[0-9\]+): file.*$gdb_prompt" {
-	    set breakpoint $expect_out(1,string);
-	}
-	default {}
-    }
-    send_gdb "continue\n";
-    gdb_expect 60 {
-	-re "Breakpoint ${breakpoint},.*$gdb_prompt" {
-	    gdb_test "delete $breakpoint" ".*" "";
-	    return;
-	}
-	default {}
-    }
-}
-
-# gdb_get_line_number TEXT [FILE]
-#
-# Search the source file FILE, and return the line number of the
-# first line containing TEXT.  If no match is found, return -1.
-# 
-# TEXT is a string literal, not a regular expression.
-#
-# The default value of FILE is "$srcdir/$subdir/$srcfile".  If FILE is
-# specified, and does not start with "/", then it is assumed to be in
-# "$srcdir/$subdir".  This is awkward, and can be fixed in the future,
-# by changing the callers and the interface at the same time.
-# In particular: gdb.base/break.exp, gdb.base/condbreak.exp,
-# gdb.base/ena-dis-br.exp.
-#
-# Use this function to keep your test scripts independent of the
-# exact line numbering of the source file.  Don't write:
-# 
-#   send_gdb "break 20"
-# 
-# This means that if anyone ever edits your test's source file, 
-# your test could break.  Instead, put a comment like this on the
-# source file line you want to break at:
-# 
-#   /* breakpoint spot: frotz.exp: test name */
-# 
-# and then write, in your test script (which we assume is named
-# frotz.exp):
-# 
-#   send_gdb "break [gdb_get_line_number "frotz.exp: test name"]\n"
-#
-# (Yes, Tcl knows how to handle the nested quotes and brackets.
-# Try this:
-# 	$ tclsh
-# 	% puts "foo [lindex "bar baz" 1]"
-# 	foo baz
-# 	% 
-# Tcl is quite clever, for a little stringy language.)
-#
-# ===
-#
-# The previous implementation of this procedure used the gdb search command.
-# This version is different:
-#
-#   . It works with MI, and it also works when gdb is not running.
-#
-#   . It operates on the build machine, not the host machine.
-#
-#   . For now, this implementation fakes a current directory of
-#     $srcdir/$subdir to be compatible with the old implementation.
-#     This will go away eventually and some callers will need to
-#     be changed.
-#
-#   . The TEXT argument is literal text and matches literally,
-#     not a regular expression as it was before.
-#
-#   . State changes in gdb, such as changing the current file
-#     and setting $_, no longer happen.
-#
-# After a bit of time we can forget about the differences from the
-# old implementation.
-#
-# --chastain 2004-08-05
-
-proc gdb_get_line_number { text { file "" } } {
-    global srcdir
-    global subdir
-    global srcfile
-
-    if { "$file" == "" } then {
-	set file "$srcfile"
-    }
-    if { ! [regexp "^/" "$file"] } then {
-	set file "$srcdir/$subdir/$file"
-    }
-
-    if { [ catch { set fd [open "$file"] } message ] } then {
-	perror "$message"
-	return -1
-    }
-
-    set found -1
-    for { set line 1 } { 1 } { incr line } {
-	if { [ catch { set nchar [gets "$fd" body] } message ] } then {
-	    perror "$message"
-	    return -1
-	}
-	if { $nchar < 0 } then {
-	    break
-	}
-	if { [string first "$text" "$body"] >= 0 } then {
-	    set found $line
-	    break
-	}
-    }
-
-    if { [ catch { close "$fd" } message ] } then {
-	perror "$message"
-	return -1
-    }
-
-    return $found
-}
-
-# gdb_continue_to_end:
-#	The case where the target uses stubs has to be handled specially. If a
-#       stub is used, we set a breakpoint at exit because we cannot rely on
-#       exit() behavior of a remote target.
-# 
-# mssg is the error message that gets printed.
-
-proc gdb_continue_to_end {mssg} {
-  if [target_info exists use_gdb_stub] {
-    if {![gdb_breakpoint "exit"]} {
-      return 0
-    }
-    gdb_test "continue" "Continuing..*Breakpoint .*exit.*" \
-      "continue until exit at $mssg"
-  } else {
-    # Continue until we exit.  Should not stop again.
-    # Don't bother to check the output of the program, that may be
-    # extremely tough for some remote systems.
-    gdb_test "continue"\
-      "Continuing.\[\r\n0-9\]+(... EXIT code 0\[\r\n\]+|Program exited normally\\.).*"\
-      "continue until exit at $mssg"
-  }
-}
-
-proc rerun_to_main {} {
-  global gdb_prompt
-
-  if [target_info exists use_gdb_stub] {
-    gdb_run_cmd
-    gdb_expect {
-      -re ".*Breakpoint .*main .*$gdb_prompt $"\
-	      {pass "rerun to main" ; return 0}
-      -re "$gdb_prompt $"\
-	      {fail "rerun to main" ; return 0}
-      timeout {fail "(timeout) rerun to main" ; return 0}
-    }
-  } else {
-    send_gdb "run\n"
-    gdb_expect {
-      -re "The program .* has been started already.*y or n. $" {
-	  send_gdb "y\n"
-	  exp_continue
-      }
-      -re "Starting program.*$gdb_prompt $"\
-	      {pass "rerun to main" ; return 0}
-      -re "$gdb_prompt $"\
-	      {fail "rerun to main" ; return 0}
-      timeout {fail "(timeout) rerun to main" ; return 0}
-    }
-  }
-}
-
-# Print a message and return true if a test should be skipped
-# due to lack of floating point suport.
-
-proc gdb_skip_float_test { msg } {
-    if [target_info exists gdb,skip_float_tests] {
-	verbose "Skipping test '$msg': no float tests.";
-	return 1;
-    }
-    return 0;
-}
-
-# Print a message and return true if a test should be skipped
-# due to lack of stdio support.
-
-proc gdb_skip_stdio_test { msg } {
-    if [target_info exists gdb,noinferiorio] {
-	verbose "Skipping test '$msg': no inferior i/o.";
-	return 1;
-    }
-    return 0;
-}
-
-proc gdb_skip_bogus_test { msg } {
-    return 0;
-}
-
-
-# Note: the procedure gdb_gnu_strip_debug will produce an executable called
-# ${binfile}.dbglnk, which is just like the executable ($binfile) but without
-# the debuginfo. Instead $binfile has a .gnu_debuglink section which contains
-# the name of a idebuginfo only file. This file will be stored in the 
-# gdb.base/.debug subdirectory.
-
-# Functions for separate debug info testing
-
-# starting with an executable:
-# foo --> original executable
-
-# at the end of the process we have:
-# foo.stripped --> foo w/o debug info
-# .debug/foo.debug --> foo's debug info
-# foo --> like foo, but with a new .gnu_debuglink section pointing to foo.debug.
-
-# Return the name of the file in which we should stor EXEC's separated
-# debug info. EXEC contains the full path.
-proc separate_debug_filename { exec } {
-
-    # In a .debug subdirectory off the same directory where the testcase
-    # executable is going to be. Something like:
-    # <your-path>/gdb/testsuite/gdb.base/.debug/blah.debug.
-    # This is the default location where gdb expects to findi
-    # the debug info file.
-
-    set exec_dir [file dirname $exec]
-    set exec_file [file tail $exec]
-    set debug_dir [file join $exec_dir ".debug"]
-    set debug_file [file join $debug_dir "${exec_file}.debug"]
-
-    return $debug_file
-}
-
-
-proc gdb_gnu_strip_debug { dest } {
-
-    set debug_file [separate_debug_filename $dest]
-    set strip_to_file_program strip
-    set objcopy_program objcopy
-
-    # Make sure the directory that will hold the separated debug
-    # info actually exists.
-    set debug_dir [file dirname $debug_file]
-    if {! [file isdirectory $debug_dir]} {
-	file mkdir $debug_dir
-    }
-
-    set debug_link [file tail $debug_file]
-    set stripped_file "${dest}.stripped"
-
-    # Get rid of the debug info, and store result in stripped_file
-    # something like gdb/testsuite/gdb.base/blah.stripped.
-    set result [catch "exec $strip_to_file_program --strip-debug ${dest} -o ${stripped_file}" output]
-    verbose "result is $result"
-    verbose "output is $output"
-    if {$result == 1} {
-      return 1
-    }
-
-    # Get rid of everything but the debug info, and store result in debug_file
-    # This will be in the .debug subdirectory, see above.
-    set result [catch "exec $strip_to_file_program --only-keep-debug ${dest} -o ${debug_file}" output]
-    verbose "result is $result"
-    verbose "output is $output"
-    if {$result == 1} {
-      return 1
-    }
-
-    # Link the two previous output files together, adding the .gnu_debuglink
-    # section to the stripped_file, containing a pointer to the debug_file,
-    # save the new file in dest.
-    # This will be the regular executable filename, in the usual location.
-    set result [catch "exec $objcopy_program --add-gnu-debuglink=${debug_file} ${stripped_file} ${dest}" output]
-    verbose "result is $result"
-    verbose "output is $output"
-    if {$result == 1} {
-      return 1
-    }
-
-   return 0
-}
-
diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp
deleted file mode 100644
index 71535d00857..00000000000
--- a/gdb/testsuite/lib/gdbserver-support.exp
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 2000, 2002, 2003, 2004, 2005 Free Software Foundation, 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.  
-
-# This file is based on config/gdbserver.exp, which was written by
-# Michael Snyder (msnyder@redhat.com).
-
-#
-# To be addressed or set in your baseboard config file:
-#
-#   set_board_info gdb_protocol "remote"
-#	Unles you have a gdbserver that uses a different protocol...
-#
-#   set_board_info gdb_server_prog
-#	This will be the path to the gdbserver program you want to test.
-#	Defaults to "gdbserver".
-#
-#   set_board_info sockethost
-#	The name of the host computer whose socket is being used.
-#	Defaults to "localhost".  Note: old gdbserver requires 
-#	that you define this, but libremote/gdbserver does not.
-#
-#   set_board_info gdb,socketport
-#	Port id to use for socket connection.  If not set explicitly,
-#	it will start at "2345" and increment for each use.
-#
-
-#
-# gdb_target_cmd
-# Send gdb the "target" command
-#
-proc gdb_target_cmd { targetname serialport } {
-    global gdb_prompt
-
-    for {set i 1} {$i <= 3} {incr i} {
-	send_gdb "target $targetname $serialport\n"
-	gdb_expect 60 {
-	    -re "A program is being debugged already.*ill it.*y or n. $" {
-		send_gdb "y\n"
-		exp_continue
-	    }
-	    -re "Couldn't establish connection to remote.*$gdb_prompt" {
-		verbose "Connection failed"
-	    }
-	    -re "Remote MIPS debugging.*$gdb_prompt" {
-		verbose "Set target to $targetname"
-		return 0
-	    }
-	    -re "Remote debugging using .*$serialport.*$gdb_prompt" {
-		verbose "Set target to $targetname"
-		return 0
-	    }
-	    -re "Remote target $targetname connected to.*$gdb_prompt" {
-		verbose "Set target to $targetname"
-		return 0
-	    }
-	    -re "Connected to.*$gdb_prompt" { 
-		verbose "Set target to $targetname"
-		return 0
-	    }
-	    -re "Ending remote.*$gdb_prompt" { }
-	    -re "Connection refused.*$gdb_prompt" {
-		verbose "Connection refused by remote target.  Pausing, and trying again."
-		sleep 30
-		continue
-	    }
-	    -re "Timeout reading from remote system.*$gdb_prompt" {
-		verbose "Got timeout error from gdb."
-	    }
-	    timeout {
-		send_gdb ""
-		break
-	    }
-	}
-    }
-    return 1
-}
-
-
-global portnum
-set portnum "2345"
-
-# Locate the gdbserver binary.  Returns "" if gdbserver could not be found.
-
-proc find_gdbserver { } {
-  global GDB
-
-  if [target_info exists gdb_server_prog] {
-    return [target_info gdb_server_prog]
-  }
-
-  set gdbserver "${GDB}server"
-  if { [file isdirectory $gdbserver] } {
-    append gdbserver "/gdbserver"
-  }
-
-  if { [file executable $gdbserver] } {
-    return $gdbserver
-  }
-
-  return ""
-}
-
-# Return non-zero if we should skip gdbserver-specific tests.
-
-proc skip_gdbserver_tests { } {
-  if { [find_gdbserver] == "" } {
-    return 1
-  }
-
-  return 0
-}
-
-# Start a gdbserver process running SERVER_EXEC, and connect GDB
-# to it.  CHILD_ARGS are passed to the inferior.
-#
-# Returns the target protocol and socket to connect to.
-
-proc gdbserver_spawn { server_exec child_args } {
-    global portnum
-
-    # Port id -- either specified in baseboard file, or managed here.
-    if [target_info exists gdb,socketport] {
-	set portnum [target_info gdb,socketport]
-    } else {
-	# Bump the port number to avoid conflicts with hung ports.
-	incr portnum
-    }
-
-    # Extract the local and remote host ids from the target board struct.
-    if [target_info exists sockethost] {
-	set debughost  [target_info sockethost]
-    } else {
-	set debughost "localhost:"
-    }
-
-    # Extract the protocol
-    if [target_info exists gdb_protocol] {
-	set protocol [target_info gdb_protocol]
-    } else {
-	set protocol "remote"
-    }
-
-    set gdbserver [find_gdbserver]
-
-    # Export the host:port pair.
-    set gdbport $debughost$portnum
-
-    # Fire off the debug agent.  This flavour of gdbserver takes as
-    # arguments the port information, the name of the executable file to
-    # be debugged, and any arguments.
-    set gdbserver_command "$gdbserver :$portnum $server_exec"
-    if { $child_args != "" } {
-	append gdbserver_command " $child_args"
-    }
-
-    set server_spawn_id [remote_spawn target $gdbserver_command]
-
-    # Wait for the server to produce at least one line and an additional
-    # character of output.  This will wait until any TCP socket has been
-    # created, so that GDB can connect.
-    expect {
-	-i $server_spawn_id
-	-notransfer
-	-re ".*\n." { }
-    }
-
-    # We can't just call close, because if gdbserver is local then that means
-    # that it will get a SIGHUP.  Doing it this way could also allow us to
-    # get at the inferior's input or output if necessary, and means that we
-    # don't need to redirect output.
-    expect_background {
-	-i $server_spawn_id
-	-re "." { }
-	eof {
-	    # The spawn ID is already closed now (but not yet waited for).
-	    wait -i $expect_out(spawn_id)
-	}
-    }
-
-    return [list $protocol $gdbport]
-}
-
-proc infer_host_exec { } {
-    set host_exec ""
-
-    send_gdb "info files\n"
-    gdb_expect 30 {
-	-re "Symbols from \"(\[^\"\]+)\"" {
-	    set host_exec $expect_out(1,string)
-	    exp_continue
-	}
-	-re "Local exec file:\[\r\n\]+\[ \t\]*`(\[^'\]+)'," {
-	    set host_exec $expect_out(1,string)
-	    exp_continue
-	}
-	-re "$gdb_prompt $" { }
-    }
-
-    return $host_exec
-}
-
-# Start a gdbserver process running HOST_EXEC and pass CHILD_ARGS
-# to it.  Return 0 on success, or non-zero on failure.
-
-proc gdbserver_load { host_exec child_args } {
-    global gdbserver_host_exec
-    global gdbserver_server_exec
-
-    # If we weren't passed an explicit binary, try to reuse the current
-    # one.  If we were, be sure to redownload it.
-
-    if { $host_exec == "" && $gdbserver_host_exec == "" } {
-	set gdbserver_host_exec [infer_host_exec]
-    } elseif { $host_exec != "" } {
-	set gdbserver_host_exec $host_exec
-	if [info exists gdbserver_server_exec] { unset gdbserver_server_exec }
-    }
-
-    if { ! [info exists gdbserver_server_exec] } {
-	if [is_remote target] {
-	    set gdbserver_server_exec [remote_download target $host_exec /tmp/[file tail $gdbserver_host_exec].[pid]]
-	} else {
-	    set gdbserver_server_exec $gdbserver_host_exec
-	}
-    }
-
-    set res [gdbserver_spawn $gdbserver_server_exec $child_args]
-    set protocol [lindex $res 0]
-    set gdbport [lindex $res 1]
-
-    if { $host_exec != "" } {
-	if [gdb_file_cmd $host_exec] {
-	    return -1
-	}
-    }
-    gdb_target_cmd $protocol $gdbport
-}
diff --git a/gdb/testsuite/lib/java.exp b/gdb/testsuite/lib/java.exp
deleted file mode 100644
index 3a0b2140763..00000000000
--- a/gdb/testsuite/lib/java.exp
+++ /dev/null
@@ -1,123 +0,0 @@
-# This test code is part of GDB, the GNU debugger.
-
-# Copyright 1998, 1999, 2000, 2003, 2004
-# Free Software Foundation, 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.  
-
-load_lib "libgloss.exp"
-
-# GCJ_UNDER_TEST is the compiler under test.
-
-global tmpdir
-
-if ![info exists tmpdir] {
-    set tmpdir "/tmp"
-}
-
-set java_initialized 0
-
-#
-# Build the status wrapper library as needed.
-#
-proc java_init { args } {
-    global wrapper_file;
-    global wrap_compile_flags;
-    global java_initialized
-    global GCJ_UNDER_TEST
-    global TOOL_EXECUTABLE
-    global env
-
-    if { $java_initialized == 1 } { return; }
-
-    if ![info exists GCJ_UNDER_TEST] {
-	if [info exists TOOL_EXECUTABLE] {
-	    set GCJ_UNDER_TEST $TOOL_EXECUTABLE;
-	} else {
-	    if [info exists env(GCJ)] {
-		set GCJ_UNDER_TEST $env(GCJ)
-	    } else {
-		global tool_root_dir
-		global target_alias
-		
-		if ![is_remote host] {
-		    set file [lookfor_file $tool_root_dir gcj];
-		    if { $file == "" } {
-			set file [lookfor_file $tool_root_dir gcc/gcj];
-		    }
-		    if { $file != "" } {
-			set CC "$file -B[file dirname $file]/ --specs=$tool_root_dir/$target_alias/libjava/libgcj-test.spec";
-		    } else {
-			set CC [transform gcj];
-		    }
-		} else {
-		    set CC [transform gcj]
-		}
-		set GCJ_UNDER_TEST $CC
-	    }
-	}
-    }
-
-    set wrapper_file "";
-    set wrap_compile_flags "";
-    if [target_info exists needs_status_wrapper] {
-	set result [build_wrapper "testglue.o"];
-	if { $result != "" } {
-	    set wrapper_file [lindex $result 0];
-	    set wrap_compile_flags [lindex $result 1];
-	} else {
-	    warning "Status wrapper failed to build."
-	}
-    }
-
-    set java_initialized 1
-}
-
-#
-# Run the test specified by srcfile and resultfile. compile_args and
-# exec_args are options telling this proc how to work.
-#
-proc compile_java_from_source { srcfile binfile compile_args } {
-    global GCJ_UNDER_TEST
-    global runtests
-    global java_initialized
-
-    if { $java_initialized != 1 } { java_init }
-
-    set errname [file rootname [file tail $srcfile]]
-    if {! [runtest_file_p $runtests $errname]} {
-        return
-    }
-
-    set args "compiler=$GCJ_UNDER_TEST"
-    lappend args "additional_flags=--main=[file rootname [file tail $srcfile]]"
-    if { $compile_args != "" } {
-	lappend args "additional_flags=$compile_args"
-    }
-
-    if { $compile_args != "" } {
-	set errname "$errname $compile_args"
-    }
-
-    set x [target_compile $srcfile ${binfile} ${binfile} $args]
-    if { $x != "" } {
-	verbose "target_compile failed: $x" 2
-	return "$errname compilation from source";
-    }
-}
-
-# Local Variables:
-# tcl-indent-level:4
-# End:
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
deleted file mode 100644
index c03c3cce6a0..00000000000
--- a/gdb/testsuite/lib/mi-support.exp
+++ /dev/null
@@ -1,934 +0,0 @@
-# Copyright 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, 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 based on a file written by Fred Fish. (fnf@cygnus.com)
-
-# Test setup routines that work with the MI interpreter.
-
-# The variable mi_gdb_prompt is a regexp which matches the gdb mi prompt.
-# Set it if it is not already set.
-global mi_gdb_prompt
-if ![info exists mi_gdb_prompt] then {
-    set mi_gdb_prompt "\[(\]gdb\[)\] \r\n"
-}
-
-set MIFLAGS "-i=mi"
-
-#
-# mi_gdb_exit -- exit the GDB, killing the target program if necessary
-#
-proc mi_gdb_exit {} {
-    catch mi_uncatched_gdb_exit
-}
-
-proc mi_uncatched_gdb_exit {} {
-    global GDB
-    global GDBFLAGS
-    global verbose
-    global gdb_spawn_id;
-    global gdb_prompt
-    global mi_gdb_prompt
-    global MIFLAGS
-
-    gdb_stop_suppressing_tests;
-
-    if { [info procs sid_exit] != "" } {
-	sid_exit
-    }
-
-    if ![info exists gdb_spawn_id] {
-	return;
-    }
-
-    verbose "Quitting $GDB $GDBFLAGS $MIFLAGS"
-
-    if { [is_remote host] && [board_info host exists fileid] } {
-	send_gdb "999-gdb-exit\n";
-	gdb_expect 10 {
-	    -re "y or n" {
-		send_gdb "y\n";
-		exp_continue;
-	    }
-            -re "Undefined command.*$gdb_prompt $" {
-                send_gdb "quit\n"
-		exp_continue;
-            }
-	    -re "DOSEXIT code" { }
-	    default { }
-	}
-    }
-
-    if ![is_remote host] {
-	remote_close host;
-    }
-    unset gdb_spawn_id
-}
-
-#
-# start gdb -- start gdb running, default procedure
-#
-# When running over NFS, particularly if running many simultaneous
-# tests on different hosts all using the same server, things can
-# get really slow.  Give gdb at least 3 minutes to start up.
-#
-proc mi_gdb_start { } {
-    global verbose
-    global GDB
-    global GDBFLAGS
-    global gdb_prompt
-    global mi_gdb_prompt
-    global timeout
-    global gdb_spawn_id;
-    global MIFLAGS
-
-    gdb_stop_suppressing_tests;
-
-    # Start SID.
-    if { [info procs sid_start] != "" } {
-	verbose "Spawning SID"
-	sid_start
-    }
-
-    verbose "Spawning $GDB -nw $GDBFLAGS $MIFLAGS"
-
-    if [info exists gdb_spawn_id] {
-	return 0;
-    }
-
-    if ![is_remote host] {
-	if { [which $GDB] == 0 } then {
-	    perror "$GDB does not exist."
-	    exit 1
-	}
-    }
-    set res [remote_spawn host "$GDB -nw $GDBFLAGS $MIFLAGS [host_info gdb_opts]"];
-    if { $res < 0 || $res == "" } {
-	perror "Spawning $GDB failed."
-	return 1;
-    }
-    gdb_expect {
-	-re "~\"GNU.*\r\n~\".*$mi_gdb_prompt$" {
-	    # We have a new format mi startup prompt.  If we are
-	    # running mi1, then this is an error as we should be
-	    # using the old-style prompt.
-	    if { $MIFLAGS == "-i=mi1" } {
-	        perror "(mi startup) Got unexpected new mi prompt."
-	        remote_close host;
-	        return -1;
-	    }
-	    verbose "GDB initialized."
-	}
-	-re "\[^~\].*$mi_gdb_prompt$" {
-	    # We have an old format mi startup prompt.  If we are
-	    # not running mi1, then this is an error as we should be
-	    # using the new-style prompt.
-	    if { $MIFLAGS != "-i=mi1" } {
-	        perror "(mi startup) Got unexpected old mi prompt."
-	        remote_close host;
-	        return -1;
-	    }
-	    verbose "GDB initialized."
-	}
-	-re ".*$gdb_prompt $" {
-	    untested "Skip mi tests (got non-mi prompt)."
-	    remote_close host;
-	    return -1;
-	}
-	-re ".*unrecognized option.*for a complete list of options." {
-	    untested "Skip mi tests (not compiled with mi support)."
-	    remote_close host;
-	    return -1;
-	}
-	-re ".*Interpreter `mi' unrecognized." {
-	    untested "Skip mi tests (not compiled with mi support)."
-	    remote_close host;
-	    return -1;
-	}
-	timeout {
-	    perror "(timeout) GDB never initialized after 10 seconds."
-	    remote_close host;
-	    return -1
-	}
-    }
-    set gdb_spawn_id -1;
-
-    # FIXME: mi output does not go through pagers, so these can be removed.
-    # force the height to "unlimited", so no pagers get used
-    send_gdb "100-gdb-set height 0\n"
-    gdb_expect 10 {
-	-re ".*100-gdb-set height 0\r\n100\\\^done\r\n$mi_gdb_prompt$" { 
-	    verbose "Setting height to 0." 2
-	}
-	timeout {
-	    warning "Couldn't set the height to 0"
-	}
-    }
-    # force the width to "unlimited", so no wraparound occurs
-    send_gdb "101-gdb-set width 0\n"
-    gdb_expect 10 {
-	-re ".*101-gdb-set width 0\r\n101\\\^done\r\n$mi_gdb_prompt$" {
-	    verbose "Setting width to 0." 2
-	}
-	timeout {
-	    warning "Couldn't set the width to 0."
-	}
-    }
-
-    return 0;
-}
-
-# Many of the tests depend on setting breakpoints at various places and
-# running until that breakpoint is reached.  At times, we want to start
-# with a clean-slate with respect to breakpoints, so this utility proc 
-# lets us do this without duplicating this code everywhere.
-#
-
-proc mi_delete_breakpoints {} {
-    global mi_gdb_prompt
-
-# FIXME: The mi operation won't accept a prompt back and will use the 'all' arg
-    send_gdb "102-break-delete\n"
-    gdb_expect 30 {
-	 -re "Delete all breakpoints.*y or n.*$" {
-	    send_gdb "y\n";
-	    exp_continue
-         }
-	 -re ".*102-break-delete\r\n102\\\^done\r\n$mi_gdb_prompt$" {
-            # This happens if there were no breakpoints
-	 }
-	 timeout { perror "Delete all breakpoints in mi_delete_breakpoints (timeout)" ; return }
-    }
-
-# The correct output is not "No breakpoints or watchpoints." but an
-# empty BreakpointTable. Also, a query is not acceptable with mi.
-    send_gdb "103-break-list\n"
-    gdb_expect 30 {
-	 -re "103-break-list\r\n103\\\^done,BreakpointTable=\{\}\r\n$mi_gdb_prompt$" {}
-	 -re "103-break-list\r\n103\\\^done,BreakpointTable=\{nr_rows=\".\",nr_cols=\".\",hdr=\\\[\{width=\".*\",alignment=\".*\",col_name=\"number\",colhdr=\"Num\"\}.*colhdr=\"Type\".*colhdr=\"Disp\".*colhdr=\"Enb\".*colhdr=\"Address\".*colhdr=\"What\".*\\\],body=\\\[\\\]\}" {}
-	 -re "103-break-list\r\n103\\\^doneNo breakpoints or watchpoints.\r\n\r\n$mi_gdb_prompt$" {warning "Unexpected console text received"}
-	 -re "$mi_gdb_prompt$" { perror "Breakpoints not deleted" ; return }
-	 -re "Delete all breakpoints.*or n.*$" {
-	    warning "Unexpected prompt for breakpoints deletion";
-	    send_gdb "y\n";
-	    exp_continue
-	}
-	 timeout { perror "-break-list (timeout)" ; return }
-    }
-}
-
-proc mi_gdb_reinitialize_dir { subdir } {
-    global mi_gdb_prompt
-    global MIFLAGS
-
-    global suppress_flag
-    if { $suppress_flag } {
-	return
-    }
-
-    if [is_remote host] {
-	return "";
-    }
-
-    if { $MIFLAGS == "-i=mi1" } {
-      send_gdb "104-environment-directory\n"
-      gdb_expect 60 {
-	-re ".*Reinitialize source path to empty.*y or n. " {
-            warning "Got confirmation prompt for dir reinitialization."
-	    send_gdb "y\n"
-	    gdb_expect 60 {
-		-re "$mi_gdb_prompt$" {}
-                timeout {error "Dir reinitialization failed (timeout)"}
-	    }
-	}
-	-re "$mi_gdb_prompt$" {}
-        timeout {error "Dir reinitialization failed (timeout)"}
-      }
-    } else {
-      send_gdb "104-environment-directory -r\n"
-      gdb_expect 60 {
-	-re "104\\\^done,source-path=.*\r\n$mi_gdb_prompt$" {}
-	-re "$mi_gdb_prompt$" {}
-        timeout {error "Dir reinitialization failed (timeout)"}
-      }
-    }
-
-    send_gdb "105-environment-directory $subdir\n"
-    gdb_expect 60 {
-	-re "Source directories searched.*$mi_gdb_prompt$" {
-	    verbose "Dir set to $subdir"
-	}
-	-re "105\\\^done.*\r\n$mi_gdb_prompt$" {
-            # FIXME: We return just the prompt for now.
-	    verbose "Dir set to $subdir"
-	    # perror "Dir \"$subdir\" failed."
-	}
-    }
-}
-
-# Send GDB the "target" command.
-# FIXME: Some of these patterns are not appropriate for MI.  Based on
-# config/monitor.exp:gdb_target_command.
-proc mi_gdb_target_cmd { targetname serialport } {
-    global mi_gdb_prompt
-
-    for {set i 1} {$i <= 3} {incr i} {
-	send_gdb "47-target-select $targetname $serialport\n"
-	gdb_expect 60 {
-	    -re "47\\^connected.*$mi_gdb_prompt$" {
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Couldn't establish connection to remote.*$mi_gdb_prompt$" {
-		verbose "Connection failed";
-	    }
-	    -re "Remote MIPS debugging.*$mi_gdb_prompt$" {
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Remote debugging using .*$serialport.*$mi_gdb_prompt$" {
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Remote target $targetname connected to.*$mi_gdb_prompt$" {
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Connected to.*$mi_gdb_prompt$" { 
-		verbose "Set target to $targetname";
-		return 0;
-	    }
-	    -re "Ending remote.*$mi_gdb_prompt$" { }
-	    -re "Connection refused.*$mi_gdb_prompt$" {
-		verbose "Connection refused by remote target.  Pausing, and trying again."
-		sleep 5
-		continue
-	    }
-	    -re "Timeout reading from remote system.*$mi_gdb_prompt$" {
-		verbose "Got timeout error from gdb.";
-	    }
-	    timeout {
-		send_gdb "";
-		break
-	    }
-	}
-    }
-    return 1
-}
-
-#
-# load a file into the debugger (file command only).
-# return a -1 if anything goes wrong.
-#
-proc mi_gdb_file_cmd { arg } {
-    global verbose
-    global loadpath
-    global loadfile
-    global GDB
-    global mi_gdb_prompt
-    global last_mi_gdb_file
-    global last_mi_remote_file
-    upvar timeout timeout
-
-    if { $arg == "" } {
-	set arg $last_mi_gdb_file;
-    } else {
-	set last_mi_gdb_file $arg
-	if { [ info exists last_mi_remote_file ] } {
-	    unset last_mi_remote_file
-	}
-    }
-
-    if [is_remote host] {
-	set arg [remote_download host $arg];
-	if { $arg == "" } {
-	    error "download failed"
-	    return -1;
-	}
-    }
-
-# FIXME: Several of these patterns are only acceptable for console
-# output.  Queries are an error for mi.
-    send_gdb "105-file-exec-and-symbols $arg\n"
-    gdb_expect 120 {
-        -re "Reading symbols from.*done.*$mi_gdb_prompt$" {
-            verbose "\t\tLoaded $arg into the $GDB"
-            return 0
-        }
-        -re "has no symbol-table.*$mi_gdb_prompt$" {
-            perror "$arg wasn't compiled with \"-g\""
-            return -1
-        }
-        -re "A program is being debugged already.*Kill it.*y or n. $" {
-            send_gdb "y\n"
-                verbose "\t\tKilling previous program being debugged"
-            exp_continue
-        }
-        -re "Load new symbol table from \".*\".*y or n. $" {
-            send_gdb "y\n"
-            gdb_expect 120 {
-                -re "Reading symbols from.*done.*$mi_gdb_prompt$" {
-                    verbose "\t\tLoaded $arg with new symbol table into $GDB"
-                    # All OK
-                }
-                timeout {
-                    perror "(timeout) Couldn't load $arg, other program already loaded."
-                    return -1
-                }
-            }
-	}
-        -re "No such file or directory.*$mi_gdb_prompt$" {
-            perror "($arg) No such file or directory\n"
-            return -1
-        }
-        -re "105-file-exec-and-symbols .*\r\n105\\\^done\r\n$mi_gdb_prompt$" {
-            # We (MI) are just giving the prompt back for now, instead of giving
-	    # some acknowledgement.
-	    return 0
-	}
-        timeout {
-            perror "couldn't load $arg into $GDB (timed out)."
-            return -1
-        }
-	eof {
-            # This is an attempt to detect a core dump, but seems not to
-            # work.  Perhaps we need to match .* followed by eof, in which
-            # gdb_expect does not seem to have a way to do that.
-            perror "couldn't load $arg into $GDB (end of file)."
-            return -1
-        }
-    }
-}
-
-#
-# load a file into the debugger.
-# return a -1 if anything goes wrong.
-#
-proc mi_gdb_load { arg } {
-    global verbose
-    global loadpath
-    global loadfile
-    global GDB
-    global mi_gdb_prompt
-    upvar timeout timeout
-
-    # ``gdb_unload''
-    if { $arg != "" } {
-	mi_gdb_file_cmd $arg
-    }
-
-    # ``load''
-    if { [info procs gdbserver_gdb_load] != "" } {
-	global last_mi_gdb_file
-	global last_mi_remote_file
-
-	if { ! [info exists last_mi_remote_file] } {
-	    if [is_remote target] {
-		set last_mi_remote_file [remote_download target $arg /tmp/[file tail $arg].[pid]]
-	    } else {
-		set last_mi_remote_file $last_mi_gdb_file
-	    }
-	}
-
-	set res [gdbserver_gdb_load $last_mi_remote_file]
-	set protocol [lindex $res 0]
-	set gdbport [lindex $res 1]
-
-	if { [mi_gdb_target_cmd $protocol $gdbport] != 0 } {
-	    return -1
-	}
-    } elseif { [info procs send_target_sid] != "" } {
-	# For SID, things get complex
-	send_target_sid
-	gdb_expect 60 {
-	    -re "\\^done,.*$mi_gdb_prompt$" {
-	    }
-	    timeout {
-		perror "Unable to connect to SID target"
-		return -1
-	    }
-	}
-	send_gdb "48-target-download\n"
-	gdb_expect 10 {
-	    -re "48\\^done.*$mi_gdb_prompt$" {
-	    }
-	    timeout {
-		perror "Unable to download to SID target"
-		return -1
-	    }
-	}
-    } elseif { [target_info protocol] == "sim" } {
-	# For the simulator, just connect to it directly.
-	send_gdb "47-target-select sim\n"
-	gdb_expect 10 {
-	    -re "47\\^connected.*$mi_gdb_prompt$" {
-	    }
-	    timeout {
-		perror "Unable to select sim target"
-		return -1
-	    }
-	}
-	send_gdb "48-target-download\n"
-	gdb_expect 10 {
-	    -re "48\\^done.*$mi_gdb_prompt$" {
-	    }
-	    timeout {
-		perror "Unable to download to sim target"
-		return -1
-	    }
-	}
-    } elseif { [target_info gdb_protocol] == "remote" } {
-	# remote targets
-	if { [mi_gdb_target_cmd "remote" [target_info netport]] != 0 } {
-	    perror "Unable to connect to remote target"
-	    return -1
-	}
-	send_gdb "48-target-download\n"
-	gdb_expect 10 {
-	    -re "48\\^done.*$mi_gdb_prompt$" {
-	    }
-	    timeout {
-		perror "Unable to download to remote target"
-		return -1
-	    }
-	}
-    }
-    return 0
-}
-
-# mi_gdb_test COMMAND PATTERN MESSAGE -- send a command to gdb; test the result.
-#
-# COMMAND is the command to execute, send to GDB with send_gdb.  If
-#   this is the null string no command is sent.
-# PATTERN is the pattern to match for a PASS, and must NOT include
-#   the \r\n sequence immediately before the gdb prompt.
-# MESSAGE is an optional message to be printed.  If this is
-#   omitted, then the pass/fail messages use the command string as the
-#   message.  (If this is the empty string, then sometimes we don't
-#   call pass or fail at all; I don't understand this at all.)
-#
-# Returns:
-#    1 if the test failed,
-#    0 if the test passes,
-#   -1 if there was an internal error.
-#  
-proc mi_gdb_test { args } {
-    global verbose
-    global mi_gdb_prompt
-    global GDB expect_out
-    upvar timeout timeout
-
-    if [llength $args]>2 then {
-	set message [lindex $args 2]
-    } else {
-	set message [lindex $args 0]
-    }
-    set command [lindex $args 0]
-    set pattern [lindex $args 1]
-
-    if [llength $args]==5 {
-	set question_string [lindex $args 3];
-	set response_string [lindex $args 4];
-    } else {
-	set question_string "^FOOBAR$"
-    }
-
-    if $verbose>2 then {
-	send_user "Sending \"$command\" to gdb\n"
-	send_user "Looking to match \"$pattern\"\n"
-	send_user "Message is \"$message\"\n"
-    }
-
-    set result -1
-    set string "${command}\n";
-    if { $command != "" } {
-	while { "$string" != "" } {
-	    set foo [string first "\n" "$string"];
-	    set len [string length "$string"];
-	    if { $foo < [expr $len - 1] } {
-		set str [string range "$string" 0 $foo];
-		if { [send_gdb "$str"] != "" } {
-		    global suppress_flag;
-
-		    if { ! $suppress_flag } {
-			perror "Couldn't send $command to GDB.";
-		    }
-		    fail "$message";
-		    return $result;
-		}
-		gdb_expect 2 {
-		    -re "\[\r\n\]" { }
-		    timeout { }
-		}
-		set string [string range "$string" [expr $foo + 1] end];
-	    } else {
-		break;
-	    }
-	}
-	if { "$string" != "" } {
-	    if { [send_gdb "$string"] != "" } {
-		global suppress_flag;
-
-		if { ! $suppress_flag } {
-		    perror "Couldn't send $command to GDB.";
-		}
-		fail "$message";
-		return $result;
-	    }
-	}
-    }
-
-    if [info exists timeout] {
-	set tmt $timeout;
-    } else {
-	global timeout;
-	if [info exists timeout] {
-	    set tmt $timeout;
-	} else {
-	    set tmt 60;
-	}
-    }
-    gdb_expect $tmt {
-	 -re "\\*\\*\\* DOSEXIT code.*" {
-	     if { $message != "" } {
-		 fail "$message";
-	     }
-	     gdb_suppress_entire_file "GDB died";
-	     return -1;
-	 }
-	 -re "Ending remote debugging.*$mi_gdb_prompt\[ \]*$" {
-	    if ![isnative] then {
-		warning "Can`t communicate to remote target."
-	    }
-	    gdb_exit
-	    gdb_start
-	    set result -1
-	}
-	 -re "\[\r\n\]*($pattern)\[\r\n\]+$mi_gdb_prompt\[ \]*$" {
-	    if ![string match "" $message] then {
-		pass "$message"
-	    }
-	    set result 0
-	}
-	 -re "(${question_string})$" {
-	    send_gdb "$response_string\n";
-	    exp_continue;
-	}
-	 -re "Undefined.* command:.*$mi_gdb_prompt\[ \]*$" {
-	    perror "Undefined command \"$command\"."
-            fail "$message"
-	    set result 1
-	}
-	 -re "Ambiguous command.*$mi_gdb_prompt\[ \]*$" {
-	    perror "\"$command\" is not a unique command name."
-            fail "$message"
-	    set result 1
-	}
-	 -re "Program exited with code \[0-9\]+.*$mi_gdb_prompt\[ \]*$" {
-	    if ![string match "" $message] then {
-		set errmsg "$message (the program exited)"
-	    } else {
-		set errmsg "$command (the program exited)"
-	    }
-	    fail "$errmsg"
-	    return -1
-	}
-	 -re "The program is not being run.*$mi_gdb_prompt\[ \]*$" {
-	    if ![string match "" $message] then {
-		set errmsg "$message (the program is no longer running)"
-	    } else {
-		set errmsg "$command (the program is no longer running)"
-	    }
-	    fail "$errmsg"
-	    return -1
-	}
-	 -re ".*$mi_gdb_prompt\[ \]*$" {
-	    if ![string match "" $message] then {
-		fail "$message"
-	    }
-	    set result 1
-	}
-	 "<return>" {
-	    send_gdb "\n"
-	    perror "Window too small."
-            fail "$message"
-	}
-	 -re "\\(y or n\\) " {
-	    send_gdb "n\n"
-	    perror "Got interactive prompt."
-            fail "$message"
-	}
-	 eof {
-	     perror "Process no longer exists"
-	     if { $message != "" } {
-		 fail "$message"
-	     }
-	     return -1
-	}
-	 full_buffer {
-	    perror "internal buffer is full."
-            fail "$message"
-	}
-	timeout	{
-	    if ![string match "" $message] then {
-		fail "$message (timeout)"
-	    }
-	    set result 1
-	}
-    }
-    return $result
-}
-
-#
-# MI run command.  (A modified version of gdb_run_cmd)
-#
-
-# In patterns, the newline sequence ``\r\n'' is matched explicitly as
-# ``.*$'' could swallow up output that we attempt to match elsewhere.
-
-proc mi_run_cmd {args} {
-    global suppress_flag
-    if { $suppress_flag } {
-	return -1
-    }
-    global mi_gdb_prompt
-
-    if [target_info exists gdb_init_command] {
-	send_gdb "[target_info gdb_init_command]\n";
-	gdb_expect 30 {
-	    -re "$mi_gdb_prompt$" { }
-	    default {
-		perror "gdb_init_command for target failed";
-		return;
-	    }
-	}
-    }
-
-    if [target_info exists use_gdb_stub] {
-	if [target_info exists gdb,do_reload_on_run] {
-	    # Specifying no file, defaults to the executable
-	    # currently being debugged.
-	    if { [mi_gdb_load ""] < 0 } {
-		return;
-	    }
-	    send_gdb "000-exec-continue\n";
-	    gdb_expect 60 {
-		-re "000\\^running\[\r\n\]+$mi_gdb_prompt$" {}
-		default {}
-	    }
-	    return;
-	}
-
-	if [target_info exists gdb,start_symbol] {
-	    set start [target_info gdb,start_symbol];
-	} else {
-	    set start "start";
-	}
-
-	# HACK: Should either use 000-jump or fix the target code
-	# to better handle RUN.
-	send_gdb  "jump *$start\n"
-	warning "Using CLI jump command, expect run-to-main FAIL"
-	return
-    }
-
-    send_gdb "000-exec-run $args\n"
-    gdb_expect {
-	-re "000\\^running\r\n${mi_gdb_prompt}" {
-	}
-	timeout {
-	    perror "Unable to start target"
-	    return
-	}
-    }
-    # NOTE: Shortly after this there will be a ``000*stopping,...(gdb)''
-}
-
-#
-# Just like run-to-main but works with the MI interface
-#
-
-proc mi_run_to_main { } {
-    global suppress_flag
-    if { $suppress_flag } {
-	return -1
-    }
-
-    global srcdir
-    global subdir
-    global binfile
-    global srcfile
-
-    mi_delete_breakpoints
-    mi_gdb_reinitialize_dir $srcdir/$subdir
-    mi_gdb_load ${binfile}
-
-    mi_runto main
-}
-
-
-# Just like gdb's "runto" proc, it will run the target to a given
-# function.  The big difference here between mi_runto and mi_execute_to
-# is that mi_execute_to must have the inferior running already.  This
-# proc will (like gdb's runto) (re)start the inferior, too.
-#
-# FUNC is the linespec of the place to stop (it inserts a breakpoint here).
-# It returns:
-#   -1  if test suppressed, failed, timedout
-#    0  if test passed
-
-proc mi_runto {func} {
-  global suppress_flag
-  if { $suppress_flag } {
-    return -1
-  }
-
-  global mi_gdb_prompt expect_out
-  global hex decimal fullname_syntax
-
-  set test "mi runto $func"
-  mi_gdb_test "200-break-insert $func" \
-    "200\\^done,bkpt=\{number=\"\[0-9\]+\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"$func\",file=\".*\",line=\"\[0-9\]*\",times=\"0\"\}" \
-    "breakpoint at $func"
-
-  if {![regexp {number="[0-9]+"} $expect_out(buffer) str]
-      || ![scan $str {number="%d"} bkptno]} {
-    set bkptno {[0-9]+}
-  }
-
-  mi_run_cmd
-  gdb_expect {
-    -re ".*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"$bkptno\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=\(\\\[.*\\\]\|\{.*\}\),file=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}\r\n$mi_gdb_prompt$" {
-      pass "$test"
-      return 0
-    }
-    -re ".*$mi_gdb_prompt$" {
-      fail "$test (2)"
-    }
-    timeout {
-      fail "$test (timeout)"
-      return -1
-    }
-  }
-}
-
-
-# Next to the next statement
-# For return values, see mi_execute_to_helper
-
-proc mi_next { test } {
-  return [mi_next_to {.*} {.*} {.*} {.*} $test]
-}
-
-
-# Step to the next statement
-# For return values, see mi_execute_to_helper
-
-proc mi_step { test } {
-  return [mi_step_to {.*} {.*} {.*} {.*} $test]
-}
-
-# cmd should not include the number or newline (i.e. "exec-step 3", not
-# "220-exec-step 3\n"
-
-# Can not match -re ".*\r\n${mi_gdb_prompt}", because of false positives
-# after the first prompt is printed.
-
-proc mi_execute_to_helper { cmd reason func args file line extra test } {
-    global suppress_flag
-    if { $suppress_flag } {
-	return -1
-    }
-    global mi_gdb_prompt
-    global hex
-    global decimal
-    global fullname_syntax
-    send_gdb "220-$cmd\n"
-    gdb_expect {
-	-re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=\"$reason\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\"$func\",args=$args,file=\".*$file\",fullname=\"${fullname_syntax}$file\",line=\"$line\"\}$extra\r\n$mi_gdb_prompt$" {
-	    pass "$test"
-	    return 0
-	}
-	-re ".*220\\^running\r\n${mi_gdb_prompt}.*220\\*stopped,reason=\"$reason\",thread-id=\"$decimal\",frame=\{addr=\"$hex\",func=\".*\",args=\[\\\[\{\].*\[\\\]\}\],file=\".*\",fullname=\"${fullname_syntax}.*\",line=\"\[0-9\]*\"\}.*\r\n$mi_gdb_prompt$" {
-	    fail "$test (stopped at wrong place)"
-	    return -1
-	}
-	-re "220\\^running\r\n${mi_gdb_prompt}.*\r\n${mi_gdb_prompt}$" {
-	    fail "$test (unknown output after running)"
-	    return -1
-	}
-	timeout {
-	    fail "$test (timeout)"
-	    return -1
-	}
-    }
-}
-
-proc mi_execute_to { cmd reason func args file line extra test } {
-    mi_execute_to_helper "$cmd" "$reason" "$func" "\\\[$args\\\]" \
-	"$file" "$line" "$extra" "$test"
-}
-
-proc mi_next_to { func args file line test } {
-    mi_execute_to "exec-next" "end-stepping-range" "$func" "$args" \
-	"$file" "$line" "" "$test"
-}
-
-proc mi_step_to { func args file line test } {
-    mi_execute_to "exec-step" "end-stepping-range" "$func" "$args" \
-	"$file" "$line" "" "$test"
-}
-
-proc mi_finish_to { func args file line result ret test } {
-    mi_execute_to "exec-finish" "function-finished" "$func" "$args" \
-	"$file" "$line" \
-	",gdb-result-var=\"$result\",return-value=\"$ret\"" \
-	"$test"
-}
-
-proc mi_continue_to { bkptno func args file line test } {
-    mi_execute_to "exec-continue" "breakpoint-hit\",bkptno=\"$bkptno" \
-	"$func" "$args" "$file" "$line" "" "$test"
-}
-
-proc mi0_execute_to { cmd reason func args file line extra test } {
-    mi_execute_to_helper "$cmd" "$reason" "$func" "\{$args\}" \
-	"$file" "$line" "$extra" "$test"
-}
-
-proc mi0_next_to { func args file line test } {
-    mi0_execute_to "exec-next" "end-stepping-range" "$func" "$args" \
-	"$file" "$line" "" "$test"
-}
-
-proc mi0_step_to { func args file line test } {
-    mi0_execute_to "exec-step" "end-stepping-range" "$func" "$args" \
-	"$file" "$line" "" "$test"
-}
-
-proc mi0_finish_to { func args file line result ret test } {
-    mi0_execute_to "exec-finish" "function-finished" "$func" "$args" \
-	"$file" "$line" \
-	",gdb-result-var=\"$result\",return-value=\"$ret\"" \
-	"$test"
-}
-
-proc mi0_continue_to { bkptno func args file line test } {
-    mi0_execute_to "exec-continue" "breakpoint-hit\",bkptno=\"$bkptno" \
-	"$func" "$args" "$file" "$line" "" "$test"
-}
diff --git a/gdb/testsuite/lib/trace-support.exp b/gdb/testsuite/lib/trace-support.exp
deleted file mode 100644
index 4765791b817..00000000000
--- a/gdb/testsuite/lib/trace-support.exp
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright (C) 1998 Free Software Foundation, 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
-
-
-#
-# Support procedures for trace testing
-#
-
-
-#
-# Procedure: gdb_target_supports_trace
-# Returns true if GDB is connected to a target that supports tracing.
-# Allows tests to abort early if not running on a trace-aware target.
-#
-
-proc gdb_target_supports_trace { } {
-    global gdb_prompt
-
-    send_gdb "tstatus\n"
-    gdb_expect {
-	-re "\[Tt\]race can only be run on.*$gdb_prompt $" {
-	    return 0
-	}
-	-re "\[Tt\]race can not be run on.*$gdb_prompt $" {
-	    return 0
-	}
-	-re "\[Tt\]arget does not support.*$gdb_prompt $" {
-	    return 0
-	}
-	-re ".*\[Ee\]rror.*$gdb_prompt $" {
-	    return 0
-	}
-	-re ".*\[Ww\]arning.*$gdb_prompt $" {
-	    return 0
-	}
-	-re ".*$gdb_prompt $" {
-	    return 1
-	}
-	timeout {
-	    return 0
-	}
-    }
-}
-
-
-#
-# Procedure: gdb_delete_tracepoints
-# Many of the tests depend on setting tracepoints at various places and
-# running until that tracepoint is reached.  At times, we want to start
-# with a clean slate with respect to tracepoints, so this utility proc 
-# lets us do this without duplicating this code everywhere.
-#
-
-proc gdb_delete_tracepoints {} {
-    global gdb_prompt
-
-    send_gdb "delete tracepoints\n"
-    gdb_expect 30 {
-	-re "Delete all tracepoints.*y or n.*$" {
-	    send_gdb "y\n";
-	    exp_continue
-	}
-	-re ".*$gdb_prompt $" { # This happens if there were no tracepoints }
-	timeout { 
-	    perror "Delete all tracepoints in delete_tracepoints (timeout)" 
-	    return 
-	}
-    }
-    send_gdb "info tracepoints\n"
-    gdb_expect 30 {
-	 -re "No tracepoints.*$gdb_prompt $" {}
-	 -re "$gdb_prompt $" { perror "tracepoints not deleted" ; return }
-	 timeout { perror "info tracepoints (timeout)" ; return }
-    }
-}
-
-#
-# Procedure: gdb_trace_setactions
-#   Define actions for a tracepoint.
-#   Arguments:
-#	testname   -- identifying string for pass/fail output
-#	tracepoint -- to which tracepoint do these actions apply? (optional)
-#	args       -- list of actions to be defined.
-#   Returns:
-#	zero       -- success
-#	non-zero   -- failure
-
-proc gdb_trace_setactions { testname tracepoint args } {
-    global gdb_prompt;
-
-    set state 0;
-    set passfail "pass";
-    send_gdb "actions $tracepoint\n";
-    set expected_result "";
-    gdb_expect 5 {
-	-re "No tracepoint number .*$gdb_prompt $" {
-	    fail $testname
-	    return 1;
-	}
-	-re "Enter actions for tracepoint $tracepoint.*>" {
-	    if { [llength $args] > 0 } {
-		set lastcommand "[lindex $args $state]";
-		send_gdb "[lindex $args $state]\n";
-		incr state;
-		set expected_result [lindex $args $state];
-		incr state;
-	    } else {
-		send_gdb "end\n";
-	    }
-	    exp_continue;
-	}
-	-re "\(.*\)\[\r\n\]+\[ \t]*> $" {
-	    if { $expected_result != "" } {
-		regsub "^\[^\r\n\]+\[\r\n\]+" "$expect_out(1,string)" "" out;
-		if ![regexp $expected_result $out] {
-		    set passfail "fail";
-		}
-		set expected_result "";
-	    }
-	    if { $state < [llength $args] } {
-		send_gdb "[lindex $args $state]\n";
-		incr state;
-		set expected_result [lindex $args $state];
-		incr state;
-	    } else {
-		send_gdb "end\n";
-		set expected_result "";
-	    }
-	    exp_continue;
-	}
-	-re "\(.*\)$gdb_prompt $" {
-	    if { $expected_result != "" } {
-		if ![regexp $expected_result $expect_out(1,string)] {
-		    set passfail "fail";
-		}
-		set expected_result "";
-	    }
-	    if { [llength $args] < $state } {
-		set passfail "fail";
-	    }
-	}
-	default {
-	    set passfail "fail";
-	}
-    }
-    if { $testname != "" } {
-	$passfail $testname;
-    }
-    if { $passfail == "pass" } then { 
-	return 0;
-    } else {
-	return 1;
-    }
-}
-
-#
-# Procedure: gdb_tfind_test
-#   Find a specified trace frame.
-#   Arguments: 
-#	testname   -- identifying string for pass/fail output
-#	tfind_arg  -- frame (line, PC, etc.) identifier
-#	exp_res    -- Expected result of frame test
-#	args       -- Test expression
-#   Returns:
-#	zero       -- success
-#	non-zero   -- failure
-#
-
-proc gdb_tfind_test { testname tfind_arg exp_res args } {
-    global gdb_prompt;
-
-    if { "$args" != "" } {
-	set expr "$exp_res";
-	set exp_res "$args";
-    } else {
-	set expr "(int) \$trace_frame";
-    }
-    set passfail "fail";
-
-    gdb_test "tfind $tfind_arg" "" ""
-    send_gdb "printf \"x \%d x\\n\", $expr\n";
-    gdb_expect 10 {
-	-re "x (-*\[0-9\]+) x" {
-	    if { $expect_out(1,string) == $exp_res } {
-		set passfail "pass";
-	    }
-	    exp_continue;
-	}
-	-re "$gdb_prompt $" { }
-    }
-    $passfail "$testname";
-    if { $passfail == "pass" } then { 
-	return 0;
-    } else {
-	return 1;
-    }
-}
-
-#
-# Procedure: gdb_readexpr
-#   Arguments:
-#	gdb_expr    -- the expression whose value is desired
-#   Returns:
-#	the value of gdb_expr, as evaluated by gdb.
-#       [FIXME: returns -1 on error, which is sometimes a legit value]
-#
-
-proc gdb_readexpr { gdb_expr } {
-    global gdb_prompt;
-
-    set result -1;
-    send_gdb "print $gdb_expr\n"
-    gdb_expect 5 {
-	-re "\[$\].*= (\[0-9\]+).*$gdb_prompt $" {
-	    set result $expect_out(1,string);
-	}
-	-re "$gdb_prompt $" { }
-	default { }
-    }
-    return $result;
-}
-
-#
-# Procedure: gdb_gettpnum
-#   Arguments:
-#	tracepoint (optional): if supplied, set a tracepoint here.
-#   Returns:
-#	the tracepoint ID of the most recently set tracepoint.
-#
-
-proc gdb_gettpnum { tracepoint } {
-    global gdb_prompt;
-
-    if { $tracepoint != "" } {
-	gdb_test "trace $tracepoint" "" ""
-    }
-    return [gdb_readexpr "\$tpnum"];
-}
-
-
-#
-# Procedure: gdb_find_function_baseline
-#   Arguments:
-#	func_name -- name of source function
-#   Returns:
-#	Sourcefile line of function definition (open curly brace),
-#	or -1 on failure.  Caller must check return value.
-#   Note:
-#	Works only for open curly brace at beginning of source line!
-#
-
-proc gdb_find_function_baseline { func_name } {
-    global gdb_prompt;
-
-    set baseline -1;
-
-    send_gdb "list $func_name\n"
-#    gdb_expect {
-#	-re "\[\r\n\]\[\{\].*$gdb_prompt $" {
-#	    set baseline 1
-#        }
-#    }
-}
-
-#
-# Procedure: gdb_find_function_baseline
-#   Arguments:
-#	filename: name of source file of desired function.
-#   Returns:
-#	Sourcefile line of function definition (open curly brace),
-#	or -1 on failure.  Caller must check return value.
-#   Note:
-#	Works only for open curly brace at beginning of source line!
-#
-
-proc gdb_find_recursion_test_baseline { filename } {
-    global gdb_prompt;
-
-    set baseline -1;
-
-    gdb_test "list $filename:1" "" ""
-    send_gdb "search gdb_recursion_test line 0\n"
-    gdb_expect {
-	-re "(\[0-9\]+)\[\t \]+\{.*line 0.*$gdb_prompt $" {
-	    set baseline $expect_out(1,string);
-	}
-	-re "$gdb_prompt $" { }
-	default { }
-    }
-    return $baseline;
-}
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index bf4a2c519fa..6039e367cae 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -99,8 +99,20 @@ extern void output_command (char *, int);
    $trace_line  : source line of trace frame currently being debugged.
    $trace_file  : source file of trace frame currently being debugged.
    $tracepoint  : tracepoint number of trace frame currently being debugged.
+
+   A number of the methods in this module assume "target remote", 
+   and some of them contain code that belongs in remote.c and 
+   ought to be accessed thru the target vector (so that non-remote
+   targets could implement them too).
+
+   Therefore this module defines a user-settable mode variable
+   "default-tracepoint-method", which will override the original
+   methods and cause a simple-minded fall-back method to be used, 
+   which should work on most if not all targets.
+
  */
 
+int default_trace_method;
 
 /* ======= Important global variables: ======= */
 
@@ -601,6 +613,22 @@ tracepoint_operation (struct tracepoint *t, int from_tty,
     }
 }
 
+/* Utility: Look up a tracepoint in the list, by address.  
+   Returns the first match that's enabled.  */
+
+struct tracepoint *
+get_tracepoint_by_address (CORE_ADDR address)
+{
+  struct tracepoint *t;
+
+  ALL_TRACEPOINTS (t)
+    if (t->enabled_p)
+      if (t->address == address)
+	return t;
+
+  return NULL;
+}
+
 /* Utility: parse a tracepoint number and look it up in the list.
    If MULTI_P is true, there might be a range of tracepoints in ARG.
    if OPTIONAL_P is true, then if the argument is missing, the most
@@ -963,7 +991,8 @@ validate_actionline (char **line, struct tracepoint *t)
 	    {
 	      if ((0 == strncasecmp ("reg", p + 1, 3)) ||
 		  (0 == strncasecmp ("arg", p + 1, 3)) ||
-		  (0 == strncasecmp ("loc", p + 1, 3)))
+		  (0 == strncasecmp ("loc", p + 1, 3)) ||
+		  (0 == strncasecmp ("stack", p + 1, 5)))
 		{
 		  p = strchr (p, ',');
 		  continue;
@@ -1500,6 +1529,9 @@ free_actions_list (char **actions_list)
   xfree (actions_list);
 }
 
+static CORE_ADDR tracepoint_top_of_stack;
+static unsigned int tracepoint_size_of_stack = 256;
+
 /* Render all actions into gdb protocol.  */
 static void
 encode_actions (struct tracepoint *t, char ***tdp_actions,
@@ -1573,6 +1605,28 @@ encode_actions (struct tracepoint *t, char ***tdp_actions,
 				     'L');
 		  action_exp = strchr (action_exp, ',');	/* more? */
 		}
+	      else if (0 == strncasecmp ("$stack", action_exp, 6))
+		{
+		  CORE_ADDR lo, hi;
+		  int stacklen;
+
+		  /* FIXME: frame pointer? stack_grows_down?  */
+		  lo = read_sp ();
+		  if (tracepoint_top_of_stack != 0)
+		    hi = tracepoint_top_of_stack;
+		  else
+		    hi = lo + tracepoint_size_of_stack;
+
+		  stacklen = hi - lo;
+
+		  if (tracepoint_top_of_stack != 0 &&
+		      stacklen > 10000)	/* Arbitrary sanity check.  */
+		    error ("Stack too big: sp = 0x%08lx, TOS = 0x%08lx, check TOS.",
+			   (unsigned long) lo, (unsigned long) hi);
+
+		  add_memrange (collect, -1, lo, stacklen);
+		  action_exp = strchr (action_exp, ',');	/* more? */
+		}
 	      else
 		{
 		  unsigned long addr, len;
@@ -1752,7 +1806,13 @@ trace_start_command (char *args, int from_tty)
 
   dont_repeat ();	/* Like "run", dangerous to repeat accidentally.  */
 
-  if (target_is_remote ())
+  if (default_trace_method)
+    {
+      /* Default implementation.  */
+      if (from_tty && info_verbose)
+	printf_filtered ("Activating trace experiment, default method.\n");
+    }
+  else if (target_is_remote ())
     {
       putpkt ("QTinit");
       remote_get_noisy_reply (target_buf, sizeof (target_buf));
@@ -1830,34 +1890,47 @@ trace_start_command (char *args, int from_tty)
       remote_get_noisy_reply (target_buf, sizeof (target_buf));
       if (strcmp (target_buf, "OK"))
 	error (_("Bogus reply from target: %s"), target_buf);
-      set_traceframe_num (-1);	/* All old traceframes invalidated.  */
-      set_tracepoint_num (-1);
-      set_traceframe_context (-1);
-      trace_running_p = 1;
-      if (deprecated_trace_start_stop_hook)
-	deprecated_trace_start_stop_hook (1, from_tty);
-
     }
   else
-    error (_("Trace can only be run on remote targets."));
+    {
+      error (_("Target does not implement this command (tstart)."));
+    }
+
+  /* All methods.  */
+  set_traceframe_num (-1);	/* All old traceframes invalidated.  */
+  set_tracepoint_num (-1);
+  set_traceframe_context (-1);
+  trace_running_p = 1;
+  if (deprecated_trace_start_stop_hook)
+    deprecated_trace_start_stop_hook (1, from_tty);
 }
 
 /* tstop command */
 static void
 trace_stop_command (char *args, int from_tty)
 {
-  if (target_is_remote ())
+  if (default_trace_method)
+    {
+      /* Default implementation.  */
+      if (from_tty && info_verbose)
+	printf_filtered ("Deactivating trace experiment, default method.\n");
+    }
+  else if (target_is_remote ())
     {
       putpkt ("QTStop");
       remote_get_noisy_reply (target_buf, sizeof (target_buf));
       if (strcmp (target_buf, "OK"))
 	error (_("Bogus reply from target: %s"), target_buf);
-      trace_running_p = 0;
-      if (deprecated_trace_start_stop_hook)
-	deprecated_trace_start_stop_hook (0, from_tty);
     }
   else
-    error (_("Trace can only be run on remote targets."));
+    {
+      error (_("Target does not implement this command (tstop)."));
+    }
+
+  /* All methods.  */
+  trace_running_p = 0;
+  if (deprecated_trace_start_stop_hook)
+    deprecated_trace_start_stop_hook (0, from_tty);
 }
 
 unsigned long trace_running_p;
@@ -1866,7 +1939,11 @@ unsigned long trace_running_p;
 static void
 trace_status_command (char *args, int from_tty)
 {
-  if (target_is_remote ())
+  if (default_trace_method)
+    {
+      printf_filtered ("Trace is %s.\n", trace_running_p ? "on" : "off");
+    }
+  else if (target_is_remote ())
     {
       putpkt ("qTStatus");
       remote_get_noisy_reply (target_buf, sizeof (target_buf));
@@ -1879,7 +1956,9 @@ trace_status_command (char *args, int from_tty)
       trace_running_p = (target_buf[1] == '1');
     }
   else
-    error (_("Trace can only be run on remote targets."));
+    {
+      error (_("Target does not implement this command (tstatus)."));
+    }
 }
 
 /* Worker function for the various flavors of the tfind command.  */
@@ -2013,6 +2092,9 @@ trace_find_command (char *args, int from_tty)
 { /* this should only be called with a numeric argument */
   int frameno = -1;
 
+  if (default_trace_method)
+    error ("default trace find");
+
   if (target_is_remote ())
     {
       if (deprecated_trace_find_hook)
@@ -2536,6 +2618,9 @@ trace_dump_command (char *args, int from_tty)
   int stepping_actions = 0;
   int stepping_frame = 0;
 
+  if (default_trace_method)
+    error ("default trace dump");
+
   if (!target_is_remote ())
     {
       error (_("Trace can only be run on remote targets."));
@@ -2669,6 +2754,425 @@ get_traceframe_number (void)
   return traceframe_number;
 }
 
+static FILE *checkpoint_file;
+static int tracepoint_method;
+
+static void
+emit_checkpoint_method1 (struct tracepoint *t)
+{
+  /* This extremely concise method emits only a few essential registers. 
+     Think of it as an execution trace.  */
+  if (checkpoint_file)
+    {
+      /* Method 1: Emit minimal subset of registers.  */
+      fputs ("T00", checkpoint_file);
+      /* FIXME: print 'em like addresses.  */
+      if (PC_REGNUM >= 0)
+	{
+	  fputs (int_string ((LONGEST) PC_REGNUM, 16, 0, 0, 0), 
+		 checkpoint_file);
+	  fputc (':', checkpoint_file);
+	  fputs (paddr (read_pc ()), checkpoint_file);
+	  fputc (';', checkpoint_file);
+	}
+      if (SP_REGNUM >= 0)
+	{
+	  fputs (int_string ((LONGEST) SP_REGNUM, 16, 0, 0, 0), 
+		 checkpoint_file);
+	  fputc (':', checkpoint_file);
+	  fputs (paddr (read_sp ()), checkpoint_file);
+	  fputc (';', checkpoint_file);
+	}
+      if (DEPRECATED_FP_REGNUM >= 0)
+	{
+	  fputs (int_string ((LONGEST) DEPRECATED_FP_REGNUM, 16, 0, 0, 0), 
+		 checkpoint_file);
+	  fputc (':', checkpoint_file);
+	  fputs (paddr ((CORE_ADDR) read_register (DEPRECATED_FP_REGNUM)), 
+		 checkpoint_file);
+	  fputc (';', checkpoint_file);
+	}
+      if (PS_REGNUM >= 0)
+	{
+	  fputs (int_string ((LONGEST) PS_REGNUM, 16, 0, 0, 0), 
+		 checkpoint_file);
+	  fputc (':', checkpoint_file);
+	  fputs (paddr ((CORE_ADDR) read_register (PS_REGNUM)), 
+		 checkpoint_file);
+	  fputc (';', checkpoint_file);
+	}
+#define I386_EBP_REGNUM 5	/* mumble, mutter... */
+
+#if defined (I386_EBP_REGNUM)
+      fputs (int_string ((LONGEST) I386_EBP_REGNUM, 16, 0, 0, 0), 
+	     checkpoint_file);
+      fputc (':', checkpoint_file);
+      fputs (paddr ((CORE_ADDR) read_register (I386_EBP_REGNUM)), 
+	     checkpoint_file);
+      fputc (';', checkpoint_file);
+#endif
+      fputc ('\n', checkpoint_file);
+    }
+}
+
+static void
+checkpoint_emit_id (int id, FILE *file)
+{
+  fprintf (file, "\nCHECKPOINT ID %d\n", id);
+}
+
+static void
+checkpoint_emit_sequential_id (FILE *file)
+{
+  static int cpnum;
+  checkpoint_emit_id (cpnum++, file);
+}
+
+static void
+checkpoint_emit_gregs (FILE *file)
+{
+  /* FIXME: assume the g packet includes regs 0 to NUM_REGS-1.  */
+  unsigned char binbuf[32];
+  char ascbuf[128];
+  int i;
+
+  for (i = 0; i < NUM_REGS; i++)
+    {
+      if (!register_cached (i))
+	target_fetch_registers (i);
+      regcache_raw_collect (current_regcache, i, binbuf);
+      *(mem2hex (binbuf, ascbuf, register_size (current_gdbarch, i))) = '\0';
+      fputs (ascbuf, file);
+    }
+  fputc ('\n', file);
+}
+
+static void
+checkpoint_emit_memrange (CORE_ADDR lo, CORE_ADDR hi, FILE *file)
+{
+  unsigned char *buf;
+  unsigned int i, len = hi - lo;
+
+  fprintf (file, "S3%02x%s", (len + 5) > 255 ? 255 : (len + 5), paddr (lo));
+
+  /* FIXME: cleanup.  */
+  buf = xmalloc (len);
+  target_read_memory (lo, buf, len);
+
+  /* FIXME: byte order?  */
+  for (i = 0; i < len; i++)
+    {
+      if ((i > 0) && ((i % 256) == 0))
+	fprintf (file, "xx\nS3%02x%s", 
+		 (len + 5 - i) > 255 ? 255 : (len + 5 - i), paddr (lo + i));
+      fprintf (file, "%02x", buf[i]);
+    }
+  xfree (buf);
+
+  /* We don't really care about the checksum.  */
+  fputs ("xx\n", file);
+}
+
+static void
+checkpoint_emit_stack (FILE *file)
+{
+  CORE_ADDR lo, hi;
+  int stacklen;
+
+  /* FIXME: frame pointer? stack_grows_down?  */
+  lo = read_sp ();
+  if (tracepoint_top_of_stack != 0)
+    hi = tracepoint_top_of_stack;
+  else
+    hi = lo + tracepoint_size_of_stack;
+
+  stacklen = hi - lo;
+
+  if (tracepoint_top_of_stack != 0 &&
+      stacklen > 10000)	/* Arbitrary sanity check.  */
+    error ("Stack too big: sp = 0x%08lx, TOS = 0x%08lx, check TOS.",
+	   (unsigned long) lo, (unsigned long) hi);
+
+  checkpoint_emit_memrange (lo, hi, file);
+}
+
+static void
+emit_checkpoint_method2 (struct tracepoint *t)
+{
+  /* This relatively concise method emits the standard "g packet"
+     register set.  It's still mostly an execution trace, but any
+     variables in registers will be captured too.  */
+
+  checkpoint_emit_sequential_id (checkpoint_file);
+  fputs ("REGISTERS\n", checkpoint_file);
+  checkpoint_emit_gregs (checkpoint_file);
+}
+
+static void
+emit_checkpoint_method3 (struct tracepoint *t)
+{
+  /* This medium-complexity method emits the standard "g packet"
+     register set, plus a configurable chunk of the machine stack.
+     User may either specify the size of the chunk (default 512),
+     or the top of the stack.  By this means, we hopefully capture
+     all local variables and arguments, and can do backtrace.  */
+
+  checkpoint_emit_sequential_id (checkpoint_file);
+  fputs ("REGISTERS\n", checkpoint_file);
+  checkpoint_emit_gregs (checkpoint_file);
+
+  /* And here's where memory goes.  */
+  fputs ("MEMORY\n", checkpoint_file);
+  checkpoint_emit_stack (checkpoint_file);
+}
+
+static void
+emit_checkpoint_method4 (struct tracepoint *t)
+{
+  /* This method will not immediately lend itself to the "drop"
+     command, because it wants to interpret the "actions" of the
+     actual tracepoint.  "Drop" doesn't have an actual tracepoint
+     associated with it (unles we give it an argument...  Hmmm!) */
+
+  char **tdp_actions, **stepping_actions;
+  int memory_flag = 0;
+  int i;
+
+  if (checkpoint_file)
+    {
+      encode_actions (t, &tdp_actions, &stepping_actions);
+      if (tdp_actions == NULL)
+	{
+	  /* Fixme -- no actions -- should just lay down a 
+	     "method 1" tracepoint, but rda doesn't know how
+	     to read those yet, so fall back to method2.  */
+	  emit_checkpoint_method2 (t);
+	  return;
+	}
+
+      checkpoint_emit_sequential_id (checkpoint_file);
+      for (i = 0; tdp_actions[i]; i++)
+	{
+	  CORE_ADDR offset, base;
+	  int regnum, len;
+	  char *ptr;
+
+	  if (tdp_actions[i][0] == 'R')
+	    {
+	      /* We want some regs.  Let's just take 'em all.  */
+	      fputs ("REGISTERS\n", checkpoint_file);
+	      checkpoint_emit_gregs (checkpoint_file);
+	    }
+	do_memrange:
+	  if (tdp_actions[i][0] == 'M')
+	    {
+	      /* A mem range.  */
+	      if (memory_flag == 0)
+		{
+		  fputs ("MEMORY\n", checkpoint_file);
+		  memory_flag++;
+		}
+	      if (strncmp (tdp_actions[i] + 1, "FFFF", 4) == 0)
+		{
+		  /* Absolute memory range.  */
+		  if ((ptr = strchr (tdp_actions[i], ',')) != NULL)
+		    {
+		      /* FIXME strtoull? */
+		      base = strtoul (++ptr, NULL, 16);
+		      if ((ptr = strchr (ptr, ',')) != NULL)
+			{
+			  len = strtoul (++ptr, NULL, 16);
+			  checkpoint_emit_memrange (base, base + len, 
+						    checkpoint_file);
+			}
+		    }
+		}
+	      else
+		{
+		  /* Register-based memory range.  */
+		  regnum = strtol (tdp_actions[i] + 1, NULL, 16);
+		  base = read_register (regnum);
+		  if ((ptr = strchr (tdp_actions[i], ',')) != NULL)
+		    {
+		      offset = strtoul (++ptr, NULL, 16);
+		      if ((ptr = strchr (ptr, ',')) != NULL)
+			{
+			  len = strtol (++ptr, NULL, 16);
+			  checkpoint_emit_memrange (base + offset, 
+						    base + offset + len,
+						    checkpoint_file);
+			}
+		    }
+		}
+	      if ((ptr = strchr (ptr, 'M')) != NULL)
+		{
+		  tdp_actions[i] = ptr;
+		  goto do_memrange;
+		}
+	    }
+	}
+    }
+}
+
+static void
+tracepoint_set_tos_command (char *args, int from_tty)
+{
+  if (args == NULL || *args == '\0')
+    error ("Argument required: address of TOS");
+
+  /* Fixme -- expression.  */
+  tracepoint_top_of_stack = parse_and_eval_address (args);
+}
+
+static void
+tracepoint_set_size_of_stack_command (char *args, int from_tty)
+{
+  if (args == NULL || *args == '\0')
+    error ("Argument required: size of desired stack memrange.");
+
+  /* Fixme -- expression.  */
+  tracepoint_size_of_stack = parse_and_eval_address (args);
+}
+
+static void
+default_do_tracepoints_command (char *args, int from_tty)
+{
+  CORE_ADDR stop_pc;
+  struct tracepoint *t;
+
+  if (checkpoint_file == NULL)
+    error ("You must open a checkpoint file first.  Type help open-checkpoint.");
+
+  if (tracepoint_chain == NULL)
+    error ("No tracepoints defined.");
+
+  if (!target_has_execution)
+    error ("Target not running.");
+
+  if (from_tty && info_verbose)
+    printf_filtered ("Do default tracepoint actions.\n");
+
+  /* OK, find a tracepoint that matches the current pc.
+     FIXME handle while-stepping.  */
+  stop_pc = read_pc ();
+  ALL_TRACEPOINTS (t)
+    if (t->address == stop_pc)
+      {
+	if (from_tty && info_verbose)
+	  printf_filtered ("Will collect data for tracepoint %d\n", t->number);
+	switch (tracepoint_method) 
+	  {
+	  case 1:	emit_checkpoint_method1 (t);	break;
+	  case 2:	emit_checkpoint_method2 (t);	break;
+	  case 3:	emit_checkpoint_method3 (t);	break;
+	  case 4:	emit_checkpoint_method4 (t);	break;
+	  default:	emit_checkpoint_method4 (t);	break;
+	  }
+      }
+}
+
+/* boolean tracepoint_event_p --
+
+   Decides whether to handle the current stop event as a 
+   tracepoint event.  If so, handles the event (collects 
+   the tracepoint data) and returns true.  GDB will not stop.
+
+   Otherwise the event must be handled by someone else,
+   eg. as a breakpoint event.  */
+
+int
+tracepoint_event_p ()
+{
+  struct tracepoint *t;
+
+  /* Can't be ours if default trace method is not on.  */
+  if (!default_trace_method)
+    return 0;
+
+  /* Can't be ours if a trace experiment is not running.  */
+  if (!trace_running_p)
+    return 0;
+
+  /* Can't be ours if we don't have an open tracepoint file.  */
+  if (checkpoint_file == NULL)
+    return 0;
+
+  /* Can't be ours if there's no (enabled) tracepoint here.  */
+  if ((t = get_tracepoint_by_address (read_pc ())) == NULL)
+    return 0;
+
+  /* OK, it's ours, let's handle it.  */
+  switch (tracepoint_method) 
+    {
+    case 1:	emit_checkpoint_method1 (t);	break;
+    case 2:	emit_checkpoint_method2 (t);	break;
+    case 3:	emit_checkpoint_method3 (t);	break;
+    case 4:	emit_checkpoint_method4 (t);	break;
+    default:	emit_checkpoint_method4 (t);	break;
+    }
+  /* Tell caller we've handled it.  */
+  return 1;
+}
+
+/* Open file for checkpoints (tracepoint frames).  */
+static void
+checkpoint_open (char *args, int from_tty)
+{
+  if (args == NULL || *args == '\0')
+    error ("Argument required: checkpoint file name.");
+
+  if ((checkpoint_file = fopen (args, "w")) == NULL)
+    error ("Could not open checkpoint file %s for output.", args);
+
+  fprintf (checkpoint_file, "CHECKPOINT FILE\n");
+  if (from_tty)
+    fprintf_filtered (gdb_stdout, "File '%s' open for checkpoints.\n",
+		      args);
+}
+
+/* Close file for checkpoints (tracepoint frames).  */
+static void
+checkpoint_close (char *unused, int from_tty)
+{
+  if (checkpoint_file == NULL)
+    error ("No checkpoint file is open.");
+
+  fclose (checkpoint_file);
+  if (from_tty)
+    fprintf_filtered (gdb_stdout, "Checkpoint file closed.\n");
+}
+
+/* "Drop" a checkpoint into the checkpoint file.  */
+static void
+checkpoint_command (char *args, int from_tty)
+{
+  if (checkpoint_file)
+    {
+      switch (tracepoint_method) 
+	{
+	case 1:		emit_checkpoint_method1 (NULL);	break;
+	case 2:		emit_checkpoint_method2 (NULL);	break;
+	case 3:		emit_checkpoint_method3 (NULL);	break;
+	case 4:
+	  if (args && *args)
+	    {
+	      struct tracepoint *t = get_tracepoint_by_number (&args, 0, 0);
+
+	      if (t)
+		{
+		  emit_checkpoint_method4 (t);
+		  break;
+		}
+	    }
+	  error ("Must specify a tracepoint ID for method 4.");
+	  break;
+	default:	emit_checkpoint_method3 (NULL);	break;
+	}
+    }
+  else
+    error ("You must open a checkpoint file.");
+}
+
 
 /* module initialization */
 void
@@ -2676,6 +3180,56 @@ _initialize_tracepoint (void)
 {
   struct cmd_list_element *c;
 
+  add_setshow_boolean_cmd ("default-tracepoint-method", class_trace, 
+			   &default_trace_method, _("\
+Set whether gdb will use a brute-force tracepoint method."), _("\
+Show whether gdb will use a brute-force tracepoint method."), _("\
+When this is set, tracepoint data will actually be collected\n\
+by gdb, and not by the target.  Obviously this method is far\n\
+more intrusive and time consuming than the ideal."), 
+			   NULL, NULL, &setlist, &showlist);
+
+  add_setshow_integer_cmd ("tracepoint-method", class_trace, 
+			   &tracepoint_method, _("\
+Set the method for saving a tracepoint."), _("\
+Show the method for saving a tracepoint."), _("\
+Method 1, save only a minimal subset of registers.\n\
+Method 2, save all of the registers (but not pseudo-registers).\n\
+Method 3, save all registers and the machine stack\n\
+  (see tos and size-of-stack).\n\
+Method 4, use tracepoints to determine what to save.\n\
+Method 5 etc. TBD."), 
+			   NULL, NULL, &setlist, &showlist);
+
+  add_com ("default-do-tracepoints", class_trace, 
+	   default_do_tracepoints_command, "Collect tracepoint data.");
+
+  c = add_com ("open-checkpoint", class_trace, checkpoint_open, "\
+Open output file for checkpoints.\n\
+Argument is filename.");
+  set_cmd_completer (c, filename_completer);
+
+  c = add_com ("close-checkpoint", class_trace, checkpoint_close, "\
+Close checkpoint file.\n\
+No arguments, since only one checkpoint file may be open at a time.");
+  set_cmd_completer (c, noop_completer);
+
+  c = add_com ("drop-checkpoint", class_trace, checkpoint_command, "\
+Drop a checkpoint.\n\
+Best not ask what good it will do...");
+  set_cmd_completer (c, noop_completer);
+
+  c = add_com ("tos", class_trace, tracepoint_set_tos_command, "\
+Set TOS so that checkpoints can save the stack.");
+  set_cmd_completer (c, noop_completer);
+
+  c = add_com ("size-of-stack", class_trace, 
+	       tracepoint_set_size_of_stack_command, "\
+Set size of stack to be saved at a checkpoint.");
+  set_cmd_completer (c, noop_completer);
+
+  /* End checkpoint stuff.  */
+
   tracepoint_chain = 0;
   tracepoint_count = 0;
   traceframe_number = -1;
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index fc7a705a341..ab57895f322 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -21,6 +21,14 @@
 #if !defined (TRACEPOINT_H)
 #define TRACEPOINT_H 1
 
+/* Exported interface: */
+
+extern int default_trace_method;
+extern int tracepoint_event_p (void);
+
+/* Most of what follows is not meant for export.
+   They're just forward declarations for internal use in tracepoint.c.  */
+
 /* The data structure for an action: */
 struct action_line
   {
diff --git a/intl/ChangeLog b/intl/ChangeLog
deleted file mode 100644
index 172f44cec1d..00000000000
--- a/intl/ChangeLog
+++ /dev/null
@@ -1,1106 +0,0 @@
-2005-05-13  Nick Clifton  <nickc@redhat.com>
-
-	* Update the address and phone number of the FSF organization in
-	the GPL notices in the following files:
-	Makefile.in, bindtextdom.c, cat-compat.c, dcgettext.c,
-	dgettext.c, explodename.c, finddomain.c, gettext.c, gettext.h,
-	gettextP.h, hash-string.h, intl-compat.c, intlh.inst.in,
-	l10nflist.c, libgettext.h, libintl.glibc, linux-msg.sed,
-	loadinfo.h, loadmsgcat.c, localealias.c, po2tbl.sed.in,
-	textdomain.c, xopen-msg.sed
-	
-2004-11-30  Tero Niemela  <tero_niemela@yahoo.com>
-
-	* Makefile.in: Change LOCALEDIR to $(datadir)/share.
-
-2002-01-21  Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>
-
-	* linux-msg.sed: Comment typo fix.
-	* xopen-msg.sed: Likewise.
-
-1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intl/localealias.c (read_alias_file): Use unsigned char for
-	local variables.  Remove unused variable tp.
-	* intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
-	for type of codeset.  For loosing Solaris systems.
-	* intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
-	* intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
-	len if not needed.
-	Patches by Jim Meyering.
-
-1998-04-28  Ulrich Drepper  <drepper@cygnus.com>
-
-	* loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if
-	mmap is not supported.
-
-	* hash-string.h: Don't include <values.h>.
-
-1998-04-27  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Use strdup is available.
-
-	* localealias.c: Define HAVE_MEMPCPY so that we can use this
-	function.  Define and use semapahores to protect modfication of
-	global objects when compiling for glibc.  Add code to allow
-	freeing alias table.
-
-	* l10nflist.c: Don't assume stpcpy not being a macro.
-
-	* gettextP.h: Define internal_function macri if not already done.
-	Use glibc byte-swap macros instead of defining SWAP when compiled
-	for glibc.
-	(struct loaded_domain): Add elements to allow unloading.
-
-	* Makefile.in (distclean): Don't remove libintl.h here.
-
-	* bindtextdomain.c: Carry over changes from glibc.  Use strdup if
-	available.
-
-	* dcgettext.c: Don't assume stpcpy not being a macro.  Mark internal
-	functions.  Add memory freeing code for glibc.
-
-	* dgettext.c: Update copyright.
-
-	* explodename.c: Include stdlib.h and string.h only if they exist.
-	Use strings.h eventually.
-
-	* finddomain.c: Mark internal functions.  Use strdup if available.
-	Add memory freeing code for glibc.
-
-1997-10-10 20:00  Ulrich Drepper  <drepper@cygnus.com>
-
-	* libgettext.h: Fix dummy textdomain and bindtextdomain macros.
-	They should return reasonable values.
-	Reported by Tom Tromey <tromey@cygnus.com>.
-
-1997-09-16 03:33  Ulrich Drepper  <drepper@cygnus.com>
-
-	* libgettext.h: Define PARAMS also to `args' if __cplusplus is defined.
-	* intlh.inst.in: Likewise.
-	Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>.
-
-	* libintl.glibc: Update from current glibc version.
-
-1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in: Reformat copyright.
-
-1997-08-19 15:22  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (DCGETTEXT): Remove wrong comment.
-
-1997-08-16 00:13  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install-data): Don't change directory to install.
-
-1997-08-01 14:30  Ulrich Drepper  <drepper@cygnus.com>
-
-	* cat-compat.c: Fix copyright.
-
-	* localealias.c: Don't define strchr unless !HAVE_STRCHR.
-
-	* loadmsgcat.c: Update copyright.  Fix typos.
-
-	* l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
-	(_nl_make_l10nflist): Handle sponsor and revision correctly.
-
-	* gettext.c: Update copyright.
-	* gettext.h: Likewise.
-	* hash-string.h: Likewise.
-
-	* finddomain.c: Remoave dead code.  Define strchr only if
-	!HAVE_STRCHR.
-
-	* explodename.c: Include <sys/types.h>.
-
-	* explodename.c: Reformat copyright text.
-	(_nl_explode_name): Fix typo.
-
-	* dcgettext.c: Define and use __set_errno.
-	(guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
-	not defined.
-
-	* bindtextdom.c: Pretty printing.
-
-1997-05-01 02:25  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (guess_category_value): Don't depend on
-	HAVE_LC_MESSAGES.  We don't need the macro here.
-	Patch by Bruno Haible <haible@ilog.fr>.
-
-	* cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
-	macro.  Instead use HAVE_LOCALE_NULL and define it when using
-	glibc, as in dcgettext.c.
-	Patch by Bruno Haible <haible@ilog.fr>.
-
-	* Makefile.in (CPPFLAGS): New variable.  Reported by Franc,ois
-	Pinard.
-
-Mon Mar 10 06:51:17 1997  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in: Implement handling of libtool.
-
-	* gettextP.h: Change data structures for use of generic lowlevel
-	i18n file handling.
-
-Wed Dec  4 20:21:18 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Put parentheses around arguments of memcpy macro
-	definition.
-	* localealias.c: Likewise.
-	* l10nflist.c: Likewise.
-	* finddomain.c: Likewise.
-	* bindtextdom.c: Likewise.
-	Reported by Thomas Esken.
-
-Mon Nov 25 22:57:51 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Move definition of `memcpy` macro to right
-	position.
-
-Fri Nov 22 04:01:58 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
- 	bcopy if not already defined.  Reported by Thomas Esken.
-	* bindtextdom.c: Likewise.
-	* l10nflist.c: Likewise.
-	* localealias.c: Likewise.
-	* textdomain.c: Likewise.
-
-Tue Oct 29 11:10:27 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (libdir): Change to use exec_prefix instead of
- 	prefix.  Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>.
-
-Sat Aug 31 03:07:09 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c (_nl_normalize_codeset): We convert to lower case,
-	so don't prepend uppercase `ISO' for only numeric arg.
-
-Fri Jul 19 00:15:46 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
-	definition of _GNU_SOURCE.  Patch by Roland McGrath.
-
-	* Makefile.in (uninstall): Fix another bug with `for' loop and
-	empty arguments.  Patch by Jim Meyering.  Correct name os
-	uninstalled files: no intl- prefix anymore.
-
-	* Makefile.in (install-data): Again work around shells which
-	cannot handle mpty for list.  Reported by Jim Meyering.
-
-Sat Jul 13 18:11:35 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Split goal.  Now depend on install-exec
-        and install-data.
-	(install-exec, install-data): New goals.  Created from former
-	install goal.
-	Reported by Karl Berry.
-
-Sat Jun 22 04:58:14 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (MKINSTALLDIRS): New variable.  Path to
-        mkinstalldirs script.
-	(install): use MKINSTALLDIRS variable or if the script is not present
-	try to find it in the $top_scrdir).
-
-Wed Jun 19 02:56:56 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Linux libc *partly* includes the argz_* functions.
-	Grr.  Work around by renaming the static version and use macros
-	for renaming.
-
-Tue Jun 18 20:11:17 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Correct presence test macros of __argz_* functions.
-
-	* l10nflist.c: Include <argz.h> based on test of it instead when
-	__argz_* functions are available.
-	Reported by Andreas Schwab.
-
-Thu Jun 13 15:17:44 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* explodename.c, l10nflist.c: Define NULL for dumb systems.
-
-Tue Jun 11 17:05:13 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in, libgettext.h (dcgettext): Rename local variable
-	result to __result to prevent name clash.
-
-	* l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
-        get prototype for stpcpy and strcasecmp.
-
-	* intlh.inst.in, libgettext.h: Move declaration of
-	`_nl_msg_cat_cntr' outside __extension__ block to prevent warning
-	from gcc's -Wnested-extern option.
-
-Fri Jun  7 01:58:00 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Remove comment.
-
-Thu Jun  6 17:28:17 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Work around for another Buglix stupidity.
-	Always use an `else' close for `if's.  Reported by Nelson Beebe.
-
-	* Makefile.in (intlh.inst): Correct typo in phony rule.
-	Reported by Nelson Beebe.
-
-Thu Jun  6 01:49:52 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (read_alias_file): Rename variable alloca_list to
-	block_list as the macro calls assume.
-	Patch by Eric Backus.
-
-	* localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
-        malloc.
-	(read_alias_file): Rename varriabe alloca_list to block_list as the
-	macro calls assume.
-	Patch by Eric Backus.
-
-	* l10nflist.c: Correct conditional for <argz.h> inclusion.
-	Reported by Roland McGrath.
-
-	* Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
-        all-@USE_NLS@.
-
-	* Makefile.in (install): intlh.inst comes from local dir, not
-        $(srcdir).
-
-	* Makefile.in (intlh.inst): Special handling of this goal.  If
-	used in gettext, this is really a rul to construct this file.  If
-	used in any other package it is defined as a .PHONY rule with
-	empty body.
-
-	* finddomain.c: Extract locale file information handling into
-	l10nfile.c.  Rename local stpcpy__ function to stpcpy.
-
-	* dcgettext.c (stpcpy): Add local definition.
-
-	* l10nflist.c: Solve some portability problems.  Patches partly by
-	Thomas Esken.  Add local definition of stpcpy.
-
-Tue Jun  4 02:47:49 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in: Don't depend including <locale.h> on
-	HAVE_LOCALE_H.  Instead configure must rewrite this fiile
-	depending on the result of the configure run.
-
-	* Makefile.in (install): libintl.inst is now called intlh.inst.
-	Add rules for updating intlh.inst from intlh.inst.in.
-
-	* libintl.inst: Renamed to intlh.inst.in.
-
-	* localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
-        because gcc has __buitlin_alloca.
-	Reported by Roland McGrath.
-
-Mon Jun  3 00:32:16 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (installcheck): New goal to fulfill needs of
-        automake's distcheck.
-
-	* Makefile.in (install): Reorder commands so that VERSION is
-        found.
-
-	* Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
-        @datadir@/gettext.
-	(COMSRCS): Add l10nfile.c.
-	(OBJECTS): Add l10nfile.o.
-	(DISTFILES): Rename to DISTFILE.normal.  Remove $(DISTFILES.common).
-	(DISTFILE.gettext): Remove $(DISTFILES.common).
-	(all-gettext): Remove goal.
-	(install): If $(PACKAGE) = gettext install, otherwose do nothing.  No
-	package but gettext itself should install libintl.h + headers.
-	(dist): Extend goal to work for gettext, too.
-	(dist-gettext): Remove goal.
-
-	* dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc.
-
-Sun Jun  2 17:33:06 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* loadmsgcat.c (_nl_load_domain): Parameter is now comes from
-        find_l10nfile.
-
-Sat Jun  1 02:23:03 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c (__argz_next): Add definition.
-
-	* dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca
-	code.  Use new l10nfile handling.
-
-	* localealias.c [!HAVE_ALLOCA]: Add code for handling missing
-        alloca code.
-
-	* l10nflist.c: Initial revision.
-
-Tue Apr  2 18:51:18 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all-gettext): New goal.  Same as all-yes.
-
-Thu Mar 28 23:01:22 1996  Karl Eichwalder  <ke@ke.central.de>
-
-	* Makefile.in (gettextsrcdir): Define using @datadir@.
-
-Tue Mar 26 12:39:14 1996  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Include <ctype.h>.  Reported by Roland McGrath.
-
-Sat Mar 23 02:00:35 1996  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
-        with external declaration.
-
-Sat Mar  2 00:47:09 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all-no): Rename from all_no.
-
-Sat Feb 17 00:25:59 1996  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h [loaded_domain]: Array `successor' must now contain up
-        to 63 elements (because of codeset name normalization).
-
-	* finddomain.c: Implement codeset name normalization.
-
-Thu Feb 15 04:39:09 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all): Define to `all-@USE_NLS@'.
-	(all-yes, all_no): New goals.  `all-no' is noop, `all-yes'
-	is former all.
-
-Mon Jan 15 21:46:01 1996  Howard Gayle  <howard@hal.com>
-
-	* localealias.c (alias_compare): Increment string pointers in loop
-        of strcasecmp replacement.
-
-Fri Dec 29 21:16:34 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src): Who commented this goal out ? :-)
-
-Fri Dec 29 15:08:16 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (DCGETTEXT): Save `errno'.  Failing system calls
-	should not effect it because a missing catalog is no error.
-	Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>.
-
-Tue Dec 19 22:09:13 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (Makefile): Explicitly use $(SHELL) for running
-        shell scripts.
-
-Fri Dec 15 17:34:59 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* Makefile.in (install-src): Only install library and header when
-	we use the own implementation.  Don't do it when using the
-	system's gettext or catgets functions.
-
-	* dcgettext.c (find_msg): Must not swap domain->hash_size here.
-
-Sat Dec  9 16:24:37 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c, libintl.inst, libgettext.h, hash-string.h,
-	gettextP.h, finddomain.c, dcgettext.c, cat-compat.c:
-	Use PARAMS instead of __P.  Suggested by Roland McGrath.
-
-Tue Dec  5 11:39:14 1995  Larry Schwimmer  <rosebud@cyclone.stanford.edu>
-
-	* libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if
-	!_LIBINTL_H' because Solaris defines _LIBINTL_H as empty.
-
-Mon Dec  4 15:42:07 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src):
-	Install libintl.inst instead of libintl.h.install.
-
-Sat Dec  2 22:51:38 1995  Marcus Daniels  <marcus@sysc.pdx.edu>
-
-	* cat-compat.c (textdomain):
-	Reverse order in which files are tried you load.  First
-	try local file, when this failed absolute path.
-
-Wed Nov 29 02:03:53 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
-
-	* cat-compat.c (bindtextdomain): Add missing { }.
-
-Sun Nov 26 18:21:41 1995  Ulrich Drepper  <drepper@myware>
-
-	* libintl.inst: Add missing __P definition.  Reported by Nelson Beebe.
-
-	* Makefile.in:
-	Add dummy `all' and `dvi' goals.  Reported by Tom Tromey.
-
-Sat Nov 25 16:12:01 1995  Franc,ois Pinard  <pinard@iro.umontreal.ca>
-
-	* hash-string.h: Capitalize arguments of macros.
-
-Sat Nov 25 12:01:36 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Prevent files names longer than 13
-	characters.  libintl.h.glibc->libintl.glibc,
-	libintl.h.install->libintl.inst.  Reported by Joshua R. Poulson.
-
-Sat Nov 25 11:31:12 1995  Eric Backus  <ericb@lsid.hp.com>
-
-	* dcgettext.c: Fix bug in preprocessor conditionals.
-
-Sat Nov 25 02:35:27 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
-
-	* libgettext.h: Solaris cc does not understand
-	 #if !SYMBOL1 && !SYMBOL2.  Sad	but true.
-
-Thu Nov 23 16:22:14 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h (hash_string):
-	Fix for machine with >32 bit `unsigned long's.
-
-	* dcgettext.c (DCGETTEXT):
-	Fix horrible bug in loop for alternative translation.
-
-Thu Nov 23 01:45:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in, linux-msg.sed, xopen-msg.sed:
-	Some further simplifications in message number generation.
-
-Mon Nov 20 21:08:43 1995  Ulrich Drepper  <drepper@myware>
-
-	* libintl.h.glibc: Use __const instead of const in prototypes.
-
-	* Makefile.in (install-src):
-	Install libintl.h.install instead of libintl.h.  This
-	is a stripped-down version.  Suggested by Peter Miller.
-
-	* libintl.h.install, libintl.h.glibc: Initial revision.
-
-	* localealias.c (_nl_expand_alias, read_alias_file):
-	Protect prototypes in type casts by __P.
-
-Tue Nov 14 16:43:58 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h: Correct prototype for hash_string.
-
-Sun Nov 12 12:42:30 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h (hash_string): Add prototype.
-
-	* gettextP.h: Fix copyright.
-	(SWAP): Add prototype.
-
-Wed Nov  8 22:56:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (read_alias_file): Forgot sizeof.
-	Avoid calling *printf function.  This introduces a big overhead.
-	Patch by Roland McGrath.
-
-Tue Nov  7 14:21:08 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy.
-
-	* finddomain.c (stpcpy):
-	Define substitution function local.  The macro was to flaky.
-
-	* cat-compat.c: Fix typo.
-
-	* xopen-msg.sed, linux-msg.sed:
-	While bringing message number to right place only accept digits.
-
-	* linux-msg.sed, xopen-msg.sed: Now that the counter does not have
-	leading 0s we don't need to remove them.  Reported by Marcus
-	Daniels.
-
-	* Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in
-	dependency.  Reported by Marcus Daniels.
-
-	* cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement.
-	Generally cleanup using #if instead of #ifndef.
-
-	* Makefile.in: Correct typos in comment.  By Franc,ois Pinard.
-
-Mon Nov  6 00:27:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src): Don't install libintl.h and libintl.a
-	if we use an available gettext implementation.
-
-Sun Nov  5 22:02:08 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS.  Reported
-	by Franc,ois Pinard.
-
-	* libgettext.h: Use #if instead of #ifdef/#ifndef.
-
-	* finddomain.c:
-	Comments describing what has to be done should start with FIXME.
-
-Sun Nov  5 19:38:01 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Split.  Use DISTFILES with normal meaning.
-	DISTFILES.common names the files common to both dist goals.
-	DISTFILES.gettext are the files only distributed in GNU gettext.
-
-Sun Nov  5 17:32:54 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (DCGETTEXT): Correct searching in derived locales.
-	This was necessary since a change in _nl_find_msg several weeks
-	ago.  I really don't know this is still not fixed.
-
-Sun Nov  5 12:43:12 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL.  This
-	might mark a special condition.
-
-	* finddomain.c (make_entry_rec): Don't make illegal entry as decided.
-
-	* Makefile.in (dist): Suppress error message when ln failed.
-	Get files from $(srcdir) explicitly.
-
-	* libgettext.h (gettext_const): Rename to gettext_noop.
-
-Fri Nov  3 07:36:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (make_entry_rec):
-	Protect against wrong locale names by testing mask.
-
-	* libgettext.h (gettext_const): Add macro definition.
-	Capitalize macro arguments.
-
-Thu Nov  2 23:15:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Test for pointer != NULL before accessing value.
-	Reported by Tom Tromey.
-
-	* gettext.c (NULL):
-	Define as (void*)0 instad of 0.  Reported by Franc,ois Pinard.
-
-Mon Oct 30 21:28:52 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in: Serious typo bug fixed by Jim Meyering.
-
-Sat Oct 28 23:20:47 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h: Disable dcgettext optimization for Solaris 2.3.
-
-	* localealias.c (alias_compare):
-	Peter Miller reported that tolower in some systems is
-	even dumber than I thought.  Protect call by `isupper'.
-
-Fri Oct 27 22:22:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (libdir, includedir): New variables.
-	(install-src): Install libintl.a and libintl.h in correct dirs.
-
-Fri Oct 27 22:07:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c.
-
-	* po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques.
-
-	* localealias.c:
-	Fix typo and superflous test.  Reported by Christian von Roques.
-
-Fri Oct  6 11:52:05 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Correct some remainder from the pre-CEN syntax.  Now
-	we don't have a constant number of successors anymore.
-
-Wed Sep 27 21:41:13 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Add libintl.h.glibc.
-
-	* Makefile.in (dist-libc): Add goal for packing sources for glibc.
-	(COMSRCS, COMHDRS): Splitted to separate sources shared with glibc.
-
-	* loadmsgcat.c: Forget to continue #if line.
-
-	* localealias.c:
-	[_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name
-	space clean.
-
-	* dcgettext.c, finddomain.c: Better comment to last change.
-
-	* loadmsgcat.c:
-	[_LIBC]: Rename fstat, open, close, read, mmap, and munmap to
-	__fstat, __open, __close, __read, __mmap, and __munmap resp
-	to keep ANSI C name space clean.
-
-	* finddomain.c:
-	[_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean.
-
-	* dcgettext.c:
-	[_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to
-	keep ANSI C name space clean.
-
-	* libgettext.h:
-	Include sys/types.h for those old SysV systems out there.
-	Reported by Francesco Potorti`.
-
-	* loadmsgcat.c (use_mmap): Define if compiled for glibc.
-
-	* bindtextdom.c: Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* finddomain.c: Fix 2 times defiend -> defined.
-
-	* textdomain.c: Include libintl.h instead of libgettext.h when
-	compiling for glibc.  Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* localealias.c, loadmsgcat.c: Prepare to be compiled in glibc.
-
-	* gettext.c:
-	Include libintl.h instead of libgettext.h when compiling for glibc.
-	Get NULL from stddef.h if we compile for glibc.
-
-	* finddomain.c: Include libintl.h instead of libgettext.h when
-	compiling for glibc.  Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* dcgettext.c: Include all those standard headers unconditionally
-	if _LIBC is defined.
-
-	* dgettext.c: If compiled in glibc include libintl.h instead of
-	libgettext.h.
-	(locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc.
-
-	* dcgettext.c: If compiled in glibc include libintl.h instead of
-	libgettext.h.
-	(getcwd): Don't rely on HAVE_GETCWD when compiling for glibc.
-
-	* bindtextdom.c:
-	If compiled in glibc include libintl.h instead of libgettext.h.
-
-Mon Sep 25 22:23:06 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0.
-	Reported by Marcus Daniels.
-
-	* cat-compat.c (bindtextdomain):
-	String used in putenv must not be recycled.
-	Reported by Marcus Daniels.
-
-	* libgettext.h (__USE_GNU_GETTEXT):
-	Additional symbol to signal that we use GNU gettext
-	library.
-
-	* cat-compat.c (bindtextdomain):
-	Fix bug with the strange stpcpy replacement.
-	Reported by Nelson Beebe.
-
-Sat Sep 23 08:23:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* cat-compat.c: Include <string.h> for stpcpy prototype.
-
-	* localealias.c (read_alias_file):
-	While expand strdup code temporary variable `cp' hided
-	higher level variable with same name.  Rename to `tp'.
-
-	* textdomain.c (textdomain):
-	Avoid warning by using temporary variable in strdup code.
-
-	* finddomain.c (_nl_find_domain): Remove unused variable `application'.
-
-Thu Sep 21 15:51:44 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (alias_compare):
-	Use strcasecmp() only if available.  Else use
-	implementation in place.
-
-	* intl-compat.c:
-	Wrapper functions now call *__ functions instead of __*.
-
-	* libgettext.h: Declare prototypes for *__ functions instead for __*.
-
-	* cat-compat.c, loadmsgcat.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-
-	* bindtextdom.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-	Rename to bindtextdomain__ if not used in GNU C Library.
-
-	* dgettext.c:
-	Rename function to dgettext__ if not used in GNU C Library.
-
-	* gettext.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-	Functions now called gettext__ if not used in GNU C Library.
-
-	* dcgettext.c, localealias.c, textdomain.c, finddomain.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-
-Sun Sep 17 23:14:49 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Correct some bugs in handling of CEN standard
- 	locale definitions.
-
-Thu Sep  7 01:49:28 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Implement CEN syntax.
-
-	* gettextP.h (loaded_domain): Extend number of successors to 31.
-
-Sat Aug 19 19:25:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (aliaspath): Remove path to X11 locale dir.
-
-	* Makefile.in: Make install-src depend on install.  This helps
- 	gettext to install the sources and other packages can use the
- 	install goal.
-
-Sat Aug 19 15:19:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (uninstall): Remove stuff installed by install-src.
-
-Tue Aug 15 13:13:53 1995  Ulrich Drepper  <drepper@myware>
-
-	* VERSION.in: Initial revision.
-
-	* Makefile.in (DISTFILES):
-	Add VERSION file.  This is not necessary for gettext, but
-	for other packages using this library.
-
-Tue Aug 15 06:16:44 1995  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h (_nl_find_domain):
-	New prototype after changing search strategy.
-
-	* finddomain.c (_nl_find_domain):
-	We now try only to find a specified catalog.  Fall back to other
-	catalogs listed in the locale list is now done in __dcgettext.
-
-	* dcgettext.c (__dcgettext):
-	Now we provide message fall back even to different languages.
-	I.e. if a message is not available in one language all the other
- 	in the locale list a tried.  Formerly fall back was only possible
- 	within one language.  Implemented by moving one loop from
- 	_nl_find_domain to here.
-
-Mon Aug 14 23:45:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (gettextsrcdir):
-	Directory where source of GNU gettext library are made
-	available.
-	(INSTALL, INSTALL_DATA): Programs used for installing sources.
-	(gettext-src): New.  Rule to install GNU gettext sources for use in
-	gettextize shell script.
-
-Sun Aug 13 14:40:48 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c (_nl_load_domain):
-	Use mmap for loading only when munmap function is
-	also available.
-
-	* Makefile.in (install): Depend on `all' goal.
-
-Wed Aug  9 11:04:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (read_alias_file):
-	Do not overwrite '\n' when terminating alias value string.
-
-	* localealias.c (read_alias_file):
-	Handle long lines.  Ignore the rest not fitting in
-	the buffer after the initial `fgets' call.
-
-Wed Aug  9 00:54:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h (_nl_load_domain):
-	Add prototype, replacing prototype for _nl_load_msg_cat.
-
-	* finddomain.c (_nl_find_domain):
-	Remove unneeded variable filename and filename_len.
-	(expand_alias): Remove prototype because functions does not
- 	exist anymore.
-
-	* localealias.c (read_alias_file):
-	Change type of fname_len parameter to int.
-	(xmalloc): Add prototype.
-
-	* loadmsgcat.c: Better prototypes for xmalloc.
-
-Tue Aug  8 22:30:39 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Allow alias name to be constructed from the four components.
-
-	* Makefile.in (aliaspath): New variable.  Set to preliminary value.
-	(SOURCES): Add localealias.c.
-	(OBJECTS): Add localealias.o.
-
-	* gettextP.h: Add prototype for _nl_expand_alias.
-
-	* finddomain.c: Aliasing handled in intl/localealias.c.
-
-	* localealias.c: Aliasing for locale names.
-
-	* bindtextdom.c: Better prototypes for xmalloc and xstrdup.
-
-Mon Aug  7 23:47:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): gettext.perl is now found in misc/.
-
-	* cat-compat.c (bindtextdomain):
-	Correct implementation.  dirname parameter was not used.
-	Reported by Marcus Daniels.
-
-	* gettextP.h (loaded_domain):
-	New fields `successor' and `decided' for oo, lazy
-	message handling implementation.
-
-	* dcgettext.c:
-	Adopt for oo, lazy message handliing.
-  	Now we can inherit translations from less specific locales.
-	(find_msg): New function.
-
-	* loadmsgcat.c, finddomain.c:
-	Complete rewrite.  Implement oo, lazy message handling :-).
-  	We now have an additional environment variable `LANGUAGE' with
- 	a higher priority than LC_ALL for the LC_MESSAGE locale.
-  	Here we can set a colon separated list of specifications each
- 	of the form `language[_territory[.codeset]][@modifier]'.
-
-Sat Aug  5 09:55:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (unistd.h):
-	Include to get _PC_PATH_MAX defined on system having it.
-
-Fri Aug  4 22:42:00 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (stpcpy): Include prototype.
-
-	* Makefile.in (dist): Remove `copying instead' message.
-
-Wed Aug  2 18:52:03 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (ID, TAGS): Do not use $^.
-
-Tue Aug  1 20:07:11 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (TAGS, ID): Use $^ as command argument.
-	(TAGS): Give etags -o option t write to current directory,
- 	not $(srcdir).
-	(ID): Use $(srcdir) instead os $(top_srcdir)/src.
-	(distclean): Remove ID.
-
-Sun Jul 30 11:51:46 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (gnulocaledir):
-	New variable, always using share/ for data directory.
-	(DEFS): Add GNULOCALEDIR, used in finddomain.c.
-
-	* finddomain.c (_nl_default_dirname):
-	Set to GNULOCALEDIR, because it always has to point
-	to the directory where GNU gettext Library writes it to.
-
-	* intl-compat.c (textdomain, bindtextdomain):
-	Undefine macros before function definition.
-
-Sat Jul 22 01:10:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h (_LIBINTL_H):
-	Protect definition in case where this file is included as
-	libgettext.h on Solaris machines.  Add comment about this.
-
-Wed Jul 19 02:36:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* intl-compat.c (textdomain): Correct typo.
-
-Wed Jul 19 01:51:35 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (dcgettext): Function now called __dcgettext.
-
-	* dgettext.c (dgettext): Now called __dgettext and calls
- 	__dcgettext.
-
-	* gettext.c (gettext):
-	Function now called __gettext and calls __dgettext.
-
-	* textdomain.c (textdomain): Function now called __textdomain.
-
-	* bindtextdom.c (bindtextdomain): Function now called
- 	__bindtextdomain.
-
-	* intl-compat.c: Initial revision.
-
-	* Makefile.in (SOURCES): Add intl-compat.c.
-	(OBJECTS): We always compile the GNU gettext library functions.
-  	OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o,
- 	and intl-compat.o.
-  	(GETTOBJS): Contains now only intl-compat.o.
-
-	* libgettext.h:
-	Re-include protection matches dualistic character of libgettext.h.
-	For all functions in GNU gettext library define __ counter part.
-
-	* finddomain.c (strchr): Define as index if not found in C library.
-	(_nl_find_domain): For relative paths paste / in between.
-
-Tue Jul 18 16:37:45 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h.
-
-	* xopen-msg.sed: Fix bug with `msgstr ""' lines.
-	A little bit better comments.
-
-Tue Jul 18 01:18:27 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in:
-	po-mode.el, makelinks, combine-sh are now found in ../misc.
-
-	* po-mode.el, makelinks, combine-sh, elisp-comp:
-	Moved to ../misc/.
-
-	* libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__.
-
-Sun Jul 16 22:33:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (INSTALL, INSTALL_DATA): New variables.
-	(install-data, uninstall): Install/uninstall .elc file.
-
-	* po-mode.el (Installation comment):
-	Add .pox as possible extension of .po files.
-
-Sun Jul 16 13:23:27 1995  Ulrich Drepper  <drepper@myware>
-
-	* elisp-comp: Complete new version by Franc,ois: This does not
- 	fail when not compiling in the source directory.
-
-Sun Jul 16 00:12:17 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (../po/cat-id-tbl.o):
-	Use $(MAKE) instead of make for recursive make.
-
-	* Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh.
-	(install-exec): Add missing dummy goal.
-	(install-data, uninstall): @ in multi-line shell command at
- 	beginning, not in front of echo.  Reported by Eric Backus.
-
-Sat Jul 15 00:21:28 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES):
-	Rename libgettext.perl to gettext.perl to fit in 14 chars
-	file systems.
-
-	* gettext.perl:
- 	Rename to gettext.perl to fit in 14 chars file systems.
-
-Thu Jul 13 23:17:20 1995  Ulrich Drepper  <drepper@myware>
-
-	* cat-compat.c: If !STDC_HEADERS try to include malloc.h.
-
-Thu Jul 13 20:55:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in: Pretty printing.
-
-	* linux-msg.sed, xopen-msg.sed:
-	Correct bugs with handling substitute flags in branches.
-
-	* hash-string.h (hash_string):
-	Old K&R compilers don't under stand `unsigned char'.
-
-	* gettext.h (nls_uint32):
-	Some old K&R compilers (eg HP) don't understand `unsigned int'.
-
-	* cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes.
-
-Thu Jul 13 01:34:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (ELCFILES): New variable.
-	(DISTFILES): Add elisp-comp.
-	Add implicit rule for .el -> .elc compilation.
-	(install-data): install $ELCFILES
-	(clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp.
-
-	* elisp-comp: Initial revision
-
-Wed Jul 12 16:14:52 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in:
-	cat-id-tbl.c is now found in po/.  This enables us to use an identical
-	intl/ directory in all packages.
-
-	* dcgettext.c (dcgettext): hashing does not work for table size <= 2.
-
-	* textdomain.c: fix typo (#if def -> #if defined)
-
-Tue Jul 11 18:44:43 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (stamp-cat-id): use top_srcdir to address source files
-	(DISTFILES,distclean): move tupdate.perl to src/
-
-	* po-to-tbl.sed.in:
-	add additional jump to clear change flag to recognize multiline strings
-
-Tue Jul 11 01:32:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* textdomain.c: Protect inclusion of stdlib.h and string.h.
-
-	* loadmsgcat.c: Protect inclusion of stdlib.h.
-
-	* libgettext.h: Protect inclusion of locale.h.
-	Allow use in C++ programs.
-	Define NULL is not happened already.
-
-	* Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of
-	po-to-tbl.sed.
-	(distclean): remove po-to-tbl.sed and tupdate.perl.
-
-	* tupdate.perl.in: Substitute Perl path even in exec line.
-	Don't include entries without translation from old .po file.
-
-Tue Jul  4 00:41:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* tupdate.perl.in: use "Updated: " in msgid "".
-
-	* cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR).
- 	Define getenv if !__STDC__.
-
-	* bindtextdom.c: Protect stdlib.h and string.h inclusion.
- 	Define free if !__STDC__.
-
-	* finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
- 	Define free if !__STDC__.
-
-	* cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
-
-Mon Jul  3 23:56:30 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR.
-	Remove unneeded $(srcdir) from Makefile.in dependency.
-
-	* makelinks: Add copyright and short description.
-
-	* po-mode.el: Last version for 0.7.
-
-	* tupdate.perl.in: Fix die message.
-
-	* dcgettext.c: Protect include of string.h.
-
-	* gettext.c: Protect include of stdlib.h and further tries to get NULL.
-
-	* finddomain.c: Some corrections in includes.
-
-	* Makefile.in (INCLUDES): Prune list correct path to Makefile.in.
-
-	* po-to-tbl.sed: Adopt for new .po file format.
-
-	* linux-msg.sed, xopen-msg.sed: Adopt for new .po file format.
-
-Sun Jul  2 23:55:03 1995  Ulrich Drepper  <drepper@myware>
-
-	* tupdate.perl.in: Complete rewrite for new .po file format.
-
-Sun Jul  2 02:06:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* First official release.  This directory contains all the code
-	needed to internationalize own packages.  It provides functions
-	which allow to use the X/Open catgets function with an interface
-	like the Uniforum gettext function.  For system which does not
-	have neither of those a complete implementation is provided.
diff --git a/intl/Makefile.in b/intl/Makefile.in
deleted file mode 100644
index f3664ae3dca..00000000000
--- a/intl/Makefile.in
+++ /dev/null
@@ -1,214 +0,0 @@
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = @datadir@/gettext/intl
-aliaspath = $(localedir):.
-subdir = intl
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-
-l = @l@
-
-AR = ar
-CC = @CC@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
-GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
-xopen-msg.sed $(HEADERS) $(SOURCES)
-DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc intlh.inst.in
-
-.SUFFIXES:
-.SUFFIXES: .c .o .lo
-.c.o:
-	$(COMPILE) $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) $<
-
-INCLUDES = -I. -I$(srcdir)
-
-all: all-@USE_INCLUDED_LIBINTL@
-
-all-yes: libintl.$la intlh.inst
-all-no:
-install-info:
-
-libintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-		   -version-info 1:0 -rpath $(libdir)
-
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
-	cd ../po && $(MAKE) cat-id-tbl.$lo
-
-check: all
-
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the gettext() function in its C library or in a
-# separate library or use the catgets interface.  A special case is
-# where configure found a previously installed GNU gettext library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
-	  fi; \
-	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
-	  dists="$(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	dists="$(DISTFILES.common)"; \
-	for file in $$dists; do \
-	  rm -f $(gettextsrcdir)/$$file; \
-	done
-
-info dvi:
-
-$(OBJECTS): config.h libgettext.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.o *.lo core core.*
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed libintl.h config.log
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile $(DISTFILES)
-	if test "$(PACKAGE)" = gettext; then \
-	  additional="$(DISTFILES.gettext)"; \
-	else \
-	  additional="$(DISTFILES.normal)"; \
-	fi; \
-	for file in $(DISTFILES.common) $$additional; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-dist-libc:
-	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
-
-Makefile: Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-# The dependency for intlh.inst is different in gettext and all other
-# packages.  Because we cannot you GNU make features we have to solve
-# the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/intl/acconfig.h b/intl/acconfig.h
deleted file mode 100644
index 70f81f80898..00000000000
--- a/intl/acconfig.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* 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
diff --git a/intl/aclocal.m4 b/intl/aclocal.m4
deleted file mode 100644
index 225439f2125..00000000000
--- a/intl/aclocal.m4
+++ /dev/null
@@ -1,387 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
-
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in 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.
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
-# 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
-
-AC_DEFUN(CY_WITH_NLS,
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
-    AC_SUBST(USE_NLS)
-
-    USE_INCLUDED_LIBINTL=no
-
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If gettext or catgets are available (in this order) we
-        dnl use this.  Else we have to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
-
-	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-		 [AC_TRY_LINK([], [return (int) gettext ("")],
-		 gt_cv_func_gettext_libintl=yes,
-		 gt_cv_func_gettext_libintl=no)])])
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	      if test "$MSGFMT" != "no"; then
-		AC_CHECK_FUNCS(dcgettext)
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	])
-
-	dnl In the standard gettext, we would now check for catgets.
-        dnl However, we never want to use catgets for our releases.
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
-	  dnl Fall back on GNU gettext library.
-	  nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-        AC_SUBST(MSGFMT)
-	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
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
-	  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
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(INTLOBJS)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-AC_DEFUN(CY_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY)
-   fi
-
-   AM_LC_MESSAGES
-   CY_WITH_NLS
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   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
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   if test -f $srcdir/po2tbl.sed.in; then
-      if test "$CATOBJEXT" = ".cat"; then
-	 AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-	 dnl Transform the SED scripts while copying because some dumb SEDs
-         dnl cannot handle comments.
-	 sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed
-      fi
-      dnl po2tbl.sed is always needed.
-      sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-	 $srcdir/po2tbl.sed.in > po2tbl.sed
-   fi
-
-   dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
-   MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs"
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.  But only do this if the po directory
-   dnl exists in srcdir.
-   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
-  ])
-
-# 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
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# 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
-
-AC_DEFUN(AM_LC_MESSAGES,
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
-    fi
-  fi])
-
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
deleted file mode 100644
index 42b87d297b8..00000000000
--- a/intl/bindtextdom.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-/* Contains the default location of the message catalogs.  */
-extern const char _nl_default_dirname[];
-
-/* List with bindings of specific domains.  */
-extern struct binding *_nl_domain_bindings;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define BINDTEXTDOMAIN __bindtextdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define BINDTEXTDOMAIN bindtextdomain__
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  struct binding *binding;
-
-  /* Some sanity checks.  */
-  if (domainname == NULL || domainname[0] == '\0')
-    return NULL;
-
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (dirname == NULL)
-    /* The current binding has be to returned.  */
-    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
-
-  if (binding != NULL)
-    {
-      /* The domain is already bound.  If the new value and the old
-	 one are equal we simply do nothing.  Otherwise replace the
-	 old binding.  */
-      if (strcmp (dirname, binding->dirname) != 0)
-	{
-	  char *new_dirname;
-
-	  if (strcmp (dirname, _nl_default_dirname) == 0)
-	    new_dirname = (char *) _nl_default_dirname;
-	  else
-	    {
-#if defined _LIBC || defined HAVE_STRDUP
-	      new_dirname = strdup (dirname);
-	      if (new_dirname == NULL)
-		return NULL;
-#else
-	      size_t len = strlen (dirname) + 1;
-	      new_dirname = (char *) malloc (len);
-	      if (new_dirname == NULL)
-		return NULL;
-
-	      memcpy (new_dirname, dirname, len);
-#endif
-	    }
-
-	  if (binding->dirname != _nl_default_dirname)
-	    free (binding->dirname);
-
-	  binding->dirname = new_dirname;
-	}
-    }
-  else
-    {
-      /* We have to create a new binding.  */
-#if !defined _LIBC && !defined HAVE_STRDUP
-      size_t len;
-#endif
-      struct binding *new_binding =
-	(struct binding *) malloc (sizeof (*new_binding));
-
-      if (new_binding == NULL)
-	return NULL;
-
-#if defined _LIBC || defined HAVE_STRDUP
-      new_binding->domainname = strdup (domainname);
-      if (new_binding->domainname == NULL)
-	return NULL;
-#else
-      len = strlen (domainname) + 1;
-      new_binding->domainname = (char *) malloc (len);
-      if (new_binding->domainname == NULL)
-	return NULL;
-      memcpy (new_binding->domainname, domainname, len);
-#endif
-
-      if (strcmp (dirname, _nl_default_dirname) == 0)
-	new_binding->dirname = (char *) _nl_default_dirname;
-      else
-	{
-#if defined _LIBC || defined HAVE_STRDUP
-	  new_binding->dirname = strdup (dirname);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-#else
-	  len = strlen (dirname) + 1;
-	  new_binding->dirname = (char *) malloc (len);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-	  memcpy (new_binding->dirname, dirname, len);
-#endif
-	}
-
-      /* Now enqueue it.  */
-      if (_nl_domain_bindings == NULL
-	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
-	{
-	  new_binding->next = _nl_domain_bindings;
-	  _nl_domain_bindings = new_binding;
-	}
-      else
-	{
-	  binding = _nl_domain_bindings;
-	  while (binding->next != NULL
-		 && strcmp (domainname, binding->next->domainname) > 0)
-	    binding = binding->next;
-
-	  new_binding->next = binding->next;
-	  binding->next = new_binding;
-	}
-
-      binding = new_binding;
-    }
-
-  return binding->dirname;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__bindtextdomain, bindtextdomain);
-#endif
diff --git a/intl/cat-compat.c b/intl/cat-compat.c
deleted file mode 100644
index be4afff87b5..00000000000
--- a/intl/cat-compat.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* Compatibility code for gettext-using-catgets interface.
-   Copyright (C) 1995, 1997 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# endif
-#endif
-
-#ifdef HAVE_NL_TYPES_H
-# include <nl_types.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* The catalog descriptor.  */
-static nl_catd catalog = (nl_catd) -1;
-
-/* Name of the default catalog.  */
-static const char default_catalog_name[] = "messages";
-
-/* Name of currently used catalog.  */
-static const char *catalog_name = default_catalog_name;
-
-/* Get ID for given string.  If not found return -1.  */
-static int msg_to_cat_id PARAMS ((const char *msg));
-
-/* Substitution for systems lacking this function in their C library.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-#endif
-
-
-/* Set currently used domain/catalog.  */
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  nl_catd new_catalog;
-  char *new_name;
-  size_t new_name_len;
-  char *lang;
-
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
-    && defined HAVE_LOCALE_NULL
-  lang = setlocale (LC_MESSAGES, NULL);
-#else
-  lang = getenv ("LC_ALL");
-  if (lang == NULL || lang[0] == '\0')
-    {
-      lang = getenv ("LC_MESSAGES");
-      if (lang == NULL || lang[0] == '\0')
-	lang = getenv ("LANG");
-    }
-#endif
-  if (lang == NULL || lang[0] == '\0')
-    lang = "C";
-
-  /* See whether name of currently used domain is asked.  */
-  if (domainname == NULL)
-    return (char *) catalog_name;
-
-  if (domainname[0] == '\0')
-    domainname = default_catalog_name;
-
-  /* Compute length of added path element.  */
-  new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
-		 + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
-		 + sizeof (".cat");
-
-  new_name = (char *) malloc (new_name_len);
-  if (new_name == NULL)
-    return NULL;
-
-  strcpy (new_name, PACKAGE);
-  new_catalog = catopen (new_name, 0);
-
-  if (new_catalog == (nl_catd) -1)
-    {
-      /* NLSPATH search didn't work, try absolute path */
-      sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
-	       PACKAGE);
-      new_catalog = catopen (new_name, 0);
-
-      if (new_catalog == (nl_catd) -1)
-	{
-	  free (new_name);
-	  return (char *) catalog_name;
-	}
-    }
-
-  /* Close old catalog.  */
-  if (catalog != (nl_catd) -1)
-    catclose (catalog);
-  if (catalog_name != default_catalog_name)
-    free ((char *) catalog_name);
-
-  catalog = new_catalog;
-  catalog_name = new_name;
-
-  return (char *) catalog_name;
-}
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-#if HAVE_SETENV || HAVE_PUTENV
-  char *old_val, *new_val, *cp;
-  size_t new_val_len;
-
-  /* This does not make much sense here but to be compatible do it.  */
-  if (domainname == NULL)
-    return NULL;
-
-  /* Compute length of added path element.  If we use setenv we don't need
-     the first byts for NLSPATH=, but why complicate the code for this
-     peanuts.  */
-  new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
-		+ sizeof ("/%L/LC_MESSAGES/%N.cat");
-
-  old_val = getenv ("NLSPATH");
-  if (old_val == NULL || old_val[0] == '\0')
-    {
-      old_val = NULL;
-      new_val_len += 1 + sizeof (LOCALEDIR) - 1
-	             + sizeof ("/%L/LC_MESSAGES/%N.cat");
-    }
-  else
-    new_val_len += strlen (old_val);
-
-  new_val = (char *) malloc (new_val_len);
-  if (new_val == NULL)
-    return NULL;
-
-# if HAVE_SETENV
-  cp = new_val;
-# else
-  cp = stpcpy (new_val, "NLSPATH=");
-# endif
-
-  cp = stpcpy (cp, dirname);
-  cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
-
-  if (old_val == NULL)
-    {
-# if __STDC__
-      stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
-# else
-
-      cp = stpcpy (cp, LOCALEDIR);
-      stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
-# endif
-    }
-  else
-    stpcpy (cp, old_val);
-
-# if HAVE_SETENV
-  setenv ("NLSPATH", new_val, 1);
-  free (new_val);
-# else
-  putenv (new_val);
-  /* Do *not* free the environment entry we just entered.  It is used
-     from now on.   */
-# endif
-
-#endif
-
-  return (char *) domainname;
-}
-
-#undef gettext
-char *
-gettext (msg)
-     const char *msg;
-{
-  int msgid;
-
-  if (msg == NULL || catalog == (nl_catd) -1)
-    return (char *) msg;
-
-  /* Get the message from the catalog.  We always use set number 1.
-     The message ID is computed by the function `msg_to_cat_id'
-     which works on the table generated by `po-to-tbl'.  */
-  msgid = msg_to_cat_id (msg);
-  if (msgid == -1)
-    return (char *) msg;
-
-  return catgets (catalog, 1, msgid, (char *) msg);
-}
-
-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
-   for the one equal to msg.  If it is found return the ID.  In case when
-   the string is not found return -1.  */
-static int
-msg_to_cat_id (msg)
-     const char *msg;
-{
-  int cnt;
-
-  for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
-    if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
-      return _msg_tbl[cnt]._msg_number;
-
-  return -1;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/intl/config.in b/intl/config.in
deleted file mode 100644
index 8a9049b80de..00000000000
--- a/intl/config.in
+++ /dev/null
@@ -1,128 +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 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 to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* 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 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 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 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 <argz.h> header file.  */
-#undef HAVE_ARGZ_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 <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_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 i library (-li).  */
-#undef HAVE_LIBI
diff --git a/intl/configure b/intl/configure
deleted file mode 100755
index 341eea019ae..00000000000
--- a/intl/configure
+++ /dev/null
@@ -1,2950 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12.1 
-# 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"
-
-# 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=
-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
-  --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" ;;
-
-  -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.12.1"
-    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=dgettext.c
-
-# 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 "$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
-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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-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 $srcdir/.. $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 $srcdir/.. $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:562: 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="${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_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:616: 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 631 "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:637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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 648 "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:654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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*
-  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:677: 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:706: 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="${IFS}:"
-  for ac_dir in $PATH; 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:735: 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="${IFS}:"
-  ac_prog_rejected=no
-  for ac_dir in $PATH; 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
-
-  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:783: 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 793 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-if { (eval echo configure:797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
-
-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:817: 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:822: 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:831: \"$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
-  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:846: 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
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-# 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:876: 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="${IFS}:"
-  for ac_dir in $PATH; 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
-
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:903: 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:924: 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 929 "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:937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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 954 "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 972 "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 993 "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:1004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./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:1028: 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 1033 "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:1082: \"$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:1103: 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 1110 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:1117: \"$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:1143: 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 1148 "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 "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:1176: 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 1181 "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 "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:1211: 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 1216 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:1244: 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 1249 "configure"
-#include "confdefs.h"
-
-#ifdef __GNUC__
-# define alloca __builtin_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
-
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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.o
-  cat >> confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1304: 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 1309 "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:1334: 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 1339 "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:1362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:1389: 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 1397 "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:1416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./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:1441: 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 1446 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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:1480: 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 1485 "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:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:1533: 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 1541 "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:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./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
-
-                              
-   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:1709: 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 1714 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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:1749: 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 1754 "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:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:1806: 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 1811 "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:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:1868: 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 1873 "configure"
-#include "confdefs.h"
-#include <locale.h>
-int main() {
-return LC_MESSAGES
-; return 0; }
-EOF
-if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:1901: 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:1921: 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:1940: 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 1945 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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:1967: 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 1972 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-int main() {
-return (int) gettext ("")
-; return 0; }
-EOF
-if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:1995: 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 2003 "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:2014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:2030: 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 2035 "configure"
-#include "confdefs.h"
-
-int main() {
-return (int) gettext ("")
-; return 0; }
-EOF
-if { (eval echo configure:2042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:2070: 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:2104: 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 2109 "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:2132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:2159: 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="${IFS}:"
-  for ac_dir in $PATH; 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:2194: 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 2226 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr
-; return 0; }
-EOF
-if { (eval echo configure:2234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:2266: 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:2300: 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="${IFS}:"
-  for ac_dir in $PATH; 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:2335: 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:2425: 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:2453: 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 2458 "configure"
-#include "confdefs.h"
-#include <linux/version.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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
-  
-
-
-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) 2>&1 | grep ac_space` 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.12.1"
-    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 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%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%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_DATA@%$INSTALL_DATA%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@RANLIB@%$RANLIB%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
-
-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
-
-  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="$nls_cv_header_libgt"
-ac_dests="$nls_cv_header_intl"
-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
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-
-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/intl/configure.in b/intl/configure.in
deleted file mode 100644
index 4ba9c244efa..00000000000
--- a/intl/configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(dgettext.c)
-AM_CONFIG_HEADER(config.h:config.in)
-
-AM_PROG_INSTALL
-CY_GNU_GETTEXT
-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-
-AC_OUTPUT(Makefile)
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
deleted file mode 100644
index 27586e9159a..00000000000
--- a/intl/dcgettext.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-#include "hash-string.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
-# include <sys/param.h>
-#endif
-
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-const char _nl_default_dirname[] = GNULOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions.  */
-static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			       const char *msgid)) internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
-     internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCGETTEXT __dcgettext
-#else
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCGETTEXT (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  char *dirname, *xdomainname;
-  char *single_locale;
-  char *retval;
-  int saved_errno = errno;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid == NULL)
-    return NULL;
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     defintion left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-  /* First find matching binding.  */
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
-  else if (binding->dirname[0] == '/')
-    dirname = binding->dirname;
-  else
-    {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
-
-      path_max = (unsigned) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
-
-      dirname = (char *) alloca (path_max + dirname_len);
-      ADD_BLOCK (block_list, dirname);
-
-      __set_errno (0);
-      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
-	{
-	  path_max += PATH_INCR;
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
-	  __set_errno (0);
-	}
-
-      if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
-    }
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-  categoryvalue = guess_category_value (category, categoryname);
-
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + strlen (domainname) + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for th translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname);
-
-      if (domain != NULL)
-	{
-	  retval = find_msg (domain, msgid);
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-		  retval = find_msg (domain->successor[cnt], msgid);
-
-		  if (retval != NULL)
-		    break;
-		}
-	    }
-
-	  if (retval != NULL)
-	    {
-	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
-	      return retval;
-	    }
-	}
-    }
-  /* NOTREACHED */
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcgettext, dcgettext);
-#endif
-
-
-static char *
-internal_function
-find_msg (domain_file, msgid)
-     struct loaded_l10nfile *domain_file;
-     const char *msgid;
-{
-  size_t top, act, bottom;
-  struct loaded_domain *domain;
-
-  if (domain_file->decided == 0)
-    _nl_load_domain (domain_file);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-      nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
-      if (nstr == 0)
-	/* Hash table entry is empty.  */
-	return NULL;
-
-      if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	  && strcmp (msgid,
-		     domain->data + W (domain->must_swap,
-				       domain->orig_tab[nstr - 1].offset)) == 0)
-	return (char *) domain->data + W (domain->must_swap,
-					  domain->trans_tab[nstr - 1].offset);
-
-      while (1)
-	{
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-
-	  nstr = W (domain->must_swap, domain->hash_tab[idx]);
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	      && strcmp (msgid,
-			 domain->data + W (domain->must_swap,
-					   domain->orig_tab[nstr - 1].offset))
-	         == 0)
-	    return (char *) domain->data
-	      + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
-	}
-      /* NOTREACHED */
-    }
-
-  /* Now we try the default method:  binary search in the sorted
-     array of messages.  */
-  bottom = 0;
-  top = domain->nstrings;
-  while (bottom < top)
-    {
-      int cmp_val;
-
-      act = (bottom + top) / 2;
-      cmp_val = strcmp (msgid, domain->data
-			       + W (domain->must_swap,
-				    domain->orig_tab[act].offset));
-      if (cmp_val < 0)
-	top = act;
-      else if (cmp_val > 0)
-	bottom = act + 1;
-      else
-	break;
-    }
-
-  /* If an translation is found return this.  */
-  return bottom >= top ? NULL : (char *) domain->data
-                                + W (domain->must_swap,
-				     domain->trans_tab[act].offset);
-}
-
-
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (category)
-     int category;
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-/* Guess value of current locale from value of the environment variables.  */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  This is a GNU extension.  */
-  retval = getenv ("LANGUAGE");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
-     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
-     systems this can be done by the `setlocale' function itself.  */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  return setlocale (category, NULL);
-#else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Next comes the name of the desired category.  */
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Last possibility is the LANG environment variable.  */
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* We use C as the default domain.  POSIX says this is implementation
-     defined.  */
-  return "C";
-#endif
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct binding *runp;
-
-  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
-    {
-      free (runp->domainname);
-      if (runp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (runp->dirname);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
deleted file mode 100644
index e4a0cfdb6e0..00000000000
--- a/intl/dgettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dgettext(3) function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
-#else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale.  */
-char *
-DGETTEXT (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dgettext, dgettext);
-#endif
diff --git a/intl/explodename.c b/intl/explodename.c
deleted file mode 100644
index 5a911cee91b..00000000000
--- a/intl/explodename.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#include <sys/types.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-int
-_nl_explode_name (name, language, modifier, territory, codeset,
-		  normalized_codeset, special, sponsor, revision)
-     char *name;
-     const char **language;
-     const char **modifier;
-     const char **territory;
-     const char **codeset;
-     const char **normalized_codeset;
-     const char **special;
-     const char **sponsor;
-     const char **revision;
-{
-  enum { undecided, xpg, cen } syntax;
-  char *cp;
-  int mask;
-
-  *modifier = NULL;
-  *territory = NULL;
-  *codeset = NULL;
-  *normalized_codeset = NULL;
-  *special = NULL;
-  *sponsor = NULL;
-  *revision = NULL;
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = 0;
-  syntax = undecided;
-  *language = cp = name;
-  while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
-	 && cp[0] != '+' && cp[0] != ',')
-    ++cp;
-
-  if (*language == cp)
-    /* This does not make sense: language has to be specified.  Use
-       this entry as it is without exploding.  Perhaps it is an alias.  */
-    cp = strchr (*language, '\0');
-  else if (cp[0] == '_')
-    {
-      /* Next is the territory.  */
-      cp[0] = '\0';
-      *territory = ++cp;
-
-      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
-	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= TERRITORY;
-
-      if (cp[0] == '.')
-	{
-	  /* Next is the codeset.  */
-	  syntax = xpg;
-	  cp[0] = '\0';
-	  *codeset = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_CODESET;
-
-	  if (*codeset != cp && (*codeset)[0] != '\0')
-	    {
-	      *normalized_codeset = _nl_normalize_codeset (*codeset,
-							   cp - *codeset);
-	      if (strcmp (*codeset, *normalized_codeset) == 0)
-		free ((char *) *normalized_codeset);
-	      else
-		mask |= XPG_NORM_CODESET;
-	    }
-	}
-    }
-
-  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
-    {
-      /* Next is the modifier.  */
-      syntax = cp[0] == '@' ? xpg : cen;
-      cp[0] = '\0';
-      *modifier = ++cp;
-
-      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
-	     && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= XPG_MODIFIER | CEN_AUDIENCE;
-    }
-
-  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
-    {
-      syntax = cen;
-
-      if (cp[0] == '+')
-	{
- 	  /* Next is special application (CEN syntax).  */
-	  cp[0] = '\0';
-	  *special = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPECIAL;
-	}
-
-      if (cp[0] == ',')
-	{
- 	  /* Next is sponsor (CEN syntax).  */
-	  cp[0] = '\0';
-	  *sponsor = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPONSOR;
-	}
-
-      if (cp[0] == '_')
-	{
- 	  /* Next is revision (CEN syntax).  */
-	  cp[0] = '\0';
-	  *revision = ++cp;
-
-	  mask |= CEN_REVISION;
-	}
-    }
-
-  /* For CEN syntax values it might be important to have the
-     separator character in the file name, not for XPG syntax.  */
-  if (syntax == xpg)
-    {
-      if (*territory != NULL && (*territory)[0] == '\0')
-	mask &= ~TERRITORY;
-
-      if (*codeset != NULL && (*codeset)[0] == '\0')
-	mask &= ~XPG_CODESET;
-
-      if (*modifier != NULL && (*modifier)[0] == '\0')
-	mask &= ~XPG_MODIFIER;
-    }
-
-  return mask;
-}
diff --git a/intl/finddomain.c b/intl/finddomain.c
deleted file mode 100644
index 5409565fd3d..00000000000
--- a/intl/finddomain.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-/* List of already loaded domains.  */
-static struct loaded_l10nfile *_nl_loaded_domains;
-
-
-/* Return a data structure describing the message catalog described by
-   the DOMAINNAME and CATEGORY parameters with respect to the currently
-   established bindings.  */
-struct loaded_l10nfile *
-internal_function
-_nl_find_domain (dirname, locale, domainname)
-     const char *dirname;
-     char *locale;
-     const char *domainname;
-{
-  struct loaded_l10nfile *retval;
-  const char *language;
-  const char *modifier;
-  const char *territory;
-  const char *codeset;
-  const char *normalized_codeset;
-  const char *special;
-  const char *sponsor;
-  const char *revision;
-  const char *alias_value;
-  int mask;
-
-  /* LOCALE can consist of up to four recognized parts for the XPG syntax:
-
-		language[_territory[.codeset]][@modifier]
-
-     and six parts for the CEN syntax:
-
-	language[_territory][+audience][+special][,[sponsor][_revision]]
-
-     Beside the first part all of them are allowed to be missing.  If
-     the full specified locale is not found, the less specific one are
-     looked for.  The various parts will be stripped off according to
-     the following order:
-		(1) revision
-		(2) sponsor
-		(3) special
-		(4) codeset
-		(5) normalized codeset
-		(6) territory
-		(7) audience/modifier
-   */
-
-  /* If we have already tested for this locale entry there has to
-     be one data set in the list of loaded domains.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, NULL, NULL, NULL, domainname, 0);
-  if (retval != NULL)
-    {
-      /* We know something about this locale.  */
-      int cnt;
-
-      if (retval->decided == 0)
-	_nl_load_domain (retval);
-
-      if (retval->data != NULL)
-	return retval;
-
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
-
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-      return cnt >= 0 ? retval : NULL;
-      /* NOTREACHED */
-    }
-
-  /* See whether the locale value is an alias.  If yes its value
-     *overwrites* the alias name.  No test for the original value is
-     done.  */
-  alias_value = _nl_expand_alias (locale);
-  if (alias_value != NULL)
-    {
-#if defined _LIBC || defined HAVE_STRDUP
-      locale = strdup (alias_value);
-      if (locale == NULL)
-	return NULL;
-#else
-      size_t len = strlen (alias_value) + 1;
-      locale = (char *) malloc (len);
-      if (locale == NULL)
-	return NULL;
-
-      memcpy (locale, alias_value, len);
-#endif
-    }
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset, &special,
-			   &sponsor, &revision);
-
-  /* Create all possible locale entries which might be interested in
-     generalization.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier, special,
-			       sponsor, revision, domainname, 1);
-  if (retval == NULL)
-    /* This means we are out of core.  */
-    return NULL;
-
-  if (retval->decided == 0)
-    _nl_load_domain (retval);
-  if (retval->data == NULL)
-    {
-      int cnt;
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-    }
-
-  /* The room for an alias was dynamically allocated.  Free it now.  */
-  if (alias_value != NULL)
-    free (locale);
-
-  return retval;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct loaded_l10nfile *runp = _nl_loaded_domains;
-
-  while (runp != NULL)
-    {
-      struct loaded_l10nfile *here = runp;
-      if (runp->data != NULL)
-	_nl_unload_domain ((struct loaded_domain *) runp->data);
-      runp = runp->next;
-      free (here);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/intl/gettext.c b/intl/gettext.c
deleted file mode 100644
index 6bc5b94d3e8..00000000000
--- a/intl/gettext.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# ifdef STDC_HEADERS
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define GETTEXT __gettext
-# define DGETTEXT __dgettext
-#else
-# define GETTEXT gettext__
-# define DGETTEXT dgettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-GETTEXT (msgid)
-     const char *msgid;
-{
-  return DGETTEXT (NULL, msgid);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__gettext, gettext);
-#endif
diff --git a/intl/gettext.h b/intl/gettext.h
deleted file mode 100644
index 3887e876402..00000000000
--- a/intl/gettext.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Internal header for GNU gettext internationalization functions.
-   Copyright (C) 1995, 1997 Free Software Foundation, 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, 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 Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#include <stdio.h>
-
-#if HAVE_LIMITS_H || _LIBC
-# include <limits.h>
-#endif
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   doing that would require that the configure script compile and *run*
-   the resulting executable.  Locally running cross-compiled executables
-   is usually not possible.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/intl/gettextP.h b/intl/gettextP.h
deleted file mode 100644
index 61e2f871bc8..00000000000
--- a/intl/gettextP.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Header describing internals of gettext library
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _GETTEXTP_H
-#define _GETTEXTP_H
-
-#include "loadinfo.h"
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef W
-# define W(flag, data) ((flag) ? SWAP (data) : (data))
-#endif
-
-
-#ifdef _LIBC
-# include <byteswap.h>
-# define SWAP(i) bswap_32 (i)
-#else
-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
-
-static inline nls_uint32
-SWAP (i)
-     nls_uint32 i;
-{
-  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-#endif
-
-
-struct loaded_domain
-{
-  const char *data;
-  int use_mmap;
-  size_t mmap_size;
-  int must_swap;
-  nls_uint32 nstrings;
-  struct string_desc *orig_tab;
-  struct string_desc *trans_tab;
-  nls_uint32 hash_size;
-  nls_uint32 *hash_tab;
-};
-
-struct binding
-{
-  struct binding *next;
-  char *domainname;
-  char *dirname;
-};
-
-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
-						 char *__locale,
-						 const char *__domainname))
-     internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
-     internal_function;
-void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettextP.h  */
diff --git a/intl/hash-string.h b/intl/hash-string.h
deleted file mode 100644
index 66281078364..00000000000
--- a/intl/hash-string.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implements a string hashing function.
-   Copyright (C) 1995, 1997 Free Software Foundation, 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, 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 Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long hash_string PARAMS ((const char *__str_param));
-
-static inline unsigned long
-hash_string (str_param)
-     const char *str_param;
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned long) *str++;
-      g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
deleted file mode 100644
index 415a0f3b4f8..00000000000
--- a/intl/intl-compat.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
-   Library.
-   Copyright (C) 1995 Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-
-#undef gettext
-#undef dgettext
-#undef dcgettext
-#undef textdomain
-#undef bindtextdomain
-
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  return bindtextdomain__ (domainname, dirname);
-}
-
-
-char *
-dcgettext (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-  return dcgettext__ (domainname, msgid, category);
-}
-
-
-char *
-dgettext (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return dgettext__ (domainname, msgid);
-}
-
-
-char *
-gettext (msgid)
-     const char *msgid;
-{
-  return gettext__ (msgid);
-}
-
-
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  return textdomain__ (domainname);
-}
diff --git a/intl/intlh.inst.in b/intl/intlh.inst.in
deleted file mode 100644
index 95e15a8f266..00000000000
--- a/intl/intlh.inst.in
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-@INCLUDE_LOCALE_H@
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				     const char *__dirname));
-
-
-/* Optimized version of the functions above.  */
-#if defined __OPTIMIZED
-/* These must be a macro.  Inlined functions are useless because the
-   `__builtin_constant_p' predicate in dcgettext would always return
-   false.  */
-
-# define gettext(msgid) dgettext ((char *) 0, msgid)
-
-# define dgettext(domainname, msgid)					      \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-/* This global variable is defined in loadmsgcat.c.  We need a sign,
-   whether a new catalog was loaded, which can be associated with all
-   translations.  */
-extern int _nl_msg_cat_cntr;
-
-#  define dcgettext(domainname, msgid, category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       (dcgettext) ((domainname), (msgid), (category));		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = (dcgettext) ((domainname), (msgid), (category));	      \
-     __result;								      \
-    }))
-# endif
-#endif /* Optimizing. */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
deleted file mode 100644
index 3ef93b84733..00000000000
--- a/intl/l10nflist.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# ifndef stpcpy
-#  define stpcpy(dest, src) __stpcpy(dest, src)
-# endif
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Define function which are usually not available.  */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
-/* Returns the number of strings in ARGZ.  */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
-static size_t
-argz_count__ (argz, len)
-     const char *argz;
-     size_t len;
-{
-  size_t count = 0;
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len + 1;
-      len -= part_len + 1;
-      count++;
-    }
-  return count;
-}
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
-#endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
-static void
-argz_stringify__ (argz, len, sep)
-     char *argz;
-     size_t len;
-     int sep;
-{
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len;
-      len -= part_len + 1;
-      if (len > 0)
-	*argz++ = sep;
-    }
-}
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
-				  const char *entry));
-
-static char *
-argz_next__ (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
-{
-  if (entry)
-    {
-      if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
-
-      return entry >= argz + argz_len ? NULL : (char *) entry;
-    }
-  else
-    if (argz_len > 0)
-      return argz;
-    else
-      return 0;
-}
-# undef __argz_next
-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif	/* !_LIBC && !HAVE___ARGZ_NEXT */
-
-
-/* Return number of bits set in X.  */
-static int pop PARAMS ((int x));
-
-static inline int
-pop (x)
-     int x;
-{
-  /* We assume that no more than 16 bits are used.  */
-  x = ((x & ~0x5555) >> 1) + (x & 0x5555);
-  x = ((x & ~0x3333) >> 2) + (x & 0x3333);
-  x = ((x >> 4) + x) & 0x0f0f;
-  x = ((x >> 8) + x) & 0xff;
-
-  return x;
-}
-
-
-struct loaded_l10nfile *
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
-		    territory, codeset, normalized_codeset, modifier, special,
-		    sponsor, revision, filename, do_allocate)
-     struct loaded_l10nfile **l10nfile_list;
-     const char *dirlist;
-     size_t dirlist_len;
-     int mask;
-     const char *language;
-     const char *territory;
-     const char *codeset;
-     const char *normalized_codeset;
-     const char *modifier;
-     const char *special;
-     const char *sponsor;
-     const char *revision;
-     const char *filename;
-     int do_allocate;
-{
-  char *abs_filename;
-  struct loaded_l10nfile *last = NULL;
-  struct loaded_l10nfile *retval;
-  char *cp;
-  size_t entries;
-  int cnt;
-
-  /* Allocate room for the full file name.  */
-  abs_filename = (char *) malloc (dirlist_len
-				  + strlen (language)
-				  + ((mask & TERRITORY) != 0
-				     ? strlen (territory) + 1 : 0)
-				  + ((mask & XPG_CODESET) != 0
-				     ? strlen (codeset) + 1 : 0)
-				  + ((mask & XPG_NORM_CODESET) != 0
-				     ? strlen (normalized_codeset) + 1 : 0)
-				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0)
-				     ? strlen (modifier) + 1 : 0)
-				  + ((mask & CEN_SPECIAL) != 0
-				     ? strlen (special) + 1 : 0)
-				  + (((mask & CEN_SPONSOR) != 0
-				      || (mask & CEN_REVISION) != 0)
-				     ? (1 + ((mask & CEN_SPONSOR) != 0
-					     ? strlen (sponsor) + 1 : 0)
-					+ ((mask & CEN_REVISION) != 0
-					   ? strlen (revision) + 1 : 0)) : 0)
-				  + 1 + strlen (filename) + 1);
-
-  if (abs_filename == NULL)
-    return NULL;
-
-  retval = NULL;
-  last = NULL;
-
-  /* Construct file name.  */
-  memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, ':');
-  cp = abs_filename + (dirlist_len - 1);
-  *cp++ = '/';
-  cp = stpcpy (cp, language);
-
-  if ((mask & TERRITORY) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, territory);
-    }
-  if ((mask & XPG_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, codeset);
-    }
-  if ((mask & XPG_NORM_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, normalized_codeset);
-    }
-  if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
-    {
-      /* This component can be part of both syntaces but has different
-	 leading characters.  For CEN we use `+', else `@'.  */
-      *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
-      cp = stpcpy (cp, modifier);
-    }
-  if ((mask & CEN_SPECIAL) != 0)
-    {
-      *cp++ = '+';
-      cp = stpcpy (cp, special);
-    }
-  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
-    {
-      *cp++ = ',';
-      if ((mask & CEN_SPONSOR) != 0)
-	cp = stpcpy (cp, sponsor);
-      if ((mask & CEN_REVISION) != 0)
-	{
-	  *cp++ = '_';
-	  cp = stpcpy (cp, revision);
-	}
-    }
-
-  *cp++ = '/';
-  stpcpy (cp, filename);
-
-  /* Look in list of already loaded domains whether it is already
-     available.  */
-  last = NULL;
-  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
-    if (retval->filename != NULL)
-      {
-	int compare = strcmp (retval->filename, abs_filename);
-	if (compare == 0)
-	  /* We found it!  */
-	  break;
-	if (compare < 0)
-	  {
-	    /* It's not in the list.  */
-	    retval = NULL;
-	    break;
-	  }
-
-	last = retval;
-      }
-
-  if (retval != NULL || do_allocate == 0)
-    {
-      free (abs_filename);
-      return retval;
-    }
-
-  retval = (struct loaded_l10nfile *)
-    malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
-				* (1 << pop (mask))
-				* sizeof (struct loaded_l10nfile *)));
-  if (retval == NULL)
-    return NULL;
-
-  retval->filename = abs_filename;
-  retval->decided = (__argz_count (dirlist, dirlist_len) != 1
-		     || ((mask & XPG_CODESET) != 0
-			 && (mask & XPG_NORM_CODESET) != 0));
-  retval->data = NULL;
-
-  if (last == NULL)
-    {
-      retval->next = *l10nfile_list;
-      *l10nfile_list = retval;
-    }
-  else
-    {
-      retval->next = last->next;
-      last->next = retval;
-    }
-
-  entries = 0;
-  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
-     a real file.  So we have to use the DIRLIST separation mechanism
-     of the inner loop.  */
-  cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
-  for (; cnt >= 0; --cnt)
-    if ((cnt & ~mask) == 0
-	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
-	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
-      {
-	/* Iterate over all elements of the DIRLIST.  */
-	char *dir = NULL;
-
-	while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
-	       != NULL)
-	  retval->successor[entries++]
-	    = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
-				  language, territory, codeset,
-				  normalized_codeset, modifier, special,
-				  sponsor, revision, filename, 1);
-      }
-  retval->successor[entries] = NULL;
-
-  return retval;
-}
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  */
-const char *
-_nl_normalize_codeset (codeset, name_len)
-     const unsigned char *codeset;
-     size_t name_len;
-{
-  int len = 0;
-  int only_digit = 1;
-  char *retval;
-  char *wp;
-  size_t cnt;
-
-  for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum (codeset[cnt]))
-      {
-	++len;
-
-	if (isalpha (codeset[cnt]))
-	  only_digit = 0;
-      }
-
-  retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
-
-  if (retval != NULL)
-    {
-      if (only_digit)
-	wp = stpcpy (retval, "iso");
-      else
-	wp = retval;
-
-      for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha (codeset[cnt]))
-	  *wp++ = tolower (codeset[cnt]);
-	else if (isdigit (codeset[cnt]))
-	  *wp++ = codeset[cnt];
-
-      *wp = '\0';
-    }
-
-  return (const char *) retval;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/intl/libgettext.h b/intl/libgettext.h
deleted file mode 100644
index f8c224e47f7..00000000000
--- a/intl/libgettext.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* Because on some systems (e.g. Solaris) we sometimes have to include
-   the systems libintl.h as well as this file we have more complex
-   include protection above.  But the systems header might perhaps also
-   define _LIBINTL_H and therefore we have to protect the definition here.  */
-
-#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
-#ifndef _LIBINTL_H
-# define _LIBINTL_H	1
-#endif
-#define _LIBGETTEXT_H	1
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef NULL
-# if !defined __cplusplus || defined __GNUC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL (0)
-# endif
-#endif
-
-#if !HAVE_LC_MESSAGES
-/* This value determines the behaviour of the gettext() and dgettext()
-   function.  But some system does not have this defined.  Define it
-   to a default value.  */
-# define LC_MESSAGES (-1)
-#endif
-
-
-/* Declarations for gettext-using-catgets interface.  Derived from
-   Jim Meyering's libintl.h.  */
-struct _msg_ent
-{
-  const char *_msg;
-  int _msg_number;
-};
-
-
-#if HAVE_CATGETS
-/* These two variables are defined in the automatically by po-to-tbl.sed
-   generated file `cat-id-tbl.c'.  */
-extern const struct _msg_ent _msg_tbl[];
-extern int _msg_tbl_length;
-#endif
-
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-extern char *gettext__ PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				  const char *__dirname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				    const char *__dirname));
-
-#if ENABLE_NLS
-
-/* Solaris 2.3 has the gettext function but dcgettext is missing.
-   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
-   has dcgettext.  */
-# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
-
-#  define gettext(Msgid)						      \
-     dgettext (NULL, Msgid)
-
-#  define dgettext(Domainname, Msgid)					      \
-     dcgettext (Domainname, Msgid, LC_MESSAGES)
-
-#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-/* This global variable is defined in loadmsgcat.c.  We need a sign,
-   whether a new catalog was loaded, which can be associated with all
-   translations.  */
-extern int _nl_msg_cat_cntr;
-
-#   define dcgettext(Domainname, Msgid, Category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (Msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       dcgettext__ (Domainname, Msgid, Category);		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = dcgettext__ (Domainname, Msgid, Category);		      \
-     __result;								      \
-    }))
-#  endif
-# endif
-
-#else
-
-# define gettext(Msgid) (Msgid)
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) ((char *) Domainname)
-# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
-
-#endif
-
-/* @@ begin of epilog @@ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/intl/libintl.glibc b/intl/libintl.glibc
deleted file mode 100644
index c55b447678b..00000000000
--- a/intl/libintl.glibc
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-   This file is derived from the file libgettext.h in the GNU gettext package.
-
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <features.h>
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-__BEGIN_DECLS
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext __P ((__const char *__msgid));
-extern char *__gettext __P ((__const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext __P ((__const char *__domainname,
-			    __const char *__msgid));
-extern char *__dgettext __P ((__const char *__domainname,
-			      __const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext __P ((__const char *__domainname,
-			     __const char *__msgid, int __category));
-extern char *__dcgettext __P ((__const char *__domainname,
-			       __const char *__msgid, int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain __P ((__const char *__domainname));
-extern char *__textdomain __P ((__const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain __P ((__const char *__domainname,
-				  __const char *__dirname));
-extern char *__bindtextdomain __P ((__const char *__domainname,
-				    __const char *__dirname));
-
-
-/* Optimized version of the function above.  */
-#if defined __OPTIMIZE__
-
-/* We need NULL for `gettext'.  */
-# define __need_NULL
-# include <stddef.h>
-
-/* We need LC_MESSAGES for `dgettext'.  */
-# include <locale.h>
-
-/* These must be macros.  Inlined functions are useless because the
-   `__builtin_constant_p' predicate in dcgettext would always return
-   false.  */
-
-# define gettext(msgid) dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid)					      \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-/* Variable defined in loadmsgcat.c which gets incremented every time a
-   new catalog is loaded.  */
-extern int _nl_msg_cat_cntr;
-
-#  define dcgettext(domainname, msgid, category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       __dcgettext ((domainname), (msgid), (category));		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = __dcgettext ((domainname), (msgid), (category));	      \
-     __result;								      \
-    }))
-# endif
-#endif /* Optimizing. */
-
-
-__END_DECLS
-
-#endif /* libintl.h */
diff --git a/intl/linux-msg.sed b/intl/linux-msg.sed
deleted file mode 100644
index f9b8188d783..00000000000
--- a/intl/linux-msg.sed
+++ /dev/null
@@ -1,100 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
-# Copyright 1995, 2002 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# Mitch's old catalog format does not allow comments.
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-  s/msgid[ 	]*"//
-#
-# This does not work now with the new format.
-# /"$/! {
-#   s/\\$//
-#   s/$/ ... (more lines following)"/
-# }
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
-}
-#
-# The .msg file contains, other than the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/# \1/
-# Clear substitution flag.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that D includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
deleted file mode 100644
index b797c0c5bae..00000000000
--- a/intl/loadinfo.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-/* Encoding of locale name parts.  */
-#define CEN_REVISION		1
-#define CEN_SPONSOR		2
-#define CEN_SPECIAL		4
-#define XPG_NORM_CODESET	8
-#define XPG_CODESET		16
-#define TERRITORY		32
-#define CEN_AUDIENCE		64
-#define XPG_MODIFIER		128
-
-#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
-
-
-struct loaded_l10nfile
-{
-  const char *filename;
-  int decided;
-
-  const void *data;
-
-  struct loaded_l10nfile *next;
-  struct loaded_l10nfile *successor[1];
-};
-
-
-extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
-						  size_t name_len));
-
-extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-			    const char *dirlist, size_t dirlist_len, int mask,
-			    const char *language, const char *territory,
-			    const char *codeset,
-			    const char *normalized_codeset,
-			    const char *modifier, const char *special,
-			    const char *sponsor, const char *revision,
-			    const char *filename, int do_allocate));
-
-
-extern const char *_nl_expand_alias PARAMS ((const char *name));
-
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
-				     const char **modifier,
-				     const char **territory,
-				     const char **codeset,
-				     const char **normalized_codeset,
-				     const char **special,
-				     const char **sponsor,
-				     const char **revision));
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
deleted file mode 100644
index ab11bc95d5c..00000000000
--- a/intl/loadmsgcat.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/* Load needed message catalogs.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, 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, 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
-# include <sys/mman.h>
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions.  This is required by the standard
-   because some ISO C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define open   __open
-# define close  __close
-# define read   __read
-# define mmap   __mmap
-# define munmap __munmap
-#endif
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
-   with all translations.  This is important if the translations are
-   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr = 0;
-
-
-/* Load the message catalogs specified by FILENAME.  If it is no valid
-   message catalog do nothing.  */
-void
-internal_function
-_nl_load_domain (domain_file)
-     struct loaded_l10nfile *domain_file;
-{
-  int fd;
-  size_t size;
-  struct stat st;
-  struct mo_file_header *data = (struct mo_file_header *) -1;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  int use_mmap = 0;
-#endif
-  struct loaded_domain *domain;
-
-  domain_file->decided = 1;
-  domain_file->data = NULL;
-
-  /* If the record does not represent a valid locale the FILENAME
-     might be NULL.  This can happen when according to the given
-     specification the locale file name is different for XPG and CEN
-     syntax.  */
-  if (domain_file->filename == NULL)
-    return;
-
-  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY);
-  if (fd == -1)
-    return;
-
-  /* We must know about the size of the file.  */
-  if (fstat (fd, &st) != 0
-      || (size = (size_t) st.st_size) != st.st_size
-      || size < sizeof (struct mo_file_header))
-    {
-      /* Something went wrong.  */
-      close (fd);
-      return;
-    }
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  /* Now we are ready to load the file.  If mmap() is available we try
-     this first.  If not available or it failed we try to load it.  */
-  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
-					 MAP_PRIVATE, fd, 0);
-
-  if (data != (struct mo_file_header *) -1)
-    {
-      /* mmap() call was successful.  */
-      close (fd);
-      use_mmap = 1;
-    }
-#endif
-
-  /* If the data is not yet available (i.e. mmap'ed) we try to load
-     it manually.  */
-  if (data == (struct mo_file_header *) -1)
-    {
-      size_t to_read;
-      char *read_ptr;
-
-      data = (struct mo_file_header *) malloc (size);
-      if (data == NULL)
-	return;
-
-      to_read = size;
-      read_ptr = (char *) data;
-      do
-	{
-	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb == -1)
-	    {
-	      close (fd);
-	      return;
-	    }
-
-	  read_ptr += nb;
-	  to_read -= nb;
-	}
-      while (to_read > 0);
-
-      close (fd);
-    }
-
-  /* Using the magic number we can test whether it really is a message
-     catalog file.  */
-  if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
-    {
-      /* The magic number is wrong: not a message catalog file.  */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      return;
-    }
-
-  domain_file->data
-    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain_file->data == NULL)
-    return;
-
-  domain = (struct loaded_domain *) domain_file->data;
-  domain->data = (char *) data;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-  domain->use_mmap = use_mmap;
-#endif
-  domain->mmap_size = size;
-  domain->must_swap = data->magic != _MAGIC;
-
-  /* Fill in the information about the available tables.  */
-  switch (W (domain->must_swap, data->revision))
-    {
-    case 0:
-      domain->nstrings = W (domain->must_swap, data->nstrings);
-      domain->orig_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab = (nls_uint32 *)
-	((char *) data + W (domain->must_swap, data->hash_tab_offset));
-      break;
-    default:
-      /* This is an illegal revision.  */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      free (domain);
-      domain_file->data = NULL;
-      return;
-    }
-
-  /* Show that one domain is changed.  This might make some cached
-     translations invalid.  */
-  ++_nl_msg_cat_cntr;
-}
-
-
-#ifdef _LIBC
-void
-internal_function
-_nl_unload_domain (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->use_mmap)
-    munmap ((caddr_t) domain->data, domain->mmap_size);
-  else
-    free ((void *) domain->data);
-
-  free (domain);
-}
-#endif
diff --git a/intl/localealias.c b/intl/localealias.c
deleted file mode 100644
index 833df0351aa..00000000000
--- a/intl/localealias.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/* Handle aliases for locale names.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define strcasecmp __strcasecmp
-
-# define mempcpy __mempcpy
-# define HAVE_MEMPCPY	1
-
-/* We need locking here since we can be called from different places.  */
-# include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
-#endif
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-struct alias_map
-{
-  const char *alias;
-  const char *value;
-};
-
-
-static char *string_space = NULL;
-static size_t string_space_act = 0;
-static size_t string_space_max = 0;
-static struct alias_map *map;
-static size_t nmap = 0;
-static size_t maxmap = 0;
-
-
-/* Prototypes for local functions.  */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
-     internal_function;
-static void extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
-				  const struct alias_map *map2));
-
-
-const char *
-_nl_expand_alias (name)
-    const char *name;
-{
-  static const char *locale_alias_path = LOCALE_ALIAS_PATH;
-  struct alias_map *retval;
-  const char *result = NULL;
-  size_t added;
-
-#ifdef _LIBC
-  __libc_lock_lock (lock);
-#endif
-
-  do
-    {
-      struct alias_map item;
-
-      item.alias = name;
-
-      if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					       sizeof (struct alias_map),
-					       (int (*) PARAMS ((const void *,
-								 const void *))
-						) alias_compare);
-      else
-	retval = NULL;
-
-      /* We really found an alias.  Return the value.  */
-      if (retval != NULL)
-	{
-	  result = retval->value;
-	  break;
-	}
-
-      /* Perhaps we can find another alias file.  */
-      added = 0;
-      while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	  const char *start;
-
-	  while (locale_alias_path[0] == ':')
-	    ++locale_alias_path;
-	  start = locale_alias_path;
-
-	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
-	    ++locale_alias_path;
-
-	  if (start < locale_alias_path)
-	    added = read_alias_file (start, locale_alias_path - start);
-	}
-    }
-  while (added != 0);
-
-#ifdef _LIBC
-  __libc_lock_unlock (lock);
-#endif
-
-  return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (fname, fname_len)
-     const char *fname;
-     int fname_len;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  FILE *fp;
-  char *full_fname;
-  size_t added;
-  static const char aliasfile[] = "/locale.alias";
-
-  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-  ADD_BLOCK (block_list, full_fname);
-#ifdef HAVE_MEMPCPY
-  mempcpy (mempcpy (full_fname, fname, fname_len),
-	   aliasfile, sizeof aliasfile);
-#else
-  memcpy (full_fname, fname, fname_len);
-  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
-  fp = fopen (full_fname, "r");
-  if (fp == NULL)
-    {
-      FREE_BLOCKS (block_list);
-      return 0;
-    }
-
-  added = 0;
-  while (!feof (fp))
-    {
-      /* It is a reasonable approach to use a fix buffer here because
-	 a) we are only interested in the first two fields
-	 b) these fields must be usable as file names and so must not
-	    be that long
-       */
-      unsigned char buf[BUFSIZ];
-      unsigned char *alias;
-      unsigned char *value;
-      unsigned char *cp;
-
-      if (fgets (buf, sizeof buf, fp) == NULL)
-	/* EOF reached.  */
-	break;
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-	 the rest of the line.  */
-      if (strchr (buf, '\n') == NULL)
-	{
-	  char altbuf[BUFSIZ];
-	  do
-	    if (fgets (altbuf, sizeof altbuf, fp) == NULL)
-	      /* Make sure the inner loop will be left.  The outer loop
-		 will exit at the `feof' test.  */
-	      break;
-	  while (strchr (altbuf, '\n') == NULL);
-	}
-
-      cp = buf;
-      /* Ignore leading white space.  */
-      while (isspace (cp[0]))
-	++cp;
-
-      /* A leading '#' signals a comment line.  */
-      if (cp[0] != '\0' && cp[0] != '#')
-	{
-	  alias = cp++;
-	  while (cp[0] != '\0' && !isspace (cp[0]))
-	    ++cp;
-	  /* Terminate alias name.  */
-	  if (cp[0] != '\0')
-	    *cp++ = '\0';
-
-	  /* Now look for the beginning of the value.  */
-	  while (isspace (cp[0]))
-	    ++cp;
-
-	  if (cp[0] != '\0')
-	    {
-	      size_t alias_len;
-	      size_t value_len;
-
-	      value = cp++;
-	      while (cp[0] != '\0' && !isspace (cp[0]))
-		++cp;
-	      /* Terminate value.  */
-	      if (cp[0] == '\n')
-		{
-		  /* This has to be done to make the following test
-		     for the end of line possible.  We are looking for
-		     the terminating '\n' which do not overwrite here.  */
-		  *cp++ = '\0';
-		  *cp = '\n';
-		}
-	      else if (cp[0] != '\0')
-		*cp++ = '\0';
-
-	      if (nmap >= maxmap)
-		extend_alias_table ();
-
-	      alias_len = strlen (alias) + 1;
-	      value_len = strlen (value) + 1;
-
-	      if (string_space_act + alias_len + value_len > string_space_max)
-		{
-		  /* Increase size of memory pool.  */
-		  size_t new_size = (string_space_max
-				     + (alias_len + value_len > 1024
-					? alias_len + value_len : 1024));
-		  char *new_pool = (char *) realloc (string_space, new_size);
-		  if (new_pool == NULL)
-		    {
-		      FREE_BLOCKS (block_list);
-		      return added;
-		    }
-		  string_space = new_pool;
-		  string_space_max = new_size;
-		}
-
-	      map[nmap].alias = memcpy (&string_space[string_space_act],
-					alias, alias_len);
-	      string_space_act += alias_len;
-
-	      map[nmap].value = memcpy (&string_space[string_space_act],
-					value, value_len);
-	      string_space_act += value_len;
-
-	      ++nmap;
-	      ++added;
-	    }
-	}
-    }
-
-  /* Should we test for ferror()?  I think we have to silently ignore
-     errors.  --drepper  */
-  fclose (fp);
-
-  if (added > 0)
-    qsort (map, nmap, sizeof (struct alias_map),
-	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
-
-  FREE_BLOCKS (block_list);
-  return added;
-}
-
-
-static void
-extend_alias_table ()
-{
-  size_t new_size;
-  struct alias_map *new_map;
-
-  new_size = maxmap == 0 ? 100 : 2 * maxmap;
-  new_map = (struct alias_map *) realloc (map, (new_size
-						* sizeof (struct alias_map)));
-  if (new_map == NULL)
-    /* Simply don't extend: we don't have any more core.  */
-    return;
-
-  map = new_map;
-  maxmap = new_size;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (string_space != NULL)
-    free (string_space);
-  if (map != NULL)
-    free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
-static int
-alias_compare (map1, map2)
-     const struct alias_map *map1;
-     const struct alias_map *map2;
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
-  return strcasecmp (map1->alias, map2->alias);
-#else
-  const unsigned char *p1 = (const unsigned char *) map1->alias;
-  const unsigned char *p2 = (const unsigned char *) map2->alias;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      /* I know this seems to be odd but the tolower() function in
-	 some systems libc cannot handle nonalpha characters.  */
-      c1 = isupper (*p1) ? tolower (*p1) : *p1;
-      c2 = isupper (*p2) ? tolower (*p2) : *p2;
-      if (c1 == '\0')
-	break;
-      ++p1;
-      ++p2;
-    }
-  while (c1 == c2);
-
-  return c1 - c2;
-#endif
-}
diff --git a/intl/po2tbl.sed.in b/intl/po2tbl.sed.in
deleted file mode 100644
index ebb32f29353..00000000000
--- a/intl/po2tbl.sed.in
+++ /dev/null
@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-#
-1 {
-  i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
-  h
-  s/.*/0/
-  x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
diff --git a/intl/textdomain.c b/intl/textdomain.c
deleted file mode 100644
index 9cec75cb5e3..00000000000
--- a/intl/textdomain.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Implementation of the textdomain(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgettext.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Name of the default text domain.  */
-extern const char _nl_default_default_domain[];
-
-/* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define TEXTDOMAIN __textdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define TEXTDOMAIN textdomain__
-#endif
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-char *
-TEXTDOMAIN (domainname)
-     const char *domainname;
-{
-  char *old;
-
-  /* A NULL pointer requests the current setting.  */
-  if (domainname == NULL)
-    return (char *) _nl_current_default_domain;
-
-  old = (char *) _nl_current_default_domain;
-
-  /* If domain name is the null string set to default domain "messages".  */
-  if (domainname[0] == '\0'
-      || strcmp (domainname, _nl_default_default_domain) == 0)
-    _nl_current_default_domain = _nl_default_default_domain;
-  else
-    {
-      /* If the following malloc fails `_nl_current_default_domain'
-	 will be NULL.  This value will be returned and so signals we
-	 are out of core.  */
-#if defined _LIBC || defined HAVE_STRDUP
-      _nl_current_default_domain = strdup (domainname);
-#else
-      size_t len = strlen (domainname) + 1;
-      char *cp = (char *) malloc (len);
-      if (cp != NULL)
-	memcpy (cp, domainname, len);
-      _nl_current_default_domain = cp;
-#endif
-    }
-
-  if (old != _nl_default_default_domain)
-    free (old);
-
-  return (char *) _nl_current_default_domain;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__textdomain, textdomain);
-#endif
diff --git a/intl/xopen-msg.sed b/intl/xopen-msg.sed
deleted file mode 100644
index 1d257d3e0b9..00000000000
--- a/intl/xopen-msg.sed
+++ /dev/null
@@ -1,104 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright 1995, 2002 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# We copy all comments into the .msg file.  Perhaps they can help.
-#
-/^#/ s/^#[ 	]*/$ /p
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-# Does not work now
-#  /"$/! {
-#    s/\\$//
-#    s/$/ ... (more lines following)"/
-#  }
-  s/^msgid[ 	]*"\(.*\)"$/$ Original Message: \1/
-  p
-}
-#
-# The .msg file contains, other than the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/\1/
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-# Bring the line in the format `<number> <message>'
-  G
-  s/^[^\n]*$/& /
-  s/\(.*\)\n\([0-9]*\)/\2 \1/
-# Clear flag from last substitution.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is a continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that `D' includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use the sed command `D' here
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
deleted file mode 100644
index 1f705ca9e70..00000000000
--- a/sim/sh64/ChangeLog
+++ /dev/null
@@ -1,392 +0,0 @@
-2005-05-02  Corinna Vinschen  <vinschen@redhat.com>
-
-	* sh-desc.h: Move extern declaration of sh_cgen_ifld_table after
-	inclusion of cgen.h.
-
-2005-04-15  Corinna Vinschen  <vinschen@redhat.com>
-
-	* configure.ac: New file.
-	* configure.in: Remove.
-	* configure: Regenerate.
-	* defs-media.h (sem_fields): Add missing sfmt_ldhil member.
-	* sim-if.c (sim_open): Use struct bfd instead of struct _bfd.
-	(sim_create_inferior): Ditto.
-
-2004-12-08  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure: Regenerate for ../common/aclocal.m4 update.
-
-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 2a6ab864694..00000000000
--- a/sim/sh64/configure
+++ /dev/null
@@ -1,9007 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="Makefile.in"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB SET_MAKE CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile CGEN_MAINT cgendir cgen cgen_breaks LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --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
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-nls           do not use Native Language Support
-  --enable-maintainer-mode		Enable developer functionality.
-  --enable-sim-bswap			Use Host specific BSWAP instruction.
-  --enable-sim-cflags=opts		Extra CFLAGS for use in building simulator
-  --enable-sim-debug=opts		Enable debugging flags
-  --enable-sim-stdio			Specify whether to use stdio for console input/output.
-  --enable-sim-trace=opts		Enable tracing flags
-  --enable-sim-profile=opts		Enable profiling flags
-  --enable-sim-endian=endian		Specify target byte endian orientation.
-  --enable-sim-alignment=align		Specify strict,  nonstrict or forced alignment of memory accesses.
-  --enable-sim-hostendian=end		Specify host byte endian orientation.
-  --enable-sim-scache=size		Specify simulator execution cache size.
-  --enable-sim-default-model=model	Specify default model to simulate.
-  --enable-sim-environment=environment	Specify mixed, user, virtual or operating environment.
-  --enable-sim-inline=inlines		Specify which functions should be inlined.
-  --enable-cgen-maint=DIR    build cgen generated files
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-included-gettext use the GNU gettext library included here
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-          ac_config_headers="$ac_config_headers config.h:config.in"
-
-
-# This file contains common code used by all simulators.
-#
-# SIM_AC_COMMON invokes AC macros used by all simulators and by the common
-# directory.  It is intended to be invoked before any target specific stuff.
-# SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
-# It is intended to be invoked last.
-#
-# The simulator's configure.in should look like:
-#
-# 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
-#
-# ... target specific stuff ...
-#
-# SIM_AC_OUTPUT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-
-
-
-
-
-
-
-# This file contains common code used by all simulators.
-#
-# common.m4 invokes AC macros used by all simulators and by the common
-# directory.  It is intended to be included before any target specific
-# stuff.  SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate
-# the Makefile.  It is intended to be invoked last.
-#
-# The simulator's configure.in should look like:
-#
-# dnl Process this file with autoconf to produce a configure script.
-# AC_PREREQ(2.5)dnl
-# AC_INIT(Makefile.in)
-# AC_CONFIG_HEADER(config.h:config.in)
-#
-# sinclude(../common/aclocal.m4)
-# sinclude(../common/common.m4)
-#
-# ... target specific stuff ...
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-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"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-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 $# != 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
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&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 "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-# 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
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# 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"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /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
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-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 "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&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}'
-
-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}
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-ALL_LINGUAS=
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 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 conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-if test "${ac_cv_search_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  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 <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#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);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* 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;
-  }
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((off_t *) 0)
-  return 0;
-if (sizeof (off_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_off_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_off_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6
-if test $ac_cv_type_off_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define off_t long
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
-_ACEOF
-
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_working_alloca_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_alloca_works=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_alloca_works=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-
-if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-else
-  # 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 <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* 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 ();
-/* 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
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
-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;
-}
-
-int
-main ()
-{
-  exit (find_stack_direction () < 0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_stack_direction=1
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-
-
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* 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 ();
-/* 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
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* 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 file system buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propagated 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 <fcntl.h>
-#include <sys/mman.h>
-
-#if !STDC_HEADERS && !HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#if !HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h.  */
-# if !HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  if 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 */
-
-int
-main ()
-{
-  char *data, *data2, *data3;
-  int i, pagesize;
-  int fd;
-
-  pagesize = getpagesize ();
-
-  /* First, make a file with some known garbage in it. */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    exit (1);
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = creat ("conftest.mmap", 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 ("conftest.mmap", O_RDWR);
-  if (fd < 0)
-    exit (1);
-  data2 = (char *) malloc (2 * pagesize);
-  if (!data2)
-    exit (1);
-  data2 += (pagesize - ((long) 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 = (char *) 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);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-fi
-rm -f conftest.mmap
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* 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 ();
-/* 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
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-
-for ac_func in stpcpy
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* 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 ();
-/* 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
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     cat >>confdefs.h <<\_ACEOF
-#define HAVE_STPCPY 1
-_ACEOF
-
-   fi
-
-   if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <locale.h>
-int
-main ()
-{
-return LC_MESSAGES
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  am_cv_val_LC_MESSAGES=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_val_LC_MESSAGES=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
-
-    fi
-  fi
-   echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-        # 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 "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
-
-
-    USE_INCLUDED_LIBINTL=no
-
-        if test "$USE_NLS" = "yes"; then
-      cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
-
-      echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
-
-# 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 "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&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
-
-	if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <libintl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_libintl_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-
-fi
-if test $ac_cv_header_libintl_h = yes; then
-  echo "$as_me:$LINENO: checking for gettext in libc" >&5
-echo $ECHO_N "checking for gettext in libc... $ECHO_C" >&6
-if test "${gt_cv_func_gettext_libc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-int
-main ()
-{
-return (int) gettext ("")
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_gettext_libc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_gettext_libc=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gettext_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gettext_libc" >&6
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_intl_bindtextdomain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_intl_bindtextdomain=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
-if test $ac_cv_lib_intl_bindtextdomain = yes; then
-  echo "$as_me:$LINENO: checking for gettext in libintl" >&5
-echo $ECHO_N "checking for gettext in libintl... $ECHO_C" >&6
-if test "${gt_cv_func_gettext_libintl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return (int) gettext ("")
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  gt_cv_func_gettext_libintl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_gettext_libintl=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gettext_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gettext_libintl" >&6
-fi
-
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
-
-	      # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-	      if test "$MSGFMT" != "no"; then
-
-for ac_func in dcgettext
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* 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 ();
-/* 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
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-		# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-
-if test -n "$GMSGFMT"; then
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-		# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  CATOBJEXT=.gmo
-		   DATADIRNAME=share
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-CATOBJEXT=.mo
-		   DATADIRNAME=lib
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-
-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 "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-        # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-
-if test -n "$GMSGFMT"; then
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-        # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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 "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&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 "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&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 "$as_me:$LINENO: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
-       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 "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&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
-	 if test "${ac_cv_header_linux_version_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for linux/version.h" >&5
-echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6
-if test "${ac_cv_header_linux_version_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking linux/version.h usability" >&5
-echo $ECHO_N "checking linux/version.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <linux/version.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking linux/version.h presence" >&5
-echo $ECHO_N "checking linux/version.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <linux/version.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: linux/version.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: linux/version.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: linux/version.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/version.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: linux/version.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/version.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: linux/version.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/version.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: linux/version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for linux/version.h" >&5
-echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6
-if test "${ac_cv_header_linux_version_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_linux_version_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6
-
-fi
-if test $ac_cv_header_linux_version_h = yes; then
-  msgformat=linux
-else
-  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_header in stdlib.h string.h strings.h unistd.h time.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in sys/time.h sys/resource.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in fcntl.h fpu_control.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-for ac_header in dlfcn.h errno.h sys/stat.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-for ac_func in getrusage time sigaction __setfpucw
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* 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 ();
-/* 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
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-# Check for socket libraries
-
-echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
-echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_bind+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_socket_bind=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_bind=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_bind" >&6
-if test $ac_cv_lib_socket_bind = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
-  LIBS="-lsocket $LIBS"
-
-fi
-
-
-echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
-
-  LIBS="-lnsl $LIBS"
-
-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 "$as_me:$LINENO: error: \"--enable-maintainer-mode does not take a value\"" >&5
-echo "$as_me: error: \"--enable-maintainer-mode does not take a value\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: error: \"--enable-sim-bswap does not take a value\"" >&5
-echo "$as_me: error: \"--enable-sim-bswap does not take a value\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: error: \"Please use --enable-sim-debug instead.\"" >&5
-echo "$as_me: error: \"Please use --enable-sim-debug instead.\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&5
-echo "$as_me: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_signal=void
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-
-
-
-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 "$as_me:$LINENO: error: \"Unknown value $enableval for --enable-sim-endian\"" >&5
-echo "$as_me: error: \"Unknown value $enableval for --enable-sim-endian\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: error: \"Unknown value $enableval passed to --enable-sim-alignment\"" >&5
-echo "$as_me: error: \"Unknown value $enableval passed to --enable-sim-alignment\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: error: \"Unknown value $enableval for --enable-sim-hostendian\"" >&5
-echo "$as_me: error: \"Unknown value $enableval for --enable-sim-hostendian\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end 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;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_bigendian=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-int
-main ()
-{
- _ascii (); _ebcdic ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
-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);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-
-  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_scache="-DWITH_SCACHE=${enableval}";;
-  *)	{ { echo "$as_me:$LINENO: error: \"Bad value $enableval passed to --enable-sim-scache\"" >&5
-echo "$as_me: error: \"Bad value $enableval passed to --enable-sim-scache\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: error: \"Missing argument to --enable-sim-default-model\"" >&5
-echo "$as_me: error: \"Missing argument to --enable-sim-default-model\"" >&2;}
-   { (exit 1); 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 "$as_me:$LINENO: error: \"Unknown value $enableval passed to --enable-sim-environment\"" >&5
-echo "$as_me: error: \"Unknown value $enableval passed to --enable-sim-environment\"" >&2;}
-   { (exit 1); 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
-cgen=guile
-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
-	cgen=guile
-	;;
-esac
-fi; if test x${cgen_maint} != xno ; then
-  CGEN_MAINT=''
-else
-  CGEN_MAINT='#'
-fi
-
-
-
-
-
-
-ac_sources="$sim_link_files"
-ac_dests="$sim_link_links"
-while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
-  ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"
-done
-          ac_config_links="$ac_config_links $ac_config_links_1"
-
-cgen_breaks=""
-if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then
-cgen_breaks="break cgen_rtx_error";
-fi
-
-          ac_config_files="$ac_config_files Makefile.sim:Makefile.in"
-
-          ac_config_files="$ac_config_files Make-common.sim:../common/Make-common.in"
-
-          ac_config_files="$ac_config_files .gdbinit:../common/gdbinit.in"
-
-          ac_config_commands="$ac_config_commands Makefile"
-
-          ac_config_commands="$ac_config_commands stamp-h"
-
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration links:
-$config_links
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile.sim" ) CONFIG_FILES="$CONFIG_FILES Makefile.sim:Makefile.in" ;;
-  "Make-common.sim" ) CONFIG_FILES="$CONFIG_FILES Make-common.sim:../common/Make-common.in" ;;
-  ".gdbinit" ) CONFIG_FILES="$CONFIG_FILES .gdbinit:../common/gdbinit.in" ;;
-  "$ac_config_links_1" ) CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;;
-  "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
-  "stamp-h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@sim_environment@,$sim_environment,;t t
-s,@sim_alignment@,$sim_alignment,;t t
-s,@sim_assert@,$sim_assert,;t t
-s,@sim_bitsize@,$sim_bitsize,;t t
-s,@sim_endian@,$sim_endian,;t t
-s,@sim_hostendian@,$sim_hostendian,;t t
-s,@sim_float@,$sim_float,;t t
-s,@sim_scache@,$sim_scache,;t t
-s,@sim_default_model@,$sim_default_model,;t t
-s,@sim_hw_cflags@,$sim_hw_cflags,;t t
-s,@sim_hw_objs@,$sim_hw_objs,;t t
-s,@sim_hw@,$sim_hw,;t t
-s,@sim_inline@,$sim_inline,;t t
-s,@sim_packages@,$sim_packages,;t t
-s,@sim_regparm@,$sim_regparm,;t t
-s,@sim_reserved_bits@,$sim_reserved_bits,;t t
-s,@sim_smp@,$sim_smp,;t t
-s,@sim_stdcall@,$sim_stdcall,;t t
-s,@sim_xor_endian@,$sim_xor_endian,;t t
-s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
-s,@WERROR_CFLAGS@,$WERROR_CFLAGS,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
-s,@HDEFINES@,$HDEFINES,;t t
-s,@AR@,$AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@ALLOCA@,$ALLOCA,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
-s,@CATALOGS@,$CATALOGS,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@DATADIRNAME@,$DATADIRNAME,;t t
-s,@GMOFILES@,$GMOFILES,;t t
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
-s,@INTLDEPS@,$INTLDEPS,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@INTLOBJS@,$INTLOBJS,;t t
-s,@POFILES@,$POFILES,;t t
-s,@POSUB@,$POSUB,;t t
-s,@INCLUDE_LOCALE_H@,$INCLUDE_LOCALE_H,;t t
-s,@GT_NO@,$GT_NO,;t t
-s,@GT_YES@,$GT_YES,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@l@,$l,;t t
-s,@MAINT@,$MAINT,;t t
-s,@sim_bswap@,$sim_bswap,;t t
-s,@sim_cflags@,$sim_cflags,;t t
-s,@sim_debug@,$sim_debug,;t t
-s,@sim_stdio@,$sim_stdio,;t t
-s,@sim_trace@,$sim_trace,;t t
-s,@sim_profile@,$sim_profile,;t t
-s,@CGEN_MAINT@,$CGEN_MAINT,;t t
-s,@cgendir@,$cgendir,;t t
-s,@cgen@,$cgen,;t t
-s,@cgen_breaks@,$cgen_breaks,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# 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=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# 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.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# 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.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_LINKS section.
-#
-
-for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-
-  { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
-echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
-
-  if test ! -r $srcdir/$ac_source; then
-    { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
-echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  rm -f $ac_dest
-
-  # Make relative symlinks.
-  ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dest_dir"
-  else
-    as_dir="$ac_dest_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dest_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dest_dir";;
-*)
-  case "$ac_dest_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $srcdir in
-  [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
-      *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
-  esac
-
-  # Try a symlink, then a hard link, then a copy.
-  ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-    ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
-    cp -p $srcdir/$ac_source $ac_dest ||
-    { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5
-echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;}
-   { (exit 1); exit 1; }; }
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    Makefile ) 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
- ;;
-    stamp-h ) echo > stamp-h ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-
diff --git a/sim/sh64/configure.ac b/sim/sh64/configure.ac
deleted file mode 100644
index 91102086eaf..00000000000
--- a/sim/sh64/configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
-AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
-sinclude(../common/aclocal.m4)
-
-sinclude(../common/common.m4)
-
-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 7e749f9d5b5..00000000000
--- a/sim/sh64/defs-media.h
+++ /dev/null
@@ -1,926 +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;
-  struct {
-    INT f_disp6;
-    UINT f_dest;
-    UINT f_left;
-  } sfmt_ldhil;
-#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 30402cc53fa..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 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;
-
-/* Ifield support.  */
-
-extern const struct cgen_ifld sh_cgen_ifld_table[];
-
-
-
-
-#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 f34ff29065e..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/ChangeLog b/sim/testsuite/ChangeLog
deleted file mode 100644
index c86d915d4a4..00000000000
--- a/sim/testsuite/ChangeLog
+++ /dev/null
@@ -1,612 +0,0 @@
-2005-01-11  Andrew Cagney  <cagney@localhost.localdomain>
-
-	* configure: Regenerated to track ../common/aclocal.m4 changes.
-
-2005-01-07  Andrew Cagney  <cagney@gnu.org>
-
-	* configure.ac: Rename configure.in, require autoconf 2.59.
-	* configure: Re-generate.
-
-	* configure.in: Pass literal subdirectories to AC_CONFIG_SUBDIRS.
-	* configure: Re-generate.
-	
-	* fr30-elf, d30v-elf: Delete directory.
-
-2004-11-16  Hans-Peter Nilsson  <hp@axis.com>
-
-	* lib/sim-defs.exp (run_sim_test): Make multiple "output"
-	specifications concatenate, not override.
-	Support "xfail" and "kfail".
-
-2004-10-26  Nick Clifton  <nickc@redhat.com>
-
-	* lib/sim-defs.exp (sim_run): Add support for the "rawsid"
-	protocol.
-
-2004-09-13  DJ Delorie  <dj@redhat.com>
-
-	* lib/sim-defs.exp (run_sim_test): Add global_as_options,
-	global_ld_options, and global_sim_options to all test cases, if
-	defined.
-
-2004-05-12  Ben Elliston  <bje@au.ibm.com>
-
-	* lib/sim-defs.exp: Remove stray semicolons.
-
-2004-03-01  Richard Sandiford  <rsandifo@redhat.com>
-
-	* sim/frv/allinsn.exp (all_machs): Add fr405 and fr450.
-	* sim/fr400/allinsn.exp (all_machs): Likewise.
-	* sim/fr400/addss.cgs (mach): Change to "fr405 fr450".
-	* sim/fr400/scutss.cgs (mach): Likewise.
-	* sim/fr400/slass.cgs (mach): Likewise.
-	* sim/fr400/smass.cgs (mach): Likewise.
-	* sim/fr400/smsss.cgs (mach): Likewise.
-	* sim/fr400/smu.cgs (mach): Likewise.
-	* sim/fr400/subss.cgs (mach): Likewise.
-	* sim/interrupts/fp_exception.cgs: Replace fmadds with .word.
-	* sim/interrupts/fp_exception-fr550.cgs: Likewise.
-	* sim/frv/mqlclrhs.cgs: New test.
-	* sim/frv/mqlmths.cgs: New test.
-	* sim/frv/mqsllhi.cgs: New test.
-	* sim/frv/mqsrahi.cgs: New test.
-
-2004-03-01  Richard Sandiford  <rsandifo@redhat.com>
-
-	* sim/frv/fr400/scutss.cgs: Fix tests to account for rounding.
-	Add some new ones.
-
-2004-03-01  Richard Sandiford  <rsandifo@redhat.com>
-
-	* sim/frv/{rstb,rsth,rst,rstd,rstq}.cgs: Delete.
-	* sim/frv/{rstbf,rsthf,rstf,rstdf,rstqf}.cgs: Delete.
-
-2004-01-26  Chris Demetriou  <cgd@broadcom.com>
-
-	* sim/mips: New directory.  Tests for the MIPS simulator.
-
-2004-01-23  Ben Elliston  <bje@wasabisystems.com>
-
-	* lib/sim-defs.exp (run_sim_test): Delete the .o and .x files if a
-	test passes.
-
-2003-10-10  Dave Brolley  <brolley@redhat.com>
-
-	* sim/frv/testutils.inc (or_gr_immed): New macro.
-	* sim/frv/fp_exception-fr550.cgs: Write insns using
-	unaligned registers into the program in order to
-	cause the required exceptions.
-	* sim/frv/fp_exception.cgs: Ditto.
-	* sim/frv/regalign.cgs: Ditto.
-
-2003-10-06  Dave Brolley  <brolley@redhat.com>
-
-	* sim/frv/fr550: New subdirectory.
-	* sim/frv/fr400/*.cgs: Add fr550 as appropriate.
-	* sim/frv/fr500/*.cgs: Add fr550 as appropriate.
-	* sim/frv/interrupts/*.cgs: Add fr550 as appropriate.
-	* sim/frv/interrupts/*-fr550.cgs: New test cases for fr550.
-
-2003-09-19  Michael Snyder  <msnyder@redhat.com>
-
-	* sim/frv/nldqi.cgs: Remove.  This insn was never implemented
-	by Fujitsu.
-
-2003-09-19  Dave Brolley  <brolley@redhat.com>
-
-	* sim/frv/rstqf.cgs: Use nldq instead of nldqi.
-	* sim/frv/rstq.cgs: Use nldq instead of nldqi.
-
-2003-09-11  Michael Snyder  <msnyder@redhat.com>
-
-	* sim/testsuite/sim/frv/movgs.cgs: Change lcr to spr[273],
-	which according to the comments seems to be the intent.
-
-2003-09-09  Dave Brolley  <brolley@redhat.com>
-
-	* sim/frv/maddaccs.cgs: move to fr400 subdirectory.
-	* sim/frv/msubaccs.cgs: move to fr400 subdirectory.
-	* sim/frv/masaccs.cgs: move to fr400 subdirectory.
-
-2003-09-03  Michael Snyder  <msnyder@redhat.com>
-
-	* sim/frv/fr500/mclracc.cgs: Change mach to 'all', to be
-	consistent with other tests in the directory.
-
-2003-09-03  Michael Snyder  <msnyder@redhat.com>
-
-	* sim/frv/interrupts/Ipipe-fr400.cgs: New file.
-	* sim/frv/interrupts/Ipipe-fr500.cgs: New file.
-	* sim/frv/interrupts/Ipipe.cgs: Remove (replaced by above).
-
-2003-08-20  Michael Snyder  <msnyder@redhat.com>
-            On behalf of Dave Brolley
-  
-	* sim/frv: New testsuite.
-	* frv-elf: New testsuite.
-  
-2003-07-09  Michael Snyder  <msnyder@redhat.com>
-
-	* sim/sh: New directory.  Tests for Renesas sh family.
-
-2003-04-13  Michael Snyder  <msnyder@redhat.com>
-
-	* sim/h8300: New directory.  Tests for Renesas h8/300 family.
-
-2003-04-01  Nick Clifton  <nickc@redhat.com>
-
-	* sim/arm: New directory: Tests for ARM simulator.
-	* sim/arm/allinsn.exp: New file: Test script.
-	* sim/arm/testutils.inc: New file: Test macros.
-	* sim/arm/adc.cgs, sim/arm/add.cgs, sim/arm/and.cgs,
-	sim/arm/b.cgs, sim/arm/bic.cgs, sim/arm/bl.cgs, sim/arm/bx.cgs,
-	sim/arm/cmn.cgs, sim/arm/cmp.cgs, sim/arm/eor.cgs,
-	sim/arm/hello.ms, sim/arm/ldm.cgs, sim/arm/ldr.cgs,
-	sim/arm/ldrb.cgs, sim/arm/ldrh.cgs, sim/arm/ldrsb.cgs,
-	sim/arm/ldrsh.cgs, sim/arm/misaligned1.ms, sim/arm/misaligned2.ms,
-	sim/arm/misaligned3.ms, sim/arm/misc.exp, sim/arm/mla.cgs,
-	sim/arm/mov.cgs, sim/arm/mrs.cgs, sim/arm/msr.cgs,
-	sim/arm/mul.cgs, sim/arm/mvn.cgs, sim/arm/orr.cgs,
-	sim/arm/rsb.cgs, sim/arm/rsc.cgs, sim/arm/sbc.cgs,
-	sim/arm/smlal.cgs, sim/arm/smull.cgs, sim/arm/stm.cgs,
-	sim/arm/str.cgs, sim/arm/strb.cgs, sim/arm/strh.cgs,
-	sim/arm/sub.cgs, sim/arm/swi.cgs, sim/arm/swp.cgs,
-	sim/arm/swpb.cgs, sim/arm/teq.cgs,  sim/arm/tst.cgs,
-	sim/arm/umlal.cgs, sim/arm/umull.cgs: New files: ARM tests.
-	* sim/arm/iwmmxt: New Directory: Tests for iWMMXt.
-	* sim/arm/iwmmxt/iwmmxt.exp: New file: Test script.
-	* sim/arm/iwmmxt/testutils.inc: New file: Test macros.
-	* sim/arm/iwmmxt/tbcst.cgs, sim/arm/iwmmxt/textrm.cgs,
-	sim/arm/iwmmxt/tinsr.cgs, sim/arm/iwmmxt/tmia.cgs,
-	sim/arm/iwmmxt/tmiaph.cgs, sim/arm/iwmmxt/tmiaxy.cgs,
-	sim/arm/iwmmxt/tmovmsk.cgss, sim/arm/iwmmxt/wacc.cgs,
-	sim/arm/iwmmxt/wadd.cgs, sim/arm/iwmmxt/waligni.cgs,
-	sim/arm/iwmmxt/walignr.cgs, sim/arm/iwmmxt/wand.cgs,
-	sim/arm/iwmmxt/wandn.cgs, sim/arm/iwmmxt/wavg2.cgs,
-	sim/arm/iwmmxt/wcmpeq.cgs, sim/arm/iwmmxt/wcmpgt.cgs,
-	sim/arm/iwmmxt/wmac.cgs, sim/arm/iwmmxt/wmadd.cgs,
-	sim/arm/iwmmxt/wmax.cgs, sim/arm/iwmmxt/wmin.cgs,
-	sim/arm/iwmmxt/wmov.cgs, sim/arm/iwmmxt/wmul.cgs,
-	sim/arm/iwmmxt/wor.cgs, sim/arm/iwmmxt/wpack.cgs,
-	sim/arm/iwmmxt/wror.cgs, sim/arm/iwmmxt/wsad.cgs,
-	sim/arm/iwmmxt/wshufh.cgs, sim/arm/iwmmxt/wsll.cgs,
-	sim/arm/iwmmxt/wsra.cgs, sim/arm/iwmmxt/wsrl.cgs,
-	sim/arm/iwmmxt/wsub.cgs, sim/arm/iwmmxt/wunpckeh.cgs,
-	sim/arm/iwmmxt/wunpckel.cgs, sim/arm/iwmmxt/wunpckih.cgs,
-	sim/arm/iwmmxt/wunpckil.cgs, sim/arm/iwmmxt/wxor.cgs,
-	sim/arm/iwmmxt/wzero.cgs: New files: iWMMXt tests.
-	* sim/arm/thumb: New Directory: Thumb tests.
-	* sim/arm/thumb/allthumb.exp: New file: Test script.
-	* sim/arm/thumb/testutils.inc: New file: Test macros.
-	* sim/arm/thumb/adc.cgs, sim/arm/thumb/add-hd-hs.cgs,
-	sim/arm/thumb/add-hd-rs.cgs, sim/arm/thumb/add-rd-hs.cgs,
-	sim/arm/thumb/add-sp.cgs, sim/arm/thumb/add.cgs,
-	sim/arm/thumb/addi.cgs, sim/arm/thumb/addi8.cgs,
-	sim/arm/thumb/and.cgs, sim/arm/thumb/asr.cgs, sim/arm/thumb/b.cgs,
-	sim/arm/thumb/bcc.cgs, sim/arm/thumb/bcs.cgs,
-	sim/arm/thumb/beq.cgs, sim/arm/thumb/bge.cgs,
-	sim/arm/thumb/bgt.cgs, sim/arm/thumb/bhi.cgs,
-	sim/arm/thumb/bic.cgs, sim/arm/thumb/bl-hi.cgs,
-	sim/arm/thumb/bl-lo.cgs, sim/arm/thumb/ble.cgs,
-	sim/arm/thumb/bls.cgs, sim/arm/thumb/blt.cgs,
-	sim/arm/thumb/bmi.cgs, sim/arm/thumb/bne.cgs,
-	sim/arm/thumb/bpl.cgs, sim/arm/thumb/bvc.cgs,
-	sim/arm/thumb/bvs.cgs, sim/arm/thumb/bx-hs.cgs,
-	sim/arm/thumb/bx-rs.cgs, sim/arm/thumb/cmn.cgs,
-	sim/arm/thumb/cmp-hd-hs.cgs, sim/arm/thumb/cmp-hd-rs.cgs,
-	sim/arm/thumb/cmp-rd-hs.cgs, sim/arm/thumb/cmp.cgs,
-	sim/arm/thumb/eor.cgs, sim/arm/thumb/lda-pc.cgs,
-	sim/arm/thumb/lda-sp.cgs, sim/arm/thumb/ldmia.cgs,
-	sim/arm/thumb/ldr-imm.cgs, sim/arm/thumb/ldr-pc.cgs,
-	sim/arm/thumb/ldr-sprel.cgs, sim/arm/thumb/ldr.cgs,
-	sim/arm/thumb/ldrb-imm.cgs, sim/arm/thumb/ldrb.cgs,
-	sim/arm/thumb/ldrh-imm.cgs, sim/arm/thumb/ldrh.cgs,
-	sim/arm/thumb/ldsb.cgs, sim/arm/thumb/ldsh.cgs,
-	sim/arm/thumb/lsl.cgs, sim/arm/thumb/lsr.cgs,
-	sim/arm/thumb/mov-hd-hs.cgs, sim/arm/thumb/mov-hd-rs.cgs,
-	sim/arm/thumb/mov-rd-hs.cgs, sim/arm/thumb/mov.cgs,
-	sim/arm/thumb/mul.cgs, sim/arm/thumb/mvn.cgs,
-	sim/arm/thumb/neg.cgs, sim/arm/thumb/orr.cgs,
-	sim/arm/thumb/pop-pc.cgs, sim/arm/thumb/pop.cgs,
-	sim/arm/thumb/push-lr.cgs, sim/arm/thumb/push.cgs,
-	sim/arm/thumb/ror.cgs, sim/arm/thumb/sbc.cgs,
-	sim/arm/thumb/stmia.cgs, sim/arm/thumb/str-imm.cgs,
-	sim/arm/thumb/str-sprel.cgs, sim/arm/thumb/str.cgs,
-	sim/arm/thumb/strb-imm.cgs, sim/arm/thumb/strb.cgs,
-	sim/arm/thumb/strh-imm.cgs, sim/arm/thumb/strh.cgs,
-	sim/arm/thumb/sub-sp.cgs, sim/arm/thumb/sub.cgs,
-	sim/arm/thumb/subi.cgs, sim/arm/thumb/subi8.cgs,
-	sim/arm/thumb/swi.cgs, sim/arm/thumb/tst.cgs: New files: Thumb
-	tests.
-	* sim/arm/xscale: New directory.
-	* sim/arm/xscale/xscale.exp: New file: Test script.
-	* sim/arm/xscale/testutils.inc: New file: Test macros.
-	* sim/arm/xscale/blx.cgs, sim/arm/xscale/mia.cgs,
-	sim/arm/xscale/miaph.cgs, sim/arm/xscale/miaxy.cgs,
-	sim/arm/xscale/mra.cgs: New files: XScale tests.
-
-2002-06-16  Andrew Cagney  <ac131313@redhat.com>
-
-	* configure: Regenerated to track ../common/aclocal.m4 changes.
-
-2001-07-31  Ben Elliston  <bje@redhat.com>
-
-	* lib/sim-defs.exp (run_sim_test): Include a description such as
-	"assembling" or "linking" that identifies the phase a test fails
-	in, for easier analysis of failures.
-
-2000-11-01  Dave Brolley  <brolley@cygnus.com>
-
-	* lib/sim-defs.exp (run_sm_test): Correct comment. "output" and
-	"xerror" options do not use a list of machines. Clear options from
-	previous test case. Use "$cpu_option"  to identify the machine to the
-	assembler, if specified.
-
-Tue May 23 21:39:23 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* configure: Regenerated to track ../common/aclocal.m4 changes.
-
-1999-09-15  Doug Evans  <devans@casey.cygnus.com>
-
-	* sim/arm/b.cgs: New testcase.
-	* sim/arm/bic.cgs: New testcase.
-	* sim/arm/bl.cgs: New testcase.
-
-Thu Sep  2 18:15:53 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* configure: Regenerated to track ../common/aclocal.m4 changes.
-
-1999-08-30  Doug Evans  <devans@casey.cygnus.com>
-
-	* lib/sim-defs.exp (run_sim_test): Rename all_machs arg to
-	requested_machs, now is list of machs to run tests for.
-	Delete locals AS,ASFLAGS,LD,LDFLAGS.  Use target_assemble
-	and target_link instead.
-
-1999-04-21  Doug Evans  <devans@casey.cygnus.com>
-
-	* sim/m32r/nop.cgs: Add missing nop insn.
-
-Mon Mar 22 13:28:56 1999  Dave Brolley  <brolley@cygnus.com>
-
-	* sim/fr30/stb.cgs: Correct for unaligned access.
-	* sim/fr30/sth.cgs: Correct for unaligned access.
-	* sim/fr30/ldub.cgs: Fix typo: lduh->ldub. Correct
-	for unaligned access.
-	* sim/fr30/and.cgs: Test unaligned access.
-
-Fri Feb  5 12:41:11 1999  Doug Evans  <devans@canuck.cygnus.com>
-
-	* lib/sim-defs.exp (sim_run): Print simulator arguments log message.
-
-1999-01-05  Doug Evans  <devans@casey.cygnus.com>
-
-	* lib/sim-defs.exp (run_sim_test): New arg all_machs.
-	* sim/fr30/allinsn.exp: Update.
-	* sim/fr30/misc.exp: Update.
-	* sim/m32r/allinsn.exp: Update.
-	* sim/m32r/misc.exp: Update.
-
-Fri Dec 18 17:19:34 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* sim/fr30/ldres.cgs: New testcase.
-	* sim/fr30/copld.cgs: New testcase.
-	* sim/fr30/copst.cgs: New testcase.
-	* sim/fr30/copsv.cgs: New testcase.
-	* sim/fr30/nop.cgs: New testcase.
-	* sim/fr30/andccr.cgs: New testcase.
-	* sim/fr30/orccr.cgs: New testcase.
-	* sim/fr30/addsp.cgs: New testcase.
-	* sim/fr30/stilm.cgs: New testcase.
-	* sim/fr30/extsb.cgs: New testcase.
-	* sim/fr30/extub.cgs: New testcase.
-	* sim/fr30/extsh.cgs: New testcase.
-	* sim/fr30/extuh.cgs: New testcase.
-	* sim/fr30/enter.cgs: New testcase.
-	* sim/fr30/leave.cgs: New testcase.
-	* sim/fr30/xchb.cgs: New testcase.
-	* sim/fr30/dmovb.cgs: New testcase.
-	* sim/fr30/dmov.cgs: New testcase.
-	* sim/fr30/dmovh.cgs: New testcase.
-
-Thu Dec 17 17:18:43 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* sim/fr30/testutils.inc (take_branch{_d},no_branch{_d}): New macros.
-	* sim/fr30/ret.cgs: Add tests fir ret:d.
-	* sim/fr30/inte.cgs: New testcase.
-	* sim/fr30/reti.cgs: New testcase.
-	* sim/fr30/bra.cgs: New testcase.
-	* sim/fr30/bno.cgs: New testcase.
-	* sim/fr30/beq.cgs: New testcase.
-	* sim/fr30/bne.cgs: New testcase.
-	* sim/fr30/bc.cgs: New testcase.
-	* sim/fr30/bnc.cgs: New testcase.
-	* sim/fr30/bn.cgs: New testcase.
-	* sim/fr30/bp.cgs: New testcase.
-	* sim/fr30/bv.cgs: New testcase.
-	* sim/fr30/bnv.cgs: New testcase.
-	* sim/fr30/blt.cgs: New testcase.
-	* sim/fr30/bge.cgs: New testcase.
-	* sim/fr30/ble.cgs: New testcase.
-	* sim/fr30/bgt.cgs: New testcase.
-	* sim/fr30/bls.cgs: New testcase.
-	* sim/fr30/bhi.cgs: New testcase.
-
-Tue Dec 15 17:47:13 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* sim/fr30/div.cgs (int): Add signed division scenario.
-	* sim/fr30/int.cgs (int): Complete testcase.
-	* sim/fr30/testutils.inc (_start): Initialize tbr.
-	(test_s_user,test_s_system,set_i,test_i): New macros.
-
-1998-12-14  Doug Evans  <devans@casey.cygnus.com>
-
-	* lib/sim-defs.exp (run_sim_test): New option xerror, for expected
-	errors.  Translate \n sequences in expected output to newline char.
-	(slurp_options): Make parentheses optional.
-	(sim_run): Look for board_info sim,options.
-	* sim/fr30/hello.ms: Add trailing \n to expected output.
-	* sim/m32r/hello.ms: Ditto.
-	* sim/m32r/hw-trap.ms: Ditto.
-
-	* sim/m32r/trap.cgs: Properly align trap2_handler.
-
-	* sim/m32r/uread16.ms: New testcase.
-	* sim/m32r/uread32.ms: New testcase.
-	* sim/m32r/uwrite16.ms: New testcase.
-	* sim/m32r/uwrite32.ms: New testcase.
-
-1998-12-14  Dave Brolley  <brolley@cygnus.com>
-
-	* sim/fr30/call.cgs: Test ret here as well.
-	* sim/fr30/ld.cgs: Remove bogus comment.
-	* sim/fr30/testutils.inc (save_rp,restore_rp): New macros.
-	* sim/fr30/div.ms: New testcase.
-	* sim/fr30/st.cgs: New testcase.
-	* sim/fr30/sth.cgs: New testcase.
-	* sim/fr30/stb.cgs: New testcase.
-	* sim/fr30/mov.cgs: New testcase.
-	* sim/fr30/jmp.cgs: New testcase.
-	* sim/fr30/ret.cgs: New testcase.
-	* sim/fr30/int.cgs: New testcase.
-
-Thu Dec 10 18:46:25 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* sim/fr30/div0s.cgs: New testcase.
-	* sim/fr30/div0u.cgs: New testcase.
-	* sim/fr30/div1.cgs: New testcase.
-	* sim/fr30/div2.cgs: New testcase.
-	* sim/fr30/div3.cgs: New testcase.
-	* sim/fr30/div4s.cgs: New testcase.
-	* sim/fr30/testutils.inc (mvi_h_dr,set_dbits,test_dbits): New Macros.
-
-Tue Dec  8 13:16:53 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* sim/fr30/testutils.inc (set_s_user): Correct Mask.
-	(set_s_system): Correct Mask.
-	* sim/fr30/ld.cgs (ld): Move previously failing test back
-	into place.
-	* sim/fr30/ldm0.cgs: New testcase.
-	* sim/fr30/ldm1.cgs: New testcase.
-	* sim/fr30/stm0.cgs: New testcase.
-	* sim/fr30/stm1.cgs: New testcase.
-
-Thu Dec  3 14:20:03 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* sim/fr30/ld.cgs: Implement more loads.
-	* sim/fr30/call.cgs: New testcase.
-	* sim/fr30/testutils.inc (testr_h_dr): New macro.
-	(set_s_user,set_s_system): New macros.
-
-	* sim/fr30: New Directory.
-
-Wed Nov 18 10:50:19 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* common/bits-gen.c (main): Add BYTE_ORDER so that it matches
- 	recent sim/common/sim-basics.h changes.
-	* common/Makefile.in: Update.
-	
-Fri Oct 30 00:37:31 1998  Felix Lee  <flee@cygnus.com>
-
-	* lib/sim-defs.exp (sim_run): download target program to remote
- 	host, if necessary.  for unix-driven win32 testing.
-
-Tue Sep 15 14:56:22 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* sim/m32r/testutils.inc (test_h_gr): Use mvaddr_h_gr.
-	* sim/m32r/rte.cgs: Test bbpc,bbpsw.
-	* sim/m32r/trap.cgs: Test bbpc,bbpsw.
-
-Fri Jul 31 17:49:13 1998  Felix Lee  <flee@cygnus.com>
-
-	* lib/sim-defs.exp (sim_run): remote_spawn, use writeto instead of
- 	writeonly.
-
-Fri Jul 24 09:40:34 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* Makefile.in (clean,mostlyclean): Change leading spaces to a tab.
-
-Wed Jul  1 15:57:54 1998  Doug Evans  <devans@seba.cygnus.com>
-
-	* sim/m32r/hw-trap.ms: New testcase.
-
-Tue Jun 16 15:44:01 1998 Jillian Ye <jillian@cygnus.com>
-
-	* lib/sim-defs.exp: Print out timeout setting info when "-v" is used.
-
-Thu Jun 11 15:24:53 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* lib/sim-defs.exp (sim_run): Argument env_vals renamed to options,
-	which is now a list of options controlling the behaviour of sim_run.
-
-Wed Jun 10 10:53:20 1998  Doug Evans  <devans@seba.cygnus.com>
-
-	* sim/m32r/addx.cgs: Add another test.
-	* sim/m32r/jmp.cgs: Add another test.
-
-Mon Jun  8 16:08:27 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* sim/m32r/trap.cgs: Test trap 2.
-
-Mon Jun  1 18:54:22 1998  Frank Ch. Eigler  <fche@cygnus.com>
-
-	* lib/sim-defs.exp (sim_run): Add possible environment variable
- 	list to simulator run.
-
-Thu May 28 14:59:46 1998 Jillian Ye <jillian@cygnus.com>
-
-        * Makefile.in: Take RUNTEST out of FLAG_TO_PASS
-                       so that make check can be invoked recursively.
-
-Thu May 14 11:48:35 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* config/default.exp (CC,SIM): Delete.
-
-	* lib/sim-defs.exp (sim_run): Fix handling of output redirection.
-	New arg prog_opts.  All callers updated.
-
-Fri May  8 18:10:28 1998  Jillian Ye <jillian@cygnus.com>
-
-	* Makefile.in: Made "check" the target of two
-          dependencies (test1, test2) so that test2 get a chance to 
-          run even when test1 failed if "make -k check" is used.
-
-Fri May  8 14:41:28 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* lib/sim-defs.exp (sim_version): Simplify.
-	(sim_run): Implement.
-	(run_sim_test): Use sim_run.
-	(sim_compile): New proc.
-
-Mon May  4 17:59:11 1998  Frank Ch. Eigler  <fche@cygnus.com>
-
-	* config/default.exp: Added C compiler settings.
-
-Wed Apr 22 12:26:28 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* Makefile.in (TARGET_FLAGS_TO_PASS): Delete LIBS, LDFLAGS.
-
-Tue Apr 21 10:49:03 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* lib/sim-defs.exp (run_sim_test): Don't exit early if one mach fails,
-	try all machs.
-
-	* sim/m32r/addx.cgs: Test (-1)+(-1)+1.
-
-Fri Apr 17 16:00:52 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* sim/m32r/mv[ft]achi.cgs: Fix expected result
-	(sign extension of top 8 bits).
-
-Wed Feb 25 11:01:17 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* Makefile.in (RUNTEST): Fix path to runtest.
-
-Fri Feb 20 11:00:02 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* sim/m32r/unlock.cgs: Fixed test.
-	* sim/m32r/mvfc.cgs: Fixed test.
-	* sim/m32r/remu.cgs: Fixed test.
-	* sim/m32r/bnc24.cgs: Test long BNC instruction.
-	* sim/m32r/bnc8.cgs: Test short BNC instruction.
-	* sim/m32r/ld-plus.cgs: Test LD instruction.
-	* sim/m32r/macwhi.cgs: Test MACWHI instruction.
-	* sim/m32r/macwlo.cgs: Test MACWLO instruction.
-	* sim/m32r/mulwhi.cgs: Test MULWHI instruction.
-	* sim/m32r/mulwlo.cgs: Test MULWLO instruction.
-	* sim/m32r/mvfachi.cgs: Test MVFACHI instruction.
-	* sim/m32r/mvfaclo.cgs: Test MVFACLO instruction.
-	* sim/m32r/mvtaclo.cgs: Test MVTACLO instruction.
-	* sim/m32r/addv.cgs: Test ADDV instruction.
-	* sim/m32r/addv3.cgs: Test ADDV3 instruction.
-	* sim/m32r/addx.cgs: Test ADDX instruction.
-	* sim/m32r/lock.cgs: Test LOCK instruction.
-	* sim/m32r/neg.cgs: Test NEG instruction.
-	* sim/m32r/not.cgs: Test NOT instruction.
-	* sim/m32r/unlock.cgs: Test UNLOCK instruction.
-
-Thu Feb 19 11:15:45 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* sim/m32r/testutils.inc (mvaddr_h_gr): new macro to load an
-	address into a general register.
-
-	* sim/m32r/or3.cgs: Test OR3 instruction.
-	* sim/m32r/rach.cgs: Test RACH instruction.
-	* sim/m32r/rem.cgs: Test REM instruction.
-	* sim/m32r/sub.cgs: Test SUB instruction.
-	* sim/m32r/mv.cgs: Test MV instruction.
-	* sim/m32r/mul.cgs: Test MUL instruction.
-	* sim/m32r/bl24.cgs: Test long BL instruction.
-	* sim/m32r/bl8.cgs: Test short BL instruction.
-	* sim/m32r/blez.cgs: Test BLEZ instruction.
-	* sim/m32r/bltz.cgs: Test BLTZ instruction.
-	* sim/m32r/bne.cgs: Test BNE instruction.
-	* sim/m32r/bnez.cgs: Test BNEZ instruction.
-	* sim/m32r/bra24.cgs: Test long BRA instruction.
-	* sim/m32r/bra8.cgs: Test short BRA instruction.
-	* sim/m32r/jl.cgs: Test JL instruction.
-	* sim/m32r/or.cgs: Test OR instruction.
-	* sim/m32r/jmp.cgs: Test JMP instruction.
-	* sim/m32r/and.cgs: Test AND instruction.
-	* sim/m32r/and3.cgs: Test AND3 instruction.
-	* sim/m32r/beq.cgs: Test BEQ instruction.
-	* sim/m32r/beqz.cgs: Test BEQZ instruction.
-	* sim/m32r/bgez.cgs: Test BGEZ instruction.
-	* sim/m32r/bgtz.cgs: Test BGTZ instruction.
-	* sim/m32r/cmp.cgs: Test CMP instruction.
-	* sim/m32r/cmpi.cgs: Test CMPI instruction.
-	* sim/m32r/cmpu.cgs: Test CMPU instruction.
-	* sim/m32r/cmpui.cgs: Test CMPUI instruction.
-	* sim/m32r/div.cgs: Test DIV instruction.
-	* sim/m32r/divu.cgs: Test DIVU instruction.
-	* sim/m32r/cmpeq.cgs: Test CMPEQ instruction.
-	* sim/m32r/sll.cgs: Test SLL instruction.
-	* sim/m32r/sll3.cgs: Test SLL3 instruction.
-	* sim/m32r/slli.cgs: Test SLLI instruction.
-	* sim/m32r/sra.cgs: Test SRA instruction.
-	* sim/m32r/sra3.cgs: Test SRA3 instruction.
-	* sim/m32r/srai.cgs: Test SRAI instruction.
-	* sim/m32r/srl.cgs: Test SRL instruction.
-	* sim/m32r/srl3.cgs: Test SRL3 instruction.
-	* sim/m32r/srli.cgs: Test SRLI instruction.
-	* sim/m32r/xor3.cgs: Test XOR3 instruction.
-	* sim/m32r/xor.cgs: Test XOR instruction.
-
-Tue Feb 17 12:46:05 1998  Doug Evans  <devans@seba.cygnus.com>
-
-	* config/default.exp: New file.
-	* lib/sim-defs.exp: New file.
-	* sim/m32r/*: m32r dejagnu simulator testsuite.
-
-	* Makefile.in (build_alias): Define.
-	(arch): Define.
-	(RUNTEST_FOR_TARGET): Delete.
-	(RUNTEST): Fix.
-	(check): Depend on site.exp.  Run dejagnu.
-	(site.exp): New target.
-	* configure.in (arch): Define from target_cpu.
-	* configure: Regenerate.
-
-Wed Sep 17 10:21:26 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* common/bits-gen.c (gen_bit): Pass in the full name of the macro.
-	(gen_mask): Ditto.
-
-	* common/bits-tst.c (main): Add tests for LSSEXT, MSSEXT.
-	(calc): Add support for 8 bit version of macros.
-	(main): Add tests for 8 bit versions of macros.
-	(check_sext): Check SEXT of zero clears bits.
-
-	* common/bits-gen.c (main): Generate tests for 8 bit versions of
- 	macros.
-
-Thu Sep 11 13:04:40 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* common/Make-common.in: New file, provide generic rules for
- 	running checks.
-
-Mon Sep  1 16:43:55 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* configure.in (configdirs): Test for the target directory instead
- 	of matching on a target.
-
diff --git a/sim/testsuite/Makefile.in b/sim/testsuite/Makefile.in
deleted file mode 100644
index 637a8fe7aa4..00000000000
--- a/sim/testsuite/Makefile.in
+++ /dev/null
@@ -1,182 +0,0 @@
-# Makefile for regression testing the GNU debugger.
-# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-
-# This file is part of GDB.
-
-# GDB 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.
-
-# GDB 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.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-build_canonical = @build@
-build_alias = @build_alias@
-host_canonical = @host@
-host_alias = @host_alias@
-target_canonical = @target@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-
-arch = @arch@
-
-SHELL = /bin/sh
-SUBDIRS = @subdirs@
-RPATH_ENVVAR = @RPATH_ENVVAR@
-
-EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \
-          echo $${rootme}/../../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = `if [ -f $${srcdir}/../../dejagnu/runtest ] ; then \
-		echo $${srcdir}/../../dejagnu/runtest ; else echo runtest; \
-	   fi`
-
-RUNTESTFLAGS =
-
-#### host, target, and site specific Makefile frags come in here.
-
-# The use of $$(x_FOR_TARGET) reduces the command line length by not
-# duplicating the lengthy definition.
-
-TARGET_FLAGS_TO_PASS = \
-        "prefix=$(prefix)" \
-        "exec_prefix=$(exec_prefix)" \
-        "against=$(against)" \
-        'CC=$$(CC_FOR_TARGET)' \
-        "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-        "CFLAGS=$(TESTSUITE_CFLAGS)" \
-        "CHILLFLAGS=$(CHILLFLAGS)" \
-        'CHILL=$$(CHILL_FOR_TARGET)' \
-        "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
-        "CHILL_LIB=$(CHILL_LIB)" \
-        'CXX=$$(CXX_FOR_TARGET)' \
-        "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
-        "CXXFLAGS=$(CXXFLAGS)" \
-        "MAKEINFO=$(MAKEINFO)" \
-        "INSTALL=$(INSTALL)" \
-        "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-        "INSTALL_DATA=$(INSTALL_DATA)" \
-        "RUNTESTFLAGS=$(RUNTESTFLAGS)"
-
-#        "RUNTEST=$(RUNTEST)" \
-
-all:
-	@echo "Nothing to be done for all..."
-
-.NOEXPORT:
-info:
-install-info:
-dvi:
-
-install:
-
-uninstall: force
-
-installcheck:
-
-check:  check-DEJAGNU check-recursive
-
-#test1:
-check-recursive: 
-	@for i in . ${SUBDIRS}; do \
-		if [ $$i = . ] ; then continue ; fi ; \
-		if [ -d ./$$i ] ; then \
-			if (rootme=`pwd`/ ; export rootme ; \
-			    rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-                                echo "check recursively into $$i directory..."; \
-				cd ./$$i; \
-				$(MAKE) $(TARGET_FLAGS_TO_PASS) check) ; then true ; \
-			else exit 1 ; fi ; \
-		else true ; fi ; \
-	done
-
-#test2:	
-check-DEJAGNU: site.exp
-	echo "Dejagnu-checking in `pwd` directory ..."
-	rootme=`pwd`; export rootme; echo rootme = $$rootme; \
-	srcdir=`cd ${srcdir}; pwd`; export srcdir ; echo srcdir = $$srcdir; \
-	EXPECT=${EXPECT} ; export EXPECT ; echo EXPECT = $$EXPECT; \
-	if [ -f $$rootme/../../expect/expect ]; then \
-	  TCL_LIBRARY=`cd $$srcdir/../../tcl/library && pwd`; \
-	  export TCL_LIBRARY; \
-	fi; \
-        echo TCL_LIBRARY = $$TCL_LIBRARY; \
-	runtest=$(RUNTEST); echo runtest = $$runtest; \
-	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
-	  $$runtest $(RUNTESTFLAGS); \
-	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
-	fi
-
-
-site.exp: Makefile
-	@echo 'Making a new site.exp file...'
-	-@rm -f site.bak
-	@echo '## these variables are automatically generated by make ##' > $@-t
-	@echo '# Do not edit here.  If you wish to override these values' >> $@-t
-	@echo '# edit the last section' >> $@-t
-	@echo 'set tool sim' >> $@-t
-	@echo 'set srcdir $(srcdir)' >> $@-t
-	@echo 'set objdir' `pwd` >> $@-t
-	@echo 'set arch $(arch)' >> $@-t
-	@echo 'set build_alias $(build_alias)' >> $@-t
-	@echo 'set build_triplet $(build_canonical)' >> $@-t
-	@echo 'set host_alias $(host_alias)' >> $@-t
-	@echo 'set host_triplet $(host_canonical)' >> $@-t
-	@echo 'set target_alias $(target_alias)' >> $@-t
-	@echo 'set target_triplet $(target_canonical)' >> $@-t
-	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
-	-@sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
-	-@mv site.exp site.bak
-	@mv $@-t site.exp
-
-force:;
-
-clean mostlyclean:
-	-rm -f *~ core *.o a.out xgdb *.x *.grt
-	-rm -f *.rum *.c *.dif *.*out
-	if [ x"${SUBDIRS}" != x ] ; then \
-	    for dir in ${SUBDIRS}; \
-	    do \
-		    echo "$$dir:"; \
-		    if [ -d $$dir ]; then \
-			    (cd $$dir; $(MAKE) clean); \
-		    fi; \
-	    done ; \
-	else true; fi
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-	if [ x"${SUBDIRS}" != x ] ; then \
-	    for dir in ${SUBDIRS}; \
-	    do \
-		    echo "$$dir:"; \
-		    if [ -d $$dir ]; then \
-			    (cd $$dir; $(MAKE) distclean); \
-		    fi; \
-	    done ; \
-	else true; fi
-
-Makefile : Makefile.in config.status
-	$(SHELL) config.status
-
-config.status: $(srcdir)/configure
-	$(SHELL) ./config.status --recheck
-# FIXME: Requires --enable-maintainer-mode, which one could add, but
-# it's provided by automake.  Maybe switch to automake someday.
-#$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in
-#	cd $(srcdir) && autoconf
diff --git a/sim/testsuite/common/Make-common.in b/sim/testsuite/common/Make-common.in
deleted file mode 100644
index 7afef4a99dd..00000000000
--- a/sim/testsuite/common/Make-common.in
+++ /dev/null
@@ -1,90 +0,0 @@
-AS_FOR_TARGET = `\
-  if [ -x ../../../gas/as-new ]; then \
-    echo ../../../gas/as-new ; \
-  else \
-    echo $(target_alias)-as ; \
-  fi`
-
-LD_FOR_TARGET = `\
-  if [ -x ../../../ld/ld-new ]; then \
-    echo ../../../ld/ld-new ; \
-  else \
-    echo $(target_alias)-ld ; \
-  fi`
-
-RUN_FOR_TARGET = `\
-  if [ -x ../../../sim/v850/run ]; then \
-    echo ../../../sim/v850/run ; \
-  else \
-    echo $(target_alias)-run ; \
-  fi`
-
-
-check: sanity $(TESTS)
-sanity:
-	@eval echo AS_FOR_TARGET=$(AS_FOR_TARGET)
-	@eval echo LD_FOR_TARGET=$(LD_FOR_TARGET)
-	@eval echo RUN_FOR_TARGET=$(RUN_FOR_TARGET)
-
-clean:
-	rm -f $(TESTS)
-	rm -f *.run *.o
-	rm -f core *.core
-
-# Rules for running the tests
-
-.SUFFIXES: .ok .run .hi .ko .ti
-.run.ok:
-	rm -f tmp-$* $*.hi
-	ulimit -t 5 ; \
-	$(RUN_FOR_TARGET) $(RUNFLAGS_FOR_TARGET) $*.run > tmp-$*
-	mv tmp-$* $*.ok
-.run.hi:
-	rm -f tmp-$* $*.hi diff-$*
-	ulimit -t 5 ; \
-	$(RUN_FOR_TARGET) $(RUNFLAGS_FOR_TARGET) $*.run > tmp-$*
-	echo 'Hello World!' | diff - tmp-$* > diff-$*
-	cat tmp-$* diff-$* > $*.hi
-.run.ko:
-	rm -f tmp-$* $*.ko
-	set +e ; \
-	ulimit -t 5 ; \
-	$(RUN_FOR_TARGET) $(RUNFLAGS_FOR_TARGET) $*.run > tmp-$* ; \
-	if [ $$? -eq 47 ] ; then \
-	  exit 0 ; \
-	else \
-	  exit 1 ; \
-	fi
-	mv tmp-$* $*.ko
-.run.ti:
-	rm -f tmp-$* $*.ti
-	set +e ; \
-	ulimit -t 5 ; \
-	$(RUN_FOR_TARGET) $(RUNFLAGS_FOR_TARGET) $(INTFLAGS_FOR_TARGET) $*.run > tmp-$*
-	test `cat tmp-$* | wc -l` -eq 10 < /dev/null
-	test `grep Tick tmp-$* | wc -l` -eq 10 < /dev/null
-	mv tmp-$* $*.ti
-
-
-# Rules for building the test
-# Preference is for obtaining the executable (.run) from a prebuilt image
-
-.SUFFIXES: .uue .s .S .run
-.uue.run:
-	head $* | grep $*.run > /dev/null
-	uudecode $*.uue
-.run.u:
-	uuencode < $*.run $*.run > $*.u
-.o.run:
-	$(LD_FOR_TARGET) $(LDFLAGS_FOR_TARGET) -o $*.run $*.o
-.s.o:
-	$(AS_FOR_TARGET) $(ASFLAGS_FOR_TARGET) -I$(srcdir) $(srcdir)/$*.s -o $*.o
-.S.o:
-	$(AS_FOR_TARGET) $(ASFLAGS_FOR_TARGET) -I$(srcdir) $(srcdir)/$*.S -o $*.o
-
-
-Makefile: Makefile.in config.status
-	$(SHELL) ./config.status
-
-config.status: configure
-	$(SHELL) ./config.status --recheck
diff --git a/sim/testsuite/common/Makefile.in b/sim/testsuite/common/Makefile.in
deleted file mode 100644
index d088501676e..00000000000
--- a/sim/testsuite/common/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-CC=gcc
-CFLAGS = -Wall -Werror -I../../common -I../../../include -g
-default: check
-
-
-# Verify SIM-BITS
-
-check: bits32m0.ok bits32m31.ok bits64m0.ok bits64m63.ok
-all: bits32m0 bits32m31 bits64m0 bits64m63
-
-bits32m0.c: bits-gen bits-tst.c
-	./bits-gen 32 0 big > tmp-bits32m0.c
-	cat bits-tst.c >> tmp-bits32m0.c
-	mv tmp-bits32m0.c bits32m0.c
-bits32m31.c: bits-gen bits-tst.c
-	./bits-gen 32 31 little > tmp-bits32m31.c
-	cat bits-tst.c >> tmp-bits32m31.c
-	mv tmp-bits32m31.c bits32m31.c
-bits64m0.c: bits-gen bits-tst.c
-	./bits-gen 64 0 big > tmp-bits64m0.c
-	cat bits-tst.c >> tmp-bits64m0.c
-	mv tmp-bits64m0.c bits64m0.c
-bits64m63.c: bits-gen bits-tst.c
-	./bits-gen 64 63 little > tmp-bits64m63.c
-	cat bits-tst.c >> tmp-bits64m63.c
-	mv tmp-bits64m63.c bits64m63.c
-
-
-
-# Verify SIM-FPU
-#
-#check: fpu-tst.ok
-#all: fpu-tst
-
-
-
-# Verify SIM-ALU
-
-check: alu-tst.ok
-all: alu-tst
-alu-tst.o: alu-tst.c alu-n-tst.h
-
-clean:
-	rm -f *.o
-	rm -f *.ok
-	rm -f bits32m0 bits32m31 bits64m0 bits64m63 bits-gen
-	rm -f tmp-*
-	rm -f alu-tst
-
-.SUFIXES: .ok
-%.ok: %
-	./$<
-	touch $<.ok
diff --git a/sim/testsuite/common/alu-n-tst.h b/sim/testsuite/common/alu-n-tst.h
deleted file mode 100644
index cd218d4339d..00000000000
--- a/sim/testsuite/common/alu-n-tst.h
+++ /dev/null
@@ -1,260 +0,0 @@
-#ifndef N
-#error "N must be #defined"
-#endif
-
-#include "symcat.h"
-
-/* NOTE: see end of file for #undef of these macros */
-#define unsignedN    XCONCAT2(unsigned,N)
-#define MAX_INT      XCONCAT2(MAX_INT,N)
-#define MIN_INT      XCONCAT2(MIN_INT,N)
-#define alu_N_tests     XCONCAT3(alu_,N,_tests)
-#define do_alu_N_tests  XCONCAT3(do_alu_,N,_tests)
-#define OP_BEGIN     XCONCAT3(ALU,N,_BEGIN)
-#define OP_ADDC      XCONCAT3(ALU,N,_ADDC)
-#define OP_ADDC_C    XCONCAT3(ALU,N,_ADDC_C)
-#define OP_SUBC      XCONCAT3(ALU,N,_SUBC)
-#define OP_SUBB      XCONCAT3(ALU,N,_SUBB)
-#define OP_SUBB_B    XCONCAT3(ALU,N,_SUBB_B)
-#define OP_SUBC_X    XCONCAT3(ALU,N,_SUBC_X)
-#define OP_NEGC      XCONCAT3(ALU,N,_NEGC)
-#define OP_NEGB      XCONCAT3(ALU,N,_NEGB)
-#define HAD_CARRY_BORROW    (XCONCAT3(ALU,N,_HAD_CARRY_BORROW) != 0)
-#define HAD_OVERFLOW (XCONCAT3(ALU,N,_HAD_OVERFLOW) != 0)
-#define RESULT          XCONCAT3(ALU,N,_RESULT)
-#define CARRY_BORROW_RESULT    XCONCAT3(ALU,N,_CARRY_BORROW_RESULT)
-#define OVERFLOW_RESULT XCONCAT3(ALU,N,_OVERFLOW_RESULT)
-#define do_op_N      XCONCAT2(do_op_,N)
-
-
-void
-do_op_N (const alu_test *tst)
-{
-  const alu_op *op;
-  int borrow_p = 0;
-  OP_BEGIN (tst->begin);
-  print_hex (tst->begin, N);
-  for (op = tst->ops; op->op != NULL; op++)
-    {
-      printf (" %s ", op->op);
-      print_hex (op->arg, N);
-      if (strcmp (op->op, "ADDC") == 0)
-	OP_ADDC (op->arg);
-      else if (strcmp (op->op, "ADDC_C0") == 0)
-	OP_ADDC_C (op->arg, 0);
-      else if (strcmp (op->op, "ADDC_C1") == 0)
-	OP_ADDC_C (op->arg, 1);
-      else if (strcmp (op->op, "SUBC") == 0)
-	OP_SUBC (op->arg);
-      else if (strcmp (op->op, "SUBC_X0") == 0)
-	OP_SUBC_X (op->arg, 0);
-      else if (strcmp (op->op, "SUBC_X1") == 0)
-	OP_SUBC_X (op->arg, 1);
-      else if (strcmp (op->op, "SUBB") == 0)
-	{
-	  OP_SUBB (op->arg);
-	  borrow_p ++;
-	}
-      else if (strcmp (op->op, "SUBB_B0") == 0)
-	{
-	  OP_SUBB_B (op->arg, 0);
-	  borrow_p ++;
-	}
-      else if (strcmp (op->op, "SUBB_B1") == 0)
-	{
-	  OP_SUBB_B (op->arg, 1);
-	  borrow_p ++;
-	}
-      else if (strcmp (op->op, "NEGC") == 0)
-	OP_NEGC ();
-      else if (strcmp (op->op, "NEGB") == 0)
-	{
-	  OP_NEGB ();
-	  borrow_p ++;
-	}
-      else
-	{
-	  printf (" -- operator unknown\n");
-	  abort ();
-	}
-    }
-  printf (" = ");
-  print_hex (tst->result, N);
-  if (borrow_p)
-    printf (" B:%d", tst->carry_borrow);
-  else
-    printf (" C:%d", tst->carry_borrow);
-  printf (" V:%d", tst->overflow);
-  if (tst->carry_borrow != HAD_CARRY_BORROW)
-    {
-      if (borrow_p)
-	printf (" -- borrow (%d) wrong", HAD_CARRY_BORROW);
-      else
-	printf (" -- carry (%d) wrong", HAD_CARRY_BORROW);
-      errors ++;
-    }
-  if (tst->overflow != HAD_OVERFLOW)
-    {
-      printf (" -- overflow (%d) wrong", HAD_OVERFLOW);
-      errors ++;
-    }
-  if ((unsignedN) CARRY_BORROW_RESULT != (unsignedN) tst->result)
-    {
-      printf (" -- result for carry/borrow wrong ");
-      print_hex (CARRY_BORROW_RESULT, N);
-      errors ++;
-    }
-  if ((unsignedN) OVERFLOW_RESULT != (unsignedN) tst->result)
-    {
-      printf (" -- result for overflow wrong ");
-      print_hex (OVERFLOW_RESULT, N);
-      errors ++;
-    }
-  if ((unsignedN) RESULT != (unsignedN) tst->result)
-    {
-      printf (" -- result wrong ");
-      print_hex (RESULT, N);
-      errors ++;
-    }
-  printf ("\n");
-}
-
-
-const alu_test alu_N_tests[] = {
-
-  /* 0 + 0; 0 + 1; 1 + 0; 1 + 1 */
-  { 0, { { "ADDC", 0 }, }, 0, 0, 0, },
-  { 0, { { "ADDC", 1 }, }, 1, 0, 0, },
-  { 1, { { "ADDC", 0 }, }, 1, 0, 0, },
-  { 1, { { "ADDC", 1 }, }, 2, 0, 0, },
-
-  /* 0 + 0 + 0; 0 + 0 + 1; 0 + 1 + 0; 0 + 1 + 1 */
-  /* 1 + 0 + 0; 1 + 0 + 1; 1 + 1 + 0; 1 + 1 + 1 */
-  { 0, { { "ADDC_C0", 0 }, }, 0, 0, 0, },
-  { 0, { { "ADDC_C0", 1 }, }, 1, 0, 0, },
-  { 0, { { "ADDC_C1", 0 }, }, 1, 0, 0, },
-  { 0, { { "ADDC_C1", 1 }, }, 2, 0, 0, },
-  { 1, { { "ADDC_C0", 0 }, }, 1, 0, 0, },
-  { 1, { { "ADDC_C0", 1 }, }, 2, 0, 0, },
-  { 1, { { "ADDC_C1", 0 }, }, 2, 0, 0, },
-  { 1, { { "ADDC_C1", 1 }, }, 3, 0, 0, },
-
-  /* */
-  { MAX_INT, { { "ADDC", 1 }, }, MIN_INT, 0, 1, },
-  { MIN_INT, { { "ADDC", -1 }, }, MAX_INT, 1, 1, },
-  { MAX_INT, { { "ADDC", MIN_INT }, }, -1, 0, 0, },
-  { MIN_INT, { { "ADDC", MAX_INT }, }, -1, 0, 0, },
-  { MAX_INT, { { "ADDC", MAX_INT }, }, MAX_INT << 1, 0, 1, },
-  { MIN_INT, { { "ADDC", MIN_INT }, }, 0, 1, 1, },
-  /* */
-  { 0, { { "ADDC_C1", -1 }, }, 0, 1, 0, },
-  { 0, { { "ADDC_C1", -2 }, }, -1, 0, 0, },
-  { -1, { { "ADDC_C1", 0 }, }, 0, 1, 0, },
-  { 0, { { "ADDC_C0", 0 }, }, 0, 0, 0, },
-  { -1, { { "ADDC_C1", -1 }, }, -1, 1, 0, },
-  { -1, { { "ADDC_C1", 1 }, }, 1, 1, 0, },
-  { 0, { { "ADDC_C1", MAX_INT }, }, MIN_INT, 0, 1, },
-  { MAX_INT, { { "ADDC_C1", 1 }, }, MIN_INT + 1, 0, 1, },
-  { MAX_INT, { { "ADDC_C1", MIN_INT }, }, 0, 1, 0, },
-  { MAX_INT, { { "ADDC_C1", MAX_INT }, }, (MAX_INT << 1) + 1, 0, 1, },
-  { MAX_INT, { { "ADDC_C0", MAX_INT }, }, MAX_INT << 1, 0, 1, },
-
-  /* 0 - 0 */
-  { 0, { { "SUBC",    0 }, },  0, 1, 0, },
-  { 0, { { "SUBB",    0 }, },  0, 0, 0, },
-
-  /* 0 - 1 */
-  { 0, { { "SUBC",    1 }, }, -1, 0, 0, },
-  { 0, { { "SUBB",    1 }, }, -1, 1, 0, },
-
-  /* 1 - 0 */
-  { 1, { { "SUBC",    0 }, },  1, 1, 0, },
-  { 1, { { "SUBB",    0 }, },  1, 0, 0, },
-
-  /* 1 - 1 */
-  { 1, { { "SUBC",    1 }, },  0, 1, 0, },
-  { 1, { { "SUBB",    1 }, },  0, 0, 0, },
-
-  /* 0 - 0 - 0 */
-  { 0, { { "SUBC_X0", 0 }, }, -1, 0, 0, },
-  { 0, { { "SUBB_B0", 0 }, },  0, 0, 0, },
-
-  /* 0 - 0 - 1 */
-  { 0, { { "SUBC_X0", 1 }, }, -2, 0, 0, },
-  { 0, { { "SUBB_B0", 1 }, }, -1, 1, 0, },
-
-  /* 0 - 1 - 0 */
-  { 0, { { "SUBC_X1", 0 }, },  0, 1, 0, },
-  { 0, { { "SUBB_B1", 0 }, }, -1, 1, 0, },
-
-  /* 0 - 1 - 1 */
-  { 0, { { "SUBC_X1", 1 }, }, -1, 0, 0, },
-  { 0, { { "SUBB_B1", 1 }, }, -2, 1, 0, },
-
-  /* 1 - 0 - 0 */
-  { 1, { { "SUBC_X0", 0 }, },  0, 1, 0, },
-  { 1, { { "SUBB_B0", 0 }, },  1, 0, 0, },
-
-  /* 1 - 0 - 1 */
-  { 1, { { "SUBC_X0", 1 }, }, -1, 0, 0, },
-  { 1, { { "SUBB_B0", 1 }, },  0, 0, 0, },
-
-  /* 1 - 1 - 0 */
-  { 1, { { "SUBC_X1", 0 }, },  1, 1, 0, },
-  { 1, { { "SUBB_B1", 0 }, },  0, 0, 0, },
-
-  /* 1 - 1 - 1 */
-  { 1, { { "SUBC_X1", 1 }, },  0, 1, 0, },
-  { 1, { { "SUBB_B1", 1 }, }, -1, 1, 0, },
-
-  /* */
-  { 0,       { { "SUBC", MIN_INT }, }, MIN_INT, 0, 1, },
-  { MIN_INT, { { "SUBC", 1 }, }, MAX_INT, 1, 1, },
-  { MAX_INT, { { "SUBC", MAX_INT }, }, 0, 1, 0, },
-
-  /* */
-  { 0,       { { "SUBC_X0", MIN_INT }, }, MAX_INT, 0, 0, },
-  { MIN_INT, { { "SUBC_X1",       0 }, }, MIN_INT, 1, 0, },
-  { MAX_INT, { { "SUBC_X0", MAX_INT }, },      -1, 0, 0, },
-
-  /* */
-  { MAX_INT, { { "NEGC", 0 }, }, MIN_INT + 1, 0, 0, },
-  { MAX_INT, { { "NEGC", 0 }, }, MIN_INT + 1, 0, 0, },
-  { MIN_INT, { { "NEGC", 0 }, }, MIN_INT, 0, 1, },
-  { 0, { { "NEGC", 0 }, }, 0, 1, 0, },
-  { -1, { { "NEGC", 0 }, }, 1, 0, 0, },
-  { 1, { { "NEGC", 0 }, }, -1, 0, 0, },
-};
-
-
-static void
-do_alu_N_tests (void)
-{
-  int i;
-  for (i = 0; i < sizeof (alu_N_tests) / sizeof (*alu_N_tests); i++)
-    {
-      const alu_test *tst = &alu_N_tests[i];
-      do_op_N (tst);
-    }
-}
-
-
-#undef OP_BEGIN
-#undef OP_ADDC
-#undef OP_ADDC_C
-#undef OP_SUBB
-#undef OP_SUBC
-#undef OP_SUBC_X
-#undef OP_SUBB_B
-#undef HAD_OVERFLOW
-#undef HAD_CARRY_BORROW
-#undef OVERFLOW_RESULT
-#undef CARRY_BORROW_RESULT
-#undef RESULT
-#undef do_op_N
-#undef unsignedN
-#undef MAX_INT
-#undef MIN_INT
-#undef alu_N_tests
-#undef do_alu_N_tests
-
diff --git a/sim/testsuite/common/alu-tst.c b/sim/testsuite/common/alu-tst.c
deleted file mode 100644
index e7fffe502cd..00000000000
--- a/sim/testsuite/common/alu-tst.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#define WITH_TARGET_WORD_MSB 0
-#define WITH_TARGET_WORD_BITSIZE 64
-#define WITH_HOST_WORD_BITSIZE (sizeof (int) * 8)
-#define WITH_TARGET_BYTE_ORDER BIG_ENDIAN /* does not matter */
-
-#define ASSERT(EXPRESSION) \
-{ \
-  if (!(EXPRESSION)) { \
-    fprintf (stderr, "%s:%d: assertion failed - %s\n", \
-             __FILE__, __LINE__, #EXPRESSION); \
-    abort (); \
-  } \
-}
-
-#define SIM_BITS_INLINE (INCLUDE_MODULE | INCLUDED_BY_MODULE)
-
-#include <string.h>
-
-#include "sim-basics.h"
-
-#include "sim-alu.h"
-
-#include <stdio.h>
-
-typedef struct {
-  char *op;
-  unsigned64 arg;
-} alu_op;
-
-typedef struct {
-  unsigned64 begin;
-  alu_op ops[4];
-  unsigned64 result;
-  int carry_borrow;
-  int overflow;
-} alu_test;
-
-#define MAX_INT8 UNSIGNED64 (127)
-#define MIN_INT8 UNSIGNED64 (128)
-
-#define MAX_INT16 UNSIGNED64 (32767)
-#define MIN_INT16 UNSIGNED64 (32768)
-
-#define MAX_INT32 UNSIGNED64 (0x7fffffff)
-#define MIN_INT32 UNSIGNED64 (0x80000000)
-
-#define MAX_INT64 UNSIGNED64 (0x7fffffffffffffff)
-#define MIN_INT64 UNSIGNED64 (0x8000000000000000)
-
-static void
-print_hex (unsigned64 val, int nr_bits)
-{
-  switch (nr_bits)
-    {
-    case 8:
-      printf ("0x%02lx", (long) (unsigned8) (val));
-      break;
-    case 16:
-      printf ("0x%04lx", (long) (unsigned16) (val));
-      break;
-    case 32:
-      printf ("0x%08lx", (long) (unsigned32) (val));
-      break;
-    case 64:
-      printf ("0x%08lx%08lx",
-	      (long) (unsigned32) (val >> 32),
-	      (long) (unsigned32) (val));
-      break;
-    default:
-      abort ();
-    }
-}
-
-
-int errors = 0;
-
-
-#define N 8
-#include "alu-n-tst.h"
-#undef N
-
-#define N 16
-#include "alu-n-tst.h"
-#undef N
-
-#define N 32
-#include "alu-n-tst.h"
-#undef N
-
-#define N 64
-#include "alu-n-tst.h"
-#undef N
-
-
-
-int
-main ()
-{
-  do_alu_8_tests ();
-  do_alu_16_tests ();
-  do_alu_32_tests ();
-  do_alu_64_tests ();
-  return (errors != 0);
-}
diff --git a/sim/testsuite/common/bits-gen.c b/sim/testsuite/common/bits-gen.c
deleted file mode 100644
index 71ddef303df..00000000000
--- a/sim/testsuite/common/bits-gen.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/* Miscellaneous simulator utilities.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-
-This file is part of 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 <stdio.h>
-
-
-void
-gen_struct (void)
-{
-  printf ("\n");
-  printf ("typedef struct _test_tuples {\n");
-  printf ("  int line;\n");
-  printf ("  int row;\n");
-  printf ("  int col;\n");
-  printf ("  long long val;\n");
-  printf ("  long long check;\n");
-  printf ("} test_tuples;\n");
-  printf ("\n");
-  printf ("typedef struct _test_spec {\n");
-  printf ("  const char *file;\n");
-  printf ("  const char *macro;\n");
-  printf ("  int nr_rows;\n");
-  printf ("  int nr_cols;\n");
-  printf ("  test_tuples *tuples;\n");
-  printf ("} test_spec;\n");
-}
-
-
-void
-gen_bit (int bitsize,
-	 int msb,
-	 const char *macro,
-	 int nr_bits)
-{
-  int i;
-
-  printf ("\n/* Test the %s macro */\n", macro);
-  printf ("test_tuples %s_tuples[%d] = {\n", macro, nr_bits);
-  for (i = 0; i < nr_bits; i++)
-    {
-      /* compute what we think the value is */
-      unsigned long long bit = 1;
-      if (msb == 0)
-	bit <<= nr_bits - i - 1;
-      else
-	bit <<= i;
-      if (bitsize == 32)
-	bit = (unsigned) bit; /* truncate it! */
-      /* write it out */
-      printf ("  { __LINE__, ");
-      printf ("%d, %2d, ", -1, i);
-      printf ("%s (%2d), ", macro, i);
-      printf ("UNSIGNED64 (0x%08lx%08lx), ",
-	      (long) (bit >> 32), (long) bit);
-      printf ("},\n");
-    }
-  printf ("};\n");
-  printf ("\n");
-  printf ("test_spec %s_test = { __FILE__, \"%s\", 1, %d, %s_tuples, };\n",
-	  macro, macro, nr_bits, macro);
-  printf ("\n");
-}
-
-
-void
-gen_enum (const char *macro,
-	  int nr_bits)
-{
-  int i;
-
-  printf ("\n/* Test the %s macro in an enum */\n", macro);
-  printf ("enum enum_%s {\n", macro);
-  for (i = 0; i < nr_bits; i++)
-    {
-      printf ("  elem_%s_%d = %s (%d),\n", macro, i, macro, i);
-    }
-  printf ("};\n");
-  printf ("\n");
-}
-
-
-void
-gen_mask (int bitsize,
-	  const char *msb,
-	  const char *macro,
-	  int nr_bits)
-{
-  int l;
-  int h;
-  printf ("\n/* Test the %s%s macro */\n", msb, macro);
-  printf ("test_tuples %s_tuples[%d][%d] = {\n", macro, nr_bits, nr_bits);
-  for (l = 0; l < nr_bits; l++)
-    {
-      printf ("  {\n");
-      for (h = 0; h < nr_bits; h++)
-	{
-	  printf ("    { __LINE__, ");
-	  if ((strcmp (msb, "MS") == 0 && l <= h)
-	      || (strcmp (msb, "MS") != 0 && l >= h)
-	      || (strcmp (macro, "") == 0))
-	    {
-	      /* compute the mask */
-	      unsigned long long mask = 0;
-	      int b;
-	      for (b = 0; b < nr_bits; b++)
-		{
-		  unsigned long long bit = 1;
-		  if (strcmp (msb, "MS") == 0)
-		    {
-		      if ((l <= b && b <= h)
-			  || (h < l && (b <= h || b >= l)))
-			bit <<= (nr_bits - b - 1);
-		      else
-			bit = 0;
-		    }
-		  else
-		    {
-		      if ((l >= b && b >= h)
-			  || (h > l && (b >= h || b <= l)))
-			bit <<= b;
-		      else
-			bit = 0;
-		    }
-		  mask |= bit;
-		}
-	      if (bitsize == 32)
-		mask = (unsigned long) mask;
-	      printf ("%d, %d, ", l, h);
-	      printf ("%s%s (%2d, %2d), ", msb, macro, l, h);
-	      printf ("UNSIGNED64 (0x%08lx%08lx), ",
-		      (long) (mask >> 32), (long) mask);
-	    }
-	  else
-	    printf ("-1, -1, ");
-	  printf ("},\n");
-	}
-      printf ("  },\n");
-    }
-  printf ("};\n");
-  printf ("\n");
-  printf ("test_spec %s_test = { __FILE__, \"%s%s\", %d, %d, &%s_tuples[0][0], };\n",
-	  macro, msb, macro, nr_bits, nr_bits, macro);
-  printf ("\n");
-}
-
-
-void
-usage (int reason)
-{
-  fprintf (stderr, "Usage:\n");
-  fprintf (stderr, "  bits-gen <nr-bits> <msb> <byte-order>\n");
-  fprintf (stderr, "Generate a test case for the simulator bit manipulation code\n");
-  fprintf (stderr, "  <nr-bits> = { 32 | 64 }\n");
-  fprintf (stderr, "  <msb> = { 0 | { 31 | 63 } }\n");
-  fprintf (stderr, "  <byte-order> = { big | little }\n");
-
-  switch (reason)
-    {
-    case 1: fprintf (stderr, "Wrong number of arguments\n");
-      break;
-    case 2:
-      fprintf (stderr, "Invalid <nr-bits> argument\n");
-      break;
-    case 3:
-      fprintf (stderr, "Invalid <msb> argument\n");
-      break;
-    case 4:
-      fprintf (stderr, "Invalid <byte-order> argument\n");
-      break;
-    default:
-    }
-
-  exit (1);
-}
-
-
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int bitsize;
-  int msb;
-  char *ms;
-  int big_endian;
-
-  if (argc != 4)
-    usage (1);
-
-  if (strcmp (argv [1], "32") == 0)
-    bitsize = 32;
-  else if (strcmp (argv [1], "64") == 0)
-    bitsize = 64;
-  else
-    usage (2);
-
-  if (strcmp (argv [2], "0") == 0)
-    msb = 0;
-  else if (strcmp (argv [2], "31") == 0 && bitsize == 32)
-    msb = 31;
-  else if (strcmp (argv [2], "63") == 0 && bitsize == 64)
-    msb = 63;
-  else
-    usage (3);
-  if (msb == 0)
-    ms = "MS";
-  else
-    ms = "LS";
-  
-  if (strcmp (argv [3], "big") == 0)
-    big_endian = 1;
-  else if (strcmp (argv [3], "little") == 0)
-    big_endian = 0;
-  else
-    usage (4);
-    
-  printf ("#define WITH_TARGET_WORD_BITSIZE %d\n", bitsize);
-  printf ("#define WITH_TARGET_WORD_MSB %d\n", msb);
-  printf ("#define WITH_HOST_WORD_BITSIZE %d\n", sizeof (int) * 8);
-  printf ("#define WITH_TARGET_BYTE_ORDER %s\n", big_endian ? "BIG_ENDIAN" : "LITTLE_ENDIAN");
-  printf ("\n");
-  printf ("#define SIM_BITS_INLINE (ALL_H_INLINE)\n");
-  printf ("\n");
-  printf ("#define ASSERT(X) do { if (!(X)) abort(); } while (0)\n");
-  printf ("\n");
-  printf ("#include \"sim-basics.h\"\n");
-
-  gen_struct ();
-
-
-
-  printf ("#define DO_BIT_TESTS\n");
-  gen_bit ( 4, msb, "BIT4",  4);
-  gen_bit ( 5, msb, "BIT5",  5);
-  gen_bit ( 8, msb, "BIT8",  8);
-  gen_bit (10, msb, "BIT10", 10);
-  gen_bit (16, msb, "BIT16", 16);
-  gen_bit (32, msb, "BIT32", 32);
-  gen_bit (64, msb, "BIT64", 64);
-  gen_bit (bitsize, msb, "BIT", 64);
-
-  gen_bit ( 8,  8 - 1, "LSBIT8",   8);
-  gen_bit (16, 16 - 1, "LSBIT16", 16);
-  gen_bit (32, 32 - 1, "LSBIT32", 32);
-  gen_bit (64, 64 - 1, "LSBIT64", 64);
-  gen_bit (bitsize, bitsize - 1, "LSBIT",   64);
-
-  gen_bit ( 8,  0, "MSBIT8",   8);
-  gen_bit (16,  0, "MSBIT16", 16);
-  gen_bit (32,  0, "MSBIT32", 32);
-  gen_bit (64,  0, "MSBIT64", 64);
-  gen_bit (bitsize,  0, "MSBIT",   64);
-
-  printf ("test_spec *(bit_tests[]) = {\n");
-  printf ("  &BIT4_test,\n");
-  printf ("  &BIT5_test,\n");
-  printf ("  &BIT8_test,\n");
-  printf ("  &BIT10_test,\n");
-  printf ("  &BIT16_test,\n");
-  printf ("  &BIT32_test,\n");
-  printf ("  &BIT64_test,\n");
-  printf ("  &BIT_test,\n");
-  printf ("  &LSBIT8_test,\n");
-  printf ("  &LSBIT16_test,\n");
-  printf ("  &LSBIT32_test,\n");
-  printf ("  &LSBIT64_test,\n");
-  printf ("  &LSBIT_test,\n");
-  printf ("  &MSBIT8_test,\n");
-  printf ("  &MSBIT16_test,\n");
-  printf ("  &MSBIT32_test,\n");
-  printf ("  &MSBIT64_test,\n");
-  printf ("  &MSBIT_test,\n");
-  printf ("  0,\n");
-  printf ("};\n\n");
-
-  gen_enum ("BIT",   64);
-  gen_enum ("LSBIT", 64);
-  gen_enum ("MSBIT", 64);
-  gen_enum ("BIT32",   32);
-  gen_enum ("LSBIT32", 32);
-  gen_enum ("MSBIT32", 32);
-
-  printf ("#define DO_MASK_TESTS\n");
-  gen_mask ( 8, ms, "MASK8",  8);
-  gen_mask (16, ms, "MASK16", 16);
-  gen_mask (32, ms, "MASK32", 32);
-  gen_mask (64, ms, "MASK64", 64);
-  gen_mask (bitsize, ms, "MASK", 64);
-
-  printf ("test_spec *(mask_tests[]) = {\n");
-  printf ("  &MASK8_test,\n");
-  printf ("  &MASK16_test,\n");
-  printf ("  &MASK32_test,\n");
-  printf ("  &MASK64_test,\n");
-  printf ("  &MASK_test,\n");
-  printf ("  0,\n");
-  printf ("};\n\n");
-
-  return 0;
-}
diff --git a/sim/testsuite/common/bits-tst.c b/sim/testsuite/common/bits-tst.c
deleted file mode 100644
index 5a4210a76ab..00000000000
--- a/sim/testsuite/common/bits-tst.c
+++ /dev/null
@@ -1,408 +0,0 @@
-# 2 "bits-tst.c"
-
-/* Drive the bit test routines */
-
-
-long long
-calc (const char *call,
-      long long val,
-      int row,
-      int col)
-{
-  if (strcmp (call, "MASK") == 0)
-    return MASKED (val, row, col);
-  if (strcmp (call, "MASK8") == 0)
-    return MASKED8 (val, row, col);
-  if (strcmp (call, "MASK16") == 0)
-    return MASKED16 (val, row, col);
-  if (strcmp (call, "MASK32") == 0)
-    return MASKED32 (val, row, col);
-  if (strcmp (call, "MASK64") == 0)
-    return MASKED64 (val, row, col);
-
-  if (strcmp (call, "EXTRACT") == 0)
-    return EXTRACTED (val, row, col);
-  if (strcmp (call, "EXTRACT8") == 0)
-    return EXTRACTED8 (val, row, col);
-  if (strcmp (call, "EXTRACT16") == 0)
-    return EXTRACTED16 (val, row, col);
-  if (strcmp (call, "EXTRACT32") == 0)
-    return EXTRACTED32 (val, row, col);
-  if (strcmp (call, "EXTRACT64") == 0)
-    return EXTRACTED64 (val, row, col);
-
-  if (strcmp (call, "LSEXTRACT") == 0)
-    return LSEXTRACTED (val, row, col);
-  if (strcmp (call, "LSEXTRACT8") == 0)
-    return LSEXTRACTED8 (val, row, col);
-  if (strcmp (call, "LSEXTRACT16") == 0)
-    return LSEXTRACTED16 (val, row, col);
-  if (strcmp (call, "LSEXTRACT32") == 0)
-    return LSEXTRACTED32 (val, row, col);
-  if (strcmp (call, "LSEXTRACT64") == 0)
-    return LSEXTRACTED64 (val, row, col);
-
-  if (strcmp (call, "MSEXTRACT") == 0)
-    return MSEXTRACTED (val, row, col);
-  if (strcmp (call, "MSEXTRACT8") == 0)
-    return MSEXTRACTED8 (val, row, col);
-  if (strcmp (call, "MSEXTRACT16") == 0)
-    return MSEXTRACTED16 (val, row, col);
-  if (strcmp (call, "MSEXTRACT32") == 0)
-    return MSEXTRACTED32 (val, row, col);
-  if (strcmp (call, "MSEXTRACT64") == 0)
-    return MSEXTRACTED64 (val, row, col);
-
-  if (strcmp (call, "INSERT") == 0)
-    return INSERTED (val, row, col);
-  if (strcmp (call, "INSERT8") == 0)
-    return INSERTED8 (val, row, col);
-  if (strcmp (call, "INSERT16") == 0)
-    return INSERTED16 (val, row, col);
-  if (strcmp (call, "INSERT32") == 0)
-    return INSERTED32 (val, row, col);
-  if (strcmp (call, "INSERT64") == 0)
-    return INSERTED64 (val, row, col);
-
-  if (strcmp (call, "LSINSERT") == 0)
-    return LSINSERTED (val, row, col);
-  if (strcmp (call, "LSINSERT8") == 0)
-    return LSINSERTED8 (val, row, col);
-  if (strcmp (call, "LSINSERT16") == 0)
-    return LSINSERTED16 (val, row, col);
-  if (strcmp (call, "LSINSERT32") == 0)
-    return LSINSERTED32 (val, row, col);
-  if (strcmp (call, "LSINSERT64") == 0)
-    return LSINSERTED64 (val, row, col);
-
-  if (strcmp (call, "MSINSERT") == 0)
-    return MSINSERTED (val, row, col);
-  if (strcmp (call, "MSINSERT8") == 0)
-    return MSINSERTED8 (val, row, col);
-  if (strcmp (call, "MSINSERT16") == 0)
-    return MSINSERTED16 (val, row, col);
-  if (strcmp (call, "MSINSERT32") == 0)
-    return MSINSERTED32 (val, row, col);
-  if (strcmp (call, "MSINSERT64") == 0)
-    return MSINSERTED64 (val, row, col);
-
-  if (strcmp (call, "MSMASK") == 0)
-    return MSMASKED (val, row, col);
-  if (strcmp (call, "MSMASK8") == 0)
-    return MSMASKED8 (val, row, col);
-  if (strcmp (call, "MSMASK16") == 0)
-    return MSMASKED16 (val, row, col);
-  if (strcmp (call, "MSMASK32") == 0)
-    return MSMASKED32 (val, row, col);
-  if (strcmp (call, "MSMASK64") == 0)
-    return MSMASKED64 (val, row, col);
-
-  if (strcmp (call, "LSMASK") == 0)
-    return LSMASKED (val, row, col);
-  if (strcmp (call, "LSMASK8") == 0)
-    return LSMASKED8 (val, row, col);
-  if (strcmp (call, "LSMASK16") == 0)
-    return LSMASKED16 (val, row, col);
-  if (strcmp (call, "LSMASK32") == 0)
-    return LSMASKED32 (val, row, col);
-  if (strcmp (call, "LSMASK64") == 0)
-    return LSMASKED64 (val, row, col);
-
-  if (strcmp (call, "ROT64") == 0)
-    return ROT64 (val, col);
-  if (strcmp (call, "ROT8") == 0)
-    return ROT8 (val, col);
-  if (strcmp (call, "ROT16") == 0)
-    return ROT16 (val, col);
-  if (strcmp (call, "ROT32") == 0)
-    return ROT32 (val, col);
-
-  if (strcmp (call, "SEXT") == 0)
-    return SEXT (val, col);
-  if (strcmp (call, "SEXT8") == 0)
-    return SEXT8 (val, col);
-  if (strcmp (call, "SEXT16") == 0)
-    return SEXT16 (val, col);
-  if (strcmp (call, "SEXT32") == 0)
-    return SEXT32 (val, col);
-  if (strcmp (call, "SEXT64") == 0)
-    return SEXT64 (val, col);
-
-  if (strcmp (call, "LSSEXT") == 0)
-    return LSSEXT (val, col);
-  if (strcmp (call, "LSSEXT8") == 0)
-    return LSSEXT8 (val, col);
-  if (strcmp (call, "LSSEXT16") == 0)
-    return LSSEXT16 (val, col);
-  if (strcmp (call, "LSSEXT32") == 0)
-    return LSSEXT32 (val, col);
-  if (strcmp (call, "LSSEXT64") == 0)
-    return LSSEXT64 (val, col);
-
-  if (strcmp (call, "MSSEXT8") == 0)
-    return MSSEXT8 (val, col);
-  if (strcmp (call, "MSSEXT16") == 0)
-    return MSSEXT16 (val, col);
-  if (strcmp (call, "MSSEXT32") == 0)
-    return MSSEXT32 (val, col);
-  if (strcmp (call, "MSSEXT64") == 0)
-    return MSSEXT64 (val, col);
-  if (strcmp (call, "MSSEXT") == 0)
-    return MSSEXT (val, col);
-
-  else
-    {
-      fprintf (stderr,
-	       "Unknown call passed to calc (%s, 0x%08lx%08lx, %d, %d)\n",
-	       call, (long)(val >> 32), (long)val, row, col);
-      abort ();
-      return val;
-    }
-}
-
-
-int
-check_sext (int nr_bits,
-	    int msb_nr,
-	    const char *sexted,
-	    const char *masked,
-	    const char *msmasked)
-{
-  int errors = 0;
-  int col;
-  for (col = 0; col < nr_bits; col ++)
-    {
-      long long mask = calc (masked, -1, col, col);
-      long long msmask = calc (msmasked, -1,
-			       0, (msb_nr ? nr_bits - col - 1 : col));
-      long long sext = calc (sexted, mask, -1, col);
-      long long mask_1 = mask >> 1;
-      long long sext_1 = calc (sexted, mask_1, -1, col);
-      long long mask_0 = (mask << 1) | mask_1;
-      long long sext_0 = calc (sexted, mask_0, -1, col);
-      if (sext_0 != mask_1)
-	{
-	  fprintf (stderr,
-		   "%s:%d: ", __FILE__, __LINE__);
-	  fprintf (stderr,
-		   " %s(0x%08lx%08lx,%d) == 0x%08lx%08lx wrong, != 0x%08lx%08lx\n",
-		   sexted, (long)(mask_0 >> 32), (long)mask_0, col,
-		   (long)(sext_0 >> 32), (long)sext_0,
-		   (long)(mask_1 >> 32), (long)mask_1);
-	  errors ++;
-	}
-      if (sext_1 != mask_1)
-	{
-	  fprintf (stderr,
-		   "%s:%d: ", __FILE__, __LINE__);
-	  fprintf (stderr,
-		   " %s(0x%08lx%08lx,%d) == 0x%08lx%08lx wrong, != 0x%08lx%08lx\n",
-		   sexted, (long)(mask_1 >> 32), (long)mask_1, col,
-		   (long)(sext_1 >> 32), (long)sext_1,
-		   (long)(mask_1 >> 32), (long)mask_1);
-	  errors ++;
-	}
-      if (sext != msmask)
-	{
-	  fprintf (stderr,
-		   "%s:%d: ", __FILE__, __LINE__);
-	  fprintf (stderr,
-		   " %s(0x%08lx%08lx,%d) == 0x%08lx%08lx wrong, != 0x%08lx%08lx (%s(%d,%d))\n",
-		   sexted, (long)(mask >> 32), (long)mask, col,
-		   (long)(sext >> 32), (long)sext,
-		   (long)(msmask >> 32), (long)msmask,
-		   msmasked, 0, (msb_nr ? nr_bits - col - 1 : col));
-	  errors ++;
-	}
-
-    }
-  return errors;
-}
-
-
-int
-check_rot (int nr_bits,
-	   const char *roted,
-	   const char *masked)
-{
-  int errors = 0;
-  int row;
-  int col;
-  for (row = 0; row < nr_bits; row++)
-    for (col = 0; col < nr_bits; col++)
-      if ((WITH_TARGET_WORD_MSB == 0 && row <= col)
-	  || (WITH_TARGET_WORD_MSB != 0 && row >= col))
-	{
-	  long long mask = calc (masked, -1, row, col);
-	  int shift;
-	  for (shift = -nr_bits + 1; shift < nr_bits; shift ++)
-	    {
-	      long long rot = calc (roted, mask, -1, shift);
-	      long long urot = calc (roted, rot, -1, -shift);
-	      if (mask != urot
-		  || (shift == 0 && rot != mask)
-		  || (shift != 0 && rot == mask && abs(row - col) != (nr_bits - 1)))
-		{
-		  fprintf (stderr, "%s:%d: ", __FILE__, __LINE__);
-		  fprintf (stderr, " %s(%s(0x%08lx%08lx,%d) == 0x%08lx%08lx, %d) failed\n",
-			   roted, roted,
-			   (long)(mask >> 32), (long)mask, shift,
-			   (long)(urot >> 32), (long)urot, -shift);
-		  errors ++;
-		}
-	    }
-	}
-  return errors;
-}
-
-
-int
-check_extract (int nr_bits,
-	       const char *extracted,
-	       const char *inserted,
-	       const char *masked)
-{
-  int errors = 0;
-  int row;
-  int col;
-  for (row = 0; row < nr_bits; row++)
-    for (col = 0; col < nr_bits; col ++)
-      if ((WITH_TARGET_WORD_MSB == 0 && row <= col)
-	  || (WITH_TARGET_WORD_MSB != 0 && row >= col))
-	{
-	  long long mask = calc (masked, -1, row, col);
-	  long long extr = calc (extracted, mask, row, col);
-	  long long inst = calc (inserted, extr, row, col);
-	  if (mask != inst)
-	    {
-	      fprintf (stderr, "%s:%d: ", __FILE__, __LINE__);
-	      fprintf (stderr, " %s(%d,%d)=0x%08lx%08lx -> %s=0x%08lx%08lx -> %s=0x%08lx%08lx failed\n",
-		       masked, row, col, (long)(mask >> 32), (long)mask,
-		       extracted, (long)(extr >> 32), (long)extr,
-		       inserted, (long)(inst >> 32), (long)inst);
-	      errors ++;
-	    }
-	}
-  return errors;
-}
-
-
-int
-check_bits (int call,
-	    test_spec **tests)
-{
-  int r;
-  int c;
-  int errors = 0;
-  while (*tests != NULL)
-    {
-      int nr_rows = (*tests)->nr_rows;
-      int nr_cols = (*tests)->nr_cols;
-      test_tuples *tuples = (*tests)->tuples;
-      for (r = 0; r < nr_rows; r++)
-	for (c = 0; c < nr_cols; c++)
-	  {
-	    int i = r * nr_rows + c;
-	    test_tuples *tuple = &tuples[i];
-	    if (tuple->col >= 0)
-	      {
-		long long val = (!call ? tuple->val : calc ((*tests)->macro, -1,
-							    tuple->row, tuple->col));
-		long long check = tuple->check;
-		if (val != check)
-		  {
-		    fprintf (stderr, "%s:%d:", (*tests)->file, tuple->line);
-		    fprintf (stderr, " %s", (*tests)->macro);
-		    if (tuple->row >= 0)
-		      fprintf (stderr, " (%d, %d)", tuple->row, tuple->col);
-		    else
-		      fprintf (stderr, " (%d)", tuple->col);
-		    fprintf (stderr, " == 0x%08lx%08lx wrong, != 0x%08lx%08lx\n",
-			     (long) (val >> 32), (long) val,
-			     (long) (check >> 32), (long) check);
-		    errors ++;
-		  }
-	      }
-	  }
-      tests ++;
-    }
-  return errors;
-}     
-
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int errors = 0;
-
-
-#if defined (DO_BIT_TESTS)
-  printf ("Checking BIT*\n");
-  errors += check_bits (0, bit_tests);
-#endif
-
-
-#if defined (DO_MASK_TESTS)
-  printf ("Checking MASK*\n");
-  errors += check_bits (0, mask_tests);
-
-  printf ("Checking MASKED*\n");
-  errors += check_bits (1, mask_tests);
-#endif
-
-
-#if defined (DO_LSMASK_TESTS)
-  printf ("Checking LSMASK*\n");
-  errors += check_bits (0, lsmask_tests);
-
-  printf ("Checking LSMASKED*\n");
-  errors += check_bits (1, lsmask_tests);
-#endif
-
-
-#if defined (DO_MSMASK_TESTS)
-  printf ("Checking MSMASK*\n");
-  errors += check_bits (0, msmask_tests);
-
-  printf ("Checking MSMASKED*\n");
-  errors += check_bits (1, msmask_tests);
-#endif
-
-
-  printf ("Checking EXTRACTED*\n");
-  errors += check_extract ( 8, "EXTRACT8",  "INSERT8",  "MASK8");
-  errors += check_extract (16, "EXTRACT16", "INSERT16", "MASK16");
-  errors += check_extract (32, "EXTRACT32", "INSERT32", "MASK32");
-  errors += check_extract (64, "EXTRACT64", "INSERT64", "MASK64");
-  errors += check_extract (64, "EXTRACT",   "INSERT",   "MASK");
-
-  printf ("Checking SEXT*\n");
-  errors += check_sext ( 8, WITH_TARGET_WORD_MSB, "SEXT8",  "MASK8",  "MSMASK8");
-  errors += check_sext (16, WITH_TARGET_WORD_MSB, "SEXT16", "MASK16", "MSMASK16");
-  errors += check_sext (32, WITH_TARGET_WORD_MSB, "SEXT32", "MASK32", "MSMASK32");
-  errors += check_sext (64, WITH_TARGET_WORD_MSB, "SEXT64", "MASK64", "MSMASK64");
-  errors += check_sext (64, WITH_TARGET_WORD_MSB, "SEXT",   "MASK",   "MSMASK");
-  
-  printf ("Checking LSSEXT*\n");
-  errors += check_sext ( 8,  8 - 1, "LSSEXT8",  "LSMASK8",  "MSMASK8");
-  errors += check_sext (16, 16 - 1, "LSSEXT16", "LSMASK16", "MSMASK16");
-  errors += check_sext (32, 32 - 1, "LSSEXT32", "LSMASK32", "MSMASK32");
-  errors += check_sext (64, 64 - 1, "LSSEXT64", "LSMASK64", "MSMASK64");
-  errors += check_sext (64, WITH_TARGET_WORD_BITSIZE - 1, "LSSEXT",   "LSMASK",   "MSMASK");
-  
-  printf ("Checking MSSEXT*\n");
-  errors += check_sext (8,   0, "MSSEXT8",  "MSMASK8",  "MSMASK8");
-  errors += check_sext (16,  0, "MSSEXT16", "MSMASK16", "MSMASK16");
-  errors += check_sext (32,  0, "MSSEXT32", "MSMASK32", "MSMASK32");
-  errors += check_sext (64,  0, "MSSEXT64", "MSMASK64", "MSMASK64");
-  errors += check_sext (64,  0, "MSSEXT",   "MSMASK",   "MSMASK");
-  
-  printf ("Checking ROT*\n");
-  errors += check_rot (16, "ROT16", "MASK16");
-  errors += check_rot (32, "ROT32", "MASK32");
-  errors += check_rot (64, "ROT64", "MASK64");
-
-  return errors != 0;
-}
diff --git a/sim/testsuite/common/fpu-tst.c b/sim/testsuite/common/fpu-tst.c
deleted file mode 100644
index d347e12727d..00000000000
--- a/sim/testsuite/common/fpu-tst.c
+++ /dev/null
@@ -1,538 +0,0 @@
-#define ASSERT(EXPRESSION) \
-do { \
-  if (!(EXPRESSION)) { \
-    fprintf (stderr, "%s:%d: assertion failed - %s\n", \
-             __FILE__, __LINE__, #EXPRESSION); \
-    abort (); \
-  } \
-} while (0)
-
-#define SIM_BITS_INLINE (INCLUDE_MODULE | INCLUDED_BY_MODULE)
-
-#include "milieu.h"
-#include "softfloat.h"
-#include "systfloat.h"
-#include "systmodes.h"
-
-/* #define SIM_FPU_INLINE (INCLUDE_MODULE | INCLUDED_BY_MODULE) */
-
-
-#include "sim-bits.h"
-#include "sim-fpu.h"
-#include "sim-fpu.c"
-
-
-
-static int flags;
-
-int8
-syst_float_flags_clear ()
-{
-  int old_flags = 0;
-  int i = 1;
-  while (flags >= i)
-    {
-      switch ((sim_fpu_status) (flags & i))
-	{
-	case sim_fpu_status_denorm:
-	  break;
-	case sim_fpu_status_invalid_snan:
-	case sim_fpu_status_invalid_qnan:
-	case sim_fpu_status_invalid_isi:
-	case sim_fpu_status_invalid_idi:
-	case sim_fpu_status_invalid_zdz:
-	case sim_fpu_status_invalid_imz:
-	case sim_fpu_status_invalid_cvi:
-	case sim_fpu_status_invalid_cmp:
-	case sim_fpu_status_invalid_sqrt:
-	  old_flags |= float_flag_invalid; /* v */
-	  break;
-	case sim_fpu_status_inexact:
-	  old_flags |= float_flag_inexact; /* x */
-	  break;
-	case sim_fpu_status_overflow:
-	  old_flags |= float_flag_overflow; /* o */
-	  break;
-	case sim_fpu_status_underflow:
-	  old_flags |= float_flag_underflow; /* u */
-	  break;
-	case sim_fpu_status_invalid_div0:
-	  old_flags |= float_flag_divbyzero; /* z */
-	  break;
-	case sim_fpu_status_rounded:
-	  break;
-	}
-      i <<= 1;
-    }
-  flags = 0;
-  return old_flags;
-}
-
-
-sim_fpu_round rounding_mode;
-
-void
-syst_float_set_rounding_mode(int8 mode)
-{
-  switch (mode)
-    {
-    case float_round_nearest_even:
-      rounding_mode = sim_fpu_round_near;
-      break;
-    case float_round_down:
-      rounding_mode = sim_fpu_round_down;
-      break;
-    case float_round_up:
-      rounding_mode = sim_fpu_round_up;
-      break;
-    case float_round_to_zero:
-      rounding_mode = sim_fpu_round_zero;
-      break;
-    }
-}
-
-
-float32
-syst_int32_to_float32(int32 a)
-{
-  float32 z;
-  sim_fpu s;
-  flags |= sim_fpu_i32to (&s, a, rounding_mode);
-  flags |= sim_fpu_round_32 (&s, rounding_mode, 0);
-  sim_fpu_to32 (&z, &s);
-  return z;
-}
-
-float64
-syst_int32_to_float64( int32 a )
-{
-  float64 z;
-  sim_fpu s;
-  flags |= sim_fpu_i32to (&s, a, rounding_mode);
-  sim_fpu_to64 (&z, &s);
-  return z;
-}
-
-int32
-syst_float32_to_int32_round_to_zero( float32 a )
-{
-  int32 z;
-  sim_fpu s;
-  sim_fpu_32to (&s, a);
-  flags |= sim_fpu_to32i (&z, &s, sim_fpu_round_zero);
-  return z;
-}
-
-float64
-syst_float32_to_float64 (float32 a)
-{
-  float64 z;
-  sim_fpu s;
-  sim_fpu_32to (&s, a);
-  flags |= sim_fpu_round_64 (&s, rounding_mode, 0);
-  sim_fpu_to64 (&z, &s);
-  return z;
-}
-
-float32 syst_float32_add( float32 a, float32 b )
-{
-  float32 z;
-  sim_fpu A;
-  sim_fpu B;
-  sim_fpu ans;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-#if 0
-  fprintf (stdout, "\n  ");
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, "\n+ ");
-  sim_fpu_print_fpu (&B, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, "\n= ");
-#endif
-  flags |= sim_fpu_add (&ans, &A, &B);
-  flags |= sim_fpu_round_32 (&ans, rounding_mode, 0);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, "\n");
-#endif
-  sim_fpu_to32 (&z, &ans);
-  return z;
-}
-
-float32 syst_float32_sub( float32 a, float32 b )
-{
-  float32 z;
-  sim_fpu A;
-  sim_fpu B;
-  sim_fpu ans;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-#if 0
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " + ");
-  sim_fpu_print_fpu (&B, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " = ");
-#endif
-  flags |= sim_fpu_sub (&ans, &A, &B);
-  flags |= sim_fpu_round_32 (&ans, rounding_mode, 0);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, "\n");
-#endif
-  sim_fpu_to32 (&z, &ans);
-  return z;
-}
-
-float32 syst_float32_mul( float32 a, float32 b )
-{
-  float32 z;
-  sim_fpu A;
-  sim_fpu B;
-  sim_fpu ans;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-#if 0
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " + ");
-  sim_fpu_print_fpu (&B, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " = ");
-#endif
-  flags |= sim_fpu_mul (&ans, &A, &B);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-#endif
-  flags |= sim_fpu_round_32 (&ans, rounding_mode, 0);
-#if 0
-  sim_fpu_print_status (flags, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, "\n");
-#endif
-  sim_fpu_to32 (&z, &ans);
-  return z;
-}
-
-float32 syst_float32_div( float32 a, float32 b )
-{
-  float32 z;
-  sim_fpu A;
-  sim_fpu B;
-  sim_fpu ans;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-  flags |= sim_fpu_div (&ans, &A, &B);
-  flags |= sim_fpu_round_32 (&ans, rounding_mode, 0);
-  sim_fpu_to32 (&z, &ans);
-  return z;
-}
-
-float32 syst_float32_sqrt( float32 a )
-{
-  float32 z;
-  sim_fpu A;
-  sim_fpu ans;
-  sim_fpu_32to (&A, a);
-#if 0
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " sqrt> ");
-#endif
-  flags |= sim_fpu_sqrt (&ans, &A);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-#endif
-  flags |= sim_fpu_round_32 (&ans, rounding_mode, 0);
-#if 0
-  fprintf (stdout, " (%x)\n", flags);
-#endif
-  sim_fpu_to32 (&z, &ans);
-  return z;
-}
-
-flag syst_float32_eq( float32 a, float32 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-  flags |= (sim_fpu_eq (&is, &A, &B) & ~sim_fpu_status_invalid_qnan);
-  return is;
-}
-
-flag syst_float32_eq_signaling( float32 a, float32 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-  flags |= sim_fpu_eq (&is, &A, &B);
-  return is;
-}
-
-flag syst_float32_le( float32 a, float32 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-  flags |= sim_fpu_le (&is, &A, &B);
-  return is;
-}
-
-flag syst_float32_le_quiet( float32 a, float32 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-  flags |= (sim_fpu_le (&is, &A, &B) & ~sim_fpu_status_invalid_qnan);
-  return is;
-}
-
-flag syst_float32_lt( float32 a, float32 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-  flags |= sim_fpu_lt (&is, &A, &B);
-  return is;
-}
-
-flag syst_float32_lt_quiet( float32 a, float32 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_32to (&A, a);
-  sim_fpu_32to (&B, b);
-  flags |= (sim_fpu_lt (&is, &A, &B) & ~sim_fpu_status_invalid_qnan);
-  return is;
-}
-
-int32 syst_float64_to_int32_round_to_zero( float64 a )
-{
-  int32 z;
-  sim_fpu s;
-  sim_fpu_64to (&s, a);
-  flags |= sim_fpu_to32i (&z, &s, sim_fpu_round_zero);
-  return z;
-}
-
-float32 syst_float64_to_float32( float64 a )
-{
-  float32 z;
-  sim_fpu s;
-  sim_fpu_64to (&s, a);
-#if 0
-  sim_fpu_print_fpu (&s, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " -> ");
-#endif
-  flags |= sim_fpu_round_32 (&s, rounding_mode, 0);
-#if 0
-  sim_fpu_print_fpu (&s, (sim_fpu_print_func*) fprintf, stdout);
-  sim_fpu_print_status (flags, (sim_fpu_print_func*) fprintf, stdout);
-  printf ("\n");
-#endif
-  sim_fpu_to32 (&z, &s);
-  return z;
-}
-
-float64 syst_float64_add( float64 a, float64 b )
-{
-  float64 z;
-  sim_fpu A;
-  sim_fpu B;
-  sim_fpu ans;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-#if 0
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " + ");
-  sim_fpu_print_fpu (&B, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " = ");
-#endif
-  flags |= sim_fpu_add (&ans, &A, &B);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-#endif
-  flags |= sim_fpu_round_64 (&ans, rounding_mode, 0);
-#if 0
-  fprintf (stdout, " (%x)\n", flags);
-#endif
-  sim_fpu_to64 (&z, &ans);
-  return z;
-}
-
-float64 syst_float64_sub( float64 a, float64 b )
-{
-  float64 z;
-  sim_fpu A;
-  sim_fpu B;
-  sim_fpu ans;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-#if 0
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " + ");
-  sim_fpu_print_fpu (&B, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " = ");
-#endif
-  flags |= sim_fpu_sub (&ans, &A, &B);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-#endif
-  flags |= sim_fpu_round_64 (&ans, rounding_mode, 0);
-#if 0
-  fprintf (stdout, " (%x)\n", flags);
-#endif
-  sim_fpu_to64 (&z, &ans);
-  return z;
-}
-
-float64 syst_float64_mul( float64 a, float64 b )
-{
-  float64 z;
-  sim_fpu A;
-  sim_fpu B;
-  sim_fpu ans;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-#if 0
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " * ");
-  sim_fpu_print_fpu (&B, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " = ");
-#endif
-  flags |= sim_fpu_mul (&ans, &A, &B);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-#endif
-  flags |= sim_fpu_round_64 (&ans, rounding_mode, 0);
-#if 0
-  sim_fpu_print_status (flags, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, "\n");
-#endif
-  sim_fpu_to64 (&z, &ans);
-  return z;
-}
-
-float64 syst_float64_div( float64 a, float64 b )
-{
-  float64 z;
-  sim_fpu A;
-  sim_fpu B;
-  sim_fpu ans;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-#if 0
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " + ");
-  sim_fpu_print_fpu (&B, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, " = ");
-#endif
-  flags |= sim_fpu_div (&ans, &A, &B);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-#endif
-  flags |= sim_fpu_round_64 (&ans, rounding_mode, 0);
-#if 0
-  sim_fpu_print_status (flags, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, "\n");
-#endif
-  sim_fpu_to64 (&z, &ans);
-  return z;
-}
-
-float64 syst_float64_sqrt( float64 a )
-{
-  float64 z;
-  sim_fpu A;
-  sim_fpu ans;
-  sim_fpu_64to (&A, a);
-#if 0
-  sim_fpu_print_fpu (&A, (sim_fpu_print_func*) fprintf, stdout);
-  printf (" sqrt> ");
-  printf ("\n");
-#endif
-  flags |= sim_fpu_sqrt (&ans, &A);
-#if 0
-  sim_fpu_print_fpu (&ans, (sim_fpu_print_func*) fprintf, stdout);
-#endif
-  flags |= sim_fpu_round_64 (&ans, rounding_mode, 0);
-#if 0
-  sim_fpu_print_status (flags, (sim_fpu_print_func*) fprintf, stdout);
-  fprintf (stdout, "\n");
-#endif
-  sim_fpu_to64 (&z, &ans);
-  return z;
-}
-
-flag syst_float64_eq( float64 a, float64 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-  flags |= (sim_fpu_eq (&is, &A, &B) & ~sim_fpu_status_invalid_qnan);
-  return is;
-}
-
-flag syst_float64_eq_signaling( float64 a, float64 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-  flags |= sim_fpu_eq (&is, &A, &B);
-  return is;
-}
-
-flag syst_float64_le( float64 a, float64 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-  flags |= sim_fpu_le (&is, &A, &B);
-  return is;
-}
-
-flag syst_float64_le_quiet( float64 a, float64 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-  flags |= (sim_fpu_le (&is, &A, &B) & ~sim_fpu_status_invalid_qnan);
-  return is;
-}
-
-flag syst_float64_lt( float64 a, float64 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-  flags |= sim_fpu_lt (&is, &A, &B);
-  return is;
-}
-
-flag syst_float64_lt_quiet( float64 a, float64 b )
-{
-  sim_fpu A;
-  sim_fpu B;
-  int is;
-  sim_fpu_64to (&A, a);
-  sim_fpu_64to (&B, b);
-  flags |= (sim_fpu_lt (&is, &A, &B) & ~sim_fpu_status_invalid_qnan);
-  return is;
-}
-
diff --git a/sim/testsuite/config/default.exp b/sim/testsuite/config/default.exp
deleted file mode 100644
index 56255a33f3a..00000000000
--- a/sim/testsuite/config/default.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Simulator default dejagnu configuration file.
-
-load_lib sim-defs.exp
-
-global AS
-if ![info exists AS] {
-    set AS [findfile $base_dir/../../gas/as-new $base_dir/../../gas/as-new \
-		     [transform as]]
-}
-
-global ASFLAGS
-if ![info exists ASFLAGS] {
-    set ASFLAGS ""
-}
-
-# Compilation is achieved with sim_compile ... so we don't check $CC here.
-
-global CFLAGS
-if ![info exists CFLAGS] {
-    set CFLAGS ""
-}
-
-global LD
-if ![info exists LD] {
-    set LD [findfile $base_dir/../../ld/ld-new $base_dir/../../ld/ld-new \
-		     [transform ld]]
-}
-
-global LDFLAGS
-if ![info exists LDFLAGS] {
-    set LDFLAGS ""
-}
-
-# The path to the simulator is obtained with [board_info host sim],
-# so we don't check $SIM here.
-
-global SIMFLAGS
-if ![info exists SIMFLAGS] {
-    set SIMFLAGS ""
-}
-
-sim_init
diff --git a/sim/testsuite/configure b/sim/testsuite/configure
deleted file mode 100755
index cb6c0907c28..00000000000
--- a/sim/testsuite/configure
+++ /dev/null
@@ -1,2458 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="common/bits-tst.c"
-ac_subdirs_all="$ac_subdirs_all frv-elf"
-ac_subdirs_all="$ac_subdirs_all m32r-elf"
-ac_subdirs_all="$ac_subdirs_all mips64el-elf"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os subdirs arch LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../.. $srcdir/\`cd $srcdir;pwd\`/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../.. $srcdir/\`cd $srcdir;pwd\`/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-# Configure sub-directory for appropriate targets
-case ${target} in
-    frv-*-elf )
-
-
-subdirs="$subdirs frv-elf"
-
-	;;
-    m32r-*-elf )
-
-
-subdirs="$subdirs m32r-elf"
-
-	;;
-    mips64el-*-elf )
-
-
-subdirs="$subdirs mips64el-elf"
-
-	;;
-esac
-
-# Compute the target architecture.
-# FIXME: Will need to canonicalize some values.
-# FIXME: Should be in generally accessable place.
-case $target in
-  *) arch=${target_cpu} ;;
-esac
-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@subdirs@,$subdirs,;t t
-s,@arch@,$arch,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-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=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d $srcdir/$ac_dir || continue
-
-    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
-echo "$as_me: configuring in $ac_dir" >&6;}
-    { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-    cd $ac_dir
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
-    elif test -f $ac_srcdir/configure; then
-      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
-    elif test -f $ac_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&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_top_builddir$cache_file ;;
-      esac
-
-      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval $ac_sub_configure $ac_sub_configure_args \
-	   --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
-	{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/sim/testsuite/configure.ac b/sim/testsuite/configure.ac
deleted file mode 100644
index ceaf4ff5660..00000000000
--- a/sim/testsuite/configure.ac
+++ /dev/null
@@ -1,36 +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.59)
-AC_INIT(common/bits-tst.c)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
-AC_CANONICAL_SYSTEM
-
-# Configure sub-directory for appropriate targets
-case ${target} in
-    frv-*-elf )
-	AC_CONFIG_SUBDIRS(frv-elf)
-	;;
-    m32r-*-elf )
-	AC_CONFIG_SUBDIRS(m32r-elf)
-	;;
-    mips64el-*-elf )
-        AC_CONFIG_SUBDIRS(mips64el-elf)
-	;;
-esac
-
-# Compute the target architecture.
-# FIXME: Will need to canonicalize some values.
-# FIXME: Should be in generally accessable place.
-case $target in
-  *) arch=${target_cpu} ;;
-esac
-AC_SUBST(arch)
-
-AC_OUTPUT(Makefile)
diff --git a/sim/testsuite/d10v-elf/ChangeLog b/sim/testsuite/d10v-elf/ChangeLog
deleted file mode 100644
index e99ae641cfc..00000000000
--- a/sim/testsuite/d10v-elf/ChangeLog
+++ /dev/null
@@ -1,126 +0,0 @@
-2005-01-07  Andrew Cagney  <cagney@gnu.org>
-
-	* configure.ac: Rename configure.in, require autoconf 2.59.
-	* configure: Re-generate.
-
-Tue Apr 18 16:32:07 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-rie-xx.s (test_rie_xx): New test.
-	* Makefile.in (TESTS): Update.
-
-Tue Feb 22 17:36:34 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* Makefile.in: Force d10v into operating mode.
-
-Mon Jan  3 00:17:28 2000  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-ae-ld-d.s, t-ae-ld-i.s, t-ae-ld-id.s, t-ae-ld-im.s ,
- 	t-ae-ld-ip.s, t-ae-ld2w-d.s, t-ae-ld2w-i.s, t-ae-ld2w-id.s ,
- 	t-ae-ld2w-im.s, t-ae-ld2w-ip.s, t-ae-st-d.s, t-ae-st-i.s ,
- 	t-ae-st-id.s, t-ae-st-im.s, t-ae-st-ip.s, t-ae-st-is.s ,
- 	t-ae-st2w-d.s, t-ae-st2w-i.s, t-ae-st2w-id.s, t-ae-st2w-im.s ,
- 	t-ae-st2w-ip.s, t-ae-st2w-is.s: New tests.  Check that an address
- 	exception occures when a word/two-word load/store is not word
- 	aligned.
-	* Makefile.in (TESTS): Update.
-
-Fri Oct 29 18:36:34 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-mvtc.s: Check that the user can not modify the DM bit in the
- 	BPSW or DPSW.
-
-Thu Oct 28 01:47:26 1999  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-mvtc.s: Update. Check that user can not modify DM bit.
-
-Wed Sep  8 19:34:55 MDT 1999	Diego Novillo <dnovillo@cygnus.com>
-
-	* t-ld-st.s: New file.
-	* t-sac.s: New file.
-	* t-sachi.s: New file.
-	* t-slae.s: New file.
-
-1999-01-13  Jason Molenda  (jsm@bugshack.cygnus.com)
-
-	* t-sadd.s: New file.
-	* Makefile.in (TESTS): Add t-sadd.
-
-Mon Feb 16 09:20:57 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-macros.i (VEC_*): Define.
-	(DMAP_REG, DMAP_BASE, DMAP_MASK): Define.
-	(IMAP[01]_REG): Define.
-
-	* t-rdt.s (test_tdt): New file.
-
-	* t-dbt.s (test_dbt): New file.
-
-	* Makefile.in (TESTS): Add t-rdt and t-dbt.
-	
-
-Fri Feb 13 16:21:13 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-sp.s: New test.
-	* Makefile.in (TESTS): Update.
-
-Wed Feb 11 17:58:50 1998  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-macros.i: Update trap calls, func in r4, args in
- 	r0...
-	(start): Force r0 to zero.
-
-	* t-sub2w.s: Ditto.
-
-Tue Dec  9 10:41:44 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-rte.s (success): New file.
-	* Makefile.in: Update.
-
-	* t-rep.s: Check rep repeats correct number of times.
-
-Fri Dec  5 10:11:18 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-mvtc.s: Check for stuck-zero in MOD_E, MOD_S.
-
-	* t-trap.s: New file.
-	* Makefile.in (TESTS): Update.
-
-Thu Dec  4 16:56:55 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-macros.i: Add definitions for PSW bits.
-
-	* t-mvtc.s: New file.
-	* Makefile.in (TESTS): Update.
-
-Wed Dec  3 16:35:24 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-rac.s: New files.
-	
-	* t-macros.i: Add macros for checking psw and 2w quantities.
-
-	* Makefile.in (TESTS): Update.
-
-Tue Dec  2 11:01:36 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-sub2w.s, t-mulxu.s, t-mac.s, t-mvtac.s, t-msbu.s, t-sub.s: New
- 	files.
-  	
-	* Makefile.in: Update.
-
-Mon Nov 17 20:14:48 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-subi.s (test_subi): New file.
-	* Makefile.in: Update.
-
-Fri Nov 14 14:06:06 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-rep.s: New file. Test case of branch to RPT_E address.
-
-Mon Nov 10 19:21:26 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* t-macros.i (_start): New file.
-	* t-rachi.s: New file.
-
-	* Makefile.in (RUN_FOR_TARGET): Look for simulator in d10v
- 	directory.
-
diff --git a/sim/testsuite/d10v-elf/Makefile.in b/sim/testsuite/d10v-elf/Makefile.in
deleted file mode 100644
index 0626ee8781c..00000000000
--- a/sim/testsuite/d10v-elf/Makefile.in
+++ /dev/null
@@ -1,181 +0,0 @@
-# Makefile for regression testing the GNU debugger.
-# Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-# This file is part of GDB.
-
-# GDB 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.
-
-# GDB 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.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-srcroot = $(srcdir)/..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-build_canonical = @build@
-host_canonical = @host@
-target_canonical = @target@
-target_cpu = @target_cpu@
-
-
-SHELL = /bin/sh
-SUBDIRS = @subdirs@
-RPATH_ENVVAR = @RPATH_ENVVAR@
-
-TESTS = \
-	exit47.ko \
-	hello.hi \
-	t-dbt.ok \
-	t-ld-st.ok \
-	t-mac.ok \
-	t-mvtac.ok \
-	t-mvtc.ok \
-	t-msbu.ok \
-	t-mulxu.ok \
-	t-rac.ok \
-	t-rachi.ok \
-	t-rdt.ok \
-	t-rep.ok \
-	t-rte.ok \
-	t-sac.ok \
-	t-sachi.ok \
-	t-sadd.ok \
-	t-slae.ok \
-	t-sp.ok \
-	t-sub2w.ok \
-	t-sub.ok \
-	t-subi.ok \
-	t-ae-ld-d.ok \
-	t-ae-ld-i.ok \
-	t-ae-ld-id.ok \
-	t-ae-ld-im.ok \
-	t-ae-ld-ip.ok \
-	t-ae-ld2w-d.ok \
-	t-ae-ld2w-i.ok \
-	t-ae-ld2w-id.ok \
-	t-ae-ld2w-im.ok \
-	t-ae-ld2w-ip.ok \
-	t-ae-st-d.ok \
-	t-ae-st-i.ok \
-	t-ae-st-id.ok \
-	t-ae-st-im.ok \
-	t-ae-st-ip.ok \
-	t-ae-st-is.ok \
-	t-ae-st2w-d.ok \
-	t-ae-st2w-i.ok \
-	t-ae-st2w-id.ok \
-	t-ae-st2w-im.ok \
-	t-ae-st2w-ip.ok \
-	t-ae-st2w-is.ok \
-	t-mod-ld-pre.ok \
-	t-rie-xx.ok \
-#
-
-AS_FOR_TARGET = `\
-  if [ -x ../../../gas/as-new ]; then \
-    echo ../../../gas/as-new ; \
-  else \
-    echo $(target_alias)-as ; \
-  fi`
-
-LD_FOR_TARGET = `\
-  if [ -x ../../../ld/ld-new ]; then \
-    echo ../../../ld/ld-new ; \
-  else \
-    echo $(target_alias)-ld ; \
-  fi`
-
-RUN_FOR_TARGET = `\
-  if [ -x ../../../sim/d10v/run ]; then \
-    echo ../../../sim/d10v/run ; \
-  else \
-    echo $(target_alias)-run ; \
-  fi`
-
-# Force d10v into operating mode.
-RUNFLAGS_FOR_TARGET=-o
-
-
-check: sanity $(TESTS)
-sanity:
-	@eval echo AS_FOR_TARGET=$(AS_FOR_TARGET)
-	@eval echo LD_FOR_TARGET=$(LD_FOR_TARGET)
-	@eval echo RUN_FOR_TARGET=$(RUN_FOR_TARGET)
-
-clean:
-	rm -f $(TESTS)
-	rm -f *.run *.o
-	rm -f core *.core
-
-# Rules for running the tests
-
-.SUFFIXES: .ok .run .hi .ko .ti
-.run.ok:
-	rm -f tmp-$* $*.hi
-	ulimit -t 5 ; \
-	$(RUN_FOR_TARGET) $(RUNFLAGS_FOR_TARGET) $*.run > tmp-$*
-	mv tmp-$* $*.ok
-.run.hi:
-	rm -f tmp-$* $*.hi diff-$*
-	ulimit -t 5 ; \
-	$(RUN_FOR_TARGET) $(RUNFLAGS_FOR_TARGET) $*.run > tmp-$*
-	echo 'Hello World!' | diff - tmp-$* > diff-$*
-	cat tmp-$* diff-$* > $*.hi
-.run.ko:
-	rm -f tmp-$* $*.ko
-	set +e ; \
-	ulimit -t 5 ; \
-	$(RUN_FOR_TARGET) $(RUNFLAGS_FOR_TARGET) $*.run > tmp-$* ; \
-	if [ $$? -eq 47 ] ; then \
-	  exit 0 ; \
-	else \
-	  exit 1 ; \
-	fi
-	mv tmp-$* $*.ko
-.run.ti:
-	rm -f tmp-$* $*.ti
-	set +e ; \
-	ulimit -t 5 ; \
-	$(RUN_FOR_TARGET) $(RUNFLAGS_FOR_TARGET) $(INTFLAGS_FOR_TARGET) $*.run > tmp-$*
-	test `cat tmp-$* | wc -l` -eq 10 < /dev/null
-	test `grep Tick tmp-$* | wc -l` -eq 10 < /dev/null
-	mv tmp-$* $*.ti
-
-
-# Rules for building the test
-# Preference is for obtaining the executable (.run) from a prebuilt image
-
-.SUFFIXES: .uue .s .S .run
-.uue.run:
-	head $* | grep $*.run > /dev/null
-	uudecode $*.uue
-.run.u:
-	uuencode < $*.run $*.run > $*.u
-.o.run:
-	$(LD_FOR_TARGET) $(LDFLAGS_FOR_TARGET) -o $*.run $*.o
-.s.o:
-	$(AS_FOR_TARGET) $(ASFLAGS_FOR_TARGET) -I$(srcdir) $(srcdir)/$*.s -o $*.o
-.S.o:
-	$(AS_FOR_TARGET) $(ASFLAGS_FOR_TARGET) -I$(srcdir) $(srcdir)/$*.S -o $*.o
-
-
-Makefile: Makefile.in config.status
-	$(SHELL) ./config.status
-
-config.status: configure
-	$(SHELL) ./config.status --recheck
diff --git a/sim/testsuite/d10v-elf/configure b/sim/testsuite/d10v-elf/configure
deleted file mode 100755
index 6a7188a6c38..00000000000
--- a/sim/testsuite/d10v-elf/configure
+++ /dev/null
@@ -1,2249 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="Makefile.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/sim/testsuite/d10v-elf/configure.ac b/sim/testsuite/d10v-elf/configure.ac
deleted file mode 100644
index 08fe90f272c..00000000000
--- a/sim/testsuite/d10v-elf/configure.ac
+++ /dev/null
@@ -1,19 +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.59)
-dnl FIXME - think of a truly uniq file to this directory
-AC_INIT(Makefile.in)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
-AC_CANONICAL_SYSTEM
-
-AC_SUBST(target_cpu)
-
-
-AC_OUTPUT(Makefile)
diff --git a/sim/testsuite/d10v-elf/exit47.s b/sim/testsuite/d10v-elf/exit47.s
deleted file mode 100644
index 93e466465e2..00000000000
--- a/sim/testsuite/d10v-elf/exit47.s
+++ /dev/null
@@ -1,4 +0,0 @@
-.include "t-macros.i"
-
-	start
-	exit47
diff --git a/sim/testsuite/d10v-elf/hello.s b/sim/testsuite/d10v-elf/hello.s
deleted file mode 100644
index d060c89adb0..00000000000
--- a/sim/testsuite/d10v-elf/hello.s
+++ /dev/null
@@ -1,5 +0,0 @@
-	.include "t-macros.i"
-
-	start
-	hello
-	exit0
diff --git a/sim/testsuite/d10v-elf/loop.s b/sim/testsuite/d10v-elf/loop.s
deleted file mode 100644
index e1371e4d951..00000000000
--- a/sim/testsuite/d10v-elf/loop.s
+++ /dev/null
@@ -1,6 +0,0 @@
-	.text
-	.globl _start
-
-_start:
-	bra _start
-	nop
diff --git a/sim/testsuite/d10v-elf/t-ae-ld-d.s b/sim/testsuite/d10v-elf/t-ae-ld-d.s
deleted file mode 100644
index 1be783fe984..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld-d.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld
-	
-	ld r8,@0x4000
-test_ld:
-	ld r8,@0x4001
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld-i.s b/sim/testsuite/d10v-elf/t-ae-ld-i.s
deleted file mode 100644
index 42168e1d812..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld-i.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld
-	
-	ldi r10, #0x4000
-	ld r8, @r10
-
-	ldi r10, #0x4001
-test_ld:
-	ld r8,@r10
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld-id.s b/sim/testsuite/d10v-elf/t-ae-ld-id.s
deleted file mode 100644
index 86b73823556..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld-id.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld
-	
-	ldi r10, #0x4001
-	ld r8, @(1,r10)
-
-test_ld:
-	ld r8,@(2,r10)
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld-im.s b/sim/testsuite/d10v-elf/t-ae-ld-im.s
deleted file mode 100644
index 08e2ba6d38e..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld-im.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld
-	
-	ldi r10, #0x4000
-	ld r8, @r10-
-
-	ldi r10, #0x4001
-test_ld:
-	ld r8,@r10-
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld-ip.s b/sim/testsuite/d10v-elf/t-ae-ld-ip.s
deleted file mode 100644
index cad66600804..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld-ip.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld
-	
-	ldi r10, #0x4000
-	ld r8, @r10+
-
-	ldi r10, #0x4001
-test_ld:
-	ld r8,@r10+
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld2w-d.s b/sim/testsuite/d10v-elf/t-ae-ld2w-d.s
deleted file mode 100644
index c8254ab191f..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld2w-d.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld2w
-	
-	ld2w r8,@0x4000
-test_ld2w:
-	ld2w r8,@0x4001
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld2w-i.s b/sim/testsuite/d10v-elf/t-ae-ld2w-i.s
deleted file mode 100644
index 4b32df5cc32..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld2w-i.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld2w
-	
-	ldi r10, #0x4000
-	ld2w r8, @r10
-
-	ldi r10, #0x4001
-test_ld2w:
-	ld2w r8,@r10
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld2w-id.s b/sim/testsuite/d10v-elf/t-ae-ld2w-id.s
deleted file mode 100644
index 906b2a0836e..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld2w-id.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld2w
-	
-	ldi r10, #0x4001
-	ld2w r8,@(1,r10)
-test_ld2w:
-	ld2w r8,@(2,r10)
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld2w-im.s b/sim/testsuite/d10v-elf/t-ae-ld2w-im.s
deleted file mode 100644
index 71a7286dfcd..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld2w-im.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld2w
-	
-	ldi r10, #0x4000
-	ld2w r8, @r10-
-
-	ldi r10, #0x4001
-test_ld2w:
-	ld2w r8,@r10-
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-ld2w-ip.s b/sim/testsuite/d10v-elf/t-ae-ld2w-ip.s
deleted file mode 100644
index 38cfab622b1..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-ld2w-ip.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_ld2w
-	
-	ldi r10, #0x4000
-	ld2w r8, @r10+
-
-	ldi r10, #0x4001
-test_ld2w:
-	ld2w r8,@r10+
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st-d.s b/sim/testsuite/d10v-elf/t-ae-st-d.s
deleted file mode 100644
index 1f0edd87f25..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st-d.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st
-	
-	st r8,@0x4000
-test_st:
-	st r8,@0x4001
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st-i.s b/sim/testsuite/d10v-elf/t-ae-st-i.s
deleted file mode 100644
index 15245981ecf..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st-i.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st
-	
-	ldi r10,#0x4000
-	st r8, @r10
-
-	ldi r10,#0x4001
-test_st:
-	st r8,@r10
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st-id.s b/sim/testsuite/d10v-elf/t-ae-st-id.s
deleted file mode 100644
index 4caa1b4fafc..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st-id.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st
-	
-	ldi r10,#0x4001
-	st r8, @(1,r10)
-test_st:
-	st r8,@(2,r10)
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st-im.s b/sim/testsuite/d10v-elf/t-ae-st-im.s
deleted file mode 100644
index d4c8bafe096..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st-im.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st
-	
-	ldi r10,#0x4000
-	st r8, @r10-
-
-	ldi r10,#0x4001
-test_st:
-	st r8,@r10-
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st-ip.s b/sim/testsuite/d10v-elf/t-ae-st-ip.s
deleted file mode 100644
index e3a02ee528d..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st-ip.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st
-	
-	ldi r10,#0x4000
-	st r8, @r10+
-
-	ldi r10,#0x4001
-test_st:
-	st r8,@r10+
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st-is.s b/sim/testsuite/d10v-elf/t-ae-st-is.s
deleted file mode 100644
index 4868780128c..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st-is.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st
-	
-	ldi sp,#0x4000
-	st r8, @-SP
-
-	ldi sp,#0x4001
-test_st:
-	st r8,@-SP
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st2w-d.s b/sim/testsuite/d10v-elf/t-ae-st2w-d.s
deleted file mode 100644
index a0d9c3176e9..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st2w-d.s
+++ /dev/null
@@ -1,13 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st2w
-	
-	st2w r8,@0x4000
-test_st2w:
-	st2w r8,@0x4001
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st2w-i.s b/sim/testsuite/d10v-elf/t-ae-st2w-i.s
deleted file mode 100644
index 8c24bc92d75..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st2w-i.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st2w
-	
-	ldi r10, #0x4000
-	st2w r8, @r10
-
-	ldi r10, #0x4001
-test_st2w:
-	st2w r8,@r10
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st2w-id.s b/sim/testsuite/d10v-elf/t-ae-st2w-id.s
deleted file mode 100644
index bfbfd4dd69d..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st2w-id.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st2w
-	
-	ldi r10, #0x4001
-	st2w r8, @(1,r10)
-test_st2w:
-	st2w r8,@(2,r10)
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st2w-im.s b/sim/testsuite/d10v-elf/t-ae-st2w-im.s
deleted file mode 100644
index ee0a9ebe10a..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st2w-im.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st2w
-	
-	ldi r10, #0x4000
-	st2w r8, @r10-
-
-	ldi r10, #0x4001
-test_st2w:
-	st2w r8,@r10-
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st2w-ip.s b/sim/testsuite/d10v-elf/t-ae-st2w-ip.s
deleted file mode 100644
index dc911f723fb..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st2w-ip.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st2w
-	
-	ldi r10, #0x4000
-	st2w r8, @r10+
-
-	ldi r10, #0x4001
-test_st2w:
-	st2w r8,@r10+
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-ae-st2w-is.s b/sim/testsuite/d10v-elf/t-ae-st2w-is.s
deleted file mode 100644
index e39d71ce4c0..00000000000
--- a/sim/testsuite/d10v-elf/t-ae-st2w-is.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_AE&DMAP_MASK)+DMAP_BASE PSW_BITS test_st2w
-	
-	ldi sp, #0x4004
-	st2w r8, @-SP
-
-	ldi sp, #0x4005
-test_st2w:
-	st2w r8,@-SP
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-dbt.s b/sim/testsuite/d10v-elf/t-dbt.s
deleted file mode 100644
index 8c518475be7..00000000000
--- a/sim/testsuite/d10v-elf/t-dbt.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = PSW_DM
-	
-;;; Blat our DMAP registers so that they point at on-chip imem
-
-	ldi r2, MAP_INSN | 0xf
-	st r2, @(DMAP_REG,r0)
-	ldi r2, MAP_INSN
-	st r2, @(IMAP1_REG,r0)
-
-;;; Patch the interrupt vector's dbt entry with a jmp to success
-
-	ldi r4, #trap
-	ldi r5, (VEC_DBT & DMAP_MASK) + DMAP_BASE
-	ld2w r2, @(0,r4)
-	st2w r2, @(0,r5)
-	ld2w r2, @(4,r4)
-	st2w r2, @(4,r5)
-
-test_dbt:
-	dbt -> nop
-	exit47
-
-success:
-	checkpsw2 1 PSW_BITS
-	exit0
-
-	.data
-trap:	ldi r1, success@word
-	jmp r1
diff --git a/sim/testsuite/d10v-elf/t-ld-st.s b/sim/testsuite/d10v-elf/t-ld-st.s
deleted file mode 100644
index ec9f2023f6a..00000000000
--- a/sim/testsuite/d10v-elf/t-ld-st.s
+++ /dev/null
@@ -1,32 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	; Test ld and st
-	ld r4, @foo
-	check 1 r4 0xdead
-
-	ldi r4, #0x2152
-	st r4, @foo
-	ld r4, @foo
-	check 2 r4 0x2152
-
-	; Test ld2w and st2w
-	ldi r4, #0xdead
-	st r4, @foo
-	ld2w r4, @foo
-	check2w2 3 r4 0xdead 0xf000
-
-	ldi r4, #0x2112
-	ldi r5, #0x1984
-	st2w r4, @foo
-	ld2w r4, @foo
-	check2w2 4 r4 0x2112 0x1984
-
-	.data
-	.align 2
-foo:	.short 0xdead
-bar:	.short 0xf000
-	.text
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-mac.s b/sim/testsuite/d10v-elf/t-mac.s
deleted file mode 100644
index 364f61531d1..00000000000
--- a/sim/testsuite/d10v-elf/t-mac.s
+++ /dev/null
@@ -1,71 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	;; clear FX
-	loadpsw2 0x8005
-	loadacc2 a1 0x7f 0xffff 0xffff
-	load r8 0xffff
-	load r9 0x8001
-test_macu1:
-	MACU a1, r9, r8
-	checkacc2 1 a1 0x80 0x8000 0x7FFE
-
-	;; set FX
-	loadpsw2 0x8085
-	loadacc2 a1 0x7f 0xffff 0xffff
-	load r8 0xffff
-	load r9 0x8001
-test_macu2:
-	MACU a1, r9, r8
-	checkacc2 2 a1 0x81 0x0000 0xfffd
-
-
-
-	
-	;; clear FX
-	ldi r2, #0x8005
-	mvtc r2, cr0
-
-	loadacc2 a1 0x7f 0xffff 0xffff
-	ldi r8, #0xffff
-	ldi r9, #0x7FFF
-test_macsu1:
-	MACSU a1, r9, r8
-	checkacc2 3 a1 0x80 0x7FFE 0x8000
-
-	;; set FX
-	ldi r2, #0x8085
-	mvtc r2, cr0
-
-	loadacc2 a1 0x7f 0xffff 0xffff
-	ldi r8, #0xffff
-	ldi r9, #0x7FFF
-test_macsu2:
-	MACSU a1, r9, r8
-	checkacc2 4 a1 0x80 0xfffd 0x0001
-
-	;; clear FX
-	ldi r2, #0x8005
-	mvtc r2, cr0
-
-	loadacc2 a1 0x7f 0xffff 0xffff
-	ldi r8, 0xffff
-	ldi r9, 0x8001
-test_macsu3:
-	MACSU a1, r9, r8
-	checkacc2 5 a1 0x7F 0x8001 0x7FFE
-
-	;; set FX
-	ldi r2, #0x8085
-	mvtc r2, cr0
-
-	loadacc2 a1 0x7f 0xffff 0xffff
-	ldi r8, #0xffff
-	ldi r9, #0x8001
-test_macsu4:
-	MACSU a1, r9, r8
-	checkacc2 6 a1 0x7f 0x0002 0xFFFD
-
-	exit0
-
diff --git a/sim/testsuite/d10v-elf/t-macros.i b/sim/testsuite/d10v-elf/t-macros.i
deleted file mode 100644
index f424acfa57b..00000000000
--- a/sim/testsuite/d10v-elf/t-macros.i
+++ /dev/null
@@ -1,233 +0,0 @@
-	.macro start
-	.text
-	.align 2
-	.globl _start
-_start:
-	ldi r0, 0
-	.endm
-
-
-	.macro exit47
-	ldi r4, 1
-	ldi r0, 47
-	trap 15
-	.endm
-
-
-	.macro exit0
-	ldi r4, 1
-	ldi r0, 0
-	trap 15
-	.endm
-
-
-	.macro exit1
-	ldi r4, 1
-	ldi r0, 1
-	trap 15
-	.endm
-
-
-	.macro exit2
-	ldi r4, 1
-	ldi r0, 2
-	trap 15
-	.endm
-
-
-	.macro load reg val
-	ldi \reg, #\val
-	.endm
-
-
-	.macro load2w reg hi lo
-	ld2w \reg, @(1f,r0)
-	.data
-	.align 2
-1:	.short \hi
-	.short \lo
-	.text
-	.endm
-
-
-	.macro check exit reg val
-	cmpeqi	\reg, #\val
-	brf0t 1f
-0:	ldi r4, 1
-	ldi r0, \exit
-	trap 15
-1:
-	.endm
-
-
-	.macro check2w2 exit reg hi lo
-	st2w	\reg, @(1f,r0)
-	ld	r2, @(1f, r0)
-	cmpeqi	r2, #\hi
-	brf0f	0f
-	ld	r2, @(1f + 2, r0)
-	cmpeqi	r2, #\lo
-	brf0f	0f
-	bra	2f
-0:	ldi r4, 1
-	ldi r0, \exit
-	trap 15
-	.data
-	.align 2
-1:	.long 0
-	.text
-2:
-	.endm
-
-
-	.macro loadacc2 acc guard hi lo
-	ldi	r2, #\lo
-	mvtaclo	r2, \acc
-	ldi	r2, #\hi
-	mvtachi	r2, \acc
-	ldi	r2, #\guard
-	mvtacg	r2, \acc
-	.endm
-
-
-	.macro checkacc2 exit acc guard hi lo
-	ldi	r2, #\guard
-	mvfacg	r3, \acc
-	cmpeq	r2, r3
-	brf0f	0f
-	ldi	r2, #\hi
-	mvfachi	r3, \acc
-	cmpeq	r2, r3
-	brf0f	0f
-	ldi	r2, #\lo
-	mvfaclo	r3, \acc
-	cmpeq	r2, r3
-	brf0f	0f
-	bra	4f
-0:	ldi r4, 1
-	ldi r0, \exit
-	trap 15
-4:
-	.endm
-
-
-	.macro loadpsw2 val
-	ldi r2, #\val
-	mvtc	r2, cr0
-	.endm
-
-
-	.macro checkpsw2 exit val
-	mvfc	r2, cr0
-	cmpeqi	r2, #\val
-	brf0t	1f
-	ldi r4, 1
-	ldi r0, \exit
-	trap 15
-1:
-	.endm
-
-
-	.macro hello
-	;; 4:write (1, string, strlen (string))
-	ldi r4, 4
-	ldi r0, 1
-	ldi r1, 1f
-	ldi r2, 2f-1f-1
-	trap 15
-	.section	.rodata
-1:	.string "Hello World!\n"
-2:	.align 2
-	.text
-	.endm
-
-
-;;; Blat our DMAP registers so that they point at on-chip imem
-	.macro point_dmap_at_imem
-	.text
-	ldi r2, MAP_INSN | 0xf
-	st r2, @(DMAP_REG,r0)
-	ldi r2, MAP_INSN
-	st r2, @(IMAP1_REG,r0)
-	.endm
-
-;;; Patch VEC so that it jumps back to code that checks PSW
-;;; and then exits with success.
-	.macro check_interrupt vec psw src
-;;; Patch the interrupt vector's AE entry with a jmp to success
-	.text
-	ldi r4, #1f
-	ldi r5, \vec
-	;; 	
-	ld2w r2, @(0,r4)
-	st2w r2, @(0,r5)
-	ld2w r2, @(4,r4)
-	st2w r2, @(4,r5)
-	;; 	
-	bra 9f
-	nop
-;;; Code that gets patched into the interrupt vector
-	.data
-1:	ldi r1, 2f@word
-	jmp r1
-;;; Successfull trap jumps back to here
-	.text
-;;; Verify the PSW
-2:	mvfc	r2, cr0
-	cmpeqi	r2, #\psw
-	brf0t	3f
-	nop
-	exit1
-;;; Verify the original addr
-3:	mvfc	r2, bpc
-	cmpeqi	r2, #\src@word
-	brf0t	4f
-	exit2
-4:	exit0
-;;; continue as normal
-9:	
-	.endm
-
-
-	PSW_SM = 0x8000
-	PSW_01 = 0x4000
-	PSW_EA = 0x2000
-	PSW_DB = 0x1000
-	PSW_DM = 0x0800
-	PSW_IE = 0x0400
-	PSW_RP = 0x0200
-	PSW_MD = 0x0100
-	PSW_FX = 0x0080
-	PSW_ST = 0x0040
-	PSW_10 = 0x0020
-	PSW_11 = 0x0010
-	PSW_F0 = 0x0008
-	PSW_F1 = 0x0004
-	PSW_14 = 0x0002
-	PSW_C  = 0x0001
-
-
-;;;
-
-	DMAP_MASK = 0x3fff
-	DMAP_BASE = 0x8000
-	DMAP_REG = 0xff04
-
-	IMAP0_REG = 0xff00
-	IMAP1_REG = 0xff02
-
-	MAP_INSN = 0x1000
-
-;;;
-
-	VEC_RI   = 0x3ff00
-	VEC_BAE  = 0x3ff04
-	VEC_RIE  = 0x3ff08
-	VEC_AE   = 0x3ff0c
-	VEC_TRAP = 0x3ff10
-	VEC_DBT  = 0x3ff50
-	VEC_SDBT = 0x3fff4
-	VEC_DBI  = 0x3ff58
-	VEC_EI   = 0x3ff5c
-
-
diff --git a/sim/testsuite/d10v-elf/t-mod-ld-pre.s b/sim/testsuite/d10v-elf/t-mod-ld-pre.s
deleted file mode 100644
index 4536e0344e1..00000000000
--- a/sim/testsuite/d10v-elf/t-mod-ld-pre.s
+++ /dev/null
@@ -1,126 +0,0 @@
-.include "t-macros.i"
-
-.section        .rodata
- 
-        .text
-        .globl  main
-        .type   main,@function
-main:
-    mvfc        r0, PSW             ||  ldi.s       r14, #0
-    ldi.l       r2, 0x100               ; MOD_E
-    ldi.l       r3, 0x108               ; MOD_S
- 
-test_mod_dec_ld:
-    mvtc        r2, MOD_E           ||  bseti       r0, #7
-    mvtc        r3, MOD_S
-    mvtc        r0, PSW                 ; modulo mode enable
-    mv          r1,r3                           ; r1=0x108
-    ld          r4, @r1-        ||      nop     ; r1=0x106
-    ld          r4, @r1-        ||      nop     ; r1=0x104
-    ld          r4, @r1-        ||      nop     ; r1=0x102
-    ld          r4, @r1-        ||      nop     ; r1=0x100
-    ld          r4, @r1-        ||      nop     ; r1=0x108 
-    ld          r4, @r1-        ||      nop     ; r1=0x106 
- 
-    cmpeqi      r1,#0x106
-    brf0f       _ERR            ;  branch to error
- 
-test_mod_inc_ld:
-    mvtc        r2, MOD_S
-    mvtc        r3, MOD_E
-    mv          r1,r2                           ; r1=0x100
-    ld          r4, @r1+        ||      nop     ; r1=0x102
-    ld          r4, @r1+        ||      nop     ; r1=0x104
-    ld          r4, @r1+        ||      nop     ; r1=0x106
-    ld          r4, @r1+        ||      nop     ; r1=0x108
-    ld          r4, @r1+        ||      nop     ; r1=0x100
-    ld          r4, @r1+        ||      nop     ; r1=0x102
- 
-    cmpeqi      r1,#0x102
-    brf0f       _ERR
- 
-test_mod_dec_ld2w:
-    mvtc        r2, MOD_E
-    mvtc        r3, MOD_S
-    mv          r1,r3                           ; r1=0x108
-    ld2W        r4, @r1-        ||      nop     ; r1=0x104
-    ld2W        r4, @r1-        ||      nop     ; r1=0x100
-    ld2W        r4, @r1-        ||      nop     ; r1=0x108 
-    ld2W        r4, @r1-        ||      nop     ; r1=0x104 
- 
-    cmpeqi      r1,#0x104
-    brf0f       _ERR            ; <= branch to error
- 
-test_mod_inc_ld2w:
-    mvtc        r2, MOD_S
-    mvtc        r3, MOD_E           ||  BCLRI       r0, #7
-    mv          r1,r2                           ; r1=0x100
-    ld2W        r4, @r1+        ||      nop     ; r1=0x104
-    ld2W        r4, @r1+        ||      nop     ; r1=0x108
-    ld2W        r4, @r1+        ||      nop     ; r1=0x100
-    ld2W        r4, @r1+        ||      nop     ; r1=0x104
- 
-    cmpeqi      r1,#0x104
-    brf0f       _ERR
- 
-test_mod_dec_ld_dis:
-    mvtc        r0, PSW                 ; modulo mode disable
-    mvtc        r2, MOD_E
-    mvtc        r3, MOD_S
-    mv          r1,r3                           ; r1=0x108
-    ld          r4, @r1-        ||      nop     ; r1=0x106
-    ld          r4, @r1-        ||      nop     ; r1=0x104
-    ld          r4, @r1-        ||      nop     ; r1=0x102
-    ld          r4, @r1-        ||      nop     ; r1=0x100
-    ld          r4, @r1-        ||      nop     ; r1=0xFE
-    ld          r4, @r1-        ||      nop     ; r1=0xFC
- 
-    cmpeqi      r1,#0xFC
-    brf0f       _ERR
- 
-test_mod_inc_ld_dis:
-    mvtc        r2, MOD_S
-    mvtc        r3, MOD_E
-    mv          r1,r2                           ; r1=0x100
-    ld          r4, @r1+        ||      nop     ; r1=0x102
-    ld          r4, @r1+        ||      nop     ; r1=0x104
-    ld          r4, @r1+        ||      nop     ; r1=0x106
-    ld          r4, @r1+        ||      nop     ; r1=0x108
-    ld          r4, @r1+        ||      nop     ; r1=0x10A
-    ld          r4, @r1+        ||      nop     ; r1=0x10C
- 
-    cmpeqi      r1,#0x10C
-    brf0f       _ERR
- 
-test_mod_dec_ld2w_dis:
-    mvtc        r2, MOD_E
-    mvtc        r3, MOD_S
-    mv          r1,r3                           ; r1=0x108
-    ld2W        r4, @r1-        ||      nop     ; r1=0x104
-    ld2W        r4, @r1-        ||      nop     ; r1=0x100
-    ld2W        r4, @r1-        ||      nop     ; r1=0xFC
-    ld2W        r4, @r1-        ||      nop     ; r1=0xF8
- 
-    cmpeqi      r1,#0xF8
-    brf0f       _ERR
-
- test_mod_inc_ld2w_dis:
-    mvtc        r2, MOD_S
-    mvtc        r3, MOD_E
-    mv          r1,r2                           ; r1=0x100
-    ld2W        r4, @r1+        ||      nop     ; r1=0x104
-    ld2W        r4, @r1+        ||      nop     ; r1=0x108
-    ld2W        r4, @r1+        ||      nop     ; r1=0x10C
-    ld2W        r4, @r1+        ||      nop     ; r1=0x110
- 
-    cmpeqi      r1,#0x110
-    brf0f       _ERR 
-
-_OK:
-	exit0
- 
-_ERR:
-	exit47
-
- 
-
diff --git a/sim/testsuite/d10v-elf/t-msbu.s b/sim/testsuite/d10v-elf/t-msbu.s
deleted file mode 100644
index 04276cc25d9..00000000000
--- a/sim/testsuite/d10v-elf/t-msbu.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	;; clear FX
-	ldi r2, #0x8005
-	mvtc r2, cr0
-
-	loadacc2 a1 0x7f 0xffff 0xffff
-	ldi r8, 0xffff
-	ldi r9, 0x8001
-test_msbu1:
-	MSBU a1, r9, r8
-	checkacc2 1 a1 0X7F 0x7FFF 0x8000
-
-	
-	;; set FX
-	ldi r2, #0x8085
-	mvtc r2, cr0
-
-	loadacc2 a1 0x7f 0xffff 0xffff
-	ldi r8, 0xffff
-	ldi r9, 0x8001
-test_msbu2:
-	MSBU a1, r9, r8
-	checkacc2 2 a1 0X7E 0xFFFF 0x0001
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-mulxu.s b/sim/testsuite/d10v-elf/t-mulxu.s
deleted file mode 100644
index a8e6ffc8d49..00000000000
--- a/sim/testsuite/d10v-elf/t-mulxu.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	;; clear FX
-	ldi r2, #0x8005
-	mvtc r2, cr0
-
-	loadacc2 a1 0x7f 0xffff 0xffff
-	ldi r8, 0xffff
-	ldi r9, 0x8001
-test_mulxu1:
-	MULXU a1, r9, r8
-	checkacc2 1 a1 0x00 0x8000 0x7FFF
-
-	
-	;; set FX
-	ldi r2, #0x8085
-	mvtc r2, cr0
-
-	loadacc2 a1 0x7f 0xffff 0xffff
-	ldi r8, 0xffff
-	ldi r9, 0x8001
-test_mulxu2:
-	MULXU a1, r9, r8
-	checkacc2 2 a1 0x01 0x0000 0xFFFE
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-mvtac.s b/sim/testsuite/d10v-elf/t-mvtac.s
deleted file mode 100644
index 68452dc827a..00000000000
--- a/sim/testsuite/d10v-elf/t-mvtac.s
+++ /dev/null
@@ -1,19 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	ldi r8, 0xbeef
-	mvtaclo r8, a0
-	checkacc2 1 a0 0xff 0xffff 0xbeef
-
-	mvtacg	r0, a0
-	checkacc2 2 a0 0x00 0xffff 0xbeef
-	
-	ldi r8, 0xdead
-	mvtachi	r8, a0
-	checkacc2 3 a0 0xff 0xdead 0xbeef
-
-	loadacc2 a1 0xfe 0xbeef 0xdead
-	checkacc2 4 a1 0xfe 0xbeef 0xdead
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-mvtc.s b/sim/testsuite/d10v-elf/t-mvtc.s
deleted file mode 100644
index 2eed8331a40..00000000000
--- a/sim/testsuite/d10v-elf/t-mvtc.s
+++ /dev/null
@@ -1,129 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-;;; Try out each bit in the PSW
-
-	loadpsw2 PSW_SM
-	checkpsw2 1 PSW_SM
-
-	loadpsw2 PSW_01
-	checkpsw2 2 0 ;; PSW_01
-
-	loadpsw2 PSW_EA
-	checkpsw2 3 PSW_EA
-
-	loadpsw2 PSW_DB
-	checkpsw2 4 PSW_DB
-
-	loadpsw2 PSW_DM
-	checkpsw2 5 0 ;; PSW_DM
-
-	loadpsw2 PSW_IE
-	checkpsw2 6 PSW_IE
-
-	loadpsw2 PSW_RP
-	checkpsw2 7 PSW_RP
-
-	loadpsw2 PSW_MD
-	checkpsw2 8 PSW_MD
-
-	loadpsw2 PSW_FX|PSW_ST
-	checkpsw2 9 PSW_FX|PSW_ST
-
-	;; loadpsw2 PSW_ST
-	;; checkpsw2 10 
-
-	loadpsw2 PSW_10
-	checkpsw2 11 0 ;; PSW_10
-
-	loadpsw2 PSW_11
-	checkpsw2 12 0 ;; PSW_11
-
-	loadpsw2 PSW_F0
-	checkpsw2 13 PSW_F0
-
-	loadpsw2 PSW_F1
-	checkpsw2 14 PSW_F1
-
-	loadpsw2 PSW_14
-	checkpsw2 15 0 ;; PSW_14
-
-	loadpsw2 PSW_C
-	checkpsw2 16 PSW_C
-
-
-;;; Check that bit 0 (LSB) of the MOD_E & MOD_S registers are stuck at ZERO.
-
-	ldi	r6, #0xdead
-	mvtc	r6, cr10
-	ldi	r6, #0xbeef
-	mvtc	r6, cr11
-	
-	mvfc	r7, cr10
-	check 17 r7 0xdeac
-	mvfc	r7, cr11
-	check 18 r7 0xbeee
-
-;;; Check that certain bits of the PSW, DPSW and BPSW are hardwired to zero
-
-psw_ffff:
-	ldi	r6, 0xffff
-	mvtc	r6, psw
-	mvfc	r7, psw
-	check 18 r7 0xb7cd
-
-bpsw_ffff:
-	ldi	r6, 0xffff
-	mvtc	r6, bpsw
-	mvfc	r7, bpsw
-	check 18 r7 0xb7cd
-
-dpsw_ffff:
-	ldi	r6, 0xffff
-	mvtc	r6, dpsw
-	mvfc	r7, dpsw
-	check 18 r7 0xb7cd
-
-;;; Another check. Very similar
-
-psw_dfff:
-	ldi	r6, 0xdfff
-	mvtc	r6, psw
-	mvfc	r7, psw
-	check 18 r7 0x97cd
-
-bpsw_dfff:
-	ldi	r6, 0xdfff
-	mvtc	r6, bpsw
-	mvfc	r7, bpsw
-	check 18 r7 0x97cd
-
-dpsw_dfff:
-	ldi	r6, 0xdfff
-	mvtc	r6, dpsw
-	mvfc	r7, dpsw
-	check 18 r7 0x97cd
-
-;;; And again.
-
-psw_8005:
-	ldi	r6, 0x8005
-	mvtc	r6, psw
-	mvfc	r7, psw
-	check 18 r7 0x8005
-
-bpsw_8005:
-	ldi	r6, 0x8005
-	mvtc	r6, bpsw
-	mvfc	r7, bpsw
-	check 18 r7 0x8005
-
-dpsw_8005:
-	ldi	r6, 0x8005
-	mvtc	r6, dpsw
-	mvfc	r7, dpsw
-	check 18 r7 0x8005
-
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-rac.s b/sim/testsuite/d10v-elf/t-rac.s
deleted file mode 100644
index f2123116c64..00000000000
--- a/sim/testsuite/d10v-elf/t-rac.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	;; clear FX
-	loadpsw2 0x8004
-	loadacc2 a0 0x80 0x0000 0x0000
-	loadacc2 a1 0x00 0x0000 0x5000
-	load r10 0x0123
-	load r11 0x4567
-test_rac1:
-	RAC	r10, a0, #-2
-	checkpsw2 1 0x8008
-	check2w2 2 r10 0x8000 0x0000
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-rachi.s b/sim/testsuite/d10v-elf/t-rachi.s
deleted file mode 100644
index ed901959469..00000000000
--- a/sim/testsuite/d10v-elf/t-rachi.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	loadacc2 a0 0x00 0x7FFF 0x8000
-test_rachi_1:
-	rachi r4, a0, 0
-	check 1 r4 0x7FFF
-
-
-	loadacc2 a0 0xFF 0x8000 0x1000
-test_rachi_2:
-	rachi r4, a0, 0
-	check 2 r4 0x8000
-
-
-	loadacc2 a0 0x00 0x1000 0xA000
-test_rachi_3:
-	rachi r4, a0, 0
-	check 3 r4 0x1001
-
-
-	loadacc2 a0 0xFF 0xA000 0x7FFF
-test_rachi_4:
-	rachi r4, a0, 0
-	check 4 r4 0xa000
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-rdt.s b/sim/testsuite/d10v-elf/t-rdt.s
deleted file mode 100644
index 661b583bb13..00000000000
--- a/sim/testsuite/d10v-elf/t-rdt.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = PSW_C|PSW_F0|PSW_F1
-	
-	ldi	r6, #success@word
-	mvtc	r6, dpc
-	ldi	r6, #PSW_BITS
-	mvtc	r6, dpsw
-
-test_rdt:
-	RTD
-	exit47
-
-success:
-	checkpsw2 1 PSW_BITS
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-rep.s b/sim/testsuite/d10v-elf/t-rep.s
deleted file mode 100644
index cea3ea8251d..00000000000
--- a/sim/testsuite/d10v-elf/t-rep.s
+++ /dev/null
@@ -1,45 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-
-	
-	;; Check that the instruction @REP_E is executed when it
-	;; is reached using a branch instruction
-	
-	ldi r2, 1
-test_rep_1:
-	rep	r2, end_rep_1
-	nop || nop
-	nop || nop
-	nop || nop
-	nop || nop
-	ldi	r3, 46
-	bra	end_rep_1
-	ldi	r3, 42
-end_rep_1:
-	addi	r3, 1
-
-	check 1 r3 47
-
-
-	;; Check that the loop is executed the correct number of times
-
-	ldi	r2, 10
-	ldi	r3, 0
-	ldi	r4, 0
-test_rep_2:
-	rep	r2, end_rep_2
-	nop || nop
-	nop || nop
-	nop || nop
-	nop || nop
-	nop || nop
-	addi	r3, 1
-end_rep_2:
-	addi	r4, 1
-
-	check 2 r3 10
-	check 3 r4 10
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-rie-xx.s b/sim/testsuite/d10v-elf/t-rie-xx.s
deleted file mode 100644
index 2a6fcbdd6fc..00000000000
--- a/sim/testsuite/d10v-elf/t-rie-xx.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = 0
-	point_dmap_at_imem
-	check_interrupt (VEC_RIE&DMAP_MASK)+DMAP_BASE PSW_BITS test_rie_xx
-	
-test_rie_xx:
-        .short 0xe120, 0x0000  ;; Example of RIE code
-	nop
-	exit47
diff --git a/sim/testsuite/d10v-elf/t-rte.s b/sim/testsuite/d10v-elf/t-rte.s
deleted file mode 100644
index 5ce31ddbf41..00000000000
--- a/sim/testsuite/d10v-elf/t-rte.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = PSW_C|PSW_F0|PSW_F1
-	
-	ldi	r6, #success@word
-	mvtc	r6, bpc
-	ldi	r6, #PSW_BITS
-	mvtc	r6, bpsw
-
-test_rte:
-	RTE
-	exit47
-
-success:
-	checkpsw2 1 PSW_BITS
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-sac.s b/sim/testsuite/d10v-elf/t-sac.s
deleted file mode 100644
index 7042be025b1..00000000000
--- a/sim/testsuite/d10v-elf/t-sac.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-test_sac_1:
-	loadacc2 a0 0x00 0xAFFF 0x0000
-	sac r4, a0
-	check 1 r4 0x7FFF
-	check 2 r5 0xFFFF
-
-test_sac_2:
-	loadacc2 a0 0xFF 0x7000 0x0000
-	sac r4, a0
-	check 3 r4 0x8000
-	check 4 r5 0x0000
-
-test_sac_3:
-	loadacc2 a0 0x00 0x1000 0xA000
-	sac r4, a0
-	check 5 r4 0x1000
-	check 6 r5 0xA000
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-sachi.s b/sim/testsuite/d10v-elf/t-sachi.s
deleted file mode 100644
index 7774ee04558..00000000000
--- a/sim/testsuite/d10v-elf/t-sachi.s
+++ /dev/null
@@ -1,22 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-test_sachi_1:
-	loadacc2 a0 0x00 0xAFFF 0x0000
-	sachi r4, a0
-	check 1 r4 0x7FFF
-
-
-test_sachi_2:
-	loadacc2 a0 0xFF 0x8000 0x1000
-	sachi r4, a0
-	check 2 r4 0x8000
-
-
-test_sachi_3:
-	loadacc2 a0 0x00 0x1000 0xA000
-	sachi r4, a0
-	check 3 r4 0x1000
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-sadd.s b/sim/testsuite/d10v-elf/t-sadd.s
deleted file mode 100644
index f3e4ebe3da4..00000000000
--- a/sim/testsuite/d10v-elf/t-sadd.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	PSW_BITS = PSW_FX|PSW_ST|PSW_SM
-        loadpsw2 PSW_BITS
-
- ;; Test normal sadd
-
-        loadacc2 a0 0x00 0x7fff 0xffff
-        loadacc2 a1 0xff 0x8000 0x0000
-        sadd a1, a0
-        checkacc2 1 a0 0x00 0x7fff 0xffff
-        checkacc2 2 a1 0xff 0x8000 0x7fff
-
- ;; Test overflow 
-
-        loadacc2 a0 0x00 0x0000 0x0000
-        loadacc2 a1 0x01 0x8000 0x0000
-        sadd a1, a0
-        checkacc2 3 a0 0x00 0x0000 0x0000
-        checkacc2 4 a1 0x00 0x7fff 0xffff
-
-        loadacc2 a0 0x00 0xffff 0xffff
-        loadacc2 a1 0x00 0xffff 0xffff
-        sadd a1, a0
-        checkacc2 5 a1 0x00 0x7fff 0xffff
-        checkacc2 6 a0 0x00 0xffff 0xffff
-
- ;; Test underflow
-
-        loadacc2 a0 0x00 0x0000 0x0000
-        loadacc2 a1 0x80 0x8000 0x0000
-        sadd a1, a0
-        checkacc2 7 a0 0x00 0x0000 0x0000
-        checkacc2 8 a1 0xff 0x8000 0x0000
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-slae.s b/sim/testsuite/d10v-elf/t-slae.s
deleted file mode 100644
index 6d8422d0f9f..00000000000
--- a/sim/testsuite/d10v-elf/t-slae.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-test_slae_1:
-	loadpsw2 PSW_ST|PSW_FX
-	loadacc2 a0 0x00 0x0AFF 0xF000
-	ldi r0, 4
-	slae a0, r0
-	checkacc2 1 a0 0x00 0x7FFF 0xFFFF
-
-test_slae_2:
-	loadpsw2 PSW_ST|PSW_FX
-	loadacc2 a0 0xFF 0xF700 0x1000
-	ldi r0, 4
-	slae a0, r0
-	checkacc2 2 a0 0xFF 0x8000 0x0000
-
-test_slae_3:
-	loadpsw2 PSW_ST|PSW_FX
-	loadacc2 a0 0x00 0x0010 0xA000
-	ldi r0, 4
-	slae a0, r0
-	checkacc2 3 a0 0x00 0x010A 0x0000
-
-test_slae_4:
-	loadpsw2 0
-	loadacc2 a0 0x00 0x0010 0xA000
-	ldi r0, 4
-	slae a0, r0
-	checkacc2 4 a0 0x00 0x010A 0x0000
-
-test_slae_5:
-	loadacc2 a0 0x00 0x0010 0xA000
-	ldi r0, -4
-	slae a0, r0
-	checkacc2 4 a0 0x00 0x0001 0x0A00
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-sp.s b/sim/testsuite/d10v-elf/t-sp.s
deleted file mode 100644
index 84f9ad48676..00000000000
--- a/sim/testsuite/d10v-elf/t-sp.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-;;; Read/Write values to SPU/SPI
-
-	loadpsw2 0
-	ldi sp, 0xdead
-	loadpsw2 PSW_SM
-	ldi sp, 0xbeef
-	
-	loadpsw2 0
-	check 1 sp 0xdead
-	loadpsw2 PSW_SM
-	check 2 sp 0xbeef
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-sub.s b/sim/testsuite/d10v-elf/t-sub.s
deleted file mode 100644
index 26d0a3a1c9a..00000000000
--- a/sim/testsuite/d10v-elf/t-sub.s
+++ /dev/null
@@ -1,42 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-;;  The d10v implements negated addition for subtraction
-
-	.macro check_sub s x y r c
-	;; clear carry
-	ldi	r6,#0x8004
-	mvtc	r6,cr0
-	;; subtract
-	ldi	r10,#\x
-	ldi	r11,#\y
-	sub	r10, r11
-	;; verify result
-	ldi	r12, #\r
-	cmpeq	r10, r12
-	brf0t	1f
-	ldi	r6, 1
-	ldi	r2, #\s
-	trap	15
-1:
-	;; verify carry
-	mvfc	r6, cr0
-	and3	r6, r6, #1
-	cmpeqi	r6, #\c
-	brf0t	1f
-	ldi	r6, 1
-	ldi	r2, #\s
-	trap	15
-1:
-	.endm
-
-check_sub 1 0x0000 0x0000  0x0000  1
-check_sub 2 0x0000 0x0001  0xffff  0
-check_sub 3 0x0001 0x0000  0x0001  1
-check_sub 4 0x0001 0x0001  0x0000  1
-check_sub 5 0x0000 0x8000  0x8000  0
-check_sub 6 0x8000 0x0001  0x7fff  1
-check_sub 7 0x7fff 0x7fff  0x0000  1
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-sub2w.s b/sim/testsuite/d10v-elf/t-sub2w.s
deleted file mode 100644
index 9f1bbb7321e..00000000000
--- a/sim/testsuite/d10v-elf/t-sub2w.s
+++ /dev/null
@@ -1,57 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-;;  The d10v implements negated addition for subtraction
-
-	.macro check_sub2w s x y r c v
-	
-	;; clear carry
-	ldi	r6,#0x8004
-	mvtc	r6,cr0
-	
-	;; load opnds
-	ld2w	r6, @(1f,r0)
-	ld2w	r8, @(2f,r0)
-	.data
-1:	.long	\x
-2:	.long	\y
-	.text
-	
-	;; subtract
-	SUB2W	r6, r8
-	
-	;; verify result
-	ld2w	r10, @(1f,r0)
-	.data
-1:	.long	\r
-	.text
-	cmpeq	r6, r10
-	brf0f	2f
-	cmpeq	r7, r11
-	brf0t	3f
-2:	ldi	r4, 1
-	ldi	r0, \s
-	trap	15
-3:
-	
-	;; verify carry
-	mvfc	r6, cr0
-	and3	r6, r6, #1
-	cmpeqi	r6, #\c
-	brf0t	1f
-	ldi	r4, 1
-	ldi	r0, \s
-	trap	15
-1:
-	.endm
-	
-check_sub2w 1 0x00000000 0x00000000  0x00000000 1 0
-check_sub2w 2 0x00000000 0x00000001  0xffffffff 0 0
-check_sub2w 3 0x00000001 0x00000000  0x00000001 1 0
-check_sub2w 3 0x00000001 0x00000001  0x00000000 1 0
-check_sub2w 5 0x00000000 0x80000000  0x80000000 0 1
-check_sub2w 6 0x80000000 0x00000001  0x7fffffff 1 1
-check_sub2w 7 0x7fffffff 0x7fffffff  0x00000000 1 0
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-subi.s b/sim/testsuite/d10v-elf/t-subi.s
deleted file mode 100644
index 81faad5ec24..00000000000
--- a/sim/testsuite/d10v-elf/t-subi.s
+++ /dev/null
@@ -1,39 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-;;  The d10v implements negated addition for subtraction
-
-	.macro check_subi s x y r c v
-	;; clear carry
-	ldi	r6,#0x8004
-	mvtc	r6,cr0
-	;; subtract
-	ldi	r10,#\x
-	SUBI	r10,#\y
-	;; verify result
-	ldi	r11, #\r
-	cmpeq	r10, r11
-	brf0t	1f
-	ldi	r6, 1
-	ldi	r2, \s
-	trap	15
-1:
-	;; verify carry
-	mvfc	r6, cr0
-	and3	r6, r6, #1
-	cmpeqi	r6, #\c
-	brf0t	1f
-	ldi	r6, 1
-	ldi	r2, \s
-	trap	15
-1:
-	.endm
-
-	check_subi 1 0000  0x0000  0xfff0 00 ;;  0 - 0x10
-	check_subi 2 0x0000  0x0001  0xffff 0 0
-	check_subi 3 0x0001  0x0000  0xfff1 0 0
-	check_subi 4 0x0001  0x0001  0x0000 1 0
-	check_subi 5 0x8000  0x0001  0x7fff 1 1
-
-	exit0
diff --git a/sim/testsuite/d10v-elf/t-trap.s b/sim/testsuite/d10v-elf/t-trap.s
deleted file mode 100644
index 6ac4ae01ef8..00000000000
--- a/sim/testsuite/d10v-elf/t-trap.s
+++ /dev/null
@@ -1,5 +0,0 @@
-.include "t-macros.i"
-
-	start
-
-	exit47
diff --git a/sim/testsuite/frv-elf/ChangeLog b/sim/testsuite/frv-elf/ChangeLog
deleted file mode 100644
index f5ce696d743..00000000000
--- a/sim/testsuite/frv-elf/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-2005-01-07  Andrew Cagney  <cagney@gnu.org>
-
-	* configure.ac: Rename configure.in, require autoconf 2.59.
-	* configure: Re-generate.
-
-2000-07-26  Dave Brolley  <brolley@redhat.com>
-
-	* Makefile.in (TESTS): Don't run cache.ok
-	* cache.s: Use softune syntax for jmpl.
-
-2000-07-19  Dave Brolley  <brolley@redhat.com>
-
-	* cache.s (pass): Use softune syntax for tira.
-	* exit47.s (pass): Use softune syntax for tira.
-	* grloop.s (pass): Use softune syntax for tira.
-	* hello.s (pass): Use softune syntax for tira.
-
-Thu Aug 19 18:00:16 1999  Dave Brolley  <brolley@cygnus.com>
-
-	* hello.s: Fix sethi, setlo insn usage.
-
-Mon Jun 21 17:33:37 1999  Dave Brolley  <brolley@cygnus.com>
-
-	* Makefile.in (TESTS): Add grloop.ok.
-	* grloop.s: New testcase.
-
-Fri Jun 18 17:55:02 1999  Dave Brolley  <brolley@cygnus.com>
-
-	* exit47.s: Use proper syscalls interface.
-	* hello.s: Use proper syscalls interface.
-
-Mon May 31 12:03:38 1999  Dave Brolley  <brolley@cygnus.com>
-
-	* hello.s,loop.s,exit47.s: Convert to frv insn set.
-
-Thu May  6 16:36:30 1999  Dave Brolley  <brolley@cygnus.com>
-
-	* Directory created.
-
diff --git a/sim/testsuite/frv-elf/Makefile.in b/sim/testsuite/frv-elf/Makefile.in
deleted file mode 100644
index 795bdd1aed1..00000000000
--- a/sim/testsuite/frv-elf/Makefile.in
+++ /dev/null
@@ -1,159 +0,0 @@
-# Makefile for regression testing the frv simulator.
-# Copyright (C) 1998 Free Software Foundation, Inc.
-
-# This file is part of GDB.
-
-# GDB 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.
-
-# GDB 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.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-srcroot = $(srcdir)/../../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-build_canonical = @build@
-host_canonical = @host@
-target_canonical = @target@
-target_cpu = @target_cpu@
-
-
-SHELL = @SHELL@
-SUBDIRS = @subdirs@
-RPATH_ENVVAR = @RPATH_ENVVAR@
-
-EXPECT = `if [ -f ../../../expect/expect ] ; then \
-          echo ../../../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = $(RUNTEST_FOR_TARGET)
-
-RUNTESTFLAGS =
-
-RUNTEST_FOR_TARGET = `\
-  if [ -f $${srcroot}/dejagnu/runtest ]; then \
-    echo $${srcroot}/dejagnu/runtest; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ]; then \
-      echo runtest; \
-    else \
-      t='$(program_transform_name)'; echo runtest | sed -e '' $$t; \
-    fi; \
-  fi`
-
-
-AS_FOR_TARGET = `\
-  if [ -x ../../../gas/as-new ]; then \
-    echo ../../../gas/as-new ; \
-  else \
-    echo $(target_alias)-as ; \
-  fi`
-
-LD_FOR_TARGET = `\
-  if [ -x ../../../ld/ld-new ]; then \
-    echo ../../../ld/ld-new ; \
-  else \
-    echo $(target_alias)-ld ; \
-  fi`
-
-RUN_FOR_TARGET = `\
-  if [ -x ../../../sim/${target_cpu}/run ]; then \
-    echo ../../../sim/${target_cpu}/run ; \
-  else \
-    echo $(target_alias)-run ; \
-  fi`
-
-TESTS = \
-	exit47.ko \
-	grloop.ok \
-	hello.ok
-
-
-check: sanity $(TESTS)
-sanity:
-	@eval echo AS_FOR_TARGET = $(AS_FOR_TARGET)
-	@eval echo LD_FOR_TARGET = $(LD_FOR_TARGET)
-	@eval echo RUN_FOR_TARGET = $(RUN_FOR_TARGET)
-
-
-
-# Rules for running all the tests, put into three types
-# exit success, exit fail, print "Hello World"
-
-.u.log:
-	uudecode $*.u
-	$(RUN_FOR_TARGET) $* > $*.log
-
-
-# Rules for running the tests
-
-.SUFFIXES: .u .ok .run .hi .ko
-.run.ok:
-	rm -f tmp-$* $*.hi
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
-	mv tmp-$* $*.ok
-.run.hi:
-	rm -f tmp-$* $*.hi diff-$*
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
-	echo "Hello World" | diff - tmp-$* > diff-$*
-	cat tmp-$* diff-$* > $*.hi
-.run.ko:
-	rm -f tmp-$* $*.ko
-	set +e ; \
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$* ; \
-	if [ $$? -eq 47 ] ; then \
-	  exit 0 ; \
-	else \
-	  exit 1 ; \
-	fi
-	mv tmp-$* $*.ko
-
-
-# Rules for building all the tests and packing them into
-# uuencoded files.
-
-uuencode: em-pstr.u em-e0.u em-e47.u em-pchr.u
-
-.SUFFIXES: .u .s .run
-.s.u:
-	rm -f $*.o $*.run
-	$(AS_FOR_TARGET) $(srcdir)/$*.s -o $*.o
-	$(LD_FOR_TARGET) -o $* $*.o
-	uuencode < $* $* > $*.u
-	rm -f $*.o $*
-.s.run:
-	rm -f $*.o $*.run
-	$(AS_FOR_TARGET) $(srcdir)/$*.s -o $*.o
-	$(LD_FOR_TARGET) -o $*.run $*.o
-	rm -f $*.o $*
-
-
-clean mostlyclean:
-	rm -f *~ core *.o a.out
-	rm -f $(TESTS)
-
-distclean maintainer-clean realclean: clean
-	rm -f *~ core
-	rm -f Makefile config.status *-init.exp
-	rm -fr *.log summary detail *.plog *.sum *.psum site.*
-
-Makefile : Makefile.in config.status
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/sim/testsuite/frv-elf/cache.s b/sim/testsuite/frv-elf/cache.s
deleted file mode 100644
index 2ed0e1e35a9..00000000000
--- a/sim/testsuite/frv-elf/cache.s
+++ /dev/null
@@ -1,164 +0,0 @@
-# run with --memory-region 0xff000000,4 --memory-region 0xfe000000,00404000
-; Exit with return code
-	.macro exit rc
-	setlos.p	#1,gr7
-	setlos          \rc,gr8
-	tira		gr0,#0
-	.endm
-
-; Pass the test case
-	.macro pass
-pass:
-	setlos.p	#5,gr10
-	setlos		#1,gr8
-	setlos		#5,gr7
-	sethi.p		%hi(passmsg),gr9
-	setlo		%lo(passmsg),gr9
-	tira		gr0,#0
-	exit		#0
-	.endm
-
-; Fail the testcase
-	.macro fail
-fail\@:
-	setlos.p	#5,gr10
-	setlos		#1,gr8
-	setlos		#5,gr7
-	sethi.p		%hi(failmsg),gr9
-	setlo		%lo(failmsg),gr9
-	tira		gr0,#0
-	exit		#1
-	.endm
-
-	.data
-failmsg:
-	.ascii "fail\n"
-passmsg:
-	.ascii "pass\n"
-
-	.text
-	.global _start
-_start:
-	movsg		hsr0,gr10	; enable insn and data caches
-	sethi.p		0xc800,gr11	; in copy-back mode
-	setlo		0x0000,gr11
-	or		gr10,gr11,gr10
-	movgs		gr10,hsr0
-	
-	sethi.p		0x7,sp
-	setlo		0x0000,sp
-
-	; fill the cache
-	sethi.p		%hi(done1),gr10
-	setlo		%lo(done1),gr10
-	movgs		gr10,lr
-	setlos.p	0x1000,gr10
-	setlos		0x0,gr11
-	movgs		gr10,lcr
-write1:	st.p		gr11,@(sp,gr11)
-	addi.p		gr11,4,gr11
-	bctrlr.p	1,0
-	bra		write1
-done1:
-	; read it back
-	sethi.p		%hi(done2),gr10
-	setlo		%lo(done2),gr10
-	movgs		gr10,lr
-	setlos.p	0x1000,gr10
-	setlos		0x0,gr11
-	movgs		gr10,lcr
-read1:	ld		@(sp,gr11),gr12
-	cmp		gr11,gr12,icc0
-	bne		icc0,1,fail
-	addi.p		gr11,4,gr11
-	bctrlr.p	1,0
-	bra		read1
-done2:	
-	
-	; fill the cache twice
-	sethi.p		%hi(done3),gr10
-	setlo		%lo(done3),gr10
-	movgs		gr10,lr
-	setlos.p	0x2000,gr10
-	setlos		0x0,gr11
-	movgs		gr10,lcr
-write3:	st.p		gr11,@(sp,gr11)
-	addi.p		gr11,4,gr11
-	bctrlr.p	1,0
-	bra		write3
-done3:
-	; read it back
-	sethi.p		%hi(done4),gr10
-	setlo		%lo(done4),gr10
-	movgs		gr10,lr
-	setlos.p	0x2000,gr10
-	setlos		0x0,gr11
-	movgs		gr10,lcr
-read4:	ld		@(sp,gr11),gr12
-	cmp		gr11,gr12,icc0
-	bne		icc0,1,fail
-	addi.p		gr11,4,gr11
-	bctrlr.p	1,0
-	bra		read4
-done4:	
-	; read it back in reverse
-	sethi.p		%hi(done5),gr10
-	setlo		%lo(done5),gr10
-	movgs		gr10,lr
-	setlos.p	0x2000,gr10
-	setlos		0x7ffc,gr11
-	movgs		gr10,lcr
-read5:	ld		@(sp,gr11),gr12
-	cmp		gr11,gr12,icc0
-	bne		icc0,1,fail
-	subi.p		gr11,4,gr11
-	bctrlr.p	1,0
-	bra		read5
-done5:	
-
-	; access data and insns in non-cache areas
-	sethi.p		0x8038,gr11		; bctrlr 0,0
-	setlo		0x2000,gr11
-
-	sethi.p		0xff00,gr10		; documented area
-	setlo		0x0000,gr10
-	sti		gr11,@(gr10,0)
-	jmpl		@(gr10,gr0)
-
-	;  enable RAM mode
-	movsg		hsr0,gr10
-	sethi.p		0x0040,gr12
-	setlo		0x0000,gr12
-	or		gr10,gr12,gr10
-	movgs		gr10,hsr0
-
-	sethi.p		0xfe00,gr10		; documented area
-	setlo		0x0400,gr10
-	sti		gr11,@(gr10,0)
-	jmpl		@(gr10,gr0)
-
-	sethi.p		0xfe40,gr10		; documented area
-	setlo		0x0400,gr10
-	sti		gr11,@(gr10,0)
-	dcf		@(gr10,gr0)
-	jmpl		@(gr10,gr0)
-
-	sethi.p		0x0007,gr10		; non RAM area
-	setlo		0x0000,gr10
-	sti		gr11,@(gr10,0)
-	jmpl		@(gr10,gr0)
-
-	sethi.p		0xfe00,gr10		; insn RAM area
-	setlo		0x0000,gr10
-	sti		gr11,@(gr10,0)
-	jmpl		@(gr10,gr0)
-
-	sethi.p		0xfe40,gr10		; data RAM area
-	setlo		0x0000,gr10
-	sti		gr11,@(gr10,0)
-	dcf		@(gr10,gr0)
-	jmpl		@(gr10,gr0)
-	
-	pass
-fail:
-	fail
diff --git a/sim/testsuite/frv-elf/configure b/sim/testsuite/frv-elf/configure
deleted file mode 100755
index 6a7188a6c38..00000000000
--- a/sim/testsuite/frv-elf/configure
+++ /dev/null
@@ -1,2249 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="Makefile.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/sim/testsuite/frv-elf/configure.ac b/sim/testsuite/frv-elf/configure.ac
deleted file mode 100644
index 08fe90f272c..00000000000
--- a/sim/testsuite/frv-elf/configure.ac
+++ /dev/null
@@ -1,19 +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.59)
-dnl FIXME - think of a truly uniq file to this directory
-AC_INIT(Makefile.in)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
-AC_CANONICAL_SYSTEM
-
-AC_SUBST(target_cpu)
-
-
-AC_OUTPUT(Makefile)
diff --git a/sim/testsuite/frv-elf/exit47.s b/sim/testsuite/frv-elf/exit47.s
deleted file mode 100644
index 70e56b3c4ab..00000000000
--- a/sim/testsuite/frv-elf/exit47.s
+++ /dev/null
@@ -1,5 +0,0 @@
-	.global _start
-_start:
-	setlos	#47,gr8
-	setlos	#1,gr7
-	tira	gr0,#0
diff --git a/sim/testsuite/frv-elf/grloop.s b/sim/testsuite/frv-elf/grloop.s
deleted file mode 100644
index 844ad1d2941..00000000000
--- a/sim/testsuite/frv-elf/grloop.s
+++ /dev/null
@@ -1,10 +0,0 @@
-	.global _start
-_start:
-	setlo	0x0400,gr10
-loop:	
-	addicc	gr10,-1,gr10,icc0
-	bne	icc0,0,loop
-; exit (0)
-	setlos	#0,gr8
-	setlos	#1,gr7
-	tira	gr0,#0
diff --git a/sim/testsuite/frv-elf/hello.s b/sim/testsuite/frv-elf/hello.s
deleted file mode 100644
index 0151febc02f..00000000000
--- a/sim/testsuite/frv-elf/hello.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.global _start
-_start:
-
-; write (hello world)
-	setlos	#14,gr10
-	sethi	%hi(hello),gr9
-	setlo	%lo(hello),gr9
-	setlos	#1,gr8
-	setlos	#5,gr7
-	tira	gr0,#0
-; exit (0)
-	setlos	#0,gr8
-	setlos	#1,gr7
-	tira	gr0,#0
-
-hello:	.ascii "Hello World!\r\n"
diff --git a/sim/testsuite/frv-elf/loop.s b/sim/testsuite/frv-elf/loop.s
deleted file mode 100644
index 8489c13c569..00000000000
--- a/sim/testsuite/frv-elf/loop.s
+++ /dev/null
@@ -1,2 +0,0 @@
-	.global _start
-_start:	 bra icc0,0,_start
diff --git a/sim/testsuite/lib/sim-defs.exp b/sim/testsuite/lib/sim-defs.exp
deleted file mode 100644
index 521e0e33a2d..00000000000
--- a/sim/testsuite/lib/sim-defs.exp
+++ /dev/null
@@ -1,402 +0,0 @@
-# Simulator dejagnu utilities.
-
-# Communicate simulator path from sim_init to sim_version.
-# For some reason [board_info target sim] doesn't work in sim_version.
-# [Presumubly because the target has been "popped" by then.  Odd though.]
-set sim_path "unknown-run"
-
-# Initialize the testrun.
-# Required by dejagnu.
-
-proc sim_init { args } {
-    global sim_path
-    set sim_path [board_info target sim]
-    # Need to return an empty string (copied from GAS).
-    return ""
-}
-
-# Print the version of the simulator being tested.
-# Required by dejagnu.
-
-proc sim_version {} {
-    global sim_path
-    set version 0.5
-    clone_output "$sim_path $version\n"
-}
-
-# Cover function to target_compile.
-# Copied from gdb_compile.
-
-proc sim_compile { source dest type options } {
-    set result [target_compile $source $dest $type $options]
-    regsub "\[\r\n\]*$" "$result" "" result
-    regsub "^\[\r\n\]*" "$result" "" result
-    if { $result != "" } {
-	clone_output "sim compile output: $result"
-    }
-    return $result
-}
-
-# Run a program on the simulator.
-# Required by dejagnu (at least ${tool}_run used to be).
-#
-# SIM_OPTS are options for the simulator.
-# PROG_OPTS are options passed to the simulated program.
-# At present REDIR must be "" or "> foo".
-# OPTIONS is a list of options internal to this routine.
-# This is modelled after target_compile.  We want to be able to add new
-# options without having to update all our users.
-# Currently:
-#	env(foo)=val	- set environment variable foo to val for this run
-#	timeout=val	- set the timeout to val for this run
-#
-# The result is a list of two elements.
-# The first is one of pass/fail/etc.
-# The second is the program's output.
-#
-# This is different than the sim_load routine provided by
-# dejagnu/config/sim.exp.  It's not clear how to pass arguments to the
-# simulator (not the simulated program, the simulator) with sim_load.
-
-proc sim_run { prog sim_opts prog_opts redir options } {
-    global SIMFLAGS
-
-    # Set the default value of the timeout.
-    # FIXME: The timeout value we actually want is a function of
-    # host, target, and testcase.
-    set testcase_timeout [board_info target sim_time_limit]
-    if { "$testcase_timeout" == "" } {
-	set testcase_timeout [board_info host testcase_timeout]
-    }
-    if { "$testcase_timeout" == "" } {
-	set testcase_timeout 240 ;# 240 same as in dejagnu/config/sim.exp.
-    }
-
-    # Initial the environment we pass to the testcase.
-    set testcase_env ""
-
-    # Process OPTIONS ...
-    foreach o $options {
-	if [regexp {^env\((.*)\)=(.*)} $o full var val] {
-	    set testcase_env "$testcase_env $var=$val"
-	} elseif [regexp {^timeout=(.*)} $o full val] {
-	    set testcase_timeout $val
-	}
-	
-    }
-	
-    verbose "testcase timeout is set to $testcase_timeout" 1
-
-    set sim [board_info target sim]
-
-    if [is_remote host] {
-	set prog [remote_download host $prog]
-	if { $prog == "" } {
-	    error "download failed"
-	    return -1
-	}
-    }
-
-    set board [target_info name]
-    if [board_info $board exists sim,options] {
-	set always_opts [board_info $board sim,options]
-    } else {
-	set always_opts ""
-    }
-
-    # FIXME: this works for UNIX only
-    if { "$testcase_env" != "" } {
-	set sim "env $testcase_env $sim"
-    }
-
-    if { [board_info target sim,protocol] == "sid" } {
-	set cmd ""
-	set sim_opts "$sim_opts -e \"set cpu-loader file [list ${prog}]\""
-    } else {
-	set cmd "$prog"
-    }
-
-    send_log "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts\n"
-
-    if { "$redir" == "" } {
-	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts"
-    } else {
-	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts $redir" writeonly
-    }
-    set result [remote_wait host $testcase_timeout]
-
-    set return_code [lindex $result 0]
-    set output [lindex $result 1]
-    # Remove the \r part of "\r\n" so we don't break all the patterns
-    # we want to match.
-    regsub -all -- "\r" $output "" output
-
-    if [is_remote host] {
-	# clean up after ourselves.
-	remote_file host delete $prog
-    }
-
-    # ??? Not sure the test for pass/fail is right.
-    # We just care that the simulator ran correctly, not whether the simulated
-    # program return 0 or non-zero from `main'.
-    set status fail
-    if { $return_code == 0 } {
-	set status pass
-    }
-
-    return [list $status $output]
-}
-
-# Run testcase NAME.
-# NAME is either a fully specified file name, or just the file name in which
-# case $srcdir/$subdir will be prepended.
-# REQUESTED_MACHS is a list of machines to run the testcase on.  If NAME isn't
-# for the specified machine(s), it is ignored.
-# Typically REQUESTED_MACHS contains just one element, it is up to the caller
-# to iterate over the desired machine variants.
-#
-# The file can contain options in the form "# option(mach list): value".
-# Possibilities:
-# mach: [all | machine names]
-# as[(mach-list)]: <assembler options>
-# ld[(mach-list)]: <linker options>
-# sim[(mach-list)]: <simulator options>
-# output: program output pattern to match with string-match
-# xerror: program is expected to return with a "failure" exit code
-# xfail: <PRMS-opt> <target-triplets-where-test-fails>
-# kfail: <PRMS> <target-triplets-where-test-fails>
-# If `output' is not specified, the program must output "pass" if !xerror or
-# "fail" if xerror.
-# The parens in "optname()" are optional if the specification is for all machs.
-# Multiple "output", "xfail" and "kfail" options concatenate.
-# The xfail and kfail arguments are space-separated target triplets and PRIDs.
-# There must be a PRMS (bug report ID) specified for kfail, while it's
-# optional for xfail.
-
-proc run_sim_test { name requested_machs } {
-    global subdir srcdir
-    global SIMFLAGS
-    global opts
-    global cpu_option
-    global global_as_options
-    global global_ld_options
-    global global_sim_options
-
-    if [string match "*/*" $name] {
-	set file $name
-	set name [file tail $name]
-    } else {
-	set file "$srcdir/$subdir/$name"
-    }
-
-    set opt_array [slurp_options "${file}"]
-    if { $opt_array == -1 } {
-	unresolved $subdir/$name
-	return
-    }
-    # Clear default options
-    set opts(as) ""
-    set opts(ld) ""
-    set opts(sim) ""
-    set opts(output) ""
-    set opts(mach) ""
-    set opts(timeout) ""
-    set opts(xerror) "no"
-    set opts(xfail) ""
-    set opts(kfail) ""
-
-    if ![info exists global_as_options] {
-        set global_as_options ""
-    }
-    if ![info exists global_ld_options] {
-        set global_ld_options ""
-    }
-    if ![info exists global_sim_options] {
-        set global_sim_options ""
-    }
-
-    # Clear any machine specific options specified in a previous test case
-    foreach m $requested_machs {
-	if [info exists opts(as,$m)] {
-	    unset opts(as,$m)
-	}
-	if [info exists opts(ld,$m)] {
-	    unset opts(ld,$m)
-	}
-	if [info exists opts(sim,$m)] {
-	    unset opts(sim,$m)
-	}
-    }
-
-    foreach i $opt_array {
-	set opt_name [lindex $i 0]
-	set opt_machs [lindex $i 1]
-	set opt_val [lindex $i 2]
-	if ![info exists opts($opt_name)] {
-	    perror "unknown option $opt_name in file $file"
-	    unresolved $subdir/$name
-	    return
-	}
-	# Multiple "output" specifications concatenate, they don't override.
-	if { $opt_name == "output" } {
-	    set opt_val "$opts(output)$opt_val"
-	}
-	# Similar with "xfail" and "kfail", but arguments are space-separated.
-	if { $opt_name == "xfail" || $opt_name == "kfail" } {
-	    set opt_val "$opts($opt_name) $opt_val"
-	}
-
-	foreach m $opt_machs {
-	    set opts($opt_name,$m) $opt_val
-	}
-	if { "$opt_machs" == "" } {
-	    set opts($opt_name) $opt_val
-	}
-    }
-
-    set testname $name
-    set sourcefile $file
-    if { $opts(output) == "" } {
-	if { "$opts(xerror)" == "no" } {
-	    set opts(output) "pass\n"
-	} else {
-	    set opts(output) "fail\n"
-	}
-    }
-    # Change \n sequences to newline chars.
-    regsub -all "\\\\n" $opts(output) "\n" opts(output)
-
-    set testcase_machs $opts(mach)
-    if { "$testcase_machs" == "all" } {
-	set testcase_machs $requested_machs
-    }
-
-    foreach mach $testcase_machs {
-	if { [lsearch $requested_machs $mach] < 0 } {
-	    verbose -log "Skipping $mach version of $name, not requested."
-	    continue
-	}
-
-	verbose -log "Testing $name on machine $mach."
-
-	# Time to setup xfailures and kfailures.
-	if { "$opts(xfail)" != "" } {
-	    verbose -log "xfail: $opts(xfail)"
-	    # Using eval to make $opts(xfail) appear as individual
-	    # arguments.
-	    eval setup_xfail $opts(xfail)
-	}
-	if { "$opts(kfail)" != "" } {
-	    verbose -log "kfail: $opts(kfail)"
-	    eval setup_kfail $opts(kfail)
-	}
-
-	if ![info exists opts(as,$mach)] {
-	    set opts(as,$mach) $opts(as)
-	}
-
-	set as_options "$opts(as,$mach) -I$srcdir/$subdir"
-	if [info exists cpu_option] {
-	    set as_options "$as_options $cpu_option=$mach"
-	}
-	set comp_output [target_assemble $sourcefile ${name}.o "$as_options $global_as_options"]
-
-	if ![string match "" $comp_output] {
-	    verbose -log "$comp_output" 3
-	    fail "$mach $testname (assembling)"
-	    continue
-	}
-
-	if ![info exists opts(ld,$mach)] {
-	    set opts(ld,$mach) $opts(ld)
-	}
-
-	set comp_output [target_link ${name}.o ${name}.x "$opts(ld,$mach) $global_ld_options"]
-
-	if ![string match "" $comp_output] {
-	    verbose -log "$comp_output" 3
-	    fail "$mach $testname (linking)"
-	    continue
-	}
-
-	# If no machine specific options, default to the general version.
-	if ![info exists opts(sim,$mach)] {
-	    set opts(sim,$mach) $opts(sim)
-	}
-
-	# Build the options argument.
-	set options ""
-	if { "$opts(timeout)" != "" } {
-	    set options "$options timeout=$opts(timeout)"
-	}
-
-	set result [sim_run ${name}.x "$opts(sim,$mach) $global_sim_options" "" "" "$options"]
-	set status [lindex $result 0]
-	set output [lindex $result 1]
-
-	if { "$status" == "pass" } {
-	    if { "$opts(xerror)" == "no" } {
-		if [string match $opts(output) $output] {
-		    pass "$mach $testname"
-		    file delete ${name}.o ${name}.x
-		} else {
-		    verbose -log "output:  $output" 3
-		    verbose -log "pattern: $opts(output)" 3
-		    fail "$mach $testname (execution)"
-		}
-	    } else {
-		verbose -log "`pass' return code when expecting failure" 3
-		fail "$mach $testname (execution)"
-	    }
-	} elseif { "$status" == "fail" } {
-	    if { "$opts(xerror)" == "no" } {
-		fail "$mach $testname (execution)"
-	    } else {
-		if [string match $opts(output) $output] {
-		    pass "$mach $testname"
-		    file delete ${name}.o ${name}.x
-		} else {
-		    verbose -log "output:  $output" 3
-		    verbose -log "pattern: $opts(output)" 3
-		    fail "$mach $testname (execution)"
-		}
-	    }
-	} else {
-	    $status "$mach $testname"
-	}
-    }
-}
-
-# Subroutine of run_sim_test to process options in FILE.
-
-proc slurp_options { file } {
-    if [catch { set f [open $file r] } x] {
-	#perror "couldn't open `$file': $x"
-	perror "$x"
-	return -1
-    }
-    set opt_array {}
-    # whitespace expression
-    set ws  {[ 	]*}
-    set nws {[^ 	]*}
-    # whitespace is ignored anywhere except within the options list;
-    # option names are alphabetic only
-    set pat "^#${ws}(\[a-zA-Z\]*)\\(?(\[^):\]*)\\)?$ws:${ws}(.*)$ws\$"
-    # Allow arbitrary lines until the first option is seen.
-    set seen_opt 0
-    while { [gets $f line] != -1 } {
-	set line [string trim $line]
-	# Whitespace here is space-tab.
-	if [regexp $pat $line xxx opt_name opt_machs opt_val] {
-	    # match!
-	    lappend opt_array [list $opt_name $opt_machs $opt_val]
-	    set seen_opt 1
-	} else {
-	    if { $seen_opt } {
-		break
-	    }
-	}
-    }
-    close $f
-    return $opt_array
-}
diff --git a/sim/testsuite/m32r-elf/ChangeLog b/sim/testsuite/m32r-elf/ChangeLog
deleted file mode 100644
index 7c26297667f..00000000000
--- a/sim/testsuite/m32r-elf/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2005-01-07  Andrew Cagney  <cagney@gnu.org>
-
-	* configure.ac: Rename configure.in, require autoconf 2.59.
-	* configure: Re-generate.
-
-Thu Feb 12 19:09:38 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* Directory created.
-
diff --git a/sim/testsuite/m32r-elf/Makefile.in b/sim/testsuite/m32r-elf/Makefile.in
deleted file mode 100644
index bbfb6a55322..00000000000
--- a/sim/testsuite/m32r-elf/Makefile.in
+++ /dev/null
@@ -1,157 +0,0 @@
-# Makefile for regression testing the m32r simulator.
-# Copyright (C) 1998 Free Software Foundation, Inc.
-
-# This file is part of GDB.
-
-# GDB 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.
-
-# GDB 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.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-srcroot = $(srcdir)/../../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-build_canonical = @build@
-host_canonical = @host@
-target_canonical = @target@
-target_cpu = @target_cpu@
-
-
-SHELL = @SHELL@
-SUBDIRS = @subdirs@
-RPATH_ENVVAR = @RPATH_ENVVAR@
-
-EXPECT = `if [ -f ../../../expect/expect ] ; then \
-          echo ../../../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = $(RUNTEST_FOR_TARGET)
-
-RUNTESTFLAGS =
-
-RUNTEST_FOR_TARGET = `\
-  if [ -f $${srcroot}/dejagnu/runtest ]; then \
-    echo $${srcroot}/dejagnu/runtest; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ]; then \
-      echo runtest; \
-    else \
-      t='$(program_transform_name)'; echo runtest | sed -e '' $$t; \
-    fi; \
-  fi`
-
-
-AS_FOR_TARGET = `\
-  if [ -x ../../../gas/as-new ]; then \
-    echo ../../../gas/as-new ; \
-  else \
-    echo $(target_alias)-as ; \
-  fi`
-
-LD_FOR_TARGET = `\
-  if [ -x ../../../ld/ld-new ]; then \
-    echo ../../../ld/ld-new ; \
-  else \
-    echo $(target_alias)-ld ; \
-  fi`
-
-RUN_FOR_TARGET = `\
-  if [ -x ../../../sim/${target_cpu}/run ]; then \
-    echo ../../../sim/${target_cpu}/run ; \
-  else \
-    echo $(target_alias)-run ; \
-  fi`
-
-TESTS = \
-	hello.ok \
-	exit47.ko
-
-check: sanity $(TESTS)
-sanity:
-	@eval echo AS_FOR_TARGET = $(AS_FOR_TARGET)
-	@eval echo LD_FOR_TARGET = $(LD_FOR_TARGET)
-	@eval echo RUN_FOR_TARGET = $(RUN_FOR_TARGET)
-
-
-
-# Rules for running all the tests, put into three types
-# exit success, exit fail, print "Hello World"
-
-.u.log:
-	uudecode $*.u
-	$(RUN_FOR_TARGET) $* > $*.log
-
-
-# Rules for running the tests
-
-.SUFFIXES: .u .ok .run .hi .ko
-.run.ok:
-	rm -f tmp-$* $*.hi
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
-	mv tmp-$* $*.ok
-.run.hi:
-	rm -f tmp-$* $*.hi diff-$*
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
-	echo "Hello World" | diff - tmp-$* > diff-$*
-	cat tmp-$* diff-$* > $*.hi
-.run.ko:
-	rm -f tmp-$* $*.ko
-	set +e ; \
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$* ; \
-	if [ $$? -eq 47 ] ; then \
-	  exit 0 ; \
-	else \
-	  exit 1 ; \
-	fi
-	mv tmp-$* $*.ko
-
-
-# Rules for building all the tests and packing them into
-# uuencoded files.
-
-uuencode: em-pstr.u em-e0.u em-e47.u em-pchr.u
-
-.SUFFIXES: .u .s .run
-.s.u:
-	rm -f $*.o $*.run
-	$(AS_FOR_TARGET) $(srcdir)/$*.s -o $*.o
-	$(LD_FOR_TARGET) -o $* $*.o
-	uuencode < $* $* > $*.u
-	rm -f $*.o $*
-.s.run:
-	rm -f $*.o $*.run
-	$(AS_FOR_TARGET) $(srcdir)/$*.s -o $*.o
-	$(LD_FOR_TARGET) -o $*.run $*.o
-	rm -f $*.o $*
-
-
-clean mostlyclean:
-	rm -f *~ core *.o a.out
-	rm -f $(TESTS)
-
-distclean maintainer-clean realclean: clean
-	rm -f *~ core
-	rm -f Makefile config.status *-init.exp
-	rm -fr *.log summary detail *.plog *.sum *.psum site.*
-
-Makefile : Makefile.in config.status
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/sim/testsuite/m32r-elf/configure b/sim/testsuite/m32r-elf/configure
deleted file mode 100755
index 6a7188a6c38..00000000000
--- a/sim/testsuite/m32r-elf/configure
+++ /dev/null
@@ -1,2249 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="Makefile.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/sim/testsuite/m32r-elf/configure.ac b/sim/testsuite/m32r-elf/configure.ac
deleted file mode 100644
index 08fe90f272c..00000000000
--- a/sim/testsuite/m32r-elf/configure.ac
+++ /dev/null
@@ -1,19 +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.59)
-dnl FIXME - think of a truly uniq file to this directory
-AC_INIT(Makefile.in)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
-AC_CANONICAL_SYSTEM
-
-AC_SUBST(target_cpu)
-
-
-AC_OUTPUT(Makefile)
diff --git a/sim/testsuite/m32r-elf/exit47.s b/sim/testsuite/m32r-elf/exit47.s
deleted file mode 100644
index ab814e3ab9a..00000000000
--- a/sim/testsuite/m32r-elf/exit47.s
+++ /dev/null
@@ -1,7 +0,0 @@
-	;; Return with exit code 47.
-
-	.globl _start
-_start:
-	ldi8 r1,#47
-	ldi8 r0,#1
-	trap #0
diff --git a/sim/testsuite/m32r-elf/hello.s b/sim/testsuite/m32r-elf/hello.s
deleted file mode 100644
index a61693462fb..00000000000
--- a/sim/testsuite/m32r-elf/hello.s
+++ /dev/null
@@ -1,17 +0,0 @@
-
-	.globl _start
-_start:
-
-; write (hello world)
-	ldi8 r3,#14
-	ld24 r2,#hello
-	ldi8 r1,#1
-	ldi8 r0,#5
-	trap #0
-; exit (0)
-	ldi8 r1,#0
-	ldi8 r0,#1
-	trap #0
-
-length:	.long 14
-hello:	.ascii "Hello World!\r\n"
diff --git a/sim/testsuite/m32r-elf/loop.s b/sim/testsuite/m32r-elf/loop.s
deleted file mode 100644
index b24cfb41fdd..00000000000
--- a/sim/testsuite/m32r-elf/loop.s
+++ /dev/null
@@ -1,2 +0,0 @@
-	.globl _start
-_start:	bra _start
diff --git a/sim/testsuite/mips64el-elf/ChangeLog b/sim/testsuite/mips64el-elf/ChangeLog
deleted file mode 100644
index a7e0fe85a1d..00000000000
--- a/sim/testsuite/mips64el-elf/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-2005-01-07  Andrew Cagney  <cagney@gnu.org>
-
-	* configure.ac: Rename configure.in, require autoconf 2.59.
-	* configure: Re-generate.
-
-Thu Aug 13 22:37:29 EDT 1998  Jim Lemke  <jlemke@cygnus.com>
-
-	* Makefile.in, configure, configure.in:
-	Create a minimal testsuite.
-
diff --git a/sim/testsuite/mips64el-elf/Makefile.in b/sim/testsuite/mips64el-elf/Makefile.in
deleted file mode 100644
index c8191aea4ae..00000000000
--- a/sim/testsuite/mips64el-elf/Makefile.in
+++ /dev/null
@@ -1,171 +0,0 @@
-# Makefile for regression testing the GNU debugger.
-# Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-# This file is part of GDB.
-
-# GDB 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.
-
-# GDB 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.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-srcroot = $(srcdir)/..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-build_canonical = @build@
-host_canonical = @host@
-target_canonical = @target@
-target_cpu = @target_cpu@
-
-
-SHELL = /bin/sh
-SUBDIRS = @subdirs@
-RPATH_ENVVAR = @RPATH_ENVVAR@
-
-EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \
-          echo $${rootme}/../../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = $(RUNTEST_FOR_TARGET)
-
-RUNTESTFLAGS =
-
-RUNTEST_FOR_TARGET = `\
-  if [ -f $${srcdir}/../../../dejagnu/runtest ]; then \
-    echo $${srcdir}/../../../dejagnu/runtest; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ]; then \
-      echo runtest; \
-    else \
-      t='$(program_transform_name)'; echo runtest | sed -e '' $$t; \
-    fi; \
-  fi`
-
-
-AS_FOR_TARGET = `\
-  if [ -x ../../../gas/as-new ]; then \
-    echo ../../../gas/as-new ; \
-  else \
-    echo $(target_alias)-as ; \
-  fi`
-
-LD_FOR_TARGET = `\
-  if [ -x ../../../ld/ld-new ]; then \
-    echo ../../../ld/ld-new ; \
-  else \
-    echo $(target_alias)-ld ; \
-  fi`
-
-RUN_FOR_TARGET = `\
-  if [ -x ../../../sim/mips/run ]; then \
-    echo ../../../sim/mips/run ; \
-  else \
-    echo $(target_alias)-run ; \
-  fi`
-
-TESTS = 
-
-check: sanity $(TESTS)
-sanity:
-	@eval echo AS_FOR_TARGET = $(AS_FOR_TARGET)
-	@eval echo LD_FOR_TARGET = $(LD_FOR_TARGET)
-	@eval echo RUN_FOR_TARGET = $(RUN_FOR_TARGET)
-
-
-
-# Rules for running all the tests, put into three types
-# exit success, exit fail, print "Hello World"
-
-.u.log:
-	uudecode $*.u
-	$(RUN_FOR_TARGET) $* > $*.log
-
-
-# Rules for running the tests
-
-.SUFFIXES: .u .uue .ok .ok .run .hi .ko .ko
-.run.ok:
-	rm -f tmp-$* $*.ok
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
-	mv tmp-$* $*.ok
-.run.hi:
-	rm -f tmp-$* $*.hi diff-$*
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$*
-	echo 'Hello World!' | diff - tmp-$* > diff-$*
-	cat tmp-$* diff-$* > $*.hi
-.run.ko:
-	rm -f tmp-$* $*.ko
-	set +e ; \
-	ulimit -t 5 ; $(RUN_FOR_TARGET) $*.run > tmp-$* ; \
-	if [ $$? -eq 47 ] ; then \
-	  exit 0 ; \
-	else \
-	  exit 1 ; \
-	fi
-	mv tmp-$* $*.ko
-
-
-# Rules for building all the tests and packing them into
-# uuencoded files.
-
-.run.u:
-	uuencode < $*.run $*.run > $*.u
-	@echo "Move $*.u $*.uue"
-.uue.run:
-	uudecode $(srcdir)/$*.uue
-.o.run:
-	$(LD_FOR_TARGET) -Ttext 0xa0020000 -o $*.run $*.o
-.s.o:
-	$(AS_FOR_TARGET) -I $(srcdir) $(srcdir)/$*.s -o $*.o
-
-
-#
-# Standard
-#
-clean mostlyclean:
-	-rm -f *~ core *.o a.out *.x *.grt *.run tmp-* diff-*
-	rm -f $(TESTS)
-#	if [ x"${SUBDIRS}" != x ] ; then \
-#	    for dir in ${SUBDIRS}; \
-#	    do \
-#		    echo "$$dir:"; \
-#		    if [ -d $$dir ]; then \
-#			    (cd $$dir; $(MAKE) clean); \
-#		    fi; \
-#	    done ; \
-#	else true; fi
-
-distclean maintainer-clean realclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status *-init.exp
-	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-#	if [ x"${SUBDIRS}" != x ] ; then \
-#	    for dir in ${SUBDIRS}; \
-#	    do \
-#		    echo "$$dir:"; \
-#		    if [ -d $$dir ]; then \
-#			    (cd $$dir; $(MAKE) distclean); \
-#		    fi; \
-#	    done ; \
-#	else true; fi
-
-Makefile : Makefile.in config.status
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/sim/testsuite/mips64el-elf/configure b/sim/testsuite/mips64el-elf/configure
deleted file mode 100755
index 6a7188a6c38..00000000000
--- a/sim/testsuite/mips64el-elf/configure
+++ /dev/null
@@ -1,2249 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="Makefile.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-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'
-
-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
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # 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_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$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 ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) 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 | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$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 | -n)
-    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 ;;
-
-  -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_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    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 "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# 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_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # 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 <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# 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
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-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
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-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
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/../../.. $srcdir/\`cd $srcdir;pwd\`/../../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-
-          ac_config_files="$ac_config_files Makefile"
-cat >confcache <<\_ACEOF
-# 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, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# 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 \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # 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_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # 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" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/sim/testsuite/mips64el-elf/configure.ac b/sim/testsuite/mips64el-elf/configure.ac
deleted file mode 100644
index 08fe90f272c..00000000000
--- a/sim/testsuite/mips64el-elf/configure.ac
+++ /dev/null
@@ -1,19 +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.59)
-dnl FIXME - think of a truly uniq file to this directory
-AC_INIT(Makefile.in)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
-AC_CANONICAL_SYSTEM
-
-AC_SUBST(target_cpu)
-
-
-AC_OUTPUT(Makefile)
diff --git a/sim/testsuite/sim/arm/adc.cgs b/sim/testsuite/sim/arm/adc.cgs
deleted file mode 100644
index b6659a1b675..00000000000
--- a/sim/testsuite/sim/arm/adc.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# arm testcase for adc
-# mach: all
-
-# ??? Unfinished, more tests needed.
-
-	.include "testutils.inc"
-
-	start
-
-# adc$cond${set-cc?} $rd,$rn,$imm12
-
-	.global adc_imm
-adc_imm:
-	mvi_h_gr r4,1
-	mvi_h_cnvz 0,0,0,0
-	adc r5,r4,#1
-	test_h_cnvz 0,0,0,0
-	test_h_gr r5,2
-
-# adc$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-
-	.global adc_reg_imm_shift
-adc_reg_imm_shift:
-	mvi_h_gr r4,1
-	mvi_h_gr r5,1
-	mvi_h_cnvz 0,0,0,0
-	adc r6,r4,r5,lsl #2
-	test_h_cnvz 0,0,0,0
-	test_h_gr r6,5
-
-# adc$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-
-	.global adc_reg_reg_shift
-adc_reg_reg_shift:
-	mvi_h_gr r4,1
-	mvi_h_gr r5,1
-	mvi_h_gr r6,2
-	mvi_h_cnvz 0,0,0,0
-	adc r7,r4,r5,lsl r6
-	test_h_cnvz 0,0,0,0
-	test_h_gr r7,5
-
-	pass
diff --git a/sim/testsuite/sim/arm/add.cgs b/sim/testsuite/sim/arm/add.cgs
deleted file mode 100644
index eba32e0550c..00000000000
--- a/sim/testsuite/sim/arm/add.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# arm testcase for add
-# mach: all
-
-# ??? Unfinished, more tests needed.
-
-	.include "testutils.inc"
-
-	start
-
-# add$cond${set-cc?} $rd,$rn,$imm12
-
-	.global add_imm
-add_imm:
-	mvi_h_gr r4,1
-	mvi_h_cnvz 0,0,0,0
-	add r5,r4,#1
-	test_h_cnvz 0,0,0,0
-	test_h_gr r5,2
-
-# add$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-
-	.global add_reg_imm_shift
-add_reg_imm_shift:
-	mvi_h_gr r4,1
-	mvi_h_gr r5,1
-	mvi_h_cnvz 0,0,0,0
-	add r6,r4,r5,lsl #2
-	test_h_cnvz 0,0,0,0
-	test_h_gr r6,5
-
-# add$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-
-	.global add_reg_reg_shift
-add_reg_reg_shift:
-	mvi_h_gr r4,1
-	mvi_h_gr r5,1
-	mvi_h_gr r6,2
-	mvi_h_cnvz 0,0,0,0
-	add r7,r4,r5,lsl r6
-	test_h_cnvz 0,0,0,0
-	test_h_gr r7,5
-
-	pass
diff --git a/sim/testsuite/sim/arm/allinsn.exp b/sim/testsuite/sim/arm/allinsn.exp
deleted file mode 100644
index ec8402f54e4..00000000000
--- a/sim/testsuite/sim/arm/allinsn.exp
+++ /dev/null
@@ -1,28 +0,0 @@
-# ARM simulator testsuite.
-
-if { [istarget arm*-*-*] || [istarget xscale*-*-*] } {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "xscale"
-
-    if [is_remote host] {
-      remote_download host $srcdir/$subdir/testutils.inc
-    }
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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
-    }
-
-    if [is_remote host] {
-      remote_file host delete testutils.inc
-    }
-}
diff --git a/sim/testsuite/sim/arm/and.cgs b/sim/testsuite/sim/arm/and.cgs
deleted file mode 100644
index cd8f0036fdd..00000000000
--- a/sim/testsuite/sim/arm/and.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# arm testcase for and
-# mach: all
-
-# ??? Unfinished, more tests needed.
-
-	.include "testutils.inc"
-
-	start
-
-# and$cond${set-cc?} $rd,$rn,$imm12
-
-	.global and_imm
-and_imm:
-	mvi_h_gr r4,1
-	mvi_h_cnvz 0,0,0,0
-	and r5,r4,#1
-	test_h_cnvz 0,0,0,0
-	test_h_gr r5,1
-
-# and$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-
-	.global and_reg_imm_shift
-and_reg_imm_shift:
-	mvi_h_gr r4,1
-	mvi_h_gr r5,1
-	mvi_h_cnvz 0,0,0,0
-	and r6,r4,r5,lsl #1
-	test_h_cnvz 0,0,0,0
-	test_h_gr r6,0
-
-# and$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-
-	.global and_reg_reg_shift
-and_reg_reg_shift:
-	mvi_h_gr r4,1
-	mvi_h_gr r5,1
-	mvi_h_gr r6,1
-	mvi_h_cnvz 0,0,0,0
-	and r7,r4,r5,lsl r6
-	test_h_cnvz 0,0,0,0
-	test_h_gr r7,0
-
-	pass
diff --git a/sim/testsuite/sim/arm/b.cgs b/sim/testsuite/sim/arm/b.cgs
deleted file mode 100644
index 414b96398a2..00000000000
--- a/sim/testsuite/sim/arm/b.cgs
+++ /dev/null
@@ -1,261 +0,0 @@
-# arm testcase for b$cond $offset24
-# mach: all
-
-# ??? Still need to test edge cases.
-
-	.include "testutils.inc"
-
-	start
-
-	.global b
-b:
-
-# b foo
-
-	b balways1
-	fail
-balways1:
-
-# beq foo
-
-	mvi_h_gr r4,4
-	mvi_h_gr r5,4
-	cmp r4,r5
-	beq beq1
-	fail
-beq1:
-	mvi_h_gr r5,5
-	cmp r4,r5
-	beq beq2
-	b beq3
-beq2:
-	fail
-beq3:
-
-# bne foo
-
-	mvi_h_gr r4,4
-	mvi_h_gr r5,5
-	cmp r4,r5
-	bne bne1
-	fail
-bne1:
-	mvi_h_gr r5,4
-	cmp r4,r5
-	bne bne2
-	b bne3
-bne2:
-	fail
-bne3:
-
-# bcs foo
-
-	mvi_h_cnvz 1,0,0,0
-	bcs bcs1
-	fail
-bcs1:
-	mvi_h_cnvz 0,0,0,0
-	bcs bcs2
-	b bcs3
-bcs2:
-	fail
-bcs3:
-
-# bcc foo
-
-	mvi_h_cnvz 0,0,0,0
-	bcc bcc1
-	fail
-bcc1:
-	mvi_h_cnvz 1,0,0,0
-	bcc bcc2
-	b bcc3
-bcc2:
-	fail
-bcc3:
-
-# bmi foo
-
-	mvi_h_cnvz 0,1,0,0
-	bmi bmi1
-	fail
-bmi1:
-	mvi_h_cnvz 0,0,0,0
-	bmi bmi2
-	b bmi3
-bmi2:
-	fail
-bmi3:
-
-# bpl foo
-
-	mvi_h_cnvz 0,0,0,0
-	bpl bpl1
-	fail
-bpl1:
-	mvi_h_cnvz 0,1,0,0
-	bpl bpl2
-	b bpl3
-bpl2:
-	fail
-bpl3:
-
-# bvs foo
-
-	mvi_h_cnvz 0,0,1,0
-	bvs bvs1
-	fail
-bvs1:
-	mvi_h_cnvz 0,0,0,0
-	bvs bvs2
-	b bvs3
-bvs2:
-	fail
-bvs3:
-
-# bvc foo
-
-	mvi_h_cnvz 0,0,0,0
-	bvc bvc1
-	fail
-bvc1:
-	mvi_h_cnvz 0,0,1,0
-	bvc bvc2
-	b bvc3
-bvc2:
-	fail
-bvc3:
-
-# bhi foo
-
-	mvi_h_gr r4,5
-	mvi_h_gr r5,4
-	cmp r4,r5
-	bhi bhi1
-	fail
-bhi1:
-	mvi_h_gr r5,5
-	cmp r4,r5
-	bhi bhi2
-	b bhi3
-bhi2:
-	fail
-bhi3:
-	mvi_h_gr r5,6
-	cmp r4,r5
-	bhi bhi4
-	b bhi5
-bhi4:
-	fail
-bhi5:
-
-# bls foo
-
-	mvi_h_gr r4,4
-	mvi_h_gr r5,5
-	cmp r4,r5
-	bls bls1
-	fail
-bls1:
-	mvi_h_gr r5,4
-	cmp r4,r5
-	bls bls2
-	fail
-bls2:
-	mvi_h_gr r5,3
-	cmp r4,r5
-	bls bls3
-	b bls4
-bls3:
-	fail
-bls4:
-
-# bge foo
-
-	mvi_h_gr r4,4
-	mvi_h_gr r5,4
-	cmp r4,r5
-	bge bge1
-	fail
-bge1:
-	mvi_h_gr r5,3
-	cmp r4,r5
-	bge bge2
-	fail
-bge2:
-	mvi_h_gr r5,5
-	cmp r4,r5
-	bge bge3
-	b bge4
-bge3:
-	fail
-bge4:
-
-# blt foo
-
-	mvi_h_gr r4,4
-	mvi_h_gr r5,5
-	cmp r4,r5
-	blt blt1
-	fail
-blt1:
-	mvi_h_gr r5,4
-	cmp r4,r5
-	blt blt2
-	b blt3
-blt2:
-	fail
-blt3:
-	mvi_h_gr r5,3
-	cmp r4,r5
-	blt blt4
-	b blt5
-blt4:
-	fail
-blt5:
-
-# bgt foo
-
-	mvi_h_gr r4,4
-	mvi_h_gr r5,3
-	cmp r4,r5
-	bgt bgt1
-	fail
-bgt1:
-	mvi_h_gr r5,4
-	cmp r4,r5
-	bgt bgt2
-	b bgt3
-bgt2:
-	fail
-bgt3:
-	mvi_h_gr r5,5
-	cmp r4,r5
-	bgt bgt4
-	b bgt5
-bgt4:
-	fail
-bgt5:
-
-# ble foo
-
-	mvi_h_gr r4,4
-	mvi_h_gr r5,4
-	cmp r4,r5
-	ble ble1
-	fail
-ble1:
-	mvi_h_gr r5,5
-	cmp r4,r5
-	ble ble2
-	fail
-ble2:
-	mvi_h_gr r5,3
-	cmp r4,r5
-	ble ble3
-	b ble4
-ble3:
-	fail
-ble4:
-
-	pass
diff --git a/sim/testsuite/sim/arm/bic.cgs b/sim/testsuite/sim/arm/bic.cgs
deleted file mode 100644
index 37a9b6cd4a6..00000000000
--- a/sim/testsuite/sim/arm/bic.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# arm testcase for bic
-# mach: all
-
-# ??? Unfinished, more tests needed.
-
-	.include "testutils.inc"
-
-	start
-
-# bic$cond${set-cc?} $rd,$rn,$imm12
-
-	.global bic_imm
-bic_imm:
-	mvi_h_gr r4,1
-	mvi_h_cnvz 0,0,0,0
-	bic r5,r4,#0
-	test_h_cnvz 0,0,0,0
-	test_h_gr r5,1
-
-# bic$cond${set-cc?} $rd,$rn,$rm,${operbic2-shifttype} ${operbic2-shiftimm}
-
-	.global bic_reg_imm_shift
-bic_reg_imm_shift:
-	mvi_h_gr r4,7
-	mvi_h_gr r5,1
-	mvi_h_cnvz 0,0,0,0
-	bic r6,r4,r5,lsl #1
-	test_h_cnvz 0,0,0,0
-	test_h_gr r6,5
-
-# bic$cond${set-cc?} $rd,$rn,$rm,${operbic2-shifttype} ${operbic2-shiftreg}
-
-	.global bic_reg_reg_shift
-bic_reg_reg_shift:
-	mvi_h_gr r4,7
-	mvi_h_gr r5,1
-	mvi_h_gr r6,1
-	mvi_h_cnvz 0,0,0,0
-	bic r7,r4,r5,lsl r6
-	test_h_cnvz 0,0,0,0
-	test_h_gr r7,5
-
-	pass
diff --git a/sim/testsuite/sim/arm/bl.cgs b/sim/testsuite/sim/arm/bl.cgs
deleted file mode 100644
index fbc7ef5021b..00000000000
--- a/sim/testsuite/sim/arm/bl.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# arm testcase for bl$cond $offset24
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bl
-bl:
-	mvi_h_gr r14,0
-	bl bl2
-bl1:
-	fail
-bl2:
-	mvaddr_h_gr r4,bl1
-	cmp r14,r4
-	beq bl3
-	fail
-bl3:
-
-	pass
diff --git a/sim/testsuite/sim/arm/bx.cgs b/sim/testsuite/sim/arm/bx.cgs
deleted file mode 100644
index 4c18af4cd4f..00000000000
--- a/sim/testsuite/sim/arm/bx.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bx$cond $rn
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bx
-bx:
-	bx0 pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/cmn.cgs b/sim/testsuite/sim/arm/cmn.cgs
deleted file mode 100644
index 1829fc75c4a..00000000000
--- a/sim/testsuite/sim/arm/cmn.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for cmn${cond}${set-cc?} $rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmn_imm
-cmn_imm:
-	cmn00 pc,0
-
-	pass
-# arm testcase for cmn$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmn_reg_imm_shift
-cmn_reg_imm_shift:
-	cmn00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for cmn$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmn_reg_reg_shift
-cmn_reg_reg_shift:
-	cmn00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/cmp.cgs b/sim/testsuite/sim/arm/cmp.cgs
deleted file mode 100644
index ab9dd59fdc3..00000000000
--- a/sim/testsuite/sim/arm/cmp.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for cmp${cond}${set-cc?} $rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp_imm
-cmp_imm:
-	cmp00 pc,0
-
-	pass
-# arm testcase for cmp$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp_reg_imm_shift
-cmp_reg_imm_shift:
-	cmp00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for cmp$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp_reg_reg_shift
-cmp_reg_reg_shift:
-	cmp00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/eor.cgs b/sim/testsuite/sim/arm/eor.cgs
deleted file mode 100644
index 5bbb1c6d0cc..00000000000
--- a/sim/testsuite/sim/arm/eor.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for eor$cond${set-cc?} $rd,$rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global eor_imm
-eor_imm:
-	eor00 pc,pc,0
-
-	pass
-# arm testcase for eor$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global eor_reg_imm_shift
-eor_reg_imm_shift:
-	eor00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for eor$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global eor_reg_reg_shift
-eor_reg_reg_shift:
-	eor00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/hello.ms b/sim/testsuite/sim/arm/hello.ms
deleted file mode 100644
index b063c296d25..00000000000
--- a/sim/testsuite/sim/arm/hello.ms
+++ /dev/null
@@ -1,91 +0,0 @@
-# output(): Hello, world.\n
-# mach(): all
-
-# Emit hello world while switching back and forth between arm/thumb.
-# ??? Unfinished
-
-	.macro invalid
-# This is "undefined" but it's not properly decoded yet.
-	.word 0x07ffffff
-# This is stc which isn't recognized yet.
-	stc 0,cr0,[r0]
-	.endm
-
-	.global _start
-_start:
-# Run some simple insns to confirm the engine is at least working.
-	nop
-
-# Skip over output text.
-
-	bl skip_output
-
-hello_text:
-	.asciz "Hello, world.\n"
-
-	.p2align 2
-skip_output:
-
-# Prime loop.
-
-	mov r4, r14
-
-output_next:
-
-# Switch arm->thumb to output next chacter.
-# At this point r4 must point to the next character to output.
-
-	adr r0, into_thumb + 1
-	bx r0
-
-into_thumb:
-	.thumb
-
-# Output a character.
-
-	mov r0,#3 @ writec angel call
-	mov r1,r4
-	swi 0xab @ ??? Confirm number.
-
-# Switch thumb->arm.
-
-	adr r5, back_to_arm
-	bx r5
-
-	.p2align 2
-back_to_arm:
-	.arm
-
-# Load next character, see if done.
-
-	add r4,r4,#1
-	sub r3,r3,r3
-	ldrb r5,[r4,r3]
-	teq r5,#0
-	beq done
-
-# Output a character (in arm mode).
-
-	mov r0,#3
-	mov r1,r4
-	swi #0x123456
-
-# Load next character, see if done.
-
-	add r4,r4,#1
-	sub r3,r3,r3
-	ldrb r5,[r4,r3]
-	teq r5,#0
-	bne output_next
-
-done:
-	mov r0,#0x18
-	ldr r1,exit_code
-	swi #0x123456
-
-# If that fails, try to die with an invalid insn.
-
-	invalid
-
-exit_code:
-	.word 0x20026
diff --git a/sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp b/sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp
deleted file mode 100644
index f3d0f0a690e..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp
+++ /dev/null
@@ -1,28 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology simulator testsuite.
-
-if { [istarget xscale*-*-*] } {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "xscale"
-
-    if [is_remote host] {
-      remote_download host $srcdir/$subdir/testutils.inc
-    }
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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
-    }
-
-    if [is_remote host] {
-      remote_file host delete testutils.inc
-    }
-}
diff --git a/sim/testsuite/sim/arm/iwmmxt/tbcst.cgs b/sim/testsuite/sim/arm/iwmmxt/tbcst.cgs
deleted file mode 100644
index b7138df982f..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/tbcst.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for TBCST
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global tbcst
-tbcst:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Byte Wide Broadcast
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	tbcstb     wr0, r2
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0xffffffff
-	test_h_gr  r1, 0xffffffff
-	test_h_gr  r2, 0x111111ff
-	
-	# Test Half Word Wide Broadcast
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	tbcsth     wr0, r2
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x11ff11ff
-	test_h_gr  r1, 0x11ff11ff
-	test_h_gr  r2, 0x111111ff
-	
-	# Test Word Wide Broadcast
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	tbcstw     wr0, r2
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x111111ff
-	test_h_gr  r1, 0x111111ff
-	test_h_gr  r2, 0x111111ff
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/testutils.inc b/sim/testsuite/sim/arm/iwmmxt/testutils.inc
deleted file mode 100644
index ae49db8820a..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/testutils.inc
+++ /dev/null
@@ -1,118 +0,0 @@
-# r0-r3 are used as tmps, consider them call clobbered by these macros.
-# This uses the angel rom monitor calls.
-# ??? How do we use the \@ facility of .macros ???
-# @ is the comment char!
-
-	.macro mvi_h_gr reg, val
-	ldr \reg,[pc]
-	b . + 8
-	.word \val
-	.endm
-
-	.macro mvaddr_h_gr reg, addr
-	ldr \reg,[pc]
-	b . + 8
-	.word \addr
-	.endm
-
-	.macro start
-	.data
-failmsg:
-	.asciz "fail\n"
-passmsg:
-	.asciz "pass\n"
-	.text
-
-do_pass:
-	ldr r1, passmsg_addr
-	mov r0, #4
-	swi #0x123456
-	exit 0
-passmsg_addr:
-	.word passmsg
-
-do_fail:
-	ldr r1, failmsg_addr
-	mov r0, #4
-	swi #0x123456
-	exit 1
-failmsg_addr:
-	.word failmsg
-
-	.global _start
-_start:
-	.endm
-
-# *** Other macros know pass/fail are 4 bytes in size!  Yuck.
-
-	.macro pass
-	b do_pass
-	.endm
-
-	.macro fail
-	b do_fail
-	.endm
-
-	.macro exit rc
-	# ??? This works with the ARMulator but maybe not others.
-	#mov r0, #\rc
-	#swi #1
-	# This seems to be portable (though it ignores rc).
-	mov r0,#0x18
-	mvi_h_gr r1, 0x20026
-	swi #0x123456
-	# If that returns, punt with a sigill.
-	stc 0,cr0,[r0]
-	.endm
-
-# Other macros know this only clobbers r0.
-# WARNING: It also clobbers the condition codes (FIXME).
-	.macro test_h_gr reg, val
-	mvaddr_h_gr r0, \val
-	cmp \reg, r0
-	beq . + 8
-	fail
-	.endm
-
-	.macro mvi_h_cnvz c, n, v, z
-	mov r0, #0
-	.if \c
-	orr r0, r0, #0x20000000
-	.endif
-	.if \n
-	orr r0, r0, #0x80000000
-	.endif
-	.if \v
-	orr r0, r0, #0x10000000
-	.endif
-	.if \z
-	orr r0, r0, #0x40000000
-	.endif
-	mrs r1, cpsr
-	bic r1, r1, #0xf0000000
-	orr r1, r1, r0
-	msr cpsr, r1
-	# ??? nops needed
-	.endm
-
-# ??? Preserve condition codes?
-	.macro test_h_cnvz c, n, v, z
-	mov r0, #0
-	.if \c
-	orr r0, r0, #0x20000000
-	.endif
-	.if \n
-	orr r0, r0, #0x80000000
-	.endif
-	.if \v
-	orr r0, r0, #0x10000000
-	.endif
-	.if \z
-	orr r0, r0, #0x40000000
-	.endif
-	mrs r1, cpsr
-	and r1, r1, #0xf0000000
-	cmp r0, r1
-	beq . + 8
-	fail
-	.endm
diff --git a/sim/testsuite/sim/arm/iwmmxt/textrm.cgs b/sim/testsuite/sim/arm/iwmmxt/textrm.cgs
deleted file mode 100644
index fb3dc94948f..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/textrm.cgs
+++ /dev/null
@@ -1,113 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for TEXTRM
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global textrm
-textrm:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned Byte Wide Extraction
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	textrmub   r2, wr0, #3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x00000012
-	
-	# Test Signed Byte Wide Extraction
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	textrmsb   r2, wr0, #4
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0xfffffff0
-	
-	# Test Unsigned Half Word Wide Extraction
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	textrmuh   r2, wr0, #3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x00009abc
-	
-	# Test Signed Half Word Wide Extraction
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	textrmsh   r2, wr0, #1
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x00001234
-	
-	# Test Unsigned Word Wide Extraction
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	textrmuw   r2, wr0, #0
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x12345678
-	
-	# Test Signed Word Wide Extraction
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	textrmsw   r2, wr0, #1
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x9abcdef0
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/tinsr.cgs b/sim/testsuite/sim/arm/iwmmxt/tinsr.cgs
deleted file mode 100644
index f457b19047f..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/tinsr.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for TINSR
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global tinsr
-tinsr:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Byte Wide Insertion
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	tinsrb	   wr0, r2, #3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0xff345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x111111ff
-	
-	# Test Half Word Wide Insertion
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	tinsrh	   wr0, r2, #2
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abc11ff
-	test_h_gr  r2, 0x111111ff
-	
-	# Test Word Wide Insertion
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x111111ff
-
-	tmcrr	   wr0, r0, r1
-
-	tinsrw	   wr0, r2, #1
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x111111ff
-	test_h_gr  r2, 0x111111ff
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/tmia.cgs b/sim/testsuite/sim/arm/iwmmxt/tmia.cgs
deleted file mode 100644
index 0b0da66dbf6..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/tmia.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for TMIA
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global tmia
-tmia:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	tmcrr	   wr0, r0, r1
-
-	tmia	   wr0, r2, r3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x354f53c4
-	test_h_gr  r1, 0x4e330b5e
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/tmiaph.cgs b/sim/testsuite/sim/arm/iwmmxt/tmiaph.cgs
deleted file mode 100644
index 3778b0abf48..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/tmiaph.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for TMIAPH
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global tmiaph
-tmiaph:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	tmcrr	   wr0, r0, r1
-
-	tmiaph	   wr0, r2, r3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0xfec3f9f4
-	test_h_gr  r1, 0x55667787
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/tmiaxy.cgs b/sim/testsuite/sim/arm/iwmmxt/tmiaxy.cgs
deleted file mode 100644
index e7a7b732381..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/tmiaxy.cgs
+++ /dev/null
@@ -1,89 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for TMIAxy
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global tmiaXY
-tmiaXY:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Bottom Bottom Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	tmcrr	   wr0, r0, r1
-
-	tmiaBB	   wr0, r2, r3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x05f753c4
-	test_h_gr  r1, 0x55667788
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	# Test Bottom Top Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	tmcrr	   wr0, r0, r1
-
-	tmiaBT	   wr0, r2, r3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0xeeede364
-	test_h_gr  r1, 0x55667787
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	# Test Top Bottom Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	tmcrr	   wr0, r0, r1
-
-	tmiaTB	   wr0, r2, r3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x0ec85c04
-	test_h_gr  r1, 0x55667788
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	# Test Top Top Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	tmcrr	   wr0, r0, r1
-
-	tmiaTT	   wr0, r2, r3
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x09eed974
-	test_h_gr  r1, 0x55667788
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/tmovmsk.cgs b/sim/testsuite/sim/arm/iwmmxt/tmovmsk.cgs
deleted file mode 100644
index cfea5b7c6dc..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/tmovmsk.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for TMOVMSK
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global tmovmsk
-tmovmsk:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Byte Wide Mask Transfer
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-
-	tmcrr	   wr0, r0, r1
-
-	tmovmskb   r2, wr0
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x000000f0
-
-	# Test Half Word Wide Mask Transfer
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-
-	tmcrr	   wr0, r0, r1
-
-	tmovmskh   r2, wr0
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x0000000c
-
-	# Test Word Wide Mask Transfer
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-
-	tmcrr	   wr0, r0, r1
-
-	tmovmskw   r2, wr0
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x00000002
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wacc.cgs b/sim/testsuite/sim/arm/iwmmxt/wacc.cgs
deleted file mode 100644
index b3ffea13b97..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wacc.cgs
+++ /dev/null
@@ -1,77 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WACC
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wacc
-wacc:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned Byte Wide Accumulation
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	waccb	   wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x00000438
-	test_h_gr  r3, 0x00000000
-
-	# Test Unsigned Half Word Wide Accumulation
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wacch	   wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x0001e258
-	test_h_gr  r3, 0x00000000
-
-	# Test Unsigned Word Wide Accumulation
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	waccw	   wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0xacf13568
-	test_h_gr  r3, 0x00000000
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wadd.cgs b/sim/testsuite/sim/arm/iwmmxt/wadd.cgs
deleted file mode 100644
index bb4d0ab3731..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wadd.cgs
+++ /dev/null
@@ -1,251 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WADD
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wadd
-wadd:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test UnSaturated Byte Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddb      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456789
-	test_h_gr  r5, 0xabcdef11
-		
-	# Test Unsigned Saturated Byte Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddbus    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456789
-	test_h_gr  r5, 0xabcdef11
-		
-	# Test Signed Saturated Byte Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddbss    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x2345677f
-	test_h_gr  r5, 0xabcdef11
-		
-	# Test UnSaturated Halfword Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddh      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456789
-	test_h_gr  r5, 0xabcdef11
-		
-	# Test Unsigned Saturated Halfword Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddhus    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456789
-	test_h_gr  r5, 0xabcdef11
-		
-	# Test Signed Saturated Halfword Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddhss    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456789
-	test_h_gr  r5, 0xabcdef11
-		
-	# Test UnSaturated Word Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddw      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456789
-	test_h_gr  r5, 0xabcdef11
-		
-	# Test Unsigned Saturated Word Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddwus    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456789
-	test_h_gr  r5, 0xabcdef11
-		
-	# Test Signed Saturated Word Addition
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waddwss    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456789
-	test_h_gr  r5, 0xabcdef11
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/waligni.cgs b/sim/testsuite/sim/arm/iwmmxt/waligni.cgs
deleted file mode 100644
index dc99dae9c42..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/waligni.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WALIGNI
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global waligni
-waligni:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test 2 byte align
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	waligni    wr2, wr0, wr1, #2
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0xdef01234
-	test_h_gr  r5, 0x11119abc
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/walignr.cgs b/sim/testsuite/sim/arm/iwmmxt/walignr.cgs
deleted file mode 100644
index 85df51e8f65..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/walignr.cgs
+++ /dev/null
@@ -1,137 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WALIGNR
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global walignr
-walignr:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test 0 byte align
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-	mvi_h_gr   r6, 3
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-	tmcr	   wcgr0, r6
-
-	walignr0   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	tmrc	   r6, wcgr0
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0xbcdef012
-	test_h_gr  r5, 0x1111119a
-	test_h_gr  r6, 3
-
-	# Test 1 byte align
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-	mvi_h_gr   r6, 4
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-	tmcr	   wcgr1, r6
-
-	walignr1   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	tmrc	   r6, wcgr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x9abcdef0
-	test_h_gr  r5, 0x11111111
-	test_h_gr  r6, 4
-
-	# Test 2 byte align
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-	mvi_h_gr   r6, 2
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-	tmcr	   wcgr2, r6
-
-	walignr2   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	tmrc	   r6, wcgr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0xdef01234
-	test_h_gr  r5, 0x11119abc
-	test_h_gr  r6, 2
-
-	# Test 3 byte align
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-	mvi_h_gr   r6, 5
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-	tmcr	   wcgr3, r6
-
-	walignr3   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	tmrc	   r6, wcgr3
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x119abcde
-	test_h_gr  r5, 0x00111111
-	test_h_gr  r6, 5
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wand.cgs b/sim/testsuite/sim/arm/iwmmxt/wand.cgs
deleted file mode 100644
index 018383faa3b..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wand.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WAND
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wand
-wand:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wand	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x10101010
-	test_h_gr  r5, 0x00000000
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wandn.cgs b/sim/testsuite/sim/arm/iwmmxt/wandn.cgs
deleted file mode 100644
index f2c2305af0e..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wandn.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WANDN
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wandn
-wandn:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wandn	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x02244668
-	test_h_gr  r5, 0x9abcdef0
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wavg2.cgs b/sim/testsuite/sim/arm/iwmmxt/wavg2.cgs
deleted file mode 100644
index cac2c1a5ac1..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wavg2.cgs
+++ /dev/null
@@ -1,121 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WAVG2
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wavg2
-wavg2:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Byte Wide Averaging
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wavg2b     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x11223344
-	test_h_gr  r5, 0x5e6f8089
-	
-	# Test Byte Wide Averaging with Rounding
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wavg2br    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x12233445
-	test_h_gr  r5, 0x5e6f8089
-	
-	# Test Half Word Wide Averaging
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wavg2h     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x11a233c4
-	test_h_gr  r5, 0x5e6f8089
-	
-	# Test Half Word Wide Averaging with Rounding
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wavg2hr    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x11a333c5
-	test_h_gr  r5, 0x5e6f8089
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wcmpeq.cgs b/sim/testsuite/sim/arm/iwmmxt/wcmpeq.cgs
deleted file mode 100644
index 13ef3dcc85b..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wcmpeq.cgs
+++ /dev/null
@@ -1,95 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WCMPEQ
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wcmpeq
-wcmpeq:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Byte Wide Compare Equal To
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x9abcde00
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpeqb    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x9abcde00
-	test_h_gr  r4, 0x00000000
-	test_h_gr  r5, 0xffffffff
-	
-	# Test Half Word Wide Compare Equal To
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x9abcde00
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpeqh    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x9abcde00
-	test_h_gr  r4, 0x00000000
-	test_h_gr  r5, 0xffffffff
-	
-	# Test Word Wide Compare Equal To
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x9abcde00
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpeqw    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x9abcde00
-	test_h_gr  r4, 0x00000000
-	test_h_gr  r5, 0xffffffff
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wcmpgt.cgs b/sim/testsuite/sim/arm/iwmmxt/wcmpgt.cgs
deleted file mode 100644
index 33086c9630f..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wcmpgt.cgs
+++ /dev/null
@@ -1,173 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WCMPGT
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wcmpgt
-wcmpgt:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned Byte Wide Compare Greater Than
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpgtub   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xffffffff
-	test_h_gr  r5, 0xffffff00
-	
-	# Test Signed Byte Wide Compare Greater Than
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpgtsb   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xffffffff
-	test_h_gr  r5, 0x00000000
-	
-	# Test Unsigned Half Word Wide Compare Greater Than
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpgtuh   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xffffffff
-	test_h_gr  r5, 0xffffffff
-	
-	# Test Signed Half Word Wide Compare Greater Than
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpgtsh   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xffffffff
-	test_h_gr  r5, 0x00000000
-	
-	# Test Unsigned Word Wide Compare Greater Than
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpgtuw   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xffffffff
-	test_h_gr  r5, 0xffffffff
-	
-	# Test Signed Word Wide Compare Greater Than
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wcmpgtsw   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xffffffff
-	test_h_gr  r5, 0x00000000
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wmac.cgs b/sim/testsuite/sim/arm/iwmmxt/wmac.cgs
deleted file mode 100644
index 0857ef9ebcf..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wmac.cgs
+++ /dev/null
@@ -1,121 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WMAC
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wmac
-wmac:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned, Multiply Accumulate, Non-zeroing
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0x33333333
-	mvi_h_gr   r5, 0x44444444
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmacu	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x6c889377
-	test_h_gr  r5, 0x44444444
-				
-	# Test Unsigned, Multiply Accumulate, Zeroing
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0x33333333
-	mvi_h_gr   r5, 0x44444444
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmacuz	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x39556044
-	test_h_gr  r5, 0x00000000
-				
-	# Test Signed, Multiply Accumulate, Non-zeroing
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0x33333333
-	mvi_h_gr   r5, 0x44444444
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmacs	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x28449377
-	test_h_gr  r5, 0x44444444
-				
-	# Test Signed, Multiply Accumulate, Zeroing
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0x33333333
-	mvi_h_gr   r5, 0x44444444
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmacsz	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xf5116044
-	test_h_gr  r5, 0xffffffff
-				
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wmadd.cgs b/sim/testsuite/sim/arm/iwmmxt/wmadd.cgs
deleted file mode 100644
index 564b3be2ee9..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wmadd.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WMADD
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wmadd
-wmadd:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned, Multiply Addition
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmaddu	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x06fa5f6c
-	test_h_gr  r5, 0x325b00d8
-		
-	# Test Signed, Multiply Addition
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmadds	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x06fa5f6c
-	test_h_gr  r5, 0xee1700d8
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wmax.cgs b/sim/testsuite/sim/arm/iwmmxt/wmax.cgs
deleted file mode 100644
index 3a684ce0f59..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wmax.cgs
+++ /dev/null
@@ -1,173 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WMAX
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wmax
-wmax:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned Byte Maximum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmaxub     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x12345678
-	test_h_gr  r5, 0x9abcde11
-
-	# Test Signed Byte Maximum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmaxsb     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x12345678
-	test_h_gr  r5, 0x11111111
-
-	# Test Unsigned Halfword Maximum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmaxuh     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x12345678
-	test_h_gr  r5, 0x9abcde00
-
-	# Test Signed Halfword Maximum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmaxsh     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x12345678
-	test_h_gr  r5, 0x11111111
-
-	# Test Unsigned Word Maximum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmaxuw     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x12345678
-	test_h_gr  r5, 0x9abcde00
-
-	# Test Signed Word Maximum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmaxsw     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x12345678
-	test_h_gr  r5, 0x11111111
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wmin.cgs b/sim/testsuite/sim/arm/iwmmxt/wmin.cgs
deleted file mode 100644
index 3bc1c084a25..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wmin.cgs
+++ /dev/null
@@ -1,173 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WMIN
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wmin
-wmin:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned Byte Minimum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wminub     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x11111111
-	test_h_gr  r5, 0x11111100
-
-	# Test Signed Byte Minimum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wminsb     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x11111111
-	test_h_gr  r5, 0x9abcde00
-
-	# Test Unsigned Halfword Minimum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wminuh     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x11111111
-	test_h_gr  r5, 0x11111111
-
-	# Test Signed Halfword Minimum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wminsh     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x11111111
-	test_h_gr  r5, 0x9abcde00
-
-	# Test Unsigned Word Minimum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wminuw     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x11111111
-	test_h_gr  r5, 0x11111111
-
-	# Test Signed Word Minimum
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wminsw     wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x11111111
-	test_h_gr  r5, 0x9abcde00
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wmov.cgs b/sim/testsuite/sim/arm/iwmmxt/wmov.cgs
deleted file mode 100644
index e86fed616ec..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wmov.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WMOV
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wmov
-wmov:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wmov	   wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wmul.cgs b/sim/testsuite/sim/arm/iwmmxt/wmul.cgs
deleted file mode 100644
index 0978b63366e..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wmul.cgs
+++ /dev/null
@@ -1,121 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WMUL
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wmul
-wmul:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned, Most Significant Multiply
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmulum	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x013605c3
-	test_h_gr  r5, 0x14a11db9
-		
-	# Test Unsigned, Least Significant Multiply
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmulul	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xa974b5f8
-	test_h_gr  r5, 0x84f87be0
-		
-	# Test Signed, Most Significant Multiply
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmulsm	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x013605c3
-	test_h_gr  r5, 0xf27ffb97
-		
-	# Test Signed, Least Significant Multiply
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wmulsl	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0xa974b5f8
-	test_h_gr  r5, 0x84f87be0
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wor.cgs b/sim/testsuite/sim/arm/iwmmxt/wor.cgs
deleted file mode 100644
index 48d5f53a72e..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wor.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WOR
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wor
-wor:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wor	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x13355779
-	test_h_gr  r5, 0x9abcdef0
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wpack.cgs b/sim/testsuite/sim/arm/iwmmxt/wpack.cgs
deleted file mode 100644
index 0546bd4ecbb..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wpack.cgs
+++ /dev/null
@@ -1,173 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WPACK
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wpack
-wpack:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Halfword, Unsigned Saturation, Packing
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wpackhus   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x0000ffff
-	test_h_gr  r5, 0x0000ffff  
-		
-	# Test Halfword, Signed Saturation, Packing
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wpackhss   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x80807f7f
-	test_h_gr  r5, 0x00007f7f  
-		
-	# Test Word, Unsigned Saturation, Packing
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wpackwus   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x0000ffff
-	test_h_gr  r5, 0x0000ffff  
-		
-	# Test Word, Signed Saturation, Packing
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wpackwss   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x80007fff
-	test_h_gr  r5, 0x00007fff  
-		
-	# Test Double Word, Unsigned Saturation, Packing
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wpackdus   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x00000000
-	test_h_gr  r5, 0x11111111
-		
-	# Test Double Word, Signed Saturation, Packing
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wpackdss   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x80000000
-	test_h_gr  r5, 0x11111111  
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wror.cgs b/sim/testsuite/sim/arm/iwmmxt/wror.cgs
deleted file mode 100644
index e329916e8c8..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wror.cgs
+++ /dev/null
@@ -1,167 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WROR
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wror
-wror:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Halfword wide rotate right by register
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wrorh	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x091a2b3c
-	test_h_gr  r5, 0x4d5e6f78
-	
-	# Test Halfword wide rotate right by CG register
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcr	   wcgr0, r2
-	tmcrr	   wr1, r2, r3
-
-	wrorhg	   wr1, wr0, wcgr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr0
-	tmrrc	   r3, r4, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x091a2b3c
-	test_h_gr  r4, 0x4d5e6f78
-	
-	# Test Word wide rotate right by register
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wrorw	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x2b3c091a
-	test_h_gr  r5, 0x6f784d5e
-	
-	# Test Word wide rotate right by CG register
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcr	   wcgr0, r2
-	tmcrr	   wr1, r2, r3
-
-	wrorwg	   wr1, wr0, wcgr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr0
-	tmrrc	   r3, r4, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x2b3c091a
-	test_h_gr  r4, 0x6f784d5e
-	
-	# Test Double Word wide rotate right by register
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wrord	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x6f78091a
-	test_h_gr  r5, 0x2b3c4d5e
-	
-	# Test Double Word wide rotate right by CG register
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcr	   wcgr0, r2
-	tmcrr	   wr1, r2, r3
-
-	wrordg	   wr1, wr0, wcgr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr0
-	tmrrc	   r3, r4, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x6f78091a
-	test_h_gr  r4, 0x2b3c4d5e
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wsad.cgs b/sim/testsuite/sim/arm/iwmmxt/wsad.cgs
deleted file mode 100644
index 34a20cc0566..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wsad.cgs
+++ /dev/null
@@ -1,121 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WSAD
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wsad
-wsad:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Byte wide absolute accumulation
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0x22222222
-	mvi_h_gr   r5, 0x22222222
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsadb	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x2222258e
-	test_h_gr  r5, 0x00000000
-	
-	# Test Byte wide absolute accumulation with zeroing
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0x22222222
-	mvi_h_gr   r5, 0x22222222
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsadbz	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x0000036c
-	test_h_gr  r5, 0x00000000
-	
-	# Test Halfword wide absolute accumulation
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0x22222222
-	mvi_h_gr   r5, 0x22222222
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsadh	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x22239e14
-	test_h_gr  r5, 0x00000000
-	
-	# Test Halfword wide absolute accumulation with zeroing
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x22222222
-	mvi_h_gr   r4, 0x22222222
-	mvi_h_gr   r5, 0x22222222
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsadhz	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x22222222
-	test_h_gr  r4, 0x00017bf2
-	test_h_gr  r5, 0x00000000
-
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wshufh.cgs b/sim/testsuite/sim/arm/iwmmxt/wshufh.cgs
deleted file mode 100644
index d5cff1efe09..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wshufh.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WSHUFH
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wshufh
-wshufh:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wshufh	   wr1, wr0, #0x1b
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0xdef09abc
-	test_h_gr  r3, 0x56781234
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wsll.cgs b/sim/testsuite/sim/arm/iwmmxt/wsll.cgs
deleted file mode 100644
index 17d7893440a..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wsll.cgs
+++ /dev/null
@@ -1,167 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WSLL
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wsll
-wsll:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Halfword Logical Shift Left
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsllh      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23406780
-	test_h_gr  r5, 0xabc0ef00
-		
-	# Test Halfword Aritc Shift Left by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr1, r2
-	tmcrr	   wr1,   r3, r4
-
-	wsllhg     wr1, wr0, wcgr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr1
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x23406780
-	test_h_gr  r4, 0xabc0ef00
-		
-	# Test Word Logical Shift Left
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsllw      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456780
-	test_h_gr  r5, 0xabcdef00
-		
-	# Test Word Logical Shift Left by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr2, r2
-	tmcrr	   wr1,   r3, r4
-
-	wsllwg     wr1, wr0, wcgr2
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr2
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x23456780
-	test_h_gr  r4, 0xabcdef00
-		
-	# Test Double Word Logical Shift Left
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdefc
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wslld      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdefc
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x23456780
-	test_h_gr  r5, 0xabcdefc1
-		
-	# Test Double Word Logical Shift Left by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdefc
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr3, r2
-	tmcrr	   wr1,   r3, r4
-
-	wslldg     wr1, wr0, wcgr3
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr3
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdefc
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x23456780
-	test_h_gr  r4, 0xabcdefc1
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wsra.cgs b/sim/testsuite/sim/arm/iwmmxt/wsra.cgs
deleted file mode 100644
index db998bb3920..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wsra.cgs
+++ /dev/null
@@ -1,167 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WSRA
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wsra
-wsra:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Halfword Arithmetic Shift Right
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsrah      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01230567
-	test_h_gr  r5, 0xf9abfdef
-		
-	# Test Halfword Arithmetic Shift Right by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr1, r2
-	tmcrr	   wr1,   r3, r4
-
-	wsrahg     wr1, wr0, wcgr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr1
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x01230567
-	test_h_gr  r4, 0xf9abfdef
-		
-	# Test Word Arithmetic Shift Right
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsraw      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0xf9abcdef
-		
-	# Test Word Arithmetic Shift Right by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr2, r2
-	tmcrr	   wr1,   r3, r4
-
-	wsrawg     wr1, wr0, wcgr2
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr2
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x01234567
-	test_h_gr  r4, 0xf9abcdef
-		
-	# Test Double Word Arithmetic Shift Right
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdefc
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsrad      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdefc
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0xc1234567
-	test_h_gr  r5, 0xf9abcdef
-		
-	# Test Double Word Arithmetic Shift Right by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdefc
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr3, r2
-	tmcrr	   wr1,   r3, r4
-
-	wsradg     wr1, wr0, wcgr3
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr3
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdefc
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0xc1234567
-	test_h_gr  r4, 0xf9abcdef
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wsrl.cgs b/sim/testsuite/sim/arm/iwmmxt/wsrl.cgs
deleted file mode 100644
index 416a464dc1b..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wsrl.cgs
+++ /dev/null
@@ -1,167 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WSRL
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wsrl
-wsrl:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Halfword Logical Shift Right
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsrlh      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01230567
-	test_h_gr  r5, 0x09ab0def
-		
-	# Test Halfword Logical Shift Right by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr1, r2
-	tmcrr	   wr1,   r3, r4
-
-	wsrlhg     wr1, wr0, wcgr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr1
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x01230567
-	test_h_gr  r4, 0x09ab0def
-		
-	# Test Word Logical Shift Right
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsrlw      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x09abcdef
-		
-	# Test Word Logical Shift Right by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr2, r2
-	tmcrr	   wr1,   r3, r4
-
-	wsrlwg     wr1, wr0, wcgr2
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr2
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x01234567
-	test_h_gr  r4, 0x09abcdef
-		
-	# Test Double Word Logical Shift Right
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdefc
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsrld      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdefc
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0xc1234567
-	test_h_gr  r5, 0x09abcdef
-		
-	# Test Double Word Logical Shift Right by CG register
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdefc
-	mvi_h_gr   r2, 0x11111104
-	mvi_h_gr   r3, 0
-	mvi_h_gr   r4, 0
-
-	tmcrr	   wr0,   r0, r1
-	tmcr	   wcgr3, r2
-	tmcrr	   wr1,   r3, r4
-
-	wsrldg     wr1, wr0, wcgr3
-	
-	tmrrc	   r0, r1, wr0
-	tmrc	   r2, wcgr3
-	tmrrc	   r3, r4, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdefc
-	test_h_gr  r2, 0x11111104
-	test_h_gr  r3, 0xc1234567
-	test_h_gr  r4, 0x09abcdef
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wsub.cgs b/sim/testsuite/sim/arm/iwmmxt/wsub.cgs
deleted file mode 100644
index b0e77bed6be..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wsub.cgs
+++ /dev/null
@@ -1,251 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WSUB
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wsub
-wsub:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsaturated Byte subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubb      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abcdef
-		
-	# Test Unsigned saturated Byte subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubbus    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abcd00
-		
-	# Test Signed saturated Byte subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubbss    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abcdef
-		
-	# Test Unsaturated Halfword subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubh      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abccef
-		
-	# Test Unsigned saturated Halfword subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubhus    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abccef
-		
-	# Test Signed saturated Halfword subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubhss    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abccef
-		
-	# Test Unsaturated Word subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubw      wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abccef
-		
-	# Test Unsigned saturated Word subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubwus    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abccef
-		
-	# Test Signed saturated Word subtraction
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcde00
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x11111111
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wsubwss    wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcde00
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x11111111
-	test_h_gr  r4, 0x01234567
-	test_h_gr  r5, 0x89abccef
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wunpckeh.cgs b/sim/testsuite/sim/arm/iwmmxt/wunpckeh.cgs
deleted file mode 100644
index 32a70f4e61f..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wunpckeh.cgs
+++ /dev/null
@@ -1,137 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WUNPCKEH
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wunpckeh
-wunpckeh:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned Byte Unpacking
-		
-	mvi_h_gr   r0, 0x12345687
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckehub  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345687
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x00de00f0
-	test_h_gr  r3, 0x009a00bc
-		
-	# Test Signed Byte Unpacking
-		
-	mvi_h_gr   r0, 0x12345687
-	mvi_h_gr   r1, 0x7abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckehsb  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345687
-	test_h_gr  r1, 0x7abcdef0
-	test_h_gr  r2, 0xffdefff0
-	test_h_gr  r3, 0x007affbc
-		
-	# Test Unsigned Halfword Unpacking
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckehuh  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x0000def0
-	test_h_gr  r3, 0x00009abc
-		
-	# Test Signed Halfword Unpacking
-		
-	mvi_h_gr   r0, 0x12348678
-	mvi_h_gr   r1, 0x7abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckehsh  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12348678
-	test_h_gr  r1, 0x7abcdef0
-	test_h_gr  r2, 0xffffdef0
-	test_h_gr  r3, 0x00007abc
-		
-	# Test Unsigned Word Unpacking
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckehuw  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x9abcdef0
-	test_h_gr  r3, 0x00000000
-		
-	# Test Signed Word Unpacking
-		
-	mvi_h_gr   r0, 0x82345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckehsw  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x82345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x9abcdef0
-	test_h_gr  r3, 0xffffffff
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wunpckel.cgs b/sim/testsuite/sim/arm/iwmmxt/wunpckel.cgs
deleted file mode 100644
index a6ffb4f1367..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wunpckel.cgs
+++ /dev/null
@@ -1,137 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WUNPCKEL
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wunpckel
-wunpckel:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Unsigned Byte Unpacking
-		
-	mvi_h_gr   r0, 0x12345687
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckelub  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345687
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x00560087
-	test_h_gr  r3, 0x00120034
-		
-	# Test Signed Byte Unpacking
-		
-	mvi_h_gr   r0, 0x12345687
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckelsb  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345687
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x0056ff87
-	test_h_gr  r3, 0x00120034
-		
-	# Test Unsigned Halfword Unpacking
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckeluh  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x00005678
-	test_h_gr  r3, 0x00001234
-		
-	# Test Signed Halfword Unpacking
-		
-	mvi_h_gr   r0, 0x12348678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckelsh  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12348678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0xffff8678
-	test_h_gr  r3, 0x00001234
-		
-	# Test Unsigned Word Unpacking
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckeluw  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x00000000
-		
-	# Test Signed Word Unpacking
-		
-	mvi_h_gr   r0, 0x82345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0
-	mvi_h_gr   r3, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-
-	wunpckelsw  wr1, wr0
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	
-	test_h_gr  r0, 0x82345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x82345678
-	test_h_gr  r3, 0xffffffff
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wunpckih.cgs b/sim/testsuite/sim/arm/iwmmxt/wunpckih.cgs
deleted file mode 100644
index 41fed0eabab..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wunpckih.cgs
+++ /dev/null
@@ -1,95 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WUNPCKIH
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wunpckih
-wunpckih:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Byte unpacking
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wunpckihb  wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x00de00f0
-	test_h_gr  r5, 0x009a00bc
-
-	# Test Halfword unpacking
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wunpckihh  wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x0000def0
-	test_h_gr  r5, 0x00009abc
-	
-	# Test Word unpacking
-
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wunpckihw  wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x9abcdef0
-	test_h_gr  r5, 0x00000000
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wunpckil.cgs b/sim/testsuite/sim/arm/iwmmxt/wunpckil.cgs
deleted file mode 100644
index 7bd730044a2..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wunpckil.cgs
+++ /dev/null
@@ -1,95 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WUNPCKIL
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wunpckil
-wunpckil:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Byte unpacking
-		
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wunpckilb  wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x11561178
-	test_h_gr  r5, 0x11121134
-
-	# Test Halfword unpacking
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wunpckilh  wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x11115678
-	test_h_gr  r5, 0x11111234
-	
-	# Test Word unpacking
-
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wunpckilw  wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x12345678
-	test_h_gr  r5, 0x11111111
-		
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wxor.cgs b/sim/testsuite/sim/arm/iwmmxt/wxor.cgs
deleted file mode 100644
index 95e1fc89111..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wxor.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WXOR
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wxor
-wxor:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-	mvi_h_gr   r2, 0x11111111
-	mvi_h_gr   r3, 0x00000000
-	mvi_h_gr   r4, 0
-	mvi_h_gr   r5, 0
-
-	tmcrr	   wr0, r0, r1
-	tmcrr	   wr1, r2, r3
-	tmcrr	   wr2, r4, r5
-
-	wxor	   wr2, wr0, wr1
-	
-	tmrrc	   r0, r1, wr0
-	tmrrc	   r2, r3, wr1
-	tmrrc	   r4, r5, wr2
-	
-	test_h_gr  r0, 0x12345678
-	test_h_gr  r1, 0x9abcdef0
-	test_h_gr  r2, 0x11111111
-	test_h_gr  r3, 0x00000000
-	test_h_gr  r4, 0x03254769
-	test_h_gr  r5, 0x9abcdef0
-	
-	pass
diff --git a/sim/testsuite/sim/arm/iwmmxt/wzero.cgs b/sim/testsuite/sim/arm/iwmmxt/wzero.cgs
deleted file mode 100644
index 78fa7c56443..00000000000
--- a/sim/testsuite/sim/arm/iwmmxt/wzero.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# Intel(r) Wireless MMX(tm) technology testcase for WZERO
-# mach: xscale
-# as: -mcpu=xscale+iwmmxt
-
-	.include "testutils.inc"
-
-	start
-
-	.global wzero
-wzero:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-	
-	mvi_h_gr   r0, 0x12345678
-	mvi_h_gr   r1, 0x9abcdef0
-
-	tmcrr	   wr0, r0, r1
-
-	wzero	   wr0
-	
-	tmrrc	   r0, r1, wr0
-	
-	test_h_gr  r0, 0x00000000
-	test_h_gr  r1, 0x00000000
-	
-	pass
diff --git a/sim/testsuite/sim/arm/ldm.cgs b/sim/testsuite/sim/arm/ldm.cgs
deleted file mode 100644
index 6831a83cd46..00000000000
--- a/sim/testsuite/sim/arm/ldm.cgs
+++ /dev/null
@@ -1,89 +0,0 @@
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmda_wb
-ldmda_wb:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmda
-ldmda:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmdb_wb
-ldmdb_wb:
-
-	pass
-# arm testcase for ldm$cond ..
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmdb
-ldmdb:
-	ldm0 ..
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmia_wb
-ldmia_wb:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmia
-ldmia:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmib_wb
-ldmib_wb:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmib
-ldmib:
-
-	pass
diff --git a/sim/testsuite/sim/arm/ldr.cgs b/sim/testsuite/sim/arm/ldr.cgs
deleted file mode 100644
index 437b68c8f54..00000000000
--- a/sim/testsuite/sim/arm/ldr.cgs
+++ /dev/null
@@ -1,192 +0,0 @@
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_post_dec_imm_offset
-ldr_post_dec_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_post_dec_nonpriv_imm_offset
-ldr_post_dec_nonpriv_imm_offset:
-	ldr0t pc,???
-
-	pass
-# arm testcase for ldr${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_post_dec_nonpriv_reg_offset
-ldr_post_dec_nonpriv_reg_offset:
-	ldr0t pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_post_dec_reg_offset
-ldr_post_dec_reg_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_post_inc_imm_offset
-ldr_post_inc_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_post_inc_nonpriv_imm_offset
-ldr_post_inc_nonpriv_imm_offset:
-	ldr0t pc,???
-
-	pass
-# arm testcase for ldr${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_post_inc_nonpriv_reg_offset
-ldr_post_inc_nonpriv_reg_offset:
-	ldr0t pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_post_inc_reg_offset
-ldr_post_inc_reg_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pre_dec_imm_offset
-ldr_pre_dec_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pre_dec_reg_offset
-ldr_pre_dec_reg_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pre_dec_wb_imm_offset
-ldr_pre_dec_wb_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pre_dec_wb_reg_offset
-ldr_pre_dec_wb_reg_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pre_inc_imm_offset
-ldr_pre_inc_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pre_inc_reg_offset
-ldr_pre_inc_reg_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pre_inc_wb_imm_offset
-ldr_pre_inc_wb_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pre_inc_wb_reg_offset
-ldr_pre_inc_wb_reg_offset:
-	ldr0 pc,???
-
-	pass
diff --git a/sim/testsuite/sim/arm/ldrb.cgs b/sim/testsuite/sim/arm/ldrb.cgs
deleted file mode 100644
index b09880c039e..00000000000
--- a/sim/testsuite/sim/arm/ldrb.cgs
+++ /dev/null
@@ -1,192 +0,0 @@
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_post_dec_imm_offset
-ldrb_post_dec_imm_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}bt $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_post_dec_nonpriv_imm_offset
-ldrb_post_dec_nonpriv_imm_offset:
-	ldr0bt pc,???
-
-	pass
-# arm testcase for ldr${cond}bt $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_post_dec_nonpriv_reg_offset
-ldrb_post_dec_nonpriv_reg_offset:
-	ldr0bt pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_post_dec_reg_offset
-ldrb_post_dec_reg_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_post_inc_imm_offset
-ldrb_post_inc_imm_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}bt $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_post_inc_nonpriv_imm_offset
-ldrb_post_inc_nonpriv_imm_offset:
-	ldr0bt pc,???
-
-	pass
-# arm testcase for ldr${cond}bt $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_post_inc_nonpriv_reg_offset
-ldrb_post_inc_nonpriv_reg_offset:
-	ldr0bt pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_post_inc_reg_offset
-ldrb_post_inc_reg_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_pre_dec_imm_offset
-ldrb_pre_dec_imm_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_pre_dec_reg_offset
-ldrb_pre_dec_reg_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_pre_dec_wb_imm_offset
-ldrb_pre_dec_wb_imm_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_pre_dec_wb_reg_offset
-ldrb_pre_dec_wb_reg_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_pre_inc_imm_offset
-ldrb_pre_inc_imm_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_pre_inc_reg_offset
-ldrb_pre_inc_reg_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_pre_inc_wb_imm_offset
-ldrb_pre_inc_wb_imm_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_pre_inc_wb_reg_offset
-ldrb_pre_inc_wb_reg_offset:
-	ldr0b pc,???
-
-	pass
diff --git a/sim/testsuite/sim/arm/ldrh.cgs b/sim/testsuite/sim/arm/ldrh.cgs
deleted file mode 100644
index 16a4323cf92..00000000000
--- a/sim/testsuite/sim/arm/ldrh.cgs
+++ /dev/null
@@ -1,132 +0,0 @@
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_post_dec_imm_offset
-ldrh_post_dec_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_post_dec_reg_offset
-ldrh_post_dec_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_post_inc_imm_offset
-ldrh_post_inc_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_post_inc_reg_offset
-ldrh_post_inc_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_pre_dec_imm_offset
-ldrh_pre_dec_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_pre_dec_reg_offset
-ldrh_pre_dec_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_pre_dec_wb_imm_offset
-ldrh_pre_dec_wb_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_pre_dec_wb_reg_offset
-ldrh_pre_dec_wb_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_pre_inc_imm_offset
-ldrh_pre_inc_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_pre_inc_reg_offset
-ldrh_pre_inc_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_pre_inc_wb_imm_offset
-ldrh_pre_inc_wb_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_pre_inc_wb_reg_offset
-ldrh_pre_inc_wb_reg_offset:
-
-	pass
diff --git a/sim/testsuite/sim/arm/ldrsb.cgs b/sim/testsuite/sim/arm/ldrsb.cgs
deleted file mode 100644
index 4d08f4c63ac..00000000000
--- a/sim/testsuite/sim/arm/ldrsb.cgs
+++ /dev/null
@@ -1,132 +0,0 @@
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_post_dec_imm_offset
-ldrsb_post_dec_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_post_dec_reg_offset
-ldrsb_post_dec_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_post_inc_imm_offset
-ldrsb_post_inc_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_post_inc_reg_offset
-ldrsb_post_inc_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_pre_dec_imm_offset
-ldrsb_pre_dec_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_pre_dec_reg_offset
-ldrsb_pre_dec_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_pre_dec_wb_imm_offset
-ldrsb_pre_dec_wb_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_pre_dec_wb_reg_offset
-ldrsb_pre_dec_wb_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_pre_inc_imm_offset
-ldrsb_pre_inc_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_pre_inc_reg_offset
-ldrsb_pre_inc_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_pre_inc_wb_imm_offset
-ldrsb_pre_inc_wb_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsb_pre_inc_wb_reg_offset
-ldrsb_pre_inc_wb_reg_offset:
-
-	pass
diff --git a/sim/testsuite/sim/arm/ldrsh.cgs b/sim/testsuite/sim/arm/ldrsh.cgs
deleted file mode 100644
index 5a6e7c7e9d2..00000000000
--- a/sim/testsuite/sim/arm/ldrsh.cgs
+++ /dev/null
@@ -1,132 +0,0 @@
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_post_dec_imm_offset
-ldrsh_post_dec_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_post_dec_reg_offset
-ldrsh_post_dec_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_post_inc_imm_offset
-ldrsh_post_inc_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_post_inc_reg_offset
-ldrsh_post_inc_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_pre_dec_imm_offset
-ldrsh_pre_dec_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_pre_dec_reg_offset
-ldrsh_pre_dec_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_pre_dec_wb_imm_offset
-ldrsh_pre_dec_wb_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_pre_dec_wb_reg_offset
-ldrsh_pre_dec_wb_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_pre_inc_imm_offset
-ldrsh_pre_inc_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_pre_inc_reg_offset
-ldrsh_pre_inc_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_pre_inc_wb_imm_offset
-ldrsh_pre_inc_wb_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrsh_pre_inc_wb_reg_offset
-ldrsh_pre_inc_wb_reg_offset:
-
-	pass
diff --git a/sim/testsuite/sim/arm/misaligned1.ms b/sim/testsuite/sim/arm/misaligned1.ms
deleted file mode 100644
index 69fda478493..00000000000
--- a/sim/testsuite/sim/arm/misaligned1.ms
+++ /dev/null
@@ -1,61 +0,0 @@
-# Test LDR instructions with offsets misaligned by 1 byte.
-# mach(): all
-
-	.macro invalid
-# This is "undefined" but it's not properly decoded yet.
-	.word 0x07ffffff
-# This is stc which isn't recognized yet.
-	stc 0,cr0,[r0]
-	.endm
-
-	.global _start
-_start:
-# Run some simple insns to confirm the engine is at least working.
-	nop
-
-# Skip over output text.
-	bl do_test
-
-pass:
-	.asciz "pass\n"
-	.p2align 2
-
-do_test:
-	mov r4, r14
-	bl continue
-word1:
-	.word 0x5555
-continue:
-	ldr r6, [r14, #1]
-	ldr r7, word2
-	cmp r6, r7
-	# Failed.
-	bne done
-
-output_next:
-# Output a character (in arm mode).
-	mov r0,#3
-	mov r1,r4
-	swi #0x123456
-
-# Load next character, see if done.
-	add r4,r4,#1
-	sub r3,r3,r3
-	ldrb r5,[r4,r3]
-	teq r5,#0
-	bne output_next
-
-done:
-	mov r0,#0x18
-	ldr r1,exit_code
-	swi #0x123456
-
-# If that fails, try to die with an invalid insn.
-	invalid
-
-exit_code:
-	.word 0x20026
-	.word 0xFFFFFFFF
-word2:
-	.word 0x55000055
-	.word 0xFFFFFFFF
diff --git a/sim/testsuite/sim/arm/misaligned2.ms b/sim/testsuite/sim/arm/misaligned2.ms
deleted file mode 100644
index 3a03326cc20..00000000000
--- a/sim/testsuite/sim/arm/misaligned2.ms
+++ /dev/null
@@ -1,60 +0,0 @@
-# Test LDR instructions with offsets misaligned by 2 bytes. 
-# mach(): all
-
-	.macro invalid
-# This is "undefined" but it's not properly decoded yet.
-	.word 0x07ffffff
-# This is stc which isn't recognized yet.
-	stc 0,cr0,[r0]
-	.endm
-
-	.global _start
-_start:
-# Run some simple insns to confirm the engine is at least working.
-	nop
-
-# Skip over output text.
-	bl do_test
-
-pass:
-	.asciz "pass\n"
-	.p2align 2
-
-do_test:
-	mov r4, r14
-	bl continue
-word1:
-	.word 0x5555
-continue:
-	ldr r6, [r14, #2]
-	ldr r7, word2
-	cmp r6, r7
-	# Failed.
-	bne done
-
-output_next:
-# Output a character (in arm mode).
-	mov r0,#3
-	mov r1,r4
-	swi #0x123456
-
-# Load next character, see if done.
-	add r4,r4,#1
-	sub r3,r3,r3
-	ldrb r5,[r4,r3]
-	teq r5,#0
-	bne output_next
-
-done:
-	mov r0,#0x18
-	ldr r1,exit_code
-	swi #0x123456
-
-# If that fails, try to die with an invalid insn.
-	invalid
-
-exit_code:
-	.word 0x20026
-
-word2:
-	.word 0x55550000
diff --git a/sim/testsuite/sim/arm/misaligned3.ms b/sim/testsuite/sim/arm/misaligned3.ms
deleted file mode 100644
index bf2d9f11922..00000000000
--- a/sim/testsuite/sim/arm/misaligned3.ms
+++ /dev/null
@@ -1,62 +0,0 @@
-# Test LDR instructions with offsets misaligned by 3 bytes.
-# mach(): all
-
-	.macro invalid
-# This is "undefined" but it's not properly decoded yet.
-	.word 0x07ffffff
-# This is stc which isn't recognized yet.
-	stc 0,cr0,[r0]
-	.endm
-
-	.global _start
-_start:
-# Run some simple insns to confirm the engine is at least working.
-	nop
-
-# Skip over output text.
-	bl do_test
-
-pass:
-	.asciz "pass\n"
-	.p2align 2
-
-do_test:
-	mov r4, r14
-	bl continue
-word1:
-	.word 0x5555
-continue:
-	ldr r6, [r14, #3]
-	ldr r7, word2
-	cmp r6, r7
-	# Failed.
-	bne done
-
-output_next:
-# Output a character (in arm mode).
-	mov r0,#3
-	mov r1,r4
-	swi #0x123456
-
-# Load next character, see if done.
-	add r4,r4,#1
-	sub r3,r3,r3
-	ldrb r5,[r4,r3]
-	teq r5,#0
-	bne output_next
-
-done:
-	mov r0,#0x18
-	ldr r1,exit_code
-	swi #0x123456
-
-# If that fails, try to die with an invalid insn.
-	invalid
-
-exit_code:
-	.word 0x20026
-
-	.word 0xFFFFFFFF
-word2:
-	.word 0x555500
-	.word 0xFFFFFFFF
diff --git a/sim/testsuite/sim/arm/misc.exp b/sim/testsuite/sim/arm/misc.exp
deleted file mode 100644
index 1e8006f1492..00000000000
--- a/sim/testsuite/sim/arm/misc.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Miscellaneous ARM simulator testcases
-
-if { [istarget arm*-*-*] || [istarget thumb*-*-*] || [istarget xscale*-*-*] } {
-    # load support procs
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "arm7tdmi"
-
-    # The .ms suffix is for "miscellaneous .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
-	# 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/arm/mla.cgs b/sim/testsuite/sim/arm/mla.cgs
deleted file mode 100644
index c82dd0cabf1..00000000000
--- a/sim/testsuite/sim/arm/mla.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for mla$cond${set-cc?} ${mul-rd},$rm,$rs,${mul-rn}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mla
-mla:
-	mla00 pc,pc,pc,pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/mov.cgs b/sim/testsuite/sim/arm/mov.cgs
deleted file mode 100644
index d2a83d3713c..00000000000
--- a/sim/testsuite/sim/arm/mov.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for mov$cond${set-cc?} $rd,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mov_imm
-mov_imm:
-	mov00 pc,0
-
-	pass
-# arm testcase for mov$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mov_reg_imm_shift
-mov_reg_imm_shift:
-	mov00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for mov$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mov_reg_reg_shift
-mov_reg_reg_shift:
-	mov00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/mrs.cgs b/sim/testsuite/sim/arm/mrs.cgs
deleted file mode 100644
index 22c5e95af95..00000000000
--- a/sim/testsuite/sim/arm/mrs.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# arm testcase for mrs$cond $rd,cpsr
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mrs_c
-mrs_c:
-	mrs0 pc,cpsr
-
-	pass
-# arm testcase for mrs$cond $rd,spsr
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mrs_s
-mrs_s:
-	mrs0 pc,spsr
-
-	pass
diff --git a/sim/testsuite/sim/arm/msr.cgs b/sim/testsuite/sim/arm/msr.cgs
deleted file mode 100644
index c79f0bd6ac8..00000000000
--- a/sim/testsuite/sim/arm/msr.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# arm testcase for msr$cond cpsr,$rm
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global msr_c
-msr_c:
-	msr0 cpsr,pc
-
-	pass
-# arm testcase for msr$cond spsr,$rm
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global msr_s
-msr_s:
-	msr0 spsr,pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/mul.cgs b/sim/testsuite/sim/arm/mul.cgs
deleted file mode 100644
index 4f0a9264d27..00000000000
--- a/sim/testsuite/sim/arm/mul.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for mul$cond${set-cc?} ${mul-rd},$rm,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mul
-mul:
-	mul00 pc,pc,pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/mvn.cgs b/sim/testsuite/sim/arm/mvn.cgs
deleted file mode 100644
index 92fd3a45550..00000000000
--- a/sim/testsuite/sim/arm/mvn.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for mvn$cond${set-cc?} $rd,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvn_imm
-mvn_imm:
-	mvn00 pc,0
-
-	pass
-# arm testcase for mvn$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvn_reg_imm_shift
-mvn_reg_imm_shift:
-	mvn00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for mvn$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvn_reg_reg_shift
-mvn_reg_reg_shift:
-	mvn00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/orr.cgs b/sim/testsuite/sim/arm/orr.cgs
deleted file mode 100644
index 3fc67adbbf3..00000000000
--- a/sim/testsuite/sim/arm/orr.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for orr$cond${set-cc?} $rd,$rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global orr_imm
-orr_imm:
-	orr00 pc,pc,0
-
-	pass
-# arm testcase for orr$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global orr_reg_imm_shift
-orr_reg_imm_shift:
-	orr00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for orr$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global orr_reg_reg_shift
-orr_reg_reg_shift:
-	orr00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/rsb.cgs b/sim/testsuite/sim/arm/rsb.cgs
deleted file mode 100644
index 14edc350eec..00000000000
--- a/sim/testsuite/sim/arm/rsb.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for rsb$cond${set-cc?} $rd,$rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global rsb_imm
-rsb_imm:
-	rsb00 pc,pc,0
-
-	pass
-# arm testcase for rsb$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global rsb_reg_imm_shift
-rsb_reg_imm_shift:
-	rsb00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for rsb$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global rsb_reg_reg_shift
-rsb_reg_reg_shift:
-	rsb00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/rsc.cgs b/sim/testsuite/sim/arm/rsc.cgs
deleted file mode 100644
index 078fbcce5d7..00000000000
--- a/sim/testsuite/sim/arm/rsc.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for rsc$cond${set-cc?} $rd,$rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global rsc_imm
-rsc_imm:
-	rsc00 pc,pc,0
-
-	pass
-# arm testcase for rsc$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global rsc_reg_imm_shift
-rsc_reg_imm_shift:
-	rsc00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for rsc$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global rsc_reg_reg_shift
-rsc_reg_reg_shift:
-	rsc00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/sbc.cgs b/sim/testsuite/sim/arm/sbc.cgs
deleted file mode 100644
index 946270217fa..00000000000
--- a/sim/testsuite/sim/arm/sbc.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for sbc$cond${set-cc?} $rd,$rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global sbc_imm
-sbc_imm:
-	sbc00 pc,pc,0
-
-	pass
-# arm testcase for sbc$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global sbc_reg_imm_shift
-sbc_reg_imm_shift:
-	sbc00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for sbc$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global sbc_reg_reg_shift
-sbc_reg_reg_shift:
-	sbc00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/smlal.cgs b/sim/testsuite/sim/arm/smlal.cgs
deleted file mode 100644
index 4ad1373e351..00000000000
--- a/sim/testsuite/sim/arm/smlal.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for smlal$cond${set-cc?} $rdlo,$rdhi,$rm,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global smlal
-smlal:
-	smlal00 pc,pc,pc,pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/smull.cgs b/sim/testsuite/sim/arm/smull.cgs
deleted file mode 100644
index 22e3960cf44..00000000000
--- a/sim/testsuite/sim/arm/smull.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for smull$cond${set-cc?} $rdlo,$rdhi,$rm,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global smull
-smull:
-	smull00 pc,pc,pc,pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/stm.cgs b/sim/testsuite/sim/arm/stm.cgs
deleted file mode 100644
index c3812163a9f..00000000000
--- a/sim/testsuite/sim/arm/stm.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmda_wb
-stmda_wb:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmda
-stmda:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmdb_wb
-stmdb_wb:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmdb
-stmdb:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmia_wb
-stmia_wb:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmia
-stmia:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmib_wb
-stmib_wb:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmib
-stmib:
-
-	pass
diff --git a/sim/testsuite/sim/arm/str.cgs b/sim/testsuite/sim/arm/str.cgs
deleted file mode 100644
index 82c683b56cc..00000000000
--- a/sim/testsuite/sim/arm/str.cgs
+++ /dev/null
@@ -1,192 +0,0 @@
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_post_dec_imm_offset
-str_post_dec_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_post_dec_nonpriv_imm_offset
-str_post_dec_nonpriv_imm_offset:
-	ldr0t pc,???
-
-	pass
-# arm testcase for str${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_post_dec_nonpriv_reg_offset
-str_post_dec_nonpriv_reg_offset:
-	str0t pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_post_dec_reg_offset
-str_post_dec_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_post_inc_imm_offset
-str_post_inc_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_post_inc_nonpriv_imm_offset
-str_post_inc_nonpriv_imm_offset:
-	ldr0t pc,???
-
-	pass
-# arm testcase for str${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_post_inc_nonpriv_reg_offset
-str_post_inc_nonpriv_reg_offset:
-	str0t pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_post_inc_reg_offset
-str_post_inc_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_pre_dec_imm_offset
-str_pre_dec_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_pre_dec_reg_offset
-str_pre_dec_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_pre_dec_wb_imm_offset
-str_pre_dec_wb_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_pre_dec_wb_reg_offset
-str_pre_dec_wb_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_pre_inc_imm_offset
-str_pre_inc_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_pre_inc_reg_offset
-str_pre_inc_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_pre_inc_wb_imm_offset
-str_pre_inc_wb_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_pre_inc_wb_reg_offset
-str_pre_inc_wb_reg_offset:
-	str0 pc,???
-
-	pass
diff --git a/sim/testsuite/sim/arm/strb.cgs b/sim/testsuite/sim/arm/strb.cgs
deleted file mode 100644
index 875a6494c94..00000000000
--- a/sim/testsuite/sim/arm/strb.cgs
+++ /dev/null
@@ -1,192 +0,0 @@
-# arm testcase for ldr${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_post_dec_imm_offset
-strb_post_dec_imm_offset:
-	ldr0b pc,???
-
-	pass
-# arm testcase for ldr${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_post_dec_nonpriv_imm_offset
-strb_post_dec_nonpriv_imm_offset:
-	ldr0t pc,???
-
-	pass
-# arm testcase for str${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_post_dec_nonpriv_reg_offset
-strb_post_dec_nonpriv_reg_offset:
-	str0t pc,???
-
-	pass
-# arm testcase for str${cond}b $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_post_dec_reg_offset
-strb_post_dec_reg_offset:
-	str0b pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_post_inc_imm_offset
-strb_post_inc_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for ldr${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_post_inc_nonpriv_imm_offset
-strb_post_inc_nonpriv_imm_offset:
-	ldr0t pc,???
-
-	pass
-# arm testcase for str${cond}t $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_post_inc_nonpriv_reg_offset
-strb_post_inc_nonpriv_reg_offset:
-	str0t pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_post_inc_reg_offset
-strb_post_inc_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_pre_dec_imm_offset
-strb_pre_dec_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_pre_dec_reg_offset
-strb_pre_dec_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_pre_dec_wb_imm_offset
-strb_pre_dec_wb_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_pre_dec_wb_reg_offset
-strb_pre_dec_wb_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_pre_inc_imm_offset
-strb_pre_inc_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_pre_inc_reg_offset
-strb_pre_inc_reg_offset:
-	str0 pc,???
-
-	pass
-# arm testcase for ldr${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_pre_inc_wb_imm_offset
-strb_pre_inc_wb_imm_offset:
-	ldr0 pc,???
-
-	pass
-# arm testcase for str${cond} $rd,???
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_pre_inc_wb_reg_offset
-strb_pre_inc_wb_reg_offset:
-	str0 pc,???
-
-	pass
diff --git a/sim/testsuite/sim/arm/strh.cgs b/sim/testsuite/sim/arm/strh.cgs
deleted file mode 100644
index e111d48745a..00000000000
--- a/sim/testsuite/sim/arm/strh.cgs
+++ /dev/null
@@ -1,132 +0,0 @@
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_post_dec_imm_offset
-strh_post_dec_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_post_dec_reg_offset
-strh_post_dec_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_post_inc_imm_offset
-strh_post_inc_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_post_inc_reg_offset
-strh_post_inc_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_pre_dec_imm_offset
-strh_pre_dec_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_pre_dec_reg_offset
-strh_pre_dec_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_pre_dec_wb_imm_offset
-strh_pre_dec_wb_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_pre_dec_wb_reg_offset
-strh_pre_dec_wb_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_pre_inc_imm_offset
-strh_pre_inc_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_pre_inc_reg_offset
-strh_pre_inc_reg_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_pre_inc_wb_imm_offset
-strh_pre_inc_wb_imm_offset:
-
-	pass
-# arm testcase for FIXME
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_pre_inc_wb_reg_offset
-strh_pre_inc_wb_reg_offset:
-
-	pass
diff --git a/sim/testsuite/sim/arm/sub.cgs b/sim/testsuite/sim/arm/sub.cgs
deleted file mode 100644
index 50f222c4445..00000000000
--- a/sim/testsuite/sim/arm/sub.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for sub$cond${set-cc?} $rd,$rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global sub_imm
-sub_imm:
-	sub00 pc,pc,0
-
-	pass
-# arm testcase for sub$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global sub_reg_imm_shift
-sub_reg_imm_shift:
-	sub00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for sub$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global sub_reg_reg_shift
-sub_reg_reg_shift:
-	sub00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/swi.cgs b/sim/testsuite/sim/arm/swi.cgs
deleted file mode 100644
index 0c23d43ddb4..00000000000
--- a/sim/testsuite/sim/arm/swi.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for swi$cond ${swi-comment}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global swi
-swi:
-	swi0 0
-
-	pass
diff --git a/sim/testsuite/sim/arm/swp.cgs b/sim/testsuite/sim/arm/swp.cgs
deleted file mode 100644
index f965ef2ded0..00000000000
--- a/sim/testsuite/sim/arm/swp.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for swp$cond $rd,$rm,[$rn]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global swp
-swp:
-	swp0 pc,pc,[pc]
-
-	pass
diff --git a/sim/testsuite/sim/arm/swpb.cgs b/sim/testsuite/sim/arm/swpb.cgs
deleted file mode 100644
index 6f8a076163f..00000000000
--- a/sim/testsuite/sim/arm/swpb.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for swpb${cond}b $rd,$rm,[$rn]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global swpb
-swpb:
-	swpb0b pc,pc,[pc]
-
-	pass
diff --git a/sim/testsuite/sim/arm/teq.cgs b/sim/testsuite/sim/arm/teq.cgs
deleted file mode 100644
index 6c69347b62c..00000000000
--- a/sim/testsuite/sim/arm/teq.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for teq${cond}${set-cc?} $rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global teq_imm
-teq_imm:
-	teq00 pc,0
-
-	pass
-# arm testcase for teq$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global teq_reg_imm_shift
-teq_reg_imm_shift:
-	teq00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for teq$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global teq_reg_reg_shift
-teq_reg_reg_shift:
-	teq00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/testutils.inc b/sim/testsuite/sim/arm/testutils.inc
deleted file mode 100644
index ae49db8820a..00000000000
--- a/sim/testsuite/sim/arm/testutils.inc
+++ /dev/null
@@ -1,118 +0,0 @@
-# r0-r3 are used as tmps, consider them call clobbered by these macros.
-# This uses the angel rom monitor calls.
-# ??? How do we use the \@ facility of .macros ???
-# @ is the comment char!
-
-	.macro mvi_h_gr reg, val
-	ldr \reg,[pc]
-	b . + 8
-	.word \val
-	.endm
-
-	.macro mvaddr_h_gr reg, addr
-	ldr \reg,[pc]
-	b . + 8
-	.word \addr
-	.endm
-
-	.macro start
-	.data
-failmsg:
-	.asciz "fail\n"
-passmsg:
-	.asciz "pass\n"
-	.text
-
-do_pass:
-	ldr r1, passmsg_addr
-	mov r0, #4
-	swi #0x123456
-	exit 0
-passmsg_addr:
-	.word passmsg
-
-do_fail:
-	ldr r1, failmsg_addr
-	mov r0, #4
-	swi #0x123456
-	exit 1
-failmsg_addr:
-	.word failmsg
-
-	.global _start
-_start:
-	.endm
-
-# *** Other macros know pass/fail are 4 bytes in size!  Yuck.
-
-	.macro pass
-	b do_pass
-	.endm
-
-	.macro fail
-	b do_fail
-	.endm
-
-	.macro exit rc
-	# ??? This works with the ARMulator but maybe not others.
-	#mov r0, #\rc
-	#swi #1
-	# This seems to be portable (though it ignores rc).
-	mov r0,#0x18
-	mvi_h_gr r1, 0x20026
-	swi #0x123456
-	# If that returns, punt with a sigill.
-	stc 0,cr0,[r0]
-	.endm
-
-# Other macros know this only clobbers r0.
-# WARNING: It also clobbers the condition codes (FIXME).
-	.macro test_h_gr reg, val
-	mvaddr_h_gr r0, \val
-	cmp \reg, r0
-	beq . + 8
-	fail
-	.endm
-
-	.macro mvi_h_cnvz c, n, v, z
-	mov r0, #0
-	.if \c
-	orr r0, r0, #0x20000000
-	.endif
-	.if \n
-	orr r0, r0, #0x80000000
-	.endif
-	.if \v
-	orr r0, r0, #0x10000000
-	.endif
-	.if \z
-	orr r0, r0, #0x40000000
-	.endif
-	mrs r1, cpsr
-	bic r1, r1, #0xf0000000
-	orr r1, r1, r0
-	msr cpsr, r1
-	# ??? nops needed
-	.endm
-
-# ??? Preserve condition codes?
-	.macro test_h_cnvz c, n, v, z
-	mov r0, #0
-	.if \c
-	orr r0, r0, #0x20000000
-	.endif
-	.if \n
-	orr r0, r0, #0x80000000
-	.endif
-	.if \v
-	orr r0, r0, #0x10000000
-	.endif
-	.if \z
-	orr r0, r0, #0x40000000
-	.endif
-	mrs r1, cpsr
-	and r1, r1, #0xf0000000
-	cmp r0, r1
-	beq . + 8
-	fail
-	.endm
diff --git a/sim/testsuite/sim/arm/thumb/adc.cgs b/sim/testsuite/sim/arm/thumb/adc.cgs
deleted file mode 100644
index 58d74c178f2..00000000000
--- a/sim/testsuite/sim/arm/thumb/adc.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for adc $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_adc
-alu_adc:
-	adc r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/add-hd-hs.cgs b/sim/testsuite/sim/arm/thumb/add-hd-hs.cgs
deleted file mode 100644
index 0307acc4a32..00000000000
--- a/sim/testsuite/sim/arm/thumb/add-hd-hs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add $hd,$hs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global add_hd_hs
-add_hd_hs:
-	add r8,r8
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/add-hd-rs.cgs b/sim/testsuite/sim/arm/thumb/add-hd-rs.cgs
deleted file mode 100644
index ca080f7e98a..00000000000
--- a/sim/testsuite/sim/arm/thumb/add-hd-rs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add $hd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global add_hd_rs
-add_hd_rs:
-	add r8,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/add-rd-hs.cgs b/sim/testsuite/sim/arm/thumb/add-rd-hs.cgs
deleted file mode 100644
index 46373a0ab10..00000000000
--- a/sim/testsuite/sim/arm/thumb/add-rd-hs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add $rd,$hs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global add_rd_hs
-add_rd_hs:
-	add r0,r8
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/add-sp.cgs b/sim/testsuite/sim/arm/thumb/add-sp.cgs
deleted file mode 100644
index 54efa2abe33..00000000000
--- a/sim/testsuite/sim/arm/thumb/add-sp.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add sp,#$sword7
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global add_sp
-add_sp:
-	add sp,#0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/add.cgs b/sim/testsuite/sim/arm/thumb/add.cgs
deleted file mode 100644
index 63cc20c275f..00000000000
--- a/sim/testsuite/sim/arm/thumb/add.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add $rd,$rs,$rn
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	add r0,r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/addi.cgs b/sim/testsuite/sim/arm/thumb/addi.cgs
deleted file mode 100644
index 00ec76d0f88..00000000000
--- a/sim/testsuite/sim/arm/thumb/addi.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add $rd,$rs,#$offset3
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global addi
-addi:
-	add r0,r0,#0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/addi8.cgs b/sim/testsuite/sim/arm/thumb/addi8.cgs
deleted file mode 100644
index d8e9f8162e4..00000000000
--- a/sim/testsuite/sim/arm/thumb/addi8.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add ${bit10-rd},#$offset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global addi8
-addi8:
-	add r0,#0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/allthumb.exp b/sim/testsuite/sim/arm/thumb/allthumb.exp
deleted file mode 100644
index 9674bca4845..00000000000
--- a/sim/testsuite/sim/arm/thumb/allthumb.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-# ARM simulator testsuite.
-
-if { [istarget arm*-*-*]
-     || [istarget thumb*-*-*] } {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "arm7tdmi"
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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/arm/thumb/and.cgs b/sim/testsuite/sim/arm/thumb/and.cgs
deleted file mode 100644
index d67adf47533..00000000000
--- a/sim/testsuite/sim/arm/thumb/and.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for and $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_and
-alu_and:
-	and r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/asr.cgs b/sim/testsuite/sim/arm/thumb/asr.cgs
deleted file mode 100644
index 4d21daedc23..00000000000
--- a/sim/testsuite/sim/arm/thumb/asr.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# arm testcase for asr $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_asr
-alu_asr:
-	asr r0,r0
-
-# FIXME: Also asr $rd,$rs,#$offset5
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/b.cgs b/sim/testsuite/sim/arm/thumb/b.cgs
deleted file mode 100644
index ecae5373f3b..00000000000
--- a/sim/testsuite/sim/arm/thumb/b.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for b $offset11
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global b
-b:
-	b footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bcc.cgs b/sim/testsuite/sim/arm/thumb/bcc.cgs
deleted file mode 100644
index 6c84458e637..00000000000
--- a/sim/testsuite/sim/arm/thumb/bcc.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bcc $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcc
-bcc:
-	bcc footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bcs.cgs b/sim/testsuite/sim/arm/thumb/bcs.cgs
deleted file mode 100644
index a29a8fb25ec..00000000000
--- a/sim/testsuite/sim/arm/thumb/bcs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bcs $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcs
-bcs:
-	bcs footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/beq.cgs b/sim/testsuite/sim/arm/thumb/beq.cgs
deleted file mode 100644
index 33f374829a1..00000000000
--- a/sim/testsuite/sim/arm/thumb/beq.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for beq $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global beq
-beq:
-	beq footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bge.cgs b/sim/testsuite/sim/arm/thumb/bge.cgs
deleted file mode 100644
index 4eb543dcae2..00000000000
--- a/sim/testsuite/sim/arm/thumb/bge.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bge $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bge
-bge:
-	bge footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bgt.cgs b/sim/testsuite/sim/arm/thumb/bgt.cgs
deleted file mode 100644
index 1ffe0927ff2..00000000000
--- a/sim/testsuite/sim/arm/thumb/bgt.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bgt $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bgt
-bgt:
-	bgt footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bhi.cgs b/sim/testsuite/sim/arm/thumb/bhi.cgs
deleted file mode 100644
index c9811c6b2b0..00000000000
--- a/sim/testsuite/sim/arm/thumb/bhi.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bhi $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bhi
-bhi:
-	bhi footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bic.cgs b/sim/testsuite/sim/arm/thumb/bic.cgs
deleted file mode 100644
index 6dca1efe137..00000000000
--- a/sim/testsuite/sim/arm/thumb/bic.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bic $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_bic
-alu_bic:
-	bic r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bl-hi.cgs b/sim/testsuite/sim/arm/thumb/bl-hi.cgs
deleted file mode 100644
index c7400c7f481..00000000000
--- a/sim/testsuite/sim/arm/thumb/bl-hi.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bl-hi ${lbwl-hi}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bl_hi
-bl_hi:
-	bl-hi 0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bl-lo.cgs b/sim/testsuite/sim/arm/thumb/bl-lo.cgs
deleted file mode 100644
index ed766130930..00000000000
--- a/sim/testsuite/sim/arm/thumb/bl-lo.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bl-lo ${lbwl-lo}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bl_lo
-bl_lo:
-	bl-lo 0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ble.cgs b/sim/testsuite/sim/arm/thumb/ble.cgs
deleted file mode 100644
index e9c5a8f5503..00000000000
--- a/sim/testsuite/sim/arm/thumb/ble.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ble $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ble
-ble:
-	ble footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bls.cgs b/sim/testsuite/sim/arm/thumb/bls.cgs
deleted file mode 100644
index 483412b872b..00000000000
--- a/sim/testsuite/sim/arm/thumb/bls.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bls $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bls
-bls:
-	bls footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/blt.cgs b/sim/testsuite/sim/arm/thumb/blt.cgs
deleted file mode 100644
index 0fbcbe8942b..00000000000
--- a/sim/testsuite/sim/arm/thumb/blt.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for blt $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global blt
-blt:
-	blt footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bmi.cgs b/sim/testsuite/sim/arm/thumb/bmi.cgs
deleted file mode 100644
index 8f7558a46ad..00000000000
--- a/sim/testsuite/sim/arm/thumb/bmi.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bmi $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bmi
-bmi:
-	bmi footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bne.cgs b/sim/testsuite/sim/arm/thumb/bne.cgs
deleted file mode 100644
index a5ac34841f7..00000000000
--- a/sim/testsuite/sim/arm/thumb/bne.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bne $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bne
-bne:
-	bne footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bpl.cgs b/sim/testsuite/sim/arm/thumb/bpl.cgs
deleted file mode 100644
index 8f642591d4e..00000000000
--- a/sim/testsuite/sim/arm/thumb/bpl.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bpl $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bpl
-bpl:
-	bpl footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bvc.cgs b/sim/testsuite/sim/arm/thumb/bvc.cgs
deleted file mode 100644
index bbd3af52833..00000000000
--- a/sim/testsuite/sim/arm/thumb/bvc.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bvc $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bvc
-bvc:
-	bvc footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bvs.cgs b/sim/testsuite/sim/arm/thumb/bvs.cgs
deleted file mode 100644
index 8c9a551353c..00000000000
--- a/sim/testsuite/sim/arm/thumb/bvs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bvs $soffset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bvs
-bvs:
-	bvs footext
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bx-hs.cgs b/sim/testsuite/sim/arm/thumb/bx-hs.cgs
deleted file mode 100644
index d96338791e4..00000000000
--- a/sim/testsuite/sim/arm/thumb/bx-hs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bx $hs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bx_hs
-bx_hs:
-	bx r8
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/bx-rs.cgs b/sim/testsuite/sim/arm/thumb/bx-rs.cgs
deleted file mode 100644
index f6db8c86339..00000000000
--- a/sim/testsuite/sim/arm/thumb/bx-rs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for bx $rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global bx_rs
-bx_rs:
-	bx r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/cmn.cgs b/sim/testsuite/sim/arm/thumb/cmn.cgs
deleted file mode 100644
index 96d53a1f95f..00000000000
--- a/sim/testsuite/sim/arm/thumb/cmn.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for cmn $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_cmn
-alu_cmn:
-	cmn r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/cmp-hd-hs.cgs b/sim/testsuite/sim/arm/thumb/cmp-hd-hs.cgs
deleted file mode 100644
index 96a91a2fb34..00000000000
--- a/sim/testsuite/sim/arm/thumb/cmp-hd-hs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for cmp $hd,$hs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp_hd_hs
-cmp_hd_hs:
-	cmp r8,r8
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/cmp-hd-rs.cgs b/sim/testsuite/sim/arm/thumb/cmp-hd-rs.cgs
deleted file mode 100644
index 9fc4875ff7e..00000000000
--- a/sim/testsuite/sim/arm/thumb/cmp-hd-rs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for cmp $hd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp_hd_rs
-cmp_hd_rs:
-	cmp r8,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/cmp-rd-hs.cgs b/sim/testsuite/sim/arm/thumb/cmp-rd-hs.cgs
deleted file mode 100644
index e3f7a4a2d61..00000000000
--- a/sim/testsuite/sim/arm/thumb/cmp-rd-hs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for cmp $rd,$hs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp_rd_hs
-cmp_rd_hs:
-	cmp r0,r8
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/cmp.cgs b/sim/testsuite/sim/arm/thumb/cmp.cgs
deleted file mode 100644
index 7564099c76d..00000000000
--- a/sim/testsuite/sim/arm/thumb/cmp.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# arm testcase for cmp ${bit10-rd},#$offset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp
-cmp:
-	cmp r0,#0
-
-# FIXME: Also: cmp $rd,$rs
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/eor.cgs b/sim/testsuite/sim/arm/thumb/eor.cgs
deleted file mode 100644
index cc6021c5309..00000000000
--- a/sim/testsuite/sim/arm/thumb/eor.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for eor $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_eor
-alu_eor:
-	eor r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/lda-pc.cgs b/sim/testsuite/sim/arm/thumb/lda-pc.cgs
deleted file mode 100644
index 74407e20b5a..00000000000
--- a/sim/testsuite/sim/arm/thumb/lda-pc.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add ${bit10-rd},pc,$word8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global lda_pc
-lda_pc:
-	add r0,pc,0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/lda-sp.cgs b/sim/testsuite/sim/arm/thumb/lda-sp.cgs
deleted file mode 100644
index ce2b62ef4fc..00000000000
--- a/sim/testsuite/sim/arm/thumb/lda-sp.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add ${bit10-rd},sp,$word8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global lda_sp
-lda_sp:
-	add r0,sp,0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldmia.cgs b/sim/testsuite/sim/arm/thumb/ldmia.cgs
deleted file mode 100644
index 550031ef648..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldmia.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldmia $rb!,{$rlist}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldmia
-ldmia:
-	ldmia r0!,{0}
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldr-imm.cgs b/sim/testsuite/sim/arm/thumb/ldr-imm.cgs
deleted file mode 100644
index a757f33957e..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldr-imm.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldr $rd,[$rb,#${offset5-7}]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_imm
-ldr_imm:
-	ldr r0,[r0,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldr-pc.cgs b/sim/testsuite/sim/arm/thumb/ldr-pc.cgs
deleted file mode 100644
index 8227562bbbe..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldr-pc.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldr ${bit10-rd},[pc,#$word8]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_pc
-ldr_pc:
-	ldr r0,[pc,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldr-sprel.cgs b/sim/testsuite/sim/arm/thumb/ldr-sprel.cgs
deleted file mode 100644
index 11eee26401d..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldr-sprel.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldr ${bit10-rd},[sp,#$word8]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr_sprel
-ldr_sprel:
-	ldr r0,[sp,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldr.cgs b/sim/testsuite/sim/arm/thumb/ldr.cgs
deleted file mode 100644
index 03af925a656..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldr.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldr $rd,[$rb,$ro]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldr
-ldr:
-	ldr r0,[r0,r0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldrb-imm.cgs b/sim/testsuite/sim/arm/thumb/ldrb-imm.cgs
deleted file mode 100644
index c1eeafe414b..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldrb-imm.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldrb $rd,[$rb,#$offset5]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb_imm
-ldrb_imm:
-	ldrb r0,[r0,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldrb.cgs b/sim/testsuite/sim/arm/thumb/ldrb.cgs
deleted file mode 100644
index 316a10f2a00..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldrb.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldrb $rd,[$rb,$ro]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrb
-ldrb:
-	ldrb r0,[r0,r0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldrh-imm.cgs b/sim/testsuite/sim/arm/thumb/ldrh-imm.cgs
deleted file mode 100644
index 81ea1e037ff..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldrh-imm.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldrh $rd,[$rb,#${offset5-6}]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh_imm
-ldrh_imm:
-	ldrh r0,[r0,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldrh.cgs b/sim/testsuite/sim/arm/thumb/ldrh.cgs
deleted file mode 100644
index 3ff8f4e4ce8..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldrh.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldrh $rd,[$rb,$ro]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldrh
-ldrh:
-	ldrh r0,[r0,r0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldsb.cgs b/sim/testsuite/sim/arm/thumb/ldsb.cgs
deleted file mode 100644
index e1612c93a4e..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldsb.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldsb $rd,[$rb,$ro]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldsb
-ldsb:
-	ldsb r0,[r0,r0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ldsh.cgs b/sim/testsuite/sim/arm/thumb/ldsh.cgs
deleted file mode 100644
index 46d49ac2920..00000000000
--- a/sim/testsuite/sim/arm/thumb/ldsh.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ldsh $rd,[$rb,$ro]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldsh
-ldsh:
-	ldsh r0,[r0,r0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/lsl.cgs b/sim/testsuite/sim/arm/thumb/lsl.cgs
deleted file mode 100644
index 05222e72c5a..00000000000
--- a/sim/testsuite/sim/arm/thumb/lsl.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# arm testcase for lsl $rd,$rs,#$offset5
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global lsl
-lsl:
-	lsl r0,r0,#0
-
-# FIXME: Also lsl $rd,$rs
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/lsr.cgs b/sim/testsuite/sim/arm/thumb/lsr.cgs
deleted file mode 100644
index fe38fe0a31a..00000000000
--- a/sim/testsuite/sim/arm/thumb/lsr.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# arm testcase for lsr $rd,$rs,#$offset5
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global lsr
-lsr:
-	lsr r0,r0,#0
-
-# FIXME: Also lsr $rd,$rs
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/mov-hd-hs.cgs b/sim/testsuite/sim/arm/thumb/mov-hd-hs.cgs
deleted file mode 100644
index 2050908dca5..00000000000
--- a/sim/testsuite/sim/arm/thumb/mov-hd-hs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for mov $hd,$hs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mov_hd_hs
-mov_hd_hs:
-	mov r8,r8
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/mov-hd-rs.cgs b/sim/testsuite/sim/arm/thumb/mov-hd-rs.cgs
deleted file mode 100644
index 3d229c32f71..00000000000
--- a/sim/testsuite/sim/arm/thumb/mov-hd-rs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for mov $hd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mov_hd_rs
-mov_hd_rs:
-	mov r8,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/mov-rd-hs.cgs b/sim/testsuite/sim/arm/thumb/mov-rd-hs.cgs
deleted file mode 100644
index 0661dfab5a3..00000000000
--- a/sim/testsuite/sim/arm/thumb/mov-rd-hs.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for mov $rd,$hs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mov_rd_hs
-mov_rd_hs:
-	mov r0,r8
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/mov.cgs b/sim/testsuite/sim/arm/thumb/mov.cgs
deleted file mode 100644
index b497b0f5c62..00000000000
--- a/sim/testsuite/sim/arm/thumb/mov.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for mov ${bit10-rd},#$offset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global mov
-mov:
-	mov r0,#0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/mul.cgs b/sim/testsuite/sim/arm/thumb/mul.cgs
deleted file mode 100644
index d160c569fae..00000000000
--- a/sim/testsuite/sim/arm/thumb/mul.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for mul $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_mul
-alu_mul:
-	mul r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/mvn.cgs b/sim/testsuite/sim/arm/thumb/mvn.cgs
deleted file mode 100644
index 606ce859325..00000000000
--- a/sim/testsuite/sim/arm/thumb/mvn.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for mvn $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_mvn
-alu_mvn:
-	mvn r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/neg.cgs b/sim/testsuite/sim/arm/thumb/neg.cgs
deleted file mode 100644
index 09f0c81f0ce..00000000000
--- a/sim/testsuite/sim/arm/thumb/neg.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for neg $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_neg
-alu_neg:
-	neg r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/orr.cgs b/sim/testsuite/sim/arm/thumb/orr.cgs
deleted file mode 100644
index de6f6880c65..00000000000
--- a/sim/testsuite/sim/arm/thumb/orr.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for orr $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_orr
-alu_orr:
-	orr r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/pop-pc.cgs b/sim/testsuite/sim/arm/thumb/pop-pc.cgs
deleted file mode 100644
index 4579cad6bc2..00000000000
--- a/sim/testsuite/sim/arm/thumb/pop-pc.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for pop {${rlist-pc}}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global pop_pc
-pop_pc:
-	pop {0}
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/pop.cgs b/sim/testsuite/sim/arm/thumb/pop.cgs
deleted file mode 100644
index b156e1dd8af..00000000000
--- a/sim/testsuite/sim/arm/thumb/pop.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for pop {$rlist}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global pop
-pop:
-	pop {0}
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/push-lr.cgs b/sim/testsuite/sim/arm/thumb/push-lr.cgs
deleted file mode 100644
index ee700a4e305..00000000000
--- a/sim/testsuite/sim/arm/thumb/push-lr.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for push {${rlist-lr}}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global push_lr
-push_lr:
-	push {0}
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/push.cgs b/sim/testsuite/sim/arm/thumb/push.cgs
deleted file mode 100644
index ff94ca5ab4b..00000000000
--- a/sim/testsuite/sim/arm/thumb/push.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for push {$rlist}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global push
-push:
-	push {0}
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/ror.cgs b/sim/testsuite/sim/arm/thumb/ror.cgs
deleted file mode 100644
index 991fa66fdc1..00000000000
--- a/sim/testsuite/sim/arm/thumb/ror.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for ror $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_ror
-alu_ror:
-	ror r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/sbc.cgs b/sim/testsuite/sim/arm/thumb/sbc.cgs
deleted file mode 100644
index 078b06118cb..00000000000
--- a/sim/testsuite/sim/arm/thumb/sbc.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for sbc $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_sbc
-alu_sbc:
-	sbc r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/stmia.cgs b/sim/testsuite/sim/arm/thumb/stmia.cgs
deleted file mode 100644
index 0e1c30cef23..00000000000
--- a/sim/testsuite/sim/arm/thumb/stmia.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for stmia $rb!,{$rlist}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global stmia
-stmia:
-	stmia r0!,{0}
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/str-imm.cgs b/sim/testsuite/sim/arm/thumb/str-imm.cgs
deleted file mode 100644
index ce759413ca7..00000000000
--- a/sim/testsuite/sim/arm/thumb/str-imm.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for str $rd,[$rb,#${offset5-7}]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_imm
-str_imm:
-	str r0,[r0,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/str-sprel.cgs b/sim/testsuite/sim/arm/thumb/str-sprel.cgs
deleted file mode 100644
index 132edfb6f4f..00000000000
--- a/sim/testsuite/sim/arm/thumb/str-sprel.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for str ${bit10-rd},[sp,#$word8]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str_sprel
-str_sprel:
-	str r0,[sp,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/str.cgs b/sim/testsuite/sim/arm/thumb/str.cgs
deleted file mode 100644
index 073e20b4eb7..00000000000
--- a/sim/testsuite/sim/arm/thumb/str.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for str $rd,[$rb,$ro]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global str
-str:
-	str r0,[r0,r0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/strb-imm.cgs b/sim/testsuite/sim/arm/thumb/strb-imm.cgs
deleted file mode 100644
index 2b5bcf7ff7e..00000000000
--- a/sim/testsuite/sim/arm/thumb/strb-imm.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for strb $rd,[$rb,#$offset5]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb_imm
-strb_imm:
-	strb r0,[r0,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/strb.cgs b/sim/testsuite/sim/arm/thumb/strb.cgs
deleted file mode 100644
index b7cb7638696..00000000000
--- a/sim/testsuite/sim/arm/thumb/strb.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for strb $rd,[$rb,$ro]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strb
-strb:
-	strb r0,[r0,r0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/strh-imm.cgs b/sim/testsuite/sim/arm/thumb/strh-imm.cgs
deleted file mode 100644
index 95002882448..00000000000
--- a/sim/testsuite/sim/arm/thumb/strh-imm.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for strh $rd,[$rb,#${offset5-6}]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh_imm
-strh_imm:
-	strh r0,[r0,#0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/strh.cgs b/sim/testsuite/sim/arm/thumb/strh.cgs
deleted file mode 100644
index 13f3a0d6875..00000000000
--- a/sim/testsuite/sim/arm/thumb/strh.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for strh $rd,[$rb,$ro]
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global strh
-strh:
-	strh r0,[r0,r0]
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/sub-sp.cgs b/sim/testsuite/sim/arm/thumb/sub-sp.cgs
deleted file mode 100644
index e676f58fb30..00000000000
--- a/sim/testsuite/sim/arm/thumb/sub-sp.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for add sp,#-$sword7
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global sub_sp
-sub_sp:
-	add sp,#-0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/sub.cgs b/sim/testsuite/sim/arm/thumb/sub.cgs
deleted file mode 100644
index 91cd7abb39c..00000000000
--- a/sim/testsuite/sim/arm/thumb/sub.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for sub $rd,$rs,$rn
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global sub
-sub:
-	sub r0,r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/subi.cgs b/sim/testsuite/sim/arm/thumb/subi.cgs
deleted file mode 100644
index 044efd0d048..00000000000
--- a/sim/testsuite/sim/arm/thumb/subi.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for sub $rd,$rs,#$offset3
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global subi
-subi:
-	sub r0,r0,#0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/subi8.cgs b/sim/testsuite/sim/arm/thumb/subi8.cgs
deleted file mode 100644
index 0c4d717ef08..00000000000
--- a/sim/testsuite/sim/arm/thumb/subi8.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for sub ${bit10-rd},#$offset8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global subi8
-subi8:
-	sub r0,#0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/swi.cgs b/sim/testsuite/sim/arm/thumb/swi.cgs
deleted file mode 100644
index 1724c14c9d5..00000000000
--- a/sim/testsuite/sim/arm/thumb/swi.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for swi $value8
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global swi
-swi:
-	swi 0
-
-	pass
diff --git a/sim/testsuite/sim/arm/thumb/testutils.inc b/sim/testsuite/sim/arm/thumb/testutils.inc
deleted file mode 100644
index bdae29bef19..00000000000
--- a/sim/testsuite/sim/arm/thumb/testutils.inc
+++ /dev/null
@@ -1,91 +0,0 @@
-# FIXME: wip, copied from ../testutils.inc
-# r0-r3 are used as tmps, consider them call clobbered by these macros.
-# This uses the angel rom monitor calls.
-# ??? How do we use the \@ facility of .macros ???
-# @ is the comment char!
-
-	.macro a_mvi_h_gr reg, val
-	ldr \reg,[pc]
-	b . + 8
-	.word \val
-	.endm
-
-	.macro mvaddr_h_gr reg, addr
-	ldr \reg,[pc]
-	b . + 8
-	.word \val
-	.endm
-
-	.macro start
-	.data
-failmsg:
-	.asciz "fail\n"
-passmsg:
-	.asciz "pass\n"
-	.text
-
-do_pass:
-	ldr r1, passmsg_addr
-	mov r0, #4
-	swi #0x123456
-	exit 0
-passmsg_addr:
-	.word passmsg
-
-do_fail:
-	ldr r1, failmsg_addr
-	mov r0, #4
-	swi #0x123456
-	exit 1
-failmsg_addr:
-	.word failmsg
-
-	.global _start
-_start:
-	.endm
-
-# *** Other macros know pass/fail are 4 bytes in size!  Yuck.
-
-	.macro pass
-	b do_pass
-	.endm
-
-	.macro fail
-	b do_fail
-	.endm
-
-	.macro exit rc
-	mov r1, #\rc
-	mov r0, #0x2a @ decimal 42
-	swi #1
-	# If that returns, punt with a sigill.
-	stc 0,cr0,[r0]
-	.endm
-
-# Other macros know this only clobbers r0.
-	.macro test_h_gr reg, val
-	mvaddr_h_gr r0, \val
-	cmp \reg, r0
-	beq . + 8
-	fail
-	.endm
-
-	.macro mvi_h_cc c, n, v, z
-	ldi8 r0, 0
-	ldi8 r1, 1
-	.if xxx
-	cmp r0, r1
-	.else
-	cmp r1, r0
-	.endif
-	.endm
-
-	.macro test_h_cc c, n, v, z
-	.if xxx
-	bc . + 8
-	fail
-	.else
-	bnc . + 8
-	fail
-	.endif
-	.endm
diff --git a/sim/testsuite/sim/arm/thumb/tst.cgs b/sim/testsuite/sim/arm/thumb/tst.cgs
deleted file mode 100644
index 068fccc427e..00000000000
--- a/sim/testsuite/sim/arm/thumb/tst.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for tst $rd,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global alu_tst
-alu_tst:
-	tst r0,r0
-
-	pass
diff --git a/sim/testsuite/sim/arm/tst.cgs b/sim/testsuite/sim/arm/tst.cgs
deleted file mode 100644
index f07170753dc..00000000000
--- a/sim/testsuite/sim/arm/tst.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# arm testcase for tst${cond}${set-cc?} $rn,$imm12
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global tst_imm
-tst_imm:
-	tst00 pc,0
-
-	pass
-# arm testcase for tst$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftimm}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global tst_reg_imm_shift
-tst_reg_imm_shift:
-	tst00 pc,pc,pc,lsl 0
-
-	pass
-# arm testcase for tst$cond${set-cc?} $rd,$rn,$rm,${operand2-shifttype} ${operand2-shiftreg}
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global tst_reg_reg_shift
-tst_reg_reg_shift:
-	tst00 pc,pc,pc,lsl pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/umlal.cgs b/sim/testsuite/sim/arm/umlal.cgs
deleted file mode 100644
index 1c17fb6c0b9..00000000000
--- a/sim/testsuite/sim/arm/umlal.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for umlal$cond${set-cc?} $rdlo,$rdhi,$rm,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global umlal
-umlal:
-	umlal00 pc,pc,pc,pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/umull.cgs b/sim/testsuite/sim/arm/umull.cgs
deleted file mode 100644
index a58541c450b..00000000000
--- a/sim/testsuite/sim/arm/umull.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# arm testcase for umull$cond${set-cc?} $rdlo,$rdhi,$rm,$rs
-# mach: unfinished
-
-	.include "testutils.inc"
-
-	start
-
-	.global umull
-umull:
-	umull00 pc,pc,pc,pc
-
-	pass
diff --git a/sim/testsuite/sim/arm/xscale/blx.cgs b/sim/testsuite/sim/arm/xscale/blx.cgs
deleted file mode 100644
index 854647b0b25..00000000000
--- a/sim/testsuite/sim/arm/xscale/blx.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# arm testcase for bl$cond $offset24
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-        .arm
-        blx thumb
-	
-        .thumb
-	.thumb_func
-thumb:  
-	nop
-        blx     next
-        blx     PASS
-        nop
-        nop
-
-        .section text1, "ax"
-        .arm
-next:
-        add     r0, r1, r0
-        bx      lr
-
-FAIL:
-	fail
-PASS:   
-	pass
-
-
diff --git a/sim/testsuite/sim/arm/xscale/mia.cgs b/sim/testsuite/sim/arm/xscale/mia.cgs
deleted file mode 100644
index a3f729e86c2..00000000000
--- a/sim/testsuite/sim/arm/xscale/mia.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# XSCALE testcase for MIA
-# mach: xscale
-# as: -mcpu=xscale
-
-	.include "testutils.inc"
-
-	start
-
-	.global mia
-mia:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	mar        acc0, r0, r1
-
-	mia	   acc0, r2, r3
-	
-	mra        r0, r1, acc0
-	
-	test_h_gr  r0, 0x354f53c4
-	test_h_gr  r1, 0x4e330b5e
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	pass
diff --git a/sim/testsuite/sim/arm/xscale/miaph.cgs b/sim/testsuite/sim/arm/xscale/miaph.cgs
deleted file mode 100644
index 53fb2017f61..00000000000
--- a/sim/testsuite/sim/arm/xscale/miaph.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# XSCALE testcase for MIAPH
-# mach: xscale
-# as: -mcpu=xscale
-
-	.include "testutils.inc"
-
-	start
-
-	.global miaph
-miaph:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	mar	   acc0, r0, r1
-
-	miaph	   acc0, r2, r3
-	
-	mra	   r0, r1, acc0
-	
-	test_h_gr  r0, 0xfec3f9f4
-	test_h_gr  r1, 0x55667787
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	pass
diff --git a/sim/testsuite/sim/arm/xscale/miaxy.cgs b/sim/testsuite/sim/arm/xscale/miaxy.cgs
deleted file mode 100644
index 624564ed176..00000000000
--- a/sim/testsuite/sim/arm/xscale/miaxy.cgs
+++ /dev/null
@@ -1,89 +0,0 @@
-# XSCALE testcase for MIAxy
-# mach: xscale
-# as: -mcpu=xscale
-
-	.include "testutils.inc"
-
-	start
-
-	.global miaXY
-miaXY:
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-
-	# Test Bottom Bottom Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	mar	   acc0, r0, r1
-
-	miaBB	   acc0, r2, r3
-	
-	mra	   r0, r1, acc0
-	
-	test_h_gr  r0, 0x05f753c4
-	test_h_gr  r1, 0x55667788
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	# Test Bottom Top Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	mar	   acc0, r0, r1
-
-	miaBT	   acc0, r2, r3
-	
-	mra	   r0, r1, acc0
-	
-	test_h_gr  r0, 0xeeede364
-	test_h_gr  r1, 0x55667787
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	# Test Top Bottom Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	mar	   acc0, r0, r1
-
-	miaTB	   acc0, r2, r3
-	
-	mra	   r0, r1, acc0
-	
-	test_h_gr  r0, 0x0ec85c04
-	test_h_gr  r1, 0x55667788
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	# Test Top Top Multilply Accumulate
-	
-	mvi_h_gr   r0, 0x11223344
-	mvi_h_gr   r1, 0x55667788
-	mvi_h_gr   r2, 0x12345678
-	mvi_h_gr   r3, 0x9abcdef0
-
-	mar	   acc0, r0, r1
-
-	miaTT	   acc0, r2, r3
-	
-	mra	   r0, r1, acc0
-	
-	test_h_gr  r0, 0x09eed974
-	test_h_gr  r1, 0x55667788
-	test_h_gr  r2, 0x12345678
-	test_h_gr  r3, 0x9abcdef0
-
-	pass
diff --git a/sim/testsuite/sim/arm/xscale/mra.cgs b/sim/testsuite/sim/arm/xscale/mra.cgs
deleted file mode 100644
index be4d9df009a..00000000000
--- a/sim/testsuite/sim/arm/xscale/mra.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# XScale testcase for MAR and MRA
-# mach: xscale
-# as: -mcpu=xscale
-
-	.include "testutils.inc"
-
-	start
-
-	.global mar_mra
-mar_mra:
-	mvi_h_gr   r2,0
-	mvi_h_gr   r3,0
-	mvi_h_gr   r4,0x0000EFA0
-	mvi_h_gr   r5,0xA0A0A0A0
-
-	# Enable access to CoProcessors 0 & 1 before
-        # we attempt these instructions.
-
-	mvi_h_gr   r1, 3
-	mcr        p15, 0, r1, cr15, cr1, 0
-	
-	mar        acc0, r5, r4
-	mra        r2, r3, acc0
-	
-	test_h_gr  r2,0xA0A0A0A0
-	test_h_gr  r3,0x0000EFA0
-	test_h_gr  r4,0x0000EFA0
-	test_h_gr  r5,0xA0A0A0A0
-	
-	pass
diff --git a/sim/testsuite/sim/arm/xscale/testutils.inc b/sim/testsuite/sim/arm/xscale/testutils.inc
deleted file mode 100644
index ae49db8820a..00000000000
--- a/sim/testsuite/sim/arm/xscale/testutils.inc
+++ /dev/null
@@ -1,118 +0,0 @@
-# r0-r3 are used as tmps, consider them call clobbered by these macros.
-# This uses the angel rom monitor calls.
-# ??? How do we use the \@ facility of .macros ???
-# @ is the comment char!
-
-	.macro mvi_h_gr reg, val
-	ldr \reg,[pc]
-	b . + 8
-	.word \val
-	.endm
-
-	.macro mvaddr_h_gr reg, addr
-	ldr \reg,[pc]
-	b . + 8
-	.word \addr
-	.endm
-
-	.macro start
-	.data
-failmsg:
-	.asciz "fail\n"
-passmsg:
-	.asciz "pass\n"
-	.text
-
-do_pass:
-	ldr r1, passmsg_addr
-	mov r0, #4
-	swi #0x123456
-	exit 0
-passmsg_addr:
-	.word passmsg
-
-do_fail:
-	ldr r1, failmsg_addr
-	mov r0, #4
-	swi #0x123456
-	exit 1
-failmsg_addr:
-	.word failmsg
-
-	.global _start
-_start:
-	.endm
-
-# *** Other macros know pass/fail are 4 bytes in size!  Yuck.
-
-	.macro pass
-	b do_pass
-	.endm
-
-	.macro fail
-	b do_fail
-	.endm
-
-	.macro exit rc
-	# ??? This works with the ARMulator but maybe not others.
-	#mov r0, #\rc
-	#swi #1
-	# This seems to be portable (though it ignores rc).
-	mov r0,#0x18
-	mvi_h_gr r1, 0x20026
-	swi #0x123456
-	# If that returns, punt with a sigill.
-	stc 0,cr0,[r0]
-	.endm
-
-# Other macros know this only clobbers r0.
-# WARNING: It also clobbers the condition codes (FIXME).
-	.macro test_h_gr reg, val
-	mvaddr_h_gr r0, \val
-	cmp \reg, r0
-	beq . + 8
-	fail
-	.endm
-
-	.macro mvi_h_cnvz c, n, v, z
-	mov r0, #0
-	.if \c
-	orr r0, r0, #0x20000000
-	.endif
-	.if \n
-	orr r0, r0, #0x80000000
-	.endif
-	.if \v
-	orr r0, r0, #0x10000000
-	.endif
-	.if \z
-	orr r0, r0, #0x40000000
-	.endif
-	mrs r1, cpsr
-	bic r1, r1, #0xf0000000
-	orr r1, r1, r0
-	msr cpsr, r1
-	# ??? nops needed
-	.endm
-
-# ??? Preserve condition codes?
-	.macro test_h_cnvz c, n, v, z
-	mov r0, #0
-	.if \c
-	orr r0, r0, #0x20000000
-	.endif
-	.if \n
-	orr r0, r0, #0x80000000
-	.endif
-	.if \v
-	orr r0, r0, #0x10000000
-	.endif
-	.if \z
-	orr r0, r0, #0x40000000
-	.endif
-	mrs r1, cpsr
-	and r1, r1, #0xf0000000
-	cmp r0, r1
-	beq . + 8
-	fail
-	.endm
diff --git a/sim/testsuite/sim/arm/xscale/xscale.exp b/sim/testsuite/sim/arm/xscale/xscale.exp
deleted file mode 100644
index 375692941a9..00000000000
--- a/sim/testsuite/sim/arm/xscale/xscale.exp
+++ /dev/null
@@ -1,28 +0,0 @@
-# XSCALE simulator testsuite.
-
-if { [istarget xscale*-*-*] } {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "xscale"
-
-    if [is_remote host] {
-      remote_download host $srcdir/$subdir/testutils.inc
-    }
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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
-    }
-
-    if [is_remote host] {
-      remote_file host delete testutils.inc
-    }
-}
diff --git a/sim/testsuite/sim/fr30/add.cgs b/sim/testsuite/sim/fr30/add.cgs
deleted file mode 100644
index 1409df1b6fe..00000000000
--- a/sim/testsuite/sim/fr30/add.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# fr30 testcase for add $Rj,$Ri, add $u4,$Rj
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global add
-add:
-	; Test add $Rj,$Ri
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	add      	r7,r8
-	test_cc		0 0 0 0
-	test_h_gr  	3,r8
-
-	mvi_h_gr   	0x7fffffff,r7
-	mvi_h_gr   	1,r8
-	set_cc          0x05		; Set mask opposite of expected
-	add		r7,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0x80000000,r8
-
-	set_cc          0x08		; Set mask opposite of expected
-	add		r8,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0,r8
-
-	; Test add $u4Ri
-	mvi_h_gr   	4,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	add		0,r8
-	test_cc		0 0 0 0
-	test_h_gr  	4,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	add		1,r8
-	test_cc		0 0 0 0
-	test_h_gr  	5,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	add		15,r8
-	test_cc		0 0 0 0
-	test_h_gr  	20,r8
-	mvi_h_gr   	0x7fffffff,r8	; test neg and overflow bits
-	set_cc          0x05		; Set mask opposite of expected
-	add		1,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0x80000000,r8
-	set_cc          0x08		; Set mask opposite of expected
-	add		r8,r8		; test zero, carry and overflow bits
-	test_cc		0 1 1 1;
-	test_h_gr  	0,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/add.ms b/sim/testsuite/sim/fr30/add.ms
deleted file mode 100644
index 9da6868a110..00000000000
--- a/sim/testsuite/sim/fr30/add.ms
+++ /dev/null
@@ -1,13 +0,0 @@
-# fr30 testcase for add $Rj,$Ri
-# cpu {}
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global add
-add:
-	add ac,ac
-	fail
-	EXIT 0
diff --git a/sim/testsuite/sim/fr30/add2.cgs b/sim/testsuite/sim/fr30/add2.cgs
deleted file mode 100644
index 856acde6fe8..00000000000
--- a/sim/testsuite/sim/fr30/add2.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# fr30 testcase for add2 $m4,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global add
-add:
-	mvi_h_gr   	30,r8
-	set_cc          0x0e	; Set mask opposite of expected
-	add2       	-16,r8	; Max value of immediate field
-	test_cc		0 0 0 1
-	test_h_gr  	14,r8
-
-	set_cc          0x0e	; Set mask opposite of expected
-	add2       	-3,r8	; Mid value of immediate field
-	test_cc		0 0 0 1
-	test_h_gr  	11,r8
-
-	set_cc          0x0e	; Set mask opposite of expected
-	add2       	-1,r8	; Min value of immediate field
-	test_cc		0 0 0 1
-	test_h_gr  	10,r8
-
-	set_cc          0x0a	; Set mask opposite of expected
-	add2       	-10,r8	; Test zero and carry bits
-	test_cc		0 1 0 1
-	test_h_gr  	0,r8
-
-	set_cc          0x07	; Set mask opposite of expected
-	add2       	-16,r8	; Test negative bit
-	test_cc		1 0 0 0
-	test_h_gr  	-16,r8
-
-	mvi_h_gr	0x80000000,r8
-	set_cc          0x0c	; Set mask opposite of expected
-	add2       	-1,r8	; Test overflow bit
-	test_cc		0 0 1 1
-	test_h_gr  	0x7fffffff,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/addc.cgs b/sim/testsuite/sim/fr30/addc.cgs
deleted file mode 100644
index e13547894b6..00000000000
--- a/sim/testsuite/sim/fr30/addc.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# fr30 testcase for addc $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global add
-add:
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	2,r8
-	set_cc          0x0e		; Make sure carry bit is off
-	addc      	r7,r8
-	test_cc		0 0 0 0
-	test_h_gr  	3,r8
-
-	mvi_h_gr   	0x7fffffff,r7
-	mvi_h_gr   	1,r8
-	set_cc          0x04		; Make sure carry bit is off
-	addc		r7,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0x80000000,r8
-
-	set_cc          0x08		; Make sure carry bit is off
-	addc		r8,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0,r8
-
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Make sure carry bit is on
-	addc      	r7,r8
-	test_cc		0 0 0 0
-	test_h_gr  	4,r8
-
-	mvi_h_gr   	0x7fffffff,r7
-	mvi_h_gr   	0,r8
-	set_cc          0x05		; Make sure carry bit is on
-	addc		r7,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0x80000000,r8
-
-	mvi_h_gr   	0x7fffffff,r7
-	set_cc          0x0b		; Make sure carry bit is on
-	addc		r7,r8
-	test_cc		0 1 0 1;
-	test_h_gr  	0,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/addn.cgs b/sim/testsuite/sim/fr30/addn.cgs
deleted file mode 100644
index b7638d61995..00000000000
--- a/sim/testsuite/sim/fr30/addn.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# fr30 testcase for addn $Rj,$Ri, addn $u4,$Rj
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global addn
-addn:
-	; Test addn $Rj,$Ri
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of normal result
-	addn      	r7,r8
-	test_cc		1 1 1 1
-	test_h_gr  	3,r8
-
-	mvi_h_gr   	0x7fffffff,r7
-	mvi_h_gr   	1,r8
-	set_cc          0x05		; Set mask opposite of normal result
-	addn		r7,r8
-	test_cc		0 1 0 1
-	test_h_gr  	0x80000000,r8
-
-	set_cc          0x08		; Set mask opposite of normal result
-	addn		r8,r8
-	test_cc		1 0 0 0
-	test_h_gr  	0,r8
-
-	; Test addn $u4Ri
-	mvi_h_gr   	4,r8
-	set_cc          0x0f		; Set mask opposite of normal result
-	addn		0,r8
-	test_cc		1 1 1 1
-	test_h_gr  	4,r8
-	set_cc          0x0f		; Set mask opposite of normal result
-	addn		1,r8
-	test_cc		1 1 1 1
-	test_h_gr  	5,r8
-	set_cc          0x0f		; Set mask opposite of normal result
-	addn		15,r8
-	test_cc		1 1 1 1
-	test_h_gr  	20,r8
-	mvi_h_gr   	0x7fffffff,r8	; test neg and overflow bits
-	set_cc          0x05		; Set mask opposite of normal result
-	addn		1,r8
-	test_cc		0 1 0 1
-	test_h_gr  	0x80000000,r8
-	set_cc          0x08		; Set mask opposite of normal result
-	addn		r8,r8		; test zero, carry and overflow bits
-	test_cc		1 0 0 0;
-	test_h_gr  	0,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/addn2.cgs b/sim/testsuite/sim/fr30/addn2.cgs
deleted file mode 100644
index 9525baf4502..00000000000
--- a/sim/testsuite/sim/fr30/addn2.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# fr30 testcase for addn2 $m4,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global add
-add:
-	mvi_h_gr   	30,r8
-	set_cc          0x0e	; Set mask opposite of normal result
-	addn2       	-16,r8	; Max value of immediate field
-	test_cc		1 1 1 0
-	test_h_gr  	14,r8
-
-	set_cc          0x0e	; Set mask opposite of normal result
-	addn2       	-3,r8	; Mid value of immediate field
-	test_cc		1 1 1 0
-	test_h_gr  	11,r8
-
-	set_cc          0x0e	; Set mask opposite of normal result
-	addn2       	-1,r8	; Min value of immediate field
-	test_cc		1 1 1 0
-	test_h_gr  	10,r8
-
-	set_cc          0x0a	; Set mask opposite of normal result
-	addn2       	-10,r8	; Test zero and carry bits
-	test_cc		1 0 1 0
-	test_h_gr  	0,r8
-
-	set_cc          0x07	; Set mask opposite of normal result
-	addn2       	-16,r8	; Test negative bit
-	test_cc		0 1 1 1
-	test_h_gr  	-16,r8
-
-	mvi_h_gr	0x80000000,r8
-	set_cc          0x0c	; Set mask opposite of normal result
-	addn2       	-1,r8	; Test overflow bit
-	test_cc		1 1 0 0
-	test_h_gr  	0x7fffffff,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/addsp.cgs b/sim/testsuite/sim/fr30/addsp.cgs
deleted file mode 100644
index da5bc36b86a..00000000000
--- a/sim/testsuite/sim/fr30/addsp.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# fr30 testcase for addsp $s10
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global addsp
-addsp:
-	; Test addsp $s10
-	mvr_h_gr   	sp,r7			; save stack pointer permanently
-	mvr_h_gr	sp,r8			; Shadow updated sp
-	set_cc	0x0f			; Condition codes are irrelevent
-	addsp      	508
-	test_cc		1 1 1 1
-	inci_h_gr	508,r8
-	testr_h_gr	r8,sp
-
-	set_cc	0x0e			; Condition codes are irrelevent
-	addsp      	0
-	test_cc		1 1 1 0
-	testr_h_gr	r8,sp
-
-	set_cc	0x0d			; Condition codes are irrelevent
-	addsp      	-512
-	test_cc		1 1 0 1
-	inci_h_gr	-512,r8
-	testr_h_gr	r8,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/allinsn.exp b/sim/testsuite/sim/fr30/allinsn.exp
deleted file mode 100644
index 8c3d5121113..00000000000
--- a/sim/testsuite/sim/fr30/allinsn.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# FR30 simulator testsuite.
-
-if [istarget fr30*-*-*] {
-    # load support procs
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "fr30"
-
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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/fr30/and.cgs b/sim/testsuite/sim/fr30/and.cgs
deleted file mode 100644
index 3148a311915..00000000000
--- a/sim/testsuite/sim/fr30/and.cgs
+++ /dev/null
@@ -1,57 +0,0 @@
-# fr30 testcase for and $Rj,$Ri, and $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global and
-and:
-	; Test and $Rj,$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_gr   	0x55555555,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	and      	r7,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0,r8
-
-	mvi_h_gr   	0xffff0000,r8
-	set_cc          0x04		; Set mask opposite of expected
-	and		r7,r8
-	test_cc		1 0 0 0
-	test_h_gr  	0xaaaa0000,r8
-
-	mvi_h_gr   	0xffff,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	and		r7,r8
-	test_cc		0 0 0 1
-	test_h_gr  	0xaaaa,r8
-
-	; Test and $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0b		; Set mask opposite of expected
-	and      	r7,@sp
-	test_cc		0 1 1 1
-	test_h_mem 	0,sp
-
-	mvi_h_mem  	0xffff0000,sp
-	set_cc          0x04		; Set mask opposite of expected
-	and		r7,@sp
-	test_cc		1 0 0 0
-	test_h_mem 	0xaaaa0000,sp
-
-	mvr_h_gr	sp,r9
-	inci_h_gr	4,r9
-	mvi_h_mem  	0xffffffff,sp
-	mvi_h_mem  	0xffff0000,r9
-	inci_h_gr	1,sp		; test unaligned access
-	set_cc          0x05		; Set mask opposite of expected
-	and		r7,@sp
-	test_cc		1 0 0 1
-	inci_h_gr	-1,sp
-	test_h_mem 	0xaaaaaaaa,sp
-	test_h_mem 	0xffff0000,r9
-
-	pass
diff --git a/sim/testsuite/sim/fr30/andb.cgs b/sim/testsuite/sim/fr30/andb.cgs
deleted file mode 100644
index c01d49d276b..00000000000
--- a/sim/testsuite/sim/fr30/andb.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# fr30 testcase for andb $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global andb
-andb:
-	; Test andb $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0b		; Set mask opposite of expected
-	andb      	r7,@sp
-	test_cc		0 1 1 1
-	test_h_mem 	0x00555555,sp
-
-	mvi_h_mem  	0xffffffff,sp
-	set_cc          0x04		; Set mask opposite of expected
-	andb		r7,@sp
-	test_cc		1 0 0 0
-	test_h_mem 	0xaaffffff,sp
-
-	mvi_h_mem  	0x0fffffff,sp
-	set_cc          0x0d		; Set mask opposite of expected
-	andb		r7,@sp
-	test_cc		0 0 0 1
-	test_h_mem 	0x0affffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/andccr.cgs b/sim/testsuite/sim/fr30/andccr.cgs
deleted file mode 100644
index 7f8f99e25f5..00000000000
--- a/sim/testsuite/sim/fr30/andccr.cgs
+++ /dev/null
@@ -1,51 +0,0 @@
-# fr30 testcase for andccr $u8
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global andccr
-andccr:
-	set_cc		0x00
-	set_i			0
-	set_s_system
-	andccr      	0xff
-	test_cc		0 0 0 0
-	test_i		0
-	test_s_system
-
-	set_cc		0x0f
-	set_i			1
-	set_s_user
-	andccr      	0xff
-	test_cc		1 1 1 1
-	test_i		1
-	test_s_user
-
-	set_cc		0x0f
-	set_i			1
-	set_s_user
-	andccr      	0xaa
-	test_cc		1 0 1 0
-	test_i		0
-	test_s_user
-
-	set_cc		0x0f
-	set_i			1
-	set_s_user
-	andccr      	0xc0
-	test_cc		0 0 0 0
-	test_i		0
-	test_s_system
-
-	set_cc		0x0f
-	set_i			1
-	set_s_user
-	andccr      	0x3f		; no effect
-	test_cc		1 1 1 1
-	test_i		1
-	test_s_user
-
-	pass
diff --git a/sim/testsuite/sim/fr30/andh.cgs b/sim/testsuite/sim/fr30/andh.cgs
deleted file mode 100644
index a172fc764f2..00000000000
--- a/sim/testsuite/sim/fr30/andh.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# fr30 testcase for andh $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global andh
-andh:
-	; Test andh $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0b		; Set mask opposite of expected
-	andh      	r7,@sp
-	test_cc		0 1 1 1
-	test_h_mem 	0x00005555,sp
-
-	mvi_h_mem  	0xffffffff,sp
-	set_cc          0x04		; Set mask opposite of expected
-	andh		r7,@sp
-	test_cc		1 0 0 0
-	test_h_mem 	0xaaaaffff,sp
-
-	mvi_h_mem  	0x00ffffff,sp
-	set_cc          0x0d		; Set mask opposite of expected
-	andh		r7,@sp
-	test_cc		0 0 0 1
-	test_h_mem 	0x00aaffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/asr.cgs b/sim/testsuite/sim/fr30/asr.cgs
deleted file mode 100644
index f783d41ba3d..00000000000
--- a/sim/testsuite/sim/fr30/asr.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# fr30 testcase for asr $Rj,$Ri, asr $u4,$Rj
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global asr
-asr:
-	; Test asr $Rj,$Ri
-	mvi_h_gr   	0xdeadbee0,r7	; Shift by 0
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x05		; Set mask opposite of expected
-	asr      	r7,r8
-	test_cc		1 0 0 0
-	test_h_gr  	0x80000000,r8
-
-	mvi_h_gr   	0xdeadbee1,r7	; Shift by 1
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x07		; Set mask opposite of expected
-	asr      	r7,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0xc0000000,r8
-
-	mvi_h_gr   	0xdeadbeff,r7	; Shift by 31
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x07		; Set mask opposite of expected
-	asr      	r7,r8
-	test_cc		1 0 1 0
-	test_h_gr  	-1,r8
-
-	mvi_h_gr   	0xdeadbeff,r7	; clear register
-	mvi_h_gr   	0x40000000,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	asr      	r7,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	; Test asr $u4Ri
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x05		; Set mask opposite of expected
-	asr      	0,r8
-	test_cc		1 0 0 0
-	test_h_gr  	0x80000000,r8
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x07		; Set mask opposite of expected
-	asr      	1,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0xc0000000,r8
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x07		; Set mask opposite of expected
-	asr      	15,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0xffff0000,r8
-
-	mvi_h_gr   	0x00004000,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	asr      	15,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/asr2.cgs b/sim/testsuite/sim/fr30/asr2.cgs
deleted file mode 100644
index 884e40d5c84..00000000000
--- a/sim/testsuite/sim/fr30/asr2.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for asr2 $u4,$Rj
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global asr2
-asr2:
-	; Test asr2 $u4Ri
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x05		; Set mask opposite of expected
-	asr2      	0,r8
-	test_cc		1 0 0 0
-	test_h_gr  	0xffff8000,r8
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x07		; Set mask opposite of expected
-	asr2      	1,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0xffffc000,r8
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x07		; Set mask opposite of expected
-	asr2      	15,r8
-	test_cc		1 0 1 0
-	test_h_gr  	-1,r8
-
-	mvi_h_gr   	0x40000000,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	asr2      	15,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bandh.cgs b/sim/testsuite/sim/fr30/bandh.cgs
deleted file mode 100644
index 45ab5e59f3a..00000000000
--- a/sim/testsuite/sim/fr30/bandh.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# fr30 testcase for bandh $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bandh
-bandh:
-	; Test bandh $Rj,@$Ri
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0f		; Condition codes should not change
-	bandh      	0x0a,@sp
-	test_cc		1 1 1 1
-	test_h_mem 	0x05555555,sp
-
-	mvi_h_mem  	0xffffffff,sp
-	set_cc          0x04		; Condition codes should not change
-	bandh		0x0a,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0xafffffff,sp
-
-	mvi_h_mem  	0xe5ffffff,sp
-	set_cc          0x0a		; Condition codes should not change
-	bandh		0x07,@sp
-	test_cc		1 0 1 0
-	test_h_mem 	0x65ffffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bandl.cgs b/sim/testsuite/sim/fr30/bandl.cgs
deleted file mode 100644
index 9cd4825965a..00000000000
--- a/sim/testsuite/sim/fr30/bandl.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# fr30 testcase for bandl $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bandl
-bandl:
-	; Test bandl $Rj,@$Ri
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0f		; Condition codes should not change
-	bandl      	0x0a,@sp
-	test_cc		1 1 1 1
-	test_h_mem 	0x50555555,sp
-
-	mvi_h_mem  	0xffffffff,sp
-	set_cc          0x04		; Condition codes should not change
-	bandl		0x0a,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0xfaffffff,sp
-
-	mvi_h_mem  	0x5effffff,sp
-	set_cc          0x0a		; Condition codes should not change
-	bandl		0x07,@sp
-	test_cc		1 0 1 0
-	test_h_mem 	0x56ffffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bc.cgs b/sim/testsuite/sim/fr30/bc.cgs
deleted file mode 100644
index 0502625d32e..00000000000
--- a/sim/testsuite/sim/fr30/bc.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bc $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bc
-bc:
-	; Test bc $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch 	bc
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch 	bc
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch 	bc
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch 	bc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch 	bc
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch 	bc
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch 	bc
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch 	bc
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch 	bc
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch 	bc
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch 	bc
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch 	bc
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch 	bc
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch 	bc
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch 	bc
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch 	bc
-
-	; Test bc:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch_d 	bc:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch_d 	bc:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch_d 	bc:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch_d 	bc:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch_d 	bc:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch_d 	bc:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch_d 	bc:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch_d 	bc:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch_d 	bc:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch_d 	bc:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch_d 	bc:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch_d 	bc:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch_d 	bc:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch_d 	bc:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch_d 	bc:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch_d 	bc:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/beorh.cgs b/sim/testsuite/sim/fr30/beorh.cgs
deleted file mode 100644
index 6d07f1af788..00000000000
--- a/sim/testsuite/sim/fr30/beorh.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for beorh $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global beorh
-beorh:
-	; Test beorh $Rj,@$Ri
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0f		; Condition codes should not change
-	beorh      	0x0a,@sp
-	test_cc		1 1 1 1
-	test_h_mem 	0xf5555555,sp
-
-	mvi_h_mem  	0x0fffffff,sp
-	set_cc          0x04		; Condition codes should not change
-	beorh		0x00,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0x0fffffff,sp
-
-	mvi_h_mem  	0xffffffff,sp
-	set_cc          0x0a		; Condition codes should not change
-	beorh		0x0f,@sp
-	test_cc		1 0 1 0
-	test_h_mem 	0x0fffffff,sp
-
-	mvi_h_mem  	0x9eadbeef,sp
-	set_cc          0x09		; Condition codes should not change
-	beorh		0x04,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/beorl.cgs b/sim/testsuite/sim/fr30/beorl.cgs
deleted file mode 100644
index f7ea05347b3..00000000000
--- a/sim/testsuite/sim/fr30/beorl.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for beorl $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global beorl
-beorl:
-	; Test beorl $Rj,@$Ri
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0f		; Condition codes should not change
-	beorl      	0x0a,@sp
-	test_cc		1 1 1 1
-	test_h_mem 	0x5f555555,sp
-
-	mvi_h_mem  	0xf0ffffff,sp
-	set_cc          0x04		; Condition codes should not change
-	beorl		0x00,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0xf0ffffff,sp
-
-	mvi_h_mem  	0xffffffff,sp
-	set_cc          0x0a		; Condition codes should not change
-	beorl		0x0f,@sp
-	test_cc		1 0 1 0
-	test_h_mem 	0xf0ffffff,sp
-
-	mvi_h_mem  	0xddadbeef,sp
-	set_cc          0x09		; Condition codes should not change
-	beorl		0x03,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/beq.cgs b/sim/testsuite/sim/fr30/beq.cgs
deleted file mode 100644
index edd797e4ed2..00000000000
--- a/sim/testsuite/sim/fr30/beq.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for beq $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global beq
-beq:
-	; Test beq $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch 	beq
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch 	beq
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch 	beq
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch 	beq
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch 	beq
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch 	beq
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch 	beq
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch 	beq
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch 	beq
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch 	beq
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch 	beq
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch 	beq
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch 	beq
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch 	beq
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch 	beq
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch 	beq
-
-	; Test beq:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch_d 	beq:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch_d 	beq:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch_d 	beq:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch_d 	beq:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch_d 	beq:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch_d 	beq:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch_d 	beq:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch_d 	beq:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch_d 	beq:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch_d 	beq:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch_d 	beq:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch_d 	beq:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch_d 	beq:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch_d 	beq:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch_d 	beq:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch_d 	beq:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bge.cgs b/sim/testsuite/sim/fr30/bge.cgs
deleted file mode 100644
index dd7796ccd94..00000000000
--- a/sim/testsuite/sim/fr30/bge.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bge $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bge
-bge:
-	; Test bge $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch 	bge
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch 	bge
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch 	bge
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch 	bge
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch 	bge
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch 	bge
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch 	bge
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch 	bge
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch 	bge
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch 	bge
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch 	bge
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch 	bge
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch 	bge
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch 	bge
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch 	bge
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch 	bge
-
-	; Test bge:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch_d 	bge:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch_d 	bge:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch_d 	bge:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch_d 	bge:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch_d 	bge:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch_d 	bge:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch_d 	bge:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch_d 	bge:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch_d 	bge:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch_d 	bge:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch_d 	bge:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch_d 	bge:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch_d 	bge:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch_d 	bge:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch_d 	bge:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch_d 	bge:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bgt.cgs b/sim/testsuite/sim/fr30/bgt.cgs
deleted file mode 100644
index 525ac2e8f32..00000000000
--- a/sim/testsuite/sim/fr30/bgt.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bgt $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bgt
-bgt:
-	; Test bgt $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch 	bgt
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch 	bgt
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch 	bgt
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch 	bgt
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch 	bgt
-
-	; Test bgt:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch_d 	bgt:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch_d 	bgt:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch_d 	bgt:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch_d 	bgt:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch_d 	bgt:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bhi.cgs b/sim/testsuite/sim/fr30/bhi.cgs
deleted file mode 100644
index f5a15492063..00000000000
--- a/sim/testsuite/sim/fr30/bhi.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bhi $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bhi
-bhi:
-	; Test bhi $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch 	bhi
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch 	bhi
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch 	bhi
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch 	bhi
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch 	bhi
-
-	; Test bhi:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch_d 	bhi:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch_d 	bhi:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch_d 	bhi:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch_d 	bhi:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch_d 	bhi:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ble.cgs b/sim/testsuite/sim/fr30/ble.cgs
deleted file mode 100644
index 1a33f783ce3..00000000000
--- a/sim/testsuite/sim/fr30/ble.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for ble $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ble
-ble:
-	; Test ble $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch 	ble
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch 	ble
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch 	ble
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch 	ble
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch 	ble
-
-	; Test ble:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch_d 	ble:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch_d 	ble:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch_d 	ble:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch_d 	ble:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch_d 	ble:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch_d 	ble:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch_d 	ble:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch_d 	ble:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch_d 	ble:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch_d 	ble:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch_d 	ble:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch_d 	ble:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch_d 	ble:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch_d 	ble:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch_d 	ble:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch_d 	ble:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bls.cgs b/sim/testsuite/sim/fr30/bls.cgs
deleted file mode 100644
index c0148b7b901..00000000000
--- a/sim/testsuite/sim/fr30/bls.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bls $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bls
-bls:
-	; Test bls $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch 	bls
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch 	bls
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch 	bls
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch 	bls
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch 	bls
-
-	; Test bls:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch_d 	bls:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch_d 	bls:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch_d 	bls:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch_d 	bls:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch_d 	bls:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch_d 	bls:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch_d 	bls:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch_d 	bls:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch_d 	bls:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch_d 	bls:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch_d 	bls:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch_d 	bls:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch_d 	bls:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch_d 	bls:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch_d 	bls:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch_d 	bls:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/blt.cgs b/sim/testsuite/sim/fr30/blt.cgs
deleted file mode 100644
index f7b6ff114bf..00000000000
--- a/sim/testsuite/sim/fr30/blt.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for blt $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global blt
-blt:
-	; Test blt $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch 	blt
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch 	blt
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch 	blt
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch 	blt
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch 	blt
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch 	blt
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch 	blt
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch 	blt
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch 	blt
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch 	blt
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch 	blt
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch 	blt
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch 	blt
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch 	blt
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch 	blt
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch 	blt
-
-	; Test blt:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch_d 	blt:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch_d 	blt:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch_d 	blt:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch_d 	blt:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch_d 	blt:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch_d 	blt:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch_d 	blt:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch_d 	blt:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch_d 	blt:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch_d 	blt:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch_d 	blt:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch_d 	blt:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch_d 	blt:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch_d 	blt:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch_d 	blt:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch_d 	blt:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bn.cgs b/sim/testsuite/sim/fr30/bn.cgs
deleted file mode 100644
index 45858fc97ee..00000000000
--- a/sim/testsuite/sim/fr30/bn.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bn $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bn
-bn:
-	; Test bn $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch 	bn
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch 	bn
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch 	bn
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch 	bn
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch 	bn
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch 	bn
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch 	bn
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch 	bn
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch 	bn
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch 	bn
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch 	bn
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch 	bn
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch 	bn
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch 	bn
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch 	bn
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch 	bn
-
-	; Test bn:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch_d 	bn:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch_d 	bn:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch_d 	bn:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch_d 	bn:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch_d 	bn:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch_d 	bn:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch_d 	bn:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch_d 	bn:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch_d 	bn:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch_d 	bn:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch_d 	bn:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch_d 	bn:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch_d 	bn:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch_d 	bn:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch_d 	bn:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch_d 	bn:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bnc.cgs b/sim/testsuite/sim/fr30/bnc.cgs
deleted file mode 100644
index 9968c43737c..00000000000
--- a/sim/testsuite/sim/fr30/bnc.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bnc $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bnc
-bc:
-	; Test bnc $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch 	bnc
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch 	bnc
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch 	bnc
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch 	bnc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch 	bnc
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch 	bnc
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch 	bnc
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch 	bnc
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch 	bnc
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch 	bnc
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch 	bnc
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch 	bnc
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch 	bnc
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch 	bnc
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch 	bnc
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch 	bnc
-
-	; Test bnc:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch_d 	bnc:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch_d 	bnc:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch_d 	bnc:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch_d 	bnc:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch_d 	bnc:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch_d 	bnc:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch_d 	bnc:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch_d 	bnc:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch_d 	bnc:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch_d 	bnc:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch_d 	bnc:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch_d 	bnc:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch_d 	bnc:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch_d 	bnc:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch_d 	bnc:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch_d 	bnc:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bne.cgs b/sim/testsuite/sim/fr30/bne.cgs
deleted file mode 100644
index 58971de1326..00000000000
--- a/sim/testsuite/sim/fr30/bne.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bne $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bne
-bne:
-	; Test bne $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch 	bne
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch 	bne
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch 	bne
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch 	bne
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch 	bne
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch 	bne
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch 	bne
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch 	bne
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch 	bne
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch 	bne
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch 	bne
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch 	bne
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch 	bne
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch 	bne
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch 	bne
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch 	bne
-
-	; Test bne:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch_d 	bne:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch_d 	bne:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch_d 	bne:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch_d 	bne:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch_d 	bne:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch_d 	bne:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch_d 	bne:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch_d 	bne:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch_d 	bne:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch_d 	bne:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch_d 	bne:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch_d 	bne:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch_d 	bne:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch_d 	bne:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch_d 	bne:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch_d 	bne:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bno.cgs b/sim/testsuite/sim/fr30/bno.cgs
deleted file mode 100644
index faef9ba0380..00000000000
--- a/sim/testsuite/sim/fr30/bno.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bno $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bno
-bno:
-	; Test bno $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch 	bno
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch 	bno
-
-	; Test bno:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch_d 	bno:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch_d 	bno:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch_d 	bno:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch_d 	bno:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch_d 	bno:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch_d 	bno:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch_d 	bno:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bnv.cgs b/sim/testsuite/sim/fr30/bnv.cgs
deleted file mode 100644
index 7615abd6c7d..00000000000
--- a/sim/testsuite/sim/fr30/bnv.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bnv $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bnv
-bnv:
-	; Test bnv $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch 	bnv
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch 	bnv
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch 	bnv
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch 	bnv
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch 	bnv
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch 	bnv
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch 	bnv
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch 	bnv
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch 	bnv
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch 	bnv
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch 	bnv
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch 	bnv
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch 	bnv
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch 	bnv
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch 	bnv
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch 	bnv
-
-	; Test bnv:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch_d 	bnv:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch_d 	bnv:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch_d 	bnv:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch_d 	bnv:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch_d 	bnv:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch_d 	bnv:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch_d 	bnv:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch_d 	bnv:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	no_branch_d 	bnv:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	no_branch_d 	bnv:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch_d 	bnv:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch_d 	bnv:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	no_branch_d 	bnv:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	no_branch_d 	bnv:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch_d 	bnv:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch_d 	bnv:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/borh.cgs b/sim/testsuite/sim/fr30/borh.cgs
deleted file mode 100644
index 039f18a37e2..00000000000
--- a/sim/testsuite/sim/fr30/borh.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# fr30 testcase for borh $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global borh
-borh:
-	; Test borh $Rj,@$Ri
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0f		; Condition codes should not change
-	borh      	0x0a,@sp
-	test_cc		1 1 1 1
-	test_h_mem 	0xf5555555,sp
-
-	mvi_h_mem  	0x0fffffff,sp
-	set_cc          0x04		; Condition codes should not change
-	borh		0x00,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0x0fffffff,sp
-
-	mvi_h_mem  	0xceadbeef,sp
-	set_cc          0x09		; Condition codes should not change
-	borh		0x01,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/borl.cgs b/sim/testsuite/sim/fr30/borl.cgs
deleted file mode 100644
index beb2bbbaa2d..00000000000
--- a/sim/testsuite/sim/fr30/borl.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# fr30 testcase for borl $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global borl
-borl:
-	; Test borl $Rj,@$Ri
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0f		; Condition codes should not change
-	borl      	0x0a,@sp
-	test_cc		1 1 1 1
-	test_h_mem 	0x5f555555,sp
-
-	mvi_h_mem  	0xf0ffffff,sp
-	set_cc          0x04		; Condition codes should not change
-	borl		0x00,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0xf0ffffff,sp
-
-	mvi_h_mem  	0xdcadbeef,sp
-	set_cc          0x09		; Condition codes should not change
-	borl		0x02,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bp.cgs b/sim/testsuite/sim/fr30/bp.cgs
deleted file mode 100644
index 375328305e0..00000000000
--- a/sim/testsuite/sim/fr30/bp.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bp $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bp
-bp:
-	; Test bp $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch 	bp
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch 	bp
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch 	bp
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch 	bp
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch 	bp
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch 	bp
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch 	bp
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch 	bp
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch 	bp
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch 	bp
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch 	bp
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch 	bp
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch 	bp
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch 	bp
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch 	bp
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch 	bp
-
-	; Test bp:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	no_branch_d 	bp:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	no_branch_d 	bp:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch_d 	bp:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch_d 	bp:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	no_branch_d 	bp:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	no_branch_d 	bp:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch_d 	bp:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch_d 	bp:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch_d 	bp:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch_d 	bp:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch_d 	bp:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch_d 	bp:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch_d 	bp:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch_d 	bp:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch_d 	bp:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch_d 	bp:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bra.cgs b/sim/testsuite/sim/fr30/bra.cgs
deleted file mode 100644
index 3732f74a3ed..00000000000
--- a/sim/testsuite/sim/fr30/bra.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bra $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bra
-bra:
-	; Test bra $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch 	bra
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch 	bra
-
-	; Test bra:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch_d 	bra:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch_d 	bra:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	take_branch_d 	bra:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	take_branch_d 	bra:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch_d 	bra:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch_d 	bra:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	take_branch_d 	bra:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/btsth.cgs b/sim/testsuite/sim/fr30/btsth.cgs
deleted file mode 100644
index 2897c340555..00000000000
--- a/sim/testsuite/sim/fr30/btsth.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# fr30 testcase for btsth $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global btsth
-btsth:
-	; Test btsth $Rj,@$Ri
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0b		; Set mask opposite of expected
-	btsth      	0x0a,@sp
-	test_cc		0 1 1 1
-	test_h_mem 	0x55555555,sp
-
-	mvi_h_mem  	0xffffffff,sp
-	set_cc          0x04		; Set mask opposite of expected
-	btsth		0x0a,@sp
-	test_cc		1 0 0 0
-	test_h_mem 	0xffffffff,sp
-
-	mvi_h_mem  	0xe5ffffff,sp
-	set_cc          0x0e		; Set mask opposite of expected
-	btsth		0x07,@sp
-	test_cc		0 0 1 0
-	test_h_mem 	0xe5ffffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/btstl.cgs b/sim/testsuite/sim/fr30/btstl.cgs
deleted file mode 100644
index cef5a927190..00000000000
--- a/sim/testsuite/sim/fr30/btstl.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# fr30 testcase for btstl $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global btstl
-btstl:
-	; Test btstl $Rj,@$Ri
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x0b		; Set mask opposite of expected
-	btstl      	0x0a,@sp
-	test_cc		0 1 1 1
-	test_h_mem 	0x55555555,sp
-
-	mvi_h_mem  	0xffffffff,sp
-	set_cc          0x0c		; Set mask opposite of expected
-	btstl		0x0a,@sp
-	test_cc		0 0 0 0
-	test_h_mem 	0xffffffff,sp
-
-	mvi_h_mem  	0x5effffff,sp
-	set_cc          0x0e		; Set mask opposite of expected
-	btstl		0x07,@sp
-	test_cc		0 0 1 0
-	test_h_mem 	0x5effffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/bv.cgs b/sim/testsuite/sim/fr30/bv.cgs
deleted file mode 100644
index 68cb9acf165..00000000000
--- a/sim/testsuite/sim/fr30/bv.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# fr30 testcase for bv $label9
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global bv
-bv:
-	; Test bv $label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch 	bv
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch 	bv
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch 	bv
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch 	bv
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch 	bv
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch 	bv
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch 	bv
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch 	bv
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch 	bv
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch 	bv
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch 	bv
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch 	bv
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch 	bv
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch 	bv
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch 	bv
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch 	bv
-
-	; Test bv:d label9
-	set_cc          0x0f		; condition codes are irrelevent
-	take_branch_d 	bv:d 0xf
-
-	set_cc          0x0e		; condition codes are irrelevent
-	take_branch_d 	bv:d 0xe
-
-	set_cc          0x0d		; condition codes are irrelevent
-	no_branch_d 	bv:d 0xd
-
-	set_cc          0x0c		; condition codes are irrelevent
-	no_branch_d 	bv:d 0xc
-
-	set_cc          0x0b		; condition codes are irrelevent
-	take_branch_d 	bv:d 0xb
-
-	set_cc          0x0a		; condition codes are irrelevent
-	take_branch_d 	bv:d 0xa
-
-	set_cc          0x09		; condition codes are irrelevent
-	no_branch_d 	bv:d 0x9
-
-	set_cc          0x08		; condition codes are irrelevent
-	no_branch_d 	bv:d 0x8
-
-	set_cc          0x07		; condition codes are irrelevent
-	take_branch_d 	bv:d 0x7
-
-	set_cc          0x06		; condition codes are irrelevent
-	take_branch_d 	bv:d 0x6
-
-	set_cc          0x05		; condition codes are irrelevent
-	no_branch_d 	bv:d 0x5
-
-	set_cc          0x04		; condition codes are irrelevent
-	no_branch_d 	bv:d 0x4
-
-	set_cc          0x03		; condition codes are irrelevent
-	take_branch_d 	bv:d 0x3
-
-	set_cc          0x02		; condition codes are irrelevent
-	take_branch_d 	bv:d 0x2
-
-	set_cc          0x01		; condition codes are irrelevent
-	no_branch_d 	bv:d 0x1
-
-	set_cc          0x00		; condition codes are irrelevent
-	no_branch_d 	bv:d 0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/call.cgs b/sim/testsuite/sim/fr30/call.cgs
deleted file mode 100644
index 413840ed350..00000000000
--- a/sim/testsuite/sim/fr30/call.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# fr30 testcase for call @$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global call
-
-	; Test call $Ri
-	mvi_h_gr	0xdeadbeef,r9
-	mvi_h_gr   	#func1,r0
-	set_cc          0x0f		; condition codes shouldn't change
-call1:
-	call		@r0
-	test_h_gr	0xbeefdead,r9
-	pass
-
-func1:
-	test_cc		1 1 1 1
-	mvi_h_gr	#call1,r7
-	inci_h_gr	2,r7
-	testr_h_dr	r7,rp
-	save_rp
-
-	mvi_h_gr   	#func2,r0
-	set_cc          0x0f		; condition codes shouldn't change
-call2:
-	call:d		@r0
-	ldi:8		1,r0		; Must assume this works
-	restore_rp
-	ret
-func2:
-	test_cc		1 1 1 1
-	mvi_h_gr	#call2,r7
-	inci_h_gr	4,r7
-	testr_h_dr	r7,rp
-	testr_h_gr	1,r0
-	save_rp
-
-	set_cc          0x0f		; condition codes shouldn't change
-call3:
-	call		func3
-	restore_rp
-	ret
-func3:
-	test_cc		1 1 1 1
-	mvi_h_gr	#call3,r7
-	inci_h_gr	2,r7
-	testr_h_dr	r7,rp
-	save_rp
-
-	set_cc          0x0f		; condition codes shouldn't change
-call4:
-	call:d		func4
-	ldi:8		1,r0		; Must assume this works
-	restore_rp
-	ret
-func4:
-	test_cc		1 1 1 1
-	mvi_h_gr	#call4,r7
-	inci_h_gr	4,r7
-	testr_h_dr	r7,rp
-	testr_h_gr	1,r0
-	mvi_h_gr	0xbeefdead,r9
-	ret
-
-	fail
diff --git a/sim/testsuite/sim/fr30/cmp.cgs b/sim/testsuite/sim/fr30/cmp.cgs
deleted file mode 100644
index 7bfbbf8f1c9..00000000000
--- a/sim/testsuite/sim/fr30/cmp.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# fr30 testcase for cmp $Rj,$Ri, cmp $u4,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global cmp
-cmp:
-	; Test cmp $Rj,$Ri
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	cmp      	r7,r8
-	test_cc		0 0 0 0
-
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	cmp		r7,r8
-	test_cc		0 0 1 0
-
-	set_cc          0x0b		; Set mask opposite of expected
-	cmp		r8,r8
-	test_cc		0 1 0 0
-
-	mvi_h_gr   	0,r8
-	set_cc          0x06		; Set mask opposite of expected
-	cmp		r7,r8
-	test_cc		1 0 0 1
-
-	; Test cmp $u4,$Ri
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	cmp      	1,r8
-	test_cc		0 0 0 0
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	cmp		1,r8
-	test_cc		0 0 1 0
-
-	mvi_h_gr   	0,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	cmp		0,r8
-	test_cc		0 1 0 0
-
-	set_cc          0x06		; Set mask opposite of expected
-	cmp		15,r8
-	test_cc		1 0 0 1
-
-	pass
diff --git a/sim/testsuite/sim/fr30/cmp2.cgs b/sim/testsuite/sim/fr30/cmp2.cgs
deleted file mode 100644
index 7ba62013cad..00000000000
--- a/sim/testsuite/sim/fr30/cmp2.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# fr30 testcase for cmp2 $u4,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global cmp2
-cmp2:
-	; Test cmp2 $u4,$Ri
-	mvi_h_gr   	2,r8
-	set_cc          0x0e		; Set mask opposite of expected
-	cmp2      	-1,r8
-	test_cc		0 0 0 1
-
-	mvi_h_gr   	0x7ffffffe,r8
-	set_cc          0x04		; Set mask opposite of expected
-	cmp2		-2,r8
-	test_cc		1 0 1 1
-
-	mvi_h_gr   	-16,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	cmp2		-16,r8
-	test_cc		0 1 0 0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/copld.cgs b/sim/testsuite/sim/fr30/copld.cgs
deleted file mode 100644
index e0ababb0e85..00000000000
--- a/sim/testsuite/sim/fr30/copld.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# fr30 testcase for copld $u4,$cc,$Rj,CRi
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global copld
-copld:
-	; Test copld copld $u4,$cc,$Rj,CRi
-	; The current implementation is a noop
-	set_cc          0x0f		; Condition codes are irrelevent
-	copld      	0,0,r0,cr15
-	test_cc		1 1 1 1
-
-	set_cc          0x0e		; Condition codes are irrelevent
-	copld      	15,255,r15,cr0
-	test_cc		1 1 1 0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/copop.cgs b/sim/testsuite/sim/fr30/copop.cgs
deleted file mode 100644
index b0afd77005b..00000000000
--- a/sim/testsuite/sim/fr30/copop.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# fr30 testcase for copop $u4,$cc,$CRj,CRi
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global copop
-copop:
-	; Test copop copop $u4,$cc,$CRj,CRi
-	; The current implementation is a noop
-	set_cc          0x0f		; Condition codes are irrelevent
-	copop      	0,0,cr0,cr15
-	test_cc		1 1 1 1
-
-	set_cc          0x0e		; Condition codes are irrelevent
-	copop      	15,255,cr0,cr15
-	test_cc		1 1 1 0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/copst.cgs b/sim/testsuite/sim/fr30/copst.cgs
deleted file mode 100644
index 00120b2096c..00000000000
--- a/sim/testsuite/sim/fr30/copst.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# fr30 testcase for copst $u4,$cc,$CRj,Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global copst
-copst:
-	; Test copst copst $u4,$cc,$CRj,Ri
-	; The current implementation is a noop
-	set_cc          0x0f		; Condition codes are irrelevent
-	copst      	0,0,cr0,r15
-	test_cc		1 1 1 1
-
-	set_cc          0x0e		; Condition codes are irrelevent
-	copst      	15,255,cr15,r0
-	test_cc		1 1 1 0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/copsv.cgs b/sim/testsuite/sim/fr30/copsv.cgs
deleted file mode 100644
index e00a4f5315c..00000000000
--- a/sim/testsuite/sim/fr30/copsv.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# fr30 testcase for copsv $u4,$cc,$CRj,Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global copsv
-copsv:
-	; Test copsv copsv $u4,$cc,$CRj,Ri
-	; The current implementation is a noop
-	set_cc          0x0f		; Condition codes are irrelevent
-	copsv      	0,0,cr0,r15
-	test_cc		1 1 1 1
-
-	set_cc          0x0e		; Condition codes are irrelevent
-	copsv      	15,255,cr15,r0
-	test_cc		1 1 1 0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/div.ms b/sim/testsuite/sim/fr30/div.ms
deleted file mode 100644
index 7e3aaf20ae0..00000000000
--- a/sim/testsuite/sim/fr30/div.ms
+++ /dev/null
@@ -1,176 +0,0 @@
-# fr30 testcase for division
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global div
-div:
-	; simple division 12 / 3
-	mvi_h_gr   	0x00000003,r2
-	mvi_h_dr   	0xdeadbeef,mdh
-	mvi_h_dr   	0x0000000c,mdl
-	div0s      	r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div2            r2
-	div3
-	div4s
-	test_h_gr  	0x00000003,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x00000004,mdl
-	test_dbits	0x0
-
-	; example 1 from div0s the manual
-	mvi_h_gr   	0x01234567,r2
-	mvi_h_dr   	0xdeadbeef,mdh
-	mvi_h_dr   	0xfedcba98,mdl
-	div0s      	r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div2            r2
-	div3
-	div4s
-	test_h_gr  	0x01234567,r2
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0xffffffff,mdl
-	test_dbits	0x3
-
-	; example 2 from div0s the manual
-	mvi_h_dr   	0xdeadbeef,mdh
-	mvi_h_dr   	0xfedcba98,mdl
-	mvi_h_gr   	0x1234567,r2
-	mvi_h_gr   	1,r0
-	mvi_h_gr   	32,r1
-	div0s      	r2
-loop1:	sub		r0,r1
-	bne:d		loop1
-	div1		r2
-	div2		r2
-	div3
-	div4s
-	test_h_gr  	0x01234567,r2
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0xffffffff,mdl
-	test_dbits	0x3
-
-	; example 1 from div0u in the manual
-	mvi_h_gr   	0x01234567,r2
-	mvi_h_dr   	0xdeadbeef,mdh
-	mvi_h_dr   	0xfedcba98,mdl
-	div0u      	r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	div1		r2
-	test_h_gr  	0x01234567,r2
-	test_h_dr  	0x00000078,mdh
-	test_h_dr  	0x000000e0,mdl
-	test_dbits	0x0
-
-	; example 2 from div0u in the manual
-	mvi_h_dr   	0xdeadbeef,mdh
-	mvi_h_dr   	0xfedcba98,mdl
-	mvi_h_gr   	0x1234567,r2
-	mvi_h_gr   	1,r0
-	mvi_h_gr   	32,r1
-	div0u      	r2
-loop2:	sub		r0,r1
-	bne:d		loop2
-	div1		r2
-	test_h_gr  	0x01234567,r2
-	test_h_dr  	0x00000078,mdh
-	test_h_dr  	0x000000e0,mdl
-	test_dbits	0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/div0s.cgs b/sim/testsuite/sim/fr30/div0s.cgs
deleted file mode 100644
index 84d76c4bfb9..00000000000
--- a/sim/testsuite/sim/fr30/div0s.cgs
+++ /dev/null
@@ -1,64 +0,0 @@
-# fr30 testcase for div0s $Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global div0s
-div0s:
-	; Test div0s $Rj,$Ri
-	; example from the manual - negative dividend
-	mvi_h_gr   	0x0fffffff,r2
-	mvi_h_dr   	0x00000000,mdh
-	mvi_h_dr   	0xfffffff0,mdl
-	set_dbits	0x0		; Set opposite of expected
-	set_cc          0x0f		; Condition codes should not change
-	div0s      	r2
-	test_cc		1 1 1 1
-	test_h_gr  	0x0fffffff,r2
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0xfffffff0,mdl
-	test_dbits	0x3
-
-	; negative divisor
-	mvi_h_gr   	0xffffffff,r2
-	mvi_h_dr   	0xffffffff,mdh
-	mvi_h_dr   	0x7fffffff,mdl
-	set_dbits	0x1		; Set opposite of expected
-	set_cc          0x0f		; Condition codes should not change
-	div0s      	r2
-	test_cc		1 1 1 1
-	test_h_gr  	0xffffffff,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x7fffffff,mdl
-	test_dbits	0x2
-
-	; Both sign bits 0
-	mvi_h_gr   	0x0fffffff,r2
-	mvi_h_dr   	0xffffffff,mdh
-	mvi_h_dr   	0x7ffffff0,mdl
-	set_dbits	0x3		; Set opposite of expected
-	set_cc          0x0f		; Condition codes should not change
-	div0s      	r2
-	test_cc		1 1 1 1
-	test_h_gr  	0x0fffffff,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x7ffffff0,mdl
-	test_dbits	0x0
-
-	; Both sign bits 1
-	mvi_h_gr   	0xffffffff,r2
-	mvi_h_dr   	0x00000000,mdh
-	mvi_h_dr   	0xffffffff,mdl
-	set_dbits	0x2		; Set opposite of expected
-	set_cc          0x0f		; Condition codes should not change
-	div0s      	r2
-	test_cc		1 1 1 1
-	test_h_gr  	0xffffffff,r2
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0xffffffff,mdl
-	test_dbits	0x1
-
-	pass
diff --git a/sim/testsuite/sim/fr30/div0u.cgs b/sim/testsuite/sim/fr30/div0u.cgs
deleted file mode 100644
index 8fd84a6c22b..00000000000
--- a/sim/testsuite/sim/fr30/div0u.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# fr30 testcase for div0u $Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global div0u
-div0u:
-	; Test div0u $Rj,$Ri
-	; operand register has no effect
-	mvi_h_gr   	0xdeadbeef,r2
-	mvi_h_dr   	0xdeadbeef,mdh
-	mvi_h_dr   	0x0ffffff0,mdl
-	set_dbits	0x3		; Set opposite of expected
-	set_cc          0x0f		; Condition codes should not change
-	div0u      	r2
-	test_cc		1 1 1 1
-	test_h_gr  	0xdeadbeef,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x0ffffff0,mdl
-	test_dbits	0x0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/div1.cgs b/sim/testsuite/sim/fr30/div1.cgs
deleted file mode 100644
index dac35fe15c4..00000000000
--- a/sim/testsuite/sim/fr30/div1.cgs
+++ /dev/null
@@ -1,113 +0,0 @@
-# fr30 testcase for div1 $Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global div1
-div1:
-	; Test div1 $Ri
-	; example from the manual -- all status bits 0
-	mvi_h_gr   	0x00ffffff,r2
-	mvi_h_dr   	0x00ffffff,mdh
-	mvi_h_dr   	0x00000000,mdl
-	set_dbits	0x0
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 0 0 0
-	test_dbits	0x0
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00ffffff,mdh	; misprinted in manual?
-	test_h_dr  	0x00000001,mdl
-
-	; D0 == 1
-	set_dbits	0x1
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 0 0 0
-	test_dbits	0x1
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x01fffffe,mdh
-	test_h_dr  	0x00000002,mdl
-
-	; D1 == 1
-	set_dbits	0x2
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 0 0 0
-	test_dbits	0x2
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x03fffffc,mdh
-	test_h_dr  	0x00000004,mdl
-
-	; D0 == 1, D1 == 1
-	set_dbits	0x3
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 0 0 0
-	test_dbits	0x3
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x08fffff7,mdh
-	test_h_dr  	0x00000009,mdl
-
-	; C == 1
-	mvi_h_gr  	0x11ffffef,r2
-	set_dbits	0x0
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 0 0 1
-	test_dbits	0x0
-	test_h_gr  	0x11ffffef,r2
-	test_h_dr  	0x11ffffee,mdh
-	test_h_dr  	0x00000012,mdl
-
-	; D0 == 1, C == 1
-	mvi_h_gr  	0x23ffffdd,r2
-	set_dbits	0x1
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 0 0 1
-	test_dbits	0x1
-	test_h_gr  	0x23ffffdd,r2
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0x00000025,mdl
-
-	; D1 == 1, C == 1
-	mvi_h_gr  	0x00000003,r2
-	set_dbits	0x2
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 0 0 1
-	test_dbits	0x2
-	test_h_gr  	0x00000003,r2
-	test_h_dr  	0x00000001,mdh
-	test_h_dr  	0x0000004b,mdl
-
-	; D0 == 1, D1 == 1, C == 1
-	mvi_h_gr  	0xfffffffe,r2
-	set_dbits	0x3
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 0 0 1
-	test_dbits	0x3
-	test_h_gr  	0xfffffffe,r2
-	test_h_dr  	0x00000002,mdh
-	test_h_dr  	0x00000096,mdl
-
-	; remainder is zero
-	mvi_h_gr  	0x00000004,r2
-	set_dbits	0x0
-	set_cc          0x00
-	div1      	r2
-	test_cc		0 1 0 0
-	test_dbits	0x0
-	test_h_gr  	0x00000004,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x0000012d,mdl
-
-	pass
-
-
-
diff --git a/sim/testsuite/sim/fr30/div2.cgs b/sim/testsuite/sim/fr30/div2.cgs
deleted file mode 100644
index 03000a24242..00000000000
--- a/sim/testsuite/sim/fr30/div2.cgs
+++ /dev/null
@@ -1,120 +0,0 @@
-# fr30 testcase for div2 $Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global div2
-div2:
-	; Test div2 $Ri
-	; example from the manual -- all status bits 0
-	mvi_h_gr   	0x00ffffff,r2
-	mvi_h_dr   	0x00ffffff,mdh
-	mvi_h_dr   	0x0000000f,mdl
-	set_dbits	0x0
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 1 0 0
-	test_dbits	0x0
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	; D0 == 1
-	mvi_h_dr   	0x00ffffff,mdh
-	set_dbits	0x1
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 1 0 0
-	test_dbits	0x1
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	; D1 == 1
-	mvi_h_dr   	0x00ffffff,mdh
-	set_dbits	0x2
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 0 0 0
-	test_dbits	0x2
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00ffffff,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	; D0 == 1, D1 == 1
-	set_dbits	0x3
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 0 0 0
-	test_dbits	0x3
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00ffffff,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	; C == 1
-	mvi_h_dr   	0x11ffffee,mdh
-	mvi_h_gr  	0x11ffffef,r2
-	set_dbits	0x0
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 0 0 1
-	test_dbits	0x0
-	test_h_gr  	0x11ffffef,r2
-	test_h_dr  	0x11ffffee,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	; D0 == 1, C == 1
-	mvi_h_dr   	0x23ffffdc,mdh
-	mvi_h_gr  	0x23ffffdd,r2
-	set_dbits	0x1
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 0 0 1
-	test_dbits	0x1
-	test_h_gr  	0x23ffffdd,r2
-	test_h_dr  	0x23ffffdc,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	; D1 == 1, C == 1
-	mvi_h_dr   	0xfffffffd,mdh
-	mvi_h_gr  	0x00000004,r2
-	set_dbits	0x2
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 0 0 1
-	test_dbits	0x2
-	test_h_gr  	0x00000004,r2
-	test_h_dr  	0xfffffffd,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	; D0 == 1, D1 == 1, C == 1
-	mvi_h_dr   	0x00000002,mdh
-	mvi_h_gr  	0xffffffff,r2
-	set_dbits	0x3
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 0 0 1
-	test_dbits	0x3
-	test_h_gr  	0xffffffff,r2
-	test_h_dr  	0x00000002,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	; remainder is zero
-	mvi_h_dr   	0x00000004,mdh
-	mvi_h_gr  	0x00000004,r2
-	set_dbits	0x0
-	set_cc          0x00
-	div2      	r2
-	test_cc		0 1 0 0
-	test_dbits	0x0
-	test_h_gr  	0x00000004,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x0000000f,mdl
-
-	pass
-
-
-
diff --git a/sim/testsuite/sim/fr30/div3.cgs b/sim/testsuite/sim/fr30/div3.cgs
deleted file mode 100644
index ee7da1a8042..00000000000
--- a/sim/testsuite/sim/fr30/div3.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# fr30 testcase for div3
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global div3
-div3:
-	; Test div3
-	; example from the manual
-	mvi_h_gr   	0x00ffffff,r2
-	mvi_h_dr   	0x00000000,mdh
-	mvi_h_dr   	0x0000000f,mdl
-	set_dbits	0x0
-	set_cc          0x04
-	div3
-	test_cc		0 1 0 0
-	test_dbits	0x0
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x00000010,mdl
-
-	set_dbits	0x0
-	set_cc          0x00
-	div3
-	test_cc		0 0 0 0
-	test_dbits	0x0
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0x00000010,mdl
-
-	pass
diff --git a/sim/testsuite/sim/fr30/div4s.cgs b/sim/testsuite/sim/fr30/div4s.cgs
deleted file mode 100644
index 3b98ecaf1c3..00000000000
--- a/sim/testsuite/sim/fr30/div4s.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# fr30 testcase for div4s
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global div4s
-div4s:
-	; Test div4s
-	; example from the manual
-	mvi_h_gr   	0x00ffffff,r2
-	mvi_h_dr   	0x00000000,mdh
-	mvi_h_dr   	0x0000000f,mdl
-	set_dbits	0x3
-	set_cc          0x0f
-	div4s
-	test_cc		1 1 1 1
-	test_dbits	0x3
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0xfffffff1,mdl
-
-	set_dbits	0x0
-	set_cc          0x00
-	div4s
-	test_cc		0 0 0 0
-	test_dbits	0x0
-	test_h_gr  	0x00ffffff,r2
-	test_h_dr  	0x00000000,mdh
-	test_h_dr  	0xfffffff1,mdl
-
-	pass
diff --git a/sim/testsuite/sim/fr30/dmov.cgs b/sim/testsuite/sim/fr30/dmov.cgs
deleted file mode 100644
index bd2e5cc45ff..00000000000
--- a/sim/testsuite/sim/fr30/dmov.cgs
+++ /dev/null
@@ -1,73 +0,0 @@
-# fr30 testcase for dmov
-# mach(): fr30
-
-	.include "testutils.inc"
-	START
-
-	.text
-	.global dmov
-dmov:
-	; Test dmov @$dir10,$R13
-	mvi_h_gr	0xdeadbeef,r1
-	mvi_h_gr	0x200,r2
-	mvr_h_mem	r1,r2
-	set_cc          0x0f		; Condition codes shouldn't change
-	dmov		@0x200,r13
-	test_cc		1 1 1 1
-	test_h_gr	0xdeadbeef,r13
-
-	; Test dmov $R13,@$dir10
-	mvi_h_gr	0xbeefdead,r13
-	set_cc          0x0e		; Condition codes shouldn't change
-	dmov		r13,@0x200
-	test_cc		1 1 1 0
-	test_h_mem	0xbeefdead,r2
-
-	; Test dmov @$dir10,@R13+
-	mvi_h_gr	0x1fc,r13
-	set_cc          0x0d		; Condition codes shouldn't change
-	dmov		@0x200,@r13+
-	test_cc		1 1 0 1
-	mvi_h_gr	0x1fc,r2
-	test_h_mem	0xbeefdead,r2
-	inci_h_gr	4,r2
-	test_h_mem	0xbeefdead,r2
-	test_h_gr	0x200,r13
-
-	; Test dmov @$R13+,@$dir10
-	mvi_h_gr	0x1fc,r13
-	mvi_h_mem	0xdeadbeef,r13
-	set_cc          0x0c		; Condition codes shouldn't change
-	dmov		@r13+,@0x200
-	test_cc		1 1 0 0
-	mvi_h_gr	0x1fc,r2
-	test_h_mem	0xdeadbeef,r2
-	inci_h_gr	4,r2
-	test_h_mem	0xdeadbeef,r2
-	test_h_gr	0x200,r13
-
-	; Test dmov @$dir10,@-R15
-	mvi_h_gr	0x200,r15
-	mvi_h_mem	0xdeadbeef,r15
-	set_cc          0x0b		; Condition codes shouldn't change
-	dmov		@0x200,@-r15
-	test_cc		1 0 1 1
-	mvi_h_gr	0x1fc,r2
-	test_h_mem	0xdeadbeef,r2
-	inci_h_gr	4,r2
-	test_h_mem	0xdeadbeef,r2
-	test_h_gr	0x1fc,r15
-
-	; Test dmov @$R15+,@$dir10
-	mvi_h_gr	0x1fc,r15
-	mvi_h_mem	0xbeefdead,r15
-	set_cc          0x0a		; Condition codes shouldn't change
-	dmov		@r15+,@0x200
-	test_cc		1 0 1 0
-	mvi_h_gr	0x1fc,r2
-	test_h_mem	0xbeefdead,r2
-	inci_h_gr	4,r2
-	test_h_mem	0xbeefdead,r2
-	test_h_gr	0x200,r15
-
-	pass
diff --git a/sim/testsuite/sim/fr30/dmovb.cgs b/sim/testsuite/sim/fr30/dmovb.cgs
deleted file mode 100644
index 96cfb9d3e08..00000000000
--- a/sim/testsuite/sim/fr30/dmovb.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# fr30 testcase for dmovb
-# mach(): fr30
-
-	.include "testutils.inc"
-	START
-
-	.text
-	.global dmovb
-dmovb:
-	; Test dmovb @$dir8,$R13
-	mvi_h_gr	0xdeadbeef,r1
-	mvi_h_gr	0x80,r2
-	mvr_h_mem	r1,r2
-	set_cc          0x0f		; Condition codes shouldn't change
-	dmovb		@0x80,r13
-	test_cc		1 1 1 1
-	test_h_gr	0xffffffde,r13
-
-	; Test dmovb $R13,@$dir8
-	mvi_h_gr	0xbeefdead,r13
-	set_cc          0x0e		; Condition codes shouldn't change
-	dmovb		r13,@0x80
-	test_cc		1 1 1 0
-	test_h_mem	0xadadbeef,r2
-
-	; Test dmovb @$dir8,@R13+
-	mvi_h_gr	0x7c,r13
-	mvi_h_mem	0xdeadbeef,r13
-	set_cc          0x0d		; Condition codes shouldn't change
-	dmovb		@0x7f,@r13+
-	test_cc		1 1 0 1
-	mvi_h_gr	0x7c,r2
-	test_h_mem	0xefadbeef,r2
-	test_h_gr	0x7d,r13
-
-	; Test dmovb @$R13+,@$dir8
-	mvi_h_gr	0x7c,r13
-	mvi_h_mem	0xbeefdead,r13
-	set_cc          0x0c		; Condition codes shouldn't change
-	dmovb		@r13+,@0x7f
-	test_cc		1 1 0 0
-	mvi_h_gr	0x7c,r2
-	test_h_mem	0xbeefdebe,r2
-	test_h_gr	0x7d,r13
-
-	pass
diff --git a/sim/testsuite/sim/fr30/dmovh.cgs b/sim/testsuite/sim/fr30/dmovh.cgs
deleted file mode 100644
index 86afb44f411..00000000000
--- a/sim/testsuite/sim/fr30/dmovh.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# fr30 testcase for dmovh
-# mach(): fr30
-
-	.include "testutils.inc"
-	START
-
-	.text
-	.global dmovh
-dmovh:
-	; Test dmovh @$dir9,$R13
-	mvi_h_gr	0xdeadbeef,r1
-	mvi_h_gr	0x100,r2
-	mvr_h_mem	r1,r2
-	set_cc          0x0f		; Condition codes shouldn't change
-	dmovh		@0x100,r13
-	test_cc		1 1 1 1
-	test_h_gr	0xffffdead,r13
-
-	; Test dmovh $R13,@$dir9
-	mvi_h_gr	0xdeadbeef,r13
-	set_cc          0x0e		; Condition codes shouldn't change
-	dmovh		r13,@0x100
-	test_cc		1 1 1 0
-	test_h_mem	0xbeefbeef,r2
-
-	; Test dmovh @$dir9,@R13+
-	mvi_h_gr	0x1fc,r13
-	mvi_h_mem	0xdeadbeef,r13
-	set_cc          0x0d		; Condition codes shouldn't change
-	dmovh		@0x1fe,@r13+
-	test_cc		1 1 0 1
-	mvi_h_gr	0x1fc,r2
-	test_h_mem	0xbeefbeef,r2
-	test_h_gr	0x1fe,r13
-
-	; Test dmovh @$R13+,@$dir9
-	mvi_h_gr	0x1fc,r13
-	mvi_h_mem	0xbeefdead,r13
-	set_cc          0x0c		; Condition codes shouldn't change
-	dmovh		@r13+,@0x1fe
-	test_cc		1 1 0 0
-	mvi_h_gr	0x1fc,r2
-	test_h_mem	0xbeefbeef,r2
-	test_h_gr	0x1fe,r13
-
-	pass
diff --git a/sim/testsuite/sim/fr30/enter.cgs b/sim/testsuite/sim/fr30/enter.cgs
deleted file mode 100644
index ae75e16a2e1..00000000000
--- a/sim/testsuite/sim/fr30/enter.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# fr30 testcase for enter $u10
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global enter
-enter:
-	; Test enter $u10
-	mvr_h_gr   	sp,r7			; save stack pointer
-	mvr_h_gr	sp,r8			; shadow stack pointer
-	mvr_h_gr	sp,r14		; Initialize
-	set_cc	0x0f			; Condition codes are irrelevent
-	enter      	0
-	test_cc	1 1 1 1
-	testr_h_gr 	r8,sp
-	inci_h_gr	-4,r8
-	testr_h_gr	r14,r8
-	testr_h_mem	r7,r14
-
-	mvr_h_gr	sp,r8			; shadow stack pointer
-	mvr_h_gr	r14,r9		; save
-	set_cc	0x0e			; Condition codes are irrelevent
-	enter      	0x3fc
-	test_cc	1 1 1 0
-	inci_h_gr	-4,r8
-	testr_h_gr	r14,r8
-	testr_h_mem	r9,r14
-	inci_h_gr	-0x3f8,r8
-	testr_h_gr 	r8,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/eor.cgs b/sim/testsuite/sim/fr30/eor.cgs
deleted file mode 100644
index a87076151cf..00000000000
--- a/sim/testsuite/sim/fr30/eor.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# fr30 testcase for eor $Rj,$Ri, eor $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global eor
-eor:
-	; Test eor $Rj,$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_gr   	0x55555555,r8
-	set_cc          0x07		; Set mask opposite of expected
-	eor      	r7,r8
-	test_cc		1 0 1 1
-	test_h_gr  	0xffffffff,r8
-
-	mvi_h_gr   	0x00000000,r7
-	mvi_h_gr   	0x00000000,r8
-	set_cc          0x08		; Set mask opposite of expected
-	eor		r7,r8
-	test_cc		0 1 0 0
-	test_h_gr  	0x00000000,r8
-
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_gr   	0xaaaaaaaa,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	eor      	r7,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	mvi_h_gr   	0xdead0000,r7
-	mvi_h_gr   	0x0000beef,r8
-	set_cc          0x05		; Set mask opposite of expected
-	eor		r7,r8
-	test_cc		1 0 0 1
-	test_h_gr  	0xdeadbeef,r8
-
-	; Test eor $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x07		; Set mask opposite of expected
-	eor      	r7,@sp
-	test_cc		1 0 1 1
-	test_h_mem 	0xffffffff,sp
-
-	mvi_h_gr   	0x00000000,r7
-	mvi_h_mem  	0x00000000,sp
-	set_cc          0x08		; Set mask opposite of expected
-	eor		r7,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0x00000000,sp
-
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0xaaaaaaaa,sp
-	set_cc          0x0b		; Set mask opposite of expected
-	eor      	r7,@sp
-	test_cc		0 1 1 1
-	test_h_mem 	0x00000000,sp
-
-	mvi_h_gr   	0xdead0000,r7
-	mvi_h_mem  	0x0000beef,sp
-	set_cc          0x05		; Set mask opposite of expected
-	eor		r7,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/eorb.cgs b/sim/testsuite/sim/fr30/eorb.cgs
deleted file mode 100644
index 540f3f7aa1f..00000000000
--- a/sim/testsuite/sim/fr30/eorb.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# fr30 testcase for eorb $Rj,$Ri, eorb $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global eorb
-eorb:
-	; Test eorb $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x07		; Set mask opposite of expected
-	eorb      	r7,@sp
-	test_cc		1 0 1 1
-	test_h_mem 	0xff555555,sp
-
-	mvi_h_gr   	0xaaaaaa00,r7
-	mvi_h_mem  	0x00555555,sp
-	set_cc          0x08		; Set mask opposite of expected
-	eorb		r7,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0x00555555,sp
-
-	mvi_h_gr   	0xaaaaaa55,r7
-	mvi_h_mem  	0x55aaaaaa,sp
-	set_cc          0x0b		; Set mask opposite of expected
-	eorb      	r7,@sp
-	test_cc		0 1 1 1
-	test_h_mem 	0x00aaaaaa,sp
-
-	mvi_h_gr   	0x000000d0,r7
-	mvi_h_mem  	0x0eadbeef,sp
-	set_cc          0x05		; Set mask opposite of expected
-	eorb		r7,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/eorh.cgs b/sim/testsuite/sim/fr30/eorh.cgs
deleted file mode 100644
index 7cf84735959..00000000000
--- a/sim/testsuite/sim/fr30/eorh.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# fr30 testcase for eorh $Rj,$Ri, eorh $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global eorh
-eorh:
-	; Test eorh $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x07		; Set mask opposite of expected
-	eorh      	r7,@sp
-	test_cc		1 0 1 1
-	test_h_mem 	0xffff5555,sp
-
-	mvi_h_gr   	0xaaaa0000,r7
-	mvi_h_mem  	0x00005555,sp
-	set_cc          0x08		; Set mask opposite of expected
-	eorh		r7,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0x00005555,sp
-
-	mvi_h_gr   	0xaaaa5555,r7
-	mvi_h_mem  	0x5555aaaa,sp
-	set_cc          0x0b		; Set mask opposite of expected
-	eorh      	r7,@sp
-	test_cc		0 1 1 1
-	test_h_mem 	0x0000aaaa,sp
-
-	mvi_h_gr   	0x0000de00,r7
-	mvi_h_mem  	0x00adbeef,sp
-	set_cc          0x05		; Set mask opposite of expected
-	eorh		r7,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/extsb.cgs b/sim/testsuite/sim/fr30/extsb.cgs
deleted file mode 100644
index 6a18d7e7dae..00000000000
--- a/sim/testsuite/sim/fr30/extsb.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for extsb $Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global extsb
-extsb:
-	; Test extsb $Ri
-	mvi_h_gr   	0,r7
-	set_cc          0x0f		; Condition codes are irrelevent
-	extsb      	r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_gr   	0x7f,r7
-	set_cc          0x0e		; Condition codes are irrelevent
-	extsb      	r7
-	test_cc		1 1 1 0
-	test_h_gr  	0x7f,r7
-
- 	mvi_h_gr   	0x80,r7
-	set_cc          0x0d		; Condition codes are irrelevent
-	extsb      	r7
-	test_cc		1 1 0 1
-	test_h_gr  	0xffffff80,r7
-
-	mvi_h_gr   	0xffffff7f,r7
-	set_cc          0x0c		; Condition codes are irrelevent
-	extsb      	r7
-	test_cc		1 1 0 0
-	test_h_gr  	0x7f,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/extsh.cgs b/sim/testsuite/sim/fr30/extsh.cgs
deleted file mode 100644
index eb12fd0aae8..00000000000
--- a/sim/testsuite/sim/fr30/extsh.cgs
+++ /dev/null
@@ -1,48 +0,0 @@
-# fr30 testcase for extsh $Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global extsh
-extsh:
-	; Test extsh $Ri
-	mvi_h_gr   	0,r7
-	set_cc          0x0f		; Condition codes are irrelevent
-	extsh      	r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_gr   	0x7f,r7
-	set_cc          0x0e		; Condition codes are irrelevent
-	extsh      	r7
-	test_cc		1 1 1 0
-	test_h_gr  	0x7f,r7
-
- 	mvi_h_gr   	0x80,r7
-	set_cc          0x0d		; Condition codes are irrelevent
-	extsh      	r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x80,r7
-
- 	mvi_h_gr   	0x7fff,r7
-	set_cc          0x0c		; Condition codes are irrelevent
-	extsh      	r7
-	test_cc		1 1 0 0
-	test_h_gr  	0x7fff,r7
-
- 	mvi_h_gr   	0x8000,r7
-	set_cc          0x0b		; Condition codes are irrelevent
-	extsh      	r7
-	test_cc		1 0 1 1
-	test_h_gr  	0xffff8000,r7
-
-	mvi_h_gr   	0xffff7fff,r7
-	set_cc          0x0a		; Condition codes are irrelevent
-	extsh      	r7
-	test_cc		1 0 1 0
-	test_h_gr  	0x7fff,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/extub.cgs b/sim/testsuite/sim/fr30/extub.cgs
deleted file mode 100644
index ddcc68361cc..00000000000
--- a/sim/testsuite/sim/fr30/extub.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# fr30 testcase for extub $Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global extub
-extub:
-	; Test extub $Ri
-	mvi_h_gr   	0,r7
-	set_cc          0x0f		; Condition codes are irrelevent
-	extub      	r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_gr   	0x7f,r7
-	set_cc          0x0e		; Condition codes are irrelevent
-	extub      	r7
-	test_cc		1 1 1 0
-	test_h_gr  	0x7f,r7
-
- 	mvi_h_gr   	0x80,r7
-	set_cc          0x0d		; Condition codes are irrelevent
-	extub      	r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x80,r7
-
-	mvi_h_gr   	0xffffff7f,r7
-	set_cc          0x0c		; Condition codes are irrelevent
-	extub      	r7
-	test_cc		1 1 0 0
-	test_h_gr  	0x7f,r7
-
-	mvi_h_gr   	0xffffff80,r7
-	set_cc          0x0b		; Condition codes are irrelevent
-	extub      	r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x80,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/extuh.cgs b/sim/testsuite/sim/fr30/extuh.cgs
deleted file mode 100644
index fa2579e469f..00000000000
--- a/sim/testsuite/sim/fr30/extuh.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# fr30 testcase for extuh $Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global extuh
-extuh:
-	; Test extuh $Ri
-	mvi_h_gr   	0,r7
-	set_cc          0x0f		; Condition codes are irrelevent
-	extuh      	r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_gr   	0x7f,r7
-	set_cc          0x0e		; Condition codes are irrelevent
-	extuh      	r7
-	test_cc		1 1 1 0
-	test_h_gr  	0x7f,r7
-
- 	mvi_h_gr   	0x80,r7
-	set_cc          0x0d		; Condition codes are irrelevent
-	extuh      	r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x80,r7
-
-	mvi_h_gr   	0x7fff,r7
-	set_cc          0x0e		; Condition codes are irrelevent
-	extuh      	r7
-	test_cc		1 1 1 0
-	test_h_gr  	0x7fff,r7
-
- 	mvi_h_gr   	0x8000,r7
-	set_cc          0x0d		; Condition codes are irrelevent
-	extuh      	r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x8000,r7
-
-	mvi_h_gr   	0xffff7fff,r7
-	set_cc          0x0c		; Condition codes are irrelevent
-	extuh      	r7
-	test_cc		1 1 0 0
-	test_h_gr  	0x7fff,r7
-
-	mvi_h_gr   	0xffff8000,r7
-	set_cc          0x0b		; Condition codes are irrelevent
-	extuh      	r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x8000,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/hello.ms b/sim/testsuite/sim/fr30/hello.ms
deleted file mode 100644
index 0f208dfb927..00000000000
--- a/sim/testsuite/sim/fr30/hello.ms
+++ /dev/null
@@ -1,19 +0,0 @@
-# mach: fr30
-# output: Hello world!\n
-
-	.global _start
-_start:
-
-; write (hello world)
-	ldi32 #14,r6
-	ldi32 #hello,r5
-	ldi32 #1,r4
-	ldi32 #5,r0
-	int   #10
-; exit (0)
-	ldi32 #0,r4
-	ldi32 #1,r0
-	int   #10
-
-length:	.long 14
-hello:	.ascii "Hello world!\r\n"
diff --git a/sim/testsuite/sim/fr30/int.cgs b/sim/testsuite/sim/fr30/int.cgs
deleted file mode 100644
index 7cdca7b8c9b..00000000000
--- a/sim/testsuite/sim/fr30/int.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# fr30 testcase for int $u8
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global int
-int:
-	; Test int $u8 - setup and test an interrupt #0xfd (randomly chosen)
-	mvr_h_gr   	tbr,r7
-	inci_h_gr	8,r7
-	mvi_h_mem	pass,r7
-	mvi_h_gr	doint,r9
-	inci_h_gr	2,r9
-	mvr_h_gr	ssp,r10
-	set_cc          0x0f		; Condition codes should not change
-	set_s_user			; Set opposite of expected
-	set_i		1		; Set opposite of expected
-	mvr_h_gr	ps,r8
-doint:	int		0xfd
-	fail
-
-pass:
-	test_cc		1 1 1 1
-	test_s_system
-	test_i		0
-	inci_h_gr	-4,r10
-	testr_h_mem	r8,r10
-	inci_h_gr	-4,r10
-	testr_h_mem	r9,r10
-	testr_h_dr	r10,ssp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/inte.cgs b/sim/testsuite/sim/fr30/inte.cgs
deleted file mode 100644
index a15bfd978a2..00000000000
--- a/sim/testsuite/sim/fr30/inte.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for inte
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global inte
-inte:
-	; Test inte which is essentially int #9
-	mvr_h_gr   	tbr,r7
-	inci_h_gr	0x3d8,r7
-	mvi_h_mem	pass,r7
-	mvi_h_gr	doint,r9
-	inci_h_gr	2,r9
-	mvr_h_gr	ssp,r10
-	set_cc          0x0f		; Condition codes should not change
-	set_s_user			; Set opposite of expected
-	set_i		1		; Should not change
-	mvr_h_gr	ps,r8
-doint:	inte
-	fail
-
-pass:
-	test_cc		1 1 1 1
-	test_ilm	4
-	test_s_system
-	test_i		1
-	inci_h_gr	-4,r10
-	testr_h_mem	r8,r10
-	inci_h_gr	-4,r10
-	testr_h_mem	r9,r10
-	testr_h_dr	r10,ssp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/jmp.cgs b/sim/testsuite/sim/fr30/jmp.cgs
deleted file mode 100644
index db4af220d36..00000000000
--- a/sim/testsuite/sim/fr30/jmp.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# fr30 testcase for jmp @$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global jmp
-
-	; Test jmp $Ri
-	mvi_h_gr   	#func1,r0
-	set_cc          0x0f		; condition codes shouldn't change
-jmp1:
-	jmp		@r0
-	fail
-func1:
-	test_cc		1 1 1 1
-	mvi_h_gr   	#func2,r0
-	set_cc          0x0f		; condition codes shouldn't change
-jmp2:
-	jmp:d		@r0
-	ldi:8		1,r0		; Must assume this works
-	fail
-func2:
-	test_cc		1 1 1 1
-	testr_h_gr	1,r0
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ld.cgs b/sim/testsuite/sim/fr30/ld.cgs
deleted file mode 100644
index 3f2d30bb023..00000000000
--- a/sim/testsuite/sim/fr30/ld.cgs
+++ /dev/null
@@ -1,219 +0,0 @@
-# fr30 testcase for
-# mach(): fr30
-# ld $Rj,$Ri
-# ld @($R13,$Rj),$Ri
-# ld @($R14,$disp10),$Ri
-# ld @($R15,$udisp6),$Ri
-# ld @$R15+,$Ri
-# ld @$R15+,$Rs
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ld
-ld:
-	; Test ld $Rj,$Ri
-	mvi_h_mem	#0x00000000,sp
-	set_cc          0x0f		; condition codes should not change
-	ld		@sp,r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_mem	#0x00000001,sp
-	set_cc          0x07		; condition codes should not change
-	ld    		@sp,r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	mvi_h_mem	#0x7fffffff,sp
-	set_cc          0x0b		; condition codes should not change
-	ld		@sp,r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x7fffffff,r7
-
-	mvi_h_mem	#0x80000000,sp
-	set_cc          0x0d		; condition codes should not change
-	ld      	@sp,r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x80000000,r7
-
-	mvi_h_mem	#0xffffffff,sp
-	set_cc          0x0e		; condition codes should not change
-	ld		@sp,r7
-	test_cc		1 1 1 0
-	test_h_gr  	-1,r7
-
-	; Test ld @($R13,$Rj),$Ri
-	mvr_h_gr	sp,r13
-	inci_h_gr	-8,r13
-	mvi_h_gr	8,r8
-
-	mvi_h_mem	#0x00000000,sp
-	set_cc          0x0f		; condition codes should not change
-	ld		@(r13,r8),r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_mem	#0x00000001,sp
-	set_cc          0x07		; condition codes should not change
-	ld    		@(r13,r8),r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	mvi_h_mem	#0x7fffffff,sp
-	set_cc          0x0b		; condition codes should not change
-	ld		@(r13,r8),r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x7fffffff,r7
-
-	mvi_h_mem	#0x80000000,sp
-	set_cc          0x0d		; condition codes should not change
-	ld      	@(r13,r8),r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x80000000,r7
-
-	mvi_h_mem	#0xffffffff,sp
-	set_cc          0x0e		; condition codes should not change
-	ld		@(r13,r8),r7
-	test_cc		1 1 1 0
-	test_h_gr  	-1,r7
-
-	; Test ld @($R14,$disp10),$Ri
-	mvi_h_mem	#0xdeadbeef,sp
-	mvr_h_gr	sp,r14
-	mvi_h_gr	-0x1fc,r8
-	add_h_gr	r8,r14
-
-	set_cc          0x0f		; condition codes should not change
-	ld		@(r14,0x1fc),r7
-	test_cc		1 1 1 1
-	test_h_gr  	0xdeadbeef,r7
-
-	inci_h_gr	0xfc,r14
-	set_cc          0x07		; condition codes should not change
-	ld    		@(r14,0x100),r7
-	test_cc		0 1 1 1
-	test_h_gr  	0xdeadbeef,r7
-
-	inci_h_gr	0x100,r14
-	set_cc          0x0b		; condition codes should not change
-	ld		@(r14,0x0),r7
-	test_cc		1 0 1 1
-	test_h_gr  	0xdeadbeef,r7
-
-	inci_h_gr	0x100,r14
-	set_cc          0x0d		; condition codes should not change
-	ld      	@(r14,-0x100),r7
-	test_cc		1 1 0 1
-	test_h_gr  	0xdeadbeef,r7
-
-	inci_h_gr	0x100,r14
-	set_cc          0x0e		; condition codes should not change
-	ld		@(r14,-0x200),r7
-	test_cc		1 1 1 0
-	test_h_gr  	0xdeadbeef,r7
-
-	; Test ld @($R15,$udisp6),$Ri
-	mvi_h_mem	#0xdeadbeef,sp
-	mvr_h_gr	sp,r14
-	mvi_h_gr	-0x3c,r8
-	add_h_gr	r8,r14
-
-	set_cc          0x0f		; condition codes should not change
-	ld		@(r14,0x3c),r7
-	test_cc		1 1 1 1
-	test_h_gr  	0xdeadbeef,r7
-
-	inci_h_gr	0x1c,r14
-	set_cc          0x07		; condition codes should not change
-	ld    		@(r14,0x20),r7
-	test_cc		0 1 1 1
-	test_h_gr  	0xdeadbeef,r7
-
-	inci_h_gr	0x20,r14
-	set_cc          0x0b		; condition codes should not change
-	ld		@(r14,0x0),r7
-	test_cc		1 0 1 1
-	test_h_gr  	0xdeadbeef,r7
-
-	; Test ld @$R15+,$Ri
-	mvr_h_gr	sp,r8		; save original stack pointer
-	mvr_h_gr	r8,r9
-	inci_h_gr	4,r9		; original stack pointer + 4
-	mvi_h_mem	#0xdeadbeef,sp	; prime memory
-
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,r7
-	test_cc		1 1 1 1
-	test_h_gr  	0xdeadbeef,r7
-	testr_h_gr	sp,r9		; should have been incremented
-
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,sp
-	test_cc		1 1 1 1
-	test_h_gr  	0xdeadbeef,sp	; should not have been incremented
-
-	; Test ld @$R15+,$Rs
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,tbr
-	test_cc		1 1 1 1
-	test_h_dr  	0xdeadbeef,tbr
-	testr_h_gr	sp,r9		; should have been incremented
-
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,rp
-	test_cc		1 1 1 1
-	test_h_dr  	0xdeadbeef,rp
-	testr_h_gr	sp,r9		; should have been incremented
-
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,mdh
-	test_cc		1 1 1 1
-	test_h_dr  	0xdeadbeef,mdh
-	testr_h_gr	sp,r9		; should have been incremented
-
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,mdl
-	test_cc		1 1 1 1
-	test_h_dr  	0xdeadbeef,mdl
-	testr_h_gr	sp,r9		; should have been incremented
-
-	set_s_user
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,ssp
-	test_cc		1 1 1 1
-	test_h_dr  	0xdeadbeef,ssp
-	testr_h_gr	sp,r9		; should have been incremented
-
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,usp
-	test_cc		1 1 1 1
-	test_h_dr  	0xdeadbeef,usp
-	test_h_gr	0xdeadbeef,sp	; should not have been incremented
-
-	set_s_system
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,usp
-	test_cc		1 1 1 1
-	test_h_dr  	0xdeadbeef,usp
-	testr_h_gr	sp,r9		; should have been incremented
-
-	mvr_h_gr	r8,sp		; restore original stack pointer
-	set_cc          0x0f		; condition codes should not change
-	ld		@r15+,ssp
-	test_cc		1 1 1 1
-	test_h_dr  	0xdeadbeef,ssp
-	test_h_gr	0xdeadbeef,sp	; should not have been incremented
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ldi20.cgs b/sim/testsuite/sim/fr30/ldi20.cgs
deleted file mode 100644
index c7a4ef4165f..00000000000
--- a/sim/testsuite/sim/fr30/ldi20.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# fr30 testcase for ldi20 $i20,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ldi20
-ldi20:
-	; Test ldi20 $i20,$Ri
-	set_cc          0x0f		; condition codes should not change
-	ldi20		#0x00000000,r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	set_cc          0x07		; condition codes should not change
-	ldi:20		1,r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	set_cc          0x0b		; condition codes should not change
-	ldi20		0x7ffff,r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x0007ffff,r7
-
-	set_cc          0x0d		; condition codes should not change
-	ldi:20		0x80000,r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x00080000,r7
-
-	set_cc          0x0e		; condition codes should not change
-	ldi20		0xfffff,r7
-	test_cc		1 1 1 0
-	test_h_gr  	0x000fffff,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ldi32.cgs b/sim/testsuite/sim/fr30/ldi32.cgs
deleted file mode 100644
index 3e56db741e3..00000000000
--- a/sim/testsuite/sim/fr30/ldi32.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# fr30 testcase for ldi32 $i32,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ldi32
-ldi32:
-	; Test ldi32 $i32,$Ri
-	set_cc          0x0f		; condition codes should not change
-	ldi32		#0x00000000,r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	set_cc          0x07		; condition codes should not change
-	ldi:32		1,r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	set_cc          0x0b		; condition codes should not change
-	ldi32		0x7fffffff,r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x7fffffff,r7
-
-	set_cc          0x0d		; condition codes should not change
-	ldi:32		0x80000000,r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x80000000,r7
-
-	set_cc          0x0e		; condition codes should not change
-	ldi32		0xffffffff,r7
-	test_cc		1 1 1 0
-	test_h_gr  	-1,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ldi8.cgs b/sim/testsuite/sim/fr30/ldi8.cgs
deleted file mode 100644
index 9b15edead0c..00000000000
--- a/sim/testsuite/sim/fr30/ldi8.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# fr30 testcase for ldi8 $i8,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ldi8
-ldi8:
-	; Test ldi8 $i8,$Ri
-	set_cc          0x0f		; condition codes should not change
-	ldi8		#0x00000000,r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	set_cc          0x07		; condition codes should not change
-	ldi:20		1,r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	set_cc          0x0b		; condition codes should not change
-	ldi8		0x7f,r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x0000007f,r7
-
-	set_cc          0x0d		; condition codes should not change
-	ldi:20		0x80,r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x00000080,r7
-
-	set_cc          0x0e		; condition codes should not change
-	ldi8		0xff,r7
-	test_cc		1 1 1 0
-	test_h_gr  	0x000000ff,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ldm0.cgs b/sim/testsuite/sim/fr30/ldm0.cgs
deleted file mode 100644
index 9deb5642544..00000000000
--- a/sim/testsuite/sim/fr30/ldm0.cgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# fr30 testcase for ldm0 ($reglist_low)
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ldm0
-ldm0:
-	; Test ldm0 ($reglist_low)
-	mvr_h_gr	sp,r9		; save stack pointer permanently
-	inci_h_gr	-4,sp
-	mvi_h_mem  	3,sp
-	inci_h_gr	-4,sp
-	mvi_h_mem  	2,sp
-	inci_h_gr	-4,sp
-	mvi_h_mem  	1,sp
-	inci_h_gr	-4,sp
-	mvi_h_mem  	0,sp
-
-	set_cc          0x0f		; Condition codes should not change
-	ldm0      	(r0,r2,r4,r6)
-	test_cc		1 1 1 1
-	testr_h_gr	sp,r9
-	test_h_gr 	0,r0
-	test_h_gr 	1,r2
-	test_h_gr 	2,r4
-	test_h_gr   	3,r6
-
-	inci_h_gr	-16,sp
-	set_cc          0x0f		; Condition codes should not change
-	ldm0      	(r1,r3,r5,r7)
-	test_cc		1 1 1 1
-	testr_h_gr	sp,r9
-	test_h_gr 	0,r1
-	test_h_gr 	1,r3
-	test_h_gr 	2,r5
-	test_h_gr   	3,r7
-
-	inci_h_gr	-16,sp
-	set_cc          0x0f		; Condition codes should not change
-	ldm0      	(r1,r5,r7,r3)	; Order speficied should not matter
-	test_cc		1 1 1 1
-	testr_h_gr	sp,r9
-	test_h_gr 	0,r1
-	test_h_gr 	1,r3
-	test_h_gr 	2,r5
-	test_h_gr   	3,r7
-
-	set_cc          0x0f		; Condition codes should not change
-	ldm0      	()		; Nothing should happen
-	test_cc		1 1 1 1
-	testr_h_gr	sp,r9
-	test_h_gr 	0,r1
-	test_h_gr 	1,r3
-	test_h_gr 	2,r5
-	test_h_gr   	3,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ldm1.cgs b/sim/testsuite/sim/fr30/ldm1.cgs
deleted file mode 100644
index 33cfcdba770..00000000000
--- a/sim/testsuite/sim/fr30/ldm1.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# fr30 testcase for ldm1 ($reglist_low)
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ldm1
-ldm1:
-	; Test ldm1 ($reglist_low)
-	mvr_h_gr	sp,r1		; save stack pointer permanently
-	inci_h_gr	-4,sp
-	mvi_h_mem  	3,sp
-	inci_h_gr	-4,sp
-	mvi_h_mem  	2,sp
-	inci_h_gr	-4,sp
-	mvi_h_mem  	1,sp
-	inci_h_gr	-4,sp
-	mvi_h_mem  	0,sp
-
-	set_cc          0x0f		; Condition codes should not change
-	ldm1      	(r8,r10,r12,r14)
-	test_cc		1 1 1 1
-	testr_h_gr	sp,r1
-	test_h_gr 	0,r8
-	test_h_gr 	1,r10
-	test_h_gr 	2,r12
-	test_h_gr   	3,r14
-
-	inci_h_gr	-16,sp
-	set_cc          0x0f		; Condition codes should not change
-	ldm1      	(r9,r11,r13,r15)
-	test_cc		1 1 1 1
-	test_h_gr 	0,r9
-	test_h_gr 	1,r11
-	test_h_gr 	2,r13
-	test_h_gr   	3,r15
-
-	mvr_h_gr	r1,sp		; restore stack pointer
-	inci_h_gr	-16,sp
-	set_cc          0x0f		; Condition codes should not change
-	ldm1      	(r9,r13,r15,r11); Order speficied should not matter
-	test_cc		1 1 1 1
-	test_h_gr 	0,r9
-	test_h_gr 	1,r11
-	test_h_gr 	2,r13
-	test_h_gr   	3,r15
-
-	mvr_h_gr	r1,sp		; restore stack pointer
-	set_cc          0x0f		; Condition codes should not change
-	ldm1      	()		; Nothing should happen
-	test_cc		1 1 1 1
-	testr_h_gr	sp,r1
-	test_h_gr 	0,r9
-	test_h_gr 	1,r11
-	test_h_gr 	2,r13
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ldres.cgs b/sim/testsuite/sim/fr30/ldres.cgs
deleted file mode 100644
index 008348992d2..00000000000
--- a/sim/testsuite/sim/fr30/ldres.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# fr30 testcase for ldres $@Ri+,$u4
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ldres
-ldres:
-	; Test ldres $@Ri+,$u4
-	; The current implementation simply increments Ri
-	mvi_h_gr   	0x1000,r7
-	set_cc          0x0f		; Condition codes are irrelevent
-	ldres      	@r7+,0
-	test_cc		1 1 1 1
-	test_h_gr  	0x1004,r7
-
-	mvi_h_gr   	0x1000,r7
-	set_cc          0x0f		; Condition codes are irrelevent
-	ldres      	@r7+,0xf
-	test_cc		1 1 1 1
-	test_h_gr  	0x1004,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ldub.cgs b/sim/testsuite/sim/fr30/ldub.cgs
deleted file mode 100644
index 8d42cfa8595..00000000000
--- a/sim/testsuite/sim/fr30/ldub.cgs
+++ /dev/null
@@ -1,115 +0,0 @@
-# fr30 testcase for
-# mach(): fr30
-#  ldub $Rj,$Ri
-#  ldub @($R13,$Rj),$Ri
-#  ldub @($R14,$disp8),$Ri
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ldub
-ldub:
-	; Test ldub $Rj,$Ri
-	mvi_h_mem	#0x00adbeef,sp
-	set_cc          0x0f		; condition codes should not change
-	ldub		@sp,r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_mem	#0x01adbeef,sp
-	set_cc          0x07		; condition codes should not change
-	ldub    	@sp,r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	mvi_h_mem	#0x7fadbeef,sp
-	set_cc          0x0b		; condition codes should not change
-	ldub		@sp,r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x7f,r7
-
-	mvi_h_mem	#0x80adbeef,sp
-	set_cc          0x0d		; condition codes should not change
-	ldub      	@sp,r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x80,r7
-
-	mvi_h_mem	#0xffadbeef,sp
-	set_cc          0x0e		; condition codes should not change
-	ldub		@sp,r7
-	test_cc		1 1 1 0
-	test_h_gr  	0xff,r7
-
-	; Test ldub @($R13,$Rj),$Ri
-	mvr_h_gr	sp,r13
-	inci_h_gr	-8,r13
-	mvi_h_gr	8,r8
-
-	mvi_h_mem	#0x00adbeef,sp
-	set_cc          0x0f		; condition codes should not change
-	ldub		@(r13,r8),r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_mem	#0x01adbeef,sp
-	set_cc          0x07		; condition codes should not change
-	ldub    	@(r13,r8),r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	mvi_h_mem	#0x7fadbeef,sp
-	set_cc          0x0b		; condition codes should not change
-	ldub		@(r13,r8),r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x7f,r7
-
-	mvi_h_mem	#0x80adbeef,sp
-	set_cc          0x0d		; condition codes should not change
-	ldub      	@(r13,r8),r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x80,r7
-
-	mvi_h_mem	#0xffadbeef,sp
-	set_cc          0x0e		; condition codes should not change
-	ldub		@(r13,r8),r7
-	test_cc		1 1 1 0
-	test_h_gr  	0xff,r7
-
-	; Test ldub @($R14,$disp8),$Ri
-	mvi_h_mem	#0xdeadbeef,sp
-	mvr_h_gr	sp,r14
-	mvi_h_gr	-0x7f,r8
-	add_h_gr	r8,r14
-
-	set_cc          0x0f		; condition codes should not change
-	ldub		@(r14,0x7f),r7
-	test_cc		1 1 1 1
-	test_h_gr  	0xde,r7
-
-	inci_h_gr	0x3f,r14
-	set_cc          0x07		; condition codes should not change
-	ldub    	@(r14,0x40),r7
-	test_cc		0 1 1 1
-	test_h_gr  	0xde,r7
-
-	inci_h_gr	0x40,r14
-	set_cc          0x0b		; condition codes should not change
-	ldub		@(r14,0x0),r7
-	test_cc		1 0 1 1
-	test_h_gr  	0xde,r7
-
-	inci_h_gr	0x40,r14
-	set_cc          0x0d		; condition codes should not change
-	ldub      	@(r14,-0x40),r7
-	test_cc		1 1 0 1
-	test_h_gr  	0xde,r7
-
-	inci_h_gr	0x40,r14
-	set_cc          0x0e		; condition codes should not change
-	ldub		@(r14,-0x80),r7
-	test_cc		1 1 1 0
-	test_h_gr  	0xde,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/lduh.cgs b/sim/testsuite/sim/fr30/lduh.cgs
deleted file mode 100644
index 7d36b75cbcc..00000000000
--- a/sim/testsuite/sim/fr30/lduh.cgs
+++ /dev/null
@@ -1,115 +0,0 @@
-# fr30 testcase for
-# mach(): fr30
-# lduh $Rj,$Ri
-# lduh @($R13,$Rj),$Ri
-# lduh @($R14,$disp9),$Ri
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global lduh
-lduh:
-	; Test lduh $Rj,$Ri
-	mvi_h_mem	#0x0000beef,sp
-	set_cc          0x0f		; condition codes should not change
-	lduh		@sp,r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_mem	#0x0001beef,sp
-	set_cc          0x07		; condition codes should not change
-	lduh    	@sp,r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	mvi_h_mem	#0x7fffbeef,sp
-	set_cc          0x0b		; condition codes should not change
-	lduh		@sp,r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x7fff,r7
-
-	mvi_h_mem	#0x8000beef,sp
-	set_cc          0x0d		; condition codes should not change
-	lduh      	@sp,r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x8000,r7
-
-	mvi_h_mem	#0xffffbeef,sp
-	set_cc          0x0e		; condition codes should not change
-	lduh		@sp,r7
-	test_cc		1 1 1 0
-	test_h_gr  	0xffff,r7
-
-	; Test lduh @($R13,$Rj),$Ri
-	mvr_h_gr	sp,r13
-	inci_h_gr	-8,r13
-	mvi_h_gr	8,r8
-
-	mvi_h_mem	#0x0000beef,sp
-	set_cc          0x0f		; condition codes should not change
-	lduh		@(r13,r8),r7
-	test_cc		1 1 1 1
-	test_h_gr  	0,r7
-
-	mvi_h_mem	#0x0001beef,sp
-	set_cc          0x07		; condition codes should not change
-	lduh    	@(r13,r8),r7
-	test_cc		0 1 1 1
-	test_h_gr  	1,r7
-
-	mvi_h_mem	#0x7fffbeef,sp
-	set_cc          0x0b		; condition codes should not change
-	lduh		@(r13,r8),r7
-	test_cc		1 0 1 1
-	test_h_gr  	0x7fff,r7
-
-	mvi_h_mem	#0x8000beef,sp
-	set_cc          0x0d		; condition codes should not change
-	lduh      	@(r13,r8),r7
-	test_cc		1 1 0 1
-	test_h_gr  	0x8000,r7
-
-	mvi_h_mem	#0xffffbeef,sp
-	set_cc          0x0e		; condition codes should not change
-	lduh		@(r13,r8),r7
-	test_cc		1 1 1 0
-	test_h_gr  	0xffff,r7
-
-	; Test lduh @($R14,$disp9),$Ri
-	mvi_h_mem	#0xdeadbeef,sp
-	mvr_h_gr	sp,r14
-	mvi_h_gr	-0xfe,r8
-	add_h_gr	r8,r14
-
-	set_cc          0x0f		; condition codes should not change
-	lduh		@(r14,0xfe),r7
-	test_cc		1 1 1 1
-	test_h_gr  	0xdead,r7
-
-	inci_h_gr	0x7e,r14
-	set_cc          0x07		; condition codes should not change
-	lduh    	@(r14,0x80),r7
-	test_cc		0 1 1 1
-	test_h_gr  	0xdead,r7
-
-	inci_h_gr	0x80,r14
-	set_cc          0x0b		; condition codes should not change
-	lduh		@(r14,0x0),r7
-	test_cc		1 0 1 1
-	test_h_gr  	0xdead,r7
-
-	inci_h_gr	0x80,r14
-	set_cc          0x0d		; condition codes should not change
-	lduh      	@(r14,-0x80),r7
-	test_cc		1 1 0 1
-	test_h_gr  	0xdead,r7
-
-	inci_h_gr	0x80,r14
-	set_cc          0x0e		; condition codes should not change
-	lduh		@(r14,-0x100),r7
-	test_cc		1 1 1 0
-	test_h_gr  	0xdead,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/leave.cgs b/sim/testsuite/sim/fr30/leave.cgs
deleted file mode 100644
index 4d3dd70100e..00000000000
--- a/sim/testsuite/sim/fr30/leave.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# fr30 testcase for leave
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global leave
-leave:
-	; Test leave $u10
-	mvr_h_gr	sp,r7			; save Stack pointer
-	mvr_h_gr	sp,r14
-	inci_h_gr	-4,r14
-	mvi_h_mem	0xdeadbeef,r14
-	mvi_h_gr	0xbeefdead,r15
-	set_cc	0x0f			; Condition codes are irrelevent
-	leave
-	test_cc	1 1 1 1
-	testr_h_gr	sp,r7
-	test_h_gr	0xdeadbeef,r14
-
-	pass
diff --git a/sim/testsuite/sim/fr30/lsl.cgs b/sim/testsuite/sim/fr30/lsl.cgs
deleted file mode 100644
index ead749fbbb5..00000000000
--- a/sim/testsuite/sim/fr30/lsl.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# fr30 testcase for lsl $Rj,$Ri, lsl $u4,$Rj
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global lsl
-lsl:
-	; Test lsl $Rj,$Ri
-	mvi_h_gr   	0xdeadbee0,r7	; Shift by 0
-	mvi_h_gr   	2,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	lsl      	r7,r8
-	test_cc		0 0 0 0
-	test_h_gr  	2,r8
-
-	mvi_h_gr   	0xdeadbee1,r7	; Shift by 1
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	lsl      	r7,r8
-	test_cc		0 0 1 0
-	test_h_gr  	4,r8
-
-	mvi_h_gr   	0xdeadbeff,r7	; Shift by 31
-	mvi_h_gr   	1,r8
-	set_cc          0x07		; Set mask opposite of expected
-	lsl      	r7,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0x80000000,r8
-
-	mvi_h_gr   	0xdeadbeff,r7	; clear register
-	mvi_h_gr   	2,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	lsl      	r7,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	; Test lsl $u4Ri
-	mvi_h_gr   	2,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	lsl      	0,r8
-	test_cc		0 0 0 0
-	test_h_gr  	2,r8
-
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	lsl      	1,r8
-	test_cc		0 0 1 0
-	test_h_gr  	4,r8
-
-	mvi_h_gr   	1,r8
-	set_cc          0x0e		; Set mask opposite of expected
-	lsl      	15,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x00008000,r8
-
-	mvi_h_gr   	0x00020000,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	lsl      	15,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/lsl2.cgs b/sim/testsuite/sim/fr30/lsl2.cgs
deleted file mode 100644
index 58acf84ef2c..00000000000
--- a/sim/testsuite/sim/fr30/lsl2.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for lsl2 $Rj,$Ri, lsl2 $u4,$Rj
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global lsl2
-lsl2:
-	; Test lsl2 $u4Ri
-	mvi_h_gr   	2,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	lsl2      	0,r8
-	test_cc		0 0 0 0
-	test_h_gr  	0x20000,r8
-
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	lsl2      	1,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x40000,r8
-
-	mvi_h_gr   	1,r8
-	set_cc          0x07		; Set mask opposite of expected
-	lsl2      	15,r8
-	test_cc		1 0 1 0
-	test_h_gr  	0x80000000,r8
-
-	mvi_h_gr   	2,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	lsl2      	15,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/lsr.cgs b/sim/testsuite/sim/fr30/lsr.cgs
deleted file mode 100644
index 5b9587fe71f..00000000000
--- a/sim/testsuite/sim/fr30/lsr.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# fr30 testcase for lsr $Rj,$Ri, lsr $u4,$Rj
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global lsr
-lsr:
-	; Test lsr $Rj,$Ri
-	mvi_h_gr   	0xdeadbee0,r7	; Shift by 0
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x05		; Set mask opposite of expected
-	lsr      	r7,r8
-	test_cc		1 0 0 0
-	test_h_gr  	0x80000000,r8
-
-	mvi_h_gr   	0xdeadbee1,r7	; Shift by 1
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	lsr      	r7,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x40000000,r8
-
-	mvi_h_gr   	0xdeadbeff,r7	; Shift by 31
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	lsr      	r7,r8
-	test_cc		0 0 1 0
-	test_h_gr  	1,r8
-
-	mvi_h_gr   	0xdeadbeff,r7	; clear register
-	mvi_h_gr   	0x40000000,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	lsr      	r7,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	; Test lsr $u4Ri
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x05		; Set mask opposite of expected
-	lsr      	0,r8
-	test_cc		1 0 0 0
-	test_h_gr  	0x80000000,r8
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	lsr      	1,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x40000000,r8
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0e		; Set mask opposite of expected
-	lsr      	15,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x00010000,r8
-
-	mvi_h_gr   	0x00004000,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	lsr      	15,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/lsr2.cgs b/sim/testsuite/sim/fr30/lsr2.cgs
deleted file mode 100644
index fd6ceaa9ff7..00000000000
--- a/sim/testsuite/sim/fr30/lsr2.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for lsr2 $u4,$Rj
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global lsr2
-lsr2:
-	; Test lsr2 $u4Ri
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	lsr2      	0,r8
-	test_cc		0 0 0 0
-	test_h_gr  	0x00008000,r8
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	lsr2      	1,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x00004000,r8
-
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0e		; Set mask opposite of expected
-	lsr2      	15,r8
-	test_cc		0 0 1 0
-	test_h_gr  	1,r8
-
-	mvi_h_gr   	0x40000000,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	lsr2      	15,r8
-	test_cc		0 1 1 1
-	test_h_gr  	0x00000000,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/misc.exp b/sim/testsuite/sim/fr30/misc.exp
deleted file mode 100644
index da1490dd9e4..00000000000
--- a/sim/testsuite/sim/fr30/misc.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Miscellaneous FR30 simulator testcases
-
-if [istarget fr30*-*-*] {
-    # load support procs
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "fr30"
-
-    # The .ms suffix is for "miscellaneous .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
-	# 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/fr30/mov.cgs b/sim/testsuite/sim/fr30/mov.cgs
deleted file mode 100644
index bf99252f061..00000000000
--- a/sim/testsuite/sim/fr30/mov.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# fr30 testcase for mov $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global mov
-mov:
-	; Test mov $Rj,$Ri
-	mvi_h_gr   	1,r7
-	mvi_h_dr   	0xa,tbr
-	mvi_h_dr   	0xb,rp
-	mvi_h_dr   	0xc,mdh
-	mvi_h_dr   	0xd,mdl
-	mvr_h_gr        sp,ssp
-	mvr_h_gr	sp,usp
-
-	mov		r7,r7
-	set_cc          0x0f		; Condition codes should not change
-	test_cc		1 1 1 1
-	test_h_gr  	1,r7
-
-	mov		r7,r8
-	set_cc          0x0e		; Condition codes should not change
-	test_cc		1 1 1 0
-	test_h_gr  	1,r7
-	test_h_gr  	1,r8
-
-	; Test mov $Rs,$Ri
-	set_cc          0x0d		; Condition codes should not change
-	mov		tbr,r7
-	test_cc		1 1 0 1
-	test_h_gr  	0xa,r7
-
-	set_cc          0x0c		; Condition codes should not change
-	mov		rp,r7
-	test_cc		1 1 0 0
-	test_h_gr  	0xb,r7
-
-	set_cc          0x0b		; Condition codes should not change
-	mov		mdh,r7
-	test_cc		1 0 1 1
-	test_h_gr  	0xc,r7
-
-	set_cc          0x0a		; Condition codes should not change
-	mov		mdl,r7
-	test_cc		1 0 1 0
-	test_h_gr  	0xd,r7
-
-	set_cc          0x09		; Condition codes should not change
-	mov		usp,r7
-	test_cc		1 0 0 1
-	testr_h_gr  	sp,r7
-
-	set_cc          0x08		; Condition codes should not change
-	mov		ssp,r7
-	test_cc		1 0 0 0
-	testr_h_gr  	sp,r7
-
-	; Test mov $Ri,$Rs
-	set_cc          0x07		; Condition codes should not change
-	mov		r8,tbr
-	test_cc		0 1 1 1
-	test_h_dr  	0x1,tbr
-
-	set_cc          0x06		; Condition codes should not change
-	mov		r8,rp
-	test_cc		0 1 1 0
-	test_h_dr  	0x1,rp
-
-	set_cc          0x05		; Condition codes should not change
-	mov		r8,mdh
-	test_cc		0 1 0 1
-	test_h_dr  	0x1,mdh
-
-	set_cc          0x04		; Condition codes should not change
-	mov		r8,mdl
-	test_cc		0 1 0 0
-	test_h_dr  	0x1,mdl
-
-	set_cc          0x03		; Condition codes should not change
-	mov		r8,ssp
-	test_cc		0 0 1 1
-	test_h_dr  	0x1,ssp
-
-	set_cc          0x02		; Condition codes should not change
-	mov		r8,usp
-	test_cc		0 0 1 0
-	test_h_dr  	0x1,usp
-
-	; Test mov $PS,$Ri
-	set_cc          0x01		; Condition codes affect result
-	set_dbits	0x3
-	mov		ps,r7
-	test_cc		0 0 0 1
-	test_h_gr  	0x00000601,r7
-
-	; Test mov $Ri,PS
-	set_cc          0x01		; Set opposite of expected
-	set_dbits	0x1		; Set opposite of expected
-	mvi_h_gr	0x0000040e,r7
-	mov		r7,PS
-	test_cc		1 1 1 0
-	test_dbits	0x2
-
-	pass
diff --git a/sim/testsuite/sim/fr30/mul.cgs b/sim/testsuite/sim/fr30/mul.cgs
deleted file mode 100644
index f7cbf58e50e..00000000000
--- a/sim/testsuite/sim/fr30/mul.cgs
+++ /dev/null
@@ -1,240 +0,0 @@
-# fr30 testcase for mul $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global mul
-mul:
-	; Test mul $Rj,$Ri
-	; Positive operands
-	mvi_h_gr   	3,r7		; multiply small numbers
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	6,mdl
-
-	mvi_h_gr   	1,r7		; multiply by 1
-	mvi_h_gr   	2,r8
-	set_cc          0x0e		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 0 0
-	test_h_dr  	0,mdh
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	2,r7		; multiply by 1
-	mvi_h_gr   	1,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	0,r7		; multiply by 0
-	mvi_h_gr   	2,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	2,r7		; multiply by 0
-	mvi_h_gr   	0,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	0,mdh
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	0x3fffffff,r7	; 31 bit result
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	0x7ffffffe,mdl
-
-	mvi_h_gr   	0x40000000,r7	; 32 bit result
-	mvi_h_gr   	2,r8
-	set_cc          0x04		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 1 0
-	test_h_dr  	0,mdh
-	test_h_dr  	0x80000000,mdl
-
-	mvi_h_gr   	0x40000000,r7	; 33 bit result
-	mvi_h_gr   	4,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 1 1
-	test_h_dr  	1,mdh
-	test_h_dr  	0x00000000,mdl
-
-	mvi_h_gr   	0x7fffffff,r7	; max positive result
-	mvi_h_gr   	0x7fffffff,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 1 1
-	test_h_dr  	0x3fffffff,mdh
-	test_h_dr  	0x00000001,mdl
-
-	; Mixed operands
-	mvi_h_gr   	-3,r7		; multiply small numbers
-	mvi_h_gr   	2,r8
-	set_cc          0x07		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 0 1
-	test_h_dr  	-1,mdh
-	test_h_dr  	-6,mdl
-
-	mvi_h_gr   	3,r7		; multiply small numbers
-	mvi_h_gr   	-2,r8
-	set_cc          0x07		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 0 1
-	test_h_dr  	-1,mdh
-	test_h_dr  	-6,mdl
-
-	mvi_h_gr   	1,r7		; multiply by 1
-	mvi_h_gr   	-2,r8
-	set_cc          0x06		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 0 0
-	test_h_dr  	-1,mdh
-	test_h_dr  	-2,mdl
-
-	mvi_h_gr   	-2,r7		; multiply by 1
-	mvi_h_gr   	1,r8
-	set_cc          0x07		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 0 1
-	test_h_dr  	-1,mdh
-	test_h_dr  	-2,mdl
-
-	mvi_h_gr   	0,r7		; multiply by 0
-	mvi_h_gr   	-2,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	-2,r7		; multiply by 0
-	mvi_h_gr   	0,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	0,mdh
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	0x20000001,r7	; 31 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x07		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 0 1
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0xbffffffe,mdl
-
-	mvi_h_gr   	0x40000000,r7	; 32 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x06		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 0 0
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0x80000000,mdl
-
-	mvi_h_gr   	0x40000001,r7	; 32 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x0c		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 1 0
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0x7ffffffe,mdl
-
-	mvi_h_gr   	0x40000000,r7	; 33 bit result
-	mvi_h_gr   	-4,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 1 1
-	test_h_dr  	0xffffffff,mdh
-	test_h_dr  	0x00000000,mdl
-
-	mvi_h_gr   	0x7fffffff,r7	; max negative result
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x05		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 1 1
-	test_h_dr  	0xc0000000,mdh
-	test_h_dr  	0x80000000,mdl
-
-	; Negative operands
-	mvi_h_gr   	-3,r7		; multiply small numbers
-	mvi_h_gr   	-2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	6,mdl
-
-	mvi_h_gr   	-1,r7		; multiply by 1
-	mvi_h_gr   	-2,r8
-	set_cc          0x0e		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 0 0
-	test_h_dr  	0,mdh
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	-2,r7		; multiply by 1
-	mvi_h_gr   	-1,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	0xc0000001,r7	; 31 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	0x7ffffffe,mdl
-
-	mvi_h_gr   	0xc0000000,r7	; 32 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x04		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		1 0 1 0
-	test_h_dr  	0,mdh
-	test_h_dr  	0x80000000,mdl
-
-	mvi_h_gr   	0xc0000000,r7	; 33 bit result
-	mvi_h_gr   	-4,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 1 1
-	test_h_dr  	1,mdh
-	test_h_dr  	0x00000000,mdl
-
-	mvi_h_gr   	0x80000001,r7	; almost max positive result
-	mvi_h_gr   	0x80000001,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 1 1
-	test_h_dr  	0x3fffffff,mdh
-	test_h_dr  	0x00000001,mdl
-
-
-	mvi_h_gr   	0x80000000,r7	; max positive result
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	mul      	r7,r8
-	test_cc		0 0 1 1
-	test_h_dr  	0x40000000,mdh
-	test_h_dr  	0x00000000,mdl
-
-	pass
diff --git a/sim/testsuite/sim/fr30/mulh.cgs b/sim/testsuite/sim/fr30/mulh.cgs
deleted file mode 100644
index 1421f07b31a..00000000000
--- a/sim/testsuite/sim/fr30/mulh.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# fr30 testcase for mulh $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global mulh
-mulh:
-	; Test mulh $Rj,$Ri
-	; Positive operands
-	mvi_h_gr   	0xdead0003,r7		; multiply small numbers
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	6,mdl
-
-	mvi_h_gr   	0xdead0001,r7		; multiply by 1
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x08		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	0xdead0002,r7		; multiply by 1
-	mvi_h_gr   	0xbeef0001,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	0xdead0000,r7		; multiply by 0
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	0xdead0002,r7		; multiply by 0
-	mvi_h_gr   	0xbeef0000,r8
-	set_cc          0x08		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	0xdead3fff,r7	; 15 bit result
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0x00007ffe,mdl
-
-	mvi_h_gr   	0xdead4000,r7	; 16 bit result
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 1 0
-	test_h_dr  	0x00008000,mdl
-
-	mvi_h_gr   	0xdead4000,r7	; 17 bit result
-	mvi_h_gr   	0xbeef0004,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x00010000,mdl
-
-	mvi_h_gr   	0xdead7fff,r7	; max positive result
-	mvi_h_gr   	0xbeef7fff,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x3fff0001,mdl
-
-	; Mixed operands
-	mvi_h_gr   	-3,r7		; multiply small numbers
-	mvi_h_gr   	2,r8
-	set_cc          0x05		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 0 1
-	test_h_dr  	-6,mdl
-
-	mvi_h_gr   	3,r7		; multiply small numbers
-	mvi_h_gr   	-2,r8
-	set_cc          0x05		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 0 1
-	test_h_dr  	-6,mdl
-
-	mvi_h_gr   	1,r7		; multiply by 1
-	mvi_h_gr   	-2,r8
-	set_cc          0x04		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 0 0
-	test_h_dr  	-2,mdl
-
-	mvi_h_gr   	-2,r7		; multiply by 1
-	mvi_h_gr   	1,r8
-	set_cc          0x05		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 0 1
-	test_h_dr  	-2,mdl
-
-	mvi_h_gr   	0,r7		; multiply by 0
-	mvi_h_gr   	-2,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	-2,r7		; multiply by 0
-	mvi_h_gr   	0,r8
-	set_cc          0x08		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	0xdead2001,r7	; 15 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x05		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 0 1
-	test_h_dr  	0xffffbffe,mdl
-
-	mvi_h_gr   	0xdead4000,r7	; 16 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x04		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 0 0
-	test_h_dr  	0xffff8000,mdl
-
-	mvi_h_gr   	0xdead4001,r7	; 16 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x06		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 1 0
-	test_h_dr  	0xffff7ffe,mdl
-
-	mvi_h_gr   	0xdead4000,r7	; 17 bit result
-	mvi_h_gr   	-4,r8
-	set_cc          0x07		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 1 1
-	test_h_dr  	0xffff0000,mdl
-
-	mvi_h_gr   	0xdead7fff,r7	; max negative result
-	mvi_h_gr   	0xbeef8000,r8
-	set_cc          0x07		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		1 0 1 1
-	test_h_dr  	0xc0008000,mdl
-
-	; Negative operands
-	mvi_h_gr   	-3,r7		; multiply small numbers
-	mvi_h_gr   	-2,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	6,mdl
-
-	mvi_h_gr   	-1,r7		; multiply by 1
-	mvi_h_gr   	-2,r8
-	set_cc          0x08		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	-2,r7		; multiply by 1
-	mvi_h_gr   	-1,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	0xdeadc001,r7	; 15 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0x00007ffe,mdl
-
-	mvi_h_gr   	0xdeadc000,r7	; 16 bit result
-	mvi_h_gr   	-2,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 1 0
-	test_h_dr  	0x00008000,mdl
-
-	mvi_h_gr   	0xdeadc000,r7	; 17 bit result
-	mvi_h_gr   	-4,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x00010000,mdl
-
-	mvi_h_gr   	0xdead8001,r7	; almost max positive result
-	mvi_h_gr   	0xbeef8001,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x3fff0001,mdl
-
-	mvi_h_gr   	0xdead8000,r7	; max positive result
-	mvi_h_gr   	0xbeef8000,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	mulh      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x40000000,mdl
-
-	pass
diff --git a/sim/testsuite/sim/fr30/mulu.cgs b/sim/testsuite/sim/fr30/mulu.cgs
deleted file mode 100644
index 477583b224d..00000000000
--- a/sim/testsuite/sim/fr30/mulu.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# fr30 testcase for mulu $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global mulu
-mulu:
-	; Test mulu $Rj,$Ri
-	; Positive operands
-	mvi_h_gr   	3,r7		; multiply small numbers
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	6,mdl
-
-	mvi_h_gr   	1,r7		; multiply by 1
-	mvi_h_gr   	2,r8
-	set_cc          0x0e		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 0 0 0
-	test_h_dr  	0,mdh
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	2,r7		; multiply by 1
-	mvi_h_gr   	1,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	0,r7		; multiply by 0
-	mvi_h_gr   	2,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	2,r7		; multiply by 0
-	mvi_h_gr   	0,r8
-	set_cc          0x0a		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	0,mdh
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	0x3fffffff,r7	; 31 bit result
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 0 0 1
-	test_h_dr  	0,mdh
-	test_h_dr  	0x7ffffffe,mdl
-
-	mvi_h_gr   	0x40000000,r7	; 32 bit result
-	mvi_h_gr   	2,r8
-	set_cc          0x0e		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 0 0 0
-	test_h_dr  	0,mdh
-	test_h_dr  	0x80000000,mdl
-
-	mvi_h_gr   	0x80000000,r7	; 33 bit result
-	mvi_h_gr   	2,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	1,mdh
-	test_h_dr  	0x00000000,mdl
-
-	mvi_h_gr   	0x7fffffff,r7	; max positive result
-	mvi_h_gr   	0x7fffffff,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 0 1 1
-	test_h_dr  	0x3fffffff,mdh
-	test_h_dr  	0x00000001,mdl
-
-	mvi_h_gr   	0x80000000,r7	; max positive result
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x09		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x40000000,mdh
-	test_h_dr  	0x00000000,mdl
-
-	mvi_h_gr   	0xffffffff,r7	; max positive result
-	mvi_h_gr   	0xffffffff,r8
-	set_cc          0x05		; Set mask opposite of expected
-	mulu      	r7,r8
-	test_cc		1 0 1 1
-	test_h_dr  	0xfffffffe,mdh
-	test_h_dr  	0x00000001,mdl
-
-	pass
diff --git a/sim/testsuite/sim/fr30/muluh.cgs b/sim/testsuite/sim/fr30/muluh.cgs
deleted file mode 100644
index b0c847e1b97..00000000000
--- a/sim/testsuite/sim/fr30/muluh.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# fr30 testcase for muluh $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global muluh
-muluh:
-	; Test muluh $Rj,$Ri
-	; Positive operands
-	mvi_h_gr   	0xdead0003,r7		; multiply small numbers
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x09		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	6,mdl
-
-	mvi_h_gr   	0xdead0001,r7		; multiply by 1
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x08		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	0xdead0002,r7		; multiply by 1
-	mvi_h_gr   	0xbeef0001,r8
-	set_cc          0x09		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	2,mdl
-
-	mvi_h_gr   	0xdead0000,r7		; multiply by 0
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x09		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	0xdead0002,r7		; multiply by 0
-	mvi_h_gr   	0xbeef0000,r8
-	set_cc          0x08		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	0,mdl
-
-	mvi_h_gr   	0xdead3fff,r7	; 15 bit result
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x09		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 0 1
-	test_h_dr  	0x00007ffe,mdl
-
-	mvi_h_gr   	0xdead4000,r7	; 16 bit result
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x08		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 0 0
-	test_h_dr  	0x00008000,mdl
-
-	mvi_h_gr   	0xdead8000,r7	; 17 bit result
-	mvi_h_gr   	0xbeef0002,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x00010000,mdl
-
-	mvi_h_gr   	0xdead7fff,r7	; max positive result
-	mvi_h_gr   	0xbeef7fff,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x3fff0001,mdl
-
-	mvi_h_gr   	0xdead8000,r7	; max positive result
-	mvi_h_gr   	0xbeef8000,r8
-	set_cc          0x0b		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		0 1 1 1
-	test_h_dr  	0x40000000,mdl
-
-	mvi_h_gr   	0xdeadffff,r7	; max positive result
-	mvi_h_gr   	0xbeefffff,r8
-	set_cc          0x07		; Set mask opposite of expected
-	muluh      	r7,r8
-	test_cc		1 0 1 1
-	test_h_dr  	0xfffe0001,mdl
-
-	pass
diff --git a/sim/testsuite/sim/fr30/nop.cgs b/sim/testsuite/sim/fr30/nop.cgs
deleted file mode 100644
index 885c55cfd1a..00000000000
--- a/sim/testsuite/sim/fr30/nop.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# fr30 testcase for nop
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global nop
-nop:
-	; Test nop
-	set_cc          0x0f		; Condition codes are irrelevent
-	nop
-	test_cc		1 1 1 1
-
-	pass
diff --git a/sim/testsuite/sim/fr30/or.cgs b/sim/testsuite/sim/fr30/or.cgs
deleted file mode 100644
index 8acb9702000..00000000000
--- a/sim/testsuite/sim/fr30/or.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# fr30 testcase for or $Rj,$Ri, or $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global or
-or:
-	; Test or $Rj,$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_gr   	0x55555555,r8
-	set_cc          0x07		; Set mask opposite of expected
-	or      	r7,r8
-	test_cc		1 0 1 1
-	test_h_gr  	0xffffffff,r8
-
-	mvi_h_gr   	0x00000000,r7
-	mvi_h_gr   	0x00000000,r8
-	set_cc          0x08		; Set mask opposite of expected
-	or		r7,r8
-	test_cc		0 1 0 0
-	test_h_gr  	0x00000000,r8
-
-	mvi_h_gr   	0xdead0000,r7
-	mvi_h_gr   	0x0000beef,r8
-	set_cc          0x05		; Set mask opposite of expected
-	or		r7,r8
-	test_cc		1 0 0 1
-	test_h_gr  	0xdeadbeef,r8
-
-	; Test or $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x07		; Set mask opposite of expected
-	or      	r7,@sp
-	test_cc		1 0 1 1
-	test_h_mem 	0xffffffff,sp
-
-	mvi_h_gr   	0x00000000,r7
-	mvi_h_mem  	0x00000000,sp
-	set_cc          0x08		; Set mask opposite of expected
-	or		r7,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0x00000000,sp
-
-	mvi_h_gr   	0xdead0000,r7
-	mvi_h_mem  	0x0000beef,sp
-	set_cc          0x05		; Set mask opposite of expected
-	or		r7,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/orb.cgs b/sim/testsuite/sim/fr30/orb.cgs
deleted file mode 100644
index a7b36bf5284..00000000000
--- a/sim/testsuite/sim/fr30/orb.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# fr30 testcase for orb $Rj,$Ri, orb $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global orb
-orb:
-	; Test orb $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x07		; Set mask opposite of expected
-	orb      	r7,@sp
-	test_cc		1 0 1 1
-	test_h_mem 	0xff555555,sp
-
-	mvi_h_gr   	0xffffff00,r7
-	mvi_h_mem  	0x00ffffff,sp
-	set_cc          0x08		; Set mask opposite of expected
-	orb		r7,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0x00ffffff,sp
-
-	mvi_h_gr   	0x000000d0,r7
-	mvi_h_mem  	0x0eadbeef,sp
-	set_cc          0x05		; Set mask opposite of expected
-	orb		r7,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/orccr.cgs b/sim/testsuite/sim/fr30/orccr.cgs
deleted file mode 100644
index 3bc55a84570..00000000000
--- a/sim/testsuite/sim/fr30/orccr.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# fr30 testcase for orccr $u8
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global orccr
-orccr:
-	orccr      	0xff
-	test_cc		1 1 1 1
-	test_i		1
-	test_s_user
-
-	set_cc	0x0f
-	orccr      	0x00
-	test_cc		1 1 1 1
-	test_i		1
-	test_s_user
-
-	set_cc		0x00
-	set_i			0
-	set_s_system
-	orccr      	0xaa
-	test_cc		1 0 1 0
-	test_i		0
-	test_s_user
-
-	set_cc		0x00
-	set_i			0
-	set_s_system
-	orccr      	0xc0
-	test_cc		0 0 0 0
-	test_i		0
-	test_s_system
-
-	pass
diff --git a/sim/testsuite/sim/fr30/orh.cgs b/sim/testsuite/sim/fr30/orh.cgs
deleted file mode 100644
index b30b4028e85..00000000000
--- a/sim/testsuite/sim/fr30/orh.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# fr30 testcase for orh $Rj,$Ri, orh $Rj,@$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global orh
-orh:
-	; Test orh $Rj,@$Ri
-	mvi_h_gr   	0xaaaaaaaa,r7
-	mvi_h_mem  	0x55555555,sp
-	set_cc          0x07		; Set mask opposite of expected
-	orh      	r7,@sp
-	test_cc		1 0 1 1
-	test_h_mem 	0xffff5555,sp
-
-	mvi_h_gr   	0xffff0000,r7
-	mvi_h_mem  	0x0000ffff,sp
-	set_cc          0x08		; Set mask opposite of expected
-	orh		r7,@sp
-	test_cc		0 1 0 0
-	test_h_mem 	0x0000ffff,sp
-
-	mvi_h_gr   	0x0000de00,r7
-	mvi_h_mem  	0x00adbeef,sp
-	set_cc          0x05		; Set mask opposite of expected
-	orh		r7,@sp
-	test_cc		1 0 0 1
-	test_h_mem 	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/ret.cgs b/sim/testsuite/sim/fr30/ret.cgs
deleted file mode 100644
index 7bfa0b230f9..00000000000
--- a/sim/testsuite/sim/fr30/ret.cgs
+++ /dev/null
@@ -1,75 +0,0 @@
-# fr30 testcase for ret
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global ret
-
-	; Test ret
-	mvi_h_gr	0xdeadbeef,r9
-	mvi_h_gr   	#func1,r0
-	set_cc          0x0f		; condition codes shouldn't change
-call1:
-	call		@r0
-	testr_h_gr	2,r0
-	test_h_gr	0xbeefdead,r9
-	pass
-
-func1:
-	test_cc		1 1 1 1
-	mvi_h_gr	#call1,r7
-	inci_h_gr	2,r7
-	testr_h_dr	r7,rp
-	save_rp
-
-	mvi_h_gr   	#func2,r0
-	set_cc          0x0f		; condition codes shouldn't change
-call2:
-	call:d		@r0
-	ldi:8		1,r0		; Must assume this works
-	testr_h_gr	2,r0
-	restore_rp
-	ret
-func2:
-	test_cc		1 1 1 1
-	mvi_h_gr	#call2,r7
-	inci_h_gr	4,r7
-	testr_h_dr	r7,rp
-	testr_h_gr	1,r0
-	save_rp
-
-	set_cc          0x0f		; condition codes shouldn't change
-call3:
-	call		func3
-	testr_h_gr	2,r0
-	restore_rp
-	ret
-func3:
-	test_cc		1 1 1 1
-	mvi_h_gr	#call3,r7
-	inci_h_gr	2,r7
-	testr_h_dr	r7,rp
-	save_rp
-
-	set_cc          0x0f		; condition codes shouldn't change
-call4:
-	call:d		func4
-	ldi:8		1,r0		; Must assume this works
-	testr_h_gr	3,r0
-	restore_rp
-	ret:d
-	ldi:8		2,r0		; Must assume this works
-func4:
-	test_cc		1 1 1 1
-	mvi_h_gr	#call4,r7
-	inci_h_gr	4,r7
-	testr_h_dr	r7,rp
-	testr_h_gr	1,r0
-	mvi_h_gr	0xbeefdead,r9
-	ret:d
-	ldi:8		3,r0		; Must assume this works
-
-	fail
diff --git a/sim/testsuite/sim/fr30/reti.cgs b/sim/testsuite/sim/fr30/reti.cgs
deleted file mode 100644
index 76a1af0bb82..00000000000
--- a/sim/testsuite/sim/fr30/reti.cgs
+++ /dev/null
@@ -1,57 +0,0 @@
-# fr30 testcase for reti
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global reti
-reti:
-	; Test reti with low reset of ilm allowed
-	mvr_h_gr	sp,r8		; Save stack pointer
-	set_s_system
-	set_i		1
-	set_ilm		15		; attempt reset of low range	 
-	set_cc          0x0f		; Condition codes should not change
-	save_ps
-	inci_h_gr	-4,sp
-	mvi_h_mem	ret1,sp
-	set_i		0		; Set opposite of expected
-	set_ilm		0 		; attempt reset of low range	 
-	set_cc          0x00		; Set opposite of expected
-
-	reti
-	fail
-
-ret1:
-	test_cc		1 1 1 1
-	test_s_system
-	test_i		1
-	test_ilm	15
-	testr_h_gr	r8,sp
-
-	; Test reti with low reset of ilm not allowed
-	mvr_h_gr	sp,r8		; Save stack pointer
-	set_s_system
-	set_i		0
-	set_ilm		15		; attempt reset of low range	 
-	set_cc          0x0f		; Condition codes should not change
-	save_ps
-	inci_h_gr	-4,sp
-	mvi_h_mem	ret2,sp
-	set_i		0		; Set opposite of expected
-	set_ilm		16 		; disallow reset of low range
-	set_cc          0x00		; Set opposite of expected
-
-	reti
-	fail
-
-ret2:
-	test_cc		1 1 1 1
-	test_s_system
-	test_i		0
-	test_ilm	31
-	testr_h_gr	r8,sp
-
-	pass
diff --git a/sim/testsuite/sim/fr30/st.cgs b/sim/testsuite/sim/fr30/st.cgs
deleted file mode 100644
index e458d14001b..00000000000
--- a/sim/testsuite/sim/fr30/st.cgs
+++ /dev/null
@@ -1,194 +0,0 @@
-# fr30 testcase for
-# mach(): fr30
-#  st $Ri,@$Rj
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global st
-st:
-	mvr_h_gr	sp,r9		; Save stack pointer
-	; Test st $Ri,@Rj
-	mvi_h_gr	0xdeadbeef,r8
-	set_cc          0x0f		; Condition codes should not change
-	st      	r8,@sp
-	test_cc		1 1 1 1
-	test_h_mem	0xdeadbeef,sp
-	test_h_gr	0xdeadbeef,r8
-
-	; Test st $Ri,@(R13,Rj)
-	mvi_h_gr	0xbeefdead,r8
-	mvr_h_gr	sp,r1
-	inci_h_gr	-8,sp
-	mvr_h_gr	sp,r2
-	inci_h_gr	4,sp
-
-	mvi_h_gr	4,r13
-	set_cc          0x0e		; Condition codes should not change
-	st      	r8,@(r13,sp)
-	test_cc		1 1 1 0
-	test_h_mem	0xbeefdead,r1
-	test_h_gr	0xbeefdead,r8
-
-	mvi_h_gr	0,r13
-	set_cc          0x0d		; Condition codes should not change
-	st      	r8,@(r13,sp)
-	test_cc		1 1 0 1
-	test_h_mem	0xbeefdead,sp
-	test_h_gr	0xbeefdead,r8
-
-	mvi_h_gr	-4,r13
-	set_cc          0x0c		; Condition codes should not change
-	st      	r8,@(r13,sp)
-	test_cc		1 1 0 0
-	test_h_mem	0xbeefdead,r2
-	test_h_gr	0xbeefdead,r8
-
-	; Test st $Ri,@(R14,$disp10)
-	mvi_h_gr	0xdeadbeef,r8
-	mvr_h_gr	r9,sp		; Restore stack pointer
-	mvr_h_gr	sp,r14
-	inci_h_gr	-508,r14
-	mvr_h_gr	r14,r2
-	inci_h_gr	-512,r14
-	mvr_h_gr	r14,r3
-	inci_h_gr	512,r14
-
-	set_cc          0x0b		; Condition codes should not change
-	st      	r8,@(r14,508)
-	test_cc		1 0 1 1
-	test_h_mem	0xdeadbeef,r1
-	test_h_gr	0xdeadbeef,r8
-
-	set_cc          0x0a		; Condition codes should not change
-	st      	r8,@(r14,0)
-	test_cc		1 0 1 0
-	test_h_mem	0xdeadbeef,r2
-	test_h_gr	0xdeadbeef,r8
-
-	set_cc          0x09		; Condition codes should not change
-	st      	r8,@(r14,-512)
-	test_cc		1 0 0 1
-	test_h_mem	0xdeadbeef,r3
-	test_h_gr	0xdeadbeef,r8
-
-	; Test st $Ri,@(R15,$udisp6)
-	mvi_h_gr	0xbeefdead,r8
-	mvr_h_gr	r9,sp		; Restore stack pointer
-	inci_h_gr	-60,sp
-
-	set_cc          0x08		; Condition codes should not change
-	st      	r8,@(r15,60)
-	test_cc		1 0 0 0
-	test_h_mem	0xbeefdead,r9
-	test_h_gr	0xbeefdead,r8
-
-	set_cc          0x07		; Condition codes should not change
-	st      	r8,@(r15,0)
-	test_cc		0 1 1 1
-	test_h_mem	0xbeefdead,r9
-	test_h_gr	0xbeefdead,r8
-
-	; Test st $Ri,@-R15
-	mvr_h_gr	r9,sp		; Restore stack pointer
-	mvr_h_gr	r9,r10
-
-	set_cc          0x06		; Condition codes should not change
-	st      	r15,@-r15
-	test_cc		0 1 1 0
-	testr_h_mem	r9,sp		; original value stored
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	mvi_h_gr	0xdeadbeef,r8
-	set_cc          0x05		; Condition codes should not change
-	st      	r8,@-r15
-	test_cc		0 1 0 1
-	test_h_mem	0xdeadbeef,sp
-	test_h_gr	0xdeadbeef,r8
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	; Test st $Rs,@-R15
-	mvr_h_gr	r9,sp		; Restore stack pointer
-	mvr_h_gr	r9,r10
-	mvi_h_dr	0xbeefdead,tbr
-	mvi_h_dr	0xdeadbeef,rp
-	mvi_h_dr	0x0000dead,mdh
-	mvi_h_dr	0xbeef0000,mdl
-
-	set_cc          0x04		; Condition codes should not change
-	st      	tbr,@-r15
-	test_cc		0 1 0 0
-	test_h_mem	0xbeefdead,sp
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	set_cc          0x03		; Condition codes should not change
-	st      	rp,@-r15
-	test_cc		0 0 1 1
-	test_h_mem	0xdeadbeef,sp
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	set_cc          0x02		; Condition codes should not change
-	st      	mdh,@-r15
-	test_cc		0 0 1 0
-	test_h_mem	0x0000dead,sp
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	set_cc          0x01		; Condition codes should not change
-	st      	mdl,@-r15
-	test_cc		0 0 0 1
-	test_h_mem	0xbeef0000,sp
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	mvr_h_gr	sp,usp
-	set_s_user
-	set_cc          0x00		; Condition codes should not change
-	st      	ssp,@-r15
-	test_cc		0 0 0 0
-	testr_h_mem	r10,sp
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	set_cc          0x00		; Condition codes should not change
-	st      	usp,@-r15
-	test_cc		0 0 0 0
-	testr_h_mem	r10,sp		; original value stored
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	mvr_h_gr	sp,ssp
-	set_s_system
-	set_cc          0x00		; Condition codes should not change
-	st      	usp,@-r15
-	test_cc		0 0 0 0
-	testr_h_mem	r10,sp
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	set_cc          0x00		; Condition codes should not change
-	st      	ssp,@-r15
-	test_cc		0 0 0 0
-	testr_h_mem	r10,sp		; original value stored
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	; Test st $PS,@-R15
-	mvr_h_gr	r9,sp		; Restore stack pointer
-	mvr_h_gr	r9,r10
-
-	set_cc          0x0f		; Condition codes affect result
-	set_dbits	3		; Division bits affect result
-	st      	ps,@-r15
-	test_cc		1 1 1 1
-	test_h_mem	0x0000060f,sp
-	inci_h_gr	-4,r10
-	testr_h_gr	r10,sp		; was decremented
-
-	pass
diff --git a/sim/testsuite/sim/fr30/stb.cgs b/sim/testsuite/sim/fr30/stb.cgs
deleted file mode 100644
index edbf4f22c7e..00000000000
--- a/sim/testsuite/sim/fr30/stb.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# fr30 testcase for
-# mach(): fr30
-#  stb $Ri,@$Rj
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global stb
-stb:
-	mvr_h_gr	sp,r9		; Save stack pointer
-	; Test stb $Ri,@Rj
-	mvi_h_mem	0xdeadbeef,sp
-	mvi_h_gr	0xaaaaaafe,r8
-	set_cc          0x0f		; Condition codes should not change
-	stb      	r8,@sp
-	test_cc		1 1 1 1
-	test_h_mem	0xfeadbeef,sp
-	test_h_gr	0xaaaaaafe,r8
-
-	; Test stb $Ri,@(R13,Rj)
-	mvi_h_mem	0xbeefdead,sp
-	mvi_h_gr	0xaaaaaade,r8
-	mvr_h_gr	sp,r1
-	inci_h_gr	-8,sp
-	mvr_h_gr	sp,r2
-	mvi_h_mem	0xbeefdead,sp
-	inci_h_gr	4,sp
-	mvi_h_mem	0xbeefdead,sp
-
-	mvi_h_gr	4,r13
-	set_cc          0x0e		; Condition codes should not change
-	stb      	r8,@(r13,sp)
-	test_cc		1 1 1 0
-	test_h_mem	0xdeefdead,r1
-	test_h_gr	0xaaaaaade,r8
-
-	mvi_h_gr	0,r13
-	set_cc          0x0d		; Condition codes should not change
-	stb      	r8,@(r13,sp)
-	test_cc		1 1 0 1
-	test_h_mem	0xdeefdead,sp
-	test_h_gr	0xaaaaaade,r8
-
-	mvi_h_gr	-4,r13
-	set_cc          0x0c		; Condition codes should not change
-	stb      	r8,@(r13,sp)
-	test_cc		1 1 0 0
-	test_h_mem	0xdeefdead,r2
-	test_h_gr	0xaaaaaade,r8
-
-	; Test stb $Ri,@(R14,$disp8
-	mvr_h_gr	r9,sp		; Restore stack pointer
-	mvi_h_gr	0xaaaaaafe,r8
-	mvi_h_mem	0xdeadbeef,sp
-	mvr_h_gr	sp,r14
-	inci_h_gr	-128,r14	; must be aligned
-	mvi_h_mem	0xdeadbeef,r14
-	mvr_h_gr	r14,r2
-	inci_h_gr	-128,r14	; must be aligned
-	mvi_h_mem	0xdeadbeef,r14
-	mvr_h_gr	r14,r3
-	inci_h_gr	129,r14
-
-	set_cc          0x0b		; Condition codes should not change
-	stb      	r8,@(r14,127)
-	test_cc		1 0 1 1
-	test_h_mem	0xfeadbeef,r1
-	test_h_gr	0xaaaaaafe,r8
-
-	set_cc          0x0a		; Condition codes should not change
-	stb      	r8,@(r14,0)
-	test_cc		1 0 1 0
-	test_h_mem	0xdefebeef,r2
-	test_h_gr	0xaaaaaafe,r8
-
-	set_cc          0x09		; Condition codes should not change
-	stb      	r8,@(r14,-128)
-	test_cc		1 0 0 1
-	test_h_mem	0xdefebeef,r3
-	test_h_gr	0xaaaaaafe,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/sth.cgs b/sim/testsuite/sim/fr30/sth.cgs
deleted file mode 100644
index 8c4a1156b92..00000000000
--- a/sim/testsuite/sim/fr30/sth.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# fr30 testcase for
-# mach(): fr30
-#  sth $Ri,@$Rj
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global sth
-sth:
-	mvr_h_gr	sp,r9		; Save stack pointer
-	; Test sth $Ri,@Rj
-	mvi_h_mem	0xdeadbeef,sp
-	mvi_h_gr	0xaaaabeef,r8
-	set_cc          0x0f		; Condition codes should not change
-	sth      	r8,@sp
-	test_cc		1 1 1 1
-	test_h_mem	0xbeefbeef,sp
-	test_h_gr	0xaaaabeef,r8
-
-	; Test sth $Ri,@(R13,Rj)
-	mvi_h_mem	0xbeefdead,sp
-	mvi_h_gr	0xaaaadead,r8
-	mvr_h_gr	sp,r1
-	inci_h_gr	-8,sp
-	mvr_h_gr	sp,r2
-	mvi_h_mem	0xbeefdead,sp
-	inci_h_gr	4,sp
-	mvi_h_mem	0xbeefdead,sp
-
-	mvi_h_gr	4,r13
-	set_cc          0x0e		; Condition codes should not change
-	sth      	r8,@(r13,sp)
-	test_cc		1 1 1 0
-	test_h_mem	0xdeaddead,r1
-	test_h_gr	0xaaaadead,r8
-
-	mvi_h_gr	0,r13
-	set_cc          0x0d		; Condition codes should not change
-	sth      	r8,@(r13,sp)
-	test_cc		1 1 0 1
-	test_h_mem	0xdeaddead,sp
-	test_h_gr	0xaaaadead,r8
-
-	mvi_h_gr	-4,r13
-	set_cc          0x0c		; Condition codes should not change
-	sth      	r8,@(r13,sp)
-	test_cc		1 1 0 0
-	test_h_mem	0xdeaddead,r2
-	test_h_gr	0xaaaadead,r8
-
-	; Test sth $Ri,@(R14,$disp9)
-	mvr_h_gr	r9,sp		; Restore stack pointer
-	mvi_h_gr	0xaaaaabcd,r8
-	mvi_h_mem	0xdeadbeef,sp
-	mvr_h_gr	sp,r14
-	inci_h_gr	-256,r14	; must be aligned
-	mvr_h_gr	r14,r2
-	mvi_h_mem	0xdeadbeef,r14
-	inci_h_gr	-256,r14
-	mvr_h_gr	r14,r3
-	mvi_h_mem	0xdeadbeef,r14
-	inci_h_gr	258,r14
-
-	set_cc          0x0b		; Condition codes should not change
-	sth      	r8,@(r14,254)
-	test_cc		1 0 1 1
-	test_h_mem	0xabcdbeef,r1
-	test_h_gr	0xaaaaabcd,r8
-
-	set_cc          0x0a		; Condition codes should not change
-	sth      	r8,@(r14,0)
-	test_cc		1 0 1 0
-	test_h_mem	0xdeadabcd,r2
-	test_h_gr	0xaaaaabcd,r8
-
-	set_cc          0x09		; Condition codes should not change
-	sth      	r8,@(r14,-256)
-	test_cc		1 0 0 1
-	test_h_mem	0xdeadabcd,r3
-	test_h_gr	0xaaaaabcd,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/stilm.cgs b/sim/testsuite/sim/fr30/stilm.cgs
deleted file mode 100644
index 197940bbf4f..00000000000
--- a/sim/testsuite/sim/fr30/stilm.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# fr30 testcase for stilm $i8
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global stilm
-stilm:
-	stilm      	0
-	test_ilm	0
-
-	stilm		0xe0
-	test_ilm	0
-
-	stilm		1
-	test_ilm	1
-
-	stilm		15
-	test_ilm	15
-
-	stilm		16
-	test_ilm	16
-
-	stilm		0
-	test_ilm	16
-
-	stilm		1
-	test_ilm	17
-
-	stilm		18
-	test_ilm	18
-
-	stilm		31
-	test_ilm	31
-
-	stilm		0xff
-	test_ilm	31
-
-	pass
diff --git a/sim/testsuite/sim/fr30/stm0.cgs b/sim/testsuite/sim/fr30/stm0.cgs
deleted file mode 100644
index 5cc162c1a31..00000000000
--- a/sim/testsuite/sim/fr30/stm0.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# fr30 testcase for stm0 ($reglist_low)
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global stm0
-stm0:
-	; Test stm0 ($reglist_low)
-	mvr_h_gr	sp,r8		; save stack pointer temporarily
-	mvr_h_gr	sp,r9		; save stack pointer permanently
-	mvi_h_gr   	0,r0
-	mvi_h_gr   	1,r1
-	mvi_h_gr   	2,r2
-	mvi_h_gr   	3,r3
-	mvi_h_gr   	4,r4
-	mvi_h_gr   	5,r5
-	mvi_h_gr   	6,r6
-	mvi_h_gr   	7,r7
-	set_cc          0x0f		; Condition codes should not change
-	stm0      	(r0,r2,r4,r6)
-	test_cc		1 1 1 1
-	inci_h_gr	-4,r8
-	test_h_mem	6,r8
-	inci_h_gr	-4,r8
-	test_h_mem	4,r8
-	inci_h_gr	-4,r8
-	test_h_mem	2,r8
-	inci_h_gr	-4,r8
-	test_h_mem	0,r8
-
-	mvr_h_gr	r9,sp		; restore stack pointer
-	mvr_h_gr	r9,r8		; save stack pointer temporarily
-	mvi_h_gr   	0,r0
-	mvi_h_gr   	1,r1
-	mvi_h_gr   	2,r2
-	mvi_h_gr   	3,r3
-	mvi_h_gr   	4,r4
-	mvi_h_gr   	5,r5
-	mvi_h_gr   	6,r6
-	mvi_h_gr   	7,r7
-	set_cc          0x0f		; Condition codes should not change
-	stm0      	(r1,r3,r5,r7)
-	test_cc		1 1 1 1
-	inci_h_gr	-4,r8
-	test_h_mem	7,r8
-	inci_h_gr	-4,r8
-	test_h_mem	5,r8
-	inci_h_gr	-4,r8
-	test_h_mem	3,r8
-	inci_h_gr	-4,r8
-	test_h_mem	1,r8
-
-	mvr_h_gr	r9,sp		; restore stack pointer
-	mvr_h_gr	r9,r8		; save stack pointer temporarily
-	mvi_h_gr   	0,r0
-	mvi_h_gr   	1,r1
-	mvi_h_gr   	2,r2
-	mvi_h_gr   	3,r3
-	mvi_h_gr   	4,r4
-	mvi_h_gr   	5,r5
-	mvi_h_gr   	6,r6
-	mvi_h_gr   	7,r7
-	set_cc          0x0f		; Condition codes should not change
-	stm0      	(r1,r5,r7,r3)	; Order specified should not matter
-	test_cc		1 1 1 1
-	inci_h_gr	-4,r8
-	test_h_mem	7,r8
-	inci_h_gr	-4,r8
-	test_h_mem	5,r8
-	inci_h_gr	-4,r8
-	test_h_mem	3,r8
-	inci_h_gr	-4,r8
-	test_h_mem	1,r8
-
-	mvr_h_gr	r9,sp		; restore stack pointer
-	mvr_h_gr	r9,r8		; save stack pointer temporarily
-	mvi_h_gr   	9,r0
-	mvi_h_gr   	9,r1
-	mvi_h_gr   	9,r2
-	mvi_h_gr   	9,r3
-	mvi_h_gr   	9,r4
-	mvi_h_gr   	9,r5
-	mvi_h_gr   	9,r6
-	mvi_h_gr   	9,r7
-	set_cc          0x0f		; Condition codes should not change
-	stm0      	()		; should do nothing
-	test_cc		1 1 1 1
-	testr_h_gr	r9,sp
-	inci_h_gr	-4,r8
-	test_h_mem	7,r8
-	inci_h_gr	-4,r8
-	test_h_mem	5,r8
-	inci_h_gr	-4,r8
-	test_h_mem	3,r8
-	inci_h_gr	-4,r8
-	test_h_mem	1,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/stm1.cgs b/sim/testsuite/sim/fr30/stm1.cgs
deleted file mode 100644
index 2ac373d3544..00000000000
--- a/sim/testsuite/sim/fr30/stm1.cgs
+++ /dev/null
@@ -1,97 +0,0 @@
-# fr30 testcase for stm1 ($reglist_low)
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global stm1
-stm1:
-	; Test stm1 ($reglist_low)
-	mvr_h_gr	sp,r1		; save stack pointer temporarily
-	mvr_h_gr	sp,r2		; save stack pointer permanently
-	mvi_h_gr   	8,r8
-	mvi_h_gr   	9,r9
-	mvi_h_gr   	10,r10
-	mvi_h_gr   	11,r11
-	mvi_h_gr   	12,r12
-	mvi_h_gr   	13,r13
-	mvi_h_gr   	14,r14
-	set_cc          0x0f		; Condition codes should not change
-	stm1      	(r8,r10,r12,r14)
-	test_cc		1 1 1 1
-	inci_h_gr	-4,r1
-	test_h_mem	14,r1
-	inci_h_gr	-4,r1
-	test_h_mem	12,r1
-	inci_h_gr	-4,r1
-	test_h_mem	10,r1
-	inci_h_gr	-4,r1
-	testr_h_mem	8,r1
-
-	mvr_h_gr	r2,sp		; restore stack pointer
-	mvr_h_gr	r2,r1		; save stack pointer temporarily
-	mvi_h_gr   	8,r8
-	mvi_h_gr   	9,r9
-	mvi_h_gr   	10,r10
-	mvi_h_gr   	11,r11
-	mvi_h_gr   	12,r12
-	mvi_h_gr   	13,r13
-	mvi_h_gr   	14,r14
-	set_cc          0x0f		; Condition codes should not change
-	stm1      	(r9,r11,r13,r15)
-	test_cc		1 1 1 1
-	inci_h_gr	-4,r1
-	testr_h_mem	r2,r1
-	inci_h_gr	-4,r1
-	test_h_mem	13,r1
-	inci_h_gr	-4,r1
-	test_h_mem	11,r1
-	inci_h_gr	-4,r1
-	test_h_mem	9,r1		; saved r15 is from before stm1
-
-	mvr_h_gr	r2,sp		; restore stack pointer
-	mvr_h_gr	r2,r1		; save stack pointer temporarily
-	mvi_h_gr   	8,r8
-	mvi_h_gr   	9,r9
-	mvi_h_gr   	10,r10
-	mvi_h_gr   	11,r11
-	mvi_h_gr   	12,r12
-	mvi_h_gr   	13,r13
-	mvi_h_gr   	14,r14
-	set_cc          0x0f		; Condition codes should not change
-	stm1      	(r9,r13,r15,r11); Order specified should not matter
-	test_cc		1 1 1 1
-	inci_h_gr	-4,r1
-	testr_h_mem	r2,r1
-	inci_h_gr	-4,r1
-	test_h_mem	13,r1
-	inci_h_gr	-4,r1
-	test_h_mem	11,r1
-	inci_h_gr	-4,r1
-	test_h_mem	9,r1		; saved r15 is from before stm1
-
-	mvr_h_gr	r2,sp		; restore stack pointer
-	mvr_h_gr	r2,r1		; save stack pointer temporarily
-	mvi_h_gr   	9,r8
-	mvi_h_gr   	9,r9
-	mvi_h_gr   	9,r10
-	mvi_h_gr   	9,r11
-	mvi_h_gr   	9,r12
-	mvi_h_gr   	9,r13
-	mvi_h_gr   	9,r14
-	set_cc          0x0f		; Condition codes should not change
-	stm1      	()		; should do nothing
-	test_cc		1 1 1 1
-	testr_h_gr	r2,sp
-	inci_h_gr	-4,r1
-	testr_h_mem	r2,r1
-	inci_h_gr	-4,r1
-	test_h_mem	13,r1
-	inci_h_gr	-4,r1
-	test_h_mem	11,r1
-	inci_h_gr	-4,r1
-	test_h_mem	9,r1
-
-	pass
diff --git a/sim/testsuite/sim/fr30/stres.cgs b/sim/testsuite/sim/fr30/stres.cgs
deleted file mode 100644
index a85fdf3f9f4..00000000000
--- a/sim/testsuite/sim/fr30/stres.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# fr30 testcase for stres $@Ri+,$u4
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global stres
-stres:
-	; Test stres $@Ri+,$u4
-	; The current implementation simply increments Ri
-	mvi_h_gr   	0x1000,r7
-	set_cc          0x0f		; Condition codes are irrelevent
-	stres      	0,@r7+
-	test_cc		1 1 1 1
-	test_h_gr  	0x1004,r7
-
-	mvi_h_gr   	0x1000,r7
-	set_cc          0x0f		; Condition codes are irrelevent
-	stres      	0xf,@r7+
-	test_cc		1 1 1 1
-	test_h_gr  	0x1004,r7
-
-	pass
diff --git a/sim/testsuite/sim/fr30/sub.cgs b/sim/testsuite/sim/fr30/sub.cgs
deleted file mode 100644
index eceaa79c5c6..00000000000
--- a/sim/testsuite/sim/fr30/sub.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for sub $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global sub
-sub:
-	; Test sub $Rj,$Ri
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of expected
-	sub      	r7,r8
-	test_cc		0 0 0 0
-	test_h_gr  	1,r8
-
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0d		; Set mask opposite of expected
-	sub		r7,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x7fffffff,r8
-
-	set_cc          0x0b		; Set mask opposite of expected
-	sub		r8,r8
-	test_cc		0 1 0 0
-	test_h_gr  	0,r8
-
-	set_cc          0x06		; Set mask opposite of expected
-	sub		r7,r8
-	test_cc		1 0 0 1
-	test_h_gr  	0xffffffff,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/subc.cgs b/sim/testsuite/sim/fr30/subc.cgs
deleted file mode 100644
index 2978e40c38d..00000000000
--- a/sim/testsuite/sim/fr30/subc.cgs
+++ /dev/null
@@ -1,62 +0,0 @@
-# fr30 testcase for subc $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global subc
-subc:
-	; Test subc $Rj,$Ri
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	2,r8
-	set_cc          0x0e		; Make sure carry is off
-	subc      	r7,r8
-	test_cc		0 0 0 0
-	test_h_gr  	1,r8
-
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0c		; Make sure carry is off
-	subc		r7,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x7fffffff,r8
-
-	set_cc          0x0a		; Make sure carry is off
-	subc		r8,r8
-	test_cc		0 1 0 0
-	test_h_gr  	0,r8
-
-	set_cc          0x06		; Make sure carry is off
-	subc		r7,r8
-	test_cc		1 0 0 1
-	test_h_gr  	0xffffffff,r8
-
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	3,r8
-	set_cc          0x0f		; Make sure carry is on
-	subc      	r7,r8
-	test_cc		0 0 0 0
-	test_h_gr  	1,r8
-
-	mvi_h_gr   	0,r7
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0d		; Make sure carry is on
-	subc		r7,r8
-	test_cc		0 0 1 0
-	test_h_gr  	0x7fffffff,r8
-
-	mvi_h_gr  	0x7ffffffe,r7
-	set_cc          0x0b		; Make sure carry is on
-	subc		r7,r8
-	test_cc		0 1 0 0
-	test_h_gr  	0,r8
-
-	mvi_h_gr   	0,r7
-	set_cc          0x07		; Make sure carry is on
-	subc		r7,r8
-	test_cc		1 0 0 1
-	test_h_gr  	0xffffffff,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/subn.cgs b/sim/testsuite/sim/fr30/subn.cgs
deleted file mode 100644
index c4830468d22..00000000000
--- a/sim/testsuite/sim/fr30/subn.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# fr30 testcase for subn $Rj,$Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global subn
-subn:
-	; Test subn $Rj,$Ri
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	2,r8
-	set_cc          0x0f		; Set mask opposite of usual result
-	subn      	r7,r8
-	test_cc		1 1 1 1
-	test_h_gr  	1,r8
-
-	mvi_h_gr   	1,r7
-	mvi_h_gr   	0x80000000,r8
-	set_cc          0x0d		; Set mask opposite of usual result
-	subn		r7,r8
-	test_cc		1 1 0 1
-	test_h_gr  	0x7fffffff,r8
-
-	set_cc          0x0b		; Set mask opposite of usual result
-	subn		r8,r8
-	test_cc		1 0 1 1
-	test_h_gr  	0,r8
-
-	set_cc          0x06		; Set mask opposite of usual result
-	subn		r7,r8
-	test_cc		0 1 1 0
-	test_h_gr  	0xffffffff,r8
-
-	pass
diff --git a/sim/testsuite/sim/fr30/testutils.inc b/sim/testsuite/sim/fr30/testutils.inc
deleted file mode 100644
index 7523d6f6aa5..00000000000
--- a/sim/testsuite/sim/fr30/testutils.inc
+++ /dev/null
@@ -1,306 +0,0 @@
-# r0, r4-r6 are used as tmps, consider them call clobbered by these macros.
-
-	.macro start
-	.data
-failmsg:
-	.ascii "fail\n"
-passmsg:
-	.ascii "pass\n"
-	.text
-	.global _start
-_start:
-	ldi32 0x7fffc,sp	; TODO -- what's a good value for this?
-	ldi32 0xffc00,r0
-	mov   r0,tbr		; defined in manual
-	mov   sp,usp
-	mov   sp,ssp
-	.endm
-
-; Exit with return code
-	.macro exit rc
-	ldi32 \rc,r4
-	ldi32 #1,r0
-	int   #10
-	.endm
-
-; Pass the test case
-	.macro pass
-	ldi32 #5,r6
-	ldi32 #passmsg,r5
-	ldi32 #1,r4
-	ldi32 #5,r0
-	int   #10
-	exit  #0
-	.endm
-
-; Fail the testcase
-	.macro fail
-	ldi32 #5,r6
-	ldi32 #failmsg,r5
-	ldi32 #1,r4
-	ldi32 #5,r0
-	int   #10
-	exit  #1
-	.endm
-
-; Load an immediate value into a general register
-; TODO: use minimal sized insn
-	.macro mvi_h_gr val reg
-	ldi32 \val,\reg
-	.endm
-
-; Load an immediate value into a dedicated register
-	.macro mvi_h_dr val reg
-	ldi32 \val,r0
-	mov r0,\reg
-	.endm
-
-; Load a general register into another general register
-	.macro mvr_h_gr src targ
-	mov \src,\targ
-	.endm
-
-; Store an immediate into a word in memory
-	.macro mvi_h_mem val addr
-	mvi_h_gr  \val r4
-	mvr_h_mem r4,\addr
-	.endm
-
-; Store a register into a word in memory
-	.macro mvr_h_mem reg addr
-	st \reg,@\addr
-	.endm
-
-; Store the current ps on the stack
-	.macro save_ps
-	st ps,@-r15
-	.endm
-
-; Load a word value from memory
-	.macro ldmem_h_gr addr reg
-	ld @\addr,\reg
-	.endm
-
-; Add 2 general registers
-	.macro add_h_gr reg1 reg2
-	add \reg1,\reg2
-	.endm
-
-; Increment a register by and immediate
-	.macro inci_h_gr inc reg
-	mvi_h_gr \inc,r4
-	add r4,\reg
-	.endm
-
-; Test the value of an immediate against a general register
-	.macro test_h_gr val reg
-	.if (\val >= 0) && (\val <= 15)
-	cmp \val,\reg
-	.else
-	.if (\val < 0) && (\val >= -16)
-	cmp2 \val,\reg
-	.else
-	ldi32 \val,r4
-	cmp r4,\reg
-	.endif
-	.endif
-	beq test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-; compare two general registers
-	.macro testr_h_gr reg1 reg2
-	cmp \reg1,\reg2
-	beq testr_gr\@
-	fail
-testr_gr\@:
-	.endm
-
-; Test the value of an immediate against a dedicated register
-	.macro test_h_dr val reg
-	mov \reg,r5
-	test_h_gr \val r5
-	.endm
-
-; Test the value of an general register against a dedicated register
-	.macro testr_h_dr gr dr
-	mov \dr,r5
-	testr_h_gr \gr r5
-	.endm
-
-; Compare an immediate with word in memory
-	.macro test_h_mem val addr
-	ldmem_h_gr \addr r5
-	test_h_gr \val r5
-	.endm
-
-; Compare a general register with word in memory
-	.macro testr_h_mem reg addr
-	ldmem_h_gr \addr r5
-	testr_h_gr \reg r5
-	.endm
-
-; Set the condition codes
-	.macro set_cc mask
-	andccr	0xf0
-	orccr	\mask
-	.endm
-
-; Set the stack mode
-	.macro set_s_user
-	orccr	0x20
-	.endm
-
-	.macro set_s_system
-	andccr	0x1f
-	.endm
-
-; Test the stack mode
-	.macro test_s_user
-	mvr_h_gr ps,r0
-	mvi_h_gr 0x20,r4
-	and      r4,r0
-	test_h_gr 0x20,r0
-	.endm
-
-	.macro test_s_system
-	mvr_h_gr ps,r0
-	mvi_h_gr 0x20,r4
-	and      r4,r0
-	test_h_gr 0x0,r0
-	.endm
-
-; Set the interrupt bit
-	.macro set_i val
-	.if (\val == 1)
-	orccr	0x10
-	.else
-	andccr	0x2f
-	.endif
-	.endm
-
-; Test the stack mode
-	.macro test_i val
-	mvr_h_gr  ps,r0
-	mvi_h_gr  0x10,r4
-	and       r4,r0
-	.if (\val == 1)
-	test_h_gr 0x10,r0
-	.else
-	test_h_gr 0x0,r0
-	.endif
-	.endm
-
-; Set the ilm
-	.macro set_ilm val
-	stilm \val
-	.endm
-
-; Test the ilm
-	.macro test_ilm val
-	mvr_h_gr   ps,r0
-	mvi_h_gr   0x1f0000,r4
-	and        r4,r0
-	mvi_h_gr   \val,r5
-	mvi_h_gr   0x1f,r4
-	and	   r4,r5
-	lsl        15,r5
-	lsl        1,r5
-	testr_h_gr r0,r5
-	.endm
-
-; Test the condition codes
-	.macro test_cc N Z V C
-	.if (\N == 1)
-	bp fail\@
-	.else
-	bn fail\@
-	.endif
-	.if (\Z == 1)
-	bne fail\@
-	.else
-	beq fail\@
-	.endif
-	.if (\V == 1)
-	bnv fail\@
-	.else
-	bv fail\@
-	.endif
-	.if (\C == 1)
-	bnc fail\@
-	.else
-	bc fail\@
-	.endif
-	bra test_cc\@
-fail\@:
-	fail
-test_cc\@:
-	.endm
-
-; Set the division bits
-	.macro set_dbits val
-	mvr_h_gr ps,r5
-	mvi_h_gr 0xfffff8ff,r4
-	and r4,r5
-	mvi_h_gr \val,r0
-	mvi_h_gr 3,r4
-	and r4,r0
-	lsl 9,r0
-	or r0,r5
-	mvr_h_gr r5,ps
-	.endm
-
-; Test the division bits
-	.macro test_dbits val
-	mvr_h_gr ps,r0
-	lsr 9,r0
-	mvi_h_gr 3,r4
-	and r4,r0
-	test_h_gr \val,r0
-	.endm
-
-; Save the return pointer
-	.macro save_rp
-	st rp,@-R15
-	.ENDM
-
-; restore the return pointer
-	.macro restore_rp
-	ld @R15+,rp
-	.endm
-
-; Ensure branch taken
-	.macro take_branch opcode
-	\opcode take_br\@
-	fail
-take_br\@:
-	.endm
-
-	.macro take_branch_d opcode val
-	\opcode take_brd\@
-	ldi:8 \val,r0
-	fail
-take_brd\@:
-	test_h_gr \val,r0
-	.endm
-
-; Ensure branch not taken
-	.macro no_branch opcode
-	\opcode no_brf\@
-	bra	no_brs\@
-no_brf\@:
-	fail
-no_brs\@:
-	.endm
-
-	.macro no_branch_d opcode val
-	\opcode no_brdf\@
-	ldi:8   \val,r0
-	bra	no_brds\@
-no_brdf\@:
-	fail
-no_brds\@:
-	test_h_gr \val,r0
-	.endm
-
diff --git a/sim/testsuite/sim/fr30/xchb.cgs b/sim/testsuite/sim/fr30/xchb.cgs
deleted file mode 100644
index 3450a2e34cd..00000000000
--- a/sim/testsuite/sim/fr30/xchb.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# fr30 testcase for xchb @$Rj,Ri
-# mach(): fr30
-
-	.include "testutils.inc"
-
-	START
-
-	.text
-	.global xchb
-xchb:
-	; Test xchb @$Rj,Ri
-	mvi_h_mem	0xdeadbeef,sp
-	mvi_h_gr	0xbeefdead,r0
-	set_cc	0x0f			; Condition codes are irrelevent
-	xchb		@sp,r0
-	test_cc	1 1 1 1
-	test_h_gr	0xde,r0
-	test_h_mem	0xadadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/add.cgs b/sim/testsuite/sim/frv/add.cgs
deleted file mode 100644
index 54fdfd5daa4..00000000000
--- a/sim/testsuite/sim/frv/add.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# frv testcase for add $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	add      	gr7,gr8,gr8
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	add		gr7,gr8,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	add		gr8,gr8,gr8
-	test_gr_immed  	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/add.pcgs b/sim/testsuite/sim/frv/add.pcgs
deleted file mode 100644
index cf49976d440..00000000000
--- a/sim/testsuite/sim/frv/add.pcgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv parallel testcase for add $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	add.p      	gr7,gr8,gr8
-	add      	gr7,gr8,gr9
-	add.p      	gr7,gr8,gr10
-	add      	gr7,gr8,gr11
-	add.p      	gr7,gr8,gr12
-	add      	gr7,gr8,gr13
-	test_gr_immed  	3,gr8
-	test_gr_immed  	3,gr9
-	test_gr_immed  	4,gr10
-	test_gr_immed  	4,gr11
-	test_gr_immed  	4,gr12
-	test_gr_immed  	4,gr13
-
-	pass
diff --git a/sim/testsuite/sim/frv/addcc.cgs b/sim/testsuite/sim/frv/addcc.cgs
deleted file mode 100644
index d2e33d8fa2a..00000000000
--- a/sim/testsuite/sim/frv/addcc.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# frv testcase for addcc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global addcc
-addcc:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	addcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	addcc		gr7,gr8,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x08,0		; Set mask opposite of expected
-	addcc		gr8,gr8,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	addcc		gr8,gr8,gr8,icc0; test zero, carry and overflow bits
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-
-
-	pass
diff --git a/sim/testsuite/sim/frv/addi.cgs b/sim/testsuite/sim/frv/addi.cgs
deleted file mode 100644
index 3d60c5d9acf..00000000000
--- a/sim/testsuite/sim/frv/addi.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for addi $GRi,$s12,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global addi
-addi:
-	set_gr_immed   	4,gr8
-	addi		gr8,0,gr8
-	test_gr_immed  	4,gr8
-	addi		gr8,1,gr8
-	test_gr_immed  	5,gr8
-	addi		gr8,15,gr8
-	test_gr_immed  	20,gr8
-	set_gr_limmed  	0x7fff,0xffff,gr8
-	addi		gr8,1,gr8
-	test_gr_limmed 	0x8000,0x0000,gr8
-	addi		gr8,0x7ff,gr8
-	test_gr_limmed 	0x8000,0x07ff,gr8
-	addi		gr8,-2048,gr8
-	test_gr_limmed 	0x7fff,0xffff,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/addicc.cgs b/sim/testsuite/sim/frv/addicc.cgs
deleted file mode 100644
index 6f2a19760c4..00000000000
--- a/sim/testsuite/sim/frv/addicc.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# frv testcase for addicc $GRi,$s10,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global addicc
-addicc:
-	; Test add $u4Ri
-	set_gr_immed   	4,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	addicc		gr8,0,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	4,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	addicc		gr8,1,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	5,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	addicc		gr8,15,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	20,gr8
-	set_gr_limmed  	0x7fff,0xffff,gr8	; test neg and overflow bits
-	set_icc         0x05,0		; Set mask opposite of expected
-	addicc		gr8,1,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/addx.cgs b/sim/testsuite/sim/frv/addx.cgs
deleted file mode 100644
index 259a694062f..00000000000
--- a/sim/testsuite/sim/frv/addx.cgs
+++ /dev/null
@@ -1,49 +0,0 @@
-# frv testcase for addx $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global addx
-addx:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Make sure carry bit is off
-	addx      	gr7,gr8,gr8,icc0
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x04,0		; Make sure carry bit is off
-	addx		gr7,gr8,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x08,0		; Make sure carry bit is off
-	addx		gr8,gr8,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Make sure carry bit is on
-	addx      	gr7,gr8,gr8,icc0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	0,gr8
-	set_icc         0x05,0		; Make sure carry bit is on
-	addx		gr7,gr8,gr8,icc0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_icc         0x0b,0		; Make sure carry bit is on
-	addx		gr7,gr8,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/addxcc.cgs b/sim/testsuite/sim/frv/addxcc.cgs
deleted file mode 100644
index 230c047d688..00000000000
--- a/sim/testsuite/sim/frv/addxcc.cgs
+++ /dev/null
@@ -1,49 +0,0 @@
-# frv testcase for addxcc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global addxcc
-addxcc:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Make sure carry bit is off
-	addxcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x04,0		; Make sure carry bit is off
-	addxcc		gr7,gr8,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x08,0		; Make sure carry bit is off
-	addxcc		gr8,gr8,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Make sure carry bit is on
-	addxcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	0,gr8
-	set_icc         0x05,0		; Make sure carry bit is on
-	addxcc		gr7,gr8,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_icc         0x0b,0		; Make sure carry bit is on
-	addxcc		gr7,gr8,gr8,icc0
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/addxi.cgs b/sim/testsuite/sim/frv/addxi.cgs
deleted file mode 100644
index c36272a14ea..00000000000
--- a/sim/testsuite/sim/frv/addxi.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# frv testcase for addxi $GRi,$s10,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global addxi
-addxi:
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Make sure carry bit is off
-	addxi      	gr8,1,gr8,icc0
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr8
-	set_icc         0x04,0		; Make sure carry bit is off
-	addxi		gr8,1,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xffff,0xff00,gr8
-	set_icc         0x08,0		; Make sure carry bit is off
-	addxi		gr8,0x100,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Make sure carry bit is on
-	addxi      	gr8,1,gr8,icc0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr8
-	set_icc         0x05,0		; Make sure carry bit is on
-	addxi		gr8,0,gr8,icc0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xffff,0xfeff,gr8
-	set_icc         0x0b,0		; Make sure carry bit is on
-	addxi		gr8,0x100,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/addxicc.cgs b/sim/testsuite/sim/frv/addxicc.cgs
deleted file mode 100644
index 831fec39bdf..00000000000
--- a/sim/testsuite/sim/frv/addxicc.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# frv testcase for addxicc $GRi,$s10,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global addxicc
-addxicc:
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Make sure carry bit is off
-	addxicc      	gr8,1,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr8
-	set_icc         0x04,0		; Make sure carry bit is off
-	addxicc		gr8,1,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xffff,0xff00,gr8
-	set_icc         0x08,0		; Make sure carry bit is off
-	addxicc		gr8,0x100,gr8,icc0
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Make sure carry bit is on
-	addxicc      	gr8,1,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr8
-	set_icc         0x05,0		; Make sure carry bit is on
-	addxicc		gr8,0,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xffff,0xfeff,gr8
-	set_icc         0x0b,0		; Make sure carry bit is on
-	addxicc		gr8,0x100,gr8,icc0
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/allinsn.exp b/sim/testsuite/sim/frv/allinsn.exp
deleted file mode 100644
index b7f9fe2ad06..00000000000
--- a/sim/testsuite/sim/frv/allinsn.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# FRV simulator testsuite.
-
-if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-    # all machines
-    set all_machs "frv fr500 fr550 fr400 fr405 fr450"
-    set cpu_option -mcpu
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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/frv/and.cgs b/sim/testsuite/sim/frv/and.cgs
deleted file mode 100644
index a1773f1e3de..00000000000
--- a/sim/testsuite/sim/frv/and.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# frv testcase for and $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global and
-and:
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	and      	gr7,gr8,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,0		; Set mask opposite of expected
-	and		gr7,gr8,gr8
-	test_icc	0 1 0 0 icc0
-	test_gr_limmed 	0xaaaa,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	and		gr7,gr8,gr8
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed	0x0000,0xaaaa,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/andcc.cgs b/sim/testsuite/sim/frv/andcc.cgs
deleted file mode 100644
index a2a04d2c0ca..00000000000
--- a/sim/testsuite/sim/frv/andcc.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# frv testcase for andcc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global andcc
-andcc:
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	andcc      	gr7,gr8,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,0		; Set mask opposite of expected
-	andcc		gr7,gr8,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0xaaaa,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	andcc		gr7,gr8,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_limmed	0x0000,0xaaaa,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/andcr.cgs b/sim/testsuite/sim/frv/andcr.cgs
deleted file mode 100644
index 9fbbaffb8b0..00000000000
--- a/sim/testsuite/sim/frv/andcr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for andcr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global andcr
-andcr:
-	set_spr_immed	0x1b1b,cccr
-	andcr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc7,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc7,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc6,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc6,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc5,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc5,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc5,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc5,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc4,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc4,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andcr		cc4,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	andcr		cc4,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/andi.cgs b/sim/testsuite/sim/frv/andi.cgs
deleted file mode 100644
index e9fdf75b4d5..00000000000
--- a/sim/testsuite/sim/frv/andi.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for andi $GRi,$s12,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global andi
-andi:
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_icc         0x0b,0		; Set mask opposite of expected
-	andi      	gr7,0x555,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_immed   0,gr8
-
-	set_icc         0x04,0		; Set mask opposite of expected
-	andi		gr7,-2048,gr8
-	test_icc	0 1 0 0 icc0
-	test_gr_limmed 	0xaaaa,0xa800,gr8
-
-	set_icc         0x0d,0		; Set mask opposite of expected
-	andi		gr7,-1,gr8
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed	0xaaaa,0xaaaa,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/andicc.cgs b/sim/testsuite/sim/frv/andicc.cgs
deleted file mode 100644
index 650805975ad..00000000000
--- a/sim/testsuite/sim/frv/andicc.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for andicc $GRi,$s10,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global andicc
-andicc:
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_icc         0x0b,0		; Set mask opposite of expected
-	andicc      	gr7,0x155,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed   0,gr8
-
-	set_icc         0x04,0		; Set mask opposite of expected
-	andicc		gr7,-512,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0xaaaa,0xaa00,gr8
-
-	set_icc         0x05,0		; Set mask opposite of expected
-	andicc		gr7,-1,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed	0xaaaa,0xaaaa,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/andncr.cgs b/sim/testsuite/sim/frv/andncr.cgs
deleted file mode 100644
index 31fd1f78d0d..00000000000
--- a/sim/testsuite/sim/frv/andncr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for andncr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global andncr
-andncr:
-	set_spr_immed	0x1b1b,cccr
-	andncr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc7,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc7,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc6,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc6,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc5,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc5,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc5,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	andncr		cc5,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	andncr		cc4,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc4,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc4,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	andncr		cc4,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/bar.cgs b/sim/testsuite/sim/frv/bar.cgs
deleted file mode 100644
index df6a9caf6ec..00000000000
--- a/sim/testsuite/sim/frv/bar.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# frv testcase for bar
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bar
-bar:
-	bar
-
-	pass
diff --git a/sim/testsuite/sim/frv/bc.cgs b/sim/testsuite/sim/frv/bc.cgs
deleted file mode 100644
index a5c612ccc9a..00000000000
--- a/sim/testsuite/sim/frv/bc.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bc $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bc
-bc:
-	set_icc		0x0 0
-	bc		icc0,0,bad
-	set_icc		0x1 1
-	bc		icc1,1,ok2
-	fail
-ok2:
-	set_icc		0x2 2
-	bc		icc2,2,bad
-	set_icc		0x3 3
-	bc		icc3,3,ok4
-	fail
-ok4:
-	set_icc		0x4 0
-	bc		icc0,0,bad
-	set_icc		0x5 1
-	bc		icc1,1,ok6
-	fail
-ok6:
-	set_icc		0x6 2
-	bc		icc2,2,bad
-	set_icc		0x7 3
-	bc		icc3,3,ok8
-	fail
-ok8:
-	set_icc		0x8 0
-	bc		icc0,0,bad
-	set_icc		0x9 1
-	bc		icc1,1,oka
-	fail
-oka:
-	set_icc		0xa 2
-	bc		icc2,2,bad
-	set_icc		0xb 3
-	bc		icc3,3,okc
-	fail
-okc:
-	set_icc		0xc 0
-	bc		icc0,0,bad
-	set_icc		0xd 1
-	bc		icc1,1,oke
-	fail
-oke:
-	set_icc		0xe 2
-	bc		icc2,2,bad
-	set_icc		0xf 3
-	bc		icc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcclr.cgs b/sim/testsuite/sim/frv/bcclr.cgs
deleted file mode 100644
index 248be13491a..00000000000
--- a/sim/testsuite/sim/frv/bcclr.cgs
+++ /dev/null
@@ -1,293 +0,0 @@
-# frv testcase for bcclr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcclr
-bcclr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcclr		icc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bcclr		icc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcclr		icc2,0,2
-
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bcclr		icc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcclr		icc0,0,0
-
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bcclr		icc1,0,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcclr		icc2,0,2
-
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bcclr		icc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcclr		icc0,0,0
-
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bcclr		icc1,0,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bcclr		icc2,0,2
-
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bcclr		icc3,0,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcclr		icc0,0,0
-
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bcclr		icc1,0,1
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcclr		icc2,0,2
-
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bcclr		icc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcclr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_icc		0x1 1
-	bcclr		icc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcclr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_icc		0x3 3
-	bcclr		icc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcclr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_icc		0x5 1
-	bcclr		icc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcclr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_icc		0x7 3
-	bcclr		icc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcclr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_icc		0x9 1
-	bcclr		icc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bcclr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_icc		0xb 3
-	bcclr		icc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcclr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_icc		0xd 1
-	bcclr		icc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcclr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_icc		0xf 3
-	bcclr		icc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcclr		icc0,1,0
-
-	set_icc		0x1 1
-	bcclr		icc1,1,1
-
-	set_icc		0x2 2
-	bcclr		icc2,1,2
-
-	set_icc		0x3 3
-	bcclr		icc3,1,3
-
-	set_icc		0x4 0
-	bcclr		icc0,1,0
-
-	set_icc		0x5 1
-	bcclr		icc1,1,1
-
-	set_icc		0x6 2
-	bcclr		icc2,1,2
-
-	set_icc		0x7 3
-	bcclr		icc3,1,3
-
-	set_icc		0x8 0
-	bcclr		icc0,1,0
-
-	set_icc		0x9 1
-	bcclr		icc1,1,1
-
-	set_icc		0xa 2
-	bcclr		icc2,1,2
-
-	set_icc		0xb 3
-	bcclr		icc3,1,3
-
-	set_icc		0xc 0
-	bcclr		icc0,1,0
-
-	set_icc		0xd 1
-	bcclr		icc1,1,1
-
-	set_icc		0xe 2
-	bcclr		icc2,1,2
-
-	set_icc		0xf 3
-	bcclr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcclr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcclr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcclr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcclr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcclr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcclr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcclr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcclr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcclr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcclr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcclr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcclr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcclr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcclr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcclr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcclr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bceqlr.cgs b/sim/testsuite/sim/frv/bceqlr.cgs
deleted file mode 100644
index bacabf417ec..00000000000
--- a/sim/testsuite/sim/frv/bceqlr.cgs
+++ /dev/null
@@ -1,293 +0,0 @@
-# frv testcase for bceqlr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bceqlr
-bceqlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bceqlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bceqlr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bceqlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bceqlr		icc3,0,3
-
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bceqlr		icc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bceqlr		icc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bceqlr		icc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bceqlr		icc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bceqlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bceqlr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bceqlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bceqlr		icc3,0,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bceqlr		icc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bceqlr		icc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bceqlr		icc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bceqlr		icc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bceqlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bceqlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bceqlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bceqlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_icc		0x4 0
-	bceqlr		icc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_icc		0x5 1
-	bceqlr		icc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_icc		0x6 2
-	bceqlr		icc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_icc		0x7 3
-	bceqlr		icc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bceqlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bceqlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bceqlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bceqlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_icc		0xc 0
-	bceqlr		icc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_icc		0xd 1
-	bceqlr		icc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_icc		0xe 2
-	bceqlr		icc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_icc		0xf 3
-	bceqlr		icc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bceqlr		icc0,1,0
-
-	set_icc		0x1 1
-	bceqlr		icc1,1,1
-
-	set_icc		0x2 2
-	bceqlr		icc2,1,2
-
-	set_icc		0x3 3
-	bceqlr		icc3,1,3
-
-	set_icc		0x4 0
-	bceqlr		icc0,1,0
-
-	set_icc		0x5 1
-	bceqlr		icc1,1,1
-
-	set_icc		0x6 2
-	bceqlr		icc2,1,2
-
-	set_icc		0x7 3
-	bceqlr		icc3,1,3
-
-	set_icc		0x8 0
-	bceqlr		icc0,1,0
-
-	set_icc		0x9 1
-	bceqlr		icc1,1,1
-
-	set_icc		0xa 2
-	bceqlr		icc2,1,2
-
-	set_icc		0xb 3
-	bceqlr		icc3,1,3
-
-	set_icc		0xc 0
-	bceqlr		icc0,1,0
-
-	set_icc		0xd 1
-	bceqlr		icc1,1,1
-
-	set_icc		0xe 2
-	bceqlr		icc2,1,2
-
-	set_icc		0xf 3
-	bceqlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bceqlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bceqlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bceqlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bceqlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bceqlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bceqlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bceqlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bceqlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bceqlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bceqlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bceqlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bceqlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bceqlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bceqlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bceqlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bceqlr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcgelr.cgs b/sim/testsuite/sim/frv/bcgelr.cgs
deleted file mode 100644
index 72bd37450fd..00000000000
--- a/sim/testsuite/sim/frv/bcgelr.cgs
+++ /dev/null
@@ -1,293 +0,0 @@
-# frv testcase for bcgelr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcgelr
-bcgelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bcgelr		icc0,0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bcgelr		icc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcgelr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcgelr		icc3,0,3
-
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bcgelr		icc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bcgelr		icc1,0,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcgelr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcgelr		icc3,0,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcgelr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcgelr		icc1,0,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bcgelr		icc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bcgelr		icc3,0,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcgelr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcgelr		icc1,0,1
-
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bcgelr		icc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bcgelr		icc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_icc		0x0 0
-	bcgelr		icc0,1,0
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_icc		0x1 1
-	bcgelr		icc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcgelr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcgelr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_icc		0x4 0
-	bcgelr		icc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_icc		0x5 1
-	bcgelr		icc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcgelr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcgelr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcgelr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcgelr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_icc		0xa 2
-	bcgelr		icc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_icc		0xb 3
-	bcgelr		icc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcgelr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcgelr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_icc		0xe 2
-	bcgelr		icc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_icc		0xf 3
-	bcgelr		icc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcgelr		icc0,1,0
-
-	set_icc		0x1 1
-	bcgelr		icc1,1,1
-
-	set_icc		0x2 2
-	bcgelr		icc2,1,2
-
-	set_icc		0x3 3
-	bcgelr		icc3,1,3
-
-	set_icc		0x4 0
-	bcgelr		icc0,1,0
-
-	set_icc		0x5 1
-	bcgelr		icc1,1,1
-
-	set_icc		0x6 2
-	bcgelr		icc2,1,2
-
-	set_icc		0x7 3
-	bcgelr		icc3,1,3
-
-	set_icc		0x8 0
-	bcgelr		icc0,1,0
-
-	set_icc		0x9 1
-	bcgelr		icc1,1,1
-
-	set_icc		0xa 2
-	bcgelr		icc2,1,2
-
-	set_icc		0xb 3
-	bcgelr		icc3,1,3
-
-	set_icc		0xc 0
-	bcgelr		icc0,1,0
-
-	set_icc		0xd 1
-	bcgelr		icc1,1,1
-
-	set_icc		0xe 2
-	bcgelr		icc2,1,2
-
-	set_icc		0xf 3
-	bcgelr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcgelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcgelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcgelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcgelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcgelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcgelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcgelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcgelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcgelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcgelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcgelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcgelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcgelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcgelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcgelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcgelr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcgtlr.cgs b/sim/testsuite/sim/frv/bcgtlr.cgs
deleted file mode 100644
index edffed83327..00000000000
--- a/sim/testsuite/sim/frv/bcgtlr.cgs
+++ /dev/null
@@ -1,284 +0,0 @@
-# frv testcase for bcgtlr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcgtlr
-bcgtlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bcgtlr		icc0,0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bcgtlr		icc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcgtlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcgtlr		icc3,0,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcgtlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcgtlr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcgtlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcgtlr		icc3,0,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcgtlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcgtlr		icc1,0,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bcgtlr		icc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bcgtlr		icc3,0,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcgtlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcgtlr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcgtlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcgtlr		icc3,0,3
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_icc		0x0 0
-	bcgtlr		icc0,1,0
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_icc		0x1 1
-	bcgtlr		icc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcgtlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcgtlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcgtlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcgtlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcgtlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcgtlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcgtlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcgtlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_icc		0xa 2
-	bcgtlr		icc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_icc		0xb 3
-	bcgtlr		icc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcgtlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcgtlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcgtlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcgtlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcgtlr		icc0,1,0
-
-	set_icc		0x1 1
-	bcgtlr		icc1,1,1
-
-	set_icc		0x2 2
-	bcgtlr		icc2,1,2
-
-	set_icc		0x3 3
-	bcgtlr		icc3,1,3
-
-	set_icc		0x4 0
-	bcgtlr		icc0,1,0
-
-	set_icc		0x5 1
-	bcgtlr		icc1,1,1
-
-	set_icc		0x6 2
-	bcgtlr		icc2,1,2
-
-	set_icc		0x7 3
-	bcgtlr		icc3,1,3
-
-	set_icc		0x8 0
-	bcgtlr		icc0,1,0
-
-	set_icc		0x9 1
-	bcgtlr		icc1,1,1
-
-	set_icc		0xa 2
-	bcgtlr		icc2,1,2
-
-	set_icc		0xb 3
-	bcgtlr		icc3,1,3
-
-	set_icc		0xc 0
-	bcgtlr		icc0,1,0
-
-	set_icc		0xd 1
-	bcgtlr		icc1,1,1
-
-	set_icc		0xe 2
-	bcgtlr		icc2,1,2
-
-	set_icc		0xf 3
-	bcgtlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcgtlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcgtlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcgtlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcgtlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcgtlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcgtlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcgtlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcgtlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcgtlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcgtlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcgtlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcgtlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcgtlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcgtlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcgtlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcgtlr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bchilr.cgs b/sim/testsuite/sim/frv/bchilr.cgs
deleted file mode 100644
index ea7e2f4bac5..00000000000
--- a/sim/testsuite/sim/frv/bchilr.cgs
+++ /dev/null
@@ -1,284 +0,0 @@
-# frv testcase for bchilr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bchilr
-bchilr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bchilr		icc0,0,0
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bchilr		icc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bchilr		icc2,0,2
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bchilr		icc3,0,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bchilr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bchilr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bchilr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bchilr		icc3,0,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bchilr		icc0,0,0
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bchilr		icc1,0,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bchilr		icc2,0,2
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bchilr		icc3,0,3
-
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bchilr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bchilr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bchilr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bchilr		icc3,0,3
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_icc		0x0 0
-	bchilr		icc0,1,0
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bchilr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_icc		0x2 2
-	bchilr		icc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bchilr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bchilr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bchilr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bchilr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bchilr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_icc		0x8 0
-	bchilr		icc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bchilr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_icc		0xa 2
-	bchilr		icc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bchilr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bchilr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bchilr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bchilr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bchilr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bchilr		icc0,1,0
-
-	set_icc		0x1 1
-	bchilr		icc1,1,1
-
-	set_icc		0x2 2
-	bchilr		icc2,1,2
-
-	set_icc		0x3 3
-	bchilr		icc3,1,3
-
-	set_icc		0x4 0
-	bchilr		icc0,1,0
-
-	set_icc		0x5 1
-	bchilr		icc1,1,1
-
-	set_icc		0x6 2
-	bchilr		icc2,1,2
-
-	set_icc		0x7 3
-	bchilr		icc3,1,3
-
-	set_icc		0x8 0
-	bchilr		icc0,1,0
-
-	set_icc		0x9 1
-	bchilr		icc1,1,1
-
-	set_icc		0xa 2
-	bchilr		icc2,1,2
-
-	set_icc		0xb 3
-	bchilr		icc3,1,3
-
-	set_icc		0xc 0
-	bchilr		icc0,1,0
-
-	set_icc		0xd 1
-	bchilr		icc1,1,1
-
-	set_icc		0xe 2
-	bchilr		icc2,1,2
-
-	set_icc		0xf 3
-	bchilr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bchilr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bchilr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bchilr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bchilr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bchilr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bchilr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bchilr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bchilr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bchilr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bchilr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bchilr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bchilr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bchilr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bchilr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bchilr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bchilr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bclelr.cgs b/sim/testsuite/sim/frv/bclelr.cgs
deleted file mode 100644
index 6668c77684b..00000000000
--- a/sim/testsuite/sim/frv/bclelr.cgs
+++ /dev/null
@@ -1,301 +0,0 @@
-# frv testcase for bclelr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bclelr
-bclelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclelr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bclelr		icc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bclelr		icc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bclelr		icc3,0,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bclelr		icc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bclelr		icc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bclelr		icc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bclelr		icc3,0,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bclelr		icc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bclelr		icc1,0,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bclelr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bclelr		icc3,0,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bclelr		icc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bclelr		icc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bclelr		icc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bclelr		icc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclelr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bclelr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_icc		0x2 2
-	bclelr		icc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_icc		0x3 3
-	bclelr		icc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_icc		0x4 0
-	bclelr		icc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_icc		0x5 1
-	bclelr		icc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_icc		0x6 2
-	bclelr		icc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_icc		0x7 3
-	bclelr		icc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_icc		0x8 0
-	bclelr		icc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_icc		0x9 1
-	bclelr		icc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bclelr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bclelr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_icc		0xc 0
-	bclelr		icc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_icc		0xd 1
-	bclelr		icc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_icc		0xe 2
-	bclelr		icc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_icc		0xf 3
-	bclelr		icc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclelr		icc0,1,0
-
-	set_icc		0x1 1
-	bclelr		icc1,1,1
-
-	set_icc		0x2 2
-	bclelr		icc2,1,2
-
-	set_icc		0x3 3
-	bclelr		icc3,1,3
-
-	set_icc		0x4 0
-	bclelr		icc0,1,0
-
-	set_icc		0x5 1
-	bclelr		icc1,1,1
-
-	set_icc		0x6 2
-	bclelr		icc2,1,2
-
-	set_icc		0x7 3
-	bclelr		icc3,1,3
-
-	set_icc		0x8 0
-	bclelr		icc0,1,0
-
-	set_icc		0x9 1
-	bclelr		icc1,1,1
-
-	set_icc		0xa 2
-	bclelr		icc2,1,2
-
-	set_icc		0xb 3
-	bclelr		icc3,1,3
-
-	set_icc		0xc 0
-	bclelr		icc0,1,0
-
-	set_icc		0xd 1
-	bclelr		icc1,1,1
-
-	set_icc		0xe 2
-	bclelr		icc2,1,2
-
-	set_icc		0xf 3
-	bclelr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bclelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bclelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bclelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bclelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bclelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bclelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bclelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bclelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bclelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bclelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bclelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bclelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bclelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bclelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bclelr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bclr.cgs b/sim/testsuite/sim/frv/bclr.cgs
deleted file mode 100644
index d36563b618d..00000000000
--- a/sim/testsuite/sim/frv/bclr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bclr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bclr
-bclr:
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclr		icc0,0
-
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bclr		icc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bclr		icc2,2
-
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bclr		icc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bclr		icc0,0
-
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bclr		icc1,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bclr		icc2,2
-
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bclr		icc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bclr		icc0,0
-
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bclr		icc1,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bclr		icc2,2
-
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bclr		icc3,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bclr		icc0,0
-
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bclr		icc1,1
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bclr		icc2,2
-
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bclr		icc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bclslr.cgs b/sim/testsuite/sim/frv/bclslr.cgs
deleted file mode 100644
index 37b91bc105d..00000000000
--- a/sim/testsuite/sim/frv/bclslr.cgs
+++ /dev/null
@@ -1,301 +0,0 @@
-# frv testcase for bclslr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bclslr
-bclslr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclslr		icc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bclslr		icc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bclslr		icc2,0,2
-
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bclslr		icc3,0,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bclslr		icc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bclslr		icc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bclslr		icc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bclslr		icc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bclslr		icc0,0,0
-
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bclslr		icc1,0,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bclslr		icc2,0,2
-
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bclslr		icc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bclslr		icc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bclslr		icc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bclslr		icc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bclslr		icc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclslr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_icc		0x1 1
-	bclslr		icc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bclslr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_icc		0x3 3
-	bclslr		icc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_icc		0x4 0
-	bclslr		icc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_icc		0x5 1
-	bclslr		icc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_icc		0x6 2
-	bclslr		icc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_icc		0x7 3
-	bclslr		icc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bclslr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_icc		0x9 1
-	bclslr		icc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bclslr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_icc		0xb 3
-	bclslr		icc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_icc		0xc 0
-	bclslr		icc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_icc		0xd 1
-	bclslr		icc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_icc		0xe 2
-	bclslr		icc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_icc		0xf 3
-	bclslr		icc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclslr		icc0,1,0
-
-	set_icc		0x1 1
-	bclslr		icc1,1,1
-
-	set_icc		0x2 2
-	bclslr		icc2,1,2
-
-	set_icc		0x3 3
-	bclslr		icc3,1,3
-
-	set_icc		0x4 0
-	bclslr		icc0,1,0
-
-	set_icc		0x5 1
-	bclslr		icc1,1,1
-
-	set_icc		0x6 2
-	bclslr		icc2,1,2
-
-	set_icc		0x7 3
-	bclslr		icc3,1,3
-
-	set_icc		0x8 0
-	bclslr		icc0,1,0
-
-	set_icc		0x9 1
-	bclslr		icc1,1,1
-
-	set_icc		0xa 2
-	bclslr		icc2,1,2
-
-	set_icc		0xb 3
-	bclslr		icc3,1,3
-
-	set_icc		0xc 0
-	bclslr		icc0,1,0
-
-	set_icc		0xd 1
-	bclslr		icc1,1,1
-
-	set_icc		0xe 2
-	bclslr		icc2,1,2
-
-	set_icc		0xf 3
-	bclslr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bclslr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bclslr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bclslr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bclslr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bclslr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bclslr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bclslr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bclslr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bclslr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bclslr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bclslr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bclslr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bclslr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bclslr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bclslr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bclslr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcltlr.cgs b/sim/testsuite/sim/frv/bcltlr.cgs
deleted file mode 100644
index 0ba6bfa8aaf..00000000000
--- a/sim/testsuite/sim/frv/bcltlr.cgs
+++ /dev/null
@@ -1,292 +0,0 @@
-# frv testcase for bcltlr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcltlr
-bcltlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcltlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bcltlr		icc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bcltlr		icc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bcltlr		icc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcltlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcltlr		icc1,0,1
-
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bcltlr		icc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bcltlr		icc3,0,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bcltlr		icc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bcltlr		icc1,0,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bcltlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bcltlr		icc3,0,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bcltlr		icc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bcltlr		icc1,0,1
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcltlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcltlr		icc3,0,3
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcltlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bcltlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_icc		0x2 2
-	bcltlr		icc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_icc		0x3 3
-	bcltlr		icc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcltlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcltlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_icc		0x6 2
-	bcltlr		icc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_icc		0x7 3
-	bcltlr		icc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_icc		0x8 0
-	bcltlr		icc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_icc		0x9 1
-	bcltlr		icc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bcltlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bcltlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_icc		0xc 0
-	bcltlr		icc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_icc		0xd 1
-	bcltlr		icc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcltlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcltlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcltlr		icc0,1,0
-
-	set_icc		0x1 1
-	bcltlr		icc1,1,1
-
-	set_icc		0x2 2
-	bcltlr		icc2,1,2
-
-	set_icc		0x3 3
-	bcltlr		icc3,1,3
-
-	set_icc		0x4 0
-	bcltlr		icc0,1,0
-
-	set_icc		0x5 1
-	bcltlr		icc1,1,1
-
-	set_icc		0x6 2
-	bcltlr		icc2,1,2
-
-	set_icc		0x7 3
-	bcltlr		icc3,1,3
-
-	set_icc		0x8 0
-	bcltlr		icc0,1,0
-
-	set_icc		0x9 1
-	bcltlr		icc1,1,1
-
-	set_icc		0xa 2
-	bcltlr		icc2,1,2
-
-	set_icc		0xb 3
-	bcltlr		icc3,1,3
-
-	set_icc		0xc 0
-	bcltlr		icc0,1,0
-
-	set_icc		0xd 1
-	bcltlr		icc1,1,1
-
-	set_icc		0xe 2
-	bcltlr		icc2,1,2
-
-	set_icc		0xf 3
-	bcltlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcltlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcltlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcltlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcltlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcltlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcltlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcltlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcltlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcltlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcltlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcltlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcltlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcltlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcltlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcltlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcltlr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcnclr.cgs b/sim/testsuite/sim/frv/bcnclr.cgs
deleted file mode 100644
index 51824a6295d..00000000000
--- a/sim/testsuite/sim/frv/bcnclr.cgs
+++ /dev/null
@@ -1,293 +0,0 @@
-# frv testcase for bcnclr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcnclr
-bcnclr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bcnclr		icc0,0,0
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bcnclr		icc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bcnclr		icc2,0,2
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcnclr		icc3,0,3
-
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bcnclr		icc0,0,0
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcnclr		icc1,0,1
-
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bcnclr		icc2,0,2
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcnclr		icc3,0,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bcnclr		icc0,0,0
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcnclr		icc1,0,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bcnclr		icc2,0,2
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bcnclr		icc3,0,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bcnclr		icc0,0,0
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcnclr		icc1,0,1
-
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bcnclr		icc2,0,2
-	fail
-okf:
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcnclr		icc3,0,3
-
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_icc		0x0 0
-	bcnclr		icc0,1,0
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bcnclr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_icc		0x2 2
-	bcnclr		icc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcnclr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_icc		0x4 0
-	bcnclr		icc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcnclr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_icc		0x6 2
-	bcnclr		icc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcnclr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_icc		0x8 0
-	bcnclr		icc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcnclr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_icc		0xa 2
-	bcnclr		icc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bcnclr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_icc		0xc 0
-	bcnclr		icc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcnclr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_icc		0xe 2
-	bcnclr		icc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcnclr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnclr		icc0,1,0
-
-	set_icc		0x1 1
-	bcnclr		icc1,1,1
-
-	set_icc		0x2 2
-	bcnclr		icc2,1,2
-
-	set_icc		0x3 3
-	bcnclr		icc3,1,3
-
-	set_icc		0x4 0
-	bcnclr		icc0,1,0
-
-	set_icc		0x5 1
-	bcnclr		icc1,1,1
-
-	set_icc		0x6 2
-	bcnclr		icc2,1,2
-
-	set_icc		0x7 3
-	bcnclr		icc3,1,3
-
-	set_icc		0x8 0
-	bcnclr		icc0,1,0
-
-	set_icc		0x9 1
-	bcnclr		icc1,1,1
-
-	set_icc		0xa 2
-	bcnclr		icc2,1,2
-
-	set_icc		0xb 3
-	bcnclr		icc3,1,3
-
-	set_icc		0xc 0
-	bcnclr		icc0,1,0
-
-	set_icc		0xd 1
-	bcnclr		icc1,1,1
-
-	set_icc		0xe 2
-	bcnclr		icc2,1,2
-
-	set_icc		0xf 3
-	bcnclr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnclr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcnclr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcnclr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcnclr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcnclr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcnclr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcnclr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcnclr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcnclr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcnclr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcnclr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcnclr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcnclr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcnclr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcnclr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcnclr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcnelr.cgs b/sim/testsuite/sim/frv/bcnelr.cgs
deleted file mode 100644
index 55be2d3c156..00000000000
--- a/sim/testsuite/sim/frv/bcnelr.cgs
+++ /dev/null
@@ -1,292 +0,0 @@
-# frv testcase for bcnelr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcnelr
-bcnelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bcnelr		icc0,0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bcnelr		icc1,0,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bcnelr		icc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bcnelr		icc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcnelr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcnelr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcnelr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcnelr		icc3,0,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bcnelr		icc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bcnelr		icc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bcnelr		icc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bcnelr		icc3,0,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcnelr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcnelr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcnelr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcnelr		icc3,0,3
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_icc		0x0 0
-	bcnelr		icc0,1,0
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_icc		0x1 1
-	bcnelr		icc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_icc		0x2 2
-	bcnelr		icc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_icc		0x3 3
-	bcnelr		icc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcnelr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcnelr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcnelr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcnelr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_icc		0x8 0
-	bcnelr		icc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_icc		0x9 1
-	bcnelr		icc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_icc		0xa 2
-	bcnelr		icc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_icc		0xb 3
-	bcnelr		icc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcnelr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcnelr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcnelr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcnelr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnelr		icc0,1,0
-
-	set_icc		0x1 1
-	bcnelr		icc1,1,1
-
-	set_icc		0x2 2
-	bcnelr		icc2,1,2
-
-	set_icc		0x3 3
-	bcnelr		icc3,1,3
-
-	set_icc		0x4 0
-	bcnelr		icc0,1,0
-
-	set_icc		0x5 1
-	bcnelr		icc1,1,1
-
-	set_icc		0x6 2
-	bcnelr		icc2,1,2
-
-	set_icc		0x7 3
-	bcnelr		icc3,1,3
-
-	set_icc		0x8 0
-	bcnelr		icc0,1,0
-
-	set_icc		0x9 1
-	bcnelr		icc1,1,1
-
-	set_icc		0xa 2
-	bcnelr		icc2,1,2
-
-	set_icc		0xb 3
-	bcnelr		icc3,1,3
-
-	set_icc		0xc 0
-	bcnelr		icc0,1,0
-
-	set_icc		0xd 1
-	bcnelr		icc1,1,1
-
-	set_icc		0xe 2
-	bcnelr		icc2,1,2
-
-	set_icc		0xf 3
-	bcnelr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcnelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcnelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcnelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcnelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcnelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcnelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcnelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcnelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcnelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcnelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcnelr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcnelr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcnelr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcnelr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcnelr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcnlr.cgs b/sim/testsuite/sim/frv/bcnlr.cgs
deleted file mode 100644
index 8ddfcaa33d0..00000000000
--- a/sim/testsuite/sim/frv/bcnlr.cgs
+++ /dev/null
@@ -1,293 +0,0 @@
-# frv testcase for bcnlr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcnlr
-bcnlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bcnlr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcnlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcnlr		icc3,0,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcnlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcnlr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcnlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcnlr		icc3,0,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bcnlr		icc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bcnlr		icc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bcnlr		icc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bcnlr		icc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bcnlr		icc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bcnlr		icc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bcnlr		icc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bcnlr		icc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bcnlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcnlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcnlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcnlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcnlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcnlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcnlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_icc		0x8 0
-	bcnlr		icc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_icc		0x9 1
-	bcnlr		icc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_icc		0xa 2
-	bcnlr		icc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_icc		0xb 3
-	bcnlr		icc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_icc		0xc 0
-	bcnlr		icc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_icc		0xd 1
-	bcnlr		icc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_icc		0xe 2
-	bcnlr		icc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_icc		0xf 3
-	bcnlr		icc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnlr		icc0,1,0
-
-	set_icc		0x1 1
-	bcnlr		icc1,1,1
-
-	set_icc		0x2 2
-	bcnlr		icc2,1,2
-
-	set_icc		0x3 3
-	bcnlr		icc3,1,3
-
-	set_icc		0x4 0
-	bcnlr		icc0,1,0
-
-	set_icc		0x5 1
-	bcnlr		icc1,1,1
-
-	set_icc		0x6 2
-	bcnlr		icc2,1,2
-
-	set_icc		0x7 3
-	bcnlr		icc3,1,3
-
-	set_icc		0x8 0
-	bcnlr		icc0,1,0
-
-	set_icc		0x9 1
-	bcnlr		icc1,1,1
-
-	set_icc		0xa 2
-	bcnlr		icc2,1,2
-
-	set_icc		0xb 3
-	bcnlr		icc3,1,3
-
-	set_icc		0xc 0
-	bcnlr		icc0,1,0
-
-	set_icc		0xd 1
-	bcnlr		icc1,1,1
-
-	set_icc		0xe 2
-	bcnlr		icc2,1,2
-
-	set_icc		0xf 3
-	bcnlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcnlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcnlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcnlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcnlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcnlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcnlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcnlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcnlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcnlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcnlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcnlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcnlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcnlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcnlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcnlr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcnolr.cgs b/sim/testsuite/sim/frv/bcnolr.cgs
deleted file mode 100644
index 04f0b8dbd84..00000000000
--- a/sim/testsuite/sim/frv/bcnolr.cgs
+++ /dev/null
@@ -1,246 +0,0 @@
-# frv testcase for bcnolr
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcnolr
-bcnolr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnolr	
-
-	set_icc		0x1 1
-	bcnolr	
-
-	set_icc		0x2 2
-	bcnolr	
-
-	set_icc		0x3 3
-	bcnolr	
-
-	set_icc		0x4 0
-	bcnolr	
-
-	set_icc		0x5 1
-	bcnolr	
-
-	set_icc		0x6 2
-	bcnolr	
-
-	set_icc		0x7 3
-	bcnolr	
-
-	set_icc		0x8 0
-	bcnolr	
-
-	set_icc		0x9 1
-	bcnolr	
-
-	set_icc		0xa 2
-	bcnolr	
-
-	set_icc		0xb 3
-	bcnolr	
-
-	set_icc		0xc 0
-	bcnolr	
-
-	set_icc		0xd 1
-	bcnolr	
-
-	set_icc		0xe 2
-	bcnolr	
-
-	set_icc		0xf 3
-	bcnolr	
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcnolr	
-
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnolr	
-
-	set_icc		0x1 1
-	bcnolr	
-
-	set_icc		0x2 2
-	bcnolr	
-
-	set_icc		0x3 3
-	bcnolr	
-
-	set_icc		0x4 0
-	bcnolr	
-
-	set_icc		0x5 1
-	bcnolr	
-
-	set_icc		0x6 2
-	bcnolr	
-
-	set_icc		0x7 3
-	bcnolr	
-
-	set_icc		0x8 0
-	bcnolr	
-
-	set_icc		0x9 1
-	bcnolr	
-
-	set_icc		0xa 2
-	bcnolr	
-
-	set_icc		0xb 3
-	bcnolr	
-
-	set_icc		0xc 0
-	bcnolr	
-
-	set_icc		0xd 1
-	bcnolr	
-
-	set_icc		0xe 2
-	bcnolr	
-
-	set_icc		0xf 3
-	bcnolr	
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcnolr	
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcnolr	
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcnvlr.cgs b/sim/testsuite/sim/frv/bcnvlr.cgs
deleted file mode 100644
index 24515575ee5..00000000000
--- a/sim/testsuite/sim/frv/bcnvlr.cgs
+++ /dev/null
@@ -1,292 +0,0 @@
-# frv testcase for bcnvlr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcnvlr
-bcnvlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bcnvlr		icc0,0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bcnvlr		icc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcnvlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcnvlr		icc3,0,3
-
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bcnvlr		icc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bcnvlr		icc1,0,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcnvlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcnvlr		icc3,0,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bcnvlr		icc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bcnvlr		icc1,0,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bcnvlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bcnvlr		icc3,0,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bcnvlr		icc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bcnvlr		icc1,0,1
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcnvlr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcnvlr		icc3,0,3
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_icc		0x0 0
-	bcnvlr		icc0,1,0
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_icc		0x1 1
-	bcnvlr		icc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bcnvlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bcnvlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_icc		0x4 0
-	bcnvlr		icc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_icc		0x5 1
-	bcnvlr		icc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bcnvlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bcnvlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_icc		0x8 0
-	bcnvlr		icc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_icc		0x9 1
-	bcnvlr		icc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bcnvlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bcnvlr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_icc		0xc 0
-	bcnvlr		icc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_icc		0xd 1
-	bcnvlr		icc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcnvlr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcnvlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnvlr		icc0,1,0
-
-	set_icc		0x1 1
-	bcnvlr		icc1,1,1
-
-	set_icc		0x2 2
-	bcnvlr		icc2,1,2
-
-	set_icc		0x3 3
-	bcnvlr		icc3,1,3
-
-	set_icc		0x4 0
-	bcnvlr		icc0,1,0
-
-	set_icc		0x5 1
-	bcnvlr		icc1,1,1
-
-	set_icc		0x6 2
-	bcnvlr		icc2,1,2
-
-	set_icc		0x7 3
-	bcnvlr		icc3,1,3
-
-	set_icc		0x8 0
-	bcnvlr		icc0,1,0
-
-	set_icc		0x9 1
-	bcnvlr		icc1,1,1
-
-	set_icc		0xa 2
-	bcnvlr		icc2,1,2
-
-	set_icc		0xb 3
-	bcnvlr		icc3,1,3
-
-	set_icc		0xc 0
-	bcnvlr		icc0,1,0
-
-	set_icc		0xd 1
-	bcnvlr		icc1,1,1
-
-	set_icc		0xe 2
-	bcnvlr		icc2,1,2
-
-	set_icc		0xf 3
-	bcnvlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcnvlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcnvlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcnvlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcnvlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcnvlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcnvlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcnvlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcnvlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcnvlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcnvlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcnvlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcnvlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcnvlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcnvlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcnvlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcnvlr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcplr.cgs b/sim/testsuite/sim/frv/bcplr.cgs
deleted file mode 100644
index fef3ccbadbe..00000000000
--- a/sim/testsuite/sim/frv/bcplr.cgs
+++ /dev/null
@@ -1,292 +0,0 @@
-# frv testcase for bcplr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcplr
-bcplr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bcplr		icc0,0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bcplr		icc1,0,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bcplr		icc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bcplr		icc3,0,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bcplr		icc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bcplr		icc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bcplr		icc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bcplr		icc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcplr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcplr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bcplr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bcplr		icc3,0,3
-
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcplr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcplr		icc1,0,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcplr		icc2,0,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcplr		icc3,0,3
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_icc		0x0 0
-	bcplr		icc0,1,0
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_icc		0x1 1
-	bcplr		icc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_icc		0x2 2
-	bcplr		icc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_icc		0x3 3
-	bcplr		icc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_icc		0x4 0
-	bcplr		icc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_icc		0x5 1
-	bcplr		icc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_icc		0x6 2
-	bcplr		icc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_icc		0x7 3
-	bcplr		icc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcplr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcplr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bcplr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bcplr		icc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcplr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcplr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bcplr		icc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bcplr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcplr		icc0,1,0
-
-	set_icc		0x1 1
-	bcplr		icc1,1,1
-
-	set_icc		0x2 2
-	bcplr		icc2,1,2
-
-	set_icc		0x3 3
-	bcplr		icc3,1,3
-
-	set_icc		0x4 0
-	bcplr		icc0,1,0
-
-	set_icc		0x5 1
-	bcplr		icc1,1,1
-
-	set_icc		0x6 2
-	bcplr		icc2,1,2
-
-	set_icc		0x7 3
-	bcplr		icc3,1,3
-
-	set_icc		0x8 0
-	bcplr		icc0,1,0
-
-	set_icc		0x9 1
-	bcplr		icc1,1,1
-
-	set_icc		0xa 2
-	bcplr		icc2,1,2
-
-	set_icc		0xb 3
-	bcplr		icc3,1,3
-
-	set_icc		0xc 0
-	bcplr		icc0,1,0
-
-	set_icc		0xd 1
-	bcplr		icc1,1,1
-
-	set_icc		0xe 2
-	bcplr		icc2,1,2
-
-	set_icc		0xf 3
-	bcplr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcplr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcplr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcplr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcplr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcplr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcplr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcplr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcplr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcplr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcplr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcplr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcplr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcplr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcplr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcplr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcplr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcralr.cgs b/sim/testsuite/sim/frv/bcralr.cgs
deleted file mode 100644
index 612363d62a7..00000000000
--- a/sim/testsuite/sim/frv/bcralr.cgs
+++ /dev/null
@@ -1,309 +0,0 @@
-# frv testcase for bcralr $ccond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcralr
-bcralr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bcralr		0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bcralr		0
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bcralr		0
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bcralr		0
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bcralr		0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bcralr		0
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bcralr		0
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bcralr		0
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bcralr		0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bcralr		0
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bcralr		0
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bcralr		0
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bcralr		0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bcralr		0
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bcralr		0
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bcralr		0
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_icc		0x0 0
-	bcralr		1
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_icc		0x1 1
-	bcralr		1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_icc		0x2 2
-	bcralr		1
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_icc		0x3 3
-	bcralr		1
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_icc		0x4 0
-	bcralr		1
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_icc		0x5 1
-	bcralr		1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_icc		0x6 2
-	bcralr		1
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_icc		0x7 3
-	bcralr		1
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_icc		0x8 0
-	bcralr		1
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_icc		0x9 1
-	bcralr		1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_icc		0xa 2
-	bcralr		1
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_icc		0xb 3
-	bcralr		1
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_icc		0xc 0
-	bcralr		1
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_icc		0xd 1
-	bcralr		1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_icc		0xe 2
-	bcralr		1
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_icc		0xf 3
-	bcralr		1
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcralr		1
-
-	set_icc		0x1 1
-	bcralr		1
-
-	set_icc		0x2 2
-	bcralr		1
-
-	set_icc		0x3 3
-	bcralr		1
-
-	set_icc		0x4 0
-	bcralr		1
-
-	set_icc		0x5 1
-	bcralr		1
-
-	set_icc		0x6 2
-	bcralr		1
-
-	set_icc		0x7 3
-	bcralr		1
-
-	set_icc		0x8 0
-	bcralr		1
-
-	set_icc		0x9 1
-	bcralr		1
-
-	set_icc		0xa 2
-	bcralr		1
-
-	set_icc		0xb 3
-	bcralr		1
-
-	set_icc		0xc 0
-	bcralr		1
-
-	set_icc		0xd 1
-	bcralr		1
-
-	set_icc		0xe 2
-	bcralr		1
-
-	set_icc		0xf 3
-	bcralr		1
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcralr		0
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcralr		0
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bctrlr.cgs b/sim/testsuite/sim/frv/bctrlr.cgs
deleted file mode 100644
index b00cb97aaf8..00000000000
--- a/sim/testsuite/sim/frv/bctrlr.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# frv testcase for bctrlr $ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bctrlr
-bctrlr:
-	set_spr_addr	bad,lr
-	set_spr_immed	1,lcr
-	bctrlr 		0,0
-
-	set_spr_addr	ok1,lr
-	set_spr_immed	2,lcr
-	bctrlr 		0,0
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_spr_immed	2,lcr
-	bctrlr 		1,0
-
-	set_spr_addr	ok2,lr
-	bctrlr 		1,0
-	fail
-ok2:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bcvlr.cgs b/sim/testsuite/sim/frv/bcvlr.cgs
deleted file mode 100644
index b25d646092d..00000000000
--- a/sim/testsuite/sim/frv/bcvlr.cgs
+++ /dev/null
@@ -1,293 +0,0 @@
-# frv testcase for bcvlr $ICCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bcvlr
-bcvlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcvlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bcvlr		icc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bcvlr		icc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bcvlr		icc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcvlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcvlr		icc1,0,1
-
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bcvlr		icc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bcvlr		icc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcvlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcvlr		icc1,0,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bcvlr		icc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bcvlr		icc3,0,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcvlr		icc0,0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcvlr		icc1,0,1
-
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bcvlr		icc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bcvlr		icc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcvlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bcvlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_icc		0x2 2
-	bcvlr		icc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_icc		0x3 3
-	bcvlr		icc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bcvlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bcvlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_icc		0x6 2
-	bcvlr		icc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_icc		0x7 3
-	bcvlr		icc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bcvlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bcvlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_icc		0xa 2
-	bcvlr		icc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_icc		0xb 3
-	bcvlr		icc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bcvlr		icc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bcvlr		icc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_icc		0xe 2
-	bcvlr		icc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_icc		0xf 3
-	bcvlr		icc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcvlr		icc0,1,0
-
-	set_icc		0x1 1
-	bcvlr		icc1,1,1
-
-	set_icc		0x2 2
-	bcvlr		icc2,1,2
-
-	set_icc		0x3 3
-	bcvlr		icc3,1,3
-
-	set_icc		0x4 0
-	bcvlr		icc0,1,0
-
-	set_icc		0x5 1
-	bcvlr		icc1,1,1
-
-	set_icc		0x6 2
-	bcvlr		icc2,1,2
-
-	set_icc		0x7 3
-	bcvlr		icc3,1,3
-
-	set_icc		0x8 0
-	bcvlr		icc0,1,0
-
-	set_icc		0x9 1
-	bcvlr		icc1,1,1
-
-	set_icc		0xa 2
-	bcvlr		icc2,1,2
-
-	set_icc		0xb 3
-	bcvlr		icc3,1,3
-
-	set_icc		0xc 0
-	bcvlr		icc0,1,0
-
-	set_icc		0xd 1
-	bcvlr		icc1,1,1
-
-	set_icc		0xe 2
-	bcvlr		icc2,1,2
-
-	set_icc		0xf 3
-	bcvlr		icc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bcvlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x1 1
-	bcvlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x2 2
-	bcvlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x3 3
-	bcvlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x4 0
-	bcvlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x5 1
-	bcvlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0x6 2
-	bcvlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0x7 3
-	bcvlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0x8 0
-	bcvlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0x9 1
-	bcvlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xa 2
-	bcvlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xb 3
-	bcvlr		icc3,0,3
-
-	set_spr_immed	1,lcr
-	set_icc		0xc 0
-	bcvlr		icc0,0,0
-
-	set_spr_immed	1,lcr
-	set_icc		0xd 1
-	bcvlr		icc1,0,1
-
-	set_spr_immed	1,lcr
-	set_icc		0xe 2
-	bcvlr		icc2,0,2
-
-	set_spr_immed	1,lcr
-	set_icc		0xf 3
-	bcvlr		icc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/beq.cgs b/sim/testsuite/sim/frv/beq.cgs
deleted file mode 100644
index b3706dc09e0..00000000000
--- a/sim/testsuite/sim/frv/beq.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for beq $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global beq
-beq:
-	set_icc		0x0 0
-	beq		icc0,0,bad
-	set_icc		0x1 1
-	beq		icc1,1,bad
-	set_icc		0x2 2
-	beq		icc2,2,bad
-	set_icc		0x3 3
-	beq		icc3,3,bad
-	set_icc		0x4 0
-	beq		icc0,0,ok1
-	fail
-ok1:
-	set_icc		0x5 1
-	beq		icc1,1,ok2
-	fail
-ok2:
-	set_icc		0x6 2
-	beq		icc2,2,ok3
-	fail
-ok3:
-	set_icc		0x7 3
-	beq		icc3,3,ok4
-	fail
-ok4:
-	set_icc		0x8 0
-	beq		icc0,0,bad
-	set_icc		0x9 1
-	beq		icc1,1,bad
-	set_icc		0xa 2
-	beq		icc2,2,bad
-	set_icc		0xb 3
-	beq		icc3,3,bad
-	set_icc		0xc 0
-	beq		icc0,0,ok5
-	fail
-ok5:
-	set_icc		0xd 1
-	beq		icc1,1,ok6
-	fail
-ok6:
-	set_icc		0xe 2
-	beq		icc2,2,ok7
-	fail
-ok7:
-	set_icc		0xf 3
-	beq		icc3,3,ok8
-	fail
-ok8:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/beqlr.cgs b/sim/testsuite/sim/frv/beqlr.cgs
deleted file mode 100644
index 772b9faf197..00000000000
--- a/sim/testsuite/sim/frv/beqlr.cgs
+++ /dev/null
@@ -1,71 +0,0 @@
-# frv testcase for beqlr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global beqlr
-beqlr:
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	beqlr		icc0,0
-	set_icc		0x1 1
-	beqlr		icc1,1
-	set_icc		0x2 2
-	beqlr		icc2,2
-	set_icc		0x3 3
-	beqlr		icc3,3
-	set_spr_addr	ok1,lr
-	set_icc		0x4 0
-	beqlr		icc0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x5 1
-	beqlr		icc1,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_icc		0x6 2
-	beqlr		icc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x7 3
-	beqlr		icc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	beqlr		icc0,0
-	set_icc		0x9 1
-	beqlr		icc1,1
-	set_icc		0xa 2
-	beqlr		icc2,2
-	set_icc		0xb 3
-	beqlr		icc3,3
-	set_spr_addr	ok5,lr
-	set_icc		0xc 0
-	beqlr		icc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0xd 1
-	beqlr		icc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0xe 2
-	beqlr		icc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0xf 3
-	beqlr		icc3,3
-	fail
-ok8:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bge.cgs b/sim/testsuite/sim/frv/bge.cgs
deleted file mode 100644
index 7ebead7e5ee..00000000000
--- a/sim/testsuite/sim/frv/bge.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bge $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bge
-bge:
-	set_icc		0x0 0
-	bge		icc0,0,ok1
-	fail
-ok1:
-	set_icc		0x1 1
-	bge		icc1,1,ok2
-	fail
-ok2:
-	set_icc		0x2 2
-	bge		icc2,2,bad
-	set_icc		0x3 3
-	bge		icc3,3,bad
-	set_icc		0x4 0
-	bge		icc0,0,ok5
-	fail
-ok5:
-	set_icc		0x5 1
-	bge		icc1,1,ok6
-	fail
-ok6:
-	set_icc		0x6 2
-	bge		icc2,2,bad
-	set_icc		0x7 3
-	bge		icc3,3,bad
-	set_icc		0x8 0
-	bge		icc0,0,bad
-	set_icc		0x9 1
-	bge		icc1,1,bad
-	set_icc		0xa 2
-	bge		icc2,2,okb
-	fail
-okb:
-	set_icc		0xb 3
-	bge		icc3,3,okc
-	fail
-okc:
-	set_icc		0xc 0
-	bge		icc0,0,bad
-	set_icc		0xd 1
-	bge		icc1,1,bad
-	set_icc		0xe 2
-	bge		icc2,2,okf
-	fail
-okf:
-	set_icc		0xf 3
-	bge		icc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bgelr.cgs b/sim/testsuite/sim/frv/bgelr.cgs
deleted file mode 100644
index 806770a2c27..00000000000
--- a/sim/testsuite/sim/frv/bgelr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bgelr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bgelr
-bgelr:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bgelr		icc0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bgelr		icc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bgelr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bgelr		icc3,3
-
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bgelr		icc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bgelr		icc1,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bgelr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bgelr		icc3,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bgelr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bgelr		icc1,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bgelr		icc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bgelr		icc3,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bgelr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bgelr		icc1,1
-
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bgelr		icc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bgelr		icc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bgt.cgs b/sim/testsuite/sim/frv/bgt.cgs
deleted file mode 100644
index 98b1b17fadb..00000000000
--- a/sim/testsuite/sim/frv/bgt.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase for bgt $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bgt
-bgt:
-	set_icc		0x0 0
-	bgt		icc0,0,ok1
-	fail
-ok1:
-	set_icc		0x1 1
-	bgt		icc1,1,ok2
-	fail
-ok2:
-	set_icc		0x2 2
-	bgt		icc2,2,bad
-	set_icc		0x3 3
-	bgt		icc3,3,bad
-	set_icc		0x4 0
-	bgt		icc0,0,bad
-	set_icc		0x5 1
-	bgt		icc1,1,bad
-	set_icc		0x6 2
-	bgt		icc2,2,bad
-	set_icc		0x7 3
-	bgt		icc3,3,bad
-	set_icc		0x8 0
-	bgt		icc0,0,bad
-	set_icc		0x9 1
-	bgt		icc1,1,bad
-	set_icc		0xa 2
-	bgt		icc2,2,okb
-	fail
-okb:
-	set_icc		0xb 3
-	bgt		icc3,3,okc
-	fail
-okc:
-	set_icc		0xc 0
-	bgt		icc0,0,bad
-	set_icc		0xd 1
-	bgt		icc1,1,bad
-	set_icc		0xe 2
-	bgt		icc2,2,bad
-	set_icc		0xf 3
-	bgt		icc3,3,bad
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bgtlr.cgs b/sim/testsuite/sim/frv/bgtlr.cgs
deleted file mode 100644
index ad44a2ce2b1..00000000000
--- a/sim/testsuite/sim/frv/bgtlr.cgs
+++ /dev/null
@@ -1,80 +0,0 @@
-# frv testcase for bgtlr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bgtlr
-bgtlr:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bgtlr		icc0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bgtlr		icc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bgtlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bgtlr		icc3,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bgtlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bgtlr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bgtlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bgtlr		icc3,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bgtlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bgtlr		icc1,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bgtlr		icc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bgtlr		icc3,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bgtlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bgtlr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bgtlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bgtlr		icc3,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bhi.cgs b/sim/testsuite/sim/frv/bhi.cgs
deleted file mode 100644
index a92c0c0b307..00000000000
--- a/sim/testsuite/sim/frv/bhi.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase for bhi $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bhi
-bhi:
-	set_icc		0x0 0
-	bhi		icc0,0,ok1
-	fail
-ok1:
-	set_icc		0x1 1
-	bhi		icc1,1,bad
-	set_icc		0x2 2
-	bhi		icc2,2,ok3
-	fail
-ok3:
-	set_icc		0x3 3
-	bhi		icc3,3,bad
-	set_icc		0x4 0
-	bhi		icc0,0,bad
-	set_icc		0x5 1
-	bhi		icc1,1,bad
-	set_icc		0x6 2
-	bhi		icc2,2,bad
-	set_icc		0x7 3
-	bhi		icc3,3,bad
-	set_icc		0x8 0
-	bhi		icc0,0,ok9
-	fail
-ok9:
-	set_icc		0x9 1
-	bhi		icc1,1,bad
-	set_icc		0xa 2
-	bhi		icc2,2,okb
-	fail
-okb:
-	set_icc		0xb 3
-	bhi		icc3,3,bad
-	set_icc		0xc 0
-	bhi		icc0,0,bad
-	set_icc		0xd 1
-	bhi		icc1,1,bad
-	set_icc		0xe 2
-	bhi		icc2,2,bad
-	set_icc		0xf 3
-	bhi		icc3,3,bad
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bhilr.cgs b/sim/testsuite/sim/frv/bhilr.cgs
deleted file mode 100644
index 927643b2170..00000000000
--- a/sim/testsuite/sim/frv/bhilr.cgs
+++ /dev/null
@@ -1,80 +0,0 @@
-# frv testcase for bhilr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bhilr
-bhilr:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bhilr		icc0,0
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bhilr		icc1,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bhilr		icc2,2
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bhilr		icc3,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bhilr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bhilr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bhilr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bhilr		icc3,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bhilr		icc0,0
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bhilr		icc1,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bhilr		icc2,2
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bhilr		icc3,3
-
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bhilr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bhilr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bhilr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bhilr		icc3,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ble.cgs b/sim/testsuite/sim/frv/ble.cgs
deleted file mode 100644
index c3587663606..00000000000
--- a/sim/testsuite/sim/frv/ble.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# frv testcase for ble $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ble
-ble:
-	set_icc		0x0 0
-	ble		icc0,0,bad
-	set_icc		0x1 1
-	ble		icc1,1,bad
-	set_icc		0x2 2
-	ble		icc2,2,ok3
-	fail
-ok3:
-	set_icc		0x3 3
-	ble		icc3,3,ok4
-	fail
-ok4:
-	set_icc		0x4 0
-	ble		icc0,0,ok5
-	fail
-ok5:
-	set_icc		0x5 1
-	ble		icc1,1,ok6
-	fail
-ok6:
-	set_icc		0x6 2
-	ble		icc2,2,ok7
-	fail
-ok7:
-	set_icc		0x7 3
-	ble		icc3,3,ok8
-	fail
-ok8:
-	set_icc		0x8 0
-	ble		icc0,0,ok9
-	fail
-ok9:
-	set_icc		0x9 1
-	ble		icc1,1,oka
-	fail
-oka:
-	set_icc		0xa 2
-	ble		icc2,2,bad
-	set_icc		0xb 3
-	ble		icc3,3,bad
-	set_icc		0xc 0
-	ble		icc0,0,okd
-	fail
-okd:
-	set_icc		0xd 1
-	ble		icc1,1,oke
-	fail
-oke:
-	set_icc		0xe 2
-	ble		icc2,2,okf
-	fail
-okf:
-	set_icc		0xf 3
-	ble		icc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/blelr.cgs b/sim/testsuite/sim/frv/blelr.cgs
deleted file mode 100644
index dbb8e84539a..00000000000
--- a/sim/testsuite/sim/frv/blelr.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# frv testcase for blelr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global blelr
-blelr:
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	blelr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	blelr		icc1,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	blelr		icc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	blelr		icc3,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	blelr		icc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	blelr		icc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	blelr		icc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	blelr		icc3,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	blelr		icc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	blelr		icc1,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	blelr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	blelr		icc3,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	blelr		icc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	blelr		icc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	blelr		icc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	blelr		icc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bls.cgs b/sim/testsuite/sim/frv/bls.cgs
deleted file mode 100644
index e868de62af3..00000000000
--- a/sim/testsuite/sim/frv/bls.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# frv testcase for bls $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bls
-bls:
-	set_icc		0x0 0
-	bls		icc0,0,bad
-	set_icc		0x1 1
-	bls		icc1,1,ok2
-	fail
-ok2:
-	set_icc		0x2 2
-	bls		icc2,2,bad
-	set_icc		0x3 3
-	bls		icc3,3,ok4
-	fail
-ok4:
-	set_icc		0x4 0
-	bls		icc0,0,ok5
-	fail
-ok5:
-	set_icc		0x5 1
-	bls		icc1,1,ok6
-	fail
-ok6:
-	set_icc		0x6 2
-	bls		icc2,2,ok7
-	fail
-ok7:
-	set_icc		0x7 3
-	bls		icc3,3,ok8
-	fail
-ok8:
-	set_icc		0x8 0
-	bls		icc0,0,bad
-	set_icc		0x9 1
-	bls		icc1,1,oka
-	fail
-oka:
-	set_icc		0xa 2
-	bls		icc2,2,bad
-	set_icc		0xb 3
-	bls		icc3,3,okc
-	fail
-okc:
-	set_icc		0xc 0
-	bls		icc0,0,okd
-	fail
-okd:
-	set_icc		0xd 1
-	bls		icc1,1,oke
-	fail
-oke:
-	set_icc		0xe 2
-	bls		icc2,2,okf
-	fail
-okf:
-	set_icc		0xf 3
-	bls		icc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/blslr.cgs b/sim/testsuite/sim/frv/blslr.cgs
deleted file mode 100644
index 5166c52a54c..00000000000
--- a/sim/testsuite/sim/frv/blslr.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# frv testcase for blslr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global blslr
-blslr:
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	blslr		icc0,0
-
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	blslr		icc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	blslr		icc2,2
-
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	blslr		icc3,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	blslr		icc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	blslr		icc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	blslr		icc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	blslr		icc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	blslr		icc0,0
-
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	blslr		icc1,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	blslr		icc2,2
-
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	blslr		icc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	blslr		icc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	blslr		icc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	blslr		icc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	blslr		icc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/blt.cgs b/sim/testsuite/sim/frv/blt.cgs
deleted file mode 100644
index 639f9710a43..00000000000
--- a/sim/testsuite/sim/frv/blt.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for blt $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global blt
-blt:
-	set_icc		0x0 0
-	blt		icc0,0,bad
-	set_icc		0x1 1
-	blt		icc1,1,bad
-	set_icc		0x2 2
-	blt		icc2,2,ok3
-	fail
-ok3:
-	set_icc		0x3 3
-	blt		icc3,3,ok4
-	fail
-ok4:
-	set_icc		0x4 0
-	blt		icc0,0,bad
-	set_icc		0x5 1
-	blt		icc1,1,bad
-	set_icc		0x6 2
-	blt		icc2,2,ok7
-	fail
-ok7:
-	set_icc		0x7 3
-	blt		icc3,3,ok8
-	fail
-ok8:
-	set_icc		0x8 0
-	blt		icc0,0,ok9
-	fail
-ok9:
-	set_icc		0x9 1
-	blt		icc1,1,oka
-	fail
-oka:
-	set_icc		0xa 2
-	blt		icc2,2,bad
-	set_icc		0xb 3
-	blt		icc3,3,bad
-	set_icc		0xc 0
-	blt		icc0,0,okd
-	fail
-okd:
-	set_icc		0xd 1
-	blt		icc1,1,oke
-	fail
-oke:
-	set_icc		0xe 2
-	blt		icc2,2,bad
-	set_icc		0xf 3
-	blt		icc3,3,bad
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bltlr.cgs b/sim/testsuite/sim/frv/bltlr.cgs
deleted file mode 100644
index fcf04b5db7a..00000000000
--- a/sim/testsuite/sim/frv/bltlr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bltlr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bltlr
-bltlr:
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bltlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bltlr		icc1,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bltlr		icc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bltlr		icc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bltlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bltlr		icc1,1
-
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bltlr		icc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bltlr		icc3,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bltlr		icc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bltlr		icc1,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bltlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bltlr		icc3,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bltlr		icc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bltlr		icc1,1
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bltlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bltlr		icc3,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bn.cgs b/sim/testsuite/sim/frv/bn.cgs
deleted file mode 100644
index e5ff3977bb4..00000000000
--- a/sim/testsuite/sim/frv/bn.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bn $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bn
-bn:
-	set_icc		0x0 0
-	bn		icc0,0,bad
-	set_icc		0x1 1
-	bn		icc1,1,bad
-	set_icc		0x2 2
-	bn		icc2,2,bad
-	set_icc		0x3 3
-	bn		icc3,3,bad
-	set_icc		0x4 0
-	bn		icc0,0,bad
-	set_icc		0x5 1
-	bn		icc1,1,bad
-	set_icc		0x6 2
-	bn		icc2,2,bad
-	set_icc		0x7 3
-	bn		icc3,3,bad
-	set_icc		0x8 0
-	bn		icc0,0,ok9
-	fail
-ok9:
-	set_icc		0x9 1
-	bn		icc1,1,oka
-	fail
-oka:
-	set_icc		0xa 2
-	bn		icc2,2,okb
-	fail
-okb:
-	set_icc		0xb 3
-	bn		icc3,3,okc
-	fail
-okc:
-	set_icc		0xc 0
-	bn		icc0,0,okd
-	fail
-okd:
-	set_icc		0xd 1
-	bn		icc1,1,oke
-	fail
-oke:
-	set_icc		0xe 2
-	bn		icc2,2,okf
-	fail
-okf:
-	set_icc		0xf 3
-	bn		icc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bnc.cgs b/sim/testsuite/sim/frv/bnc.cgs
deleted file mode 100644
index 6f14e6cd550..00000000000
--- a/sim/testsuite/sim/frv/bnc.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bnc $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnc
-bnc:
-	set_icc		0x0 0
-	bnc		icc0,0,ok1
-	fail
-ok1:
-	set_icc		0x1 1
-	bnc		icc1,1,bad
-	set_icc		0x2 2
-	bnc		icc2,2,ok3
-	fail
-ok3:
-	set_icc		0x3 3
-	bnc		icc3,3,bad
-	set_icc		0x4 0
-	bnc		icc0,0,ok5
-	fail
-ok5:
-	set_icc		0x5 1
-	bnc		icc1,1,bad
-	set_icc		0x6 2
-	bnc		icc2,2,ok7
-	fail
-ok7:
-	set_icc		0x7 3
-	bnc		icc3,3,bad
-	set_icc		0x8 0
-	bnc		icc0,0,ok9
-	fail
-ok9:
-	set_icc		0x9 1
-	bnc		icc1,1,bad
-	set_icc		0xa 2
-	bnc		icc2,2,okb
-	fail
-okb:
-	set_icc		0xb 3
-	bnc		icc3,3,bad
-	set_icc		0xc 0
-	bnc		icc0,0,okd
-	fail
-okd:
-	set_icc		0xd 1
-	bnc		icc1,1,bad
-	set_icc		0xe 2
-	bnc		icc2,2,okf
-	fail
-okf:
-	set_icc		0xf 3
-	bnc		icc3,3,bad
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bnclr.cgs b/sim/testsuite/sim/frv/bnclr.cgs
deleted file mode 100644
index d24f8eb5463..00000000000
--- a/sim/testsuite/sim/frv/bnclr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bnclr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnclr
-bnclr:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bnclr		icc0,0
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bnclr		icc1,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bnclr		icc2,2
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bnclr		icc3,3
-
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bnclr		icc0,0
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bnclr		icc1,1
-
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bnclr		icc2,2
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bnclr		icc3,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bnclr		icc0,0
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bnclr		icc1,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bnclr		icc2,2
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bnclr		icc3,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bnclr		icc0,0
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bnclr		icc1,1
-
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bnclr		icc2,2
-	fail
-okf:
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bnclr		icc3,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bne.cgs b/sim/testsuite/sim/frv/bne.cgs
deleted file mode 100644
index f0f08945358..00000000000
--- a/sim/testsuite/sim/frv/bne.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bne $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bne
-bne:
-	set_icc		0x0 0
-	bne		icc0,0,ok1
-	fail
-ok1:
-	set_icc		0x1 1
-	bne		icc1,1,ok2
-	fail
-ok2:
-	set_icc		0x2 2
-	bne		icc2,2,ok3
-	fail
-ok3:
-	set_icc		0x3 3
-	bne		icc3,3,ok4
-	fail
-ok4:
-	set_icc		0x4 0
-	bne		icc0,0,bad
-	set_icc		0x5 1
-	bne		icc1,1,bad
-	set_icc		0x6 2
-	bne		icc2,2,bad
-	set_icc		0x7 3
-	bne		icc3,3,bad
-	set_icc		0x8 0
-	bne		icc0,0,ok9
-	fail
-ok9:
-	set_icc		0x9 1
-	bne		icc1,1,oka
-	fail
-oka:
-	set_icc		0xa 2
-	bne		icc2,2,okb
-	fail
-okb:
-	set_icc		0xb 3
-	bne		icc3,3,okc
-	fail
-okc:
-	set_icc		0xc 0
-	bne		icc0,0,bad
-	set_icc		0xd 1
-	bne		icc1,1,bad
-	set_icc		0xe 2
-	bne		icc2,2,bad
-	set_icc		0xf 3
-	bne		icc3,3,bad
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bnelr.cgs b/sim/testsuite/sim/frv/bnelr.cgs
deleted file mode 100644
index 7a477b844e6..00000000000
--- a/sim/testsuite/sim/frv/bnelr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bnelr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnelr
-bnelr:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bnelr		icc0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bnelr		icc1,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bnelr		icc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bnelr		icc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bnelr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bnelr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bnelr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bnelr		icc3,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bnelr		icc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bnelr		icc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bnelr		icc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bnelr		icc3,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bnelr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bnelr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bnelr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bnelr		icc3,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bnlr.cgs b/sim/testsuite/sim/frv/bnlr.cgs
deleted file mode 100644
index de32b051694..00000000000
--- a/sim/testsuite/sim/frv/bnlr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bnlr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnlr
-bnlr:
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bnlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bnlr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bnlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bnlr		icc3,3
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bnlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bnlr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bnlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bnlr		icc3,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bnlr		icc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bnlr		icc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bnlr		icc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bnlr		icc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bnlr		icc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bnlr		icc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bnlr		icc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bnlr		icc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bno.cgs b/sim/testsuite/sim/frv/bno.cgs
deleted file mode 100644
index 005e4224437..00000000000
--- a/sim/testsuite/sim/frv/bno.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# frv testcase for bno $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bno
-bno:
-	set_icc		0x0 0
-	bno
-	set_icc		0x1 1
-	bno
-	set_icc		0x2 2
-	bno
-	set_icc		0x3 3
-	bno
-	set_icc		0x4 0
-	bno
-	set_icc		0x5 1
-	bno
-	set_icc		0x6 2
-	bno
-	set_icc		0x7 3
-	bno
-	set_icc		0x8 0
-	bno
-	set_icc		0x9 1
-	bno
-	set_icc		0xa 2
-	bno
-	set_icc		0xb 3
-	bno
-	set_icc		0xc 0
-	bno
-	set_icc		0xd 1
-	bno
-	set_icc		0xe 2
-	bno
-	set_icc		0xf 3
-	bno
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bnolr.cgs b/sim/testsuite/sim/frv/bnolr.cgs
deleted file mode 100644
index ae69f6fa495..00000000000
--- a/sim/testsuite/sim/frv/bnolr.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bnolr
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnolr
-bnolr:
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bnolr
-
-	set_icc		0x1 1
-	bnolr
-
-	set_icc		0x2 2
-	bnolr
-
-	set_icc		0x3 3
-	bnolr
-
-	set_icc		0x4 0
-	bnolr
-
-	set_icc		0x5 1
-	bnolr
-
-	set_icc		0x6 2
-	bnolr
-
-	set_icc		0x7 3
-	bnolr
-
-	set_icc		0x8 0
-	bnolr
-
-	set_icc		0x9 1
-	bnolr
-
-	set_icc		0xa 2
-	bnolr
-
-	set_icc		0xb 3
-	bnolr
-
-	set_icc		0xc 0
-	bnolr
-
-	set_icc		0xd 1
-	bnolr
-
-	set_icc		0xe 2
-	bnolr
-
-	set_icc		0xf 3
-	bnolr
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bnv.cgs b/sim/testsuite/sim/frv/bnv.cgs
deleted file mode 100644
index 29ec57a1ded..00000000000
--- a/sim/testsuite/sim/frv/bnv.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bnv $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnv
-bnv:
-	set_icc		0x0 0
-	bnv		icc0,0,ok1
-	fail
-ok1:
-	set_icc		0x1 1
-	bnv		icc1,1,ok2
-	fail
-ok2:
-	set_icc		0x2 2
-	bnv		icc2,2,bad
-	set_icc		0x3 3
-	bnv		icc3,3,bad
-	set_icc		0x4 0
-	bnv		icc0,0,ok5
-	fail
-ok5:
-	set_icc		0x5 1
-	bnv		icc1,1,ok6
-	fail
-ok6:
-	set_icc		0x6 2
-	bnv		icc2,2,bad
-	set_icc		0x7 3
-	bnv		icc3,3,bad
-	set_icc		0x8 0
-	bnv		icc0,0,ok9
-	fail
-ok9:
-	set_icc		0x9 1
-	bnv		icc1,1,oka
-	fail
-oka:
-	set_icc		0xa 2
-	bnv		icc2,2,bad
-	set_icc		0xb 3
-	bnv		icc3,3,bad
-	set_icc		0xc 0
-	bnv		icc0,0,okd
-	fail
-okd:
-	set_icc		0xd 1
-	bnv		icc1,1,oke
-	fail
-oke:
-	set_icc		0xe 2
-	bnv		icc2,2,bad
-	set_icc		0xf 3
-	bnv		icc3,3,bad
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bnvlr.cgs b/sim/testsuite/sim/frv/bnvlr.cgs
deleted file mode 100644
index de40f9cf5fb..00000000000
--- a/sim/testsuite/sim/frv/bnvlr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bnvlr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnvlr
-bnvlr:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bnvlr		icc0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bnvlr		icc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x2 2
-	bnvlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 3
-	bnvlr		icc3,3
-
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bnvlr		icc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bnvlr		icc1,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_icc		0x6 2
-	bnvlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 3
-	bnvlr		icc3,3
-
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bnvlr		icc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bnvlr		icc1,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bnvlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bnvlr		icc3,3
-
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bnvlr		icc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bnvlr		icc1,1
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bnvlr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bnvlr		icc3,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bp.cgs b/sim/testsuite/sim/frv/bp.cgs
deleted file mode 100644
index 0bc1e7fb8b9..00000000000
--- a/sim/testsuite/sim/frv/bp.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bp $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bp
-bp:
-	set_icc		0x0 0
-	bp		icc0,0,ok1
-	fail
-ok1:
-	set_icc		0x1 1
-	bp		icc1,1,ok2
-	fail
-ok2:
-	set_icc		0x2 2
-	bp		icc2,2,ok3
-	fail
-ok3:
-	set_icc		0x3 3
-	bp		icc3,3,ok4
-	fail
-ok4:
-	set_icc		0x4 0
-	bp		icc0,0,ok5
-	fail
-ok5:
-	set_icc		0x5 1
-	bp		icc1,1,ok6
-	fail
-ok6:
-	set_icc		0x6 2
-	bp		icc2,2,ok7
-	fail
-ok7:
-	set_icc		0x7 3
-	bp		icc3,3,ok8
-	fail
-ok8:
-	set_icc		0x8 0
-	bp		icc0,0,bad
-	set_icc		0x9 1
-	bp		icc1,1,bad
-	set_icc		0xa 2
-	bp		icc2,2,bad
-	set_icc		0xb 3
-	bp		icc3,3,bad
-	set_icc		0xc 0
-	bp		icc0,0,bad
-	set_icc		0xd 1
-	bp		icc1,1,bad
-	set_icc		0xe 2
-	bp		icc2,2,bad
-	set_icc		0xf 3
-	bp		icc3,3,bad
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bplr.cgs b/sim/testsuite/sim/frv/bplr.cgs
deleted file mode 100644
index 2bd9bb6ec67..00000000000
--- a/sim/testsuite/sim/frv/bplr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bplr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bplr
-bplr:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bplr		icc0,0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bplr		icc1,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bplr		icc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bplr		icc3,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bplr		icc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bplr		icc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bplr		icc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bplr		icc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bplr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bplr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xa 2
-	bplr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 3
-	bplr		icc3,3
-
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bplr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bplr		icc1,1
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 2
-	bplr		icc2,2
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 3
-	bplr		icc3,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bra.cgs b/sim/testsuite/sim/frv/bra.cgs
deleted file mode 100644
index e6b312b1372..00000000000
--- a/sim/testsuite/sim/frv/bra.cgs
+++ /dev/null
@@ -1,75 +0,0 @@
-# frv testcase for bra $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bra
-bra:
-	set_icc		0x0 0
-	bra		ok1
-	fail
-ok1:
-	set_icc		0x1 1
-	bra		ok2
-	fail
-ok2:
-	set_icc		0x2 2
-	bra		ok3
-	fail
-ok3:
-	set_icc		0x3 3
-	bra		ok4
-	fail
-ok4:
-	set_icc		0x4 0
-	bra		ok5
-	fail
-ok5:
-	set_icc		0x5 1
-	bra		ok6
-	fail
-ok6:
-	set_icc		0x6 2
-	bra		ok7
-	fail
-ok7:
-	set_icc		0x7 3
-	bra		ok8
-	fail
-ok8:
-	set_icc		0x8 0
-	bra		ok9
-	fail
-ok9:
-	set_icc		0x9 1
-	bra		oka
-	fail
-oka:
-	set_icc		0xa 2
-	bra		okb
-	fail
-okb:
-	set_icc		0xb 3
-	bra		okc
-	fail
-okc:
-	set_icc		0xc 0
-	bra		okd
-	fail
-okd:
-	set_icc		0xd 1
-	bra		oke
-	fail
-oke:
-	set_icc		0xe 2
-	bra		okf
-	fail
-okf:
-	set_icc		0xf 3
-	bra		okg
-	fail
-okg:
-
-	pass
diff --git a/sim/testsuite/sim/frv/bralr.cgs b/sim/testsuite/sim/frv/bralr.cgs
deleted file mode 100644
index 39282099947..00000000000
--- a/sim/testsuite/sim/frv/bralr.cgs
+++ /dev/null
@@ -1,91 +0,0 @@
-# frv testcase for bralr
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bralr
-bralr:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	bralr
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	bralr
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bralr
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bralr
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	bralr
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	bralr
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bralr
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bralr
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	bralr
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	bralr
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bralr
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bralr
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	bralr
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	bralr
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bralr
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bralr
-	fail
-okg:
-
-	pass
diff --git a/sim/testsuite/sim/frv/branch.pcgs b/sim/testsuite/sim/frv/branch.pcgs
deleted file mode 100644
index 013b0badad2..00000000000
--- a/sim/testsuite/sim/frv/branch.pcgs
+++ /dev/null
@@ -1,63 +0,0 @@
-# frv parallel testcase for branching
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global branch
-branch:	; All insns in VLIW execute
-	setlos.p	1,gr1
-	setlos		0,gr2
-	setlos.p	0,gr3
-	bra		ok1
-	setlos.p	2,gr2
-	setlos		3,gr3
-	fail
-ok1:
-	test_gr_immed  	1,gr1
-	test_gr_immed  	0,gr2
-	test_gr_immed  	0,gr3
-
-	; 1st branch is taken
-	bra.p		ok5
-	bra		ok4
-	bra.p		ok3
-	bra		ok2
-	fail
-ok2:
-	fail
-ok3:
-	fail
-ok4:
-	fail
-ok5:
-	; 1st true branch is taken
-	set_icc		0x4 1
-	bne.p		icc1,1,ok6
-	blt		icc1,1,ok7
-	beq.p		icc1,1,ok9
-	ble		icc1,1,ok8
-	fail
-ok6:
-	fail
-ok7:
-	fail
-ok8:
-	fail
-ok9:
-	; combination of the above
-	set_icc		0x4 1
-	setlos.p	4,gr4
-	setlos.p	0,gr5
-	bne.p		icc1,1,oka
-	beq		icc1,1,okb
-	setlos		5,gr5
-	fail
-oka:
-	fail
-okb:
-	test_gr_immed  	4,gr4
-	test_gr_immed  	0,gr5
-
-	pass
diff --git a/sim/testsuite/sim/frv/break.cgs b/sim/testsuite/sim/frv/break.cgs
deleted file mode 100644
index b2a61a05be0..00000000000
--- a/sim/testsuite/sim/frv/break.cgs
+++ /dev/null
@@ -1,58 +0,0 @@
-# FRV testcase for break
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tra
-tra:
-	; Can't test break anymore in the user environment because it is the 
-	; debugger's breakpoint insn. Just pass this test for now.
-	pass
-
-
-
-
-
-	set_gr_spr	tbr,gr7
-	and_gr_immed	-4081,gr7		; clear tbr.tt
-	inc_gr_immed	0xff0,gr7		; break handler
-	set_bctrlr_0_0  gr7
-	set_spr_immed	128,lcr
-
-	test_spr_bits	0x4,2,0x1,psr		; psr.s is set
-	test_spr_bits	0x1,0,0x0,psr		; psr.et is clear
-	set_spr_addr	ok1,lr
-	break
-ret:
-	or_spr_immed	0x00000001,psr		; turn on psr.et
-	and_spr_immed	0xfffffffb,psr		; turn off psr.s
-	test_spr_bits	0x4,2,0x0,psr		; psr.s is clear
-	test_spr_bits	0x1,0,0x1,psr		; psr.et is set
-	set_spr_addr	ok0,lr
-	break
-ret1:
-	test_spr_bits	0x4,2,0x0,psr		; psr.s is clear
-	test_spr_bits	0x1,0,0x1,psr		; psr.et is set
-	pass
-
-	; check interrupt for second break
-ok0:	test_spr_addr	ret1,bpcsr
-	test_spr_bits	0x1000,12,0x0,bpsr	; bpsr.bs is clear
-	test_spr_bits	0x0001,0,0x1,bpsr	; bpsr.et is set
-	test_spr_bits	0x4,2,0x1,psr		; psr.s is set
-	test_spr_bits	0x1,0,0x0,psr		; psr.et is clear
-	rett		0			; nop
-	rett		1
-
-	; check interrupt for first break
-ok1:	test_spr_addr	ret,bpcsr
-	test_spr_bits	0x1000,12,0x1,bpsr	; bpsr.bs is set
-	test_spr_bits	0x0001,0,0x0,bpsr	; bpsr.et is clear
-	test_spr_bits	0x4,2,0x1,psr		; psr.s is set
-	test_spr_bits	0x1,0,0x0,psr		; psr.et is clear
-	rett		0			; nop
-	rett		1
-
-	
diff --git a/sim/testsuite/sim/frv/bv.cgs b/sim/testsuite/sim/frv/bv.cgs
deleted file mode 100644
index e2f8174063f..00000000000
--- a/sim/testsuite/sim/frv/bv.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for bv $ICCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bv
-bv:
-	set_icc		0x0 0
-	bv		icc0,0,bad
-	set_icc		0x1 1
-	bv		icc1,1,bad
-	set_icc		0x2 2
-	bv		icc2,2,ok3
-	fail
-ok3:
-	set_icc		0x3 3
-	bv		icc3,3,ok4
-	fail
-ok4:
-	set_icc		0x4 0
-	bv		icc0,0,bad
-	set_icc		0x5 1
-	bv		icc1,1,bad
-	set_icc		0x6 2
-	bv		icc2,2,ok7
-	fail
-ok7:
-	set_icc		0x7 3
-	bv		icc3,3,ok8
-	fail
-ok8:
-	set_icc		0x8 0
-	bv		icc0,0,bad
-	set_icc		0x9 1
-	bv		icc1,1,bad
-	set_icc		0xa 2
-	bv		icc2,2,okb
-	fail
-okb:
-	set_icc		0xb 3
-	bv		icc3,3,okc
-	fail
-okc:
-	set_icc		0xc 0
-	bv		icc0,0,bad
-	set_icc		0xd 1
-	bv		icc1,1,bad
-	set_icc		0xe 2
-	bv		icc2,2,okf
-	fail
-okf:
-	set_icc		0xf 3
-	bv		icc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/bvlr.cgs b/sim/testsuite/sim/frv/bvlr.cgs
deleted file mode 100644
index b7ba9d88ac5..00000000000
--- a/sim/testsuite/sim/frv/bvlr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for bvlr $ICCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global bvlr
-bvlr:
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	bvlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 1
-	bvlr		icc1,1
-
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	bvlr		icc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	bvlr		icc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	bvlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 1
-	bvlr		icc1,1
-
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	bvlr		icc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	bvlr		icc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	bvlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 1
-	bvlr		icc1,1
-
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	bvlr		icc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	bvlr		icc3,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	bvlr		icc0,0
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 1
-	bvlr		icc1,1
-
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	bvlr		icc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	bvlr		icc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/cadd.cgs b/sim/testsuite/sim/frv/cadd.cgs
deleted file mode 100644
index 291b8fb6675..00000000000
--- a/sim/testsuite/sim/frv/cadd.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for cadd $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cadd
-cadd:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	cadd      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	cadd		gr7,gr8,gr8,cc4,1
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	cadd		gr8,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	cadd      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	cadd		gr7,gr8,gr8,cc4,0
-	test_gr_immed	1,gr8
-
-	cadd		gr8,gr8,gr8,cc4,0
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	cadd      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	cadd		gr7,gr8,gr8,cc5,0
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	cadd		gr8,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	cadd      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	cadd		gr7,gr8,gr8,cc5,1
-	test_gr_immed	1,gr8
-
-	cadd		gr8,gr8,gr8,cc5,1
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	cadd      	gr7,gr8,gr8,cc6,1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	cadd		gr7,gr8,gr8,cc6,0
-	test_gr_immed	1,gr8
-
-	cadd		gr8,gr8,gr8,cc6,1
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	cadd      	gr7,gr8,gr8,cc7,0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	cadd		gr7,gr8,gr8,cc7,1
-	test_gr_immed	1,gr8
-
-	cadd		gr8,gr8,gr8,cc7,0
-	test_gr_immed  	1,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/caddcc.cgs b/sim/testsuite/sim/frv/caddcc.cgs
deleted file mode 100644
index ddfd41e359b..00000000000
--- a/sim/testsuite/sim/frv/caddcc.cgs
+++ /dev/null
@@ -1,163 +0,0 @@
-# frv testcase for caddcc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global caddcc
-caddcc:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	caddcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	caddcc		gr7,gr8,gr8,cc0,1
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x08,0		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc4,1
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc4,1; test zero, carry and overflow bits
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	caddcc      	gr7,gr8,gr8,cc0,0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	caddcc		gr7,gr8,gr8,cc0,0
-	test_icc	0 1 0 1 icc0
-	test_gr_immed 	1,gr8
-
-	set_icc         0x08,0		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc4,0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc4,0; test zero, carry and overflow bits
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed  0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	caddcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 0 icc1
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	caddcc		gr7,gr8,gr8,cc1,0
-	test_icc	1 0 1 0 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x08,1		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc5,0
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc5,0; test zero, carry and overflow bits
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	caddcc      	gr7,gr8,gr8,cc1,1
-	test_icc	1 1 1 1 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	caddcc		gr7,gr8,gr8,cc1,1
-	test_icc	0 1 0 1 icc1
-	test_gr_immed 	1,gr8
-
-	set_icc         0x08,1		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc5,1
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc5,1; test zero, carry and overflow bits
-	test_icc	1 0 0 0 icc1
-	test_gr_limmed  0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	caddcc      	gr7,gr8,gr8,cc2,0
-	test_icc	1 1 1 1 icc2
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	caddcc		gr7,gr8,gr8,cc2,0
-	test_icc	0 1 0 1 icc2
-	test_gr_immed 	1,gr8
-
-	set_icc         0x08,2		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc6,1
-	test_icc	1 0 0 0 icc2
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc         0x08,2		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc6,1; test zero, carry and overflow bits
-	test_icc	1 0 0 0 icc2
-	test_gr_limmed  0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	caddcc      	gr7,gr8,gr8,cc3,0
-	test_icc	1 1 1 1 icc3
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	caddcc		gr7,gr8,gr8,cc3,0
-	test_icc	0 1 0 1 icc3
-	test_gr_immed 	1,gr8
-
-	set_icc         0x08,3		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc7,1
-	test_icc	1 0 0 0 icc3
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc         0x08,3		; Set mask opposite of expected
-	caddcc		gr8,gr8,gr8,cc7,1; test zero, carry and overflow bits
-	test_icc	1 0 0 0 icc3
-	test_gr_limmed  0x8000,0x0000,gr8
-
-
-	pass
diff --git a/sim/testsuite/sim/frv/call.cgs b/sim/testsuite/sim/frv/call.cgs
deleted file mode 100644
index 5f0d7677bcc..00000000000
--- a/sim/testsuite/sim/frv/call.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# frv testcase for call $label24
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global call
-call:
-	set_spr_immed	0,lr
-	call		ok1
-bad1:
-	fail
-ok1:
-	test_spr_addr	bad1,lr
-
-	pass
diff --git a/sim/testsuite/sim/frv/call.pcgs b/sim/testsuite/sim/frv/call.pcgs
deleted file mode 100644
index 7f452c664f6..00000000000
--- a/sim/testsuite/sim/frv/call.pcgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# frv parallel testcase for call $label24
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global call
-call:
-	set_spr_immed	0,lr
-	call		ok1
-bad1:
-	fail
-ok1:
-	test_spr_addr	bad1,lr
-
-	set_spr_immed	0,lr
-	setlos.p	0,gr5
-	call.p		ok2
-	bra		bad3
-bad2:
-	setlos		5,gr5
-	fail
-bad3:
-	fail
-ok2:
-	test_spr_addr	bad2,lr
-	test_gr_immed	0,gr5
-
-	pass
diff --git a/sim/testsuite/sim/frv/callil.cgs b/sim/testsuite/sim/frv/callil.cgs
deleted file mode 100644
index eac63e86a49..00000000000
--- a/sim/testsuite/sim/frv/callil.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for callil @($GRi,$d12),$LI
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global callil
-callil:
-	set_gr_addr	ok2,gr8
-	inc_gr_immed	-2047,gr8
-	callil		@(gr8,0x7ff)
-bad2:
-	fail
-ok2:
-	test_spr_addr	bad2,lr
-
-	set_gr_addr	ok3,gr8
-	inc_gr_immed	2048,gr8
-	callil		@(gr8,-2048)
-bad3:
-	fail
-ok3:
-	test_spr_addr	bad3,lr
-
-	pass
diff --git a/sim/testsuite/sim/frv/calll.cgs b/sim/testsuite/sim/frv/calll.cgs
deleted file mode 100644
index eee73bc2a97..00000000000
--- a/sim/testsuite/sim/frv/calll.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# frv testcase for calll @($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global calll
-calll:
-	set_gr_addr	ok2,gr8
-	inc_gr_immed	-4,gr8
-	inc_gr_immed	4,gr9
-	calll		@(gr8,gr9)
-bad2:
-	fail
-ok2:
-	test_spr_addr	bad2,lr
-
-	set_gr_addr	ok3,gr8
-	inc_gr_immed	4,gr8
-	set_gr_immed	-4,gr9
-	calll		@(gr8,gr9)
-bad3:
-	fail
-ok3:
-	test_spr_addr	bad3,lr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cand.cgs b/sim/testsuite/sim/frv/cand.cgs
deleted file mode 100644
index 6113593c24f..00000000000
--- a/sim/testsuite/sim/frv/cand.cgs
+++ /dev/null
@@ -1,126 +0,0 @@
-# frv testcase for cand $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cand
-cand:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cand      	gr7,gr8,gr8,cc0,1
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,0		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc0,1
-	test_icc	0 1 0 0 icc0
-	test_gr_limmed 	0xaaaa,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc4,1
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed	0x0000,0xaaaa,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cand      	gr7,gr8,gr8,cc0,0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,0		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc0,0
-	test_icc	0 1 0 0 icc0
-	test_gr_limmed 	0xffff,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc4,0
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed	0x0000,0xffff,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,1		; Set mask opposite of expected
-	cand      	gr7,gr8,gr8,cc1,0
-	test_icc	1 0 1 1 icc1
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,1		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc1,0
-	test_icc	0 1 0 0 icc1
-	test_gr_limmed 	0xaaaa,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc5,0
-	test_icc	1 1 0 1 icc1
-	test_gr_limmed	0x0000,0xaaaa,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,1		; Set mask opposite of expected
-	cand      	gr7,gr8,gr8,cc1,1
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,1		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc1,1
-	test_icc	0 1 0 0 icc1
-	test_gr_limmed 	0xffff,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc5,1
-	test_icc	1 1 0 1 icc1
-	test_gr_limmed	0x0000,0xffff,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,2		; Set mask opposite of expected
-	cand      	gr7,gr8,gr8,cc2,0
-	test_icc	1 0 1 1 icc2
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,2		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc2,0
-	test_icc	0 1 0 0 icc2
-	test_gr_limmed 	0xffff,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,2		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc6,1
-	test_icc	1 1 0 1 icc2
-	test_gr_limmed	0x0000,0xffff,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,3		; Set mask opposite of expected
-	cand      	gr7,gr8,gr8,cc3,0
-	test_icc	1 0 1 1 icc3
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,3		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc3,0
-	test_icc	0 1 0 0 icc3
-	test_gr_limmed 	0xffff,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,3		; Set mask opposite of expected
-	cand		gr7,gr8,gr8,cc7,1
-	test_icc	1 1 0 1 icc3
-	test_gr_limmed	0x0000,0xffff,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/candcc.cgs b/sim/testsuite/sim/frv/candcc.cgs
deleted file mode 100644
index c16df73ec29..00000000000
--- a/sim/testsuite/sim/frv/candcc.cgs
+++ /dev/null
@@ -1,126 +0,0 @@
-# frv testcase for candcc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global candcc
-candcc:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	candcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,0		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc0,1
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0xaaaa,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc4,1
-	test_icc	0 0 0 1 icc0
-	test_gr_limmed	0x0000,0xaaaa,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	candcc      	gr7,gr8,gr8,cc0,0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,0		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc0,0
-	test_icc	0 1 0 0 icc0
-	test_gr_limmed 	0xffff,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc4,0
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed	0x0000,0xffff,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,1		; Set mask opposite of expected
-	candcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	0,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,1		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc1,0
-	test_icc	1 0 0 0 icc1
-	test_gr_limmed 	0xaaaa,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc5,0
-	test_icc	0 0 0 1 icc1
-	test_gr_limmed	0x0000,0xaaaa,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,1		; Set mask opposite of expected
-	candcc      	gr7,gr8,gr8,cc1,1
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,1		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc1,1
-	test_icc	0 1 0 0 icc1
-	test_gr_limmed 	0xffff,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc5,1
-	test_icc	1 1 0 1 icc1
-	test_gr_limmed	0x0000,0xffff,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,2		; Set mask opposite of expected
-	candcc      	gr7,gr8,gr8,cc2,0
-	test_icc	1 0 1 1 icc2
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,2		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc2,0
-	test_icc	0 1 0 0 icc2
-	test_gr_limmed 	0xffff,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,2		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc6,1
-	test_icc	1 1 0 1 icc2
-	test_gr_limmed	0x0000,0xffff,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed  	0x5555,0x5555,gr8
-	set_icc         0x0b,3		; Set mask opposite of expected
-	candcc      	gr7,gr8,gr8,cc3,0
-	test_icc	1 0 1 1 icc3
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_limmed  	0xffff,0x0000,gr8
-	set_icc         0x04,3		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc3,0
-	test_icc	0 1 0 0 icc3
-	test_gr_limmed 	0xffff,0x0000,gr8
-
-	set_gr_limmed	0x0000,0xffff,gr8
-	set_icc         0x0d,3		; Set mask opposite of expected
-	candcc		gr7,gr8,gr8,cc7,1
-	test_icc	1 1 0 1 icc3
-	test_gr_limmed	0x0000,0xffff,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ccalll.cgs b/sim/testsuite/sim/frv/ccalll.cgs
deleted file mode 100644
index dcfd300079c..00000000000
--- a/sim/testsuite/sim/frv/ccalll.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for ccalll @($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ccalll
-ccalll:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_addr	ok2,gr8
-	inc_gr_immed	-4,gr8
-	inc_gr_immed	4,gr9
-	ccalll		@(gr8,gr9),cc0,1
-bad2:
-	fail
-ok2:
-	test_spr_addr	bad2,lr
-
-	set_gr_addr	ok3,gr8
-	inc_gr_immed	4,gr8
-	set_gr_immed	-4,gr9
-	ccalll		@(gr8,gr9),cc4,1
-bad3:
-	fail
-ok3:
-	test_spr_addr	bad3,lr
-
-	set_spr_immed	0,lr
-	set_gr_addr	bad,gr8
-	inc_gr_immed	-4,gr8
-	set_gr_immed	4,gr9
-	ccalll		@(gr8,gr9),cc0,0
-	test_spr_addr	0,lr
-
-	set_gr_addr	bad,gr8
-	inc_gr_immed	4,gr8
-	set_gr_immed	-4,gr9
-	ccalll		@(gr8,gr9),cc4,0
-	test_spr_addr	0,lr
-
-	set_gr_addr	ok5,gr8
-	inc_gr_immed	-4,gr8
-	set_gr_immed	4,gr9
-	ccalll		@(gr8,gr9),cc1,0
-bad5:
-	fail
-ok5:
-	test_spr_addr	bad5,lr
-
-	set_gr_addr	ok6,gr8
-	inc_gr_immed	4,gr8
-	set_gr_immed	-4,gr9
-	ccalll		@(gr8,gr9),cc5,0
-bad6:
-	fail
-ok6:
-	test_spr_addr	bad6,lr
-
-	set_spr_immed	0,lr
-	set_gr_addr	bad,gr8
-	inc_gr_immed	-4,gr8
-	set_gr_immed	4,gr9
-	ccalll		@(gr8,gr9),cc1,1
-	test_spr_addr	0,lr
-
-	set_gr_addr	bad,gr8
-	inc_gr_immed	4,gr8
-	set_gr_immed	-4,gr9
-	ccalll		@(gr8,gr9),cc5,1
-	test_spr_addr	0,lr
-
-	set_gr_addr	bad,gr8
-	inc_gr_immed	-4,gr8
-	set_gr_immed	4,gr9
-	ccalll		@(gr8,gr9),cc2,1
-	test_spr_addr	0,lr
-
-	set_gr_addr	bad,gr8
-	inc_gr_immed	4,gr8
-	set_gr_immed	-4,gr9
-	ccalll		@(gr8,gr9),cc6,0
-	test_spr_addr	0,lr
-
-	set_gr_addr	bad,gr8
-	inc_gr_immed	-4,gr8
-	set_gr_immed	4,gr9
-	ccalll		@(gr8,gr9),cc3,0
-	test_spr_addr	0,lr
-
-	set_gr_addr	bad,gr8
-	inc_gr_immed	4,gr8
-	set_gr_immed	-4,gr9
-	ccalll		@(gr8,gr9),cc7,1
-	test_spr_addr	0,lr
-
-	pass
-bad:
-	fail
-
diff --git a/sim/testsuite/sim/frv/cckc.cgs b/sim/testsuite/sim/frv/cckc.cgs
deleted file mode 100644
index 70eabee5ce9..00000000000
--- a/sim/testsuite/sim/frv/cckc.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckc $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckc
-cckc:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckc		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckc		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckc		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckc		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckc		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckc		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckc		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckc		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckc		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckc		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckc		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckc		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckc		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckc		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckc		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckc		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckc		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckc		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckc		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckc		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckc		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckc		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckc		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckc		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckc		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckc		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckc		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckc		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckc		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckc		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckc		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckc		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckeq.cgs b/sim/testsuite/sim/frv/cckeq.cgs
deleted file mode 100644
index 2c86f1858d5..00000000000
--- a/sim/testsuite/sim/frv/cckeq.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckeq $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckeq
-cckeq:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckeq		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckeq		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckeq		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckeq		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckeq		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckeq		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckeq		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckeq		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckeq		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckeq		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckeq		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckeq		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckeq		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckeq		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckeq		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckeq		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckeq		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckeq		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckeq		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckeq		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckeq		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckeq		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckeq		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckeq		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckeq		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckeq		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckeq		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckeq		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckeq		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckeq		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckeq		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckeq		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckeq		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckeq		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckeq		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckeq		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckeq		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckeq		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckeq		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckeq		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckeq		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckeq		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckeq		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckeq		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckeq		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckeq		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckeq		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckeq		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckeq		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckeq		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckeq		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckeq		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckeq		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckeq		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckeq		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckeq		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckeq		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckeq		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckeq		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckeq		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckeq		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckeq		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckeq		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckeq		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckeq		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckeq		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckeq		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckeq		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckeq		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckeq		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckeq		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckeq		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckeq		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckeq		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckeq		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckeq		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckeq		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckeq		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckeq		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckeq		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckeq		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckeq		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckeq		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckeq		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckeq		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckeq		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckeq		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckeq		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckeq		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckeq		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckeq		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckeq		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckeq		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckeq		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckeq		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckeq		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckge.cgs b/sim/testsuite/sim/frv/cckge.cgs
deleted file mode 100644
index 6938f1e8e67..00000000000
--- a/sim/testsuite/sim/frv/cckge.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckge $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckge
-cckge:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckge		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckge		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckge		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckge		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckge		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckge		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckge		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckge		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckge		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckge		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckge		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckge		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckge		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckge		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckge		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckge		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckge		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckge		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckge		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckge		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckge		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckge		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckge		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckge		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckge		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckge		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckge		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckge		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckge		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckge		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckge		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckge		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckge		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckge		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckge		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckge		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckge		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckge		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckge		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckge		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckge		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckge		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckge		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckge		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckge		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckge		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckge		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckge		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckge		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckge		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckge		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckge		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckge		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckge		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckge		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckge		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckge		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckge		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckge		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckge		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckge		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckge		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckge		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckge		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckge		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckge		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckge		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckge		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckge		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckge		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckge		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckge		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckge		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckge		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckge		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckge		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckge		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckge		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckge		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckge		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckge		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckge		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckge		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckge		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckge		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckge		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckge		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckge		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckge		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckge		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckge		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckge		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckge		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckge		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckge		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckge		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckgt.cgs b/sim/testsuite/sim/frv/cckgt.cgs
deleted file mode 100644
index e0745dd4433..00000000000
--- a/sim/testsuite/sim/frv/cckgt.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckgt $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckgt
-cckgt:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckgt		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckgt		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckgt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckgt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckgt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckgt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckgt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckgt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckgt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckgt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckgt		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckgt		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckgt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckgt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckgt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckgt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckgt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckgt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckgt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckgt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckgt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckgt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckgt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckgt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckgt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckgt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckgt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckgt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckgt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckgt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckgt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckgt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckgt		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckgt		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckgt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckgt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckgt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckgt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckgt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckgt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckgt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckgt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckgt		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckgt		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckgt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckgt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckgt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckgt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckgt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckgt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckgt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckgt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckgt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckgt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckgt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckgt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckgt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckgt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckgt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckgt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckgt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckgt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckgt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckgt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckgt		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckgt		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckgt		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckgt		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckgt		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckgt		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckgt		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckgt		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckgt		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckgt		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckgt		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckgt		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckgt		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckgt		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckgt		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckgt		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckgt		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckgt		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckgt		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckgt		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckgt		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckgt		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckgt		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckgt		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckgt		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckgt		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckgt		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckgt		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckgt		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckgt		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckgt		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckgt		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckhi.cgs b/sim/testsuite/sim/frv/cckhi.cgs
deleted file mode 100644
index 4741f5ac3a4..00000000000
--- a/sim/testsuite/sim/frv/cckhi.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckhi $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckhi
-cckhi:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckhi		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckhi		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckhi		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckhi		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckhi		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckhi		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckhi		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckhi		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckhi		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckhi		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckhi		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckhi		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckhi		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckhi		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckhi		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckhi		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckhi		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckhi		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckhi		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckhi		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckhi		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckhi		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckhi		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckhi		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckhi		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckhi		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckhi		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckhi		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckhi		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckhi		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckhi		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckhi		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckhi		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckhi		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckhi		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckhi		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckhi		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckhi		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckhi		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckhi		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckhi		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckhi		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckhi		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckhi		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckhi		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckhi		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckhi		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckhi		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckhi		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckhi		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckhi		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckhi		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckhi		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckhi		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckhi		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckhi		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckhi		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckhi		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckhi		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckhi		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckhi		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckhi		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckhi		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckhi		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckhi		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckhi		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckhi		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckhi		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckhi		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckhi		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckhi		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckhi		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckhi		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckhi		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckhi		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckhi		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckhi		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckhi		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckhi		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckhi		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckhi		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckhi		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckhi		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckhi		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckhi		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckhi		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckhi		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckhi		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckhi		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckhi		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckhi		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckhi		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckhi		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckhi		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckhi		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckhi		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckle.cgs b/sim/testsuite/sim/frv/cckle.cgs
deleted file mode 100644
index 9d8821414f7..00000000000
--- a/sim/testsuite/sim/frv/cckle.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckle $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckle
-cckle:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckle		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckle		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckle		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckle		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckle		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckle		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckle		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckle		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckle		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckle		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckle		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckle		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckle		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckle		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckle		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckle		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckle		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckle		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckle		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckle		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckle		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckle		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckle		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckle		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckle		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckle		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckle		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckle		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckle		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckle		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckle		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckle		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckle		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckle		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckle		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckle		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckle		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckle		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckle		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckle		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckle		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckle		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckle		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckle		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckle		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckle		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckle		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckle		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckle		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckle		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckle		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckle		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckle		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckle		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckle		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckle		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckle		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckle		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckle		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckle		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckle		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckle		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckle		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckle		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckle		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckle		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckle		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckle		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckle		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckle		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckle		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckle		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckle		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckle		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckle		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckle		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckle		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckle		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckle		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckle		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckle		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckle		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckle		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckle		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckle		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckle		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckle		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckle		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckle		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckle		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckle		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckle		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckle		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckle		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckle		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckle		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckls.cgs b/sim/testsuite/sim/frv/cckls.cgs
deleted file mode 100644
index a78b7799add..00000000000
--- a/sim/testsuite/sim/frv/cckls.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckls $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckls
-cckls:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckls		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckls		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckls		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckls		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckls		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckls		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckls		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckls		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckls		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckls		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckls		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckls		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckls		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckls		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckls		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckls		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckls		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckls		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckls		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckls		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckls		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckls		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckls		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckls		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckls		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckls		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckls		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckls		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckls		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckls		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckls		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckls		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckls		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckls		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckls		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckls		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckls		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckls		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckls		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckls		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckls		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckls		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckls		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckls		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckls		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckls		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckls		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckls		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckls		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckls		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckls		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckls		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckls		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckls		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckls		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckls		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckls		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckls		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckls		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckls		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckls		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckls		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckls		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckls		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckls		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckls		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckls		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckls		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckls		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckls		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckls		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckls		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckls		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckls		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckls		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckls		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckls		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckls		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckls		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckls		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckls		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckls		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckls		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckls		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckls		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckls		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckls		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckls		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckls		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckls		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckls		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckls		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckls		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckls		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckls		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckls		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ccklt.cgs b/sim/testsuite/sim/frv/ccklt.cgs
deleted file mode 100644
index c14c6328694..00000000000
--- a/sim/testsuite/sim/frv/ccklt.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for ccklt $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ccklt
-ccklt:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccklt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccklt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccklt		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccklt		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccklt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccklt		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccklt		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccklt		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccklt		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccklt		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccklt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccklt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccklt		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccklt		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccklt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccklt		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccklt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccklt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccklt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccklt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccklt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccklt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccklt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccklt		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccklt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccklt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccklt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccklt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccklt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccklt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccklt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccklt		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccklt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccklt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccklt		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccklt		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccklt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccklt		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccklt		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccklt		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccklt		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccklt		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccklt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccklt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccklt		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccklt		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccklt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccklt		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccklt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccklt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccklt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccklt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccklt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccklt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccklt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccklt		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccklt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccklt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccklt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccklt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccklt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccklt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccklt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccklt		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccklt		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccklt		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccklt		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccklt		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccklt		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccklt		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccklt		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccklt		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccklt		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccklt		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccklt		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccklt		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccklt		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccklt		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccklt		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccklt		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccklt		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccklt		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccklt		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccklt		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccklt		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccklt		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccklt		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccklt		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccklt		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccklt		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccklt		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccklt		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccklt		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccklt		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccklt		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccklt		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckn.cgs b/sim/testsuite/sim/frv/cckn.cgs
deleted file mode 100644
index d4231246d8d..00000000000
--- a/sim/testsuite/sim/frv/cckn.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckn $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckn
-cckn:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckn		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckn		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckn		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckn		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckn		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckn		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckn		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckn		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckn		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckn		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckn		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckn		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckn		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckn		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckn		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckn		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckn		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckn		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckn		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckn		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckn		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckn		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckn		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckn		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckn		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckn		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckn		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckn		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckn		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckn		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckn		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckn		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckn		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckn		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckn		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckn		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckn		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckn		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckn		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckn		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckn		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckn		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckn		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckn		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckn		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckn		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckn		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckn		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckn		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckn		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckn		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckn		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckn		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckn		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckn		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckn		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckn		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckn		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckn		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckn		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckn		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckn		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckn		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckn		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckn		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckn		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckn		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckn		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckn		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckn		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckn		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckn		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckn		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckn		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckn		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckn		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckn		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckn		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckn		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckn		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckn		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckn		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckn		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckn		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckn		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckn		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckn		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckn		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckn		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckn		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckn		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckn		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckn		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckn		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckn		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckn		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ccknc.cgs b/sim/testsuite/sim/frv/ccknc.cgs
deleted file mode 100644
index 0478f271ec5..00000000000
--- a/sim/testsuite/sim/frv/ccknc.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for ccknc $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ccknc
-ccknc:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknc		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknc		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknc		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknc		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknc		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknc		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknc		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknc		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknc		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknc		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknc		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknc		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknc		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknc		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknc		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknc		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknc		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknc		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknc		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknc		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknc		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknc		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknc		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknc		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknc		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknc		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknc		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknc		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknc		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknc		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknc		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknc		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknc		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknc		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknc		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknc		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknc		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknc		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknc		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknc		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknc		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknc		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknc		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknc		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknc		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknc		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknc		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknc		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknc		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknc		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknc		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknc		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknc		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknc		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknc		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknc		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckne.cgs b/sim/testsuite/sim/frv/cckne.cgs
deleted file mode 100644
index d8af1e34cf6..00000000000
--- a/sim/testsuite/sim/frv/cckne.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckne $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckne
-cckne:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckne		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckne		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckne		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckne		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckne		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckne		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckne		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckne		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckne		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckne		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckne		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckne		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckne		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckne		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckne		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckne		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckne		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckne		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckne		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckne		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckne		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckne		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckne		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckne		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckne		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckne		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckne		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckne		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckne		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckne		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckne		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckne		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckne		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckne		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckne		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckne		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckne		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckne		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckne		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckne		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckne		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckne		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckne		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckne		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckne		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckne		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckne		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckne		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckne		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckne		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckne		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckne		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckne		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckne		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckne		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckne		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckne		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckne		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckne		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckne		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckne		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckne		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckne		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckne		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckne		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckne		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckne		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckne		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckne		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckne		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckne		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckne		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckne		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckne		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckne		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckne		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckne		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckne		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckne		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckne		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckne		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckne		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckne		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckne		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckne		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckne		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckne		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckne		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckne		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckne		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckne		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckne		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckne		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckne		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckne		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckne		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckno.cgs b/sim/testsuite/sim/frv/cckno.cgs
deleted file mode 100644
index 8c3c9274183..00000000000
--- a/sim/testsuite/sim/frv/cckno.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckno $CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckno
-cckno:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckno		cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckno		cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckno		cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckno		cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckno		cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckno		cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckno		cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckno		cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckno		cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckno		cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckno		cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckno		cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckno		cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckno		cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckno		cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckno		cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckno		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckno		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckno		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckno		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckno		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckno		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckno		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckno		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckno		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckno		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckno		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckno		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckno		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckno		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckno		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckno		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckno		cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckno		cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckno		cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckno		cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckno		cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckno		cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckno		cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckno		cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckno		cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckno		cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckno		cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckno		cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckno		cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckno		cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckno		cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckno		cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckno		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckno		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckno		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckno		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckno		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckno		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckno		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckno		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckno		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckno		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckno		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckno		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckno		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckno		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckno		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckno		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckno		cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckno		cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckno		cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckno		cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckno		cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckno		cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckno		cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckno		cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckno		cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckno		cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckno		cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckno		cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckno		cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckno		cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckno		cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckno		cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckno		cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckno		cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckno		cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckno		cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckno		cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckno		cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckno		cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckno		cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckno		cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckno		cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckno		cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckno		cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckno		cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckno		cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckno		cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckno		cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ccknv.cgs b/sim/testsuite/sim/frv/ccknv.cgs
deleted file mode 100644
index 333edca9d83..00000000000
--- a/sim/testsuite/sim/frv/ccknv.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for ccknv $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ccknv
-ccknv:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknv		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknv		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknv		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknv		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknv		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknv		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknv		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknv		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknv		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknv		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknv		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknv		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknv		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknv		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknv		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknv		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknv		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknv		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknv		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknv		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknv		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknv		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknv		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknv		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknv		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknv		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknv		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknv		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknv		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknv		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknv		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknv		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknv		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknv		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknv		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknv		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknv		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknv		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknv		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknv		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknv		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknv		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknv		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknv		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknv		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknv		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknv		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknv		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	ccknv		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	ccknv		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	ccknv		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	ccknv		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	ccknv		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	ccknv		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	ccknv		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	ccknv		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	ccknv		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	ccknv		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	ccknv		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	ccknv		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	ccknv		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	ccknv		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	ccknv		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	ccknv		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckp.cgs b/sim/testsuite/sim/frv/cckp.cgs
deleted file mode 100644
index 53570d98905..00000000000
--- a/sim/testsuite/sim/frv/cckp.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckp $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckp
-cckp:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckp		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckp		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckp		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckp		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckp		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckp		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckp		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckp		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckp		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckp		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckp		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckp		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckp		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckp		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckp		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckp		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckp		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckp		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckp		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckp		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckp		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckp		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckp		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckp		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckp		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckp		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckp		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckp		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckp		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckp		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckp		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckp		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckp		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckp		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckp		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckp		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckp		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckp		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckp		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckp		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckp		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckp		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckp		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckp		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckp		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckp		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckp		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckp		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckp		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckp		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckp		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckp		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckp		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckp		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckp		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckp		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckp		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckp		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckp		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckp		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckp		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckp		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckp		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckp		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckp		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckp		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckp		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckp		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckp		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckp		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckp		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckp		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckp		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckp		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckp		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckp		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckp		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckp		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckp		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckp		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckp		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckp		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckp		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckp		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckp		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckp		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckp		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckp		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckp		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckp		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckp		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckp		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckp		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckp		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckp		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckp		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckra.cgs b/sim/testsuite/sim/frv/cckra.cgs
deleted file mode 100644
index c0b27fca15b..00000000000
--- a/sim/testsuite/sim/frv/cckra.cgs
+++ /dev/null
@@ -1,480 +0,0 @@
-# frv testcase for cckra $CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckra
-cckra:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckra		cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckra		cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckra		cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckra		cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckra		cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckra		cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckra		cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckra		cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckra		cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckra		cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckra		cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckra		cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckra		cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckra		cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckra		cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckra		cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckra		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckra		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckra		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckra		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckra		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckra		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckra		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckra		cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckra		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckra		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckra		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckra		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckra		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckra		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckra		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckra		cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckra		cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckra		cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckra		cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckra		cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckra		cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckra		cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckra		cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckra		cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckra		cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckra		cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckra		cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckra		cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckra		cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckra		cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckra		cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckra		cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckra		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckra		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckra		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckra		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckra		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckra		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckra		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckra		cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckra		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckra		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckra		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckra		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckra		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckra		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckra		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckra		cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckra		cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckra		cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckra		cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckra		cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckra		cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckra		cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckra		cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckra		cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckra		cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckra		cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckra		cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckra		cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckra		cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckra		cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckra		cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckra		cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckra		cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckra		cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckra		cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckra		cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckra		cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckra		cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckra		cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckra		cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckra		cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckra		cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckra		cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckra		cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckra		cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckra		cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cckv.cgs b/sim/testsuite/sim/frv/cckv.cgs
deleted file mode 100644
index 9ebb6e353a4..00000000000
--- a/sim/testsuite/sim/frv/cckv.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cckv $ICCi,$CCj_int,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cckv
-cckv:
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckv		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckv		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckv		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckv		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckv		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckv		icc0,cc7,cc0,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckv		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckv		icc0,cc7,cc0,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckv		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckv		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckv		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckv		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckv		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckv		icc0,cc7,cc4,1
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckv		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckv		icc0,cc7,cc4,1
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckv		icc0,cc7,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckv		icc0,cc7,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckv		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckv		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckv		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckv		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckv		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckv		icc0,cc7,cc1,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckv		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckv		icc0,cc7,cc1,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckv		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckv		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckv		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckv		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckv		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckv		icc0,cc7,cc5,0
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckv		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckv		icc0,cc7,cc5,0
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckv		icc0,cc7,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckv		icc0,cc7,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckv		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckv		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckv		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckv		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckv		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckv		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckv		icc0,cc7,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckv		icc0,cc7,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckv		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckv		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckv		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckv		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckv		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckv		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckv		icc0,cc7,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckv		icc0,cc7,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x0 0
-	cckv		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x1 0
-	cckv		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x2 0
-	cckv		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x3 0
-	cckv		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x4 0
-	cckv		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x5 0
-	cckv		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x6 0
-	cckv		icc0,cc7,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x7 0
-	cckv		icc0,cc7,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x8 0
-	cckv		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0x9 0
-	cckv		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xa 0
-	cckv		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xb 0
-	cckv		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xc 0
-	cckv		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xd 0
-	cckv		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xe 0
-	cckv		icc0,cc7,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x5b1b,cccr
-	set_icc		0xf 0
-	cckv		icc0,cc7,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ccmp.cgs b/sim/testsuite/sim/frv/ccmp.cgs
deleted file mode 100644
index 52d5310499e..00000000000
--- a/sim/testsuite/sim/frv/ccmp.cgs
+++ /dev/null
@@ -1,134 +0,0 @@
-# frv testcase for ccmp $GRi,$GRj,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ccmp
-ccmp:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	ccmp      	gr8,gr7,cc0,1
-	test_icc	0 0 0 0 icc0
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc0,1
-	test_icc	0 0 1 0 icc0
-
-	set_icc         0x0b,0		; Set mask opposite of expected
-	ccmp		gr8,gr8,cc4,1
-	test_icc	0 1 0 0 icc0
-
-	set_gr_immed  	0,gr8
-	set_icc         0x06,0		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc4,1
-	test_icc	1 0 0 1 icc0
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	ccmp      	gr8,gr7,cc0,0
-	test_icc	1 1 1 1 icc0
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc0,0
-	test_icc	1 1 0 1 icc0
-
-	set_icc         0x0b,0		; Set mask opposite of expected
-	ccmp		gr8,gr8,cc4,0
-	test_icc	1 0 1 1 icc0
-
-	set_icc         0x06,0		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc4,0
-	test_icc	0 1 1 0 icc0
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	ccmp      	gr8,gr7,cc1,0
-	test_icc	0 0 0 0 icc1
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc1,0
-	test_icc	0 0 1 0 icc1
-
-	set_icc         0x0b,1		; Set mask opposite of expected
-	ccmp		gr8,gr8,cc5,0
-	test_icc	0 1 0 0 icc1
-
-	set_gr_immed  	0,gr8
-	set_icc         0x06,1		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc5,0
-	test_icc	1 0 0 1 icc1
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	ccmp      	gr8,gr7,cc1,1
-	test_icc	1 1 1 1 icc1
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc1,1
-	test_icc	1 1 0 1 icc1
-
-	set_icc         0x0b,1		; Set mask opposite of expected
-	ccmp		gr8,gr8,cc5,1
-	test_icc	1 0 1 1 icc1
-
-	set_icc         0x06,1		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc5,1
-	test_icc	0 1 1 0 icc1
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	ccmp      	gr8,gr7,cc2,0
-	test_icc	1 1 1 1 icc2
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,2		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc2,0
-	test_icc	1 1 0 1 icc2
-
-	set_icc         0x0b,2		; Set mask opposite of expected
-	ccmp		gr8,gr8,cc6,1
-	test_icc	1 0 1 1 icc2
-
-	set_icc         0x06,2		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc6,1
-	test_icc	0 1 1 0 icc2
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	ccmp      	gr8,gr7,cc3,0
-	test_icc	1 1 1 1 icc3
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,3		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc3,0
-	test_icc	1 1 0 1 icc3
-
-	set_icc         0x0b,3		; Set mask opposite of expected
-	ccmp		gr8,gr8,cc7,1
-	test_icc	1 0 1 1 icc3
-
-	set_icc         0x06,3		; Set mask opposite of expected
-	ccmp		gr8,gr7,cc7,1
-	test_icc	0 1 1 0 icc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfabss.cgs b/sim/testsuite/sim/frv/cfabss.cgs
deleted file mode 100644
index 752a40bdbf2..00000000000
--- a/sim/testsuite/sim/frv/cfabss.cgs
+++ /dev/null
@@ -1,96 +0,0 @@
-# frv testcase for cfabss $FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfabss
-cfabss:
-	set_spr_immed	0x1b1b,cccr
-
-	cfabss		fr0,fr1,cc0,1
-	test_fr_fr	fr1,fr52
-	cfabss		fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr28
-	cfabss		fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr24
-	cfabss		fr24,fr1,cc4,1
-	test_fr_fr	fr1,fr24
-	cfabss		fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr28
-	cfabss		fr52,fr1,cc4,1
-	test_fr_fr	fr1,fr52
-
-	cfabss		fr0,fr1,cc1,0
-	test_fr_fr	fr1,fr52
-	cfabss		fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr28
-	cfabss		fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr24
-	cfabss		fr24,fr1,cc5,0
-	test_fr_fr	fr1,fr24
-	cfabss		fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr28
-	cfabss		fr52,fr1,cc5,0
-	test_fr_fr	fr1,fr52
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfabss		fr0,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr8,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr12,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr24,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr28,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr52,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfabss		fr0,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr8,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr12,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr24,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr28,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr52,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfabss		fr0,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr8,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr12,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr24,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr28,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr52,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfabss		fr0,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr8,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr12,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr24,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr28,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfabss		fr52,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfadds.cgs b/sim/testsuite/sim/frv/cfadds.cgs
deleted file mode 100644
index 158ac930455..00000000000
--- a/sim/testsuite/sim/frv/cfadds.cgs
+++ /dev/null
@@ -1,456 +0,0 @@
-# frv testcase for cfadds $FRi,$FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfadds
-cfadds:
-	set_spr_immed	0x1b1b,cccr
-
-	cfadds      	fr16,fr0,fr1,cc0,1
-	test_fr_fr	fr1,fr0
-	cfadds      	fr16,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr4
-	cfadds      	fr16,fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr8
-	cfadds      	fr16,fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr12
-	cfadds      	fr16,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr16,fr20,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr16,fr24,fr1,cc0,1
-	test_fr_fr	fr1,fr24
-	cfadds      	fr16,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr28
-	cfadds      	fr16,fr32,fr1,cc0,1
-	test_fr_fr	fr1,fr32
-	cfadds      	fr16,fr36,fr1,cc0,1
-	test_fr_fr	fr1,fr36
-	cfadds      	fr16,fr40,fr1,cc0,1
-	test_fr_fr	fr1,fr40
-	cfadds      	fr16,fr44,fr1,cc0,1
-	test_fr_fr	fr1,fr44
-	cfadds      	fr16,fr48,fr1,cc0,1
-	test_fr_fr	fr1,fr48
-	cfadds      	fr16,fr52,fr1,cc0,1
-	test_fr_fr	fr1,fr52
-
-	cfadds      	fr20,fr0,fr1,cc0,1
-	test_fr_fr	fr1,fr0
-	cfadds      	fr20,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr4
-	cfadds      	fr20,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	cfadds      	fr20,fr12,fr1,cc4,1
-	test_fr_fr	fr1,fr12
-	cfadds      	fr20,fr16,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr20,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr20,fr24,fr1,cc4,1
-	test_fr_fr	fr1,fr24
-	cfadds      	fr20,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr28
-	cfadds      	fr20,fr32,fr1,cc4,1
-	test_fr_fr	fr1,fr32
-	cfadds      	fr20,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr36
-	cfadds      	fr20,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr40
-	cfadds      	fr20,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr44
-	cfadds      	fr20,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr48
-	cfadds      	fr20,fr52,fr1,cc4,1
-	test_fr_fr	fr1,fr52
-
-	cfadds      	fr8,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr12,fr24,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr24,fr12,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr28,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfadds      	fr36,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr44
-
-	cfadds      	fr16,fr0,fr1,cc1,0
-	test_fr_fr	fr1,fr0
-	cfadds      	fr16,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr4
-	cfadds      	fr16,fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr8
-	cfadds      	fr16,fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr12
-	cfadds      	fr16,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr16,fr20,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr16,fr24,fr1,cc1,0
-	test_fr_fr	fr1,fr24
-	cfadds      	fr16,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr28
-	cfadds      	fr16,fr32,fr1,cc1,0
-	test_fr_fr	fr1,fr32
-	cfadds      	fr16,fr36,fr1,cc1,0
-	test_fr_fr	fr1,fr36
-	cfadds      	fr16,fr40,fr1,cc1,0
-	test_fr_fr	fr1,fr40
-	cfadds      	fr16,fr44,fr1,cc1,0
-	test_fr_fr	fr1,fr44
-	cfadds      	fr16,fr48,fr1,cc1,0
-	test_fr_fr	fr1,fr48
-	cfadds      	fr16,fr52,fr1,cc1,0
-	test_fr_fr	fr1,fr52
-
-	cfadds      	fr20,fr0,fr1,cc1,0
-	test_fr_fr	fr1,fr0
-	cfadds      	fr20,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr4
-	cfadds      	fr20,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	cfadds      	fr20,fr12,fr1,cc5,0
-	test_fr_fr	fr1,fr12
-	cfadds      	fr20,fr16,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr20,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr20,fr24,fr1,cc5,0
-	test_fr_fr	fr1,fr24
-	cfadds      	fr20,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr28
-	cfadds      	fr20,fr32,fr1,cc5,0
-	test_fr_fr	fr1,fr32
-	cfadds      	fr20,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr36
-	cfadds      	fr20,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr40
-	cfadds      	fr20,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr44
-	cfadds      	fr20,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr48
-	cfadds      	fr20,fr52,fr1,cc5,0
-	test_fr_fr	fr1,fr52
-
-	cfadds      	fr8,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr12,fr24,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr24,fr12,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfadds      	fr28,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfadds      	fr36,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr44
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfadds      	fr16,fr0,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr4,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr8,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr12,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr20,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr24,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr32,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr36,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr40,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr44,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr48,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr52,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr20,fr0,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr4,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr8,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr12,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr16,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr24,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr28,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr32,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr36,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr40,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr44,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr48,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr52,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr8,fr28,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr12,fr24,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr24,fr12,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr28,fr8,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr36,fr40,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfadds      	fr16,fr0,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr4,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr8,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr12,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr20,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr24,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr32,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr36,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr40,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr44,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr48,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr52,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr20,fr0,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr4,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr8,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr12,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr16,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr24,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr28,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr32,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr36,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr40,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr44,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr48,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr52,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr8,fr28,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr12,fr24,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr24,fr12,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr28,fr8,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr36,fr40,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfadds      	fr16,fr0,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr4,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr8,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr12,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr20,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr24,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr32,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr36,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr40,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr44,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr48,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr52,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr20,fr0,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr4,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr8,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr12,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr16,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr20,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr24,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr28,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr32,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr36,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr40,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr44,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr48,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr52,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr8,fr28,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr12,fr24,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr24,fr12,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr28,fr8,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr36,fr40,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfadds      	fr16,fr0,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr4,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr8,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr12,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr20,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr24,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr32,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr36,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr40,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr44,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr48,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr16,fr52,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr20,fr0,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr4,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr8,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr12,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr16,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr20,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr24,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr28,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr32,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr36,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr40,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr44,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr48,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr20,fr52,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr8,fr28,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr12,fr24,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr24,fr12,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfadds      	fr28,fr8,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfadds      	fr36,fr40,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/cfckeq.cgs b/sim/testsuite/sim/frv/cfckeq.cgs
deleted file mode 100644
index 467568af55e..00000000000
--- a/sim/testsuite/sim/frv/cfckeq.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckeq $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckeq
-cfckeq:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckeq		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckeq		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckeq		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckeq		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckeq		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckeq		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckeq		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckeq		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckeq		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckeq		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckeq		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckeq		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckeq		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckeq		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckeq		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckeq		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckeq		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckeq		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckeq		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckeq		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckeq		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckeq		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckeq		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckeq		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckeq		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckeq		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckeq		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckeq		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckeq		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckeq		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckeq		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckeq		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckeq		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckeq		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckeq		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckeq		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckeq		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckeq		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckeq		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckeq		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckeq		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckeq		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckeq		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckeq		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckeq		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckeq		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckeq		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckeq		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckeq		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckeq		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckeq		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckeq		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckeq		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckeq		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckeq		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckeq		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckeq		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckeq		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckeq		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckeq		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckeq		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckeq		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckeq		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckeq		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckeq		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckeq		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckeq		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckeq		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckeq		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckeq		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckeq		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckeq		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckeq		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckeq		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckeq		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckeq		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckeq		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckeq		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckeq		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckeq		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckeq		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckeq		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckeq		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckeq		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckeq		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckeq		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckeq		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckeq		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckeq		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckeq		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckeq		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckeq		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckeq		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckeq		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckeq		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckeq		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckge.cgs b/sim/testsuite/sim/frv/cfckge.cgs
deleted file mode 100644
index ba2de9510e7..00000000000
--- a/sim/testsuite/sim/frv/cfckge.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckge $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckge
-cfckge:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckgt.cgs b/sim/testsuite/sim/frv/cfckgt.cgs
deleted file mode 100644
index 7858c1772a6..00000000000
--- a/sim/testsuite/sim/frv/cfckgt.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckgt $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckgt
-cfckgt:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckgt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckgt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckgt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckgt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckgt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckgt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckgt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckgt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckgt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckgt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckgt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckgt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckgt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckgt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckgt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckgt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckgt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckgt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckgt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckgt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckgt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckgt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckgt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckgt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckgt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckgt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckgt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckgt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckgt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckgt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckgt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckgt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckgt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckgt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckgt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckgt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckgt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckgt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckgt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckgt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckgt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckgt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckgt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckgt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckgt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckgt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckgt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckgt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckgt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckgt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckgt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckgt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckgt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckgt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckgt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckgt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckgt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckgt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckgt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckgt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckgt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckgt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckgt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckgt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckgt		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckgt		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckgt		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckgt		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckgt		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckgt		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckgt		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckgt		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckgt		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckgt		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckgt		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckgt		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckgt		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckgt		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckgt		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckgt		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckgt		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckgt		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckgt		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckgt		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckgt		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckgt		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckgt		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckgt		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckgt		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckgt		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckgt		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckgt		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckgt		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckgt		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckgt		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckgt		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckle.cgs b/sim/testsuite/sim/frv/cfckle.cgs
deleted file mode 100644
index fb2b1b85e13..00000000000
--- a/sim/testsuite/sim/frv/cfckle.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckle $FCCi,$CCj_float$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckle
-cfckle:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckle		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckle		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckle		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckle		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckle		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckle		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckle		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckle		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckle		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckle		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckle		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckle		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckle		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckle		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckle		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckle		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckle		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckle		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckle		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckle		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckle		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckle		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckle		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckle		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckle		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckle		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckle		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckle		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckle		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckle		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckle		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckle		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckle		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckle		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckle		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckle		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckle		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckle		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckle		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckle		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckle		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckle		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckle		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckle		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckle		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckle		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckle		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckle		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckle		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckle		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckle		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckle		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckle		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckle		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckle		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckle		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckle		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckle		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckle		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckle		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckle		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckle		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckle		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckle		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckle		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckle		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckle		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckle		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckle		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckle		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckle		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckle		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckle		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckle		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckle		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckle		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckle		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckle		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckle		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckle		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckle		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckle		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckle		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckle		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckle		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckle		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckle		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckle		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckle		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckle		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckle		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckle		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckle		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckle		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckle		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckle		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfcklg.cgs b/sim/testsuite/sim/frv/cfcklg.cgs
deleted file mode 100644
index 22deb52f38d..00000000000
--- a/sim/testsuite/sim/frv/cfcklg.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfcklg $FCCi,$CCj_float$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfcklg
-cfcklg:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklg		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklg		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklg		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklg		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklg		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklg		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklg		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklg		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklg		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklg		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklg		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklg		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklg		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklg		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklg		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklg		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklg		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklg		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklg		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklg		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklg		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklg		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklg		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklg		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklg		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklg		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklg		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklg		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklg		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklg		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklg		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklg		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklg		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklg		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklg		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklg		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklg		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklg		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklg		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklg		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklg		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklg		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklg		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklg		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklg		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklg		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklg		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklg		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklg		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklg		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklg		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklg		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklg		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklg		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklg		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklg		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklg		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklg		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklg		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklg		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklg		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklg		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklg		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklg		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklg		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklg		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklg		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklg		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklg		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklg		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklg		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklg		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklg		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklg		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklg		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklg		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklg		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklg		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklg		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklg		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklg		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklg		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklg		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklg		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklg		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklg		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklg		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklg		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklg		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklg		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklg		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklg		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklg		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklg		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklg		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklg		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfcklt.cgs b/sim/testsuite/sim/frv/cfcklt.cgs
deleted file mode 100644
index ffabcd2628b..00000000000
--- a/sim/testsuite/sim/frv/cfcklt.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfcklt $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfcklt
-cfcklt:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklt		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklt		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklt		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklt		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklt		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklt		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklt		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklt		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklt		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklt		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklt		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklt		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklt		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklt		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklt		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklt		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklt		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklt		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklt		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklt		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklt		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklt		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklt		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklt		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcklt		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcklt		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcklt		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcklt		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcklt		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcklt		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcklt		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcklt		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcklt		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcklt		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcklt		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcklt		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcklt		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcklt		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcklt		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcklt		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckne.cgs b/sim/testsuite/sim/frv/cfckne.cgs
deleted file mode 100644
index da6846fa30e..00000000000
--- a/sim/testsuite/sim/frv/cfckne.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckne $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckne
-cfckne:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckne		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckne		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckne		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckne		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckne		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckne		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckne		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckne		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckne		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckne		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckne		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckne		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckne		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckne		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckne		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckne		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckne		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckne		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckne		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckne		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckne		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckne		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckne		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckne		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckne		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckne		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckne		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckne		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckne		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckne		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckne		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckne		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckne		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckne		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckne		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckne		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckne		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckne		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckne		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckne		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckne		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckne		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckne		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckne		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckne		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckne		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckne		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckne		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckne		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckne		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckne		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckne		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckne		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckne		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckne		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckne		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckne		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckne		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckne		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckne		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckne		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckne		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckne		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckne		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckne		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckne		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckne		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckne		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckne		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckne		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckne		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckne		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckne		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckne		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckne		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckne		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckne		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckne		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckne		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckne		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckne		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckne		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckne		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckne		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckne		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckne		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckne		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckne		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckne		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckne		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckne		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckne		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckne		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckne		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckne		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckne		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckno.cgs b/sim/testsuite/sim/frv/cfckno.cgs
deleted file mode 100644
index 56819604070..00000000000
--- a/sim/testsuite/sim/frv/cfckno.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckno $CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckno
-cfckno:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckno		cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckno		cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckno		cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckno		cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckno		cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckno		cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckno		cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckno		cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckno		cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckno		cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckno		cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckno		cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckno		cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckno		cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckno		cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckno		cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckno		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckno		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckno		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckno		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckno		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckno		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckno		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckno		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckno		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckno		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckno		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckno		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckno		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckno		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckno		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckno		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckno		cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckno		cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckno		cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckno		cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckno		cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckno		cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckno		cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckno		cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckno		cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckno		cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckno		cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckno		cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckno		cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckno		cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckno		cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckno		cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckno		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckno		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckno		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckno		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckno		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckno		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckno		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckno		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckno		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckno		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckno		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckno		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckno		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckno		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckno		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckno		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckno		cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckno		cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckno		cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckno		cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckno		cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckno		cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckno		cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckno		cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckno		cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckno		cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckno		cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckno		cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckno		cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckno		cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckno		cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckno		cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckno		cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckno		cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckno		cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckno		cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckno		cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckno		cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckno		cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckno		cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckno		cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckno		cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckno		cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckno		cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckno		cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckno		cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckno		cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckno		cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfcko.cgs b/sim/testsuite/sim/frv/cfcko.cgs
deleted file mode 100644
index ac55fc3e7ac..00000000000
--- a/sim/testsuite/sim/frv/cfcko.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfcko $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfcko
-cfcko:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcko		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcko		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcko		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcko		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcko		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcko		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcko		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcko		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcko		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcko		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcko		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcko		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcko		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcko		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcko		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcko		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcko		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcko		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcko		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcko		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcko		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcko		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcko		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcko		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcko		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcko		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcko		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcko		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcko		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcko		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcko		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcko		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcko		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcko		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcko		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcko		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcko		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcko		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcko		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcko		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcko		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcko		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcko		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcko		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcko		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcko		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcko		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcko		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcko		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcko		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcko		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcko		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcko		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcko		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcko		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcko		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcko		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcko		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcko		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcko		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcko		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcko		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcko		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcko		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcko		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcko		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcko		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcko		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcko		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcko		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcko		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcko		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcko		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcko		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcko		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcko		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcko		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcko		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcko		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcko		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcko		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcko		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcko		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcko		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcko		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcko		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcko		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcko		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcko		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcko		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcko		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcko		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcko		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcko		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcko		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcko		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckra.cgs b/sim/testsuite/sim/frv/cfckra.cgs
deleted file mode 100644
index 0cabd8f47c1..00000000000
--- a/sim/testsuite/sim/frv/cfckra.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckra $CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckra
-cfckra:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckra		cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckra		cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckra		cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckra		cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckra		cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckra		cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckra		cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckra		cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckra		cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckra		cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckra		cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckra		cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckra		cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckra		cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckra		cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckra		cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckra		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckra		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckra		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckra		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckra		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckra		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckra		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckra		cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckra		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckra		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckra		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckra		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckra		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckra		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckra		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckra		cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckra		cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckra		cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckra		cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckra		cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckra		cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckra		cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckra		cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckra		cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckra		cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckra		cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckra		cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckra		cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckra		cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckra		cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckra		cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckra		cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckra		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckra		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckra		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckra		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckra		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckra		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckra		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckra		cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckra		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckra		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckra		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckra		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckra		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckra		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckra		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckra		cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckra		cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckra		cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckra		cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckra		cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckra		cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckra		cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckra		cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckra		cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckra		cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckra		cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckra		cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckra		cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckra		cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckra		cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckra		cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckra		cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckra		cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckra		cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckra		cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckra		cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckra		cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckra		cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckra		cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckra		cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckra		cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckra		cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckra		cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckra		cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckra		cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckra		cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckra		cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckra		cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfcku.cgs b/sim/testsuite/sim/frv/cfcku.cgs
deleted file mode 100644
index 0f56e7e74c6..00000000000
--- a/sim/testsuite/sim/frv/cfcku.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfcku $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfcku
-cfcku:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcku		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcku		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcku		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcku		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcku		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcku		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcku		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcku		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcku		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcku		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcku		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcku		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcku		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcku		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcku		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcku		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcku		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcku		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcku		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcku		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcku		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcku		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcku		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcku		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcku		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcku		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcku		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcku		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcku		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcku		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcku		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcku		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcku		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcku		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcku		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcku		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcku		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcku		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcku		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcku		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcku		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcku		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcku		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcku		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcku		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcku		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcku		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcku		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcku		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcku		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcku		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcku		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcku		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcku		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcku		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcku		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcku		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcku		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcku		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcku		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcku		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcku		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcku		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcku		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcku		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcku		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcku		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcku		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcku		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcku		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcku		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcku		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcku		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcku		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcku		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcku		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcku		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcku		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcku		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcku		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfcku		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfcku		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfcku		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfcku		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfcku		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfcku		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfcku		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfcku		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfcku		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfcku		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfcku		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfcku		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfcku		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfcku		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfcku		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfcku		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckue.cgs b/sim/testsuite/sim/frv/cfckue.cgs
deleted file mode 100644
index 447c2bac3ed..00000000000
--- a/sim/testsuite/sim/frv/cfckue.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckue $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckue
-cfckue:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckue		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckue		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckue		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckue		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckue		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckue		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckue		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckue		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckue		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckue		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckue		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckue		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckue		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckue		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckue		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckue		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckue		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckue		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckue		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckue		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckue		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckue		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckue		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckue		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckue		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckue		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckue		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckue		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckue		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckue		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckue		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckue		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckue		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckue		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckue		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckue		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckue		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckue		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckue		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckue		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckue		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckue		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckue		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckue		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckue		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckue		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckue		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckue		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckue		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckue		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckue		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckue		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckue		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckue		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckue		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckue		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckue		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckue		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckue		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckue		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckue		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckue		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckue		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckue		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckue		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckue		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckue		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckue		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckue		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckue		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckue		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckue		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckue		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckue		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckue		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckue		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckue		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckue		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckue		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckue		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckue		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckue		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckue		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckue		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckue		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckue		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckue		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckue		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckue		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckue		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckue		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckue		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckue		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckue		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckue		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckue		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckug.cgs b/sim/testsuite/sim/frv/cfckug.cgs
deleted file mode 100644
index 7442f84a457..00000000000
--- a/sim/testsuite/sim/frv/cfckug.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckug $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckug
-cfckug:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckug		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckug		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckug		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckug		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckug		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckug		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckug		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckug		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckug		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckug		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckug		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckug		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckug		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckug		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckug		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckug		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckug		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckug		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckug		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckug		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckug		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckug		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckug		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckug		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckug		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckug		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckug		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckug		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckug		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckug		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckug		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckug		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckug		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckug		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckug		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckug		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckug		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckug		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckug		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckug		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckug		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckug		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckug		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckug		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckug		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckug		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckug		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckug		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckug		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckug		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckug		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckug		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckug		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckug		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckug		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckug		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckug		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckug		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckug		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckug		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckug		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckug		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckug		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckug		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckug		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckug		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckug		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckug		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckug		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckug		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckug		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckug		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckug		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckug		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckug		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckug		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckug		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckug		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckug		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckug		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckug		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckug		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckug		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckug		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckug		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckug		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckug		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckug		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckug		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckug		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckug		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckug		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckug		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckug		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckug		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckug		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckuge.cgs b/sim/testsuite/sim/frv/cfckuge.cgs
deleted file mode 100644
index 8eaf92fd406..00000000000
--- a/sim/testsuite/sim/frv/cfckuge.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckuge $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckuge
-cfckuge:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckuge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckuge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckuge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckuge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckuge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckuge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckuge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckuge		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckuge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckuge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckuge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckuge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckuge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckuge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckuge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckuge		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckuge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckuge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckuge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckuge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckuge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckuge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckuge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckuge		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckuge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckuge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckuge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckuge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckuge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckuge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckuge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckuge		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckuge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckuge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckuge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckuge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckuge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckuge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckuge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckuge		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckuge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckuge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckuge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckuge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckuge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckuge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckuge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckuge		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckuge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckuge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckuge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckuge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckuge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckuge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckuge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckuge		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckuge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckuge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckuge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckuge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckuge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckuge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckuge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckuge		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckuge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckuge		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckuge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckuge		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckuge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckuge		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckuge		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckuge		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckuge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckuge		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckuge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckuge		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckuge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckuge		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckuge		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckuge		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckuge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckuge		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckuge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckuge		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckuge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckuge		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckuge		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckuge		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckuge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckuge		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckuge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckuge		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckuge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckuge		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckuge		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckuge		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckul.cgs b/sim/testsuite/sim/frv/cfckul.cgs
deleted file mode 100644
index 5945a8a7ce0..00000000000
--- a/sim/testsuite/sim/frv/cfckul.cgs
+++ /dev/null
@@ -1,410 +0,0 @@
-# frv testcase for cfckul $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckul
-cfckul:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckul		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckul		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckul		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckul		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckul		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckul		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckul		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckul		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckul		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckul		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckul		fcc0,cc3,cc4,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckul		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckul		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckul		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckul		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckul		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckul		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckul		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckul		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckul		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckul		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckul		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckul		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckul		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckul		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckul		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckul		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckul		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckul		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckul		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckul		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckul		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckul		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckul		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckul		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckul		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckul		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckul		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckul		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckul		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckul		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckul		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckul		fcc0,cc3,cc5,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckul		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckul		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckul		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckul		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckul		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckul		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckul		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckul		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckul		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckul		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckul		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckul		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckul		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckul		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckul		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckul		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckul		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckul		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckul		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckul		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckul		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckul		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckul		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckul		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckul		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckul		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckul		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckul		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckul		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckul		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckul		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckul		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckul		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckul		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckul		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckul		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckul		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfckule.cgs b/sim/testsuite/sim/frv/cfckule.cgs
deleted file mode 100644
index aaf655e8430..00000000000
--- a/sim/testsuite/sim/frv/cfckule.cgs
+++ /dev/null
@@ -1,490 +0,0 @@
-# frv testcase for cfckule $FCCi,$CCj_float,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cfckule
-cfckule:
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckule		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckule		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckule		fcc0,cc3,cc0,1
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckule		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckule		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckule		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckule		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckule		fcc0,cc3,cc0,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckule		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckule		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckule		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckule		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckule		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckule		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckule		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckule		fcc0,cc3,cc4,1
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckule		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckule		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckule		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckule		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckule		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckule		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckule		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckule		fcc0,cc3,cc0,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckule		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckule		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckule		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckule		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckule		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckule		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckule		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckule		fcc0,cc3,cc4,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckule		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckule		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckule		fcc0,cc3,cc1,0
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckule		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckule		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckule		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckule		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckule		fcc0,cc3,cc1,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckule		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckule		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckule		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckule		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckule		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckule		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckule		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckule		fcc0,cc3,cc5,0
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckule		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckule		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckule		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckule		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckule		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckule		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckule		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckule		fcc0,cc3,cc1,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckule		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckule		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckule		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckule		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckule		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckule		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckule		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckule		fcc0,cc3,cc5,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckule		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckule		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckule		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckule		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckule		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckule		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckule		fcc0,cc3,cc2,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckule		fcc0,cc3,cc2,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckule		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckule		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckule		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckule		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckule		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckule		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckule		fcc0,cc3,cc6,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckule		fcc0,cc3,cc6,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x0 0
-	cfckule		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x1 0
-	cfckule		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x2 0
-	cfckule		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x3 0
-	cfckule		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x4 0
-	cfckule		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x5 0
-	cfckule		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x6 0
-	cfckule		fcc0,cc3,cc3,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x7 0
-	cfckule		fcc0,cc3,cc3,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x8 0
-	cfckule		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0x9 0
-	cfckule		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xa 0
-	cfckule		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xb 0
-	cfckule		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xc 0
-	cfckule		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xd 0
-	cfckule		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xe 0
-	cfckule		fcc0,cc3,cc7,0
-	test_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0x1b5b,cccr
-	set_fcc		0xf 0
-	cfckule		fcc0,cc3,cc7,1
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfcmps.cgs b/sim/testsuite/sim/frv/cfcmps.cgs
deleted file mode 100644
index 168e618853b..00000000000
--- a/sim/testsuite/sim/frv/cfcmps.cgs
+++ /dev/null
@@ -1,3542 +0,0 @@
-# frv testcase for cfcmps $FRi,$FRj,$FCCi,$CCi,$cond_2
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfcmps
-cfcmps:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr0,fcc0,cc0,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr4,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr8,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr12,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr16,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr20,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr24,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr28,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr32,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr36,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr40,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr44,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr48,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr52,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr56,fcc0,cc0,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr60,fcc0,cc0,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr0,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr4,fcc0,cc0,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr8,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr12,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr16,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr20,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr24,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr28,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr32,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr36,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr40,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr44,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr48,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr52,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr56,fcc0,cc0,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr60,fcc0,cc0,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr0,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr4,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr8,fcc0,cc0,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr12,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr16,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr20,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr24,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr28,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr32,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr36,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr40,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr44,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr48,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr52,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr56,fcc0,cc0,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr60,fcc0,cc0,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr0,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr4,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr8,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr12,fcc0,cc0,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr16,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr20,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr24,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr28,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr32,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr36,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr40,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr44,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr48,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr52,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr56,fcc0,cc0,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr60,fcc0,cc0,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr0,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr4,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr8,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr12,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr16,fcc0,cc0,1
-	test_fcc	0x8,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr20,fcc0,cc0,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr24,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr28,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr32,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr36,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr40,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr44,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr48,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr52,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr56,fcc0,cc0,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr60,fcc0,cc0,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr0,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr4,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr8,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr12,fcc0,cc0,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr16,fcc0,cc0,1
-	test_fcc	0x8,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr20,fcc0,cc0,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr24,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr28,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr32,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr36,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr40,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr44,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr48,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr52,fcc0,cc0,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr56,fcc0,cc0,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr60,fcc0,cc0,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr0,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr4,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr8,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr12,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr16,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr20,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr24,fcc0,cc4,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr28,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr32,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr36,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr40,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr44,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr48,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr52,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr56,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr60,fcc0,cc4,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr0,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr4,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr8,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr12,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr16,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr20,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr24,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr28,fcc0,cc4,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr32,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr36,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr40,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr44,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr48,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr52,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr56,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr60,fcc0,cc4,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr0,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr4,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr8,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr12,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr16,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr20,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr24,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr28,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr32,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr36,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr40,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr44,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr48,fcc0,cc4,1
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr52,fcc0,cc4,1
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr56,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr60,fcc0,cc4,1
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr0,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr4,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr8,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr12,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr16,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr20,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr24,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr28,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr32,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr36,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr40,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr44,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr48,fcc0,cc4,1
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr52,fcc0,cc4,1
-	test_fcc	0x8,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr56,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr60,fcc0,cc4,1
-	test_fcc	0x1,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr0,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr4,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr8,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr12,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr16,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr20,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr24,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr28,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr32,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr36,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr40,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr44,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr48,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr52,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr56,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr60,fcc0,cc4,1
-	test_fcc	0x1,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr0,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr4,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr8,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr12,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr16,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr20,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr24,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr28,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr32,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr36,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr40,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr44,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr48,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr52,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr56,fcc0,cc4,1
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr60,fcc0,cc4,1
-	test_fcc	0x1,0
-;
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr0,fcc0,cc1,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr4,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr8,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr12,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr16,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr20,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr24,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr28,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr32,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr36,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr40,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr44,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr48,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr52,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr56,fcc0,cc1,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr60,fcc0,cc1,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr0,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr4,fcc0,cc1,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr8,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr12,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr16,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr20,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr24,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr28,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr32,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr36,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr40,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr44,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr48,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr52,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr56,fcc0,cc1,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr60,fcc0,cc1,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr0,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr4,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr8,fcc0,cc1,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr12,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr16,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr20,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr24,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr28,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr32,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr36,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr40,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr44,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr48,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr52,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr56,fcc0,cc1,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr60,fcc0,cc1,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr0,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr4,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr8,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr12,fcc0,cc1,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr16,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr20,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr24,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr28,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr32,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr36,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr40,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr44,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr48,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr52,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr56,fcc0,cc1,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr60,fcc0,cc1,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr0,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr4,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr8,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr12,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr16,fcc0,cc1,0
-	test_fcc	0x8,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr20,fcc0,cc1,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr24,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr28,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr32,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr36,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr40,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr44,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr48,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr52,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr56,fcc0,cc1,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr60,fcc0,cc1,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr0,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr4,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr8,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr12,fcc0,cc1,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr16,fcc0,cc1,0
-	test_fcc	0x8,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr20,fcc0,cc1,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr24,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr28,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr32,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr36,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr40,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr44,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr48,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr52,fcc0,cc1,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr56,fcc0,cc1,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr60,fcc0,cc1,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr0,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr4,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr8,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr12,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr16,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr20,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr24,fcc0,cc5,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr28,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr32,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr36,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr40,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr44,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr48,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr52,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr56,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr60,fcc0,cc5,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr0,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr4,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr8,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr12,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr16,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr20,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr24,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr28,fcc0,cc5,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr32,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr36,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr40,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr44,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr48,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr52,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr56,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr60,fcc0,cc5,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr0,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr4,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr8,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr12,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr16,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr20,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr24,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr28,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr32,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr36,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr40,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr44,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr48,fcc0,cc5,0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr52,fcc0,cc5,0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr56,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr60,fcc0,cc5,0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr0,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr4,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr8,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr12,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr16,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr20,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr24,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr28,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr32,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr36,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr40,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr44,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr48,fcc0,cc5,0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr52,fcc0,cc5,0
-	test_fcc	0x8,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr56,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr60,fcc0,cc5,0
-	test_fcc	0x1,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr0,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr4,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr8,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr12,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr16,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr20,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr24,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr28,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr32,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr36,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr40,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr44,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr48,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr52,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr56,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr60,fcc0,cc5,0
-	test_fcc	0x1,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr0,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr4,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr8,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr12,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr16,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr20,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr24,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr28,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr32,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr36,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr40,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr44,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr48,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr52,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr56,fcc0,cc5,0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr60,fcc0,cc5,0
-	test_fcc	0x1,0
-;
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr0,fcc0,cc0,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr4,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr8,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr12,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr16,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr20,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr24,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr28,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr32,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr36,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr40,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr44,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr48,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr52,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr56,fcc0,cc0,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr60,fcc0,cc0,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr0,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr4,fcc0,cc0,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr8,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr12,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr16,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr20,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr24,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr28,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr32,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr36,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr40,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr44,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr48,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr52,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr56,fcc0,cc0,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr60,fcc0,cc0,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr0,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr4,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr8,fcc0,cc0,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr12,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr16,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr20,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr24,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr28,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr32,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr36,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr40,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr44,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr48,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr52,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr56,fcc0,cc0,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr60,fcc0,cc0,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr0,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr4,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr8,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr12,fcc0,cc0,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr16,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr20,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr24,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr28,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr32,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr36,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr40,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr44,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr48,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr52,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr56,fcc0,cc0,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr60,fcc0,cc0,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr0,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr4,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr8,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr12,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr16,fcc0,cc0,0
-	test_fcc	0x7,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr20,fcc0,cc0,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr24,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr28,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr32,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr36,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr40,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr44,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr48,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr52,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr56,fcc0,cc0,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr60,fcc0,cc0,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr0,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr4,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr8,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr12,fcc0,cc0,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr16,fcc0,cc0,0
-	test_fcc	0x7,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr20,fcc0,cc0,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr24,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr28,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr32,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr36,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr40,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr44,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr48,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr52,fcc0,cc0,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr56,fcc0,cc0,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr60,fcc0,cc0,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr0,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr4,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr8,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr12,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr16,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr20,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr24,fcc0,cc4,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr28,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr32,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr36,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr40,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr44,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr48,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr52,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr56,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr60,fcc0,cc4,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr0,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr4,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr8,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr12,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr16,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr20,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr24,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr28,fcc0,cc4,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr32,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr36,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr40,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr44,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr48,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr52,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr56,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr60,fcc0,cc4,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr0,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr4,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr8,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr12,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr16,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr20,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr24,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr28,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr32,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr36,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr40,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr44,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr48,fcc0,cc4,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr52,fcc0,cc4,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr56,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr60,fcc0,cc4,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr0,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr4,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr8,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr12,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr16,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr20,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr24,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr28,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr32,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr36,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr40,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr44,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr48,fcc0,cc4,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr52,fcc0,cc4,0
-	test_fcc	0x7,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr56,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr60,fcc0,cc4,0
-	test_fcc	0xe,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr0,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr4,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr8,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr12,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr16,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr20,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr24,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr28,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr32,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr36,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr40,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr44,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr48,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr52,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr56,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr60,fcc0,cc4,0
-	test_fcc	0xe,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr0,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr4,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr8,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr12,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr16,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr20,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr24,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr28,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr32,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr36,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr40,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr44,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr48,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr52,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr56,fcc0,cc4,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr60,fcc0,cc4,0
-	test_fcc	0xe,0
-;
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr0,fcc0,cc1,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr4,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr8,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr12,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr16,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr20,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr24,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr28,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr32,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr36,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr40,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr44,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr48,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr52,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr56,fcc0,cc1,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr60,fcc0,cc1,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr0,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr4,fcc0,cc1,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr8,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr12,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr16,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr20,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr24,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr28,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr32,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr36,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr40,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr44,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr48,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr52,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr56,fcc0,cc1,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr60,fcc0,cc1,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr0,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr4,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr8,fcc0,cc1,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr12,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr16,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr20,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr24,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr28,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr32,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr36,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr40,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr44,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr48,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr52,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr56,fcc0,cc1,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr60,fcc0,cc1,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr0,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr4,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr8,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr12,fcc0,cc1,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr16,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr20,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr24,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr28,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr32,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr36,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr40,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr44,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr48,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr52,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr56,fcc0,cc1,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr60,fcc0,cc1,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr0,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr4,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr8,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr12,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr16,fcc0,cc1,1
-	test_fcc	0x7,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr20,fcc0,cc1,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr24,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr28,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr32,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr36,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr40,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr44,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr48,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr52,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr56,fcc0,cc1,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr60,fcc0,cc1,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr0,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr4,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr8,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr12,fcc0,cc1,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr16,fcc0,cc1,1
-	test_fcc	0x7,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr20,fcc0,cc1,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr24,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr28,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr32,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr36,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr40,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr44,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr48,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr52,fcc0,cc1,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr56,fcc0,cc1,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr60,fcc0,cc1,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr0,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr4,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr8,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr12,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr16,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr20,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr24,fcc0,cc5,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr28,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr32,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr36,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr40,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr44,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr48,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr52,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr56,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr60,fcc0,cc5,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr0,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr4,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr8,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr12,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr16,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr20,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr24,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr28,fcc0,cc5,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr32,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr36,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr40,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr44,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr48,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr52,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr56,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr60,fcc0,cc5,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr0,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr4,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr8,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr12,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr16,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr20,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr24,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr28,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr32,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr36,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr40,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr44,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr48,fcc0,cc5,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr52,fcc0,cc5,1
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr56,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr60,fcc0,cc5,1
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr0,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr4,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr8,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr12,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr16,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr20,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr24,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr28,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr32,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr36,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr40,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr44,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr48,fcc0,cc5,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr52,fcc0,cc5,1
-	test_fcc	0x7,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr56,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr60,fcc0,cc5,1
-	test_fcc	0xe,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr0,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr4,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr8,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr12,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr16,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr20,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr24,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr28,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr32,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr36,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr40,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr44,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr48,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr52,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr56,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr60,fcc0,cc5,1
-	test_fcc	0xe,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr0,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr4,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr8,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr12,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr16,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr20,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr24,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr28,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr32,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr36,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr40,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr44,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr48,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr52,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr56,fcc0,cc5,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr60,fcc0,cc5,1
-	test_fcc	0xe,0
-;
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr0,fcc0,cc2,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr4,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr8,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr12,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr16,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr20,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr24,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr28,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr32,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr36,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr40,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr44,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr48,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr52,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr56,fcc0,cc2,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr60,fcc0,cc2,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr0,fcc0,cc2,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr4,fcc0,cc2,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr8,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr12,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr16,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr20,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr24,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr28,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr32,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr36,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr40,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr44,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr48,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr52,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr56,fcc0,cc2,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr60,fcc0,cc2,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr0,fcc0,cc2,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr4,fcc0,cc2,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr8,fcc0,cc2,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr12,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr16,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr20,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr24,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr28,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr32,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr36,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr40,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr44,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr48,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr52,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr56,fcc0,cc2,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr60,fcc0,cc2,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr0,fcc0,cc2,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr4,fcc0,cc2,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr8,fcc0,cc2,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr12,fcc0,cc2,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr16,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr20,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr24,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr28,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr32,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr36,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr40,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr44,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr48,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr52,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr56,fcc0,cc2,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr60,fcc0,cc2,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr0,fcc0,cc2,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr4,fcc0,cc2,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr8,fcc0,cc2,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr12,fcc0,cc2,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr16,fcc0,cc2,1
-	test_fcc	0x7,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr20,fcc0,cc2,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr24,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr28,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr32,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr36,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr40,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr44,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr48,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr52,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr56,fcc0,cc2,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr60,fcc0,cc2,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr0,fcc0,cc2,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr4,fcc0,cc2,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr8,fcc0,cc2,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr12,fcc0,cc2,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr16,fcc0,cc2,1
-	test_fcc	0x7,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr20,fcc0,cc2,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr24,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr28,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr32,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr36,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr40,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr44,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr48,fcc0,cc2,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr52,fcc0,cc2,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr56,fcc0,cc2,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr60,fcc0,cc2,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr0,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr4,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr8,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr12,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr16,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr20,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr24,fcc0,cc6,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr28,fcc0,cc6,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr32,fcc0,cc6,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr36,fcc0,cc6,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr40,fcc0,cc6,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr44,fcc0,cc6,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr48,fcc0,cc6,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr52,fcc0,cc6,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr56,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr60,fcc0,cc6,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr0,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr4,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr8,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr12,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr16,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr20,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr24,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr28,fcc0,cc6,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr32,fcc0,cc6,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr36,fcc0,cc6,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr40,fcc0,cc6,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr44,fcc0,cc6,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr48,fcc0,cc6,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr52,fcc0,cc6,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr56,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr60,fcc0,cc6,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr0,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr4,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr8,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr12,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr16,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr20,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr24,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr28,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr32,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr36,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr40,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr44,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr48,fcc0,cc6,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr52,fcc0,cc6,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr56,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr60,fcc0,cc6,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr0,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr4,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr8,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr12,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr16,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr20,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr24,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr28,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr32,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr36,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr40,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr44,fcc0,cc6,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr48,fcc0,cc6,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr52,fcc0,cc6,0
-	test_fcc	0x7,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr56,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr60,fcc0,cc6,0
-	test_fcc	0xe,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr0,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr4,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr8,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr12,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr16,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr20,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr24,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr28,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr32,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr36,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr40,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr44,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr48,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr52,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr56,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr60,fcc0,cc6,0
-	test_fcc	0xe,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr0,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr4,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr8,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr12,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr16,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr20,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr24,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr28,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr32,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr36,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr40,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr44,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr48,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr52,fcc0,cc6,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr56,fcc0,cc6,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr60,fcc0,cc6,1
-	test_fcc	0xe,0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr0,fcc0,cc3,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr4,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr8,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr12,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr16,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr20,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr24,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr28,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr32,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr36,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr40,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr44,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr48,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr52,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr56,fcc0,cc3,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr0,fr60,fcc0,cc3,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr0,fcc0,cc3,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr4,fcc0,cc3,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr8,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr12,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr16,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr20,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr24,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr28,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr32,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr36,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr40,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr44,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr48,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr52,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr56,fcc0,cc3,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr4,fr60,fcc0,cc3,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr0,fcc0,cc3,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr4,fcc0,cc3,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr8,fcc0,cc3,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr12,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr16,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr20,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr24,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr28,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr32,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr36,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr40,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr44,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr48,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr52,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr56,fcc0,cc3,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr8,fr60,fcc0,cc3,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr0,fcc0,cc3,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr4,fcc0,cc3,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr8,fcc0,cc3,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr12,fcc0,cc3,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr16,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr20,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr24,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr28,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr32,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr36,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr40,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr44,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr48,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr52,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr56,fcc0,cc3,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr12,fr60,fcc0,cc3,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr0,fcc0,cc3,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr4,fcc0,cc3,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr8,fcc0,cc3,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr12,fcc0,cc3,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr16,fcc0,cc3,1
-	test_fcc	0x7,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr20,fcc0,cc3,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr24,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr28,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr32,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr36,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr40,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr44,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr48,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr52,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr56,fcc0,cc3,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr16,fr60,fcc0,cc3,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr0,fcc0,cc3,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr4,fcc0,cc3,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr8,fcc0,cc3,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr12,fcc0,cc3,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr16,fcc0,cc3,1
-	test_fcc	0x7,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr20,fcc0,cc3,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr24,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr28,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr32,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr36,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr40,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr44,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr48,fcc0,cc3,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr52,fcc0,cc3,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr56,fcc0,cc3,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr20,fr60,fcc0,cc3,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr0,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr4,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr8,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr12,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr16,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr20,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr24,fcc0,cc7,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr28,fcc0,cc7,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr32,fcc0,cc7,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr36,fcc0,cc7,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr40,fcc0,cc7,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr44,fcc0,cc7,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr48,fcc0,cc7,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr52,fcc0,cc7,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr56,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr24,fr60,fcc0,cc7,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr0,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr4,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr8,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr12,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr16,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr20,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr24,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr28,fcc0,cc7,0
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr32,fcc0,cc7,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr36,fcc0,cc7,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr40,fcc0,cc7,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr44,fcc0,cc7,0
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr48,fcc0,cc7,1
-	test_fcc	0xb,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr52,fcc0,cc7,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr56,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr28,fr60,fcc0,cc7,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr0,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr4,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr8,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr12,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr16,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr20,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr24,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr28,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr32,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr36,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr40,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr44,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr48,fcc0,cc7,1
-	test_fcc	0x7,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr52,fcc0,cc7,0
-	test_fcc	0xb,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr56,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr48,fr60,fcc0,cc7,0
-	test_fcc	0xe,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr0,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr4,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr8,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr12,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr16,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr20,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr24,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr28,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr32,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr36,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr40,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr44,fcc0,cc7,0
-	test_fcc	0xd,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr48,fcc0,cc7,1
-	test_fcc	0xd,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr52,fcc0,cc7,0
-	test_fcc	0x7,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr56,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr52,fr60,fcc0,cc7,0
-	test_fcc	0xe,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr0,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr4,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr8,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr12,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr16,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr20,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr24,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr28,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr32,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr36,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr40,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr44,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr48,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr52,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr56,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr56,fr60,fcc0,cc7,0
-	test_fcc	0xe,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr0,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr4,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr8,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr12,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr16,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr20,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr24,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr28,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr32,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr36,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr40,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr44,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr48,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr52,fcc0,cc7,1
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr56,fcc0,cc7,0
-	test_fcc	0xe,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	cfcmps      	fr60,fr60,fcc0,cc7,1
-	test_fcc	0xe,0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfdivs.cgs b/sim/testsuite/sim/frv/cfdivs.cgs
deleted file mode 100644
index e776f800ec3..00000000000
--- a/sim/testsuite/sim/frv/cfdivs.cgs
+++ /dev/null
@@ -1,696 +0,0 @@
-# frv testcase for cfdivs $FRi,$FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfdivs
-cfdivs:
-	set_spr_immed	0x1b1b,cccr
-
-	cfdivs      	fr0,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr0
-	cfdivs      	fr4,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr4
-	cfdivs      	fr8,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr8
-	cfdivs      	fr12,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr12
-	cfdivs      	fr16,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr24,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr24
-	cfdivs      	fr28,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr28
-	cfdivs      	fr32,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr32
-	cfdivs      	fr36,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr36
-	cfdivs      	fr40,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr40
-	cfdivs      	fr44,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr44
-	cfdivs      	fr48,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr48
-	cfdivs      	fr52,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr52
-
-	cfdivs      	fr16,fr0,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr24,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr32,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr52,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfdivs      	fr20,fr0,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr4,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr12,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr24,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr32,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr52,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfdivs      	fr8,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	cfdivs      	fr28,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-
-	cfdivs      	fr40,fr32,fr1,cc4,1
-	test_fr_fr	fr1,fr36
-;
-	cfdivs      	fr0,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr0
-	cfdivs      	fr4,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr4
-	cfdivs      	fr8,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr8
-	cfdivs      	fr12,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr12
-	cfdivs      	fr16,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr24,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr24
-	cfdivs      	fr28,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr28
-	cfdivs      	fr32,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr32
-	cfdivs      	fr36,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr36
-	cfdivs      	fr40,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr40
-	cfdivs      	fr44,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr44
-	cfdivs      	fr48,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr48
-	cfdivs      	fr52,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr52
-
-	cfdivs      	fr16,fr0,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr24,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr32,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr16,fr52,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfdivs      	fr20,fr0,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr4,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr12,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr24,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr32,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfdivs      	fr20,fr52,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfdivs      	fr8,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	cfdivs      	fr28,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-
-	cfdivs      	fr40,fr32,fr1,cc5,0
-	test_fr_fr	fr1,fr36
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfdivs      	fr0,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr4,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr8,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr12,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr24,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr28,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr32,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr36,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr40,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr44,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr48,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr52,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr16,fr0,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr4,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr8,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr12,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr24,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr32,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr36,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr40,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr44,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr48,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr52,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr20,fr0,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr4,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr8,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr12,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr24,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr28,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr32,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr36,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr40,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr44,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr48,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr52,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr8,fr28,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr28,fr8,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr40,fr32,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfdivs      	fr0,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr4,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr8,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr12,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr24,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr28,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr32,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr36,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr40,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr44,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr48,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr52,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr16,fr0,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr4,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr8,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr12,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr24,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr32,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr36,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr40,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr44,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr48,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr52,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr20,fr0,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr4,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr8,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr12,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr24,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr28,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr32,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr36,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr40,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr44,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr48,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr52,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr8,fr28,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr28,fr8,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr40,fr32,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfdivs      	fr0,fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr4,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr8,fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr12,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr24,fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr28,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr32,fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr36,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr40,fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr44,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr48,fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr52,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr16,fr0,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr4,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr8,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr12,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr24,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr32,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr36,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr40,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr44,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr48,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr52,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr20,fr0,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr4,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr8,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr12,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr24,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr28,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr32,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr36,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr40,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr44,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr48,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr52,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr8,fr28,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr28,fr8,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr40,fr32,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfdivs      	fr0,fr28,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr4,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr8,fr28,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr12,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr28,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr24,fr28,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr28,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr32,fr28,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr36,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr40,fr28,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr44,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr48,fr28,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr52,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr16,fr0,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr4,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr8,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr12,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr24,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr32,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr36,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr40,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr44,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr48,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr16,fr52,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr20,fr0,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr4,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr8,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr12,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr24,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr28,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr32,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr36,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr40,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr44,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr48,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr20,fr52,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr8,fr28,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfdivs      	fr28,fr8,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfdivs      	fr40,fr32,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfitos.cgs b/sim/testsuite/sim/frv/cfitos.cgs
deleted file mode 100644
index b24184e65c0..00000000000
--- a/sim/testsuite/sim/frv/cfitos.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# frv testcase for cfitos $FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfitos
-cfitos:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0,0,fr1
-	cfitos		fr1,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_iimmed	0x0000,0x0002,fr1
-	cfitos		fr1,fr1,cc0,1
-	test_fr_fr	fr1,fr32
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfitos		fr1,fr1,cc4,1
-	test_fr_iimmed	0xce054904,fr1
-
-	set_fr_iimmed	0,0,fr1
-	cfitos		fr1,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_iimmed	0x0000,0x0002,fr1
-	cfitos		fr1,fr1,cc1,0
-	test_fr_fr	fr1,fr32
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfitos		fr1,fr1,cc5,0
-	test_fr_iimmed	0xce054904,fr1
-
-	set_fr_iimmed	0,0,fr1
-	cfitos		fr1,fr1,cc0,0
-	test_fr_iimmed	0,fr1
-
-	set_fr_iimmed	0x0000,0x0002,fr1
-	cfitos		fr1,fr1,cc0,0
-	test_fr_iimmed	0x00000002,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfitos		fr1,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0,0,fr1
-	cfitos		fr1,fr1,cc1,1
-	test_fr_iimmed	0,fr1
-
-	set_fr_iimmed	0x0000,0x0002,fr1
-	cfitos		fr1,fr1,cc1,1
-	test_fr_iimmed	0x00000002,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfitos		fr1,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0,0,fr1
-	cfitos		fr1,fr1,cc2,1
-	test_fr_iimmed	0,fr1
-
-	set_fr_iimmed	0x0000,0x0002,fr1
-	cfitos		fr1,fr1,cc2,0
-	test_fr_iimmed	0x00000002,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfitos		fr1,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0,0,fr1
-	cfitos		fr1,fr1,cc3,0
-	test_fr_iimmed	0,fr1
-
-	set_fr_iimmed	0x0000,0x0002,fr1
-	cfitos		fr1,fr1,cc3,1
-	test_fr_iimmed	0x00000002,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfitos		fr1,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfmadds.cgs b/sim/testsuite/sim/frv/cfmadds.cgs
deleted file mode 100644
index a30f7bfd87d..00000000000
--- a/sim/testsuite/sim/frv/cfmadds.cgs
+++ /dev/null
@@ -1,627 +0,0 @@
-# frv testcase for cfmadds $GRi,$GRj,$GRk,$CCi,$cond
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfmadds
-cfmadds:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr16,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr20,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr24,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr32,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr36,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr40,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr44,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr48,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfmadds      	fr20,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr20,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr24,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr32,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr36,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr0,fr1,cc4,1
-	test_fr_fr	fr1,fr0
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr4,fr1,cc4,1
-	test_fr_fr	fr1,fr4
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr12,fr1,cc4,1
-	test_fr_fr	fr1,fr12
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr16,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr24,fr1,cc4,1
-	test_fr_fr	fr1,fr24
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr28
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr32,fr1,cc4,1
-	test_fr_fr	fr1,fr32
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr36
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr40
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr44
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr48
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr52,fr1,cc4,1
-	test_fr_fr	fr1,fr52
-
-	set_fr_fr	fr36,fr1
-	cfmadds      	fr28,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr32
-	cfmadds      	fr8,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr28
-
-	set_fr_fr	fr36,fr1
-	cfmadds      	fr32,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr44
-;
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr16,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr20,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr24,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr32,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr36,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr40,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr44,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr16,fr48,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfmadds      	fr20,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr20,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr24,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr32,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr36,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmadds      	fr20,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr0,fr1,cc5,0
-	test_fr_fr	fr1,fr0
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr4,fr1,cc5,0
-	test_fr_fr	fr1,fr4
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr12,fr1,cc5,0
-	test_fr_fr	fr1,fr12
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr16,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr24,fr1,cc5,0
-	test_fr_fr	fr1,fr24
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr28
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr32,fr1,cc5,0
-	test_fr_fr	fr1,fr32
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr36
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr40
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr44
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr48
-	set_fr_fr	fr16,fr1
-	cfmadds      	fr28,fr52,fr1,cc5,0
-	test_fr_fr	fr1,fr52
-
-	set_fr_fr	fr36,fr1
-	cfmadds      	fr28,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr32
-	cfmadds      	fr8,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr28
-
-	set_fr_fr	fr36,fr1
-	cfmadds      	fr32,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr44
-;
-	set_fr_fr	fr48,fr1
-	cfmadds      	fr16,fr4,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr8,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr12,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr16,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr20,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr24,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr28,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr32,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr36,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr40,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr44,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr48,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr20,fr4,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr8,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr12,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr16,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr20,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr24,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr28,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr32,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr36,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr40,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr44,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr48,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr28,fr0,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr4,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr8,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr12,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr16,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr20,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr24,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr28,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr32,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr36,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr40,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr44,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr48,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr52,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr28,fr8,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr8,fr28,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr32,fr36,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-;
-	set_fr_fr	fr48,fr1
-	cfmadds      	fr16,fr4,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr8,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr12,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr16,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr20,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr24,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr28,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr32,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr36,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr40,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr44,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr48,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr20,fr4,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr8,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr12,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr16,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr20,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr24,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr28,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr32,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr36,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr40,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr44,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr48,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr28,fr0,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr4,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr8,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr12,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr16,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr20,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr24,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr28,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr32,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr36,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr40,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr44,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr48,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr52,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr28,fr8,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr8,fr28,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr32,fr36,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-;
-	set_fr_fr	fr48,fr1
-	cfmadds      	fr16,fr4,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr8,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr12,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr16,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr20,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr24,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr28,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr32,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr36,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr40,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr44,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr48,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr20,fr4,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr8,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr12,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr16,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr20,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr24,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr28,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr32,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr36,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr40,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr44,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr48,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr28,fr0,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr4,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr8,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr12,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr16,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr20,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr24,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr28,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr32,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr36,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr40,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr44,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr48,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr52,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr28,fr8,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr8,fr28,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr32,fr36,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-;
-	set_fr_fr	fr48,fr1
-	cfmadds      	fr16,fr4,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr8,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr12,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr16,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr20,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr24,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr28,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr32,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr36,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr40,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr44,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr16,fr48,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr20,fr4,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr8,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr12,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr16,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr20,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr24,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr28,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr32,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr36,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr40,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr44,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr20,fr48,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr28,fr0,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr4,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr8,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr12,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr16,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr20,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr24,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr28,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr32,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr36,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr40,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr44,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr48,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr28,fr52,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr28,fr8,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmadds      	fr8,fr28,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-
-	cfmadds      	fr32,fr36,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-;
-	pass
diff --git a/sim/testsuite/sim/frv/cfmas.cgs b/sim/testsuite/sim/frv/cfmas.cgs
deleted file mode 100644
index 8c0dc05f65d..00000000000
--- a/sim/testsuite/sim/frv/cfmas.cgs
+++ /dev/null
@@ -1,775 +0,0 @@
-# frv testcase for cfmas $FRi,$FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global cfmas
-cfmas:
-	set_spr_immed	0x1b1b,cccr
-
-	cfmas      	fr16,fr4,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	cfmas      	fr16,fr8,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	cfmas      	fr16,fr12,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	cfmas      	fr16,fr16,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr16,fr20,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr16,fr24,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	cfmas      	fr16,fr28,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmas      	fr16,fr32,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	cfmas      	fr16,fr36,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	cfmas      	fr16,fr40,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	cfmas      	fr16,fr44,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	cfmas      	fr16,fr48,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-
-	cfmas      	fr20,fr4,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	cfmas      	fr20,fr8,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	cfmas      	fr20,fr12,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	cfmas      	fr20,fr16,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr20,fr20,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr20,fr24,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	cfmas      	fr20,fr28,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmas      	fr20,fr32,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	cfmas      	fr20,fr36,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	cfmas      	fr20,fr40,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	cfmas      	fr20,fr44,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	cfmas      	fr20,fr48,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-
-	cfmas      	fr28,fr0,fr2,cc4,1
-	test_fr_fr	fr2,fr0
-	cfmas      	fr28,fr4,fr2,cc4,1
-	test_fr_fr	fr2,fr4
-	cfmas      	fr28,fr8,fr2,cc4,1
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr28,fr12,fr2,cc4,1
-	test_fr_fr	fr2,fr12
-	cfmas      	fr28,fr16,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmas      	fr28,fr20,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmas      	fr28,fr24,fr2,cc4,1
-	test_fr_fr	fr2,fr24
-	cfmas      	fr28,fr28,fr2,cc4,1
-	test_fr_fr	fr2,fr28
-	cfmas      	fr28,fr32,fr2,cc4,1
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr36
-	cfmas      	fr28,fr36,fr2,cc4,1
-	test_fr_fr	fr2,fr36
-	cfmas      	fr28,fr40,fr2,cc4,1
-	test_fr_fr	fr2,fr40
-	cfmas      	fr28,fr44,fr2,cc4,1
-	test_fr_fr	fr2,fr44
-	cfmas      	fr28,fr48,fr2,cc4,1
-	test_fr_fr	fr2,fr48
-	cfmas      	fr28,fr52,fr2,cc4,1
-	test_fr_fr	fr2,fr52
-
-	cfmas      	fr28,fr8,fr2,cc4,1
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr8,fr28,fr2,cc4,1
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	cfmas      	fr32,fr36,fr2,cc4,1
-	test_fr_fr	fr2,fr40
-;
-	cfmas      	fr16,fr4,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	cfmas      	fr16,fr8,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	cfmas      	fr16,fr12,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	cfmas      	fr16,fr16,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr16,fr20,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr16,fr24,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	cfmas      	fr16,fr28,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmas      	fr16,fr32,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	cfmas      	fr16,fr36,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	cfmas      	fr16,fr40,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	cfmas      	fr16,fr44,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	cfmas      	fr16,fr48,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-
-	cfmas      	fr20,fr4,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	cfmas      	fr20,fr8,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	cfmas      	fr20,fr12,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	cfmas      	fr20,fr16,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr20,fr20,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr20,fr24,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	cfmas      	fr20,fr28,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmas      	fr20,fr32,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	cfmas      	fr20,fr36,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	cfmas      	fr20,fr40,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	cfmas      	fr20,fr44,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	cfmas      	fr20,fr48,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-
-	cfmas      	fr28,fr0,fr2,cc5,0
-	test_fr_fr	fr2,fr0
-	cfmas      	fr28,fr4,fr2,cc5,0
-	test_fr_fr	fr2,fr4
-	cfmas      	fr28,fr8,fr2,cc5,0
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr28,fr12,fr2,cc5,0
-	test_fr_fr	fr2,fr12
-	cfmas      	fr28,fr16,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmas      	fr28,fr20,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmas      	fr28,fr24,fr2,cc5,0
-	test_fr_fr	fr2,fr24
-	cfmas      	fr28,fr28,fr2,cc5,0
-	test_fr_fr	fr2,fr28
-	cfmas      	fr28,fr32,fr2,cc5,0
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr36
-	cfmas      	fr28,fr36,fr2,cc5,0
-	test_fr_fr	fr2,fr36
-	cfmas      	fr28,fr40,fr2,cc5,0
-	test_fr_fr	fr2,fr40
-	cfmas      	fr28,fr44,fr2,cc5,0
-	test_fr_fr	fr2,fr44
-	cfmas      	fr28,fr48,fr2,cc5,0
-	test_fr_fr	fr2,fr48
-	cfmas      	fr28,fr52,fr2,cc5,0
-	test_fr_fr	fr2,fr52
-
-	cfmas      	fr28,fr8,fr2,cc5,0
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmas      	fr8,fr28,fr2,cc5,0
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	cfmas      	fr32,fr36,fr2,cc5,0
-	test_fr_fr	fr2,fr40
-;
-	set_fr_iimmed	0x1111,0x1111,fr2
-	set_fr_iimmed	0x2222,0x2222,fr3
-	cfmas      	fr16,fr4,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr8,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr12,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr16,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr20,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr24,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr28,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr32,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr36,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr40,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr44,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr48,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr20,fr4,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr8,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr12,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr16,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr20,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr24,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr20,fr28,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr32,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr36,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr40,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr44,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr48,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr28,fr0,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr4,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr8,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr28,fr12,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr16,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr20,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr24,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr28,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr32,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr28,fr36,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr40,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr44,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr48,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr52,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmas      	fr28,fr8,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr8,fr28,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr32,fr36,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-;
-	set_fr_iimmed	0x1111,0x1111,fr2
-	set_fr_iimmed	0x2222,0x2222,fr3
-	cfmas      	fr16,fr4,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr8,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr12,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr16,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr20,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr24,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr28,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr32,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr36,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr40,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr44,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr48,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr20,fr4,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr8,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr12,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr16,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr20,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr24,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr20,fr28,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr32,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr36,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr40,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr44,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr48,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr28,fr0,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr4,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr8,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr28,fr12,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr16,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr20,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr24,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr28,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr32,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr28,fr36,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr40,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr44,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr48,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr52,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmas      	fr28,fr8,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr8,fr28,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr32,fr36,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-;
-	set_fr_iimmed	0x1111,0x1111,fr2
-	set_fr_iimmed	0x2222,0x2222,fr3
-	cfmas      	fr16,fr4,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr8,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr12,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr16,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr20,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr24,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr28,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr32,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr36,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr40,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr44,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr48,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr20,fr4,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr8,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr12,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr16,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr20,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr24,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr20,fr28,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr32,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr36,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr40,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr44,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr48,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr28,fr0,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr4,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr8,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr28,fr12,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr16,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr20,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr24,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr28,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr32,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr28,fr36,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr40,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr44,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr48,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr52,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmas      	fr28,fr8,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr8,fr28,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr32,fr36,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-;
-	set_fr_iimmed	0x1111,0x1111,fr2
-	set_fr_iimmed	0x2222,0x2222,fr3
-	cfmas      	fr16,fr4,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr8,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr12,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr16,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr20,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr24,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr28,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr32,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr36,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr40,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr44,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr16,fr48,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr20,fr4,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr8,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr12,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr16,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr20,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr24,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr20,fr28,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr32,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr36,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr40,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr44,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr20,fr48,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr28,fr0,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr4,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr8,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr28,fr12,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr16,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr20,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr24,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr28,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr32,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr28,fr36,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr40,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr44,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr48,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmas      	fr28,fr52,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmas      	fr28,fr8,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmas      	fr8,fr28,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	cfmas      	fr32,fr36,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfmovs.cgs b/sim/testsuite/sim/frv/cfmovs.cgs
deleted file mode 100644
index 310bac36541..00000000000
--- a/sim/testsuite/sim/frv/cfmovs.cgs
+++ /dev/null
@@ -1,216 +0,0 @@
-# frv testcase for cfmovs $FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfmovs
-cfmovs:
-	set_spr_immed	0x1b1b,cccr
-
-	cfmovs		fr0,fr1,cc0,1
-	test_fr_fr	fr0,fr1
-	cfmovs		fr4,fr1,cc0,1
-	test_fr_fr	fr4,fr1
-	cfmovs		fr8,fr1,cc0,1
-	test_fr_fr	fr8,fr1
-	cfmovs		fr12,fr1,cc0,1
-	test_fr_fr	fr12,fr1
-	cfmovs		fr16,fr1,cc0,1
-	test_fr_fr	fr16,fr1
-	cfmovs		fr20,fr1,cc0,1
-	test_fr_fr	fr20,fr1
-	cfmovs		fr24,fr1,cc0,1
-	test_fr_fr	fr24,fr1
-	cfmovs		fr28,fr1,cc0,1
-	test_fr_fr	fr28,fr1
-	cfmovs		fr32,fr1,cc4,1
-	test_fr_fr	fr32,fr1
-	cfmovs		fr36,fr1,cc4,1
-	test_fr_fr	fr36,fr1
-	cfmovs		fr40,fr1,cc4,1
-	test_fr_fr	fr40,fr1
-	cfmovs		fr44,fr1,cc4,1
-	test_fr_fr	fr44,fr1
-	cfmovs		fr48,fr1,cc4,1
-	test_fr_fr	fr48,fr1
-	cfmovs		fr52,fr1,cc4,1
-	test_fr_fr	fr52,fr1
-	cfmovs		fr56,fr1,cc4,1
-	test_fr_iimmed	0x7fc00000,fr1
-	cfmovs		fr60,fr1,cc4,1
-	test_fr_iimmed	0x7f800001,fr1
-
-	cfmovs		fr0,fr1,cc1,0
-	test_fr_fr	fr0,fr1
-	cfmovs		fr4,fr1,cc1,0
-	test_fr_fr	fr4,fr1
-	cfmovs		fr8,fr1,cc1,0
-	test_fr_fr	fr8,fr1
-	cfmovs		fr12,fr1,cc1,0
-	test_fr_fr	fr12,fr1
-	cfmovs		fr16,fr1,cc1,0
-	test_fr_fr	fr16,fr1
-	cfmovs		fr20,fr1,cc1,0
-	test_fr_fr	fr20,fr1
-	cfmovs		fr24,fr1,cc1,0
-	test_fr_fr	fr24,fr1
-	cfmovs		fr28,fr1,cc1,0
-	test_fr_fr	fr28,fr1
-	cfmovs		fr32,fr1,cc5,0
-	test_fr_fr	fr32,fr1
-	cfmovs		fr36,fr1,cc5,0
-	test_fr_fr	fr36,fr1
-	cfmovs		fr40,fr1,cc5,0
-	test_fr_fr	fr40,fr1
-	cfmovs		fr44,fr1,cc5,0
-	test_fr_fr	fr44,fr1
-	cfmovs		fr48,fr1,cc5,0
-	test_fr_fr	fr48,fr1
-	cfmovs		fr52,fr1,cc5,0
-	test_fr_fr	fr52,fr1
-	cfmovs		fr56,fr1,cc5,0
-	test_fr_iimmed	0x7fc00000,fr1
-	cfmovs		fr60,fr1,cc5,0
-	test_fr_iimmed	0x7f800001,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfmovs		fr0,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr4,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr8,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr12,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr20,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr24,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr32,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr36,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr40,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr44,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr48,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr52,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr56,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr60,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfmovs		fr0,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr4,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr8,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr12,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr20,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr24,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr32,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr36,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr40,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr44,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr48,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr52,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr56,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr60,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfmovs		fr0,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr4,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr8,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr12,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr20,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr24,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr28,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr32,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr36,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr40,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr44,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr48,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr52,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr56,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr60,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfmovs		fr0,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr4,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr8,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr12,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr20,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr24,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr28,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr32,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr36,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr40,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr44,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr48,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr52,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr56,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmovs		fr60,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfmss.cgs b/sim/testsuite/sim/frv/cfmss.cgs
deleted file mode 100644
index c31fba3bfba..00000000000
--- a/sim/testsuite/sim/frv/cfmss.cgs
+++ /dev/null
@@ -1,697 +0,0 @@
-# frv testcase for cfmss $FRi,$FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global cfmss
-cfmss:
-	set_spr_immed	0x1b1b,cccr
-
-	cfmss      	fr16,fr4,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr8,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmss      	fr16,fr12,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr16,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmss      	fr16,fr20,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmss      	fr16,fr24,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr28,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	cfmss      	fr16,fr32,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr36,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr40,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr44,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr48,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-
-	cfmss      	fr20,fr4,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr8,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmss      	fr20,fr12,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr16,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmss      	fr20,fr20,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmss      	fr20,fr24,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr28,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	cfmss      	fr20,fr32,fr2,cc0,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr36,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr40,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr44,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr48,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-
-	cfmss      	fr28,fr0,fr2,cc4,1
-	test_fr_fr	fr2,fr0
-	cfmss      	fr28,fr4,fr2,cc4,1
-	test_fr_fr	fr2,fr4
-	cfmss      	fr28,fr8,fr2,cc4,1
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	cfmss      	fr28,fr12,fr2,cc4,1
-	test_fr_fr	fr2,fr12
-	cfmss      	fr28,fr16,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmss      	fr28,fr20,fr2,cc4,1
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmss      	fr28,fr24,fr2,cc4,1
-	test_fr_fr	fr2,fr24
-	cfmss      	fr28,fr28,fr2,cc4,1
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	cfmss      	fr28,fr32,fr2,cc4,1
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr8
-	cfmss      	fr28,fr36,fr2,cc4,1
-	test_fr_fr	fr2,fr36
-	cfmss      	fr28,fr40,fr2,cc4,1
-	test_fr_fr	fr2,fr40
-	cfmss      	fr28,fr44,fr2,cc4,1
-	test_fr_fr	fr2,fr44
-	cfmss      	fr28,fr48,fr2,cc4,1
-	test_fr_fr	fr2,fr48
-	cfmss      	fr28,fr52,fr2,cc4,1
-	test_fr_fr	fr2,fr52
-
-	cfmss      	fr28,fr8,fr2,cc4,1
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	cfmss      	fr8,fr28,fr2,cc4,1
-	test_fr_fr	fr2,fr8
-
-	cfmss      	fr32,fr36,fr2,cc4,1
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr8
-;
-	cfmss      	fr16,fr4,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr8,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmss      	fr16,fr12,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr16,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmss      	fr16,fr20,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmss      	fr16,fr24,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr28,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	cfmss      	fr16,fr32,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr36,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr40,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr44,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr16,fr48,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-
-	cfmss      	fr20,fr4,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr8,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmss      	fr20,fr12,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr16,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmss      	fr20,fr20,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	cfmss      	fr20,fr24,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr28,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	cfmss      	fr20,fr32,fr2,cc1,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr36,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr40,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr44,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	cfmss      	fr20,fr48,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-
-	cfmss      	fr28,fr0,fr2,cc5,0
-	test_fr_fr	fr2,fr0
-	cfmss      	fr28,fr4,fr2,cc5,0
-	test_fr_fr	fr2,fr4
-	cfmss      	fr28,fr8,fr2,cc5,0
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	cfmss      	fr28,fr12,fr2,cc5,0
-	test_fr_fr	fr2,fr12
-	cfmss      	fr28,fr16,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmss      	fr28,fr20,fr2,cc5,0
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	cfmss      	fr28,fr24,fr2,cc5,0
-	test_fr_fr	fr2,fr24
-	cfmss      	fr28,fr28,fr2,cc5,0
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	cfmss      	fr28,fr32,fr2,cc5,0
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr8
-	cfmss      	fr28,fr36,fr2,cc5,0
-	test_fr_fr	fr2,fr36
-	cfmss      	fr28,fr40,fr2,cc5,0
-	test_fr_fr	fr2,fr40
-	cfmss      	fr28,fr44,fr2,cc5,0
-	test_fr_fr	fr2,fr44
-	cfmss      	fr28,fr48,fr2,cc5,0
-	test_fr_fr	fr2,fr48
-	cfmss      	fr28,fr52,fr2,cc5,0
-	test_fr_fr	fr2,fr52
-
-	cfmss      	fr28,fr8,fr2,cc5,0
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	cfmss      	fr8,fr28,fr2,cc5,0
-	test_fr_fr	fr2,fr8
-
-	cfmss      	fr32,fr36,fr2,cc5,0
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr8
-;
-	set_fr_iimmed	0x1111,0x1111,fr2
-	set_fr_iimmed	0x2222,0x2222,fr3
-	cfmss      	fr16,fr4,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr8,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr12,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr16,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr20,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr24,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr28,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr32,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr36,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr40,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr44,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr48,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr20,fr4,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr8,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr12,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr16,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr20,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr24,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr28,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr32,fr2,cc0,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr36,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr40,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr44,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr48,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr28,fr0,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr4,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr8,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr12,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr16,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr20,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr24,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr28,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr32,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr36,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr40,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr44,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr48,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr52,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr28,fr8,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr8,fr28,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr32,fr36,fr2,cc4,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-;
-	set_fr_iimmed	0x1111,0x1111,fr2
-	set_fr_iimmed	0x2222,0x2222,fr3
-	cfmss      	fr16,fr4,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr8,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr12,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr16,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr20,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr24,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr28,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr32,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr36,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr40,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr44,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr48,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr20,fr4,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr8,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr12,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr16,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr20,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr24,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr28,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr32,fr2,cc1,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr36,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr40,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr44,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr48,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr28,fr0,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr4,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr8,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr12,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr16,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr20,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr24,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr28,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr32,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr36,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr40,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr44,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr48,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr52,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr28,fr8,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr8,fr28,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr32,fr36,fr2,cc5,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-;
-	set_fr_iimmed	0x1111,0x1111,fr2
-	set_fr_iimmed	0x2222,0x2222,fr3
-	cfmss      	fr16,fr4,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr8,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr12,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr16,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr20,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr24,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr28,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr32,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr36,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr40,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr44,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr48,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr20,fr4,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr8,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr12,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr16,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr20,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr24,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr28,fr2,cc2,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr32,fr2,cc2,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr36,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr40,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr44,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr48,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr28,fr0,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr4,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr8,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr12,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr16,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr20,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr24,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr28,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr32,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr36,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr40,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr44,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr48,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr52,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr28,fr8,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr8,fr28,fr2,cc6,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr32,fr36,fr2,cc6,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-;
-	set_fr_iimmed	0x1111,0x1111,fr2
-	set_fr_iimmed	0x2222,0x2222,fr3
-	cfmss      	fr16,fr4,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr8,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr12,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr16,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr20,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr24,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr28,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr16,fr32,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr36,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr40,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr44,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr16,fr48,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr20,fr4,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr8,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr12,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr16,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr20,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr24,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr28,fr2,cc3,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr20,fr32,fr2,cc3,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr36,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr40,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr44,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr20,fr48,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr28,fr0,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr4,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr8,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr12,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr16,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr20,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr24,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr28,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr32,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr28,fr36,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr40,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr44,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr48,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	cfmss      	fr28,fr52,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr28,fr8,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-	cfmss      	fr8,fr28,fr2,cc7,0
-	test_fr_iimmed	0x11111111,fr2
-
-	cfmss      	fr32,fr36,fr2,cc7,1
-	test_fr_iimmed	0x11111111,fr2
-	test_fr_iimmed	0x22222222,fr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfmsubs.cgs b/sim/testsuite/sim/frv/cfmsubs.cgs
deleted file mode 100644
index bc74da41b03..00000000000
--- a/sim/testsuite/sim/frv/cfmsubs.cgs
+++ /dev/null
@@ -1,629 +0,0 @@
-# frv testcase for cfmsubs $GRi,$GRj,$GRk,$CCi,$cond
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfmsubs
-cfmsubs:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr16,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr20,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr24,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr32,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr36,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr40,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr44,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr48,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfmsubs      	fr20,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr20,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr24,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr32,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr36,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr0,fr1,cc4,1
-	test_fr_fr	fr1,fr0
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr4,fr1,cc4,1
-	test_fr_fr	fr1,fr4
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr12,fr1,cc4,1
-	test_fr_fr	fr1,fr12
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr16,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr24,fr1,cc4,1
-	test_fr_fr	fr1,fr24
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr28
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr32,fr1,cc4,1
-	test_fr_fr	fr1,fr32
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr36
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr40
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr44
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr48
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr52,fr1,cc4,1
-	test_fr_fr	fr1,fr52
-
-	set_fr_fr	fr32,fr1
-	cfmsubs      	fr8,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr36,fr1
-	cfmsubs      	fr36,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr40
-
-	cfmsubs      	fr32,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-;
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr16,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr20,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr24,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr32,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr36,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr40,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr44,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr16,fr48,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfmsubs      	fr20,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr20,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr24,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr32,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr36,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmsubs      	fr20,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr0,fr1,cc5,0
-	test_fr_fr	fr1,fr0
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr4,fr1,cc5,0
-	test_fr_fr	fr1,fr4
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr12,fr1,cc5,0
-	test_fr_fr	fr1,fr12
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr16,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr24,fr1,cc5,0
-	test_fr_fr	fr1,fr24
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr28
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr32,fr1,cc5,0
-	test_fr_fr	fr1,fr32
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr36
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr40
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr44
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr48
-	set_fr_fr	fr16,fr1
-	cfmsubs      	fr28,fr52,fr1,cc5,0
-	test_fr_fr	fr1,fr52
-
-	set_fr_fr	fr32,fr1
-	cfmsubs      	fr8,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr36,fr1
-	cfmsubs      	fr36,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr40
-
-	cfmsubs      	fr32,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-;
-	set_fr_fr	fr48,fr1
-	cfmsubs      	fr16,fr4,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr8,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr12,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr16,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr20,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr24,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr28,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr32,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr36,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr40,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr44,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr48,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr20,fr4,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr8,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr12,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr16,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr20,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr24,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr28,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr32,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr36,fr1,cc0,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr40,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr44,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr48,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr28,fr0,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr4,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr8,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr12,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr16,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr20,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr24,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr28,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr32,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr36,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr40,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr44,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr48,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr52,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr8,fr8,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr36,fr36,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr32,fr36,fr1,cc4,0
-	test_fr_fr	fr1,fr48
-;
-	set_fr_fr	fr48,fr1
-	cfmsubs      	fr16,fr4,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr8,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr12,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr16,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr20,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr24,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr28,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr32,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr36,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr40,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr44,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr48,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr20,fr4,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr8,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr12,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr16,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr20,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr24,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr28,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr32,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr36,fr1,cc1,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr40,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr44,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr48,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr28,fr0,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr4,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr8,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr12,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr16,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr20,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr24,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr28,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr32,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr36,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr40,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr44,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr48,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr52,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr8,fr8,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr36,fr36,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr32,fr36,fr1,cc5,1
-	test_fr_fr	fr1,fr48
-;
-	set_fr_fr	fr48,fr1
-	cfmsubs      	fr16,fr4,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr8,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr12,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr16,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr20,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr24,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr28,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr32,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr36,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr40,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr44,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr48,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr20,fr4,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr8,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr12,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr16,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr20,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr24,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr28,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr32,fr1,cc2,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr36,fr1,cc2,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr40,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr44,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr48,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr28,fr0,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr4,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr8,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr12,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr16,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr20,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr24,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr28,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr32,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr36,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr40,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr44,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr48,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr52,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr8,fr8,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr36,fr36,fr1,cc6,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr32,fr36,fr1,cc6,0
-	test_fr_fr	fr1,fr48
-;
-	set_fr_fr	fr48,fr1
-	cfmsubs      	fr16,fr4,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr8,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr12,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr16,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr20,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr24,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr28,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr32,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr36,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr40,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr44,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr16,fr48,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr20,fr4,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr8,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr12,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr16,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr20,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr24,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr28,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr32,fr1,cc3,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr36,fr1,cc3,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr40,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr44,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr20,fr48,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr28,fr0,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr4,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr8,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr12,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr16,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr20,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr24,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr28,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr32,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr36,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr40,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr44,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr48,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr28,fr52,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr8,fr8,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-	cfmsubs      	fr36,fr36,fr1,cc7,1
-	test_fr_fr	fr1,fr48
-
-	cfmsubs      	fr32,fr36,fr1,cc7,0
-	test_fr_fr	fr1,fr48
-;
-	pass
diff --git a/sim/testsuite/sim/frv/cfmuls.cgs b/sim/testsuite/sim/frv/cfmuls.cgs
deleted file mode 100644
index 773c95a60e7..00000000000
--- a/sim/testsuite/sim/frv/cfmuls.cgs
+++ /dev/null
@@ -1,696 +0,0 @@
-# frv testcase for cfmuls $FRi,$FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfmuls
-cfmuls:
-	set_spr_immed	0x1b1b,cccr
-
-	cfmuls      	fr16,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr20,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr24,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr32,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr36,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr40,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr44,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr48,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfmuls      	fr20,fr4,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr20,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr24,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr28,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr32,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfmuls      	fr28,fr0,fr1,cc4,1
-	test_fr_fr	fr1,fr0
-	cfmuls      	fr28,fr4,fr1,cc4,1
-	test_fr_fr	fr1,fr4
-	cfmuls      	fr28,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	cfmuls      	fr28,fr12,fr1,cc4,1
-	test_fr_fr	fr1,fr12
-	cfmuls      	fr28,fr16,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr28,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr28,fr24,fr1,cc4,1
-	test_fr_fr	fr1,fr24
-	cfmuls      	fr28,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr28
-	cfmuls      	fr28,fr32,fr1,cc4,1
-	test_fr_fr	fr1,fr32
-	cfmuls      	fr28,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr36
-	cfmuls      	fr28,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr40
-	cfmuls      	fr28,fr44,fr1,cc4,1
-	test_fr_fr	fr1,fr44
-	cfmuls      	fr28,fr48,fr1,cc4,1
-	test_fr_fr	fr1,fr48
-	cfmuls      	fr28,fr52,fr1,cc4,1
-	test_fr_fr	fr1,fr52
-
-	cfmuls      	fr28,fr8,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	cfmuls      	fr8,fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-
-	cfmuls      	fr32,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr40
-;
-	cfmuls      	fr16,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr20,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr24,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr32,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr36,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr40,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr44,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr16,fr48,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfmuls      	fr20,fr4,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr20,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr24,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr28,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr32,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr20,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	cfmuls      	fr28,fr0,fr1,cc5,0
-	test_fr_fr	fr1,fr0
-	cfmuls      	fr28,fr4,fr1,cc5,0
-	test_fr_fr	fr1,fr4
-	cfmuls      	fr28,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	cfmuls      	fr28,fr12,fr1,cc5,0
-	test_fr_fr	fr1,fr12
-	cfmuls      	fr28,fr16,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr28,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfmuls      	fr28,fr24,fr1,cc5,0
-	test_fr_fr	fr1,fr24
-	cfmuls      	fr28,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr28
-	cfmuls      	fr28,fr32,fr1,cc5,0
-	test_fr_fr	fr1,fr32
-	cfmuls      	fr28,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr36
-	cfmuls      	fr28,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr40
-	cfmuls      	fr28,fr44,fr1,cc5,0
-	test_fr_fr	fr1,fr44
-	cfmuls      	fr28,fr48,fr1,cc5,0
-	test_fr_fr	fr1,fr48
-	cfmuls      	fr28,fr52,fr1,cc5,0
-	test_fr_fr	fr1,fr52
-
-	cfmuls      	fr28,fr8,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	cfmuls      	fr8,fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-
-	cfmuls      	fr32,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr40
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfmuls      	fr16,fr4,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr8,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr12,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr20,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr24,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr32,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr36,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr40,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr44,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr48,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr20,fr4,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr8,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr12,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr20,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr24,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr28,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr32,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr36,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr40,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr44,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr48,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr28,fr0,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr4,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr8,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr12,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr16,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr24,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr28,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr32,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr36,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr40,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr44,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr48,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr52,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr28,fr8,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr8,fr28,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr32,fr36,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfmuls      	fr16,fr4,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr8,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr12,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr20,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr24,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr32,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr36,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr40,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr44,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr48,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr20,fr4,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr8,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr12,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr20,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr24,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr28,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr32,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr36,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr40,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr44,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr48,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr28,fr0,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr4,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr8,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr12,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr16,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr24,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr28,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr32,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr36,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr40,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr44,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr48,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr52,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr28,fr8,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr8,fr28,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr32,fr36,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfmuls      	fr16,fr4,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr8,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr12,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr20,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr24,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr32,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr36,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr40,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr44,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr48,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr20,fr4,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr8,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr12,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr20,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr24,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr28,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr32,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr36,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr40,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr44,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr48,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr28,fr0,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr4,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr8,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr12,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr16,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr20,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr24,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr28,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr32,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr36,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr40,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr44,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr48,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr52,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr28,fr8,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr8,fr28,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr32,fr36,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfmuls      	fr16,fr4,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr8,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr12,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr20,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr24,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr32,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr36,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr40,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr44,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr16,fr48,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr20,fr4,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr8,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr12,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr20,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr24,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr28,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr32,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr36,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr40,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr44,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr20,fr48,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr28,fr0,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr4,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr8,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr12,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr16,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr20,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr24,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr28,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr32,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr36,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr40,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr44,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr48,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr28,fr52,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr28,fr8,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfmuls      	fr8,fr28,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfmuls      	fr32,fr36,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfnegs.cgs b/sim/testsuite/sim/frv/cfnegs.cgs
deleted file mode 100644
index c1f2b256897..00000000000
--- a/sim/testsuite/sim/frv/cfnegs.cgs
+++ /dev/null
@@ -1,96 +0,0 @@
-# frv testcase for cfnegs $FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfnegs
-cfnegs:
-	set_spr_immed	0x1b1b,cccr
-
-	cfnegs		fr0,fr1,cc0,1
-	test_fr_fr	fr1,fr52
-	cfnegs		fr8,fr1,cc0,1
-	test_fr_fr	fr1,fr28
-	cfnegs		fr12,fr1,cc0,1
-	test_fr_fr	fr1,fr24
-	cfnegs		fr24,fr1,cc4,1
-	test_fr_fr	fr1,fr12
-	cfnegs		fr28,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	cfnegs		fr52,fr1,cc4,1
-	test_fr_fr	fr1,fr0
-
-	cfnegs		fr0,fr1,cc1,0
-	test_fr_fr	fr1,fr52
-	cfnegs		fr8,fr1,cc1,0
-	test_fr_fr	fr1,fr28
-	cfnegs		fr12,fr1,cc1,0
-	test_fr_fr	fr1,fr24
-	cfnegs		fr24,fr1,cc5,0
-	test_fr_fr	fr1,fr12
-	cfnegs		fr28,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	cfnegs		fr52,fr1,cc5,0
-	test_fr_fr	fr1,fr0
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfnegs		fr0,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr8,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr12,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr24,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr28,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr52,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfnegs		fr0,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr8,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr12,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr24,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr28,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr52,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfnegs		fr0,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr8,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr12,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr24,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr28,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr52,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfnegs		fr0,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr8,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr12,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr24,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr28,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfnegs		fr52,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfsqrts.cgs b/sim/testsuite/sim/frv/cfsqrts.cgs
deleted file mode 100644
index ee7a9a56297..00000000000
--- a/sim/testsuite/sim/frv/cfsqrts.cgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# frv testcase for cfsqrts $FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfsqrts
-cfsqrts:
-	set_spr_immed	0x1b1b,cccr
-
-	cfsqrts		fr44,fr1,cc0,1		; 9.0
-	test_fr_fr	fr1,fr36		; 3.0
-
-	set_fr_iimmed	0x4049,0x0fdb,fr10	; 3.141592654
-	cfsqrts		fr10,fr10,cc4,1
-	test_fr_iimmed	0x3fe2dfc5,fr10		; 1.7724539
-
-	cfsqrts		fr44,fr1,cc1,0		; 9.0
-	test_fr_fr	fr1,fr36		; 3.0
-
-	set_fr_iimmed	0x4049,0x0fdb,fr10	; 3.141592654
-	cfsqrts		fr10,fr10,cc5,0
-	test_fr_iimmed	0x3fe2dfc5,fr10		; 1.7724539
-
-	set_fr_fr	fr0,fr1
-	cfsqrts		fr44,fr1,cc0,0		; 9.0
-	test_fr_fr	fr1,fr0
-
-	set_fr_iimmed	0x4049,0x0fdb,fr10	; 3.141592654
-	cfsqrts		fr10,fr10,cc4,0
-	test_fr_iimmed	0x40490fdb,fr10
-
-	set_fr_fr	fr0,fr1
-	cfsqrts		fr44,fr1,cc1,1		; 9.0
-	test_fr_fr	fr1,fr0
-
-	set_fr_iimmed	0x4049,0x0fdb,fr10	; 3.141592654
-	cfsqrts		fr10,fr10,cc5,1
-	test_fr_iimmed	0x40490fdb,fr10
-
-	set_fr_fr	fr0,fr1
-	cfsqrts		fr44,fr1,cc2,0		; 9.0
-	test_fr_fr	fr1,fr0
-
-	set_fr_iimmed	0x4049,0x0fdb,fr10	; 3.141592654
-	cfsqrts		fr10,fr10,cc6,1
-	test_fr_iimmed	0x40490fdb,fr10
-
-	set_fr_fr	fr0,fr1
-	cfsqrts		fr44,fr1,cc3,1		; 9.0
-	test_fr_fr	fr1,fr0
-
-	set_fr_iimmed	0x4049,0x0fdb,fr10	; 3.141592654
-	cfsqrts		fr10,fr10,cc7,0
-	test_fr_iimmed	0x40490fdb,fr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfstoi.cgs b/sim/testsuite/sim/frv/cfstoi.cgs
deleted file mode 100644
index 9ba8d126fe1..00000000000
--- a/sim/testsuite/sim/frv/cfstoi.cgs
+++ /dev/null
@@ -1,83 +0,0 @@
-# frv testcase for cfstoi $FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfstoi
-cfstoi:
-	set_spr_immed	0x1b1b,cccr
-
-	cfstoi		fr16,fr1,cc0,1
-	test_fr_iimmed	0,fr1
-	cfstoi		fr20,fr1,cc0,1
-	test_fr_iimmed	0,fr1
-
-	cfstoi		fr32,fr1,cc4,1
-	test_fr_iimmed	0x00000002,fr1
-
-	set_fr_iimmed	0xce05,0x4904,fr1
-	cfstoi		fr1,fr1,cc4,1
-	test_fr_iimmed	0xdeadbf00,fr1
-
-	cfstoi		fr16,fr1,cc1,0
-	test_fr_iimmed	0,fr1
-	cfstoi		fr20,fr1,cc1,0
-	test_fr_iimmed	0,fr1
-
-	cfstoi		fr32,fr1,cc5,0
-	test_fr_iimmed	0x00000002,fr1
-
-	set_fr_iimmed	0xce05,0x4904,fr1
-	cfstoi		fr1,fr1,cc5,0
-	test_fr_iimmed	0xdeadbf00,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfstoi		fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfstoi		fr20,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr32,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr1,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfstoi		fr20,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr32,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr1,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfstoi		fr20,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr32,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr1,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfstoi		fr20,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr32,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfstoi		fr1,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cfsubs.cgs b/sim/testsuite/sim/frv/cfsubs.cgs
deleted file mode 100644
index 3bc7db1ea68..00000000000
--- a/sim/testsuite/sim/frv/cfsubs.cgs
+++ /dev/null
@@ -1,412 +0,0 @@
-# frv testcase for cfsubs $FRi,$FRj,$FRk,$CCi,$cond
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global cfsubs
-cfsubs:
-	set_spr_immed	0x1b1b,cccr
-
-	cfsubs      	fr0,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr0
-	cfsubs      	fr4,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr4
-	cfsubs      	fr8,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr8
-	cfsubs      	fr12,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr12
-	cfsubs      	fr16,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfsubs      	fr20,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfsubs      	fr24,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr24
-	cfsubs      	fr28,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr28
-	cfsubs      	fr32,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr32
-	cfsubs      	fr36,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr36
-	cfsubs      	fr40,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr40
-	cfsubs      	fr44,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr44
-	cfsubs      	fr48,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr48
-	cfsubs      	fr52,fr16,fr1,cc0,1
-	test_fr_fr	fr1,fr52
-
-	cfsubs      	fr0,fr20,fr1,cc0,1
-	test_fr_fr	fr1,fr0
-	cfsubs      	fr4,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr4
-	cfsubs      	fr8,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-	cfsubs      	fr12,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr12
-	cfsubs      	fr16,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfsubs      	fr20,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfsubs      	fr24,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr24
-	cfsubs      	fr28,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr28
-	cfsubs      	fr32,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr32
-	cfsubs      	fr36,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr36
-	cfsubs      	fr40,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr40
-	cfsubs      	fr44,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr44
-	cfsubs      	fr48,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr48
-	cfsubs      	fr52,fr20,fr1,cc4,1
-	test_fr_fr	fr1,fr52
-
-	cfsubs      	fr32,fr36,fr1,cc4,1
-	test_fr_fr	fr1,fr8
-
-	cfsubs      	fr44,fr40,fr1,cc4,1
-	test_fr_fr	fr1,fr36
-;
-	cfsubs      	fr0,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr0
-	cfsubs      	fr4,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr4
-	cfsubs      	fr8,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr8
-	cfsubs      	fr12,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr12
-	cfsubs      	fr16,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfsubs      	fr20,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfsubs      	fr24,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr24
-	cfsubs      	fr28,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr28
-	cfsubs      	fr32,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr32
-	cfsubs      	fr36,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr36
-	cfsubs      	fr40,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr40
-	cfsubs      	fr44,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr44
-	cfsubs      	fr48,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr48
-	cfsubs      	fr52,fr16,fr1,cc1,0
-	test_fr_fr	fr1,fr52
-
-	cfsubs      	fr0,fr20,fr1,cc1,0
-	test_fr_fr	fr1,fr0
-	cfsubs      	fr4,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr4
-	cfsubs      	fr8,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-	cfsubs      	fr12,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr12
-	cfsubs      	fr16,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfsubs      	fr20,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	cfsubs      	fr24,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr24
-	cfsubs      	fr28,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr28
-	cfsubs      	fr32,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr32
-	cfsubs      	fr36,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr36
-	cfsubs      	fr40,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr40
-	cfsubs      	fr44,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr44
-	cfsubs      	fr48,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr48
-	cfsubs      	fr52,fr20,fr1,cc5,0
-	test_fr_fr	fr1,fr52
-
-	cfsubs      	fr32,fr36,fr1,cc5,0
-	test_fr_fr	fr1,fr8
-
-	cfsubs      	fr44,fr40,fr1,cc5,0
-	test_fr_fr	fr1,fr36
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfsubs      	fr0,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr4,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr8,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr12,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr16,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr20,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr24,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr28,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr32,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr36,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr40,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr44,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr48,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr52,fr16,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr0,fr20,fr1,cc0,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr4,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr8,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr12,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr16,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr20,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr24,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr28,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr32,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr36,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr40,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr44,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr48,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr52,fr20,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr32,fr36,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr44,fr40,fr1,cc4,0
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfsubs      	fr0,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr4,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr8,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr12,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr16,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr20,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr24,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr28,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr32,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr36,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr40,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr44,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr48,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr52,fr16,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr0,fr20,fr1,cc1,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr4,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr8,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr12,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr16,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr20,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr24,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr28,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr32,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr36,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr40,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr44,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr48,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr52,fr20,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr32,fr36,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr44,fr40,fr1,cc5,1
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfsubs      	fr0,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr4,fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr8,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr12,fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr16,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr20,fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr24,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr28,fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr32,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr36,fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr40,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr44,fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr48,fr16,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr52,fr16,fr1,cc2,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr0,fr20,fr1,cc2,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr4,fr20,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr8,fr20,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr12,fr20,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr16,fr20,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr20,fr20,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr24,fr20,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr28,fr20,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr32,fr20,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr36,fr20,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr40,fr20,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr44,fr20,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr48,fr20,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr52,fr20,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr32,fr36,fr1,cc6,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr44,fr40,fr1,cc6,1
-	test_fr_iimmed	0xdeadbeef,fr1
-;
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	cfsubs      	fr0,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr4,fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr8,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr12,fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr16,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr20,fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr24,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr28,fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr32,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr36,fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr40,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr44,fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr48,fr16,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr52,fr16,fr1,cc3,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr0,fr20,fr1,cc3,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr4,fr20,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr8,fr20,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr12,fr20,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr16,fr20,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr20,fr20,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr24,fr20,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr28,fr20,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr32,fr20,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr36,fr20,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr40,fr20,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr44,fr20,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr48,fr20,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-	cfsubs      	fr52,fr20,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr32,fr36,fr1,cc7,0
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	cfsubs      	fr44,fr40,fr1,cc7,1
-	test_fr_iimmed	0xdeadbeef,fr1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/cjmpl.cgs b/sim/testsuite/sim/frv/cjmpl.cgs
deleted file mode 100644
index df7be86ac14..00000000000
--- a/sim/testsuite/sim/frv/cjmpl.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# frv testcase for cjmpl @($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cjmpl
-cjmpl:
-	set_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0,lr
-	set_gr_addr	ok1,gr8
-	set_gr_immed	0,gr9
-	cjmpl		@(gr8,gr9),cc0,1
-	fail
-ok1:
-	test_spr_immed	0,lr
-
-	set_spr_immed	0,lr
-	set_gr_addr	bad,gr8
-	set_gr_immed	0,gr9
-	cjmpl		@(gr8,gr9),cc0,0
-	test_spr_immed	0,lr
-
-	set_spr_immed	0,lr
-	set_gr_addr	ok4,gr8
-	set_gr_immed	3,gr9			; target gets aligned down
-	cjmpl		@(gr8,gr9),cc1,0
-	fail
-ok4:
-	test_spr_immed	0,lr
-
-	set_spr_immed	0,lr
-	set_gr_addr	bad,gr8
-	set_gr_immed	0,gr9
-	cjmpl		@(gr8,gr9),cc1,1
-	test_spr_immed	0,lr
-
-	set_spr_immed	0,lr
-	set_gr_addr	bad,gr8
-	set_gr_immed	0,gr9
-	cjmpl		@(gr8,gr9),cc2,0
-	test_spr_immed	0,lr
-
-	set_spr_immed	0,lr
-	set_gr_addr	bad,gr8
-	set_gr_immed	0,gr9
-	cjmpl		@(gr8,gr9),cc3,1
-	test_spr_immed	0,lr
-
-	pass
-bad:
-	fail
-
diff --git a/sim/testsuite/sim/frv/ckc.cgs b/sim/testsuite/sim/frv/ckc.cgs
deleted file mode 100644
index a849dd48376..00000000000
--- a/sim/testsuite/sim/frv/ckc.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckc $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckc
-ckc:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckeq.cgs b/sim/testsuite/sim/frv/ckeq.cgs
deleted file mode 100644
index 241dc9d0c3c..00000000000
--- a/sim/testsuite/sim/frv/ckeq.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckeq $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckeq
-ckeq:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckeq		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckeq		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckeq		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckeq		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckeq		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckeq		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckeq		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckeq		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckeq		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckeq		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckeq		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckeq		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckeq		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckeq		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckeq		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckeq		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckge.cgs b/sim/testsuite/sim/frv/ckge.cgs
deleted file mode 100644
index 58eefd33845..00000000000
--- a/sim/testsuite/sim/frv/ckge.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckge $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckge
-ckge:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckge		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckge		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckge		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckge		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckge		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckge		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckge		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckge		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckge		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckge		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckge		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckge		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckge		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckge		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckge		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckge		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckgt.cgs b/sim/testsuite/sim/frv/ckgt.cgs
deleted file mode 100644
index 7d4b6a88e19..00000000000
--- a/sim/testsuite/sim/frv/ckgt.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckgt $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckgt
-ckgt:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckgt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckgt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckgt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckgt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckgt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckhi.cgs b/sim/testsuite/sim/frv/ckhi.cgs
deleted file mode 100644
index 5c55937f6ab..00000000000
--- a/sim/testsuite/sim/frv/ckhi.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckhi $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckhi
-ckhi:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckhi		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckhi		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckhi		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckhi		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckhi		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckle.cgs b/sim/testsuite/sim/frv/ckle.cgs
deleted file mode 100644
index 8a6f445beaa..00000000000
--- a/sim/testsuite/sim/frv/ckle.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckle $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckle
-ckle:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckle		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckle		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckle		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckle		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckle		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckls.cgs b/sim/testsuite/sim/frv/ckls.cgs
deleted file mode 100644
index ca5822f283f..00000000000
--- a/sim/testsuite/sim/frv/ckls.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckls $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckls
-ckls:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckls		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckls		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckls		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckls		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckls		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cklt.cgs b/sim/testsuite/sim/frv/cklt.cgs
deleted file mode 100644
index f5848af490d..00000000000
--- a/sim/testsuite/sim/frv/cklt.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for cklt $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cklt
-cklt:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	cklt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	cklt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	cklt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	cklt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	cklt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	cklt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	cklt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	cklt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	cklt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	cklt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	cklt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	cklt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	cklt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	cklt		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	cklt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	cklt		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckn.cgs b/sim/testsuite/sim/frv/ckn.cgs
deleted file mode 100644
index 073a2f1137d..00000000000
--- a/sim/testsuite/sim/frv/ckn.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckn $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckn
-ckn:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckn		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckn		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckn		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckn		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckn		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckn		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckn		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckn		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckn		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckn		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckn		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckn		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckn		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckn		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckn		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckn		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cknc.cgs b/sim/testsuite/sim/frv/cknc.cgs
deleted file mode 100644
index a1359a983ad..00000000000
--- a/sim/testsuite/sim/frv/cknc.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for cknc $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cknc
-cknc:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	cknc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	cknc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	cknc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	cknc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	cknc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	cknc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	cknc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	cknc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	cknc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	cknc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	cknc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	cknc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	cknc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	cknc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	cknc		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	cknc		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckne.cgs b/sim/testsuite/sim/frv/ckne.cgs
deleted file mode 100644
index b9c293519b7..00000000000
--- a/sim/testsuite/sim/frv/ckne.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckne $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckne
-ckne:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckne		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckne		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckne		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckne		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckne		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckne		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckne		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckne		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckne		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckne		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckne		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckne		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckne		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckne		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckne		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckne		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckno.cgs b/sim/testsuite/sim/frv/ckno.cgs
deleted file mode 100644
index e387b46beac..00000000000
--- a/sim/testsuite/sim/frv/ckno.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckno $CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckno
-ckno:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckno		cc7
-	test_spr_immed	0x9b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cknv.cgs b/sim/testsuite/sim/frv/cknv.cgs
deleted file mode 100644
index 039eb7d8dbf..00000000000
--- a/sim/testsuite/sim/frv/cknv.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for cknv $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cknv
-cknv:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	cknv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	cknv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	cknv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	cknv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	cknv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	cknv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	cknv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	cknv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	cknv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	cknv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	cknv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	cknv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	cknv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	cknv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	cknv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	cknv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckp.cgs b/sim/testsuite/sim/frv/ckp.cgs
deleted file mode 100644
index 49129ec9bb9..00000000000
--- a/sim/testsuite/sim/frv/ckp.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckp $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckp
-ckp:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckp		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckp		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckp		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckp		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckp		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckp		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckp		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckp		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckp		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckp		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckp		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckp		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckp		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckp		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckp		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckp		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckra.cgs b/sim/testsuite/sim/frv/ckra.cgs
deleted file mode 100644
index b542b10b9ed..00000000000
--- a/sim/testsuite/sim/frv/ckra.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckra $CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckra
-ckra:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckra		cc7
-	test_spr_immed	0xdb1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ckv.cgs b/sim/testsuite/sim/frv/ckv.cgs
deleted file mode 100644
index 338c2861ed8..00000000000
--- a/sim/testsuite/sim/frv/ckv.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for ckv $ICCi,$CCj_int
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ckv
-ckv:
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x0 0
-	ckv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x1 0
-	ckv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x2 0
-	ckv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x3 0
-	ckv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x4 0
-	ckv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x5 0
-	ckv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x6 0
-	ckv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x7 0
-	ckv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x8 0
-	ckv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0x9 0
-	ckv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xa 0
-	ckv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xb 0
-	ckv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xc 0
-	ckv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xd 0
-	ckv		icc0,cc7
-	test_spr_immed	0x9b1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xe 0
-	ckv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_icc		0xf 0
-	ckv		icc0,cc7
-	test_spr_immed	0xdb1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/cld.cgs b/sim/testsuite/sim/frv/cld.cgs
deleted file mode 100644
index 62e1324a22b..00000000000
--- a/sim/testsuite/sim/frv/cld.cgs
+++ /dev/null
@@ -1,126 +0,0 @@
-# frv testcase for cld @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cld
-cld:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cld 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cld 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cld 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cld 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cld 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cld 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cld 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cld 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cld 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cld 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cld 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cld 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cld 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cld 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cld 		@(sp,gr7),gr8,cc6,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cld 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cld 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cld 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldbf.cgs b/sim/testsuite/sim/frv/cldbf.cgs
deleted file mode 100644
index 46d65ea6939..00000000000
--- a/sim/testsuite/sim/frv/cldbf.cgs
+++ /dev/null
@@ -1,114 +0,0 @@
-# frv testcase for cldbf @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldbf
-cldbf:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbf 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0x0000,0x00de,fr8
-
-	set_gr_immed	1,gr7
-	cldbf 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0x0000,0x00ad,fr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbf 		@(sp,gr7),fr8,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbf 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	1,gr7
-	cldbf 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbf 		@(sp,gr7),fr8,cc4,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbf 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0x0000,0x00de,fr8
-
-	set_gr_immed	1,gr7
-	cldbf 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0x0000,0x00ad,fr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbf 		@(sp,gr7),fr8,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbf 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	1,gr7
-	cldbf 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbf 		@(sp,gr7),fr8,cc5,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbf 		@(sp,gr7),fr8,cc2,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	1,gr7
-	cldbf 		@(sp,gr7),fr8,cc2,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbf 		@(sp,gr7),fr8,cc6,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbf 		@(sp,gr7),fr8,cc3,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	1,gr7
-	cldbf 		@(sp,gr7),fr8,cc3,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbf 		@(sp,gr7),fr8,cc7,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldbfu.cgs b/sim/testsuite/sim/frv/cldbfu.cgs
deleted file mode 100644
index bde4ff16db6..00000000000
--- a/sim/testsuite/sim/frv/cldbfu.cgs
+++ /dev/null
@@ -1,154 +0,0 @@
-# frv testcase for cldbfu @($GRi,$GRj),$FRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldbfu
-cldbfu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbfu 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0x0000,0x00de,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0x0000,0x00ad,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbfu 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc4,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbfu 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0x0000,0x00de,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0x0000,0x00ad,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbfu 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc5,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbfu 		@(sp,gr7),fr8,cc2,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc2,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc6,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldbfu 		@(sp,gr7),fr8,cc3,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc3,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldbfu 		@(sp,gr7),fr8,cc7,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldd.cgs b/sim/testsuite/sim/frv/cldd.cgs
deleted file mode 100644
index 709eba19ae7..00000000000
--- a/sim/testsuite/sim/frv/cldd.cgs
+++ /dev/null
@@ -1,168 +0,0 @@
-# frv testcase for cldd @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldd
-cldd:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	cldd 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	cldd 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	cldd 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	cldd 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	cldd 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	cldd 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	cldd 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	cldd 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	cldd 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	cldd 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	cldd 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	cldd 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	cldd 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	cldd 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	cldd 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	cldd 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	cldd 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	cldd 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/clddf.cgs b/sim/testsuite/sim/frv/clddf.cgs
deleted file mode 100644
index c5416ed4c37..00000000000
--- a/sim/testsuite/sim/frv/clddf.cgs
+++ /dev/null
@@ -1,174 +0,0 @@
-# frv testcase for clddf @($GRi,$GRj),$FRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global clddf
-clddf:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddf 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddf 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddf 		@(sp,gr7),fr8,cc4,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddf 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddf 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddf 		@(sp,gr7),fr8,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddf 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddf 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddf 		@(sp,gr7),fr8,cc5,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddf 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddf 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddf 		@(sp,gr7),fr8,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddf 		@(sp,gr7),fr8,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddf 		@(sp,gr7),fr8,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddf 		@(sp,gr7),fr8,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddf 		@(sp,gr7),fr8,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddf 		@(sp,gr7),fr8,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddf 		@(sp,gr7),fr8,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/clddfu.cgs b/sim/testsuite/sim/frv/clddfu.cgs
deleted file mode 100644
index ab981aa1389..00000000000
--- a/sim/testsuite/sim/frv/clddfu.cgs
+++ /dev/null
@@ -1,212 +0,0 @@
-# frv testcase for clddfu @($GRi,$GRj),$FRk,$CCi,$ccond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global clddfu
-clddfu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddfu 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddfu 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	clddfu 		@(sp,gr7),fr8,cc4,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddfu 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,gr20
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddfu 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,gr20
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddfu 		@(sp,gr7),fr8,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddfu 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddfu 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	clddfu 		@(sp,gr7),fr8,cc5,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddfu 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,gr20
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddfu 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,gr20
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddfu 		@(sp,gr7),fr8,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddfu 		@(sp,gr7),fr8,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,gr20
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddfu 		@(sp,gr7),fr8,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,gr20
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddfu 		@(sp,gr7),fr8,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	clddfu 		@(sp,gr7),fr8,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,gr20
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddfu 		@(sp,gr7),fr8,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,gr20
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddfu 		@(sp,gr7),fr8,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/clddu.cgs b/sim/testsuite/sim/frv/clddu.cgs
deleted file mode 100644
index 91df6d8f43e..00000000000
--- a/sim/testsuite/sim/frv/clddu.cgs
+++ /dev/null
@@ -1,219 +0,0 @@
-# frv testcase for clddu @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global clddu
-clddu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	clddu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	clddu 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	clddu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,gr20
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,gr20
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddu 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	clddu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	clddu 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	clddu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,gr20
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,gr20
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddu 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	clddu 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,gr20
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddu 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,gr20
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddu 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	clddu 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,gr20
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	clddu 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,gr20
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	clddu 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,gr8
-	inc_gr_immed	-12,gr8
-	set_gr_immed	8,gr7
-	clddu 		@(gr8,gr7),gr8,cc0,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldf.cgs b/sim/testsuite/sim/frv/cldf.cgs
deleted file mode 100644
index 011a02a3e85..00000000000
--- a/sim/testsuite/sim/frv/cldf.cgs
+++ /dev/null
@@ -1,126 +0,0 @@
-# frv testcase for cldf @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldf
-cldf:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldf 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldf 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldf 		@(sp,gr7),fr8,cc4,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldf 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldf 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldf 		@(sp,gr7),fr8,cc4,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldf 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldf 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldf 		@(sp,gr7),fr8,cc5,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldf 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldf 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldf 		@(sp,gr7),fr8,cc5,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldf 		@(sp,gr7),fr8,cc2,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldf 		@(sp,gr7),fr8,cc2,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldf 		@(sp,gr7),fr8,cc6,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldf 		@(sp,gr7),fr8,cc3,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldf 		@(sp,gr7),fr8,cc3,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldf 		@(sp,gr7),fr8,cc7,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldfu.cgs b/sim/testsuite/sim/frv/cldfu.cgs
deleted file mode 100644
index d4abef00c96..00000000000
--- a/sim/testsuite/sim/frv/cldfu.cgs
+++ /dev/null
@@ -1,164 +0,0 @@
-# frv testcase for cldfu @($GRi,$GRj),$FRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldfu
-cldfu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldfu 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldfu 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	cldfu 		@(sp,gr7),fr8,cc4,1
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldfu 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,gr20
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldfu 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,gr20
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldfu 		@(sp,gr7),fr8,cc4,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldfu 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldfu 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	cldfu 		@(sp,gr7),fr8,cc5,0
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldfu 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,gr20
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldfu 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,gr20
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldfu 		@(sp,gr7),fr8,cc5,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldfu 		@(sp,gr7),fr8,cc2,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,gr20
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldfu 		@(sp,gr7),fr8,cc2,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,gr20
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldfu 		@(sp,gr7),fr8,cc6,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldfu 		@(sp,gr7),fr8,cc3,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,gr20
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldfu 		@(sp,gr7),fr8,cc3,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,gr20
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldfu 		@(sp,gr7),fr8,cc7,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldhf.cgs b/sim/testsuite/sim/frv/cldhf.cgs
deleted file mode 100644
index 26972ed000d..00000000000
--- a/sim/testsuite/sim/frv/cldhf.cgs
+++ /dev/null
@@ -1,114 +0,0 @@
-# frv testcase for cldhf @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldhf
-cldhf:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhf 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0x0000,0xdead,fr8
-
-	set_gr_immed	2,gr7
-	cldhf 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0x0000,0xbeef,fr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhf 		@(sp,gr7),fr8,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhf 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	2,gr7
-	cldhf 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhf 		@(sp,gr7),fr8,cc4,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhf 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0x0000,0xdead,fr8
-
-	set_gr_immed	2,gr7
-	cldhf 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0x0000,0xbeef,fr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhf 		@(sp,gr7),fr8,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhf 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	2,gr7
-	cldhf 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhf 		@(sp,gr7),fr8,cc5,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhf 		@(sp,gr7),fr8,cc2,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	2,gr7
-	cldhf 		@(sp,gr7),fr8,cc2,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhf 		@(sp,gr7),fr8,cc6,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhf 		@(sp,gr7),fr8,cc3,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	2,gr7
-	cldhf 		@(sp,gr7),fr8,cc3,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhf 		@(sp,gr7),fr8,cc7,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldhfu.cgs b/sim/testsuite/sim/frv/cldhfu.cgs
deleted file mode 100644
index 062e3984a92..00000000000
--- a/sim/testsuite/sim/frv/cldhfu.cgs
+++ /dev/null
@@ -1,152 +0,0 @@
-# frv testcase for cldhfu @($GRi,$GRj),$FRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldhfu
-cldhfu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhfu 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0x0000,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc0,1
-	test_fr_limmed	0x0000,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhfu 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc0,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,gr20
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc4,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhfu 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0x0000,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc1,0
-	test_fr_limmed	0x0000,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhfu 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc1,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,gr20
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc5,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhfu 		@(sp,gr7),fr8,cc2,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc2,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,gr20
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc6,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	cldhfu 		@(sp,gr7),fr8,cc3,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc3,0
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,gr20
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldhfu 		@(sp,gr7),fr8,cc7,1
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldq.cgs b/sim/testsuite/sim/frv/cldq.cgs
deleted file mode 100644
index bfb433b5e31..00000000000
--- a/sim/testsuite/sim/frv/cldq.cgs
+++ /dev/null
@@ -1,276 +0,0 @@
-# frv testcase for cldq @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldq
-cldq:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldq 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldq 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldq 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldq 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldq 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldq 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldq 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldq 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldq 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldq 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldq 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldq 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldq 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldq 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldq 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldq 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldq 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldq 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldqu.cgs b/sim/testsuite/sim/frv/cldqu.cgs
deleted file mode 100644
index fa0949a876e..00000000000
--- a/sim/testsuite/sim/frv/cldqu.cgs
+++ /dev/null
@@ -1,318 +0,0 @@
-# frv testcase for cldqu @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldqu
-cldqu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldqu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldqu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	cldqu 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldqu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,gr20
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldqu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,gr20
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldqu 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldqu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldqu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	cldqu 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldqu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,gr20
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldqu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,gr20
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldqu 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldqu 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,gr20
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldqu 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,gr20
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldqu 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	cldqu 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,gr20
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	cldqu 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,gr20
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	cldqu 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,gr8
-	inc_gr_immed	-28,gr8
-	set_gr_immed	16,gr7
-	cldqu 		@(gr8,gr7),gr8,cc0,1
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldsb.cgs b/sim/testsuite/sim/frv/cldsb.cgs
deleted file mode 100644
index ea8dd943ba3..00000000000
--- a/sim/testsuite/sim/frv/cldsb.cgs
+++ /dev/null
@@ -1,114 +0,0 @@
-# frv testcase for cldsb @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldsb
-cldsb:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsb 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xffde,gr8
-
-	set_gr_immed	1,gr7
-	cldsb 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xffad,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldsb 		@(sp,gr7),gr8,cc4,1
-	test_gr_immed	0,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsb 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	1,gr7
-	cldsb 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldsb 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsb 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xffff,0xffde,gr8
-
-	set_gr_immed	1,gr7
-	cldsb 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xffff,0xffad,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldsb 		@(sp,gr7),gr8,cc5,0
-	test_gr_immed	0,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsb 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	1,gr7
-	cldsb 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldsb 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsb 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	1,gr7
-	cldsb 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldsb 		@(sp,gr7),gr8,cc6,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsb 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	1,gr7
-	cldsb 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldsb 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldsbu.cgs b/sim/testsuite/sim/frv/cldsbu.cgs
deleted file mode 100644
index a4057f15696..00000000000
--- a/sim/testsuite/sim/frv/cldsbu.cgs
+++ /dev/null
@@ -1,162 +0,0 @@
-# frv testcase for cldsbu @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldsbu
-cldsbu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldsbu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xffde,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	1,gr9
-	set_gr_immed	1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xffad,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc4,1
-	test_gr_immed	0,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldsbu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	inc_gr_immed	4,gr9
-	set_gr_immed	-1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldsbu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xffff,0xffde,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	1,gr9
-	set_gr_immed	1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xffff,0xffad,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc5,0
-	test_gr_immed	0,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldsbu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	inc_gr_immed	4,gr9
-	set_gr_immed	-1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldsbu 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	inc_gr_immed	4,gr9
-	set_gr_immed	-1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldsbu 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	inc_gr_immed	4,gr9
-	set_gr_immed	-1,gr7
-	cldsbu 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr8
-	set_gr_immed	1,gr7
-	cldsbu 		@(gr8,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xffad,gr8
-
-	pass
-
diff --git a/sim/testsuite/sim/frv/cldsh.cgs b/sim/testsuite/sim/frv/cldsh.cgs
deleted file mode 100644
index 091d72036af..00000000000
--- a/sim/testsuite/sim/frv/cldsh.cgs
+++ /dev/null
@@ -1,114 +0,0 @@
-# frv testcase for cldsh @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldsh
-cldsh:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsh 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	cldsh 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xbeef,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldsh 		@(sp,gr7),gr8,cc4,1
-	test_gr_immed	0,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsh 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	cldsh 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldsh 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsh 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xffff,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	cldsh 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xffff,0xbeef,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldsh 		@(sp,gr7),gr8,cc5,0
-	test_gr_immed	0,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsh 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	cldsh 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldsh 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsh 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	cldsh 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldsh 		@(sp,gr7),gr8,cc6,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldsh 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	cldsh 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldsh 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldshu.cgs b/sim/testsuite/sim/frv/cldshu.cgs
deleted file mode 100644
index 491352eb58b..00000000000
--- a/sim/testsuite/sim/frv/cldshu.cgs
+++ /dev/null
@@ -1,159 +0,0 @@
-# frv testcase for cldshu @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldshu
-cldshu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldshu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	set_gr_immed	2,gr7
-	cldshu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldshu 		@(sp,gr7),gr8,cc4,1
-	test_gr_immed	0,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldshu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	2,gr7
-	cldshu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldshu 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldshu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xffff,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	set_gr_immed	2,gr7
-	cldshu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xffff,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldshu 		@(sp,gr7),gr8,cc5,0
-	test_gr_immed	0,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldshu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	2,gr7
-	cldshu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldshu 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldshu 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	2,gr7
-	cldshu 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldshu 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldshu 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	2,gr7
-	cldshu 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	cldshu 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr8
-	set_gr_immed	2,gr7
-	cldshu 		@(gr8,gr7),gr8,cc0,1
-	test_gr_limmed	0xffff,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldu.cgs b/sim/testsuite/sim/frv/cldu.cgs
deleted file mode 100644
index 61cf606132a..00000000000
--- a/sim/testsuite/sim/frv/cldu.cgs
+++ /dev/null
@@ -1,172 +0,0 @@
-# frv testcase for cldu @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldu
-cldu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	cldu 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,gr9
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldu 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	cldu 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,gr9
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldu 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldu 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,gr9
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldu 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldu 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldu 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,gr9
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	cldu 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	cldu 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr8
-	inc_gr_immed	-4,gr8
-	set_gr_immed	4,gr7
-	cldu 		@(gr8,gr7),gr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldub.cgs b/sim/testsuite/sim/frv/cldub.cgs
deleted file mode 100644
index b1f07766ddd..00000000000
--- a/sim/testsuite/sim/frv/cldub.cgs
+++ /dev/null
@@ -1,114 +0,0 @@
-# frv testcase for cldub @($GRi,$GRj),$GRk,$cci,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldub
-cldub:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldub 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0x00de,gr8
-
-	set_gr_immed	1,gr7
-	cldub 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0x00ad,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldub 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldub 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	1,gr7
-	cldub 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldub 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldub 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x0000,0x00de,gr8
-
-	set_gr_immed	1,gr7
-	cldub 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x0000,0x00ad,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldub 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldub 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	1,gr7
-	cldub 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldub 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldub 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	1,gr7
-	cldub 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldub 		@(sp,gr7),gr8,cc6,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	cldub 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	1,gr7
-	cldub 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldub 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cldubu.cgs b/sim/testsuite/sim/frv/cldubu.cgs
deleted file mode 100644
index c9f9579da9d..00000000000
--- a/sim/testsuite/sim/frv/cldubu.cgs
+++ /dev/null
@@ -1,155 +0,0 @@
-# frv testcase for cldubu @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cldubu
-cldubu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldubu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0x00de,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	1,gr9
-	set_gr_immed	1,gr7
-	cldubu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0x00ad,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldubu 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldubu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	1,gr7
-	cldubu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldubu 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldubu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x0000,0x00de,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	1,gr9
-	set_gr_immed	1,gr7
-	cldubu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x0000,0x00ad,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldubu 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldubu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	1,gr7
-	cldubu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldubu 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldubu 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	1,gr7
-	cldubu 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldubu 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	cldubu 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	1,gr7
-	cldubu 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	cldubu 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr8
-	set_gr_immed	1,gr7
-	cldubu 		@(gr8,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0x00ad,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/clduh.cgs b/sim/testsuite/sim/frv/clduh.cgs
deleted file mode 100644
index a9e505c0727..00000000000
--- a/sim/testsuite/sim/frv/clduh.cgs
+++ /dev/null
@@ -1,114 +0,0 @@
-# frv testcase for clduh @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global clduh
-clduh:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	clduh 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	clduh 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0xbeef,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduh 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	clduh 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	clduh 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduh 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	clduh 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x0000,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	clduh 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x0000,0xbeef,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduh 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	clduh 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	clduh 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduh 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	clduh 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	clduh 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduh 		@(sp,gr7),gr8,cc6,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	clduh 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	clduh 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduh 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/clduhu.cgs b/sim/testsuite/sim/frv/clduhu.cgs
deleted file mode 100644
index 80eb381c384..00000000000
--- a/sim/testsuite/sim/frv/clduhu.cgs
+++ /dev/null
@@ -1,159 +0,0 @@
-# frv testcase for clduhu @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global clduhu
-clduhu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	clduhu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	set_gr_immed	2,gr7
-	clduhu 		@(sp,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduhu 		@(sp,gr7),gr8,cc4,1
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	clduhu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	2,gr7
-	clduhu 		@(sp,gr7),gr8,cc0,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduhu 		@(sp,gr7),gr8,cc4,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	clduhu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x0000,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	set_gr_immed	2,gr7
-	clduhu 		@(sp,gr7),gr8,cc1,0
-	test_gr_limmed	0x0000,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduhu 		@(sp,gr7),gr8,cc5,0
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	clduhu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	2,gr7
-	clduhu 		@(sp,gr7),gr8,cc1,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduhu 		@(sp,gr7),gr8,cc5,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	clduhu 		@(sp,gr7),gr8,cc2,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	2,gr7
-	clduhu 		@(sp,gr7),gr8,cc2,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduhu 		@(sp,gr7),gr8,cc6,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	clduhu 		@(sp,gr7),gr8,cc3,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_immed	2,gr7
-	clduhu 		@(sp,gr7),gr8,cc3,0
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	4,gr9
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	clduhu 		@(sp,gr7),gr8,cc7,1
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr8
-	set_gr_immed	2,gr7
-	clduhu 		@(gr8,gr7),gr8,cc0,1
-	test_gr_limmed	0x0000,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/clrfa.cgs b/sim/testsuite/sim/frv/clrfa.cgs
deleted file mode 100644
index 8bba605e8df..00000000000
--- a/sim/testsuite/sim/frv/clrfa.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for clrfa
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global clrfa
-clrfa:
-	nldfi		@(sp,0),fr20	; Activate fr20 with nesr.fr==1
-	or_spr_immed	0x00100000,fner1
-	nldi		@(sp,0),gr20	; Activate gr20 with nesr.fr==0
-	or_spr_immed	0x00200000,fner1
-	nldfi		@(sp,0),fr52	; Activate fr52 with nesr.fr==1
-	or_spr_immed	0x00100000,fner0
-
-	clrfa
-	test_spr_immed	0x00000000,fner1
-	test_spr_immed	0x00000000,fner0
-	test_spr_immed	0,nesr0
-	test_spr_immed	0,neear0
-	test_spr_immed	0x94800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0,nesr2
-	test_spr_immed	0,neear2
-
-	pass
diff --git a/sim/testsuite/sim/frv/clrfr.cgs b/sim/testsuite/sim/frv/clrfr.cgs
deleted file mode 100644
index 9112815236b..00000000000
--- a/sim/testsuite/sim/frv/clrfr.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for clrfr $FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global clrfr
-clrfr:
-	nldfi		@(sp,0),fr20	; Activate fr20 with nesr.fr==1
-	or_spr_immed	0x00100000,fner1
-	nldi		@(sp,0),gr20	; Activate gr20 with nesr.fr==0
-	or_spr_immed	0x00200000,fner1
-	nldfi		@(sp,0),fr52	; Activate fr52 with nesr.fr==1
-	or_spr_immed	0x00100000,fner0
-
-	clrfr		fr20
-	test_spr_immed	0x00200000,fner1
-	test_spr_immed	0x00100000,fner0
-	test_spr_immed	0,nesr0
-	test_spr_immed	0,neear0
-	test_spr_immed	0x94800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0xf4800801,nesr2
-	test_spr_gr	neear2,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/clrga.cgs b/sim/testsuite/sim/frv/clrga.cgs
deleted file mode 100644
index 9e9a9a9f1c8..00000000000
--- a/sim/testsuite/sim/frv/clrga.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for clrga
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global clrga
-clrga:
-	nldi		@(sp,0),gr20	; Activate gr20 with nesr.fr==0
-	or_spr_immed	0x00100000,gner1
-	nldfi		@(sp,0),fr20	; Activate fr20 with nesr.fr==1
-	or_spr_immed	0x00200000,gner1
-	nldi		@(sp,0),gr52	; Activate gr52 with nesr.fr==0
-	or_spr_immed	0x00100000,gner0
-
-	clrga
-	test_spr_immed	0x00000000,gner1
-	test_spr_immed	0x00000000,gner0
-	test_spr_immed	0,nesr0
-	test_spr_immed	0,neear0
-	test_spr_immed	0xd4800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0,nesr2
-	test_spr_immed	0,neear2
-
-	pass
diff --git a/sim/testsuite/sim/frv/clrgr.cgs b/sim/testsuite/sim/frv/clrgr.cgs
deleted file mode 100644
index 049b9e371e7..00000000000
--- a/sim/testsuite/sim/frv/clrgr.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for clrgr $GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global clrgr
-clrgr:
-	nldi		@(sp,0),gr20	; Activate gr20 with nesr.fr==0
-	or_spr_immed	0x00100000,gner1
-	nldfi		@(sp,0),fr20	; Activate fr20 with nesr.fr==1
-	or_spr_immed	0x00200000,gner1
-	nldi		@(sp,0),gr52	; Activate gr52 with nesr.fr==0
-	or_spr_immed	0x00100000,gner0
-
-	clrgr		gr20
-	test_spr_immed	0x00200000,gner1
-	test_spr_immed	0x00100000,gner0
-	test_spr_immed	0,nesr0
-	test_spr_immed	0,neear0
-	test_spr_immed	0xd4800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0xb4800801,nesr2
-	test_spr_gr	neear2,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmaddhss.cgs b/sim/testsuite/sim/frv/cmaddhss.cgs
deleted file mode 100644
index 1f04e678eca..00000000000
--- a/sim/testsuite/sim/frv/cmaddhss.cgs
+++ /dev/null
@@ -1,562 +0,0 @@
-# frv testcase for cmaddhss $FRi,$FRj,$FRj,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global maddhss
-maddhss:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x1233,0x5677,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,1
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc4,1
-	cmaddhss	fr11,fr11,fr13,cc4,1
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie not set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x1233,0x5677,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc5,0
-	cmaddhss	fr11,fr11,fr13,cc5,0
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie not set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc4,0
-	cmaddhss	fr11,fr11,fr13,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc5,1
-	cmaddhss	fr11,fr11,fr13,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc6,1
-	cmaddhss	fr11,fr11,fr13,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-;
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc7,1
-	cmaddhss	fr11,fr11,fr13,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmaddhus.cgs b/sim/testsuite/sim/frv/cmaddhus.cgs
deleted file mode 100644
index 76da81d5548..00000000000
--- a/sim/testsuite/sim/frv/cmaddhus.cgs
+++ /dev/null
@@ -1,496 +0,0 @@
-# frv testcase for cmaddhus $FRi,$FRj,$FRj,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmaddhus
-cmaddhus:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x8000,0x7fff,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc4,1
-	cmaddhus	fr11,fr11,fr13,cc4,1
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0xffff,0xffff,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x8000,0x7fff,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc5,0
-	cmaddhus	fr11,fr11,fr13,cc5,0
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0xffff,0xffff,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0x0000,fr10
-	set_fr_iimmed	0x0000,0xdead,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc4,0
-	cmaddhus	fr11,fr11,fr13,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0x0000,fr10
-	set_fr_iimmed	0x0000,0xdead,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc5,1
-	cmaddhus	fr11,fr11,fr13,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0x0000,fr10
-	set_fr_iimmed	0x0000,0xdead,fr11
-	cmaddhus	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc6,0
-	cmaddhus	fr11,fr11,fr13,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0x0000,fr10
-	set_fr_iimmed	0x0000,0xdead,fr11
-	cmaddhus	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc7,0
-	cmaddhus	fr11,fr11,fr13,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmand.cgs b/sim/testsuite/sim/frv/cmand.cgs
deleted file mode 100644
index 7ed9e4da33e..00000000000
--- a/sim/testsuite/sim/frv/cmand.cgs
+++ /dev/null
@@ -1,89 +0,0 @@
-# frv testcase for cmand $FRinti,$FRintj,$FRintk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmand
-cmand:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed  	0x5555,0x5555,fr8
-	cmand      	fr7,fr8,fr8,cc0,1
-	test_fr_iimmed 	0,fr8
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	cmand		fr7,fr8,fr8,cc0,1
-	test_fr_iimmed 	0xaaaa0000,fr8
-
-	set_fr_iimmed	0x0000,0xffff,fr8
-	cmand		fr7,fr8,fr8,cc4,1
-	test_fr_iimmed	0x0000aaaa,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed  	0x5555,0x5555,fr8
-	cmand      	fr7,fr8,fr8,cc1,0
-	test_fr_iimmed 	0,fr8
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	cmand		fr7,fr8,fr8,cc1,0
-	test_fr_iimmed 	0xaaaa0000,fr8
-
-	set_fr_iimmed	0x0000,0xffff,fr8
-	cmand		fr7,fr8,fr8,cc5,0
-	test_fr_iimmed	0x0000aaaa,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed  	0x5555,0x5555,fr8
-	cmand      	fr7,fr8,fr8,cc0,0
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	cmand		fr7,fr8,fr8,cc0,0
-	test_fr_iimmed 	0xffff0000,fr8
-
-	set_fr_iimmed	0x0000,0xffff,fr8
-	cmand		fr7,fr8,fr8,cc4,0
-	test_fr_iimmed	0x0000ffff,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed  	0x5555,0x5555,fr8
-	cmand      	fr7,fr8,fr8,cc1,1
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	cmand		fr7,fr8,fr8,cc1,1
-	test_fr_iimmed 	0xffff0000,fr8
-
-	set_fr_iimmed	0x0000,0xffff,fr8
-	cmand		fr7,fr8,fr8,cc5,1
-	test_fr_iimmed	0x0000ffff,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed  	0x5555,0x5555,fr8
-	cmand      	fr7,fr8,fr8,cc2,0
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	cmand		fr7,fr8,fr8,cc2,1
-	test_fr_iimmed 	0xffff0000,fr8
-
-	set_fr_iimmed	0x0000,0xffff,fr8
-	cmand		fr7,fr8,fr8,cc6,0
-	test_fr_iimmed	0x0000ffff,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed  	0x5555,0x5555,fr8
-	cmand      	fr7,fr8,fr8,cc3,1
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	cmand		fr7,fr8,fr8,cc3,0
-	test_fr_iimmed 	0xffff0000,fr8
-
-	set_fr_iimmed	0x0000,0xffff,fr8
-	cmand		fr7,fr8,fr8,cc7,1
-	test_fr_iimmed	0x0000ffff,fr8
-	pass
diff --git a/sim/testsuite/sim/frv/cmbtoh.cgs b/sim/testsuite/sim/frv/cmbtoh.cgs
deleted file mode 100644
index 5e7c91ae669..00000000000
--- a/sim/testsuite/sim/frv/cmbtoh.cgs
+++ /dev/null
@@ -1,74 +0,0 @@
-# frv testcase for cmbtoh $FRj,$FRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmbtoh
-cmbtoh:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtoh		fr10,fr12,cc0,1
-	test_fr_limmed	0x00de,0x00ad,fr12
-	test_fr_limmed	0x00be,0x00ef,fr13
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtoh		fr10,fr12,cc4,1
-	test_fr_limmed	0x0012,0x0034,fr12
-	test_fr_limmed	0x0056,0x0078,fr13
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtoh		fr10,fr12,cc1,0
-	test_fr_limmed	0x00de,0x00ad,fr12
-	test_fr_limmed	0x00be,0x00ef,fr13
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtoh		fr10,fr12,cc5,0
-	test_fr_limmed	0x0012,0x0034,fr12
-	test_fr_limmed	0x0056,0x0078,fr13
-
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x2222,0x2222,fr13
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtoh		fr10,fr12,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtoh		fr10,fr12,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtoh		fr10,fr12,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtoh		fr10,fr12,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtoh		fr10,fr12,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtoh		fr10,fr12,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtoh		fr10,fr12,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtoh		fr10,fr12,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmbtohe.cgs b/sim/testsuite/sim/frv/cmbtohe.cgs
deleted file mode 100644
index eb6b51492ee..00000000000
--- a/sim/testsuite/sim/frv/cmbtohe.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for cmbtohe $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmbtohe
-cmbtohe:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtohe		fr10,fr12,cc0,1
-	test_fr_limmed	0x00de,0x00de,fr12
-	test_fr_limmed	0x00ad,0x00ad,fr13
-	test_fr_limmed	0x00be,0x00be,fr14
-	test_fr_limmed	0x00ef,0x00ef,fr15
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtohe		fr10,fr12,cc4,1
-	test_fr_limmed	0x0012,0x0012,fr12
-	test_fr_limmed	0x0034,0x0034,fr13
-	test_fr_limmed	0x0056,0x0056,fr14
-	test_fr_limmed	0x0078,0x0078,fr15
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtohe		fr10,fr12,cc1,0
-	test_fr_limmed	0x00de,0x00de,fr12
-	test_fr_limmed	0x00ad,0x00ad,fr13
-	test_fr_limmed	0x00be,0x00be,fr14
-	test_fr_limmed	0x00ef,0x00ef,fr15
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtohe		fr10,fr12,cc5,0
-	test_fr_limmed	0x0012,0x0012,fr12
-	test_fr_limmed	0x0034,0x0034,fr13
-	test_fr_limmed	0x0056,0x0056,fr14
-	test_fr_limmed	0x0078,0x0078,fr15
-
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x2222,0x2222,fr13
-	set_fr_iimmed	0x3333,0x3333,fr14
-	set_fr_iimmed	0x4444,0x4444,fr15
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtohe		fr10,fr12,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-	test_fr_limmed	0x3333,0x3333,fr14
-	test_fr_limmed	0x4444,0x4444,fr15
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtohe		fr10,fr12,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-	test_fr_limmed	0x3333,0x3333,fr14
-	test_fr_limmed	0x4444,0x4444,fr15
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtohe		fr10,fr12,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-	test_fr_limmed	0x3333,0x3333,fr14
-	test_fr_limmed	0x4444,0x4444,fr15
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtohe		fr10,fr12,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-	test_fr_limmed	0x3333,0x3333,fr14
-	test_fr_limmed	0x4444,0x4444,fr15
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtohe		fr10,fr12,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-	test_fr_limmed	0x3333,0x3333,fr14
-	test_fr_limmed	0x4444,0x4444,fr15
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtohe		fr10,fr12,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-	test_fr_limmed	0x3333,0x3333,fr14
-	test_fr_limmed	0x4444,0x4444,fr15
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmbtohe		fr10,fr12,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-	test_fr_limmed	0x3333,0x3333,fr14
-	test_fr_limmed	0x4444,0x4444,fr15
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	cmbtohe		fr10,fr12,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-	test_fr_limmed	0x3333,0x3333,fr14
-	test_fr_limmed	0x4444,0x4444,fr15
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmcpxis.cgs b/sim/testsuite/sim/frv/cmcpxis.cgs
deleted file mode 100644
index ded030078d4..00000000000
--- a/sim/testsuite/sim/frv/cmcpxis.cgs
+++ /dev/null
@@ -1,971 +0,0 @@
-# frv testcase for cmcpxis $GRi,$GRj,$ACCk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmcpxis
-cmcpxis:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 0x00,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	3,acc0
-
-	set_fr_iimmed	0x3ff8,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xc000,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-9,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 0xff,accg0
-	test_acc_immed 	-6,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-
-	set_fr_iimmed  	0x2001,0xffff,fr7	; 15 bit result
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbfff,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x7ffa,acc0
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0x8001,0x0000,acc0
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8000,0x0000,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 0x00,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	3,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-
-	; Positive operands
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 0x00,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	3,acc0
-
-	set_fr_iimmed	0x3ff8,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xc000,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-9,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 0xff,accg0
-	test_acc_immed 	-6,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-
-	set_fr_iimmed  	0x2001,0xffff,fr7	; 15 bit result
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbfff,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x7ffa,acc0
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0x8001,0x0000,acc0
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8000,0x0000,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 0x00,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	3,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfff9,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfff9,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfff9,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfff9,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfff9,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-;
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfff9,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfff9,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxis      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmcpxiu.cgs b/sim/testsuite/sim/frv/cmcpxiu.cgs
deleted file mode 100644
index 90a92bc0ce9..00000000000
--- a/sim/testsuite/sim/frv/cmcpxiu.cgs
+++ /dev/null
@@ -1,508 +0,0 @@
-# frv testcase for cmcpxiu $GRi,$GRj,$GRk,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmcpxiu
-cmcpxiu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	5,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7fff,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8001,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010001,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; almost max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffb0003,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffc0002,acc0
-
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	5,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7fff,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8001,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010001,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; almost max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffb0003,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffc0002,acc0
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0x0001,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0x0001,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0x0001,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0x0001,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmcpxrs.cgs b/sim/testsuite/sim/frv/cmcpxrs.cgs
deleted file mode 100644
index ea1242c1cdb..00000000000
--- a/sim/testsuite/sim/frv/cmcpxrs.cgs
+++ /dev/null
@@ -1,649 +0,0 @@
-# frv testcase for cmcpxrs $GRi,$GRj,$ACCk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmcpxrs
-cmcpxrs:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-14,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0007,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ff0,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x2000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x4000,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-3,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0xfff9,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbff0,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x0003,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8006,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0x8000,0x8000,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x7fff,0x8000,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffb,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-14,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x7fff,0x8001,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-14,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0007,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ff0,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x2000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x4000,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-3,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0xfff9,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbff0,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x0003,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8006,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0x8000,0x8000,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x7fff,0x8000,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffb,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-14,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x7fff,0x8001,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0007,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x2000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0xfff9,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x0003,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffb,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x7fff,0x8001,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0007,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x2000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0xfff9,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x0003,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffb,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x7fff,0x8001,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0007,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x2000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0xfff9,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x0003,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffb,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x7fff,0x8001,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-;
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0007,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x2000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,1,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0xfff9,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x0003,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffb,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x7fff,0x8001,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmcpxrs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmcpxru.cgs b/sim/testsuite/sim/frv/cmcpxru.cgs
deleted file mode 100644
index f9217b68121..00000000000
--- a/sim/testsuite/sim/frv/cmcpxru.cgs
+++ /dev/null
@@ -1,544 +0,0 @@
-# frv testcase for cmcpxru $GRi,$GRj,$GRk,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmcpxru
-cmcpxru:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	14,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffd,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xffff,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x0001ffff,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	14,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffd,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xffff,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x0001ffff,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-;
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	2,1,0,msr1		; msr1.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmexpdhd.cgs b/sim/testsuite/sim/frv/cmexpdhd.cgs
deleted file mode 100644
index 33a3c009375..00000000000
--- a/sim/testsuite/sim/frv/cmexpdhd.cgs
+++ /dev/null
@@ -1,116 +0,0 @@
-# frv testcase for cmexpdhd $FRi,$s6,$FRj,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmexpdhd
-cmexpdhd:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhd	fr10,0,fr12,cc0,1
-	test_fr_limmed	0xdead,0xdead,fr12
-	test_fr_limmed	0xdead,0xdead,fr13
-
-	cmexpdhd	fr10,1,fr12,cc0,1
-	test_fr_limmed	0xbeef,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr13
-
-	cmexpdhd	fr10,62,fr12,cc4,1
-	test_fr_limmed	0xdead,0xdead,fr12
-	test_fr_limmed	0xdead,0xdead,fr13
-
-	cmexpdhd	fr10,63,fr12,cc4,1
-	test_fr_limmed	0xbeef,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr13
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhd	fr10,0,fr12,cc1,0
-	test_fr_limmed	0xdead,0xdead,fr12
-	test_fr_limmed	0xdead,0xdead,fr13
-
-	cmexpdhd	fr10,1,fr12,cc1,0
-	test_fr_limmed	0xbeef,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr13
-
-	cmexpdhd	fr10,62,fr12,cc5,0
-	test_fr_limmed	0xdead,0xdead,fr12
-	test_fr_limmed	0xdead,0xdead,fr13
-
-	cmexpdhd	fr10,63,fr12,cc5,0
-	test_fr_limmed	0xbeef,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr13
-
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x2222,0x2222,fr13
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhd	fr10,0,fr12,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,1,fr12,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,62,fr12,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,63,fr12,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhd	fr10,0,fr12,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,1,fr12,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,62,fr12,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,63,fr12,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhd	fr10,0,fr12,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,1,fr12,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,62,fr12,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,63,fr12,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhd	fr10,0,fr12,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,1,fr12,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,62,fr12,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	cmexpdhd	fr10,63,fr12,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr12
-	test_fr_limmed	0x2222,0x2222,fr13
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmexpdhw.cgs b/sim/testsuite/sim/frv/cmexpdhw.cgs
deleted file mode 100644
index 330d404562b..00000000000
--- a/sim/testsuite/sim/frv/cmexpdhw.cgs
+++ /dev/null
@@ -1,91 +0,0 @@
-# frv testcase for cmexpdhw $FRi,$s6,$FRj,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmexpdhw
-cmexpdhw:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhw	fr10,0,fr12,cc0,1
-	test_fr_limmed	0xdead,0xdead,fr12
-
-	cmexpdhw	fr10,1,fr12,cc0,1
-	test_fr_limmed	0xbeef,0xbeef,fr12
-
-	cmexpdhw	fr10,62,fr12,cc4,1
-	test_fr_limmed	0xdead,0xdead,fr12
-
-	cmexpdhw	fr10,63,fr12,cc4,1
-	test_fr_limmed	0xbeef,0xbeef,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhw	fr10,0,fr12,cc1,0
-	test_fr_limmed	0xdead,0xdead,fr12
-
-	cmexpdhw	fr10,1,fr12,cc1,0
-	test_fr_limmed	0xbeef,0xbeef,fr12
-
-	cmexpdhw	fr10,62,fr12,cc5,0
-	test_fr_limmed	0xdead,0xdead,fr12
-
-	cmexpdhw	fr10,63,fr12,cc5,0
-	test_fr_limmed	0xbeef,0xbeef,fr12
-
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhw	fr10,0,fr12,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,1,fr12,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,62,fr12,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,63,fr12,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhw	fr10,0,fr12,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,1,fr12,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,62,fr12,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,63,fr12,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhw	fr10,0,fr12,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,1,fr12,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,62,fr12,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,63,fr12,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	cmexpdhw	fr10,0,fr12,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,1,fr12,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,62,fr12,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	cmexpdhw	fr10,63,fr12,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmhtob.cgs b/sim/testsuite/sim/frv/cmhtob.cgs
deleted file mode 100644
index a3f00c52cef..00000000000
--- a/sim/testsuite/sim/frv/cmhtob.cgs
+++ /dev/null
@@ -1,103 +0,0 @@
-# frv testcase for cmhtob $FRj,$FRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmhtob
-cmhtob:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x00ad,0x00ef,fr10
-	set_fr_iimmed	0x0034,0x0078,fr11
-	cmhtob		fr10,fr12,cc0,1
-	test_fr_limmed	0xadef,0x3478,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	cmhtob		fr10,fr12,cc0,1
-	test_fr_limmed	0xffff,0xffff,fr12
-
-	set_fr_iimmed	0x0134,0x0878,fr10
-	set_fr_iimmed	0x10ad,0x80ef,fr11
-	cmhtob		fr10,fr12,cc4,1
-	test_fr_limmed	0xffff,0xffff,fr12
-
-	set_fr_iimmed	0x00ad,0x00ef,fr10
-	set_fr_iimmed	0x0034,0x0078,fr11
-	cmhtob		fr10,fr12,cc1,0
-	test_fr_limmed	0xadef,0x3478,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	cmhtob		fr10,fr12,cc1,0
-	test_fr_limmed	0xffff,0xffff,fr12
-
-	set_fr_iimmed	0x0134,0x0878,fr10
-	set_fr_iimmed	0x10ad,0x80ef,fr11
-	cmhtob		fr10,fr12,cc5,0
-	test_fr_limmed	0xffff,0xffff,fr12
-
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x00ad,0x00ef,fr10
-	set_fr_iimmed	0x0034,0x0078,fr11
-	cmhtob		fr10,fr12,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	cmhtob		fr10,fr12,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0x0134,0x0878,fr10
-	set_fr_iimmed	0x10ad,0x80ef,fr11
-	cmhtob		fr10,fr12,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0x00ad,0x00ef,fr10
-	set_fr_iimmed	0x0034,0x0078,fr11
-	cmhtob		fr10,fr12,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	cmhtob		fr10,fr12,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0x0134,0x0878,fr10
-	set_fr_iimmed	0x10ad,0x80ef,fr11
-	cmhtob		fr10,fr12,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0x00ad,0x00ef,fr10
-	set_fr_iimmed	0x0034,0x0078,fr11
-	cmhtob		fr10,fr12,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	cmhtob		fr10,fr12,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0x0134,0x0878,fr10
-	set_fr_iimmed	0x10ad,0x80ef,fr11
-	cmhtob		fr10,fr12,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0x00ad,0x00ef,fr10
-	set_fr_iimmed	0x0034,0x0078,fr11
-	cmhtob		fr10,fr12,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	cmhtob		fr10,fr12,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	set_fr_iimmed	0x0134,0x0878,fr10
-	set_fr_iimmed	0x10ad,0x80ef,fr11
-	cmhtob		fr10,fr12,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr12
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmmachs.cgs b/sim/testsuite/sim/frv/cmmachs.cgs
deleted file mode 100644
index 2131b7e456d..00000000000
--- a/sim/testsuite/sim/frv/cmmachs.cgs
+++ /dev/null
@@ -1,1631 +0,0 @@
-# frv testcase for cmmachs $GRi,$GRj,$ACCk,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmmachs
-cmmachs:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_spr_immed	0x0,msr1
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x8006,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0007,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0001,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0xbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0xbffd,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffd,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc003,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc005,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc005,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3ffec006,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x7ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x7ffec006,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-;;;;;;;;;;;;
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	-128,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	-128,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_spr_immed	0x0,msr1
-	set_accg_immed 	0x0,accg0		; saturation
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x8006,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0007,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0001,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0xbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0xbffd,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffd,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc003,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc005,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc005,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3ffec006,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x7ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x7ffec006,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_spr_immed	0x0,msr1
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_spr_immed	0x0,msr1
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_spr_immed	0x0,msr1
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-;
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_spr_immed	0x0,msr1
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmmachu.cgs b/sim/testsuite/sim/frv/cmmachu.cgs
deleted file mode 100644
index 8948f15c4a5..00000000000
--- a/sim/testsuite/sim/frv/cmmachu.cgs
+++ /dev/null
@@ -1,864 +0,0 @@
-# frv testcase for cmmachu $GRi,$GRj,$GRk,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmmachu
-cmmachu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_spr_immed 	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0,accg0
-	set_acc_immed	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00020006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00020006,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40010007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40010007,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8001,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x8001,0x0007,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x7fff,0x0008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x7fff,0x0008,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_spr_immed 	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0,accg0
-	set_acc_immed	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00020006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00020006,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40010007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40010007,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8001,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x8001,0x0007,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x7fff,0x0008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x7fff,0x0008,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_spr_immed 	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_spr_immed 	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_spr_immed 	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-;
-	set_spr_immed 	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmmulhs.cgs b/sim/testsuite/sim/frv/cmmulhs.cgs
deleted file mode 100644
index 01ee59822e4..00000000000
--- a/sim/testsuite/sim/frv/cmmulhs.cgs
+++ /dev/null
@@ -1,814 +0,0 @@
-# frv testcase for cmmulhs $GRi,$GRj,$ACCk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmmulhs
-cmmulhs:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ffe,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x0001,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-2,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffe,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffe,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x8000,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xc000,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xc000,0x8000,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40000000,acc1
-
-	; Positive operands
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ffe,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x0001,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-2,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffe,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffe,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x8000,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xc000,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xc000,0x8000,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40000000,acc1
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhs      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhs      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmulhs      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmulhs      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmulhs      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmulhs      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmulhs      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmmulhu.cgs b/sim/testsuite/sim/frv/cmmulhu.cgs
deleted file mode 100644
index 9e8fbb881cc..00000000000
--- a/sim/testsuite/sim/frv/cmmulhu.cgs
+++ /dev/null
@@ -1,460 +0,0 @@
-# frv testcase for cmmulhu $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmmulhu
-cmmulhu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmulhu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmulhu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x7ffe,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00010000,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x4000,0x0000,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0xfffe,0x0001,acc1
-
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmulhu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmulhu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x7ffe,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00010000,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x4000,0x0000,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0xfffe,0x0001,acc1
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmulhu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmulhu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmulhu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmulhu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmulhu      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmulhu      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhu      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmulhu      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmulhu      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmulhu      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmulhu      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmulhu      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmnot.cgs b/sim/testsuite/sim/frv/cmnot.cgs
deleted file mode 100644
index cc93c016e20..00000000000
--- a/sim/testsuite/sim/frv/cmnot.cgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# frv testcase for cmnot $FRintj,$FRintk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmnot
-cmnot:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	cmnot      	fr7,fr7,cc0,1
-	test_fr_iimmed 	0x55555555,fr7
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	cmnot      	fr7,fr7,cc4,1
-	test_fr_iimmed 	0x21524110,fr7
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	cmnot      	fr7,fr7,cc1,0
-	test_fr_iimmed 	0x55555555,fr7
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	cmnot      	fr7,fr7,cc5,0
-	test_fr_iimmed 	0x21524110,fr7
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	cmnot      	fr7,fr7,cc0,0
-	test_fr_iimmed 	0xaaaaaaaa,fr7
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	cmnot      	fr7,fr7,cc4,0
-	test_fr_iimmed 	0xdeadbeef,fr7
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	cmnot      	fr7,fr7,cc1,1
-	test_fr_iimmed 	0xaaaaaaaa,fr7
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	cmnot      	fr7,fr7,cc5,1
-	test_fr_iimmed 	0xdeadbeef,fr7
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	cmnot      	fr7,fr7,cc2,0
-	test_fr_iimmed 	0xaaaaaaaa,fr7
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	cmnot      	fr7,fr7,cc6,1
-	test_fr_iimmed 	0xdeadbeef,fr7
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	cmnot      	fr7,fr7,cc3,0
-	test_fr_iimmed 	0xaaaaaaaa,fr7
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	cmnot      	fr7,fr7,cc7,1
-	test_fr_iimmed 	0xdeadbeef,fr7
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmor.cgs b/sim/testsuite/sim/frv/cmor.cgs
deleted file mode 100644
index ebdc5f2a313..00000000000
--- a/sim/testsuite/sim/frv/cmor.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for cmor $FRinti,$FRintj,$FRintk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmor
-cmor:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmor      	fr7,fr8,fr8,cc0,1
-	test_fr_iimmed 	0xffffffff,fr8
-
-	set_fr_iimmed   0x0000,0x0000,fr7
-	set_fr_iimmed   0x0000,0x0000,fr8
-	cmor		fr7,fr8,fr8,cc0,1
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed  	0x0000,0xbeef,fr8
-	cmor		fr7,fr8,fr8,cc4,1
-	test_fr_iimmed 	0xdeadbeef,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmor      	fr7,fr8,fr8,cc1,0
-	test_fr_iimmed 	0xffffffff,fr8
-
-	set_fr_iimmed   0x0000,0x0000,fr7
-	set_fr_iimmed   0x0000,0x0000,fr8
-	cmor		fr7,fr8,fr8,cc1,0
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed  	0x0000,0xbeef,fr8
-	cmor		fr7,fr8,fr8,cc5,0
-	test_fr_iimmed 	0xdeadbeef,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmor      	fr7,fr8,fr8,cc0,0
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	set_fr_iimmed   0x0000,0x0000,fr8
-	cmor		fr7,fr8,fr8,cc0,0
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed  	0x0000,0xbeef,fr8
-	cmor		fr7,fr8,fr8,cc4,0
-	test_fr_iimmed 	0x0000beef,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmor      	fr7,fr8,fr8,cc1,1
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	set_fr_iimmed   0x0000,0x0000,fr8
-	cmor		fr7,fr8,fr8,cc1,1
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed  	0x0000,0xbeef,fr8
-	cmor		fr7,fr8,fr8,cc5,1
-	test_fr_iimmed 	0x0000beef,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmor      	fr7,fr8,fr8,cc2,0
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	set_fr_iimmed   0x0000,0x0000,fr8
-	cmor		fr7,fr8,fr8,cc2,1
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed  	0x0000,0xbeef,fr8
-	cmor		fr7,fr8,fr8,cc6,0
-	test_fr_iimmed 	0x0000beef,fr8
-
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmor      	fr7,fr8,fr8,cc3,1
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	set_fr_iimmed   0x0000,0x0000,fr8
-	cmor		fr7,fr8,fr8,cc3,0
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed  	0x0000,0xbeef,fr8
-	cmor		fr7,fr8,fr8,cc7,1
-	test_fr_iimmed 	0x0000beef,fr8
-	pass
diff --git a/sim/testsuite/sim/frv/cmov.cgs b/sim/testsuite/sim/frv/cmov.cgs
deleted file mode 100644
index 236bb20f086..00000000000
--- a/sim/testsuite/sim/frv/cmov.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# frv testcase for cmov $GRi,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmov
-cmov:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0xdeadbeef,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cmov		gr7,gr8,cc0,0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0xdeadbeef,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0xdeadbeef,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cmov		gr7,gr8,cc0,1
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00007fff,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0xdeadbeef,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	cmov		gr7,gr8,cc1,0
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	0x00007fff,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0xdeadbeef,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	cmov		gr7,gr8,cc1,1
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	0xdeadbeef,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0xdeadbeef,gr8
-	set_icc         0x08,2		; Set mask opposite of expected
-	cmov		gr7,gr8,cc2,0
-	test_icc	1 0 0 0 icc2
-	test_gr_immed  	0xdeadbeef,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0xdeadbeef,gr8
-	set_icc         0x08,3		; Set mask opposite of expected
-	cmov		gr7,gr8,cc3,0
-	test_icc	1 0 0 0 icc3
-	test_gr_immed  	0xdeadbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmovfg.cgs b/sim/testsuite/sim/frv/cmovfg.cgs
deleted file mode 100644
index 4109842cfa4..00000000000
--- a/sim/testsuite/sim/frv/cmovfg.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for cmovfg $FRk,$GRj,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmovfg
-cmovfg:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc4,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc0,0
-	test_gr_limmed	0,0,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc4,0
-	test_gr_limmed	0,0,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc1,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc5,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc1,1
-	test_gr_limmed	0,0,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc5,1
-	test_gr_limmed	0,0,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc2,0
-	test_gr_limmed	0,0,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc2,1
-	test_gr_limmed	0,0,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc3,1
-	test_gr_limmed	0,0,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	cmovfg 		fr8,gr8,cc7,0
-	test_gr_limmed	0,0,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmovfgd.cgs b/sim/testsuite/sim/frv/cmovfgd.cgs
deleted file mode 100644
index 5d1757d1f38..00000000000
--- a/sim/testsuite/sim/frv/cmovfgd.cgs
+++ /dev/null
@@ -1,132 +0,0 @@
-# frv testcase for cmovfgd $FRk,$GRj,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmovfgd
-cmovfgd:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc4,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc0,0
-	test_gr_limmed	0,0,gr8
-	test_gr_limmed	0,0,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc4,0
-	test_gr_limmed	0,0,gr8
-	test_gr_limmed	0,0,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc1,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc5,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc1,1
-	test_gr_limmed	0,0,gr8
-	test_gr_limmed	0,0,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc5,1
-	test_gr_limmed	0,0,gr8
-	test_gr_limmed	0,0,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc2,0
-	test_gr_limmed	0,0,gr8
-	test_gr_limmed	0,0,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc6,1
-	test_gr_limmed	0,0,gr8
-	test_gr_limmed	0,0,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc3,1
-	test_gr_limmed	0,0,gr8
-	test_gr_limmed	0,0,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	cmovfgd 	fr8,gr8,cc7,0
-	test_gr_limmed	0,0,gr8
-	test_gr_limmed	0,0,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmovgf.cgs b/sim/testsuite/sim/frv/cmovgf.cgs
deleted file mode 100644
index 58ed1d85356..00000000000
--- a/sim/testsuite/sim/frv/cmovgf.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for cmovgf $GRj,$FRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmovgf
-cmovgf:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc4,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0,0,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc4,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0,0,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc1,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc5,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0,0,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc5,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0,0,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc2,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0,0,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc6,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0,0,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc3,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0,0,fr8
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	cmovgf 		gr8,fr8,cc7,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0,0,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmovgfd.cgs b/sim/testsuite/sim/frv/cmovgfd.cgs
deleted file mode 100644
index 67bb2728508..00000000000
--- a/sim/testsuite/sim/frv/cmovgfd.cgs
+++ /dev/null
@@ -1,132 +0,0 @@
-# frv testcase for cmovgfd $GRj,$FRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmovgfd
-cmovgfd:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc0,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc4,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc0,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0,0,fr8
-	test_fr_limmed	0,0,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc4,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0,0,fr8
-	test_fr_limmed	0,0,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc1,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc5,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc1,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0,0,fr8
-	test_fr_limmed	0,0,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc5,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0,0,fr8
-	test_fr_limmed	0,0,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc2,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0,0,fr8
-	test_fr_limmed	0,0,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc6,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0,0,fr8
-	test_fr_limmed	0,0,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc3,1
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0,0,fr8
-	test_fr_limmed	0,0,fr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	cmovgfd 	gr8,fr8,cc7,0
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0,0,fr8
-	test_fr_limmed	0,0,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmp.cgs b/sim/testsuite/sim/frv/cmp.cgs
deleted file mode 100644
index e6694c14a7c..00000000000
--- a/sim/testsuite/sim/frv/cmp.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# frv testcase for cmp $GRi,$GRj,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp
-cmp:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	cmp      	gr8,gr7,icc0
-	test_icc	0 0 0 0 icc0
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	cmp		gr8,gr7,icc0
-	test_icc	0 0 1 0 icc0
-
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cmp		gr8,gr8,icc0
-	test_icc	0 1 0 0 icc0
-
-	set_gr_immed   	0,gr8
-	set_icc         0x06,0		; Set mask opposite of expected
-	cmp		gr8,gr7,icc0
-	test_icc	1 0 0 1 icc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmpb.cgs b/sim/testsuite/sim/frv/cmpb.cgs
deleted file mode 100644
index 94b98366069..00000000000
--- a/sim/testsuite/sim/frv/cmpb.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# frv testcase for cmpb $GRi,$GRj,$ICCi_1
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmpb
-cmpb:
-	set_gr_limmed  	0xdead,0xbeef,gr7
-	set_gr_limmed  	0xdead,0xbeef,gr8
-	set_icc         0x00,0		; Set mask opposite of expected
-	cmpb		gr7,gr8,icc0
-	test_icc	1 1 1 1 icc0
-
-	set_gr_limmed  	0x21ad,0xbeef,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cmpb		gr7,gr8,icc0
-	test_icc	0 1 1 1 icc0
-
-	set_gr_limmed  	0xde52,0xbeef,gr8
-	set_icc         0x04,0		; Set mask opposite of expected
-	cmpb		gr7,gr8,icc0
-	test_icc	1 0 1 1 icc0
-
-	set_gr_limmed  	0xdead,0x41ef,gr8
-	set_icc         0x02,0		; Set mask opposite of expected
-	cmpb		gr7,gr8,icc0
-	test_icc	1 1 0 1 icc0
-
-	set_gr_limmed  	0xdead,0xbe10,gr8
-	set_icc         0x01,0		; Set mask opposite of expected
-	cmpb		gr7,gr8,icc0
-	test_icc	1 1 1 0 icc0
-
-	set_gr_limmed  	0xbeef,0xdead,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	cmpb		gr7,gr8,icc0
-	test_icc	0 0 0 0 icc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmpba.cgs b/sim/testsuite/sim/frv/cmpba.cgs
deleted file mode 100644
index 160b9ef2cb9..00000000000
--- a/sim/testsuite/sim/frv/cmpba.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# frv testcase for cmpba $GRi,$GRj,$ICCi_1
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmpba
-cmpba:
-	set_gr_limmed  	0xdead,0xbeef,gr7
-	set_gr_limmed  	0xdead,0xbeef,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	cmpba		gr7,gr8,icc0
-	test_icc	0 0 0 1 icc0
-
-	set_gr_limmed  	0x21ad,0xbeef,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	cmpba		gr7,gr8,icc0
-	test_icc	0 0 0 1 icc0
-
-	set_gr_limmed  	0xde52,0xbeef,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	cmpba		gr7,gr8,icc0
-	test_icc	0 0 0 1 icc0
-
-	set_gr_limmed  	0xdead,0x41ef,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	cmpba		gr7,gr8,icc0
-	test_icc	0 0 0 1 icc0
-
-	set_gr_limmed  	0xdead,0xbe10,gr8
-	set_icc         0x03,0		; Set mask opposite of expected
-	cmpba		gr7,gr8,icc0
-	test_icc	0 0 0 1 icc0
-
-	set_gr_limmed  	0xbeef,0xdead,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	cmpba		gr7,gr8,icc0
-	test_icc	0 0 0 0 icc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmpi.cgs b/sim/testsuite/sim/frv/cmpi.cgs
deleted file mode 100644
index a8324db5531..00000000000
--- a/sim/testsuite/sim/frv/cmpi.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for cmpi $GRi,$s12,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmpi
-cmpi:
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	cmpi      	gr8,1,icc0
-	test_icc	0 0 0 0 icc0
-
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	cmpi		gr8,1,icc0
-	test_icc	0 0 1 0 icc0
-
-	set_gr_immed   	0x1ff,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cmpi		gr8,0x1ff,icc0
-	test_icc	0 1 0 0 icc0
-
-	set_gr_immed  	0,gr8
-	set_icc         0x06,0		; Set mask opposite of expected
-	cmpi		gr8,1,icc0
-	test_icc	1 0 0 1 icc0
-
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	cmpi      	gr8,-1,icc0
-	test_icc	0 0 0 1 icc0
-
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x06,0		; Set mask opposite of expected
-	cmpi		gr8,-1,icc0
-	test_icc	1 0 0 1 icc0
-
-	set_gr_immed   	-512,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cmpi		gr8,-512,icc0
-	test_icc	0 1 0 0 icc0
-
-	set_gr_immed  	0,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	cmpi		gr8,-1,icc0
-	test_icc	0 0 0 1 icc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmqmachs.cgs b/sim/testsuite/sim/frv/cmqmachs.cgs
deleted file mode 100644
index 4acd62a73af..00000000000
--- a/sim/testsuite/sim/frv/cmqmachs.cgs
+++ /dev/null
@@ -1,1268 +0,0 @@
-# frv testcase for cmqmachs $GRi,$GRj,$ACCk,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmqmachs
-cmqmachs:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0,accg0
-	set_acc_immed 	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed 	0,acc1
-	set_accg_immed 	0,accg2
-	set_acc_immed 	0,acc2
-	set_accg_immed 	0,accg3
-	set_acc_immed 	0,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8008,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7fff,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7fff,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7ffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7ffd,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x3fff,0x3ffb,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x3fff,0x3ffb,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffb,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffb,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0008,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffd,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffd,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0009,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0009,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fffbffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fffbffd,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0,accg0
-	set_acc_immed 	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed 	0,acc1
-	set_accg_immed 	0,accg2
-	set_acc_immed 	0,acc2
-	set_accg_immed 	0,accg3
-	set_acc_immed 	0,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8008,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7fff,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7fff,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7ffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7ffd,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x3fff,0x3ffb,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x3fff,0x3ffb,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffb,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffb,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0008,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffd,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffd,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0009,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0009,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fffbffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fffbffd,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0x7f,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2		; saturation
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0x7f,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2		; saturation
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0x7f,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2		; saturation
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-;
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0x7f,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2		; saturation
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/cmqmachu.cgs b/sim/testsuite/sim/frv/cmqmachu.cgs
deleted file mode 100644
index 1be138952f0..00000000000
--- a/sim/testsuite/sim/frv/cmqmachu.cgs
+++ /dev/null
@@ -1,876 +0,0 @@
-# frv testcase for cmqmachu $GRi,$GRj,$GRk,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmqmachu
-cmqmachu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0,accg0
-	set_acc_immed 	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed 	0,acc1
-	set_accg_immed 	0,accg2
-	set_acc_immed 	0,acc2
-	set_accg_immed 	0,accg3
-	set_acc_immed 	0,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8000,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00018000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00018000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff8007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff8007,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4001,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4001,0x8000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x3ffd,0x8008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x3ffd,0x8008,acc1
-	test_accg_immed 	1,accg2
-	test_acc_limmed	0x3fff,0x8001,acc2
-	test_accg_immed 	1,accg3
-	test_acc_limmed	0x3fff,0x8001,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0,accg0
-	set_acc_immed 	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed 	0,acc1
-	set_accg_immed 	0,accg2
-	set_acc_immed 	0,acc2
-	set_accg_immed 	0,accg3
-	set_acc_immed 	0,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8000,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00018000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00018000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff8007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff8007,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4001,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4001,0x8000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x3ffd,0x8008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x3ffd,0x8008,acc1
-	test_accg_immed 	1,accg2
-	test_acc_limmed	0x3fff,0x8001,acc2
-	test_accg_immed 	1,accg3
-	test_acc_limmed	0x3fff,0x8001,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-;
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmqmulhs.cgs b/sim/testsuite/sim/frv/cmqmulhs.cgs
deleted file mode 100644
index b3157373bfc..00000000000
--- a/sim/testsuite/sim/frv/cmqmulhs.cgs
+++ /dev/null
@@ -1,734 +0,0 @@
-# frv testcase for cmqmulhs $GRi,$GRj,$ACCk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmqmulhs
-cmqmulhs:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x0001,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x0001,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc0,1
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_immed 	-2,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed 	-2,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffe,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffe,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc4,1
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x8000,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xc000,0x8000,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xc000,0x8000,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x40000000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x40000000,acc3
-
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x0001,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x0001,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc1,0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_immed 	-2,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed 	-2,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffe,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffe,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc5,0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x8000,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xc000,0x8000,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xc000,0x8000,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x40000000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x40000000,acc3
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-;
-	; Positive operands
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmulhs      	fr8,fr10,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmqmulhu.cgs b/sim/testsuite/sim/frv/cmqmulhu.cgs
deleted file mode 100644
index 36f0c2f45b1..00000000000
--- a/sim/testsuite/sim/frv/cmqmulhu.cgs
+++ /dev/null
@@ -1,464 +0,0 @@
-# frv testcase for cmqmulhu $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmqmulhu
-cmqmulhu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x7ffe,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00010000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00010000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4000,0x0000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4000,0x0000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0xfffe,0x0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0xfffe,0x0001,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0xfffe,0x0001,acc3
-
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x7ffe,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00010000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00010000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4000,0x0000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4000,0x0000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0xfffe,0x0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0xfffe,0x0001,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0xfffe,0x0001,acc3
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-;
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmulhu      	fr8,fr10,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmsubhss.cgs b/sim/testsuite/sim/frv/cmsubhss.cgs
deleted file mode 100644
index 386b27d1a14..00000000000
--- a/sim/testsuite/sim/frv/cmsubhss.cgs
+++ /dev/null
@@ -1,562 +0,0 @@
-# frv testcase for cmsubhss $FRi,$FRj,$FRj,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmsubhss
-cmsubhss:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xdead,0x4111,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x4111,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x1235,0x5679,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc4,1
-	cmsubhss	fr11,fr10,fr13,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x8000,0x8000,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr0.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xdead,0x4111,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x4111,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x1235,0x5679,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc5,0
-	cmsubhss	fr11,fr10,fr13,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x8000,0x8000,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr0.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc4,0
-	cmsubhss	fr11,fr10,fr13,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc5,1
-	cmsubhss	fr11,fr10,fr13,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc6,1
-	cmsubhss	fr11,fr10,fr13,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-;
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc7,1
-	cmsubhss	fr11,fr10,fr13,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmsubhus.cgs b/sim/testsuite/sim/frv/cmsubhus.cgs
deleted file mode 100644
index 2a8f3434c78..00000000000
--- a/sim/testsuite/sim/frv/cmsubhus.cgs
+++ /dev/null
@@ -1,442 +0,0 @@
-# frv testcase for cmsubhus $FRi,$FRj,$FRj,$CCi,$cond
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmsubhus
-cmsubhus:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x7ffc,0x7ffd,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc4,1
-	cmsubhus	fr10,fr11,fr13,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x0000,0x0000,fr13
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x7ffc,0x7ffd,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc5,0
-	cmsubhus	fr10,fr11,fr13,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x0000,0x0000,fr13
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc4,0
-	cmsubhus	fr10,fr11,fr13,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc5,1
-	cmsubhus	fr10,fr11,fr13,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc6,0
-	cmsubhus	fr10,fr11,fr13,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-;
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc7,0
-	cmsubhus	fr10,fr11,fr13,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	pass
diff --git a/sim/testsuite/sim/frv/cmxor.cgs b/sim/testsuite/sim/frv/cmxor.cgs
deleted file mode 100644
index 236e2fed0e4..00000000000
--- a/sim/testsuite/sim/frv/cmxor.cgs
+++ /dev/null
@@ -1,132 +0,0 @@
-# frv testcase for cmxor $FRinti,$FRintj,$FRintk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmxor
-cmxor:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmxor      	fr7,fr8,fr8,cc0,1
-	test_fr_iimmed 	0xffffffff,fr8
-
-	set_fr_iimmed	0x0000,0x0000,fr7
-	set_fr_iimmed	0x0000,0x0000,fr8
-	cmxor		fr7,fr8,fr8,cc0,1
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0xaaaa,0xaaaa,fr8
-	cmxor      	fr7,fr8,fr8,cc4,1
-	test_fr_iimmed	0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed   0x0000,0xbeef,fr8
-	cmxor		fr7,fr8,fr8,cc4,1
-	test_fr_iimmed  0xdeadbeef,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmxor      	fr7,fr8,fr8,cc1,0
-	test_fr_iimmed 	0xffffffff,fr8
-
-	set_fr_iimmed	0x0000,0x0000,fr7
-	set_fr_iimmed	0x0000,0x0000,fr8
-	cmxor		fr7,fr8,fr8,cc1,0
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0xaaaa,0xaaaa,fr8
-	cmxor      	fr7,fr8,fr8,cc5,0
-	test_fr_iimmed	0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed   0x0000,0xbeef,fr8
-	cmxor		fr7,fr8,fr8,cc5,0
-	test_fr_iimmed  0xdeadbeef,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmxor      	fr7,fr8,fr8,cc0,0
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr7
-	set_fr_iimmed	0x0000,0x0000,fr8
-	cmxor		fr7,fr8,fr8,cc0,0
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0xaaaa,0xaaaa,fr8
-	cmxor      	fr7,fr8,fr8,cc4,0
-	test_fr_iimmed	0xaaaaaaaa,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed   0x0000,0xbeef,fr8
-	cmxor		fr7,fr8,fr8,cc4,0
-	test_fr_iimmed  0x0000beef,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmxor      	fr7,fr8,fr8,cc1,1
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr7
-	set_fr_iimmed	0x0000,0x0000,fr8
-	cmxor		fr7,fr8,fr8,cc1,1
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0xaaaa,0xaaaa,fr8
-	cmxor      	fr7,fr8,fr8,cc5,1
-	test_fr_iimmed	0xaaaaaaaa,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed   0x0000,0xbeef,fr8
-	cmxor		fr7,fr8,fr8,cc5,1
-	test_fr_iimmed  0x0000beef,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmxor      	fr7,fr8,fr8,cc2,0
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr7
-	set_fr_iimmed	0x0000,0x0000,fr8
-	cmxor		fr7,fr8,fr8,cc2,1
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0xaaaa,0xaaaa,fr8
-	cmxor      	fr7,fr8,fr8,cc6,0
-	test_fr_iimmed	0xaaaaaaaa,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed   0x0000,0xbeef,fr8
-	cmxor		fr7,fr8,fr8,cc6,1
-	test_fr_iimmed  0x0000beef,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	cmxor      	fr7,fr8,fr8,cc3,0
-	test_fr_iimmed 	0x55555555,fr8
-
-	set_fr_iimmed	0xdead,0xbeef,fr7
-	set_fr_iimmed	0x0000,0x0000,fr8
-	cmxor		fr7,fr8,fr8,cc3,1
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0xaaaa,0xaaaa,fr8
-	cmxor      	fr7,fr8,fr8,cc7,0
-	test_fr_iimmed	0xaaaaaaaa,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed   0x0000,0xbeef,fr8
-	cmxor		fr7,fr8,fr8,cc7,1
-	test_fr_iimmed  0x0000beef,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cnot.cgs b/sim/testsuite/sim/frv/cnot.cgs
deleted file mode 100644
index 3169887914d..00000000000
--- a/sim/testsuite/sim/frv/cnot.cgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# frv testcase for cnot $GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cnot
-cnot:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	cnot      	gr7,gr7,cc0,1
-	test_gr_limmed 	0x5555,0x5555,gr7
-
-	set_gr_limmed   0xdead,0xbeef,gr7
-	cnot      	gr7,gr7,cc4,1
-	test_gr_limmed 	0x2152,0x4110,gr7
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	cnot      	gr7,gr7,cc0,0
-	test_gr_limmed 	0xaaaa,0xaaaa,gr7
-
-	set_gr_limmed   0xdead,0xbeef,gr7
-	cnot      	gr7,gr7,cc4,0
-	test_gr_limmed 	0xdead,0xbeef,gr7
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	cnot      	gr7,gr7,cc1,0
-	test_gr_limmed 	0x5555,0x5555,gr7
-
-	set_gr_limmed   0xdead,0xbeef,gr7
-	cnot      	gr7,gr7,cc5,0
-	test_gr_limmed 	0x2152,0x4110,gr7
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	cnot      	gr7,gr7,cc1,1
-	test_gr_limmed 	0xaaaa,0xaaaa,gr7
-
-	set_gr_limmed   0xdead,0xbeef,gr7
-	cnot      	gr7,gr7,cc5,1
-	test_gr_limmed 	0xdead,0xbeef,gr7
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	cnot      	gr7,gr7,cc2,0
-	test_gr_limmed 	0xaaaa,0xaaaa,gr7
-
-	set_gr_limmed   0xdead,0xbeef,gr7
-	cnot      	gr7,gr7,cc6,1
-	test_gr_limmed 	0xdead,0xbeef,gr7
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	cnot      	gr7,gr7,cc3,0
-	test_gr_limmed 	0xaaaa,0xaaaa,gr7
-
-	set_gr_limmed   0xdead,0xbeef,gr7
-	cnot      	gr7,gr7,cc7,1
-	test_gr_limmed 	0xdead,0xbeef,gr7
-
-	pass
diff --git a/sim/testsuite/sim/frv/commitfa.cgs b/sim/testsuite/sim/frv/commitfa.cgs
deleted file mode 100644
index 8208cab5226..00000000000
--- a/sim/testsuite/sim/frv/commitfa.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for commitfa
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global commitfa
-commitfa:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x190,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-	set_gr_immed	0,gr15
-
-	nldfi		@(sp,0),fr20	; Activate fr20 with nesr.fr==1
-	nldi		@(sp,0),gr20	; Activate gr20 with nesr.fr==0
-	nldfi		@(sp,0),fr52	; Activate fr52 with nesr.fr==1
-	set_spr_immed	0x00000000,fner1
-	set_spr_immed	0x00000000,fner0
-	set_spr_addr	bad,lr
-	commitfa			; should be nop
-	test_spr_immed	0x00000000,fner1
-	test_spr_immed	0x00000000,fner0
-	test_spr_immed	0xd4800001,nesr0
-	test_spr_gr	neear0,sp
-	test_spr_immed	0x94800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0xf4800801,nesr2
-	test_spr_gr	neear2,sp
-
-	or_spr_immed	0x00100000,fner1
-	or_spr_immed	0x00200000,fner1
-	or_spr_immed	0x00100000,fner0
-	set_spr_addr	ok,lr
-	set_gr_addr	com1,gr16
-com1:	commitfa
-	test_gr_immed	1,gr15
-
-	pass
-
-ok:	test_spr_immed	0x1,esfr1		; esr0 is active
-	test_spr_gr	epcr0,gr16
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x14,esr0	; esr0.ec is set
-	test_spr_bits	0x0800,11,0x0,esr0	; esr0.eav is clear
-	test_spr_bits	0x01000,12,0x0,esr0	; esr0.edv is clear
-	test_spr_immed	0x00000000,fner1
-	test_spr_immed	0x00000000,fner0
-	test_spr_immed	0,nesr0
-	test_spr_immed	0,neear0
-	test_spr_immed	0x94800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0,nesr2
-	test_spr_immed	0,neear2
-	inc_gr_immed	1,gr15
-	rett		0
-
-bad:	fail
diff --git a/sim/testsuite/sim/frv/commitfr.cgs b/sim/testsuite/sim/frv/commitfr.cgs
deleted file mode 100644
index 97491dc38f2..00000000000
--- a/sim/testsuite/sim/frv/commitfr.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for commitfr $FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global commitfr
-commitfr:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x190,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-	set_gr_immed	0,gr15
-
-	nldfi		@(sp,0),fr20	; Activate fr20 with nesr.fr==1
-	nldi		@(sp,0),gr20	; Activate gr20 with nesr.fr==0
-	nldfi		@(sp,0),fr52	; Activate fr52 with nesr.fr==1
-	set_spr_immed	0x00000000,fner1
-	set_spr_immed	0x00000000,fner0
-	set_spr_addr	bad,lr
-	commitfr	fr20		; should be nop
-	test_spr_immed	0x00000000,fner1
-	test_spr_immed	0x00000000,fner0
-	test_spr_immed	0xd4800001,nesr0
-	test_spr_gr	neear0,sp
-	test_spr_immed	0x94800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0xf4800801,nesr2
-	test_spr_gr	neear2,sp
-
-	or_spr_immed	0x00100000,fner1
-	or_spr_immed	0x00200000,fner1
-	or_spr_immed	0x00100000,fner0
-	set_spr_addr	ok,lr
-	set_gr_addr	com1,gr16
-com1:	commitfr	fr20
-	test_gr_immed	1,gr15
-
-	pass
-
-ok:	test_spr_immed	0x1,esfr1		; esr0 is active
-	test_spr_gr	epcr0,gr16
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x14,esr0	; esr0.ec is set
-	test_spr_bits	0x0800,11,0x0,esr0	; esr0.eav is clear
-	test_spr_bits	0x01000,12,0x0,esr0	; esr0.edv is clear
-	test_spr_immed	0x00200000,fner1
-	test_spr_immed	0x00100000,fner0
-	test_spr_immed	0,nesr0
-	test_spr_immed	0,neear0
-	test_spr_immed	0x94800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0xf4800801,nesr2
-	test_spr_gr	neear2,sp
-	inc_gr_immed	1,gr15
-	rett		0
-
-bad:	fail
diff --git a/sim/testsuite/sim/frv/commitga.cgs b/sim/testsuite/sim/frv/commitga.cgs
deleted file mode 100644
index 57100b82284..00000000000
--- a/sim/testsuite/sim/frv/commitga.cgs
+++ /dev/null
@@ -1,62 +0,0 @@
-# frv testcase for commitga
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global commitga
-commitga:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x190,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-	set_gr_immed	0,gr15
-
-	nldi		@(sp,0),gr20	; Activate gr20 with nesr.fr==0
-	nldfi		@(sp,0),fr20	; Activate fr20 with nesr.fr==1
-	nldi		@(sp,0),gr52	; Activate gr52 with nesr.fr==0
-	set_spr_immed	0x00000000,gner1
-	set_spr_immed	0x00000000,gner0
-	set_spr_addr	bad,lr
-	commitga			; should be a nop
-	test_gr_immed	0,gr15
-	test_spr_immed	0x00000000,gner1
-	test_spr_immed	0x00000000,gner0
-	test_spr_immed	0x94800001,nesr0
-	test_spr_gr	neear0,sp
-	test_spr_immed	0xd4800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0xb4800801,nesr2
-	test_spr_gr	neear2,sp
-
-	or_spr_immed	0x00100000,gner1
-	or_spr_immed	0x00200000,gner1
-	or_spr_immed	0x00100000,gner0
-	set_spr_addr	ok,lr
-	set_gr_addr	com1,gr16
-com1:	commitga
-	test_gr_immed	1,gr15
-
-	pass
-
-ok:	test_spr_immed	0x1,esfr1		; esr0 is active
-	test_spr_gr	epcr0,gr16
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x14,esr0	; esr0.ec is set
-	test_spr_bits	0x0800,11,0x0,esr0	; esr0.eav is clear
-	test_spr_bits	0x01000,12,0x0,esr0	; esr0.edv is clear
-	test_spr_immed	0x00000000,gner1
-	test_spr_immed	0x00000000,gner0
-	test_spr_immed	0,nesr0
-	test_spr_immed	0,neear0
-	test_spr_immed	0xd4800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0,nesr2
-	test_spr_immed	0,neear0
-	inc_gr_immed	1,gr15
-	rett		0
-
-bad:	fail
diff --git a/sim/testsuite/sim/frv/commitgr.cgs b/sim/testsuite/sim/frv/commitgr.cgs
deleted file mode 100644
index 45553da052e..00000000000
--- a/sim/testsuite/sim/frv/commitgr.cgs
+++ /dev/null
@@ -1,62 +0,0 @@
-# frv testcase for commitgr $GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global commitgr
-commitgr:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x190,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-	set_gr_immed	0,gr15
-
-	nldi		@(sp,0),gr20	; Activate gr20 with nesr.fr==0
-	nldfi		@(sp,0),fr20	; Activate fr20 with nesr.fr==1
-	nldi		@(sp,0),gr52	; Activate gr52 with nesr.fr==0
-	set_spr_immed	0x00000000,gner1
-	set_spr_immed	0x00000000,gner0
-	set_spr_addr	bad,lr
-	commitgr	gr20		; should only clear ne flags
-	test_gr_immed	0,gr15
-	test_spr_immed	0x00000000,gner1
-	test_spr_immed	0x00000000,gner0
-	test_spr_immed	0x94800001,nesr0
-	test_spr_gr	neear0,sp
-	test_spr_immed	0xd4800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0xb4800801,nesr2
-	test_spr_gr	neear2,sp
-
-	or_spr_immed	0x00100000,gner1
-	or_spr_immed	0x00200000,gner1
-	or_spr_immed	0x00100000,gner0
-	set_spr_addr	ok,lr
-	set_gr_addr	com1,gr16
-com1:	commitgr	gr20
-	test_gr_immed	1,gr15
-
-	pass
-
-ok:	test_spr_immed	0x1,esfr1		; esr0 is active
-	test_spr_gr	epcr0,gr16
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x14,esr0	; esr0.ec is set
-	test_spr_bits	0x0800,11,0x0,esr0	; esr0.eav is clear
-	test_spr_bits	0x01000,12,0x0,esr0	; esr0.edv is clear
-	test_spr_immed	0x00200000,gner1
-	test_spr_immed	0x00100000,gner0
-	test_spr_immed	0,nesr0
-	test_spr_immed	0,neear0
-	test_spr_immed	0xd4800401,nesr1
-	test_spr_gr	neear1,sp
-	test_spr_immed	0xb4800801,nesr2
-	test_spr_gr	neear2,sp
-	inc_gr_immed	1,gr15
-	rett		0
-
-bad:	fail
diff --git a/sim/testsuite/sim/frv/cop1.cgs b/sim/testsuite/sim/frv/cop1.cgs
deleted file mode 100644
index 652e3550e0e..00000000000
--- a/sim/testsuite/sim/frv/cop1.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# frv testcase for cop1 $s6_1,$CPRi,$CPRj,$CPRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global cop1
-cop1:
-	cop1		0,cpr0,cpr15,cpr31
-	cop1		31,cpr32,cpr45,cpr63
-	cop1		-32,cpr32,cpr45,cpr63
-
-	pass
diff --git a/sim/testsuite/sim/frv/cop2.cgs b/sim/testsuite/sim/frv/cop2.cgs
deleted file mode 100644
index 858ed2b4ce2..00000000000
--- a/sim/testsuite/sim/frv/cop2.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# frv testcase for cop2 $s6_1,$CPRi,$CPRj,$CPRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global cop2
-cop2:
-	cop2		0,cpr0,cpr15,cpr31
-	cop2		31,cpr32,cpr45,cpr63
-	cop2		-32,cpr32,cpr45,cpr63
-
-	pass
diff --git a/sim/testsuite/sim/frv/cor.cgs b/sim/testsuite/sim/frv/cor.cgs
deleted file mode 100644
index ef19985b672..00000000000
--- a/sim/testsuite/sim/frv/cor.cgs
+++ /dev/null
@@ -1,138 +0,0 @@
-# frv testcase for cor $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cor
-cor:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	cor      	gr7,gr8,gr8,cc0,1
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	0x00000000,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc0,1
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc4,1
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0xdead,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	cor      	gr7,gr8,gr8,cc0,0
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc0,0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc4,0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x0000,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	cor      	gr7,gr8,gr8,cc1,0
-	test_icc	0 1 1 1 icc1
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	0x00000000,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc1,0
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc5,0
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0xdead,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	cor      	gr7,gr8,gr8,cc1,1
-	test_icc	0 1 1 1 icc1
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc1,1
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc5,1
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0x0000,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,2		; Set mask opposite of expected
-	cor      	gr7,gr8,gr8,cc2,0
-	test_icc	0 1 1 1 icc2
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,2		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc2,0
-	test_icc	1 0 0 0 icc2
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc6,1
-	test_icc	0 1 0 1 icc2
-	test_gr_limmed 	0x0000,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,3		; Set mask opposite of expected
-	cor      	gr7,gr8,gr8,cc3,0
-	test_icc	0 1 1 1 icc3
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,3		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc3,0
-	test_icc	1 0 0 0 icc3
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	cor		gr7,gr8,gr8,cc7,1
-	test_icc	0 1 0 1 icc3
-	test_gr_limmed 	0x0000,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/corcc.cgs b/sim/testsuite/sim/frv/corcc.cgs
deleted file mode 100644
index 527665802e6..00000000000
--- a/sim/testsuite/sim/frv/corcc.cgs
+++ /dev/null
@@ -1,138 +0,0 @@
-# frv testcase for corcc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global corcc
-corcc:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	corcc      	gr7,gr8,gr8,cc0,1
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	0x00000000,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc0,1
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc4,1
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xdead,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	corcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc0,0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc4,0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x0000,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	corcc      	gr7,gr8,gr8,cc1,0
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	0x00000000,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc1,0
-	test_icc	0 1 0 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc5,0
-	test_icc	1 0 0 1 icc1
-	test_gr_limmed 	0xdead,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	corcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 1 1 1 icc1
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc1,1
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc5,1
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0x0000,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,2		; Set mask opposite of expected
-	corcc      	gr7,gr8,gr8,cc2,0
-	test_icc	0 1 1 1 icc2
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,2		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc2,0
-	test_icc	1 0 0 0 icc2
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc6,1
-	test_icc	0 1 0 1 icc2
-	test_gr_limmed 	0x0000,0xbeef,gr8
-
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,3		; Set mask opposite of expected
-	corcc      	gr7,gr8,gr8,cc3,0
-	test_icc	0 1 1 1 icc3
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed   	0x00007fff,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,3		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc3,0
-	test_icc	1 0 0 0 icc3
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	corcc		gr7,gr8,gr8,cc7,1
-	test_icc	0 1 0 1 icc3
-	test_gr_limmed 	0x0000,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cscan.cgs b/sim/testsuite/sim/frv/cscan.cgs
deleted file mode 100644
index 505bb5a384e..00000000000
--- a/sim/testsuite/sim/frv/cscan.cgs
+++ /dev/null
@@ -1,394 +0,0 @@
-# frv testcase for cscan $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cscan
-cscan:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed	0x2aaa,0xaaaa,gr7
-	set_gr_limmed	0xaaaa,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc0,1
-	test_gr_immed	0,gr9
-	test_gr_limmed	0x2aaa,0xaaaa,gr7
-	test_gr_limmed	0xaaaa,0x5555,gr8
-
-	set_gr_limmed	0x2aaa,0xaaaa,gr7
-	set_gr_limmed	0xaaaa,0xaaab,gr8
-	cscan 		gr7,gr8,gr9,cc0,1
-	test_gr_immed	0,gr9
-	test_gr_limmed	0x2aaa,0xaaaa,gr7
-	test_gr_limmed	0xaaaa,0xaaab,gr8
-
-	set_gr_limmed	0xd555,0x5555,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	cscan 		gr7,gr8,gr9,cc0,1
-	test_gr_immed	63,gr9
-	test_gr_limmed	0xd555,0x5555,gr7
-	test_gr_limmed	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed	0xd555,0x5555,gr7
-	set_gr_limmed	0xaaaa,0xaaab,gr8
-	cscan 		gr7,gr8,gr9,cc0,1
-	test_gr_immed	63,gr9
-	test_gr_limmed	0xd555,0x5555,gr7
-	test_gr_limmed	0xaaaa,0xaaab,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0x7fff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc0,1
-	test_gr_immed	0,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xbfff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc4,1
-	test_gr_immed	2,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xbfff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xfffe,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc4,1
-	test_gr_immed	16,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xfffe,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xffff,0xfffd,gr8
-	cscan 		gr7,gr8,gr9,cc4,1
-	test_gr_immed	31,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xffff,0xfffd,gr8
-
-	set_gr_limmed	0xdead,0xbeef,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	cscan 		gr7,gr8,gr9,cc4,1
-	test_gr_immed	7,gr9
-	test_gr_limmed	0xdead,0xbeef,gr7
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0x7fff,gr9
-	set_gr_limmed	0xaaaa,0xaaaa,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc0,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xaaaa,0xaaaa,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0xaaaa,0xaaab,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc0,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xaaaa,0xaaab,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0x5555,0x5555,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc0,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0x5555,0x5555,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0x5555,0x5555,gr7
-	set_gr_limmed	0x5555,0x5554,gr8
-	cscan 		gr7,gr8,gr9,cc0,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0x5555,0x5555,gr7
-	test_gr_limmed	0x5555,0x5554,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0x7fff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc0,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xbfff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc4,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xbfff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xfffe,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc4,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xfffe,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xffff,0xfffd,gr8
-	cscan 		gr7,gr8,gr9,cc4,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xffff,0xfffd,gr8
-
-	set_gr_limmed	0xdead,0xbeef,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	cscan 		gr7,gr8,gr9,cc4,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xdead,0xbeef,gr7
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_limmed	0x2aaa,0xaaaa,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	cscan 		gr7,gr8,gr9,cc1,0
-	test_gr_immed	0,gr9
-	test_gr_limmed	0x2aaa,0xaaaa,gr7
-	test_gr_limmed	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed	0x2aaa,0xaaaa,gr7
-	set_gr_limmed	0xaaaa,0xaaab,gr8
-	cscan 		gr7,gr8,gr9,cc1,0
-	test_gr_immed	0,gr9
-	test_gr_limmed	0x2aaa,0xaaaa,gr7
-	test_gr_limmed	0xaaaa,0xaaab,gr8
-
-	set_gr_limmed	0xd555,0x5555,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	cscan 		gr7,gr8,gr9,cc1,0
-	test_gr_immed	63,gr9
-	test_gr_limmed	0xd555,0x5555,gr7
-	test_gr_limmed	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed	0xd555,0x5555,gr7
-	set_gr_limmed	0xaaaa,0xaaab,gr8
-	cscan 		gr7,gr8,gr9,cc1,0
-	test_gr_immed	63,gr9
-	test_gr_limmed	0xd555,0x5555,gr7
-	test_gr_limmed	0xaaaa,0xaaab,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0x7fff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc1,0
-	test_gr_immed	0,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xbfff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc5,0
-	test_gr_immed	2,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xbfff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xfffe,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc5,0
-	test_gr_immed	16,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xfffe,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xffff,0xfffd,gr8
-	cscan 		gr7,gr8,gr9,cc5,0
-	test_gr_immed	31,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xffff,0xfffd,gr8
-
-	set_gr_limmed	0xdead,0xbeef,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	cscan 		gr7,gr8,gr9,cc5,0
-	test_gr_immed	7,gr9
-	test_gr_limmed	0xdead,0xbeef,gr7
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0x7fff,gr9
-	set_gr_limmed	0xaaaa,0xaaaa,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc1,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xaaaa,0xaaaa,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0xaaaa,0xaaab,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc1,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xaaaa,0xaaab,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0x5555,0x5555,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc1,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0x5555,0x5555,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0x5555,0x5555,gr7
-	set_gr_limmed	0x5555,0x5554,gr8
-	cscan 		gr7,gr8,gr9,cc1,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0x5555,0x5555,gr7
-	test_gr_limmed	0x5555,0x5554,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0x7fff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc1,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xbfff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc5,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xbfff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xfffe,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc5,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xfffe,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xffff,0xfffd,gr8
-	cscan 		gr7,gr8,gr9,cc5,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xffff,0xfffd,gr8
-
-	set_gr_limmed	0xdead,0xbeef,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	cscan 		gr7,gr8,gr9,cc5,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xdead,0xbeef,gr7
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0x7fff,gr9
-	set_gr_limmed	0xaaaa,0xaaaa,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc2,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xaaaa,0xaaaa,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0xaaaa,0xaaab,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc2,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xaaaa,0xaaab,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0x5555,0x5555,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc2,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0x5555,0x5555,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0x5555,0x5555,gr7
-	set_gr_limmed	0x5555,0x5554,gr8
-	cscan 		gr7,gr8,gr9,cc2,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0x5555,0x5555,gr7
-	test_gr_limmed	0x5555,0x5554,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0x7fff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc2,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xbfff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc6,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xbfff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xfffe,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc6,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xfffe,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xffff,0xfffd,gr8
-	cscan 		gr7,gr8,gr9,cc6,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xffff,0xfffd,gr8
-
-	set_gr_limmed	0xdead,0xbeef,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	cscan 		gr7,gr8,gr9,cc6,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xdead,0xbeef,gr7
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0x7fff,gr9
-	set_gr_limmed	0xaaaa,0xaaaa,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc3,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xaaaa,0xaaaa,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0xaaaa,0xaaab,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc3,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xaaaa,0xaaab,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0x5555,0x5555,gr7
-	set_gr_limmed	0x5555,0x5555,gr8
-	cscan 		gr7,gr8,gr9,cc3,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0x5555,0x5555,gr7
-	test_gr_limmed	0x5555,0x5555,gr8
-
-	set_gr_limmed	0x5555,0x5555,gr7
-	set_gr_limmed	0x5555,0x5554,gr8
-	cscan 		gr7,gr8,gr9,cc3,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0x5555,0x5555,gr7
-	test_gr_limmed	0x5555,0x5554,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0x7fff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc3,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xbfff,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc7,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xbfff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xfffe,0xffff,gr8
-	cscan 		gr7,gr8,gr9,cc7,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xfffe,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xffff,0xfffd,gr8
-	cscan 		gr7,gr8,gr9,cc7,0
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xffff,0xfffd,gr8
-
-	set_gr_limmed	0xdead,0xbeef,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	cscan 		gr7,gr8,gr9,cc7,1
-	test_gr_immed	0x7fff,gr9
-	test_gr_limmed	0xdead,0xbeef,gr7
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/csdiv.cgs b/sim/testsuite/sim/frv/csdiv.cgs
deleted file mode 100644
index c6bfb976967..00000000000
--- a/sim/testsuite/sim/frv/csdiv.cgs
+++ /dev/null
@@ -1,190 +0,0 @@
-# frv testcase for csdiv $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csdiv
-csdiv:
-	set_spr_immed	0x1b1b,cccr
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc4,1
-	test_gr_immed  	4,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc4,1
-	test_gr_immed  	-1,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide will cause overflow
-	set_spr_addr	ok1,lr
-	set_gr_addr	e1,gr17
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-e1:	csdiv      	gr1,gr3,gr2,cc4,1
-	test_gr_immed	1,gr15
-	test_gr_limmed 	0x8000,0x0000,gr2
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc4,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc5,0
-	test_gr_immed  	4,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc5,0
-	test_gr_immed  	-1,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	; divide will cause overflow
-	set_spr_addr	ok1,lr
-	set_gr_addr	e2,gr17
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-e2:	csdiv      	gr1,gr3,gr2,cc5,0
-	test_gr_immed	2,gr15
-	test_gr_limmed 	0x8000,0x0000,gr2
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc5,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	pass
-
-ok1:	; exception handler for overflow
-	test_spr_bits	0x18,3,0x2,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/csll.cgs b/sim/testsuite/sim/frv/csll.cgs
deleted file mode 100644
index 0186756fed6..00000000000
--- a/sim/testsuite/sim/frv/csll.cgs
+++ /dev/null
@@ -1,180 +0,0 @@
-# frv testcase for csll $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csll
-csll:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc0,1
-	test_icc	1 1 0 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc0,1
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc4,1
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc4,1
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 0 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc4,0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed 	1,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc4,0
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc1,0
-	test_icc	1 1 0 1 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc1,0
-	test_icc	1 1 1 1 icc1
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc5,0
-	test_icc	0 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc5,0
-	test_icc	1 0 1 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 0 1 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 1 1 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc5,1
-	test_icc	0 1 1 1 icc1
-	test_gr_immed 	1,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc5,1
-	test_icc	1 0 1 0 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,2		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 0 1 icc2
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 1 1 icc2
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,2		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc6,1
-	test_icc	0 1 1 1 icc2
-	test_gr_immed 	1,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,2		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc6,1
-	test_icc	1 0 1 0 icc2
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,3		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 0 1 icc3
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 1 1 icc3
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,3		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc7,1
-	test_icc	0 1 1 1 icc3
-	test_gr_immed 	1,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,3		; Set mask opposite of expected
-	csll      	gr8,gr7,gr8,cc7,1
-	test_icc	1 0 1 0 icc3
-	test_gr_immed  	2,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/csllcc.cgs b/sim/testsuite/sim/frv/csllcc.cgs
deleted file mode 100644
index 0c5b9af8ae4..00000000000
--- a/sim/testsuite/sim/frv/csllcc.cgs
+++ /dev/null
@@ -1,180 +0,0 @@
-# frv testcase for csllcc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csllcc
-csllcc:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc0,1
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc0,1
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc4,1
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc4,1
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 0 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc4,0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed 	1,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc4,0
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc1,0
-	test_icc	0 0 0 1 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc1,0
-	test_icc	0 0 0 1 icc1
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc5,0
-	test_icc	1 0 0 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc5,0
-	test_icc	0 1 1 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 0 1 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 1 1 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc5,1
-	test_icc	0 1 1 1 icc1
-	test_gr_immed 	1,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc5,1
-	test_icc	1 0 1 0 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,2		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 0 1 icc2
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 1 1 icc2
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,2		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc6,1
-	test_icc	0 1 1 1 icc2
-	test_gr_immed 	1,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,2		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc6,1
-	test_icc	1 0 1 0 icc2
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,3		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 0 1 icc3
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 1 1 icc3
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,3		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc7,1
-	test_icc	0 1 1 1 icc3
-	test_gr_immed 	1,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,3		; Set mask opposite of expected
-	csllcc      	gr8,gr7,gr8,cc7,1
-	test_icc	1 0 1 0 icc3
-	test_gr_immed  	2,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/csmul.cgs b/sim/testsuite/sim/frv/csmul.cgs
deleted file mode 100644
index 25346e7d18f..00000000000
--- a/sim/testsuite/sim/frv/csmul.cgs
+++ /dev/null
@@ -1,1044 +0,0 @@
-# frv testcase for csmul $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csmul
-csmul:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	1,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_limmed 	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0xbfff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_limmed	0xc000,0x0000,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_limmed	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc4,1
-	test_gr_limmed	0x4000,0x0000,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	1,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_limmed 	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0xbfff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_limmed	0xc000,0x0000,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_limmed	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc5,0
-	test_gr_limmed	0x4000,0x0000,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr8
-	test_gr_immed  	0,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed	-4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed	0,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_immed  	-4,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_immed  	0,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc4,0
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr8
-	test_gr_immed  	0,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed	-4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed	0,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_immed  	-4,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_immed  	0,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc5,1
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr8
-	test_gr_immed  	0,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed	-4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed	0,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_immed  	-4,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_immed  	0,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc6,0
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr8
-	test_gr_immed  	0,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed	-4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed	0,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_immed  	-4,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_immed  	0,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	csmul      	gr7,gr8,gr8,cc7,1
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/csmulcc.cgs b/sim/testsuite/sim/frv/csmulcc.cgs
deleted file mode 100644
index 26c7e66e136..00000000000
--- a/sim/testsuite/sim/frv/csmulcc.cgs
+++ /dev/null
@@ -1,1380 +0,0 @@
-# frv testcase for csmulcc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csmulcc
-csmulcc:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0xc,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	set_icc		0xd,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0xe,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	set_icc		0xb,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0x8,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0xd,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0xe,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	set_icc		0xf,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_icc		0xc,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 0 icc0
-	test_gr_limmed 	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x5,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	1 0 0 1 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0x6,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0x4,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	set_icc		0x9,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0xa,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0xbfff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x4,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x5,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x6,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0x7,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed	0xc000,0x0000,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0xc,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0xd,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	set_icc		0xe,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xf,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xc,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0xd,0
-	csmulcc      	gr7,gr8,gr8,cc0,1
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	set_icc		0xe,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0xf,0
-	csmulcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 0 1 1 icc0
-	test_gr_limmed	0x4000,0x0000,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x0,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	set_icc		0x1,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0x2,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	set_icc		0x3,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0x4,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0x5,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0x6,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	set_icc		0x7,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_icc		0x8,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0x7fff,0xffff,gr8
-	test_gr_immed  	0,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x9,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	1 0 0 1 icc0
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0xa,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0xb,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0xc,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	1 1 0 0 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	set_icc		0xd,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	1 1 0 1 icc0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0xe,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xf,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x0,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x1,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x2,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed	-4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0x3,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	0 0 1 1 icc0
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed	0,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0x4,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0x5,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	set_icc		0x6,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x8,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x9,0
-	csmulcc      	gr7,gr8,gr8,cc0,0
-	test_icc	1 0 0 1 icc0
-	test_gr_immed  	-4,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	set_icc		0xa,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_immed  	0,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0xb,0
-	csmulcc      	gr7,gr8,gr8,cc4,0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0xc,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	set_icc		0xd,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 1 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0xe,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 0 1 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	set_icc		0xb,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0x8,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 1 0 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0xd,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 1 icc1
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0xe,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 0 1 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	set_icc		0xf,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 0 1 1 icc1
-	test_gr_immed  	1,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_icc		0xc,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 0 icc1
-	test_gr_limmed 	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x5,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	1 0 0 1 icc1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0x6,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	1 0 1 0 icc1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	1 0 1 1 icc1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0x4,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	set_icc		0x9,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 1 0 1 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0xa,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 1 1 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0xbfff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x4,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	1 0 0 0 icc1
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x5,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	1 0 0 1 icc1
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x6,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	1 0 1 0 icc1
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0x7,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed	0xc000,0x0000,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0xc,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0xd,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 1 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	set_icc		0xe,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 0 1 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xf,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 0 1 1 icc1
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xc,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0xd,1
-	csmulcc      	gr7,gr8,gr8,cc1,0
-	test_icc	0 0 0 1 icc1
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	set_icc		0xe,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 0 1 0 icc1
-	test_gr_limmed	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0xf,1
-	csmulcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 0 1 1 icc1
-	test_gr_limmed	0x4000,0x0000,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x0,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 0 0 0 icc1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	set_icc		0x1,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 0 0 1 icc1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0x2,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	0 0 1 0 icc1
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	set_icc		0x3,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	0 0 1 1 icc1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0x4,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 1 0 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0x5,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 1 0 1 icc1
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0x6,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	0 1 1 0 icc1
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	set_icc		0x7,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_icc		0x8,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	1 0 0 0 icc1
-	test_gr_limmed 	0x7fff,0xffff,gr8
-	test_gr_immed  	0,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x9,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	1 0 0 1 icc1
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0xa,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	1 0 1 0 icc1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0xb,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	1 0 1 1 icc1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0xc,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	1 1 0 0 icc1
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	set_icc		0xd,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	1 1 0 1 icc1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0xe,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	1 1 1 0 icc1
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xf,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	1 1 1 1 icc1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x0,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 0 0 0 icc1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x1,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 0 0 1 icc1
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x2,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	0 0 1 0 icc1
-	test_gr_immed	-4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0x3,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	0 0 1 1 icc1
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed	0,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0x4,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 1 0 0 icc1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0x5,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 1 0 1 icc1
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	set_icc		0x6,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	0 1 1 0 icc1
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x8,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x9,1
-	csmulcc      	gr7,gr8,gr8,cc1,1
-	test_icc	1 0 0 1 icc1
-	test_gr_immed  	-4,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	set_icc		0xa,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	1 0 1 0 icc1
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_immed  	0,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0xb,1
-	csmulcc      	gr7,gr8,gr8,cc5,1
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x0,2
-	csmulcc      	gr7,gr8,gr8,cc2,0
-	test_icc	0 0 0 0 icc2
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	set_icc		0x1,2
-	csmulcc      	gr7,gr8,gr8,cc2,1
-	test_icc	0 0 0 1 icc2
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0x2,2
-	csmulcc      	gr7,gr8,gr8,cc6,0
-	test_icc	0 0 1 0 icc2
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	set_icc		0x3,2
-	csmulcc      	gr7,gr8,gr8,cc6,1
-	test_icc	0 0 1 1 icc2
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0x4,2
-	csmulcc      	gr7,gr8,gr8,cc2,0
-	test_icc	0 1 0 0 icc2
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0x5,2
-	csmulcc      	gr7,gr8,gr8,cc2,1
-	test_icc	0 1 0 1 icc2
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0x6,2
-	csmulcc      	gr7,gr8,gr8,cc6,1
-	test_icc	0 1 1 0 icc2
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	set_icc		0x7,2
-	csmulcc      	gr7,gr8,gr8,cc6,0
-	test_icc	0 1 1 1 icc2
-	test_gr_immed  	4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_icc		0x8,2
-	csmulcc      	gr7,gr8,gr8,cc2,1
-	test_icc	1 0 0 0 icc2
-	test_gr_limmed 	0x7fff,0xffff,gr8
-	test_gr_immed  	0,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x9,2
-	csmulcc      	gr7,gr8,gr8,cc2,0
-	test_icc	1 0 0 1 icc2
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0xa,2
-	csmulcc      	gr7,gr8,gr8,cc6,1
-	test_icc	1 0 1 0 icc2
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0xb,2
-	csmulcc      	gr7,gr8,gr8,cc6,0
-	test_icc	1 0 1 1 icc2
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0xc,2
-	csmulcc      	gr7,gr8,gr8,cc2,1
-	test_icc	1 1 0 0 icc2
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	set_icc		0xd,2
-	csmulcc      	gr7,gr8,gr8,cc2,0
-	test_icc	1 1 0 1 icc2
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0xe,2
-	csmulcc      	gr7,gr8,gr8,cc6,1
-	test_icc	1 1 1 0 icc2
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xf,2
-	csmulcc      	gr7,gr8,gr8,cc6,0
-	test_icc	1 1 1 1 icc2
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x0,2
-	csmulcc      	gr7,gr8,gr8,cc2,1
-	test_icc	0 0 0 0 icc2
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x1,2
-	csmulcc      	gr7,gr8,gr8,cc2,0
-	test_icc	0 0 0 1 icc2
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x2,2
-	csmulcc      	gr7,gr8,gr8,cc6,1
-	test_icc	0 0 1 0 icc2
-	test_gr_immed	-4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0x3,2
-	csmulcc      	gr7,gr8,gr8,cc6,0
-	test_icc	0 0 1 1 icc2
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed	0,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0x4,2
-	csmulcc      	gr7,gr8,gr8,cc2,1
-	test_icc	0 1 0 0 icc2
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0x5,2
-	csmulcc      	gr7,gr8,gr8,cc2,0
-	test_icc	0 1 0 1 icc2
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	set_icc		0x6,2
-	csmulcc      	gr7,gr8,gr8,cc6,1
-	test_icc	0 1 1 0 icc2
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,2
-	csmulcc      	gr7,gr8,gr8,cc6,0
-	test_icc	0 1 1 1 icc2
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x8,2
-	csmulcc      	gr7,gr8,gr8,cc2,1
-	test_icc	1 0 0 0 icc2
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x9,2
-	csmulcc      	gr7,gr8,gr8,cc2,0
-	test_icc	1 0 0 1 icc2
-	test_gr_immed  	-4,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	set_icc		0xa,2
-	csmulcc      	gr7,gr8,gr8,cc6,1
-	test_icc	1 0 1 0 icc2
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_immed  	0,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0xb,2
-	csmulcc      	gr7,gr8,gr8,cc6,0
-	test_icc	1 0 1 1 icc2
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x0,3
-	csmulcc      	gr7,gr8,gr8,cc3,0
-	test_icc	0 0 0 0 icc3
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	set_icc		0x1,3
-	csmulcc      	gr7,gr8,gr8,cc3,1
-	test_icc	0 0 0 1 icc3
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0x2,3
-	csmulcc      	gr7,gr8,gr8,cc7,0
-	test_icc	0 0 1 0 icc3
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	set_icc		0x3,3
-	csmulcc      	gr7,gr8,gr8,cc7,1
-	test_icc	0 0 1 1 icc3
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0x4,3
-	csmulcc      	gr7,gr8,gr8,cc3,0
-	test_icc	0 1 0 0 icc3
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0x5,3
-	csmulcc      	gr7,gr8,gr8,cc3,1
-	test_icc	0 1 0 1 icc3
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0x6,3
-	csmulcc      	gr7,gr8,gr8,cc7,1
-	test_icc	0 1 1 0 icc3
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	set_icc		0x7,3
-	csmulcc      	gr7,gr8,gr8,cc7,0
-	test_icc	0 1 1 1 icc3
-	test_gr_immed  	4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_icc		0x8,3
-	csmulcc      	gr7,gr8,gr8,cc3,1
-	test_icc	1 0 0 0 icc3
-	test_gr_limmed 	0x7fff,0xffff,gr8
-	test_gr_immed  	0,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x9,3
-	csmulcc      	gr7,gr8,gr8,cc3,0
-	test_icc	1 0 0 1 icc3
-	test_gr_immed  	2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0xa,3
-	csmulcc      	gr7,gr8,gr8,cc7,1
-	test_icc	1 0 1 0 icc3
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0xb,3
-	csmulcc      	gr7,gr8,gr8,cc7,0
-	test_icc	1 0 1 1 icc3
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0xc,3
-	csmulcc      	gr7,gr8,gr8,cc3,1
-	test_icc	1 1 0 0 icc3
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	set_icc		0xd,3
-	csmulcc      	gr7,gr8,gr8,cc3,0
-	test_icc	1 1 0 1 icc3
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0xe,3
-	csmulcc      	gr7,gr8,gr8,cc7,1
-	test_icc	1 1 1 0 icc3
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xf,3
-	csmulcc      	gr7,gr8,gr8,cc7,0
-	test_icc	1 1 1 1 icc3
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x0,3
-	csmulcc      	gr7,gr8,gr8,cc3,1
-	test_icc	0 0 0 0 icc3
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x1,3
-	csmulcc      	gr7,gr8,gr8,cc3,0
-	test_icc	0 0 0 1 icc3
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x2,3
-	csmulcc      	gr7,gr8,gr8,cc7,1
-	test_icc	0 0 1 0 icc3
-	test_gr_immed	-4,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0x3,3
-	csmulcc      	gr7,gr8,gr8,cc7,0
-	test_icc	0 0 1 1 icc3
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed	0,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0x4,3
-	csmulcc      	gr7,gr8,gr8,cc3,1
-	test_icc	0 1 0 0 icc3
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0x5,3
-	csmulcc      	gr7,gr8,gr8,cc3,0
-	test_icc	0 1 0 1 icc3
-	test_gr_immed  	-2,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	set_icc		0x6,3
-	csmulcc      	gr7,gr8,gr8,cc7,1
-	test_icc	0 1 1 0 icc3
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,3
-	csmulcc      	gr7,gr8,gr8,cc7,0
-	test_icc	0 1 1 1 icc3
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x8,3
-	csmulcc      	gr7,gr8,gr8,cc3,1
-	test_icc	1 0 0 0 icc3
-	test_gr_immed  	-2,gr8
-	test_gr_immed	0,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x9,3
-	csmulcc      	gr7,gr8,gr8,cc3,0
-	test_icc	1 0 0 1 icc3
-	test_gr_immed  	-4,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	set_icc		0xa,3
-	csmulcc      	gr7,gr8,gr8,cc7,1
-	test_icc	1 0 1 0 icc3
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_immed  	0,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0xb,3
-	csmulcc      	gr7,gr8,gr8,cc7,0
-	test_icc	1 0 1 1 icc3
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/csra.cgs b/sim/testsuite/sim/frv/csra.cgs
deleted file mode 100644
index f59de057d68..00000000000
--- a/sim/testsuite/sim/frv/csra.cgs
+++ /dev/null
@@ -1,180 +0,0 @@
-# frv testcase for csra $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csra
-csra:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc0,1
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc0,1
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0xc000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc4,1
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	-1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc4,1
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc0,0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc4,0
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc4,0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc1,0
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc1,0
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0xc000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc5,0
-	test_icc	1 1 1 1 icc1
-	test_gr_immed  	-1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc5,0
-	test_icc	1 0 1 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc1,1
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc5,1
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc5,1
-	test_icc	1 0 1 0 icc1
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc2,0
-	test_icc	0 1 0 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc6,1
-	test_icc	1 1 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,2		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc6,1
-	test_icc	1 0 1 0 icc2
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc3,0
-	test_icc	0 1 0 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc7,1
-	test_icc	1 1 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,3		; Set mask opposite of expected
-	csra      	gr8,gr7,gr8,cc7,1
-	test_icc	1 0 1 0 icc3
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/csracc.cgs b/sim/testsuite/sim/frv/csracc.cgs
deleted file mode 100644
index 64d4cbfb56a..00000000000
--- a/sim/testsuite/sim/frv/csracc.cgs
+++ /dev/null
@@ -1,180 +0,0 @@
-# frv testcase for csracc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csracc
-csracc:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc0,1
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc0,1
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0xc000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc4,1
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	-1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc4,1
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc0,0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc4,0
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc4,0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc1,0
-	test_icc	1 0 0 0 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc1,0
-	test_icc	1 0 1 0 icc1
-	test_gr_limmed 	0xc000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc5,0
-	test_icc	1 0 1 0 icc1
-	test_gr_immed  	-1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc5,0
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc1,1
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc5,1
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc5,1
-	test_icc	1 0 1 0 icc1
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc2,0
-	test_icc	0 1 0 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc6,1
-	test_icc	1 1 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,2		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc6,1
-	test_icc	1 0 1 0 icc2
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc3,0
-	test_icc	0 1 0 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc7,1
-	test_icc	1 1 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,3		; Set mask opposite of expected
-	csracc      	gr8,gr7,gr8,cc7,1
-	test_icc	1 0 1 0 icc3
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/csrl.cgs b/sim/testsuite/sim/frv/csrl.cgs
deleted file mode 100644
index 7a71db4bddb..00000000000
--- a/sim/testsuite/sim/frv/csrl.cgs
+++ /dev/null
@@ -1,180 +0,0 @@
-# frv testcase for csrl $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csrl
-csrl:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc0,1
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc0,1
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc4,1
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc4,1
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc0,0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc4,0
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc4,0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed  0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc1,0
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc1,0
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc5,0
-	test_icc	1 1 1 1 icc1
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc5,0
-	test_icc	1 0 1 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc1,1
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc5,1
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc5,1
-	test_icc	1 0 1 0 icc1
-	test_gr_limmed  0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc2,0
-	test_icc	0 1 0 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc6,1
-	test_icc	1 1 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,2		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc6,1
-	test_icc	1 0 1 0 icc2
-	test_gr_limmed  0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc3,0
-	test_icc	0 1 0 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc7,1
-	test_icc	1 1 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,3		; Set mask opposite of expected
-	csrl      	gr8,gr7,gr8,cc7,1
-	test_icc	1 0 1 0 icc3
-	test_gr_limmed  0x4000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/csrlcc.cgs b/sim/testsuite/sim/frv/csrlcc.cgs
deleted file mode 100644
index fb89456f5a5..00000000000
--- a/sim/testsuite/sim/frv/csrlcc.cgs
+++ /dev/null
@@ -1,180 +0,0 @@
-# frv testcase for csrlcc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csrlcc
-csrlcc:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc0,1
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc0,1
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc4,1
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc4,1
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc0,0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc4,0
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc4,0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed  0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc1,0
-	test_icc	1 0 0 0 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc1,0
-	test_icc	0 0 1 0 icc1
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc5,0
-	test_icc	0 0 1 0 icc1
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc5,0
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc1,1
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc5,1
-	test_icc	1 1 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,1		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc5,1
-	test_icc	1 0 1 0 icc1
-	test_gr_limmed  0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc2,0
-	test_icc	0 1 0 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc6,1
-	test_icc	1 1 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,2		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc6,1
-	test_icc	1 0 1 0 icc2
-	test_gr_limmed  0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc3,0
-	test_icc	0 1 0 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc7,1
-	test_icc	1 1 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,3		; Set mask opposite of expected
-	csrlcc      	gr8,gr7,gr8,cc7,1
-	test_icc	1 0 1 0 icc3
-	test_gr_limmed  0x4000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cst.cgs b/sim/testsuite/sim/frv/cst.cgs
deleted file mode 100644
index 8244edf0d27..00000000000
--- a/sim/testsuite/sim/frv/cst.cgs
+++ /dev/null
@@ -1,126 +0,0 @@
-# frv testcase for cst $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cst
-cst:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xffff,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xeeee,0xffff,gr21
-
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cst		gr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xcccc,0xdddd,gr21
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cst		gr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xffff,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xeeee,0xffff,gr21
-
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cst		gr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xcccc,0xdddd,gr21
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cst		gr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cst		gr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cst		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cst		gr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstb.cgs b/sim/testsuite/sim/frv/cstb.cgs
deleted file mode 100644
index 7b62558d83c..00000000000
--- a/sim/testsuite/sim/frv/cstb.cgs
+++ /dev/null
@@ -1,120 +0,0 @@
-# frv testcase for cstb $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstb		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffad,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstb		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffad,0xeeef,sp
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstb		gr8,@(sp,gr7),cc4,1
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xffad,0xee00,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstb		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstb		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstb		gr8,@(sp,gr7),cc4,0
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstb		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffad,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstb		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffad,0xeeef,sp
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstb		gr8,@(sp,gr7),cc5,0
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xffad,0xee00,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstb		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstb		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstb		gr8,@(sp,gr7),cc5,1
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstb		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstb		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstb		gr8,@(sp,gr7),cc6,0
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstb		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstb		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstb		gr8,@(sp,gr7),cc7,1
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstbf.cgs b/sim/testsuite/sim/frv/cstbf.cgs
deleted file mode 100644
index 23e1ae432de..00000000000
--- a/sim/testsuite/sim/frv/cstbf.cgs
+++ /dev/null
@@ -1,120 +0,0 @@
-# frv testcase for cstbf $FRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstbf
-cstbf:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbf		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffad,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbf		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffad,0xaaef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbf		fr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xffad,0xaabb,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbf		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbf		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbf		fr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbf		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffad,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbf		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffad,0xaaef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbf		fr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xffad,0xaabb,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbf		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbf		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbf		fr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbf		fr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbf		fr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbf		fr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbf		fr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbf		fr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbf		fr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstbfu.cgs b/sim/testsuite/sim/frv/cstbfu.cgs
deleted file mode 100644
index 01943be1e88..00000000000
--- a/sim/testsuite/sim/frv/cstbfu.cgs
+++ /dev/null
@@ -1,152 +0,0 @@
-# frv testcase for cstbfu $FRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstbfu
-cstbfu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbfu		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffad,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	2,gr21
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbfu		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffad,0xaaef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	1,gr21
-	inc_gr_immed	2,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbfu		fr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xffad,0xaabb,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbfu		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbfu		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,gr21
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbfu		fr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbfu		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffad,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	2,gr21
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbfu		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffad,0xaaef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	1,gr21
-	inc_gr_immed	2,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbfu		fr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xffad,0xaabb,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbfu		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbfu		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,gr21
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbfu		fr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbfu		fr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbfu		fr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,gr21
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbfu		fr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_gr_gr	sp,gr21
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstbfu		fr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xffaa,fr8
-	cstbfu		fr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,gr21
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	set_fr_iimmed	0xffff,0xffbb,fr8
-	cstbfu		fr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstbu.cgs b/sim/testsuite/sim/frv/cstbu.cgs
deleted file mode 100644
index f8a9d0f1b70..00000000000
--- a/sim/testsuite/sim/frv/cstbu.cgs
+++ /dev/null
@@ -1,152 +0,0 @@
-# frv testcase for cstbu $GRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstbu
-cstbu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstbu		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffad,0xbeef,sp
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstbu		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffad,0xeeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	-1,gr7
-	inc_gr_immed	2,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstbu		gr8,@(sp,gr7),cc4,1
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xffad,0xee00,gr21
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	gr21,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstbu		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstbu		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstbu		gr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstbu		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffad,0xbeef,sp
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstbu		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffad,0xeeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	-1,gr7
-	inc_gr_immed	2,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstbu		gr8,@(sp,gr7),cc5,0
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xffad,0xee00,gr21
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	gr21,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstbu		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstbu		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstbu		gr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	gr21,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstbu		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstbu		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstbu		gr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	gr21,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstbu		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xffee,gr8
-	cstbu		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	-1,gr7
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_limmed	0xffff,0xff00,gr8
-	cstbu		gr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstd.cgs b/sim/testsuite/sim/frv/cstd.cgs
deleted file mode 100644
index 6904414a73f..00000000000
--- a/sim/testsuite/sim/frv/cstd.cgs
+++ /dev/null
@@ -1,221 +0,0 @@
-# frv testcase for cstd $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstd
-cstd:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstd		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xbeef,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstd		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xaaaa,0xaaaa,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbbbb,0xbbbb,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstd		gr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xcccc,0xcccc,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdddd,0xdddd,gr21
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstd		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstd		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstd		gr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstd		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xbeef,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstd		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xaaaa,0xaaaa,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbbbb,0xbbbb,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstd		gr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xcccc,0xcccc,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdddd,0xdddd,gr21
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstd		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstd		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstd		gr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstd		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstd		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstd		gr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstd		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstd		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstd		gr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstdf.cgs b/sim/testsuite/sim/frv/cstdf.cgs
deleted file mode 100644
index fabbe93f3b6..00000000000
--- a/sim/testsuite/sim/frv/cstdf.cgs
+++ /dev/null
@@ -1,222 +0,0 @@
-# frv testcase for cstdf $GRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstdf
-cstdf:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdf		fr8,@(sp,gr7),cc0,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdf		fr8,@(sp,gr7),cc0,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xaaaa,0xaaaa,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbbbb,0xbbbb,gr22
-
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdf		fr8,@(sp,gr7),cc4,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xcccc,0xcccc,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xdddd,0xdddd,gr22
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdf		fr8,@(sp,gr7),cc0,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdf		fr8,@(sp,gr7),cc0,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdf		fr8,@(sp,gr7),cc4,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdf		fr8,@(sp,gr7),cc1,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdf		fr8,@(sp,gr7),cc1,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xaaaa,0xaaaa,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbbbb,0xbbbb,gr22
-
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdf		fr8,@(sp,gr7),cc5,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xcccc,0xcccc,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xdddd,0xdddd,gr22
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdf		fr8,@(sp,gr7),cc1,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdf		fr8,@(sp,gr7),cc1,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdf		fr8,@(sp,gr7),cc5,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdf		fr8,@(sp,gr7),cc2,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdf		fr8,@(sp,gr7),cc2,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdf		fr8,@(sp,gr7),cc6,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdf		fr8,@(sp,gr7),cc3,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdf		fr8,@(sp,gr7),cc3,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdf		fr8,@(sp,gr7),cc7,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstdfu.cgs b/sim/testsuite/sim/frv/cstdfu.cgs
deleted file mode 100644
index b489bc900c6..00000000000
--- a/sim/testsuite/sim/frv/cstdfu.cgs
+++ /dev/null
@@ -1,248 +0,0 @@
-# frv testcase for cstdfu $GRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstdfu
-cstdfu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdfu		fr8,@(sp,gr7),cc0,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdfu		fr8,@(sp,gr7),cc0,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xaaaa,0xaaaa,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbbbb,0xbbbb,gr22
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdfu		fr8,@(sp,gr7),cc4,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xcccc,0xcccc,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xdddd,0xdddd,gr22
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdfu		fr8,@(sp,gr7),cc0,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-8,sp
-	set_gr_gr	sp,gr23
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdfu		fr8,@(sp,gr7),cc0,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr23
-
-	inc_gr_immed	16,sp
-	set_gr_gr	sp,gr23
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdfu		fr8,@(sp,gr7),cc4,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr23
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdfu		fr8,@(sp,gr7),cc1,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdfu		fr8,@(sp,gr7),cc1,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xaaaa,0xaaaa,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbbbb,0xbbbb,gr22
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdfu		fr8,@(sp,gr7),cc5,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xcccc,0xcccc,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xdddd,0xdddd,gr22
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdfu		fr8,@(sp,gr7),cc1,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-8,sp
-	set_gr_gr	sp,gr23
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdfu		fr8,@(sp,gr7),cc1,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr23
-
-	inc_gr_immed	16,sp
-	set_gr_gr	sp,gr23
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdfu		fr8,@(sp,gr7),cc5,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr23
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdfu		fr8,@(sp,gr7),cc2,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-8,sp
-	set_gr_gr	sp,gr23
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdfu		fr8,@(sp,gr7),cc2,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr23
-
-	inc_gr_immed	16,sp
-	set_gr_gr	sp,gr23
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdfu		fr8,@(sp,gr7),cc6,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr23
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	cstdfu		fr8,@(sp,gr7),cc3,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-8,sp
-	set_gr_gr	sp,gr23
-	set_gr_immed	8,gr7
-	set_fr_iimmed	0xaaaa,0xaaaa,fr8
-	set_fr_iimmed	0xbbbb,0xbbbb,fr9
-	cstdfu		fr8,@(sp,gr7),cc3,0
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr23
-
-	inc_gr_immed	16,sp
-	set_gr_gr	sp,gr23
-	set_gr_immed	-8,gr7
-	set_fr_iimmed	0xcccc,0xcccc,fr8
-	set_fr_iimmed	0xdddd,0xdddd,fr9
-	cstdfu		fr8,@(sp,gr7),cc7,1
-	set_gr_gr	gr21,gr22
-	test_mem_limmed	0xdead,0xbeef,gr22
-	inc_gr_immed	4,gr22
-	test_mem_limmed	0xbeef,0xdead,gr22
-	test_gr_gr	sp,gr23
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstdu.cgs b/sim/testsuite/sim/frv/cstdu.cgs
deleted file mode 100644
index a996ef6d1b7..00000000000
--- a/sim/testsuite/sim/frv/cstdu.cgs
+++ /dev/null
@@ -1,251 +0,0 @@
-# frv testcase for cstdu $GRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstdu
-cstdu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstdu		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xbeef,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstdu		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xaaaa,0xaaaa,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbbbb,0xbbbb,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstdu		gr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xcccc,0xcccc,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdddd,0xdddd,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_gr	sp,gr22
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstdu		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_gr	sp,gr22
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstdu		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_gr	sp,gr22
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstdu		gr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstdu		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xbeef,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstdu		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xaaaa,0xaaaa,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbbbb,0xbbbb,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstdu		gr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xcccc,0xcccc,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdddd,0xdddd,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_gr	sp,gr22
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstdu		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_gr	sp,gr22
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstdu		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_gr	sp,gr22
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstdu		gr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_gr	sp,gr22
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstdu		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_gr	sp,gr22
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstdu		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_gr	sp,gr22
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstdu		gr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-
-	set_gr_gr	sp,gr22
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	cstdu		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-8,sp
-	set_gr_gr	sp,gr22
-	set_gr_immed	8,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	cstdu		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	16,sp
-	set_gr_gr	sp,gr22
-	set_gr_immed	-8,gr7
-	set_gr_limmed	0xcccc,0xcccc,gr8
-	set_gr_limmed	0xdddd,0xdddd,gr9
-	cstdu		gr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_gr_gr	sp,gr22
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstf.cgs b/sim/testsuite/sim/frv/cstf.cgs
deleted file mode 100644
index 94c0f052e56..00000000000
--- a/sim/testsuite/sim/frv/cstf.cgs
+++ /dev/null
@@ -1,126 +0,0 @@
-# frv testcase for cstf $FRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstf
-cstf:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstf		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xffff,gr20
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstf		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xeeee,0xeeee,gr20
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstf		fr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xdddd,0xdddd,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstf		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstf		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstf		fr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstf		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xffff,gr20
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstf		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xeeee,0xeeee,gr20
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstf		fr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xdddd,0xdddd,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstf		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstf		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstf		fr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstf		fr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstf		fr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstf		fr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstf		fr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstf		fr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstf		fr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstfu.cgs b/sim/testsuite/sim/frv/cstfu.cgs
deleted file mode 100644
index ee450c84334..00000000000
--- a/sim/testsuite/sim/frv/cstfu.cgs
+++ /dev/null
@@ -1,158 +0,0 @@
-# frv testcase for cstfu $FRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstfu
-cstfu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstfu		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xffff,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstfu		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xeeee,0xeeee,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	4,sp
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstfu		fr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xdddd,0xdddd,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstfu		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	inc_gr_immed	-4,gr21
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstfu		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	inc_gr_immed	8,gr21
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstfu		fr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstfu		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xffff,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstfu		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xeeee,0xeeee,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	4,sp
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstfu		fr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xdddd,0xdddd,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstfu		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	inc_gr_immed	-4,gr21
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstfu		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	inc_gr_immed	8,gr21
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstfu		fr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstfu		fr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	inc_gr_immed	-4,gr21
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstfu		fr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	inc_gr_immed	8,gr21
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstfu		fr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	cstfu		fr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	4,gr7
-	inc_gr_immed	-4,sp
-	inc_gr_immed	-4,gr21
-	set_fr_iimmed	0xeeee,0xeeee,fr8
-	cstfu		fr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	-4,gr7
-	inc_gr_immed	8,sp
-	inc_gr_immed	8,gr21
-	set_fr_iimmed	0xdddd,0xdddd,fr8
-	cstfu		fr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	pass
diff --git a/sim/testsuite/sim/frv/csth.cgs b/sim/testsuite/sim/frv/csth.cgs
deleted file mode 100644
index b9f743cbd71..00000000000
--- a/sim/testsuite/sim/frv/csth.cgs
+++ /dev/null
@@ -1,120 +0,0 @@
-# frv testcase for csth $GRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csth
-csth:
-	set_spr_immed	0x1b1b,cccr
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csth		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csth		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xeeee,sp
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csth		gr8,@(sp,gr7),cc4,1
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xffff,0xdddd,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csth		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csth		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csth		gr8,@(sp,gr7),cc4,0
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csth		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csth		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xeeee,sp
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csth		gr8,@(sp,gr7),cc5,0
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xffff,0xdddd,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csth		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csth		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csth		gr8,@(sp,gr7),cc5,1
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csth		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csth		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csth		gr8,@(sp,gr7),cc6,0
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csth		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csth		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csth		gr8,@(sp,gr7),cc7,1
-	inc_gr_immed	-4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/csthf.cgs b/sim/testsuite/sim/frv/csthf.cgs
deleted file mode 100644
index 21a64c8ae53..00000000000
--- a/sim/testsuite/sim/frv/csthf.cgs
+++ /dev/null
@@ -1,120 +0,0 @@
-# frv testcase for csthf $FRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csthf
-csthf:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthf		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthf		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xaaaa,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthf		fr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xffff,0xbbbb,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthf		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthf		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthf		fr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthf		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthf		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xaaaa,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthf		fr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xffff,0xbbbb,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthf		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthf		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthf		fr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthf		fr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthf		fr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthf		fr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthf		fr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthf		fr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthf		fr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/csthfu.cgs b/sim/testsuite/sim/frv/csthfu.cgs
deleted file mode 100644
index 252ae7da0a2..00000000000
--- a/sim/testsuite/sim/frv/csthfu.cgs
+++ /dev/null
@@ -1,150 +0,0 @@
-# frv testcase for csthfu $FRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csthfu
-csthfu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthfu		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	2,gr21
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthfu		fr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xaaaa,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	2,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthfu		fr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xffff,0xbbbb,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthfu		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthfu		fr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,gr21
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthfu		fr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthfu		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	2,gr21
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthfu		fr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xaaaa,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	2,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthfu		fr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xffff,0xbbbb,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthfu		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthfu		fr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,gr21
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthfu		fr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthfu		fr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthfu		fr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,gr21
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthfu		fr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr20,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr21
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0x1111,0xffff,fr8
-	csthfu		fr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	set_gr_immed	2,gr7
-	set_fr_iimmed	0xffff,0xaaaa,fr8
-	csthfu		fr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,gr21
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_fr_iimmed	0x2222,0xbbbb,fr8
-	csthfu		fr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr20
-	test_gr_gr	sp,gr21
-
-	pass
diff --git a/sim/testsuite/sim/frv/csthu.cgs b/sim/testsuite/sim/frv/csthu.cgs
deleted file mode 100644
index c7e2255ccaa..00000000000
--- a/sim/testsuite/sim/frv/csthu.cgs
+++ /dev/null
@@ -1,150 +0,0 @@
-# frv testcase for csthu $GRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csthu
-csthu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csthu		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xdead,0xeeee,gr8
-	csthu		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xeeee,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csthu		gr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xffff,0xdddd,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	gr21,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csthu		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csthu		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csthu		gr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,gr20
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csthu		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xdead,0xeeee,gr8
-	csthu		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xeeee,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csthu		gr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xffff,0xdddd,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	gr21,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csthu		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csthu		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csthu		gr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	gr21,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csthu		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csthu		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csthu		gr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_gr_gr	gr21,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	csthu		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_immed	2,gr7
-	set_gr_limmed	0xffff,0xeeee,gr8
-	csthu		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,gr20
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	set_gr_limmed	0xffff,0xdddd,gr8
-	csthu		gr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstq.cgs b/sim/testsuite/sim/frv/cstq.cgs
deleted file mode 100644
index 6f183322cd7..00000000000
--- a/sim/testsuite/sim/frv/cstq.cgs
+++ /dev/null
@@ -1,355 +0,0 @@
-# frv testcase for cstq $GRk,@($GRi,$GRj),$CCi,$cond
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstq
-cstq:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_gr	sp,gr22
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	cstq		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xbeef,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xbeef,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	set_gr_limmed	0xcccc,0xcccc,gr10
-	set_gr_limmed	0xdddd,0xdddd,gr11
-	cstq		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xaaaa,0xaaaa,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbbbb,0xbbbb,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xcccc,0xcccc,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdddd,0xdddd,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	set_gr_limmed	0x1111,0x1111,gr8
-	set_gr_limmed	0x2222,0x2222,gr9
-	set_gr_limmed	0x3333,0x3333,gr10
-	set_gr_limmed	0x4444,0x4444,gr11
-	cstq		gr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0x1111,0x1111,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0x2222,0x2222,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0x3333,0x3333,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0x4444,0x4444,gr21
-
-	set_gr_gr	gr22,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	cstq		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	set_gr_limmed	0xcccc,0xcccc,gr10
-	set_gr_limmed	0xdddd,0xdddd,gr11
-	cstq		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	set_gr_limmed	0x1111,0x1111,gr8
-	set_gr_limmed	0x2222,0x2222,gr9
-	set_gr_limmed	0x3333,0x3333,gr10
-	set_gr_limmed	0x4444,0x4444,gr11
-	cstq		gr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr22,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	cstq		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xbeef,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xbeef,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	set_gr_limmed	0xcccc,0xcccc,gr10
-	set_gr_limmed	0xdddd,0xdddd,gr11
-	cstq		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xaaaa,0xaaaa,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbbbb,0xbbbb,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xcccc,0xcccc,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdddd,0xdddd,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	set_gr_limmed	0x1111,0x1111,gr8
-	set_gr_limmed	0x2222,0x2222,gr9
-	set_gr_limmed	0x3333,0x3333,gr10
-	set_gr_limmed	0x4444,0x4444,gr11
-	cstq		gr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0x1111,0x1111,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0x2222,0x2222,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0x3333,0x3333,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0x4444,0x4444,gr21
-
-	set_gr_gr	gr22,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	cstq		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	set_gr_limmed	0xcccc,0xcccc,gr10
-	set_gr_limmed	0xdddd,0xdddd,gr11
-	cstq		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	set_gr_limmed	0x1111,0x1111,gr8
-	set_gr_limmed	0x2222,0x2222,gr9
-	set_gr_limmed	0x3333,0x3333,gr10
-	set_gr_limmed	0x4444,0x4444,gr11
-	cstq		gr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr22,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	cstq		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	set_gr_limmed	0xcccc,0xcccc,gr10
-	set_gr_limmed	0xdddd,0xdddd,gr11
-	cstq		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	set_gr_limmed	0x1111,0x1111,gr8
-	set_gr_limmed	0x2222,0x2222,gr9
-	set_gr_limmed	0x3333,0x3333,gr10
-	set_gr_limmed	0x4444,0x4444,gr11
-	cstq		gr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr22,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_gr	sp,gr21
-
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	cstq		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	set_gr_limmed	0xbbbb,0xbbbb,gr9
-	set_gr_limmed	0xcccc,0xcccc,gr10
-	set_gr_limmed	0xdddd,0xdddd,gr11
-	cstq		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	set_gr_gr	gr20,gr21
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	set_gr_limmed	0x1111,0x1111,gr8
-	set_gr_limmed	0x2222,0x2222,gr9
-	set_gr_limmed	0x3333,0x3333,gr10
-	set_gr_limmed	0x4444,0x4444,gr11
-	cstq		gr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xbeef,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xdead,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xdead,0xbeef,gr21
-	inc_gr_immed	4,gr21
-	test_mem_limmed	0xbeef,0xdead,gr21
-
-	pass
diff --git a/sim/testsuite/sim/frv/cstu.cgs b/sim/testsuite/sim/frv/cstu.cgs
deleted file mode 100644
index 81a5b82496c..00000000000
--- a/sim/testsuite/sim/frv/cstu.cgs
+++ /dev/null
@@ -1,152 +0,0 @@
-# frv testcase for cstu $GRk,@($GRi,$GRj),$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cstu
-cstu:
-	set_spr_immed	0x1b1b,cccr
-	set_gr_gr	sp,gr21
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc0,1
-	test_mem_limmed	0xeeee,0xffff,gr21
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cstu		gr8,@(sp,gr7),cc4,1
-	test_mem_limmed	0xcccc,0xdddd,gr21
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc0,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	8,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cstu		gr8,@(sp,gr7),cc4,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc1,0
-	test_mem_limmed	0xeeee,0xffff,gr21
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cstu		gr8,@(sp,gr7),cc5,0
-	test_mem_limmed	0xcccc,0xdddd,gr21
-	test_gr_gr	sp,gr21
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc1,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	8,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cstu		gr8,@(sp,gr7),cc5,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc2,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc2,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	8,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cstu		gr8,@(sp,gr7),cc6,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	set_gr_gr	gr21,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc3,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr21
-
-	inc_gr_immed	-4,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xeeee,0xffff,gr8
-	cstu		gr8,@(sp,gr7),cc3,0
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	8,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	-4,gr7
-	set_gr_limmed	0xcccc,0xdddd,gr8
-	cstu		gr8,@(sp,gr7),cc7,1
-	test_mem_limmed	0xdead,0xbeef,gr21
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/csub.cgs b/sim/testsuite/sim/frv/csub.cgs
deleted file mode 100644
index 7d07c147327..00000000000
--- a/sim/testsuite/sim/frv/csub.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for csub $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csub
-csub:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	csub      	gr8,gr7,gr8,cc4,1
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed	0x8000,0x0000,gr8
-	csub		gr8,gr7,gr8,cc4,1
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	csub		gr8,gr8,gr8,cc4,1
-	test_gr_immed  	0,gr8
-
-	csub		gr8,gr7,gr8,cc4,1
-	test_gr_immed  	-1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	csub      	gr8,gr7,gr8,cc4,0
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed	0x8000,0x0000,gr8
-	csub		gr8,gr7,gr8,cc4,0
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	csub		gr8,gr8,gr8,cc4,0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	csub		gr8,gr7,gr8,cc4,0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	csub      	gr8,gr7,gr8,cc5,0
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed	0x8000,0x0000,gr8
-	csub		gr8,gr7,gr8,cc5,0
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	csub		gr8,gr8,gr8,cc5,0
-	test_gr_immed  	0,gr8
-
-	csub		gr8,gr7,gr8,cc5,0
-	test_gr_immed  	-1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	csub      	gr8,gr7,gr8,cc5,1
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed	0x8000,0x0000,gr8
-	csub		gr8,gr7,gr8,cc5,1
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	csub		gr8,gr8,gr8,cc5,1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	csub		gr8,gr7,gr8,cc5,1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	csub      	gr8,gr7,gr8,cc6,1
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed	0x8000,0x0000,gr8
-	csub		gr8,gr7,gr8,cc6,0
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	csub		gr8,gr8,gr8,cc6,1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	csub		gr8,gr7,gr8,cc6,0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	csub      	gr8,gr7,gr8,cc7,0
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed	0x8000,0x0000,gr8
-	csub		gr8,gr7,gr8,cc7,1
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	csub		gr8,gr8,gr8,cc7,0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	csub		gr8,gr7,gr8,cc7,1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/csubcc.cgs b/sim/testsuite/sim/frv/csubcc.cgs
deleted file mode 100644
index 64cd93b16f5..00000000000
--- a/sim/testsuite/sim/frv/csubcc.cgs
+++ /dev/null
@@ -1,156 +0,0 @@
-# frv testcase for csubcc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global csubcc
-csubcc:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csubcc      	gr8,gr7,gr8,cc0,1
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc0,1
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed 	0x7fff,0xffff,gr8
-
-	set_icc         0x0b,0		; Set mask opposite of expected
-	csubcc		gr8,gr8,gr8,cc4,1
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,0		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc4,1
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	csubcc      	gr8,gr7,gr8,cc0,0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc0,0
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x0b,0		; Set mask opposite of expected
-	csubcc		gr8,gr8,gr8,cc4,0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x06,0		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc4,0
-	test_icc	0 1 1 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csubcc      	gr8,gr7,gr8,cc1,0
-	test_icc	0 0 0 0 icc1
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc1,0
-	test_icc	0 0 1 0 icc1
-	test_gr_limmed 	0x7fff,0xffff,gr8
-
-	set_icc         0x0b,1		; Set mask opposite of expected
-	csubcc		gr8,gr8,gr8,cc5,0
-	test_icc	0 1 0 0 icc1
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,1		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc5,0
-	test_icc	1 0 0 1 icc1
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,1		; Set mask opposite of expected
-	csubcc      	gr8,gr7,gr8,cc1,1
-	test_icc	1 1 1 1 icc1
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,1		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc1,1
-	test_icc	1 1 0 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x0b,1		; Set mask opposite of expected
-	csubcc		gr8,gr8,gr8,cc5,1
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x06,1		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc5,1
-	test_icc	0 1 1 0 icc1
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,2		; Set mask opposite of expected
-	csubcc      	gr8,gr7,gr8,cc2,0
-	test_icc	1 1 1 1 icc2
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,2		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc2,0
-	test_icc	1 1 0 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x0b,2		; Set mask opposite of expected
-	csubcc		gr8,gr8,gr8,cc6,1
-	test_icc	1 0 1 1 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x06,2		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc6,1
-	test_icc	0 1 1 0 icc2
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,3		; Set mask opposite of expected
-	csubcc      	gr8,gr7,gr8,cc3,0
-	test_icc	1 1 1 1 icc3
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,3		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc3,0
-	test_icc	1 1 0 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x0b,3		; Set mask opposite of expected
-	csubcc		gr8,gr8,gr8,cc7,1
-	test_icc	1 0 1 1 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_icc         0x06,3		; Set mask opposite of expected
-	csubcc		gr8,gr7,gr8,cc7,1
-	test_icc	0 1 1 0 icc3
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cswap.cgs b/sim/testsuite/sim/frv/cswap.cgs
deleted file mode 100644
index 19a51d5481d..00000000000
--- a/sim/testsuite/sim/frv/cswap.cgs
+++ /dev/null
@@ -1,212 +0,0 @@
-# frv testcase for cswap @($GRi,$GRj),$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cswap
-cswap:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_gr		sp,gr20
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr21
-	set_mem_limmed		0xbeef,0xdead,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr22
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		4,sp
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		-4,gr7
-	cswap @(sp,gr7),gr8,cc0,1
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_immed		0,gr7
-	cswap @(sp,gr7),gr8,cc0,1
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xdead,0xbeef,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_immed		4,gr7
-	cswap @(sp,gr7),gr8,cc4,1
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xdead,0xbeef,gr21
-	test_mem_limmed		0xbeef,0xdead,gr20
-
-	set_gr_gr		gr20,sp
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr21
-	set_mem_limmed		0xbeef,0xdead,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr22
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		4,sp
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		-4,gr7
-	cswap @(sp,gr7),gr8,cc0,0
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_limmed		0xdead,0xbeef,gr8
-	set_gr_immed		0,gr7
-	cswap @(sp,gr7),gr8,cc0,0
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		4,gr7
-	cswap @(sp,gr7),gr8,cc4,0
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_gr		gr20,sp
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr21
-	set_mem_limmed		0xbeef,0xdead,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr22
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		4,sp
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		-4,gr7
-	cswap @(sp,gr7),gr8,cc1,0
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_immed		0,gr7
-	cswap @(sp,gr7),gr8,cc1,0
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xdead,0xbeef,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_immed		4,gr7
-	cswap @(sp,gr7),gr8,cc5,0
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xdead,0xbeef,gr21
-	test_mem_limmed		0xbeef,0xdead,gr20
-
-	set_gr_gr		gr20,sp
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr21
-	set_mem_limmed		0xbeef,0xdead,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr22
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		4,sp
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		-4,gr7
-	cswap @(sp,gr7),gr8,cc1,1
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_limmed		0xdead,0xbeef,gr8
-	set_gr_immed		0,gr7
-	cswap @(sp,gr7),gr8,cc1,1
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		4,gr7
-	cswap @(sp,gr7),gr8,cc5,1
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_gr		gr20,sp
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr21
-	set_mem_limmed		0xbeef,0xdead,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr22
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		4,sp
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		-4,gr7
-	cswap @(sp,gr7),gr8,cc2,0
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_limmed		0xdead,0xbeef,gr8
-	set_gr_immed		0,gr7
-	cswap @(sp,gr7),gr8,cc2,1
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		4,gr7
-	cswap @(sp,gr7),gr8,cc6,0
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_gr		gr20,sp
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr21
-	set_mem_limmed		0xbeef,0xdead,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr22
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		4,sp
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		-4,gr7
-	cswap @(sp,gr7),gr8,cc3,1
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_limmed		0xdead,0xbeef,gr8
-	set_gr_immed		0,gr7
-	cswap @(sp,gr7),gr8,cc3,0
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		4,gr7
-	cswap @(sp,gr7),gr8,cc7,1
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xdead,0xbeef,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/cudiv.cgs b/sim/testsuite/sim/frv/cudiv.cgs
deleted file mode 100644
index 78f44ae8407..00000000000
--- a/sim/testsuite/sim/frv/cudiv.cgs
+++ /dev/null
@@ -1,96 +0,0 @@
-# frv testcase for cudiv $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cudiv
-cudiv:
-	set_spr_immed	0x1b1b,cccr
-
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	cudiv      	gr3,gr2,gr3,cc0,1
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x00000004,gr3
-
-	; example 1 from division in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	cudiv      	gr3,gr2,gr3,cc4,1
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_immed  	0x000000e0,gr3
-
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	cudiv      	gr3,gr2,gr3,cc0,0
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x0000000c,gr3
-
-	; example 1 from division in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	cudiv      	gr3,gr2,gr3,cc4,0
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_limmed 	0xfedc,0xba98,gr3
-
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	cudiv      	gr3,gr2,gr3,cc1,0
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x00000004,gr3
-
-	; example 1 from division in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	cudiv      	gr3,gr2,gr3,cc5,0
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_immed  	0x000000e0,gr3
-
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	cudiv      	gr3,gr2,gr3,cc1,1
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x0000000c,gr3
-
-	; example 1 from division in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	cudiv      	gr3,gr2,gr3,cc5,1
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_limmed 	0xfedc,0xba98,gr3
-
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	cudiv      	gr3,gr2,gr3,cc2,0
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x0000000c,gr3
-
-	; example 1 from division in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	cudiv      	gr3,gr2,gr3,cc6,1
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_limmed 	0xfedc,0xba98,gr3
-
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	cudiv      	gr3,gr2,gr3,cc3,0
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x0000000c,gr3
-
-	; example 1 from division in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	cudiv      	gr3,gr2,gr3,cc7,1
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_limmed 	0xfedc,0xba98,gr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/cxor.cgs b/sim/testsuite/sim/frv/cxor.cgs
deleted file mode 100644
index 54a672dfe70..00000000000
--- a/sim/testsuite/sim/frv/cxor.cgs
+++ /dev/null
@@ -1,180 +0,0 @@
-# frv testcase for cxor $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cxor
-cxor:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc0,1
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed	0x00000000,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc0,1
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc4,1
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc4,1
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed  0xdead,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc0,0
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed	0x00007fff,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc0,0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc4,0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc4,0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed  0x0000,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc1,0
-	test_icc	0 1 1 1 icc1
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed	0x00000000,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc1,0
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,1		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc5,0
-	test_icc	1 0 1 1 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc5,0
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed  0xdead,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc1,1
-	test_icc	0 1 1 1 icc1
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed	0x00007fff,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc1,1
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,1		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc5,1
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed 	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc5,1
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed  0x0000,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,2		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc2,0
-	test_icc	0 1 1 1 icc2
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed	0x00007fff,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,2		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc2,0
-	test_icc	1 0 0 0 icc2
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,2		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc6,1
-	test_icc	1 0 1 1 icc2
-	test_gr_limmed 	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc6,1
-	test_icc	0 1 0 1 icc2
-	test_gr_limmed  0x0000,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,3		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc3,0
-	test_icc	0 1 1 1 icc3
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed	0x00007fff,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,3		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc3,0
-	test_icc	1 0 0 0 icc3
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,3		; Set mask opposite of expected
-	cxor      	gr7,gr8,gr8,cc7,1
-	test_icc	1 0 1 1 icc3
-	test_gr_limmed 	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	cxor		gr7,gr8,gr8,cc7,1
-	test_icc	0 1 0 1 icc3
-	test_gr_limmed  0x0000,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/cxorcc.cgs b/sim/testsuite/sim/frv/cxorcc.cgs
deleted file mode 100644
index 86d917d288c..00000000000
--- a/sim/testsuite/sim/frv/cxorcc.cgs
+++ /dev/null
@@ -1,180 +0,0 @@
-# frv testcase for cxorcc $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global cxorcc
-cxorcc:
-	set_spr_immed	0x1b1b,cccr
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc0,1
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed	0x00000000,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc0,1
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc4,1
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc4,1
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed  0xdead,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc0,0
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed	0x00007fff,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc0,0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc4,0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc4,0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed  0x0000,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc1,0
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed	0x00000000,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc1,0
-	test_icc	0 1 0 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,1		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc5,0
-	test_icc	0 1 1 1 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc5,0
-	test_icc	1 0 0 1 icc1
-	test_gr_limmed  0xdead,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,1		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc1,1
-	test_icc	0 1 1 1 icc1
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed	0x00007fff,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,1		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc1,1
-	test_icc	1 0 0 0 icc1
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,1		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc5,1
-	test_icc	1 0 1 1 icc1
-	test_gr_limmed 	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,1		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc5,1
-	test_icc	0 1 0 1 icc1
-	test_gr_limmed  0x0000,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,2		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc2,0
-	test_icc	0 1 1 1 icc2
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed	0x00007fff,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,2		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc2,0
-	test_icc	1 0 0 0 icc2
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,2		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc6,1
-	test_icc	1 0 1 1 icc2
-	test_gr_limmed 	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,2		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc6,1
-	test_icc	0 1 0 1 icc2
-	test_gr_limmed  0x0000,0xbeef,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,3		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc3,0
-	test_icc	0 1 1 1 icc3
-	test_gr_limmed 	0x5555,0x5555,gr8
-
-	set_gr_immed	0x00007fff,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,3		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc3,0
-	test_icc	1 0 0 0 icc3
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,3		; Set mask opposite of expected
-	cxorcc      	gr7,gr8,gr8,cc7,1
-	test_icc	1 0 1 1 icc3
-	test_gr_limmed 	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,3		; Set mask opposite of expected
-	cxorcc		gr7,gr8,gr8,cc7,1
-	test_icc	0 1 0 1 icc3
-	test_gr_limmed  0x0000,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/dcef.cgs b/sim/testsuite/sim/frv/dcef.cgs
deleted file mode 100644
index 74475ef0b22..00000000000
--- a/sim/testsuite/sim/frv/dcef.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for dcef @(GRi,GRj),a
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global dcef
-dcef:
-	and_spr_immed	0x7fffffff,hsr0	; data cache only: copy-back mode
-	set_gr_addr	doit,gr10
-	set_gr_immed	0,gr11
-	set_gr_immed	1,gr12
-	set_gr_immed	2,gr13
-	set_gr_immed	3,gr14
-
-	set_spr_addr	ok1,lr
-	bra		doit
-ok1:	test_gr_immed	1,gr11
-
-	set_mem_immed	0x9600b00d,gr10	; change to add gr11,gr13,gr11 in cache
-	set_spr_addr	ok2,lr
-	bra		doit
-ok2:	test_gr_immed	2,gr11		; still only added 1
-
-	set_gr_addr	doit1,gr10
-	set_mem_immed	0x9600b00d,gr10	; change to add gr11,gr13,gr11 in cache
-	dcef		@(gr10,gr0),1	; flush data cache
-	set_spr_addr	ok3,lr
-	bra		doit1
-ok3:	test_gr_immed	4,gr11		; added 2 this time
-
-	set_gr_addr	doit2,gr10
-	set_mem_immed	0x9600b00e,gr10	; change to add gr11,gr14,gr11 in cache
-	dcef		@(gr0,gr0),1	; flush data cache
-	set_spr_addr	ok4,lr
-	bra		doit2
-ok4:	test_gr_immed	7,gr11		; added 3 this time
-
-	pass
-
-doit:	add		gr11,gr12,gr11
-	bralr
-
-doit1:	add		gr11,gr12,gr11
-	bralr
-
-doit2:	add		gr11,gr12,gr11
-	bralr
-
diff --git a/sim/testsuite/sim/frv/dcei.cgs b/sim/testsuite/sim/frv/dcei.cgs
deleted file mode 100644
index 6254c06b183..00000000000
--- a/sim/testsuite/sim/frv/dcei.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for dcei @(GRi,GRj),a
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global dcei
-dcei:
-	or_spr_immed	0x08000000,hsr0	; data cache: copy-back mode
-
-	set_mem_immed	0xdeadbeef,sp
-	test_mem_immed	0xdeadbeef,sp
-
-	flush_data_cache sp
-	set_mem_immed	0xbeefdead,sp
-	test_mem_immed	0xbeefdead,sp
-
-	dcei		@(sp,gr0),1
-	test_mem_immed	0xdeadbeef,sp
-
-	set_mem_immed	0xbeefdead,sp
-	test_mem_immed	0xbeefdead,sp
-	dcei		@(gr0,gr0),1
-	test_mem_immed	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/dcf.cgs b/sim/testsuite/sim/frv/dcf.cgs
deleted file mode 100644
index f6e670e7b43..00000000000
--- a/sim/testsuite/sim/frv/dcf.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# FRV testcase for dcf @(GRi,GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global dcf
-dcf:
-	and_spr_immed	0x7fffffff,hsr0	; data cache only: copy-back mode
-	set_gr_addr	doit,gr10
-	set_gr_immed	0,gr11
-	set_gr_immed	1,gr12
-	set_gr_immed	2,gr13
-
-	set_spr_addr	ok1,lr
-	bra		doit
-ok1:	test_gr_immed	1,gr11
-
-	set_mem_immed	0x9600b00d,gr10	; change to add gr11,gr13,gr11 in cache
-	set_spr_addr	ok2,lr
-	bra		doit
-ok2:	test_gr_immed	2,gr11		; still only added 1
-
-	set_gr_addr	doit1,gr10
-	set_mem_immed	0x9600b00d,gr10	; change to add gr11,gr13,gr11 in cache
-	dcf		@(gr10,gr0)	; flush data cache
-	set_spr_addr	ok3,lr
-	bra		doit1
-ok3:	test_gr_immed	4,gr11		; added 2 this time
-
-	pass
-
-doit:	add		gr11,gr12,gr11
-	bralr
-
-doit1:	add		gr11,gr12,gr11
-	bralr
-
diff --git a/sim/testsuite/sim/frv/dci.cgs b/sim/testsuite/sim/frv/dci.cgs
deleted file mode 100644
index de481c363c4..00000000000
--- a/sim/testsuite/sim/frv/dci.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# FRV testcase for dci @(GRi,GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global dci
-dci:
-	or_spr_immed	0x08000000,hsr0	; data cache: copy-back mode
-
-	set_mem_immed	0xdeadbeef,sp
-	test_mem_immed	0xdeadbeef,sp
-
-	flush_data_cache sp
-	set_mem_immed	0xbeefdead,sp
-	test_mem_immed	0xbeefdead,sp
-
-	dci		@(sp,gr0)
-	test_mem_immed	0xdeadbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/fabsd.cgs b/sim/testsuite/sim/frv/fabsd.cgs
deleted file mode 100644
index 41a485e19eb..00000000000
--- a/sim/testsuite/sim/frv/fabsd.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for fabsd $FRj,$FRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fabsd
-fabsd:
-	fabsd		fr0,fr2
-	test_dfr_dfr	fr2,fr52
-	fabsd		fr8,fr2
-	test_dfr_dfr	fr2,fr28
-	fabsd		fr12,fr2
-	test_dfr_dfr	fr2,fr24
-	fabsd		fr24,fr2
-	test_dfr_dfr	fr2,fr24
-	fabsd		fr28,fr2
-	test_dfr_dfr	fr2,fr28
-	fabsd		fr52,fr2
-	test_dfr_dfr	fr2,fr52
-
-	pass
diff --git a/sim/testsuite/sim/frv/fabss.cgs b/sim/testsuite/sim/frv/fabss.cgs
deleted file mode 100644
index f48514a13e1..00000000000
--- a/sim/testsuite/sim/frv/fabss.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for fabss $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fabss
-fabss:
-	fabss		fr0,fr1
-	test_fr_fr	fr1,fr52
-	fabss		fr8,fr1
-	test_fr_fr	fr1,fr28
-	fabss		fr12,fr1
-	test_fr_fr	fr1,fr24
-	fabss		fr24,fr1
-	test_fr_fr	fr1,fr24
-	fabss		fr28,fr1
-	test_fr_fr	fr1,fr28
-	fabss		fr52,fr1
-	test_fr_fr	fr1,fr52
-
-	pass
diff --git a/sim/testsuite/sim/frv/faddd.cgs b/sim/testsuite/sim/frv/faddd.cgs
deleted file mode 100644
index dbb6373bb4d..00000000000
--- a/sim/testsuite/sim/frv/faddd.cgs
+++ /dev/null
@@ -1,93 +0,0 @@
-# frv testcase for faddd $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global faddd
-faddd:
-	faddd      	fr16,fr0,fr2
-	test_dfr_dfr	fr2,fr0
-	faddd      	fr16,fr4,fr2
-	test_dfr_dfr	fr2,fr4
-	faddd      	fr16,fr8,fr2
-	test_dfr_dfr	fr2,fr8
-	faddd      	fr16,fr12,fr2
-	test_dfr_dfr	fr2,fr12
-	faddd      	fr16,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	faddd      	fr16,fr20,fr2
-	test_dfr_dfr	fr2,fr26
-	test_dfr_dfr	fr2,fr20
-	faddd      	fr16,fr24,fr2
-	test_dfr_dfr	fr2,fr24
-	faddd      	fr16,fr28,fr2
-	test_dfr_dfr	fr2,fr28
-	faddd      	fr16,fr32,fr2
-	test_dfr_dfr	fr2,fr32
-	faddd      	fr16,fr36,fr2
-	test_dfr_dfr	fr2,fr36
-	faddd      	fr16,fr40,fr2
-	test_dfr_dfr	fr2,fr40
-	faddd      	fr16,fr44,fr2
-	test_dfr_dfr	fr2,fr44
-	faddd      	fr16,fr48,fr2
-	test_dfr_dfr	fr2,fr48
-	faddd      	fr16,fr52,fr2
-	test_dfr_dfr	fr2,fr52
-
-	faddd      	fr20,fr0,fr2
-	test_dfr_dfr	fr2,fr0
-	faddd      	fr20,fr4,fr2
-	test_dfr_dfr	fr2,fr4
-	faddd      	fr20,fr8,fr2
-	test_dfr_dfr	fr2,fr8
-	faddd      	fr20,fr12,fr2
-	test_dfr_dfr	fr2,fr12
-	faddd      	fr20,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	faddd      	fr20,fr20,fr2
-	test_dfr_dfr	fr2,fr26
-	test_dfr_dfr	fr2,fr20
-	faddd      	fr20,fr24,fr2
-	test_dfr_dfr	fr2,fr24
-	faddd      	fr20,fr28,fr2
-	test_dfr_dfr	fr2,fr28
-	faddd      	fr20,fr32,fr2
-	test_dfr_dfr	fr2,fr32
-	faddd      	fr20,fr36,fr2
-	test_dfr_dfr	fr2,fr36
-	faddd      	fr20,fr40,fr2
-	test_dfr_dfr	fr2,fr40
-	faddd      	fr20,fr44,fr2
-	test_dfr_dfr	fr2,fr44
-	faddd      	fr20,fr48,fr2
-	test_dfr_dfr	fr2,fr48
-	faddd      	fr20,fr52,fr2
-	test_dfr_dfr	fr2,fr52
-
-	faddd      	fr8,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	faddd      	fr12,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	faddd      	fr24,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	faddd      	fr28,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	faddd      	fr36,fr40,fr2
-	test_dfr_dfr	fr2,fr44
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fadds.cgs b/sim/testsuite/sim/frv/fadds.cgs
deleted file mode 100644
index d741ac92239..00000000000
--- a/sim/testsuite/sim/frv/fadds.cgs
+++ /dev/null
@@ -1,92 +0,0 @@
-# frv testcase for fadds $GRi,$GRj,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fadds
-fadds:
-	fadds      	fr16,fr0,fr1
-	test_fr_fr	fr1,fr0
-	fadds      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr4
-	fadds      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr8
-	fadds      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr12
-	fadds      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fadds      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fadds      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr24
-	fadds      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr28
-	fadds      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr32
-	fadds      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr36
-	fadds      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr40
-	fadds      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr44
-	fadds      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr48
-	fadds      	fr16,fr52,fr1
-	test_fr_fr	fr1,fr52
-
-	fadds      	fr20,fr0,fr1
-	test_fr_fr	fr1,fr0
-	fadds      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr4
-	fadds      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr8
-	fadds      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr12
-	fadds      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fadds      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fadds      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr24
-	fadds      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr28
-	fadds      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr32
-	fadds      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr36
-	fadds      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr40
-	fadds      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr44
-	fadds      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr48
-	fadds      	fr20,fr52,fr1
-	test_fr_fr	fr1,fr52
-
-	fadds      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fadds      	fr12,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fadds      	fr24,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fadds      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	fadds      	fr36,fr40,fr1
-	test_fr_fr	fr1,fr44
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fbeq.cgs b/sim/testsuite/sim/frv/fbeq.cgs
deleted file mode 100644
index e51b2c96dcc..00000000000
--- a/sim/testsuite/sim/frv/fbeq.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for fbeq $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbeq
-fbeq:
-	set_fcc		0x0 0
-	fbeq		fcc0,0,bad
-	set_fcc		0x1 1
-	fbeq		fcc1,1,bad
-	set_fcc		0x2 2
-	fbeq		fcc2,2,bad
-	set_fcc		0x3 3
-	fbeq		fcc3,3,bad
-	set_fcc		0x4 0
-	fbeq		fcc0,0,bad
-	set_fcc		0x5 1
-	fbeq		fcc1,1,bad
-	set_fcc		0x6 2
-	fbeq		fcc2,2,bad
-	set_fcc		0x7 3
-	fbeq		fcc3,3,bad
-	set_fcc		0x8 0
-	fbeq		fcc0,0,ok9
-	fail
-ok9:
-	set_fcc		0x9 1
-	fbeq		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbeq		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbeq		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbeq		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbeq		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbeq		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbeq		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbeqlr.cgs b/sim/testsuite/sim/frv/fbeqlr.cgs
deleted file mode 100644
index af29cb909c4..00000000000
--- a/sim/testsuite/sim/frv/fbeqlr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for fbeqlr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbeqlr
-fbeqlr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbeqlr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fbeqlr		fcc1,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fbeqlr		fcc2,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fbeqlr		fcc3,3
-
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fbeqlr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fbeqlr		fcc1,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fbeqlr		fcc2,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0x7 3
-	fbeqlr		fcc3,3
-
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fbeqlr		fcc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbeqlr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbeqlr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbeqlr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbeqlr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbeqlr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbeqlr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbeqlr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbge.cgs b/sim/testsuite/sim/frv/fbge.cgs
deleted file mode 100644
index a20029e6613..00000000000
--- a/sim/testsuite/sim/frv/fbge.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# frv testcase for fbge $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbge
-fbge:
-	set_fcc		0x0 0
-	fbge		fcc0,0,bad
-	set_fcc		0x1 1
-	fbge		fcc1,1,bad
-	set_fcc		0x2 2
-	fbge		fcc2,2,ok3
-	fail
-ok3:
-	set_fcc		0x3 3
-	fbge		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbge		fcc0,0,bad
-	set_fcc		0x5 1
-	fbge		fcc1,1,bad
-	set_fcc		0x6 2
-	fbge		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbge		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbge		fcc0,0,ok9
-	fail
-ok9:
-	set_fcc		0x9 1
-	fbge		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbge		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbge		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbge		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbge		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbge		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbge		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbgelr.cgs b/sim/testsuite/sim/frv/fbgelr.cgs
deleted file mode 100644
index 59e941084ba..00000000000
--- a/sim/testsuite/sim/frv/fbgelr.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# frv testcase for fbgelr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbgelr
-fbgelr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbgelr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fbgelr		fcc1,1
-
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fbgelr		fcc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbgelr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fbgelr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fbgelr		fcc1,1
-
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbgelr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbgelr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fbgelr		fcc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbgelr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbgelr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbgelr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbgelr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbgelr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbgelr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbgelr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbgt.cgs b/sim/testsuite/sim/frv/fbgt.cgs
deleted file mode 100644
index 7cc4ea7ab4b..00000000000
--- a/sim/testsuite/sim/frv/fbgt.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for fbgt $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbgt
-fbgt:
-	set_fcc		0x0 0
-	fbgt		fcc0,0,bad
-	set_fcc		0x1 1
-	fbgt		fcc1,1,bad
-	set_fcc		0x2 2
-	fbgt		fcc2,2,ok3
-	fail
-ok3:
-	set_fcc		0x3 3
-	fbgt		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbgt		fcc0,0,bad
-	set_fcc		0x5 1
-	fbgt		fcc1,1,bad
-	set_fcc		0x6 2
-	fbgt		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbgt		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbgt		fcc0,0,bad
-	set_fcc		0x9 1
-	fbgt		fcc1,1,bad
-	set_fcc		0xa 2
-	fbgt		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbgt		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbgt		fcc0,0,bad
-	set_fcc		0xd 1
-	fbgt		fcc1,1,bad
-	set_fcc		0xe 2
-	fbgt		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbgt		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbgtlr.cgs b/sim/testsuite/sim/frv/fbgtlr.cgs
deleted file mode 100644
index 7e4a7a51275..00000000000
--- a/sim/testsuite/sim/frv/fbgtlr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for fbgtlr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbgtlr
-fbgtlr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbgtlr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fbgtlr		fcc1,1
-
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fbgtlr		fcc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbgtlr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fbgtlr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fbgtlr		fcc1,1
-
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbgtlr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbgtlr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fbgtlr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fbgtlr		fcc1,1
-
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbgtlr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbgtlr		fcc3,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fbgtlr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0xd 1
-	fbgtlr		fcc1,1
-
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbgtlr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbgtlr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fble.cgs b/sim/testsuite/sim/frv/fble.cgs
deleted file mode 100644
index e52936a776b..00000000000
--- a/sim/testsuite/sim/frv/fble.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# frv testcase for fble $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fble
-fble:
-	set_fcc		0x0 0
-	fble		fcc0,0,bad
-	set_fcc		0x1 1
-	fble		fcc1,1,bad
-	set_fcc		0x2 2
-	fble		fcc2,2,bad
-	set_fcc		0x3 3
-	fble		fcc3,3,bad
-	set_fcc		0x4 0
-	fble		fcc0,0,ok5
-	fail
-ok5:
-	set_fcc		0x5 1
-	fble		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fble		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fble		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fble		fcc0,0,ok9
-	fail
-ok9:
-	set_fcc		0x9 1
-	fble		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fble		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fble		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fble		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fble		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fble		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fble		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fblelr.cgs b/sim/testsuite/sim/frv/fblelr.cgs
deleted file mode 100644
index 92a47bc970f..00000000000
--- a/sim/testsuite/sim/frv/fblelr.cgs
+++ /dev/null
@@ -1,89 +0,0 @@
-# frv testcase for fblelr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fblelr
-fblelr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fblelr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fblelr		fcc1,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fblelr		fcc2,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fblelr		fcc3,3
-
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fblelr		fcc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fblelr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fblelr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fblelr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fblelr		fcc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fblelr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fblelr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fblelr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fblelr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fblelr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fblelr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fblelr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
-
diff --git a/sim/testsuite/sim/frv/fblg.cgs b/sim/testsuite/sim/frv/fblg.cgs
deleted file mode 100644
index a16f80289f5..00000000000
--- a/sim/testsuite/sim/frv/fblg.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# frv testcase for fblg $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fblg
-fblg:
-	set_fcc		0x0 0
-	fblg		fcc0,0,bad
-	set_fcc		0x1 1
-	fblg		fcc1,1,bad
-	set_fcc		0x2 2
-	fblg		fcc2,2,ok3
-	fail
-ok3:
-	set_fcc		0x3 3
-	fblg		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fblg		fcc0,0,ok5
-	fail
-ok5:
-	set_fcc		0x5 1
-	fblg		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fblg		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fblg		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fblg		fcc0,0,bad
-	set_fcc		0x9 1
-	fblg		fcc1,1,bad
-	set_fcc		0xa 2
-	fblg		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fblg		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fblg		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fblg		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fblg		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fblg		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fblglr.cgs b/sim/testsuite/sim/frv/fblglr.cgs
deleted file mode 100644
index e7a32b04ce7..00000000000
--- a/sim/testsuite/sim/frv/fblglr.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# frv testcase for fblglr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fblglr
-fblglr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fblglr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fblglr		fcc1,1
-
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fblglr		fcc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fblglr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fblglr		fcc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fblglr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fblglr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fblglr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fblglr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fblglr		fcc1,1
-
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fblglr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fblglr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fblglr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fblglr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fblglr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fblglr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fblt.cgs b/sim/testsuite/sim/frv/fblt.cgs
deleted file mode 100644
index ef7e5c78c45..00000000000
--- a/sim/testsuite/sim/frv/fblt.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for fblt $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fblt
-fblt:
-	set_fcc		0x0 0
-	fblt		fcc0,0,bad
-	set_fcc		0x1 1
-	fblt		fcc1,1,bad
-	set_fcc		0x2 2
-	fblt		fcc2,2,bad
-	set_fcc		0x3 3
-	fblt		fcc3,3,bad
-	set_fcc		0x4 0
-	fblt		fcc0,0,ok5
-	fail
-ok5:
-	set_fcc		0x5 1
-	fblt		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fblt		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fblt		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fblt		fcc0,0,bad
-	set_fcc		0x9 1
-	fblt		fcc1,1,bad
-	set_fcc		0xa 2
-	fblt		fcc2,2,bad
-	set_fcc		0xb 3
-	fblt		fcc3,3,bad
-	set_fcc		0xc 0
-	fblt		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fblt		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fblt		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fblt		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbltlr.cgs b/sim/testsuite/sim/frv/fbltlr.cgs
deleted file mode 100644
index 0a2c43696d3..00000000000
--- a/sim/testsuite/sim/frv/fbltlr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for fbltlr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbltlr
-fbltlr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbltlr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fbltlr		fcc1,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fbltlr		fcc2,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fbltlr		fcc3,3
-
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fbltlr		fcc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbltlr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbltlr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbltlr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fbltlr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fbltlr		fcc1,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fbltlr		fcc2,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0xb 3
-	fbltlr		fcc3,3
-
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbltlr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbltlr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbltlr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbltlr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbne.cgs b/sim/testsuite/sim/frv/fbne.cgs
deleted file mode 100644
index f376eeaeac0..00000000000
--- a/sim/testsuite/sim/frv/fbne.cgs
+++ /dev/null
@@ -1,73 +0,0 @@
-# frv testcase for fbne $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbne
-fbne:
-	set_fcc		0x0 0
-	fbne		fcc0,0,bad
-	set_fcc		0x1 1
-	fbne		fcc1,1,ok2
-	fail
-ok2:
-	set_fcc		0x2 2
-	fbne		fcc2,2,ok3
-	fail
-ok3:
-	set_fcc		0x3 3
-	fbne		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbne		fcc0,0,ok5
-	fail
-ok5:
-	set_fcc		0x5 1
-	fbne		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbne		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbne		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbne		fcc0,0,bad
-	set_fcc		0x9 1
-	fbne		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbne		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbne		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbne		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbne		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbne		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbne		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbnelr.cgs b/sim/testsuite/sim/frv/fbnelr.cgs
deleted file mode 100644
index 334d185a4d4..00000000000
--- a/sim/testsuite/sim/frv/fbnelr.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fbnelr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbnelr
-fbnelr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbnelr		fcc0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fbnelr		fcc1,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fbnelr		fcc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbnelr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fbnelr		fcc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbnelr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbnelr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbnelr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fbnelr		fcc0,0
-
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbnelr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbnelr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbnelr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbnelr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbnelr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbnelr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbnelr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbno.cgs b/sim/testsuite/sim/frv/fbno.cgs
deleted file mode 100644
index a3dc5877f47..00000000000
--- a/sim/testsuite/sim/frv/fbno.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# frv testcase for fbno $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbno
-fbno:
-	set_fcc		0x0 0
-	fbno
-	set_fcc		0x1 1
-	fbno
-	set_fcc		0x2 2
-	fbno
-	set_fcc		0x3 3
-	fbno
-	set_fcc		0x4 0
-	fbno
-	set_fcc		0x5 1
-	fbno
-	set_fcc		0x6 2
-	fbno
-	set_fcc		0x7 3
-	fbno
-	set_fcc		0x8 0
-	fbno
-	set_fcc		0x9 1
-	fbno
-	set_fcc		0xa 2
-	fbno
-	set_fcc		0xb 3
-	fbno
-	set_fcc		0xc 0
-	fbno
-	set_fcc		0xd 1
-	fbno
-	set_fcc		0xe 2
-	fbno
-	set_fcc		0xf 3
-	fbno
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbnolr.cgs b/sim/testsuite/sim/frv/fbnolr.cgs
deleted file mode 100644
index be5a0ef9a6c..00000000000
--- a/sim/testsuite/sim/frv/fbnolr.cgs
+++ /dev/null
@@ -1,47 +0,0 @@
-# frv testcase for fbnolr
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbnolr
-fbnolr:
-	set_spr_addr	bad,lr
-
-	set_fcc		0x0 0
-	fbnolr
-	set_fcc		0x1 1
-	fbnolr
-	set_fcc		0x2 2
-	fbnolr
-	set_fcc		0x3 3
-	fbnolr
-	set_fcc		0x4 0
-	fbnolr
-	set_fcc		0x5 1
-	fbnolr
-	set_fcc		0x6 2
-	fbnolr
-	set_fcc		0x7 3
-	fbnolr
-	set_fcc		0x8 0
-	fbnolr
-	set_fcc		0x9 1
-	fbnolr
-	set_fcc		0xa 2
-	fbnolr
-	set_fcc		0xb 3
-	fbnolr
-	set_fcc		0xc 0
-	fbnolr
-	set_fcc		0xd 1
-	fbnolr
-	set_fcc		0xe 2
-	fbnolr
-	set_fcc		0xf 3
-	fbnolr
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbo.cgs b/sim/testsuite/sim/frv/fbo.cgs
deleted file mode 100644
index 42062c93f0f..00000000000
--- a/sim/testsuite/sim/frv/fbo.cgs
+++ /dev/null
@@ -1,73 +0,0 @@
-# frv testcase for fbo $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbo
-fbo:
-	set_fcc		0x0 0
-	fbo		fcc0,0,bad
-	set_fcc		0x1 1
-	fbo		fcc1,1,bad
-	set_fcc		0x2 2
-	fbo		fcc2,2,ok3
-	fail
-ok3:
-	set_fcc		0x3 3
-	fbo		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbo		fcc0,0,ok5
-	fail
-ok5:
-	set_fcc		0x5 1
-	fbo		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbo		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbo		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbo		fcc0,0,ok9
-	fail
-ok9:
-	set_fcc		0x9 1
-	fbo		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbo		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbo		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbo		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbo		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbo		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbo		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbolr.cgs b/sim/testsuite/sim/frv/fbolr.cgs
deleted file mode 100644
index 2f9bfb34bf3..00000000000
--- a/sim/testsuite/sim/frv/fbolr.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fbolr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbolr
-fbolr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbolr		fcc0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fbolr		fcc1,1
-
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fbolr		fcc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbolr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fbolr		fcc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbolr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbolr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbolr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fbolr		fcc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbolr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbolr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbolr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbolr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbolr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbolr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbolr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbra.cgs b/sim/testsuite/sim/frv/fbra.cgs
deleted file mode 100644
index 2f293081ff0..00000000000
--- a/sim/testsuite/sim/frv/fbra.cgs
+++ /dev/null
@@ -1,75 +0,0 @@
-# frv testcase for fbra $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbra
-fbra:
-	set_fcc		0x0 0
-	fbra		ok1
-	fail
-ok1:
-	set_fcc		0x1 1
-	fbra		ok2
-	fail
-ok2:
-	set_fcc		0x2 2
-	fbra		ok3
-	fail
-ok3:
-	set_fcc		0x3 3
-	fbra		ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbra		ok5
-	fail
-ok5:
-	set_fcc		0x5 1
-	fbra		ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbra		ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbra		ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbra		ok9
-	fail
-ok9:
-	set_fcc		0x9 1
-	fbra		oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbra		okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbra		okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbra		okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbra		oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbra		okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbra		okg
-	fail
-okg:
-
-	pass
diff --git a/sim/testsuite/sim/frv/fbralr.cgs b/sim/testsuite/sim/frv/fbralr.cgs
deleted file mode 100644
index d57afc9e68a..00000000000
--- a/sim/testsuite/sim/frv/fbralr.cgs
+++ /dev/null
@@ -1,91 +0,0 @@
-# frv testcase for fbralr
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbralr
-fbralr:
-	set_spr_addr	ok1,lr
-	set_fcc		0x0 0
-	fbralr
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fbralr
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fbralr
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbralr
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fbralr
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbralr
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbralr
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbralr
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fbralr
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbralr
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbralr
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbralr
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbralr
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbralr
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbralr
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbralr
-	fail
-okg:
-
-	pass
diff --git a/sim/testsuite/sim/frv/fbu.cgs b/sim/testsuite/sim/frv/fbu.cgs
deleted file mode 100644
index f3970012a17..00000000000
--- a/sim/testsuite/sim/frv/fbu.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for fbu $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbu
-fbu:
-	set_fcc		0x0 0
-	fbu		fcc0,0,bad
-	set_fcc		0x1 1
-	fbu		fcc1,1,ok2
-	fail
-ok2:
-	set_fcc		0x2 2
-	fbu		fcc2,2,bad
-	set_fcc		0x3 3
-	fbu		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbu		fcc0,0,bad
-	set_fcc		0x5 1
-	fbu		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbu		fcc2,2,bad
-	set_fcc		0x7 3
-	fbu		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbu		fcc0,0,bad
-	set_fcc		0x9 1
-	fbu		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbu		fcc2,2,bad
-	set_fcc		0xb 3
-	fbu		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbu		fcc0,0,bad
-	set_fcc		0xd 1
-	fbu		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbu		fcc2,2,bad
-	set_fcc		0xf 3
-	fbu		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbue.cgs b/sim/testsuite/sim/frv/fbue.cgs
deleted file mode 100644
index dd1d636a18e..00000000000
--- a/sim/testsuite/sim/frv/fbue.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# frv testcase for fbue $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbue
-fbue:
-	set_fcc		0x0 0
-	fbue		fcc0,0,bad
-	set_fcc		0x1 1
-	fbue		fcc1,1,ok2
-	fail
-ok2:
-	set_fcc		0x2 2
-	fbue		fcc2,2,bad
-	set_fcc		0x3 3
-	fbue		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbue		fcc0,0,bad
-	set_fcc		0x5 1
-	fbue		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbue		fcc2,2,bad
-	set_fcc		0x7 3
-	fbue		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbue		fcc0,0,ok9
-	fail
-ok9:
-	set_fcc		0x9 1
-	fbue		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbue		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbue		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbue		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbue		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbue		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbue		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbuelr.cgs b/sim/testsuite/sim/frv/fbuelr.cgs
deleted file mode 100644
index 62ca6aa7063..00000000000
--- a/sim/testsuite/sim/frv/fbuelr.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# frv testcase for fbuelr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbuelr
-fbuelr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbuelr		fcc0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fbuelr		fcc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fbuelr		fcc2,2
-
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbuelr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fbuelr		fcc0,0
-
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbuelr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fbuelr		fcc2,2
-
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbuelr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fbuelr		fcc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbuelr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbuelr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbuelr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbuelr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbuelr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbuelr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbuelr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbug.cgs b/sim/testsuite/sim/frv/fbug.cgs
deleted file mode 100644
index 3a5ee01aa3f..00000000000
--- a/sim/testsuite/sim/frv/fbug.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# frv testcase for fbug $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbug
-fbug:
-	set_fcc		0x0 0
-	fbug		fcc0,0,bad
-	set_fcc		0x1 1
-	fbug		fcc1,1,ok2
-	fail
-ok2:
-	set_fcc		0x2 2
-	fbug		fcc2,2,ok3
-	fail
-ok3:
-	set_fcc		0x3 3
-	fbug		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbug		fcc0,0,bad
-	set_fcc		0x5 1
-	fbug		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbug		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbug		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbug		fcc0,0,bad
-	set_fcc		0x9 1
-	fbug		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbug		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbug		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbug		fcc0,0,bad
-	set_fcc		0xd 1
-	fbug		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbug		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbug		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbuge.cgs b/sim/testsuite/sim/frv/fbuge.cgs
deleted file mode 100644
index edbf7f83461..00000000000
--- a/sim/testsuite/sim/frv/fbuge.cgs
+++ /dev/null
@@ -1,73 +0,0 @@
-# frv testcase for fbuge $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbuge
-fbuge:
-	set_fcc		0x0 0
-	fbuge		fcc0,0,bad
-	set_fcc		0x1 1
-	fbuge		fcc1,1,ok2
-	fail
-ok2:
-	set_fcc		0x2 2
-	fbuge		fcc2,2,ok3
-	fail
-ok3:
-	set_fcc		0x3 3
-	fbuge		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbuge		fcc0,0,bad
-	set_fcc		0x5 1
-	fbuge		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbuge		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbuge		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbuge		fcc0,0,ok9
-	fail
-ok9:
-	set_fcc		0x9 1
-	fbuge		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbuge		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbuge		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbuge		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbuge		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbuge		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbuge		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbugelr.cgs b/sim/testsuite/sim/frv/fbugelr.cgs
deleted file mode 100644
index b1799c56918..00000000000
--- a/sim/testsuite/sim/frv/fbugelr.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fbugelr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbugelr
-fbugelr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbugelr		fcc0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fbugelr		fcc1,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fbugelr		fcc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbugelr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fbugelr		fcc0,0
-
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbugelr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbugelr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbugelr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fbugelr		fcc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbugelr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbugelr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbugelr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbugelr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbugelr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbugelr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbugelr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbuglr.cgs b/sim/testsuite/sim/frv/fbuglr.cgs
deleted file mode 100644
index d660a95d810..00000000000
--- a/sim/testsuite/sim/frv/fbuglr.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# frv testcase for fbuglr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbuglr
-fbuglr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbuglr		fcc0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fbuglr		fcc1,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fbuglr		fcc2,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbuglr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fbuglr		fcc0,0
-
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbuglr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbuglr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbuglr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fbuglr		fcc0,0
-
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbuglr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbuglr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbuglr		fcc3,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fbuglr		fcc0,0
-
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbuglr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbuglr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbuglr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbul.cgs b/sim/testsuite/sim/frv/fbul.cgs
deleted file mode 100644
index 47b689d6ea5..00000000000
--- a/sim/testsuite/sim/frv/fbul.cgs
+++ /dev/null
@@ -1,69 +0,0 @@
-# frv testcase for fbul $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbul
-fbul:
-	set_fcc		0x0 0
-	fbul		fcc0,0,bad
-	set_fcc		0x1 1
-	fbul		fcc1,1,ok2
-	fail
-ok2:
-	set_fcc		0x2 2
-	fbul		fcc2,2,bad
-	set_fcc		0x3 3
-	fbul		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbul		fcc0,0,ok5
-	fail
-ok5:
-	set_fcc		0x5 1
-	fbul		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbul		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbul		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbul		fcc0,0,bad
-	set_fcc		0x9 1
-	fbul		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbul		fcc2,2,bad
-	set_fcc		0xb 3
-	fbul		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbul		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbul		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbul		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbul		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbule.cgs b/sim/testsuite/sim/frv/fbule.cgs
deleted file mode 100644
index ad5f4e9b173..00000000000
--- a/sim/testsuite/sim/frv/fbule.cgs
+++ /dev/null
@@ -1,73 +0,0 @@
-# frv testcase for fbule $FCCi,$hint,$label16
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbule
-fbule:
-	set_fcc		0x0 0
-	fbule		fcc0,0,bad
-	set_fcc		0x1 1
-	fbule		fcc1,1,ok2
-	fail
-ok2:
-	set_fcc		0x2 2
-	fbule		fcc2,2,bad
-	set_fcc		0x3 3
-	fbule		fcc3,3,ok4
-	fail
-ok4:
-	set_fcc		0x4 0
-	fbule		fcc0,0,ok5
-	fail
-ok5:
-	set_fcc		0x5 1
-	fbule		fcc1,1,ok6
-	fail
-ok6:
-	set_fcc		0x6 2
-	fbule		fcc2,2,ok7
-	fail
-ok7:
-	set_fcc		0x7 3
-	fbule		fcc3,3,ok8
-	fail
-ok8:
-	set_fcc		0x8 0
-	fbule		fcc0,0,ok9
-	fail
-ok9:
-	set_fcc		0x9 1
-	fbule		fcc1,1,oka
-	fail
-oka:
-	set_fcc		0xa 2
-	fbule		fcc2,2,okb
-	fail
-okb:
-	set_fcc		0xb 3
-	fbule		fcc3,3,okc
-	fail
-okc:
-	set_fcc		0xc 0
-	fbule		fcc0,0,okd
-	fail
-okd:
-	set_fcc		0xd 1
-	fbule		fcc1,1,oke
-	fail
-oke:
-	set_fcc		0xe 2
-	fbule		fcc2,2,okf
-	fail
-okf:
-	set_fcc		0xf 3
-	fbule		fcc3,3,okg
-	fail
-okg:
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbulelr.cgs b/sim/testsuite/sim/frv/fbulelr.cgs
deleted file mode 100644
index f34d58cfc6e..00000000000
--- a/sim/testsuite/sim/frv/fbulelr.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fbulelr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbulelr
-fbulelr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbulelr		fcc0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fbulelr		fcc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fbulelr		fcc2,2
-
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbulelr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fbulelr		fcc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbulelr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbulelr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbulelr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fbulelr		fcc0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbulelr		fcc1,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fbulelr		fcc2,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbulelr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbulelr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbulelr		fcc1,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbulelr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbulelr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbullr.cgs b/sim/testsuite/sim/frv/fbullr.cgs
deleted file mode 100644
index 2d5b251ce00..00000000000
--- a/sim/testsuite/sim/frv/fbullr.cgs
+++ /dev/null
@@ -1,88 +0,0 @@
-# frv testcase for fbullr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbullr
-fbullr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbullr		fcc0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fbullr		fcc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fbullr		fcc2,2
-
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbullr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fbullr		fcc0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbullr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fbullr		fcc2,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbullr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fbullr		fcc0,0
-
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbullr		fcc1,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fbullr		fcc2,2
-
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbullr		fcc3,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fbullr		fcc0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbullr		fcc1,1
-	fail
-oke:
- 	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fbullr		fcc2,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbullr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fbulr.cgs b/sim/testsuite/sim/frv/fbulr.cgs
deleted file mode 100644
index d8594bc3b91..00000000000
--- a/sim/testsuite/sim/frv/fbulr.cgs
+++ /dev/null
@@ -1,84 +0,0 @@
-# frv testcase for fbulr $FCCi,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fbulr
-fbulr:
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fbulr		fcc0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fbulr		fcc1,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fbulr		fcc2,2
-
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fbulr		fcc3,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fbulr		fcc0,0
-
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fbulr		fcc1,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fbulr		fcc2,2
-
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fbulr		fcc3,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fbulr		fcc0,0
-
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fbulr		fcc1,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fbulr		fcc2,2
-
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fbulr		fcc3,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fbulr		fcc0,0
-
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fbulr		fcc1,1
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_fcc		0xe 2
-	fbulr		fcc2,2
-
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fbulr		fcc3,3
-	fail
-okg:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbeqlr.cgs b/sim/testsuite/sim/frv/fcbeqlr.cgs
deleted file mode 100644
index b87e77f34a4..00000000000
--- a/sim/testsuite/sim/frv/fcbeqlr.cgs
+++ /dev/null
@@ -1,262 +0,0 @@
-# frv testcase for fcbeqlr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbeqlr
-fcbeqlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbeqlr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbeqlr		fcc1,0,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbeqlr		fcc2,0,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fcbeqlr		fcc3,0,3
-
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbeqlr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fcbeqlr		fcc1,0,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fcbeqlr		fcc2,0,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0x7 3
-	fcbeqlr		fcc3,0,3
-
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fcbeqlr		fcc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbeqlr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbeqlr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbeqlr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbeqlr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbeqlr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbeqlr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbeqlr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbeqlr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbeqlr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbeqlr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fcbeqlr		fcc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbeqlr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fcbeqlr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fcbeqlr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x7 3
-	fcbeqlr		fcc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_fcc		0x8 0
-	fcbeqlr		fcc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbeqlr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbeqlr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbeqlr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbeqlr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbeqlr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbeqlr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbeqlr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbeqlr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbeqlr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbeqlr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbeqlr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbeqlr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbeqlr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbeqlr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbeqlr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbeqlr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbeqlr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbeqlr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbeqlr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbeqlr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbeqlr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbeqlr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbeqlr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbeqlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbeqlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbeqlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbeqlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbeqlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbeqlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbeqlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbeqlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbeqlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbeqlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbeqlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbeqlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbeqlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbeqlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbeqlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbeqlr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbgelr.cgs b/sim/testsuite/sim/frv/fcbgelr.cgs
deleted file mode 100644
index cc1b9d7c78c..00000000000
--- a/sim/testsuite/sim/frv/fcbgelr.cgs
+++ /dev/null
@@ -1,270 +0,0 @@
-# frv testcase for fcbgelr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbgelr
-fcbgelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbgelr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbgelr		fcc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fcbgelr		fcc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbgelr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbgelr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fcbgelr		fcc1,0,1
-
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbgelr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbgelr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fcbgelr		fcc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbgelr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbgelr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbgelr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbgelr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbgelr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbgelr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbgelr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbgelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbgelr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_fcc		0x2 2
-	fcbgelr		fcc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbgelr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbgelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fcbgelr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbgelr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbgelr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_fcc		0x8 0
-	fcbgelr		fcc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbgelr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbgelr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbgelr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbgelr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbgelr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbgelr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbgelr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbgelr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbgelr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbgelr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbgelr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbgelr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbgelr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbgelr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbgelr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbgelr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbgelr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbgelr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbgelr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbgelr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbgelr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbgelr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbgelr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbgelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbgelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbgelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbgelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbgelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbgelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbgelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbgelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbgelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbgelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbgelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbgelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbgelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbgelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbgelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbgelr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbgtlr.cgs b/sim/testsuite/sim/frv/fcbgtlr.cgs
deleted file mode 100644
index 76204e235ab..00000000000
--- a/sim/testsuite/sim/frv/fcbgtlr.cgs
+++ /dev/null
@@ -1,262 +0,0 @@
-# frv testcase for fcbgtlr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbgtlr
-fcbgtlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbgtlr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbgtlr		fcc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fcbgtlr		fcc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbgtlr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbgtlr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fcbgtlr		fcc1,0,1
-
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbgtlr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbgtlr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbgtlr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fcbgtlr		fcc1,0,1
-
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbgtlr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbgtlr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fcbgtlr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0xd 1
-	fcbgtlr		fcc1,0,1
-
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbgtlr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbgtlr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbgtlr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbgtlr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_fcc		0x2 2
-	fcbgtlr		fcc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbgtlr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbgtlr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x5 1
-	fcbgtlr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbgtlr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbgtlr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbgtlr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fcbgtlr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbgtlr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbgtlr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fcbgtlr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xd 1
-	fcbgtlr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbgtlr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbgtlr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbgtlr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbgtlr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbgtlr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbgtlr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbgtlr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbgtlr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbgtlr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbgtlr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbgtlr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbgtlr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbgtlr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbgtlr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbgtlr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbgtlr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbgtlr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbgtlr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbgtlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbgtlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbgtlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbgtlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbgtlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbgtlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbgtlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbgtlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbgtlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbgtlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbgtlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbgtlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbgtlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbgtlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbgtlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbgtlr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcblelr.cgs b/sim/testsuite/sim/frv/fcblelr.cgs
deleted file mode 100644
index b9850d6863d..00000000000
--- a/sim/testsuite/sim/frv/fcblelr.cgs
+++ /dev/null
@@ -1,270 +0,0 @@
-# frv testcase for fcblelr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcblelr
-fcblelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcblelr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcblelr		fcc1,0,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcblelr		fcc2,0,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fcblelr		fcc3,0,3
-
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fcblelr		fcc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcblelr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcblelr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcblelr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fcblelr		fcc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcblelr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcblelr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcblelr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcblelr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcblelr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcblelr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcblelr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcblelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcblelr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcblelr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fcblelr		fcc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_fcc		0x4 0
-	fcblelr		fcc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcblelr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcblelr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcblelr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_fcc		0x8 0
-	fcblelr		fcc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcblelr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcblelr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcblelr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcblelr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcblelr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcblelr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcblelr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcblelr	fcc0,1,0
-	set_fcc		0x1 1
-	fcblelr	fcc1,1,1
-	set_fcc		0x2 2
-	fcblelr	fcc2,1,2
-	set_fcc		0x3 3
-	fcblelr	fcc3,1,3
-	set_fcc		0x4 0
-	fcblelr	fcc0,1,0
-	set_fcc		0x5 1
-	fcblelr	fcc1,1,1
-	set_fcc		0x6 2
-	fcblelr	fcc2,1,2
-	set_fcc		0x7 3
-	fcblelr	fcc3,1,3
-	set_fcc		0x8 0
-	fcblelr	fcc0,1,0
-	set_fcc		0x9 1
-	fcblelr	fcc1,1,1
-	set_fcc		0xa 2
-	fcblelr	fcc2,1,2
-	set_fcc		0xb 3
-	fcblelr	fcc3,1,3
-	set_fcc		0xc 0
-	fcblelr	fcc0,1,0
-	set_fcc		0xd 1
-	fcblelr	fcc1,1,1
-	set_fcc		0xe 2
-	fcblelr	fcc2,1,2
-	set_fcc		0xf 3
-	fcblelr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcblelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcblelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcblelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcblelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcblelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcblelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcblelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcblelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcblelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcblelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcblelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcblelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcblelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcblelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcblelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcblelr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcblglr.cgs b/sim/testsuite/sim/frv/fcblglr.cgs
deleted file mode 100644
index e875d40fb1d..00000000000
--- a/sim/testsuite/sim/frv/fcblglr.cgs
+++ /dev/null
@@ -1,270 +0,0 @@
-# frv testcase for fcblglr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcblglr
-fcblglr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcblglr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcblglr		fcc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fcblglr		fcc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcblglr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fcblglr		fcc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcblglr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcblglr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcblglr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcblglr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fcblglr		fcc1,0,1
-
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcblglr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcblglr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcblglr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcblglr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcblglr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcblglr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcblglr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcblglr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_fcc		0x2 2
-	fcblglr		fcc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcblglr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_fcc		0x4 0
-	fcblglr		fcc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcblglr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcblglr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcblglr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcblglr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fcblglr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcblglr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcblglr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcblglr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcblglr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcblglr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcblglr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcblglr	fcc0,1,0
-	set_fcc		0x1 1
-	fcblglr	fcc1,1,1
-	set_fcc		0x2 2
-	fcblglr	fcc2,1,2
-	set_fcc		0x3 3
-	fcblglr	fcc3,1,3
-	set_fcc		0x4 0
-	fcblglr	fcc0,1,0
-	set_fcc		0x5 1
-	fcblglr	fcc1,1,1
-	set_fcc		0x6 2
-	fcblglr	fcc2,1,2
-	set_fcc		0x7 3
-	fcblglr	fcc3,1,3
-	set_fcc		0x8 0
-	fcblglr	fcc0,1,0
-	set_fcc		0x9 1
-	fcblglr	fcc1,1,1
-	set_fcc		0xa 2
-	fcblglr	fcc2,1,2
-	set_fcc		0xb 3
-	fcblglr	fcc3,1,3
-	set_fcc		0xc 0
-	fcblglr	fcc0,1,0
-	set_fcc		0xd 1
-	fcblglr	fcc1,1,1
-	set_fcc		0xe 2
-	fcblglr	fcc2,1,2
-	set_fcc		0xf 3
-	fcblglr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcblglr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcblglr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcblglr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcblglr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcblglr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcblglr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcblglr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcblglr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcblglr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcblglr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcblglr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcblglr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcblglr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcblglr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcblglr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcblglr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbltlr.cgs b/sim/testsuite/sim/frv/fcbltlr.cgs
deleted file mode 100644
index d15dd3083c3..00000000000
--- a/sim/testsuite/sim/frv/fcbltlr.cgs
+++ /dev/null
@@ -1,262 +0,0 @@
-# frv testcase for fcbltlr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbltlr
-fcbltlr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbltlr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbltlr		fcc1,0,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbltlr		fcc2,0,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fcbltlr		fcc3,0,3
-
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fcbltlr		fcc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbltlr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbltlr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbltlr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbltlr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fcbltlr		fcc1,0,1
-
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fcbltlr		fcc2,0,2
-
-	set_spr_addr	bad,lr
-	set_fcc		0xb 3
-	fcbltlr		fcc3,0,3
-
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbltlr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbltlr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbltlr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbltlr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbltlr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbltlr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbltlr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x3 3
-	fcbltlr		fcc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_fcc		0x4 0
-	fcbltlr		fcc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbltlr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbltlr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbltlr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbltlr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x9 1
-	fcbltlr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fcbltlr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xb 3
-	fcbltlr		fcc3,1,3
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbltlr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbltlr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbltlr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbltlr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbltlr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbltlr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbltlr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbltlr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbltlr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbltlr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbltlr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbltlr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbltlr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbltlr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbltlr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbltlr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbltlr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbltlr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbltlr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbltlr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbltlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbltlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbltlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbltlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbltlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbltlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbltlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbltlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbltlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbltlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbltlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbltlr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbltlr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbltlr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbltlr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbltlr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbnelr.cgs b/sim/testsuite/sim/frv/fcbnelr.cgs
deleted file mode 100644
index cb0aa26a74b..00000000000
--- a/sim/testsuite/sim/frv/fcbnelr.cgs
+++ /dev/null
@@ -1,274 +0,0 @@
-# frv testcase for fcbnelr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbnelr
-fcbnelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbnelr		fcc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fcbnelr		fcc1,0,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fcbnelr		fcc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbnelr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fcbnelr		fcc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbnelr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbnelr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbnelr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbnelr		fcc0,0,0
-
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbnelr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbnelr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbnelr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbnelr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbnelr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbnelr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbnelr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbnelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_fcc		0x1 1
-	fcbnelr		fcc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_fcc		0x2 2
-	fcbnelr		fcc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbnelr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_fcc		0x4 0
-	fcbnelr		fcc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbnelr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbnelr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbnelr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbnelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbnelr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbnelr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbnelr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbnelr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbnelr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbnelr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbnelr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbnelr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbnelr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbnelr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbnelr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbnelr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbnelr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbnelr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbnelr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbnelr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbnelr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbnelr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbnelr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbnelr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbnelr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbnelr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbnelr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbnelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbnelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbnelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbnelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbnelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbnelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbnelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbnelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbnelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbnelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbnelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbnelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbnelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbnelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbnelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbnelr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbnolr.cgs b/sim/testsuite/sim/frv/fcbnolr.cgs
deleted file mode 100644
index 3c1b73a64e6..00000000000
--- a/sim/testsuite/sim/frv/fcbnolr.cgs
+++ /dev/null
@@ -1,185 +0,0 @@
-# frv testcase for fcbnolr
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbnolr
-fcbnolr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-
-	set_fcc		0x0 0
-	fcbnolr
-	set_fcc		0x1 1
-	fcbnolr
-	set_fcc		0x2 2
-	fcbnolr
-	set_fcc		0x3 3
-	fcbnolr
-	set_fcc		0x4 0
-	fcbnolr
-	set_fcc		0x5 1
-	fcbnolr
-	set_fcc		0x6 2
-	fcbnolr
-	set_fcc		0x7 3
-	fcbnolr
-	set_fcc		0x8 0
-	fcbnolr
-	set_fcc		0x9 1
-	fcbnolr
-	set_fcc		0xa 2
-	fcbnolr
-	set_fcc		0xb 3
-	fcbnolr
-	set_fcc		0xc 0
-	fcbnolr
-	set_fcc		0xd 1
-	fcbnolr
-	set_fcc		0xe 2
-	fcbnolr
-	set_fcc		0xf 3
-	fcbnolr
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbnolr
-
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbnolr
-	set_fcc		0x1 1
-	fcbnolr
-	set_fcc		0x2 2
-	fcbnolr
-	set_fcc		0x3 3
-	fcbnolr
-	set_fcc		0x4 0
-	fcbnolr
-	set_fcc		0x5 1
-	fcbnolr
-	set_fcc		0x6 2
-	fcbnolr
-	set_fcc		0x7 3
-	fcbnolr
-	set_fcc		0x8 0
-	fcbnolr
-	set_fcc		0x9 1
-	fcbnolr
-	set_fcc		0xa 2
-	fcbnolr
-	set_fcc		0xb 3
-	fcbnolr
-	set_fcc		0xc 0
-	fcbnolr
-	set_fcc		0xd 1
-	fcbnolr
-	set_fcc		0xe 2
-	fcbnolr
-	set_fcc		0xf 3
-	fcbnolr
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbnolr
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbnolr
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbolr.cgs b/sim/testsuite/sim/frv/fcbolr.cgs
deleted file mode 100644
index 31909f1bb2a..00000000000
--- a/sim/testsuite/sim/frv/fcbolr.cgs
+++ /dev/null
@@ -1,274 +0,0 @@
-# frv testcase for fcbolr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbolr
-fcbolr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbolr		fcc0,0,0
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbolr		fcc1,0,1
-
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fcbolr		fcc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbolr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fcbolr		fcc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbolr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbolr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbolr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fcbolr		fcc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbolr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbolr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbolr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbolr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbolr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbolr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbolr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbolr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x1 1
-	fcbolr		fcc1,1,1
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_fcc		0x2 2
-	fcbolr		fcc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbolr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_fcc		0x4 0
-	fcbolr		fcc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbolr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbolr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbolr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_fcc		0x8 0
-	fcbolr		fcc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbolr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbolr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbolr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbolr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbolr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbolr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbolr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbolr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbolr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbolr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbolr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbolr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbolr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbolr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbolr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbolr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbolr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbolr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbolr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbolr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbolr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbolr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbolr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbolr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbolr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbolr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbolr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbolr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbolr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbolr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbolr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbolr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbolr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbolr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbolr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbolr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbolr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbolr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbolr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbralr.cgs b/sim/testsuite/sim/frv/fcbralr.cgs
deleted file mode 100644
index 60359d8201e..00000000000
--- a/sim/testsuite/sim/frv/fcbralr.cgs
+++ /dev/null
@@ -1,276 +0,0 @@
-# frv testcase for fcbralr $ccond
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbralr
-fcbralr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_fcc		0x0 0
-	fcbralr		0
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fcbralr		0
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fcbralr		0
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbralr		0
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fcbralr		0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbralr		0
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbralr		0
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbralr		0
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fcbralr		0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbralr		0
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbralr		0
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbralr		0
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbralr		0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbralr		0
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbralr		0
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbralr		0
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	okh,lr
-	set_fcc		0x0 0
-	fcbralr		1
-	fail
-okh:
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_fcc		0x1 1
-	fcbralr		1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_fcc		0x2 2
-	fcbralr		1
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbralr		1
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_fcc		0x4 0
-	fcbralr		1
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbralr		1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbralr		1
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbralr		1
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_fcc		0x8 0
-	fcbralr		1
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbralr		1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbralr		1
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbralr		1
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbralr		1
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbralr		1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbralr		1
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbralr		1
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbralr	1
-	set_fcc		0x1 1
-	fcbralr	1
-	set_fcc		0x2 2
-	fcbralr	1
-	set_fcc		0x3 3
-	fcbralr	1
-	set_fcc		0x4 0
-	fcbralr	1
-	set_fcc		0x5 1
-	fcbralr	1
-	set_fcc		0x6 2
-	fcbralr	1
-	set_fcc		0x7 3
-	fcbralr	1
-	set_fcc		0x8 0
-	fcbralr	1
-	set_fcc		0x9 1
-	fcbralr	1
-	set_fcc		0xa 2
-	fcbralr	1
-	set_fcc		0xb 3
-	fcbralr	1
-	set_fcc		0xc 0
-	fcbralr	1
-	set_fcc		0xd 1
-	fcbralr	1
-	set_fcc		0xe 2
-	fcbralr	1
-	set_fcc		0xf 3
-	fcbralr	1
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbralr	0
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbralr	0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fcbuelr.cgs b/sim/testsuite/sim/frv/fcbuelr.cgs
deleted file mode 100644
index e102ee31dec..00000000000
--- a/sim/testsuite/sim/frv/fcbuelr.cgs
+++ /dev/null
@@ -1,270 +0,0 @@
-# frv testcase for fcbuelr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbuelr
-fcbuelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbuelr		fcc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fcbuelr		fcc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbuelr		fcc2,0,2
-
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbuelr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbuelr		fcc0,0,0
-
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbuelr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fcbuelr		fcc2,0,2
-
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbuelr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fcbuelr		fcc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbuelr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbuelr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbuelr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbuelr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbuelr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbuelr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbuelr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbuelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_fcc		0x1 1
-	fcbuelr		fcc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbuelr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbuelr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbuelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbuelr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fcbuelr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbuelr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_fcc		0x8 0
-	fcbuelr		fcc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbuelr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbuelr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbuelr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbuelr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbuelr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbuelr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbuelr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbuelr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbuelr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbuelr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbuelr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbuelr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbuelr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbuelr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbuelr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbuelr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbuelr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbuelr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbuelr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbuelr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbuelr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbuelr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbuelr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbuelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbuelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbuelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbuelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbuelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbuelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbuelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbuelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbuelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbuelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbuelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbuelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbuelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbuelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbuelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbuelr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbugelr.cgs b/sim/testsuite/sim/frv/fcbugelr.cgs
deleted file mode 100644
index 8ecd1411115..00000000000
--- a/sim/testsuite/sim/frv/fcbugelr.cgs
+++ /dev/null
@@ -1,274 +0,0 @@
-# frv testcase for fcbugelr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbugelr
-fcbugelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbugelr		fcc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fcbugelr		fcc1,0,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fcbugelr		fcc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbugelr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbugelr		fcc0,0,0
-
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbugelr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbugelr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbugelr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fcbugelr		fcc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbugelr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbugelr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbugelr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbugelr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbugelr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbugelr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbugelr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbugelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_fcc		0x1 1
-	fcbugelr		fcc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_fcc		0x2 2
-	fcbugelr		fcc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbugelr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbugelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbugelr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbugelr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbugelr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_fcc		0x8 0
-	fcbugelr		fcc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbugelr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbugelr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbugelr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbugelr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbugelr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbugelr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbugelr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbugelr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbugelr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbugelr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbugelr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbugelr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbugelr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbugelr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbugelr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbugelr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbugelr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbugelr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbugelr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbugelr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbugelr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbugelr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbugelr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbugelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbugelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbugelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbugelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbugelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbugelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbugelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbugelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbugelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbugelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbugelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbugelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbugelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbugelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbugelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbugelr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbuglr.cgs b/sim/testsuite/sim/frv/fcbuglr.cgs
deleted file mode 100644
index d9470a81a89..00000000000
--- a/sim/testsuite/sim/frv/fcbuglr.cgs
+++ /dev/null
@@ -1,270 +0,0 @@
-# frv testcase for fcbuglr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbuglr
-fcbuglr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbuglr		fcc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fcbuglr		fcc1,0,1
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_fcc		0x2 2
-	fcbuglr		fcc2,0,2
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbuglr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbuglr		fcc0,0,0
-
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbuglr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbuglr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbuglr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbuglr		fcc0,0,0
-
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbuglr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbuglr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbuglr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fcbuglr		fcc0,0,0
-
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbuglr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbuglr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbuglr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbuglr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_fcc		0x1 1
-	fcbuglr		fcc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	okj,lr
-	set_fcc		0x2 2
-	fcbuglr		fcc2,1,2
-	fail
-okj:
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbuglr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbuglr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbuglr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbuglr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbuglr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbuglr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbuglr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbuglr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbuglr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fcbuglr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbuglr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbuglr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbuglr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbuglr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbuglr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbuglr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbuglr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbuglr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbuglr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbuglr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbuglr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbuglr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbuglr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbuglr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbuglr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbuglr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbuglr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbuglr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbuglr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbuglr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbuglr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbuglr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbuglr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbuglr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbuglr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbuglr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbuglr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbuglr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbuglr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbuglr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbuglr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbuglr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbuglr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbuglr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbuglr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbulelr.cgs b/sim/testsuite/sim/frv/fcbulelr.cgs
deleted file mode 100644
index 3f1da04a79b..00000000000
--- a/sim/testsuite/sim/frv/fcbulelr.cgs
+++ /dev/null
@@ -1,274 +0,0 @@
-# frv testcase for fcbulelr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbulelr
-fcbulelr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbulelr		fcc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fcbulelr		fcc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbulelr		fcc2,0,2
-
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbulelr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fcbulelr		fcc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbulelr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbulelr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbulelr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_fcc		0x8 0
-	fcbulelr		fcc0,0,0
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbulelr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_fcc		0xa 2
-	fcbulelr		fcc2,0,2
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbulelr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbulelr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbulelr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbulelr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbulelr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbulelr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_fcc		0x1 1
-	fcbulelr		fcc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbulelr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbulelr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_fcc		0x4 0
-	fcbulelr		fcc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbulelr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbulelr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbulelr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	okp,lr
-	set_fcc		0x8 0
-	fcbulelr		fcc0,1,0
-	fail
-okp:
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbulelr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	okr,lr
-	set_fcc		0xa 2
-	fcbulelr		fcc2,1,2
-	fail
-okr:
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbulelr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbulelr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbulelr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbulelr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbulelr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbulelr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbulelr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbulelr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbulelr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbulelr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbulelr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbulelr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbulelr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbulelr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbulelr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbulelr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbulelr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbulelr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbulelr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbulelr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbulelr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbulelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbulelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbulelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbulelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbulelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbulelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbulelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbulelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbulelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbulelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbulelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbulelr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbulelr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbulelr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbulelr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbulelr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbullr.cgs b/sim/testsuite/sim/frv/fcbullr.cgs
deleted file mode 100644
index 1a87dde129e..00000000000
--- a/sim/testsuite/sim/frv/fcbullr.cgs
+++ /dev/null
@@ -1,270 +0,0 @@
-# frv testcase for fcbullr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbullr
-fcbullr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbullr		fcc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fcbullr		fcc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbullr		fcc2,0,2
-
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbullr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_fcc		0x4 0
-	fcbullr		fcc0,0,0
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbullr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_fcc		0x6 2
-	fcbullr		fcc2,0,2
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbullr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbullr		fcc0,0,0
-
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbullr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fcbullr		fcc2,0,2
-
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbullr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_fcc		0xc 0
-	fcbullr		fcc0,0,0
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbullr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_fcc		0xe 2
-	fcbullr		fcc2,0,2
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbullr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbullr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_fcc		0x1 1
-	fcbullr		fcc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbullr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbullr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	okl,lr
-	set_fcc		0x4 0
-	fcbullr		fcc0,1,0
-	fail
-okl:
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbullr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	okn,lr
-	set_fcc		0x6 2
-	fcbullr		fcc2,1,2
-	fail
-okn:
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbullr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbullr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbullr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fcbullr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbullr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	okt,lr
-	set_fcc		0xc 0
-	fcbullr		fcc0,1,0
-	fail
-okt:
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbullr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	okv,lr
-	set_fcc		0xe 2
-	fcbullr		fcc2,1,2
-	fail
-okv:
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbullr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbullr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbullr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbullr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbullr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbullr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbullr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbullr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbullr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbullr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbullr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbullr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbullr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbullr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbullr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbullr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbullr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbullr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbullr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbullr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbullr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbullr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbullr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbullr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbullr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbullr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbullr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbullr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbullr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbullr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbullr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbullr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbullr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fcbulr.cgs b/sim/testsuite/sim/frv/fcbulr.cgs
deleted file mode 100644
index c81dff3e13c..00000000000
--- a/sim/testsuite/sim/frv/fcbulr.cgs
+++ /dev/null
@@ -1,262 +0,0 @@
-# frv testcase for fcbulr $FCCi,$ccond,$hint
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcbulr
-fcbulr:
-	; ccond is true
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbulr		fcc0,0,0
-
-	set_spr_addr	ok2,lr
-	set_fcc		0x1 1
-	fcbulr		fcc1,0,1
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbulr		fcc2,0,2
-
-	set_spr_addr	ok4,lr
-	set_fcc		0x3 3
-	fcbulr		fcc3,0,3
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbulr		fcc0,0,0
-
-	set_spr_addr	ok6,lr
-	set_fcc		0x5 1
-	fcbulr		fcc1,0,1
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fcbulr		fcc2,0,2
-
-	set_spr_addr	ok8,lr
-	set_fcc		0x7 3
-	fcbulr		fcc3,0,3
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbulr		fcc0,0,0
-
-	set_spr_addr	oka,lr
-	set_fcc		0x9 1
-	fcbulr		fcc1,0,1
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fcbulr		fcc2,0,2
-
-	set_spr_addr	okc,lr
-	set_fcc		0xb 3
-	fcbulr		fcc3,0,3
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fcbulr		fcc0,0,0
-
-	set_spr_addr	oke,lr
-	set_fcc		0xd 1
-	fcbulr		fcc1,0,1
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_fcc		0xe 2
-	fcbulr		fcc2,0,2
-
-	set_spr_addr	okg,lr
-	set_fcc		0xf 3
-	fcbulr		fcc3,0,3
-	fail
-okg:
-
-	; ccond is true
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fcbulr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oki,lr
-	set_fcc		0x1 1
-	fcbulr		fcc1,1,1
-	fail
-oki:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x2 2
-	fcbulr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okk,lr
-	set_fcc		0x3 3
-	fcbulr		fcc3,1,3
-	fail
-okk:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fcbulr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okm,lr
-	set_fcc		0x5 1
-	fcbulr		fcc1,1,1
-	fail
-okm:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x6 2
-	fcbulr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oko,lr
-	set_fcc		0x7 3
-	fcbulr		fcc3,1,3
-	fail
-oko:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	fcbulr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okq,lr
-	set_fcc		0x9 1
-	fcbulr		fcc1,1,1
-	fail
-okq:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xa 2
-	fcbulr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oks,lr
-	set_fcc		0xb 3
-	fcbulr		fcc3,1,3
-	fail
-oks:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	fcbulr		fcc0,1,0
-
-	set_spr_immed	1,lcr
-	set_spr_addr	oku,lr
-	set_fcc		0xd 1
-	fcbulr		fcc1,1,1
-	fail
-oku:
-	set_spr_immed	1,lcr
-	set_spr_addr	bad,lr
-	set_fcc		0xe 2
-	fcbulr		fcc2,1,2
-
-	set_spr_immed	1,lcr
-	set_spr_addr	okw,lr
-	set_fcc		0xf 3
-	fcbulr		fcc3,1,3
-	fail
-okw:
-	; ccond is false
-	set_spr_immed	128,lcr
-
-	set_fcc		0x0 0
-	fcbulr	fcc0,1,0
-	set_fcc		0x1 1
-	fcbulr	fcc1,1,1
-	set_fcc		0x2 2
-	fcbulr	fcc2,1,2
-	set_fcc		0x3 3
-	fcbulr	fcc3,1,3
-	set_fcc		0x4 0
-	fcbulr	fcc0,1,0
-	set_fcc		0x5 1
-	fcbulr	fcc1,1,1
-	set_fcc		0x6 2
-	fcbulr	fcc2,1,2
-	set_fcc		0x7 3
-	fcbulr	fcc3,1,3
-	set_fcc		0x8 0
-	fcbulr	fcc0,1,0
-	set_fcc		0x9 1
-	fcbulr	fcc1,1,1
-	set_fcc		0xa 2
-	fcbulr	fcc2,1,2
-	set_fcc		0xb 3
-	fcbulr	fcc3,1,3
-	set_fcc		0xc 0
-	fcbulr	fcc0,1,0
-	set_fcc		0xd 1
-	fcbulr	fcc1,1,1
-	set_fcc		0xe 2
-	fcbulr	fcc2,1,2
-	set_fcc		0xf 3
-	fcbulr	fcc3,1,3
-
-	; ccond is false
-	set_spr_immed	1,lcr
-	set_fcc		0x0 0
-	fcbulr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x1 1
-	fcbulr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x2 2
-	fcbulr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x3 3
-	fcbulr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x4 0
-	fcbulr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x5 1
-	fcbulr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0x6 2
-	fcbulr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0x7 3
-	fcbulr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0x8 0
-	fcbulr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0x9 1
-	fcbulr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xa 2
-	fcbulr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xb 3
-	fcbulr	fcc3,0,3
-	set_spr_immed	1,lcr
-	set_fcc		0xc 0
-	fcbulr	fcc0,0,0
-	set_spr_immed	1,lcr
-	set_fcc		0xd 1
-	fcbulr	fcc1,0,1
-	set_spr_immed	1,lcr
-	set_fcc		0xe 2
-	fcbulr	fcc2,0,2
-	set_spr_immed	1,lcr
-	set_fcc		0xf 3
-	fcbulr	fcc3,0,3
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fckeq.cgs b/sim/testsuite/sim/frv/fckeq.cgs
deleted file mode 100644
index 572a86d2438..00000000000
--- a/sim/testsuite/sim/frv/fckeq.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckeq $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckeq
-fckeq:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckeq		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckge.cgs b/sim/testsuite/sim/frv/fckge.cgs
deleted file mode 100644
index 91a1efdfa9e..00000000000
--- a/sim/testsuite/sim/frv/fckge.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckge $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckge
-fckge:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckgt.cgs b/sim/testsuite/sim/frv/fckgt.cgs
deleted file mode 100644
index 06715f96d0d..00000000000
--- a/sim/testsuite/sim/frv/fckgt.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckgt $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckgt
-fckgt:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckgt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckle.cgs b/sim/testsuite/sim/frv/fckle.cgs
deleted file mode 100644
index 7d5e6dae951..00000000000
--- a/sim/testsuite/sim/frv/fckle.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckle $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckle
-fckle:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckle		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fcklg.cgs b/sim/testsuite/sim/frv/fcklg.cgs
deleted file mode 100644
index f8df5a1152c..00000000000
--- a/sim/testsuite/sim/frv/fcklg.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fcklg $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcklg
-fcklg:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fcklg		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fcklt.cgs b/sim/testsuite/sim/frv/fcklt.cgs
deleted file mode 100644
index 14e53711879..00000000000
--- a/sim/testsuite/sim/frv/fcklt.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fcklt $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcklt
-fcklt:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fcklt		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckne.cgs b/sim/testsuite/sim/frv/fckne.cgs
deleted file mode 100644
index 774f8379bfc..00000000000
--- a/sim/testsuite/sim/frv/fckne.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckne $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckne
-fckne:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckne		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckno.cgs b/sim/testsuite/sim/frv/fckno.cgs
deleted file mode 100644
index 08513a25198..00000000000
--- a/sim/testsuite/sim/frv/fckno.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckno $CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckno
-fckno:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckno		cc3
-	test_spr_immed	0x1b9b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fcko.cgs b/sim/testsuite/sim/frv/fcko.cgs
deleted file mode 100644
index 06d56407448..00000000000
--- a/sim/testsuite/sim/frv/fcko.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fcko $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcko
-fcko:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fcko		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckra.cgs b/sim/testsuite/sim/frv/fckra.cgs
deleted file mode 100644
index a74b9fc32e6..00000000000
--- a/sim/testsuite/sim/frv/fckra.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckra $CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckra
-fckra:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckra		cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fcku.cgs b/sim/testsuite/sim/frv/fcku.cgs
deleted file mode 100644
index 9aaa635eef7..00000000000
--- a/sim/testsuite/sim/frv/fcku.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fcku $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fcku
-fcku:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fcku		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckue.cgs b/sim/testsuite/sim/frv/fckue.cgs
deleted file mode 100644
index 0bd7696171d..00000000000
--- a/sim/testsuite/sim/frv/fckue.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckue $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckue
-fckue:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckue		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckug.cgs b/sim/testsuite/sim/frv/fckug.cgs
deleted file mode 100644
index f810335eda4..00000000000
--- a/sim/testsuite/sim/frv/fckug.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckug $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckug
-fckug:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckug		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckuge.cgs b/sim/testsuite/sim/frv/fckuge.cgs
deleted file mode 100644
index d8126389f77..00000000000
--- a/sim/testsuite/sim/frv/fckuge.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckuge $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckuge
-fckuge:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckuge		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckul.cgs b/sim/testsuite/sim/frv/fckul.cgs
deleted file mode 100644
index 2d30d924186..00000000000
--- a/sim/testsuite/sim/frv/fckul.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckul $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckul
-fckul:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckul		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fckule.cgs b/sim/testsuite/sim/frv/fckule.cgs
deleted file mode 100644
index 9830a66a8f5..00000000000
--- a/sim/testsuite/sim/frv/fckule.cgs
+++ /dev/null
@@ -1,90 +0,0 @@
-# frv testcase for fckule $FCCi,$CCj_float
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fckule
-fckule:
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x0 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x1 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x2 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x3 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x4 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x5 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x6 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x7 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x8 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0x9 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xa 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xb 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xc 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xd 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xe 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	set_spr_immed	0x1b1b,cccr
-	set_fcc		0xf 0
-	fckule		fcc0,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/fcmpd.cgs b/sim/testsuite/sim/frv/fcmpd.cgs
deleted file mode 100644
index 5c862664845..00000000000
--- a/sim/testsuite/sim/frv/fcmpd.cgs
+++ /dev/null
@@ -1,601 +0,0 @@
-# frv testcase for fcmpd $GRi,$GRj,$FCCi_2
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fcmpd
-fcmpd:
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr0,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr4,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr8,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr12,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr16,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr20,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr0,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr4,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr8,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr12,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr16,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr20,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr4,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr8,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr12,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr16,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr20,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr8,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr12,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr16,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr20,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr12,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr16,fcc0
-	test_fcc	0x8,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr20,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr16,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr16,fcc0
-	test_fcc	0x8,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr20,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr20,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr16,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr20,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr24,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr24,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr16,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr20,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr24,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr28,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr28,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr16,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr20,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr24,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr28,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr32,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr36,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr40,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr44,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr48,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr48,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr16,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr20,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr24,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr28,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr32,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr36,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr40,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr44,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr48,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr52,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr52,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr0,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr4,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr8,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr12,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr16,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr20,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr24,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr28,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr32,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr36,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr40,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr44,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr48,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr52,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr56,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr0,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr4,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr8,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr12,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr16,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr20,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr24,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr28,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr32,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr36,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr40,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr44,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr48,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr52,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmpd      	fr60,fr60,fcc0
-	test_fcc	0x1,0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fcmps.cgs b/sim/testsuite/sim/frv/fcmps.cgs
deleted file mode 100644
index ea1ccc05f29..00000000000
--- a/sim/testsuite/sim/frv/fcmps.cgs
+++ /dev/null
@@ -1,600 +0,0 @@
-# frv testcase for fcmps $GRi,$GRj,$FCCi_2
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fcmps
-fcmps:
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr0,fr0,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr4,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr8,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr12,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr16,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr20,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr0,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr0,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr0,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr4,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr4,fr4,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr8,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr12,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr16,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr20,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr4,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr4,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr4,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr8,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr8,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr8,fr8,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr12,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr16,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr20,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr8,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr8,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr8,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr12,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr12,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr12,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr12,fr12,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr16,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr20,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr12,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr12,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr12,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr16,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr16,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr16,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr16,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr16,fr16,fcc0
-	test_fcc	0x8,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr16,fr20,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr16,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr16,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr16,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr16,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr16,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr16,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr16,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr16,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr16,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr16,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr20,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr20,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr20,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr20,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr20,fr16,fcc0
-	test_fcc	0x8,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr20,fr20,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr20,fr24,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr20,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr20,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr20,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr20,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr20,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr20,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr20,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr20,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr20,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr24,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr24,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr24,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr24,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr24,fr16,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr24,fr20,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr24,fr24,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr24,fr28,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr24,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr24,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr24,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr24,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr24,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr24,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr24,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr24,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr28,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr28,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr28,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr28,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr28,fr16,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr28,fr20,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr28,fr24,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr28,fr28,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr28,fr32,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr28,fr36,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr28,fr40,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr28,fr44,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr28,fr48,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr28,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr28,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr28,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr16,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr20,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr24,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr28,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr32,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr36,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr40,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr48,fr44,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr48,fr48,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xb,0		; Set mask opposite of expected
-	fcmps      	fr48,fr52,fcc0
-	test_fcc	0x4,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr48,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr48,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr0,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr4,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr8,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr12,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr16,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr20,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr24,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr28,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr32,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr36,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr40,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr44,fcc0
-	test_fcc	0x2,0
-	set_fcc         0xd,0		; Set mask opposite of expected
-	fcmps      	fr52,fr48,fcc0
-	test_fcc	0x2,0
-	set_fcc         0x7,0		; Set mask opposite of expected
-	fcmps      	fr52,fr52,fcc0
-	test_fcc	0x8,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr52,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr52,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr0,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr4,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr8,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr12,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr16,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr20,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr24,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr28,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr32,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr36,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr40,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr44,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr48,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr52,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr56,fr60,fcc0
-	test_fcc	0x1,0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr0,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr4,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr8,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr12,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr16,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr20,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr24,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr28,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr32,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr36,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr40,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr44,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr48,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr52,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr56,fcc0
-	test_fcc	0x1,0
-	set_fcc         0xe,0		; Set mask opposite of expected
-	fcmps      	fr60,fr60,fcc0
-	test_fcc	0x1,0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdabss.cgs b/sim/testsuite/sim/frv/fdabss.cgs
deleted file mode 100644
index 83d3e1c723e..00000000000
--- a/sim/testsuite/sim/frv/fdabss.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for fdabss $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fdabss
-fdabss:
-	set_fr_fr	fr8,fr1
-	fdabss		fr0,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr28
-	set_fr_fr	fr24,fr13
-	fdabss		fr12,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	set_fr_fr	fr52,fr29
-	fdabss		fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr52
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdadds.cgs b/sim/testsuite/sim/frv/fdadds.cgs
deleted file mode 100644
index ecfa56cded8..00000000000
--- a/sim/testsuite/sim/frv/fdadds.cgs
+++ /dev/null
@@ -1,134 +0,0 @@
-# frv testcase for fdadds $GRi,$GRj,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fdadds
-fdadds:
-	fdadds      	fr16,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	fdadds      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	fdadds      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fdadds      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	fdadds      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdadds      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdadds      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	fdadds      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	fdadds      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	fdadds      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	fdadds      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	fdadds      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	fdadds      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	fdadds      	fr16,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-
-	fdadds      	fr20,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	fdadds      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	fdadds      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fdadds      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	fdadds      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdadds      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdadds      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	fdadds      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	fdadds      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	fdadds      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	fdadds      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	fdadds      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	fdadds      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	fdadds      	fr20,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-
-	fdadds      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdadds      	fr12,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdadds      	fr24,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdadds      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fdadds      	fr36,fr40,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fdcmps.cgs b/sim/testsuite/sim/frv/fdcmps.cgs
deleted file mode 100644
index 397832c3bed..00000000000
--- a/sim/testsuite/sim/frv/fdcmps.cgs
+++ /dev/null
@@ -1,985 +0,0 @@
-# frv testcase for fdcmps $FRi,$FRj,$FCCi_2
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fdcmps
-fdcmps:
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr0,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr4,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr8,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr12,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr16,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr20,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr0,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr4,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr8,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr12,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr16,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr20,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr4,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr8,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr12,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr16,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr20,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr8,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr12,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr16,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr20,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr12,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr16,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr20,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr16,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr16,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr20,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr20,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr16,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr20,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr24,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr24,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr16,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr20,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr24,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr28,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr28,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr16,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr20,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr24,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr28,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr32,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr36,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr40,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr44,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr48,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr48,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr16,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr20,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr24,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr28,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr32,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr36,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr40,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr44,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr48,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr52,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr52,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr0,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr4,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr8,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr12,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr16,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr20,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr24,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr28,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr32,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr36,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr40,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr44,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr48,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr52,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr56,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr0,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr4,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr8,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr12,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr16,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr20,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr24,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr28,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr32,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr36,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr40,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr44,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr48,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr52,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	fdcmps      	fr60,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fddivs.cgs b/sim/testsuite/sim/frv/fddivs.cgs
deleted file mode 100644
index ac423b29b1a..00000000000
--- a/sim/testsuite/sim/frv/fddivs.cgs
+++ /dev/null
@@ -1,195 +0,0 @@
-# frv testcase for fddivs $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fddivs
-fddivs:
-	fddivs      	fr0,fr28,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	fddivs      	fr4,fr28,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	fddivs      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fddivs      	fr12,fr28,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	fddivs      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr24,fr28,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	fddivs      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	fddivs      	fr32,fr28,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	fddivs      	fr36,fr28,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	fddivs      	fr40,fr28,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	fddivs      	fr44,fr28,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	fddivs      	fr48,fr28,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	fddivs      	fr52,fr28,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-
-	fddivs      	fr16,fr0,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr16,fr52,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fddivs      	fr20,fr0,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fddivs      	fr20,fr52,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fddivs      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fddivs      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-
-	fddivs      	fr40,fr32,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fditos.cgs b/sim/testsuite/sim/frv/fditos.cgs
deleted file mode 100644
index 412e8afa649..00000000000
--- a/sim/testsuite/sim/frv/fditos.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for fditos $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fditos
-fditos:
-	set_fr_iimmed	0,0,fr2
-	set_fr_iimmed	0x0000,0x0002,fr3
-	fditos		fr2,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-
-	set_fr_iimmed	0xdead,0xbeef,fr2
-	set_fr_iimmed	0xdead,0xbeef,fr3
-	fditos		fr2,fr2
-	test_fr_iimmed	0xce054904,fr2
-	test_fr_iimmed	0xce054904,fr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdivd.cgs b/sim/testsuite/sim/frv/fdivd.cgs
deleted file mode 100644
index 65222bb64bf..00000000000
--- a/sim/testsuite/sim/frv/fdivd.cgs
+++ /dev/null
@@ -1,128 +0,0 @@
-# frv testcase for fdivd $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fdivd
-fdivd:
-	fdivd      	fr0,fr28,fr2
-	test_dfr_dfr	fr2,fr0
-	fdivd      	fr4,fr28,fr2
-	test_dfr_dfr	fr2,fr4
-	fdivd      	fr8,fr28,fr2
-	test_dfr_dfr	fr2,fr8
-	fdivd      	fr12,fr28,fr2
-	test_dfr_dfr	fr2,fr12
-	fdivd      	fr16,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr24,fr28,fr2
-	test_dfr_dfr	fr2,fr24
-	fdivd      	fr28,fr28,fr2
-	test_dfr_dfr	fr2,fr28
-	fdivd      	fr32,fr28,fr2
-	test_dfr_dfr	fr2,fr32
-	fdivd      	fr36,fr28,fr2
-	test_dfr_dfr	fr2,fr36
-	fdivd      	fr40,fr28,fr2
-	test_dfr_dfr	fr2,fr40
-	fdivd      	fr44,fr28,fr2
-	test_dfr_dfr	fr2,fr44
-	fdivd      	fr48,fr28,fr2
-	test_dfr_dfr	fr2,fr48
-	fdivd      	fr52,fr28,fr2
-	test_dfr_dfr	fr2,fr52
-
-	fdivd      	fr16,fr0,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr4,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr32,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr40,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr44,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr48,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr16,fr52,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	fdivd      	fr20,fr0,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr4,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr32,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr40,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr44,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr48,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fdivd      	fr20,fr52,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	fdivd      	fr8,fr28,fr2
-	test_dfr_dfr	fr2,fr8
-	fdivd      	fr28,fr8,fr2
-	test_dfr_dfr	fr2,fr8
-
-	fdivd      	fr40,fr32,fr2
-	test_dfr_dfr	fr2,fr36
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fdivs.cgs b/sim/testsuite/sim/frv/fdivs.cgs
deleted file mode 100644
index cf2bd4b9b0f..00000000000
--- a/sim/testsuite/sim/frv/fdivs.cgs
+++ /dev/null
@@ -1,127 +0,0 @@
-# frv testcase for fdivs $GRi,$GRj,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fdivs
-fdivs:
-	fdivs      	fr0,fr28,fr1
-	test_fr_fr	fr1,fr0
-	fdivs      	fr4,fr28,fr1
-	test_fr_fr	fr1,fr4
-	fdivs      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr8
-	fdivs      	fr12,fr28,fr1
-	test_fr_fr	fr1,fr12
-	fdivs      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr24,fr28,fr1
-	test_fr_fr	fr1,fr24
-	fdivs      	fr28,fr28,fr1
-	test_fr_fr	fr1,fr28
-	fdivs      	fr32,fr28,fr1
-	test_fr_fr	fr1,fr32
-	fdivs      	fr36,fr28,fr1
-	test_fr_fr	fr1,fr36
-	fdivs      	fr40,fr28,fr1
-	test_fr_fr	fr1,fr40
-	fdivs      	fr44,fr28,fr1
-	test_fr_fr	fr1,fr44
-	fdivs      	fr48,fr28,fr1
-	test_fr_fr	fr1,fr48
-	fdivs      	fr52,fr28,fr1
-	test_fr_fr	fr1,fr52
-
-	fdivs      	fr16,fr0,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr16,fr52,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	fdivs      	fr20,fr0,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fdivs      	fr20,fr52,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	fdivs      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr8
-	fdivs      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-
-	fdivs      	fr40,fr32,fr1
-	test_fr_fr	fr1,fr36
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fdmadds.cgs b/sim/testsuite/sim/frv/fdmadds.cgs
deleted file mode 100644
index 7035366ac50..00000000000
--- a/sim/testsuite/sim/frv/fdmadds.cgs
+++ /dev/null
@@ -1,226 +0,0 @@
-# frv testcase for fdmadds $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fdmadds
-fdmadds:
-	fdmadds      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fdmadds      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmadds      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	fdmadds      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-
-	set_fr_fr	fr36,fr2
-	set_fr_fr	fr36,fr3
-	fdmadds      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	fdmadds      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-
-	set_fr_fr	fr36,fr2
-	set_fr_fr	fr36,fr3
-	fdmadds      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdmas.cgs b/sim/testsuite/sim/frv/fdmas.cgs
deleted file mode 100644
index a7162db296e..00000000000
--- a/sim/testsuite/sim/frv/fdmas.cgs
+++ /dev/null
@@ -1,265 +0,0 @@
-# frv testcase for fdmas $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-	load_float_constants2
-	load_float_constants3
-
-	.global fdmas
-fdmas:
-	fdmas      	fr16,fr4,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr4
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr4
-	fdmas      	fr16,fr8,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr8
-	fdmas      	fr16,fr12,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr12
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr12
-	fdmas      	fr16,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmas      	fr16,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmas      	fr16,fr24,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr24
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr24
-	fdmas      	fr16,fr28,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	fdmas      	fr16,fr32,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr32
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr32
-	fdmas      	fr16,fr36,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr36
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr36
-	fdmas      	fr16,fr40,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr40
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr40
-	fdmas      	fr16,fr44,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr44
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr44
-	fdmas      	fr16,fr48,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr48
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr48
-
-	fdmas      	fr20,fr4,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr4
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr4
-	fdmas      	fr20,fr8,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr8
-	fdmas      	fr20,fr12,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr12
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr12
-	fdmas      	fr20,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmas      	fr20,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmas      	fr20,fr24,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr24
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr24
-	fdmas      	fr20,fr28,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	fdmas      	fr20,fr32,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr32
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr32
-	fdmas      	fr20,fr36,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr36
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr36
-	fdmas      	fr20,fr40,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr40
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr40
-	fdmas      	fr20,fr44,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr44
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr44
-	fdmas      	fr20,fr48,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr48
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr48
-
-	fdmas      	fr28,fr0,fr60
-	test_fr_fr	fr60,fr0
-	test_fr_fr	fr62,fr0
-	fdmas      	fr28,fr4,fr60
-	test_fr_fr	fr60,fr4
-	test_fr_fr	fr62,fr4
-	fdmas      	fr28,fr8,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmas      	fr28,fr12,fr60
-	test_fr_fr	fr60,fr12
-	test_fr_fr	fr62,fr12
-	fdmas      	fr28,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmas      	fr28,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmas      	fr28,fr24,fr60
-	test_fr_fr	fr60,fr24
-	test_fr_fr	fr62,fr24
-	fdmas      	fr28,fr28,fr60
-	test_fr_fr	fr60,fr28
-	test_fr_fr	fr62,fr28
-	fdmas      	fr28,fr32,fr60
-	test_fr_fr	fr60,fr32
-	test_fr_fr	fr61,fr36
-	test_fr_fr	fr62,fr32
-	test_fr_fr	fr63,fr36
-	fdmas      	fr28,fr36,fr60
-	test_fr_fr	fr60,fr36
-	test_fr_fr	fr62,fr36
-	fdmas      	fr28,fr40,fr60
-	test_fr_fr	fr60,fr40
-	test_fr_fr	fr62,fr40
-	fdmas      	fr28,fr44,fr60
-	test_fr_fr	fr60,fr44
-	test_fr_fr	fr62,fr44
-	fdmas      	fr28,fr48,fr60
-	test_fr_fr	fr60,fr48
-	test_fr_fr	fr62,fr48
-	fdmas      	fr28,fr52,fr60
-	test_fr_fr	fr60,fr52
-	test_fr_fr	fr62,fr52
-
-	fdmas      	fr28,fr8,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmas      	fr8,fr28,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-
-	fdmas      	fr32,fr36,fr60
-	test_fr_fr	fr60,fr40
-	test_fr_fr	fr62,fr40
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdmovs.cgs b/sim/testsuite/sim/frv/fdmovs.cgs
deleted file mode 100644
index 58e9607ccfc..00000000000
--- a/sim/testsuite/sim/frv/fdmovs.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# frv testcase for fdmovs $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fdmovs
-fdmovs:
-	set_fr_fr	fr4,fr1
-	fdmovs		fr0,fr2
-	test_fr_fr	fr0,fr2
-	test_fr_fr	fr4,fr3
-	set_fr_fr	fr12,fr9
-	fdmovs		fr8,fr2
-	test_fr_fr	fr8,fr2
-	test_fr_fr	fr12,fr3
-	set_fr_fr	fr20,fr17
-	fdmovs		fr16,fr2
-	test_fr_fr	fr16,fr2
-	test_fr_fr	fr20,fr3
-	set_fr_fr	fr28,fr25
-	fdmovs		fr24,fr2
-	test_fr_fr	fr24,fr2
-	test_fr_fr	fr28,fr3
-	set_fr_fr	fr36,fr33
-	fdmovs		fr32,fr2
-	test_fr_fr	fr32,fr2
-	test_fr_fr	fr36,fr3
-	set_fr_fr	fr44,fr41
-	fdmovs		fr40,fr2
-	test_fr_fr	fr40,fr2
-	test_fr_fr	fr44,fr3
-	set_fr_fr	fr52,fr49
-	fdmovs		fr48,fr2
-	test_fr_fr	fr48,fr2
-	test_fr_fr	fr52,fr3
-	set_fr_fr	fr60,fr57
-	fdmovs		fr56,fr2
-	test_fr_iimmed	0x7fc00000,fr2
-	test_fr_iimmed	0x7f800001,fr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdmss.cgs b/sim/testsuite/sim/frv/fdmss.cgs
deleted file mode 100644
index 5457a1ee600..00000000000
--- a/sim/testsuite/sim/frv/fdmss.cgs
+++ /dev/null
@@ -1,235 +0,0 @@
-# frv testcase for fdmss $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-	load_float_constants2
-	load_float_constants3
-
-	.global fdmss
-fdmss:
-	fdmss      	fr16,fr4,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr16,fr8,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	fdmss      	fr16,fr12,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr16,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmss      	fr16,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmss      	fr16,fr24,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr16,fr28,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr8
-	fdmss      	fr16,fr32,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr16,fr36,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr16,fr40,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr16,fr44,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr16,fr48,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-
-	fdmss      	fr20,fr4,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr20,fr8,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	fdmss      	fr20,fr12,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr20,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmss      	fr20,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	fdmss      	fr20,fr24,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr20,fr28,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr8
-	fdmss      	fr20,fr32,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr20,fr36,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr20,fr40,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr20,fr44,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	fdmss      	fr20,fr48,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-
-	fdmss      	fr28,fr0,fr60
-	test_fr_fr	fr60,fr0
-	test_fr_fr	fr62,fr0
-	fdmss      	fr28,fr4,fr60
-	test_fr_fr	fr60,fr4
-	test_fr_fr	fr62,fr4
-	fdmss      	fr28,fr8,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr32
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr32
-	fdmss      	fr28,fr12,fr60
-	test_fr_fr	fr60,fr12
-	test_fr_fr	fr62,fr12
-	fdmss      	fr28,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	fdmss      	fr28,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	fdmss      	fr28,fr24,fr60
-	test_fr_fr	fr60,fr24
-	test_fr_fr	fr62,fr24
-	fdmss      	fr28,fr28,fr60
-	test_fr_fr	fr60,fr28
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr62,fr28
-	test_fr_fr	fr63,fr20
-	test_fr_fr	fr63,fr16
-	fdmss      	fr28,fr32,fr60
-	test_fr_fr	fr60,fr32
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr32
-	test_fr_fr	fr63,fr8
-	fdmss      	fr28,fr36,fr60
-	test_fr_fr	fr60,fr36
-	test_fr_fr	fr62,fr36
-	fdmss      	fr28,fr40,fr60
-	test_fr_fr	fr60,fr40
-	test_fr_fr	fr62,fr40
-	fdmss      	fr28,fr44,fr60
-	test_fr_fr	fr60,fr44
-	test_fr_fr	fr62,fr44
-	fdmss      	fr28,fr48,fr60
-	test_fr_fr	fr60,fr48
-	test_fr_fr	fr62,fr48
-	fdmss      	fr28,fr52,fr60
-	test_fr_fr	fr60,fr52
-	test_fr_fr	fr62,fr52
-
-	fdmss      	fr28,fr8,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr32
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr32
-	fdmss      	fr8,fr28,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr62,fr8
-
-	fdmss      	fr32,fr36,fr60
-	test_fr_fr	fr60,fr40
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr40
-	test_fr_fr	fr63,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdmulcs.cgs b/sim/testsuite/sim/frv/fdmulcs.cgs
deleted file mode 100644
index a7cb15950d0..00000000000
--- a/sim/testsuite/sim/frv/fdmulcs.cgs
+++ /dev/null
@@ -1,201 +0,0 @@
-# frv testcase for fdmulcs $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fdmulcs
-fdmulcs:
-	fdmulcs      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fdmulcs      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr2,fr20
-	fdmulcs      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fdmulcs      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	fdmulcs      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	fdmulcs      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fdmulcs      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	fdmulcs      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmulcs      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	fdmulcs      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	fdmulcs      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	fdmulcs      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	fdmulcs      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	fdmulcs      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	fdmulcs      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	fdmulcs      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-
-	fdmulcs      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fdmulcs      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-
-	fdmulcs      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-
-	set_fr_fr	fr32,fr50	; 2
-	set_fr_fr	fr28,fr51	; 1
-	set_fr_fr	fr44,fr52	; 9
-	set_fr_fr	fr36,fr53	; 3
-	fdmulcs		fr50,fr52,fr54	; 2*3, 1*9
-	test_fr_fr	fr54,fr40	; 6
-	test_fr_fr	fr55,fr44	; 9
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdmuls.cgs b/sim/testsuite/sim/frv/fdmuls.cgs
deleted file mode 100644
index 2c2c05abdf0..00000000000
--- a/sim/testsuite/sim/frv/fdmuls.cgs
+++ /dev/null
@@ -1,193 +0,0 @@
-# frv testcase for fdmuls $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fdmuls
-fdmuls:
-	fdmuls      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fdmuls      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr2,fr20
-	fdmuls      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fdmuls      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	fdmuls      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	fdmuls      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fdmuls      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	fdmuls      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdmuls      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	fdmuls      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	fdmuls      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	fdmuls      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	fdmuls      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	fdmuls      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	fdmuls      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	fdmuls      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-
-	fdmuls      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fdmuls      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-
-	fdmuls      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdnegs.cgs b/sim/testsuite/sim/frv/fdnegs.cgs
deleted file mode 100644
index db409cb04a4..00000000000
--- a/sim/testsuite/sim/frv/fdnegs.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for fdnegs $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fdnegs
-fdnegs:
-	set_fr_fr	fr8,fr1
-	fdnegs		fr0,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr28
-	set_fr_fr	fr24,fr13
-	fdnegs		fr12,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr12
-	set_fr_fr	fr52,fr29
-	fdnegs		fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdsads.cgs b/sim/testsuite/sim/frv/fdsads.cgs
deleted file mode 100644
index 123810df17d..00000000000
--- a/sim/testsuite/sim/frv/fdsads.cgs
+++ /dev/null
@@ -1,119 +0,0 @@
-# frv testcase for fdsads $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fdsads
-fdsads:
-	fdsads      	fr16,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr52
-	fdsads      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr48
-	fdsads      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr28
-	fdsads      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr24
-	fdsads      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdsads      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdsads      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr12
-	fdsads      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr8
-	fdsads      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr32
-	fdsads      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr36
-	fdsads      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr40
-	fdsads      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr44
-	fdsads      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr4
-	fdsads      	fr16,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr0
-
-	fdsads      	fr20,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr52
-	fdsads      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr48
-	fdsads      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr28
-	fdsads      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr24
-	fdsads      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdsads      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdsads      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr12
-	fdsads      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr8
-	fdsads      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr32
-	fdsads      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr36
-	fdsads      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr40
-	fdsads      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr44
-	fdsads      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr4
-	fdsads      	fr20,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr0
-
-	fdsads      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fdsads      	fr12,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fdsads      	fr24,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fdsads      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	test_fr_fr	fr3,fr32
-
-	fdsads      	fr36,fr40,fr2
-	test_fr_fr	fr2,fr44
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fdsqrts.cgs b/sim/testsuite/sim/frv/fdsqrts.cgs
deleted file mode 100644
index 6026b93a2a0..00000000000
--- a/sim/testsuite/sim/frv/fdsqrts.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# frv testcase for fdsqrts $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fdsqrts
-fdsqrts:
-	set_fr_iimmed	0x4049,0x0fdb,fr45	; 3.141592654
-	fdsqrts		fr44,fr2		; 9.0
-	test_fr_fr	fr2,fr36		; 3.0
-	test_fr_iimmed	0x3fe2dfc5,fr3		; 1.7724539
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdstoi.cgs b/sim/testsuite/sim/frv/fdstoi.cgs
deleted file mode 100644
index 5c79e49dfc6..00000000000
--- a/sim/testsuite/sim/frv/fdstoi.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# frv testcase for fdstoi $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fdstoi
-fdstoi:
-	set_fr_fr	fr20,fr17
-	fdstoi		fr16,fr2
-	test_fr_iimmed	0,fr2
-	test_fr_iimmed	0,fr3
-
-	set_fr_iimmed	0xce05,0x4904,fr2
-	set_fr_fr	fr32,fr3
-	fdstoi		fr2,fr2
-	test_fr_iimmed	0xdeadbf00,fr2
-	test_fr_iimmed	0x00000002,fr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fdsubs.cgs b/sim/testsuite/sim/frv/fdsubs.cgs
deleted file mode 100644
index 93dae46d9ee..00000000000
--- a/sim/testsuite/sim/frv/fdsubs.cgs
+++ /dev/null
@@ -1,117 +0,0 @@
-# frv testcase for fdsubs $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fdsubs
-fdsubs:
-	fdsubs      	fr0,fr16,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	fdsubs      	fr4,fr16,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	fdsubs      	fr8,fr16,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fdsubs      	fr12,fr16,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	fdsubs      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdsubs      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdsubs      	fr24,fr16,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	fdsubs      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	fdsubs      	fr32,fr16,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	fdsubs      	fr36,fr16,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	fdsubs      	fr40,fr16,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	fdsubs      	fr44,fr16,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	fdsubs      	fr48,fr16,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	fdsubs      	fr52,fr16,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-
-	fdsubs      	fr0,fr20,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	fdsubs      	fr4,fr20,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	fdsubs      	fr8,fr20,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	fdsubs      	fr12,fr20,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	fdsubs      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdsubs      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fdsubs      	fr24,fr20,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	fdsubs      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	fdsubs      	fr32,fr20,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	fdsubs      	fr36,fr20,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	fdsubs      	fr40,fr20,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	fdsubs      	fr44,fr20,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	fdsubs      	fr48,fr20,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	fdsubs      	fr52,fr20,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-
-	fdsubs      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-
-	fdsubs      	fr44,fr40,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fdtoi.cgs b/sim/testsuite/sim/frv/fdtoi.cgs
deleted file mode 100644
index 1749852263e..00000000000
--- a/sim/testsuite/sim/frv/fdtoi.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# frv testcase for fdtoi $FRj,$FRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global fdtoi
-fdtoi:
-	set_fr_iimmed	0,0,fr2
-	set_fr_iimmed	0,0,fr3
-	fdtoi		fr2,fr2
-	test_fr_iimmed	0,fr2
-
-	set_fr_iimmed	0x4000,0x0000,fr2
-	set_fr_iimmed	0x0000,0x0000,fr3
-	fdtoi		fr2,fr2
-	test_fr_iimmed	0x00000002,fr2
-
-	set_fr_iimmed	0xc1c0,0xa920,fr2
-	set_fr_iimmed	0x8880,0x0000,fr3
-	fdtoi		fr2,fr2
-	test_fr_iimmed	0xdeadbeef,fr2
-
-	set_gr_limmed	0x4031,0x0000,gr8
-	set_gr_limmed	0x0000,0x0000,gr9
-	movgfd		gr8,fr0
-	fdtoi		fr0,fr0
-	test_fr_iimmed	17,fr0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fitod.cgs b/sim/testsuite/sim/frv/fitod.cgs
deleted file mode 100644
index 62ef1f21f39..00000000000
--- a/sim/testsuite/sim/frv/fitod.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for fitod $FRj,$FRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global fitod
-fitod:
-	set_fr_iimmed	0,0,fr2
-	fitod		fr2,fr2
-	test_fr_iimmed	0,fr2
-	test_fr_iimmed	0,fr3
-
-	set_fr_iimmed	0x0000,0x0002,fr2
-	fitod		fr2,fr2
-	test_fr_iimmed	0x40000000,fr2
-	test_fr_iimmed	0x00000000,fr3
-
-	set_fr_iimmed	0xdead,0xbeef,fr2
-	fitod		fr2,fr2
-	test_fr_iimmed	0xc1c0a920,fr2
-	test_fr_iimmed	0x88800000,fr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fitos.cgs b/sim/testsuite/sim/frv/fitos.cgs
deleted file mode 100644
index 2afe290565c..00000000000
--- a/sim/testsuite/sim/frv/fitos.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for fitos $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fitos
-fitos:
-	set_fr_iimmed	0,0,fr1
-	fitos		fr1,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_iimmed	0x0000,0x0002,fr1
-	fitos		fr1,fr1
-	test_fr_fr	fr1,fr32
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	fitos		fr1,fr1
-	test_fr_iimmed	0xce054904,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmad.cgs b/sim/testsuite/sim/frv/fmad.cgs
deleted file mode 100644
index 64fee9c56ea..00000000000
--- a/sim/testsuite/sim/frv/fmad.cgs
+++ /dev/null
@@ -1,161 +0,0 @@
-# frv testcase for fmad $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fmad
-fmad:
-	fmad      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	fmad      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	fmad      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	fmad      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmad      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmad      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	fmad      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmad      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	fmad      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	fmad      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	fmad      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	fmad      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-
-	fmad      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	fmad      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	fmad      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	fmad      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmad      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmad      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	fmad      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmad      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	fmad      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	fmad      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	fmad      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	fmad      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-
-	fmad      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	fmad      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	fmad      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmad      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	fmad      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmad      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmad      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	fmad      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	fmad      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr36
-	fmad      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	fmad      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	fmad      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	fmad      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	fmad      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-
-	fmad      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmad      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fmad      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmaddd.cgs b/sim/testsuite/sim/frv/fmaddd.cgs
deleted file mode 100644
index bfa816f1a2a..00000000000
--- a/sim/testsuite/sim/frv/fmaddd.cgs
+++ /dev/null
@@ -1,143 +0,0 @@
-# frv testcase for fmaddd $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fmaddd
-fmaddd:
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr16,fr4,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr32,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr40,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr44,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr16,fr48,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	fmaddd      	fr20,fr4,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr32,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr40,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr44,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmaddd      	fr20,fr48,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr0,fr2
-	test_dfr_dfr	fr2,fr0
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr4,fr2
-	test_dfr_dfr	fr2,fr4
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr8,fr2
-	test_dfr_dfr	fr2,fr8
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr12,fr2
-	test_dfr_dfr	fr2,fr12
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr24,fr2
-	test_dfr_dfr	fr2,fr24
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr28,fr2
-	test_dfr_dfr	fr2,fr28
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr32,fr2
-	test_dfr_dfr	fr2,fr32
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr36,fr2
-	test_dfr_dfr	fr2,fr36
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr40,fr2
-	test_dfr_dfr	fr2,fr40
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr44,fr2
-	test_dfr_dfr	fr2,fr44
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr48,fr2
-	test_dfr_dfr	fr2,fr48
-	set_dfr_dfr	fr16,fr2
-	fmaddd      	fr28,fr52,fr2
-	test_dfr_dfr	fr2,fr52
-
-	set_dfr_dfr	fr36,fr2
-	fmaddd      	fr28,fr8,fr2
-	test_dfr_dfr	fr2,fr32
-	fmaddd      	fr8,fr28,fr2
-	test_dfr_dfr	fr2,fr28
-
-	set_dfr_dfr	fr36,fr2
-	fmaddd      	fr32,fr36,fr2
-	test_dfr_dfr	fr2,fr44
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmadds.cgs b/sim/testsuite/sim/frv/fmadds.cgs
deleted file mode 100644
index 128c82a9b56..00000000000
--- a/sim/testsuite/sim/frv/fmadds.cgs
+++ /dev/null
@@ -1,143 +0,0 @@
-# frv testcase for fmadds $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fmadds
-fmadds:
-	set_fr_fr	fr16,fr1
-	fmadds      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	fmadds      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmadds      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr0,fr1
-	test_fr_fr	fr1,fr0
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr4,fr1
-	test_fr_fr	fr1,fr4
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr12,fr1
-	test_fr_fr	fr1,fr12
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr24,fr1
-	test_fr_fr	fr1,fr24
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr28,fr1
-	test_fr_fr	fr1,fr28
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr32,fr1
-	test_fr_fr	fr1,fr32
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr36,fr1
-	test_fr_fr	fr1,fr36
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr40,fr1
-	test_fr_fr	fr1,fr40
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr44,fr1
-	test_fr_fr	fr1,fr44
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr48,fr1
-	test_fr_fr	fr1,fr48
-	set_fr_fr	fr16,fr1
-	fmadds      	fr28,fr52,fr1
-	test_fr_fr	fr1,fr52
-
-	set_fr_fr	fr36,fr1
-	fmadds      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr32
-	fmadds      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr28
-
-	set_fr_fr	fr36,fr1
-	fmadds      	fr32,fr36,fr1
-	test_fr_fr	fr1,fr44
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmas.cgs b/sim/testsuite/sim/frv/fmas.cgs
deleted file mode 100644
index 1e7b1dfef8b..00000000000
--- a/sim/testsuite/sim/frv/fmas.cgs
+++ /dev/null
@@ -1,161 +0,0 @@
-# frv testcase for fmas $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fmas
-fmas:
-	fmas      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	fmas      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	fmas      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	fmas      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmas      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmas      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	fmas      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmas      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	fmas      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	fmas      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	fmas      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	fmas      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-
-	fmas      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	fmas      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	fmas      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	fmas      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmas      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmas      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	fmas      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmas      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	fmas      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	fmas      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	fmas      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	fmas      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-
-	fmas      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	fmas      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	fmas      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmas      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	fmas      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmas      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmas      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	fmas      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	fmas      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr36
-	fmas      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	fmas      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	fmas      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	fmas      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	fmas      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-
-	fmas      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmas      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-
-	fmas      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmovd.cgs b/sim/testsuite/sim/frv/fmovd.cgs
deleted file mode 100644
index 938faa2adf6..00000000000
--- a/sim/testsuite/sim/frv/fmovd.cgs
+++ /dev/null
@@ -1,48 +0,0 @@
-# frv testcase for fmovd $FRj,$FRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fmovd
-fmovd:
-	fmovd		fr0,fr2
-	test_dfr_dfr	fr0,fr2
-	fmovd		fr4,fr2
-	test_dfr_dfr	fr4,fr2
-	fmovd		fr8,fr2
-	test_dfr_dfr	fr8,fr2
-	fmovd		fr12,fr2
-	test_dfr_dfr	fr12,fr2
-	fmovd		fr16,fr2
-	test_dfr_dfr	fr16,fr2
-	fmovd		fr20,fr2
-	test_dfr_dfr	fr20,fr2
-	fmovd		fr24,fr2
-	test_dfr_dfr	fr24,fr2
-	fmovd		fr28,fr2
-	test_dfr_dfr	fr28,fr2
-	fmovd		fr32,fr2
-	test_dfr_dfr	fr32,fr2
-	fmovd		fr36,fr2
-	test_dfr_dfr	fr36,fr2
-	fmovd		fr40,fr2
-	test_dfr_dfr	fr40,fr2
-	fmovd		fr44,fr2
-	test_dfr_dfr	fr44,fr2
-	fmovd		fr48,fr2
-	test_dfr_dfr	fr48,fr2
-	fmovd		fr52,fr2
-	test_dfr_dfr	fr52,fr2
-	fmovd		fr56,fr2
-	test_fr_iimmed	0x7ff80000,fr2
-	test_fr_iimmed	0x00000000,fr3
-	fmovd		fr60,fr2
-	test_fr_iimmed	0x7ff00000,fr2
-	test_fr_iimmed	0x00000001,fr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmovs.cgs b/sim/testsuite/sim/frv/fmovs.cgs
deleted file mode 100644
index 2a70277f6e5..00000000000
--- a/sim/testsuite/sim/frv/fmovs.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# frv testcase for fmovs $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fmovs
-fmovs:
-	fmovs		fr0,fr1
-	test_fr_fr	fr0,fr1
-	fmovs		fr4,fr1
-	test_fr_fr	fr4,fr1
-	fmovs		fr8,fr1
-	test_fr_fr	fr8,fr1
-	fmovs		fr12,fr1
-	test_fr_fr	fr12,fr1
-	fmovs		fr16,fr1
-	test_fr_fr	fr16,fr1
-	fmovs		fr20,fr1
-	test_fr_fr	fr20,fr1
-	fmovs		fr24,fr1
-	test_fr_fr	fr24,fr1
-	fmovs		fr28,fr1
-	test_fr_fr	fr28,fr1
-	fmovs		fr32,fr1
-	test_fr_fr	fr32,fr1
-	fmovs		fr36,fr1
-	test_fr_fr	fr36,fr1
-	fmovs		fr40,fr1
-	test_fr_fr	fr40,fr1
-	fmovs		fr44,fr1
-	test_fr_fr	fr44,fr1
-	fmovs		fr48,fr1
-	test_fr_fr	fr48,fr1
-	fmovs		fr52,fr1
-	test_fr_fr	fr52,fr1
-	fmovs		fr56,fr1
-	test_fr_iimmed	0x7fc00000,fr1
-	fmovs		fr60,fr1
-	test_fr_iimmed	0x7f800001,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmsd.cgs b/sim/testsuite/sim/frv/fmsd.cgs
deleted file mode 100644
index cd2efbd119e..00000000000
--- a/sim/testsuite/sim/frv/fmsd.cgs
+++ /dev/null
@@ -1,146 +0,0 @@
-# frv testcase for fmsd $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fmsd
-fmsd:
-	fmsd      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmsd      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmsd      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmsd      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	fmsd      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-
-	fmsd      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmsd      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmsd      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmsd      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	fmsd      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmsd      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-
-	fmsd      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	fmsd      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	fmsd      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	fmsd      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	fmsd      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmsd      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmsd      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	fmsd      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	fmsd      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr8
-	fmsd      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	fmsd      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	fmsd      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	fmsd      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	fmsd      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-
-	fmsd      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	fmsd      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-
-	fmsd      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmss.cgs b/sim/testsuite/sim/frv/fmss.cgs
deleted file mode 100644
index defe0690aac..00000000000
--- a/sim/testsuite/sim/frv/fmss.cgs
+++ /dev/null
@@ -1,146 +0,0 @@
-# frv testcase for fmss $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global fmss
-fmss:
-	fmss      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmss      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmss      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmss      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	fmss      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-
-	fmss      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmss      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmss      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	fmss      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	fmss      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	fmss      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-
-	fmss      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	fmss      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	fmss      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	fmss      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	fmss      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmss      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	fmss      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	fmss      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	fmss      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr8
-	fmss      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	fmss      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	fmss      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	fmss      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	fmss      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-
-	fmss      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	fmss      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-
-	fmss      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmsubd.cgs b/sim/testsuite/sim/frv/fmsubd.cgs
deleted file mode 100644
index 6b4c943c1bb..00000000000
--- a/sim/testsuite/sim/frv/fmsubd.cgs
+++ /dev/null
@@ -1,144 +0,0 @@
-# frv testcase for fmsubd $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fmsubd
-fmsubd:
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr16,fr4,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr32,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr40,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr44,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr16,fr48,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	fmsubd      	fr20,fr4,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr32,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr40,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr44,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmsubd      	fr20,fr48,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr0,fr2
-	test_dfr_dfr	fr2,fr0
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr4,fr2
-	test_dfr_dfr	fr2,fr4
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr8,fr2
-	test_dfr_dfr	fr2,fr8
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr12,fr2
-	test_dfr_dfr	fr2,fr12
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr24,fr2
-	test_dfr_dfr	fr2,fr24
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr28,fr2
-	test_dfr_dfr	fr2,fr28
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr32,fr2
-	test_dfr_dfr	fr2,fr32
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr36,fr2
-	test_dfr_dfr	fr2,fr36
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr40,fr2
-	test_dfr_dfr	fr2,fr40
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr44,fr2
-	test_dfr_dfr	fr2,fr44
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr48,fr2
-	test_dfr_dfr	fr2,fr48
-	set_dfr_dfr	fr16,fr2
-	fmsubd      	fr28,fr52,fr2
-	test_dfr_dfr	fr2,fr52
-
-	set_dfr_dfr	fr32,fr2
-	fmsubd      	fr8,fr8,fr2
-	test_dfr_dfr	fr2,fr8
-	set_dfr_dfr	fr36,fr2
-	fmsubd      	fr36,fr36,fr2
-	test_dfr_dfr	fr2,fr40
-
-	fmsubd      	fr32,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmsubs.cgs b/sim/testsuite/sim/frv/fmsubs.cgs
deleted file mode 100644
index 14a5bb355a3..00000000000
--- a/sim/testsuite/sim/frv/fmsubs.cgs
+++ /dev/null
@@ -1,144 +0,0 @@
-# frv testcase for fmsubs $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fmsubs
-fmsubs:
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	fmsubs      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmsubs      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr0,fr1
-	test_fr_fr	fr1,fr0
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr4,fr1
-	test_fr_fr	fr1,fr4
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr12,fr1
-	test_fr_fr	fr1,fr12
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr24,fr1
-	test_fr_fr	fr1,fr24
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr28,fr1
-	test_fr_fr	fr1,fr28
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr32,fr1
-	test_fr_fr	fr1,fr32
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr36,fr1
-	test_fr_fr	fr1,fr36
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr40,fr1
-	test_fr_fr	fr1,fr40
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr44,fr1
-	test_fr_fr	fr1,fr44
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr48,fr1
-	test_fr_fr	fr1,fr48
-	set_fr_fr	fr16,fr1
-	fmsubs      	fr28,fr52,fr1
-	test_fr_fr	fr1,fr52
-
-	set_fr_fr	fr32,fr1
-	fmsubs      	fr8,fr8,fr1
-	test_fr_fr	fr1,fr8
-	set_fr_fr	fr36,fr1
-	fmsubs      	fr36,fr36,fr1
-	test_fr_fr	fr1,fr40
-
-	fmsubs      	fr32,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmuld.cgs b/sim/testsuite/sim/frv/fmuld.cgs
deleted file mode 100644
index e06ca07675a..00000000000
--- a/sim/testsuite/sim/frv/fmuld.cgs
+++ /dev/null
@@ -1,126 +0,0 @@
-# frv testcase for fmuld $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fmuld
-fmuld:
-	fmuld      	fr16,fr4,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr32,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr40,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr44,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr16,fr48,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	fmuld      	fr20,fr4,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr8,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr12,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr24,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr28,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr32,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr36,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr40,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr44,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr20,fr48,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-
-	fmuld      	fr28,fr0,fr2
-	test_dfr_dfr	fr2,fr0
-	fmuld      	fr28,fr4,fr2
-	test_dfr_dfr	fr2,fr4
-	fmuld      	fr28,fr8,fr2
-	test_dfr_dfr	fr2,fr8
-	fmuld      	fr28,fr12,fr2
-	test_dfr_dfr	fr2,fr12
-	fmuld      	fr28,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr28,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fmuld      	fr28,fr24,fr2
-	test_dfr_dfr	fr2,fr24
-	fmuld      	fr28,fr28,fr2
-	test_dfr_dfr	fr2,fr28
-	fmuld      	fr28,fr32,fr2
-	test_dfr_dfr	fr2,fr32
-	fmuld      	fr28,fr36,fr2
-	test_dfr_dfr	fr2,fr36
-	fmuld      	fr28,fr40,fr2
-	test_dfr_dfr	fr2,fr40
-	fmuld      	fr28,fr44,fr2
-	test_dfr_dfr	fr2,fr44
-	fmuld      	fr28,fr48,fr2
-	test_dfr_dfr	fr2,fr48
-	fmuld      	fr28,fr52,fr2
-	test_dfr_dfr	fr2,fr52
-
-	fmuld      	fr28,fr8,fr2
-	test_dfr_dfr	fr2,fr8
-	fmuld      	fr8,fr28,fr2
-	test_dfr_dfr	fr2,fr8
-
-	fmuld      	fr32,fr36,fr2
-	test_dfr_dfr	fr2,fr40
-
-	pass
diff --git a/sim/testsuite/sim/frv/fmuls.cgs b/sim/testsuite/sim/frv/fmuls.cgs
deleted file mode 100644
index a92fa1ea83c..00000000000
--- a/sim/testsuite/sim/frv/fmuls.cgs
+++ /dev/null
@@ -1,125 +0,0 @@
-# frv testcase for fmuls $GRi,$GRj,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fmuls
-fmuls:
-	fmuls      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	fmuls      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-
-	fmuls      	fr28,fr0,fr1
-	test_fr_fr	fr1,fr0
-	fmuls      	fr28,fr4,fr1
-	test_fr_fr	fr1,fr4
-	fmuls      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	fmuls      	fr28,fr12,fr1
-	test_fr_fr	fr1,fr12
-	fmuls      	fr28,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr28,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fmuls      	fr28,fr24,fr1
-	test_fr_fr	fr1,fr24
-	fmuls      	fr28,fr28,fr1
-	test_fr_fr	fr1,fr28
-	fmuls      	fr28,fr32,fr1
-	test_fr_fr	fr1,fr32
-	fmuls      	fr28,fr36,fr1
-	test_fr_fr	fr1,fr36
-	fmuls      	fr28,fr40,fr1
-	test_fr_fr	fr1,fr40
-	fmuls      	fr28,fr44,fr1
-	test_fr_fr	fr1,fr44
-	fmuls      	fr28,fr48,fr1
-	test_fr_fr	fr1,fr48
-	fmuls      	fr28,fr52,fr1
-	test_fr_fr	fr1,fr52
-
-	fmuls      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	fmuls      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr8
-
-	fmuls      	fr32,fr36,fr1
-	test_fr_fr	fr1,fr40
-
-	pass
diff --git a/sim/testsuite/sim/frv/fnegd.cgs b/sim/testsuite/sim/frv/fnegd.cgs
deleted file mode 100644
index c18721b8e72..00000000000
--- a/sim/testsuite/sim/frv/fnegd.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for fnegd $FRj,$FRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fnegd
-fnegd:
-	fnegd		fr0,fr2
-	test_dfr_dfr	fr2,fr52
-	fnegd		fr8,fr2
-	test_dfr_dfr	fr2,fr28
-	fnegd		fr12,fr2
-	test_dfr_dfr	fr2,fr24
-	fnegd		fr24,fr2
-	test_dfr_dfr	fr2,fr12
-	fnegd		fr28,fr2
-	test_dfr_dfr	fr2,fr8
-	fnegd		fr52,fr2
-	test_dfr_dfr	fr2,fr0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fnegs.cgs b/sim/testsuite/sim/frv/fnegs.cgs
deleted file mode 100644
index fdb87704ab5..00000000000
--- a/sim/testsuite/sim/frv/fnegs.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for fnegs $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fnegs
-fnegs:
-	fnegs		fr0,fr1
-	test_fr_fr	fr1,fr52
-	fnegs		fr8,fr1
-	test_fr_fr	fr1,fr28
-	fnegs		fr12,fr1
-	test_fr_fr	fr1,fr24
-	fnegs		fr24,fr1
-	test_fr_fr	fr1,fr12
-	fnegs		fr28,fr1
-	test_fr_fr	fr1,fr8
-	fnegs		fr52,fr1
-	test_fr_fr	fr1,fr0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fnop.cgs b/sim/testsuite/sim/frv/fnop.cgs
deleted file mode 100644
index 5e48384751a..00000000000
--- a/sim/testsuite/sim/frv/fnop.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# frv testcase for fnop
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global fnop
-fnop:
-	fnop
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/addss.cgs b/sim/testsuite/sim/frv/fr400/addss.cgs
deleted file mode 100644
index b108f506924..00000000000
--- a/sim/testsuite/sim/frv/fr400/addss.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# frv testcase for addss $GRi,$GRj,$GRk
-# mach: fr405 fr450
-
-	.include "../testutils.inc"
-
-	start
-
-	.global add
-add_nosaturate:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	addss		gr7,gr8,gr8
-	test_gr_immed  	3,gr8
-add_saturate_pos:
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_immed   	1,gr8
-	addss		gr7,gr8,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_limmed	0x4000,0x0000,gr7
-	set_gr_limmed	0x4000,0x0000,gr8
-	addss		gr7,gr8,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-add_saturate_neg:
-	set_gr_limmed	0x8000,0x0000,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	addss		gr7,gr8,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	set_gr_limmed	0x8000,0x0001,gr7
-	set_gr_limmed	0x8000,0x0001,gr8
-	addss		gr7,gr8,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/allinsn.exp b/sim/testsuite/sim/frv/fr400/allinsn.exp
deleted file mode 100644
index b1697610403..00000000000
--- a/sim/testsuite/sim/frv/fr400/allinsn.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# FRV simulator testsuite.
-
-if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-    # all machines
-    set all_machs "fr400 fr405 fr450 fr550"
-    set cpu_option -mcpu
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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/frv/fr400/csdiv.cgs b/sim/testsuite/sim/frv/fr400/csdiv.cgs
deleted file mode 100644
index 9fa6d8c6af9..00000000000
--- a/sim/testsuite/sim/frv/fr400/csdiv.cgs
+++ /dev/null
@@ -1,187 +0,0 @@
-# frv testcase for csdiv $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global csdiv
-csdiv:
-	set_spr_immed	0x1b1b,cccr
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc4,1
-	test_gr_immed  	4,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc4,1
-	test_gr_immed  	-1,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide will cause overflow
-	set_spr_addr	ok1,lr
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-e1:	csdiv      	gr1,gr3,gr2,cc4,1
-	test_gr_immed	1,gr15
-	test_gr_limmed 	0x8000,0x0000,gr2
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc4,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc4,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc5,0
-	test_gr_immed  	4,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc5,0
-	test_gr_immed  	-1,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	; divide will cause overflow
-	set_spr_addr	ok1,lr
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-e2:	csdiv      	gr1,gr3,gr2,cc5,0
-	test_gr_immed	2,gr15
-	test_gr_limmed 	0x8000,0x0000,gr2
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc5,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc5,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc6,0
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	csdiv      	gr1,gr3,gr2,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	csdiv      	gr1,gr3,gr2,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	csdiv      	gr1,gr3,gr2,cc7,1
-	test_gr_limmed 	0x7fff,0xffff,gr2
-
-	pass
-
-ok1:	; exception handler for overflow
-	test_spr_bits	0x18,3,0x2,isr		; isr.dtt is set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/fr400/maddaccs.cgs b/sim/testsuite/sim/frv/fr400/maddaccs.cgs
deleted file mode 100644
index 98659c42c13..00000000000
--- a/sim/testsuite/sim/frv/fr400/maddaccs.cgs
+++ /dev/null
@@ -1,131 +0,0 @@
-# frv testcase for maddaccs $ACC40Si,$ACC40Sk
-# mach: fr400
-
-	.include "../testutils.inc"
-
-	start
-
-	.global maddaccs
-maddaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0xdead0000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x0000beef,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdead,0xbeef,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xbeef,0xdead,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x11111111,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x2345,0x6789,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	1,accg3
-	test_acc_limmed	0x1234,0x5677,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5677,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffe7ffe,acc0
-	set_accg_immed	0x0,accg1
-	set_acc_immed	0x00020001,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x80,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xfffffffe,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	maddaccs.p	acc0,acc1
-	maddaccs	acc2,acc3
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie not set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x8,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/masaccs.cgs b/sim/testsuite/sim/frv/fr400/masaccs.cgs
deleted file mode 100644
index 8fbde91f872..00000000000
--- a/sim/testsuite/sim/frv/fr400/masaccs.cgs
+++ /dev/null
@@ -1,151 +0,0 @@
-# frv testcase for masaccs $ACC40Si,$ACC40Sk
-# mach: fr400
-
-	.include "../testutils.inc"
-
-	start
-
-	.global masaccs
-masaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0xdead0000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x0000beef,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0xdead,0xbeef,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdeac,0x4111,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0xbeef,0xdead,acc2
-	test_accg_immed	0xff,accg3
-	test_acc_limmed	0x4111,0xdead,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x11111111,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x2345,0x6789,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0123,0x4567,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	1,accg2
-	test_acc_limmed	0x1234,0x5677,acc2
-	test_accg_immed	0xff,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x1234,0x5677,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffe7ffe,acc0
-	set_accg_immed	0x0,accg1
-	set_acc_immed	0x00020001,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xfffc,0x7ffd,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x80,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xfffffffe,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x80,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0003,acc3
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	masaccs.p	acc0,acc0
-	masaccs		acc2,acc2
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie not set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x8,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0000,acc1
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0002,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/maveh.cgs b/sim/testsuite/sim/frv/fr400/maveh.cgs
deleted file mode 100644
index 445e121daf6..00000000000
--- a/sim/testsuite/sim/frv/fr400/maveh.cgs
+++ /dev/null
@@ -1,319 +0,0 @@
-# frv testcase for maveh $FRi,$FRj,$FRj on fr400 machines
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global maveh
-maveh:
-	; Test Rounding toward positive infinity via RDAV
-	or_spr_immed	0x20000000,msr0
-	and_spr_immed	0xefffffff,msr0
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x0000,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0002,0x0001,fr12
-
-	set_fr_iimmed	0x0000,0xffff,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0xffff,fr12
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xef57,0xdf78,fr12
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xdf78,0xef57,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x11a3,0x33c5,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x091a,0x2b3c,fr12
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x4000,0x4000,fr12
-
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xc000,fr12
-
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xc000,fr12
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	maveh.p		fr10,fr10,fr12
-	maveh		fr11,fr11,fr13
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-
-	; Test Rounding toward nearest via RD
-	or_spr_immed	0x10000000,msr0
-	and_spr_immed	0x3fffffff,msr0
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x0000,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0002,0x0001,fr12
-
-	set_fr_iimmed	0x0000,0xffff,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xfffe,fr12
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xef56,0xdf77,fr12
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xdf77,0xef56,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x11a3,0x33c5,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x091a,0x2b3c,fr12
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x4000,0x4000,fr12
-
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xbfff,fr12
-
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xbfff,0xbfff,fr12
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	maveh.p		fr10,fr10,fr12
-	maveh		fr11,fr11,fr13
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-
-	; Test Rounding toward zero via RD
-	or_spr_immed	0x50000000,msr0
-	and_spr_immed	0x7fffffff,msr0
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x0000,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0001,0x0000,fr12
-
-	set_fr_iimmed	0x0000,0xffff,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0xffff,fr12
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xef57,0xdf78,fr12
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xdf78,0xef57,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x11a2,0x33c4,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0919,0x2b3b,fr12
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x4000,0x3fff,fr12
-
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xc000,fr12
-
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xc000,fr12
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	maveh.p		fr10,fr10,fr12
-	maveh		fr11,fr11,fr13
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-
-	; Test Rounding toward positive infinity via RD
-	or_spr_immed	0x90000000,msr0
-	and_spr_immed	0xbfffffff,msr0
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x0000,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0002,0x0001,fr12
-
-	set_fr_iimmed	0x0000,0xffff,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0xffff,fr12
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xef57,0xdf78,fr12
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xdf78,0xef57,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x11a3,0x33c5,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x091a,0x2b3c,fr12
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x4000,0x4000,fr12
-
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xc000,fr12
-
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xc000,fr12
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	maveh.p		fr10,fr10,fr12
-	maveh		fr11,fr11,fr13
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-
-	; Test Rounding toward negative infinity via RD
-	or_spr_immed	0xd0000000,msr0
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x0000,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0001,0x0000,fr12
-
-	set_fr_iimmed	0x0000,0xffff,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xfffe,fr12
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xef56,0xdf77,fr12
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xdf77,0xef56,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x11a2,0x33c4,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0919,0x2b3b,fr12
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x4000,0x3fff,fr12
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xbfff,fr12
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xbfff,0xbfff,fr12
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	maveh.p		fr10,fr10,fr12
-	maveh		fr11,fr11,fr13
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/mclracc.cgs b/sim/testsuite/sim/frv/fr400/mclracc.cgs
deleted file mode 100644
index 02975446be4..00000000000
--- a/sim/testsuite/sim/frv/fr400/mclracc.cgs
+++ /dev/null
@@ -1,79 +0,0 @@
-# frv testcase for mclracc $ACC40k,$A
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mclracc
-mclracc:
-	set_accg_immed	0xff,accg0
-	set_acc_immed	-1,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	-1,acc1
-	set_accg_immed	0xff,accg2
-	set_acc_immed	-1,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	-1,acc3
-
-	mclracc		acc8,0		; nop
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0xff,accg2
-	test_acc_immed	-1,acc2
-	test_accg_immed	0xff,accg3
-	test_acc_immed	-1,acc3
-
-	mclracc		acc8,1		; nop
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0xff,accg2
-	test_acc_immed	-1,acc2
-	test_accg_immed	0xff,accg3
-	test_acc_immed	-1,acc3
-
-	mclracc		acc2,0
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed	0xff,accg3
-	test_acc_immed	-1,acc3
-
-	mclracc		acc3,1
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed	0,accg3
-	test_acc_immed	0,acc3
-
-	mclracc		acc0,0
-	test_accg_immed	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed	0,accg3
-	test_acc_immed	0,acc3
-
-	mclracc		acc0,1
-	test_accg_immed	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed	0,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed	0,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed	0,accg3
-	test_acc_immed	0,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/mhdseth.cgs b/sim/testsuite/sim/frv/fr400/mhdseth.cgs
deleted file mode 100644
index b99c996f78b..00000000000
--- a/sim/testsuite/sim/frv/fr400/mhdseth.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# frv testcase for mhdseth $s12,$FRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mhdseth
-mhdseth:
-	set_fr_immed	0,fr1
-	mhdseth		0,fr1
-	test_fr_iimmed	0,fr1
-	mhdseth		1,fr1
-	test_fr_iimmed	0x08000800,fr1 
-	mhdseth		0xf,fr1
-	test_fr_iimmed	0x78007800,fr1
-	mhdseth		-16,fr1
-	test_fr_iimmed	0x80008000,fr1
-	mhdseth		-1,fr1
-	test_fr_iimmed	0xf800f800,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/mhdsets.cgs b/sim/testsuite/sim/frv/fr400/mhdsets.cgs
deleted file mode 100644
index c495cb7130c..00000000000
--- a/sim/testsuite/sim/frv/fr400/mhdsets.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# frv testcase for mhdsets $s12,$FRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mhdsets
-mhdsets:
-	set_fr_immed	0,fr1
-	mhdsets		0,fr1
-	test_fr_iimmed	0,fr1
-	mhdsets		1,fr1
-	test_fr_iimmed	0x00010001,fr1
-	mhdsets		0x7ff,fr1
-	test_fr_iimmed	0x07ff07ff,fr1
-	mhdsets		-2048,fr1
-	test_fr_iimmed	0xf800f800,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/mhsethih.cgs b/sim/testsuite/sim/frv/fr400/mhsethih.cgs
deleted file mode 100644
index fed9d2335e7..00000000000
--- a/sim/testsuite/sim/frv/fr400/mhsethih.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# frv testcase for mhsethih $s12,$FRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mhsethih
-mhsethih:
-	set_fr_immed	0,fr1
-	mhsethih	0,fr1
-	test_fr_iimmed	0,fr1
-	mhsethih	1,fr1
-	test_fr_iimmed	0x08000000,fr1 
-	mhsethih	0xf,fr1
-	test_fr_iimmed	0x78000000,fr1
-	mhsethih	-16,fr1
-	test_fr_iimmed	0x80000000,fr1
-	mhsethih	-1,fr1
-	test_fr_iimmed	0xf8000000,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/mhsethis.cgs b/sim/testsuite/sim/frv/fr400/mhsethis.cgs
deleted file mode 100644
index ade9102a5e3..00000000000
--- a/sim/testsuite/sim/frv/fr400/mhsethis.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for mhsethis $s12,$FRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mhsethis
-mhsethis:
-	set_fr_immed	0,fr1
-	mhsethis	0,fr1
-	test_fr_iimmed	0,fr1
-	mhsethis	1,fr1
-	test_fr_iimmed	0x00010000,fr1
-	mhsethis	0x7ff,fr1
-	test_fr_iimmed	0x07ff0000,fr1
-	mhsethis	-2048,fr1
-	test_fr_iimmed	0xf8000000,fr1
-
-	; Try parallel set of hi and lo at the same time
-	mhsethis.p	1,fr1
-	mhsetlos	2,fr1
-	test_fr_iimmed	0x00010002,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/mhsetloh.cgs b/sim/testsuite/sim/frv/fr400/mhsetloh.cgs
deleted file mode 100644
index 1dedb836eca..00000000000
--- a/sim/testsuite/sim/frv/fr400/mhsetloh.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for mhsetloh $s12,$FRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mhsetloh
-mhsetloh:
-	set_fr_immed	0,fr1
-	mhsetloh	0,fr1
-	test_fr_iimmed	0,fr1
-	mhsetloh	1,fr1
-	test_fr_iimmed	0x0000800,fr1 
-	mhsetloh	0xf,fr1
-	test_fr_iimmed	0x00007800,fr1
-	mhsetloh	-16,fr1
-	test_fr_iimmed	0x00008000,fr1
-	mhsetloh	-1,fr1
-	test_fr_iimmed	0x0000f800,fr1
-
-	; Try parallel write to both hi and lo
-	mhsetloh.p	1,fr1
-	mhsethih	0xf,fr1
-	test_fr_iimmed	0x78000800,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/mhsetlos.cgs b/sim/testsuite/sim/frv/fr400/mhsetlos.cgs
deleted file mode 100644
index 8e8839ab6e9..00000000000
--- a/sim/testsuite/sim/frv/fr400/mhsetlos.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for mhsetlos $s12,$FRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mhsetlos
-mhsetlos:
-	set_fr_immed	0,fr1
-	mhsetlos	0,fr1
-	test_fr_iimmed	0,fr1
-	mhsetlos	1,fr1
-	test_fr_iimmed	0x00000001,fr1
-	mhsetlos	0x7ff,fr1
-	test_fr_iimmed	0x000007ff,fr1
-	mhsetlos	-2048,fr1
-	test_fr_iimmed	0x0000f800,fr1
-
-	; Try parallel set of hi and lo at the same time
-	mhsethis.p	1,fr1
-	mhsetlos	2,fr1
-	test_fr_iimmed	0x00010002,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/movgs.cgs b/sim/testsuite/sim/frv/fr400/movgs.cgs
deleted file mode 100644
index 4e22aab5b5d..00000000000
--- a/sim/testsuite/sim/frv/fr400/movgs.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for movgs $GRj,iacc0[hl]
-# mach: fr400
-
-	.include "../testutils.inc"
-
-	start
-
-	.global movgs
-IACC0H:
-	set_gr_limmed	0xdead,0xbeef,gr8
-	and_spr_immed	0,iacc0h
-	movgs gr8,iacc0h
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,iacc0h
-SPR280:
-	; try alternate names for iacc0h
-	and_spr_immed	0,280
-	movgs gr8,spr[280]			; iacc0h is spr number 280
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,spr[280]
-
-IACC0L:
-	set_gr_limmed	0xdead,0xbeef,gr8
-	and_spr_immed	0,iacc0l
-	movgs gr8,iacc0l
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,iacc0l
-SPR281:
-	; try alternate names for iacc0l
-	and_spr_immed	0,281
-	movgs gr8,spr[281]			; iacc0l is spr number 281
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,spr[281]
-
-IACC0L_SPR281:
-	; try crossing between iacc0l and spr[281]
-	and_spr_immed	0,281
-	and_spr_immed	0,iacc0l
-	movgs gr8,spr[281]			; iacc0l is spr number 281
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,iacc0l
-
-SPR280_IACC0H:
-	and_spr_immed	0,280
-	and_spr_immed	0,iacc0h
-	movgs gr8,iacc0h			; iacc0h is spr number 280
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,spr[280]
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/movsg.cgs b/sim/testsuite/sim/frv/fr400/movsg.cgs
deleted file mode 100644
index 3f9df25faf7..00000000000
--- a/sim/testsuite/sim/frv/fr400/movsg.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# frv testcase for movsg iacc0[hl],$GRj
-# mach: fr400
-
-	.include "../testutils.inc"
-
-	start
-
-	.global movsg
-Iacc0h:
-	set_spr_limmed	0xdead,0xbeef,iacc0h
-	set_gr_limmed	0,0,gr8
-	movsg iacc0h,gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,iacc0h
-Iacc0l:
-	set_spr_limmed	0xdead,0xbeef,iacc0l
-	set_gr_limmed	0,0,gr8
-	movsg iacc0l,gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,iacc0l
-
-Spr280:
-	set_spr_limmed	0xdead,0xbeef,spr[280]
-	set_gr_limmed	0,0,gr8
-	movsg spr[280],gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,spr[280]
-Spr281:
-	set_spr_limmed	0xdead,0xbeef,spr[281]
-	set_gr_limmed	0,0,gr8
-	movsg spr[281],gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,spr[281]
-
-Iacc0h_spr280:
-	set_spr_limmed	0xdead,0xbeef,spr[280]
-	set_spr_limmed	0xdead,0xbeef,iacc0h
-	set_gr_limmed	0,0,gr8
-	movsg iacc0h,gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,spr[280]
-Iacc0l_spr281:
-	set_spr_limmed	0xdead,0xbeef,spr[281]
-	set_spr_limmed	0xdead,0xbeef,iacc0l
-	set_gr_limmed	0,0,gr8
-	movsg iacc0l,gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,spr[281]
-
-Spr280_iacc0h:
-	set_spr_limmed	0xdead,0xbeef,spr[280]
-	set_spr_limmed	0xdead,0xbeef,iacc0h
-	set_gr_limmed	0,0,gr8
-	movsg spr[280],gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,iacc0h
-Spr281_iacc0l:
-	set_spr_limmed	0xdead,0xbeef,spr[281]
-	set_spr_limmed	0xdead,0xbeef,iacc0l
-	set_gr_limmed	0,0,gr8
-	movsg spr[281],gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,iacc0l
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/msubaccs.cgs b/sim/testsuite/sim/frv/fr400/msubaccs.cgs
deleted file mode 100644
index f0aba1dbfb1..00000000000
--- a/sim/testsuite/sim/frv/fr400/msubaccs.cgs
+++ /dev/null
@@ -1,131 +0,0 @@
-# frv testcase for msubaccs $ACC40Si,$ACC40Sk
-# mach: fr400
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubaccs
-msubaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0xdead0000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x0000beef,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdeac,0x4111,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0xff,accg3
-	test_acc_limmed	0x4111,0xdead,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x11111111,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0123,0x4567,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0xff,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffffffe,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xfffffffe,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x80,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000002,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x80,accg3
-	set_acc_immed	0x00000000,acc3
-	msubaccs.p	acc0,acc1
-	msubaccs	acc2,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x8,msr1		; msr0.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0000,acc1
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/scutss.cgs b/sim/testsuite/sim/frv/fr400/scutss.cgs
deleted file mode 100644
index f958de68dfc..00000000000
--- a/sim/testsuite/sim/frv/fr400/scutss.cgs
+++ /dev/null
@@ -1,664 +0,0 @@
-# frv testcase for scutss $FRj,$FRk
-# mach: fr405 fr450
-
-	.include "../testutils.inc"
-
-	start
-
-	.global scutss
-scutss:
-	set_spr_immed   0xffffffe7,iacc0h
-	set_spr_immed   0x89abcdef,iacc0l
-
-	set_gr_immed	0,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xffe8,gr11
-
-	set_gr_immed	1,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xffcf,gr11
-
-	set_gr_immed	2,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xff9e,gr11
-
-	set_gr_immed	3,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xff3c,gr11
-
-	set_gr_immed	4,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xfe79,gr11
-
-	set_gr_immed	5,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xfcf1,gr11
-
-	set_gr_immed	6,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xf9e2,gr11
-
-	set_gr_immed	7,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xf3c5,gr11
-
-	set_gr_immed	8,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xe78a,gr11
-
-	set_gr_immed	9,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xcf13,gr11
-
-	set_gr_immed	10,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0x9e27,gr11
-
-	set_gr_immed	11,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0x3c4d,gr11
-
-	set_gr_immed	12,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfffe,0x789b,gr11
-
-	set_gr_immed	13,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfffc,0xf135,gr11
-
-	set_gr_immed	14,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfff9,0xe26b,gr11
-
-	set_gr_immed	15,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfff3,0xc4d6,gr11
-
-	set_gr_immed	16,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffe7,0x89ac,gr11
-
-	set_gr_immed	17,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffcf,0x1358,gr11
-
-	set_gr_immed	18,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xff9e,0x26af,gr11
-
-	set_gr_immed	19,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xff3c,0x4d5e,gr11
-
-	set_gr_immed	20,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfe78,0x9abd,gr11
-
-	set_gr_immed	21,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfcf1,0x357a,gr11
-
-	set_gr_immed	22,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xf9e2,0x6af3,gr11
-
-	set_gr_immed	23,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xf3c4,0xd5e7,gr11
-
-	set_gr_immed	24,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xe789,0xabce,gr11
-
-	set_gr_immed	25,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xcf13,0x579c,gr11
-
-	set_gr_immed	26,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x9e26,0xaf38,gr11
-
-	set_gr_immed	27,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x8000,0x0000,gr11
-
-	set_gr_immed	28,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x8000,0x0000,gr11
-
-	set_gr_immed	29,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x8000,0x0000,gr11
-
-	set_gr_immed	30,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x8000,0x0000,gr11
-
-	set_gr_immed	31,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x8000,0x0000,gr11
-
-	set_gr_immed	32,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x8000,0x0000,gr11
-
-	set_gr_immed	33,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x8000,0x0000,gr11
-
-	set_gr_immed	34,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	35,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	36,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	37,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	38,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	39,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	40,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	41,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	42,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	43,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	44,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	45,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	46,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	47,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	48,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	49,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	50,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	51,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	52,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	53,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	54,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	55,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	56,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	57,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	58,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	59,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	60,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	61,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	62,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	63,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	set_gr_immed	64,gr10		; same as -64
-	scutss      	gr10,gr11
-	test_gr_immed	0,gr11
-
-	set_gr_immed	128,gr10	; same as 0 
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xffe8,gr11
-
-	.global scutss2
-scutss2:
-	set_spr_immed   0xe789abcd,iacc0h
-	set_spr_immed   0xefa5a5a5,iacc0l
-
-	set_gr_limmed	0xffff,0xffff,gr10	; -1
-	scutss      	gr10,gr11
-	test_gr_limmed  0xf3c4,0xd5e7,gr11
-
-	set_gr_limmed	0x0000,0x007e,gr10	; -2 (only lower 7 bits matter)
-	scutss      	gr10,gr11
-	test_gr_limmed  0xf9e2,0x6af3,gr11
-
-	set_gr_immed	-3,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfcf1,0x357a,gr11
-
-	set_gr_immed	-4,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfe78,0x9abd,gr11
-
-	set_gr_immed	-5,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xff3c,0x4d5e,gr11
-
-	set_gr_immed	-6,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xff9e,0x26af,gr11
-
-	set_gr_immed	-7,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffcf,0x1358,gr11
-
-	set_gr_immed	-8,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffe7,0x89ac,gr11
-
-	set_gr_immed	-9,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfff3,0xc4d6,gr11
-
-	set_gr_immed	-10,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfff9,0xe26b,gr11
-
-	set_gr_immed	-11,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfffc,0xf135,gr11
-
-	set_gr_immed	-12,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xfffe,0x789b,gr11
-
-	set_gr_immed	-13,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0x3c4d,gr11
-
-	set_gr_immed	-14,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0x9e27,gr11
-
-	set_gr_immed	-15,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xcf13,gr11
-
-	set_gr_immed	-16,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xe78a,gr11
-
-	set_gr_immed	-17,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xf3c5,gr11
-
-	set_gr_immed	-18,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xf9e2,gr11
-
-	set_gr_immed	-19,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xfcf1,gr11
-
-	set_gr_immed	-20,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xfe79,gr11
-
-	set_gr_immed	-21,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xff3c,gr11
-
-	set_gr_immed	-22,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xff9e,gr11
-
-	set_gr_immed	-23,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xffcf,gr11
-
-	set_gr_immed	-24,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xffe8,gr11
-
-	set_gr_immed	-25,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xfff4,gr11
-
-	set_gr_immed	-26,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xfffa,gr11
-
-	set_gr_immed	-27,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xfffd,gr11
-
-	set_gr_immed	-28,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xfffe,gr11
-
-	set_gr_immed	-29,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0xffff,0xffff,gr11
-
-	set_gr_immed	-30,gr10
-	scutss      	gr10,gr11
-	test_gr_immed   0,gr11
-
-	set_gr_immed	-31,gr10
-	scutss      	gr10,gr11
-	test_gr_immed   0,gr11
-
-	set_gr_immed	-32,gr10
-	scutss      	gr10,gr11
-	test_gr_immed   0,gr11
-
-	set_gr_limmed	0,64,gr10	; same as -32 
-	scutss      	gr10,gr11
-	test_gr_immed   0,gr11
-
-	set_spr_immed   0x6789abcd,iacc0h
-	set_spr_immed   0xefa5a5a5,iacc0l
-
-	set_gr_limmed	0xffff,0xffff,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x33c4,0xd5e7,gr11
-
-	set_gr_limmed	0x0000,0x007e,gr10	; -2 (only lower 7 bits matter)
-	scutss      	gr10,gr11
-	test_gr_limmed  0x19e2,0x6af3,gr11
-
-	set_gr_immed	-3,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0cf1,0x357a,gr11
-
-	set_gr_immed	-4,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0678,0x9abd,gr11
-
-	set_gr_immed	-5,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x033c,0x4d5e,gr11
-
-	set_gr_immed	-6,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x019e,0x26af,gr11
-
-	set_gr_immed	-7,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x00cf,0x1358,gr11
-
-	set_gr_immed	-8,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0067,0x89ac,gr11
-
-	set_gr_immed	-9,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0033,0xc4d6,gr11
-
-	set_gr_immed	-10,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0019,0xe26b,gr11
-
-	set_gr_immed	-11,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x000c,0xf135,gr11
-
-	set_gr_immed	-12,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0006,0x789b,gr11
-
-	set_gr_immed	-13,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0003,0x3c4d,gr11
-
-	set_gr_immed	-14,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0001,0x9e27,gr11
-
-	set_gr_immed	-15,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0xcf13,gr11
-
-	set_gr_immed	-16,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x678a,gr11
-
-	set_gr_immed	-17,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x33c5,gr11
-
-	set_gr_immed	-18,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x19e2,gr11
-
-	set_gr_immed	-19,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0cf1,gr11
-
-	set_gr_immed	-20,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0679,gr11
-
-	set_gr_immed	-21,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x033c,gr11
-
-	set_gr_immed	-22,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x019e,gr11
-
-	set_gr_immed	-23,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x00cf,gr11
-
-	set_gr_immed	-24,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0068,gr11
-
-	set_gr_immed	-25,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0034,gr11
-
-	set_gr_immed	-26,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x001a,gr11
-
-	set_gr_immed	-27,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x000d,gr11
-
-	set_gr_immed	-28,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0006,gr11
-
-	set_gr_immed	-29,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0003,gr11
-
-	set_gr_immed	-30,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0002,gr11
-
-	set_gr_immed	-31,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0001,gr11
-
-	set_gr_immed	-32,gr10
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0000,gr11
-
-	set_gr_immed	64,gr10		; same as -32
-	scutss      	gr10,gr11
-	test_gr_limmed  0x0000,0x0000,gr11
-
-	; Examples from the customer (modified for iacc0)
-	set_spr_immed   0xffffffff,iacc0h
-	set_spr_immed   0xffe00000,iacc0l
-
-	set_gr_limmed	0,16,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed  0xffff,0xffe0,gr11
-
-	set_gr_limmed	0,17,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed  0xffff,0xffc0,gr11
-
-	set_gr_limmed	0,18,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0xffff,0xff80,gr11
-
-	set_spr_immed   0,iacc0h
-	set_spr_immed   0x003fffff,iacc0l
-
-	set_gr_limmed	0,40,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed  0x3fff,0xff00,gr11
-
-	set_gr_limmed	0,41,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed  0x7fff,0xfe00,gr11
-
-	set_spr_immed   0x7f,iacc0h
-	set_spr_immed   0xffe00000,iacc0l
-
-	set_gr_limmed	0,40,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed  0x7fff,0xffff,gr11		; saturated
-
-	set_gr_limmed	0,41,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x7fff,0xffff,gr11		; saturated
-
-	set_gr_limmed	0,42,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x7fff,0xffff,gr11		; saturated
-
-	set_spr_immed   0x08,iacc0h
-	set_spr_immed   0x003fffff,iacc0l
-
-	set_gr_limmed	0,40,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x7fff,0xffff,gr11		; saturated
-
-	set_gr_limmed	0,41,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x7fff,0xffff,gr11		; saturated
-
-	set_spr_immed   0xffffffff,iacc0h
-	set_spr_immed   0xefe00000,iacc0l
-
-	set_gr_limmed	0,40,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11		; saturated
-
-	set_gr_limmed	0,41,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11		; saturated
-
-	set_gr_limmed	0,42,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11		; saturated
-
-	set_spr_immed   0x80000000,iacc0h
-	set_spr_immed   0x003fffff,iacc0l
-
-	set_gr_limmed	0,16,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11		; saturated
-
-	set_gr_limmed	0,17,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11		; saturated
-
-	set_spr_immed   0xaf5a5a5a,iacc0h
-	set_spr_immed   0x5a5a5a5a,iacc0l
-
-	set_gr_limmed	0xffff,0xfffc,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed  0xfaf5,0xa5a6,gr11
-
-	set_spr_immed   0x2f5a5a5a,iacc0h
-	set_spr_immed   0x5a5a5a5a,iacc0l
-
-	set_gr_limmed	0xffff,0xfff9,gr10
-	scutss    	gr10,gr11
-	test_gr_limmed  0x005e,0xb4b5,gr11
-
-# From the manual
-	.global scutss3
-scutss3:
-	set_spr_immed   0xfffffedc,iacc0h
-	set_spr_immed   0xba987654,iacc0l
-
-	set_gr_immed	16,gr10
-	scutss		gr10,gr11
-	test_gr_limmed	0xfedc,0xba98,gr11
-
-	set_gr_immed	12,gr10
-	scutss		gr10,gr11
-	test_gr_limmed	0xffed,0xcbaa,gr11
-
-	set_gr_immed	-4,gr10
-	scutss		gr10,gr11
-	test_gr_limmed	0xffff,0xffee,gr11
-
-	set_gr_immed	24,gr10
-	scutss		gr10,gr11
-	test_gr_limmed	0x8000,0x0000,gr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/sdiv.cgs b/sim/testsuite/sim/frv/fr400/sdiv.cgs
deleted file mode 100644
index b9c03cfeea3..00000000000
--- a/sim/testsuite/sim/frv/fr400/sdiv.cgs
+++ /dev/null
@@ -1,71 +0,0 @@
-# frv testcase for sdiv $GRi,$GRj,$GRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global sdiv
-sdiv:
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	sdiv      	gr1,gr3,gr2
-	test_gr_immed  	4,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	sdiv      	gr1,gr3,gr2
-	test_gr_immed  	-1,gr2
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	sdiv      	gr1,gr3,gr2
-	test_gr_limmed 	0x7fff,0xffff,gr2
-	test_spr_bits	0x4,2,1,isr	; isr.aexc is set
-
-	and_spr_immed	-33,isr		; turn off isr.edem
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide will cause overflow
-	set_spr_addr	ok1,lr
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-e1:	sdiv      	gr1,gr3,gr2	; overflow
-	test_gr_immed	1,gr15
-	test_gr_limmed 	0x8000,0x0000,gr2; gr2 updated
-
-	; divide by zero
-	set_spr_addr	ok2,lr
-	set_gr_immed	0xdeadbeef,gr2
-e2:	sdiv      	gr1,gr0,gr2	; divide by zero
-	test_gr_immed	2,gr15		; handler called
-	test_gr_immed	0xdeadbeef,gr2	; gr2 not updated.
-
-	pass
-
-ok1:	; exception handler for overflow
-	test_spr_bits	0x18,3,0x2,isr		; isr.dtt is set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
-
-ok2:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x3,isr		; isr.dtt is set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/fr400/sdivi.cgs b/sim/testsuite/sim/frv/fr400/sdivi.cgs
deleted file mode 100644
index fda573e5842..00000000000
--- a/sim/testsuite/sim/frv/fr400/sdivi.cgs
+++ /dev/null
@@ -1,70 +0,0 @@
-# frv testcase for sdivi $GRi,$s12,$GRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global sdivi
-sdivi:
-	; simple division 12 / 3
-	set_gr_immed   	12,gr1
-	sdivi      	gr1,3,gr2
-	test_gr_immed  	4,gr2
-
-	; Random example
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	sdivi      	gr1,0x7ff,gr2
-	test_gr_limmed 	0xffff,0xdb93,gr2
-
-	; Random negative example
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	sdivi      	gr1,-2048,gr2
-	test_gr_immed 	0x2468,gr2
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_limmed  	0x8000,0x0000,gr1
-	sdivi      	gr1,-1,gr2
-	test_gr_limmed 	0x7fff,0xffff,gr2
-	test_spr_bits	0x4,2,1,isr	; isr.aexc is set
-
-	and_spr_immed	-33,isr		; turn off isr.edem
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide will cause overflow
-	set_spr_addr	ok1,lr
-	set_gr_limmed  	0x8000,0x0000,gr1
-e1:	sdivi      	gr1,-1,gr2
-	test_gr_immed	1,gr15
-	test_gr_limmed 	0x8000,0x0000,gr2
-
-	; divide by zero
-	set_spr_addr	ok2,lr
-e2:	sdivi      	gr1,0,gr2	; divide by zero
-	test_gr_immed	2,gr15
-
-	pass
-
-ok1:	; exception handler for overflow
-	test_spr_bits	0x18,3,0x2,isr		; isr.dtt is set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
-
-ok2:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x3,isr		; isr.dtt is set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/fr400/slass.cgs b/sim/testsuite/sim/frv/fr400/slass.cgs
deleted file mode 100644
index 3e8bcac2f94..00000000000
--- a/sim/testsuite/sim/frv/fr400/slass.cgs
+++ /dev/null
@@ -1,104 +0,0 @@
-# frv testcase for slass $GRi,$GRj,$GRk
-# mach: fr405 fr450
-
-	.include "../testutils.inc"
-
-	start
-
-	.global sll
-slass0:
-	set_gr_immed  	0,gr7			; Shift by 0
-	set_gr_immed   	2,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_immed  	2,gr8
-	test_gr_immed	0,gr7
-	test_gr_immed  	2,gr6
-slass1:
-	set_gr_immed  	1,gr7			; Shift by 1
-	set_gr_immed   	2,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_immed  	2,gr8
-	test_gr_immed	1,gr7
-	test_gr_immed  	4,gr6
-
-slass2:
-	set_gr_immed  	31,gr7			; Shift 1 by 31
-	set_gr_immed   	1,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_immed  	1,gr8
-	test_gr_immed	31,gr7
-	test_gr_limmed	0x7fff,0xffff,gr6
-
-slass3:
-	set_gr_immed  	31,gr7			; Shift -1 by 31
-	set_gr_immed   	-1,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_immed  	-1,gr8
-	test_gr_immed	31,gr7
-	test_gr_limmed	0x8000,0x0000,gr6
-
-slass4:
-	set_gr_immed  	14,gr7			; Shift 0xffff0000 by 14
-	set_gr_limmed	0xffff,0x0000,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_limmed	0xffff,0x0000,gr8
-	test_gr_immed	14,gr7
-	test_gr_limmed	0xc000,0x0000,gr6
-
-slass5:
-	set_gr_immed  	15,gr7			; Shift 0xffff0000 by 15
-	set_gr_limmed	0xffff,0x0000,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_limmed	0xffff,0x0000,gr8
-	test_gr_immed	15,gr7
-	test_gr_limmed	0x8000,0x0000,gr6
-
-slass6:
-	set_gr_immed  	20,gr7			; Shift 0xffff0000 by 20
-	set_gr_limmed	0xffff,0x0000,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_limmed	0xffff,0x0000,gr8
-	test_gr_immed	20,gr7
-	test_gr_limmed	0x8000,0x0000,gr6
-
-slass7:
-	set_gr_immed  	14,gr7			; Shift 0x0000ffff by 14
-	set_gr_limmed	0x0000,0xffff,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_limmed	0x0000,0xffff,gr8
-	test_gr_immed	14,gr7
-	test_gr_limmed	0x3fff,0xc000,gr6
-
-slass8:
-	set_gr_immed  	15,gr7			; Shift 0x0000ffff by 15
-	set_gr_limmed  	0x0000,0xffff,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_limmed	0x0000,0xffff,gr8
-	test_gr_immed	15,gr7
-	test_gr_limmed	0x7fff,0x8000,gr6
-
-slass9:
-	set_gr_immed  	20,gr7			; Shift 0x0000ffff by 20
-	set_gr_limmed  	0x0000,0xffff,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_limmed	0x0000,0xffff,gr8
-	test_gr_immed	20,gr7
-	test_gr_limmed	0x7fff,0xffff,gr6
-
-slass10:
-	set_gr_immed  	30,gr7			; Shift 1 by 30
-	set_gr_immed   	1,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_immed  	1,gr8
-	test_gr_immed	30,gr7
-	test_gr_limmed	0x4000,0x0000,gr6
-
-slass11:
-	set_gr_immed  	30,gr7			; Shift -1 by 30
-	set_gr_immed   	-1,gr8
-	slass      	gr8,gr7,gr6
-	test_gr_immed  	-1,gr8
-	test_gr_immed	30,gr7
-	test_gr_limmed	0xc000,0000,gr6
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/smass.cgs b/sim/testsuite/sim/frv/fr400/smass.cgs
deleted file mode 100644
index 4594ecd0abb..00000000000
--- a/sim/testsuite/sim/frv/fr400/smass.cgs
+++ /dev/null
@@ -1,359 +0,0 @@
-# frv testcase for smass $GRi,$GRj
-# mach: fr405 fr450
-
-	.include "../testutils.inc"
-
-	start
-
-	.global smass
-smass1:
-	; Positive operands
-	set_gr_immed	3,gr7		; multiply small numbers
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	3,gr7
-	test_gr_immed	2,gr8
-	test_spr_immed	7,iacc0l	; result 3*2+1
-	test_spr_immed	0,iacc0h
-smass2:
-	set_gr_immed	1,gr7		; multiply by 1
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	1,gr7
-	test_gr_immed	2,gr8
-	test_spr_immed	3,iacc0l	; result 1*2+1
-	test_spr_immed	0,iacc0h
-smass3:
-	set_gr_immed	2,gr7		; multiply by 1
-	set_gr_immed	1,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	1,gr8
-	test_gr_immed	2,gr7
-	test_spr_immed	3,iacc0l	; result 2*1+1
-	test_spr_immed	0,iacc0h
-smass4:
-	set_gr_immed	0,gr7		; multiply by 0
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_immed	0,gr7
-	test_spr_immed	1,iacc0l	; result 0*2+1
-	test_spr_immed	0,iacc0h
-smass5:
-	set_gr_immed	2,gr7		; multiply by 0
-	set_gr_immed	0,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	0,gr8
-	test_gr_immed	2,gr7
-	test_spr_immed	1,iacc0l	; result 2*0+1
-	test_spr_immed	0,iacc0h
-smass6:
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_limmed	0x3fff,0xffff,gr7
-	test_spr_limmed	0x7fff,0xffff,iacc0l	; 3fffffff*2+1
-	test_spr_immed	0,iacc0h
-smass7:
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_limmed	0x8000,0x0001,iacc0l	; 40000000*2+1
-	test_spr_immed	0,iacc0h
-smass8:
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed	4,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	4,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_immed	1,iacc0l		; 40000000*4+1
-	test_spr_immed	1,iacc0h
-smass9:
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_immed	0x00000002,iacc0l	; 7fffffff*7fffffff+1
-	test_spr_limmed	0x3fff,0xffff,iacc0h
-smass10:
-	; Mixed operands
-	set_gr_immed	-3,gr7		; multiply small numbers
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_immed	-3,gr7
-	test_spr_immed	-5,iacc0l	; -3*2+1
-	test_spr_immed	-1,iacc0h
-smass11:
-	set_gr_immed	3,gr7		; multiply small numbers
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	3,gr7
-	test_spr_immed	-5,iacc0l	; 3*-2+1
-	test_spr_immed	-1,iacc0h
-smass12:
-	set_gr_immed	1,gr7		; multiply by 1
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	1,gr7
-	test_spr_immed	-1,iacc0l	; 1*-2+1
-	test_spr_immed	-1,iacc0h
-smass13:
-	set_gr_immed	-2,gr7		; multiply by 1
-	set_gr_immed	1,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	1,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	-1,iacc0l	; -2*1+1
-	test_spr_immed	-1,iacc0h
-smass14:
-	set_gr_immed	0,gr7		; multiply by 0
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr7
-	test_spr_immed	1,iacc0l	; 0*-2+1
-	test_spr_immed	0,iacc0h
-smass15:
-	set_gr_immed	-2,gr7		; multiply by 0
-	set_gr_immed	0,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	0,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	1,iacc0l	; -2*0+1
-	test_spr_immed	0,iacc0h
-smass16:
-	set_gr_limmed	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x2000,0x0001,gr7
-	test_spr_limmed	0xbfff,0xffff,iacc0l	; 20000001*-2+1
-	test_spr_limmed	0xffff,0xffff,iacc0h
-smass17:
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_limmed	0x8000,0x0001,iacc0l	; 40000000*-2+1
-	test_spr_limmed	0xffff,0xffff,iacc0h
-smass18:
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x4000,0x0001,gr7
-	test_spr_limmed	0x7fff,0xffff,iacc0l	; 40000001*-2+1
-	test_spr_limmed	0xffff,0xffff,iacc0h
-smass19:
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed	-4,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-4,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_limmed	0x0000,0x0001,iacc0l	; 40000000*-4+1
-	test_spr_limmed	0xffff,0xffff,iacc0h
-smass20:
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0x8000,0x0001,iacc0l	; 7fffffff*80000000+1
-	test_spr_limmed	0xc000,0x0000,iacc0h
-smass21:
-	; Negative operands
-	set_gr_immed	-3,gr7		; multiply small numbers
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	-3,gr7
-	test_spr_immed	7,iacc0l	; -3*-2+1
-	test_spr_immed	0,iacc0h
-smass22:
-	set_gr_immed	-1,gr7		; multiply by 1
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	-1,gr7
-	test_spr_immed	3,iacc0l	; -1*-2+1
-	test_spr_immed	0,iacc0h
-smass23:
-	set_gr_immed	-2,gr7		; multiply by 1
-	set_gr_immed	-1,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-1,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	3,iacc0l	; -2*-1+1
-	test_spr_immed	0,iacc0h
-smass24:
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0xc000,0x0001,gr7
-	test_spr_limmed	0x7fff,0xffff,iacc0l	; c0000001*-2+1
-	test_spr_immed	0,iacc0h
-smass25:
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0xc000,0x0000,gr7
-	test_spr_limmed	0x8000,0x0001,iacc0l	; c0000000*-2+1
-	test_spr_immed	0,iacc0h
-smass26:
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed	-4,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_immed	-4,gr8
-	test_gr_limmed	0xc000,0x0000,gr7
-	test_spr_immed	0x00000001,iacc0l	; c0000000*-4+1
-	test_spr_immed	1,iacc0h
-smass27:
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_limmed	0x8000,0x0001,gr7
-	test_spr_immed	0x00000002,iacc0l	; 80000001*80000001+1
-	test_spr_limmed	0x3fff,0xffff,iacc0h
-smass28:
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smass		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x8000,0x0000,gr7
-	test_spr_immed	0x00000001,iacc0l	; 80000000*80000000+1
-	test_spr_limmed	0x4000,0x0000,iacc0h
-
-smass29:
-	set_gr_limmed	0x7fff,0xffff,gr7	; not quite overflow (pos)
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_limmed	0xffff,0xfffe,iacc0l
-	set_spr_limmed	0x4000,0x0000,iacc0h
-	smass		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0xffff,0xffff,iacc0l	; 7fffffff*7fffffff+
-	test_spr_limmed	0x7fff,0xffff,iacc0h	;  40000000fffffffe
-
-smass30:
-	set_gr_limmed	0x7fff,0xffff,gr7	; just barely overflow (pos)
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_limmed	0xffff,0xffff,iacc0l
-	set_spr_limmed	0x4000,0x0000,iacc0h
-	smass		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0xffff,0xffff,iacc0l	; 7fffffff*7fffffff+
-	test_spr_limmed	0x7fff,0xffff,iacc0h	;  40000000ffffffff
-
-smass31:
-	set_gr_limmed	0x7fff,0xffff,gr7	; maximum overflow (pos)
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_limmed	0xffff,0xffff,iacc0l
-	set_spr_limmed	0x7fff,0xffff,iacc0h
-	smass		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0xffff,0xffff,iacc0l	; 7fffffff*7fffffff+
-	test_spr_limmed	0x7fff,0xffff,iacc0h	;  7fffffffffffffff
-
-smass32:
-	set_gr_limmed	0x7fff,0xffff,gr7	; not quite overflow (neg)
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_spr_limmed	0x8000,0x0000,iacc0l
-	set_spr_limmed	0xbfff,0xffff,iacc0h
-	smass		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0x0000,0x0000,iacc0l	; 7fffffff*7fffffff+
-	test_spr_limmed	0x8000,0x0000,iacc0h	;  bfffffff80000000
-
-smass33:
-	set_gr_limmed	0x7fff,0xffff,gr7	; just barely overflow (neg)
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_spr_limmed	0x7fff,0xffff,iacc0l
-	set_spr_limmed	0xbfff,0xffff,iacc0h
-	smass		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0x0000,0x0000,iacc0l	; 7fffffff*7fffffff+
-	test_spr_limmed	0x8000,0x0000,iacc0h	;  bfffffff7fffffff
-
-smass34:
-	set_gr_limmed	0x7fff,0xffff,gr7	; maximum overflow (neg)
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_spr_limmed	0x0000,0x0000,iacc0l
-	set_spr_limmed	0x8000,0x0000,iacc0h
-	smass		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0x0000,0x0000,iacc0l	; 7fffffff*7fffffff+
-	test_spr_limmed	0x8000,0x0000,iacc0h	;  8000000000000000
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/smsss.cgs b/sim/testsuite/sim/frv/fr400/smsss.cgs
deleted file mode 100644
index 50876d83bc3..00000000000
--- a/sim/testsuite/sim/frv/fr400/smsss.cgs
+++ /dev/null
@@ -1,354 +0,0 @@
-# frv testcase for smsss $GRi,$GRj
-# mach: fr405 fr450
-
-	.include "../testutils.inc"
-
-	start
-
-	.global smsss
-smsss1:
-	; Positive operands
-	set_gr_immed	3,gr7		; multiply small numbers
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	7,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	3,gr7
-	test_gr_immed	2,gr8
-	test_spr_immed	1,iacc0l	; result 7-3*2
-	test_spr_immed	0,iacc0h
-smsss2:
-	set_gr_immed	1,gr7		; multiply by 1
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	3,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	1,gr7
-	test_gr_immed	2,gr8
-	test_spr_immed	1,iacc0l	; result 3-1*2
-	test_spr_immed	0,iacc0h
-smsss3:
-	set_gr_immed	2,gr7		; multiply by 1
-	set_gr_immed	1,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	3,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	1,gr8
-	test_gr_immed	2,gr7
-	test_spr_immed	1,iacc0l	; result 3-2*1
-	test_spr_immed	0,iacc0h
-smsss4:
-	set_gr_immed	0,gr7		; multiply by 0
-	set_gr_immed	2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_immed	0,gr7
-	test_spr_immed	1,iacc0l	; result 1-0*2
-	test_spr_immed	0,iacc0h
-smsss5:
-	set_gr_immed	2,gr7		; multiply by 0
-	set_gr_immed	0,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	0,gr8
-	test_gr_immed	2,gr7
-	test_spr_immed	1,iacc0l	; result 1-2*0
-	test_spr_immed	0,iacc0h
-smsss6:
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed	2,gr8
-	set_spr_immed	-1,iacc0h
-	set_spr_immed	-1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_limmed	0x3fff,0xffff,gr7
-	test_spr_limmed	0x8000,0x0001,iacc0l	; -1-3fffffff*2
-	test_spr_immed	-1,iacc0h
-smsss7:
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed	2,gr8
-	set_spr_immed	-1,iacc0h
-	set_spr_limmed	0x8000,0x0001,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_immed	1,iacc0l	; ffffffff80000001-40000000*2
-	test_spr_immed	-1,iacc0h
-smsss8:
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed	4,gr8
-	set_spr_immed	-1,iacc0h
-	set_spr_immed	1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	4,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_immed	1,iacc0l		; ffffffff00000001-40000000*4
-	test_spr_immed	-2,iacc0h
-smsss9:
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_limmed	0x7fff,0xffff,iacc0h
-	set_spr_immed	-1,iacc0l
-	smsss		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0xffff,0xfffe,iacc0l	; 7fffffffffffffff-7fffffff*7fffffff
-	test_spr_limmed	0x4000,0x0000,iacc0h
-smsss10:
-	; Mixed operands
-	set_gr_immed	-3,gr7		; multiply small numbers
-	set_gr_immed	2,gr8
-	set_spr_immed	-1,iacc0h
-	set_spr_immed	-5,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_immed	-3,gr7
-	test_spr_immed	1,iacc0l	; -5-(-3*2)
-	test_spr_immed	0,iacc0h
-smsss11:
-	set_gr_immed	3,gr7		; multiply small numbers
-	set_gr_immed	-2,gr8
-	set_spr_immed	-1,iacc0h
-	set_spr_immed	-5,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	3,gr7
-	test_spr_immed	1,iacc0l	; -5-(3*-2)
-	test_spr_immed	0,iacc0h
-smsss12:
-	set_gr_immed	1,gr7		; multiply by 1
-	set_gr_immed	-2,gr8
-	set_spr_immed	-1,iacc0h
-	set_spr_immed	-1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	1,gr7
-	test_spr_immed	1,iacc0l	; -1-(1*-2)
-	test_spr_immed	0,iacc0h
-smsss13:
-	set_gr_immed	-2,gr7		; multiply by 1
-	set_gr_immed	1,gr8
-	set_spr_immed	-1,iacc0h
-	set_spr_immed	-1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	1,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	1,iacc0l	; -1-(-2*1)
-	test_spr_immed	0,iacc0h
-smsss14:
-	set_gr_immed	0,gr7		; multiply by 0
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr7
-	test_spr_immed	1,iacc0l	; 1-(0*-2)
-	test_spr_immed	0,iacc0h
-smsss15:
-	set_gr_immed	-2,gr7		; multiply by 0
-	set_gr_immed	0,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	0,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	1,iacc0l	; 1-(-2*0)
-	test_spr_immed	0,iacc0h
-smsss16:
-	set_gr_limmed	0x2000,0x0000,gr7	; 31 bit result
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_limmed	0x3fff,0xffff,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x2000,0x0000,gr7
-	test_spr_limmed	0x7fff,0xffff,iacc0l
-	test_spr_immed	0,iacc0h	; 3fffffff-20000001*-2
-smsss17:
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_limmed	0x8000,0x0001,iacc0l	; 1-40000000*-2
-	test_spr_immed	0,iacc0h
-smsss18:
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed	-2,gr8
-	set_spr_immed	-1,iacc0h
-	set_spr_immed	-1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_limmed	0x7fff,0xffff,iacc0l
-	test_spr_immed	0,iacc0h	; -1-40000000*-2
-smsss19:
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed	-4,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	1,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-4,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_immed	1,iacc0l	; 200000001-(40000000*-4)
-	test_spr_immed	1,iacc0h
-smsss20:
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_limmed	0xbfff,0xffff,iacc0h
-	set_spr_limmed	0x0000,0x0001,iacc0l
-	smsss		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_immed	0,iacc0l	; bfffffff00000001-(7fffffff*7fffffff)
-	test_spr_limmed	0x8000,0x0000,iacc0h
-smsss21:
-	; Negative operands
-	set_gr_immed	-3,gr7		; multiply small numbers
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	7,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	-3,gr7
-	test_spr_immed	1,iacc0l	; 7-(-3*-2)
-	test_spr_immed	0,iacc0h
-smsss22:
-	set_gr_immed	-1,gr7		; multiply by 1
-	set_gr_immed	-2,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	3,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	-1,gr7
-	test_spr_immed	1,iacc0l	; 3-(-1*-2)
-	test_spr_immed	0,iacc0h
-smsss23:
-	set_gr_immed	-2,gr7		; multiply by 1
-	set_gr_immed	-1,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_immed	3,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-1,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	1,iacc0l	; 3-(-2*-1)
-	test_spr_immed	0,iacc0h
-smsss24:
-	set_gr_immed	-32768,gr7		; 31 bit result
-	set_gr_immed	-32768,gr8
-	set_spr_immed	0,iacc0h
-	set_spr_limmed	0xbfff,0xffff,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-32768,gr8
-	test_gr_immed	-32768,gr7
-	test_spr_limmed	0x7fff,0xffff,iacc0l	; 7ffffffb-(-2*-2)
-	test_spr_immed	0,iacc0h
-smsss25:
-	set_gr_immed	0xffff,gr7		; 32 bit result
-	set_gr_immed	0xffff,gr8
-	set_spr_immed	1,iacc0h
-	set_spr_limmed	0xfffe,0x0000,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	0xffff,gr8
-	test_gr_immed	0xffff,gr7
-	test_spr_limmed	0xffff,0xffff,iacc0l	; 1fffe0000-ffff*ffff
-	test_spr_immed	0,iacc0h
-smsss26:
-	set_gr_limmed	0x0001,0x0000,gr7	; 33 bit result
-	set_gr_limmed	0x0001,0x0000,gr8
-	set_spr_immed	2,iacc0h
-	set_spr_immed	1,iacc0l
-	smsss		gr7,gr8
-	test_gr_limmed	0x0001,0x0000,gr8
-	test_gr_limmed	0x0001,0x0000,gr7
-	test_spr_immed	1,iacc0l	; 0x200000001-0x10000*0x10000
-	test_spr_immed	1,iacc0h
-smsss27:
-	set_gr_immed	-2,gr7		; almost max positive result
-	set_gr_immed	-2,gr8
-	set_spr_limmed	0x7fff,0xffff,iacc0h
-	set_spr_limmed	0xffff,0xffff,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	-2,gr7
-	test_spr_limmed	0xffff,0xfffb,iacc0l	; maxpos - (-2*-2)
-	test_spr_limmed	0x7fff,0xffff,iacc0h
-smsss28:
-	set_gr_immed	0,gr7		; max positive result
-	set_gr_immed	0,gr8
-	set_spr_limmed	0x7fff,0xffff,iacc0h
-	set_spr_limmed	0xffff,0xffff,iacc0l
-	smsss		gr7,gr8
-	test_gr_immed	0,gr8
-	test_gr_immed	0,gr7
-	test_spr_limmed	0xffff,0xffff,iacc0l	; maxpos-(0*0)
-	test_spr_limmed	0x7fff,0xffff,iacc0h
-smsss29:
-	set_gr_limmed	0x7fff,0xffff,gr7	; not quite overflow (pos)
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_spr_limmed	0x4000,0x0000,iacc0h
-	set_spr_limmed	0x7fff,0xffff,iacc0l
-	smsss		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0xffff,0xffff,iacc0l	; 400000007fffffff - 
-	test_spr_limmed	0x7fff,0xffff,iacc0h	;  0x80000000*0x7fffffff
-smsss30:
-	set_gr_limmed	0x7fff,0xffff,gr7	; just barely overflow (pos)
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_spr_limmed	0x4000,0x0000,iacc0h
-	set_spr_limmed	0x8000,0x0000,iacc0l
-	smsss		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0xffff,0xffff,iacc0l	; 4000000080000000 -
-	test_spr_limmed	0x7fff,0xffff,iacc0h	;  0x80000000*0x7fffffff
-
-smsss31:
-	set_gr_limmed	0x7fff,0xffff,gr7	; maximum overflow (pos)
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_spr_limmed	0xffff,0xffff,iacc0l
-	set_spr_limmed	0x7fff,0xffff,iacc0h
-	smsss		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0xffff,0xffff,iacc0l	; 7fffffffffffffff -
-	test_spr_limmed	0x7fff,0xffff,iacc0h	;  80000000*80000000
-smsss32:
-	set_gr_limmed	0x7fff,0xffff,gr7	; not quite overflow (neg)
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_immed	1,iacc0l
-	set_spr_limmed	0xbfff,0xffff,iacc0h
-	smsss		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0x0000,0x0000,iacc0l	; bfffffff00000001 -
-	test_spr_limmed	0x8000,0x0000,iacc0h	;  0x7fffffff*0x7fffffff
-smsss33:
-	set_gr_limmed	0x7fff,0xffff,gr7	; just barely overflow (neg)
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_immed	0,iacc0l
-	set_spr_limmed	0xbfff,0xffff,iacc0h
-	smsss		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0x0000,0x0000,iacc0l	; 7fffffff*7fffffff+
-	test_spr_limmed	0x8000,0x0000,iacc0h	;  bfffffff7fffffff
-smsss34:
-	set_gr_limmed	0x7fff,0xffff,gr7	; maximum overflow (neg)
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_spr_limmed	0x0000,0x0000,iacc0l
-	set_spr_limmed	0x8000,0x0000,iacc0h
-	smsss		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0x0000,0x0000,iacc0l	; 8000000000000000-
-	test_spr_limmed	0x8000,0x0000,iacc0h	;  7fffffff*7fffffff+
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/smu.cgs b/sim/testsuite/sim/frv/fr400/smu.cgs
deleted file mode 100644
index eae788ed8ea..00000000000
--- a/sim/testsuite/sim/frv/fr400/smu.cgs
+++ /dev/null
@@ -1,237 +0,0 @@
-# frv testcase for smu $GRi,$GRj
-# mach: fr405 fr450
-
-	.include "../testutils.inc"
-
-	start
-
-	.global smu
-smu1:
-	; Positive operands
-	set_gr_immed	3,gr7		; multiply small numbers
-	set_gr_immed	2,gr8
-	smu		gr7,gr8
-	test_gr_immed	3,gr7
-	test_gr_immed	2,gr8
-	test_spr_immed	6,iacc0l
-	test_spr_immed	0,iacc0h
-smu2:
-	set_gr_immed	1,gr7		; multiply by 1
-	set_gr_immed	2,gr8
-	smu		gr7,gr8
-	test_gr_immed	1,gr7
-	test_gr_immed	2,gr8
-	test_spr_immed	2,iacc0l
-	test_spr_immed	0,iacc0h
-smu3:
-	set_gr_immed	2,gr7		; multiply by 1
-	set_gr_immed	1,gr8
-	smu		gr7,gr8
-	test_gr_immed	1,gr8
-	test_gr_immed	2,gr7
-	test_spr_immed	2,iacc0l
-	test_spr_immed	0,iacc0h
-smu4:
-	set_gr_immed	0,gr7		; multiply by 0
-	set_gr_immed	2,gr8
-	smu		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_immed	0,gr7
-	test_spr_immed	0,iacc0l
-	test_spr_immed	0,iacc0h
-smu5:
-	set_gr_immed	2,gr7		; multiply by 0
-	set_gr_immed	0,gr8
-	smu		gr7,gr8
-	test_gr_immed	0,gr8
-	test_gr_immed	2,gr7
-	test_spr_immed	0,iacc0l
-	test_spr_immed	0,iacc0h
-smu6:
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed	2,gr8
-	smu		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_limmed	0x3fff,0xffff,gr7
-	test_spr_limmed	0x7fff,0xfffe,iacc0l
-	test_spr_immed	0,iacc0h
-smu7:
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed	2,gr8
-	smu		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_limmed	0x8000,0x0000,iacc0l
-	test_spr_immed	0,iacc0h
-smu8:
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed	4,gr8
-	smu		gr7,gr8
-	test_gr_immed	4,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_immed	0,iacc0l
-	test_spr_immed	1,iacc0h
-smu9:
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	smu		gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_immed	0x00000001,iacc0l
-	test_spr_limmed	0x3fff,0xffff,iacc0h
-smu10:
-	; Mixed operands
-	set_gr_immed	-3,gr7		; multiply small numbers
-	set_gr_immed	2,gr8
-	smu		gr7,gr8
-	test_gr_immed	2,gr8
-	test_gr_immed	-3,gr7
-	test_spr_immed	-6,iacc0l
-	test_spr_immed	-1,iacc0h
-smu11:
-	set_gr_immed	3,gr7		; multiply small numbers
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	3,gr7
-	test_spr_immed	-6,iacc0l
-	test_spr_immed	-1,iacc0h
-smu12:
-	set_gr_immed	1,gr7		; multiply by 1
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	1,gr7
-	test_spr_immed	-2,iacc0l
-	test_spr_immed	-1,iacc0h
-smu13:
-	set_gr_immed	-2,gr7		; multiply by 1
-	set_gr_immed	1,gr8
-	smu		gr7,gr8
-	test_gr_immed	1,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	-2,iacc0l
-	test_spr_immed	-1,iacc0h
-smu14:
-	set_gr_immed	0,gr7		; multiply by 0
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	0,gr7
-	test_spr_immed	0,iacc0l
-	test_spr_immed	0,iacc0h
-smu15:
-	set_gr_immed	-2,gr7		; multiply by 0
-	set_gr_immed	0,gr8
-	smu		gr7,gr8
-	test_gr_immed	0,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	0,iacc0l
-	test_spr_immed	0,iacc0h
-smu16:
-	set_gr_limmed	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x2000,0x0001,gr7
-	test_spr_limmed	0xbfff,0xfffe,iacc0l
-	test_spr_limmed	0xffff,0xffff,iacc0h
-smu17:
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_limmed	0x8000,0x0000,iacc0l
-	test_spr_limmed	0xffff,0xffff,iacc0h
-smu18:
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0x4000,0x0001,gr7
-	test_spr_limmed	0x7fff,0xfffe,iacc0l
-	test_spr_limmed	0xffff,0xffff,iacc0h
-smu19:
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed	-4,gr8
-	smu		gr7,gr8
-	test_gr_immed	-4,gr8
-	test_gr_limmed	0x4000,0x0000,gr7
-	test_spr_limmed	0x0000,0x0000,iacc0l
-	test_spr_limmed	0xffff,0xffff,iacc0h
-smu20:
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	smu		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x7fff,0xffff,gr7
-	test_spr_limmed	0x8000,0x0000,iacc0l
-	test_spr_limmed	0xc000,0x0000,iacc0h
-smu21:
-	; Negative operands
-	set_gr_immed	-3,gr7		; multiply small numbers
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	-3,gr7
-	test_spr_immed	6,iacc0l
-	test_spr_immed	0,iacc0h
-smu22:
-	set_gr_immed	-1,gr7		; multiply by 1
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_immed	-1,gr7
-	test_spr_immed	2,iacc0l
-	test_spr_immed	0,iacc0h
-smu23:
-	set_gr_immed	-2,gr7		; multiply by 1
-	set_gr_immed	-1,gr8
-	smu		gr7,gr8
-	test_gr_immed	-1,gr8
-	test_gr_immed	-2,gr7
-	test_spr_immed	2,iacc0l
-	test_spr_immed	0,iacc0h
-smu24:
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0xc000,0x0001,gr7
-	test_spr_limmed	0x7fff,0xfffe,iacc0l
-	test_spr_immed	0,iacc0h
-smu25:
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed	-2,gr8
-	smu		gr7,gr8
-	test_gr_immed	-2,gr8
-	test_gr_limmed	0xc000,0x0000,gr7
-	test_spr_limmed	0x8000,0x0000,iacc0l
-	test_spr_immed	0,iacc0h
-smu26:
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed	-4,gr8
-	smu		gr7,gr8
-	test_gr_immed	-4,gr8
-	test_gr_limmed	0xc000,0x0000,gr7
-	test_spr_immed	0x00000000,iacc0l
-	test_spr_immed	1,iacc0h
-smu27:
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	smu		gr7,gr8
-	test_gr_limmed	0x8000,0x0001,gr8
-	test_gr_limmed	0x8000,0x0001,gr7
-	test_spr_immed	0x00000001,iacc0l
-	test_spr_limmed	0x3fff,0xffff,iacc0h
-smu28:
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	smu		gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-	test_gr_limmed	0x8000,0x0000,gr7
-	test_spr_immed	0x00000000,iacc0l
-	test_spr_limmed	0x4000,0x0000,iacc0h
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/subss.cgs b/sim/testsuite/sim/frv/fr400/subss.cgs
deleted file mode 100644
index fcda589a9f3..00000000000
--- a/sim/testsuite/sim/frv/fr400/subss.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# frv testcase for subss $GRi,$GRj,$GRk
-# mach: fr405 fr450
-
-	.include "../testutils.inc"
-
-	start
-
-	.global sub
-sub_no_saturate:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	subss		gr8,gr7,gr8
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	2,gr7
-	set_gr_immed   	1,gr8
-	subss		gr8,gr7,gr8
-	test_gr_limmed	0xffff,0xffff,gr8
-
-sub_saturate_neg:
-	set_gr_immed   	1,gr7
-	set_gr_limmed	0x8000,0x0000,gr8
-	subss		gr8,gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	set_gr_limmed	0xffff,0xfff0,gr8
-	subss		gr8,gr7,gr8
-	test_gr_limmed	0x8000,0x0000,gr8
-
-sub_saturate_pos:
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0x7fff,0xffff,gr8
-	subss		gr8,gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_immed   	0x0010,gr8
-	set_gr_limmed	0x8000,0x0000,gr7
-	subss		gr8,gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr400/udiv.cgs b/sim/testsuite/sim/frv/fr400/udiv.cgs
deleted file mode 100644
index dd92bcd0442..00000000000
--- a/sim/testsuite/sim/frv/fr400/udiv.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# frv testcase for udiv $GRi,$GRj,$GRk
-# mach: fr400
-
-	.include "../testutils.inc"
-
-	start
-
-	.global udiv
-udiv:
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	udiv      	gr3,gr2,gr3
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x00000004,gr3
-
-	; example 1 from udiv in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	udiv      	gr3,gr2,gr3
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_immed  	0x000000e0,gr3
-
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide by zero
-	set_spr_addr	ok1,lr
-e1:	udiv      	gr1,gr0,gr2	; divide by zero
-	test_gr_immed	1,gr15
-
-	pass
-
-ok1:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x1,isr		; isr.dtt is set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/fr400/udivi.cgs b/sim/testsuite/sim/frv/fr400/udivi.cgs
deleted file mode 100644
index 69a7937a983..00000000000
--- a/sim/testsuite/sim/frv/fr400/udivi.cgs
+++ /dev/null
@@ -1,47 +0,0 @@
-# frv testcase for udivi $GRi,$s12,$GRk
-# mach: fr400
-
-	.include "../testutils.inc"
-
-	start
-
-	.global udivi
-udivi:
-	; simple division 12 / 3
-	set_gr_immed   	0x0000000c,gr3
-	udivi      	gr3,3,gr3
-	test_gr_immed  	0x00000004,gr3
-
-	; random example
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	udivi      	gr3,0x7ff,gr3
-	test_gr_limmed 	0x001f,0xdf93,gr3
-
-	; random example
-	set_gr_limmed  	0xffff,0xffff,gr3
-	udivi      	gr3,-2048,gr3
-	test_gr_immed 	1,gr3
-
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide by zero
-	set_spr_addr	ok1,lr
-e1:	udivi      	gr1,0,gr2	; divide by zero
-	test_gr_immed	1,gr15
-
-	pass
-
-ok1:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x1,isr		; isr.dtt is set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/fr500/allinsn.exp b/sim/testsuite/sim/frv/fr500/allinsn.exp
deleted file mode 100644
index 7d192593efb..00000000000
--- a/sim/testsuite/sim/frv/fr500/allinsn.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# FRV simulator testsuite.
-
-if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-    # all machines
-    set all_machs "frv fr500 fr550"
-    set cpu_option -mcpu
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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/frv/fr500/cmqaddhss.cgs b/sim/testsuite/sim/frv/fr500/cmqaddhss.cgs
deleted file mode 100644
index 9c886205b1d..00000000000
--- a/sim/testsuite/sim/frv/fr500/cmqaddhss.cgs
+++ /dev/null
@@ -1,444 +0,0 @@
-# frv testcase for cmqaddhss $FRi,$FRj,$FRj,$CCi,$cond
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmqaddhss
-cmqaddhss:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x1233,0x5677,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x7,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc4,1
-	cmqaddhss	fr12,fr12,fr16,cc4,1
-	test_fr_limmed	0x0002,0x0002,fr14
-	test_fr_limmed	0xfffe,0xfffe,fr15
-	test_fr_limmed	0x7fff,0x0000,fr16
-	test_fr_limmed	0x0000,0x8000,fr17
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie not set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x9,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x1233,0x5677,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x7,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc5,0
-	cmqaddhss	fr12,fr12,fr16,cc5,0
-	test_fr_limmed	0x0002,0x0002,fr14
-	test_fr_limmed	0xfffe,0xfffe,fr15
-	test_fr_limmed	0x7fff,0x0000,fr16
-	test_fr_limmed	0x0000,0x8000,fr17
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie not set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x9,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc4,0
-	cmqaddhss	fr12,fr12,fr16,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc5,1
-	cmqaddhss	fr12,fr12,fr16,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc6,1
-	cmqaddhss	fr12,fr12,fr16,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-;
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc7,1
-	cmqaddhss	fr12,fr12,fr16,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/cmqaddhus.cgs b/sim/testsuite/sim/frv/fr500/cmqaddhus.cgs
deleted file mode 100644
index 5b29c9a93b0..00000000000
--- a/sim/testsuite/sim/frv/fr500/cmqaddhus.cgs
+++ /dev/null
@@ -1,360 +0,0 @@
-# frv testcase for cmqaddhus $FRi,$FRj,$FRj,$CCi,$cond
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmqaddhus
-cmqaddhus:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc4,1
-	test_fr_limmed	0x8000,0x7fff,fr14
-	test_fr_limmed	0xffff,0xffff,fr15
-	test_spr_bits	0x3c,2,1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc4,1
-	cmqaddhus	fr12,fr12,fr16,cc4,1
-	test_fr_limmed	0x0004,0x0002,fr14
-	test_fr_limmed	0x0002,0x0002,fr15
-	test_fr_limmed	0xffff,0xffff,fr16
-	test_fr_limmed	0xffff,0xffff,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xf,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc5,0
-	test_fr_limmed	0x8000,0x7fff,fr14
-	test_fr_limmed	0xffff,0xffff,fr15
-	test_spr_bits	0x3c,2,1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc5,0
-	cmqaddhus	fr12,fr12,fr16,cc5,0
-	test_fr_limmed	0x0004,0x0002,fr14
-	test_fr_limmed	0x0002,0x0002,fr15
-	test_fr_limmed	0xffff,0xffff,fr16
-	test_fr_limmed	0xffff,0xffff,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xf,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc4,0
-	cmqaddhus	fr12,fr12,fr16,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc5,1
-	cmqaddhus	fr12,fr12,fr16,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc6,0
-	cmqaddhus	fr12,fr12,fr16,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc7,0
-	cmqaddhus	fr12,fr12,fr16,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/cmqsubhss.cgs b/sim/testsuite/sim/frv/fr500/cmqsubhss.cgs
deleted file mode 100644
index 4dbee66c7e6..00000000000
--- a/sim/testsuite/sim/frv/fr500/cmqsubhss.cgs
+++ /dev/null
@@ -1,448 +0,0 @@
-# frv testcase for cmqsubhss $FRi,$FRj,$FRj,$CCi,$cond
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubhss
-msubhss:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0x4111,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x4111,0xdead,fr14
-	test_fr_limmed	0x0123,0x4567,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x1235,0x5679,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc4,1
-	cmqsubhss	fr12,fr10,fr16,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x8000,0x8000,fr16
-	test_fr_limmed	0x8001,0x8001,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr0.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0x4111,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x4111,0xdead,fr14
-	test_fr_limmed	0x0123,0x4567,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x1235,0x5679,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc5,0
-	cmqsubhss	fr12,fr10,fr16,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x8000,0x8000,fr16
-	test_fr_limmed	0x8001,0x8001,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr0.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc4,0
-	cmqsubhss	fr12,fr10,fr16,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc5,1
-	cmqsubhss	fr12,fr10,fr16,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc6,1
-	cmqsubhss	fr12,fr10,fr16,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc7,1
-	cmqsubhss	fr12,fr10,fr16,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/cmqsubhus.cgs b/sim/testsuite/sim/frv/fr500/cmqsubhus.cgs
deleted file mode 100644
index f60ae981706..00000000000
--- a/sim/testsuite/sim/frv/fr500/cmqsubhus.cgs
+++ /dev/null
@@ -1,370 +0,0 @@
-# frv testcase for cmqsubhus $FRi,$FRj,$FRj,$CCi,$cond
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmqsubhus
-cmqsubhus:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0123,0x4567,fr14
-	test_fr_limmed	0x7ffc,0x7ffd,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc4,1
-	cmqsubhus	fr10,fr12,fr16,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x0001,0x0000,fr16
-	test_fr_limmed	0x0000,0x0000,fr17
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x1,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0123,0x4567,fr14
-	test_fr_limmed	0x7ffc,0x7ffd,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc5,0
-	cmqsubhus	fr10,fr12,fr16,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x0001,0x0000,fr16
-	test_fr_limmed	0x0000,0x0000,fr17
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x1,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc4,0
-	cmqsubhus	fr10,fr12,fr16,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_fr_limmed	0x4444,0x4444,fr17
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc5,1
-	cmqsubhus	fr10,fr12,fr16,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_fr_limmed	0x4444,0x4444,fr17
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc6,0
-	cmqsubhus	fr10,fr12,fr16,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_fr_limmed	0x4444,0x4444,fr17
-;
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc7,0
-	cmqsubhus	fr10,fr12,fr16,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	2,1,0,msr1		; msr1.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_fr_limmed	0x4444,0x4444,fr17
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/dcpl.cgs b/sim/testsuite/sim/frv/fr500/dcpl.cgs
deleted file mode 100644
index c0c904cd820..00000000000
--- a/sim/testsuite/sim/frv/fr500/dcpl.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# FRV testcase for dcpl GRi,GRj,lock
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global dcpl
-dcpl:
-	or_spr_immed	0xc8000000,hsr0	; caches enabled -- copy-back mode
-
-	; preload and lock all the lines in set 0 of the data cache
-	set_gr_immed	0x70000,gr10
-	dcpl		gr10,gr0,1
-	set_mem_immed	0x11111111,gr10
-	test_mem_immed	0x11111111,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	1,gr11
-	dcpl		gr10,gr11,1
-	set_mem_immed	0x22222222,gr10
-	test_mem_immed	0x22222222,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	63,gr11
-	dcpl		gr10,gr11,1
-	set_mem_immed	0x33333333,gr10
-	test_mem_immed	0x33333333,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	64,gr11
-	dcpl		gr10,gr11,1
-	set_mem_immed	0x44444444,gr10
-	test_mem_immed	0x44444444,gr10
-
-	; Now write to another address which should be in the same set
-	; the write should go through to memory, since all the lines in the
-	; set are locked
-	inc_gr_immed	0x1000,gr10
-	set_mem_immed	0xdeadbeef,gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	; Invalidate the data cache. Only the last value stored should have made
-	; it through to memory
-	set_gr_immed	0x70000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x1000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x1000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x1000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x1000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/dcul.cgs b/sim/testsuite/sim/frv/fr500/dcul.cgs
deleted file mode 100644
index 1c5bd93c181..00000000000
--- a/sim/testsuite/sim/frv/fr500/dcul.cgs
+++ /dev/null
@@ -1,118 +0,0 @@
-# FRV testcase for dcul GRi
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global dcul
-dcul:
-	or_spr_immed	0xc8000000,hsr0	; caches enabled -- copy-back mode
-
-	; preload and lock all the lines in set 0 of the data cache
-	set_gr_immed	0x70000,gr10
-	lock_data_cache	gr10
-	set_mem_immed	0x11111111,gr10
-	test_mem_immed	0x11111111,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	1,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x22222222,gr10
-	test_mem_immed	0x22222222,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	63,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x33333333,gr10
-	test_mem_immed	0x33333333,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	64,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x44444444,gr10
-	test_mem_immed	0x44444444,gr10
-
-	; Now write to another address which should be in the same set
-	; the write should go through to memory, since all the lines in the
-	; set are locked
-	inc_gr_immed	0x1000,gr10
-	set_mem_immed	0xdeadbeef,gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	; Invalidate the data cache. Only the last value stored should have made
-	; it through to memory
-	set_gr_immed	0x70000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x1000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x1000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x1000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x1000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	; Now preload load and lock all the lines in set 0 of the data cache
-	; again
-	set_gr_immed	0x70000,gr10
-	lock_data_cache	gr10
-	set_mem_immed	0x11111111,gr10
-	test_mem_immed	0x11111111,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	1,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x22222222,gr10
-	test_mem_immed	0x22222222,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	63,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x33333333,gr10
-	test_mem_immed	0x33333333,gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_gr_immed	64,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x44444444,gr10
-	test_mem_immed	0x44444444,gr10
-
-	; unlock one line
-	set_gr_immed	0x72000,gr10
-	dcul		gr10
-
-	; Now write to another address which should be in the same set.
-	set_gr_immed	0x75000,gr10
-	set_mem_immed	0xbeefdead,gr10
-
-	; All of the stored values should be retrievable
-
-	set_gr_immed	0x70000,gr10
-	test_mem_immed	0x11111111,gr10
-
-	inc_gr_immed	0x1000,gr10
-	test_mem_immed	0x22222222,gr10
-
-	inc_gr_immed	0x1000,gr10
-	test_mem_immed	0x33333333,gr10
-
-	inc_gr_immed	0x1000,gr10
-	test_mem_immed	0x44444444,gr10
-
-	inc_gr_immed	0x1000,gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	inc_gr_immed	0x1000,gr10
-	test_mem_immed	0xbeefdead,gr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/mclracc.cgs b/sim/testsuite/sim/frv/fr500/mclracc.cgs
deleted file mode 100644
index 43fcf7599ca..00000000000
--- a/sim/testsuite/sim/frv/fr500/mclracc.cgs
+++ /dev/null
@@ -1,79 +0,0 @@
-# frv testcase for mclracc $ACC40k,$A
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mclracc
-mclracc:
-	set_accg_immed	0xff,accg0
-	set_acc_immed	-1,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	-1,acc1
-	set_accg_immed	0xff,accg3
-	set_acc_immed	-1,acc3
-	set_accg_immed	0xff,accg7
-	set_acc_immed	-1,acc7
-
-	mclracc		acc8,0		; nop
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0xff,accg3
-	test_acc_immed	-1,acc3
-	test_accg_immed	0xff,accg7
-	test_acc_immed	-1,acc7
-
-	mclracc		acc8,1		; nop
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0xff,accg3
-	test_acc_immed	-1,acc3
-	test_accg_immed	0xff,accg7
-	test_acc_immed	-1,acc7
-
-	mclracc		acc3,0
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0,accg3
-	test_acc_immed	0,acc3
-	test_accg_immed	0xff,accg7
-	test_acc_immed	-1,acc7
-
-	mclracc		acc7,1
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0,accg3
-	test_acc_immed	0,acc3
-	test_accg_immed	0,accg7
-	test_acc_immed	0,acc7
-
-	mclracc		acc0,0
-	test_accg_immed	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_immed	-1,acc1
-	test_accg_immed	0,accg3
-	test_acc_immed	0,acc3
-	test_accg_immed	0,accg7
-	test_acc_immed	0,acc7
-
-	mclracc		acc0,1
-	test_accg_immed	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed	0,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed	0,accg3
-	test_acc_immed	0,acc3
-	test_accg_immed	0,accg7
-	test_acc_immed	0,acc7
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/mqaddhss.cgs b/sim/testsuite/sim/frv/fr500/mqaddhss.cgs
deleted file mode 100644
index 7183a3f7eb6..00000000000
--- a/sim/testsuite/sim/frv/fr500/mqaddhss.cgs
+++ /dev/null
@@ -1,79 +0,0 @@
-# frv testcase for mqaddhss $FRi,$FRj,$FRj
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqaddhss
-mqaddhss:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0x1233,0x5677,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x7,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	mqaddhss.p	fr10,fr10,fr14
-	mqaddhss	fr12,fr12,fr16
-	test_fr_limmed	0x0002,0x0002,fr14
-	test_fr_limmed	0xfffe,0xfffe,fr15
-	test_fr_limmed	0x7fff,0x0000,fr16
-	test_fr_limmed	0x0000,0x8000,fr17
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie not set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x9,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/mqaddhus.cgs b/sim/testsuite/sim/frv/fr500/mqaddhus.cgs
deleted file mode 100644
index 9faa109fc2a..00000000000
--- a/sim/testsuite/sim/frv/fr500/mqaddhus.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# frv testcase for mqaddhus $FRi,$FRj,$FRj
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqaddhus
-mqaddhus:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	mqaddhus	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	mqaddhus	fr10,fr12,fr14
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	mqaddhus	fr10,fr12,fr14
-	test_fr_limmed	0x8000,0x7fff,fr14
-	test_fr_limmed	0xffff,0xffff,fr15
-	test_spr_bits	0x3c,2,1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	mqaddhus.p	fr10,fr10,fr14
-	mqaddhus	fr12,fr12,fr16
-	test_fr_limmed	0x0004,0x0002,fr14
-	test_fr_limmed	0x0002,0x0002,fr15
-	test_fr_limmed	0xffff,0xffff,fr16
-	test_fr_limmed	0xffff,0xffff,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xf,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/mqsubhss.cgs b/sim/testsuite/sim/frv/fr500/mqsubhss.cgs
deleted file mode 100644
index 74d5a870e72..00000000000
--- a/sim/testsuite/sim/frv/fr500/mqsubhss.cgs
+++ /dev/null
@@ -1,79 +0,0 @@
-# frv testcase for mqsubhss $FRi,$FRj,$FRj
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubhss
-msubhss:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	mqsubhss	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0x4111,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	mqsubhss	fr10,fr12,fr14
-	test_fr_limmed	0x4111,0xdead,fr14
-	test_fr_limmed	0x0123,0x4567,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	mqsubhss	fr10,fr12,fr14
-	test_fr_limmed	0x1235,0x5679,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqsubhss	fr10,fr12,fr14
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	mqsubhss.p	fr10,fr10,fr14
-	mqsubhss	fr12,fr10,fr16
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x8000,0x8000,fr16
-	test_fr_limmed	0x8001,0x8001,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr0.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr500/mqsubhus.cgs b/sim/testsuite/sim/frv/fr500/mqsubhus.cgs
deleted file mode 100644
index 44aa7a94487..00000000000
--- a/sim/testsuite/sim/frv/fr500/mqsubhus.cgs
+++ /dev/null
@@ -1,66 +0,0 @@
-# frv testcase for msubhus $FRi,$FRj,$FRj
-# mach: frv fr500
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubhus
-msubhus:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	mqsubhus	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqsubhus	fr10,fr12,fr14
-	test_fr_limmed	0x0123,0x4567,fr14
-	test_fr_limmed	0x7ffc,0x7ffd,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqsubhus	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	mqsubhus.p	fr10,fr10,fr14
-	mqsubhus	fr10,fr12,fr16
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x0001,0x0000,fr16
-	test_fr_limmed	0x0000,0x0000,fr17
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0x1,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/allinsn.exp b/sim/testsuite/sim/frv/fr550/allinsn.exp
deleted file mode 100644
index 1fe17952de1..00000000000
--- a/sim/testsuite/sim/frv/fr550/allinsn.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# FRV simulator testsuite.
-
-if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-    # all machines
-    set all_machs "fr550"
-    set cpu_option -mcpu
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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/frv/fr550/cmaddhss.cgs b/sim/testsuite/sim/frv/fr550/cmaddhss.cgs
deleted file mode 100644
index 174a3dcc56e..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmaddhss.cgs
+++ /dev/null
@@ -1,547 +0,0 @@
-# frv testcase for cmaddhss $FRi,$FRj,$FRj,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global maddhss
-maddhss:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x1233,0x5677,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,1
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc4,1
-	cmaddhss	fr11,fr11,fr13,cc4,1
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x1233,0x5677,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc5,0
-	cmaddhss	fr11,fr11,fr13,cc5,0
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc4,0
-	cmaddhss	fr11,fr11,fr13,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc5,1
-	cmaddhss	fr11,fr11,fr13,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc6,1
-	cmaddhss	fr11,fr11,fr13,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-;
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmaddhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhss	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhss	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmaddhss.p	fr10,fr10,fr12,cc7,1
-	cmaddhss	fr11,fr11,fr13,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmaddhus.cgs b/sim/testsuite/sim/frv/fr550/cmaddhus.cgs
deleted file mode 100644
index 40e11529ce7..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmaddhus.cgs
+++ /dev/null
@@ -1,481 +0,0 @@
-# frv testcase for cmaddhus $FRi,$FRj,$FRj,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmaddhus
-cmaddhus:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x8000,0x7fff,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc4,1
-	cmaddhus	fr11,fr11,fr13,cc4,1
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0xffff,0xffff,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x8000,0x7fff,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc5,0
-	cmaddhus	fr11,fr11,fr13,cc5,0
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0xffff,0xffff,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0x0000,fr10
-	set_fr_iimmed	0x0000,0xdead,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc4,0
-	cmaddhus	fr11,fr11,fr13,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0x0000,fr10
-	set_fr_iimmed	0x0000,0xdead,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc5,1
-	cmaddhus	fr11,fr11,fr13,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0x0000,fr10
-	set_fr_iimmed	0x0000,0xdead,fr11
-	cmaddhus	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc6,0
-	cmaddhus	fr11,fr11,fr13,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0x0000,fr10
-	set_fr_iimmed	0x0000,0xdead,fr11
-	cmaddhus	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmaddhus	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmaddhus	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmaddhus	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmaddhus	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	cmaddhus	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmaddhus.p	fr10,fr10,fr12,cc7,0
-	cmaddhus	fr11,fr11,fr13,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmcpxiu.cgs b/sim/testsuite/sim/frv/fr550/cmcpxiu.cgs
deleted file mode 100644
index 341949ba488..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmcpxiu.cgs
+++ /dev/null
@@ -1,492 +0,0 @@
-# frv testcase for cmcpxiu $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmcpxiu
-cmcpxiu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	5,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7fff,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8001,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010001,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; almost max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffb0003,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffc0002,acc0
-
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	5,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7fff,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8001,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010001,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; almost max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffb0003,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffc0002,acc0
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0x0001,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0x0001,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc2,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0x0001,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc3,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0x0001,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxiu      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is clear
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmcpxru.cgs b/sim/testsuite/sim/frv/fr550/cmcpxru.cgs
deleted file mode 100644
index 3eeb0a041ed..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmcpxru.cgs
+++ /dev/null
@@ -1,528 +0,0 @@
-# frv testcase for cmcpxru $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmcpxru
-cmcpxru:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	14,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffd,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xffff,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x0001ffff,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	14,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffd,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xffff,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x0001ffff,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc0,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc1,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc2,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-;
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc3,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmcpxru      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf is clear
-	test_spr_bits	1,0,0,msr0		; msr0.aovf is clear
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmmachs.cgs b/sim/testsuite/sim/frv/fr550/cmmachs.cgs
deleted file mode 100644
index f716867d35c..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmmachs.cgs
+++ /dev/null
@@ -1,1545 +0,0 @@
-# frv testcase for cmmachs $GRi,$GRj,$ACCk,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmmachs
-cmmachs:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x8006,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0007,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0001,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0xbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0xbffd,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffd,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc003,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc005,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc005,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3ffec006,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x7ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x7ffec006,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-;;;;;;;;;;;;
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	-128,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	-128,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_accg_immed 	0x0,accg0		; saturation
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x8006,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0007,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0001,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0xbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0xbffd,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffd,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc003,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc005,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc005,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3ffec006,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x7ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x7ffec006,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-;
-	; Positive operands
-	set_spr_immed 	0x0,msr0
-	set_accg_immed 	0x0,accg0
-	set_acc_immed	0x0,acc0
-	set_accg_immed 	0x0,accg1
-	set_acc_immed	0x0,acc1
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	cmmachs      	fr7,fr8,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachs      	fr7,fr8,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmmachu.cgs b/sim/testsuite/sim/frv/fr550/cmmachu.cgs
deleted file mode 100644
index 176d1b1aca6..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmmachu.cgs
+++ /dev/null
@@ -1,858 +0,0 @@
-# frv testcase for cmmachu $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmmachu
-cmmachu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_spr_immed 	0,msr0
-	set_accg_immed 	0,accg0
-	set_acc_immed	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00020006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00020006,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40010007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40010007,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8001,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x8001,0x0007,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x7fff,0x0008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x7fff,0x0008,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_spr_immed 	0,msr0
-	set_accg_immed 	0,accg0
-	set_acc_immed	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00020006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00020006,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40010007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40010007,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8001,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x8001,0x0007,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x7fff,0x0008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x7fff,0x0008,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_spr_immed 	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_spr_immed 	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_spr_immed 	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-;
-	set_spr_immed 	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed	0x22222222,acc1
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	cmmachu      	fr7,fr8,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed	0x22222222,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	cmmachu      	fr7,fr8,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmqaddhss.cgs b/sim/testsuite/sim/frv/fr550/cmqaddhss.cgs
deleted file mode 100644
index 3d32bec08e4..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmqaddhss.cgs
+++ /dev/null
@@ -1,429 +0,0 @@
-# frv testcase for cmqaddhss $FRi,$FRj,$FRj,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmqaddhss
-cmqaddhss:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x1233,0x5677,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x7,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc4,1
-	cmqaddhss	fr12,fr12,fr16,cc4,1
-	test_fr_limmed	0x0002,0x0002,fr14
-	test_fr_limmed	0xfffe,0xfffe,fr15
-	test_fr_limmed	0x7fff,0x0000,fr16
-	test_fr_limmed	0x0000,0x8000,fr17
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x1233,0x5677,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x7,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc5,0
-	cmqaddhss	fr12,fr12,fr16,cc5,0
-	test_fr_limmed	0x0002,0x0002,fr14
-	test_fr_limmed	0xfffe,0xfffe,fr15
-	test_fr_limmed	0x7fff,0x0000,fr16
-	test_fr_limmed	0x0000,0x8000,fr17
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc4,0
-	cmqaddhss	fr12,fr12,fr16,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc5,1
-	cmqaddhss	fr12,fr12,fr16,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc6,1
-	cmqaddhss	fr12,fr12,fr16,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-;
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhss	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhss	fr10,fr12,fr14,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqaddhss	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	cmqaddhss	fr10,fr12,fr14,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	cmqaddhss.p	fr10,fr10,fr14,cc7,1
-	cmqaddhss	fr12,fr12,fr16,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmqaddhus.cgs b/sim/testsuite/sim/frv/fr550/cmqaddhus.cgs
deleted file mode 100644
index 4e25ba43ca2..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmqaddhus.cgs
+++ /dev/null
@@ -1,345 +0,0 @@
-# frv testcase for cmqaddhus $FRi,$FRj,$FRj,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmqaddhus
-cmqaddhus:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc4,1
-	test_fr_limmed	0x8000,0x7fff,fr14
-	test_fr_limmed	0xffff,0xffff,fr15
-	test_spr_bits	0x3c,2,1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc4,1
-	cmqaddhus	fr12,fr12,fr16,cc4,1
-	test_fr_limmed	0x0004,0x0002,fr14
-	test_fr_limmed	0x0002,0x0002,fr15
-	test_fr_limmed	0xffff,0xffff,fr16
-	test_fr_limmed	0xffff,0xffff,fr17
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc5,0
-	test_fr_limmed	0x8000,0x7fff,fr14
-	test_fr_limmed	0xffff,0xffff,fr15
-	test_spr_bits	0x3c,2,1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc5,0
-	cmqaddhus	fr12,fr12,fr16,cc5,0
-	test_fr_limmed	0x0004,0x0002,fr14
-	test_fr_limmed	0x0002,0x0002,fr15
-	test_fr_limmed	0xffff,0xffff,fr16
-	test_fr_limmed	0xffff,0xffff,fr17
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc4,0
-	cmqaddhus	fr12,fr12,fr16,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc5,1
-	cmqaddhus	fr12,fr12,fr16,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc6,0
-	cmqaddhus	fr12,fr12,fr16,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqaddhus	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqaddhus	fr10,fr12,fr14,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	cmqaddhus	fr10,fr12,fr14,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqaddhus.p	fr10,fr10,fr14,cc7,0
-	cmqaddhus	fr12,fr12,fr16,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmqmachs.cgs b/sim/testsuite/sim/frv/fr550/cmqmachs.cgs
deleted file mode 100644
index 0aee4f0ab77..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmqmachs.cgs
+++ /dev/null
@@ -1,1262 +0,0 @@
-# frv testcase for cmqmachs $GRi,$GRj,$ACCk,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmqmachs
-cmqmachs:
-	set_spr_immed	0x1b1b,cccr
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_accg_immed 	0,accg0
-	set_acc_immed 	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed 	0,acc1
-	set_accg_immed 	0,accg2
-	set_acc_immed 	0,acc2
-	set_accg_immed 	0,accg3
-	set_acc_immed 	0,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8008,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7fff,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7fff,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7ffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7ffd,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x3fff,0x3ffb,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x3fff,0x3ffb,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffb,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffb,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0008,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffd,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffd,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0009,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0009,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fffbffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fffbffd,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_accg_immed 	0,accg0
-	set_acc_immed 	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed 	0,acc1
-	set_accg_immed 	0,accg2
-	set_acc_immed 	0,acc2
-	set_accg_immed 	0,accg3
-	set_acc_immed 	0,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8008,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7fff,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7fff,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7ffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7ffd,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x3fff,0x3ffb,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x3fff,0x3ffb,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffb,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffb,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0008,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffd,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffd,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0009,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0009,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fffbffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fffbffd,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0x7f,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2		; saturation
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0x7f,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2		; saturation
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0x7f,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2		; saturation
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-;
-	; Positive operands
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	cmqmachs      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0x7f,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	cmqmachs      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x80,accg0		; saturation
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2		; saturation
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fr550/cmqmachu.cgs b/sim/testsuite/sim/frv/fr550/cmqmachu.cgs
deleted file mode 100644
index 8b880f82436..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmqmachu.cgs
+++ /dev/null
@@ -1,870 +0,0 @@
-# frv testcase for cmqmachu $GRi,$GRj,$GRk,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmqmachu
-cmqmachu:
-	set_spr_immed	0x1b1b,cccr
-
-	set_spr_immed	0,msr0
-	set_accg_immed 	0,accg0
-	set_acc_immed 	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed 	0,acc1
-	set_accg_immed 	0,accg2
-	set_acc_immed 	0,acc2
-	set_accg_immed 	0,accg3
-	set_acc_immed 	0,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8000,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00018000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00018000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff8007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff8007,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4001,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4001,0x8000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x3ffd,0x8008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x3ffd,0x8008,acc1
-	test_accg_immed 	1,accg2
-	test_acc_limmed	0x3fff,0x8001,acc2
-	test_accg_immed 	1,accg3
-	test_acc_limmed	0x3fff,0x8001,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,1
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed 	0,accg0
-	set_acc_immed 	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed 	0,acc1
-	set_accg_immed 	0,accg2
-	set_acc_immed 	0,acc2
-	set_accg_immed 	0,accg3
-	set_acc_immed 	0,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8000,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00018000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00018000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff8007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff8007,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4001,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4001,0x8000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x3ffd,0x8008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x3ffd,0x8008,acc1
-	test_accg_immed 	1,accg2
-	test_acc_limmed	0x3fff,0x8001,acc2
-	test_accg_immed 	1,accg3
-	test_acc_limmed	0x3fff,0x8001,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc0,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc4,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc1,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc5,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc2,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc2,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc6,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc6,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-;
-	set_spr_immed	0,msr0
-	set_accg_immed 	0x00000011,accg0
-	set_acc_immed 	0x11111111,acc0
-	set_accg_immed 	0x00000022,accg1
-	set_acc_immed 	0x22222222,acc1
-	set_accg_immed 	0x00000033,accg2
-	set_acc_immed 	0x33333333,acc2
-	set_accg_immed 	0x00000044,accg3
-	set_acc_immed 	0x44444444,acc3
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc3,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc3,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	cmqmachu      	fr8,fr10,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x00000011,accg0
-	test_acc_immed 	0x11111111,acc0
-	test_accg_immed 	0x00000022,accg1
-	test_acc_immed 	0x22222222,acc1
-	test_accg_immed 	0x00000033,accg2
-	test_acc_immed 	0x33333333,acc2
-	test_accg_immed 	0x00000044,accg3
-	test_acc_immed 	0x44444444,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	cmqmachu      	fr8,fr10,acc0,cc7,0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	cmqmachu      	fr8,fr10,acc0,cc7,1
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0		; saturation
-	test_acc_immed	0xffffffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed	0xffffffff,acc1
-	test_accg_immed 	0xff,accg2		; saturation
-	test_acc_immed	0xffffffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed	0xffffffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmqsubhss.cgs b/sim/testsuite/sim/frv/fr550/cmqsubhss.cgs
deleted file mode 100644
index 490b449ec83..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmqsubhss.cgs
+++ /dev/null
@@ -1,429 +0,0 @@
-# frv testcase for cmqsubhss $FRi,$FRj,$FRj,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubhss
-msubhss:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0x4111,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x4111,0xdead,fr14
-	test_fr_limmed	0x0123,0x4567,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x1235,0x5679,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc4,1
-	cmqsubhss	fr12,fr10,fr16,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x8000,0x8000,fr16
-	test_fr_limmed	0x8001,0x8001,fr17
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0x4111,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x4111,0xdead,fr14
-	test_fr_limmed	0x0123,0x4567,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x1235,0x5679,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc5,0
-	cmqsubhss	fr12,fr10,fr16,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x8000,0x8000,fr16
-	test_fr_limmed	0x8001,0x8001,fr17
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc4,0
-	cmqsubhss	fr12,fr10,fr16,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc5,1
-	cmqsubhss	fr12,fr10,fr16,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc6,1
-	cmqsubhss	fr12,fr10,fr16,cc6,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	cmqsubhss	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	cmqsubhss	fr10,fr12,fr14,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	cmqsubhss	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhss	fr10,fr12,fr14,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	cmqsubhss.p	fr10,fr10,fr14,cc7,1
-	cmqsubhss	fr12,fr10,fr16,cc7,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_fr_limmed	0x4444,0x4444,fr17
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmqsubhus.cgs b/sim/testsuite/sim/frv/fr550/cmqsubhus.cgs
deleted file mode 100644
index 90bd89ae63f..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmqsubhus.cgs
+++ /dev/null
@@ -1,351 +0,0 @@
-# frv testcase for cmqsubhus $FRi,$FRj,$FRj,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmqsubhus
-cmqsubhus:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc0,1
-	test_fr_limmed	0x0123,0x4567,fr14
-	test_fr_limmed	0x7ffc,0x7ffd,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc4,1
-	cmqsubhus	fr10,fr12,fr16,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x0001,0x0000,fr16
-	test_fr_limmed	0x0000,0x0000,fr17
-	test_spr_bits	0x3c,2,0x1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc1,0
-	test_fr_limmed	0x0123,0x4567,fr14
-	test_fr_limmed	0x7ffc,0x7ffd,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc5,0
-	cmqsubhus	fr10,fr12,fr16,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x0001,0x0000,fr16
-	test_fr_limmed	0x0000,0x0000,fr17
-	test_spr_bits	0x3c,2,0x1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc0,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc4,0
-	cmqsubhus	fr10,fr12,fr16,cc4,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_fr_limmed	0x4444,0x4444,fr17
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc1,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc5,1
-	cmqsubhus	fr10,fr12,fr16,cc5,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_fr_limmed	0x4444,0x4444,fr17
-
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc2,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc2,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc6,0
-	cmqsubhus	fr10,fr12,fr16,cc6,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_fr_limmed	0x4444,0x4444,fr17
-;
-	set_fr_iimmed	0x1111,0x1111,fr14
-	set_fr_iimmed	0x2222,0x2222,fr15
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	cmqsubhus	fr10,fr12,fr14,cc3,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc3,0
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	cmqsubhus	fr10,fr12,fr14,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x3333,0x3333,fr16
-	set_fr_iimmed	0x4444,0x4444,fr17
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	cmqsubhus.p	fr10,fr10,fr14,cc7,0
-	cmqsubhus	fr10,fr12,fr16,cc7,1
-	test_fr_limmed	0x1111,0x1111,fr14
-	test_fr_limmed	0x2222,0x2222,fr15
-	test_fr_limmed	0x3333,0x3333,fr16
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_fr_limmed	0x4444,0x4444,fr17
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmsubhss.cgs b/sim/testsuite/sim/frv/fr550/cmsubhss.cgs
deleted file mode 100644
index 9370d54c9cf..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmsubhss.cgs
+++ /dev/null
@@ -1,547 +0,0 @@
-# frv testcase for cmsubhss $FRi,$FRj,$FRj,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmsubhss
-cmsubhss:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xdead,0x4111,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x4111,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x1235,0x5679,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc4,1
-	cmsubhss	fr11,fr10,fr13,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x8000,0x8000,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xdead,0x4111,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x4111,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x1235,0x5679,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc5,0
-	cmsubhss	fr11,fr10,fr13,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x8000,0x8000,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc4,0
-	cmsubhss	fr11,fr10,fr13,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc5,1
-	cmsubhss	fr11,fr10,fr13,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc6,1
-	cmsubhss	fr11,fr10,fr13,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-;
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	cmsubhss	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhss	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhss	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	cmsubhss.p	fr10,fr10,fr12,cc7,1
-	cmsubhss	fr11,fr10,fr13,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/cmsubhus.cgs b/sim/testsuite/sim/frv/fr550/cmsubhus.cgs
deleted file mode 100644
index 5cf676b7967..00000000000
--- a/sim/testsuite/sim/frv/fr550/cmsubhus.cgs
+++ /dev/null
@@ -1,427 +0,0 @@
-# frv testcase for cmsubhus $FRi,$FRj,$FRj,$CCi,$cond
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global cmsubhus
-cmsubhus:
-	set_spr_immed	0x1b1b,cccr
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,1
-	test_fr_limmed	0x7ffc,0x7ffd,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc4,1
-	cmsubhus	fr10,fr11,fr13,cc4,1
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x0000,0x0000,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,0
-	test_fr_limmed	0x7ffc,0x7ffd,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc5,0
-	cmsubhus	fr10,fr11,fr13,cc5,0
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x0000,0x0000,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc0,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc4,0
-	cmsubhus	fr10,fr11,fr13,cc4,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc1,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc5,1
-	cmsubhus	fr10,fr11,fr13,cc5,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc2,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc2,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc6,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc6,0
-	cmsubhus	fr10,fr11,fr13,cc6,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-;
-	set_fr_iimmed	0xdead,0xbeef,fr12
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	cmsubhus	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	cmsubhus	fr10,fr11,fr12,cc3,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc3,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	cmsubhus	fr10,fr11,fr12,cc7,0
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	cmsubhus	fr10,fr11,fr12,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xbeef,0xdead,fr13
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	cmsubhus.p	fr10,fr10,fr12,cc7,0
-	cmsubhus	fr10,fr11,fr13,cc7,1
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xdead,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/dcpl.cgs b/sim/testsuite/sim/frv/fr550/dcpl.cgs
deleted file mode 100644
index 93c659a5917..00000000000
--- a/sim/testsuite/sim/frv/fr550/dcpl.cgs
+++ /dev/null
@@ -1,65 +0,0 @@
-# FRV testcase for dcpl GRi,GRj,lock
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global dcpl
-dcpl:
-	or_spr_immed	0xc8000000,hsr0	; caches enabled -- copy-back mode
-
-	; preload and lock all the lines in set 0 of the data cache
-	set_gr_immed	0x70000,gr10
-	dcpl		gr10,gr0,1
-	set_mem_immed	0x11111111,gr10
-	test_mem_immed	0x11111111,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	1,gr11
-	dcpl		gr10,gr11,1
-	set_mem_immed	0x22222222,gr10
-	test_mem_immed	0x22222222,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	63,gr11
-	dcpl		gr10,gr11,1
-	set_mem_immed	0x33333333,gr10
-	test_mem_immed	0x33333333,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	64,gr11
-	dcpl		gr10,gr11,1
-	set_mem_immed	0x44444444,gr10
-	test_mem_immed	0x44444444,gr10
-
-	; Now write to another address which should be in the same set
-	; the write should go through to memory, since all the lines in the
-	; set are locked
-	inc_gr_immed	0x2000,gr10
-	set_mem_immed	0xdeadbeef,gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	; Invalidate the data cache. Only the last value stored should have made
-	; it through to memory
-	set_gr_immed	0x70000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x2000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x2000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x2000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x2000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/dcul.cgs b/sim/testsuite/sim/frv/fr550/dcul.cgs
deleted file mode 100644
index a3bd4be8cd5..00000000000
--- a/sim/testsuite/sim/frv/fr550/dcul.cgs
+++ /dev/null
@@ -1,118 +0,0 @@
-# FRV testcase for dcul GRi
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global dcul
-dcul:
-	or_spr_immed	0xc8000000,hsr0	; caches enabled -- copy-back mode
-
-	; preload and lock all the lines in set 0 of the data cache
-	set_gr_immed	0x70000,gr10
-	lock_data_cache	gr10
-	set_mem_immed	0x11111111,gr10
-	test_mem_immed	0x11111111,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	1,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x22222222,gr10
-	test_mem_immed	0x22222222,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	63,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x33333333,gr10
-	test_mem_immed	0x33333333,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	64,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x44444444,gr10
-	test_mem_immed	0x44444444,gr10
-
-	; Now write to another address which should be in the same set
-	; the write should go through to memory, since all the lines in the
-	; set are locked
-	inc_gr_immed	0x2000,gr10
-	set_mem_immed	0xdeadbeef,gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	; Invalidate the data cache. Only the last value stored should have made
-	; it through to memory
-	set_gr_immed	0x70000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x2000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x2000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x2000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0,gr10
-
-	inc_gr_immed	0x2000,gr10
-	invalidate_data_cache	gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	; Now preload load and lock all the lines in set 0 of the data cache
-	; again
-	set_gr_immed	0x70000,gr10
-	lock_data_cache	gr10
-	set_mem_immed	0x11111111,gr10
-	test_mem_immed	0x11111111,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	1,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x22222222,gr10
-	test_mem_immed	0x22222222,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	63,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x33333333,gr10
-	test_mem_immed	0x33333333,gr10
-
-	inc_gr_immed	0x2000,gr10
-	set_gr_immed	64,gr11
-	lock_data_cache	gr10
-	set_mem_immed	0x44444444,gr10
-	test_mem_immed	0x44444444,gr10
-
-	; unlock one line
-	set_gr_immed	0x78000,gr10
-	dcul		gr10
-
-	; Now write to another address which should be in the same set.
-	set_gr_immed	0x7a000,gr10
-	set_mem_immed	0xbeefdead,gr10
-
-	; All of the stored values should be retrievable
-
-	set_gr_immed	0x70000,gr10
-	test_mem_immed	0x11111111,gr10
-
-	inc_gr_immed	0x2000,gr10
-	test_mem_immed	0x22222222,gr10
-
-	inc_gr_immed	0x2000,gr10
-	test_mem_immed	0x33333333,gr10
-
-	inc_gr_immed	0x2000,gr10
-	test_mem_immed	0x44444444,gr10
-
-	inc_gr_immed	0x2000,gr10
-	test_mem_immed	0xdeadbeef,gr10
-
-	inc_gr_immed	0x2000,gr10
-	test_mem_immed	0xbeefdead,gr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mabshs.cgs b/sim/testsuite/sim/frv/fr550/mabshs.cgs
deleted file mode 100644
index 9168df8981b..00000000000
--- a/sim/testsuite/sim/frv/fr550/mabshs.cgs
+++ /dev/null
@@ -1,64 +0,0 @@
-# frv testcase for mabshs $FRj,$FRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mabshs
-mabshs:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x0000,0x0000,fr11
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0001,0xffff,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x0001,0x0001,fr11
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7fff,0x8001,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x7fff,0x7fff,fr11
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x7fff,0x7fff,fr11
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x7fff,0x7fff,fr11
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	mabshs.p	fr10,fr12
-	mabshs		fr11,fr13
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/maddaccs.cgs b/sim/testsuite/sim/frv/fr550/maddaccs.cgs
deleted file mode 100644
index 262a148470d..00000000000
--- a/sim/testsuite/sim/frv/fr550/maddaccs.cgs
+++ /dev/null
@@ -1,128 +0,0 @@
-# frv testcase for maddaccs $ACC40Si,$ACC40Sk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global maddaccs
-maddaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0xdead0000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x0000beef,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdead,0xbeef,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xbeef,0xdead,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x11111111,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x2345,0x6789,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	1,accg3
-	test_acc_limmed	0x1234,0x5677,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5677,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffe7ffe,acc0
-	set_accg_immed	0x0,accg1
-	set_acc_immed	0x00020001,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x80,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xfffffffe,acc1
-	maddaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg4
-	set_acc_immed	0x00000001,acc4
-	set_accg_immed	0x7f,accg5
-	set_acc_immed	0xffffffff,acc5
-	maddaccs.p	acc0,acc1
-	maddaccs	acc4,acc5
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed	0x7f,accg5
-	test_acc_limmed	0xffff,0xffff,acc5
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/maddhss.cgs b/sim/testsuite/sim/frv/fr550/maddhss.cgs
deleted file mode 100644
index 8c5c7143659..00000000000
--- a/sim/testsuite/sim/frv/fr550/maddhss.cgs
+++ /dev/null
@@ -1,97 +0,0 @@
-# frv testcase for maddhss $FRi,$FRj,$FRj
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global maddhss
-maddhss:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x1233,0x5677,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maddhss		fr10,fr11,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	maddhss.p	fr10,fr10,fr12
-	maddhss		fr11,fr11,fr13
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/maddhus.cgs b/sim/testsuite/sim/frv/fr550/maddhus.cgs
deleted file mode 100644
index 93d06bd5251..00000000000
--- a/sim/testsuite/sim/frv/fr550/maddhus.cgs
+++ /dev/null
@@ -1,86 +0,0 @@
-# frv testcase for maddhus $FRi,$FRj,$FRj
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global maddhus
-maddhus:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0x8000,0x7fff,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	maddhus.p	fr10,fr10,fr12
-	maddhus		fr11,fr11,fr13
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0xffff,0xffff,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/masaccs.cgs b/sim/testsuite/sim/frv/fr550/masaccs.cgs
deleted file mode 100644
index 9595d161e5c..00000000000
--- a/sim/testsuite/sim/frv/fr550/masaccs.cgs
+++ /dev/null
@@ -1,148 +0,0 @@
-# frv testcase for masaccs $ACC40Si,$ACC40Sk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global masaccs
-masaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msro.mtt always set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0xdead0000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x0000beef,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msro.mtt always set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0xdead,0xbeef,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdeac,0x4111,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msro.mtt always set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0xbeef,0xdead,acc2
-	test_accg_immed	0xff,accg3
-	test_acc_limmed	0x4111,0xdead,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x11111111,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msro.mtt always set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x2345,0x6789,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0123,0x4567,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msro.mtt always set
-	test_accg_immed	1,accg2
-	test_acc_limmed	0x1234,0x5677,acc2
-	test_accg_immed	0xff,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msro.mtt always set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x1234,0x5677,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffe7ffe,acc0
-	set_accg_immed	0x0,accg1
-	set_acc_immed	0x00020001,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xfffc,0x7ffd,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x80,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xfffffffe,acc1
-	masaccs		acc0,acc2
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x80,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0003,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg4
-	set_acc_immed	0x00000001,acc4
-	set_accg_immed	0x7f,accg5
-	set_acc_immed	0xffffffff,acc5
-	masaccs.p	acc0,acc0
-	masaccs		acc4,acc4
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0000,acc1
-	test_accg_immed	0x7f,accg4
-	test_acc_limmed	0xffff,0xffff,acc4
-	test_accg_immed	0x80,accg5
-	test_acc_limmed	0x0000,0x0002,acc5
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mdaddaccs.cgs b/sim/testsuite/sim/frv/fr550/mdaddaccs.cgs
deleted file mode 100644
index 92d23d0b23a..00000000000
--- a/sim/testsuite/sim/frv/fr550/mdaddaccs.cgs
+++ /dev/null
@@ -1,102 +0,0 @@
-# frv testcase for mdaddaccs $ACC40Si,$ACC40Sk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mdaddaccs
-mdaddaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0xdead0000,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x0000beef,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdead,0xbeef,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x11111111,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0xbeef,0xdead,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x2345,0x6789,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	1,accg2
-	test_acc_limmed	0x1234,0x5677,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5677,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffe7ffe,acc0
-	set_accg_immed	0x0,accg1
-	set_acc_immed	0x00020001,acc1
-	set_accg_immed	0x80,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xfffffffe,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0002,acc2
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mdasaccs.cgs b/sim/testsuite/sim/frv/fr550/mdasaccs.cgs
deleted file mode 100644
index 88216212fbf..00000000000
--- a/sim/testsuite/sim/frv/fr550/mdasaccs.cgs
+++ /dev/null
@@ -1,122 +0,0 @@
-# frv testcase for mdasaccs $ACC40Si,$ACC40Sk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mdasaccs
-mdasaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0xdead0000,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x0000beef,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg0
-	test_acc_limmed	0x0000,0x0000,acc0
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0000,acc1
-	test_accg_immed	0,accg2
-	test_acc_limmed	0xdead,0xbeef,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdeac,0x4111,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x11111111,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg0
-	test_acc_limmed	0xbeef,0xdead,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_limmed	0x4111,0xdead,acc1
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x2345,0x6789,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0123,0x4567,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	1,accg0
-	test_acc_limmed	0x1234,0x5677,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_limmed	0x1234,0x5679,acc1
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x1234,0x5677,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffe7ffe,acc0
-	set_accg_immed	0x0,accg1
-	set_acc_immed	0x00020001,acc1
-	set_accg_immed	0x80,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xfffffffe,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0xa,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed	0x7f,accg1
-	test_acc_limmed	0xfffc,0x7ffd,acc1
-	test_accg_immed	0x80,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0003,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0000,acc1
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0002,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mdsubaccs.cgs b/sim/testsuite/sim/frv/fr550/mdsubaccs.cgs
deleted file mode 100644
index 1fe7498c4ff..00000000000
--- a/sim/testsuite/sim/frv/fr550/mdsubaccs.cgs
+++ /dev/null
@@ -1,102 +0,0 @@
-# frv testcase for mdsubaccs $ACC40Si,$ACC40Sk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mdsubaccs
-mdsubaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0xdead0000,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x0000beef,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdeac,0x4111,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x11111111,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0xff,accg2
-	test_acc_limmed	0x4111,0xdead,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0123,0x4567,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0xff,accg2
-	test_acc_limmed	0x1234,0x5679,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffffffe,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xfffffffe,acc1
-	set_accg_immed	0x80,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x00000002,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x80,accg3
-	set_acc_immed	0x00000000,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mmachs.cgs b/sim/testsuite/sim/frv/fr550/mmachs.cgs
deleted file mode 100644
index 90140765844..00000000000
--- a/sim/testsuite/sim/frv/fr550/mmachs.cgs
+++ /dev/null
@@ -1,259 +0,0 @@
-# frv testcase for mmachs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mmachs
-mmachs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x8006,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0007,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0001,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0xbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0xbffd,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffd,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc003,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc005,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc005,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3ffec006,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x7ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x7ffec006,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	mmachs      	fr7,fr8,acc0
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fr550/mmachu.cgs b/sim/testsuite/sim/frv/fr550/mmachu.cgs
deleted file mode 100644
index cd5c03c32ec..00000000000
--- a/sim/testsuite/sim/frv/fr550/mmachu.cgs
+++ /dev/null
@@ -1,146 +0,0 @@
-# frv testcase for mmachu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mmachu
-mmachu:
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00020006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00020006,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40010007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40010007,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8001,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x8001,0x0007,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x7fff,0x0008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x7fff,0x0008,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mmrdhs.cgs b/sim/testsuite/sim/frv/fr550/mmrdhs.cgs
deleted file mode 100644
index 1aeb1b5793c..00000000000
--- a/sim/testsuite/sim/frv/fr550/mmrdhs.cgs
+++ /dev/null
@@ -1,263 +0,0 @@
-# frv testcase for mmrdhs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mmrdhs
-mmrdhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-8,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-8,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x7ffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x7ffa,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xfffe,0xfffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xfffe,0xfffa,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed 0xbfff,0xfff9,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed 0xbfff,0xfff9,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed 0xbfff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed 0xbfff,0xffff,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed 0xc000,0x0001,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed 0xc000,0x0001,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed 0xc000,0x0001,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed 0xc000,0x0001,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xc000,0x4003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xc000,0x4003,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xc000,0xc003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xc000,0xc003,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x4003,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x4003,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x3ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x3ffd,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x3ffb,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x3ffb,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	0xc0013ffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	0xc0013ffa,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	0x80013ffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	0x80013ffa,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	0xffff,1,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0x8000,0x0000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fr550/mmrdhu.cgs b/sim/testsuite/sim/frv/fr550/mmrdhu.cgs
deleted file mode 100644
index 99378bcc9a1..00000000000
--- a/sim/testsuite/sim/frv/fr550/mmrdhu.cgs
+++ /dev/null
@@ -1,151 +0,0 @@
-# frv testcase for mmrdhu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mmrdhu
-mmrdhu:
-	set_accg_immed	0x80,accg0
-	set_acc_immed	0,acc0
-	set_accg_immed	0x80,accg1
-	set_acc_immed	0,acc1
-
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0
-	test_acc_immed 	0xfffffffa,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed 	0xfffffffa,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0
-	test_acc_immed 	0xfffffff8,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed 	0xfffffff8,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0
-	test_acc_immed 	0xfffffff8,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed 	0xfffffff8,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0x7ffa,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0x7ffa,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xfffe,0xfffa,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xfffe,0xfffa,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xfffd,0xfffa,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xfffd,0xfffa,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xbffe,0xfff9,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xbffe,0xfff9,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0x7ffe,0xfff9,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0x7ffe,0xfff9,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0x7e,accg0
-	test_acc_limmed	0x8000,0xfff8,acc0
-	test_accg_immed 	0x7e,accg1
-	test_acc_limmed	0x8000,0xfff8,acc1
-
-	set_accg_immed 	0,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0xffff,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed	0,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mqaddhss.cgs b/sim/testsuite/sim/frv/fr550/mqaddhss.cgs
deleted file mode 100644
index b0c7853ee46..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqaddhss.cgs
+++ /dev/null
@@ -1,76 +0,0 @@
-# frv testcase for mqaddhss $FRi,$FRj,$FRj
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqaddhss
-mqaddhss:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0x1233,0x5677,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0xffff,0xfffe,fr12
-	set_fr_iimmed	0xfffe,0xfffe,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x7,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x7fff,0x0000,fr12
-	set_fr_iimmed	0x0000,0x8000,fr13
-	mqaddhss.p	fr10,fr10,fr14
-	mqaddhss	fr12,fr12,fr16
-	test_fr_limmed	0x0002,0x0002,fr14
-	test_fr_limmed	0xfffe,0xfffe,fr15
-	test_fr_limmed	0x7fff,0x0000,fr16
-	test_fr_limmed	0x0000,0x8000,fr17
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mqaddhus.cgs b/sim/testsuite/sim/frv/fr550/mqaddhus.cgs
deleted file mode 100644
index 7f8b7550a95..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqaddhus.cgs
+++ /dev/null
@@ -1,62 +0,0 @@
-# frv testcase for mqaddhus $FRi,$FRj,$FRj
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqaddhus
-mqaddhus:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	mqaddhus	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	mqaddhus	fr10,fr12,fr14
-	test_fr_limmed	0xbeef,0xdead,fr14
-	test_fr_limmed	0x2345,0x6789,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	set_fr_iimmed	0x0002,0x0001,fr12
-	set_fr_iimmed	0x0001,0x0002,fr13
-	mqaddhus	fr10,fr12,fr14
-	test_fr_limmed	0x8000,0x7fff,fr14
-	test_fr_limmed	0xffff,0xffff,fr15
-	test_spr_bits	0x3c,2,1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0xfffe,0xfffe,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	mqaddhus.p	fr10,fr10,fr14
-	mqaddhus	fr12,fr12,fr16
-	test_fr_limmed	0x0004,0x0002,fr14
-	test_fr_limmed	0x0002,0x0002,fr15
-	test_fr_limmed	0xffff,0xffff,fr16
-	test_fr_limmed	0xffff,0xffff,fr17
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mqmachs.cgs b/sim/testsuite/sim/frv/fr550/mqmachs.cgs
deleted file mode 100644
index 2f18620b025..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqmachs.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# frv testcase for mqmachs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqmachs
-mqmachs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8008,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7fff,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7fff,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7ffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7ffd,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x3fff,0x3ffb,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x3fff,0x3ffb,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffb,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffb,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0008,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffd,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffd,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0009,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0009,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fffbffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fffbffd,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fr550/mqmachu.cgs b/sim/testsuite/sim/frv/fr550/mqmachu.cgs
deleted file mode 100644
index 71cba98b8c1..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqmachu.cgs
+++ /dev/null
@@ -1,144 +0,0 @@
-# frv testcase for mqmachu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqmachu
-mqmachu:
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8000,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00018000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00018000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff8007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff8007,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4001,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4001,0x8000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x3ffd,0x8008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x3ffd,0x8008,acc1
-	test_accg_immed 	1,accg2
-	test_acc_limmed	0x3fff,0x8001,acc2
-	test_accg_immed 	1,accg3
-	test_acc_limmed	0x3fff,0x8001,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mqmacxhs.cgs b/sim/testsuite/sim/frv/fr550/mqmacxhs.cgs
deleted file mode 100644
index aded33ee006..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqmacxhs.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# frv testcase for mqmacxhs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqmacxhs
-mqmacxhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	0,2,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	2,1,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	0x3fff,2,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,2,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8008,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7fff,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7fff,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	2,0xfffd,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7ffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7ffd,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0xfffe,0,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0x2001,0xfffe,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x3fff,0x3ffb,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x3fff,0x3ffb,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,0xfffe,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffb,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffb,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffe,0xfffd,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0008,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffd,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffd,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0009,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0009,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fffbffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fffbffd,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	0xffff,1,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fr550/mqsubhss.cgs b/sim/testsuite/sim/frv/fr550/mqsubhss.cgs
deleted file mode 100644
index a8936e98ba4..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqsubhss.cgs
+++ /dev/null
@@ -1,76 +0,0 @@
-# frv testcase for mqsubhss $FRi,$FRj,$FRj
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubhss
-msubhss:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0x0000,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0xbeef,fr13
-	mqsubhss	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0x4111,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	set_fr_iimmed	0xbeef,0x0000,fr12
-	set_fr_iimmed	0x1111,0x1111,fr13
-	mqsubhss	fr10,fr12,fr14
-	test_fr_limmed	0x4111,0xdead,fr14
-	test_fr_limmed	0x0123,0x4567,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0xfffe,0xffff,fr13
-	mqsubhss	fr10,fr12,fr14
-	test_fr_limmed	0x1235,0x5679,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8001,0x8001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqsubhss	fr10,fr12,fr14
-	test_fr_limmed	0x8000,0x8000,fr14
-	test_fr_limmed	0x8000,0x8000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	set_fr_iimmed	0x8000,0x8000,fr12
-	set_fr_iimmed	0x8000,0x8000,fr13
-	mqsubhss.p	fr10,fr10,fr14
-	mqsubhss	fr12,fr10,fr16
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x8000,0x8000,fr16
-	test_fr_limmed	0x8001,0x8001,fr17
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mqsubhus.cgs b/sim/testsuite/sim/frv/fr550/mqsubhus.cgs
deleted file mode 100644
index fc92eb5a7fa..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqsubhus.cgs
+++ /dev/null
@@ -1,63 +0,0 @@
-# frv testcase for msubhus $FRi,$FRj,$FRj
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubhus
-msubhus:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr13
-	mqsubhus	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0xdead,0xbeef,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0x1111,0x1111,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqsubhus	fr10,fr12,fr14
-	test_fr_limmed	0x0123,0x4567,fr14
-	test_fr_limmed	0x7ffc,0x7ffd,fr15
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0001,fr11
-	set_fr_iimmed	0x0001,0x0002,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqsubhus	fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	set_fr_iimmed	0x0000,0x0001,fr12
-	set_fr_iimmed	0x0002,0x0003,fr13
-	mqsubhus.p	fr10,fr10,fr14
-	mqsubhus	fr10,fr12,fr16
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-	test_fr_limmed	0x0001,0x0000,fr16
-	test_fr_limmed	0x0000,0x0000,fr17
-	test_spr_bits	0x3c,2,0x1,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mqxmachs.cgs b/sim/testsuite/sim/frv/fr550/mqxmachs.cgs
deleted file mode 100644
index 3c08e416b74..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqxmachs.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# frv testcase for mqxmachs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqxmachs
-mqxmachs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	6,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	6,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_immed 	8,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	8,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ffe,acc1
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8008,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8008,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x7fff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x7fff,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x0000,0x8002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x0000,0x8002,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x7ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x7ffd,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x0000,0x8002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x0000,0x8002,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffb,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffb,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x0002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x0002,acc3
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffb,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffb,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x0008,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x0008,acc3
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fff0009,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fff0009,acc3
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fffbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fffbffd,acc1
-
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fr550/mqxmacxhs.cgs b/sim/testsuite/sim/frv/fr550/mqxmacxhs.cgs
deleted file mode 100644
index 32b043b67e5..00000000000
--- a/sim/testsuite/sim/frv/fr550/mqxmacxhs.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# frv testcase for mqxmacxhs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mqxmacxhs
-mqxmacxhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	0,2,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	6,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	6,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	2,1,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	0x3fff,2,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_immed 	8,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	8,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ffe,acc1
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,2,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8008,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8008,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x7fff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x7fff,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	2,0xfffd,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x0000,0x8002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x0000,0x8002,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x7ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x7ffd,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0xfffe,0,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0x2001,0xfffe,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x0000,0x8002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x0000,0x8002,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffb,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffb,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,0xfffe,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x0002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x0002,acc3
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffb,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffb,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffe,0xfffd,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x0008,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x0008,acc3
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fff0009,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fff0009,acc3
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fffbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fffbffd,acc1
-
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	0xffff,1,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fr550/msubaccs.cgs b/sim/testsuite/sim/frv/fr550/msubaccs.cgs
deleted file mode 100644
index eeaf4a6080f..00000000000
--- a/sim/testsuite/sim/frv/fr550/msubaccs.cgs
+++ /dev/null
@@ -1,128 +0,0 @@
-# frv testcase for msubaccs $ACC40Si,$ACC40Sk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubaccs
-msubaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0xdead0000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x0000beef,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdeac,0x4111,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0xff,accg3
-	test_acc_limmed	0x4111,0xdead,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x11111111,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0123,0x4567,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0xff,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffffffe,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xfffffffe,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x80,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000002,acc1
-	msubaccs	acc0,acc3
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg4
-	set_acc_immed	0x00000001,acc4
-	set_accg_immed	0x80,accg5
-	set_acc_immed	0x00000000,acc5
-	msubaccs.p	acc0,acc1
-	msubaccs	acc4,acc5
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0000,acc1
-	test_accg_immed	0x7f,accg5
-	test_acc_limmed	0xffff,0xffff,acc5
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/msubhss.cgs b/sim/testsuite/sim/frv/fr550/msubhss.cgs
deleted file mode 100644
index 6beb6764462..00000000000
--- a/sim/testsuite/sim/frv/fr550/msubhss.cgs
+++ /dev/null
@@ -1,97 +0,0 @@
-# frv testcase for msubhss $FRi,$FRj,$FRj
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubhss
-msubhss:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0xdead,0x4111,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x4111,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x1235,0x5679,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	msubhss.p	fr10,fr10,fr12
-	msubhss		fr11,fr10,fr13
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x8000,0x8000,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/msubhus.cgs b/sim/testsuite/sim/frv/fr550/msubhus.cgs
deleted file mode 100644
index 5a3cd26f773..00000000000
--- a/sim/testsuite/sim/frv/fr550/msubhus.cgs
+++ /dev/null
@@ -1,77 +0,0 @@
-# frv testcase for msubhus $FRi,$FRj,$FRj
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global msubhus
-msubhus:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x7ffc,0x7ffd,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt always set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	msubhus.p	fr10,fr10,fr12
-	msubhus		fr10,fr11,fr13
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x0000,0x0000,fr13
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/fr550/mtrap.cgs b/sim/testsuite/sim/frv/fr550/mtrap.cgs
deleted file mode 100644
index 83dca7b875a..00000000000
--- a/sim/testsuite/sim/frv/fr550/mtrap.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for mp_exception
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global mp_exception
-mpx:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	0x0e0,gr7		; address of exception handler
-	set_bctrlr_0_0  gr7
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_psr_et	1
-	set_gr_immed	0,gr5
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0x1233,0x5677,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	mtrap				; generate interrupt
-	test_gr_immed	1,gr5
-
-	and_spr_immed	0xffffc000,msr0	; Clear msr0 fields
-	mcmpsh		fr10,fr11,fcc0	; no exception
-	test_spr_bits	0x7000,12,1,msr0; msr0.mtt is always set
-	mtrap				; nop
-	test_gr_immed	1,gr5
-
-	pass
-
-; exception handler
-ok1:
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	inc_gr_immed	1,gr5
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/fr550/udiv.cgs b/sim/testsuite/sim/frv/fr550/udiv.cgs
deleted file mode 100644
index 05cbde425ab..00000000000
--- a/sim/testsuite/sim/frv/fr550/udiv.cgs
+++ /dev/null
@@ -1,48 +0,0 @@
-# frv testcase for udiv $GRi,$GRj,$GRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global udiv
-udiv:
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	udiv      	gr3,gr2,gr3
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x00000004,gr3
-
-	; example 1 from udiv in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	udiv      	gr3,gr2,gr3
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_immed  	0x000000e0,gr3
-
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide by zero
-	set_spr_addr	ok1,lr
-	set_gr_addr	e1,gr17
-e1:	udiv      	gr1,gr0,gr2	; divide by zero
-	test_gr_immed	1,gr15
-
-	pass
-
-ok1:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x3,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/fr550/udivi.cgs b/sim/testsuite/sim/frv/fr550/udivi.cgs
deleted file mode 100644
index d5ee1c4c145..00000000000
--- a/sim/testsuite/sim/frv/fr550/udivi.cgs
+++ /dev/null
@@ -1,49 +0,0 @@
-# frv testcase for udivi $GRi,$s12,$GRk
-# mach: all
-
-	.include "../testutils.inc"
-
-	start
-
-	.global udivi
-udivi:
-	; simple division 12 / 3
-	set_gr_immed   	0x0000000c,gr3
-	udivi      	gr3,3,gr3
-	test_gr_immed  	0x00000004,gr3
-
-	; random example
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	udivi      	gr3,0x7ff,gr3
-	test_gr_limmed 	0x001f,0xdf93,gr3
-
-	; random example
-	set_gr_limmed  	0xffff,0xffff,gr3
-	udivi      	gr3,-2048,gr3
-	test_gr_immed 	1,gr3
-
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide by zero
-	set_spr_addr	ok1,lr
-	set_gr_addr	e1,gr17
-e1:	udivi      	gr1,0,gr2	; divide by zero
-	test_gr_immed	1,gr15
-
-	pass
-
-ok1:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x3,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/fsqrtd.cgs b/sim/testsuite/sim/frv/fsqrtd.cgs
deleted file mode 100644
index a428b013b6e..00000000000
--- a/sim/testsuite/sim/frv/fsqrtd.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# frv testcase for fsqrtd $FRj,$FRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fsqrtd
-fsqrtd:
-	fsqrtd		fr44,fr2		; 9.0
-	test_dfr_dfr	fr2,fr36		; 3.0
-
-	set_fr_iimmed	0x4009,0x21fb,fr10	; 3.141592654
-	set_fr_iimmed	0x6000,0x0000,fr11
-	fsqrtd		fr10,fr10
-	test_fr_iimmed	0x3ffc5bf8,fr10		; 1.7724539
-	test_fr_iimmed	0x9853a94d,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/fsqrts.cgs b/sim/testsuite/sim/frv/fsqrts.cgs
deleted file mode 100644
index e771c40b070..00000000000
--- a/sim/testsuite/sim/frv/fsqrts.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# frv testcase for fsqrts $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fsqrts
-fsqrts:
-	fsqrts		fr44,fr1		; 9.0
-	test_fr_fr	fr1,fr36		; 3.0
-
-	set_fr_iimmed	0x4049,0x0fdb,fr10	; 3.141592654
-	fsqrts		fr10,fr10
-	test_fr_iimmed	0x3fe2dfc5,fr10		; 1.7724539
-
-	pass
diff --git a/sim/testsuite/sim/frv/fstoi.cgs b/sim/testsuite/sim/frv/fstoi.cgs
deleted file mode 100644
index 0a90a2aec2e..00000000000
--- a/sim/testsuite/sim/frv/fstoi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for fstoi $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fstoi
-fstoi:
-	fstoi		fr16,fr1
-	test_fr_iimmed	0,fr1
-	fstoi		fr20,fr1
-	test_fr_iimmed	0,fr1
-
-	fstoi		fr32,fr1
-	test_fr_iimmed	0x00000002,fr1
-
-	set_fr_iimmed	0xce05,0x4904,fr1
-	fstoi		fr1,fr1
-	test_fr_iimmed	0xdeadbf00,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/fsubd.cgs b/sim/testsuite/sim/frv/fsubd.cgs
deleted file mode 100644
index fed2d04aaf7..00000000000
--- a/sim/testsuite/sim/frv/fsubd.cgs
+++ /dev/null
@@ -1,83 +0,0 @@
-# frv testcase for fsubd $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	double_constants
-	start
-	load_double_constants
-
-	.global fsubd
-fsubd:
-	fsubd      	fr0,fr16,fr2
-	test_dfr_dfr	fr2,fr0
-	fsubd      	fr4,fr16,fr2
-	test_dfr_dfr	fr2,fr4
-	fsubd      	fr8,fr16,fr2
-	test_dfr_dfr	fr2,fr8
-	fsubd      	fr12,fr16,fr2
-	test_dfr_dfr	fr2,fr12
-	fsubd      	fr16,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fsubd      	fr20,fr16,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fsubd      	fr24,fr16,fr2
-	test_dfr_dfr	fr2,fr24
-	fsubd      	fr28,fr16,fr2
-	test_dfr_dfr	fr2,fr28
-	fsubd      	fr32,fr16,fr2
-	test_dfr_dfr	fr2,fr32
-	fsubd      	fr36,fr16,fr2
-	test_dfr_dfr	fr2,fr36
-	fsubd      	fr40,fr16,fr2
-	test_dfr_dfr	fr2,fr40
-	fsubd      	fr44,fr16,fr2
-	test_dfr_dfr	fr2,fr44
-	fsubd      	fr48,fr16,fr2
-	test_dfr_dfr	fr2,fr48
-	fsubd      	fr52,fr16,fr2
-	test_dfr_dfr	fr2,fr52
-
-	fsubd      	fr0,fr20,fr2
-	test_dfr_dfr	fr2,fr0
-	fsubd      	fr4,fr20,fr2
-	test_dfr_dfr	fr2,fr4
-	fsubd      	fr8,fr20,fr2
-	test_dfr_dfr	fr2,fr8
-	fsubd      	fr12,fr20,fr2
-	test_dfr_dfr	fr2,fr12
-	fsubd      	fr16,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fsubd      	fr20,fr20,fr2
-	test_dfr_dfr	fr2,fr16
-	test_dfr_dfr	fr2,fr20
-	fsubd      	fr24,fr20,fr2
-	test_dfr_dfr	fr2,fr24
-	fsubd      	fr28,fr20,fr2
-	test_dfr_dfr	fr2,fr28
-	fsubd      	fr32,fr20,fr2
-	test_dfr_dfr	fr2,fr32
-	fsubd      	fr36,fr20,fr2
-	test_dfr_dfr	fr2,fr36
-	fsubd      	fr40,fr20,fr2
-	test_dfr_dfr	fr2,fr40
-	fsubd      	fr44,fr20,fr2
-	test_dfr_dfr	fr2,fr44
-	fsubd      	fr48,fr20,fr2
-	test_dfr_dfr	fr2,fr48
-	fsubd      	fr52,fr20,fr2
-	test_dfr_dfr	fr2,fr52
-
-	fsubd      	fr32,fr36,fr2
-	test_dfr_dfr	fr2,fr8
-
-	fsubd      	fr44,fr40,fr2
-	test_dfr_dfr	fr2,fr36
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fsubs.cgs b/sim/testsuite/sim/frv/fsubs.cgs
deleted file mode 100644
index c1143ade113..00000000000
--- a/sim/testsuite/sim/frv/fsubs.cgs
+++ /dev/null
@@ -1,82 +0,0 @@
-# frv testcase for fsubs $GRi,$GRj,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global fsubs
-fsubs:
-	fsubs      	fr0,fr16,fr1
-	test_fr_fr	fr1,fr0
-	fsubs      	fr4,fr16,fr1
-	test_fr_fr	fr1,fr4
-	fsubs      	fr8,fr16,fr1
-	test_fr_fr	fr1,fr8
-	fsubs      	fr12,fr16,fr1
-	test_fr_fr	fr1,fr12
-	fsubs      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fsubs      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fsubs      	fr24,fr16,fr1
-	test_fr_fr	fr1,fr24
-	fsubs      	fr28,fr16,fr1
-	test_fr_fr	fr1,fr28
-	fsubs      	fr32,fr16,fr1
-	test_fr_fr	fr1,fr32
-	fsubs      	fr36,fr16,fr1
-	test_fr_fr	fr1,fr36
-	fsubs      	fr40,fr16,fr1
-	test_fr_fr	fr1,fr40
-	fsubs      	fr44,fr16,fr1
-	test_fr_fr	fr1,fr44
-	fsubs      	fr48,fr16,fr1
-	test_fr_fr	fr1,fr48
-	fsubs      	fr52,fr16,fr1
-	test_fr_fr	fr1,fr52
-
-	fsubs      	fr0,fr20,fr1
-	test_fr_fr	fr1,fr0
-	fsubs      	fr4,fr20,fr1
-	test_fr_fr	fr1,fr4
-	fsubs      	fr8,fr20,fr1
-	test_fr_fr	fr1,fr8
-	fsubs      	fr12,fr20,fr1
-	test_fr_fr	fr1,fr12
-	fsubs      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fsubs      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	fsubs      	fr24,fr20,fr1
-	test_fr_fr	fr1,fr24
-	fsubs      	fr28,fr20,fr1
-	test_fr_fr	fr1,fr28
-	fsubs      	fr32,fr20,fr1
-	test_fr_fr	fr1,fr32
-	fsubs      	fr36,fr20,fr1
-	test_fr_fr	fr1,fr36
-	fsubs      	fr40,fr20,fr1
-	test_fr_fr	fr1,fr40
-	fsubs      	fr44,fr20,fr1
-	test_fr_fr	fr1,fr44
-	fsubs      	fr48,fr20,fr1
-	test_fr_fr	fr1,fr48
-	fsubs      	fr52,fr20,fr1
-	test_fr_fr	fr1,fr52
-
-	fsubs      	fr32,fr36,fr1
-	test_fr_fr	fr1,fr8
-
-	fsubs      	fr44,fr40,fr1
-	test_fr_fr	fr1,fr36
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/fteq.cgs b/sim/testsuite/sim/frv/fteq.cgs
deleted file mode 100644
index 020a88712ee..00000000000
--- a/sim/testsuite/sim/frv/fteq.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for fteq $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fteq
-fteq:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x6 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x7 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	fteq 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftge.cgs b/sim/testsuite/sim/frv/ftge.cgs
deleted file mode 100644
index eab7a061701..00000000000
--- a/sim/testsuite/sim/frv/ftge.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# frv testcase for ftge $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftge
-ftge:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftgt.cgs b/sim/testsuite/sim/frv/ftgt.cgs
deleted file mode 100644
index 9035fbc8773..00000000000
--- a/sim/testsuite/sim/frv/ftgt.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for ftgt $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftgt
-ftgt:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0xd 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftgt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftieq.cgs b/sim/testsuite/sim/frv/ftieq.cgs
deleted file mode 100644
index a5710ad10dc..00000000000
--- a/sim/testsuite/sim/frv/ftieq.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for ftieq $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftieq
-ftieq:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x6 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x7 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftieq 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftige.cgs b/sim/testsuite/sim/frv/ftige.cgs
deleted file mode 100644
index 5b58ce0c390..00000000000
--- a/sim/testsuite/sim/frv/ftige.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for ftige $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftige
-ftige:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftige 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftigt.cgs b/sim/testsuite/sim/frv/ftigt.cgs
deleted file mode 100644
index e31ead4cfe3..00000000000
--- a/sim/testsuite/sim/frv/ftigt.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for ftigt $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftigt
-ftigt:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x5 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0xd 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftigt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftile.cgs b/sim/testsuite/sim/frv/ftile.cgs
deleted file mode 100644
index d13eeee67de..00000000000
--- a/sim/testsuite/sim/frv/ftile.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for ftile $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftile
-ftile:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftile 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftilg.cgs b/sim/testsuite/sim/frv/ftilg.cgs
deleted file mode 100644
index 26127d25aa7..00000000000
--- a/sim/testsuite/sim/frv/ftilg.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for ftilg $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftilg
-ftilg:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftilg 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftilt.cgs b/sim/testsuite/sim/frv/ftilt.cgs
deleted file mode 100644
index 7a74d5b6c20..00000000000
--- a/sim/testsuite/sim/frv/ftilt.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for ftilt $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftilt
-ftilt:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0xa 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0xb 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftilt 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftine.cgs b/sim/testsuite/sim/frv/ftine.cgs
deleted file mode 100644
index 89aa5a6302d..00000000000
--- a/sim/testsuite/sim/frv/ftine.cgs
+++ /dev/null
@@ -1,112 +0,0 @@
-# frv testcase for ftine $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftine
-ftine:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftine 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftino.cgs b/sim/testsuite/sim/frv/ftino.cgs
deleted file mode 100644
index b08a571a356..00000000000
--- a/sim/testsuite/sim/frv/ftino.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase for ftino
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftinev
-ftinev:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_mem_limmed	0x0038,0x2000,gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_gr_immed	0,gr7
-
-	set_fcc		0x0 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x1 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x2 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x3 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x4 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x5 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x6 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x7 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x8 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x9 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xa 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xb 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xc 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xd 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xe 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xf 0
-	ftino 			; should branch to tbr + (128 + 4)*16
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftio.cgs b/sim/testsuite/sim/frv/ftio.cgs
deleted file mode 100644
index 083c17064f5..00000000000
--- a/sim/testsuite/sim/frv/ftio.cgs
+++ /dev/null
@@ -1,112 +0,0 @@
-# frv testcase for ftio $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftio
-ftio:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftio 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftira.cgs b/sim/testsuite/sim/frv/ftira.cgs
deleted file mode 100644
index 9382b2b84ae..00000000000
--- a/sim/testsuite/sim/frv/ftira.cgs
+++ /dev/null
@@ -1,114 +0,0 @@
-# frv testcase for ftira $GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftira
-ftira:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_fcc		0x0 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
diff --git a/sim/testsuite/sim/frv/ftiu.cgs b/sim/testsuite/sim/frv/ftiu.cgs
deleted file mode 100644
index adc40bead17..00000000000
--- a/sim/testsuite/sim/frv/ftiu.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for ftiu $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftiu
-ftiu:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_fcc		0x6 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_fcc		0xa 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_fcc		0xe 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftiu 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftiue.cgs b/sim/testsuite/sim/frv/ftiue.cgs
deleted file mode 100644
index 311143430cf..00000000000
--- a/sim/testsuite/sim/frv/ftiue.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for ftiue $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftiue
-ftiue:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_fcc		0x6 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftiue 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftiug.cgs b/sim/testsuite/sim/frv/ftiug.cgs
deleted file mode 100644
index 9e16f89480e..00000000000
--- a/sim/testsuite/sim/frv/ftiug.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for ftiug $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftiug
-ftiug:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftiug 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftiuge.cgs b/sim/testsuite/sim/frv/ftiuge.cgs
deleted file mode 100644
index bda587e7879..00000000000
--- a/sim/testsuite/sim/frv/ftiuge.cgs
+++ /dev/null
@@ -1,112 +0,0 @@
-# frv testcase for ftiuge $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftiuge
-ftiuge:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftiuge 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftiul.cgs b/sim/testsuite/sim/frv/ftiul.cgs
deleted file mode 100644
index ee5e2ba60aa..00000000000
--- a/sim/testsuite/sim/frv/ftiul.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for ftiul $FCCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftiul
-ftiul:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_fcc		0xa 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftiul 		fcc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftle.cgs b/sim/testsuite/sim/frv/ftle.cgs
deleted file mode 100644
index 4ffa760577c..00000000000
--- a/sim/testsuite/sim/frv/ftle.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# frv testcase for ftle $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftle
-ftle:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftle 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftlg.cgs b/sim/testsuite/sim/frv/ftlg.cgs
deleted file mode 100644
index a72f5026d27..00000000000
--- a/sim/testsuite/sim/frv/ftlg.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# frv testcase for ftlg $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftlg
-ftlg:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftlg 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftlt.cgs b/sim/testsuite/sim/frv/ftlt.cgs
deleted file mode 100644
index c9343139d4a..00000000000
--- a/sim/testsuite/sim/frv/ftlt.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for ftlt $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftlt
-ftlt:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x3 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x9 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0xa 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0xb 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftlt 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftne.cgs b/sim/testsuite/sim/frv/ftne.cgs
deleted file mode 100644
index 03b9857eb99..00000000000
--- a/sim/testsuite/sim/frv/ftne.cgs
+++ /dev/null
@@ -1,113 +0,0 @@
-# frv testcase for ftne $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftne
-ftne:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftne 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftno.cgs b/sim/testsuite/sim/frv/ftno.cgs
deleted file mode 100644
index bada522a6a8..00000000000
--- a/sim/testsuite/sim/frv/ftno.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# frv testcase for ftno
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftnev
-ftnev:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_mem_limmed	0x0038,0x2000,gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_fcc		0x0 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x1 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x2 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x3 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x4 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x5 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x6 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x7 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x8 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0x9 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xa 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xb 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xc 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xd 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xe 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	set_fcc		0xf 0
-	ftno 			; should branch to tbr + (128 + 4)*16
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/fto.cgs b/sim/testsuite/sim/frv/fto.cgs
deleted file mode 100644
index 82035f4bec0..00000000000
--- a/sim/testsuite/sim/frv/fto.cgs
+++ /dev/null
@@ -1,113 +0,0 @@
-# frv testcase for fto $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global fto
-fto:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_fcc		0x1 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	fto 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftra.cgs b/sim/testsuite/sim/frv/ftra.cgs
deleted file mode 100644
index 7754f697640..00000000000
--- a/sim/testsuite/sim/frv/ftra.cgs
+++ /dev/null
@@ -1,115 +0,0 @@
-# frv testcase for ftra $GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftra
-ftra:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_fcc		0x0 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
diff --git a/sim/testsuite/sim/frv/ftu.cgs b/sim/testsuite/sim/frv/ftu.cgs
deleted file mode 100644
index 354423baa36..00000000000
--- a/sim/testsuite/sim/frv/ftu.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for ftu $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftu
-ftu:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_fcc		0x6 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_fcc		0xa 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_fcc		0xe 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftu 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftue.cgs b/sim/testsuite/sim/frv/ftue.cgs
deleted file mode 100644
index 564bb30265a..00000000000
--- a/sim/testsuite/sim/frv/ftue.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# frv testcase for ftue $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftue
-ftue:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_fcc		0x6 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftue 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftug.cgs b/sim/testsuite/sim/frv/ftug.cgs
deleted file mode 100644
index cc6a405a596..00000000000
--- a/sim/testsuite/sim/frv/ftug.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# frv testcase for ftug $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftug
-ftug:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_fcc		0xc 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftug 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftuge.cgs b/sim/testsuite/sim/frv/ftuge.cgs
deleted file mode 100644
index 7c04eaf29a4..00000000000
--- a/sim/testsuite/sim/frv/ftuge.cgs
+++ /dev/null
@@ -1,113 +0,0 @@
-# frv testcase for ftuge $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftuge
-ftuge:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_fcc		0x2 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_fcc		0x4 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftuge 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftul.cgs b/sim/testsuite/sim/frv/ftul.cgs
deleted file mode 100644
index b45ebb35bed..00000000000
--- a/sim/testsuite/sim/frv/ftul.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# frv testcase for ftul $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftul
-ftul:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_fcc		0x8 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_fcc		0xa 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftul 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/ftule.cgs b/sim/testsuite/sim/frv/ftule.cgs
deleted file mode 100644
index 4a93260d3d6..00000000000
--- a/sim/testsuite/sim/frv/ftule.cgs
+++ /dev/null
@@ -1,113 +0,0 @@
-# frv testcase for ftule $FCCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ftule
-ftule:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_fcc		0x0 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_fcc		0x1 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_fcc		0x2 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_fcc		0x3 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_fcc		0x4 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_fcc		0x5 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_fcc		0x6 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_fcc		0x7 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_fcc		0x8 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_fcc		0x9 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_fcc		0xa 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_fcc		0xb 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_fcc		0xc 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_fcc		0xd 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_fcc		0xe 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_fcc		0xf 0
-	ftule 		fcc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/icei.cgs b/sim/testsuite/sim/frv/icei.cgs
deleted file mode 100644
index aac925bf29f..00000000000
--- a/sim/testsuite/sim/frv/icei.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# frv testcase for icei @(GRi,GRj),a
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global icei
-icei:
-	; Can't really test this because of SCACHE implementation
-	set_gr_addr	icei,gr10
-	icei		@(gr10,gr0),1
-	icei		@(gr10,gr0),1
-
-	pass
diff --git a/sim/testsuite/sim/frv/ici.cgs b/sim/testsuite/sim/frv/ici.cgs
deleted file mode 100644
index 8aeacae33a9..00000000000
--- a/sim/testsuite/sim/frv/ici.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# FRV testcase for ici @(GRi,GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ici
-ici:
-	set_gr_immed	1234,gr2
-	set_spr_addr	ok1,lr
-	bra		testit
-
-ok1:
-	; Change the first insn to set gr1 to 1235
-	; but don't invalidate the insn cache
-	; should have no effect
-	set_gr_mem	testit,gr10
-	ori		gr10,1,gr10
-	set_mem_gr	gr10,testit
-	set_gr_addr	testit,gr10
-	dcf		@(gr10,gr0)	; flush data cache	
-	set_spr_addr	ok2,lr
-	bra		testit
-
-ok2:	; Now invalidate the insn cache. The new insn should take effect
-	ici		@(gr10,gr0)
-	set_gr_immed	1235,gr2
-	set_spr_addr	ok3,lr
-	bra		testit
-
-ok3:
-	pass
-
-testit:
-	setlos		1234,gr1
-	test_gr_gr	gr1,gr2
-	bralr
-	fail
diff --git a/sim/testsuite/sim/frv/icpl.cgs b/sim/testsuite/sim/frv/icpl.cgs
deleted file mode 100644
index b86ba352796..00000000000
--- a/sim/testsuite/sim/frv/icpl.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# FRV testcase for icpl GRi,GRj,lock
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global icpl
-	; keep this at least 64 bytes away from doit2
-	bra		icpl
-doit1:	add		gr11,gr12,gr11
-	bralr
-
-icpl:
-	or_spr_immed	0x80000000,hsr0	; insn cache: enable
-	and_spr_immed	0xbfffffff,hsr0 ; data cache: disable
-	set_gr_immed	0,gr11
-	set_gr_immed	1,gr12
-	set_gr_immed	2,gr13
-
-	set_gr_addr	doit1,gr10
-	icpl		gr10,gr0,0	; preload insns at doit1
-	set_mem_immed	0x9600b00d,gr10	; change to add gr11,gr13,gr11
-
-	set_gr_addr	doit2,gr10
-	set_mem_immed	0x9600b00d,gr10	; change to add gr11,gr13,gr11
-
-	set_spr_addr	ok1,lr
-	bra		doit1
-ok1:	test_gr_immed	1,gr11		; used preloaded add of 1
-
-	set_spr_addr	ok2,lr
-	bra		doit2
-ok2:	test_gr_immed	3,gr11		; used changed add of 2
-
-	pass
-
-doit2:	add		gr11,gr12,gr11
-	bralr
diff --git a/sim/testsuite/sim/frv/icul.cgs b/sim/testsuite/sim/frv/icul.cgs
deleted file mode 100644
index b112f41f5ea..00000000000
--- a/sim/testsuite/sim/frv/icul.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# FRV testcase for icul $GRi
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global icul
-icul:
-	or_spr_immed	0xc8000000,hsr0	; caches enabled -- copy-back mode
-
-	; preload and lock all the lines in set 0 of the insn cache
-	set_gr_immed	0x70000,gr10
-	set_bctrlr_0_0  gr10
-	lock_insn_cache	gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_bctrlr_0_0  gr10
-	lock_insn_cache	gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_bctrlr_0_0  gr10
-	lock_insn_cache	gr10
-
-	inc_gr_immed	0x1000,gr10
-	set_bctrlr_0_0  gr10
-	lock_insn_cache	gr10
-
-	; execute the pre-loaded insn
-	set_gr_immed	0x70000,gr10
-	calll		@(gr10,gr0)	; should come right back
-	inc_gr_immed	0x1000,gr10
-	calll		@(gr10,gr0)	; should come right back
-	inc_gr_immed	0x1000,gr10
-	calll		@(gr10,gr0)	; should come right back
-	inc_gr_immed	0x1000,gr10
-	calll		@(gr10,gr0)	; should come right back
-
-	; Now execute another insn which would have gone into set 0.
-	inc_gr_immed	0x1000,gr10
-	set_bctrlr_0_0  gr10
-	set_spr_immed	128,lcr
-	calll		@(gr10,gr0)	; should come right back
-
-	; Now unlock one of the lines and do it again
-	set_gr_immed	0x71000,gr10
-	icul		gr10
-	calll		@(gr10,gr0)	; should come right back
-
-	inc_gr_immed	0x3000,gr10
-	calll		@(gr10,gr0)	; should come right back
-
-	pass
diff --git a/sim/testsuite/sim/frv/interrupts.exp b/sim/testsuite/sim/frv/interrupts.exp
deleted file mode 100644
index e31533e1053..00000000000
--- a/sim/testsuite/sim/frv/interrupts.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# FRV simulator testsuite.
-
-if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-    # all machines
-    set all_machs "frv fr500 fr550 fr400"
-    set cpu_option -mcpu
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/interrupts/*.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/frv/interrupts/Ipipe-fr400.cgs b/sim/testsuite/sim/frv/interrupts/Ipipe-fr400.cgs
deleted file mode 100644
index dad9f0e6882..00000000000
--- a/sim/testsuite/sim/frv/interrupts/Ipipe-fr400.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# frv testcase
-# mach: fr400 
-
-	.include "testutils.inc"
-
-	start
-
-	.global Ipipe
-Ipipe:
-	; Clear the packing bit of the insn at 'pack:'. We can't
-	; simply use '.p' because the assembler will catch the error.
-	set_gr_mem	pack,gr10
-	and_gr_immed	0x7fffffff,gr10
-	set_mem_gr	gr10,pack
-	set_gr_addr	pack,gr10
-	flush_data_cache gr10
-
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	0x070,gr7		; address of exception handler
-	set_bctrlr_0_0  gr7
-	set_spr_immed	128,lcr
-	set_spr_addr	ok0,lr
-	set_psr_et	1
-
-bundle:	add.p		gr1,gr1,gr1
-pack:	add		gr2,gr2,gr2
-bad:	add		gr3,gr3,gr3
-	fail
-ok0:
-	test_spr_immed	1,esfr1
-	test_spr_bits	0x3f,0,0xb,esr0
-	test_spr_addr	bundle,epcr0
-
-	pass
diff --git a/sim/testsuite/sim/frv/interrupts/Ipipe-fr500.cgs b/sim/testsuite/sim/frv/interrupts/Ipipe-fr500.cgs
deleted file mode 100644
index b4dd770a56c..00000000000
--- a/sim/testsuite/sim/frv/interrupts/Ipipe-fr500.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# frv testcase
-# mach: fr500
-
-	.include "testutils.inc"
-
-	start
-
-	.global Ipipe
-Ipipe:
-	; Clear the packing bit of the insn at 'pack:'. We can't
-	; simply use '.p' because the assembler will catch the error.
-	set_gr_mem	pack,gr10
-	and_gr_immed	0x7fffffff,gr10
-	set_mem_gr	gr10,pack
-	set_gr_addr	pack,gr10
-	flush_data_cache gr10
-
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	0x070,gr7		; address of exception handler
-	set_bctrlr_0_0  gr7
-	set_spr_immed	128,lcr
-	set_spr_addr	ok0,lr
-	set_psr_et	1
-
-	add.p		gr1,gr1,gr1
-pack:	add		gr2,gr2,gr2
-bad:	add		gr3,gr3,gr3
-	fail
-ok0:
-	test_spr_immed	1,esfr1
-	test_spr_bits	0x3f,0,0xb,esr0
-	test_spr_addr	bad,epcr0
-
-	pass
diff --git a/sim/testsuite/sim/frv/interrupts/badalign-fr550.cgs b/sim/testsuite/sim/frv/interrupts/badalign-fr550.cgs
deleted file mode 100644
index 6c0369b3426..00000000000
--- a/sim/testsuite/sim/frv/interrupts/badalign-fr550.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv testcase to generate interrupt for st $GRk,@($GRi,$GRj)
-# mach: fr550
-	.include "testutils.inc"
-
-	start
-
-	.global align
-align:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x100,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-	set_gr_immed	0xdeadbeef,gr17
-	set_gr_immed	0,gr15
-	inc_gr_immed	2,sp		; out of alignment
-
-	test_spr_bits	1,0,0,isr	; ISR.EMAM always clear (not used)
-	sti		gr17,@(sp,0)	; no exception
-	sti		gr17,@(sp,4)	; no exception
-	ldi		@(sp,0),gr18	; stored at unaligned address
-	test_gr_immed	0xdeadbeef,gr18
-	ldi		@(sp,0),gr19	; no exception
-	test_gr_immed	0xdeadbeef,gr19
-
-	and_spr_immed	0xfffffffe,isr	; turn off ISR.EMAM
-	sti		gr17,@(sp,0)	; misaligned -- no exception
-	test_gr_immed	0,gr15
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	1,gr21
-	set_gr_immed	0x10101010,gr10
-	nop.p
-	ldu		@(sp,gr21),gr10	; misaligned read  no exception
-	test_gr_immed	0,gr15		; handler was not called
-	test_gr_immed	0xadbeefde,gr10	; gr10 updated
-	test_gr_immed	1,gr21		; gr21 not updated
-	inc_gr_immed	1,gr20
-	test_gr_gr	gr20,sp		; sp updated
-
-	pass
diff --git a/sim/testsuite/sim/frv/interrupts/badalign.cgs b/sim/testsuite/sim/frv/interrupts/badalign.cgs
deleted file mode 100644
index b8660219da8..00000000000
--- a/sim/testsuite/sim/frv/interrupts/badalign.cgs
+++ /dev/null
@@ -1,73 +0,0 @@
-# frv testcase to generate interrupt for st $GRk,@($GRi,$GRj)
-# mach: fr500 frv
-	.include "testutils.inc"
-
-	start
-
-	.global align
-align:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x100,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_psr_et	1
-	set_gr_immed	0xdeadbeef,gr17
-	set_gr_immed	0,gr15
-	inc_gr_immed	2,sp		; out of alignment
-
-	test_spr_bits	1,0,1,isr	; mem_address_not_aligned is masked
-	sti		gr17,@(sp,0)	; no exception
-	ldi		@(sp,-2),gr18	; stored at aligned address
-	test_gr_immed	0xdeadbeef,gr18
-	ldi		@(sp,0),gr19	; no exception
-	test_gr_immed	0xdeadbeef,gr19
-
-	and_spr_immed	0xfffffffe,isr	; turn off ISR.EMAM
-	set_gr_addr	bad1,gr16
-bad1:	sti		gr17,@(sp,0)	; misaligned write in slot I1
-	test_gr_immed	1,gr15
-
-	set_gr_addr	bad3,gr16
-	set_gr_gr	sp,gr20
-	set_gr_immed	1,gr21
-	set_gr_immed	0x10101010,gr10
-bad2:	nop.p
-bad3:	ldu		@(sp,gr21),gr10	; misaligned read in slot I2
-	test_gr_immed	2,gr15		; handler was called
-	test_gr_immed	0x10101010,gr10	; gr10 not updated
-	test_gr_immed	1,gr21		; gr21 not updated
-	inc_gr_immed	1,gr20
-	test_gr_gr	gr20,sp		; sp updated
-
-	pass
-
-; exception handler
-ok1:
-	cmpi		gr15,0,icc0
-	bne		icc0,0,load
-	; handle interrupt on store
-	test_spr_immed	0x100,esfr1		; esr8 is active
-	test_spr_gr	epcr8,gr16
-	test_spr_bits	0x0001,0,0x1,esr8	; esr8 is valid
-	test_spr_bits	0x003e,1,0xb,esr8	; esr8.ec is set
-	test_spr_bits	0x0800,11,0x1,esr8	; esr8.eav is set
-	test_spr_gr	ear8,sp
-	test_spr_bits	0x01000,12,0x1,esr8	; esr8.edv is set
-	test_spr_bits	0x1e000,13,0x3,esr8	; esr8.edn is 3
-	test_spr_gr	edr3,gr17		; edr3 is set
-	bra		ret
-load:
-	; handle interrupt on load
-	test_spr_immed	0x200,esfr1		; esr9 is active
-	test_spr_gr	epcr9,gr16
-	test_spr_bits	0x0001,0,0x1,esr9	; esr9 is valid
-	test_spr_bits	0x003e,1,0xb,esr9	; esr9.ec is set
-	test_spr_bits	0x0800,11,0x1,esr9	; esr9.eav is set
-	test_spr_gr	ear9,sp
-	test_spr_bits	0x1000,12,0x0,esr9	; esr9.edv is not set
-ret:
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/compound-fr550.cgs b/sim/testsuite/sim/frv/interrupts/compound-fr550.cgs
deleted file mode 100644
index 7cd2278280f..00000000000
--- a/sim/testsuite/sim/frv/interrupts/compound-fr550.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# frv testcase to generate compound exception
-# mach: fr550
-	.include "testutils.inc"
-
-	start
-
-	.global align
-align:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x200,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	or_spr_immed	0x04000000,fsr0		; enabled div/0 fp_exception
-	set_psr_et	1
-
-	set_gr_immed	0,gr15
-	set_fr_iimmed	0x7f7f,0xffff,fr0
-	set_fr_iimmed	0x0000,0x0000,fr1
-
-	and_spr_immed	0xfffffffe,isr		; enable mem_address_not_aligned
-	set_gr_addr	dividef,gr16
-	set_gr_addr	dividei,gr17
-	set_gr_immed	0xdeadbeef,gr8
-	inc_gr_immed	2,sp			; misalign
-store:	sti.p		gr8,@(sp,0)		; misaligned - no exception
-dividef:fdivs.p		fr0,fr1,fr2		; fp_exception
-dividei:sdiv		gr1,gr0,gr1		; division exception
-	test_gr_immed	1,gr15
-
-	pass
-
-; exception handler
-ok1:
-	; check fp_exception
-	test_spr_immed	0x5,esfr1		; esr2 and esr0 are active
-	test_spr_gr	epcr2,gr16
-	test_spr_bits	0x0001,0,0x1,esr2	; esr2 is valid
-	test_spr_bits	0x003e,1,0xd,esr2	; esr2.ec is set
-	test_spr_bits	0x0800,11,0x0,esr2	; esr2.eav is clear
-
-	; check on fp_exception
-	test_spr_bits	0x100000,20,0x0,fsr0	; fsr0.qne is clear
-	test_spr_bits	0xe0000,17,0x1,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x0,fsr0	; fsr0.aexc is clear
-
-	; check interrupt on dividei
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/compound.cgs b/sim/testsuite/sim/frv/interrupts/compound.cgs
deleted file mode 100644
index 2fd928eeee5..00000000000
--- a/sim/testsuite/sim/frv/interrupts/compound.cgs
+++ /dev/null
@@ -1,66 +0,0 @@
-# frv testcase to generate compound exception
-# mach: fr500 frv
-	.include "testutils.inc"
-
-	start
-
-	.global align
-align:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x200,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	or_spr_immed	0x04000000,fsr0		; enabled div/0 fp_exception
-	set_psr_et	1
-
-	set_gr_immed	0,gr15
-	set_fr_iimmed	0x7f7f,0xffff,fr0
-	set_fr_iimmed	0x0000,0x0000,fr1
-
-	and_spr_immed	0xfffffffe,isr		; enable mem_address_not_aligned
-	set_gr_addr	store,gr16
-	set_gr_addr	dividei,gr17
-	set_gr_immed	0xdeadbeef,gr8
-	inc_gr_immed	2,sp			; misalign
-store:	sti.p		gr8,@(sp,0)		; misaligned write
-dividef:fdivs.p		fr0,fr1,fr2		; fp_exception
-dividei:sdiv		gr1,gr0,gr1		; division exception
-	test_gr_immed	1,gr15
-
-	pass
-
-; exception handler
-ok1:
-	; check interrupt on store
-	test_spr_immed	0x102,esfr1		; esr8 and esr1 are active
-	test_spr_gr	epcr8,gr16
-	test_spr_bits	0x0001,0,0x1,esr8	; esr8 is valid
-	test_spr_bits	0x003e,1,0xb,esr8	; esr8.ec is set
-	test_spr_bits	0x0800,11,0x1,esr8	; esr8.eav is set
-	test_spr_gr	ear8,sp
-	test_spr_bits	0x01000,12,0x1,esr8	; esr8.edv is set
-	test_spr_bits	0x1e000,13,0x3,esr8	; esr8.edn is 3
-	test_spr_gr	edr3,gr8		; edr3 is set
-
-	; check on fp_exception
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is set
-	test_spr_bits	0xe0000,17,0x1,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x0,fsr0	; fsr0.aexc is clear
-
-	test_spr_bits	0x80000000,31,0x0,fqst2	; fq2.miv is set
-	test_spr_bits	0x18000,15,0x0,fqst2	; fq2.sie is set
-	test_spr_bits	0x380,7,0x1,fqst2	; fq2.ftt is set
-	test_spr_bits	0x7e,1,0x4,fqst2	; fq2.cexc is set
-	test_spr_bits	0x1,0,0x1,fqst2		; fq2.valid is set
-	test_spr_immed	0x05e40241,fqop2	; fq2.opc
-
-	; check interrupt on dividei
-	test_spr_gr	epcr1,gr17
-	test_spr_bits	0x0001,0,0x1,esr1	; esr1 is valid
-	test_spr_bits	0x003e,1,0x13,esr1	; esr1.ec is set
-
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/data_store_error-fr550.cgs b/sim/testsuite/sim/frv/interrupts/data_store_error-fr550.cgs
deleted file mode 100644
index 3924adc576f..00000000000
--- a/sim/testsuite/sim/frv/interrupts/data_store_error-fr550.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase to generate interrupt for st $GRk,@($GRi,$GRj)
-# mach: fr550
-# sim(fr550): --memory-region 0xfeff0600,0x8000 --memory-region 0xfe800000,0x7f0010
-	.include "testutils.inc"
-
-	start
-
-	.global dsr
-dsr:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x140,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-
-	set_spr_addr	ok0,lr
-	set_gr_immed	0,gr16
-
-	set_gr_immed	0xdeadbeef,gr15
-	set_gr_addr	0xfeff0600,gr17
-bad1:	sti		gr15,@(gr17,0)		; no interrupt
-	test_gr_immed	0,gr16
-
-	set_gr_immed	0xbeefdead,gr15
-	set_gr_addr	0xfeff7ffc,gr17
-bad2:	sti		gr15,@(gr17,0)		; no interrupt
-	test_gr_immed	0,gr16
-
-	set_gr_immed	0xbeefbeef,gr15
-	set_gr_addr	0xfe800000,gr17
-bad3:	sti		gr15,@(gr17,0)		; cause interrupt
-	test_gr_immed	1,gr16
-
-	set_gr_immed	0xdeaddead,gr15
-	set_gr_addr	0xfefefffc,gr17
-bad4:	sti		gr15,@(gr17,0)		; cause interrupt
-	test_gr_immed	2,gr16
-
-	sti		gr0,@(sp,0)		; no interrupt
-	test_gr_immed	2,gr16
-
-	pass
-ok0:
-	; check interrupts
-	test_spr_immed	0x4000,esfr1		; esr14 is active
-	test_spr_bits	0x0001,0,0x1,esr14	; esr14 is valid
-	test_spr_bits	0x003e,1,0x0,esr14	; esr14.ec is set
-	test_spr_bits	0x0800,11,0x0,esr14	; esr14.eav is not set
-
-	addi		gr16,1,gr16
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/data_store_error.cgs b/sim/testsuite/sim/frv/interrupts/data_store_error.cgs
deleted file mode 100644
index b967d0a0525..00000000000
--- a/sim/testsuite/sim/frv/interrupts/data_store_error.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase to generate interrupt for st $GRk,@($GRi,$GRj)
-# mach: fr500
-# sim(fr500): --memory-region 0xfeff0600,0x8000 --memory-region 0xfe800000,0x7f0010
-	.include "testutils.inc"
-
-	start
-
-	.global dsr
-dsr:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x140,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-
-	set_spr_addr	ok0,lr
-	set_gr_immed	0,gr16
-
-	set_gr_immed	0xdeadbeef,gr15
-	set_gr_addr	0xfeff0600,gr17
-bad1:	sti		gr15,@(gr17,0)		; cause interrupt
-	test_gr_immed	1,gr16
-
-	set_gr_immed	0xbeefdead,gr15
-	set_gr_addr	0xfeff7ffc,gr17
-bad2:	sti		gr15,@(gr17,0)		; cause interrupt
-	test_gr_immed	2,gr16
-
-	set_gr_immed	0xbeefbeef,gr15
-	set_gr_addr	0xfe800000,gr17
-bad3:	sti		gr15,@(gr17,0)		; cause interrupt
-	test_gr_immed	3,gr16
-
-	set_gr_immed	0xdeaddead,gr15
-	set_gr_addr	0xfefefffc,gr17
-bad4:	sti		gr15,@(gr17,0)		; cause interrupt
-	test_gr_immed	4,gr16
-
-	sti		gr0,@(sp,0)		; no interrupt
-	test_gr_immed	4,gr16
-
-	pass
-ok0:
-	; check interrupts
-	test_spr_immed	0x4000,esfr1		; esr14 is active
-	test_spr_bits	0x0001,0,0x1,esr14	; esr14 is valid
-	test_spr_bits	0x003e,1,0x0,esr14	; esr14.ec is set
-	test_spr_bits	0x0800,11,0x0,esr14	; esr14.eav is not set
-
-	addi		gr16,1,gr16
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/fp_exception-fr550.cgs b/sim/testsuite/sim/frv/interrupts/fp_exception-fr550.cgs
deleted file mode 100644
index 5d1c3f58d30..00000000000
--- a/sim/testsuite/sim/frv/interrupts/fp_exception-fr550.cgs
+++ /dev/null
@@ -1,185 +0,0 @@
-# frv testcase to generate fp_exception
-# mach: fr550
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global align
-align:
-	; clear the packing bit if the insn at 'pack:'. We can't simply use
-	; '.p' because the assembler will catch the error.
-	set_gr_mem	pack,gr10
-	and_gr_immed	0x7fffffff,gr10
-	set_mem_gr	gr10,pack
-	set_gr_addr	pack,gr10
-	flush_data_cache gr10
-
-	; Make the the source register number odd at badst. We can't simply
-	; code an odd register number because the assembler will catch the
-	; error.
-	set_gr_mem	badst,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,badst
-	set_gr_addr	badst,gr10
-	flush_data_cache gr10
-
-	; Make the the dest register number odd at badld. We can't simply
-	; code an odd register number because the assembler will catch the
-	; error.
-	set_gr_mem	badld,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,badld
-	set_gr_addr	badld,gr10
-	flush_data_cache gr10
-
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x070,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	inc_gr_immed	0x060,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_psr_et	1
-	inc_gr_immed	-4,sp		; for alignment
-
-	set_gr_immed	0,gr20		; PC increment
-	set_gr_immed	0,gr15
-
-	set_spr_addr	ok3,lr
-	set_gr_immed	4,gr20		; PC increment
-badst:	stdfi		fr0,@(sp,0)	; misaligned reg -- slot I0
-	test_gr_immed	1,gr15
-
-	set_spr_addr	ok4,lr
-	set_gr_immed	8,gr20		; PC increment
-	nop.p
-badld:	lddfi		@(sp,0),fr8	; misaligned reg -- slot I1
-	test_gr_immed	2,gr15
-
-	set_spr_addr	ok5,lr
-	set_gr_immed	20,gr20		; PC increment
-	fnegs.p		fr9,fr9
-	fnegs.p		fr9,fr10
-	fnegs.p		fr9,fr11
-pack:	fnegs		fr10,fr12
-	fnegs		fr10,fr13	; packing violation
-	test_gr_immed	3,gr15
-
-	set_spr_addr	ok1,lr
-	set_gr_immed	4,gr20		; PC increment
-bad:	.word		0x83e502c4	; fmadds fr16,fr4,fr1 (unimplemented)
-	test_gr_immed	4,gr15
-
-	and_spr_immed	0xfbffffff,fsr0		; disable div/0 fp_exception
-	set_fr_iimmed	0x7f7f,0xffff,fr0
-	set_fr_iimmed	0x0000,0x0000,fr1
-	fdivs		fr0,fr1,fr2		; div/0 -- no exception
-	test_spr_bits	0x100000,20,0x0,fsr0	; fsr0.qne is never set
-	test_spr_bits	0xfc00,10,0x4,fsr0	; fsr0.aexc is still set
-	test_spr_bits	0xe0000,17,0x0,fsr0	; fsr0.ftt is clear
-
-	set_spr_addr	ok2,lr
-	set_gr_immed	0,gr20			; PC increment
-	or_spr_immed	0x04000000,fsr0		; enable div/0 fp_exception
-	set_fr_iimmed	0xdead,0xbeef,fr2
-div0:	fdivs		fr0,fr1,fr2		; fp_exception - div/0
-	test_fr_iimmed	0xdeadbeef,fr2		; fr2 not updated
-	test_gr_immed	5,gr15
-
-	and_spr_immed	0xfdffffff,fsr0		; disable inexact fp_exception
-	fsqrts		fr32,fr2		; inexact -- no exception
-	test_spr_bits	0x100000,20,0x0,fsr0	; fsr0.qne is never set
-	test_spr_bits	0xfc00,10,0x6,fsr0	; fsr0.aexc is set
-	test_spr_bits	0xe0000,17,0x0,fsr0	; fsr0.ftt is clear
-
-	set_fr_fr	fr2,fr3			; sqrt 2
-	set_fr_iimmed	0xdead,0xbeef,fr2
-	set_spr_addr	ok6,lr
-	or_spr_immed	0x02000000,fsr0		; enable inexact fp_exception
-inxt1:	fsqrts		fr32,fr2		; fp_exception - inexact
-	test_gr_immed	6,gr15			; handler called
-	test_fr_fr	fr2,fr3			; fr2 updated
-
-	set_fr_iimmed	0xdead,0xbeef,fr2
-	set_spr_addr	ok7,lr
-inxt2:	fsqrts		fr32,fr2		; fp_exception - inexact again
-	test_gr_immed	7,gr15			; handler called
-	test_fr_fr	fr2,fr3			; fr2 updated
-
-	pass
-
-; exception handler 1 -- illegal_instruction: bad insn
-ok1:
-	test_spr_immed	1,esfr1			; esr0 active
-	test_spr_bits	0x3e,1,0x5,esr0		; esr0.ec is set
-	test_spr_bits	0x1,0,0x1,esr0		; esr0.valid is set
-	bra		ret
-
-; exception handler 2 - fp_exception: divide by 0
-ok2:
-	test_spr_bits	0x100000,20,0x0,fsr0	; fsr0.qne is clear
-	test_spr_bits	0xe0000,17,0x1,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x4,fsr0	; fsr0.aexc is still set
-
-	test_spr_immed	4,esfr1			; esr2 active
-	test_spr_bits	0x3e,1,0xd,esr2		; esr2.ec is set
-	test_spr_bits	0x1,0,0x1,esr2		; esr2.valid is set
-	test_spr_addr	div0,epcr2		; epcr2 is set
-	bra		ret
-
-; exception handler 3 - illegal_instruction: register exception
-ok3:
-	test_spr_immed	1,esfr1			; esr0 active
-	test_spr_bits	0x3e,1,0x5,esr0		; esr0.ec is set
-	test_spr_bits	0x1,0,0x1,esr0		; esr0.valid is set
-	bra		ret
-
-; exception handler 4 - illegal_instruction: register exception
-ok4:
-	test_spr_immed	1,esfr1			; esr0 active
-	test_spr_bits	0x3e,1,0x5,esr0		; esr0.ec is set
-	test_spr_bits	0x1,0,0x1,esr0		; esr0.valid is set
-	bra		ret
-
-; exception handler 5 - illegal_instruction: sequence violation
-ok5:
-	test_spr_immed	1,esfr1			; esr0 active
-	test_spr_bits	0x3e,1,0x5,esr0		; esr0.ec is set
-	test_spr_bits	0x1,0,0x1,esr0		; esr0.valid is set
-	bra		ret
-
-; exception handler 6 - fp_exception: inexact
-ok6:
-	test_spr_bits	0x100000,20,0x0,fsr0	; fsr0.qne is clear
-	test_spr_bits	0xe0000,17,0x1,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x6,fsr0	; fsr0.aexc is still set
-
-	test_spr_immed	4,esfr1			; esr2 active
-	test_spr_bits	0x3e,1,0xd,esr2		; esr2.ec is set
-	test_spr_bits	0x1,0,0x1,esr2		; esr2.valid is set
-	test_spr_addr	inxt1,epcr2		; epcr2 is set
-	bra		ret
-
-; exception handler 7 - fp_exception: inexact again
-ok7:
-	test_spr_bits	0x100000,20,0x0,fsr0	; fsr0.qne is clear
-	test_spr_bits	0xe0000,17,0x1,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x6,fsr0	; fsr0.aexc is still set
-
-	test_spr_immed	4,esfr1			; esr2 active
-	test_spr_bits	0x3e,1,0xd,esr2		; esr2.ec is set
-	test_spr_bits	0x1,0,0x1,esr2		; esr2.valid is set
-	test_spr_addr	inxt2,epcr2		; epcr2 is set
-	bra		ret
-
-ret:
-	inc_gr_immed	1,gr15
-	movsg		pcsr,gr60
-	add		gr60,gr20,gr60
-	movgs		gr60,pcsr
-	rett		0
-	fail
-
diff --git a/sim/testsuite/sim/frv/interrupts/fp_exception.cgs b/sim/testsuite/sim/frv/interrupts/fp_exception.cgs
deleted file mode 100644
index 0109b53cf2e..00000000000
--- a/sim/testsuite/sim/frv/interrupts/fp_exception.cgs
+++ /dev/null
@@ -1,209 +0,0 @@
-# frv testcase to generate fp_exception
-# mach: fr500
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global align
-align:
-	; clear the packing bit if the insn at 'pack:'. We can't simply use
-	; '.p' because the assembler will catch the error.
-	set_gr_mem	pack,gr10
-	and_gr_immed	0x7fffffff,gr10
-	set_mem_gr	gr10,pack
-	set_gr_addr	pack,gr10
-	flush_data_cache gr10
-
-	; Make the the source register number odd at badst. We can't simply
-	; code an odd register number because the assembler will catch the
-	; error.
-	set_gr_mem	badst,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,badst
-	set_gr_addr	badst,gr10
-	flush_data_cache gr10
-
-	; Make the the dest register number odd at ld. We can't simply
-	; code an odd register number because the assembler will catch the
-	; error.
-	set_gr_mem	badld,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,badld
-	set_gr_addr	badld,gr10
-	flush_data_cache gr10
-
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x070,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	inc_gr_immed	0x060,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_psr_et	1
-	inc_gr_immed	-4,sp		; for alignment
-
-	set_gr_immed	0,gr20		; PC increment
-	set_gr_immed	0,gr15
-
-	set_spr_addr	ok3,lr
-badst:	stdfi		fr0,@(sp,0)	; misaligned reg -- slot I0
-	test_gr_immed	1,gr15
-
-	set_spr_addr	ok4,lr
-	nop.p
-badld:	lddfi		@(sp,0),fr8	; misaligned reg -- slot I1
-	test_gr_immed	2,gr15
-
-	set_spr_addr	ok5,lr
-	fnegs.p		fr9,fr9
-pack:	fnegs		fr10,fr10
-	fnegs		fr10,fr11	; packing violation
-	test_gr_immed	3,gr15
-
-	set_spr_addr	ok1,lr
-	set_gr_immed	4,gr20		; PC increment
-bad:	.word		0x83e502c4	; fmadds fr16,fr4,fr1 (unimplemented)
-	test_gr_immed	4,gr15
-
-	and_spr_immed	0xfbffffff,fsr0		; disable div/0 fp_exception
-	set_fr_iimmed	0x7f7f,0xffff,fr0
-	set_fr_iimmed	0x0000,0x0000,fr1
-	fdivs		fr0,fr1,fr2		; div/0 -- no exception
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is still set
-	test_spr_bits	0xfc00,10,0x4,fsr0	; fsr0.aexc is still set
-	test_spr_bits	0xe0000,17,0x0,fsr0	; fsr0.ftt is clear
-	and_spr_immed	0xffefffff,fsr0		; Clear fsr0.qne
-
-	set_spr_addr	ok2,lr
-	set_gr_immed	0,gr20			; PC increment
-	or_spr_immed	0x04000000,fsr0		; enable div/0 fp_exception
-	set_fr_iimmed	0xdead,0xbeef,fr2
-	fdivs		fr0,fr1,fr2		; fp_exception - div/0
-	test_fr_iimmed	0xdeadbeef,fr2		; fr2 not updated
-	test_gr_immed	5,gr15
-
-	and_spr_immed	0xfdffffff,fsr0		; disable inexact fp_exception
-	fsqrts		fr32,fr2		; inexact -- no exception
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is still set
-	test_spr_bits	0xfc00,10,0x6,fsr0	; fsr0.aexc is set
-	test_spr_bits	0xe0000,17,0x0,fsr0	; fsr0.ftt is clear
-
-	set_fr_fr	fr2,fr3			; sqrt 2
-	set_fr_iimmed	0xdead,0xbeef,fr2
-	set_spr_addr	ok6,lr
-	or_spr_immed	0x02000000,fsr0		; enable inexact fp_exception
-	fsqrts		fr32,fr2		; fp_exception - inexact
-	test_gr_immed	6,gr15			; handler called
-	test_fr_fr	fr2,fr3			; fr2 updated
-
-	set_fr_iimmed	0xdead,0xbeef,fr2
-	set_spr_addr	ok7,lr
-	fsqrts		fr32,fr2		; fp_exception - inexact again
-	test_gr_immed	7,gr15			; handler called
-	test_fr_fr	fr2,fr3			; fr2 updated
-
-	pass
-
-; exception handler 1 -- bad insn
-ok1:
-	test_spr_immed	1,esfr1			; esr0 active
-	test_spr_bits	0x3e,1,0x5,esr0		; esr0.ec is set
-	test_spr_bits	0x1,0,0x1,esr0		; esr0.valid is set
-	test_spr_addr	bad,epcr0
-	bra		ret
-
-; exception handler 2 - fp_exception: divide by 0
-ok2:
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is set
-	test_spr_bits	0xe0000,17,0x1,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x4,fsr0	; fsr0.aexc is still set
-
-	test_spr_bits	0x80000000,31,0x0,fqst2	; fq2.miv is set
-	test_spr_bits	0x18000,15,0x0,fqst2	; fq2.sie is set
-	test_spr_bits	0x380,7,0x1,fqst2	; fq2.ftt is set
-	test_spr_bits	0x7e,1,0x4,fqst2	; fq2.cexc is set
-	test_spr_bits	0x1,0,0x1,fqst2		; fq2.valid is set
-	test_spr_immed	0x85e40241,fqop2	; fq2.opc
-	bra		ret
-
-; exception handler 3 - fp_exception: register exception
-ok3:
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is set
-	test_spr_bits	0xe0000,17,0x6,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x0,fsr0	; fsr0.aexc is clear
-
-	test_spr_bits	0x80000000,31,0x0,fqst2	; fq2.miv is set
-	test_spr_bits	0x18000,15,0x0,fqst2	; fq2.sie is set
-	test_spr_bits	0x380,7,0x6,fqst2	; fq2.ftt is set
-	test_spr_bits	0x7e,1,0x0,fqst2	; fq2.cexc is set
-	test_spr_bits	0x1,0,0x1,fqst2		; fq2.valid is set
-	test_spr_immed	0x83581000,fqop2	; fq2.opc
-	bra		ret
-
-; exception handler 4 - fp_exception: another register exception
-ok4:
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is set
-	test_spr_bits	0xe0000,17,0x6,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x0,fsr0	; fsr0.aexc is still clear
-
-	test_spr_bits	0x80000000,31,0x0,fqst3	; fq3.miv is set
-	test_spr_bits	0x18000,15,0x0,fqst3	; fq3.sie is set
-	test_spr_bits	0x380,7,0x6,fqst3	; fq3.ftt is set
-	test_spr_bits	0x7e,1,0x0,fqst3	; fq3.cexc is set
-	test_spr_bits	0x1,0,0x1,fqst3		; fq3.valid is set
-	test_spr_immed	0x92ec1000,fqop3	; fq3.opc
-	bra		ret
-
-; exception handler 5 - fp_exception: sequence violation
-ok5:
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is set
-	test_spr_bits	0xe0000,17,0x4,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x0,fsr0	; fsr0.aexc is still clear
-
-	test_spr_bits	0x80000000,31,0x0,fqst3	; fq3.miv is set
-	test_spr_bits	0x18000,15,0x0,fqst3	; fq3.sie is set
-	test_spr_bits	0x380,7,0x4,fqst3	; fq3.ftt is set
-	test_spr_bits	0x7e,1,0x0,fqst3	; fq3.cexc is set
-	test_spr_bits	0x1,0,0x1,fqst3		; fq3.valid is set
-	test_spr_immed	0x97e400ca,fqop3	; fq3.opc
-	bra		ret
-
-; exception handler 6 - fp_exception: inexact
-ok6:
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is set
-	test_spr_bits	0xe0000,17,0x1,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x6,fsr0	; fsr0.aexc is still set
-
-	test_spr_bits	0x80000000,31,0x0,fqst0	; fq0.miv is set
-	test_spr_bits	0x18000,15,0x0,fqst0	; fq0.sie is set
-	test_spr_bits	0x380,7,0x1,fqst0	; fq0.ftt is set
-	test_spr_bits	0x7e,1,0x2,fqst0	; fq0.cexc is set
-	test_spr_bits	0x1,0,0x1,fqst0		; fq0.valid is set
-	test_spr_immed	0x85e40160,fqop0	; fq0.opc
-	bra		ret
-
-; exception handler 7 - fp_exception: inexact again
-ok7:
-	test_spr_bits	0x100000,20,0x1,fsr0	; fsr0.qne is set
-	test_spr_bits	0xe0000,17,0x1,fsr0	; fsr0.ftt is set
-	test_spr_bits	0xfc00,10,0x6,fsr0	; fsr0.aexc is still set
-
-	test_spr_bits	0x80000000,31,0x0,fqst1	; fq1.miv is set
-	test_spr_bits	0x18000,15,0x0,fqst1	; fq1.sie is set
-	test_spr_bits	0x380,7,0x1,fqst1	; fq1.ftt is set
-	test_spr_bits	0x7e,1,0x2,fqst1	; fq1.cexc is set
-	test_spr_bits	0x1,0,0x1,fqst1		; fq1.valid is set
-	test_spr_immed	0x85e40160,fqop1	; fq1.opc
-	bra		ret
-
-ret:
-	inc_gr_immed	1,gr15
-	movsg		pcsr,gr60
-	add		gr60,gr20,gr60
-	movgs		gr60,pcsr
-	rett		0
-	fail
-
diff --git a/sim/testsuite/sim/frv/interrupts/illinsn.cgs b/sim/testsuite/sim/frv/interrupts/illinsn.cgs
deleted file mode 100644
index fc44a8fc99e..00000000000
--- a/sim/testsuite/sim/frv/interrupts/illinsn.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# FRV testcase
-# mach: fr500 fr550 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global tra
-tra:
-	and_spr_immed	0x3fffffff,hsr0		; no caches enabled
-
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	0x070,gr7		; address of exception handler
-	set_bctrlr_0_0  gr7
-	inc_gr_immed	0x790,gr7		; address of exception handler
-	set_bctrlr_0_0  gr7
-	set_spr_immed	128,lcr
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-
-	set_gr_addr	ill1,gr7
-	set_mem_immed	0x81f80000,gr7	; unknown opcode: 7E
-ill1:	tira		gr0,0		; should be overridden
-ill2:	nop				; also illegal, but prev has priority
-bad0:	fail
-
-	; check interrupt
-ok0:	test_spr_addr	ill1,pcsr
-	test_spr_immed	1,esfr1		; esr0 active
-	test_spr_bits	0x3f,0,0xb,esr0
-	movsg		psr,gr28
-	srli		gr28,28,gr28
-	subicc 		gr28,0x3,gr0,icc3 ; is fr550?
-	beq 		icc3,0,no_epcr
-	test_spr_addr	ill1,epcr0
-no_epcr:
-	pass
diff --git a/sim/testsuite/sim/frv/interrupts/insn_access_error-fr550.cgs b/sim/testsuite/sim/frv/interrupts/insn_access_error-fr550.cgs
deleted file mode 100644
index 6c4929950ba..00000000000
--- a/sim/testsuite/sim/frv/interrupts/insn_access_error-fr550.cgs
+++ /dev/null
@@ -1,44 +0,0 @@
-# frv testcase to generate insn_access_error interrupt
-# mach: fr550
-# sim: --memory-region 0xfe800000,0x7f0500 --memory-region 0xfeff0540,0xfb00
-	.include "testutils.inc"
-
-	start
-
-	.global dsr
-dsr:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x020,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-
-	set_spr_addr	handler,lr
-	set_gr_immed	0,gr16
-
-	set_gr_addr	ok0,gr8
-	set_gr_addr	0xfe800000,gr17
-	jmpl		@(gr17,gr0)		; cause interrupt
-ok0:
-	test_gr_immed	1,gr16
-
-	set_gr_addr	ok1,gr8
-	set_gr_addr	0xfefffffc,gr17
-	jmpl		@(gr17,gr0)		; cause interrupt
-ok1:
-	test_gr_immed	2,gr16
-
-	pass
-handler:
-	; check interrupts
-	test_spr_immed	0x1,esfr1		; esr0 is active
-;	test_spr_gr	epcr0,gr17		; epcr0 is not used
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x2,esr0	; esr0.ec is set
-	test_spr_bits	0x0800,11,0x0,esr0	; esr0.eav is not set
-
-	addi		gr16,1,gr16
-	movgs		gr8,pcsr
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/insn_access_error.cgs b/sim/testsuite/sim/frv/interrupts/insn_access_error.cgs
deleted file mode 100644
index 11a9eaf5355..00000000000
--- a/sim/testsuite/sim/frv/interrupts/insn_access_error.cgs
+++ /dev/null
@@ -1,56 +0,0 @@
-# frv testcase to generate insn_access_error interrupt
-# mach: fr500 fr400
-# sim: --memory-region 0xfeff0600,0x8000 --memory-region 0xfe800000,0x7f0040
-	.include "testutils.inc"
-
-	start
-
-	.global dsr
-dsr:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x020,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-
-	set_spr_addr	handler,lr
-	set_gr_immed	0,gr16
-
-	set_gr_addr	ok0,gr8
-	set_gr_addr	0xfeff0600,gr17
-	jmpl		@(gr17,gr0)		; cause interrupt
-ok0:
-	test_gr_immed	1,gr16
-
-	set_gr_addr	ok1,gr8
-	set_gr_addr	0xfeff7ffc,gr17
-	jmpl		@(gr17,gr0)		; cause interrupt
-ok1:
-	test_gr_immed	2,gr16
-
-	set_gr_addr	ok2,gr8
-	set_gr_addr	0xfe800000,gr17
-	jmpl		@(gr17,gr0)		; cause interrupt
-ok2:
-	test_gr_immed	3,gr16
-
-	set_gr_addr	ok3,gr8
-	set_gr_addr	0xfefefffc,gr17
-	jmpl		@(gr17,gr0)		; cause interrupt
-ok3:
-	test_gr_immed	4,gr16
-
-	pass
-handler:
-	; check interrupts
-	test_spr_immed	0x1,esfr1		; esr0 is active
-	test_spr_gr	epcr0,gr17
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x2,esr0	; esr0.ec is set
-	test_spr_bits	0x0800,11,0x0,esr0	; esr0.eav is not set
-
-	addi		gr16,1,gr16
-	movgs		gr8,pcsr
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/mp_exception.cgs b/sim/testsuite/sim/frv/interrupts/mp_exception.cgs
deleted file mode 100644
index 3203acc85ce..00000000000
--- a/sim/testsuite/sim/frv/interrupts/mp_exception.cgs
+++ /dev/null
@@ -1,289 +0,0 @@
-# frv testcase for mp_exception
-# mach: fr500 fr550 frv
-# xerror:
-
-# This program no longer assembles because the assembler
-# now detects the unaligned registers. For this reason
-# this test is now marked as "xerror" and prints the
-# expected message "fail"
-
-	.include "testutils.inc"
-
-	start
-
-	.global mp_exception
-mpx:
-.if 1
-	fail
-.else
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mcmpsh		fr10,fr11,fcc1	; mp_exception: cr-not-aligned
-	test_spr_bits	0x7000,12,3,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf is set
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mcmpsh.p	fr10,fr11,fcc0	; no exception
-	mcmpsh		fr10,fr11,fcc2	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	mmulhs.p	fr10,fr11,acc3	; no exception
-	mmulhs		fr10,fr11,acc1	; mp_exception: acc-not-aligned
-	test_spr_bits	0x7000,12,2,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mmulhu		fr10,fr11,acc0	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,1,msr0	; msr0.ovf is still set
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mmulxhs.p	fr10,fr11,acc3	; no exception
-	mmulxhs		fr10,fr11,acc1	; mp_exception: acc-not-aligned
-	test_spr_bits	0x7000,12,2,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mmulxhu		fr10,fr11,acc0	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,1,msr0	; msr0.ovf is still set
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mmachs.p	fr10,fr11,acc3	; no exception
-	mmachs		fr10,fr11,acc1	; mp_exception: acc-not-aligned
-	test_spr_bits	0x7000,12,2,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mmachu		fr10,fr11,acc0	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mqaddhss.p	fr10,fr12,fr17	; mp_exception: register-not-aligned
-	mqaddhss	fr10,fr12,fr14	; no exception
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mqaddhss.p	fr10,fr12,fr14	; no exception
-	mqaddhss	fr10,fr13,fr16	; mp_exception: register-not-aligned
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mqaddhss.p	fr19,fr12,fr14	; mp_exception: register-not-aligned
-	mqaddhss	fr10,fr13,fr16	; mp_exception: register-not-aligned
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqaddhss	fr10,fr12,fr14	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mqmulhs.p	fr10,fr11,acc3	; no exception
-	mqmulhs		fr10,fr11,acc2	; mp_exception: acc-not-aligned
-	test_spr_bits	0x7000,12,2,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqmulhu		fr10,fr11,acc0	; mp_exception: register_not_aligned
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,1,msr0	; msr0.ovf is still set
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqmulhu		fr10,fr12,acc0	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,1,msr0	; msr0.ovf is still set
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mqmulxhs.p	fr10,fr11,acc3	; no exception
-	mqmulxhs	fr10,fr11,acc2	; mp_exception: acc-not-aligned
-	test_spr_bits	0x7000,12,2,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqmulxhu	fr10,fr11,acc0	; mp_exception: register-not-aligned
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,1,msr0	; msr0.ovf is still set
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqmulxhu	fr10,fr12,acc0	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,1,msr0	; msr0.ovf is still set
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mqmachs.p	fr10,fr12,acc3	; no exception
-	mqmachs		fr10,fr12,acc2	; mp_exception: acc-not-aligned
-	test_spr_bits	0x7000,12,2,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqmachu.p	fr19,fr12,acc0	; mp_exception: register-not-aligned
-	mqmachu		fr10,fr12,acc0	; no exception
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqmachu.p	fr10,fr12,acc0	; no exception
-	mqmachu		fr19,fr12,acc0	; mp_exception: register-not-aligned
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqmachu.p	fr19,fr12,acc0	; mp_exception: register-not-aligned
-	mqmachu		fr19,fr12,acc0	; mp_exception: register-not-aligned
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqmachu		fr10,fr12,acc0	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	mqcpxrs.p	fr10,fr12,acc0	; no exception
-	mqcpxrs		fr10,fr12,acc1	; mp_exception: acc-not-aligned
-	test_spr_bits	0x7000,12,2,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqcpxru.p	fr19,fr12,acc0	; mp_exception: register-not-aligned
-	mqcpxru		fr10,fr12,acc0	; no exception
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqcpxru.p	fr10,fr12,acc0	; no exception
-	mqcpxru		fr19,fr12,acc0	; mp_exception: register-not-aligned
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqcpxru.p	fr19,fr12,acc0	; mp_exception: register-not-aligned
-	mqcpxru		fr19,fr12,acc0	; mp_exception: register-not-aligned
-	test_spr_bits	0x7000,12,6,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	or_spr_immed	2,msr0		; Set msr0.ovf
-	or_spr_immed	2,msr1		; Set msr1.ovf
-	and_spr_immed	0xffff8fff,msr0	; Clear msr0.mtt
-	mqcpxru		fr10,fr12,acc0	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,1,msr1	; msr1.ovf still set
-
-	pass
-.endif
diff --git a/sim/testsuite/sim/frv/interrupts/privileged_instruction.cgs b/sim/testsuite/sim/frv/interrupts/privileged_instruction.cgs
deleted file mode 100644
index 9996236b333..00000000000
--- a/sim/testsuite/sim/frv/interrupts/privileged_instruction.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# frv testcase to generate privileged_instruction interrupt
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global dsr
-dsr:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x060,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_psr_et	1
-	and_spr_immed	0xfffffffb,psr		; clear psr.s
-
-	set_spr_addr	handler,lr
-	set_gr_immed	0,gr16
-
- 	set_gr_addr	bad1,gr17
-bad1:	rett		0		; cause interrupt
-	test_gr_immed	1,gr16
- 	set_gr_addr	bad2,gr17
-bad2:	rei		0		; cause interrupt
-	test_gr_immed	2,gr16
- 	set_gr_addr	bad3,gr17
-bad3:	witlb		gr0,@(gr0,gr0)	; cause interrupt
-	test_gr_immed	3,gr16
- 	set_gr_addr	bad4,gr17
-bad4:	wdtlb		gr0,@(gr0,gr0)	; cause interrupt
-	test_gr_immed	4,gr16
- 	set_gr_addr	bad5,gr17
-bad5:	itlbi		@(gr0,gr0)	; cause interrupt
-	test_gr_immed	5,gr16
- 	set_gr_addr	bad6,gr17
-bad6:	dtlbi		@(gr0,gr0)	; cause interrupt
-	test_gr_immed	6,gr16
-
-	pass
-handler:
-	; check interrupts
-	test_spr_immed	0x1,esfr1		; esr0 is active
-	test_spr_gr	epcr0,gr17
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x4,esr0	; esr0.ec is set
-	test_spr_bits	0x0800,11,0x0,esr0	; esr0.eav is not set
-
-	addi		gr16,1,gr16
-	movsg		pcsr,gr8
-	addi		gr8,4,gr8
-	movgs		gr8,pcsr
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/regalign.cgs b/sim/testsuite/sim/frv/interrupts/regalign.cgs
deleted file mode 100644
index afa09b5f22e..00000000000
--- a/sim/testsuite/sim/frv/interrupts/regalign.cgs
+++ /dev/null
@@ -1,130 +0,0 @@
-# frv testcase to generate interrupts for bad register alignment
-# mach: frv
-	.include "testutils.inc"
-
-	start
-
-	.global align
-align:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x080,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	inc_gr_immed	0x050,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_psr_et	1
-
-	; Make the the register number odd at bad[1-4], bad9 and bada.
-	; We can't simply code an odd register number because the assembler
-	; will catch the error.
-	set_gr_mem	bad1,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,bad1
-	set_gr_addr	bad1,gr10
-	flush_data_cache gr10
-	set_gr_mem	bad2,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,bad2
-	set_gr_addr	bad2,gr10
-	flush_data_cache gr10
-	set_gr_mem	bad3,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,bad3
-	set_gr_addr	bad3,gr10
-	flush_data_cache gr10
-	set_gr_mem	bad4,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,bad4
-	set_gr_addr	bad4,gr10
-	flush_data_cache gr10
-	set_gr_mem	bad9,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,bad9
-	set_gr_addr	bad9,gr10
-	flush_data_cache gr10
-	set_gr_mem	bada,gr10
-	or_gr_immed	0x02000000,gr10
-	set_mem_gr	gr10,bada
-	set_gr_addr	bada,gr10
-	flush_data_cache gr10
-
-	set_gr_immed	4,gr20		; PC increment
-	set_gr_immed	0,gr15
-	inc_gr_immed	-12,sp		; for memory alignment
-
-	set_gr_addr	bad1,gr17
-bad1:	stdi	gr0,@(sp,0)		; misaligned reg
-	test_gr_immed	1,gr15
-
-	set_gr_addr	bad2,gr17
-bad2:	lddi	@(sp,0),gr8		; misaligned reg
-	test_gr_immed	2,gr15
-
-	set_gr_addr	bad3,gr17
-bad3:	stdc	cpr0,@(sp,gr0)		; misaligned reg
-	test_gr_immed	3,gr15
-
-	set_gr_addr	bad4,gr17
-bad4:	lddc	@(sp,gr0),cpr8		; misaligned reg
-	test_gr_immed	4,gr15
-
-	set_gr_addr	bad5,gr17
-bad5:	stqi	gr2,@(sp,0)		; misaligned reg
-	test_gr_immed	5,gr15
-
-	set_gr_addr	bad6,gr17
-bad6:	ldqi	@(sp,0),gr10		; misaligned reg
-	test_gr_immed	6,gr15
-
-	set_gr_addr	bad7,gr17
-bad7:	stqc	cpr2,@(sp,gr0)		; misaligned reg
-	test_gr_immed	7,gr15
-
-	set_gr_addr	bad8,gr17
-bad8:	ldqc	@(sp,gr0),cpr10		; misaligned reg
-	test_gr_immed   8,gr15
-
-	set_gr_immed	0,gr20		; PC increment
-	set_gr_addr	bad9,gr17
-bad9:	stdfi	fr0,@(sp,0)		; misaligned reg
-	test_gr_immed	9,gr15
-
-	set_gr_addr	bada,gr17
-bada:	lddfi	@(sp,0),fr8		; misaligned reg
-	test_gr_immed	10,gr15
-
-	set_gr_addr	badb,gr17
-badb:	stqfi	fr2,@(sp,0)		; misaligned reg
-	test_gr_immed   11,gr15
-
-	set_gr_addr	badc,gr17
-badc:	ldqfi	@(sp,0),fr10		; misaligned reg
-	test_gr_immed	12,gr15
-
-	pass
-
-; exception handler
-ok1:
-	cmpi		gr20,0,icc0
-	beq		icc0,0,float
-
-	; check register_exception
-	test_spr_immed	0x1,esfr1		; esr0 is active
-	test_spr_gr	epcr0,gr17
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0xc,esr0	; esr0.ec is set
-	test_spr_bits	0x00c0,6,0x1,esr0	; esr0.rec is set
-	test_spr_bits	0x0800,11,0x0,esr0	; esr0.eav is not set
-	movsg		pcsr,gr60
-	add		gr60,gr20,gr60
-	movgs		gr60,pcsr
-	bra		ret
-float:
-	; check fp_exception
-	test_spr_immed	0,esfr1			; no esr's active
-ret:
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/reset.cgs b/sim/testsuite/sim/frv/interrupts/reset.cgs
deleted file mode 100644
index ff2035c8a7e..00000000000
--- a/sim/testsuite/sim/frv/interrupts/reset.cgs
+++ /dev/null
@@ -1,81 +0,0 @@
-# frv testcase to generate reset interrupts
-# mach: fr500 fr550 fr400
-# sim: --memory-region 0xff000000,64
-
-	.include "testutils.inc"
-
-	start
-
-	.global reset
-reset:
-	and_spr_immed	0xfffffffb,psr	; turn off PSR.S
-	set_gr_immed	0xfeff0500,gr10	; address of reset register
-	set_spr_immed	0x7fffffff,lcr
-	set_bctrlr_0_0  gr0
-
-; Can't recover from hardware interrupt with enough state intact to verify it
-;	set_spr_addr	ok1,lr
-;	set_mem_immed	0x3,gr10	; cause hardware reset
-;	dcf		@(gr10,gr0)	; Wait for store to happen
-;	fail
-;
-;ok1:	; reset should branch to reset address which should then branch here
-;	test_mem_immed	0x00000200,gr10
-;	set_spr_addr	ok2,lr
-;	set_mem_immed	0x2,gr10	; cause hardware reset
-;	dcf		@(gr10,gr0)	; Wait for store to happen
-;	fail
-;	
-ok2:	; reset should branch to reset address which should then branch here
-;	test_mem_immed	0x00000200,gr10
-	set_spr_addr	ok3,lr
-	set_mem_immed	0x1,gr10	; cause software reset
-	dcf		@(gr10,gr0)	; Wait for store to happen
-	fail
-	
-ok3:	; reset should branch to reset address which should then branch here
-	test_mem_immed	0x00000100,gr10
-	test_spr_bits	0x4,2,1,psr	; psr.s is set
-	test_spr_bits	0x2,1,0,psr	; psr.ps not set
-	set_spr_addr	bad,lr
-	set_mem_immed	0x0,gr10	; no reset
-	test_mem_immed	0x0,gr10
-
-	; now retest with HSR0.SA set
-	set_mem_immed	0,gr0
-	set_gr_addr	0xff000000,gr11
-	set_bctrlr_0_0  gr11
-	or_spr_immed	0x00001000,hsr0	; set HSR0.SA
-
-; Can't recover from hardware interrupt with enough state intact to verify it
-;	set_spr_addr	ok4,lr
-;	dcf		@(gr10,gr0)	; Wait for store to happen
-;	set_mem_immed	0x3,gr10	; cause hardware reset
-;	fail
-;
-;ok4:	; reset should branch to reset address which should then branch here
-;	test_mem_immed	0x00000200,gr10
-;	set_spr_addr	ok5,lr
-;	set_mem_immed	0x2,gr10	; cause hardware reset
-;	dcf		@(gr10,gr0)	; Wait for store to happen
-;	fail
-;	
-ok5:	; reset should branch to reset address which should then branch here
-;	test_mem_immed	0x00000200,gr10
-	set_spr_addr	ok6,lr
-	set_mem_immed	0x1,gr10	; cause software reset
-	dcf		@(gr10,gr0)	; Wait for store to happen
-	fail
-	
-ok6:	; reset should branch to reset address which should then branch here
-	test_mem_immed	0x00000100,gr10
-	test_spr_bits	0x4,2,1,psr	; psr.s is set
-	test_spr_bits	0x2,1,1,psr	; psr.ps is set
-	set_spr_addr	bad,lr
-	set_mem_immed	0x0,gr10	; no reset
-	test_mem_immed	0x0,gr10
-
-	pass
-
-bad:	; Should never get here
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/shadow_regs.cgs b/sim/testsuite/sim/frv/interrupts/shadow_regs.cgs
deleted file mode 100644
index ee6bea45e71..00000000000
--- a/sim/testsuite/sim/frv/interrupts/shadow_regs.cgs
+++ /dev/null
@@ -1,205 +0,0 @@
-# FRV testcase for handling of shadow registers SR0-SR4
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global tra
-tra:
-	test_spr_bits	0x800,11,1,psr	; PSR.ESR set
-	test_spr_bits	0x4,2,1,psr	; PSR.S set
-
-	; Set up exception handler for later
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-	set_spr_immed	128,lcr
-	set_psr_et	1
-
-	set_gr_immed	0x11111111,gr4	; SGR4-7
-	set_gr_immed	0x22222222,gr5
-	set_gr_immed	0x33333333,gr6
-	set_gr_immed	0x44444444,gr7
-	set_spr_immed	0x55555555,sr0 	; UGR4-7
-	set_spr_immed	0x66666666,sr1
-	set_spr_immed	0x77777777,sr2
-	set_spr_immed	0x88888888,sr3
-
-	and_spr_immed	0xfffff7ff,psr	; turn off PSR.ESR
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x11111111,sr0	; SGR4-7
-	test_spr_immed	0x22222222,sr1
-	test_spr_immed	0x33333333,sr2
-	test_spr_immed	0x44444444,sr3
-
-	set_spr_immed	0x55555555,sr0 	; SGR4-7
-	set_spr_immed	0x66666666,sr1
-	set_spr_immed	0x77777777,sr2
-	set_spr_immed	0x88888888,sr3
-	test_gr_immed	0x55555555,gr4	; SGR4-7
-	test_gr_immed	0x66666666,gr5
-	test_gr_immed	0x77777777,gr6
-	test_gr_immed	0x88888888,gr7
-	test_spr_immed	0x55555555,sr0	; SGR4-7
-	test_spr_immed	0x66666666,sr1
-	test_spr_immed	0x77777777,sr2
-	test_spr_immed	0x88888888,sr3
-
-	set_gr_immed	0x11111111,gr4	; SGR4-7
-	set_gr_immed	0x22222222,gr5
-	set_gr_immed	0x33333333,gr6
-	set_gr_immed	0x44444444,gr7
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x11111111,sr0	; SGR4-7
-	test_spr_immed	0x22222222,sr1
-	test_spr_immed	0x33333333,sr2
-	test_spr_immed	0x44444444,sr3
-
-	or_spr_immed	0x00000800,psr	; turn on PSR.ESR
-	test_gr_immed	0x11111111,gr4	; SGR4-7 -- SR0-3 (UGR4-7) are undefined
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-
-	set_spr_immed	0x55555555,sr0	; UGR4-7
-	set_spr_immed	0x66666666,sr1
-	set_spr_immed	0x77777777,sr2
-	set_spr_immed	0x88888888,sr3
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x55555555,sr0	; UGR4-7
-	test_spr_immed	0x66666666,sr1
-	test_spr_immed	0x77777777,sr2
-	test_spr_immed	0x88888888,sr3
-
-	and_spr_immed	0xfffffffb,psr	; turn off PSR.S
-	test_spr_immed	0x11111111,sr0 	; SGR4-7
-	test_spr_immed	0x22222222,sr1
-	test_spr_immed	0x33333333,sr2
-	test_spr_immed	0x44444444,sr3
-	test_gr_immed	0x55555555,gr4	; UGR4-7
-	test_gr_immed	0x66666666,gr5
-	test_gr_immed	0x77777777,gr6
-	test_gr_immed	0x88888888,gr7
-
-	; need to generate a trap to return to supervisor mode
-	set_spr_addr	ok0,lr
-	tira 		gr0,4		; should branch to tbr + (128 + 4)*16
-
-	test_spr_bits	0x800,11,0,psr	; PSR.ESR clear
-	test_spr_bits	0x4,2,0,psr	; PSR.S clear
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x11111111,sr0	; SGR4-7
-	test_spr_immed	0x22222222,sr1
-	test_spr_immed	0x33333333,sr2
-	test_spr_immed	0x44444444,sr3
-
-	set_gr_immed	0x55555555,gr4 	; SGR4-7
-	set_gr_immed	0x66666666,gr5
-	set_gr_immed	0x77777777,gr6
-	set_gr_immed	0x88888888,gr7
-	test_gr_immed	0x55555555,gr4	; SGR4-7
-	test_gr_immed	0x66666666,gr5
-	test_gr_immed	0x77777777,gr6
-	test_gr_immed	0x88888888,gr7
-	test_spr_immed	0x55555555,sr0	; SGR4-7
-	test_spr_immed	0x66666666,sr1
-	test_spr_immed	0x77777777,sr2
-	test_spr_immed	0x88888888,sr3
-
-	set_gr_immed	0x11111111,gr4	; SGR4-7
-	set_gr_immed	0x22222222,gr5
-	set_gr_immed	0x33333333,gr6
-	set_gr_immed	0x44444444,gr7
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x11111111,sr0	; SGR4-7
-	test_spr_immed	0x22222222,sr1
-	test_spr_immed	0x33333333,sr2
-	test_spr_immed	0x44444444,sr3
-
-	; need to generate a trap to return to supervisor mode
-	set_spr_addr	ok1,lr
-	tira 		gr0,4		; should branch to tbr + (128 + 4)*16
-
-	pass
-
-ok0:	; exception handler should branch here the first time
-	test_spr_bits	0x800,11,1,psr	; PSR.ESR set
-	test_spr_bits	0x4,2,1,psr	; PSR.S set
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x55555555,sr0	; UGR4-7
-	test_spr_immed	0x66666666,sr1
-	test_spr_immed	0x77777777,sr2
-	test_spr_immed	0x88888888,sr3
-
-	and_spr_immed	0xfffff7ff,psr	; turn off PSR.ESR
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x11111111,sr0	; SGR4-7
-	test_spr_immed	0x22222222,sr1
-	test_spr_immed	0x33333333,sr2
-	test_spr_immed	0x44444444,sr3
-	rett		0
-	fail
-
-ok1:	; exception handler should branch here the second time
-	test_spr_bits	0x800,11,0,psr	; PSR.ESR clear
-	test_spr_bits	0x4,2,1,psr	; PSR.S set
-
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x11111111,sr0	; SGR4-7
-	test_spr_immed	0x22222222,sr1
-	test_spr_immed	0x33333333,sr2
-	test_spr_immed	0x44444444,sr3
-
-	set_spr_immed	0x55555555,sr0 	; SGR4-7
-	set_spr_immed	0x66666666,sr1
-	set_spr_immed	0x77777777,sr2
-	set_spr_immed	0x88888888,sr3
-	test_gr_immed	0x55555555,gr4	; SGR4-7
-	test_gr_immed	0x66666666,gr5
-	test_gr_immed	0x77777777,gr6
-	test_gr_immed	0x88888888,gr7
-	test_spr_immed	0x55555555,sr0	; SGR4-7
-	test_spr_immed	0x66666666,sr1
-	test_spr_immed	0x77777777,sr2
-	test_spr_immed	0x88888888,sr3
-
-	set_gr_immed	0x11111111,gr4	; SGR4-7
-	set_gr_immed	0x22222222,gr5
-	set_gr_immed	0x33333333,gr6
-	set_gr_immed	0x44444444,gr7
-	test_gr_immed	0x11111111,gr4	; SGR4-7
-	test_gr_immed	0x22222222,gr5
-	test_gr_immed	0x33333333,gr6
-	test_gr_immed	0x44444444,gr7
-	test_spr_immed	0x11111111,sr0	; SGR4-7
-	test_spr_immed	0x22222222,sr1
-	test_spr_immed	0x33333333,sr2
-	test_spr_immed	0x44444444,sr3
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/interrupts/timer.cgs b/sim/testsuite/sim/frv/interrupts/timer.cgs
deleted file mode 100644
index e9cebc299bd..00000000000
--- a/sim/testsuite/sim/frv/interrupts/timer.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# frv testcase to generate timer interrupt for st $GRk,@($GRi,$GRj)
-# mach: fr500 fr550 fr400
-# sim: --timer 200,14
-	.include "testutils.inc"
-
-	start
-
-	.global align
-align:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x2e0,gr17		; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	0x7fffffff,lcr
-	set_spr_addr	ok1,lr
-	and_spr_immed	0xffffff87,psr ; enable external interrupts
-	or_spr_immed	0x00000069,psr ; enable external interrupts
-
-	set_gr_immed	10,gr16
-	set_gr_immed	0,gr15
-
-again:	cmp		gr15,gr16,icc0
-	blt		icc0,0,again
-	
-	pass
-
-; exception handler
-ok1:
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/jmpil.cgs b/sim/testsuite/sim/frv/jmpil.cgs
deleted file mode 100644
index 1d11067f224..00000000000
--- a/sim/testsuite/sim/frv/jmpil.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# frv testcase for jmpil @($GRi,$d12)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global jmpil
-jmpil:
-	set_spr_immed	0,lr
-	set_gr_addr	ok1,gr8
-	jmpil		@(gr8,2)	; target gets aligned down
-	fail
-ok1:
-	test_spr_immed	0,lr
-
-	pass
diff --git a/sim/testsuite/sim/frv/jmpl.cgs b/sim/testsuite/sim/frv/jmpl.cgs
deleted file mode 100644
index 9a58e606614..00000000000
--- a/sim/testsuite/sim/frv/jmpl.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# frv testcase for jmpl @($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global jmpl
-jmpl:
-	set_spr_immed	0,lr
-	set_gr_addr	ok1,gr8
-	set_gr_immed	1,gr9		; target gets aligned down
-	jmpl		@(gr8,gr9)
-	fail
-ok1:
-	test_spr_immed	0,lr
-
-	pass
diff --git a/sim/testsuite/sim/frv/jmpl.pcgs b/sim/testsuite/sim/frv/jmpl.pcgs
deleted file mode 100644
index 2126820a697..00000000000
--- a/sim/testsuite/sim/frv/jmpl.pcgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv parallel testcase for jmpl @($GRi,$GRj),$LI
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global jmpl
-jmpl:
-	set_spr_immed	0,lr
-	set_gr_addr	ok1,gr8
-	set_gr_immed	0,gr9
-	jmpl.p		@(gr8,gr9)
-	setlos		10,gr10
-	fail
-ok1:
-	test_spr_immed	0,lr
-	test_gr_immed	10,gr10
-
-	set_gr_addr	ok2,gr8
-	inc_gr_immed	-4,gr8
-	inc_gr_immed	4,gr9
-	calll.p		@(gr8,gr9)
-	setlos		11,gr11
-bad2:
-	fail
-ok2:
-	test_spr_addr	bad2,lr
-	test_gr_immed	11,gr11
-
-	set_gr_addr	ok3,gr8
-	inc_gr_immed	4,gr8
-	set_gr_immed	-4,gr9
-	setlos		12,gr12
-	calll		@(gr8,gr9)
-bad3:
-	fail
-ok3:
-	test_spr_addr	bad3,lr
-	test_gr_immed	12,gr12
-
-	pass
diff --git a/sim/testsuite/sim/frv/ld.cgs b/sim/testsuite/sim/frv/ld.cgs
deleted file mode 100644
index 35206c2ad57..00000000000
--- a/sim/testsuite/sim/frv/ld.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# frv testcase for ld @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ld
-ld:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	ld 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	ld 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	ld 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldbf.cgs b/sim/testsuite/sim/frv/ldbf.cgs
deleted file mode 100644
index 52ac0775b45..00000000000
--- a/sim/testsuite/sim/frv/ldbf.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for ldbf @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldbf
-ldbf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	ldbf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x00de,fr8
-
-	set_gr_immed	1,gr7
-	ldbf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x00ad,fr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	ldbf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldbfi.cgs b/sim/testsuite/sim/frv/ldbfi.cgs
deleted file mode 100644
index 7e918069df9..00000000000
--- a/sim/testsuite/sim/frv/ldbfi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for ldbfi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldbfi
-ldbfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	ldbfi 		@(sp,0),fr8
-	test_fr_limmed	0x0000,0x00de,fr8
-
-	ldbfi 		@(sp,1),fr8
-	test_fr_limmed	0x0000,0x00ad,fr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	ldbfi 		@(sp,-1),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldbfu.cgs b/sim/testsuite/sim/frv/ldbfu.cgs
deleted file mode 100644
index 3cbfb91d959..00000000000
--- a/sim/testsuite/sim/frv/ldbfu.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for ldbfu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldbfu
-ldbfu:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	ldbfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x00de,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	1,gr7
-	ldbfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x00ad,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	ldbfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldc.cgs b/sim/testsuite/sim/frv/ldc.cgs
deleted file mode 100644
index 4593c31d118..00000000000
--- a/sim/testsuite/sim/frv/ldc.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# frv testcase for ldc @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldc
-ldc:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-
-	set_gr_immed	0,gr7
-	ldc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr8
-
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	ldc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr8
-
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	ldc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldcu.cgs b/sim/testsuite/sim/frv/ldcu.cgs
deleted file mode 100644
index 69890a8f6a4..00000000000
--- a/sim/testsuite/sim/frv/ldcu.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for ldcu @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldcu
-ldcu:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-
-	set_gr_immed	0,gr7
-	ldcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr8
-	test_gr_gr	sp,gr20
-
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	ldcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr8
-	test_gr_gr	sp,gr20
-
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	ldcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr8
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldd.cgs b/sim/testsuite/sim/frv/ldd.cgs
deleted file mode 100644
index fa09d31d963..00000000000
--- a/sim/testsuite/sim/frv/ldd.cgs
+++ /dev/null
@@ -1,43 +0,0 @@
-# frv testcase for ldd @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldd
-ldd:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	ldd 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	ldd 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	ldd 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	; loading into gr0 should have no effect
-	; gr1 is sp
-	set_gr_gr	gr1,gr8
-	ldd 		@(sp,gr7),gr0
-	test_gr_immed	0,gr0
-	test_gr_gr	gr1,gr8
-	pass
diff --git a/sim/testsuite/sim/frv/lddc.cgs b/sim/testsuite/sim/frv/lddc.cgs
deleted file mode 100644
index e01a2146ef1..00000000000
--- a/sim/testsuite/sim/frv/lddc.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# frv testcase for lddc @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global lddc
-lddc:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-
-	set_gr_immed	0,gr7
-	; loading into cpr0 is business as usual
-	set_cpr_limmed	0xdead,0xbeef,cpr0
-	set_cpr_limmed	0xbeef,0xdead,cpr1
-	lddc 		@(sp,gr7),cpr0
-	test_cpr_limmed	0xbeef,0xdead,cpr0
-	test_cpr_limmed	0xdead,0xbeef,cpr1
-
-	lddc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xbeef,0xdead,cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr9
-
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	lddc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xbeef,0xdead,cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr9
-
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	lddc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xbeef,0xdead,cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/lddcu.cgs b/sim/testsuite/sim/frv/lddcu.cgs
deleted file mode 100644
index b4ed485fa27..00000000000
--- a/sim/testsuite/sim/frv/lddcu.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv testcase for lddcu @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global lddcu
-lddcu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-
-	set_gr_immed	0,gr7
-	lddcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xbeef,0xdead,cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr9
-	test_gr_gr	sp,gr20
-
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	lddcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xbeef,0xdead,cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr9
-	test_gr_gr	sp,gr20
-
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	lddcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0xbeef,0xdead,cpr8
-	test_cpr_limmed	0xdead,0xbeef,cpr9
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/lddf.cgs b/sim/testsuite/sim/frv/lddf.cgs
deleted file mode 100644
index f7bae78935d..00000000000
--- a/sim/testsuite/sim/frv/lddf.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# frv testcase for lddf @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global lddf
-lddf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	; loading into fr0 is business as usual
-	set_fr_iimmed	0xdead,0xbeef,fr0
-	set_fr_iimmed	0xbeef,0xdead,fr1
-	lddf 		@(sp,gr7),fr0
-	test_fr_limmed	0xbeef,0xdead,fr0
-	test_fr_limmed	0xdead,0xbeef,fr1
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	lddf 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	lddf 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	lddf 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/lddfi.cgs b/sim/testsuite/sim/frv/lddfi.cgs
deleted file mode 100644
index 1eac91632f4..00000000000
--- a/sim/testsuite/sim/frv/lddfi.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for lddfi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global lddfi
-lddfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	lddfi 		@(sp,0),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	lddfi 		@(sp,8),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	lddfi 		@(sp,-8),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/lddfu.cgs b/sim/testsuite/sim/frv/lddfu.cgs
deleted file mode 100644
index cb4c86eed02..00000000000
--- a/sim/testsuite/sim/frv/lddfu.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# frv testcase for lddfu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global lddfu
-lddfu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	lddfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	lddfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	lddfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/lddi.cgs b/sim/testsuite/sim/frv/lddi.cgs
deleted file mode 100644
index 38ef2b4f728..00000000000
--- a/sim/testsuite/sim/frv/lddi.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for lddi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global lddi
-lddi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	lddi 		@(sp,0),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	lddi 		@(sp,8),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	lddi 		@(sp,-8),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/lddu.cgs b/sim/testsuite/sim/frv/lddu.cgs
deleted file mode 100644
index 5b2ead17720..00000000000
--- a/sim/testsuite/sim/frv/lddu.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for lddu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global lddu
-lddu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	lddu 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	lddu 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	lddu 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	set_gr_gr	sp,gr8
-	lddu 		@(gr8,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldf.cgs b/sim/testsuite/sim/frv/ldf.cgs
deleted file mode 100644
index 996d72c9e89..00000000000
--- a/sim/testsuite/sim/frv/ldf.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# frv testcase for ldf @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldf
-ldf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	ldf 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	ldf 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	ldf 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldfi.cgs b/sim/testsuite/sim/frv/ldfi.cgs
deleted file mode 100644
index e5ea94dbda4..00000000000
--- a/sim/testsuite/sim/frv/ldfi.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for ldfi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldfi
-ldfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	ldfi 		@(sp,0),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	ldfi 		@(sp,4),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	ldfi 		@(sp,-4),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldfu.cgs b/sim/testsuite/sim/frv/ldfu.cgs
deleted file mode 100644
index 08f67db4375..00000000000
--- a/sim/testsuite/sim/frv/ldfu.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# frv testcase for ldfu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldfu
-ldfu:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	ldfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	ldfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	ldfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldhf.cgs b/sim/testsuite/sim/frv/ldhf.cgs
deleted file mode 100644
index 8935ac7fd61..00000000000
--- a/sim/testsuite/sim/frv/ldhf.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for ldhf @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldhf
-ldhf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	ldhf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0xdead,fr8
-
-	set_gr_immed	2,gr7
-	ldhf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0xbeef,fr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	ldhf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldhfi.cgs b/sim/testsuite/sim/frv/ldhfi.cgs
deleted file mode 100644
index 362ec504854..00000000000
--- a/sim/testsuite/sim/frv/ldhfi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for ldhfi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldhfi
-ldhfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	ldhfi 		@(sp,0),fr8
-	test_fr_limmed	0x0000,0xdead,fr8
-
-	ldhfi 		@(sp,2),fr8
-	test_fr_limmed	0x0000,0xbeef,fr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	ldhfi 		@(sp,-2),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldhfu.cgs b/sim/testsuite/sim/frv/ldhfu.cgs
deleted file mode 100644
index 0b342e1e7dc..00000000000
--- a/sim/testsuite/sim/frv/ldhfu.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# frv testcase for ldhfu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldhfu
-ldhfu:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	ldhfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0xdead,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	ldhfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0xbeef,fr8
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	ldhfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldi.cgs b/sim/testsuite/sim/frv/ldi.cgs
deleted file mode 100644
index f36b95d9f58..00000000000
--- a/sim/testsuite/sim/frv/ldi.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for ldi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldi
-ldi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	ldi 		@(sp,0),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	ldi 		@(sp,4),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	ldi 		@(sp,-4),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldq.cgs b/sim/testsuite/sim/frv/ldq.cgs
deleted file mode 100644
index e61f1de1c7b..00000000000
--- a/sim/testsuite/sim/frv/ldq.cgs
+++ /dev/null
@@ -1,64 +0,0 @@
-# frv testcase for ldq @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldq
-ldq:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	ldq 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	ldq 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	ldq 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	; loading into gr0 has no effect
-	; gr1 is sp
-	set_gr_gr	gr1,gr8
-	set_gr_limmed	0x1234,0x5678,gr2
-	set_gr_limmed	0x9abc,0xdef0,gr3
-	ldq 		@(sp,gr7),gr0
-	test_gr_immed	0,gr0
-	test_gr_gr	gr1,gr8
-	set_gr_immed	0x12345678,gr2
-	set_gr_immed	0x9abcdef0,gr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldqc.cgs b/sim/testsuite/sim/frv/ldqc.cgs
deleted file mode 100644
index 64b6a6afa61..00000000000
--- a/sim/testsuite/sim/frv/ldqc.cgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# frv testcase for ldqc @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldqc
-ldqc:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	set_cpr_limmed	0x1234,0x5678,cpr10
-	set_cpr_limmed	0x9abc,0xdef0,cpr11
-
-	set_gr_immed	0,gr7
-	;loading into cpr0 is business as usual
-	ldqc 		@(sp,gr7),cpr0
-	test_cpr_limmed	0x9abc,0xdef0,cpr0
-	test_cpr_limmed	0x1234,0x5678,cpr1
-	test_cpr_limmed	0xbeef,0xdead,cpr2
-	test_cpr_limmed	0xdead,0xbeef,cpr3
-
-	ldqc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0x9abc,0xdef0,cpr8
-	test_cpr_limmed	0x1234,0x5678,cpr9
-	test_cpr_limmed	0xbeef,0xdead,cpr10
-	test_cpr_limmed	0xdead,0xbeef,cpr11
-
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	set_cpr_limmed	0x1234,0x5678,cpr10
-	set_cpr_limmed	0x9abc,0xdef0,cpr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	ldqc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0x9abc,0xdef0,cpr8
-	test_cpr_limmed	0x1234,0x5678,cpr9
-	test_cpr_limmed	0xbeef,0xdead,cpr10
-	test_cpr_limmed	0xdead,0xbeef,cpr11
-
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	set_cpr_limmed	0x1234,0x5678,cpr10
-	set_cpr_limmed	0x9abc,0xdef0,cpr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	ldqc 		@(sp,gr7),cpr8
-	test_cpr_limmed	0x9abc,0xdef0,cpr8
-	test_cpr_limmed	0x1234,0x5678,cpr9
-	test_cpr_limmed	0xbeef,0xdead,cpr10
-	test_cpr_limmed	0xdead,0xbeef,cpr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldqcu.cgs b/sim/testsuite/sim/frv/ldqcu.cgs
deleted file mode 100644
index 18d9246c542..00000000000
--- a/sim/testsuite/sim/frv/ldqcu.cgs
+++ /dev/null
@@ -1,57 +0,0 @@
-# frv testcase for ldqcu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldqcu
-ldqcu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	set_cpr_limmed	0x1234,0x5678,cpr10
-	set_cpr_limmed	0x9abc,0xdef0,cpr11
-
-	set_gr_immed	0,gr7
-	ldqcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0x9abc,0xdef0,cpr8
-	test_cpr_limmed	0x1234,0x5678,cpr9
-	test_cpr_limmed	0xbeef,0xdead,cpr10
-	test_cpr_limmed	0xdead,0xbeef,cpr11
-	test_gr_gr	sp,gr20
-
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	set_cpr_limmed	0x1234,0x5678,cpr10
-	set_cpr_limmed	0x9abc,0xdef0,cpr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	ldqcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0x9abc,0xdef0,cpr8
-	test_cpr_limmed	0x1234,0x5678,cpr9
-	test_cpr_limmed	0xbeef,0xdead,cpr10
-	test_cpr_limmed	0xdead,0xbeef,cpr11
-	test_gr_gr	sp,gr20
-
-	set_cpr_limmed	0xdead,0xbeef,cpr8
-	set_cpr_limmed	0xbeef,0xdead,cpr9
-	set_cpr_limmed	0x1234,0x5678,cpr10
-	set_cpr_limmed	0x9abc,0xdef0,cpr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	ldqcu 		@(sp,gr7),cpr8
-	test_cpr_limmed	0x9abc,0xdef0,cpr8
-	test_cpr_limmed	0x1234,0x5678,cpr9
-	test_cpr_limmed	0xbeef,0xdead,cpr10
-	test_cpr_limmed	0xdead,0xbeef,cpr11
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldqf.cgs b/sim/testsuite/sim/frv/ldqf.cgs
deleted file mode 100644
index 66fb65c130f..00000000000
--- a/sim/testsuite/sim/frv/ldqf.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for ldqf @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldqf
-ldqf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-
-	set_gr_immed	0,gr7
-	; loading into fr0 is business as usual
-	ldqf 		@(sp,gr7),fr0
-	test_fr_limmed	0x9abc,0xdef0,fr0
-	test_fr_limmed	0x1234,0x5678,fr1
-	test_fr_limmed	0xbeef,0xdead,fr2
-	test_fr_limmed	0xdead,0xbeef,fr3
-
-	ldqf 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	ldqf 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	ldqf 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldqfi.cgs b/sim/testsuite/sim/frv/ldqfi.cgs
deleted file mode 100644
index 28c3b1f3247..00000000000
--- a/sim/testsuite/sim/frv/ldqfi.cgs
+++ /dev/null
@@ -1,51 +0,0 @@
-# frv testcase for ldqfi @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldqfi
-ldqfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-
-	ldqfi 		@(sp,0),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	-16,sp
-	ldqfi 		@(sp,16),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	32,sp
-	ldqfi 		@(sp,-16),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldqfu.cgs b/sim/testsuite/sim/frv/ldqfu.cgs
deleted file mode 100644
index 7287958166d..00000000000
--- a/sim/testsuite/sim/frv/ldqfu.cgs
+++ /dev/null
@@ -1,58 +0,0 @@
-# frv testcase for ldqfu @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldqfu
-ldqfu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-
-	set_gr_immed	0,gr7
-	ldqfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	ldqfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_gr_gr	sp,gr20
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	ldqfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldqi.cgs b/sim/testsuite/sim/frv/ldqi.cgs
deleted file mode 100644
index 64d66f2f766..00000000000
--- a/sim/testsuite/sim/frv/ldqi.cgs
+++ /dev/null
@@ -1,51 +0,0 @@
-# frv testcase for ldqi @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldqi
-ldqi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	ldqi 		@(sp,0),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	ldqi 		@(sp,16),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	ldqi 		@(sp,-16),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldqu.cgs b/sim/testsuite/sim/frv/ldqu.cgs
deleted file mode 100644
index 263eae1b60f..00000000000
--- a/sim/testsuite/sim/frv/ldqu.cgs
+++ /dev/null
@@ -1,71 +0,0 @@
-# frv testcase for ldqu @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldqu
-ldqu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	ldqu 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	ldqu 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	ldqu 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	set_gr_gr	sp,gr8
-	ldqu 		@(gr8,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldsb.cgs b/sim/testsuite/sim/frv/ldsb.cgs
deleted file mode 100644
index 4b10639ca9f..00000000000
--- a/sim/testsuite/sim/frv/ldsb.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for ldsb @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldsb
-ldsb:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	ldsb 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xffde,gr8
-
-	set_gr_immed	1,gr7
-	ldsb 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xffad,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	ldsb 		@(sp,gr7),gr8
-	test_gr_immed	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldsbi.cgs b/sim/testsuite/sim/frv/ldsbi.cgs
deleted file mode 100644
index c90a129f317..00000000000
--- a/sim/testsuite/sim/frv/ldsbi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for ldsbi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldsbi
-ldsbi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	ldsbi 		@(sp,0),gr8
-	test_gr_limmed	0xffff,0xffde,gr8
-
-	ldsbi 		@(sp,1),gr8
-	test_gr_limmed	0xffff,0xffad,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	ldsbi 		@(sp,-1),gr8
-	test_gr_immed	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldsbu.cgs b/sim/testsuite/sim/frv/ldsbu.cgs
deleted file mode 100644
index 976cee8204c..00000000000
--- a/sim/testsuite/sim/frv/ldsbu.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# frv testcase for ldsbu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldsbu
-ldsbu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	ldsbu 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xffde,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	1,gr9
-	set_gr_immed	1,gr7
-	ldsbu 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xffad,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	ldsbu 		@(sp,gr7),gr8
-	test_gr_immed	0,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-3,sp
-	set_mem_limmed	0x0000,0x00da,sp
-	set_gr_immed	3,gr7
-	ldsbu 		@(sp,gr7),sp
-	test_gr_limmed	0xffff,0xffda,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldsh.cgs b/sim/testsuite/sim/frv/ldsh.cgs
deleted file mode 100644
index c526f39c71d..00000000000
--- a/sim/testsuite/sim/frv/ldsh.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for ldsh @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldsh
-ldsh:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	ldsh 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	ldsh 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xbeef,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	ldsh 		@(sp,gr7),gr8
-	test_gr_immed	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldshi.cgs b/sim/testsuite/sim/frv/ldshi.cgs
deleted file mode 100644
index 69f99f13e83..00000000000
--- a/sim/testsuite/sim/frv/ldshi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for ldshi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldshi
-ldshi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	ldshi 		@(sp,0),gr8
-	test_gr_limmed	0xffff,0xdead,gr8
-
-	ldshi 		@(sp,2),gr8
-	test_gr_limmed	0xffff,0xbeef,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	ldshi 		@(sp,-2),gr8
-	test_gr_immed	0,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldshu.cgs b/sim/testsuite/sim/frv/ldshu.cgs
deleted file mode 100644
index f1b8c23c5ea..00000000000
--- a/sim/testsuite/sim/frv/ldshu.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for ldshu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldshu
-ldshu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	ldshu 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	set_gr_immed	2,gr7
-	ldshu 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	ldshu 		@(sp,gr7),gr8
-	test_gr_immed	0,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0x0000,0xdead,sp
-	set_gr_immed	2,gr7
-	ldshu 		@(sp,gr7),sp
-	test_gr_limmed	0xffff,0xdead,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldu.cgs b/sim/testsuite/sim/frv/ldu.cgs
deleted file mode 100644
index b7f2e34aaaf..00000000000
--- a/sim/testsuite/sim/frv/ldu.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for ldu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldu
-ldu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	ldu 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	ldu 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	ldu 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	ldu 		@(sp,gr7),sp
-	test_gr_limmed	0xdead,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldub.cgs b/sim/testsuite/sim/frv/ldub.cgs
deleted file mode 100644
index 1e192542a22..00000000000
--- a/sim/testsuite/sim/frv/ldub.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for ldub @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldub
-ldub:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	ldub 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x00de,gr8
-
-	set_gr_immed	1,gr7
-	ldub 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x00ad,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	ldub 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldubi.cgs b/sim/testsuite/sim/frv/ldubi.cgs
deleted file mode 100644
index 4c40beebc5e..00000000000
--- a/sim/testsuite/sim/frv/ldubi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for ldubi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldubi
-ldubi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	ldubi 		@(sp,0),gr8
-	test_gr_limmed	0x0000,0x00de,gr8
-
-	ldubi 		@(sp,1),gr8
-	test_gr_limmed	0x0000,0x00ad,gr8
-
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	ldubi 		@(sp,-1),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/ldubu.cgs b/sim/testsuite/sim/frv/ldubu.cgs
deleted file mode 100644
index 8c99ab072a5..00000000000
--- a/sim/testsuite/sim/frv/ldubu.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for ldubu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldubu
-ldubu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	ldubu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x00de,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	1,gr9
-	set_gr_immed	1,gr7
-	ldubu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x00ad,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	ldubu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	inc_gr_immed	-3,sp
-	set_mem_limmed	0xffff,0xffda,sp
-	set_gr_immed	3,gr7
-	ldubu 		@(sp,gr7),sp
-	test_gr_limmed	0x0000,0x00da,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/lduh.cgs b/sim/testsuite/sim/frv/lduh.cgs
deleted file mode 100644
index 24c3bac4b40..00000000000
--- a/sim/testsuite/sim/frv/lduh.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for lduh @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global lduh
-lduh:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_immed	0,gr7
-	lduh 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0xdead,gr8
-
-	set_gr_immed	2,gr7
-	lduh 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0xbeef,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	lduh 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/lduhi.cgs b/sim/testsuite/sim/frv/lduhi.cgs
deleted file mode 100644
index b9896d62f58..00000000000
--- a/sim/testsuite/sim/frv/lduhi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for lduhi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global lduhi
-lduhi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	lduhi 		@(sp,0),gr8
-	test_gr_limmed	0x0000,0xdead,gr8
-
-	lduhi 		@(sp,2),gr8
-	test_gr_limmed	0x0000,0xbeef,gr8
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	lduhi 		@(sp,-2),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/lduhu.cgs b/sim/testsuite/sim/frv/lduhu.cgs
deleted file mode 100644
index 52faecf6234..00000000000
--- a/sim/testsuite/sim/frv/lduhu.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for lduhu @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global lduhu
-lduhu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	lduhu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0xdead,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	2,gr9
-	set_gr_immed	2,gr7
-	lduhu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0xbeef,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	lduhu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_gr_gr	sp,gr9
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0xdead,sp
-	set_gr_immed	2,gr7
-	lduhu 		@(sp,gr7),sp
-	test_gr_limmed	0x0000,0xdead,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/lrbranch.pcgs b/sim/testsuite/sim/frv/lrbranch.pcgs
deleted file mode 100644
index 0ac1a7568dd..00000000000
--- a/sim/testsuite/sim/frv/lrbranch.pcgs
+++ /dev/null
@@ -1,51 +0,0 @@
-# frv parallel testcase for lr branching
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global lrbranch
-lrbranch:
-	; Both conditions true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_icc		0x4 0
-	bcgelr.p	icc0,0,0
-	bra   		ok4
-	fail
-ok1:
-	test_spr_immed 	127,LCR
-
-	; Only first condition true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok2,lr
-	set_icc		0x0 0
-	bcgelr.p	icc0,0,0
-	bno
-	fail
-ok2:
-	test_spr_immed 	127,LCR
-
-	; Only second condition true
-	set_spr_immed	128,lcr
-	set_spr_addr	ok3,lr
-	set_icc		0x8 0
-	bcgelr.p	icc0,0,0
-	bra   		ok3
-	fail
-ok3:
-	test_spr_immed 	127,LCR
-
-	; Both conditions false
-	set_spr_immed	128,lcr
-	set_spr_addr	ok4,lr
-	set_icc		0x0 0
-	bceqlr.p	icc0,0,0
-	bno
-	test_spr_immed 	127,LCR
-
-	pass
-
-ok4:
-	fail
diff --git a/sim/testsuite/sim/frv/mabshs.cgs b/sim/testsuite/sim/frv/mabshs.cgs
deleted file mode 100644
index 29b25328732..00000000000
--- a/sim/testsuite/sim/frv/mabshs.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# frv testcase for mabshs $FRj,$FRk
-# mach: fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mabshs
-mabshs:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x0000,0x0000,fr11
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0001,0xffff,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x0001,0x0001,fr11
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7fff,0x8001,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x7fff,0x7fff,fr11
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x7fff,0x7fff,fr11
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	mabshs		fr10,fr11
-	test_fr_limmed	0x7fff,0x7fff,fr11
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	mabshs.p	fr10,fr12
-	mabshs		fr11,fr13
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	0x3c,2,0x8,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/maddhss.cgs b/sim/testsuite/sim/frv/maddhss.cgs
deleted file mode 100644
index 289ecc77d8a..00000000000
--- a/sim/testsuite/sim/frv/maddhss.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for maddhss $FRi,$FRj,$FRj
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global maddhss
-maddhss:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x1233,0x5677,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maddhss		fr10,fr11,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maddhss		fr10,fr11,fr12
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	maddhss.p	fr10,fr10,fr12
-	maddhss		fr11,fr11,fr13
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie not set
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/maddhus.cgs b/sim/testsuite/sim/frv/maddhus.cgs
deleted file mode 100644
index fe96e696629..00000000000
--- a/sim/testsuite/sim/frv/maddhus.cgs
+++ /dev/null
@@ -1,89 +0,0 @@
-# frv testcase for maddhus $FRi,$FRj,$FRj
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global maddhus
-maddhus:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0xbeef,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0x2345,0x6789,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0x8000,0x7fff,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xfffe,0xfffe,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0002,0x0001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maddhus		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xffff,fr12
-	test_spr_bits	0x3c,2,8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	maddhus.p	fr10,fr10,fr12
-	maddhus		fr11,fr11,fr13
-	test_fr_limmed	0x0002,0x0002,fr12
-	test_fr_limmed	0xffff,0xffff,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/mand.cgs b/sim/testsuite/sim/frv/mand.cgs
deleted file mode 100644
index c6aa993fa0a..00000000000
--- a/sim/testsuite/sim/frv/mand.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# frv testcase for mand $FRinti,$FRintj,$FRintk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mand
-mand:
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed  	0x5555,0x5555,fr8
-	mand      	fr7,fr8,fr8
-	test_fr_iimmed 	0,fr8
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	mand		fr7,fr8,fr8
-	test_fr_iimmed 	0xaaaa0000,fr8
-
-	set_fr_iimmed	0x0000,0xffff,fr8
-	mand		fr7,fr8,fr8
-	test_fr_iimmed	0x0000aaaa,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/maveh.cgs b/sim/testsuite/sim/frv/maveh.cgs
deleted file mode 100644
index d48ad72553b..00000000000
--- a/sim/testsuite/sim/frv/maveh.cgs
+++ /dev/null
@@ -1,72 +0,0 @@
-# frv testcase for maveh $FRi,$FRj,$FRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global maveh
-maveh:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x0000,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0001,0x0000,fr12
-
-	set_fr_iimmed	0x0000,0xffff,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xfffe,fr12
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xef56,0xdf77,fr12
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xdf77,0xef56,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x11a2,0x33c4,fr12
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x0919,0x2b3b,fr12
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0x4000,0x3fff,fr12
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xffff,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xc000,0xbfff,fr12
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0xfffe,0xfffe,fr11
-	maveh		fr10,fr11,fr12
-	test_fr_limmed	0xbfff,0xbfff,fr12
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	maveh.p		fr10,fr10,fr12
-	maveh		fr11,fr11,fr13
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr13
-
-	pass
diff --git a/sim/testsuite/sim/frv/mbtoh.cgs b/sim/testsuite/sim/frv/mbtoh.cgs
deleted file mode 100644
index 52895ad4a21..00000000000
--- a/sim/testsuite/sim/frv/mbtoh.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# frv testcase for mbtoh $FRj,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mbtoh
-mbtoh:
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	mbtoh		fr10,fr12
-	test_fr_limmed	0x00de,0x00ad,fr12
-	test_fr_limmed	0x00be,0x00ef,fr13
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	mbtoh		fr10,fr12
-	test_fr_limmed	0x0012,0x0034,fr12
-	test_fr_limmed	0x0056,0x0078,fr13
-
-	pass
diff --git a/sim/testsuite/sim/frv/mbtohe.cgs b/sim/testsuite/sim/frv/mbtohe.cgs
deleted file mode 100644
index 1e978ec59e4..00000000000
--- a/sim/testsuite/sim/frv/mbtohe.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for mbtohe $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global mbtohe
-mbtohe:
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	mbtohe		fr10,fr12
-	test_fr_limmed	0x00de,0x00de,fr12
-	test_fr_limmed	0x00ad,0x00ad,fr13
-	test_fr_limmed	0x00be,0x00be,fr14
-	test_fr_limmed	0x00ef,0x00ef,fr15
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	mbtohe		fr10,fr12
-	test_fr_limmed	0x0012,0x0012,fr12
-	test_fr_limmed	0x0034,0x0034,fr13
-	test_fr_limmed	0x0056,0x0056,fr14
-	test_fr_limmed	0x0078,0x0078,fr15
-
-	pass
diff --git a/sim/testsuite/sim/frv/mclracc.cgs b/sim/testsuite/sim/frv/mclracc.cgs
deleted file mode 100644
index 7972b9a9cfc..00000000000
--- a/sim/testsuite/sim/frv/mclracc.cgs
+++ /dev/null
@@ -1,79 +0,0 @@
-# frv testcase for mclracc $ACC40k,$A
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global mclracc
-mclracc:
-	set_accg_immed	0xff,accg0
-	set_acc_immed	-1,acc0
-	set_accg_immed	0xff,accg8
-	set_acc_immed	-1,acc8
-	set_accg_immed	0xff,accg31
-	set_acc_immed	-1,acc31
-	set_accg_immed	0xff,accg62
-	set_acc_immed	-1,acc62
-
-	mclracc		acc63,0		; nop
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg8
-	test_acc_immed	-1,acc8
-	test_accg_immed	0xff,accg31
-	test_acc_immed	-1,acc31
-	test_accg_immed	0xff,accg62
-	test_acc_immed	-1,acc62
-
-	mclracc		acc63,1		; nop
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg8
-	test_acc_immed	-1,acc8
-	test_accg_immed	0xff,accg31
-	test_acc_immed	-1,acc31
-	test_accg_immed	0xff,accg62
-	test_acc_immed	-1,acc62
-
-	mclracc		acc31,0
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg8
-	test_acc_immed	-1,acc8
-	test_accg_immed	0,accg31
-	test_acc_immed	0,acc31
-	test_accg_immed	0xff,accg62
-	test_acc_immed	-1,acc62
-
-	mclracc		acc62,1
-	test_accg_immed	0xff,accg0
-	test_acc_immed	-1,acc0
-	test_accg_immed	0xff,accg8
-	test_acc_immed	-1,acc8
-	test_accg_immed	0,accg31
-	test_acc_immed	0,acc31
-	test_accg_immed	0,accg62
-	test_acc_immed	0,acc62
-
-	mclracc		acc0,0
-	test_accg_immed	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed	0xff,accg8
-	test_acc_immed	-1,acc8
-	test_accg_immed	0,accg31
-	test_acc_immed	0,acc31
-	test_accg_immed	0,accg62
-	test_acc_immed	0,acc62
-
-	mclracc		acc0,1
-	test_accg_immed	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed	0,accg8
-	test_acc_immed	0,acc8
-	test_accg_immed	0,accg31
-	test_acc_immed	0,acc31
-	test_accg_immed	0,accg62
-	test_acc_immed	0,acc62
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcmpsh.cgs b/sim/testsuite/sim/frv/mcmpsh.cgs
deleted file mode 100644
index 50e986d0406..00000000000
--- a/sim/testsuite/sim/frv/mcmpsh.cgs
+++ /dev/null
@@ -1,138 +0,0 @@
-# frv testcase for mcmpsh $FRi,$FRj,$FCCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcmpsh
-mcmpsh:
-	set_fr_iimmed	0x7fff,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x2,1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x4,1
-
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x4,1
-
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x2,1
-
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x2,1
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x4,1
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpsh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcmpuh.cgs b/sim/testsuite/sim/frv/mcmpuh.cgs
deleted file mode 100644
index a6670b736f7..00000000000
--- a/sim/testsuite/sim/frv/mcmpuh.cgs
+++ /dev/null
@@ -1,138 +0,0 @@
-# frv testcase for mcmpuh $FRi,$FRj,$FCCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcmpuh
-mcmpuh:
-	set_fr_iimmed	0x7fff,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x4,1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x2,1
-
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x2,1
-
-	set_fr_iimmed	0x7fff,0x8000,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x4,1
-
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x8000,0x7fff,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x4,1
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x8,1
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x2,1
-
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	mcmpuh		fr10,fr11,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcop1.cgs b/sim/testsuite/sim/frv/mcop1.cgs
deleted file mode 100644
index 5405456f51f..00000000000
--- a/sim/testsuite/sim/frv/mcop1.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# frv testcase for mcop1 $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcop1
-mcop1:
-	mcop1.p		fr19,fr12,fr13	; mp_exception: not-implemented
-	mcop1		fr20,fr14,fr18	; mp_exception: not-implemented
-	test_spr_bits	0x7000,12,5,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	mcop1.p		fr19,fr12,fr13	; mp_exception: not-implemented
-	mcop1		fr20,fr14,fr18	; mp_exception: not-implemented
-	test_spr_bits	0x7000,12,5,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	mcop1		fr19,fr12,fr13	; mp_exception: not-implemented
-	test_spr_bits	0x7000,12,5,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	mcop1		fr19,fr12,fr13	; mp_exception: not-implemented
-	test_spr_bits	0x7000,12,5,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcop2.cgs b/sim/testsuite/sim/frv/mcop2.cgs
deleted file mode 100644
index f423a3ef7f7..00000000000
--- a/sim/testsuite/sim/frv/mcop2.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# frv testcase for mcop2 $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcop2
-mcop2:
-	mcop2.p		fr19,fr12,fr13	; mp_exception: not-implemented
-	mcop2		fr20,fr14,fr18	; mp_exception: not-implemented
-	test_spr_bits	0x7000,12,5,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	mcop2.p		fr19,fr12,fr13	; mp_exception: not-implemented
-	mcop2		fr20,fr14,fr18	; mp_exception: not-implemented
-	test_spr_bits	0x7000,12,5,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	mcop2		fr19,fr12,fr13	; mp_exception: not-implemented
-	test_spr_bits	0x7000,12,5,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	mcop2		fr19,fr12,fr13	; mp_exception: not-implemented
-	test_spr_bits	0x7000,12,5,msr0; msr0.mtt is set
-	test_spr_bits	0x003c,2,0,msr0	; msr0.sie is clear
-	test_spr_bits	0x0002,1,0,msr0	; msr0.ovf is clear
-	test_spr_bits	0x003c,2,0,msr1	; msr1.sie is clear
-	test_spr_bits	0x0002,1,0,msr1	; msr1.ovf is clear
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcplhi.cgs b/sim/testsuite/sim/frv/mcplhi.cgs
deleted file mode 100644
index d1a52eb637a..00000000000
--- a/sim/testsuite/sim/frv/mcplhi.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase for mcplhi $FRi,$s6,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcplhi
-mcplhi:
-	set_fr_iimmed   0xdead,0xbeef,fr8
-	set_fr_iimmed   0xbeef,0xdead,fr9
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0x0,fr10	; Shift by 0
-	test_fr_iimmed  0xdead5678,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0x1,fr10	; Shift by 1
-	test_fr_iimmed  0xbd5b5678,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0x4,fr10	; Shift by 4
-	test_fr_iimmed  0xeadf5678,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0xc,fr10	; Shift by 12
-	test_fr_iimmed  0xdeef5678,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0xf,fr10	; Shift by 15
-	test_fr_iimmed  0xbeef5678,fr10
-
-	; test again with truncated shift values
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0x10,fr10	; Shift by 0
-	test_fr_iimmed  0xdead5678,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0x21,fr10	; Shift by 1
-	test_fr_iimmed  0xbd5b5678,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0x34,fr10	; Shift by 4
-	test_fr_iimmed  0xeadf5678,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0x1c,fr10	; Shift by 12
-	test_fr_iimmed  0xdeef5678,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcplhi      	fr8,0x2f,fr10	; Shift by 15
-	test_fr_iimmed  0xbeef5678,fr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcpli.cgs b/sim/testsuite/sim/frv/mcpli.cgs
deleted file mode 100644
index b63ec67a733..00000000000
--- a/sim/testsuite/sim/frv/mcpli.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for mcpli $FRi,$s6,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcpli
-mcpli:
-	set_fr_iimmed   0xdead,0xbeef,fr8
-	set_fr_iimmed   0xbeef,0xdead,fr9
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x0,fr10	; Shift by 0
-	test_fr_iimmed  0xdeadbeef,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x1,fr10	; Shift by 1
-	test_fr_iimmed  0xbd5b7ddf,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x4,fr10	; Shift by 4
-	test_fr_iimmed  0xeadbeefd,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0xc,fr10	; Shift by 12
-	test_fr_iimmed  0xdbeefead,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x1c,fr10	; Shift by 28
-	test_fr_iimmed  0xfeefdead,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x1f,fr10	; Shift by 31
-	test_fr_iimmed  0xbeefdead,fr10
-
-	; test again with truncated shift values
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x20,fr10	; Shift by 0
-	test_fr_iimmed  0xdeadbeef,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x21,fr10	; Shift by 1
-	test_fr_iimmed  0xbd5b7ddf,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x24,fr10	; Shift by 4
-	test_fr_iimmed  0xeadbeefd,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x2c,fr10	; Shift by 12
-	test_fr_iimmed  0xdbeefead,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x3c,fr10	; Shift by 28
-	test_fr_iimmed  0xfeefdead,fr10
-
-	set_fr_iimmed   0x1234,0x5678,fr10
-	mcpli      	fr8,0x3f,fr10	; Shift by 31
-	test_fr_iimmed  0xbeefdead,fr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcpxis.cgs b/sim/testsuite/sim/frv/mcpxis.cgs
deleted file mode 100644
index c3dad019c90..00000000000
--- a/sim/testsuite/sim/frv/mcpxis.cgs
+++ /dev/null
@@ -1,115 +0,0 @@
-# frv testcase for mcpxis $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcpxis
-mcpxis:
-	; Positive operands
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 0x00,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	3,acc0
-
-	set_fr_iimmed	0x3ff8,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x0007,2,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xc000,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-9,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 0xff,accg0
-	test_acc_immed 	-6,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-
-	set_fr_iimmed  	0x2001,0xffff,fr7	; 15 bit result
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbfff,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x7ffa,acc0
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0x8001,0x0000,acc0
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8000,0x0000,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 0x00,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	3,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mcpxis      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcpxiu.cgs b/sim/testsuite/sim/frv/mcpxiu.cgs
deleted file mode 100644
index 198f0568c40..00000000000
--- a/sim/testsuite/sim/frv/mcpxiu.cgs
+++ /dev/null
@@ -1,76 +0,0 @@
-# frv testcase for mcpxiu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcpxiu
-mcpxiu:
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	26,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,3,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	5,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7fff,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	0x0001,2,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8001,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010001,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; almost max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffb0003,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mcpxiu      	fr7,fr8,acc0
-	test_accg_immed 1,accg0
-	test_acc_immed	0xfffc0002,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcpxrs.cgs b/sim/testsuite/sim/frv/mcpxrs.cgs
deleted file mode 100644
index 1d62a96e7dc..00000000000
--- a/sim/testsuite/sim/frv/mcpxrs.cgs
+++ /dev/null
@@ -1,115 +0,0 @@
-# frv testcase for mcpxrs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcpxrs
-mcpxrs:
-	; Positive operands
-	set_fr_iimmed  	2,4,fr7		; multiply small numbers
-	set_fr_iimmed  	3,5,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-14,acc0
-
-	set_fr_iimmed  	3,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,1,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0007,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ff0,acc0
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x2000,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x4000,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,1,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-3,acc0
-
-	set_fr_iimmed  	0xfffe,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	1,0xfffe,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0xfff9,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbff0,acc0
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x0003,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8006,acc0
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0x8000,0x8000,acc0
-
-	set_fr_iimmed	0x8000,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x7fff,0x8000,acc0
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffc,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffb,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-14,acc0
-
-	set_fr_iimmed  	0xffff,0xffff,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed	0x7fff,0x0000,fr7	; almost max positive result
-	set_fr_iimmed	0x7fff,0x8001,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed	0x8000,0x0000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mcpxrs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcpxru.cgs b/sim/testsuite/sim/frv/mcpxru.cgs
deleted file mode 100644
index 8a543926e69..00000000000
--- a/sim/testsuite/sim/frv/mcpxru.cgs
+++ /dev/null
@@ -1,94 +0,0 @@
-# frv testcase for mcpxru $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcpxru
-mcpxru:
-	set_fr_iimmed  	4,2,fr7		; multiply small numbers
-	set_fr_iimmed  	5,3,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	14,acc0
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	3,1,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-
-	set_fr_iimmed 	0x3fff,1,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffd,acc0
-
-	set_fr_iimmed  	0x4000,1,fr7	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xffff,acc0
-
-	set_fr_iimmed  	0x8000,1,fr7	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x0001ffff,acc0
-
-	set_fr_iimmed  	0x7fff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-
-	set_fr_iimmed  	0xffff,0x0000,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-
-	set_fr_iimmed  	0x0000,0x0001,fr7	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0x0000,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed  	0xfffe,0xffff,fr7	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mcpxru      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcut.cgs b/sim/testsuite/sim/frv/mcut.cgs
deleted file mode 100644
index d6211ab7593..00000000000
--- a/sim/testsuite/sim/frv/mcut.cgs
+++ /dev/null
@@ -1,509 +0,0 @@
-# frv testcase for mcut $ACC40i,$FRj,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcut
-mcut:
-	set_accg_immed   0xffffffe7,accg0
-	set_acc_immed   0x89abcdef,acc0
-
-	set_fr_iimmed	0,0,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xe789abcd,fr11
-
-	set_fr_iimmed	0,1,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xcf13579b,fr11
-
-	set_fr_iimmed	0,2,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x9e26af37,fr11
-
-	set_fr_iimmed	0,3,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x3c4d5e6f,fr11
-
-	set_fr_iimmed	0,4,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x789abcde,fr11
-
-	set_fr_iimmed	0,5,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xf13579bd,fr11
-
-	set_fr_iimmed	0,6,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xe26af37b,fr11
-
-	set_fr_iimmed	0,7,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xc4d5e6f7,fr11
-
-	set_fr_iimmed	0,8,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x89abcdef,fr11
-
-	set_fr_iimmed	0,9,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x13579bde,fr11
-
-	set_fr_iimmed	0,10,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x26af37bc,fr11
-
-	set_fr_iimmed	0,11,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x4d5e6f78,fr11
-
-	set_fr_iimmed	0,12,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x9abcdef0,fr11
-
-	set_fr_iimmed	0,13,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x3579bde0,fr11
-
-	set_fr_iimmed	0,14,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x6af37bc0,fr11
-
-	set_fr_iimmed	0,15,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xd5e6f780,fr11
-
-	set_fr_iimmed	0,16,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xabcdef00,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x579bde00,fr11
-
-	set_fr_iimmed	0,18,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xaf37bc00,fr11
-
-	set_fr_iimmed	0,19,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x5e6f7800,fr11
-
-	set_fr_iimmed	0,20,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xbcdef000,fr11
-
-	set_fr_iimmed	0,21,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x79bde000,fr11
-
-	set_fr_iimmed	0,22,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xf37bc000,fr11
-
-	set_fr_iimmed	0,23,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xe6f78000,fr11
-
-	set_fr_iimmed	0,24,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xcdef0000,fr11
-
-	set_fr_iimmed	0,25,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x9bde0000,fr11
-
-	set_fr_iimmed	0,26,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x37bc0000,fr11
-
-	set_fr_iimmed	0,27,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x6f780000,fr11
-
-	set_fr_iimmed	0,28,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xdef00000,fr11
-
-	set_fr_iimmed	0,29,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xbde00000,fr11
-
-	set_fr_iimmed	0,30,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x7bc00000,fr11
-
-	set_fr_iimmed	0,31,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xf7800000,fr11
-
-	set_fr_iimmed	0,31,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xf7800000,fr11
-
-	set_fr_iimmed	0,64,fr10	; same as 0
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xe789abcd,fr11
-
-	set_fr_iimmed	0xffff,0xffff,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xf3c4d5e6,fr11
-
-	set_fr_iimmed	0x0000,0x003e,fr10	; only lower 6 bits matter
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xf9e26af3,fr11
-
-	set_fr_iimmed	0xffff,0xfffd,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfcf13579,fr11
-
-	set_fr_iimmed	0xffff,0xfffc,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfe789abc,fr11
-
-	set_fr_iimmed	0xffff,0xfffb,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xff3c4d5e,fr11
-
-	set_fr_iimmed	0xffff,0xfffa,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xff9e26af,fr11
-
-	set_fr_iimmed	0xffff,0xfff9,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffcf1357,fr11
-
-	set_fr_iimmed	0xffff,0xfff8,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffe789ab,fr11
-
-	set_fr_iimmed	0xffff,0xfff7,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfff3c4d5,fr11
-
-	set_fr_iimmed	0xffff,0xfff6,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfff9e26a,fr11
-
-	set_fr_iimmed	0xffff,0xfff5,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffcf135,fr11
-
-	set_fr_iimmed	0xffff,0xfff4,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffe789a,fr11
-
-	set_fr_iimmed	0xffff,0xfff3,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffff3c4d,fr11
-
-	set_fr_iimmed	0xffff,0xfff2,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffff9e26,fr11
-
-	set_fr_iimmed	0xffff,0xfff1,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffcf13,fr11
-
-	set_fr_iimmed	0xffff,0xfff0,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffe789,fr11
-
-	set_fr_iimmed	0xffff,0xffef,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffff3c4,fr11
-
-	set_fr_iimmed	0xffff,0xffee,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffff9e2,fr11
-
-	set_fr_iimmed	0xffff,0xffed,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffcf1,fr11
-
-	set_fr_iimmed	0xffff,0xffec,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffe78,fr11
-
-	set_fr_iimmed	0xffff,0xffeb,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffff3c,fr11
-
-	set_fr_iimmed	0xffff,0xffea,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffff9e,fr11
-
-	set_fr_iimmed	0xffff,0xffe9,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffcf,fr11
-
-	set_fr_iimmed	0xffff,0xffe8,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffe7,fr11
-
-	set_fr_iimmed	0xffff,0xffe7,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffff3,fr11
-
-	set_fr_iimmed	0xffff,0xffe6,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffff9,fr11
-
-	set_fr_iimmed	0xffff,0xffe5,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffffc,fr11
-
-	set_fr_iimmed	0xffff,0xffe4,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffffe,fr11
-
-	set_fr_iimmed	0xffff,0xffe3,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_fr_iimmed	0xffff,0xffe2,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_fr_iimmed	0xffff,0xffe1,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_fr_iimmed	0xffff,0xffe0,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_fr_iimmed	0,32,fr10	; same as -32
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_accg_immed   0xffffff67,accg0
-	set_acc_immed   0x89abcdef,acc0
-
-	set_fr_iimmed	0xffff,0xffff,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x33c4d5e6,fr11
-
-	set_fr_iimmed	0x0000,0x003e,fr10	; only lower 6 bits matter
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x19e26af3,fr11
-
-	set_fr_iimmed	0xffff,0xfffd,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x0cf13579,fr11
-
-	set_fr_iimmed	0xffff,0xfffc,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x06789abc,fr11
-
-	set_fr_iimmed	0xffff,0xfffb,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x033c4d5e,fr11
-
-	set_fr_iimmed	0xffff,0xfffa,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x019e26af,fr11
-
-	set_fr_iimmed	0xffff,0xfff9,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00cf1357,fr11
-
-	set_fr_iimmed	0xffff,0xfff8,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x006789ab,fr11
-
-	set_fr_iimmed	0xffff,0xfff7,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x0033c4d5,fr11
-
-	set_fr_iimmed	0xffff,0xfff6,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x0019e26a,fr11
-
-	set_fr_iimmed	0xffff,0xfff5,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x000cf135,fr11
-
-	set_fr_iimmed	0xffff,0xfff4,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x0006789a,fr11
-
-	set_fr_iimmed	0xffff,0xfff3,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00033c4d,fr11
-
-	set_fr_iimmed	0xffff,0xfff2,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00019e26,fr11
-
-	set_fr_iimmed	0xffff,0xfff1,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x0000cf13,fr11
-
-	set_fr_iimmed	0xffff,0xfff0,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00006789,fr11
-
-	set_fr_iimmed	0xffff,0xffef,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x000033c4,fr11
-
-	set_fr_iimmed	0xffff,0xffee,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x000019e2,fr11
-
-	set_fr_iimmed	0xffff,0xffed,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000cf1,fr11
-
-	set_fr_iimmed	0xffff,0xffec,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000678,fr11
-
-	set_fr_iimmed	0xffff,0xffeb,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x0000033c,fr11
-
-	set_fr_iimmed	0xffff,0xffea,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x0000019e,fr11
-
-	set_fr_iimmed	0xffff,0xffe9,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x000000cf,fr11
-
-	set_fr_iimmed	0xffff,0xffe8,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000067,fr11
-
-	set_fr_iimmed	0xffff,0xffe7,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000033,fr11
-
-	set_fr_iimmed	0xffff,0xffe6,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000019,fr11
-
-	set_fr_iimmed	0xffff,0xffe5,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x0000000c,fr11
-
-	set_fr_iimmed	0xffff,0xffe4,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000006,fr11
-
-	set_fr_iimmed	0xffff,0xffe3,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000003,fr11
-
-	set_fr_iimmed	0xffff,0xffe2,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000001,fr11
-
-	set_fr_iimmed	0xffff,0xffe1,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	set_fr_iimmed	0xffff,0xffe0,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	set_fr_iimmed	0,32,fr10	; same as -32
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	; Examples from the customer
-	set_accg_immed   0xffffffff,accg0
-	set_acc_immed   0xffe00000,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	set_fr_iimmed	0,18,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x3fffff00,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0x7f,accg0
-	set_acc_immed   0xffe00000,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	set_fr_iimmed	0,18,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0x08,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x3fffff00,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0xff,accg0
-	set_acc_immed   0xefe00000,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	set_fr_iimmed	0,18,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0x80,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x3fffff00,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0xffffffaf,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-
-	set_fr_iimmed	0xffff,0xfffc,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0xfaf5a5a5,fr11
-
-	set_accg_immed   0x0000002f,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-
-	set_fr_iimmed	0xffff,0xfff9,fr10
-	mcut      	acc0,fr10,fr11
-	test_fr_iimmed  0x005eb4b4,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcuti.cgs b/sim/testsuite/sim/frv/mcuti.cgs
deleted file mode 100644
index e2e702fd79d..00000000000
--- a/sim/testsuite/sim/frv/mcuti.cgs
+++ /dev/null
@@ -1,381 +0,0 @@
-# frv testcase for mcuti $ACC40i,$s6,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcuti
-mcuti:
-	set_accg_immed   0xffffffe7,accg0
-	set_acc_immed   0x89abcdef,acc0
-
-	mcuti      	acc0,0,fr11
-	test_fr_iimmed  0xe789abcd,fr11
-
-	mcuti      	acc0,1,fr11
-	test_fr_iimmed  0xcf13579b,fr11
-
-	mcuti      	acc0,2,fr11
-	test_fr_iimmed  0x9e26af37,fr11
-
-	set_fr_iimmed	0,3,fr10
-	mcuti      	acc0,3,fr11
-	test_fr_iimmed  0x3c4d5e6f,fr11
-
-	mcuti      	acc0,4,fr11
-	test_fr_iimmed  0x789abcde,fr11
-
-	mcuti      	acc0,5,fr11
-	test_fr_iimmed  0xf13579bd,fr11
-
-	mcuti      	acc0,6,fr11
-	test_fr_iimmed  0xe26af37b,fr11
-
-	mcuti      	acc0,7,fr11
-	test_fr_iimmed  0xc4d5e6f7,fr11
-
-	mcuti      	acc0,8,fr11
-	test_fr_iimmed  0x89abcdef,fr11
-
-	mcuti      	acc0,9,fr11
-	test_fr_iimmed  0x13579bde,fr11
-
-	mcuti      	acc0,10,fr11
-	test_fr_iimmed  0x26af37bc,fr11
-
-	mcuti      	acc0,11,fr11
-	test_fr_iimmed  0x4d5e6f78,fr11
-
-	mcuti      	acc0,12,fr11
-	test_fr_iimmed  0x9abcdef0,fr11
-
-	mcuti      	acc0,13,fr11
-	test_fr_iimmed  0x3579bde0,fr11
-
-	mcuti      	acc0,14,fr11
-	test_fr_iimmed  0x6af37bc0,fr11
-
-	mcuti      	acc0,15,fr11
-	test_fr_iimmed  0xd5e6f780,fr11
-
-	mcuti      	acc0,16,fr11
-	test_fr_iimmed  0xabcdef00,fr11
-
-	mcuti      	acc0,17,fr11
-	test_fr_iimmed  0x579bde00,fr11
-
-	mcuti      	acc0,18,fr11
-	test_fr_iimmed  0xaf37bc00,fr11
-
-	mcuti      	acc0,19,fr11
-	test_fr_iimmed  0x5e6f7800,fr11
-
-	mcuti      	acc0,20,fr11
-	test_fr_iimmed  0xbcdef000,fr11
-
-	mcuti      	acc0,21,fr11
-	test_fr_iimmed  0x79bde000,fr11
-
-	mcuti      	acc0,22,fr11
-	test_fr_iimmed  0xf37bc000,fr11
-
-	mcuti      	acc0,23,fr11
-	test_fr_iimmed  0xe6f78000,fr11
-
-	mcuti      	acc0,24,fr11
-	test_fr_iimmed  0xcdef0000,fr11
-
-	mcuti      	acc0,25,fr11
-	test_fr_iimmed  0x9bde0000,fr11
-
-	mcuti      	acc0,26,fr11
-	test_fr_iimmed  0x37bc0000,fr11
-
-	mcuti      	acc0,27,fr11
-	test_fr_iimmed  0x6f780000,fr11
-
-	mcuti      	acc0,28,fr11
-	test_fr_iimmed  0xdef00000,fr11
-
-	mcuti      	acc0,29,fr11
-	test_fr_iimmed  0xbde00000,fr11
-
-	mcuti      	acc0,30,fr11
-	test_fr_iimmed  0x7bc00000,fr11
-
-	mcuti      	acc0,31,fr11
-	test_fr_iimmed  0xf7800000,fr11
-
-	mcuti      	acc0,-1,fr11
-	test_fr_iimmed  0xf3c4d5e6,fr11
-
-	mcuti      	acc0,-2,fr11
-	test_fr_iimmed  0xf9e26af3,fr11
-
-	mcuti      	acc0,-3,fr11
-	test_fr_iimmed  0xfcf13579,fr11
-
-	mcuti      	acc0,-4,fr11
-	test_fr_iimmed  0xfe789abc,fr11
-
-	mcuti      	acc0,-5,fr11
-	test_fr_iimmed  0xff3c4d5e,fr11
-
-	mcuti      	acc0,-6,fr11
-	test_fr_iimmed  0xff9e26af,fr11
-
-	mcuti      	acc0,-7,fr11
-	test_fr_iimmed  0xffcf1357,fr11
-
-	mcuti      	acc0,-8,fr11
-	test_fr_iimmed  0xffe789ab,fr11
-
-	mcuti      	acc0,-9,fr11
-	test_fr_iimmed  0xfff3c4d5,fr11
-
-	mcuti      	acc0,-10,fr11
-	test_fr_iimmed  0xfff9e26a,fr11
-
-	mcuti      	acc0,-11,fr11
-	test_fr_iimmed  0xfffcf135,fr11
-
-	mcuti      	acc0,-12,fr11
-	test_fr_iimmed  0xfffe789a,fr11
-
-	mcuti      	acc0,-13,fr11
-	test_fr_iimmed  0xffff3c4d,fr11
-
-	mcuti      	acc0,-14,fr11
-	test_fr_iimmed  0xffff9e26,fr11
-
-	mcuti      	acc0,-15,fr11
-	test_fr_iimmed  0xffffcf13,fr11
-
-	mcuti      	acc0,-16,fr11
-	test_fr_iimmed  0xffffe789,fr11
-
-	mcuti      	acc0,-17,fr11
-	test_fr_iimmed  0xfffff3c4,fr11
-
-	mcuti      	acc0,-18,fr11
-	test_fr_iimmed  0xfffff9e2,fr11
-
-	mcuti      	acc0,-19,fr11
-	test_fr_iimmed  0xfffffcf1,fr11
-
-	mcuti      	acc0,-20,fr11
-	test_fr_iimmed  0xfffffe78,fr11
-
-	mcuti      	acc0,-21,fr11
-	test_fr_iimmed  0xffffff3c,fr11
-
-	mcuti      	acc0,-22,fr11
-	test_fr_iimmed  0xffffff9e,fr11
-
-	mcuti      	acc0,-23,fr11
-	test_fr_iimmed  0xffffffcf,fr11
-
-	mcuti      	acc0,-24,fr11
-	test_fr_iimmed  0xffffffe7,fr11
-
-	mcuti      	acc0,-25,fr11
-	test_fr_iimmed  0xfffffff3,fr11
-
-	mcuti      	acc0,-26,fr11
-	test_fr_iimmed  0xfffffff9,fr11
-
-	mcuti      	acc0,-27,fr11
-	test_fr_iimmed  0xfffffffc,fr11
-
-	mcuti      	acc0,-28,fr11
-	test_fr_iimmed  0xfffffffe,fr11
-
-	mcuti      	acc0,-29,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	mcuti      	acc0,-30,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	mcuti      	acc0,-31,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	mcuti      	acc0,-32,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_accg_immed   0xffffff67,accg0
-	set_acc_immed   0x89abcdef,acc0
-
-	mcuti      	acc0,-1,fr11
-	test_fr_iimmed  0x33c4d5e6,fr11
-
-	mcuti      	acc0,-2,fr11
-	test_fr_iimmed  0x19e26af3,fr11
-
-	mcuti      	acc0,-3,fr11
-	test_fr_iimmed  0x0cf13579,fr11
-
-	mcuti      	acc0,-4,fr11
-	test_fr_iimmed  0x06789abc,fr11
-
-	mcuti      	acc0,-5,fr11
-	test_fr_iimmed  0x033c4d5e,fr11
-
-	mcuti      	acc0,-6,fr11
-	test_fr_iimmed  0x019e26af,fr11
-
-	mcuti      	acc0,-7,fr11
-	test_fr_iimmed  0x00cf1357,fr11
-
-	mcuti      	acc0,-8,fr11
-	test_fr_iimmed  0x006789ab,fr11
-
-	mcuti      	acc0,-9,fr11
-	test_fr_iimmed  0x0033c4d5,fr11
-
-	mcuti      	acc0,-10,fr11
-	test_fr_iimmed  0x0019e26a,fr11
-
-	mcuti      	acc0,-11,fr11
-	test_fr_iimmed  0x000cf135,fr11
-
-	mcuti      	acc0,-12,fr11
-	test_fr_iimmed  0x0006789a,fr11
-
-	mcuti      	acc0,-13,fr11
-	test_fr_iimmed  0x00033c4d,fr11
-
-	mcuti      	acc0,-14,fr11
-	test_fr_iimmed  0x00019e26,fr11
-
-	mcuti      	acc0,-15,fr11
-	test_fr_iimmed  0x0000cf13,fr11
-
-	mcuti      	acc0,-16,fr11
-	test_fr_iimmed  0x00006789,fr11
-
-	mcuti      	acc0,-17,fr11
-	test_fr_iimmed  0x000033c4,fr11
-
-	mcuti      	acc0,-18,fr11
-	test_fr_iimmed  0x000019e2,fr11
-
-	mcuti      	acc0,-19,fr11
-	test_fr_iimmed  0x00000cf1,fr11
-
-	mcuti      	acc0,-20,fr11
-	test_fr_iimmed  0x00000678,fr11
-
-	mcuti      	acc0,-21,fr11
-	test_fr_iimmed  0x0000033c,fr11
-
-	mcuti      	acc0,-22,fr11
-	test_fr_iimmed  0x0000019e,fr11
-
-	mcuti      	acc0,-23,fr11
-	test_fr_iimmed  0x000000cf,fr11
-
-	mcuti      	acc0,-24,fr11
-	test_fr_iimmed  0x00000067,fr11
-
-	mcuti      	acc0,-25,fr11
-	test_fr_iimmed  0x00000033,fr11
-
-	mcuti      	acc0,-26,fr11
-	test_fr_iimmed  0x00000019,fr11
-
-	mcuti      	acc0,-27,fr11
-	test_fr_iimmed  0x0000000c,fr11
-
-	mcuti      	acc0,-28,fr11
-	test_fr_iimmed  0x00000006,fr11
-
-	mcuti      	acc0,-29,fr11
-	test_fr_iimmed  0x00000003,fr11
-
-	mcuti      	acc0,-30,fr11
-	test_fr_iimmed  0x00000001,fr11
-
-	mcuti      	acc0,-31,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	mcuti      	acc0,-32,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	; Examples from the customer
-	set_accg_immed   0xffffffff,accg0
-	set_acc_immed   0xffe00000,acc0
-
-	mcuti      	acc0,16,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	mcuti      	acc0,17,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	mcuti      	acc0,18,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	mcuti      	acc0,16,fr11
-	test_fr_iimmed  0x3fffff00,fr11
-
-	mcuti      	acc0,17,fr11
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0x7f,accg0
-	set_acc_immed   0xffe00000,acc0
-
-	mcuti      	acc0,16,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	mcuti      	acc0,17,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	mcuti      	acc0,18,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0x08,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	mcuti      	acc0,16,fr11
-	test_fr_iimmed  0x3fffff00,fr11
-
-	mcuti      	acc0,17,fr11
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0xff,accg0
-	set_acc_immed   0xefe00000,acc0
-
-	mcuti      	acc0,16,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	mcuti      	acc0,17,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	mcuti      	acc0,18,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0x80,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	mcuti      	acc0,16,fr11
-	test_fr_iimmed  0x3fffff00,fr11
-
-	mcuti      	acc0,17,fr11
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0xffffffaf,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-
-	mcuti      	acc0,-4,fr11
-	test_fr_iimmed  0xfaf5a5a5,fr11
-
-	set_accg_immed   0x0000002f,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-
-	mcuti      	acc0,-7,fr11
-	test_fr_iimmed  0x005eb4b4,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcutss.cgs b/sim/testsuite/sim/frv/mcutss.cgs
deleted file mode 100644
index efe3278864c..00000000000
--- a/sim/testsuite/sim/frv/mcutss.cgs
+++ /dev/null
@@ -1,505 +0,0 @@
-# frv testcase for mcutss $ACC40i,$FRj,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcutss
-mcutss:
-	set_accg_immed   0xffffffe7,accg0
-	set_acc_immed   0x89abcdef,acc0
-
-	set_fr_iimmed	0,0,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xe789abcd,fr11
-
-	set_fr_iimmed	0,1,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xcf13579b,fr11
-
-	set_fr_iimmed	0,2,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x9e26af37,fr11
-
-	set_fr_iimmed	0,3,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,4,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,5,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,6,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,7,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,8,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,9,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,10,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,11,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,12,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,13,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,14,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,15,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,16,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,18,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,19,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,20,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,21,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,22,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,23,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,24,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,25,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,26,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,27,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,28,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,29,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,30,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,31,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_fr_iimmed	0,64,fr10	; same as 0
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xe789abcd,fr11
-
-	set_fr_iimmed	0xffff,0xffff,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xf3c4d5e6,fr11
-
-	set_fr_iimmed	0x0000,0x003e,fr10	; only lower 6 bits matter
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xf9e26af3,fr11
-
-	set_fr_iimmed	0xffff,0xfffd,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfcf13579,fr11
-
-	set_fr_iimmed	0xffff,0xfffc,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfe789abc,fr11
-
-	set_fr_iimmed	0xffff,0xfffb,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xff3c4d5e,fr11
-
-	set_fr_iimmed	0xffff,0xfffa,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xff9e26af,fr11
-
-	set_fr_iimmed	0xffff,0xfff9,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffcf1357,fr11
-
-	set_fr_iimmed	0xffff,0xfff8,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffe789ab,fr11
-
-	set_fr_iimmed	0xffff,0xfff7,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfff3c4d5,fr11
-
-	set_fr_iimmed	0xffff,0xfff6,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfff9e26a,fr11
-
-	set_fr_iimmed	0xffff,0xfff5,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffcf135,fr11
-
-	set_fr_iimmed	0xffff,0xfff4,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffe789a,fr11
-
-	set_fr_iimmed	0xffff,0xfff3,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffff3c4d,fr11
-
-	set_fr_iimmed	0xffff,0xfff2,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffff9e26,fr11
-
-	set_fr_iimmed	0xffff,0xfff1,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffcf13,fr11
-
-	set_fr_iimmed	0xffff,0xfff0,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffe789,fr11
-
-	set_fr_iimmed	0xffff,0xffef,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffff3c4,fr11
-
-	set_fr_iimmed	0xffff,0xffee,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffff9e2,fr11
-
-	set_fr_iimmed	0xffff,0xffed,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffcf1,fr11
-
-	set_fr_iimmed	0xffff,0xffec,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffe78,fr11
-
-	set_fr_iimmed	0xffff,0xffeb,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffff3c,fr11
-
-	set_fr_iimmed	0xffff,0xffea,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffff9e,fr11
-
-	set_fr_iimmed	0xffff,0xffe9,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffcf,fr11
-
-	set_fr_iimmed	0xffff,0xffe8,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffe7,fr11
-
-	set_fr_iimmed	0xffff,0xffe7,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffff3,fr11
-
-	set_fr_iimmed	0xffff,0xffe6,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffff9,fr11
-
-	set_fr_iimmed	0xffff,0xffe5,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffffc,fr11
-
-	set_fr_iimmed	0xffff,0xffe4,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xfffffffe,fr11
-
-	set_fr_iimmed	0xffff,0xffe3,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_fr_iimmed	0xffff,0xffe2,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_fr_iimmed	0xffff,0xffe1,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_fr_iimmed	0xffff,0xffe0,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_fr_iimmed	0,32,fr10	; same as -32
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_accg_immed   0xffffff67,accg0
-	set_acc_immed   0x89abcdef,acc0
-
-	set_fr_iimmed	0xffff,0xffff,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x33c4d5e6,fr11
-
-	set_fr_iimmed	0x0000,0x003e,fr10	; only lower 6 bits matter
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x19e26af3,fr11
-
-	set_fr_iimmed	0xffff,0xfffd,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x0cf13579,fr11
-
-	set_fr_iimmed	0xffff,0xfffc,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x06789abc,fr11
-
-	set_fr_iimmed	0xffff,0xfffb,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x033c4d5e,fr11
-
-	set_fr_iimmed	0xffff,0xfffa,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x019e26af,fr11
-
-	set_fr_iimmed	0xffff,0xfff9,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00cf1357,fr11
-
-	set_fr_iimmed	0xffff,0xfff8,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x006789ab,fr11
-
-	set_fr_iimmed	0xffff,0xfff7,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x0033c4d5,fr11
-
-	set_fr_iimmed	0xffff,0xfff6,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x0019e26a,fr11
-
-	set_fr_iimmed	0xffff,0xfff5,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x000cf135,fr11
-
-	set_fr_iimmed	0xffff,0xfff4,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x0006789a,fr11
-
-	set_fr_iimmed	0xffff,0xfff3,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00033c4d,fr11
-
-	set_fr_iimmed	0xffff,0xfff2,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00019e26,fr11
-
-	set_fr_iimmed	0xffff,0xfff1,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x0000cf13,fr11
-
-	set_fr_iimmed	0xffff,0xfff0,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00006789,fr11
-
-	set_fr_iimmed	0xffff,0xffef,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x000033c4,fr11
-
-	set_fr_iimmed	0xffff,0xffee,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x000019e2,fr11
-
-	set_fr_iimmed	0xffff,0xffed,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000cf1,fr11
-
-	set_fr_iimmed	0xffff,0xffec,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000678,fr11
-
-	set_fr_iimmed	0xffff,0xffeb,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x0000033c,fr11
-
-	set_fr_iimmed	0xffff,0xffea,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x0000019e,fr11
-
-	set_fr_iimmed	0xffff,0xffe9,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x000000cf,fr11
-
-	set_fr_iimmed	0xffff,0xffe8,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000067,fr11
-
-	set_fr_iimmed	0xffff,0xffe7,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000033,fr11
-
-	set_fr_iimmed	0xffff,0xffe6,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000019,fr11
-
-	set_fr_iimmed	0xffff,0xffe5,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x0000000c,fr11
-
-	set_fr_iimmed	0xffff,0xffe4,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000006,fr11
-
-	set_fr_iimmed	0xffff,0xffe3,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000003,fr11
-
-	set_fr_iimmed	0xffff,0xffe2,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000001,fr11
-
-	set_fr_iimmed	0xffff,0xffe1,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	set_fr_iimmed	0xffff,0xffe0,fr10
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	set_fr_iimmed	0,32,fr10	; same as -32
-	mcutss      	acc0,fr10,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	; Examples from the customer
-	set_accg_immed   0xffffffff,accg0
-	set_acc_immed   0xffe00000,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	set_fr_iimmed	0,18,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x3fffff00,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0x7f,accg0
-	set_acc_immed   0xffe00000,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_fr_iimmed	0,17,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_fr_iimmed	0,18,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_accg_immed   0x08,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_fr_iimmed	0,17,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_accg_immed   0xff,accg0
-	set_acc_immed   0xefe00000,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_fr_iimmed	0,17,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_fr_iimmed	0,18,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_accg_immed   0x80,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	set_fr_iimmed	0,16,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_fr_iimmed	0,17,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_accg_immed   0xffffffaf,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-
-	set_fr_iimmed	0xffff,0xfffc,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0xfaf5a5a5,fr11
-
-	set_accg_immed   0x0000002f,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-
-	set_fr_iimmed	0xffff,0xfff9,fr10
-	mcutss    	acc0,fr10,fr11
-	test_fr_iimmed  0x005eb4b4,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/mcutssi.cgs b/sim/testsuite/sim/frv/mcutssi.cgs
deleted file mode 100644
index 739912f5131..00000000000
--- a/sim/testsuite/sim/frv/mcutssi.cgs
+++ /dev/null
@@ -1,380 +0,0 @@
-# frv testcase for mcutssi $ACC40i,$s6,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mcutssi
-mcutssi:
-	set_accg_immed   0xffffffe7,accg0
-	set_acc_immed   0x89abcdef,acc0
-
-	mcutssi      	acc0,0,fr11
-	test_fr_iimmed  0xe789abcd,fr11
-
-	mcutssi      	acc0,1,fr11
-	test_fr_iimmed  0xcf13579b,fr11
-
-	mcutssi      	acc0,2,fr11
-	test_fr_iimmed  0x9e26af37,fr11
-
-	mcutssi      	acc0,3,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,4,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,5,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,6,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,7,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,8,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,9,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,11,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,12,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,13,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,14,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,15,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,16,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,17,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,18,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,19,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,20,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,21,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,22,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,23,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,24,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,25,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,26,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,27,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,28,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,29,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,30,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,31,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	mcutssi      	acc0,-1,fr11
-	test_fr_iimmed  0xf3c4d5e6,fr11
-
-	mcutssi      	acc0,-2,fr11
-	test_fr_iimmed  0xf9e26af3,fr11
-
-	mcutssi      	acc0,-3,fr11
-	test_fr_iimmed  0xfcf13579,fr11
-
-	mcutssi      	acc0,-4,fr11
-	test_fr_iimmed  0xfe789abc,fr11
-
-	mcutssi      	acc0,-5,fr11
-	test_fr_iimmed  0xff3c4d5e,fr11
-
-	mcutssi      	acc0,-6,fr11
-	test_fr_iimmed  0xff9e26af,fr11
-
-	mcutssi      	acc0,-7,fr11
-	test_fr_iimmed  0xffcf1357,fr11
-
-	mcutssi      	acc0,-8,fr11
-	test_fr_iimmed  0xffe789ab,fr11
-
-	mcutssi      	acc0,-9,fr11
-	test_fr_iimmed  0xfff3c4d5,fr11
-
-	mcutssi      	acc0,-10,fr11
-	test_fr_iimmed  0xfff9e26a,fr11
-
-	mcutssi      	acc0,-11,fr11
-	test_fr_iimmed  0xfffcf135,fr11
-
-	mcutssi      	acc0,-12,fr11
-	test_fr_iimmed  0xfffe789a,fr11
-
-	mcutssi      	acc0,-13,fr11
-	test_fr_iimmed  0xffff3c4d,fr11
-
-	mcutssi      	acc0,-14,fr11
-	test_fr_iimmed  0xffff9e26,fr11
-
-	mcutssi      	acc0,-15,fr11
-	test_fr_iimmed  0xffffcf13,fr11
-
-	mcutssi      	acc0,-16,fr11
-	test_fr_iimmed  0xffffe789,fr11
-
-	mcutssi      	acc0,-17,fr11
-	test_fr_iimmed  0xfffff3c4,fr11
-
-	mcutssi      	acc0,-18,fr11
-	test_fr_iimmed  0xfffff9e2,fr11
-
-	mcutssi      	acc0,-19,fr11
-	test_fr_iimmed  0xfffffcf1,fr11
-
-	mcutssi      	acc0,-20,fr11
-	test_fr_iimmed  0xfffffe78,fr11
-
-	mcutssi      	acc0,-21,fr11
-	test_fr_iimmed  0xffffff3c,fr11
-
-	mcutssi      	acc0,-22,fr11
-	test_fr_iimmed  0xffffff9e,fr11
-
-	mcutssi      	acc0,-23,fr11
-	test_fr_iimmed  0xffffffcf,fr11
-
-	mcutssi      	acc0,-24,fr11
-	test_fr_iimmed  0xffffffe7,fr11
-
-	mcutssi      	acc0,-25,fr11
-	test_fr_iimmed  0xfffffff3,fr11
-
-	mcutssi      	acc0,-26,fr11
-	test_fr_iimmed  0xfffffff9,fr11
-
-	mcutssi      	acc0,-27,fr11
-	test_fr_iimmed  0xfffffffc,fr11
-
-	mcutssi      	acc0,-28,fr11
-	test_fr_iimmed  0xfffffffe,fr11
-
-	mcutssi      	acc0,-29,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	mcutssi      	acc0,-30,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	mcutssi      	acc0,-31,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	mcutssi      	acc0,-32,fr11
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_accg_immed   0xffffff67,accg0
-	set_acc_immed   0x89abcdef,acc0
-
-	mcutssi      	acc0,-1,fr11
-	test_fr_iimmed  0x33c4d5e6,fr11
-
-	mcutssi      	acc0,-2,fr11
-	test_fr_iimmed  0x19e26af3,fr11
-
-	mcutssi      	acc0,-3,fr11
-	test_fr_iimmed  0x0cf13579,fr11
-
-	mcutssi      	acc0,-4,fr11
-	test_fr_iimmed  0x06789abc,fr11
-
-	mcutssi      	acc0,-5,fr11
-	test_fr_iimmed  0x033c4d5e,fr11
-
-	mcutssi      	acc0,-6,fr11
-	test_fr_iimmed  0x019e26af,fr11
-
-	mcutssi      	acc0,-7,fr11
-	test_fr_iimmed  0x00cf1357,fr11
-
-	mcutssi      	acc0,-8,fr11
-	test_fr_iimmed  0x006789ab,fr11
-
-	mcutssi      	acc0,-9,fr11
-	test_fr_iimmed  0x0033c4d5,fr11
-
-	mcutssi      	acc0,-10,fr11
-	test_fr_iimmed  0x0019e26a,fr11
-
-	mcutssi      	acc0,-11,fr11
-	test_fr_iimmed  0x000cf135,fr11
-
-	mcutssi      	acc0,-12,fr11
-	test_fr_iimmed  0x0006789a,fr11
-
-	mcutssi      	acc0,-13,fr11
-	test_fr_iimmed  0x00033c4d,fr11
-
-	mcutssi      	acc0,-14,fr11
-	test_fr_iimmed  0x00019e26,fr11
-
-	mcutssi      	acc0,-15,fr11
-	test_fr_iimmed  0x0000cf13,fr11
-
-	mcutssi      	acc0,-16,fr11
-	test_fr_iimmed  0x00006789,fr11
-
-	mcutssi      	acc0,-17,fr11
-	test_fr_iimmed  0x000033c4,fr11
-
-	mcutssi      	acc0,-18,fr11
-	test_fr_iimmed  0x000019e2,fr11
-
-	mcutssi      	acc0,-19,fr11
-	test_fr_iimmed  0x00000cf1,fr11
-
-	mcutssi      	acc0,-20,fr11
-	test_fr_iimmed  0x00000678,fr11
-
-	mcutssi      	acc0,-21,fr11
-	test_fr_iimmed  0x0000033c,fr11
-
-	mcutssi      	acc0,-22,fr11
-	test_fr_iimmed  0x0000019e,fr11
-
-	mcutssi      	acc0,-23,fr11
-	test_fr_iimmed  0x000000cf,fr11
-
-	mcutssi      	acc0,-24,fr11
-	test_fr_iimmed  0x00000067,fr11
-
-	mcutssi      	acc0,-25,fr11
-	test_fr_iimmed  0x00000033,fr11
-
-	mcutssi      	acc0,-26,fr11
-	test_fr_iimmed  0x00000019,fr11
-
-	mcutssi      	acc0,-27,fr11
-	test_fr_iimmed  0x0000000c,fr11
-
-	mcutssi      	acc0,-28,fr11
-	test_fr_iimmed  0x00000006,fr11
-
-	mcutssi      	acc0,-29,fr11
-	test_fr_iimmed  0x00000003,fr11
-
-	mcutssi      	acc0,-30,fr11
-	test_fr_iimmed  0x00000001,fr11
-
-	mcutssi      	acc0,-31,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	mcutssi      	acc0,-32,fr11
-	test_fr_iimmed  0x00000000,fr11
-
-	; Examples from the customer
-	set_accg_immed   0xffffffff,accg0
-	set_acc_immed   0xffe00000,acc0
-
-	mcutssi    	acc0,16,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	mcutssi    	acc0,17,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	mcutssi    	acc0,18,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	mcutssi    	acc0,16,fr11
-	test_fr_iimmed  0x3fffff00,fr11
-
-	mcutssi    	acc0,17,fr11
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0x7f,accg0
-	set_acc_immed   0xffe00000,acc0
-
-	mcutssi    	acc0,16,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	mcutssi    	acc0,17,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	mcutssi    	acc0,18,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_accg_immed   0x08,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	mcutssi    	acc0,16,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	mcutssi    	acc0,17,fr11
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_accg_immed   0xff,accg0
-	set_acc_immed   0xefe00000,acc0
-
-	mcutssi    	acc0,16,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	mcutssi    	acc0,17,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	mcutssi    	acc0,18,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_accg_immed   0x80,accg0
-	set_acc_immed   0x003fffff,acc0
-
-	mcutssi    	acc0,16,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	mcutssi    	acc0,17,fr11
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_accg_immed   0xffffffaf,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-
-	mcutssi    	acc0,-4,fr11
-	test_fr_iimmed  0xfaf5a5a5,fr11
-
-	set_accg_immed   0x0000002f,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-
-	mcutssi    	acc0,-7,fr11
-	test_fr_iimmed  0x005eb4b4,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/mdaddaccs.cgs b/sim/testsuite/sim/frv/mdaddaccs.cgs
deleted file mode 100644
index 553c4a773c7..00000000000
--- a/sim/testsuite/sim/frv/mdaddaccs.cgs
+++ /dev/null
@@ -1,102 +0,0 @@
-# frv testcase for mdaddaccs $ACC40Si,$ACC40Sk
-# mach: fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mdaddaccs
-mdaddaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0xdead0000,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x0000beef,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdead,0xbeef,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x11111111,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0xbeef,0xdead,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x2345,0x6789,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	1,accg2
-	test_acc_limmed	0x1234,0x5677,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5677,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffe7ffe,acc0
-	set_accg_immed	0x0,accg1
-	set_acc_immed	0x00020001,acc1
-	set_accg_immed	0x80,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xfffffffe,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdaddaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0002,acc2
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/mdasaccs.cgs b/sim/testsuite/sim/frv/mdasaccs.cgs
deleted file mode 100644
index 0535b6295b2..00000000000
--- a/sim/testsuite/sim/frv/mdasaccs.cgs
+++ /dev/null
@@ -1,122 +0,0 @@
-# frv testcase for mdasaccs $ACC40Si,$ACC40Sk
-# mach: fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mdasaccs
-mdasaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0xdead0000,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x0000beef,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg0
-	test_acc_limmed	0x0000,0x0000,acc0
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0000,acc1
-	test_accg_immed	0,accg2
-	test_acc_limmed	0xdead,0xbeef,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdeac,0x4111,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x11111111,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg0
-	test_acc_limmed	0xbeef,0xdead,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_limmed	0x4111,0xdead,acc1
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x2345,0x6789,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0123,0x4567,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	1,accg0
-	test_acc_limmed	0x1234,0x5677,acc0
-	test_accg_immed	0xff,accg1
-	test_acc_limmed	0x1234,0x5679,acc1
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x1234,0x5677,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffe7ffe,acc0
-	set_accg_immed	0x0,accg1
-	set_acc_immed	0x00020001,acc1
-	set_accg_immed	0x80,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xfffffffe,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0xa,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed	0x7f,accg1
-	test_acc_limmed	0xfffc,0x7ffd,acc1
-	test_accg_immed	0x80,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0003,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdasaccs	acc0,acc0
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed	0,accg1
-	test_acc_limmed	0x0000,0x0000,acc1
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0002,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/mdcutssi.cgs b/sim/testsuite/sim/frv/mdcutssi.cgs
deleted file mode 100644
index 8e5216c347d..00000000000
--- a/sim/testsuite/sim/frv/mdcutssi.cgs
+++ /dev/null
@@ -1,513 +0,0 @@
-# frv testcase for mdcutssi $ACC40i,$s6,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global mdcutssi
-mdcutssi:
-	set_accg_immed   0xffffffe7,accg0
-	set_acc_immed   0x89abcdef,acc0
-	set_accg_immed   0xffffffe7,accg1
-	set_acc_immed   0x89abcdef,acc1
-
-	mdcutssi      	acc0,0,fr10
-	test_fr_iimmed  0xe789abcd,fr10
-	test_fr_iimmed  0xe789abcd,fr11
-
-	mdcutssi      	acc0,1,fr10
-	test_fr_iimmed  0xcf13579b,fr10
-	test_fr_iimmed  0xcf13579b,fr11
-
-	mdcutssi      	acc0,2,fr10
-	test_fr_iimmed  0x9e26af37,fr10
-	test_fr_iimmed  0x9e26af37,fr11
-
-	mdcutssi      	acc0,3,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,4,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,5,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,6,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,7,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,8,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,9,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,10,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,11,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,12,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,13,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,14,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,15,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,16,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,17,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,18,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,19,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,20,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,21,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,22,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,23,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,24,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,25,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,26,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,27,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,28,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,29,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,30,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,31,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	mdcutssi      	acc0,-1,fr10
-	test_fr_iimmed  0xf3c4d5e6,fr10
-	test_fr_iimmed  0xf3c4d5e6,fr11
-
-	mdcutssi      	acc0,-2,fr10
-	test_fr_iimmed  0xf9e26af3,fr10
-	test_fr_iimmed  0xf9e26af3,fr11
-
-	mdcutssi      	acc0,-3,fr10
-	test_fr_iimmed  0xfcf13579,fr10
-	test_fr_iimmed  0xfcf13579,fr11
-
-	mdcutssi      	acc0,-4,fr10
-	test_fr_iimmed  0xfe789abc,fr10
-	test_fr_iimmed  0xfe789abc,fr11
-
-	mdcutssi      	acc0,-5,fr10
-	test_fr_iimmed  0xff3c4d5e,fr10
-	test_fr_iimmed  0xff3c4d5e,fr11
-
-	mdcutssi      	acc0,-6,fr10
-	test_fr_iimmed  0xff9e26af,fr10
-	test_fr_iimmed  0xff9e26af,fr11
-
-	mdcutssi      	acc0,-7,fr10
-	test_fr_iimmed  0xffcf1357,fr10
-	test_fr_iimmed  0xffcf1357,fr11
-
-	mdcutssi      	acc0,-8,fr10
-	test_fr_iimmed  0xffe789ab,fr10
-	test_fr_iimmed  0xffe789ab,fr11
-
-	mdcutssi      	acc0,-9,fr10
-	test_fr_iimmed  0xfff3c4d5,fr10
-	test_fr_iimmed  0xfff3c4d5,fr11
-
-	mdcutssi      	acc0,-10,fr10
-	test_fr_iimmed  0xfff9e26a,fr10
-	test_fr_iimmed  0xfff9e26a,fr11
-
-	mdcutssi      	acc0,-11,fr10
-	test_fr_iimmed  0xfffcf135,fr10
-	test_fr_iimmed  0xfffcf135,fr11
-
-	mdcutssi      	acc0,-12,fr10
-	test_fr_iimmed  0xfffe789a,fr10
-	test_fr_iimmed  0xfffe789a,fr11
-
-	mdcutssi      	acc0,-13,fr10
-	test_fr_iimmed  0xffff3c4d,fr10
-	test_fr_iimmed  0xffff3c4d,fr11
-
-	mdcutssi      	acc0,-14,fr10
-	test_fr_iimmed  0xffff9e26,fr10
-	test_fr_iimmed  0xffff9e26,fr11
-
-	mdcutssi      	acc0,-15,fr10
-	test_fr_iimmed  0xffffcf13,fr10
-	test_fr_iimmed  0xffffcf13,fr11
-
-	mdcutssi      	acc0,-16,fr10
-	test_fr_iimmed  0xffffe789,fr10
-	test_fr_iimmed  0xffffe789,fr11
-
-	mdcutssi      	acc0,-17,fr10
-	test_fr_iimmed  0xfffff3c4,fr10
-	test_fr_iimmed  0xfffff3c4,fr11
-
-	mdcutssi      	acc0,-18,fr10
-	test_fr_iimmed  0xfffff9e2,fr10
-	test_fr_iimmed  0xfffff9e2,fr11
-
-	mdcutssi      	acc0,-19,fr10
-	test_fr_iimmed  0xfffffcf1,fr10
-	test_fr_iimmed  0xfffffcf1,fr11
-
-	mdcutssi      	acc0,-20,fr10
-	test_fr_iimmed  0xfffffe78,fr10
-	test_fr_iimmed  0xfffffe78,fr11
-
-	mdcutssi      	acc0,-21,fr10
-	test_fr_iimmed  0xffffff3c,fr10
-	test_fr_iimmed  0xffffff3c,fr11
-
-	mdcutssi      	acc0,-22,fr10
-	test_fr_iimmed  0xffffff9e,fr10
-	test_fr_iimmed  0xffffff9e,fr11
-
-	mdcutssi      	acc0,-23,fr10
-	test_fr_iimmed  0xffffffcf,fr10
-	test_fr_iimmed  0xffffffcf,fr11
-
-	mdcutssi      	acc0,-24,fr10
-	test_fr_iimmed  0xffffffe7,fr10
-	test_fr_iimmed  0xffffffe7,fr11
-
-	mdcutssi      	acc0,-25,fr10
-	test_fr_iimmed  0xfffffff3,fr10
-	test_fr_iimmed  0xfffffff3,fr11
-
-	mdcutssi      	acc0,-26,fr10
-	test_fr_iimmed  0xfffffff9,fr10
-	test_fr_iimmed  0xfffffff9,fr11
-
-	mdcutssi      	acc0,-27,fr10
-	test_fr_iimmed  0xfffffffc,fr10
-	test_fr_iimmed  0xfffffffc,fr11
-
-	mdcutssi      	acc0,-28,fr10
-	test_fr_iimmed  0xfffffffe,fr10
-	test_fr_iimmed  0xfffffffe,fr11
-
-	mdcutssi      	acc0,-29,fr10
-	test_fr_iimmed  0xffffffff,fr10
-	test_fr_iimmed  0xffffffff,fr11
-
-	mdcutssi      	acc0,-30,fr10
-	test_fr_iimmed  0xffffffff,fr10
-	test_fr_iimmed  0xffffffff,fr11
-
-	mdcutssi      	acc0,-31,fr10
-	test_fr_iimmed  0xffffffff,fr10
-	test_fr_iimmed  0xffffffff,fr11
-
-	mdcutssi      	acc0,-32,fr10
-	test_fr_iimmed  0xffffffff,fr10
-	test_fr_iimmed  0xffffffff,fr11
-
-	set_accg_immed   0xffffff67,accg0
-	set_acc_immed   0x89abcdef,acc0
-	set_accg_immed   0xffffff67,accg1
-	set_acc_immed   0x89abcdef,acc1
-
-	mdcutssi      	acc0,-1,fr10
-	test_fr_iimmed  0x33c4d5e6,fr10
-	test_fr_iimmed  0x33c4d5e6,fr11
-
-	mdcutssi      	acc0,-2,fr10
-	test_fr_iimmed  0x19e26af3,fr10
-	test_fr_iimmed  0x19e26af3,fr11
-
-	mdcutssi      	acc0,-3,fr10
-	test_fr_iimmed  0x0cf13579,fr10
-	test_fr_iimmed  0x0cf13579,fr11
-
-	mdcutssi      	acc0,-4,fr10
-	test_fr_iimmed  0x06789abc,fr10
-	test_fr_iimmed  0x06789abc,fr11
-
-	mdcutssi      	acc0,-5,fr10
-	test_fr_iimmed  0x033c4d5e,fr10
-	test_fr_iimmed  0x033c4d5e,fr11
-
-	mdcutssi      	acc0,-6,fr10
-	test_fr_iimmed  0x019e26af,fr10
-	test_fr_iimmed  0x019e26af,fr11
-
-	mdcutssi      	acc0,-7,fr10
-	test_fr_iimmed  0x00cf1357,fr10
-	test_fr_iimmed  0x00cf1357,fr11
-
-	mdcutssi      	acc0,-8,fr10
-	test_fr_iimmed  0x006789ab,fr10
-	test_fr_iimmed  0x006789ab,fr11
-
-	mdcutssi      	acc0,-9,fr10
-	test_fr_iimmed  0x0033c4d5,fr10
-	test_fr_iimmed  0x0033c4d5,fr11
-
-	mdcutssi      	acc0,-10,fr10
-	test_fr_iimmed  0x0019e26a,fr10
-	test_fr_iimmed  0x0019e26a,fr11
-
-	mdcutssi      	acc0,-11,fr10
-	test_fr_iimmed  0x000cf135,fr10
-	test_fr_iimmed  0x000cf135,fr11
-
-	mdcutssi      	acc0,-12,fr10
-	test_fr_iimmed  0x0006789a,fr10
-	test_fr_iimmed  0x0006789a,fr11
-
-	mdcutssi      	acc0,-13,fr10
-	test_fr_iimmed  0x00033c4d,fr10
-	test_fr_iimmed  0x00033c4d,fr11
-
-	mdcutssi      	acc0,-14,fr10
-	test_fr_iimmed  0x00019e26,fr10
-	test_fr_iimmed  0x00019e26,fr11
-
-	mdcutssi      	acc0,-15,fr10
-	test_fr_iimmed  0x0000cf13,fr10
-	test_fr_iimmed  0x0000cf13,fr11
-
-	mdcutssi      	acc0,-16,fr10
-	test_fr_iimmed  0x00006789,fr10
-	test_fr_iimmed  0x00006789,fr11
-
-	mdcutssi      	acc0,-17,fr10
-	test_fr_iimmed  0x000033c4,fr10
-	test_fr_iimmed  0x000033c4,fr11
-
-	mdcutssi      	acc0,-18,fr10
-	test_fr_iimmed  0x000019e2,fr10
-	test_fr_iimmed  0x000019e2,fr11
-
-	mdcutssi      	acc0,-19,fr10
-	test_fr_iimmed  0x00000cf1,fr10
-	test_fr_iimmed  0x00000cf1,fr11
-
-	mdcutssi      	acc0,-20,fr10
-	test_fr_iimmed  0x00000678,fr10
-	test_fr_iimmed  0x00000678,fr11
-
-	mdcutssi      	acc0,-21,fr10
-	test_fr_iimmed  0x0000033c,fr10
-	test_fr_iimmed  0x0000033c,fr11
-
-	mdcutssi      	acc0,-22,fr10
-	test_fr_iimmed  0x0000019e,fr10
-	test_fr_iimmed  0x0000019e,fr11
-
-	mdcutssi      	acc0,-23,fr10
-	test_fr_iimmed  0x000000cf,fr10
-	test_fr_iimmed  0x000000cf,fr11
-
-	mdcutssi      	acc0,-24,fr10
-	test_fr_iimmed  0x00000067,fr10
-	test_fr_iimmed  0x00000067,fr11
-
-	mdcutssi      	acc0,-25,fr10
-	test_fr_iimmed  0x00000033,fr10
-	test_fr_iimmed  0x00000033,fr11
-
-	mdcutssi      	acc0,-26,fr10
-	test_fr_iimmed  0x00000019,fr10
-	test_fr_iimmed  0x00000019,fr11
-
-	mdcutssi      	acc0,-27,fr10
-	test_fr_iimmed  0x0000000c,fr10
-	test_fr_iimmed  0x0000000c,fr11
-
-	mdcutssi      	acc0,-28,fr10
-	test_fr_iimmed  0x00000006,fr10
-	test_fr_iimmed  0x00000006,fr11
-
-	mdcutssi      	acc0,-29,fr10
-	test_fr_iimmed  0x00000003,fr10
-	test_fr_iimmed  0x00000003,fr11
-
-	mdcutssi      	acc0,-30,fr10
-	test_fr_iimmed  0x00000001,fr10
-	test_fr_iimmed  0x00000001,fr11
-
-	mdcutssi      	acc0,-31,fr10
-	test_fr_iimmed  0x00000000,fr10
-	test_fr_iimmed  0x00000000,fr11
-
-	mdcutssi      	acc0,-32,fr10
-	test_fr_iimmed  0x00000000,fr10
-	test_fr_iimmed  0x00000000,fr11
-
-	; Examples from the customer
-	set_accg_immed   0xffffffff,accg0
-	set_acc_immed   0xffe00000,acc0
-	set_accg_immed   0xffffffff,accg1
-	set_acc_immed   0xffe00000,acc1
-
-	mdcutssi    	acc0,16,fr10
-	test_fr_iimmed  0xe0000000,fr10
-	test_fr_iimmed  0xe0000000,fr11
-
-	mdcutssi    	acc0,17,fr10
-	test_fr_iimmed  0xc0000000,fr10
-	test_fr_iimmed  0xc0000000,fr11
-
-	mdcutssi    	acc0,18,fr10
-	test_fr_iimmed  0x80000000,fr10
-	test_fr_iimmed  0x80000000,fr11
-
-	set_accg_immed   0,accg0
-	set_acc_immed   0x003fffff,acc0
-	set_accg_immed   0,accg1
-	set_acc_immed   0x003fffff,acc1
-
-	mdcutssi    	acc0,16,fr10
-	test_fr_iimmed  0x3fffff00,fr10
-	test_fr_iimmed  0x3fffff00,fr11
-
-	mdcutssi    	acc0,17,fr10
-	test_fr_iimmed  0x7ffffe00,fr10
-	test_fr_iimmed  0x7ffffe00,fr11
-
-	set_accg_immed   0x7f,accg0
-	set_acc_immed   0xffe00000,acc0
-	set_accg_immed   0x7f,accg1
-	set_acc_immed   0xffe00000,acc1
-
-	mdcutssi    	acc0,16,fr10
-	test_fr_iimmed  0x7fffffff,fr10		; saturated
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	mdcutssi    	acc0,17,fr10
-	test_fr_iimmed  0x7fffffff,fr10		; saturated
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	mdcutssi    	acc0,18,fr10
-	test_fr_iimmed  0x7fffffff,fr10		; saturated
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_accg_immed   0x08,accg0
-	set_acc_immed   0x003fffff,acc0
-	set_accg_immed   0x08,accg1
-	set_acc_immed   0x003fffff,acc1
-
-	mdcutssi    	acc0,16,fr10
-	test_fr_iimmed  0x7fffffff,fr10		; saturated
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	mdcutssi    	acc0,17,fr10
-	test_fr_iimmed  0x7fffffff,fr10		; saturated
-	test_fr_iimmed  0x7fffffff,fr11		; saturated
-
-	set_accg_immed   0xff,accg0
-	set_acc_immed   0xefe00000,acc0
-	set_accg_immed   0xff,accg1
-	set_acc_immed   0xefe00000,acc1
-
-	mdcutssi    	acc0,16,fr10
-	test_fr_iimmed  0x80000000,fr10		; saturated
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	mdcutssi    	acc0,17,fr10
-	test_fr_iimmed  0x80000000,fr10		; saturated
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	mdcutssi    	acc0,18,fr10
-	test_fr_iimmed  0x80000000,fr10		; saturated
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_accg_immed   0x80,accg0
-	set_acc_immed   0x003fffff,acc0
-	set_accg_immed   0x80,accg1
-	set_acc_immed   0x003fffff,acc1
-
-	mdcutssi    	acc0,16,fr10
-	test_fr_iimmed  0x80000000,fr10		; saturated
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	mdcutssi    	acc0,17,fr10
-	test_fr_iimmed  0x80000000,fr10		; saturated
-	test_fr_iimmed  0x80000000,fr11		; saturated
-
-	set_accg_immed   0xffffffaf,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-	set_accg_immed   0xffffffaf,accg1
-	set_acc_immed   0x5a5a5a5a,acc1
-
-	mdcutssi    	acc0,-4,fr10
-	test_fr_iimmed  0xfaf5a5a5,fr10
-	test_fr_iimmed  0xfaf5a5a5,fr11
-
-	set_accg_immed   0x0000002f,accg0
-	set_acc_immed   0x5a5a5a5a,acc0
-	set_accg_immed   0x0000002f,accg1
-	set_acc_immed   0x5a5a5a5a,acc1
-
-	mdcutssi    	acc0,-7,fr10
-	test_fr_iimmed  0x005eb4b4,fr10
-	test_fr_iimmed  0x005eb4b4,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/mdpackh.cgs b/sim/testsuite/sim/frv/mdpackh.cgs
deleted file mode 100644
index cbd0bc80008..00000000000
--- a/sim/testsuite/sim/frv/mdpackh.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# frv testcase for mdpackh $FRi,$FRj,$FRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mdpackh
-mdpackh:
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0xaaaa,0xbbbb,fr11
-	set_fr_iimmed	0x1234,0x5678,fr12
-	set_fr_iimmed	0xcccc,0xdddd,fr13
-	mdpackh		fr10,fr12,fr14
-	test_fr_limmed	0xbeef,0x5678,fr14
-	test_fr_limmed	0xbbbb,0xdddd,fr15
-
-	pass
diff --git a/sim/testsuite/sim/frv/mdrotli.cgs b/sim/testsuite/sim/frv/mdrotli.cgs
deleted file mode 100644
index 1d2e183a1c9..00000000000
--- a/sim/testsuite/sim/frv/mdrotli.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for mdrotli $FRi,$s6,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global mdrotli
-mdrotli:
-	set_fr_iimmed   0,2,fr8
-	set_fr_iimmed   0,2,fr9
-	mdrotli      	fr8,-32,fr8	; Shift by 0
-	test_fr_iimmed  2,fr8
-	test_fr_iimmed  2,fr9
-
-	set_fr_iimmed   0,2,fr8
-	set_fr_iimmed   0,2,fr9
-	mdrotli      	fr8,1,fr8	; Shift by 1
-	test_fr_iimmed  4,fr8
-	test_fr_iimmed  4,fr9
-
-	set_fr_iimmed   0,1,fr8
-	set_fr_iimmed  	0,2,fr9
-	mdrotli      	fr8,31,fr8	; Shift by 31
-	test_fr_iimmed 	0x80000000,fr8
-	test_fr_iimmed  1,fr9
-
-	set_fr_iimmed  	0xdead,0xbeef,fr8
-	set_fr_iimmed  	0xbeef,0xdead,fr9
-	mdrotli      	fr8,16,fr8
-	test_fr_iimmed  0xbeefdead,fr8
-	test_fr_iimmed  0xdeadbeef,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/mdsubaccs.cgs b/sim/testsuite/sim/frv/mdsubaccs.cgs
deleted file mode 100644
index 73d2e2dc899..00000000000
--- a/sim/testsuite/sim/frv/mdsubaccs.cgs
+++ /dev/null
@@ -1,102 +0,0 @@
-# frv testcase for mdsubaccs $ACC40Si,$ACC40Sk
-# mach: fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mdsubaccs
-mdsubaccs:
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000000,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0xdead0000,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x0000beef,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0xdeac,0x4111,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x0000dead,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xbeef0000,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x11111111,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0xff,accg2
-	test_acc_limmed	0x4111,0xdead,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x0123,0x4567,acc3
-
-	set_accg_immed	0,accg0
-	set_acc_immed	0x12345678,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x12345678,acc2
-	set_accg_immed	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed	0xff,accg2
-	test_acc_limmed	0x1234,0x5679,acc2
-	test_accg_immed	0,accg3
-	test_acc_limmed	0x1234,0x5679,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0x7f,accg0
-	set_acc_immed	0xfffffffe,acc0
-	set_accg_immed	0xff,accg1
-	set_acc_immed	0xfffffffe,acc1
-	set_accg_immed	0x80,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0,accg3
-	set_acc_immed	0x00000002,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed	0x80,accg3
-	test_acc_limmed	0x0000,0x0000,acc3
-
-	set_spr_immed	0,msr0
-	set_accg_immed	0,accg0
-	set_acc_immed	0x00000001,acc0
-	set_accg_immed	0,accg1
-	set_acc_immed	0x00000001,acc1
-	set_accg_immed	0,accg2
-	set_acc_immed	0x00000001,acc2
-	set_accg_immed	0x80,accg3
-	set_acc_immed	0x00000000,acc3
-	mdsubaccs	acc0,acc2
-	test_spr_bits	0x3c,2,4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	test_accg_immed	0,accg2
-	test_acc_limmed	0x0000,0x0000,acc2
-	test_accg_immed	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/mdunpackh.cgs b/sim/testsuite/sim/frv/mdunpackh.cgs
deleted file mode 100644
index 02870c8c14d..00000000000
--- a/sim/testsuite/sim/frv/mdunpackh.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mdunpackh $FRi,$FRj
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global mdunpackh
-mdunpackh:
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	mdunpackh	fr10,fr12
-	test_fr_limmed	0xdead,0xdead,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr13
-	test_fr_limmed	0x1234,0x1234,fr14
-	test_fr_limmed	0x5678,0x5678,fr15
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	mdunpackh	fr10,fr12
-	test_fr_limmed	0x1234,0x1234,fr12
-	test_fr_limmed	0x5678,0x5678,fr13
-	test_fr_limmed	0xdead,0xdead,fr14
-	test_fr_limmed	0xbeef,0xbeef,fr15
-
-	pass
diff --git a/sim/testsuite/sim/frv/membar.cgs b/sim/testsuite/sim/frv/membar.cgs
deleted file mode 100644
index aae1d1a8e21..00000000000
--- a/sim/testsuite/sim/frv/membar.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# frv testcase for membar
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global membar
-membar:
-	membar
-
-	pass
diff --git a/sim/testsuite/sim/frv/mexpdhd.cgs b/sim/testsuite/sim/frv/mexpdhd.cgs
deleted file mode 100644
index d5f95ce98bd..00000000000
--- a/sim/testsuite/sim/frv/mexpdhd.cgs
+++ /dev/null
@@ -1,27 +0,0 @@
-# frv testcase for mexpdhd $FRi,$s6,$FRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mexpdhd
-mexpdhd:
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	mexpdhd	fr10,0,fr12
-	test_fr_limmed	0xdead,0xdead,fr12
-	test_fr_limmed	0xdead,0xdead,fr13
-
-	mexpdhd	fr10,1,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr13
-
-	mexpdhd	fr10,62,fr12
-	test_fr_limmed	0xdead,0xdead,fr12
-	test_fr_limmed	0xdead,0xdead,fr13
-
-	mexpdhd	fr10,63,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr13
-
-	pass
diff --git a/sim/testsuite/sim/frv/mexpdhw.cgs b/sim/testsuite/sim/frv/mexpdhw.cgs
deleted file mode 100644
index a13b0f24ce0..00000000000
--- a/sim/testsuite/sim/frv/mexpdhw.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# frv testcase for mexpdhw $FRi,$s6,$FRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mexpdhw
-mexpdhw:
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	mexpdhw	fr10,0,fr12
-	test_fr_limmed	0xdead,0xdead,fr12
-
-	mexpdhw	fr10,1,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr12
-
-	mexpdhw	fr10,62,fr12
-	test_fr_limmed	0xdead,0xdead,fr12
-
-	mexpdhw	fr10,63,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr12
-
-	pass
diff --git a/sim/testsuite/sim/frv/mhdseth.cgs b/sim/testsuite/sim/frv/mhdseth.cgs
deleted file mode 100644
index 7c09b2d9d00..00000000000
--- a/sim/testsuite/sim/frv/mhdseth.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mhdseth $s5,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global setlo
-setlo:
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	mhdseth		0,fr1
-	test_fr_limmed	0x06ad,0x06ef,fr1
-
-	mhdseth		1,fr1
-	test_fr_limmed	0x0ead,0x0eef,fr1
-
-	mhdseth		0xf,fr1
-	test_fr_limmed	0x7ead,0x7eef,fr1
-
-	mhdseth		-16,fr1
-	test_fr_limmed	0x86ad,0x86ef,fr1
-
-	mhdseth		-1,fr1
-	test_fr_limmed	0xfead,0xfeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mhdsets.cgs b/sim/testsuite/sim/frv/mhdsets.cgs
deleted file mode 100644
index 1f2681450be..00000000000
--- a/sim/testsuite/sim/frv/mhdsets.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mhdsets $u12,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global setlo
-setlo:
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	mhdsets		0,fr1
-	test_fr_limmed	0x0000,0x0000,fr1
-
-	mhdsets		1,fr1
-	test_fr_limmed	0x0001,0x0001,fr1
-
-	mhdsets		0x07ff,fr1
-	test_fr_limmed	0x07ff,0x07ff,fr1
-
-	mhdsets		-2048,fr1
-	test_fr_limmed	0xf800,0xf800,fr1
-
-	mhdsets		-1,fr1
-	test_fr_limmed	0xffff,0xffff,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mhsethih.cgs b/sim/testsuite/sim/frv/mhsethih.cgs
deleted file mode 100644
index f05eb77509d..00000000000
--- a/sim/testsuite/sim/frv/mhsethih.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mhsethih $s5,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global setlo
-setlo:
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	mhsethih	0,fr1
-	test_fr_limmed	0x06ad,0xbeef,fr1
-
-	mhsethih	1,fr1
-	test_fr_limmed	0x0ead,0xbeef,fr1
-
-	mhsethih	0xf,fr1
-	test_fr_limmed	0x7ead,0xbeef,fr1
-
-	mhsethih	-16,fr1
-	test_fr_limmed	0x86ad,0xbeef,fr1
-
-	mhsethih	-1,fr1
-	test_fr_limmed	0xfead,0xbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mhsethis.cgs b/sim/testsuite/sim/frv/mhsethis.cgs
deleted file mode 100644
index cf893366cbe..00000000000
--- a/sim/testsuite/sim/frv/mhsethis.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mhsethis $u12,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global setlo
-setlo:
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	mhsethis	0,fr1
-	test_fr_limmed	0x0000,0xbeef,fr1
-
-	mhsethis	1,fr1
-	test_fr_limmed	0x0001,0xbeef,fr1
-
-	mhsethis	0x07ff,fr1
-	test_fr_limmed	0x07ff,0xbeef,fr1
-
-	mhsethis	-2048,fr1
-	test_fr_limmed	0xf800,0xbeef,fr1
-
-	mhsethis	-1,fr1
-	test_fr_limmed	0xffff,0xbeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mhsetloh.cgs b/sim/testsuite/sim/frv/mhsetloh.cgs
deleted file mode 100644
index 930628d97e9..00000000000
--- a/sim/testsuite/sim/frv/mhsetloh.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mhsetloh $s5,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global setlo
-setlo:
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	mhsetloh	0,fr1
-	test_fr_limmed	0xdead,0x06ef,fr1
-
-	mhsetloh	1,fr1
-	test_fr_limmed	0xdead,0x0eef,fr1
-
-	mhsetloh	0xf,fr1
-	test_fr_limmed	0xdead,0x7eef,fr1
-
-	mhsetloh	-16,fr1
-	test_fr_limmed	0xdead,0x86ef,fr1
-
-	mhsetloh	-1,fr1
-	test_fr_limmed	0xdead,0xfeef,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mhsetlos.cgs b/sim/testsuite/sim/frv/mhsetlos.cgs
deleted file mode 100644
index fb404a23ebb..00000000000
--- a/sim/testsuite/sim/frv/mhsetlos.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mhsetlos $u12,$FRk
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global setlo
-setlo:
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	mhsetlos	0,fr1
-	test_fr_limmed	0xdead,0x0000,fr1
-
-	mhsetlos	1,fr1
-	test_fr_limmed	0xdead,0x0001,fr1
-
-	mhsetlos	0x07ff,fr1
-	test_fr_limmed	0xdead,0x07ff,fr1
-
-	mhsetlos	-2048,fr1
-	test_fr_limmed	0xdead,0xf800,fr1
-
-	mhsetlos	-1,fr1
-	test_fr_limmed	0xdead,0xffff,fr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mhtob.cgs b/sim/testsuite/sim/frv/mhtob.cgs
deleted file mode 100644
index efd83d73bde..00000000000
--- a/sim/testsuite/sim/frv/mhtob.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for mhtob $FRj,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mhtob
-mhtob:
-	set_fr_iimmed	0x00ad,0x00ef,fr10
-	set_fr_iimmed	0x0034,0x0078,fr11
-	mhtob		fr10,fr12
-	test_fr_limmed	0xadef,0x3478,fr12
-
-	set_fr_iimmed	0xdead,0xbeef,fr10	; saturation
-	set_fr_iimmed	0x1234,0x5678,fr11
-	mhtob		fr10,fr12
-	test_fr_limmed	0xffff,0xffff,fr12
-
-	set_fr_iimmed	0x0134,0x0878,fr10	; saturation
-	set_fr_iimmed	0x10ad,0x80ef,fr11
-	mhtob		fr10,fr12
-	test_fr_limmed	0xffff,0xffff,fr12
-
-	pass
diff --git a/sim/testsuite/sim/frv/mmachs.cgs b/sim/testsuite/sim/frv/mmachs.cgs
deleted file mode 100644
index 0292161b432..00000000000
--- a/sim/testsuite/sim/frv/mmachs.cgs
+++ /dev/null
@@ -1,259 +0,0 @@
-# frv testcase for mmachs $GRi,$GRj,$ACCk
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mmachs
-mmachs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x8006,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0007,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x4000,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x4000,0x0001,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0xffff,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0xbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0xbffd,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffd,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc003,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xc005,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xc005,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3ffec006,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x7ffec006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x7ffec006,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	mmachs      	fr7,fr8,acc0
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0x8000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmachs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/mmachu.cgs b/sim/testsuite/sim/frv/mmachu.cgs
deleted file mode 100644
index aad07c7fba8..00000000000
--- a/sim/testsuite/sim/frv/mmachu.cgs
+++ /dev/null
@@ -1,146 +0,0 @@
-# frv testcase for mmachu $GRi,$GRj,$GRk
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mmachu
-mmachu:
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0001,0x0006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0001,0x0006,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00020006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00020006,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40010007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40010007,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x8001,0x0007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x8001,0x0007,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x7fff,0x0008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x7fff,0x0008,acc1
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmachu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mmrdhs.cgs b/sim/testsuite/sim/frv/mmrdhs.cgs
deleted file mode 100644
index 6295bc1687f..00000000000
--- a/sim/testsuite/sim/frv/mmrdhs.cgs
+++ /dev/null
@@ -1,263 +0,0 @@
-# frv testcase for mmrdhs $GRi,$GRj,$ACCk
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mmrdhs
-mmrdhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-8,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-8,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x7ffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x7ffa,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xfffe,0xfffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xfffe,0xfffa,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed 0xbfff,0xfff9,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed 0xbfff,0xfff9,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed 0xbfff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed 0xbfff,0xffff,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed 0xc000,0x0001,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed 0xc000,0x0001,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed 0xc000,0x0001,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed 0xc000,0x0001,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xc000,0x4003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xc000,0x4003,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xc000,0xc003,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xc000,0xc003,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x4003,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x4003,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x3ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x3ffd,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x3ffb,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x3ffb,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	0xc0013ffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	0xc0013ffa,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	0x80013ffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	0x80013ffa,acc1
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	0xffff,1,fr7
-	set_fr_iimmed  	1,0xffff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_fr_iimmed  	0x8000,0x0000,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmrdhs      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/mmrdhu.cgs b/sim/testsuite/sim/frv/mmrdhu.cgs
deleted file mode 100644
index b1c0243c383..00000000000
--- a/sim/testsuite/sim/frv/mmrdhu.cgs
+++ /dev/null
@@ -1,151 +0,0 @@
-# frv testcase for mmrdhu $GRi,$GRj,$GRk
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mmrdhu
-mmrdhu:
-	set_accg_immed	0x80,accg0
-	set_acc_immed	0,acc0
-	set_accg_immed	0x80,accg1
-	set_acc_immed	0,acc1
-
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0
-	test_acc_immed 	0xfffffffa,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed 	0xfffffffa,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0
-	test_acc_immed 	0xfffffff8,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed 	0xfffffff8,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0
-	test_acc_immed 	0xfffffff8,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_immed 	0xfffffff8,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0x7ffa,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0x7ffa,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xfffe,0xfffa,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xfffe,0xfffa,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xfffd,0xfffa,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xfffd,0xfffa,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xbffe,0xfff9,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xbffe,0xfff9,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0x7ffe,0xfff9,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0x7ffe,0xfff9,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0x7e,accg0
-	test_acc_limmed	0x8000,0xfff8,acc0
-	test_accg_immed 	0x7e,accg1
-	test_acc_limmed	0x8000,0xfff8,acc1
-
-	set_accg_immed 	0,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	1,1,fr7
-	set_fr_iimmed  	1,1,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0xffff,fr7
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmrdhu      	fr7,fr8,acc0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed	0,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mmulhs.cgs b/sim/testsuite/sim/frv/mmulhs.cgs
deleted file mode 100644
index 21045006dab..00000000000
--- a/sim/testsuite/sim/frv/mmulhs.cgs
+++ /dev/null
@@ -1,141 +0,0 @@
-# frv testcase for mmulhs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mmulhs
-mmulhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ffe,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x0001,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-2,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffe,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffe,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x8000,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xc000,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xc000,0x8000,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mmulhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40000000,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mmulhu.cgs b/sim/testsuite/sim/frv/mmulhu.cgs
deleted file mode 100644
index 53e9b7062f5..00000000000
--- a/sim/testsuite/sim/frv/mmulhu.cgs
+++ /dev/null
@@ -1,82 +0,0 @@
-# frv testcase for mmulhu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mmulhu
-mmulhu:
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	2,3,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	2,0,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x7ffe,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00010000,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x4000,0x0000,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmulhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0xfffe,0x0001,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mmulxhs.cgs b/sim/testsuite/sim/frv/mmulxhs.cgs
deleted file mode 100644
index 449becfb4d9..00000000000
--- a/sim/testsuite/sim/frv/mmulxhs.cgs
+++ /dev/null
@@ -1,141 +0,0 @@
-# frv testcase for mmulxhs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mmulxhs
-mmulxhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	4,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	9,acc1
-
-	set_fr_iimmed  	0,1,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	2,1,fr7		; multiply by 1
-	set_fr_iimmed  	2,1,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x3fff,2,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ffe,acc1
-
-	set_fr_iimmed	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x4000,2,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-
-	set_fr_iimmed	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x0001,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	2,0xfffd,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	0xfffe,1,fr7		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-2,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr7		; multiply by 0
-	set_fr_iimmed  	0xfffe,0,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed  	0x2001,0xfffe,fr7	; 15 bit result
-	set_fr_iimmed  	0x2001,0xfffe,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffe,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffe,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr7	; 16 bit result
-	set_fr_iimmed  	0x4000,0xfffe,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x8000,acc1
-
-	set_fr_iimmed	0x7fff,0x8000,fr7	; max negative result
-	set_fr_iimmed	0x7fff,0x8000,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xc000,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xc000,0x8000,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr7		; multiply small numbers
-	set_fr_iimmed  	0xfffe,0xfffd,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	0xffff,0xfffe,fr7		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr7	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr8
-	mmulxhs      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40000000,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mmulxhu.cgs b/sim/testsuite/sim/frv/mmulxhu.cgs
deleted file mode 100644
index 866b64e50f4..00000000000
--- a/sim/testsuite/sim/frv/mmulxhu.cgs
+++ /dev/null
@@ -1,82 +0,0 @@
-# frv testcase for mmulxhu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mmulxhu
-mmulxhu:
-	set_fr_iimmed  	3,2,fr7		; multiply small numbers
-	set_fr_iimmed  	3,2,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	1,2,fr7		; multiply by 1
-	set_fr_iimmed  	1,2,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed  	0,2,fr7		; multiply by 0
-	set_fr_iimmed  	0,2,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-
-	set_fr_iimmed 	0x3fff,2,fr7	; 15 bit result
-	set_fr_iimmed  	0x3fff,2,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x7ffe,acc1
-
-	set_fr_iimmed  	0x4000,2,fr7	; 16 bit result
-	set_fr_iimmed  	0x4000,2,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-
-	set_fr_iimmed  	0x8000,2,fr7	; 17 bit result
-	set_fr_iimmed  	0x8000,2,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x00010000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x00010000,acc1
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr7	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed  	0x8000,0x8000,fr7	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x4000,0x0000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x4000,0x0000,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr7	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr8
-	mmulxhu      	fr7,fr8,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0xfffe,0x0001,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mnop.cgs b/sim/testsuite/sim/frv/mnop.cgs
deleted file mode 100644
index 54dda66b94c..00000000000
--- a/sim/testsuite/sim/frv/mnop.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# frv testcase for mnop
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mnop
-mnop:
-	mnop
-
-	pass
diff --git a/sim/testsuite/sim/frv/mnot.cgs b/sim/testsuite/sim/frv/mnot.cgs
deleted file mode 100644
index 3a90781a0e8..00000000000
--- a/sim/testsuite/sim/frv/mnot.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# frv testcase for mnot $FRintj,$FRintk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mnot
-mnot:
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	mnot      	fr7,fr7
-	test_fr_iimmed 	0x55555555,fr7
-
-	set_fr_iimmed   0xdead,0xbeef,fr7
-	mnot      	fr7,fr7
-	test_fr_iimmed 	0x21524110,fr7
-
-	pass
diff --git a/sim/testsuite/sim/frv/mor.cgs b/sim/testsuite/sim/frv/mor.cgs
deleted file mode 100644
index 72feaffb64d..00000000000
--- a/sim/testsuite/sim/frv/mor.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# frv testcase for mor $FRinti,$FRintj,$FRintk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mor
-mor:
-	set_fr_iimmed  	0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	mor      	fr7,fr8,fr8
-	test_fr_iimmed 	0xffffffff,fr8
-
-	set_fr_iimmed   0x0000,0x0000,fr7
-	set_fr_iimmed   0x0000,0x0000,fr8
-	mor		fr7,fr8,fr8
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed  	0x0000,0xbeef,fr8
-	mor		fr7,fr8,fr8
-	test_fr_iimmed 	0xdeadbeef,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/mov.cgs b/sim/testsuite/sim/frv/mov.cgs
deleted file mode 100644
index 8a077eb5e54..00000000000
--- a/sim/testsuite/sim/frv/mov.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# frv testcase for mov $GRi,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ori
-ori:
-	set_gr_immed   	0xdeadbeef,gr7
-	set_gr_immed   	0xbeefdead,gr8
-	set_icc         0x08,0
-	mov		gr7,gr8
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0xdeadbeef,gr7
-	test_gr_immed  	0xdeadbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/movfg.cgs b/sim/testsuite/sim/frv/movfg.cgs
deleted file mode 100644
index c3da00ec16b..00000000000
--- a/sim/testsuite/sim/frv/movfg.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for movfg $FRk,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global movfg
-movfg:
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_gr_limmed	0,0,gr8
-	movfg fr8,gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/movfgd.cgs b/sim/testsuite/sim/frv/movfgd.cgs
deleted file mode 100644
index cc2d60de0ff..00000000000
--- a/sim/testsuite/sim/frv/movfgd.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# frv testcase for movfgd $FRk,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global movfgd
-movfgd:
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	movfgd fr8,gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/movfgq.cgs b/sim/testsuite/sim/frv/movfgq.cgs
deleted file mode 100644
index b3a90e817ad..00000000000
--- a/sim/testsuite/sim/frv/movfgq.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# frv testcase for movfgq $FRk,$GRj
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global movfgq
-movfgq:
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	set_gr_limmed	0,0,gr8
-	set_gr_limmed	0,0,gr9
-	set_gr_limmed	0,0,gr10
-	set_gr_limmed	0,0,gr11
-	movfgq fr8,gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_fr_limmed	0x1234,0x5678,fr10
-	test_fr_limmed	0x9abc,0xdef0,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/movgf.cgs b/sim/testsuite/sim/frv/movgf.cgs
deleted file mode 100644
index 40fae33f072..00000000000
--- a/sim/testsuite/sim/frv/movgf.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for movgf $GRj,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global movgf
-movgf:
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_fr_iimmed	0,0,fr8
-	movgf gr8,fr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/movgfd.cgs b/sim/testsuite/sim/frv/movgfd.cgs
deleted file mode 100644
index df844ccf6cb..00000000000
--- a/sim/testsuite/sim/frv/movgfd.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# frv testcase for movgfd $GRj,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global movgfd
-movgfd:
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	movgfd gr8,fr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/movgfq.cgs b/sim/testsuite/sim/frv/movgfq.cgs
deleted file mode 100644
index 0196133496a..00000000000
--- a/sim/testsuite/sim/frv/movgfq.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# frv testcase for movgfq $GRj,$FRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global movgfq
-movgfq:
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	set_fr_iimmed	0,0,fr8
-	set_fr_iimmed	0,0,fr9
-	set_fr_iimmed	0,0,fr10
-	set_fr_iimmed	0,0,fr11
-	movgfq gr8,fr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_limmed	0xbeef,0xdead,gr9
-	test_gr_limmed	0x1234,0x5678,gr10
-	test_gr_limmed	0x9abc,0xdef0,gr11
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_fr_limmed	0xbeef,0xdead,fr9
-	test_fr_limmed	0x1234,0x5678,fr10
-	test_fr_limmed	0x9abc,0xdef0,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/movgs.cgs b/sim/testsuite/sim/frv/movgs.cgs
deleted file mode 100644
index f9d2f549932..00000000000
--- a/sim/testsuite/sim/frv/movgs.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# frv testcase for movgs $GRj,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global movgs
-movgs:
-	set_gr_limmed	0xdead,0xbeef,gr8
-	and_spr_immed	0,lcr
-	movgs gr8,lcr
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,lcr
-
-	; try alternate names for lcr
-	and_spr_immed	0,273
-	movgs gr8,spr[273]			; lcr is spr number 273
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,spr[273]
-
-	pass
diff --git a/sim/testsuite/sim/frv/movsg.cgs b/sim/testsuite/sim/frv/movsg.cgs
deleted file mode 100644
index b26dbc18a57..00000000000
--- a/sim/testsuite/sim/frv/movsg.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for movsg $FRk,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global movsg
-movsg:
-	set_spr_limmed	0xdead,0xbeef,lcr
-	set_gr_limmed	0,0,gr8
-	movsg lcr,gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0xdead,0xbeef,lcr
-
-	pass
diff --git a/sim/testsuite/sim/frv/mpackh.cgs b/sim/testsuite/sim/frv/mpackh.cgs
deleted file mode 100644
index 5a87cc6b5d0..00000000000
--- a/sim/testsuite/sim/frv/mpackh.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# frv testcase for mpackh $FRi,$FRj,$FRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mpackh
-mpackh:
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	mpackh		fr10,fr11,fr12
-	test_fr_limmed	0xbeef,0x5678,fr12
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqcpxis.cgs b/sim/testsuite/sim/frv/mqcpxis.cgs
deleted file mode 100644
index 397f5335d21..00000000000
--- a/sim/testsuite/sim/frv/mqcpxis.cgs
+++ /dev/null
@@ -1,103 +0,0 @@
-# frv testcase for mqcpxis $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqcpxis
-mqcpxis:
-	; Positive operands
-	set_fr_iimmed  	2,4,fr8		; multiply small numbers
-	set_fr_iimmed  	5,3,fr10
-	set_fr_iimmed  	3,1,fr9		; multiply by 0
-	set_fr_iimmed  	0,2,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 0x00,accg0
-	test_acc_immed 	26,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed	0x3fff,1,fr9	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	3,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7fff,acc1
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	0x2000,2,fr10
-	set_fr_iimmed	0x7fff,0x0000,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xc000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x0001,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	1,0xfffd,fr10
-	set_fr_iimmed  	0xfffe,2,fr9		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-9,acc0
-	test_accg_immed 0xff,accg1
-	test_acc_immed 	-6,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0xfffe,1,fr10
-	set_fr_iimmed  	0x2001,0xffff,fr9	; 15 bit result
-	set_fr_iimmed  	0xffff,0xfffe,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbfff,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0x0003,0xfffe,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x7ffa,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0x8001,0x0000,acc1
-
-	; Negative operands
-	set_fr_iimmed	0x8000,0x8000,fr8	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed  	0xfffe,0xfffc,fr9		; multiply small numbers
-	set_fr_iimmed  	0xfffb,0xfffd,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 0x00,accg0
-	test_acc_limmed	0x8000,0x0000,acc0
-	test_accg_immed 0x00,accg1
-	test_acc_immed 	26,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr8		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr10
-	set_fr_iimmed	0x7fff,0x0000,fr9	; almost max positive result
-	set_fr_iimmed	0x8001,0x7fff,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	3,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed	0x8000,0x0000,fr8	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x8000,0x0000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqcpxis      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40000000,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqcpxiu.cgs b/sim/testsuite/sim/frv/mqcpxiu.cgs
deleted file mode 100644
index 22d48f6333c..00000000000
--- a/sim/testsuite/sim/frv/mqcpxiu.cgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# frv testcase for mqcpxiu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqcpxiu
-mqcpxiu:
-	set_fr_iimmed  	4,2,fr8		; multiply small numbers
-	set_fr_iimmed  	3,5,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	1,3,fr11
-	mqcpxiu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	26,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	5,acc1
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	0,2,fr10
-	set_fr_iimmed 	0x3fff,1,fr9	; 15 bit result
-	set_fr_iimmed  	0x0001,2,fr11
-	mqcpxiu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x7fff,acc1
-
-	set_fr_iimmed  	0x4000,1,fr8	; 16 bit result
-	set_fr_iimmed  	0x0001,2,fr10
-	set_fr_iimmed  	0x4000,1,fr9	; 17 bit result
-	set_fr_iimmed  	0x0001,4,fr11
-	mqcpxiu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x0010001,acc1
-
-	set_fr_iimmed  	0x7fff,0x0000,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x0000,0x8000,fr11
-	mqcpxiu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x4000,0x0000,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	mqcpxiu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 1,accg1
-	test_acc_immed	0xfffc0002,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqcpxrs.cgs b/sim/testsuite/sim/frv/mqcpxrs.cgs
deleted file mode 100644
index d1d1f48db1c..00000000000
--- a/sim/testsuite/sim/frv/mqcpxrs.cgs
+++ /dev/null
@@ -1,103 +0,0 @@
-# frv testcase for mqcpxrs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqcpxrs
-mqcpxrs:
-	; Positive operands
-	set_fr_iimmed  	2,4,fr8		; multiply small numbers
-	set_fr_iimmed  	3,5,fr10
-	set_fr_iimmed  	3,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-14,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x0007,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ff0,acc1
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x2000,fr10
-	set_fr_iimmed	0x7fff,0x0000,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x4000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x0001,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,1,fr10
-	set_fr_iimmed  	0xfffe,2,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-3,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	1,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0xfff9,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-2,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbff0,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x0003,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8006,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0x8000,0x8000,acc1
-
-	; Negative operands
-	set_fr_iimmed	0x8000,0x7fff,fr8	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed  	0xfffe,0xfffc,fr9		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffb,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x7fff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-14,acc1
-
-	set_fr_iimmed  	0xffff,0xffff,fr8		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr10
-	set_fr_iimmed	0x7fff,0x0000,fr9	; almost max positive result
-	set_fr_iimmed	0x7fff,0x8001,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	1,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-
-	set_fr_iimmed	0x8000,0x0000,fr8	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr10
-	set_fr_iimmed	0x8000,0x0000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqcpxrs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x40000000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x40000000,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqcpxru.cgs b/sim/testsuite/sim/frv/mqcpxru.cgs
deleted file mode 100644
index 45e1b358bed..00000000000
--- a/sim/testsuite/sim/frv/mqcpxru.cgs
+++ /dev/null
@@ -1,78 +0,0 @@
-# frv testcase for mqcpxru $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqcpxru
-mqcpxru:
-	set_fr_iimmed  	4,2,fr8		; multiply small numbers
-	set_fr_iimmed  	5,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	3,1,fr11
-	mqcpxru      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	14,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	1,acc1
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,1,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x0001,fr11
-	mqcpxru      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x7ffd,acc1
-
-	set_fr_iimmed  	0x4000,1,fr8	; 16 bit result
-	set_fr_iimmed  	4,0x0001,fr10
-	set_fr_iimmed  	0x8000,1,fr9	; 17 bit result
-	set_fr_iimmed  	4,0x0001,fr11
-	mqcpxru      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0xffff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x0001ffff,acc1
-
-	set_fr_iimmed  	0x7fff,0x0000,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x0000,fr11
-	mqcpxru      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x4000,0x0000,acc1
-
-	set_fr_iimmed  	0xffff,0x0000,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x0001,fr9	; saturation
-	set_fr_iimmed  	0xffff,0x0001,fr11
-	mqcpxru      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed	0,acc1
-
-	set_fr_iimmed  	0x0000,0xffff,fr8	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xfffe,0xffff,fr9	; saturation
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	mqcpxru      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xc,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed	0,acc1
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqlclrhs.cgs b/sim/testsuite/sim/frv/mqlclrhs.cgs
deleted file mode 100644
index 5e090b00d7a..00000000000
--- a/sim/testsuite/sim/frv/mqlclrhs.cgs
+++ /dev/null
@@ -1,74 +0,0 @@
-# frv testcase for mqlclrhs $FRi,$FRj,$FRj
-# mach: fr450
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqlclrhs
-mqlclrhs:
-	set_fr_iimmed	0x1000,0x2000,fr4
-	set_fr_iimmed	0xe800,0xd800,fr5
-	set_fr_iimmed	0x0800,0x0800,fr6
-	set_fr_iimmed	0x0800,0x0800,fr7
-	mqlclrhs	fr4,fr6,fr8
-	test_fr_limmed	0x1000,0x2000,fr8
-	test_fr_limmed	0xe800,0xd800,fr9
-
-	set_fr_iimmed	0x1000,0x2000,fr4
-	set_fr_iimmed	0xe800,0xd800,fr5
-	set_fr_iimmed	0xf800,0xf800,fr6
-	set_fr_iimmed	0xf800,0xf800,fr7
-	mqlclrhs	fr4,fr6,fr8
-	test_fr_limmed	0xf000,0xe000,fr8
-	test_fr_limmed	0x1800,0x2800,fr9
-
-	set_fr_iimmed	0x1000,0x1000,fr4
-	set_fr_iimmed	0x1000,0x1000,fr5
-	set_fr_iimmed	0xf000,0xf800,fr6
-	set_fr_iimmed	0x0800,0x1000,fr7
-	mqlclrhs	fr4,fr6,fr8
-	test_fr_limmed	0x0000,0xf000,fr8
-	test_fr_limmed	0x1000,0x0000,fr9
-
-	set_fr_iimmed	0xf000,0xf000,fr4
-	set_fr_iimmed	0xf000,0xf000,fr5
-	set_fr_iimmed	0xf000,0xf800,fr6
-	set_fr_iimmed	0x0800,0x1000,fr7
-	mqlclrhs	fr4,fr6,fr8
-	test_fr_limmed	0x0000,0x1000,fr8
-	test_fr_limmed	0xf000,0x0000,fr9
-
-	set_fr_iimmed	0x8000,0x8000,fr4
-	set_fr_iimmed	0x8000,0x8000,fr5
-	set_fr_iimmed	0x8000,0x7fff,fr6
-	set_fr_iimmed	0x8001,0x0000,fr7
-	mqlclrhs	fr4,fr6,fr8
-	test_fr_limmed	0x0000,0x8000,fr8
-	test_fr_limmed	0x7fff,0x8000,fr9
-
-	set_fr_iimmed	0x7fff,0x7fff,fr4
-	set_fr_iimmed	0x7fff,0x7fff,fr5
-	set_fr_iimmed	0x8000,0x7fff,fr6
-	set_fr_iimmed	0x8001,0x0000,fr7
-	mqlclrhs	fr4,fr6,fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_fr_limmed	0x0000,0x7fff,fr9
-
-	set_fr_iimmed	0x8001,0x8001,fr4
-	set_fr_iimmed	0x8001,0x8001,fr5
-	set_fr_iimmed	0x8000,0x7fff,fr6
-	set_fr_iimmed	0x8001,0x0000,fr7
-	mqlclrhs	fr4,fr6,fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_fr_limmed	0x0000,0x8001,fr9
-
-	set_fr_iimmed	0x8000,0x8000,fr4
-	set_fr_iimmed	0x0001,0xffff,fr5
-	set_fr_iimmed	0x0001,0xffff,fr6
-	set_fr_iimmed	0x8000,0x8000,fr7
-	mqlclrhs	fr4,fr6,fr8
-	test_fr_limmed	0x8000,0x7fff,fr8
-	test_fr_limmed	0x0000,0x0000,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqlmths.cgs b/sim/testsuite/sim/frv/mqlmths.cgs
deleted file mode 100644
index d416d651dac..00000000000
--- a/sim/testsuite/sim/frv/mqlmths.cgs
+++ /dev/null
@@ -1,74 +0,0 @@
-# frv testcase for mqlmths $FRi,$FRj,$FRj
-# mach: fr450
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqlmths
-mqlmths:
-	set_fr_iimmed	0x1000,0x2000,fr4
-	set_fr_iimmed	0xe800,0xd800,fr5
-	set_fr_iimmed	0x0800,0x0800,fr6
-	set_fr_iimmed	0x0800,0x0800,fr7
-	mqlmths		fr4,fr6,fr8
-	test_fr_limmed	0x0800,0x0800,fr8
-	test_fr_limmed	0xf800,0xf800,fr9
-
-	set_fr_iimmed	0x1000,0x2000,fr4
-	set_fr_iimmed	0xe800,0xd800,fr5
-	set_fr_iimmed	0xf800,0xf800,fr6
-	set_fr_iimmed	0xf800,0xf800,fr7
-	mqlmths		fr4,fr6,fr8
-	test_fr_limmed	0xf800,0xf800,fr8
-	test_fr_limmed	0x0800,0x0800,fr9
-
-	set_fr_iimmed	0x1000,0x1000,fr4
-	set_fr_iimmed	0x1000,0x1000,fr5
-	set_fr_iimmed	0xe800,0xf800,fr6
-	set_fr_iimmed	0x0800,0x1800,fr7
-	mqlmths		fr4,fr6,fr8
-	test_fr_limmed	0x1000,0xf800,fr8
-	test_fr_limmed	0x0800,0x1000,fr9
-
-	set_fr_iimmed	0xf000,0xf000,fr4
-	set_fr_iimmed	0xf000,0xf000,fr5
-	set_fr_iimmed	0xe800,0xf800,fr6
-	set_fr_iimmed	0x0800,0x1800,fr7
-	mqlmths		fr4,fr6,fr8
-	test_fr_limmed	0xf000,0x0800,fr8
-	test_fr_limmed	0xf800,0xf000,fr9
-
-	set_fr_iimmed	0x8000,0x8000,fr4
-	set_fr_iimmed	0x8000,0x8000,fr5
-	set_fr_iimmed	0x8000,0x7fff,fr6
-	set_fr_iimmed	0x8001,0x0000,fr7
-	mqlmths		fr4,fr6,fr8
-	test_fr_limmed	0x7fff,0x8001,fr8
-	test_fr_limmed	0x7fff,0x0000,fr9
-
-	set_fr_iimmed	0x7fff,0x7fff,fr4
-	set_fr_iimmed	0x7fff,0x7fff,fr5
-	set_fr_iimmed	0x8000,0x7fff,fr6
-	set_fr_iimmed	0x8001,0x0000,fr7
-	mqlmths		fr4,fr6,fr8
-	test_fr_limmed	0x7fff,0x7fff,fr8
-	test_fr_limmed	0x8001,0x0000,fr9
-
-	set_fr_iimmed	0x8001,0x8001,fr4
-	set_fr_iimmed	0x8001,0x8001,fr5
-	set_fr_iimmed	0x8000,0x7fff,fr6
-	set_fr_iimmed	0x8001,0x0000,fr7
-	mqlmths		fr4,fr6,fr8
-	test_fr_limmed	0x8001,0x8001,fr8
-	test_fr_limmed	0x7fff,0x0000,fr9
-
-	set_fr_iimmed	0x8000,0x8000,fr4
-	set_fr_iimmed	0x0001,0xffff,fr5
-	set_fr_iimmed	0x0001,0xffff,fr6
-	set_fr_iimmed	0x8000,0x8000,fr7
-	mqlmths		fr4,fr6,fr8
-	test_fr_limmed	0xffff,0x0001,fr8
-	test_fr_limmed	0x0001,0xffff,fr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqmachs.cgs b/sim/testsuite/sim/frv/mqmachs.cgs
deleted file mode 100644
index 5608c647150..00000000000
--- a/sim/testsuite/sim/frv/mqmachs.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# frv testcase for mqmachs $GRi,$GRj,$ACCk
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqmachs
-mqmachs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8008,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7fff,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7fff,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7ffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7ffd,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x3fff,0x3ffb,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x3fff,0x3ffb,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffb,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffb,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0008,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffd,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffd,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0009,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0009,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fffbffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fffbffd,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/mqmachu.cgs b/sim/testsuite/sim/frv/mqmachu.cgs
deleted file mode 100644
index e16be68bd6b..00000000000
--- a/sim/testsuite/sim/frv/mqmachu.cgs
+++ /dev/null
@@ -1,144 +0,0 @@
-# frv testcase for mqmachu $GRi,$GRj,$GRk
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqmachu
-mqmachu:
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8000,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8006,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8006,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00018000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00018000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff8007,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff8007,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4001,0x8000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4001,0x8000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	1,accg0
-	test_acc_limmed	0x3ffd,0x8008,acc0
-	test_accg_immed 	1,accg1
-	test_acc_limmed	0x3ffd,0x8008,acc1
-	test_accg_immed 	1,accg2
-	test_acc_limmed	0x3fff,0x8001,acc2
-	test_accg_immed 	1,accg3
-	test_acc_limmed	0x3fff,0x8001,acc3
-
-	set_accg_immed 	0xff,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0xff,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0xff,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0xff,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	1,1,fr9
-	set_fr_iimmed  	1,1,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_fr_iimmed  	0xffff,0x0000,fr8
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0x0000,0xffff,fr9
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	mqmachu      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqmacxhs.cgs b/sim/testsuite/sim/frv/mqmacxhs.cgs
deleted file mode 100644
index 0be1151c69a..00000000000
--- a/sim/testsuite/sim/frv/mqmacxhs.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# frv testcase for mqmacxhs $GRi,$GRj,$ACCk
-# mach: fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqmacxhs
-mqmacxhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	0,2,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	2,1,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	0x3fff,2,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	8,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	8,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,2,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8008,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7fff,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7fff,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	2,0xfffd,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x7ffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x7ffd,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0xfffe,0,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0x2001,0xfffe,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x0000,0x8002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x0000,0x8002,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x3fff,0x3ffb,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x3fff,0x3ffb,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,0xfffe,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0002,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0002,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffb,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffb,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffe,0xfffd,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x0008,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x0008,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffd,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffd,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0009,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0009,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fffbffd,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fffbffd,acc3
-
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	0xffff,1,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x9,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/mqmulhs.cgs b/sim/testsuite/sim/frv/mqmulhs.cgs
deleted file mode 100644
index 0a10c2908ce..00000000000
--- a/sim/testsuite/sim/frv/mqmulhs.cgs
+++ /dev/null
@@ -1,125 +0,0 @@
-# frv testcase for mqmulhs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqmulhs
-mqmulhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	mqmulhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	mqmulhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqmulhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x0001,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x0001,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	mqmulhs      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_immed 	-2,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed 	-2,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	mqmulhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffe,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffe,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	mqmulhs      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x8000,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xc000,0x8000,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xc000,0x8000,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	mqmulhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqmulhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x40000000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x40000000,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqmulhu.cgs b/sim/testsuite/sim/frv/mqmulhu.cgs
deleted file mode 100644
index e94c09ae97e..00000000000
--- a/sim/testsuite/sim/frv/mqmulhu.cgs
+++ /dev/null
@@ -1,80 +0,0 @@
-# frv testcase for mqmulhu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqmulhu
-mqmulhu:
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	2,1,fr11
-	mqmulhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	2,0,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	mqmulhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x7ffe,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	2,0x8000,fr11
-	mqmulhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00010000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00010000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	mqmulhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4000,0x0000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4000,0x0000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	mqmulhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0xfffe,0x0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0xfffe,0x0001,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0xfffe,0x0001,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqmulxhs.cgs b/sim/testsuite/sim/frv/mqmulxhs.cgs
deleted file mode 100644
index 7686bc1cf5c..00000000000
--- a/sim/testsuite/sim/frv/mqmulxhs.cgs
+++ /dev/null
@@ -1,125 +0,0 @@
-# frv testcase for mqmulxhs $GRi,$GRj,$ACCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqmulxhs
-mqmulxhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	0,2,fr11
-	mqmulxhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	4,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	9,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	2,1,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	0x3fff,2,fr11
-	mqmulxhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	2,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	2,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0,0x7ffe,acc3
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,2,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqmulxhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x3fff,0x0001,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x3fff,0x0001,acc3
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	2,0xfffd,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr11
-	mqmulxhs      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_immed 	-6,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_immed 	-6,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_immed 	-2,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_immed 	-2,acc3
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0xfffe,0,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0x2001,0xfffe,fr11
-	mqmulxhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xffff,0xbffe,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xffff,0xbffe,acc3
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,0xfffe,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	mqmulxhs      	fr8,fr10,acc0
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0x8000,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0x8000,acc1
-	test_accg_immed 	0xff,accg2
-	test_acc_limmed	0xc000,0x8000,acc2
-	test_accg_immed 	0xff,accg3
-	test_acc_limmed	0xc000,0x8000,acc3
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffe,0xfffd,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr11
-	mqmulxhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqmulxhs      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x40000000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x40000000,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqmulxhu.cgs b/sim/testsuite/sim/frv/mqmulxhu.cgs
deleted file mode 100644
index b60e421bc73..00000000000
--- a/sim/testsuite/sim/frv/mqmulxhu.cgs
+++ /dev/null
@@ -1,80 +0,0 @@
-# frv testcase for mqmulxhu $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqmulxhu
-mqmulxhu:
-	set_fr_iimmed  	3,2,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	1,2,fr9		; multiply by 1
-	set_fr_iimmed  	1,2,fr11
-	mqmulxhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	6,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	6,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	2,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	2,acc3
-
-	set_fr_iimmed  	0,2,fr8		; multiply by 0
-	set_fr_iimmed  	0,2,fr10
-	set_fr_iimmed 	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	0x3fff,2,fr11
-	mqmulxhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x7ffe,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x7ffe,acc3
-
-	set_fr_iimmed  	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,2,fr10
-	set_fr_iimmed  	0x8000,2,fr9	; 17 bit result
-	set_fr_iimmed  	0x8000,2,fr11
-	mqmulxhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x0000,0x8000,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x0000,0x8000,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x00010000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x00010000,acc3
-
-	set_fr_iimmed  	0x7fff,0x7fff,fr8	; max positive result
-	set_fr_iimmed  	0x7fff,0x7fff,fr10
-	set_fr_iimmed  	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed  	0x8000,0x8000,fr11
-	mqmulxhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fff0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fff0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x4000,0x0000,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x4000,0x0000,acc3
-
-	set_fr_iimmed  	0xffff,0xffff,fr8	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr10
-	set_fr_iimmed  	0xffff,0xffff,fr9	; max positive result
-	set_fr_iimmed  	0xffff,0xffff,fr11
-	mqmulxhu      	fr8,fr10,acc0
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0xfffe,0x0001,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0xfffe,0x0001,acc1
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0xfffe,0x0001,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0xfffe,0x0001,acc3
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqsaths.cgs b/sim/testsuite/sim/frv/mqsaths.cgs
deleted file mode 100644
index 61ff112b5c6..00000000000
--- a/sim/testsuite/sim/frv/mqsaths.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for mqsaths $FRi,$FRj,$FRj
-# mach: fr400 fr550
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqsaths
-mqsaths:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0001,0x7fff,fr11
-	set_fr_iimmed	0x0000,0x0000,fr13
-	mqsaths		fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-
-	set_fr_iimmed	0xffff,0x8000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr12
-	set_fr_iimmed	0x0000,0x0000,fr11
-	set_fr_iimmed	0x0040,0x0040,fr13
-	mqsaths		fr10,fr12,fr14
-	test_fr_limmed	0xffff,0xffff,fr14
-	test_fr_limmed	0x0000,0x0000,fr15
-
-	set_fr_iimmed	0x0001,0x7fff,fr10
-	set_fr_iimmed	0x0040,0x0040,fr12
-	set_fr_iimmed	0xffff,0x8000,fr11
-	set_fr_iimmed	0x0040,0x0040,fr13
-	mqsaths		fr10,fr12,fr14
-	test_fr_limmed	0x0001,0x0040,fr14
-	test_fr_limmed	0xffff,0xffbf,fr15
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr12
-	set_fr_iimmed	0x0001,0x7fff,fr11
-	set_fr_iimmed	0x7fff,0x7fff,fr13
-	mqsaths		fr10,fr12,fr14
-	test_fr_limmed	0x0000,0x0000,fr14
-	test_fr_limmed	0x0001,0x7fff,fr15
-
-	set_fr_iimmed	0xffff,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr12
-	set_fr_iimmed	0xffff,0x8000,fr11
-	set_fr_iimmed	0x7fff,0x7fff,fr13
-	mqsaths		fr10,fr12,fr14
-	test_fr_limmed	0xffff,0x8000,fr14
-	test_fr_limmed	0xffff,0x8000,fr15
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqsllhi.cgs b/sim/testsuite/sim/frv/mqsllhi.cgs
deleted file mode 100644
index 21379f2b0b8..00000000000
--- a/sim/testsuite/sim/frv/mqsllhi.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# frv testcase for mqsllhi $FRi,#u6,$FRj
-# mach: fr450
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqsllhi
-mqsllhi:
-	set_fr_iimmed	0x0001,0x0002,fr4
-	set_fr_iimmed	0x0003,0x0004,fr5
-	mqsllhi		fr4,#1,fr6
-	test_fr_limmed	0x0002,0x0004,fr6
-	test_fr_limmed	0x0006,0x0008,fr7
-
-	set_fr_iimmed	0xffff,0xfffe,fr4
-	set_fr_iimmed	0xfffc,0xfff8,fr5
-	mqsllhi		fr4,#1,fr6
-	test_fr_limmed	0xfffe,0xfffc,fr6
-	test_fr_limmed	0xfff8,0xfff0,fr7
-
-	set_fr_iimmed	0xffff,0xfffe,fr4
-	set_fr_iimmed	0xfffc,0xfff8,fr5
-	mqsllhi		fr4,#12,fr6
-	test_fr_limmed	0xf000,0xe000,fr6
-	test_fr_limmed	0xc000,0x8000,fr7
-
-	set_fr_iimmed	0x1234,0x5678,fr4
-	set_fr_iimmed	0x9abc,0xdef0,fr5
-	mqsllhi		fr4,#12,fr6
-	test_fr_limmed	0x4000,0x8000,fr6
-	test_fr_limmed	0xc000,0x0000,fr7
-
-	set_fr_iimmed	0x1234,0x5678,fr4
-	set_fr_iimmed	0x9abc,0xdef0,fr5
-	mqsllhi		fr4,#16,fr6
-	test_fr_limmed	0x1234,0x5678,fr6
-	test_fr_limmed	0x9abc,0xdef0,fr7
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqsrahi.cgs b/sim/testsuite/sim/frv/mqsrahi.cgs
deleted file mode 100644
index 1d30179c498..00000000000
--- a/sim/testsuite/sim/frv/mqsrahi.cgs
+++ /dev/null
@@ -1,40 +0,0 @@
-# frv testcase for mqsrahi $FRi,#u6,$FRj
-# mach: fr450
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqsrahi
-mqsrahi:
-	set_fr_iimmed	0x0001,0x0002,fr4
-	set_fr_iimmed	0x0003,0x0004,fr5
-	mqsrahi		fr4,#1,fr6
-	test_fr_limmed	0x0000,0x0001,fr6
-	test_fr_limmed	0x0001,0x0002,fr7
-
-	set_fr_iimmed	0xffff,0xfffe,fr4
-	set_fr_iimmed	0xfffc,0xfff8,fr5
-	mqsrahi		fr4,#1,fr6
-	test_fr_limmed	0xffff,0xffff,fr6
-	test_fr_limmed	0xfffe,0xfffc,fr7
-
-	set_fr_iimmed	0x8000,0xc000,fr4
-	set_fr_iimmed	0xe000,0xf000,fr5
-	mqsrahi		fr4,#12,fr6
-	test_fr_limmed	0xfff8,0xfffc,fr6
-	test_fr_limmed	0xfffe,0xffff,fr7
-
-	set_fr_iimmed	0x1234,0x5678,fr4
-	set_fr_iimmed	0x9abc,0xdef0,fr5
-	mqsrahi		fr4,#12,fr6
-	test_fr_limmed	0x0001,0x0005,fr6
-	test_fr_limmed	0xfff9,0xfffd,fr7
-
-	set_fr_iimmed	0x1234,0x5678,fr4
-	set_fr_iimmed	0x9abc,0xdef0,fr5
-	mqsrahi		fr4,#16,fr6
-	test_fr_limmed	0x1234,0x5678,fr6
-	test_fr_limmed	0x9abc,0xdef0,fr7
-
-	pass
diff --git a/sim/testsuite/sim/frv/mqxmachs.cgs b/sim/testsuite/sim/frv/mqxmachs.cgs
deleted file mode 100644
index 6791ed31874..00000000000
--- a/sim/testsuite/sim/frv/mqxmachs.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# frv testcase for mqxmachs $GRi,$GRj,$ACCk
-# mach: fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqxmachs
-mqxmachs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	3,2,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	2,0,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	6,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	6,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	1,2,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	2,0x3fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_immed 	8,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	8,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ffe,acc1
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	2,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8008,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8008,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x7fff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x7fff,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,2,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	1,0xfffe,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x0000,0x8002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x0000,0x8002,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x7ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x7ffd,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0,0xfffe,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0xfffe,0x2001,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x0000,0x8002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x0000,0x8002,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffb,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffb,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0xfffe,0x4000,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x8000,0x7fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x0002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x0002,acc3
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffb,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffb,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffd,0xfffe,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xfffe,0xffff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x0008,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x0008,acc3
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fff0009,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fff0009,acc3
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fffbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fffbffd,acc1
-
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	1,0xffff,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqxmachs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/mqxmacxhs.cgs b/sim/testsuite/sim/frv/mqxmacxhs.cgs
deleted file mode 100644
index c644eed231c..00000000000
--- a/sim/testsuite/sim/frv/mqxmacxhs.cgs
+++ /dev/null
@@ -1,211 +0,0 @@
-# frv testcase for mqxmacxhs $GRi,$GRj,$ACCk
-# mach: fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mqxmacxhs
-mqxmacxhs:
-	; Positive operands
-	set_fr_iimmed  	2,3,fr8		; multiply small numbers
-	set_fr_iimmed  	2,3,fr10
-	set_fr_iimmed  	0,1,fr9		; multiply by 0
-	set_fr_iimmed  	0,2,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0,acc1
-	test_accg_immed 	0,accg2
-	test_acc_immed 	6,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	6,acc3
-
-	set_fr_iimmed  	2,1,fr8		; multiply by 1
-	set_fr_iimmed  	2,1,fr10
-	set_fr_iimmed	0x3fff,2,fr9	; 15 bit result
-	set_fr_iimmed  	0x3fff,2,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_immed 	8,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	8,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0,0x7ffe,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0,0x7ffe,acc1
-
-	set_fr_iimmed	0x4000,2,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,2,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr9	; max positive result
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x8008,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x8008,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x7fff,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x7fff,acc1
-
-	; Mixed operands
-	set_fr_iimmed  	2,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	2,0xfffd,fr10
-	set_fr_iimmed  	0xfffe,1,fr9		; multiply by 1
-	set_fr_iimmed  	0xfffe,1,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x0000,0x8002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x0000,0x8002,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed 0x3fff,0x7ffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed 0x3fff,0x7ffd,acc1
-
-	set_fr_iimmed  	0xfffe,0,fr8		; multiply by 0
-	set_fr_iimmed  	0xfffe,0,fr10
-	set_fr_iimmed  	0x2001,0xfffe,fr9	; 15 bit result
-	set_fr_iimmed  	0x2001,0xfffe,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed 0x0000,0x8002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed 0x0000,0x8002,acc3
-	test_accg_immed 	0,accg0
-	test_acc_limmed	0x3fff,0x3ffb,acc0
-	test_accg_immed 	0,accg1
-	test_acc_limmed	0x3fff,0x3ffb,acc1
-
-	set_fr_iimmed	0x4000,0xfffe,fr8	; 16 bit result
-	set_fr_iimmed  	0x4000,0xfffe,fr10
-	set_fr_iimmed	0x7fff,0x8000,fr9	; max negative result
-	set_fr_iimmed	0x7fff,0x8000,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x0002,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x0002,acc3
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffb,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffb,acc1
-
-	; Negative operands
-	set_fr_iimmed  	0xfffe,0xfffd,fr8		; multiply small numbers
-	set_fr_iimmed  	0xfffe,0xfffd,fr10
-	set_fr_iimmed  	0xffff,0xfffe,fr9		; multiply by -1
-	set_fr_iimmed  	0xffff,0xfffe,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_limmed	0x0000,0x0008,acc2
-	test_accg_immed 	0,accg3
-	test_acc_limmed	0x0000,0x0008,acc3
-	test_accg_immed 	0xff,accg0
-	test_acc_limmed	0xffff,0xbffd,acc0
-	test_accg_immed 	0xff,accg1
-	test_acc_limmed	0xffff,0xbffd,acc1
-
-	set_fr_iimmed	0x8001,0x8001,fr8	; almost max positive result
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr9	; max positive result
-	set_fr_iimmed	0x8000,0x8000,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-	test_accg_immed 	0,accg2
-	test_acc_immed 	0x3fff0009,acc2
-	test_accg_immed 	0,accg3
-	test_acc_immed 	0x3fff0009,acc3
-	test_accg_immed 	0,accg0
-	test_acc_immed 	0x3fffbffd,acc0
-	test_accg_immed 	0,accg1
-	test_acc_immed 	0x3fffbffd,acc1
-
-	set_accg_immed 	0x7f,accg2		; saturation
-	set_acc_immed	0xffffffff,acc2
-	set_accg_immed 	0x7f,accg3
-	set_acc_immed	0xffffffff,acc3
-	set_accg_immed 	0x7f,accg0		; saturation
-	set_acc_immed	0xffffffff,acc0
-	set_accg_immed 	0x7f,accg1
-	set_acc_immed	0xffffffff,acc1
-	set_fr_iimmed  	1,1,fr8
-	set_fr_iimmed  	1,1,fr10
-	set_fr_iimmed  	0x7fff,0x7fff,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0xf,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x7f,accg2
-	test_acc_limmed	0xffff,0xffff,acc2
-	test_accg_immed 	0x7f,accg3
-	test_acc_limmed	0xffff,0xffff,acc3
-	test_accg_immed 	0x7f,accg0
-	test_acc_limmed	0xffff,0xffff,acc0
-	test_accg_immed 	0x7f,accg1
-	test_acc_limmed	0xffff,0xffff,acc1
-
-	set_accg_immed 	0x80,accg2		; saturation
-	set_acc_immed	0,acc2
-	set_accg_immed 	0x80,accg3
-	set_acc_immed	0,acc3
-	set_accg_immed 	0x80,accg0		; saturation
-	set_acc_immed	0,acc0
-	set_accg_immed 	0x80,accg1
-	set_acc_immed	0,acc1
-	set_fr_iimmed  	0xffff,0,fr8
-	set_fr_iimmed  	0xffff,1,fr10
-	set_fr_iimmed  	0x0000,0x8000,fr9	; saturation
-	set_fr_iimmed  	0x7fff,0x7fff,fr11
-	mqxmacxhs      	fr8,fr10,acc0
-	test_spr_bits	0x3c,2,0x6,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf is set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf is set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt is set
-	test_accg_immed 	0x80,accg2
-	test_acc_immed	0,acc2
-	test_accg_immed 	0x80,accg3
-	test_acc_immed	0,acc3
-	test_accg_immed 	0x80,accg0
-	test_acc_immed	0,acc0
-	test_accg_immed 	0x80,accg1
-	test_acc_immed	0,acc1
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/mrdacc.cgs b/sim/testsuite/sim/frv/mrdacc.cgs
deleted file mode 100644
index 217803655b6..00000000000
--- a/sim/testsuite/sim/frv/mrdacc.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mrdacc $ACC40i,$FRintk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mrdacc
-mrdacc:
-	set_accg_immed	0,accg0
-	set_acc_immed	0,acc0
-	set_accg_immed	-1,accg3
-	set_acc_immed	-1,acc3
-	set_accg_immed	0x12,accg2
-	set_acc_immed	0xdeadbeef,acc2
-
-	mrdacc		acc0,fr10
-	test_fr_iimmed	0,fr10
-
-	mrdacc		acc3,fr10
-	test_fr_iimmed	0xffffffff,fr10
-
-	mrdacc		acc2,fr10
-	test_fr_iimmed	0xdeadbeef,fr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/mrdaccg.cgs b/sim/testsuite/sim/frv/mrdaccg.cgs
deleted file mode 100644
index 96e94065e63..00000000000
--- a/sim/testsuite/sim/frv/mrdaccg.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for mrdaccg $ACC40i,$FRintk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mrdaccg
-mrdaccg:
-	set_accg_immed	0,accg0
-	set_acc_immed	0,acc0
-	set_accg_immed	-1,accg3
-	set_acc_immed	-1,acc3
-	set_accg_immed	0x12,accg2
-	set_acc_immed	0xdeadbeef,acc2
-
-	mrdaccg		accg0,fr10
-	test_fr_iimmed	0,fr10
-
-	mrdaccg		accg3,fr10
-	test_fr_iimmed	0x000000ff,fr10
-
-	mrdaccg		accg2,fr10
-	test_fr_iimmed	0x00000012,fr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/mrotli.cgs b/sim/testsuite/sim/frv/mrotli.cgs
deleted file mode 100644
index 02220ee4942..00000000000
--- a/sim/testsuite/sim/frv/mrotli.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for mrotli $FRi,$s6,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mrotli
-mrotli:
-	set_fr_iimmed   0,2,fr8
-	mrotli      	fr8,0x20,fr8	; Shift by 0
-	test_fr_iimmed  2,fr8
-
-	set_fr_iimmed   0,2,fr8
-	mrotli      	fr8,0,fr8	; Shift by 0
-	test_fr_iimmed  2,fr8
-
-	set_fr_iimmed   0,2,fr8
-	mrotli      	fr8,1,fr8	; Shift by 1
-	test_fr_iimmed  4,fr8
-
-	set_fr_iimmed   0,1,fr8
-	mrotli      	fr8,31,fr8	; Shift by 31
-	test_fr_iimmed 	0x80000000,fr8
-
-	set_fr_iimmed  	0,2,fr8
-	mrotli      	fr8,31,fr8	; max rotation
-	test_fr_iimmed  1,fr8
-
-	set_fr_iimmed  	0xdead,0xbeef,fr8
-	mrotli      	fr8,16,fr8
-	test_fr_iimmed  0xbeefdead,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/mrotri.cgs b/sim/testsuite/sim/frv/mrotri.cgs
deleted file mode 100644
index 17a5c74e7e7..00000000000
--- a/sim/testsuite/sim/frv/mrotri.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for mrotri $FRinti,$s6,$FRintk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mrotri
-mrotri:
-	set_fr_iimmed   0x8000,0x0000,fr8
-	mrotri      	fr8,0x20,fr8	; Shift by 0
-	test_fr_iimmed 	0x80000000,fr8
-
-	set_fr_iimmed   0x8000,0x0000,fr8
-	mrotri      	fr8,0,fr8	; Shift by 0
-	test_fr_iimmed 	0x80000000,fr8
-
-	set_fr_iimmed   0x8000,0x0000,fr8
-	mrotri      	fr8,1,fr8	; Shift by 1
-	test_fr_iimmed 	0x40000000,fr8
-
-	set_fr_iimmed   0x8000,0x0000,fr8
-	mrotri      	fr8,31,fr8	; Shift by 31
-	test_fr_iimmed  1,fr8
-
-	set_fr_iimmed   0x4000,0x0000,fr8
-	mrotri      	fr8,31,fr8	; max shift
-	test_fr_iimmed  0x80000000,fr8
-
-	set_fr_iimmed   0xdead,0xbeef,fr8
-	mrotri      	fr8,16,fr8	; max shift
-	test_fr_iimmed  0xbeefdead,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/msaths.cgs b/sim/testsuite/sim/frv/msaths.cgs
deleted file mode 100644
index 513d5d3d66a..00000000000
--- a/sim/testsuite/sim/frv/msaths.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# frv testcase for msaths $FRi,$FRj,$FRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global msaths
-msaths:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x7fff,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0xffff,0x8000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xffff,fr12
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0040,0x0040,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x7fff,fr10
-	set_fr_iimmed	0x0040,0x0040,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0x0001,0x0040,fr12
-
-	set_fr_iimmed	0xffff,0x8000,fr10
-	set_fr_iimmed	0x0040,0x0040,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0xffbf,fr12
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0x0001,0x7fff,fr12
-
-	set_fr_iimmed	0xffff,0x8000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	msaths		fr10,fr11,fr12
-	test_fr_limmed	0xffff,0x8000,fr12
-
-	pass
diff --git a/sim/testsuite/sim/frv/msathu.cgs b/sim/testsuite/sim/frv/msathu.cgs
deleted file mode 100644
index 4f376b2c34d..00000000000
--- a/sim/testsuite/sim/frv/msathu.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# frv testcase for msathu $FRi,$FRj,$FRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global msathu
-msathu:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x7fff,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0xffff,0x8000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0040,0x0040,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x7fff,fr10
-	set_fr_iimmed	0x0040,0x0040,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x0001,0x0040,fr12
-
-	set_fr_iimmed	0xffff,0x8000,fr10
-	set_fr_iimmed	0x0040,0x0040,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x0040,0x0040,fr12
-
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-
-	set_fr_iimmed	0x0001,0x7fff,fr10
-	set_fr_iimmed	0x7fff,0x7fff,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x0001,0x7fff,fr12
-
-	set_fr_iimmed	0xffff,0xffff,fr10
-	set_fr_iimmed	0x7fff,0xffff,fr11
-	msathu		fr10,fr11,fr12
-	test_fr_limmed	0x7fff,0xffff,fr12
-
-	pass
diff --git a/sim/testsuite/sim/frv/msllhi.cgs b/sim/testsuite/sim/frv/msllhi.cgs
deleted file mode 100644
index 4340b9f9c06..00000000000
--- a/sim/testsuite/sim/frv/msllhi.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# frv testcase for msllhi $FRi,$s6,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global msllhi
-msllhi:
-	set_fr_iimmed   2,2,fr8
-	msllhi      	fr8,0x20,fr8	; Shift by 0
-	test_fr_limmed  2,2,fr8
-
-	set_fr_iimmed   2,2,fr8
-	msllhi      	fr8,0,fr8	; Shift by 0
-	test_fr_limmed  2,2,fr8
-
-	set_fr_iimmed   2,2,fr8
-	msllhi      	fr8,1,fr8	; Shift by 1
-	test_fr_limmed  4,4,fr8
-
-	set_fr_iimmed   1,1,fr8
-	msllhi      	fr8,31,fr8	; Shift by 15
-	test_fr_limmed 	0x8000,0x8000,fr8
-
-	set_fr_iimmed  	0xdead,0xbeef,fr8
-	msllhi      	fr8,15,fr8
-	test_fr_iimmed  0x80008000,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/msrahi.cgs b/sim/testsuite/sim/frv/msrahi.cgs
deleted file mode 100644
index 182f84e2147..00000000000
--- a/sim/testsuite/sim/frv/msrahi.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# frv testcase for msrahi $FRi,$s6,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global msrahi
-msrahi:
-	set_fr_iimmed   2,2,fr8
-	msrahi      	fr8,0x20,fr8	; Shift by 0
-	test_fr_limmed  2,2,fr8
-
-	set_fr_iimmed   2,2,fr8
-	msrahi      	fr8,0,fr8	; Shift by 0
-	test_fr_limmed  2,2,fr8
-
-	set_fr_iimmed   3,2,fr8
-	msrahi      	fr8,1,fr8	; Shift by 1
-	test_fr_limmed  1,1,fr8
-
-	set_fr_iimmed   0x8000,0x7fff,fr8
-	msrahi      	fr8,31,fr8	; Shift by 15
-	test_fr_limmed 	0xffff,0x0000,fr8
-
-	set_fr_iimmed  	0xdead,0xbeef,fr8
-	msrahi      	fr8,15,fr8
-	test_fr_iimmed  0xffffffff,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/msrlhi.cgs b/sim/testsuite/sim/frv/msrlhi.cgs
deleted file mode 100644
index c9971a98a68..00000000000
--- a/sim/testsuite/sim/frv/msrlhi.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# frv testcase for msrlhi $FRi,$s6,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global msrlhi
-msrlhi:
-	set_fr_iimmed   2,2,fr8
-	msrlhi      	fr8,0x20,fr8	; Shift by 0
-	test_fr_limmed  2,2,fr8
-
-	set_fr_iimmed   2,2,fr8
-	msrlhi      	fr8,0,fr8	; Shift by 0
-	test_fr_limmed  2,2,fr8
-
-	set_fr_iimmed   3,2,fr8
-	msrlhi      	fr8,1,fr8	; Shift by 1
-	test_fr_limmed  1,1,fr8
-
-	set_fr_iimmed   0xffff,0x8000,fr8
-	msrlhi      	fr8,31,fr8	; Shift by 15
-	test_fr_limmed 	0x0001,0x0001,fr8
-
-	set_fr_iimmed  	0xdead,0xbeef,fr8
-	msrlhi      	fr8,15,fr8
-	test_fr_iimmed  0x00010001,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/msubhss.cgs b/sim/testsuite/sim/frv/msubhss.cgs
deleted file mode 100644
index 1ba334367e4..00000000000
--- a/sim/testsuite/sim/frv/msubhss.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for msubhss $FRi,$FRj,$FRj
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global msubhss
-msubhss:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0x0000,fr10
-	set_fr_iimmed	0x0000,0xbeef,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0xdead,0x4111,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0000,0xdead,fr10
-	set_fr_iimmed	0xbeef,0x0000,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x4111,0xdead,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xffff,0xffff,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x1235,0x5679,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0xfffe,0xffff,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x7fff,0x7fff,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x8001,0x8001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	msubhss		fr10,fr11,fr12
-	test_fr_limmed	0x8000,0x8000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x8000,0x8000,fr11
-	msubhss.p	fr10,fr10,fr12
-	msubhss		fr11,fr10,fr13
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x8000,0x8000,fr13
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr0.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/msubhus.cgs b/sim/testsuite/sim/frv/msubhus.cgs
deleted file mode 100644
index 1a002da42d5..00000000000
--- a/sim/testsuite/sim/frv/msubhus.cgs
+++ /dev/null
@@ -1,80 +0,0 @@
-# frv testcase for msubhus $FRi,$FRj,$FRj
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global msubhus
-msubhus:
-	set_fr_iimmed	0x0000,0x0000,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x0000,0x0000,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0xdead,0xbeef,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x1111,0x1111,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x0123,0x4567,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x7ffe,0x7ffe,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x7ffc,0x7ffd,fr12
-	test_spr_bits	0x3c,2,0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	1,0,0,msr0		; msr0.aovf not set
-	test_spr_bits	0x7000,12,0,msr0	; msr0.mtt not set
-
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0001,0x0002,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x4,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0001,fr11
-	msubhus		fr10,fr11,fr12
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_spr_bits	0x3c,2,0x8,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	set_spr_immed	0,msr0
-	set_spr_immed	0,msr1
-	set_fr_iimmed	0x0001,0x0001,fr10
-	set_fr_iimmed	0x0002,0x0002,fr11
-	msubhus.p	fr10,fr10,fr12
-	msubhus		fr10,fr11,fr13
-	test_fr_limmed	0x0000,0x0000,fr12
-	test_fr_limmed	0x0000,0x0000,fr13
-	test_spr_bits	0x3c,2,0x0,msr0		; msr0.sie is clear
-	test_spr_bits	2,1,0,msr0		; msr0.ovf not set
-	test_spr_bits	0x3c,2,0xc,msr1		; msr1.sie is set
-	test_spr_bits	2,1,1,msr1		; msr1.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-
-	pass
diff --git a/sim/testsuite/sim/frv/mtrap.cgs b/sim/testsuite/sim/frv/mtrap.cgs
deleted file mode 100644
index 65b947a24de..00000000000
--- a/sim/testsuite/sim/frv/mtrap.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for mp_exception
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global mp_exception
-mpx:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	0x0e0,gr7		; address of exception handler
-	set_bctrlr_0_0  gr7
-	set_spr_immed	128,lcr
-	set_spr_addr	ok1,lr
-	set_psr_et	1
-	set_gr_immed	0,gr5
-
-	set_spr_immed	0,msr0
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x7ffe,0x7ffe,fr11
-	set_fr_iimmed	0xffff,0xffff,fr12
-	set_fr_iimmed	0x0002,0x0001,fr13
-	mqaddhss	fr10,fr12,fr14
-	test_fr_limmed	0x1233,0x5677,fr14
-	test_fr_limmed	0x7fff,0x7fff,fr15
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	mtrap				; generate interrupt
-	test_gr_immed	1,gr5
-
-	and_spr_immed	0xffffc000,msr0	; Clear msr0 fields
-	mcmpsh		fr10,fr11,fcc0	; no exception
-	test_spr_bits	0x7000,12,0,msr0; msr0.mtt is clear
-	mtrap				; nop
-	test_gr_immed	1,gr5
-
-	pass
-
-; exception handler
-ok1:
-	test_spr_bits	0x3c,2,0x2,msr0		; msr0.sie is set
-	test_spr_bits	2,1,1,msr0		; msr0.ovf set
-	test_spr_bits	1,0,1,msr0		; msr0.aovf set
-	test_spr_bits	0x7000,12,1,msr0	; msr0.mtt set
-	inc_gr_immed	1,gr5
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/munpackh.cgs b/sim/testsuite/sim/frv/munpackh.cgs
deleted file mode 100644
index 45b2bd82421..00000000000
--- a/sim/testsuite/sim/frv/munpackh.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# frv testcase for munpackh $FRi,$FRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global munpackh
-munpackh:
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	set_fr_iimmed	0x1234,0x5678,fr11
-	munpackh	fr10,fr12
-	test_fr_limmed	0xdead,0xdead,fr12
-	test_fr_limmed	0xbeef,0xbeef,fr13
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0xdead,0xbeef,fr11
-	munpackh	fr10,fr12
-	test_fr_limmed	0x1234,0x1234,fr12
-	test_fr_limmed	0x5678,0x5678,fr13
-
-	pass
diff --git a/sim/testsuite/sim/frv/mwcut.cgs b/sim/testsuite/sim/frv/mwcut.cgs
deleted file mode 100644
index 0e31b8fa93a..00000000000
--- a/sim/testsuite/sim/frv/mwcut.cgs
+++ /dev/null
@@ -1,269 +0,0 @@
-# frv testcase for mwcut $FRi,FRj,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mwcut
-mwcut:
-	set_fr_iimmed   0x0123,0x4567,fr8
-	set_fr_iimmed   0x89ab,0xcdef,fr9
-
-	set_fr_iimmed	0,0,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x01234567,fr11
-
-	set_fr_iimmed	0,1,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x02468acf,fr11
-
-	set_fr_iimmed	0,2,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x048d159e,fr11
-
-	set_fr_iimmed	0,3,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x091a2b3c,fr11
-
-	set_fr_iimmed	0,4,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x12345678,fr11
-
-	set_fr_iimmed	0,5,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x2468acf1,fr11
-
-	set_fr_iimmed	0,6,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x48d159e2,fr11
-
-	set_fr_iimmed	0,7,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x91a2b3c4,fr11
-
-	set_fr_iimmed	0,8,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x23456789,fr11
-
-	set_fr_iimmed	0,9,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x468acf13,fr11
-
-	set_fr_iimmed	0,10,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x8d159e26,fr11
-
-	set_fr_iimmed	0,11,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x1a2b3c4d,fr11
-
-	set_fr_iimmed	0,12,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x3456789a,fr11
-
-	set_fr_iimmed	0,13,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x68acf135,fr11
-
-	set_fr_iimmed	0,14,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xd159e26a,fr11
-
-	set_fr_iimmed	0,15,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xa2b3c4d5,fr11
-
-	set_fr_iimmed	0,16,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x456789ab,fr11
-
-	set_fr_iimmed	0,17,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x8acf1357,fr11
-
-	set_fr_iimmed	0,18,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x159e26af,fr11
-
-	set_fr_iimmed	0,19,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x2b3c4d5e,fr11
-
-	set_fr_iimmed	0,20,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x56789abc,fr11
-
-	set_fr_iimmed	0,21,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xacf13579,fr11
-
-	set_fr_iimmed	0,22,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x59e26af3,fr11
-
-	set_fr_iimmed	0,23,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xb3c4d5e6,fr11
-
-	set_fr_iimmed	0,24,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x6789abcd,fr11
-
-	set_fr_iimmed	0,25,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xcf13579b,fr11
-
-	set_fr_iimmed	0,26,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x9e26af37,fr11
-
-	set_fr_iimmed	0,27,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x3c4d5e6f,fr11
-
-	set_fr_iimmed	0,28,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x789abcde,fr11
-
-	set_fr_iimmed	0,29,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xf13579bd,fr11
-
-	set_fr_iimmed	0,30,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xe26af37b,fr11
-
-	set_fr_iimmed	0,31,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xc4d5e6f7,fr11
-
-	set_fr_iimmed	0,32,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x89abcdef,fr11
-
-	set_fr_iimmed	0,33,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x13579bde,fr11
-
-	set_fr_iimmed	0,34,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x26af37bc,fr11
-
-	set_fr_iimmed	0,35,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x4d5e6f78,fr11
-
-	set_fr_iimmed	0,36,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x9abcdef0,fr11
-
-	set_fr_iimmed	0,37,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x3579bde0,fr11
-
-	set_fr_iimmed	0,38,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x6af37bc0,fr11
-
-	set_fr_iimmed	0,39,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xd5e6f780,fr11
-
-	set_fr_iimmed	0,40,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xabcdef00,fr11
-
-	set_fr_iimmed	0,41,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x579bde00,fr11
-
-	set_fr_iimmed	0,42,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xaf37bc00,fr11
-
-	set_fr_iimmed	0,43,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x5e6f7800,fr11
-
-	set_fr_iimmed	0,44,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xbcdef000,fr11
-
-	set_fr_iimmed	0,45,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x79bde000,fr11
-
-	set_fr_iimmed	0,46,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xf37bc000,fr11
-
-	set_fr_iimmed	0,47,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xe6f78000,fr11
-
-	set_fr_iimmed	0,48,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xcdef0000,fr11
-
-	set_fr_iimmed	0,49,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x9bde0000,fr11
-
-	set_fr_iimmed	0,50,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x37bc0000,fr11
-
-	set_fr_iimmed	0,51,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x6f780000,fr11
-
-	set_fr_iimmed	0,52,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xdef00000,fr11
-
-	set_fr_iimmed	0,53,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xbde00000,fr11
-
-	set_fr_iimmed	0,54,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x7bc00000,fr11
-
-	set_fr_iimmed	0,55,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xf7800000,fr11
-
-	set_fr_iimmed	0,56,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xef000000,fr11
-
-	set_fr_iimmed	0,57,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xde000000,fr11
-
-	set_fr_iimmed	0,58,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xbc000000,fr11
-
-	set_fr_iimmed	0,59,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x78000000,fr11
-
-	set_fr_iimmed	0,60,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xf0000000,fr11
-
-	set_fr_iimmed	0,61,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	set_fr_iimmed	0,62,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	set_fr_iimmed	0,63,fr10
-	mwcut      	fr8,fr10,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/mwcuti.cgs b/sim/testsuite/sim/frv/mwcuti.cgs
deleted file mode 100644
index 338eab86389..00000000000
--- a/sim/testsuite/sim/frv/mwcuti.cgs
+++ /dev/null
@@ -1,205 +0,0 @@
-# frv testcase for mwcuti $FRi,s6,$FRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mwcuti
-mwcuti:
-	set_fr_iimmed   0x0123,0x4567,fr8
-	set_fr_iimmed   0x89ab,0xcdef,fr9
-
-	mwcuti      	fr8,0,fr11
-	test_fr_iimmed  0x01234567,fr11
-
-	mwcuti      	fr8,1,fr11
-	test_fr_iimmed  0x02468acf,fr11
-
-	mwcuti      	fr8,2,fr11
-	test_fr_iimmed  0x048d159e,fr11
-
-	mwcuti      	fr8,3,fr11
-	test_fr_iimmed  0x091a2b3c,fr11
-
-	mwcuti      	fr8,4,fr11
-	test_fr_iimmed  0x12345678,fr11
-
-	mwcuti      	fr8,5,fr11
-	test_fr_iimmed  0x2468acf1,fr11
-
-	mwcuti      	fr8,6,fr11
-	test_fr_iimmed  0x48d159e2,fr11
-
-	mwcuti      	fr8,7,fr11
-	test_fr_iimmed  0x91a2b3c4,fr11
-
-	mwcuti      	fr8,8,fr11
-	test_fr_iimmed  0x23456789,fr11
-
-	mwcuti      	fr8,9,fr11
-	test_fr_iimmed  0x468acf13,fr11
-
-	mwcuti      	fr8,10,fr11
-	test_fr_iimmed  0x8d159e26,fr11
-
-	mwcuti      	fr8,11,fr11
-	test_fr_iimmed  0x1a2b3c4d,fr11
-
-	mwcuti      	fr8,12,fr11
-	test_fr_iimmed  0x3456789a,fr11
-
-	mwcuti      	fr8,13,fr11
-	test_fr_iimmed  0x68acf135,fr11
-
-	mwcuti      	fr8,14,fr11
-	test_fr_iimmed  0xd159e26a,fr11
-
-	mwcuti      	fr8,15,fr11
-	test_fr_iimmed  0xa2b3c4d5,fr11
-
-	mwcuti      	fr8,16,fr11
-	test_fr_iimmed  0x456789ab,fr11
-
-	mwcuti      	fr8,17,fr11
-	test_fr_iimmed  0x8acf1357,fr11
-
-	mwcuti      	fr8,18,fr11
-	test_fr_iimmed  0x159e26af,fr11
-
-	mwcuti      	fr8,19,fr11
-	test_fr_iimmed  0x2b3c4d5e,fr11
-
-	mwcuti      	fr8,20,fr11
-	test_fr_iimmed  0x56789abc,fr11
-
-	mwcuti      	fr8,21,fr11
-	test_fr_iimmed  0xacf13579,fr11
-
-	mwcuti      	fr8,22,fr11
-	test_fr_iimmed  0x59e26af3,fr11
-
-	mwcuti      	fr8,23,fr11
-	test_fr_iimmed  0xb3c4d5e6,fr11
-
-	mwcuti      	fr8,24,fr11
-	test_fr_iimmed  0x6789abcd,fr11
-
-	mwcuti      	fr8,25,fr11
-	test_fr_iimmed  0xcf13579b,fr11
-
-	mwcuti      	fr8,26,fr11
-	test_fr_iimmed  0x9e26af37,fr11
-
-	mwcuti      	fr8,27,fr11
-	test_fr_iimmed  0x3c4d5e6f,fr11
-
-	mwcuti      	fr8,28,fr11
-	test_fr_iimmed  0x789abcde,fr11
-
-	mwcuti      	fr8,29,fr11
-	test_fr_iimmed  0xf13579bd,fr11
-
-	mwcuti      	fr8,30,fr11
-	test_fr_iimmed  0xe26af37b,fr11
-
-	mwcuti      	fr8,31,fr11
-	test_fr_iimmed  0xc4d5e6f7,fr11
-
-	mwcuti      	fr8,32,fr11
-	test_fr_iimmed  0x89abcdef,fr11
-
-	mwcuti      	fr8,33,fr11
-	test_fr_iimmed  0x13579bde,fr11
-
-	mwcuti      	fr8,34,fr11
-	test_fr_iimmed  0x26af37bc,fr11
-
-	mwcuti      	fr8,35,fr11
-	test_fr_iimmed  0x4d5e6f78,fr11
-
-	mwcuti      	fr8,36,fr11
-	test_fr_iimmed  0x9abcdef0,fr11
-
-	mwcuti      	fr8,37,fr11
-	test_fr_iimmed  0x3579bde0,fr11
-
-	mwcuti      	fr8,38,fr11
-	test_fr_iimmed  0x6af37bc0,fr11
-
-	mwcuti      	fr8,39,fr11
-	test_fr_iimmed  0xd5e6f780,fr11
-
-	mwcuti      	fr8,40,fr11
-	test_fr_iimmed  0xabcdef00,fr11
-
-	mwcuti      	fr8,41,fr11
-	test_fr_iimmed  0x579bde00,fr11
-
-	mwcuti      	fr8,42,fr11
-	test_fr_iimmed  0xaf37bc00,fr11
-
-	mwcuti      	fr8,43,fr11
-	test_fr_iimmed  0x5e6f7800,fr11
-
-	mwcuti      	fr8,44,fr11
-	test_fr_iimmed  0xbcdef000,fr11
-
-	mwcuti      	fr8,45,fr11
-	test_fr_iimmed  0x79bde000,fr11
-
-	mwcuti      	fr8,46,fr11
-	test_fr_iimmed  0xf37bc000,fr11
-
-	mwcuti      	fr8,47,fr11
-	test_fr_iimmed  0xe6f78000,fr11
-
-	mwcuti      	fr8,48,fr11
-	test_fr_iimmed  0xcdef0000,fr11
-
-	mwcuti      	fr8,49,fr11
-	test_fr_iimmed  0x9bde0000,fr11
-
-	mwcuti      	fr8,50,fr11
-	test_fr_iimmed  0x37bc0000,fr11
-
-	mwcuti      	fr8,51,fr11
-	test_fr_iimmed  0x6f780000,fr11
-
-	mwcuti      	fr8,52,fr11
-	test_fr_iimmed  0xdef00000,fr11
-
-	mwcuti      	fr8,53,fr11
-	test_fr_iimmed  0xbde00000,fr11
-
-	mwcuti      	fr8,54,fr11
-	test_fr_iimmed  0x7bc00000,fr11
-
-	mwcuti      	fr8,55,fr11
-	test_fr_iimmed  0xf7800000,fr11
-
-	mwcuti      	fr8,56,fr11
-	test_fr_iimmed  0xef000000,fr11
-
-	mwcuti      	fr8,57,fr11
-	test_fr_iimmed  0xde000000,fr11
-
-	mwcuti      	fr8,58,fr11
-	test_fr_iimmed  0xbc000000,fr11
-
-	mwcuti      	fr8,59,fr11
-	test_fr_iimmed  0x78000000,fr11
-
-	mwcuti      	fr8,60,fr11
-	test_fr_iimmed  0xf0000000,fr11
-
-	mwcuti      	fr8,61,fr11
-	test_fr_iimmed  0xe0000000,fr11
-
-	mwcuti      	fr8,62,fr11
-	test_fr_iimmed  0xc0000000,fr11
-
-	mwcuti      	fr8,63,fr11
-	test_fr_iimmed  0x80000000,fr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/mwtacc.cgs b/sim/testsuite/sim/frv/mwtacc.cgs
deleted file mode 100644
index 20b4d31885b..00000000000
--- a/sim/testsuite/sim/frv/mwtacc.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# frv testcase for mwtacc $FRinti,$ACC40k
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mwtacc
-mwtacc:
-	test_accg_immed	0x00,accg0
-	test_acc_immed	0x00000000,acc0
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	mwtacc		fr10,acc0
-	test_accg_immed	0x00,accg0
-	test_acc_immed	0xdeadbeef,acc0
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	mwtacc		fr10,acc0
-	test_accg_immed	0x00,accg0
-	test_acc_immed	0x12345678,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/mwtaccg.cgs b/sim/testsuite/sim/frv/mwtaccg.cgs
deleted file mode 100644
index 6e26bab287b..00000000000
--- a/sim/testsuite/sim/frv/mwtaccg.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# frv testcase for mwtaccg $FRinti,$ACC40k
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mwtaccg
-mwtaccg:
-	test_accg_immed	0x00,accg0
-	test_acc_immed	0x00000000,acc0
-
-	set_fr_iimmed	0xdead,0xbeef,fr10
-	mwtaccg		fr10,accg0
-	test_accg_immed	0xef,accg0
-	test_acc_immed	0,acc0
-
-	set_fr_iimmed	0x1234,0x5678,fr10
-	mwtaccg		fr10,accg0
-	test_accg_immed	0x78,accg0
-	test_acc_immed	0,acc0
-
-	pass
diff --git a/sim/testsuite/sim/frv/mxor.cgs b/sim/testsuite/sim/frv/mxor.cgs
deleted file mode 100644
index 6d1cce11bf5..00000000000
--- a/sim/testsuite/sim/frv/mxor.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# frv testcase for mxor $FRinti,$FRintj,$FRintk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global mxor
-mxor:
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0x5555,0x5555,fr8
-	mxor      	fr7,fr8,fr8
-	test_fr_iimmed 	0xffffffff,fr8
-
-	set_fr_iimmed	0x0000,0x0000,fr7
-	set_fr_iimmed	0x0000,0x0000,fr8
-	mxor		fr7,fr8,fr8
-	test_fr_iimmed  0x00000000,fr8
-
-	set_fr_iimmed   0xaaaa,0xaaaa,fr7
-	set_fr_iimmed   0xaaaa,0xaaaa,fr8
-	mxor      	fr7,fr8,fr8
-	test_fr_iimmed	0x00000000,fr8
-
-	set_fr_iimmed   0xdead,0x0000,fr7
-	set_fr_iimmed   0x0000,0xbeef,fr8
-	mxor		fr7,fr8,fr8
-	test_fr_iimmed  0xdeadbeef,fr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/nandcr.cgs b/sim/testsuite/sim/frv/nandcr.cgs
deleted file mode 100644
index 8d3298fd787..00000000000
--- a/sim/testsuite/sim/frv/nandcr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for nandcr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global nandcr
-nandcr:
-	set_spr_immed	0x1b1b,cccr
-	nandcr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc7,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc7,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc6,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc6,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc5,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc5,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc5,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc5,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc4,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc4,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandcr		cc4,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	nandcr		cc4,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/nandncr.cgs b/sim/testsuite/sim/frv/nandncr.cgs
deleted file mode 100644
index c761c56102c..00000000000
--- a/sim/testsuite/sim/frv/nandncr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for nandncr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global nandncr
-nandncr:
-	set_spr_immed	0x1b1b,cccr
-	nandncr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc7,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc7,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc6,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc6,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc5,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc5,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc5,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	nandncr		cc5,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	nandncr		cc4,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc4,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc4,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	nandncr		cc4,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfadds.cgs b/sim/testsuite/sim/frv/nfadds.cgs
deleted file mode 100644
index bdfa1dc124f..00000000000
--- a/sim/testsuite/sim/frv/nfadds.cgs
+++ /dev/null
@@ -1,179 +0,0 @@
-# frv testcase for nfadds $GRi,$GRj,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfadds
-nfadds:
-	nfadds      	fr16,fr0,fr1
-	test_fr_fr	fr1,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr16,fr52,fr1
-	test_fr_fr	fr1,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfadds      	fr20,fr0,fr1
-	test_fr_fr	fr1,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr20,fr52,fr1
-	test_fr_fr	fr1,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfadds      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr12,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr24,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfadds      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfadds      	fr36,fr40,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	nfadds      	fr48,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfadds      	fr52,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfadds      	fr56,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfadds      	fr60,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	2,fner1
-	test_spr_immed	0,fner0
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/nfdadds.cgs b/sim/testsuite/sim/frv/nfdadds.cgs
deleted file mode 100644
index 0be25e7a3b5..00000000000
--- a/sim/testsuite/sim/frv/nfdadds.cgs
+++ /dev/null
@@ -1,225 +0,0 @@
-# frv testcase for nfdadds $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfdadds
-nfdadds:
-	nfdadds      	fr16,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr16,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdadds      	fr20,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr20,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdadds      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr12,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr24,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdadds      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdadds      	fr36,fr40,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	nfdadds      	fr48,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdadds      	fr52,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdadds      	fr56,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdadds      	fr60,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0xc,fner1
-	test_spr_immed	0,fner0
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/nfdcmps.cgs b/sim/testsuite/sim/frv/nfdcmps.cgs
deleted file mode 100644
index 977805ab2d7..00000000000
--- a/sim/testsuite/sim/frv/nfdcmps.cgs
+++ /dev/null
@@ -1,1549 +0,0 @@
-# frv testcase for nfdcmps $FRi,$FRj,$FCCi_2
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfdcmps
-nfdcmps:
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr0,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr4,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr8,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr12,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr16,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr20,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr0,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr4,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr8,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr12,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr16,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr20,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr4,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr8,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr12,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr16,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr20,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr8,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr12,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr16,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr20,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr12,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr16,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr20,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr16,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr16,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr20,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr24,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr20,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr16,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr20,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr24,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr28,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr24,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr16,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr20,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr24,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr28,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr32,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr36,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr40,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr44,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr48,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr28,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr16,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr20,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr24,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr28,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr32,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr36,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr40,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr44,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr48,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xb,0		; Set mask opposite of expected
-	set_fcc         0xb,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr52,fcc0
-	test_fcc	0x4,0
-	test_fcc	0x4,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr48,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr0,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr4,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr8,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr12,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr16,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr20,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr24,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr28,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr32,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr36,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr40,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr44,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xd,0		; Set mask opposite of expected
-	set_fcc         0xd,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr48,fcc0
-	test_fcc	0x2,0
-	test_fcc	0x2,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0x7,0		; Set mask opposite of expected
-	set_fcc         0x7,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr52,fcc0
-	test_fcc	0x8,0
-	test_fcc	0x8,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr52,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr0,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr4,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr8,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr12,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr16,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr20,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr24,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr28,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr32,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr36,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr40,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr44,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr48,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr52,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr56,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr0,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr4,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr8,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr12,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr16,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr20,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr24,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr28,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr32,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr36,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr40,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr44,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr48,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr52,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr56,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fcc         0xe,0		; Set mask opposite of expected
-	set_fcc         0xe,1		; Set mask opposite of expected
-	nfdcmps      	fr60,fr60,fcc0
-	test_fcc	0x1,0
-	test_fcc	0x1,1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfddivs.cgs b/sim/testsuite/sim/frv/nfddivs.cgs
deleted file mode 100644
index 0b16447057e..00000000000
--- a/sim/testsuite/sim/frv/nfddivs.cgs
+++ /dev/null
@@ -1,306 +0,0 @@
-# frv testcase for nfddivs $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfddivs
-nfddivs:
-	nfddivs      	fr0,fr28,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr4,fr28,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr12,fr28,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr24,fr28,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr32,fr28,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr36,fr28,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr40,fr28,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr44,fr28,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr48,fr28,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr52,fr28,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfddivs      	fr16,fr0,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr16,fr52,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfddivs      	fr20,fr0,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr20,fr52,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfddivs      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfddivs      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfddivs      	fr40,fr32,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	set_spr_immed	0,fner0
-	set_spr_immed	0,fner1
-	nfddivs      	fr48,fr20,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0xc,fner1
-	test_spr_immed	0,fner0
-
-	set_spr_immed	0,fner0
-	set_spr_immed	0,fner1
-	nfddivs      	fr52,fr16,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0x0,fner1
-	test_spr_immed	0,fner0
-
-	nfddivs      	fr56,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfddivs      	fr60,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0xc,fner1
-	test_spr_immed	0,fner0
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/nfditos.cgs b/sim/testsuite/sim/frv/nfditos.cgs
deleted file mode 100644
index 1200944332d..00000000000
--- a/sim/testsuite/sim/frv/nfditos.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# frv testcase for nfditos $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfditos
-nfditos:
-	set_fr_iimmed	0,0,fr2
-	set_fr_iimmed	0x0000,0x0002,fr3
-	nfditos		fr2,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr2
-	set_fr_iimmed	0xdead,0xbeef,fr3
-	nfditos		fr2,fr2
-	test_fr_iimmed	0xce054904,fr2
-	test_fr_iimmed	0xce054904,fr3
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; TODO test cases to set ne flags
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfdivs.cgs b/sim/testsuite/sim/frv/nfdivs.cgs
deleted file mode 100644
index 73e58b82b50..00000000000
--- a/sim/testsuite/sim/frv/nfdivs.cgs
+++ /dev/null
@@ -1,234 +0,0 @@
-# frv testcase for nfdivs $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfdivs
-nfdivs:
-	nfdivs      	fr0,fr28,fr1
-	test_fr_fr	fr1,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr4,fr28,fr1
-	test_fr_fr	fr1,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr12,fr28,fr1
-	test_fr_fr	fr1,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr24,fr28,fr1
-	test_fr_fr	fr1,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr28,fr28,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr32,fr28,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr36,fr28,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr40,fr28,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr44,fr28,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr48,fr28,fr1
-	test_fr_fr	fr1,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr52,fr28,fr1
-	test_fr_fr	fr1,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdivs      	fr16,fr0,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr16,fr52,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdivs      	fr20,fr0,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr20,fr52,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdivs      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdivs      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdivs      	fr40,fr32,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	set_spr_immed	0,fner0
-	set_spr_immed	0,fner1
-	nfdivs      	fr48,fr20,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	2,fner1
-	test_spr_immed	0,fner0
-
-	set_spr_immed	0,fner0
-	set_spr_immed	0,fner1
-	nfdivs      	fr52,fr16,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdivs      	fr56,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdivs      	fr60,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	2,fner1
-	test_spr_immed	0,fner0
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/nfdmadds.cgs b/sim/testsuite/sim/frv/nfdmadds.cgs
deleted file mode 100644
index 1af110cee6d..00000000000
--- a/sim/testsuite/sim/frv/nfdmadds.cgs
+++ /dev/null
@@ -1,310 +0,0 @@
-# frv testcase for nfdmadds $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfdmadds
-nfdmadds:
-	nfdmadds      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmadds      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr2
-	set_fr_fr	fr16,fr3
-	nfdmadds      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr36,fr2
-	set_fr_fr	fr36,fr3
-	nfdmadds      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmadds      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr36,fr2
-	set_fr_fr	fr36,fr3
-	nfdmadds      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; TODO -- test cases to set ne flags
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfdmas.cgs b/sim/testsuite/sim/frv/nfdmas.cgs
deleted file mode 100644
index 07f76aafb55..00000000000
--- a/sim/testsuite/sim/frv/nfdmas.cgs
+++ /dev/null
@@ -1,349 +0,0 @@
-# frv testcase for nfdmas $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-	load_float_constants2
-	load_float_constants3
-
-	.global nfdmas
-nfdmas:
-	nfdmas      	fr16,fr4,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr4
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr8,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr12,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr12
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr24,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr24
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr28,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr32,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr32
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr36,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr36
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr40,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr40
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr44,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr44
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr16,fr48,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr48
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmas      	fr20,fr4,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr4
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr8,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr12,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr12
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr24,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr24
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr28,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr32,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr32
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr36,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr36
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr40,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr40
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr44,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr44
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr20,fr48,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr48
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmas      	fr28,fr0,fr60
-	test_fr_fr	fr60,fr0
-	test_fr_fr	fr62,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr4,fr60
-	test_fr_fr	fr60,fr4
-	test_fr_fr	fr62,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr8,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr12,fr60
-	test_fr_fr	fr60,fr12
-	test_fr_fr	fr62,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr24,fr60
-	test_fr_fr	fr60,fr24
-	test_fr_fr	fr62,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr28,fr60
-	test_fr_fr	fr60,fr28
-	test_fr_fr	fr62,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr32,fr60
-	test_fr_fr	fr60,fr32
-	test_fr_fr	fr61,fr36
-	test_fr_fr	fr62,fr32
-	test_fr_fr	fr63,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr36,fr60
-	test_fr_fr	fr60,fr36
-	test_fr_fr	fr62,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr40,fr60
-	test_fr_fr	fr60,fr40
-	test_fr_fr	fr62,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr44,fr60
-	test_fr_fr	fr60,fr44
-	test_fr_fr	fr62,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr48,fr60
-	test_fr_fr	fr60,fr48
-	test_fr_fr	fr62,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr28,fr52,fr60
-	test_fr_fr	fr60,fr52
-	test_fr_fr	fr62,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmas      	fr28,fr8,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmas      	fr8,fr28,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmas      	fr32,fr36,fr60
-	test_fr_fr	fr60,fr40
-	test_fr_fr	fr62,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; TODO -- test cases to set ne flags
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfdmss.cgs b/sim/testsuite/sim/frv/nfdmss.cgs
deleted file mode 100644
index 3633d706544..00000000000
--- a/sim/testsuite/sim/frv/nfdmss.cgs
+++ /dev/null
@@ -1,319 +0,0 @@
-# frv testcase for nfdmss $FRi,$FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-	load_float_constants2
-	load_float_constants3
-
-	.global nfdmss
-nfdmss:
-	nfdmss      	fr16,fr4,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr8,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr12,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr24,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr28,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr32,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr36,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr40,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr44,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr16,fr48,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmss      	fr20,fr4,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr8,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr12,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr16
-	test_fr_fr	fr63,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr24,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr28,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr32,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr36,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr40,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr44,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr20,fr48,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmss      	fr28,fr0,fr60
-	test_fr_fr	fr60,fr0
-	test_fr_fr	fr62,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr4,fr60
-	test_fr_fr	fr60,fr4
-	test_fr_fr	fr62,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr8,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr32
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr12,fr60
-	test_fr_fr	fr60,fr12
-	test_fr_fr	fr62,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr16,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr20,fr60
-	test_fr_fr	fr60,fr16
-	test_fr_fr	fr60,fr20
-	test_fr_fr	fr61,fr28
-	test_fr_fr	fr62,fr16
-	test_fr_fr	fr62,fr20
-	test_fr_fr	fr63,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr24,fr60
-	test_fr_fr	fr60,fr24
-	test_fr_fr	fr62,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr28,fr60
-	test_fr_fr	fr60,fr28
-	test_fr_fr	fr61,fr20
-	test_fr_fr	fr61,fr16
-	test_fr_fr	fr62,fr28
-	test_fr_fr	fr63,fr20
-	test_fr_fr	fr63,fr16
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr32,fr60
-	test_fr_fr	fr60,fr32
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr32
-	test_fr_fr	fr63,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr36,fr60
-	test_fr_fr	fr60,fr36
-	test_fr_fr	fr62,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr40,fr60
-	test_fr_fr	fr60,fr40
-	test_fr_fr	fr62,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr44,fr60
-	test_fr_fr	fr60,fr44
-	test_fr_fr	fr62,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr48,fr60
-	test_fr_fr	fr60,fr48
-	test_fr_fr	fr62,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr28,fr52,fr60
-	test_fr_fr	fr60,fr52
-	test_fr_fr	fr62,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmss      	fr28,fr8,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr61,fr32
-	test_fr_fr	fr62,fr8
-	test_fr_fr	fr63,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmss      	fr8,fr28,fr60
-	test_fr_fr	fr60,fr8
-	test_fr_fr	fr62,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmss      	fr32,fr36,fr60
-	test_fr_fr	fr60,fr40
-	test_fr_fr	fr61,fr8
-	test_fr_fr	fr62,fr40
-	test_fr_fr	fr63,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; TODO -- test cases to set ne flags
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfdmulcs.cgs b/sim/testsuite/sim/frv/nfdmulcs.cgs
deleted file mode 100644
index 227ff291311..00000000000
--- a/sim/testsuite/sim/frv/nfdmulcs.cgs
+++ /dev/null
@@ -1,313 +0,0 @@
-# frv testcase for nfdmulcs $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfdmulcs
-nfdmulcs:
-	nfdmulcs      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmulcs      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmulcs      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmulcs      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmulcs      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmulcs      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	nfdmulcs      	fr48,fr32,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmulcs      	fr52,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmulcs      	fr56,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmulcs      	fr60,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0xc,fner1
-	test_spr_immed	0,fner0
-
-	; test all regs different
-	set_spr_immed	0,fner0
-	set_spr_immed	0,fner1
-	set_fr_fr	fr32,fr50	; 2
-	set_fr_fr	fr28,fr51	; 1
-	set_fr_fr	fr44,fr52	; 9
-	set_fr_fr	fr36,fr53	; 3
-	nfdmulcs	fr50,fr52,fr54	; 2*3, 1*9
-	test_fr_fr	fr54,fr40	; 6
-	test_fr_fr	fr55,fr44	; 9
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfdmuls.cgs b/sim/testsuite/sim/frv/nfdmuls.cgs
deleted file mode 100644
index efe158035d7..00000000000
--- a/sim/testsuite/sim/frv/nfdmuls.cgs
+++ /dev/null
@@ -1,300 +0,0 @@
-# frv testcase for nfdmuls $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfdmuls
-nfdmuls:
-	nfdmuls      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmuls      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmuls      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmuls      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdmuls      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmuls      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	nfdmuls      	fr48,fr32,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmuls      	fr52,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmuls      	fr56,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdmuls      	fr60,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0xc,fner1
-	test_spr_immed	0,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfdsads.cgs b/sim/testsuite/sim/frv/nfdsads.cgs
deleted file mode 100644
index 6c06f16c0c2..00000000000
--- a/sim/testsuite/sim/frv/nfdsads.cgs
+++ /dev/null
@@ -1,212 +0,0 @@
-# frv testcase for nfdsads $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfdsads
-nfdsads:
-	nfdsads      	fr16,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr16,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsads      	fr20,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr20,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsads      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr12,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr24,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsads      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsads      	fr36,fr40,fr2
-	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	set_fr_fr	fr4,fr49
-	nfdsads      	fr48,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr0,fr53
-	nfdsads      	fr52,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsads      	fr56,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsads      	fr60,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0xc,fner1
-	test_spr_immed	0,fner0
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/nfdsqrts.cgs b/sim/testsuite/sim/frv/nfdsqrts.cgs
deleted file mode 100644
index 1a906bb7279..00000000000
--- a/sim/testsuite/sim/frv/nfdsqrts.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# frv testcase for nfdsqrts $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfdsqrts
-nfdsqrts:
-	set_fr_iimmed	0x4049,0x0fdb,fr45	; 3.141592654
-	nfdsqrts		fr44,fr2		; 9.0
-	test_fr_fr	fr2,fr36		; 3.0
-	test_fr_iimmed	0x3fe2dfc5,fr3		; 1.7724539
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; TODO test cases to set ne flags
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfdstoi.cgs b/sim/testsuite/sim/frv/nfdstoi.cgs
deleted file mode 100644
index 56dc941bb70..00000000000
--- a/sim/testsuite/sim/frv/nfdstoi.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# frv testcase for nfdstoi $FRj,$FRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfdstoi
-nfdstoi:
-	set_fr_fr	fr20,fr17
-	nfdstoi		fr16,fr2
-	test_fr_iimmed	0,fr2
-	test_fr_iimmed	0,fr3
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_iimmed	0xce05,0x4904,fr2
-	set_fr_fr	fr32,fr3
-	nfdstoi		fr2,fr2
-	test_fr_iimmed	0xdeadbf00,fr2
-	test_fr_iimmed	0x00000002,fr3
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; TODO test cases to set ne flags
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfdsubs.cgs b/sim/testsuite/sim/frv/nfdsubs.cgs
deleted file mode 100644
index c981aab3624..00000000000
--- a/sim/testsuite/sim/frv/nfdsubs.cgs
+++ /dev/null
@@ -1,202 +0,0 @@
-# frv testcase for nfdsubs $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfdsubs
-nfdsubs:
-	nfdsubs      	fr0,fr16,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr4,fr16,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr8,fr16,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr12,fr16,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr24,fr16,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr32,fr16,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr36,fr16,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr40,fr16,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr44,fr16,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr48,fr16,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr52,fr16,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsubs      	fr0,fr20,fr2
-	test_fr_fr	fr2,fr0
-	test_fr_fr	fr3,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr4,fr20,fr2
-	test_fr_fr	fr2,fr4
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr8,fr20,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr12,fr20,fr2
-	test_fr_fr	fr2,fr12
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr24,fr20,fr2
-	test_fr_fr	fr2,fr24
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr32,fr20,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr36,fr20,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr40,fr20,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr44,fr20,fr2
-	test_fr_fr	fr2,fr44
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr48,fr20,fr2
-	test_fr_fr	fr2,fr48
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfdsubs      	fr52,fr20,fr2
-	test_fr_fr	fr2,fr52
-	test_fr_fr	fr3,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsubs      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsubs      	fr44,fr40,fr2
-	test_fr_fr	fr2,fr36
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	nfdsubs      	fr4,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsubs      	fr0,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsubs      	fr56,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfdsubs      	fr60,fr28,fr2
-;	test_fr_fr	fr2,fr44
-;	test_fr_fr	fr3,fr44
-	test_spr_immed	0xc,fner1
-	test_spr_immed	0,fner0
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/nfitos.cgs b/sim/testsuite/sim/frv/nfitos.cgs
deleted file mode 100644
index 539f7b281c5..00000000000
--- a/sim/testsuite/sim/frv/nfitos.cgs
+++ /dev/null
@@ -1,44 +0,0 @@
-# frv testcase for nfitos $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfitos
-nfitos:
-	set_fr_iimmed	0,0,fr1
-	nfitos		fr1,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_iimmed	0x0000,0x0002,fr1
-	nfitos		fr1,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr1
-	nfitos		fr1,fr1
-	test_fr_iimmed	0xce054904,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; These were an attempt to cause overflow
-	set_fr_iimmed	0x7fff,0xffff,fr1
-	nfitos		fr1,fr1
-	test_fr_iimmed	0x4f000000,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_iimmed	0x8000,0x0000,fr1
-	nfitos		fr1,fr1
-	test_fr_iimmed	0xcf000000,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfmadds.cgs b/sim/testsuite/sim/frv/nfmadds.cgs
deleted file mode 100644
index 2113cd27716..00000000000
--- a/sim/testsuite/sim/frv/nfmadds.cgs
+++ /dev/null
@@ -1,227 +0,0 @@
-# frv testcase for nfmadds $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfmadds
-nfmadds:
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmadds      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr0,fr1
-	test_fr_fr	fr1,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr4,fr1
-	test_fr_fr	fr1,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr12,fr1
-	test_fr_fr	fr1,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr24,fr1
-	test_fr_fr	fr1,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr28,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr32,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr36,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr40,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr44,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr48,fr1
-	test_fr_fr	fr1,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmadds      	fr28,fr52,fr1
-	test_fr_fr	fr1,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr36,fr1
-	nfmadds      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmadds      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr36,fr1
-	nfmadds      	fr32,fr36,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; TODO test cases to set ne flags
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfmas.cgs b/sim/testsuite/sim/frv/nfmas.cgs
deleted file mode 100644
index b688dbdf4d2..00000000000
--- a/sim/testsuite/sim/frv/nfmas.cgs
+++ /dev/null
@@ -1,297 +0,0 @@
-# frv testcase for nfmas $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfmas
-nfmas:
-	nfmas      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmas      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	set_spr_immed	0,fner0
-	set_spr_immed	0,fner1
-	nfmas      	fr48,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr52,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr56,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr60,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	6,fner1
-	test_spr_immed	0,fner0
-
-	set_spr_immed	0,fner0
-	set_spr_immed	0,fner1
-	nfmas      	fr48,fr32,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr52,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr56,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmas      	fr60,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	6,fner1
-	test_spr_immed	0,fner0
-
-	pass
-
diff --git a/sim/testsuite/sim/frv/nfmss.cgs b/sim/testsuite/sim/frv/nfmss.cgs
deleted file mode 100644
index bc7c8ef6cbb..00000000000
--- a/sim/testsuite/sim/frv/nfmss.cgs
+++ /dev/null
@@ -1,279 +0,0 @@
-# frv testcase for nfmss $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-	load_float_constants1
-
-	.global nfmss
-nfmss:
-	nfmss      	fr16,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr16,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr20,fr4,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr8,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr12,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr16
-	test_fr_fr	fr3,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr24,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr28,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr32,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr36,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr40,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr44,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr20,fr48,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr28,fr0,fr2
-	test_fr_fr	fr2,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr4,fr2
-	test_fr_fr	fr2,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr12,fr2
-	test_fr_fr	fr2,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr16,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr20,fr2
-	test_fr_fr	fr2,fr16
-	test_fr_fr	fr2,fr20
-	test_fr_fr	fr3,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr24,fr2
-	test_fr_fr	fr2,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr28,fr2
-	test_fr_fr	fr2,fr28
-	test_fr_fr	fr3,fr20
-	test_fr_fr	fr3,fr16
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr32,fr2
-	test_fr_fr	fr2,fr32
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr36,fr2
-	test_fr_fr	fr2,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr40,fr2
-	test_fr_fr	fr2,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr44,fr2
-	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr48,fr2
-	test_fr_fr	fr2,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr28,fr52,fr2
-	test_fr_fr	fr2,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr28,fr8,fr2
-	test_fr_fr	fr2,fr8
-	test_fr_fr	fr3,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmss      	fr8,fr28,fr2
-	test_fr_fr	fr2,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr32,fr36,fr2
-	test_fr_fr	fr2,fr40
-	test_fr_fr	fr3,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	nfmss      	fr4,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr0,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr56,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr60,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0x6,fner1
-	test_spr_immed	0,fner0
-
-	set_spr_immed	0,fner0
-	set_spr_immed	0,fner1
-	nfmss      	fr48,fr32,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr52,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr56,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmss      	fr60,fr28,fr1
-;	test_fr_fr	fr1,fr44
-;	test_fr_fr	fr2,fr44
-	test_spr_immed	0x6,fner1
-	test_spr_immed	0,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfmsubs.cgs b/sim/testsuite/sim/frv/nfmsubs.cgs
deleted file mode 100644
index 1ae87e36d1f..00000000000
--- a/sim/testsuite/sim/frv/nfmsubs.cgs
+++ /dev/null
@@ -1,227 +0,0 @@
-# frv testcase for nfmsubs $GRi,$GRj,$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfmsubs
-nfmsubs:
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmsubs      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmsubs      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr0,fr1
-	test_fr_fr	fr1,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr4,fr1
-	test_fr_fr	fr1,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr12,fr1
-	test_fr_fr	fr1,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr24,fr1
-	test_fr_fr	fr1,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr28,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr32,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr36,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr40,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr44,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr48,fr1
-	test_fr_fr	fr1,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr16,fr1
-	nfmsubs      	fr28,fr52,fr1
-	test_fr_fr	fr1,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_fr	fr32,fr1
-	nfmsubs      	fr8,fr8,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	set_fr_fr	fr36,fr1
-	nfmsubs      	fr36,fr36,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmsubs      	fr32,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; TODO test cases to set ne flags
-	pass
diff --git a/sim/testsuite/sim/frv/nfmuls.cgs b/sim/testsuite/sim/frv/nfmuls.cgs
deleted file mode 100644
index e4b0d2eebbc..00000000000
--- a/sim/testsuite/sim/frv/nfmuls.cgs
+++ /dev/null
@@ -1,228 +0,0 @@
-# frv testcase for nfmuls $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfmuls
-nfmuls:
-	nfmuls      	fr16,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr16,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmuls      	fr20,fr4,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr8,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr12,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr24,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr28,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr32,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr36,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr40,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr44,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr20,fr48,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmuls      	fr28,fr0,fr1
-	test_fr_fr	fr1,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr4,fr1
-	test_fr_fr	fr1,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr12,fr1
-	test_fr_fr	fr1,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr24,fr1
-	test_fr_fr	fr1,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr28,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr32,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr36,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr40,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr44,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr48,fr1
-	test_fr_fr	fr1,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr28,fr52,fr1
-	test_fr_fr	fr1,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmuls      	fr28,fr8,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfmuls      	fr8,fr28,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmuls      	fr32,fr36,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	nfmuls      	fr48,fr32,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmuls      	fr52,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmuls      	fr56,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfmuls      	fr60,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	2,fner1
-	test_spr_immed	0,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfsqrts.cgs b/sim/testsuite/sim/frv/nfsqrts.cgs
deleted file mode 100644
index 8ada77a85e0..00000000000
--- a/sim/testsuite/sim/frv/nfsqrts.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# frv testcase for nfsqrts $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfsqrts
-nfsqrts:
-	nfsqrts		fr44,fr1		; 9.0
-	test_fr_fr	fr1,fr36		; 3.0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_iimmed	0x4049,0x0fdb,fr10	; 3.141592654
-	nfsqrts		fr10,fr10
-	test_fr_iimmed	0x3fe2dfc5,fr10		; 1.7724539
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; fp_exceptions
-	nfsqrts		fr8,fr1			; -1 -- invalid
-	test_fr_iimmed	0x7fc00000,fr1		; nan1
-	test_spr_immed	2,fner1
-	test_spr_immed	0,fner0
-	test_spr_bits	0x80000000,31,0x0,fqst0	; fq0.miv is clear
-	test_spr_bits	0x18000,15,0x0,fqst0	; fq0.sie is clear
-	test_spr_bits	0x380,7,0x0,fqst0	; fq0.ftt is clear
-	test_spr_bits	0x7e,1,0x0,fqst0	; fq0.cexc is clear
-	test_spr_bits	0x1,0,0x0,fqst0		; fq0.valid is clear
-	test_spr_immed	0,fqop0			; fq0.opc
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfstoi.cgs b/sim/testsuite/sim/frv/nfstoi.cgs
deleted file mode 100644
index 296812827ae..00000000000
--- a/sim/testsuite/sim/frv/nfstoi.cgs
+++ /dev/null
@@ -1,49 +0,0 @@
-# frv testcase for nfstoi $FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfstoi
-nfstoi:
-	nfstoi		fr16,fr1
-	test_fr_iimmed	0,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfstoi		fr20,fr1
-	test_fr_iimmed	0,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfstoi		fr32,fr1
-	test_fr_iimmed	0x00000002,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	set_fr_iimmed	0xce05,0x4904,fr1
-	nfstoi		fr1,fr1
-	test_fr_iimmed	0xdeadbf00,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; These were an attempt to cause overflow and nan exceptions
-	nfstoi		fr48,fr1
-	test_fr_iimmed	0x7fffffff,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfstoi		fr52,fr1
-	test_fr_iimmed	0x7fffffff,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfstoi		fr56,fr1
-	test_fr_iimmed	0x80000000,fr1
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nfsubs.cgs b/sim/testsuite/sim/frv/nfsubs.cgs
deleted file mode 100644
index 3da08b9ffb7..00000000000
--- a/sim/testsuite/sim/frv/nfsubs.cgs
+++ /dev/null
@@ -1,163 +0,0 @@
-# frv testcase for nfsubs $FRi,$FRj,$FRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	float_constants
-	start
-	load_float_constants
-
-	.global nfsubs
-nfsubs:
-	nfsubs      	fr0,fr16,fr1
-	test_fr_fr	fr1,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr4,fr16,fr1
-	test_fr_fr	fr1,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr8,fr16,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr12,fr16,fr1
-	test_fr_fr	fr1,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr16,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr20,fr16,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr24,fr16,fr1
-	test_fr_fr	fr1,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr28,fr16,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr32,fr16,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr36,fr16,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr40,fr16,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr44,fr16,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr48,fr16,fr1
-	test_fr_fr	fr1,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr52,fr16,fr1
-	test_fr_fr	fr1,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfsubs      	fr0,fr20,fr1
-	test_fr_fr	fr1,fr0
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr4,fr20,fr1
-	test_fr_fr	fr1,fr4
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr8,fr20,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr12,fr20,fr1
-	test_fr_fr	fr1,fr12
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr16,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr20,fr20,fr1
-	test_fr_fr	fr1,fr16
-	test_fr_fr	fr1,fr20
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr24,fr20,fr1
-	test_fr_fr	fr1,fr24
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr28,fr20,fr1
-	test_fr_fr	fr1,fr28
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr32,fr20,fr1
-	test_fr_fr	fr1,fr32
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr36,fr20,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr40,fr20,fr1
-	test_fr_fr	fr1,fr40
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr44,fr20,fr1
-	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr48,fr20,fr1
-	test_fr_fr	fr1,fr48
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-	nfsubs      	fr52,fr20,fr1
-	test_fr_fr	fr1,fr52
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfsubs      	fr32,fr36,fr1
-	test_fr_fr	fr1,fr8
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfsubs      	fr44,fr40,fr1
-	test_fr_fr	fr1,fr36
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	; try to cause exceptions
-	nfsubs      	fr4,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfsubs      	fr0,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfsubs      	fr56,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	0,fner1
-	test_spr_immed	0,fner0
-
-	nfsubs      	fr60,fr28,fr1
-;	test_fr_fr	fr1,fr44
-	test_spr_immed	2,fner1
-	test_spr_immed	0,fner0
-
-	pass
-
-
diff --git a/sim/testsuite/sim/frv/nld.cgs b/sim/testsuite/sim/frv/nld.cgs
deleted file mode 100644
index 297468b44d6..00000000000
--- a/sim/testsuite/sim/frv/nld.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv testcase for nld @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nld
-nld:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nld 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0x8880,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	nld 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0x8880,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	nld 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0x8880,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldbf.cgs b/sim/testsuite/sim/frv/nldbf.cgs
deleted file mode 100644
index 1a5c25b6741..00000000000
--- a/sim/testsuite/sim/frv/nldbf.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv testcase for nldbf @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldbf
-nldbf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldbf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x00de,fr8
-	test_spr_limmed	0xc800,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	1,gr7
-	nldbf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x00ad,fr8
-	test_spr_limmed	0xc800,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	2,gr20
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	nldbf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_spr_limmed	0xc800,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldbfi.cgs b/sim/testsuite/sim/frv/nldbfi.cgs
deleted file mode 100644
index aa90bc91194..00000000000
--- a/sim/testsuite/sim/frv/nldbfi.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for nldbfi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldbfi
-nldbfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_gr	sp,gr20
-	nldbfi 		@(sp,0),fr8
-	test_fr_limmed	0x0000,0x00de,fr8
-	test_spr_limmed	0xc800,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	1,gr20
-	nldbfi 		@(sp,1),fr8
-	test_fr_limmed	0x0000,0x00ad,fr8
-	test_spr_limmed	0xc800,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	2,gr20
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	nldbfi 		@(sp,-1),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_spr_limmed	0xc800,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldbfu.cgs b/sim/testsuite/sim/frv/nldbfu.cgs
deleted file mode 100644
index 174042b4bc1..00000000000
--- a/sim/testsuite/sim/frv/nldbfu.cgs
+++ /dev/null
@@ -1,46 +0,0 @@
-# frv testcase for nldbfu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldbfu
-nldbfu:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	nldbfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x00de,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc800,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	1,gr7
-	nldbfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x00ad,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc800,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	2,gr20
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	nldbfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc800,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldd.cgs b/sim/testsuite/sim/frv/nldd.cgs
deleted file mode 100644
index 1f457611709..00000000000
--- a/sim/testsuite/sim/frv/nldd.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for nldd @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldd
-nldd:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldd 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_spr_limmed	0x88a0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	nldd 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_spr_limmed	0x88a0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	nldd 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_spr_limmed	0x88a0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nlddf.cgs b/sim/testsuite/sim/frv/nlddf.cgs
deleted file mode 100644
index d30b6dd2385..00000000000
--- a/sim/testsuite/sim/frv/nlddf.cgs
+++ /dev/null
@@ -1,50 +0,0 @@
-# frv testcase for nlddf @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nlddf
-nlddf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nlddf 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_spr_limmed	0xc8a0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	nlddf 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_spr_limmed	0xc8a0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	set_gr_immed	-8,gr7
-	nlddf 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_spr_limmed	0xc8a0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nlddfi.cgs b/sim/testsuite/sim/frv/nlddfi.cgs
deleted file mode 100644
index b58ad6ffe3c..00000000000
--- a/sim/testsuite/sim/frv/nlddfi.cgs
+++ /dev/null
@@ -1,47 +0,0 @@
-# frv testcase for nlddfi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nlddfi
-nlddfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_gr	sp,gr20
-	nlddfi 		@(sp,0),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_spr_limmed	0xc8a0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	nlddfi 		@(sp,8),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_spr_limmed	0xc8a0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	16,sp
-	nlddfi 		@(sp,-8),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_spr_limmed	0xc8a0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nlddfu.cgs b/sim/testsuite/sim/frv/nlddfu.cgs
deleted file mode 100644
index d45c995cd2c..00000000000
--- a/sim/testsuite/sim/frv/nlddfu.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase for nlddfu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nlddfu
-nlddfu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-
-	set_gr_immed	0,gr7
-	nlddfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc8a0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	nlddfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc8a0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	nlddfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xbeef,0xdead,fr8
-	test_fr_limmed	0xdead,0xbeef,fr9
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc8a0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nlddi.cgs b/sim/testsuite/sim/frv/nlddi.cgs
deleted file mode 100644
index 04d24875417..00000000000
--- a/sim/testsuite/sim/frv/nlddi.cgs
+++ /dev/null
@@ -1,47 +0,0 @@
-# frv testcase for nlddi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nlddi
-nlddi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_gr	sp,gr20
-	nlddi 		@(sp,0),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_spr_limmed	0x88a0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	nlddi 		@(sp,8),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_spr_limmed	0x88a0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	16,sp
-	nlddi 		@(sp,-8),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_spr_limmed	0x88a0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nlddu.cgs b/sim/testsuite/sim/frv/nlddu.cgs
deleted file mode 100644
index 44565c8a6ff..00000000000
--- a/sim/testsuite/sim/frv/nlddu.cgs
+++ /dev/null
@@ -1,66 +0,0 @@
-# frv testcase for nlddu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nlddu
-nlddu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-
-	set_gr_immed	0,gr7
-	nlddu 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0x88a0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	-8,sp
-	set_gr_immed	8,gr7
-	nlddu 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0x88a0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	nlddu 		@(sp,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0x88a0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	inc_gr_immed	8,sp
-	set_gr_immed	-8,gr7
-	set_gr_gr	sp,gr8
-	nlddu 		@(gr8,gr7),gr8
-	test_gr_limmed	0xbeef,0xdead,gr8
-	test_gr_limmed	0xdead,0xbeef,gr9
-	test_spr_limmed	0x88a0,0x0c01,nesr3
-	test_spr_gr	neear3,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldf.cgs b/sim/testsuite/sim/frv/nldf.cgs
deleted file mode 100644
index 6aabc67ea57..00000000000
--- a/sim/testsuite/sim/frv/nldf.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv testcase for nldf @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldf
-nldf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldf 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_spr_limmed	0xc880,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	nldf 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_spr_limmed	0xc880,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	set_gr_immed	-4,gr7
-	nldf 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_spr_limmed	0xc880,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldfi.cgs b/sim/testsuite/sim/frv/nldfi.cgs
deleted file mode 100644
index 20f62dfc15f..00000000000
--- a/sim/testsuite/sim/frv/nldfi.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for nldfi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldfi
-nldfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_gr	sp,gr20
-	nldfi 		@(sp,0),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_spr_limmed	0xc880,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	nldfi 		@(sp,4),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_spr_limmed	0xc880,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	8,sp
-	nldfi 		@(sp,-4),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_spr_limmed	0xc880,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldfu.cgs b/sim/testsuite/sim/frv/nldfu.cgs
deleted file mode 100644
index 8e95016b608..00000000000
--- a/sim/testsuite/sim/frv/nldfu.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# frv testcase for nldfu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldfu
-nldfu:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	nldfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc880,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	nldfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc880,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	nldfu 		@(sp,gr7),fr8
-	test_fr_limmed	0xdead,0xbeef,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc880,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldhf.cgs b/sim/testsuite/sim/frv/nldhf.cgs
deleted file mode 100644
index b90d8f9f301..00000000000
--- a/sim/testsuite/sim/frv/nldhf.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# frv testcase for nldhf @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldhf
-nldhf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldhf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0xdead,fr8
-	test_spr_limmed	0xc840,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	nldhf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0xbeef,fr8
-	test_spr_limmed	0xc840,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	nldhf 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_spr_limmed	0xc840,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldhfi.cgs b/sim/testsuite/sim/frv/nldhfi.cgs
deleted file mode 100644
index bcd52ed6e99..00000000000
--- a/sim/testsuite/sim/frv/nldhfi.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for nldhfi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldhfi
-nldhfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_gr	sp,gr20
-	nldhfi 		@(sp,0),fr8
-	test_fr_limmed	0x0000,0xdead,fr8
-	test_spr_limmed	0xc840,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	2,gr20
-	nldhfi 		@(sp,2),fr8
-	test_fr_limmed	0x0000,0xbeef,fr8
-	test_spr_limmed	0xc840,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	nldhfi 		@(sp,-2),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_spr_limmed	0xc840,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldhfu.cgs b/sim/testsuite/sim/frv/nldhfu.cgs
deleted file mode 100644
index 97d1dd9037f..00000000000
--- a/sim/testsuite/sim/frv/nldhfu.cgs
+++ /dev/null
@@ -1,45 +0,0 @@
-# frv testcase for nldhfu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldhfu
-nldhfu:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xbeef,0xdead,fr8
-
-	set_gr_immed	0,gr7
-	nldhfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0xdead,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc840,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	nldhfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0xbeef,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc840,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	nldhfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x0000,0x0000,fr8
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc840,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldi.cgs b/sim/testsuite/sim/frv/nldi.cgs
deleted file mode 100644
index c70f0cb9eb4..00000000000
--- a/sim/testsuite/sim/frv/nldi.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for nldi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldi
-nldi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	nldi 		@(sp,0),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0x8880,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	nldi 		@(sp,4),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0x8880,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	8,sp
-	nldi 		@(sp,-4),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_spr_limmed	0x8880,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldq.cgs b/sim/testsuite/sim/frv/nldq.cgs
deleted file mode 100644
index 0338e19fc0c..00000000000
--- a/sim/testsuite/sim/frv/nldq.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# frv testcase for nldq @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldq
-nldq:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldq 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_spr_limmed	0x88c0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	nldq 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_spr_limmed	0x88c0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	nldq 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_spr_limmed	0x88c0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldqf.cgs b/sim/testsuite/sim/frv/nldqf.cgs
deleted file mode 100644
index 8e268acc85d..00000000000
--- a/sim/testsuite/sim/frv/nldqf.cgs
+++ /dev/null
@@ -1,67 +0,0 @@
-# frv testcase for nldqf @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldqf
-nldqf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldqf 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_spr_limmed	0xc8c0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	nldqf 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_spr_limmed	0xc8c0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	32,sp
-	set_gr_immed	-16,gr7
-	nldqf 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_spr_limmed	0xc8c0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldqfi.cgs b/sim/testsuite/sim/frv/nldqfi.cgs
deleted file mode 100644
index ff05fae7ad3..00000000000
--- a/sim/testsuite/sim/frv/nldqfi.cgs
+++ /dev/null
@@ -1,64 +0,0 @@
-# frv testcase for nldqfi @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldqfi
-nldqfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-
-	set_gr_gr	sp,gr20
-	nldqfi 		@(sp,0),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_spr_limmed	0xc8c0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	-16,sp
-	nldqfi 		@(sp,16),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_spr_limmed	0xc8c0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	32,sp
-	nldqfi 		@(sp,-16),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_spr_limmed	0xc8c0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldqfu.cgs b/sim/testsuite/sim/frv/nldqfu.cgs
deleted file mode 100644
index ffe2990cff0..00000000000
--- a/sim/testsuite/sim/frv/nldqfu.cgs
+++ /dev/null
@@ -1,70 +0,0 @@
-# frv testcase for nldqfu @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldqfu
-nldqfu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-
-	set_gr_immed	0,gr7
-	nldqfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc8c0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	nldqfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc8c0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	set_fr_iimmed	0xdead,0xbeef,fr8
-	set_fr_iimmed	0xbeef,0xdead,fr9
-	set_fr_iimmed	0x1234,0x5678,fr10
-	set_fr_iimmed	0x9abc,0xdef0,fr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	nldqfu 		@(sp,gr7),fr8
-	test_fr_limmed	0x9abc,0xdef0,fr8
-	test_fr_limmed	0x1234,0x5678,fr9
-	test_fr_limmed	0xbeef,0xdead,fr10
-	test_fr_limmed	0xdead,0xbeef,fr11
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0xc8c0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,fner1
-	test_spr_limmed	0x0000,0x0000,fner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldqu.cgs b/sim/testsuite/sim/frv/nldqu.cgs
deleted file mode 100644
index a7e8b30fd2a..00000000000
--- a/sim/testsuite/sim/frv/nldqu.cgs
+++ /dev/null
@@ -1,87 +0,0 @@
-# frv testcase for nldqu @($GRi,$GRj),$GRk
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldqu
-nldqu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9abc,0xdef0,sp
-	set_gr_gr	sp,gr20
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-
-	set_gr_immed	0,gr7
-	nldqu 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0x88c0,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	-16,sp
-	set_gr_immed	16,gr7
-	nldqu 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0x88c0,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	nldqu 		@(sp,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_gr_gr	sp,gr20
-	test_spr_limmed	0x88c0,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xdead,0xbeef,gr8
-	set_gr_limmed	0xbeef,0xdead,gr9
-	set_gr_limmed	0x1234,0x5678,gr10
-	set_gr_limmed	0x9abc,0xdef0,gr11
-	inc_gr_immed	16,sp
-	set_gr_immed	-16,gr7
-	set_gr_gr	sp,gr8
-	nldqu 		@(gr8,gr7),gr8
-	test_gr_limmed	0x9abc,0xdef0,gr8
-	test_gr_limmed	0x1234,0x5678,gr9
-	test_gr_limmed	0xbeef,0xdead,gr10
-	test_gr_limmed	0xdead,0xbeef,gr11
-	test_spr_limmed	0x88c0,0x0c01,nesr3
-	test_spr_gr	neear3,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldsb.cgs b/sim/testsuite/sim/frv/nldsb.cgs
deleted file mode 100644
index 1db547c7cab..00000000000
--- a/sim/testsuite/sim/frv/nldsb.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv testcase for nldsb @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldsb
-nldsb:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldsb 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xffde,gr8
-	test_spr_limmed	0x8820,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	1,gr7
-	nldsb 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xffad,gr8
-	test_spr_limmed	0x8820,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr20
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	nldsb 		@(sp,gr7),gr8
-	test_gr_immed	0,gr8
-	test_spr_limmed	0x8820,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldsbi.cgs b/sim/testsuite/sim/frv/nldsbi.cgs
deleted file mode 100644
index 4b9dcba3e68..00000000000
--- a/sim/testsuite/sim/frv/nldsbi.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for nldsbi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldsbi
-nldsbi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	nldsbi 		@(sp,0),gr8
-	test_gr_limmed	0xffff,0xffde,gr8
-	test_spr_limmed	0x8820,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	1,gr20
-	nldsbi 		@(sp,1),gr8
-	test_gr_limmed	0xffff,0xffad,gr8
-	test_spr_limmed	0x8820,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr20
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	nldsbi 		@(sp,-1),gr8
-	test_gr_immed	0,gr8
-	test_spr_limmed	0x8820,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldsbu.cgs b/sim/testsuite/sim/frv/nldsbu.cgs
deleted file mode 100644
index e60ffc011e2..00000000000
--- a/sim/testsuite/sim/frv/nldsbu.cgs
+++ /dev/null
@@ -1,56 +0,0 @@
-# frv testcase for nldsbu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldsbu
-nldsbu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	nldsbu 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xffde,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8820,0x0001,nesr0
-	test_spr_gr	neear0,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	1,gr9
-	set_gr_immed	1,gr7
-	nldsbu 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xffad,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8820,0x0401,nesr1
-	test_spr_gr	neear1,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr9
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	nldsbu 		@(sp,gr7),gr8
-	test_gr_immed	0,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8820,0x0801,nesr2
-	test_spr_gr	neear2,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	-3,sp
-	set_mem_limmed	0x0000,0x00da,sp
-	set_gr_immed	3,gr7
-	nldsbu 		@(sp,gr7),sp
-	test_gr_limmed	0xffff,0xffda,sp
-	test_spr_limmed	0x8120,0x0c01,nesr3
-	test_spr_gr	neear3,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldsh.cgs b/sim/testsuite/sim/frv/nldsh.cgs
deleted file mode 100644
index afc00c49df5..00000000000
--- a/sim/testsuite/sim/frv/nldsh.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# frv testcase for nldsh @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldsh
-nldsh:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldsh 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xdead,gr8
-	test_spr_limmed	0x8860,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	nldsh 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xbeef,gr8
-	test_spr_limmed	0x8860,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	nldsh 		@(sp,gr7),gr8
-	test_gr_immed	0,gr8
-	test_spr_limmed	0x8860,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldshi.cgs b/sim/testsuite/sim/frv/nldshi.cgs
deleted file mode 100644
index 60de1564874..00000000000
--- a/sim/testsuite/sim/frv/nldshi.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for nldshi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldshi
-nldshi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	nldshi 		@(sp,0),gr8
-	test_gr_limmed	0xffff,0xdead,gr8
-	test_spr_limmed	0x8860,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr20
-	nldshi 		@(sp,2),gr8
-	test_gr_limmed	0xffff,0xbeef,gr8
-	test_spr_limmed	0x8860,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	nldshi 		@(sp,-2),gr8
-	test_gr_immed	0,gr8
-	test_spr_limmed	0x8860,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldshu.cgs b/sim/testsuite/sim/frv/nldshu.cgs
deleted file mode 100644
index 775b760df8f..00000000000
--- a/sim/testsuite/sim/frv/nldshu.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# frv testcase for nldshu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldshu
-nldshu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	nldshu 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xdead,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8860,0x0001,nesr0
-	test_spr_gr	neear0,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr9
-	set_gr_immed	2,gr7
-	nldshu 		@(sp,gr7),gr8
-	test_gr_limmed	0xffff,0xbeef,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8860,0x0401,nesr1
-	test_spr_gr	neear1,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	nldshu 		@(sp,gr7),gr8
-	test_gr_immed	0,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8860,0x0801,nesr2
-	test_spr_gr	neear2,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0x0000,0xdead,sp
-	set_gr_immed	2,gr7
-	nldshu 		@(sp,gr7),sp
-	test_gr_limmed	0xffff,0xdead,sp
-	test_spr_limmed	0x8160,0x0c01,nesr3
-	test_spr_gr	neear3,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldu.cgs b/sim/testsuite/sim/frv/nldu.cgs
deleted file mode 100644
index 0d1735e8848..00000000000
--- a/sim/testsuite/sim/frv/nldu.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# frv testcase for nldu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldu
-nldu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	nldu 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8880,0x0001,nesr0
-	test_spr_gr	neear0,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	nldu 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8880,0x0401,nesr1
-	test_spr_gr	neear1,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_gr_limmed	0xbeef,0xdead,gr8
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	nldu 		@(sp,gr7),gr8
-	test_gr_limmed	0xdead,0xbeef,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8880,0x0801,nesr2
-	test_spr_gr	neear2,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	nldu 		@(sp,gr7),sp
-	test_gr_limmed	0xdead,0xbeef,sp
-	test_spr_limmed	0x8180,0x0c01,nesr3
-	test_spr_gr	neear3,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldub.cgs b/sim/testsuite/sim/frv/nldub.cgs
deleted file mode 100644
index 2067bcc089d..00000000000
--- a/sim/testsuite/sim/frv/nldub.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv testcase for nldub @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldub
-nldub:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nldub 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x00de,gr8
-	test_spr_limmed	0x8800,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	1,gr20
-	set_gr_immed	1,gr7
-	nldub 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x00ad,gr8
-	test_spr_limmed	0x8800,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr20
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	nldub 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_spr_limmed	0x8800,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldubi.cgs b/sim/testsuite/sim/frv/nldubi.cgs
deleted file mode 100644
index 8eba5164120..00000000000
--- a/sim/testsuite/sim/frv/nldubi.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for nldubi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldubi
-nldubi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	nldubi 		@(sp,0),gr8
-	test_gr_limmed	0x0000,0x00de,gr8
-	test_spr_limmed	0x8800,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	1,gr20
-	nldubi 		@(sp,1),gr8
-	test_gr_limmed	0x0000,0x00ad,gr8
-	test_spr_limmed	0x8800,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr20
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	nldubi 		@(sp,-1),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_spr_limmed	0x8800,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nldubu.cgs b/sim/testsuite/sim/frv/nldubu.cgs
deleted file mode 100644
index acf9d9c818e..00000000000
--- a/sim/testsuite/sim/frv/nldubu.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# frv testcase for nldubu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nldubu
-nldubu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	nldubu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x00de,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8800,0x0001,nesr0
-	test_spr_gr	neear0,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	1,gr9
-	set_gr_immed	1,gr7
-	nldubu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x00ad,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8800,0x0401,nesr1
-	test_spr_gr	neear1,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr9
-	inc_gr_immed	-1,sp
-	set_mem_limmed	0xffff,0xff00,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-1,gr7
-	nldubu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_spr_limmed	0x8800,0x0801,nesr2
-	test_spr_gr	neear2,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	-3,sp
-	set_mem_limmed	0xffff,0xffda,sp
-	set_gr_immed	3,gr7
-	nldubu 		@(sp,gr7),sp
-	test_gr_limmed	0x0000,0x00da,sp
-	test_spr_limmed	0x8100,0x0c01,nesr3
-	test_spr_gr	neear3,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nlduh.cgs b/sim/testsuite/sim/frv/nlduh.cgs
deleted file mode 100644
index 1871a22044b..00000000000
--- a/sim/testsuite/sim/frv/nlduh.cgs
+++ /dev/null
@@ -1,41 +0,0 @@
-# frv testcase for nlduh @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nlduh
-nlduh:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	nlduh 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0xdead,gr8
-	test_spr_limmed	0x8840,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr20
-	set_gr_immed	2,gr7
-	nlduh 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0xbeef,gr8
-	test_spr_limmed	0x8840,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	nlduh 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_spr_limmed	0x8840,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nlduhi.cgs b/sim/testsuite/sim/frv/nlduhi.cgs
deleted file mode 100644
index ae7171ee417..00000000000
--- a/sim/testsuite/sim/frv/nlduhi.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for nlduhi @($GRi,$d12),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nlduhi
-nlduhi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr20
-	nlduhi 		@(sp,0),gr8
-	test_gr_limmed	0x0000,0xdead,gr8
-	test_spr_limmed	0x8840,0x0001,nesr0
-	test_spr_gr	neear0,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr20
-	nlduhi 		@(sp,2),gr8
-	test_gr_limmed	0x0000,0xbeef,gr8
-	test_spr_limmed	0x8840,0x0401,nesr1
-	test_spr_gr	neear1,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	nlduhi 		@(sp,-2),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_spr_limmed	0x8840,0x0801,nesr2
-	test_spr_gr	neear2,gr20
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nlduhu.cgs b/sim/testsuite/sim/frv/nlduhu.cgs
deleted file mode 100644
index 8142fc59517..00000000000
--- a/sim/testsuite/sim/frv/nlduhu.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# frv testcase for nlduhu @($GRi,$GRj),$GRk
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nlduhu
-nlduhu:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xbeef,0xdead,gr8
-
-	set_gr_gr	sp,gr9
-	set_gr_immed	0,gr7
-	nlduhu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0xdead,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8840,0x0001,nesr0
-	test_spr_gr	neear0,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	2,gr9
-	set_gr_immed	2,gr7
-	nlduhu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0xbeef,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8840,0x0401,nesr1
-	test_spr_gr	neear1,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0x0000,sp
-	inc_gr_immed	4,sp
-	set_gr_immed	-2,gr7
-	nlduhu 		@(sp,gr7),gr8
-	test_gr_limmed	0x0000,0x0000,gr8
-	test_gr_gr	sp,gr9
-	test_spr_limmed	0x8840,0x0801,nesr2
-	test_spr_gr	neear2,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	inc_gr_immed	-2,sp
-	set_mem_limmed	0xffff,0xdead,sp
-	set_gr_immed	2,gr7
-	nlduhu 		@(sp,gr7),sp
-	test_gr_limmed	0x0000,0xdead,sp
-	test_spr_limmed	0x8140,0x0c01,nesr3
-	test_spr_gr	neear3,gr9
-	test_spr_limmed	0x0000,0x0000,gner1
-	test_spr_limmed	0x0000,0x0000,gner0
-
-	pass
diff --git a/sim/testsuite/sim/frv/nop.cgs b/sim/testsuite/sim/frv/nop.cgs
deleted file mode 100644
index 7180066ce9c..00000000000
--- a/sim/testsuite/sim/frv/nop.cgs
+++ /dev/null
@@ -1,12 +0,0 @@
-# frv testcase for nop
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global nop
-nop:
-	nop
-
-	pass
diff --git a/sim/testsuite/sim/frv/norcr.cgs b/sim/testsuite/sim/frv/norcr.cgs
deleted file mode 100644
index e097a1b3667..00000000000
--- a/sim/testsuite/sim/frv/norcr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for norcr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global norcr
-norcr:
-	set_spr_immed	0x1b1b,cccr
-	norcr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	norcr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	norcr		cc7,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norcr		cc7,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norcr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	norcr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	norcr		cc6,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norcr		cc6,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norcr		cc5,cc7,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norcr		cc5,cc6,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norcr		cc5,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norcr		cc5,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norcr		cc4,cc7,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norcr		cc4,cc6,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norcr		cc4,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norcr		cc4,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/norncr.cgs b/sim/testsuite/sim/frv/norncr.cgs
deleted file mode 100644
index a7b95da6b6b..00000000000
--- a/sim/testsuite/sim/frv/norncr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for norncr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global norncr
-norncr:
-	set_spr_immed	0x1b1b,cccr
-	norncr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	norncr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	norncr		cc7,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norncr		cc7,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norncr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	norncr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	norncr		cc6,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norncr		cc6,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norncr		cc5,cc7,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norncr		cc5,cc6,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norncr		cc5,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norncr		cc5,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	norncr		cc4,cc7,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norncr		cc4,cc6,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norncr		cc4,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	norncr		cc4,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/not.cgs b/sim/testsuite/sim/frv/not.cgs
deleted file mode 100644
index e44eabfcd0a..00000000000
--- a/sim/testsuite/sim/frv/not.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# frv testcase for not $GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global not
-not:
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	not      	gr7,gr7
-	test_gr_limmed 	0x5555,0x5555,gr7
-
-	set_gr_limmed   0xdead,0xbeef,gr7
-	not      	gr7,gr7
-	test_gr_limmed 	0x2152,0x4110,gr7
-
-	pass
diff --git a/sim/testsuite/sim/frv/notcr.cgs b/sim/testsuite/sim/frv/notcr.cgs
deleted file mode 100644
index e6c08e0603a..00000000000
--- a/sim/testsuite/sim/frv/notcr.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# frv testcase for notcr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global notcr
-notcr:
-	set_spr_immed	0x1b1b,cccr
-	notcr		cc7,cc3
-	test_spr_immed	0x1b5b,cccr
-
-	notcr		cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	notcr		cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	notcr		cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/nsdiv.cgs b/sim/testsuite/sim/frv/nsdiv.cgs
deleted file mode 100644
index 533f2ef5c94..00000000000
--- a/sim/testsuite/sim/frv/nsdiv.cgs
+++ /dev/null
@@ -1,64 +0,0 @@
-# frv testcase for nsdiv $GRi,$GRj,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nsdiv
-nsdiv:
-	set_spr_immed	0,gner0
-	set_spr_immed	0,gner1
-
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	nsdiv      	gr1,gr3,gr2
-	test_gr_immed  	4,gr2
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	nsdiv      	gr1,gr3,gr2
-	test_gr_immed  	-1,gr2
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	set_spr_immed	4,gner1		; turn on NE bit for gr2
-	nsdiv      	gr1,gr3,gr2	; overflow is masked
-	test_gr_limmed 	0x7fff,0xffff,gr2
-	test_spr_bits	0x4,2,1,isr	; isr.aexc is set
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	nsdiv      	gr1,gr0,gr32	; divide by zero
-	test_spr_immed	1,gner0
-	test_spr_immed	0,gner1
-
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	nsdiv      	gr1,gr3,gr2
-	test_gr_limmed 	0x8000,0x0000,gr2
-	test_spr_immed	1,gner0
-	test_spr_immed	4,gner1
-
-	nsdiv      	gr1,gr0,gr10	; divide by zero
-	test_spr_immed	1,gner0
-	test_spr_immed	0x00000404,gner1
-
-	; simple division 12 / 3 -- should turn off ne flag
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	nsdiv      	gr1,gr3,gr2
-	test_gr_immed  	4,gr2
-	test_spr_immed	1,gner0
-	test_spr_immed	0x00000400,gner1
-
-	pass
diff --git a/sim/testsuite/sim/frv/nsdivi.cgs b/sim/testsuite/sim/frv/nsdivi.cgs
deleted file mode 100644
index 014fadd5814..00000000000
--- a/sim/testsuite/sim/frv/nsdivi.cgs
+++ /dev/null
@@ -1,64 +0,0 @@
-# frv testcase for nsdivi $GRi,$s12,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nsdivi
-nsdivi:
-	set_spr_immed	0,gner0
-	set_spr_immed	0,gner1
-
-	; simple division 12 / 3
-	set_gr_immed   	12,gr1
-	nsdivi      	gr1,3,gr2
-	test_gr_immed  	4,gr2
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	; Random example
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	nsdivi      	gr1,0x7ff,gr2
-	test_gr_limmed 	0xffff,0xdb93,gr2
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	; Random negative example
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	nsdivi      	gr1,-2048,gr2
-	test_gr_immed 	0x2468,gr2
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_limmed  	0x8000,0x0000,gr1
-	nsdivi      	gr1,-1,gr2
-	test_gr_limmed 	0x7fff,0xffff,gr2
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	nsdivi      	gr1,0,gr32	; divide by zero
-	test_spr_immed	1,gner0
-	test_spr_immed	0,gner1
-
-	; Special case from the Arch Spec Vol 2
-	and_spr_immed	-33,isr		; turn off isr.edem
-	set_gr_limmed  	0x8000,0x0000,gr1
-	nsdivi      	gr1,-1,gr2
-	test_gr_limmed 	0x8000,0x0000,gr2
-	test_spr_immed	1,gner0
-	test_spr_immed	4,gner1
-
-	nsdivi      	gr1,0,gr10	; divide by zero
-	test_spr_immed	1,gner0
-	test_spr_immed	0x00000404,gner1
-
-	; simple division 12 / 3 -- should turn off ne flag
-	set_gr_immed   	12,gr1
-	nsdivi      	gr1,3,gr2
-	test_gr_immed  	4,gr2
-	test_spr_immed	1,gner0
-	test_spr_immed	0x00000400,gner1
-
-	pass
diff --git a/sim/testsuite/sim/frv/nudiv.cgs b/sim/testsuite/sim/frv/nudiv.cgs
deleted file mode 100644
index 58bce82af09..00000000000
--- a/sim/testsuite/sim/frv/nudiv.cgs
+++ /dev/null
@@ -1,49 +0,0 @@
-# frv testcase for nudiv $GRi,$GRj,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nudiv
-nudiv:
-	set_spr_immed	0,gner0
-	set_spr_immed	0,gner1
-
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	nudiv      	gr3,gr2,gr3
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x00000004,gr3
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	; example 1 from the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	nudiv      	gr3,gr2,gr3
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_immed  	0x000000e0,gr3
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	nudiv      	gr1,gr0,gr32	; divide by zero
-	test_spr_immed	1,gner0
-	test_spr_immed	0,gner1
-
-	and_spr_immed	-33,isr		; turn off isr.edem
-	nudiv      	gr1,gr0,gr10	; divide by zero
-	test_spr_immed	1,gner0
-	test_spr_immed	0x00000400,gner1
-
-	; simple division 12 / 3 -- should turn off ne flag
-	set_gr_immed   	12,gr1
-	set_gr_immed   	3,gr3
-	nudiv      	gr1,gr3,gr10
-	test_gr_immed  	4,gr10
-	test_spr_immed	1,gner0
-	test_spr_immed	0,gner1
-
-	pass
diff --git a/sim/testsuite/sim/frv/nudivi.cgs b/sim/testsuite/sim/frv/nudivi.cgs
deleted file mode 100644
index 2426eb38fdc..00000000000
--- a/sim/testsuite/sim/frv/nudivi.cgs
+++ /dev/null
@@ -1,51 +0,0 @@
-# frv testcase for nudivi $GRi,$s12,$GRk
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global nudivi
-nudivi:
-	set_spr_immed	0,gner0
-	set_spr_immed	0,gner1
-
-	; simple division 12 / 3
-	set_gr_immed   	0x0000000c,gr3
-	nudivi      	gr3,3,gr3
-	test_gr_immed  	0x00000004,gr3
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	; random example
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	nudivi      	gr3,0x7ff,gr3
-	test_gr_limmed 	0x001f,0xdf93,gr3
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	; random example
-	set_gr_limmed  	0xffff,0xffff,gr3
-	nudivi      	gr3,-2048,gr3
-	test_gr_immed 	1,gr3
-	test_spr_immed	0,gner0
-	test_spr_immed	0,gner1
-
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	nudivi      	gr1,0,gr32	; divide by zero
-	test_spr_immed	1,gner0
-	test_spr_immed	0,gner1
-
-	and_spr_immed	-33,isr		; turn off isr.edem
-	nudivi      	gr1,0,gr10	; divide by zero
-	test_spr_immed	1,gner0
-	test_spr_immed	0x00000400,gner1
-
-	; simple division 12 / 3 -- should turn off ne flag
-	set_gr_immed   	12,gr1
-	nudivi      	gr1,3,gr10
-	test_gr_immed  	4,gr10
-	test_spr_immed	1,gner0
-	test_spr_immed	0,gner1
-
-	pass
diff --git a/sim/testsuite/sim/frv/or.cgs b/sim/testsuite/sim/frv/or.cgs
deleted file mode 100644
index b432429a013..00000000000
--- a/sim/testsuite/sim/frv/or.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# frv testcase for or $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global or
-or:
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	or      	gr7,gr8,gr8
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	0x00000000,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	or		gr7,gr8,gr8
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	or		gr7,gr8,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0xdead,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/orcc.cgs b/sim/testsuite/sim/frv/orcc.cgs
deleted file mode 100644
index a0a3e5bdeda..00000000000
--- a/sim/testsuite/sim/frv/orcc.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# frv testcase for orcc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global orcc
-orcc:
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	orcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	0x00000000,gr7
-	set_gr_immed   	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	orcc		gr7,gr8,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed  	0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	orcc		gr7,gr8,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xdead,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/orcr.cgs b/sim/testsuite/sim/frv/orcr.cgs
deleted file mode 100644
index a5114b248e7..00000000000
--- a/sim/testsuite/sim/frv/orcr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for orcr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global orcr
-orcr:
-	set_spr_immed	0x1b1b,cccr
-	orcr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	orcr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	orcr		cc7,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orcr		cc7,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orcr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	orcr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	orcr		cc6,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orcr		cc6,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orcr		cc5,cc7,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orcr		cc5,cc6,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orcr		cc5,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orcr		cc5,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orcr		cc4,cc7,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orcr		cc4,cc6,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orcr		cc4,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orcr		cc4,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/ori.cgs b/sim/testsuite/sim/frv/ori.cgs
deleted file mode 100644
index aa1d61a1d0a..00000000000
--- a/sim/testsuite/sim/frv/ori.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for ori $GRi,$s12,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ori
-ori:
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_icc         0x07,0		; Set mask opposite of expected
-	ori      	gr7,0x555,gr8
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0xaaaa,0xafff,gr8
-
-	set_gr_immed   	0x00000000,gr7
-	set_icc         0x08,0		; Set mask opposite of expected
-	ori		gr7,0,gr8
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xb800,gr7
-	set_icc         0x05,0		; Set mask opposite of expected
-	ori		gr7,0x6ef,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0xdead,0xbeef,gr8
-
-	set_gr_limmed   0xdead,0xb000,gr7
-	set_icc         0x05,0		; Set mask opposite of expected
-	ori		gr7,-273,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0xffff,0xfeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/oricc.cgs b/sim/testsuite/sim/frv/oricc.cgs
deleted file mode 100644
index 71e6d53320a..00000000000
--- a/sim/testsuite/sim/frv/oricc.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for oricc $GRi,$s10,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global oricc
-oricc:
-	set_gr_limmed  	0xaaaa,0xaaaa,gr7
-	set_icc         0x07,0		; Set mask opposite of expected
-	oricc      	gr7,0x155,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0xaaaa,0xabff,gr8
-
-	set_gr_immed   	0x00000000,gr7
-	set_icc         0x08,0		; Set mask opposite of expected
-	oricc		gr7,0,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0xbe00,gr7
-	set_icc         0x05,0		; Set mask opposite of expected
-	oricc		gr7,0x0ef,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xdead,0xbeef,gr8
-
-	set_gr_limmed   0xdead,0xb000,gr7
-	set_icc         0x05,0		; Set mask opposite of expected
-	oricc		gr7,-273,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xffff,0xfeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/orncr.cgs b/sim/testsuite/sim/frv/orncr.cgs
deleted file mode 100644
index b0e4e5914f8..00000000000
--- a/sim/testsuite/sim/frv/orncr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for orncr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global orncr
-orncr:
-	set_spr_immed	0x1b1b,cccr
-	orncr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	orncr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	orncr		cc7,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orncr		cc7,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orncr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	orncr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	orncr		cc6,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orncr		cc6,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orncr		cc5,cc7,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orncr		cc5,cc6,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orncr		cc5,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orncr		cc5,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	orncr		cc4,cc7,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orncr		cc4,cc6,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orncr		cc4,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	orncr		cc4,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/parallel.exp b/sim/testsuite/sim/frv/parallel.exp
deleted file mode 100644
index 8101a67afb5..00000000000
--- a/sim/testsuite/sim/frv/parallel.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# FRV simulator testsuite.
-
-if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
-    # all machines
-    set all_machs "frv fr500 fr550 fr400"
-    set cpu_option -mcpu
-
-    # The .pcgs suffix is for "parallel cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.pcgs]] {
-	# 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/frv/ret.cgs b/sim/testsuite/sim/frv/ret.cgs
deleted file mode 100644
index 14479980a59..00000000000
--- a/sim/testsuite/sim/frv/ret.cgs
+++ /dev/null
@@ -1,91 +0,0 @@
-# frv testcase for ret
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global ret
-ret:
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	ret
-	fail
-ok1:
-	set_spr_addr	ok2,lr
-	set_icc		0x1 1
-	ret
-	fail
-ok2:
-	set_spr_addr	ok3,lr
-	set_icc		0x2 2
-	ret
-	fail
-ok3:
-	set_spr_addr	ok4,lr
-	set_icc		0x3 3
-	ret
-	fail
-ok4:
-	set_spr_addr	ok5,lr
-	set_icc		0x4 0
-	ret
-	fail
-ok5:
-	set_spr_addr	ok6,lr
-	set_icc		0x5 1
-	ret
-	fail
-ok6:
-	set_spr_addr	ok7,lr
-	set_icc		0x6 2
-	ret
-	fail
-ok7:
-	set_spr_addr	ok8,lr
-	set_icc		0x7 3
-	ret
-	fail
-ok8:
-	set_spr_addr	ok9,lr
-	set_icc		0x8 0
-	ret
-	fail
-ok9:
-	set_spr_addr	oka,lr
-	set_icc		0x9 1
-	ret
-	fail
-oka:
-	set_spr_addr	okb,lr
-	set_icc		0xa 2
-	ret
-	fail
-okb:
-	set_spr_addr	okc,lr
-	set_icc		0xb 3
-	ret
-	fail
-okc:
-	set_spr_addr	okd,lr
-	set_icc		0xc 0
-	ret
-	fail
-okd:
-	set_spr_addr	oke,lr
-	set_icc		0xd 1
-	ret
-	fail
-oke:
-	set_spr_addr	okf,lr
-	set_icc		0xe 2
-	ret
-	fail
-okf:
-	set_spr_addr	okg,lr
-	set_icc		0xf 3
-	ret
-	fail
-okg:
-
-	pass
diff --git a/sim/testsuite/sim/frv/rett.cgs b/sim/testsuite/sim/frv/rett.cgs
deleted file mode 100644
index f964baea2aa..00000000000
--- a/sim/testsuite/sim/frv/rett.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# frv testcase for rett $debug
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global rett
-rett:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0  gr7
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x0 0
-	tira 		gr7,4		; should branch to tbr + (128 + 4)*16
-ok0:
-	test_gr_immed  	1,gr7
-	pass
-	fail
-ok1:
-	inc_gr_immed	1,gr7
-	rett 		1		; should be a nop
-	rett 		0
-	fail
diff --git a/sim/testsuite/sim/frv/scan.cgs b/sim/testsuite/sim/frv/scan.cgs
deleted file mode 100644
index d19107df12e..00000000000
--- a/sim/testsuite/sim/frv/scan.cgs
+++ /dev/null
@@ -1,73 +0,0 @@
-# frv testcase for scan $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global scan
-scan:
-	set_gr_limmed	0x2aaa,0xaaaa,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	0,gr9
-	test_gr_limmed	0x2aaa,0xaaaa,gr7
-	test_gr_limmed	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed	0x2aaa,0xaaaa,gr7
-	set_gr_limmed	0xaaaa,0xaaab,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	0,gr9
-	test_gr_limmed	0x2aaa,0xaaaa,gr7
-	test_gr_limmed	0xaaaa,0xaaab,gr8
-
-	set_gr_limmed	0xd555,0x5555,gr7
-	set_gr_limmed	0xaaaa,0xaaaa,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	63,gr9
-	test_gr_limmed	0xd555,0x5555,gr7
-	test_gr_limmed	0xaaaa,0xaaaa,gr8
-
-	set_gr_limmed	0xd555,0x5555,gr7
-	set_gr_limmed	0xaaaa,0xaaab,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	63,gr9
-	test_gr_limmed	0xd555,0x5555,gr7
-	test_gr_limmed	0xaaaa,0xaaab,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0x7fff,0xffff,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	0,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xbfff,0xffff,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	2,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xbfff,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xfffe,0xffff,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	16,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xfffe,0xffff,gr8
-
-	set_gr_limmed	0xffff,0xffff,gr7
-	set_gr_limmed	0xffff,0xfffd,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	31,gr9
-	test_gr_limmed	0xffff,0xffff,gr7
-	test_gr_limmed	0xffff,0xfffd,gr8
-
-	set_gr_limmed	0xdead,0xbeef,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	scan 		gr7,gr8,gr9
-	test_gr_immed	7,gr9
-	test_gr_limmed	0xdead,0xbeef,gr7
-	test_gr_limmed	0xbeef,0xdead,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/scani.cgs b/sim/testsuite/sim/frv/scani.cgs
deleted file mode 100644
index 97175dc1051..00000000000
--- a/sim/testsuite/sim/frv/scani.cgs
+++ /dev/null
@@ -1,55 +0,0 @@
-# frv testcase for scani $GRi,$s12,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global scani
-scani:
-	set_gr_limmed	0xffff,0xfeaa,gr7
-	scani 		gr7,0x2aa,gr9
-	test_gr_immed	0,gr9
-	test_gr_limmed	0xffff,0xfeaa,gr7
-
-	set_gr_limmed	0xffff,0xfeaa,gr7
-	scani 		gr7,0x2ab,gr9
-	test_gr_immed	0,gr9
-	test_gr_limmed	0xffff,0xfeaa,gr7
-
-	set_gr_limmed	0x0000,0x0155,gr7
-	scani 		gr7,0x2aa,gr9
-	test_gr_immed	63,gr9
-	test_gr_limmed	0x0000,0x0155,gr7
-
-	set_gr_limmed	0x0000,0x0155,gr7
-	scani 		gr7,0x2ab,gr9
-	test_gr_immed	63,gr9
-	test_gr_limmed	0x0000,0x0155,gr7
-
-	set_gr_limmed	0x7fff,0xffff,gr7
-	scani 		gr7,-1,gr9
-	test_gr_immed	0,gr9
-	test_gr_limmed	0x7fff,0xffff,gr7
-
-	set_gr_limmed	0xbfff,0xffff,gr7
-	scani 		gr7,-1,gr9
-	test_gr_immed	1,gr9
-	test_gr_limmed	0xbfff,0xffff,gr7
-
-	set_gr_limmed	0xfffe,0xffff,gr7
-	scani 		gr7,-1,gr9
-	test_gr_immed	15,gr9
-	test_gr_limmed	0xfffe,0xffff,gr7
-
-	set_gr_limmed	0xffff,0xfffd,gr7
-	scani 		gr7,-1,gr9
-	test_gr_immed	30,gr9
-	test_gr_limmed	0xffff,0xfffd,gr7
-
-	set_gr_limmed	0xdead,0xbeef,gr7
-	scani 		gr7,-2048,gr9
-	test_gr_immed	2,gr9
-	test_gr_limmed	0xdead,0xbeef,gr7
-
-	pass
diff --git a/sim/testsuite/sim/frv/sdiv.cgs b/sim/testsuite/sim/frv/sdiv.cgs
deleted file mode 100644
index d193b2318c1..00000000000
--- a/sim/testsuite/sim/frv/sdiv.cgs
+++ /dev/null
@@ -1,75 +0,0 @@
-# frv testcase for sdiv $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sdiv
-sdiv:
-	; simple division 12 / 3
-	set_gr_immed   	3,gr3
-	set_gr_immed   	12,gr1
-	sdiv      	gr1,gr3,gr2
-	test_gr_immed  	4,gr2
-
-	; Random example
-	set_gr_limmed  	0x0123,0x4567,gr3
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	sdiv      	gr1,gr3,gr2
-	test_gr_immed  	-1,gr2
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-	sdiv      	gr1,gr3,gr2
-	test_gr_limmed 	0x7fff,0xffff,gr2
-	test_spr_bits	0x4,2,1,isr	; isr.aexc is set
-
-	and_spr_immed	-33,isr		; turn off isr.edem
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide will cause overflow
-	set_spr_addr	ok1,lr
-	set_gr_addr	e1,gr17
-	set_gr_immed  	-1,gr3
-	set_gr_limmed  	0x8000,0x0000,gr1
-e1:	sdiv      	gr1,gr3,gr2	; overflow
-	test_gr_immed	1,gr15
-	test_gr_limmed 	0x8000,0x0000,gr2; gr2 updated
-
-	; divide by zero
-	set_spr_addr	ok2,lr
-	set_gr_addr	e2,gr17
-	set_gr_immed	0xdeadbeef,gr2
-e2:	sdiv      	gr1,gr0,gr2	; divide by zero
-	test_gr_immed	2,gr15		; handler called
-	test_gr_immed	0xdeadbeef,gr2	; gr2 not updated.
-
-	pass
-
-ok1:	; exception handler for overflow
-	test_spr_bits	0x18,3,0x2,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
-
-ok2:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x3,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/sdivi.cgs b/sim/testsuite/sim/frv/sdivi.cgs
deleted file mode 100644
index eb781e720a4..00000000000
--- a/sim/testsuite/sim/frv/sdivi.cgs
+++ /dev/null
@@ -1,74 +0,0 @@
-# frv testcase for sdivi $GRi,$s12,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sdivi
-sdivi:
-	; simple division 12 / 3
-	set_gr_immed   	12,gr1
-	sdivi      	gr1,3,gr2
-	test_gr_immed  	4,gr2
-
-	; Random example
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	sdivi      	gr1,0x7ff,gr2
-	test_gr_limmed 	0xffff,0xdb93,gr2
-
-	; Random negative example
-	set_gr_limmed  	0xfedc,0xba98,gr1
-	sdivi      	gr1,-2048,gr2
-	test_gr_immed 	0x2468,gr2
-
-	; Special case from the Arch Spec Vol 2
-	or_spr_immed	0x20,isr	; turn on isr.edem
-	set_gr_limmed  	0x8000,0x0000,gr1
-	sdivi      	gr1,-1,gr2
-	test_gr_limmed 	0x7fff,0xffff,gr2
-	test_spr_bits	0x4,2,1,isr	; isr.aexc is set
-
-	and_spr_immed	-33,isr		; turn off isr.edem
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide will cause overflow
-	set_spr_addr	ok1,lr
-	set_gr_addr	e1,gr17
-	set_gr_limmed  	0x8000,0x0000,gr1
-e1:	sdivi      	gr1,-1,gr2
-	test_gr_immed	1,gr15
-	test_gr_limmed 	0x8000,0x0000,gr2
-
-	; divide by zero
-	set_spr_addr	ok2,lr
-	set_gr_addr	e2,gr17
-e2:	sdivi      	gr1,0,gr2	; divide by zero
-	test_gr_immed	2,gr15
-
-	pass
-
-ok1:	; exception handler for overflow
-	test_spr_bits	0x18,3,0x2,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
-
-ok2:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x3,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/sethi.cgs b/sim/testsuite/sim/frv/sethi.cgs
deleted file mode 100644
index 00a3bdd6137..00000000000
--- a/sim/testsuite/sim/frv/sethi.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# frv testcase for sethi $s16,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sethi
-sethi:
-	set_gr_immed	0,gr1
-	sethi		0,gr1
-	test_gr_immed	0,gr1
-	sethi		1,gr1
-	test_gr_immed	0x00010000,gr1
-	sethi		0x7fff,gr1
-	test_gr_immed	0x7fff0000,gr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/sethilo.pcgs b/sim/testsuite/sim/frv/sethilo.pcgs
deleted file mode 100644
index c8e7b602ce5..00000000000
--- a/sim/testsuite/sim/frv/sethilo.pcgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# frv parallel testcase for sethi $s16,$GRk and setlo $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sethilo
-sethilo:
-	sethi.p		0xdead,gr7
-	setlo		0xbeef,gr7
-	test_gr_immed  	0xdeadbeef,gr7
-
-	setlo.p		0xdead,gr7
-	sethi		0xbeef,gr7
-	test_gr_immed  	0xbeefdead,gr7
-
-	pass
diff --git a/sim/testsuite/sim/frv/setlo.cgs b/sim/testsuite/sim/frv/setlo.cgs
deleted file mode 100644
index 6bdac2eba2e..00000000000
--- a/sim/testsuite/sim/frv/setlo.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# frv testcase for setlo $s16,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global setlo
-setlo:
-	set_gr_immed	0,gr1
-	setlo		0,gr1
-	test_gr_immed	0,gr1
-	setlo		1,gr1
-	test_gr_immed	1,gr1
-	setlo		0x7fff,gr1
-	test_gr_immed	0x7fff,gr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/setlos.cgs b/sim/testsuite/sim/frv/setlos.cgs
deleted file mode 100644
index 8979d13a7e1..00000000000
--- a/sim/testsuite/sim/frv/setlos.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# frv testcase for setlos $s16,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global setlos
-setlos:
-	setlos		0,gr1
-	test_gr_immed	0,gr1
-	setlos		1,gr1
-	test_gr_immed	1,gr1
-	setlos		0x7fff,gr1
-	test_gr_immed	0x7fff,gr1
-	setlos		-1,gr1
-	test_gr_immed	-1,gr1
-	setlos		-32768,gr1
-	test_gr_immed	-32768,gr1
-
-	pass
diff --git a/sim/testsuite/sim/frv/sll.cgs b/sim/testsuite/sim/frv/sll.cgs
deleted file mode 100644
index 9103cf6874a..00000000000
--- a/sim/testsuite/sim/frv/sll.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for sll $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sll
-sll:
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	sll      	gr8,gr7,gr8
-	test_icc	1 1 0 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	sll      	gr8,gr7,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	sll      	gr8,gr7,gr8
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	sll      	gr8,gr7,gr8
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/sllcc.cgs b/sim/testsuite/sim/frv/sllcc.cgs
deleted file mode 100644
index 533b5045399..00000000000
--- a/sim/testsuite/sim/frv/sllcc.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for sllcc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sllcc
-sllcc:
-	set_gr_limmed  	0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	sllcc      	gr8,gr7,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_limmed  	0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	sllcc      	gr8,gr7,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_immed   	1,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	sllcc      	gr8,gr7,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed  	0xdead,0xbeff,gr7	; clear register
-	set_gr_immed   	2,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	sllcc      	gr8,gr7,gr8,icc0
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/slli.cgs b/sim/testsuite/sim/frv/slli.cgs
deleted file mode 100644
index 80c25c0043a..00000000000
--- a/sim/testsuite/sim/frv/slli.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for slli $GRi,$s12,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global slli
-slli:
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	slli      	gr8,0x7e0,gr8	; Shift by 0
-	test_icc	1 1 0 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	slli      	gr8,-31,gr8	; Shift by 1
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_immed   	1,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	slli      	gr8,31,gr8	; Shift by 31
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_immed   	2,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	slli      	gr8,31,gr8	; clear register
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/sllicc.cgs b/sim/testsuite/sim/frv/sllicc.cgs
deleted file mode 100644
index b8e4c7da788..00000000000
--- a/sim/testsuite/sim/frv/sllicc.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for sllicc $GRi,$s10,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sllicc
-sllicc:
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	sllicc      	gr8,0x1e0,gr8,icc0	; Shift by 0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	2,gr8
-
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	sllicc      	gr8,-31,gr8,icc0	; Shift by 1
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	4,gr8
-
-	set_gr_immed   	1,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	sllicc      	gr8,31,gr8,icc0	; Shift by 31
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_immed   	2,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	sllicc      	gr8,31,gr8,icc0	; clear register
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/smul.cgs b/sim/testsuite/sim/frv/smul.cgs
deleted file mode 100644
index ed065a93d14..00000000000
--- a/sim/testsuite/sim/frv/smul.cgs
+++ /dev/null
@@ -1,182 +0,0 @@
-# frv testcase for smul $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global smul
-smul:
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	1,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_limmed 	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0xbfff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_limmed	0xc000,0x0000,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_limmed	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	smul      	gr7,gr8,gr8
-	test_gr_limmed	0x4000,0x0000,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/smulcc.cgs b/sim/testsuite/sim/frv/smulcc.cgs
deleted file mode 100644
index 76a009ec22f..00000000000
--- a/sim/testsuite/sim/frv/smulcc.cgs
+++ /dev/null
@@ -1,238 +0,0 @@
-# frv testcase for smulcc $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global smulcc
-smulcc:
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x0,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	set_icc		0x1,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0x2,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	set_icc		0xb,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0x8,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0xd,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	set_icc		0xe,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	4,gr8
-	set_icc		0xf,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed	0x7fff,0xffff,gr8
-	set_icc		0xc,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_limmed 	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc		0x5,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0x6,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc		0x4,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	-2,gr8
-	set_icc		0x9,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc		0xa,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x7,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0xbfff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x4,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0x5,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0x6,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0x7,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed	0xc000,0x0000,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_gr_immed   	-2,gr8
-	set_icc		0xc,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_gr_immed   	-2,gr8
-	set_icc		0xd,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_gr_immed   	-1,gr8
-	set_icc		0xe,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xf,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	-2,gr8
-	set_icc		0xc,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	-4,gr8
-	set_icc		0xd,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_gr_limmed	0x8000,0x0001,gr8
-	set_icc		0xe,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed	0x8000,0x0000,gr8
-	set_icc		0xf,0
-	smulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_limmed	0x4000,0x0000,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/smuli.cgs b/sim/testsuite/sim/frv/smuli.cgs
deleted file mode 100644
index 19a695cf56b..00000000000
--- a/sim/testsuite/sim/frv/smuli.cgs
+++ /dev/null
@@ -1,210 +0,0 @@
-# frv testcase for smuli $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global smuli
-smuli:
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_icc		0x0,0
-	smuli      	gr7,2,gr8
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_icc		0x1,0
-	smuli      	gr7,2,gr8
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_icc		0x2,0
-	smuli      	gr7,1,gr8
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_icc		0x3,0
-	smuli      	gr7,2,gr8
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_icc		0x4,0
-	smuli      	gr7,0,gr8
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_icc		0x5,0
-	smuli      	gr7,2,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_icc		0x6,0
-	smuli      	gr7,2,gr8
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_icc		0x7,0
-	smuli      	gr7,4,gr8
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_icc		0x8,0
-	smuli      	gr7,0x7ff,gr8
-	test_icc	1 0 0 0 icc0
-	test_gr_immed 	0x3ff,gr8
-	test_gr_limmed 	0x7fff,0xf801,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_icc		0x9,0
-	smuli      	gr7,2,gr8
-	test_icc	1 0 0 1 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_icc		0xa,0
-	smuli      	gr7,-2,gr8
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_icc		0xb,0
-	smuli      	gr7,-2,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_icc		0xc,0
-	smuli      	gr7,1,gr8
-	test_icc	1 1 0 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_icc		0xd,0
-	smuli      	gr7,-2,gr8
-	test_icc	1 1 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_icc		0xe,0
-	smuli      	gr7,0,gr8
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_icc		0xf,0
-	smuli      	gr7,-2,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0xbfff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_icc		0x0,0
-	smuli      	gr7,-2,gr8
-	test_icc	0 0 0 0 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_icc		0x1,0
-	smuli      	gr7,-2,gr8
-	test_icc	0 0 0 1 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_icc		0x2,0
-	smuli      	gr7,-4,gr8
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_icc		0x3,0
-	smuli      	gr7,-2048,gr8
-	test_icc	0 0 1 1 icc0
-	test_gr_limmed	0xffff,0xfc00,gr8
-	test_gr_limmed	0x0000,0x0800,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_icc		0x4,0
-	smuli      	gr7,-2,gr8
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_icc		0x5,0
-	smuli      	gr7,-2,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_icc		0x6,0
-	smuli      	gr7,-1,gr8
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_icc		0x7,0
-	smuli      	gr7,-2,gr8
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_icc		0x8,0
-	smuli      	gr7,-2,gr8
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_icc		0x9,0
-	smuli      	gr7,-4,gr8
-	test_icc	1 0 0 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_icc		0xa,0
-	smuli      	gr7,-2048,gr8
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed	0x0000,0x03ff,gr8
-	test_gr_limmed 	0xffff,0xf800,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_icc		0xb,0
-	smuli      	gr7,-2048,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed	0x0000,0x0400,gr8
-	test_gr_limmed 	0x0000,0x0000,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/smulicc.cgs b/sim/testsuite/sim/frv/smulicc.cgs
deleted file mode 100644
index e9aa889c249..00000000000
--- a/sim/testsuite/sim/frv/smulicc.cgs
+++ /dev/null
@@ -1,210 +0,0 @@
-# frv testcase for smulicc $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global smulicc
-smulicc:
-	; Positive operands
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_icc		0x0,0
-	smulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_icc		0x1,0
-	smulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_icc		0x2,0
-	smulicc      	gr7,1,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_icc		0x3,0
-	smulicc      	gr7,2,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_icc		0x4,0
-	smulicc      	gr7,0,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed	0x3fff,0xffff,gr7	; 31 bit result
-	set_icc		0x5,0
-	smulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_icc		0x6,0
-	smulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_icc		0x7,0
-	smulicc      	gr7,4,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max positive result
-	set_icc		0x8,0
-	smulicc      	gr7,0x1ff,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed 	0xff,gr8
-	test_gr_limmed 	0x7fff,0xfe01,gr9
-
-	; Mixed operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_icc		0x9,0
-	smulicc      	gr7,2,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_icc		0xa,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_icc		0xb,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_icc		0xc,0
-	smulicc      	gr7,1,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	-1,gr8
-	test_gr_immed  	-2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_icc		0xd,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	0 1 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 0
-	set_icc		0xe,0
-	smulicc      	gr7,0,gr8,icc0
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0x2000,0x0001,gr7	; 31 bit result
-	set_icc		0xf,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0xbfff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 32 bit result
-	set_icc		0x0,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0x4000,0x0001,gr7	; 32 bit result
-	set_icc		0x1,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0x4000,0x0000,gr7	; 33 bit result
-	set_icc		0x2,0
-	smulicc      	gr7,-4,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed	0xffff,0xffff,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed	0x7fff,0xffff,gr7	; max negative result
-	set_icc		0x3,0
-	smulicc      	gr7,-512,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed	0xffff,0xff00,gr8
-	test_gr_limmed	0x0000,0x0200,gr9
-
-	; Negative operands
-	set_gr_immed   	-3,gr7		; multiply small numbers
-	set_icc		0x4,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	-1,gr7		; multiply by 1
-	set_icc		0x5,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	-2,gr7		; multiply by 1
-	set_icc		0x6,0
-	smulicc      	gr7,-1,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_limmed	0xc000,0x0001,gr7	; 31 bit result
-	set_icc		0x7,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x7fff,0xfffe,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 32 bit result
-	set_icc		0x8,0
-	smulicc      	gr7,-2,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed	0x8000,0x0000,gr9
-
-	set_gr_limmed	0xc000,0x0000,gr7	; 33 bit result
-	set_icc		0x9,0
-	smulicc      	gr7,-4,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed	0x8000,0x0001,gr7	; almost max positive result
-	set_icc		0xa,0
-	smulicc      	gr7,-512,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed	0x0000,0x00ff,gr8
-	test_gr_limmed 	0xffff,0xfe00,gr9
-
-
-	set_gr_limmed	0x8000,0x0000,gr7	; max positive result
-	set_icc		0xb,0
-	smulicc      	gr7,-512,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_limmed	0x0000,0x0100,gr8
-	test_gr_limmed 	0x0000,0x0000,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/sra.cgs b/sim/testsuite/sim/frv/sra.cgs
deleted file mode 100644
index 0f0c8644d03..00000000000
--- a/sim/testsuite/sim/frv/sra.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for sra $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sra
-sra:
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	sra      	gr8,gr7,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	sra      	gr8,gr7,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0xc000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	sra      	gr8,gr7,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	-1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	sra      	gr8,gr7,gr8
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/sracc.cgs b/sim/testsuite/sim/frv/sracc.cgs
deleted file mode 100644
index 14f4a8bf49c..00000000000
--- a/sim/testsuite/sim/frv/sracc.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for sracc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sracc
-sracc:
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	sracc      	gr8,gr7,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	sracc      	gr8,gr7,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0xc000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	sracc      	gr8,gr7,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	-1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	sracc      	gr8,gr7,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/srai.cgs b/sim/testsuite/sim/frv/srai.cgs
deleted file mode 100644
index 02b9654f587..00000000000
--- a/sim/testsuite/sim/frv/srai.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for srai $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global srai
-srai:
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	srai      	gr8,0x7e0,gr8	; Shift by 0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srai      	gr8,-31,gr8	; Shift by 1
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0xc000,0x0000,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srai      	gr8,31,gr8	; Shift by 31
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	-1,gr8
-
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	srai      	gr8,31,gr8	; clear register
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/sraicc.cgs b/sim/testsuite/sim/frv/sraicc.cgs
deleted file mode 100644
index 5dbd1e600c6..00000000000
--- a/sim/testsuite/sim/frv/sraicc.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for sraicc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sraicc
-sraicc:
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	sraicc      	gr8,0x1e0,gr8,icc0	; Shift by 0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	sraicc      	gr8,-31,gr8,icc0	; Shift by 1
-	test_icc	1 0 1 0 icc0
-	test_gr_limmed 	0xc000,0x0000,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	sraicc      	gr8,31,gr8,icc0	; Shift by 31
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	-1,gr8
-
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	sraicc      	gr8,31,gr8,icc0	; clear register
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/srl.cgs b/sim/testsuite/sim/frv/srl.cgs
deleted file mode 100644
index 045e75edba6..00000000000
--- a/sim/testsuite/sim/frv/srl.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for srl $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global srl
-srl:
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	srl      	gr8,gr7,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srl      	gr8,gr7,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srl      	gr8,gr7,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	srl      	gr8,gr7,gr8
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/srlcc.cgs b/sim/testsuite/sim/frv/srlcc.cgs
deleted file mode 100644
index 1450a4b9ed9..00000000000
--- a/sim/testsuite/sim/frv/srlcc.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for srlcc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global srlcc
-srlcc:
-	set_gr_limmed   0xdead,0xbee0,gr7	; Shift by 0
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	srlcc      	gr8,gr7,gr8,icc0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbee1,gr7	; Shift by 1
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srlcc      	gr8,gr7,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; Shift by 31
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srlcc      	gr8,gr7,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0xdead,0xbeff,gr7	; clear register
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	srlcc      	gr8,gr7,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/srli.cgs b/sim/testsuite/sim/frv/srli.cgs
deleted file mode 100644
index 72207d3a3e3..00000000000
--- a/sim/testsuite/sim/frv/srli.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for srli $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global srli
-srli:
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	srli      	gr8,0x7e0,gr8	; Shift by 0
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srli      	gr8,-31,gr8	; Shift by 1
-	test_icc	1 1 1 1 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srli      	gr8,31,gr8	; Shift by 31
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	srli      	gr8,31,gr8	; clear register
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/srlicc.cgs b/sim/testsuite/sim/frv/srlicc.cgs
deleted file mode 100644
index d232802eb57..00000000000
--- a/sim/testsuite/sim/frv/srlicc.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for srlicc $GRi,$s10,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global srlicc
-srlicc:
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	srlicc      	gr8,0x1e0,gr8,icc0	; Shift by 0
-	test_icc	1 0 0 0 icc0
-	test_gr_limmed 	0x8000,0x0000,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srlicc      	gr8,-31,gr8,icc0	; Shift by 1
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	srlicc      	gr8,31,gr8,icc0	; Shift by 31
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0x4000,0x0000,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	srlicc      	gr8,31,gr8,icc0	; clear register
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/st.cgs b/sim/testsuite/sim/frv/st.cgs
deleted file mode 100644
index 557713c0594..00000000000
--- a/sim/testsuite/sim/frv/st.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for st $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	st		gr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stb.cgs b/sim/testsuite/sim/frv/stb.cgs
deleted file mode 100644
index 15fa1e65398..00000000000
--- a/sim/testsuite/sim/frv/stb.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for stb $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	stb		gr8,@(sp,gr7)
-	test_mem_limmed	0xffad,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stbf.cgs b/sim/testsuite/sim/frv/stbf.cgs
deleted file mode 100644
index 741327d8a11..00000000000
--- a/sim/testsuite/sim/frv/stbf.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for stbf $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stbf
-stbf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	stbf		fr8,@(sp,gr7)
-	test_mem_limmed	0xffad,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stbfi.cgs b/sim/testsuite/sim/frv/stbfi.cgs
deleted file mode 100644
index cfea70867f3..00000000000
--- a/sim/testsuite/sim/frv/stbfi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for stbfi $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stbfi
-stbfi:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_fr_iimmed	0xffff,0xffff,fr8
-	stbfi		fr8,@(sp,0)
-	test_mem_limmed	0xffad,0xbeef,sp
-
-	inc_gr_immed	0x801,sp	; 2049
-	stbfi		fr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xbeef,gr20
-
-	inc_gr_immed	-4094,sp
-	stbfi		fr8,@(sp,0x7ff)
-	test_mem_limmed	0xffff,0xffef,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/stbfu.cgs b/sim/testsuite/sim/frv/stbfu.cgs
deleted file mode 100644
index 01bbb99ca9e..00000000000
--- a/sim/testsuite/sim/frv/stbfu.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# frv testcase for stbfu $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stbfu
-stbfu:
-	set_gr_gr	sp,gr9
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	stbfu		fr8,@(sp,gr7)
-	test_mem_limmed	0xffad,0xbeef,sp
-	test_gr_gr	sp,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/stbi.cgs b/sim/testsuite/sim/frv/stbi.cgs
deleted file mode 100644
index f23efc9155a..00000000000
--- a/sim/testsuite/sim/frv/stbi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for stbi $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stbi
-stbi:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_limmed	0xffff,0xffff,gr8
-	stbi		gr8,@(sp,0)
-	test_mem_limmed	0xffad,0xbeef,sp
-
-	inc_gr_immed	0x801,sp	; 2049
-	stbi		gr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xbeef,gr20
-
-	inc_gr_immed	-4094,sp
-	stbi		gr8,@(sp,0x7ff)
-	test_mem_limmed	0xffff,0xffef,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/stbu.cgs b/sim/testsuite/sim/frv/stbu.cgs
deleted file mode 100644
index e56ad1137d1..00000000000
--- a/sim/testsuite/sim/frv/stbu.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# frv testcase for stbu $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stbu
-stbu:
-	set_gr_gr	sp,gr9
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	stbu		gr8,@(sp,gr7)
-	test_mem_limmed	0xffad,0xbeef,sp
-	test_gr_gr	sp,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/stc.cgs b/sim/testsuite/sim/frv/stc.cgs
deleted file mode 100644
index 581297cef9d..00000000000
--- a/sim/testsuite/sim/frv/stc.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# frv testcase for stc $CPRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stc
-stc:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xffff,0xffff,cpr8
-	stc		cpr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stcu.cgs b/sim/testsuite/sim/frv/stcu.cgs
deleted file mode 100644
index eb9e6c5efa1..00000000000
--- a/sim/testsuite/sim/frv/stcu.cgs
+++ /dev/null
@@ -1,33 +0,0 @@
-# frv testcase for stcu $CPRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stcu
-stcu:
-	set_gr_gr	sp,gr20
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xffff,0xffff,cpr8
-	stcu		cpr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xffff,sp
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_cpr_limmed	0x1234,0x5678,cpr8
-	stcu		cpr8,@(sp,gr7)
-	test_mem_limmed	0x1234,0x5678,sp
-	test_gr_gr	sp,gr20
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-4,gr7
-	set_cpr_limmed	0x9abc,0xdef0,cpr8
-	stcu		cpr8,@(sp,gr7)
-	test_mem_limmed	0x9abc,0xdef0,sp
-	test_gr_gr	sp,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/std.cgs b/sim/testsuite/sim/frv/std.cgs
deleted file mode 100644
index 8a2ed12e99f..00000000000
--- a/sim/testsuite/sim/frv/std.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# frv testcase for std $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	std		gr8,@(sp,gr7)
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr3			; sp is gr1
-	set_gr_limmed	0xbeef,0xdead,gr0
-	set_gr_limmed	0xdead,0xbeef,gr1
-	std		gr0,@(gr3,gr7)
-	test_mem_immed	0,gr3
-	inc_gr_immed	4,gr3
-	test_mem_immed	0,gr3
-
-	pass
diff --git a/sim/testsuite/sim/frv/std.pcgs b/sim/testsuite/sim/frv/std.pcgs
deleted file mode 100644
index d518b8b9746..00000000000
--- a/sim/testsuite/sim/frv/std.pcgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# frv parallel testcase for std $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	std		gr8,@(sp,gr7)		; non parallel
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	std.p		gr8,@(sp,gr0)		; parallel
-	setlos		0,gr8
-	ld		@(sp,gr0),gr10
-	ld		@(sp,gr7),gr11
-	test_mem_limmed	0xbeef,0xdead,sp	; memory is set
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	test_gr_immed	0xbeefdead,gr10		; regs were pre-loaded
-	test_gr_immed	0xdeadbeef,gr11		; not this one
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdc.cgs b/sim/testsuite/sim/frv/stdc.cgs
deleted file mode 100644
index bdff0ac81c9..00000000000
--- a/sim/testsuite/sim/frv/stdc.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# frv testcase for stdc $CPk,@($GRi,$GRj)
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdc
-stdc:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	set_cpr_limmed	0xdead,0xbeef,cpr9
-	stdc		cpr8,@(sp,gr7)
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdc.pcgs b/sim/testsuite/sim/frv/stdc.pcgs
deleted file mode 100644
index 46c49250566..00000000000
--- a/sim/testsuite/sim/frv/stdc.pcgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv parallel testcase for stdc $CPk,@($GRi,$GRj)
-# mach: frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdc
-stdc:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	set_cpr_limmed	0xdead,0xbeef,cpr9
-	stdc		cpr8,@(sp,gr7)		; non parallel
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	4,gr7
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	set_cpr_limmed	0xdead,0xbeef,cpr9
-	stdc.p		cpr8,@(sp,gr0)		; parallel
-	addi		sp,4,sp
-	subi		sp,4,sp
-	ldc		@(sp,gr0),cpr10
-	ldc		@(sp,gr7),cpr11
-	test_mem_limmed	0xbeef,0xdead,sp	; memory is set
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	test_cpr_limmed	0xbeef,0xdead,cpr10
-	test_cpr_limmed	0xdead,0xbeef,cpr11
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdcu.cgs b/sim/testsuite/sim/frv/stdcu.cgs
deleted file mode 100644
index bbae5fff096..00000000000
--- a/sim/testsuite/sim/frv/stdcu.cgs
+++ /dev/null
@@ -1,44 +0,0 @@
-# frv testcase for stdcu $CPk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdcu
-stdcu:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	set_cpr_limmed	0xdead,0xbeef,cpr9
-	stdcu		cpr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	inc_gr_immed	-12,sp
-	set_gr_immed	8,gr7
-	set_cpr_limmed	0x1234,0x5678,cpr8
-	set_cpr_limmed	0x9abc,0xdef0,cpr9
-	stdcu		cpr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0x1234,0x5678,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0x9abc,0xdef0,sp
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-8,gr7
-	set_cpr_limmed	0xfedc,0xba98,cpr8
-	set_cpr_limmed	0x7654,0x3210,cpr9
-	stdcu		cpr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0xfedc,0xba98,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0x7654,0x3210,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdf.cgs b/sim/testsuite/sim/frv/stdf.cgs
deleted file mode 100644
index 82c1461d97a..00000000000
--- a/sim/testsuite/sim/frv/stdf.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# frv testcase for stdf $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdf
-stdf:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	stdf		fr8,@(sp,gr7)
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdf.pcgs b/sim/testsuite/sim/frv/stdf.pcgs
deleted file mode 100644
index 7ef991c45f2..00000000000
--- a/sim/testsuite/sim/frv/stdf.pcgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# frv parallel testcase for stdf $GRk,@($GRi,$GRj)
-# mach: fr500 fr550 frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdf
-stdf:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	stdf		fr8,@(sp,gr7)		; non parallel
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	4,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	stdf.p		fr8,@(sp,gr0)		; parallel
-	fnegs		fr8,fr8
-	ldf		@(sp,gr0),fr10
-	ldf		@(sp,gr7),fr11		; memory is set
-	test_mem_limmed	0xbeef,0xdead,sp	
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	test_fr_iimmed	0xbeefdead,fr10		; regs were pre-loaded
-	test_fr_iimmed	0xdeadbeef,fr11		; not this one
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdfi.cgs b/sim/testsuite/sim/frv/stdfi.cgs
deleted file mode 100644
index fea9b5171dd..00000000000
--- a/sim/testsuite/sim/frv/stdfi.cgs
+++ /dev/null
@@ -1,56 +0,0 @@
-# frv testcase for stdfi $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdfi
-stdfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr21
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	set_gr_gr	sp,gr22
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x8765,0x4321,sp
-	set_gr_gr	sp,gr23
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xfedc,0xba98,sp
-	set_gr_gr	sp,gr24
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x89ab,0xcdef,sp
-	set_gr_gr	sp,gr25
-	set_fr_iimmed	0xffff,0xffff,fr8
-	set_fr_iimmed	0xffff,0xffff,fr9
-
-	stdfi		fr8,@(sp,0)
-	test_mem_limmed	0xffff,0xffff,gr25
-	test_mem_limmed	0xffff,0xffff,gr24
-	test_mem_limmed	0x8765,0x4321,gr23
-	test_mem_limmed	0x1234,0x5678,gr22
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	0x808,sp	; 2056
-	stdfi		fr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xffff,gr25
-	test_mem_limmed	0xffff,0xffff,gr24
-	test_mem_limmed	0xffff,0xffff,gr23
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	-4080,sp
-	stdfi		fr8,@(sp,0x7f8)
-	test_mem_limmed	0xffff,0xffff,gr25
-	test_mem_limmed	0xffff,0xffff,gr24
-	test_mem_limmed	0xffff,0xffff,gr23
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xffff,0xffff,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdfu.cgs b/sim/testsuite/sim/frv/stdfu.cgs
deleted file mode 100644
index 439cfa0a9b4..00000000000
--- a/sim/testsuite/sim/frv/stdfu.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for stdfu $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdfu
-stdfu:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	stdfu		fr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdi.cgs b/sim/testsuite/sim/frv/stdi.cgs
deleted file mode 100644
index e1a783d71aa..00000000000
--- a/sim/testsuite/sim/frv/stdi.cgs
+++ /dev/null
@@ -1,56 +0,0 @@
-# frv testcase for stdi $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdi
-stdi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr21
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	set_gr_gr	sp,gr22
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x8765,0x4321,sp
-	set_gr_gr	sp,gr23
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xfedc,0xba98,sp
-	set_gr_gr	sp,gr24
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x89ab,0xcdef,sp
-	set_gr_gr	sp,gr25
-	set_gr_limmed	0xffff,0xffff,gr8
-	set_gr_limmed	0xffff,0xffff,gr9
-
-	stdi		gr8,@(sp,0)
-	test_mem_limmed	0xffff,0xffff,gr25
-	test_mem_limmed	0xffff,0xffff,gr24
-	test_mem_limmed	0x8765,0x4321,gr23
-	test_mem_limmed	0x1234,0x5678,gr22
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	0x808,sp	; 2056
-	stdi		gr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xffff,gr25
-	test_mem_limmed	0xffff,0xffff,gr24
-	test_mem_limmed	0xffff,0xffff,gr23
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	-4080,sp
-	stdi		gr8,@(sp,0x7f8)
-	test_mem_limmed	0xffff,0xffff,gr25
-	test_mem_limmed	0xffff,0xffff,gr24
-	test_mem_limmed	0xffff,0xffff,gr23
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xffff,0xffff,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/stdu.cgs b/sim/testsuite/sim/frv/stdu.cgs
deleted file mode 100644
index b5f122f5ef7..00000000000
--- a/sim/testsuite/sim/frv/stdu.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# frv testcase for stdu $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stdu
-stdu:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	stdu		gr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stf.cgs b/sim/testsuite/sim/frv/stf.cgs
deleted file mode 100644
index 5ebc060bef2..00000000000
--- a/sim/testsuite/sim/frv/stf.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for stf $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stf
-stf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	stf		fr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xffff,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stfi.cgs b/sim/testsuite/sim/frv/stfi.cgs
deleted file mode 100644
index cfce1fdfe57..00000000000
--- a/sim/testsuite/sim/frv/stfi.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# frv testcase for stfi $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stfi
-stfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr21
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	set_gr_gr	sp,gr22
-	set_fr_iimmed	0xffff,0xffff,fr8
-
-	stfi		fr8,@(sp,0)
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	0x804,sp	; 2052
-	stfi		fr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	-4088,sp
-	stfi		fr8,@(sp,0x7fc)
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xffff,0xffff,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/stfu.cgs b/sim/testsuite/sim/frv/stfu.cgs
deleted file mode 100644
index e47e61dc56c..00000000000
--- a/sim/testsuite/sim/frv/stfu.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# frv testcase for stfu $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stfu
-stfu:
-	set_gr_gr	sp,gr9
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	stfu		fr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xffff,sp
-	test_gr_gr	sp,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/sth.cgs b/sim/testsuite/sim/frv/sth.cgs
deleted file mode 100644
index c11ae407cd0..00000000000
--- a/sim/testsuite/sim/frv/sth.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for sth $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	sth		gr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/sthf.cgs b/sim/testsuite/sim/frv/sthf.cgs
deleted file mode 100644
index 7310e4ee8c1..00000000000
--- a/sim/testsuite/sim/frv/sthf.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# frv testcase for sthf $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sthf
-sthf:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	sthf		fr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/sthfi.cgs b/sim/testsuite/sim/frv/sthfi.cgs
deleted file mode 100644
index ae9da976fd2..00000000000
--- a/sim/testsuite/sim/frv/sthfi.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# frv testcase for sthfi $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sthfi
-sthfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr21
-	set_fr_iimmed	0xffff,0xffff,fr8
-
-	sthfi		fr8,@(sp,0)
-	test_mem_limmed	0xffff,0xdead,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	0x802,sp	; 2050
-	sthfi		fr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	-4092,sp
-	sthfi		fr8,@(sp,0x7fe)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xffff,0xbeef,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/sthfu.cgs b/sim/testsuite/sim/frv/sthfu.cgs
deleted file mode 100644
index df472e73525..00000000000
--- a/sim/testsuite/sim/frv/sthfu.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# frv testcase for sthfu $FRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sthfu
-sthfu:
-	set_gr_gr	sp,gr9
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_fr_iimmed	0xffff,0xffff,fr8
-	sthfu		fr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xbeef,sp
-	test_gr_gr	sp,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/sthi.cgs b/sim/testsuite/sim/frv/sthi.cgs
deleted file mode 100644
index 93636e90956..00000000000
--- a/sim/testsuite/sim/frv/sthi.cgs
+++ /dev/null
@@ -1,31 +0,0 @@
-# frv testcase for sthi $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sthi
-sthi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr21
-	set_gr_limmed	0xffff,0xffff,gr8
-
-	sthi		gr8,@(sp,0)
-	test_mem_limmed	0xffff,0xdead,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	0x802,sp	; 2050
-	sthi		gr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	-4092,sp
-	sthi		gr8,@(sp,0x7fe)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xffff,0xbeef,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/sthu.cgs b/sim/testsuite/sim/frv/sthu.cgs
deleted file mode 100644
index ab35b30d396..00000000000
--- a/sim/testsuite/sim/frv/sthu.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# frv testcase for sthu $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sthu
-sthu:
-	set_gr_gr	sp,gr9
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	sthu		gr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xbeef,sp
-	test_gr_gr	sp,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/sti.cgs b/sim/testsuite/sim/frv/sti.cgs
deleted file mode 100644
index ce05003d227..00000000000
--- a/sim/testsuite/sim/frv/sti.cgs
+++ /dev/null
@@ -1,37 +0,0 @@
-# frv testcase for sti $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sti
-sti:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr21
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	set_gr_gr	sp,gr22
-	set_gr_limmed	0xffff,0xffff,gr8
-
-	sti		gr8,@(sp,0)
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xbeef,0xdead,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	0x804,sp	; 2052
-	sti		gr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xdead,0xbeef,gr20
-
-	inc_gr_immed	-4088,sp
-	sti		gr8,@(sp,0x7fc)
-	test_mem_limmed	0xffff,0xffff,gr22
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xffff,0xffff,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/stq.cgs b/sim/testsuite/sim/frv/stq.cgs
deleted file mode 100644
index 5ec836952f0..00000000000
--- a/sim/testsuite/sim/frv/stq.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase for stq $GRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stq
-stq:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	stq		gr8,@(sp,gr7)
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr4		; sp is gr1
-	set_gr_limmed	0xbeef,0xdead,gr0
-	set_gr_limmed	0xdead,0xbeef,gr1
-	set_gr_limmed	0xdead,0xdead,gr2
-	set_gr_limmed	0xbeef,0xbeef,gr3
-	stq		gr0,@(gr4,gr7)
-	test_mem_immed	0,gr4
-	inc_gr_immed	4,gr4
-	test_mem_immed	0,gr4
-	inc_gr_immed	4,gr4
-	test_mem_immed	0,gr4
-	inc_gr_immed	4,gr4
-	test_mem_immed	0,gr4
-
-	pass
diff --git a/sim/testsuite/sim/frv/stq.pcgs b/sim/testsuite/sim/frv/stq.pcgs
deleted file mode 100644
index 268dd9eafbf..00000000000
--- a/sim/testsuite/sim/frv/stq.pcgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv parallel testcase for stq $GRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stq
-stq:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	stq		gr8,@(sp,gr7)		; non parallel
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	stq.p		gr8,@(sp,gr7)		; parallel
-	setlos		0,gr8
-	ldq		@(sp,gr7),gr12
-	test_mem_limmed	0xbeef,0xdead,sp	; memory is set
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-	test_gr_immed	0xbeefdead,gr12
-	test_gr_immed	0xdeadbeef,gr13
-	test_gr_immed	0xdeaddead,gr14
-	test_gr_immed	0xbeefbeef,gr15
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqc.cgs b/sim/testsuite/sim/frv/stqc.cgs
deleted file mode 100644
index 19fc79d6e09..00000000000
--- a/sim/testsuite/sim/frv/stqc.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# frv testcase for stqc $CPRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqc
-stqc:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	set_cpr_limmed	0xdead,0xbeef,cpr9
-	set_cpr_limmed	0xdead,0xdead,cpr10
-	set_cpr_limmed	0xbeef,0xbeef,cpr11
-	stqc		cpr8,@(sp,gr7)
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqc.pcgs b/sim/testsuite/sim/frv/stqc.pcgs
deleted file mode 100644
index bda68bac785..00000000000
--- a/sim/testsuite/sim/frv/stqc.pcgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# frv parallel testcase for stqc $CPRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqc
-stqc:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	set_cpr_limmed	0xdead,0xbeef,cpr9
-	set_cpr_limmed	0xdead,0xdead,cpr10
-	set_cpr_limmed	0xbeef,0xbeef,cpr11
-	stqc		cpr8,@(sp,gr7)		; non parallel
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	set_cpr_limmed	0xdead,0xbeef,cpr9
-	set_cpr_limmed	0xdead,0xdead,cpr10
-	set_cpr_limmed	0xbeef,0xbeef,cpr11
-	stqc.p		cpr8,@(sp,gr7)		; parallel
-	addi		sp,4,sp
-	subi		sp,4,sp
-	ldqc		@(sp,gr7),cpr12
-	test_mem_limmed	0xbeef,0xdead,sp	; memory is set
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-	test_cpr_limmed	0xbeef,0xdead,cpr12
-	test_cpr_limmed	0xdead,0xbeef,cpr13
-	test_cpr_limmed	0xdead,0xdead,cpr14
-	test_cpr_limmed	0xbeef,0xbeef,cpr15
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqcu.cgs b/sim/testsuite/sim/frv/stqcu.cgs
deleted file mode 100644
index a7746caa538..00000000000
--- a/sim/testsuite/sim/frv/stqcu.cgs
+++ /dev/null
@@ -1,66 +0,0 @@
-# frv testcase for stqcu $CPRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqcu
-stqcu:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	set_gr_immed	0,gr7
-	set_cpr_limmed	0xbeef,0xdead,cpr8
-	set_cpr_limmed	0xdead,0xbeef,cpr9
-	set_cpr_limmed	0xdead,0xdead,cpr10
-	set_cpr_limmed	0xbeef,0xbeef,cpr11
-	stqcu		cpr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	inc_gr_immed	-28,sp
-	set_gr_immed	16,gr7
-	set_cpr_limmed	0x1111,0x1111,cpr8
-	set_cpr_limmed	0x2222,0x2222,cpr9
-	set_cpr_limmed	0x3333,0x3333,cpr10
-	set_cpr_limmed	0x4444,0x4444,cpr11
-	stqcu		cpr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0x1111,0x1111,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0x2222,0x2222,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0x3333,0x3333,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0x4444,0x4444,sp
-
-	inc_gr_immed	4,sp
-	set_gr_immed	-16,gr7
-	set_cpr_limmed	0x5555,0x5555,cpr8
-	set_cpr_limmed	0x6666,0x6666,cpr9
-	set_cpr_limmed	0x7777,0x7777,cpr10
-	set_cpr_limmed	0x8888,0x8888,cpr11
-	stqcu		cpr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0x5555,0x5555,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0x6666,0x6666,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0x7777,0x7777,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0x8888,0x8888,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqf.cgs b/sim/testsuite/sim/frv/stqf.cgs
deleted file mode 100644
index 24dbb42ff35..00000000000
--- a/sim/testsuite/sim/frv/stqf.cgs
+++ /dev/null
@@ -1,32 +0,0 @@
-# frv testcase for stqf $GRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqf
-stqf:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	set_fr_iimmed	0xdead,0xdead,fr10
-	set_fr_iimmed	0xbeef,0xbeef,fr11
-	stqf		fr8,@(sp,gr7)
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqf.pcgs b/sim/testsuite/sim/frv/stqf.pcgs
deleted file mode 100644
index 497f5fb8096..00000000000
--- a/sim/testsuite/sim/frv/stqf.pcgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv parallel testcase for stqf $GRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqf
-stqf:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	set_fr_iimmed	0xdead,0xdead,fr10
-	set_fr_iimmed	0xbeef,0xbeef,fr11
-	stqf		fr8,@(sp,gr7)		; non-parallel
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_immed	0,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	set_fr_iimmed	0xdead,0xdead,fr10
-	set_fr_iimmed	0xbeef,0xbeef,fr11
-	stqf.p		fr8,@(sp,gr7)		; parallel
-	fnegs		fr8,fr8
-	ldqf		@(sp,gr7),fr12
-	test_mem_limmed	0xbeef,0xdead,sp	; memory is set
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-	test_fr_iimmed	0xbeefdead,fr12
-	test_fr_iimmed	0xdeadbeef,fr13
-	test_fr_iimmed	0xdeaddead,fr14
-	test_fr_iimmed	0xbeefbeef,fr15
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqfi.cgs b/sim/testsuite/sim/frv/stqfi.cgs
deleted file mode 100644
index 6a36a903fb8..00000000000
--- a/sim/testsuite/sim/frv/stqfi.cgs
+++ /dev/null
@@ -1,95 +0,0 @@
-# frv testcase for stqfi $FRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqfi
-stqfi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr10
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr11
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	set_gr_gr	sp,gr12
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x8765,0x4321,sp
-	set_gr_gr	sp,gr13
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xfedc,0xba98,sp
-	set_gr_gr	sp,gr14
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x89ab,0xcdef,sp
-	set_gr_gr	sp,gr15
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x2345,0x6789,sp
-	set_gr_gr	sp,gr16
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9876,0x5432,sp
-	set_gr_gr	sp,gr17
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x3456,0x789a,sp
-	set_gr_gr	sp,gr18
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xa987,0x6543,sp
-	set_gr_gr	sp,gr19
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x4567,0x89ab,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xba98,0x7654,sp
-	set_gr_gr	sp,gr21
-	set_fr_iimmed	0xffff,0xffff,fr8
-	set_fr_iimmed	0xeeee,0xeeee,fr9
-	set_fr_iimmed	0xdddd,0xdddd,fr10
-	set_fr_iimmed	0xcccc,0xcccc,fr11
-
-	stqfi		fr8,@(sp,0)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xeeee,0xeeee,gr20
-	test_mem_limmed	0xdddd,0xdddd,gr19
-	test_mem_limmed	0xcccc,0xcccc,gr18
-	test_mem_limmed	0x9876,0x5432,gr17
-	test_mem_limmed	0x2345,0x6789,gr16
-	test_mem_limmed	0x89ab,0xcdef,gr15
-	test_mem_limmed	0xfedc,0xba98,gr14
-	test_mem_limmed	0x8765,0x4321,gr13
-	test_mem_limmed	0x1234,0x5678,gr12
-	test_mem_limmed	0xbeef,0xdead,gr11
-	test_mem_limmed	0xdead,0xbeef,gr10
-
-	inc_gr_immed	0x810,sp	; 2064
-	stqfi		fr8,@(sp,-2048)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xeeee,0xeeee,gr20
-	test_mem_limmed	0xdddd,0xdddd,gr19
-	test_mem_limmed	0xcccc,0xcccc,gr18
-	test_mem_limmed	0xffff,0xffff,gr17
-	test_mem_limmed	0xeeee,0xeeee,gr16
-	test_mem_limmed	0xdddd,0xdddd,gr15
-	test_mem_limmed	0xcccc,0xcccc,gr14
-	test_mem_limmed	0x8765,0x4321,gr13
-	test_mem_limmed	0x1234,0x5678,gr12
-	test_mem_limmed	0xbeef,0xdead,gr11
-	test_mem_limmed	0xdead,0xbeef,gr10
-
-	inc_gr_immed	-4064,sp
-	stqfi		fr8,@(sp,0x7f0)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xeeee,0xeeee,gr20
-	test_mem_limmed	0xdddd,0xdddd,gr19
-	test_mem_limmed	0xcccc,0xcccc,gr18
-	test_mem_limmed	0xffff,0xffff,gr17
-	test_mem_limmed	0xeeee,0xeeee,gr16
-	test_mem_limmed	0xdddd,0xdddd,gr15
-	test_mem_limmed	0xcccc,0xcccc,gr14
-	test_mem_limmed	0xffff,0xffff,gr13
-	test_mem_limmed	0xeeee,0xeeee,gr12
-	test_mem_limmed	0xdddd,0xdddd,gr11
-	test_mem_limmed	0xcccc,0xcccc,gr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqfu.cgs b/sim/testsuite/sim/frv/stqfu.cgs
deleted file mode 100644
index 80a1494d973..00000000000
--- a/sim/testsuite/sim/frv/stqfu.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# frv testcase for stqfu $FRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqfu
-stqfu:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_fr_iimmed	0xbeef,0xdead,fr8
-	set_fr_iimmed	0xdead,0xbeef,fr9
-	set_fr_iimmed	0xdead,0xdead,fr10
-	set_fr_iimmed	0xbeef,0xbeef,fr11
-	stqfu		fr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqi.cgs b/sim/testsuite/sim/frv/stqi.cgs
deleted file mode 100644
index 5a3680ef1c3..00000000000
--- a/sim/testsuite/sim/frv/stqi.cgs
+++ /dev/null
@@ -1,95 +0,0 @@
-# frv testcase for stqi $GRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqi
-stqi:
-	set_mem_limmed	0xdead,0xbeef,sp
-	set_gr_gr	sp,gr10
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xdead,sp
-	set_gr_gr	sp,gr11
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x1234,0x5678,sp
-	set_gr_gr	sp,gr12
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x8765,0x4321,sp
-	set_gr_gr	sp,gr13
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xfedc,0xba98,sp
-	set_gr_gr	sp,gr14
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x89ab,0xcdef,sp
-	set_gr_gr	sp,gr15
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x2345,0x6789,sp
-	set_gr_gr	sp,gr16
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x9876,0x5432,sp
-	set_gr_gr	sp,gr17
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x3456,0x789a,sp
-	set_gr_gr	sp,gr18
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xa987,0x6543,sp
-	set_gr_gr	sp,gr19
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0x4567,0x89ab,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xba98,0x7654,sp
-	set_gr_gr	sp,gr21
-	set_gr_limmed	0xffff,0xffff,gr4
-	set_gr_limmed	0xeeee,0xeeee,gr5
-	set_gr_limmed	0xdddd,0xdddd,gr6
-	set_gr_limmed	0xcccc,0xcccc,gr7
-
-	stqi		gr4,@(sp,0)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xeeee,0xeeee,gr20
-	test_mem_limmed	0xdddd,0xdddd,gr19
-	test_mem_limmed	0xcccc,0xcccc,gr18
-	test_mem_limmed	0x9876,0x5432,gr17
-	test_mem_limmed	0x2345,0x6789,gr16
-	test_mem_limmed	0x89ab,0xcdef,gr15
-	test_mem_limmed	0xfedc,0xba98,gr14
-	test_mem_limmed	0x8765,0x4321,gr13
-	test_mem_limmed	0x1234,0x5678,gr12
-	test_mem_limmed	0xbeef,0xdead,gr11
-	test_mem_limmed	0xdead,0xbeef,gr10
-
-	inc_gr_immed	0x810,sp	; 2064
-	stqi		gr4,@(sp,-2048)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xeeee,0xeeee,gr20
-	test_mem_limmed	0xdddd,0xdddd,gr19
-	test_mem_limmed	0xcccc,0xcccc,gr18
-	test_mem_limmed	0xffff,0xffff,gr17
-	test_mem_limmed	0xeeee,0xeeee,gr16
-	test_mem_limmed	0xdddd,0xdddd,gr15
-	test_mem_limmed	0xcccc,0xcccc,gr14
-	test_mem_limmed	0x8765,0x4321,gr13
-	test_mem_limmed	0x1234,0x5678,gr12
-	test_mem_limmed	0xbeef,0xdead,gr11
-	test_mem_limmed	0xdead,0xbeef,gr10
-
-	inc_gr_immed	-4064,sp
-	stqi		gr4,@(sp,0x7f0)
-	test_mem_limmed	0xffff,0xffff,gr21
-	test_mem_limmed	0xeeee,0xeeee,gr20
-	test_mem_limmed	0xdddd,0xdddd,gr19
-	test_mem_limmed	0xcccc,0xcccc,gr18
-	test_mem_limmed	0xffff,0xffff,gr17
-	test_mem_limmed	0xeeee,0xeeee,gr16
-	test_mem_limmed	0xdddd,0xdddd,gr15
-	test_mem_limmed	0xcccc,0xcccc,gr14
-	test_mem_limmed	0xffff,0xffff,gr13
-	test_mem_limmed	0xeeee,0xeeee,gr12
-	test_mem_limmed	0xdddd,0xdddd,gr11
-	test_mem_limmed	0xcccc,0xcccc,gr10
-
-	pass
diff --git a/sim/testsuite/sim/frv/stqu.cgs b/sim/testsuite/sim/frv/stqu.cgs
deleted file mode 100644
index 31e8de51a6a..00000000000
--- a/sim/testsuite/sim/frv/stqu.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# frv testcase for stqu $GRk,@($GRi,$GRj)
-# mach: frv
-# as(frv): -mcpu=frv
-
-	.include "testutils.inc"
-
-	start
-
-	.global stqu
-stqu:
-	set_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	-4,sp
-	set_mem_limmed	0xbeef,0xbeef,sp
-	set_gr_gr	sp,gr20
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xbeef,0xdead,gr8
-	set_gr_limmed	0xdead,0xbeef,gr9
-	set_gr_limmed	0xdead,0xdead,gr10
-	set_gr_limmed	0xbeef,0xbeef,gr11
-	stqu		gr8,@(sp,gr7)
-	test_gr_gr	sp,gr20
-	test_mem_limmed	0xbeef,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xdead,0xdead,sp
-	inc_gr_immed	4,sp
-	test_mem_limmed	0xbeef,0xbeef,sp
-
-	pass
diff --git a/sim/testsuite/sim/frv/stu.cgs b/sim/testsuite/sim/frv/stu.cgs
deleted file mode 100644
index cc480405426..00000000000
--- a/sim/testsuite/sim/frv/stu.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# frv testcase for stu $GRk,@($GRi,$GRj)
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global stu
-stu:
-	set_gr_gr	sp,gr9
-	set_mem_limmed	0xdead,0xbeef,sp
-	inc_gr_immed	-4,sp
-	set_gr_immed	4,gr7
-	set_gr_limmed	0xffff,0xffff,gr8
-	stu		gr8,@(sp,gr7)
-	test_mem_limmed	0xffff,0xffff,sp
-	test_gr_gr	sp,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/sub.cgs b/sim/testsuite/sim/frv/sub.cgs
deleted file mode 100644
index 5a1410ca6f2..00000000000
--- a/sim/testsuite/sim/frv/sub.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# frv testcase for sub $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global sub
-sub:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	sub      	gr8,gr7,gr8
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed	0x8000,0x0000,gr8
-	sub		gr8,gr7,gr8
-	test_gr_limmed	0x7fff,0xffff,gr8
-
-	sub		gr8,gr8,gr8
-	test_gr_immed  	0,gr8
-
-	sub		gr8,gr7,gr8
-	test_gr_immed  	-1,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/subcc.cgs b/sim/testsuite/sim/frv/subcc.cgs
deleted file mode 100644
index 188e0ff8a99..00000000000
--- a/sim/testsuite/sim/frv/subcc.cgs
+++ /dev/null
@@ -1,34 +0,0 @@
-# frv testcase for subcc $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global subcc
-subcc:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	subcc      	gr8,gr7,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	subcc		gr8,gr7,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed 	0x7fff,0xffff,gr8
-
-	set_icc         0x0b,0		; Set mask opposite of expected
-	subcc		gr8,gr8,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,0		; Set mask opposite of expected
-	subcc		gr8,gr7,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/subi.cgs b/sim/testsuite/sim/frv/subi.cgs
deleted file mode 100644
index c6328389f58..00000000000
--- a/sim/testsuite/sim/frv/subi.cgs
+++ /dev/null
@@ -1,56 +0,0 @@
-# frv testcase for subi $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global subi
-subi:
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	subi      	gr8,1,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	subi		gr8,1,gr8
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed 	0x7fff,0xffff,gr8
-
-	set_gr_immed   	0x7ff,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	subi		gr8,0x7ff,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,0		; Set mask opposite of expected
-	subi		gr8,1,gr8
-	test_icc	0 1 1 0 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	subi      	gr8,-1,gr8
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x06,0		; Set mask opposite of expected
-	subi		gr8,-1,gr8
-	test_icc	0 1 1 0 icc0
-	test_gr_limmed 	0x8000,0x0001,gr8
-
-	set_gr_immed   	-2048,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	subi		gr8,-2048,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x0e,0		; Set mask opposite of expected
-	subi		gr8,-1,gr8
-	test_icc	1 1 1 0 icc0
-	test_gr_immed 	1,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/subicc.cgs b/sim/testsuite/sim/frv/subicc.cgs
deleted file mode 100644
index b2296ee02c8..00000000000
--- a/sim/testsuite/sim/frv/subicc.cgs
+++ /dev/null
@@ -1,56 +0,0 @@
-# frv testcase for subicc $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global subicc
-subicc:
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	subicc      	gr8,1,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	subicc		gr8,1,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed 	0x7fff,0xffff,gr8
-
-	set_gr_immed   	0x1ff,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	subicc		gr8,0x1ff,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,0		; Set mask opposite of expected
-	subicc		gr8,1,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	subicc      	gr8,-1,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	3,gr8
-
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x06,0		; Set mask opposite of expected
-	subicc		gr8,-1,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0x8000,0x0001,gr8
-
-	set_gr_immed   	-512,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	subicc		gr8,-512,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x0e,0		; Set mask opposite of expected
-	subicc		gr8,-1,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed 	1,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/subx.cgs b/sim/testsuite/sim/frv/subx.cgs
deleted file mode 100644
index 4559a52cdd7..00000000000
--- a/sim/testsuite/sim/frv/subx.cgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# frv testcase for subx $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global subx
-subx:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Make sure carry is off
-	subx      	gr8,gr7,gr8,icc0
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0c,0		; Make sure carry is off
-	subx		gr8,gr7,gr8,icc0
-	test_icc	1 1 0 0 icc0
-	test_gr_limmed  0x7fff,0xffff,gr8
-
-	set_icc         0x0a,0		; Make sure carry is off
-	subx		gr8,gr8,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,0		; Make sure carry is off
-	subx		gr8,gr7,gr8,icc0
-	test_icc	0 1 1 0 icc0
-	test_gr_limmed  0xffff,0xffff,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	3,gr8
-	set_icc         0x0f,0		; Make sure carry is on
-	subx      	gr8,gr7,gr8,icc0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	0,gr7
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Make sure carry is on
-	subx		gr8,gr7,gr8,icc0
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed  0x7fff,0xffff,gr8
-
-	set_gr_limmed  	0x7fff,0xfffe,gr7
-	set_icc         0x0b,0		; Make sure carry is on
-	subx		gr8,gr7,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	0,gr7
-	set_icc         0x07,0		; Make sure carry is on
-	subx		gr8,gr7,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed  0xffff,0xffff,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/subxcc.cgs b/sim/testsuite/sim/frv/subxcc.cgs
deleted file mode 100644
index 713a2a71be0..00000000000
--- a/sim/testsuite/sim/frv/subxcc.cgs
+++ /dev/null
@@ -1,60 +0,0 @@
-# frv testcase for subxcc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global subxcc
-subxcc:
-	set_gr_immed   	1,gr7
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Make sure carry is off
-	subxcc      	gr8,gr7,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0c,0		; Make sure carry is off
-	subxcc		gr8,gr7,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed  0x7fff,0xffff,gr8
-
-	set_icc         0x0a,0		; Make sure carry is off
-	subxcc		gr8,gr8,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,0		; Make sure carry is off
-	subxcc		gr8,gr7,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed  0xffff,0xffff,gr8
-
-	set_gr_immed   	1,gr7
-	set_gr_immed   	3,gr8
-	set_icc         0x0f,0		; Make sure carry is on
-	subxcc      	gr8,gr7,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_immed   	0,gr7
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Make sure carry is on
-	subxcc		gr8,gr7,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed  0x7fff,0xffff,gr8
-
-	set_gr_limmed  	0x7fff,0xfffe,gr7
-	set_icc         0x0b,0		; Make sure carry is on
-	subxcc		gr8,gr7,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_gr_immed   	0,gr7
-	set_icc         0x07,0		; Make sure carry is on
-	subxcc		gr8,gr7,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed  0xffff,0xffff,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/subxi.cgs b/sim/testsuite/sim/frv/subxi.cgs
deleted file mode 100644
index bbe8e4ddfdf..00000000000
--- a/sim/testsuite/sim/frv/subxi.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for subxi $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global subxi
-subxi:
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Make sure carry is off
-	subxi      	gr8,1,gr8,icc0
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0c,0		; Make sure carry is off
-	subxi		gr8,1,gr8,icc0
-	test_icc	1 1 0 0 icc0
-	test_gr_limmed  0x7fff,0xffff,gr8
-
-	set_gr_immed   	0x1ff,gr8
-	set_icc         0x0a,0		; Make sure carry is off
-	subxi		gr8,0x1ff,gr8,icc0
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,0		; Make sure carry is off
-	subxi		gr8,1,gr8,icc0
-	test_icc	0 1 1 0 icc0
-	test_gr_limmed  0xffff,0xffff,gr8
-
-	set_gr_immed   	3,gr8
-	set_icc         0x0f,0		; Make sure carry is on
-	subxi      	gr8,1,gr8,icc0
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Make sure carry is on
-	subxi		gr8,0,gr8,icc0
-	test_icc	1 1 0 1 icc0
-	test_gr_limmed  0x7fff,0xffff,gr8
-
-	set_gr_immed   	0x200,gr8
-	set_icc         0x0b,0		; Make sure carry is on
-	subxi		gr8,0x1ff,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x07,0		; Make sure carry is on
-	subxi		gr8,0,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed  0xffff,0xffff,gr8
-
-	set_icc         0x07,0		; Make sure carry is on
-	subxi		gr8,-512,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  510,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/subxicc.cgs b/sim/testsuite/sim/frv/subxicc.cgs
deleted file mode 100644
index 369cab9dce0..00000000000
--- a/sim/testsuite/sim/frv/subxicc.cgs
+++ /dev/null
@@ -1,61 +0,0 @@
-# frv testcase for subxicc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global subxicc
-subxicc:
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Make sure carry is off
-	subxicc      	gr8,1,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0c,0		; Make sure carry is off
-	subxicc		gr8,1,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed  0x7fff,0xffff,gr8
-
-	set_gr_immed   	0x1ff,gr8
-	set_icc         0x0a,0		; Make sure carry is off
-	subxicc		gr8,0x1ff,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x06,0		; Make sure carry is off
-	subxicc		gr8,1,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed  0xffff,0xffff,gr8
-
-	set_gr_immed   	3,gr8
-	set_icc         0x0f,0		; Make sure carry is on
-	subxicc      	gr8,1,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  	1,gr8
-
-	set_gr_limmed   0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Make sure carry is on
-	subxicc		gr8,0,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_limmed  0x7fff,0xffff,gr8
-
-	set_gr_immed   	0x200,gr8
-	set_icc         0x0b,0		; Make sure carry is on
-	subxicc		gr8,0x1ff,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0,gr8
-
-	set_icc         0x07,0		; Make sure carry is on
-	subxicc		gr8,0,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed  0xffff,0xffff,gr8
-
-	set_icc         0x07,0		; Make sure carry is on
-	subxicc		gr8,-512,gr8,icc0
-	test_icc	0 0 0 0 icc0
-	test_gr_immed  510,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/swap.cgs b/sim/testsuite/sim/frv/swap.cgs
deleted file mode 100644
index 1e229032868..00000000000
--- a/sim/testsuite/sim/frv/swap.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# frv testcase for swap @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global swap
-swap:
-	set_gr_gr		sp,gr20
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr21
-	set_mem_limmed		0xbeef,0xdead,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr22
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		4,sp
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	set_gr_immed		-4,gr7
-	swap @(sp,gr7),gr8
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_immed		0,gr7
-	swap @(sp,gr7),gr8
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xdead,0xbeef,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	set_gr_immed		4,gr7
-	swap @(sp,gr7),gr8
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xdead,0xbeef,gr21
-	test_mem_limmed		0xbeef,0xdead,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/swapi.cgs b/sim/testsuite/sim/frv/swapi.cgs
deleted file mode 100644
index 4951bfa7cfd..00000000000
--- a/sim/testsuite/sim/frv/swapi.cgs
+++ /dev/null
@@ -1,39 +0,0 @@
-# frv testcase for swapi @($GRi,$GRj),$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global swapi
-swapi:
-	set_gr_gr		sp,gr20
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr21
-	set_mem_limmed		0xbeef,0xdead,sp
-	inc_gr_immed		-4,sp
-	set_gr_gr		sp,gr22
-	set_mem_limmed		0xdead,0xbeef,sp
-	inc_gr_immed		4,sp
-
-	set_gr_limmed		0xbeef,0xdead,gr8
-	swapi 			@(sp,-4),gr8
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xbeef,0xdead,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	swapi 			@(sp,0),gr8
-	test_gr_limmed		0xbeef,0xdead,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xdead,0xbeef,gr21
-	test_mem_limmed		0xdead,0xbeef,gr20
-
-	swapi 			@(sp,4),gr8
-	test_gr_limmed		0xdead,0xbeef,gr8
-	test_mem_limmed		0xbeef,0xdead,gr22
-	test_mem_limmed		0xdead,0xbeef,gr21
-	test_mem_limmed		0xbeef,0xdead,gr20
-
-	pass
diff --git a/sim/testsuite/sim/frv/tc.cgs b/sim/testsuite/sim/frv/tc.cgs
deleted file mode 100644
index 116190b0f59..00000000000
--- a/sim/testsuite/sim/frv/tc.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tc $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tc
-tc:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/teq.cgs b/sim/testsuite/sim/frv/teq.cgs
deleted file mode 100644
index 59c60914a7c..00000000000
--- a/sim/testsuite/sim/frv/teq.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for teq $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global teq
-teq:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	teq 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/testutils.inc b/sim/testsuite/sim/frv/testutils.inc
deleted file mode 100644
index 8261b4faab8..00000000000
--- a/sim/testsuite/sim/frv/testutils.inc
+++ /dev/null
@@ -1,656 +0,0 @@
-# gr28-gr31, fr31, icc3, fcc3 are used as tmps.
-# consider them call clobbered by these macros.
-
-	.macro start
-	.data
-failmsg:
-	.ascii "fail\n"
-passmsg:
-	.ascii "pass\n"
-	.text
-	.global _start
-_start:
-	; enable data and insn caches in copy-back mode
-	; Also enable all registers
-	or_spr_immed	0xc80003c0,hsr0
-	and_spr_immed	0xfffff3ff,hsr0
-
-	; turn on psr.nem, psr.cm, psr.ef, psr.em, psr.esr,
-	; disable external interrupts
-	or_spr_immed	0x69f8,psr
-
-	; If fsr exists, enable all fp_exceptions except inexact
-	movsg		psr,gr28
-	srli		gr28,28,gr28
-	subicc 		gr28,0x2,gr0,icc3 ; is fr400?
-	beq 		icc3,0,nofsr0
-	or_spr_immed	0x3d000000,fsr0
-nofsr0:
-
-	; Set the stack pointer
-	sethi.p		0x7,sp
-	setlo		0xfffc,sp	; TODO -- what's a good value for this?
-
-	; Set the TBR address
-	sethi.p		0xf,gr28
-	setlo		0xf000,gr28
-	movgs		gr28,tbr	; TODO -- what's a good value for this?
-
-	; Go to user mode -- causes too many problems
-	;and_spr_immed	0xfffffffb,psr
-	.endm
-
-; Set GR with another GR
-	.macro set_gr_gr src targ
-	addi	\src,0,\targ
-	.endm
-
-; Set GR with immediate value
-	.macro set_gr_immed val reg
-	.if (\val >= -32768) && (\val <= 23767)
-	setlos	\val,\reg
-	.else
-	setlo.p	%lo(\val),\reg
-	sethi	%hi(\val),\reg
-	.endif
-	.endm
-
-	.macro set_gr_limmed valh vall reg
-	sethi.p	\valh,\reg
-	setlo	\vall,\reg
-	.endm
-
-; Set GR with address value
-	.macro set_gr_addr addr reg
-	sethi.p	%hi(\addr),\reg
-	setlo	%lo(\addr),\reg
-	.endm
-
-; Set GR with SPR
-	.macro set_gr_spr src targ
-	movsg	\src,\targ
-	.endm
-
-; Set GR with a value from memory
-	.macro set_gr_mem addr reg
-	set_gr_addr	\addr,gr28
-	ldi		@(gr28,0),\reg
-	.endm
-
-; Increment GR with immediate value
-	.macro inc_gr_immed val reg
-	.if (\val >= -2048) && (\val <= 2047)
-	addi \reg,\val,\reg
-	.else
-	set_gr_immed \val,gr28
-	add \reg,gr28,\reg
-	.endif
-	.endm
-
-; AND GR with immediate value
-	.macro and_gr_immed val reg
-	.if (\val >= -2048) && (\val <= 2047)
-	andi \reg,\val,\reg
-	.else
-	set_gr_immed \val,gr28
-	and \reg,gr28,\reg
-	.endif
-	.endm
-
-; OR GR with immediate value
-	.macro or_gr_immed val reg
-	.if (\val >= -2048) && (\val <= 2047)
-	ori \reg,\val,\reg
-	.else
-	set_gr_immed \val,gr28
-	or \reg,gr28,\reg
-	.endif
-	.endm
-
-; Set FR with another FR
-	.macro set_fr_fr src targ
-	fmovs	\src,\targ
-	.endm
-
-; Set FR with integer immediate value
-	.macro set_fr_iimmed valh vall reg
-	set_gr_limmed	\valh,\vall,gr28
-	movgf		gr28,\reg
-	.endm
-
-; Set FR with integer immediate value
-	.macro set_fr_immed val reg
-	set_gr_immed	\val,gr28
-	movgf		gr28,\reg
-	.endm
-
-; Set FR with a value from memory
-	.macro set_fr_mem addr reg
-	set_gr_addr	\addr,gr28
-	ldfi		@(gr28,0),\reg
-	.endm
-
-; Set double FR with another double FR
-	.macro set_dfr_dfr src targ
-	fmovd	\src,\targ
-	.endm
-
-; Set double FR with a value from memory
-	.macro set_dfr_mem addr reg
-	set_gr_addr	\addr,gr28
-	lddfi		@(gr28,0),\reg
-	.endm
-
-; Set CPR with immediate value
-	.macro set_cpr_immed val reg
-	addi		sp,-4,gr28
-	set_gr_immed	\val,gr29
-	st		gr29,@(gr28,gr0)
-	ldc		@(gr28,gr0),\reg
-	.endm
-
-	.macro set_cpr_limmed valh vall reg
-	addi		sp,-4,gr28
-	set_gr_limmed	\valh,\vall,gr29
-	st		gr29,@(gr28,gr0)
-	ldc		@(gr28,gr0),\reg
-	.endm
-
-; Set SPR with immediate value
-	.macro set_spr_immed val reg
-	set_gr_immed	\val,gr28
-	movgs		gr28,\reg
-	.endm
-
-	.macro set_spr_limmed valh vall reg
-	set_gr_limmed	\valh,\vall,gr28
-	movgs		gr28,\reg
-	.endm
-
-	.macro set_spr_addr addr reg
-	set_gr_addr	\addr,gr28
-	movgs		gr28,\reg
-	.endm
-
-; increment SPR with immediate value
-	.macro inc_spr_immed val reg
-	movsg		\reg,gr28
-	inc_gr_immed 	\val,gr28
-	movgs		gr28,\reg
-	.endm
-
-; OR spr with immediate value
-	.macro or_spr_immed val reg
-	movsg		\reg,gr28
-	set_gr_immed 	\val,gr29
-	or		gr28,gr29,gr28
-	movgs		gr28,\reg
-	.endm
-
-; AND spr with immediate value
-	.macro and_spr_immed val reg
-	movsg		\reg,gr28
-	set_gr_immed 	\val,gr29
-	and		gr28,gr29,gr28
-	movgs		gr28,\reg
-	.endm
-
-; Set accumulator with immediate value
-	.macro set_acc_immed val reg
-	set_fr_immed	\val,fr31
-	mwtacc		fr31,\reg
-	.endm
-
-; Set accumulator guard with immediate value
-	.macro set_accg_immed val reg
-	set_fr_immed	\val,fr31
-	mwtaccg		fr31,\reg
-	.endm
-
-; Set memory with immediate value
-	.macro set_mem_immed val base
-	set_gr_immed	\val,gr28
-	sti		gr28,@(\base,0)
-	.endm
-
-	.macro set_mem_limmed valh vall base
-	set_gr_limmed	\valh,\vall,gr28
-	sti		gr28,@(\base,0)
-	.endm
-
-; Set memory with GR value
-	.macro set_mem_gr reg addr
-	set_gr_addr	\addr,gr28
-	sti		\reg,@(gr28,0)
-	.endm
-
-; Test the value of a general register against another general register
-	.macro test_gr_gr reg1 reg2
-	subcc \reg1,\reg2,gr0,icc3
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-; Test the value of an immediate against a general register
-	.macro test_gr_immed val reg
-	.if (\val >= -512) && (\val <= 511)
-	subicc \reg,\val,gr0,icc3
-	.else
-	set_gr_immed \val,gr28
-	subcc \reg,gr28,gr0,icc3
-	.endif
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-	.macro test_gr_limmed valh vall reg
-	set_gr_limmed \valh,\vall,gr28
-	subcc \reg,gr28,gr0,icc3
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-; Test the value of an floating register against an integer immediate
-	.macro test_fr_limmed valh vall reg
-	movfg		\reg,gr29
-	set_gr_limmed	\valh,\vall,gr28
-	subcc		gr29,gr28,gr0,icc3
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-	.macro test_fr_iimmed val reg
-	movfg		\reg,gr29
-	set_gr_immed	\val,gr28
-	subcc		gr29,gr28,gr0,icc3
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-; Test the value of a floating register against another floating point register
-	.macro test_fr_fr reg1 reg2
-	fcmps	\reg1,\reg2,fcc3
-	fbeq 	fcc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-; Test the value of a double floating register against another
-; double floating point register
-	.macro test_dfr_dfr reg1 reg2
-	fcmpd	\reg1,\reg2,fcc3
-	fbeq 	fcc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-; Test the value of a special purpose register against an integer immediate
-	.macro test_spr_immed val reg
-	movsg		\reg,gr29
-	set_gr_immed	\val,gr28
-	subcc		gr29,gr28,gr0,icc3
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-	.macro test_spr_limmed valh vall reg
-	movsg		\reg,gr29
-	set_gr_limmed	\valh,\vall,gr28
-	subcc		gr29,gr28,gr0,icc3
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-	.macro test_spr_gr spr gr
-	movsg		\spr,gr28
-	test_gr_gr	\gr,gr28
-	.endm
-
-	.macro test_spr_addr addr reg
-	movsg		\reg,gr29
-	set_gr_addr	\addr,gr28
-	test_gr_gr	gr28,gr29
-	.endm
-
-; Test spr bits masked and shifted against the given value
-	.macro test_spr_bits	mask,shift,val,reg
-	movsg		\reg,gr28
-	set_gr_immed 	\mask,gr29
-	and		gr28,gr29,gr28
-	srli		gr28,\shift,gr29
-	test_gr_immed	\val,gr29
-	.endm
-	
-
-; Test the value of an accumulator against an integer immediate
-	.macro test_acc_immed val reg
-	mrdacc		\reg,fr31
-	test_fr_iimmed	\val,fr31
-	.endm
-
-; Test the value of an accumulator against an integer immediate
-	.macro test_acc_limmed valh vall reg
-	mrdacc		\reg,fr31
-	test_fr_limmed	\valh,\vall,fr31
-	.endm
-
-; Test the value of an accumulator guard against an integer immediate
-	.macro test_accg_immed val reg
-	mrdaccg		\reg,fr31
-	test_fr_iimmed	\val,fr31
-	.endm
-
-; Test CPR agains an immediate value
-	.macro test_cpr_limmed valh vall reg
-	addi		sp,-4,gr31
-	stc		\reg,@(gr31,gr0)
-	test_mem_limmed	\valh,\vall,gr31
-	.endm
-
-; Test the value of an immediate against memory
-	.macro test_mem_immed val base
-	ldi		@(\base,0),gr29
-	.if (\val >= -512) && (\val <= 511)
-	subicc gr29,\val,gr0,icc3
-	.else
-	set_gr_immed \val,gr28
-	subcc gr29,gr28,gr0,icc3
-	.endif
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-	.macro test_mem_limmed valh vall base
-	ldi		@(\base,0),gr29
-	set_gr_limmed \valh,\vall,gr28
-	subcc gr29,gr28,gr0,icc3
-	beq icc3,0,test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-; Set an integer condition code
-	.macro set_icc mask iccno
-	set_gr_immed	4,gr29
-	smuli		gr29,\iccno,gr30
-	addi		gr31,16,gr31
-	set_gr_immed	0xf,gr28
-	sll		gr28,gr31,gr28
-	not		gr28,gr28
-	movsg		ccr,gr29
-	and		gr28,gr29,gr29
-	set_gr_immed	\mask,gr28
-	sll		gr28,gr31,gr28
-	or		gr28,gr29,gr29
-	movgs		gr29,ccr
-	.endm
-; started here
-; Test the condition codes
-	.macro test_icc N Z V C iccno
-	.if (\N == 1)
-	bp   \iccno,0,fail\@
-	.else
-	bn   \iccno,0,fail\@
-	.endif
-	.if (\Z == 1)
-	bne  \iccno,0,fail\@
-	.else
-	beq   \iccno,0,fail\@
-	.endif
-	.if (\V == 1)
-	bnv \iccno,0,fail\@
-	.else
-	bv   \iccno,0,fail\@
-	.endif
-	.if (\C == 1)
-	bnc   \iccno,0,fail\@
-	.else
-	bc   \iccno,0,fail\@
-	.endif
-	bra test_cc\@
-fail\@:
-	fail
-test_cc\@:
-	.endm
-
-; Set an floating point condition code
-	.macro set_fcc mask fccno
-	set_gr_immed	4,gr29
-	smuli		gr29,\fccno,gr30
-	set_gr_immed	0xf,gr28
-	sll		gr28,gr31,gr28
-	not		gr28,gr28
-	movsg		ccr,gr29
-	and		gr28,gr29,gr29
-	set_gr_immed	\mask,gr28
-	sll		gr28,gr31,gr28
-	or		gr28,gr29,gr29
-	movgs		gr29,ccr
-	.endm
-
-; Test the condition codes
-	.macro test_fcc val fccno
-	set_gr_immed	4,gr29
-	smuli		gr29,\fccno,gr30
-	movsg		ccr,gr29
-	srl		gr29,gr31,gr29
-	andi		gr29,0xf,gr29
-	test_gr_immed	\val,gr29
-	.endm
-
-; Set PSR.ET
-	.macro set_psr_et val
-	movsg		psr,gr28
-	.if (\val == 1)
-	ori		gr28,1,gr28		; Turn on SPR.ET
-	.else
-	andi		gr28,0xfffffffe,gr28	; Turn off SPR.ET
-	.endif
-	movgs		gr28,psr
-	.endm
-
-; Floating point constants
-	.macro float_constants
-f0:		.float	0.0
-f1:		.float	1.0
-f2:		.float	2.0
-f3:		.float	3.0
-f6:		.float	6.0
-f9:		.float	9.0
-fn0:		.float	-0.0
-fn1:		.float	-1.0
-finf:		.long	0x7f800000
-fninf:		.long	0xff800000
-fmax:		.long	0x7f7fffff
-fmin:		.long	0xff7fffff
-feps:		.long	0x00400000
-fneps:		.long	0x80400000
-fnan1:		.long	0x7fc00000
-fnan2:		.long	0x7f800001
-	.endm
-
-	.macro double_constants
-d0:		.double	0.0
-d1:		.double	1.0
-d2:		.double	2.0
-d3:		.double	3.0
-d6:		.double	6.0
-d9:		.double	9.0
-dn0:		.double	-0.0
-dn1:		.double	-1.0
-dinf:		.long	0x7ff00000
-		.long	0x00000000
-dninf:		.long	0xfff00000
-		.long	0x00000000
-dmax:		.long	0x7fefffff
-		.long	0xffffffff
-dmin:		.long	0xffefffff
-		.long	0xffffffff
-deps:		.long	0x00080000
-		.long	0x00000000
-dneps:		.long	0x80080000
-		.long	0x00000000
-dnan1:		.long	0x7ff80000
-		.long	0x00000000
-dnan2:		.long	0x7ff00000
-		.long	0x00000001
-	.endm
-
-; Load floating point constants
-	.macro load_float_constants
-	set_fr_mem	fninf,fr0
-	set_fr_mem	fmin,fr4
-	set_fr_mem	fn1,fr8
-	set_fr_mem	fneps,fr12
-	set_fr_mem	fn0,fr16
-	set_fr_mem	f0,fr20
-	set_fr_mem	feps,fr24
-	set_fr_mem	f1,fr28
-	set_fr_mem	f2,fr32
-	set_fr_mem	f3,fr36
-	set_fr_mem	f6,fr40
-	set_fr_mem	f9,fr44
-	set_fr_mem	fmax,fr48
-	set_fr_mem	finf,fr52
-	set_fr_mem	fnan1,fr56
-	set_fr_mem	fnan2,fr60
-	.endm
-
-	.macro load_float_constants1
-	set_fr_mem	fninf,fr1
-	set_fr_mem	fmin,fr5
-	set_fr_mem	fn1,fr9
-	set_fr_mem	fneps,fr13
-	set_fr_mem	fn0,fr17
-	set_fr_mem	f0,fr21
-	set_fr_mem	feps,fr25
-	set_fr_mem	f1,fr29
-	set_fr_mem	f2,fr33
-	set_fr_mem	f3,fr37
-	set_fr_mem	f6,fr41
-	set_fr_mem	f9,fr45
-	set_fr_mem	fmax,fr49
-	set_fr_mem	finf,fr53
-	set_fr_mem	fnan1,fr57
-	set_fr_mem	fnan2,fr61
-	.endm
-
-	.macro load_float_constants2
-	set_fr_mem	fninf,fr2
-	set_fr_mem	fmin,fr6
-	set_fr_mem	fn1,fr10
-	set_fr_mem	fneps,fr14
-	set_fr_mem	fn0,fr18
-	set_fr_mem	f0,fr22
-	set_fr_mem	feps,fr26
-	set_fr_mem	f1,fr30
-	set_fr_mem	f2,fr34
-	set_fr_mem	f3,fr38
-	set_fr_mem	f6,fr42
-	set_fr_mem	f9,fr46
-	set_fr_mem	fmax,fr50
-	set_fr_mem	finf,fr54
-	set_fr_mem	fnan1,fr58
-	set_fr_mem	fnan2,fr62
-	.endm
-
-	.macro load_float_constants3
-	set_fr_mem	fninf,fr3
-	set_fr_mem	fmin,fr7
-	set_fr_mem	fn1,fr11
-	set_fr_mem	fneps,fr15
-	set_fr_mem	fn0,fr19
-	set_fr_mem	f0,fr23
-	set_fr_mem	feps,fr27
-	set_fr_mem	f1,fr31
-	set_fr_mem	f2,fr35
-	set_fr_mem	f3,fr39
-	set_fr_mem	f6,fr43
-	set_fr_mem	f9,fr47
-	set_fr_mem	fmax,fr51
-	set_fr_mem	finf,fr55
-	set_fr_mem	fnan1,fr59
-	set_fr_mem	fnan2,fr63
-	.endm
-
-	.macro load_double_constants
-	set_dfr_mem	dninf,fr0
-	set_dfr_mem	dmin,fr4
-	set_dfr_mem	dn1,fr8
-	set_dfr_mem	dneps,fr12
-	set_dfr_mem	dn0,fr16
-	set_dfr_mem	d0,fr20
-	set_dfr_mem	deps,fr24
-	set_dfr_mem	d1,fr28
-	set_dfr_mem	d2,fr32
-	set_dfr_mem	d3,fr36
-	set_dfr_mem	d6,fr40
-	set_dfr_mem	d9,fr44
-	set_dfr_mem	dmax,fr48
-	set_dfr_mem	dinf,fr52
-	set_dfr_mem	dnan1,fr56
-	set_dfr_mem	dnan2,fr60
-	.endm
-
-; Lock the insn cache at the given address
-	.macro lock_insn_cache address
-	icpl		\address,gr0,1
-	.endm
-
-; Lock the data cache at the given address
-	.macro lock_data_cache address
-	dcpl		\address,gr0,1
-	.endm
-
-; Invalidate the data cache at the given address
-	.macro invalidate_data_cache address
-	dci		@(\address,gr0)
-	.endm
-
-; Flush the data cache at the given address
-	.macro flush_data_cache address
-	dcf		@(\address,gr0)
-	.endm
-
-; Write a bctrlr 0,0 insn at the address contained in the given register
-	.macro set_bctrlr_0_0 address
-	set_mem_immed	0x80382000,\address	; bctrlr 0,0
-	flush_data_cache \address
-	.endm
-
-; Exit with return code
-	.macro exit rc
-	setlos		#1,gr7
-	set_gr_immed	\rc,gr8
-	tira		gr0,#0
-	.endm
-
-; Pass the test case
-	.macro pass
-pass\@:
-	setlos.p	#5,gr10
-	setlos		#1,gr8
-	setlos		#5,gr7
-	set_gr_addr  	passmsg,gr9
-	tira		gr0,#0
-	exit		#0
-	.endm
-
-; Fail the testcase
-	.macro fail
-fail\@:
-	setlos.p	#5,gr10
-	setlos		#1,gr8
-	setlos		#5,gr7
-	set_gr_addr	failmsg,gr9
-	tira		gr0,#0
-	exit		#1
-	.endm
diff --git a/sim/testsuite/sim/frv/tge.cgs b/sim/testsuite/sim/frv/tge.cgs
deleted file mode 100644
index 3e12d9245d1..00000000000
--- a/sim/testsuite/sim/frv/tge.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tge $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tge
-tge:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tge 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tgt.cgs b/sim/testsuite/sim/frv/tgt.cgs
deleted file mode 100644
index 7e01330f031..00000000000
--- a/sim/testsuite/sim/frv/tgt.cgs
+++ /dev/null
@@ -1,93 +0,0 @@
-# frv testcase for tgt $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tgt
-tgt:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tgt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/thi.cgs b/sim/testsuite/sim/frv/thi.cgs
deleted file mode 100644
index 36cc9237647..00000000000
--- a/sim/testsuite/sim/frv/thi.cgs
+++ /dev/null
@@ -1,93 +0,0 @@
-# frv testcase for thi $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global thi
-thi:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	thi 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tic.cgs b/sim/testsuite/sim/frv/tic.cgs
deleted file mode 100644
index 8c746f5d29c..00000000000
--- a/sim/testsuite/sim/frv/tic.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for tic $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tic
-tic:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tic 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tieq.cgs b/sim/testsuite/sim/frv/tieq.cgs
deleted file mode 100644
index 5dfc0e66f19..00000000000
--- a/sim/testsuite/sim/frv/tieq.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tieq $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tieq
-tieq:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tieq 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tige.cgs b/sim/testsuite/sim/frv/tige.cgs
deleted file mode 100644
index cde3ac866c4..00000000000
--- a/sim/testsuite/sim/frv/tige.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tige $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tige
-tige:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tige 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tigt.cgs b/sim/testsuite/sim/frv/tigt.cgs
deleted file mode 100644
index 163d92f179f..00000000000
--- a/sim/testsuite/sim/frv/tigt.cgs
+++ /dev/null
@@ -1,92 +0,0 @@
-# frv testcase for tigt $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tigt
-tigt:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tigt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tihi.cgs b/sim/testsuite/sim/frv/tihi.cgs
deleted file mode 100644
index e564fc2982d..00000000000
--- a/sim/testsuite/sim/frv/tihi.cgs
+++ /dev/null
@@ -1,92 +0,0 @@
-# frv testcase for tihi $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tihi
-tihi:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tihi 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tile.cgs b/sim/testsuite/sim/frv/tile.cgs
deleted file mode 100644
index 7f5ef2a7ab8..00000000000
--- a/sim/testsuite/sim/frv/tile.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for tile $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tile
-tile:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tile 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tils.cgs b/sim/testsuite/sim/frv/tils.cgs
deleted file mode 100644
index 5713de5cfc5..00000000000
--- a/sim/testsuite/sim/frv/tils.cgs
+++ /dev/null
@@ -1,108 +0,0 @@
-# frv testcase for tils $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tils
-tils:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tils 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tilt.cgs b/sim/testsuite/sim/frv/tilt.cgs
deleted file mode 100644
index 4d596b01b9f..00000000000
--- a/sim/testsuite/sim/frv/tilt.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for tilt $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tilt
-tilt:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tilt 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tin.cgs b/sim/testsuite/sim/frv/tin.cgs
deleted file mode 100644
index f55c921c012..00000000000
--- a/sim/testsuite/sim/frv/tin.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for tin $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tin
-tin:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tin 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tinc.cgs b/sim/testsuite/sim/frv/tinc.cgs
deleted file mode 100644
index 8e99e31531f..00000000000
--- a/sim/testsuite/sim/frv/tinc.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for tinc $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tinc
-tinc:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tinc 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tine.cgs b/sim/testsuite/sim/frv/tine.cgs
deleted file mode 100644
index d7e8b005416..00000000000
--- a/sim/testsuite/sim/frv/tine.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for tine $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tine
-tine:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tine 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tino.cgs b/sim/testsuite/sim/frv/tino.cgs
deleted file mode 100644
index 65a2d6d2835..00000000000
--- a/sim/testsuite/sim/frv/tino.cgs
+++ /dev/null
@@ -1,53 +0,0 @@
-# frv testcase for tino
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tinev
-tinev:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_mem_limmed	0x0038,0x2000,gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_gr_immed	0,gr7
-
-	set_icc		0x0 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x1 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x2 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x3 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x4 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x5 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x6 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x7 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x8 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x9 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xa 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xb 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xc 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xd 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xe 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xf 0
-	tino 			; should branch to tbr + (128 + 4)*16
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tinv.cgs b/sim/testsuite/sim/frv/tinv.cgs
deleted file mode 100644
index 7ec34a42271..00000000000
--- a/sim/testsuite/sim/frv/tinv.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for tinv $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tinv
-tinv:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tinv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tip.cgs b/sim/testsuite/sim/frv/tip.cgs
deleted file mode 100644
index 835342292f4..00000000000
--- a/sim/testsuite/sim/frv/tip.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for tip $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tip
-tip:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tip 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tira.cgs b/sim/testsuite/sim/frv/tira.cgs
deleted file mode 100644
index bd3139e628d..00000000000
--- a/sim/testsuite/sim/frv/tira.cgs
+++ /dev/null
@@ -1,114 +0,0 @@
-# frv testcase for tira $GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tira
-tira:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tira 		gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
diff --git a/sim/testsuite/sim/frv/tiv.cgs b/sim/testsuite/sim/frv/tiv.cgs
deleted file mode 100644
index 84a25762eb7..00000000000
--- a/sim/testsuite/sim/frv/tiv.cgs
+++ /dev/null
@@ -1,100 +0,0 @@
-# frv testcase for tiv $ICCi_2,$GRi,$s12
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tiv
-tiv:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tiv 		icc0,gr7,4	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tle.cgs b/sim/testsuite/sim/frv/tle.cgs
deleted file mode 100644
index 1322821b60e..00000000000
--- a/sim/testsuite/sim/frv/tle.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# frv testcase for tle $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tle
-tle:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tle 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tls.cgs b/sim/testsuite/sim/frv/tls.cgs
deleted file mode 100644
index 708e61735c0..00000000000
--- a/sim/testsuite/sim/frv/tls.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# frv testcase for tls $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tls
-tls:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tls 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tlt.cgs b/sim/testsuite/sim/frv/tlt.cgs
deleted file mode 100644
index 12ee05b7f97..00000000000
--- a/sim/testsuite/sim/frv/tlt.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tlt $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tlt
-tlt:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tlt 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tn.cgs b/sim/testsuite/sim/frv/tn.cgs
deleted file mode 100644
index 05b04240aa2..00000000000
--- a/sim/testsuite/sim/frv/tn.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tn $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tn
-tn:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tn 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tnc.cgs b/sim/testsuite/sim/frv/tnc.cgs
deleted file mode 100644
index 808db3c2c95..00000000000
--- a/sim/testsuite/sim/frv/tnc.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tnc $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tnc
-tnc:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tnc 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tne.cgs b/sim/testsuite/sim/frv/tne.cgs
deleted file mode 100644
index 880188d2919..00000000000
--- a/sim/testsuite/sim/frv/tne.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tne $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tne
-tne:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tne 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tno.cgs b/sim/testsuite/sim/frv/tno.cgs
deleted file mode 100644
index df499699367..00000000000
--- a/sim/testsuite/sim/frv/tno.cgs
+++ /dev/null
@@ -1,54 +0,0 @@
-# frv testcase for tno
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tno
-tno:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_mem_limmed	0x0038,0x2000,gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_spr_addr	bad,lr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_icc		0x0 0
- 	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x1 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x2 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x3 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x4 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x5 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x6 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x7 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x8 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0x9 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xa 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xb 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xc 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xd 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xe 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	set_icc		0xf 0
-	tno 			; should branch to tbr + (128 + 4)*16
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tnv.cgs b/sim/testsuite/sim/frv/tnv.cgs
deleted file mode 100644
index d7f9241b05b..00000000000
--- a/sim/testsuite/sim/frv/tnv.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tnv $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tnv
-tnv:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_spr_addr	bad,lr
-	set_icc		0x2 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x3 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_spr_addr	bad,lr
-	set_icc		0x6 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x7 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tnv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tp.cgs b/sim/testsuite/sim/frv/tp.cgs
deleted file mode 100644
index 2709e31cf2b..00000000000
--- a/sim/testsuite/sim/frv/tp.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tp $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tp
-tp:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok0:
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xa 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xb 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xe 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xf 0
-	tp 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/tra.cgs b/sim/testsuite/sim/frv/tra.cgs
deleted file mode 100644
index 368c83acdca..00000000000
--- a/sim/testsuite/sim/frv/tra.cgs
+++ /dev/null
@@ -1,117 +0,0 @@
-# frv testcase for tra $GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tra
-tra:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0  gr7
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_psr_et	1
-	set_spr_addr	ok0,lr
-	set_icc		0x0 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-bad0:
-	fail
-ok0:
-	test_spr_addr	bad0,pcsr
-	set_psr_et	1
-	set_spr_addr	ok1,lr
-	set_icc		0x1 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok1:
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_psr_et	1
-	set_spr_addr	ok4,lr
-	set_icc		0x4 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok4:
-	set_psr_et	1
-	set_spr_addr	ok5,lr
-	set_icc		0x5 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok5:
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_psr_et	1
-	set_spr_addr	ok8,lr
-	set_icc		0x8 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok8:
-	set_psr_et	1
-	set_spr_addr	ok9,lr
-	set_icc		0x9 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok9:
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_psr_et	1
-	set_spr_addr	okc,lr
-	set_icc		0xc 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okc:
-	set_psr_et	1
-	set_spr_addr	okd,lr
-	set_icc		0xd 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okd:
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tra 		gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
diff --git a/sim/testsuite/sim/frv/tv.cgs b/sim/testsuite/sim/frv/tv.cgs
deleted file mode 100644
index d173f2994e4..00000000000
--- a/sim/testsuite/sim/frv/tv.cgs
+++ /dev/null
@@ -1,101 +0,0 @@
-# frv testcase for tv $ICCi_2,$GRi,$GRj
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global tv
-tv:
-	and_spr_immed	-4081,tbr		; clear tbr.tt
-	set_gr_spr	tbr,gr7
-	inc_gr_immed	2112,gr7		; address of exception handler
-	set_bctrlr_0_0	gr7	; bctrlr 0,0
-
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr7
-	set_gr_immed	4,gr8
-
-	set_spr_addr	bad,lr
-	set_icc		0x0 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x1 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok2,lr
-	set_icc		0x2 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok2:
-	set_psr_et	1
-	set_spr_addr	ok3,lr
-	set_icc		0x3 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok3:
-	set_spr_addr	bad,lr
-	set_icc		0x4 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x5 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	ok6,lr
-	set_icc		0x6 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok6:
-	set_psr_et	1
-	set_spr_addr	ok7,lr
-	set_icc		0x7 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-ok7:
-	set_spr_addr	bad,lr
-	set_icc		0x8 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0x9 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oka,lr
-	set_icc		0xa 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oka:
-	set_psr_et	1
-	set_spr_addr	okb,lr
-	set_icc		0xb 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okb:
-	set_spr_addr	bad,lr
-	set_icc		0xc 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_spr_addr	bad,lr
-	set_icc		0xd 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-
-	set_psr_et	1
-	set_spr_addr	oke,lr
-	set_icc		0xe 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-oke:
-	set_psr_et	1
-	set_spr_addr	okf,lr
-	set_icc		0xf 0
-	tv 		icc0,gr7,gr8	; should branch to tbr + (128 + 4)*16
-	fail
-okf:
-	pass
-bad:
-	fail
diff --git a/sim/testsuite/sim/frv/udiv.cgs b/sim/testsuite/sim/frv/udiv.cgs
deleted file mode 100644
index 35cfa8c84ab..00000000000
--- a/sim/testsuite/sim/frv/udiv.cgs
+++ /dev/null
@@ -1,48 +0,0 @@
-# frv testcase for udiv $GRi,$GRj,$GRk
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global udiv
-udiv:
-	; simple division 12 / 3
-	set_gr_immed   	0x00000003,gr2
-	set_gr_immed   	0x0000000c,gr3
-	udiv      	gr3,gr2,gr3
-	test_gr_immed  	0x00000003,gr2
-	test_gr_immed  	0x00000004,gr3
-
-	; example 1 from udiv in the fr30 manual
-	set_gr_limmed  	0x0123,0x4567,gr2
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	udiv      	gr3,gr2,gr3
-	test_gr_limmed 	0x0123,0x4567,gr2
-	test_gr_immed  	0x000000e0,gr3
-
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide by zero
-	set_spr_addr	ok1,lr
-	set_gr_addr	e1,gr17
-e1:	udiv      	gr1,gr0,gr2	; divide by zero
-	test_gr_immed	1,gr15
-
-	pass
-
-ok1:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x1,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/udivi.cgs b/sim/testsuite/sim/frv/udivi.cgs
deleted file mode 100644
index 6a505900d07..00000000000
--- a/sim/testsuite/sim/frv/udivi.cgs
+++ /dev/null
@@ -1,49 +0,0 @@
-# frv testcase for udivi $GRi,$s12,$GRk
-# mach: frv fr500 fr400
-
-	.include "testutils.inc"
-
-	start
-
-	.global udivi
-udivi:
-	; simple division 12 / 3
-	set_gr_immed   	0x0000000c,gr3
-	udivi      	gr3,3,gr3
-	test_gr_immed  	0x00000004,gr3
-
-	; random example
-	set_gr_limmed  	0xfedc,0xba98,gr3
-	udivi      	gr3,0x7ff,gr3
-	test_gr_limmed 	0x001f,0xdf93,gr3
-
-	; random example
-	set_gr_limmed  	0xffff,0xffff,gr3
-	udivi      	gr3,-2048,gr3
-	test_gr_immed 	1,gr3
-
-	; set up exception handler
-	set_psr_et	1
-	and_spr_immed	-4081,tbr	; clear tbr.tt
-	set_gr_spr	tbr,gr17
-	inc_gr_immed	0x170,gr17	; address of exception handler
-	set_bctrlr_0_0  gr17
-	set_spr_immed	128,lcr
-	set_gr_immed	0,gr15
-
-	; divide by zero
-	set_spr_addr	ok1,lr
-	set_gr_addr	e1,gr17
-e1:	udivi      	gr1,0,gr2	; divide by zero
-	test_gr_immed	1,gr15
-
-	pass
-
-ok1:	; exception handler for divide by zero
-	test_spr_bits	0x18,3,0x1,isr		; isr.dtt is set
-	test_spr_gr	epcr0,gr17		; return address set
-	test_spr_bits	0x0001,0,0x1,esr0	; esr0 is valid
-	test_spr_bits	0x003e,1,0x13,esr0	; esr0.ec is set
-	inc_gr_immed	1,gr15
-	rett		0
-	fail
diff --git a/sim/testsuite/sim/frv/umul.cgs b/sim/testsuite/sim/frv/umul.cgs
deleted file mode 100644
index 6c612217036..00000000000
--- a/sim/testsuite/sim/frv/umul.cgs
+++ /dev/null
@@ -1,76 +0,0 @@
-# frv testcase for umul $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global umul
-umul:
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed 	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_limmed 	0x7fff,0xfffe,gr9
-
-	set_gr_limmed  	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_immed  	0,gr8
-	test_gr_limmed 	0x8000,0x0000,gr9
-
-	set_gr_limmed  	0x8000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	2,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed  	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed  	0x7fff,0xffff,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_limmed 	0x3fff,0xffff,gr8
-	test_gr_immed  	0x00000001,gr9
-
-	set_gr_limmed  	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed  	0x8000,0x0000,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_limmed 	0x4000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0xffff,0xffff,gr7	; max positive result
-	set_gr_limmed  	0xffff,0xffff,gr8
-	umul      	gr7,gr8,gr8
-	test_gr_limmed 	0xffff,0xfffe,gr8
-	test_gr_immed  	1,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/umulcc.cgs b/sim/testsuite/sim/frv/umulcc.cgs
deleted file mode 100644
index c2b5cff0ea5..00000000000
--- a/sim/testsuite/sim/frv/umulcc.cgs
+++ /dev/null
@@ -1,98 +0,0 @@
-# frv testcase for umulcc $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global umulcc
-umulcc:
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_gr_immed   	1,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_gr_immed   	2,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_gr_immed   	0,gr8
-	set_icc         0x0a,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed 	0x3fff,0xffff,gr7	; 31 bit result
-	set_gr_immed   	2,gr8
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed 	0x7fff,0xfffe,gr9
-
-	set_gr_limmed  	0x4000,0x0000,gr7	; 32 bit result
-	set_gr_immed   	2,gr8
-	set_icc         0x0e,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed 	0x8000,0x0000,gr9
-
-	set_gr_limmed  	0x8000,0x0000,gr7	; 33 bit result
-	set_gr_immed   	2,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed  	0x7fff,0xffff,gr7	; max positive result
-	set_gr_limmed  	0x7fff,0xffff,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_limmed 	0x3fff,0xffff,gr8
-	test_gr_immed  	1,gr9
-
-	set_gr_limmed  	0x8000,0x0000,gr7	; max positive result
-	set_gr_limmed  	0x8000,0x0000,gr8
-	set_icc         0x0d,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_limmed 	0x4000,0x0000,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed  	0xffff,0xffff,gr7	; max positive result
-	set_gr_limmed  	0xffff,0xffff,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	umulcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xffff,0xfffe,gr8
-	test_gr_immed  	1,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/umuli.cgs b/sim/testsuite/sim/frv/umuli.cgs
deleted file mode 100644
index 6f1b9c12211..00000000000
--- a/sim/testsuite/sim/frv/umuli.cgs
+++ /dev/null
@@ -1,87 +0,0 @@
-# frv testcase for umuli $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global umuli
-umuli:
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umuli      	gr7,2,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_icc         0x0e,0		; Set mask opposite of expected
-	umuli      	gr7,2,gr8
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umuli      	gr7,1,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_icc         0x0b,0		; Set mask opposite of expected
-	umuli      	gr7,2,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_icc         0x0a,0		; Set mask opposite of expected
-	umuli      	gr7,0,gr8
-	test_icc	1 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed 	0x3fff,0xffff,gr7	; 31 bit result
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umuli      	gr7,2,gr8
-	test_icc	1 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed 	0x7fff,0xfffe,gr9
-
-	set_gr_limmed  	0x4000,0x0000,gr7	; 32 bit result
-	set_icc         0x0e,0		; Set mask opposite of expected
-	umuli      	gr7,2,gr8
-	test_icc	1 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed 	0x8000,0x0000,gr9
-
-	set_gr_limmed  	0x8000,0x0000,gr7	; 33 bit result
-	set_icc         0x09,0		; Set mask opposite of expected
-	umuli      	gr7,2,gr8
-	test_icc	1 0 0 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed  	0x7fff,0xffff,gr7	; max positive result
-	set_icc         0x0d,0		; Set mask opposite of expected
-	umuli      	gr7,0x7ff,gr8
-	test_icc	1 1 0 1 icc0
-	test_gr_immed 	0x3ff,gr8
-	test_gr_limmed 	0x7fff,0xf801,gr9
-
-	set_gr_limmed  	0x8000,0x0000,gr7	; max positive result
-	set_icc         0x09,0		; Set mask opposite of expected
-	umuli      	gr7,-2048,gr8
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed	0x7fff,0xfc00,gr8
-	test_gr_limmed	0x0000,0x0000,gr9
-
-	set_gr_limmed  	0xffff,0xffff,gr7	; max positive result
-	set_icc         0x05,0		; Set mask opposite of expected
-	umuli      	gr7,-1,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed 	0xffff,0xfffe,gr8
-	test_gr_immed  	1,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/umulicc.cgs b/sim/testsuite/sim/frv/umulicc.cgs
deleted file mode 100644
index 0d0d0c1cd0c..00000000000
--- a/sim/testsuite/sim/frv/umulicc.cgs
+++ /dev/null
@@ -1,87 +0,0 @@
-# frv testcase for umulicc $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global umulicc
-umulicc:
-	set_gr_immed   	3,gr7		; multiply small numbers
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	6,gr9
-
-	set_gr_immed   	1,gr7		; multiply by 1
-	set_icc         0x0e,0		; Set mask opposite of expected
-	umulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 1
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umulicc      	gr7,1,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	2,gr9
-
-	set_gr_immed   	0,gr7		; multiply by 0
-	set_icc         0x0b,0		; Set mask opposite of expected
-	umulicc      	gr7,2,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_immed   	2,gr7		; multiply by 0
-	set_icc         0x0a,0		; Set mask opposite of expected
-	umulicc      	gr7,0,gr8,icc0
-	test_icc	0 1 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_immed  	0,gr9
-
-	set_gr_limmed 	0x3fff,0xffff,gr7	; 31 bit result
-	set_icc         0x0f,0		; Set mask opposite of expected
-	umulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 1 1 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed 	0x7fff,0xfffe,gr9
-
-	set_gr_limmed  	0x4000,0x0000,gr7	; 32 bit result
-	set_icc         0x0e,0		; Set mask opposite of expected
-	umulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 1 0 icc0
-	test_gr_immed  	0,gr8
-	test_gr_limmed 	0x8000,0x0000,gr9
-
-	set_gr_limmed  	0x8000,0x0000,gr7	; 33 bit result
-	set_icc         0x09,0		; Set mask opposite of expected
-	umulicc      	gr7,2,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed  	1,gr8
-	test_gr_immed  	0x00000000,gr9
-
-	set_gr_limmed  	0x7fff,0xffff,gr7	; max positive result
-	set_icc         0x0d,0		; Set mask opposite of expected
-	umulicc      	gr7,0x1ff,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_immed 	0xff,gr8
-	test_gr_limmed 	0x7fff,0xfe01,gr9
-
-	set_gr_limmed  	0x8000,0x0000,gr7	; max positive result
-	set_icc         0x09,0		; Set mask opposite of expected
-	umulicc      	gr7,-512,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_limmed 	0x7fff,0xff00,gr8
-	test_gr_limmed  0x0000,0x0000,gr9
-
-	set_gr_limmed  	0xffff,0xffff,gr7	; max positive result
-	set_icc         0x05,0		; Set mask opposite of expected
-	umulicc      	gr7,-1,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed 	0xffff,0xfffe,gr8
-	test_gr_immed  	1,gr9
-
-	pass
diff --git a/sim/testsuite/sim/frv/xor.cgs b/sim/testsuite/sim/frv/xor.cgs
deleted file mode 100644
index 97310e440a7..00000000000
--- a/sim/testsuite/sim/frv/xor.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for xor $GRi,$GRj,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global xor
-xor:
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	xor      	gr7,gr8,gr8
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed	0x00000000,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	xor		gr7,gr8,gr8
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	xor      	gr7,gr8,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	xor		gr7,gr8,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed  0xdead,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/xorcc.cgs b/sim/testsuite/sim/frv/xorcc.cgs
deleted file mode 100644
index 9516b789153..00000000000
--- a/sim/testsuite/sim/frv/xorcc.cgs
+++ /dev/null
@@ -1,38 +0,0 @@
-# frv testcase for xorcc $GRi,$GRj,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global xorcc
-xorcc:
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0x5555,0x5555,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	xorcc      	gr7,gr8,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0xffff,0xffff,gr8
-
-	set_gr_immed	0x00000000,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	xorcc		gr7,gr8,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x0b,0		; Set mask opposite of expected
-	xorcc      	gr7,gr8,gr8,icc0
-	test_icc	0 1 1 1 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_gr_limmed   0x0000,0xbeef,gr8
-	set_icc         0x05,0		; Set mask opposite of expected
-	xorcc		gr7,gr8,gr8,icc0
-	test_icc	1 0 0 1 icc0
-	test_gr_limmed  0xdead,0xbeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/xorcr.cgs b/sim/testsuite/sim/frv/xorcr.cgs
deleted file mode 100644
index bcb153bc97f..00000000000
--- a/sim/testsuite/sim/frv/xorcr.cgs
+++ /dev/null
@@ -1,59 +0,0 @@
-# frv testcase for xorcr $CCi,$CCj,$CCk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global xorcr
-xorcr:
-	set_spr_immed	0x1b1b,cccr
-	xorcr		cc7,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc7,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc7,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc7,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc6,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc6,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc6,cc5,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc6,cc4,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc5,cc7,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc5,cc6,cc3
-	test_spr_immed	0x1b1b,cccr
-
-	xorcr		cc5,cc5,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	xorcr		cc5,cc4,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	xorcr		cc4,cc7,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	xorcr		cc4,cc6,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	xorcr		cc4,cc5,cc3
-	test_spr_immed	0x1bdb,cccr
-
-	xorcr		cc4,cc4,cc3
-	test_spr_immed	0x1b9b,cccr
-
-	pass
diff --git a/sim/testsuite/sim/frv/xori.cgs b/sim/testsuite/sim/frv/xori.cgs
deleted file mode 100644
index ed26660faf8..00000000000
--- a/sim/testsuite/sim/frv/xori.cgs
+++ /dev/null
@@ -1,35 +0,0 @@
-# frv testcase for xori $GRi,$s12,$GRk
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global xori
-xori:
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_icc         0x07,0		; Set mask opposite of expected
-	xori      	gr7,0x555,gr8
-	test_icc	0 1 1 1 icc0
-	test_gr_limmed 	0xaaaa,0xafff,gr8
-
-	set_gr_immed	0x00000000,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	xori		gr7,0,gr8
-	test_icc	1 0 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_icc         0x0b,0		; Set mask opposite of expected
-	xori      	gr7,0x2aa,gr8
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed  0xaaaa,0xa800,gr8
-
-	set_gr_limmed   0xdead,0x0000,gr7
-	set_icc         0x05,0		; Set mask opposite of expected
-	xori		gr7,-273,gr8
-	test_icc	0 1 0 1 icc0
-	test_gr_limmed  0x2152,0xfeef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/frv/xoricc.cgs b/sim/testsuite/sim/frv/xoricc.cgs
deleted file mode 100644
index b473620bbf1..00000000000
--- a/sim/testsuite/sim/frv/xoricc.cgs
+++ /dev/null
@@ -1,36 +0,0 @@
-# frv testcase for xoricc $GRi,$s10,$GRk,$ICCi_1
-# mach: all
-
-	.include "testutils.inc"
-
-	start
-
-	.global xoricc
-xoricc:
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_icc         0x07,0		; Set mask opposite of expected
-	xoricc      	gr7,0x155,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed 	0xaaaa,0xabff,gr8
-
-	set_gr_immed	0x00000000,gr7
-	set_gr_immed	0x00000000,gr8
-	set_icc         0x08,0		; Set mask opposite of expected
-	xoricc		gr7,0,gr8,icc0
-	test_icc	0 1 0 0 icc0
-	test_gr_immed  	0x00000000,gr8
-
-	set_gr_limmed   0xaaaa,0xaaaa,gr7
-	set_gr_limmed   0xaaaa,0xaaaa,gr8
-	set_icc         0x07,0		; Set mask opposite of expected
-	xoricc      	gr7,0xaa,gr8,icc0
-	test_icc	1 0 1 1 icc0
-	test_gr_limmed  0xaaaa,0xaa00,gr8
-
-	set_gr_limmed   0xdead,0xb000,gr7
-	set_icc         0x0d,0		; Set mask opposite of expected
-	xoricc		gr7,-273,gr8,icc0
-	test_icc	0 0 0 1 icc0
-	test_gr_limmed  0x2152,0x4eef,gr8
-
-	pass
diff --git a/sim/testsuite/sim/h8300/ChangeLog b/sim/testsuite/sim/h8300/ChangeLog
deleted file mode 100644
index 21c02663820..00000000000
--- a/sim/testsuite/sim/h8300/ChangeLog
+++ /dev/null
@@ -1,97 +0,0 @@
-2004-06-28  Alexandre Oliva  <aoliva@redhat.com>
-
-	2003-07-22  Michael Snyder  <msnyder@redhat.com>
-	* mul.s: Don't try to use negative immediate (it's always
-	unsigned).
-	* div.s: Ditto.
-
-2004-06-24  Alexandre Oliva  <aoliva@redhat.com>
-
-	2004-06-17  Alexandre Oliva  <aoliva@redhat.com>
-	* band.s, biand.s: imm3_abs16 is not available on h8300h.
-	* bset.s: Likewise.  Ditto for rn_abs32.
-
-2003-07-22  Michael Snyder  <msnyder@redhat.com>
-
-	* cmpw.s: Add test for less-than-zero immediate.
-	* shll.s: Test for shll reg, reg.
-	* shlr.s: Test for shlr reg, reg.
-	* mova.s: Add dozens of new mova tests.
-
-2003-05-30  Alexandre Oliva  <aoliva@redhat.com>
-
-	* allinsn.exp: Fix typos introduced on 2003-05-27.
-
-2003-05-29  Michael Snyder  <msnyder@redhat.com>
-
-	* tas.s: Use er4 for h8h and h8s, er3 for h8sx.
-
-2003-05-28  Michael Snyder  <msnyder@redhat.com>
-
-	* subs.s: New file.
-	* subx.s: New file.
-	* allinsn.exp: Add new subs and subx tests.
-	* testutils.inc: Simplify (and fix) set_carry_flag. 
-	(clear_carry_flag, set_zero_flag, clear_zero_flag...): New macros.
-	* addx.s: Use simplified set_carry_flag.	
-
-2003-05-27  Michael Snyder  <msnyder@redhat.com>
-
-	* tas.s: New file.
-	* band.s: New file.
-	* biand.s: New file.
-	* allinsn.exp: Add tas, band, biand tests.
-	* brabc.s: Add abs8 test.
-	* bset.s: Add bset/ne, bclr/ne tests.
-
-2003-05-23  Michael Snyder  <msnyder@redhat.com>
-
-	* and.b.s: Add andc exr.
-	* or.b.s: Add orc.exr.
-	* xor.b.s: Add xor exr.
-
-	* jmp.s: Fix 8-bit indirect test.  Add 7-bit vector test.
-
-2003-05-22  Michael Snyder  <msnyder@redhat.com>
-
-	* stack.s: Add rte/l and rts/l tests.
-	* allinsn.exp: Add stack tests.
-
-2003-05-21  Michael Snyder  <msnyder@redhat.com>
-
-	* stack.s: New file: test stack operations.
-	* stack.s: Add bsr, jsr tests.
-	* stack.s: Add trapa, rte tests.
-
-	* div.s: Corrections for size of dividend.
-
-2003-05-20  Michael Snyder  <msnyder@redhat.com>
-
-	* mul.s: Corrections for unsigned multiply.
-
-	* div.s: New file, test div instructions.
-	* allinsn.exp: Add div test.
-
-2003-05-19  Michael Snyder  <msnyder@redhat.com>
-
-	* mul.s: New file, test mul instructions.
-	* allinsn.exp: Add mul test.
-
-2003-05-14  Michael Snyder  <msnyder@redhat.com>
-
-	* addb.s, addw.s, addl.s, addw.s, addx.s, andb.s, andw.s, andl.s,
-	bfld.s, brabc.s, bra.s, bset.s, cmpb.s, cmpw.s, cmpl.s, daa.s, 
-	das.s, dec.s, extw.s, extl.s, inc.s, jmp.s, ldc.s, ldm.s, mac.s, 
-	mova.s, movb.s, movw.s, movl.s, movmd.s, movsd.s, neg.s, nop.s, 
-	not.s, orb.s, orw.s, orl.s, rotl.s, rotr.s, rotxl.s, rotxr.s, 
-	shal.s, shar.s, shll.s, shlr.s, stc.s, subb.s, subw.s, subl.s,
-	xorb.s, xorw.s, xorl.s: New files.
-	* allinsn.exp: New file.
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-change-log-default-name: "ChangeLog"
-End:
diff --git a/sim/testsuite/sim/h8300/addb.s b/sim/testsuite/sim/h8300/addb.s
deleted file mode 100644
index f1e4ebf7264..00000000000
--- a/sim/testsuite/sim/h8300/addb.s
+++ /dev/null
@@ -1,778 +0,0 @@
-# Hitachi H8 testcase 'add.b'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# add.b #xx:8, rd	;                     8   rd xxxxxxxx
-	# add.b #xx:8, @erd	;         7 d rd ???? 8 ???? xxxxxxxx
-	# add.b #xx:8, @erd+	; 0 1 7 4 6 c rd 1??? 8 ???? xxxxxxxx
-	# add.b #xx:8, @erd-	; 0 1 7 6 6 c rd 1??? 8 ???? xxxxxxxx
-	# add.b #xx:8, @+erd	; 0 1 7 5 6 c rd 1??? 8 ???? xxxxxxxx
-	# add.b #xx:8, @-erd	; 0 1 7 7 6 c rd 1??? 8 ???? xxxxxxxx
-	# add.b #xx:8, @(d:16, erd)	; 0 1 7 4 6 e b30 | rd, b31, dd:16 8 ???? xxxxxxxx
-	# add.b #xx:8, @(d:32, erd)	; 7 8 b30 | rd, 4 6 a 2 8 dd:32 8 ???? xxxxxxxx
-	# add.b #xx:8, @aa:8		; 7 f aaaaaaaa 8 ???? xxxxxxxx
-	# add.b #xx:8, @aa:16		; 6 a 1 1??? aa:16 8 ???? xxxxxxxx
-	# add.b #xx:8, @aa:32		; 6 a 3 1??? aa:32 8 ???? xxxxxxxx
-	# add.b rs, rd		;                     0 8 rs rd
-	# add.b reg8, @erd	;         7 d rd ???? 0 8 rs ????
-	# add.b reg8, @erd+	;         0 1 7     9 8 rd 1 rs
-	# add.b reg8, @erd-	;         0 1 7     9 a rd 1 rs
-	# add.b reg8, @+erd	;         0 1 7     9 9 rd 1 rs
-	# add.b reg8, @-erd	;         0 1 7     9 b rd 1 rs
-	# add.b reg8, @(d:16, erd)	; 0 1 7 9 c b30 | rd32, 1 rs8 imm16
-	# add.b reg8, @(d:32, erd)	; 0 1 7 9 d b31 | rd32, 1 rs8 imm32
-	# add.b reg8, @aa:8		; 7 f aaaaaaaa 0 8 rs ????
-	# add.b reg8, @aa:16		; 6 a 1 1??? aa:16 0 8 rs ????
-	# add.b reg8, @aa:32		; 6 a 3 1??? aa:32 0 8 rs ????
-	#
-
-	# Coming soon:
-	# add.b #xx:8, @(d:2, erd)	; 0 1 7 b30 | b21 | dd:2,  8 ???? xxxxxxxx
-	# add.b reg8, @(d:2, erd)	; 0 1 7 9 dd:2 rd32 1 rs8
-	# ...
-
-.data
-pre_byte:	.byte 0
-byte_dest:	.byte 0
-post_byte:	.byte 0
-
-	start
-	
-add_b_imm8_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  add.b #xx:8,Rd
-	add.b	#5:8, r0l	; Immediate 8-bit src, reg8 dst
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5aa r0	; add result:	a5 + 5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5aa er0	; add result:	 a5 + 5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-add_b_imm8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@eRd
-	mov	#byte_dest, er0
-	add.b	#5:8, @er0	; Immediate 8-bit src, reg indirect dst
-;;; 	.word	0x7d00
-;;; 	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 byte_dest, er0	; er0 still contains address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#5, r0l
-	beq	.L1
-	fail
-.L1:
-
-add_b_imm8_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@eRd+
-	mov	#byte_dest, er0
-	add.b	#5:8, @er0+	; Immediate 8-bit src, reg post-inc dst
-;;; 	.word	0x0174
-;;; 	.word	0x6c08
-;;; 	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 post_byte, er0	; er0 contains address plus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#10, r0l
-	beq	.L2
-	fail
-.L2:
-
-add_b_imm8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@eRd-
-	mov	#byte_dest, er0
-	add.b	#5:8, @er0-	; Immediate 8-bit src, reg post-dec dst
-;;; 	.word	0x0176
-;;; 	.word	0x6c08
-;;; 	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 pre_byte, er0	; er0 contains address minus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#15, r0l
-	beq	.L3
-	fail
-.L3:
-
-add_b_imm8_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@+eRd
-	mov	#pre_byte, er0
-	add.b	#5:8, @+er0	; Immediate 8-bit src, reg pre-inc dst
-;;; 	.word	0x0175
-;;; 	.word	0x6c08
-;;; 	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 byte_dest, er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#20, r0l
-	beq	.L4
-	fail
-.L4:
-
-add_b_imm8_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@-eRd
-	mov	#post_byte, er0
-	add.b	#5:8, @-er0	; Immediate 8-bit src, reg pre-dec dst
-;;; 	.word	0x0177
-;;; 	.word	0x6c08
-;;; 	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 byte_dest, er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#25, r0l
-	beq	.L5
-	fail
-.L5:
-
-add_b_imm8_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@(dd:16, eRd)
-	mov	#post_byte, er0
-	add.b	#5:8, @(-1:16, er0)	; Immediate 8-bit src, 16-bit reg disp dest.
-;;; 	.word	0x0174
-;;; 	.word	0x6e08
-;;; 	.word	0xffff
-;;; 	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32   post_byte, er0	; er0 contains address plus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#30, r0l
-	beq	.L6
-	fail
-.L6:
-
-add_b_imm8_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@(dd:32, eRd)
-	mov	#pre_byte, er0
-	add.b	#5:8, @(1:32, er0)	; Immediate 8-bit src, 32-bit reg disp. dest.
-;;; 	.word	0x7804
-;;; 	.word	0x6a28
-;;; 	.word	0x0000
-;;; 	.word	0x0001
-;;; 	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 pre_byte, er0	; er0 contains address minus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#35, r0l
-	beq	.L7
-	fail
-.L7:
-
-add_b_imm8_abs8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b reg8,@aa:8
-	;; NOTE: for abs8, we will use the SBR register as a base,
-	;; since otherwise we would have to make sure that the destination
-	;; was in the zero page.
-	;;
-	mov	#byte_dest-100, er0
-	ldc	er0, sbr
-	add.b	#5, @100:8	; 8-bit reg src, 8-bit absolute dest
-;;; 	.word	0x7f64
-;;; 	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32  byte_dest-100, er0	; reg 0 has base address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#40, r0l
-	beq	.L8
-	fail
-.L8:
-
-add_b_imm8_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@aa:16
-	add.b	#5:8, @byte_dest:16	; Immediate 8-bit src, 16-bit absolute dest
-;;;  	.word	0x6a18
-;;; 	.word	byte_dest
-;;;  	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#45, r0l
-	beq	.L9
-	fail
-.L9:
-
-add_b_imm8_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b #xx:8,@aa:32
-	add.b	#5:8, @byte_dest:32	; Immediate 8-bit src, 32-bit absolute dest
-;;;  	.word	0x6a38
-;;; 	.long	byte_dest
-;;;  	.word	0x8005
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#50, r0l
-	beq	.L10
-	fail
-.L10:
-
-.endif
-
-add_b_reg8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  add.b Rs,Rd
-	mov.b	#5, r0h
-	add.b	r0h, r0l	; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0x05aa r0	; add result:	a5 + 5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a505aa er0	; add result:	a5 + 5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-add_b_reg8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b rs8,@eRd	; Add to register indirect
-	mov	#byte_dest, er0
-	mov	#5, r1l
-	add.b	r1l, @er0	; reg8 src, reg indirect dest
-;;; 	.word	0x7d00
-;;; 	.word	0x0890
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0	; er0 still contains address
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#55, r0l
-	beq	.L11
-	fail
-.L11:
-
-add_b_reg8_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b rs8,@eRd+	; Add to register post-increment
-	mov	#byte_dest, er0
-	mov	#5, r1l
-	add.b	r1l, @er0+	; reg8 src, reg post-incr dest
-;;; 	.word	0x0179
-;;; 	.word	0x8019
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 post_byte er0	; er0 contains address plus one
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#60, r0l
-	beq	.L12
-	fail
-.L12:
-
-add_b_reg8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b rs8,@eRd-	; Add to register post-decrement
-	mov	#byte_dest, er0
-	mov	#5, r1l
-	add.b	r1l, @er0-	; reg8 src, reg post-decr dest
-;;; 	.word	0x0179
-;;; 	.word	0xa019
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#65, r0l
-	beq	.L13
-	fail
-.L13:
-
-add_b_reg8_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b rs8,@+eRd	; Add to register pre-increment
-	mov	#pre_byte, er0
-	mov	#5, r1l
-	add.b	r1l, @+er0	; reg8 src, reg pre-incr dest
-;;; 	.word	0x0179
-;;; 	.word	0x9019
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#70, r0l
-	beq	.L14
-	fail
-.L14:
-
-add_b_reg8_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b rs8,@-eRd	; Add to register pre-decrement
-	mov	#post_byte, er0
-	mov	#5, r1l
-	add.b	r1l, @-er0	; reg8 src, reg pre-decr dest
-;;; 	.word	0x0179
-;;; 	.word	0xb019
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#75, r0l
-	beq	.L15
-	fail
-.L15:
-
-add_b_reg8_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b rs8,@(dd:16, eRd)	; Add to register + 16-bit displacement
-	mov	#pre_byte, er0
-	mov	#5, r1l
-	add.b	r1l, @(1:16, er0)	; reg8 src, 16-bit reg disp dest
-;;;  	.word	0x0179
-;;;  	.word	0xc019
-;;;  	.word	0x0001
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#80, r0l
-	beq	.L16
-	fail
-.L16:
-
-add_b_reg8_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b rs8,@-eRd	; Add to register plus 32-bit displacement
-	mov	#post_byte, er0
-	mov	#5, r1l
-	add.b	r1l, @(-1:32, er0)	; reg8 src, 32-bit reg disp dest
-;;; 	.word	0x0179
-;;; 	.word	0xd819
-;;; 	.word	0xffff
-;;; 	.word	0xffff
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 post_byte er0	; er0 contains address plus one
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#85, r0l
-	beq	.L17
-	fail
-.L17:
-
-add_b_reg8_abs8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b reg8,@aa:8
-	;; NOTE: for abs8, we will use the SBR register as a base,
-	;; since otherwise we would have to make sure that the destination
-	;; was in the zero page.
-	;;
-	mov	#byte_dest-100, er0
-	ldc	er0, sbr
-	mov	#5, r1l
-	add.b	r1l, @100:8	; 8-bit reg src, 8-bit absolute dest
-;;; 	.word	0x7f64
-;;; 	.word	0x0890
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32  byte_dest-100, er0	; reg 0 has base address
-	test_h_gr32  0xa5a5a505 er1	; reg 1 has test load
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#90, r0l
-	beq	.L18
-	fail
-.L18:
-
-add_b_reg8_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b reg8,@aa:16
-	mov	#5, r0l
-	add.b	r0l, @byte_dest:16	; 8-bit reg src, 16-bit absolute dest
-;;; 	.word	0x6a18
-;;; 	.word	byte_dest
-;;; 	.word	0x0880
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32  0xa5a5a505 er0	; reg 0 has test load
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#95, r0l
-	beq	.L19
-	fail
-.L19:
-
-add_b_reg8_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.b reg8,@aa:32
-	mov	#5, r0l
-	add.b	r0l, @byte_dest:32	; 8-bit reg src, 32-bit absolute dest
-;;; 	.word	0x6a38
-;;; 	.long	byte_dest
-;;; 	.word	0x0880
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a5a505 er0	; reg 0 has test load
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#100, r0l
-	beq	.L20
-	fail
-.L20:
-
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/addl.s b/sim/testsuite/sim/h8300/addl.s
deleted file mode 100644
index 586fcf64f24..00000000000
--- a/sim/testsuite/sim/h8300/addl.s
+++ /dev/null
@@ -1,1865 +0,0 @@
-# Hitachi H8 testcase 'add.l'
-# mach(): h8300h h8300s h8sx
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# add.l xx:3, erd
-	# add.l xx:16, erd
-	# add.l xx:32, erd
-	# add.l xx:16, @erd
-	# add.l xx:16, @erd+
-	# add.l xx:16, @erd-
-	# add.l xx:16, @+erd
-	# add.l xx:16, @-erd
-	# add.l xx:16, @(dd:2, erd)
-	# add.l xx:16, @(dd:16, erd)
-	# add.l xx:16, @(dd:32, erd)
-	# add.l xx:16, @aa:16
-	# add.l xx:16, @aa:32
-	# add.l xx:32, @erd+
-	# add.l xx:32, @erd-
-	# add.l xx:32, @+erd
-	# add.l xx:32, @-erd
-	# add.l xx:32, @(dd:2, erd)
-	# add.l xx:32, @(dd:16, erd)
-	# add.l xx:32, @(dd:32, erd)
-	# add.l xx:32, @aa:16
-	# add.l xx:32, @aa:32
-	# add.l ers, erd
-	# add.l ers, @erd
-	# add.l ers, @erd+
-	# add.l ers, @erd-
-	# add.l ers, @+erd
-	# add.l ers, @-erd
-	# add.l ers, @(dd:2, erd)
-	# add.l ers, @(dd:16, erd)
-	# add.l ers, @(dd:32, erd)
-	# add.l ers, @aa:16
-	# add.l ers, @aa:32
-	# add.l ers, erd
-	# add.l @ers, erd
-	# add.l @ers+, erd
-	# add.l @ers-, erd
-	# add.l @+ers, erd
-	# add.l @-ers, erd
-	# add.l @(dd:2, ers), erd
-	# add.l @(dd:16, ers), erd
-	# add.l @(dd:32, ers), erd
-	# add.l @aa:16, erd
-	# add.l @aa:32, erd
-	# add.l @ers, @erd
-	# add.l @ers+, @erd+
-	# add.l @ers-, @erd-
-	# add.l @+ers, +@erd
-	# add.l @-ers, @-erd
-	# add.l @(dd:2, ers), @(dd:2, erd)
-	# add.l @(dd:16, ers), @(dd:16, erd)
-	# add.l @(dd:32, ers), @(dd:32, erd)
-	# add.l @aa:16, @aa:16
-	# add.l @aa:32, @aa:32
-
-	start
-
-	.data
-	.align	4
-long_src:
-	.long	0x12345678
-long_dst:
-	.long	0x87654321
-
-	.text
-
-	;;
-	;; Add long from immediate source
-	;; 
-
-.if (sim_cpu == h8sx)
-add_l_imm3_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:3, erd
-	add.l	#0x3:3, er0	; Immediate 16-bit operand
-;;;	.word	0x0ab8
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a5a8 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_imm16_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, erd
-	add.l	#0x1234, er0	; Immediate 16-bit operand
-;;;	.word	0x7a18
-;;;	.word	0x1234
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5b7d9 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-add_l_imm32_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, erd
-	add.l	#0x12345678, er0	; Immediate 32-bit operand
-;;;	.word	0x7a10
-;;;	.long	0x12345678
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-add_l_imm16_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @erd
-	mov.l	#long_dst, er1
-	add.l	#0xdead:16, @er1	; Register indirect operand
-;;;	.word	0x010e
-;;;	.word	0x0110
-;;;	.word	0xdead
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext11
-	fail
-.Lnext11:
-	mov.l	#0x87654321, @long_dst	; Initialize it again for the next use.
-
-add_l_imm16_to_postinc:		; post-increment from imm16 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @erd+
-	mov.l	#long_dst, er1
-	add.l	#0xdead:16, @er1+	; Imm16, register post-incr operands.
-;;;	.word	0x010e
-;;;	.word	0x8110
-;;;	.word	0xdead
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst+4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext12
-	fail
-.Lnext12:
-	mov.l	#0x87654321, @long_dst	; initialize it again for the next use.
-
-add_l_imm16_to_postdec:		; post-decrement from imm16 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @erd-
-	mov.l	#long_dst, er1
-	add.l	#0xdead:16, @er1-	; Imm16, register post-decr operands.
-;;;	.word	0x010e
-;;;	.word	0xa110
-;;;	.word	0xdead
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext13
-	fail
-.Lnext13:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm16_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @+erd
-	mov.l	#long_dst-4, er1
-	add.l	#0xdead:16, @+er1	; Imm16, register pre-incr operands
-;;;	.word	0x010e
-;;;	.word	0x9110
-;;;	.word	0xdead
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext14
-	fail
-.Lnext14:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm16_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @-erd
-	mov.l	#long_dst+4, er1
-	add.l	#0xdead:16, @-er1	; Imm16, register pre-decr operands
-;;;	.word	0x010e
-;;;	.word	0xb110
-;;;	.word	0xdead
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext15
-	fail
-.Lnext15:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm16_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @(dd:2, erd)
-	mov.l	#long_dst-12, er1
-	add.l	#0xdead:16, @(12:2, er1) ; Imm16, reg plus 2-bit disp. operand
-;;;	.word	0x010e
-;;;	.word	0x3110
-;;;	.word	0xdead
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-12, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext16
-	fail
-.Lnext16:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm16_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @(dd:16, erd)
-	mov.l	#long_dst-4, er1
-	add.l	#0xdead:16, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x010e
-;;;	.word	0xc110
-;;;	.word	0xdead
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext17
-	fail
-.Lnext17:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm16_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @(dd:32, erd)
-	mov.l	#long_dst-8, er1
-	add.l	#0xdead:16, @(8:32, er1)   ; Register plus 32-bit disp. operand
-;;;	.word	0x010e
-;;;	.word	0xc910
-;;;	.word	0xdead
-;;;	.long	8
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-8, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext18
-	fail
-.Lnext18:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm16_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @aa:16
-	add.l	#0xdead:16, @long_dst:16	; 16-bit address-direct operand
-;;;	.word	0x010e
-;;;	.word	0x4010
-;;;	.word	0xdead
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext19
-	fail
-.Lnext19:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm16_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:16, @aa:32
-	add.l	#0xdead:16, @long_dst:32	; 32-bit address-direct operand
-;;;	.word	0x010e
-;;;	.word	0x4810
-;;;	.word	0xdead
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x876621ce, @long_dst
-	beq	.Lnext20
-	fail
-.Lnext20:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @erd
-	mov.l	#long_dst, er1
-	add.l	#0xcafedead:32, @er1	; Register indirect operand
-;;;	.word	0x010e
-;;;	.word	0x0118
-;;;	.long	0xcafedead
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext21
-	fail
-.Lnext21:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_postinc:		; post-increment from imm32 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @erd+
-	mov.l	#long_dst, er1
-	add.l	#0xcafedead:32, @er1+	; Imm32, register post-incr operands.
-;;;	.word	0x010e
-;;;	.word	0x8118
-;;;	.long	0xcafedead
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst+4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext22
-	fail
-.Lnext22:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_postdec:		; post-decrement from imm32 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @erd-
-	mov.l	#long_dst, er1
-	add.l	#0xcafedead:32, @er1-	; Imm32, register post-decr operands.
-;;;	.word	0x010e
-;;;	.word	0xa118
-;;;	.long	0xcafedead
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext23
-	fail
-.Lnext23:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @+erd
-	mov.l	#long_dst-4, er1
-	add.l	#0xcafedead:32, @+er1	; Imm32, register pre-incr operands
-;;;	.word	0x010e
-;;;	.word	0x9118
-;;;	.long	0xcafedead
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext24
-	fail
-.Lnext24:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @-erd
-	mov.l	#long_dst+4, er1
-	add.l	#0xcafedead:32, @-er1	; Imm32, register pre-decr operands
-;;;	.word	0x010e
-;;;	.word	0xb118
-;;;	.long	0xcafedead
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext25
-	fail
-.Lnext25:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @(dd:2, erd)
-	mov.l	#long_dst-12, er1
-	add.l	#0xcafedead:32, @(12:2, er1) ; Imm32, reg plus 2-bit disp. operand
-;;;	.word	0x010e
-;;;	.word	0x3118
-;;;	.long	0xcafedead
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-12, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext26
-	fail
-.Lnext26:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @(dd:16, erd)
-	mov.l	#long_dst-4, er1
-	add.l	#0xcafedead:32, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x010e
-;;;	.word	0xc118
-;;;	.long	0xcafedead
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext27
-	fail
-.Lnext27:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @(dd:32, erd)
-	mov.l	#long_dst-8, er1
-	add.l	#0xcafedead:32, @(8:32, er1)   ; Register plus 32-bit disp. operand
-;;;	.word	0x010e
-;;;	.word	0xc918
-;;;	.long	0xcafedead
-;;;	.long	8
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-8, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext28
-	fail
-.Lnext28:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l #xx:32, @aa:16
-	add.l	#0xcafedead:32, @long_dst:16	; 16-bit address-direct operand
-;;;	.word	0x010e
-;;;	.word	0x4018
-;;;	.long	0xcafedead
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext29
-	fail
-.Lnext29:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_imm32_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  add.l #xx:32, @aa:32
-	add.l	#0xcafedead:32, @long_dst:32	; 32-bit address-direct operand
-;;;	.word	0x010e
-;;;	.word	0x4818
-;;;	.long	0xcafedead
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x526421ce, @long_dst
-	beq	.Lnext30
-	fail
-.Lnext30:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-.endif
-
-	;;
-	;; Add long from register source
-	;; 
-
-add_l_reg32_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, erd
-	mov.l	#0x12345678, er1
-	add.l	er1, er0	; Register 32-bit operand
-;;;	.word	0x0a90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-	
-	test_h_gr32 0xb7d9fc1d er0	; add result
-	test_h_gr32 0x12345678 er1	; add src unchanged
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-add_l_reg32_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @erd
-	mov.l	#long_dst, er1
-	add.l	er0, @er1	; Register indirect operand
-;;;	.word	0x0109
-;;;	.word	0x0110
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext44
-	fail
-.Lnext44:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_postinc:		; post-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @erd+
-	mov.l	#long_dst, er1
-	add.l	er0, @er1+	; Register post-incr operand
-;;;	.word	0x0109
-;;;	.word	0x8110
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst+4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext49
-	fail
-.Lnext49:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_postdec:		; post-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @erd-
-	mov.l	#long_dst, er1
-	add.l	er0, @er1-	; Register post-decr operand
-;;;	.word	0x0109
-;;;	.word	0xa110
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext50
-	fail
-.Lnext50:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @+erd
-	mov.l	#long_dst-4, er1
-	add.l	er0, @+er1	; Register pre-incr operand
-;;;	.word	0x0109
-;;;	.word	0x9110
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext51
-	fail
-.Lnext51:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @-erd
-	mov.l	#long_dst+4, er1
-	add.l	er0, @-er1	; Register pre-decr operand
-;;;	.word	0x0109
-;;;	.word	0xb110
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext48
-	fail
-.Lnext48:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @(dd:2, erd)
-	mov.l	#long_dst-12, er1
-	add.l	er0, @(12:2, er1)	; Register plus 2-bit disp. operand
-;;;	.word	0x0109
-;;;	.word	0x3110
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-12, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext52
-	fail
-.Lnext52:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @(dd:16, erd)
-	mov.l	#long_dst-4, er1
-	add.l	er0, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x0109
-;;;	.word	0xc110
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext45
-	fail
-.Lnext45:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @(dd:32, erd)
-	mov.l	#long_dst-8, er1
-	add.l	er0, @(8:32, er1)	; Register plus 32-bit disp. operand
-;;;	.word	0x0109
-;;;	.word	0xc910
-;;;	.long	8
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_h_gr32	long_dst-8, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext46
-	fail
-.Lnext46:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @aa:16
-	add.l	er0, @long_dst:16	; 16-bit address-direct operand
-;;;	.word	0x0109
-;;;	.word	0x4110
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext41
-	fail
-.Lnext41:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-add_l_reg32_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l ers, @aa:32
-	add.l	er0, @long_dst:32	; 32-bit address-direct operand
-;;;	.word	0x0109
-;;;	.word	0x4910
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=1 C=1
-	test_neg_clear
-	test_zero_clear
-	test_ovf_set
-	test_carry_set
-	
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x2d0ae8c6, @long_dst
-	beq	.Lnext42
-	fail
-.Lnext42:
-	mov.l	#0x87654321, @long_dst	; Re-initialize it for the next use.
-
-	;;
-	;; Add long to register destination.
-	;; 
-
-add_l_indirect_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @ers, Rd
-	mov.l	#long_src, er1
-	add.l	@er1, er0	; Register indirect operand
-;;;	.word	0x010a
-;;;	.word	0x0110
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0
-
-	test_h_gr32	long_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_postinc_to_reg32:		; post-increment from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @ers+, erd
-	mov.l	#long_src, er1
-	add.l	@er1+, er0	; Register post-incr operand
-;;;	.word	0x010a
-;;;	.word	0x8110
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0
-
-	test_h_gr32	long_src+4, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_postdec_to_reg32:		; post-decrement from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @ers-, erd
-	mov.l	#long_src, er1
-	add.l	@er1-, er0	; Register post-decr operand
-;;;	.word	0x010a
-;;;	.word	0xa110
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0
-
-	test_h_gr32	long_src-4, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_preinc_to_reg32:		; pre-increment from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @+ers, erd
-	mov.l	#long_src-4, er1
-	add.l	@+er1, er0	; Register pre-incr operand
-;;;	.word	0x010a
-;;;	.word	0x9110
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0
-
-	test_h_gr32	long_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_predec_to_reg32:		; pre-decrement from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @-ers, erd
-	mov.l	#long_src+4, er1
-	add.l	@-er1, er0	; Register pre-decr operand
-;;;	.word	0x010a
-;;;	.word	0xb110
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0
-
-	test_h_gr32	long_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	
-add_l_disp2_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @(dd:2, ers), erd
-	mov.l	#long_src-4, er1
-	add.l	@(4:2, er1), er0	; Register plus 2-bit disp. operand
-;;; 	.word	0x010a
-;;; 	.word	0x1110
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	long_src-4, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_disp16_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @(dd:16, ers), erd
-	mov.l	#long_src+0x1234, er1
-	add.l	@(-0x1234:16, er1), er0	; Register plus 16-bit disp. operand
-;;;	.word	0x010a
-;;;	.word	0xc110
-;;;	.word	-0x1234
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	long_src+0x1234, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_disp32_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @(dd:32, ers), erd
-	mov.l	#long_src+65536, er1
-	add.l	@(-65536:32, er1), er0	; Register plus 32-bit disp. operand
-;;;	.word	0x010a
-;;;	.word	0xc910
-;;;	.long	-65536
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	long_src+65536, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_abs16_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @aa:16, erd
-	add.l	@long_src:16, er0	; 16-bit address-direct operand
-;;;	.word	0x010a
-;;;	.word	0x4010
-;;;	.word	@long_src
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-add_l_abs32_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @aa:32, erd
-	add.l	@long_src:32, er0	; 32-bit address-direct operand
-;;;	.word	0x010a
-;;;	.word	0x4810
-;;;	.long	@long_src
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xb7d9fc1d er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-
-	;;
-	;; Add long from memory to memory
-	;; 
-
-add_l_indirect_to_indirect:	; reg indirect, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @ers, @erd
-	mov.l	#long_src, er1
-	mov.l	#long_dst, er0
-	add.l	@er1, @er0
-;;;	.word	0x0104
-;;;	.word	0x691c
-;;;	.word	0x0010
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst er0
-	test_h_gr32  long_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst	; FIXME
-	beq	.Lnext55
-	fail
-.Lnext55:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext56
-	fail
-.Lnext56:			; OK, pass on.
-
-add_l_postinc_to_postinc:	; reg post-increment, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @ers+, @erd+
-	mov.l	#long_src, er1
-	mov.l	#long_dst, er0
-	add.l	@er1+, @er0+
-;;;	.word	0x0104
-;;;	.word	0x6d1c
-;;;	.word	0x8010
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst+4 er0
-	test_h_gr32  long_src+4 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext65
-	fail
-.Lnext65:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext66
-	fail
-.Lnext66:			; OK, pass on.
-
-add_l_postdec_to_postdec:	; reg post-decrement, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @ers-, @erd-
-	mov.l	#long_src, er1
-	mov.l	#long_dst, er0
-	add.l	@er1-, @er0-
-;;;	.word	0x0106
-;;;	.word	0x6d1c
-;;;	.word	0xa010
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst-4 er0
-	test_h_gr32  long_src-4 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext75
-	fail
-.Lnext75:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext76
-	fail
-.Lnext76:			; OK, pass on.
-
-add_l_preinc_to_preinc:		; reg pre-increment, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @+ers, @+erd
-	mov.l	#long_src-4, er1
-	mov.l	#long_dst-4, er0
-	add.l	@+er1, @+er0
-;;;	.word	0x0105
-;;;	.word	0x6d1c
-;;;	.word	0x9010
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst er0
-	test_h_gr32  long_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext85
-	fail
-.Lnext85:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext86
-	fail
-.Lnext86:				; OK, pass on.
-
-add_l_predec_to_predec:		; reg pre-decrement, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @-ers, @-erd
-	mov.l	#long_src+4, er1
-	mov.l	#long_dst+4, er0
-	add.l	@-er1, @-er0
-;;;	.word	0x0107
-;;;	.word	0x6d1c
-;;;	.word	0xb010
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst er0
-	test_h_gr32  long_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext95
-	fail
-.Lnext95:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext96
-	fail
-.Lnext96:			; OK, pass on.
-
-add_l_disp2_to_disp2:		; reg 2-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @(dd:2, ers), @(dd:2, erd)
-	mov.l	#long_src-4, er1
-	mov.l	#long_dst-8, er0
-	add.l	@(4:2, er1), @(8:2, er0)
-;;; 	.word	0x0105
-;;;	.word	0x691c
-;;; 	.word	0x2010
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst-8 er0
-	test_h_gr32  long_src-4 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext105
-	fail
-.Lnext105:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext106
-	fail
-.Lnext106:			; OK, pass on.
-
-add_l_disp16_to_disp16:		; reg 16-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @(dd:16, ers), @(dd:16, erd)
-	mov.l	#long_src-1, er1
-	mov.l	#long_dst-2, er0
-	add.l	@(1:16, er1), @(2:16, er0)
-;;; 	.word	0x0104
-;;;	.word	0x6f1c
-;;; 	.word	0x0001
-;;; 	.word	0xc010
-;;; 	.word	0x0002
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst-2 er0
-	test_h_gr32  long_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext115
-	fail
-.Lnext115:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext116
-	fail
-.Lnext116:			; OK, pass on.
-
-add_l_disp32_to_disp32:		; reg 32-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @(dd:32, ers), @(dd:32, erd)
-	mov.l	#long_src-1, er1
-	mov.l	#long_dst-2, er0
-	add.l	@(1:32, er1), @(2:32, er0)
-;;; 	.word	0x7894
-;;;	.word	0x6b2c
-;;; 	.word	0xc9c8
-;;;	.long	1
-;;;	.word	0xc810
-;;;	.long	2
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst-2 er0
-	test_h_gr32  long_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext125
-	fail
-.Lnext125:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext126
-	fail
-.Lnext126:				; OK, pass on.
-
-add_l_abs16_to_abs16:		; 16-bit absolute addr, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @aa:16, @aa:16
-	add.l	@long_src:16, @long_dst:16
-;;; 	.word	0x0104
-;;;	.word	0x6b0c
-;;;	.word	@long_src
-;;; 	.word	0x4010
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-
-	test_gr_a5a5 0		; Make sure *NO* general registers are changed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext135
-	fail
-.Lnext135:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext136
-	fail
-.Lnext136:				; OK, pass on.
-
-add_l_abs32_to_abs32:		; 32-bit absolute addr, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; add.l @aa:32, @aa:32
-	add.l	@long_src:32, @long_dst:32
-;;; 	.word	0x0104
-;;;	.word	0x6b2c
-;;;	.long	@long_src
-;;; 	.word	0x4810
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure *NO* general registers are changed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0x99999999, @long_dst
-	beq	.Lnext145
-	fail
-.Lnext145:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0x87654321, @long_dst
-	cmp.l	#0x99999999, @long_dst
-	bne	.Lnext146
-	fail
-.Lnext146:				; OK, pass on.
-
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/adds.s b/sim/testsuite/sim/h8300/adds.s
deleted file mode 100644
index 9789e87906a..00000000000
--- a/sim/testsuite/sim/h8300/adds.s
+++ /dev/null
@@ -1,74 +0,0 @@
-# Hitachi H8 testcase 'adds'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# adds #1, erd		; 0 b 0 xerd
-	# adds #2, erd		; 0 b 8 xerd
-	# adds #4, erd		; 0 b 9 xerd
-	#
-
-	start
-.if (sim_cpu)			; 32 bit only
-adds_1:	
-	set_grs_a5a5
-	set_ccr_zero
-
-	adds	#1, er0
-
-	test_cc_clear		; adds should not affect any condition codes
-	test_h_gr32  0xa5a5a5a6 er0	; result of adds #1
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-adds_2:
-	set_grs_a5a5
-	set_ccr_zero
-
-	adds	#2, er0
-
-	test_cc_clear		; adds should not affect any condition codes
-	test_h_gr32  0xa5a5a5a7 er0	; result of adds #2
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-adds_4:	
-	set_grs_a5a5
-	set_ccr_zero
-
-	adds	#4, er0
-
-	test_cc_clear		; adds should not affect any condition codes
-	test_h_gr32  0xa5a5a5a9 er0	; result of adds #4
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	pass
-.endif	
-	exit 0
diff --git a/sim/testsuite/sim/h8300/addw.s b/sim/testsuite/sim/h8300/addw.s
deleted file mode 100644
index c38bf69f127..00000000000
--- a/sim/testsuite/sim/h8300/addw.s
+++ /dev/null
@@ -1,87 +0,0 @@
-# Hitachi H8 testcase 'add.w'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# add.w xx:3, rd	; 0 a 0xxx rd	(sx only)
-	# add.w xx:16, rd	; 7 9 1 rd imm16
-	# add.w rs, rd		; 0 9 rs rd
-	#
-
-	start
-	
-.if (sim_cpu == h8sx)		; 3-bit immediate mode only for h8sx
-add_w_imm3:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  add.w #xx:3,Rd	; Immediate 3-bit operand
-	add.w	#7, r0		; FIXME will not assemble yet
-;	.word	0x0a70		; Fake it until assembler will take it.
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5ac r0	; add result:	a5a5 + 7
-	test_h_gr32 0xa5a5a5ac er0	; add result:	a5a5 + 7
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-	
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-add_w_imm16:
-	;; add.w immediate not available in h8300 mode.
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  add.w #xx:16,Rd
-	add.w	#0x111, r0	; Immediate 16-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa6b6 r0	; add result:	a5a5 + 111
-	test_h_gr32 0xa5a5a6b6 er0	; add result:	a5a5 + 111
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-	
-add_w_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  add.w Rs,Rd
-	mov.w	#0x111, r1
-	add.w	r1, r0		; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa6b6 r0	; add result:	a5a5 + 111
-	test_h_gr16 0x0111 r1
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a6b6 er0	; add result:	a5a5 + 111
-	test_h_gr32 0xa5a50111 er1
-.endif
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/addx.s b/sim/testsuite/sim/h8300/addx.s
deleted file mode 100644
index ef4e9d3b5cd..00000000000
--- a/sim/testsuite/sim/h8300/addx.s
+++ /dev/null
@@ -1,992 +0,0 @@
-# Hitachi H8 testcase 'addx'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# addx.b #xx:8, rd8	; 9 rd8 xxxxxxxx
-	# addx.b #xx:8, @erd	; 7 d erd ???? 9 ???? xxxxxxxx 
-	# addx.b #xx:8, @erd-	; 0 1 7 6 6 c erd 1??? 9 ???? xxxxxxxx
-	# addx.b rs8, rd8	; 0 e rs8 rd8
-	# addx.b rs8, @erd	; 7 d erd ???? 0 e rs8 ????
-	# addx.b rs8, @erd-	; 0 1 7 6 6 c erd 1??? 0 e rs8 ????
-	# addx.b @ers, rd8	; 7 c ers ???? 0 e ???? rd8
-	# addx.b @ers-, rd8	; 0 1 7 6 6 c ers 00?? 0 e ???? rd8
-	# addx.b @ers, @erd	; 0 1 7 4 6 8 ers d 0 erd 1 ???? 
-	# addx.b @ers-, @erd-	; 0 1 7 6 6 c ers d a erd 1 ????
-	#
-	# word ops
-	# long ops	
-
-.data
-byte_src:	.byte 0x5
-byte_dest:	.byte 0
-
-	.align 2
-word_src:	.word 0x505
-word_dest:	.word 0
-
-	.align 4
-long_src:	.long 0x50505
-long_dest:	.long 0
-
-
-	start
-
-addx_b_imm8_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b #xx:8,Rd	; Addx with carry initially zero.
-	addx.b	#5, r0l		; Immediate 8-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0xa5aa r0	; add result:	a5 + 5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5aa er0	; add result:	 a5 + 5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-addx_b_imm8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b #xx:8,Rd	; Addx with carry initially one.
-	set_carry_flag
-	addx.b	#5, r0l		; Immediate 8-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0xa5ab r0	; add result:	a5 + 5 + 1
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5ab er0	; add result:	 a5 + 5 + 1
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-addx_b_imm8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b #xx:8,@eRd	; Addx to register indirect
-	mov	#byte_dest, er0
-	addx.b	#5, @er0
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0	; er0 still contains address
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.b	#5, @byte_dest
-	beq	.Lb1
-	fail
-.Lb1:
-
-addx_b_imm8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b #xx:8,@eRd-	; Addx to register post-decrement
-	mov	#byte_dest, er0
-	addx.b	#5, @er0-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-1 er0	; er0 contains address minus one
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.b	#10, @byte_dest
-	beq	.Lb2
-	fail
-.Lb2:
-.endif
-
-addx_b_reg8_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b Rs,Rd	; addx with carry initially zero
-	mov.b	#5, r0h
-	addx.b	r0h, r0l	; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0x05aa r0	; add result:	a5 + 5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a505aa er0	; add result:	a5 + 5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b Rs,Rd	; addx with carry initially one
-	mov.b	#5, r0h
-	set_carry_flag
-	addx.b	r0h, r0l	; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0x05ab r0	; add result:	a5 + 5 + 1
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a505ab er0	; add result:	a5 + 5 + 1
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-addx_b_reg8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b rs8,@eRd	; Addx to register indirect
-	mov	#byte_dest, er0
-	mov.b	#5, r1l
-	addx.b	r1l, @er0
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0	; er0 still contains address
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.b	#15, @byte_dest
-	beq	.Lb3
-	fail
-.Lb3:
-
-addx_b_reg8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b rs8,@eRd-	; Addx to register post-decrement
-	mov	#byte_dest, er0
-	mov.b	#5, r1l
-	addx.b	r1l, @er0-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-1 er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5a505 er1	; er1 contains the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.b	#20, @byte_dest
-	beq	.Lb4
-	fail
-.Lb4:
-
-addx_b_rsind_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b @eRs,rd8	; Addx from reg indirect to reg
-	mov	#byte_src, er0
-	addx.b	@er0, r1l
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_src er0	; er0 still contains address
-	test_h_gr32 0xa5a5a5aa er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_b_rspostdec_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b @eRs-,rd8	; Addx to register post-decrement
-	mov	#byte_src, er0
-	addx.b	@er0-, r1l
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_src-1 er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5a5aa er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_b_rsind_rsind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b @eRs,rd8	; Addx from reg indirect to reg
-	mov	#byte_src, er0
-	mov	#byte_dest, er1
-	addx.b	@er0, @er1
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_src er0	; er0 still contains src address
-	test_h_gr32 byte_dest er1	; er1 still contains dst address
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the add to memory.
-	cmp.b	#25, @byte_dest
-	beq	.Lb5
-	fail
-.Lb5:
-
-addx_b_rspostdec_rspostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.b @eRs-,rd8	; Addx to register post-decrement
-	mov	#byte_src, er0
-	mov	#byte_dest, er1
-	addx.b	@er0-, @er1-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_src-1 er0	; er0 contains src address minus one
-	test_h_gr32 byte_dest-1 er1	; er1 contains dst address minus one
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the add to memory.
-	cmp.b	#30, @byte_dest
-	beq	.Lb6
-	fail
-.Lb6:
-
-addx_w_imm16_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w #xx:16,Rd	; Addx with carry initially zero.
-	addx.w	#0x505, r0	; Immediate 16-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0xaaaa r0	; add result:	0xa5a5 + 0x505
-	test_h_gr32 0xa5a5aaaa er0	; add result:	 0xa5a5 + 0x505
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-addx_w_imm16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w #xx:16,Rd	; Addx with carry initially one.
-	set_carry_flag
-	addx.w	#0x505, r0	; Immediate 16-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0xaaab r0	; add result:	0xa5a5 + 0x505 + 1
-	test_h_gr32 0xa5a5aaab er0	; add result:	 0xa5a5 + 0x505 + 1
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-addx_w_imm16_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w #xx:16,@eRd	; Addx to register indirect
-	mov	#word_dest, er0
-	addx.w	#0x505, @er0
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0	; er0 still contains address
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.w	#0x505, @word_dest
-	beq	.Lw1
-	fail
-.Lw1:
-
-addx_w_imm16_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w #xx:16,@eRd-	; Addx to register post-decrement
-	mov	#word_dest, er0
-	addx.w	#0x505, @er0-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-2 er0	; er0 contains address minus one
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.w	#0xa0a, @word_dest
-	beq	.Lw2
-	fail
-.Lw2:
-
-addx_w_reg16_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w Rs,Rd	; addx with carry initially zero
-	mov.w	#0x505, e0
-	addx.w	e0, r0		; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0x0505aaaa er0	; add result:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w Rs,Rd	; addx with carry initially one
-	mov.w	#0x505, e0
-	set_carry_flag
-	addx.w	e0, r0		; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0x0505aaab er0	; add result:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-addx_w_reg16_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w rs8,@eRd	; Addx to register indirect
-	mov	#word_dest, er0
-	mov.w	#0x505, r1
-	addx.w	r1, @er0
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0	; er0 still contains address
-	test_h_gr32 0xa5a50505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.w	#0xf0f, @word_dest
-	beq	.Lw3
-	fail
-.Lw3:
-
-addx_w_reg16_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w rs8,@eRd-	; Addx to register post-decrement
-	mov	#word_dest, er0
-	mov.w	#0x505, r1
-	addx.w	r1, @er0-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-2 er0	; er0 contains address minus one
-	test_h_gr32 0xa5a50505  er1	; er1 contains the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.w	#0x1414, @word_dest
-	beq	.Lw4
-	fail
-.Lw4:
-
-addx_w_rsind_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w @eRs,rd8	; Addx from reg indirect to reg
-	mov	#word_src, er0
-	addx.w	@er0, r1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_src er0	; er0 still contains address
-	test_h_gr32 0xa5a5aaaa er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_w_rspostdec_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w @eRs-,rd8	; Addx to register post-decrement
-	mov	#word_src, er0
-	addx.w	@er0-, r1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_src-2 er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5aaaa er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_w_rsind_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w @eRs,rd8	; Addx from reg indirect to reg
-	mov	#word_src, er0
-	mov	#word_dest, er1
-	addx.w	@er0, @er1
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 word_src er0	; er0 still contains src address
-	test_h_gr32 word_dest er1	; er1 still contains dst address
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the add to memory.
-	cmp.w	#0x1919, @word_dest
-	beq	.Lw5
-	fail
-.Lw5:
-
-addx_w_rspostdec_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.w @eRs-,rd8	; Addx to register post-decrement
-	mov	#word_src, er0
-	mov	#word_dest, er1
-	addx.w	@er0-, @er1-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 word_src-2 er0	; er0 contains src address minus one
-	test_h_gr32 word_dest-2 er1	; er1 contains dst address minus one
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the add to memory.
-	cmp.w	#0x1e1e, @word_dest
-	beq	.Lw6
-	fail
-.Lw6:
-
-addx_l_imm32_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l #xx:32,Rd	; Addx with carry initially zero.
-	addx.l	#0x50505, er0	; Immediate 32-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0xa5aaaaaa er0	; add result:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-addx_l_imm32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l #xx:32,Rd	; Addx with carry initially one.
-	set_carry_flag
-	addx.l	#0x50505, er0	; Immediate 32-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0xa5aaaaab er0	; add result:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-addx_l_imm32_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l #xx:32,@eRd	; Addx to register indirect
-	mov	#long_dest, er0
-	addx.l	#0x50505, @er0
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0	; er0 still contains address
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.l	#0x50505, @long_dest
-	beq	.Ll1
-	fail
-.Ll1:
-
-addx_l_imm32_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l #xx:32,@eRd-	; Addx to register post-decrement
-	mov	#long_dest, er0
-	addx.l	#0x50505, @er0-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-4 er0	; er0 contains address minus one
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.l	#0xa0a0a, @long_dest
-	beq	.Ll2
-	fail
-.Ll2:
-
-addx_l_reg32_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l Rs,Rd	; addx with carry initially zero
-	mov.l	#0x50505, er0
-	addx.l	er0, er1	; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0x50505    er0	; add load
-	test_h_gr32 0xa5aaaaaa er1	; add result:
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l Rs,Rd	; addx with carry initially one
-	mov.l	#0x50505, er0
-	set_carry_flag
-	addx.l	er0, er1	; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0x50505    er0	; add result:
-	test_h_gr32 0xa5aaaaab er1	; add result:
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-addx_l_reg32_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l rs8,@eRd	; Addx to register indirect
-	mov	#long_dest, er0
-	mov.l	#0x50505, er1
-	addx.l	er1, @er0
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0	; er0 still contains address
-	test_h_gr32 0x50505   er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.l	#0xf0f0f, @long_dest
-	beq	.Ll3
-	fail
-.Ll3:
-
-addx_l_reg32_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l rs8,@eRd-	; Addx to register post-decrement
-	mov	#long_dest, er0
-	mov.l	#0x50505, er1
-	addx.l	er1, @er0-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-4 er0	; er0 contains address minus one
-	test_h_gr32 0x50505     er1	; er1 contains the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the add to memory.
-	cmp.l	#0x141414, @long_dest
-	beq	.Ll4
-	fail
-.Ll4:
-
-addx_l_rsind_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l @eRs,rd8	; Addx from reg indirect to reg
-	mov	#long_src, er0
-	addx.l	@er0, er1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_src er0	; er0 still contains address
-	test_h_gr32 0xa5aaaaaa er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_l_rspostdec_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l @eRs-,rd8	; Addx to register post-decrement
-	mov	#long_src, er0
-	addx.l	@er0-, er1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_src-4 er0	; er0 contains address minus one
-	test_h_gr32 0xa5aaaaaa er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-addx_l_rsind_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l @eRs,rd8	; Addx from reg indirect to reg
-	mov	#long_src, er0
-	mov	#long_dest, er1
-	addx.l	@er0, @er1
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 long_src er0	; er0 still contains src address
-	test_h_gr32 long_dest er1	; er1 still contains dst address
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the add to memory.
-	cmp.l	#0x191919, @long_dest
-	beq	.Ll5
-	fail
-.Ll5:
-
-addx_l_rspostdec_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  addx.l @eRs-,rd8	; Addx to register post-decrement
-	mov	#long_src, er0
-	mov	#long_dest, er1
-	addx.l	@er0-, @er1-
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 long_src-4 er0	; er0 contains src address minus one
-	test_h_gr32 long_dest-4 er1	; er1 contains dst address minus one
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the add to memory.
-	cmp.l	#0x1e1e1e, @long_dest
-	beq	.Ll6
-	fail
-.Ll6:
-.endif
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/allinsn.exp b/sim/testsuite/sim/h8300/allinsn.exp
deleted file mode 100644
index 82fedebe211..00000000000
--- a/sim/testsuite/sim/h8300/allinsn.exp
+++ /dev/null
@@ -1,65 +0,0 @@
-# Hitachi H8/300 (h, s, sx) simulator testsuite
-
-set all "h8300 h8300h h8300s h8sx"
-
-if {[istarget h8300*-*-*] || [istarget h8sx*-*-*]} then {
-    run_sim_test addb.s  $all
-    run_sim_test addw.s  $all
-    run_sim_test addl.s  $all
-    run_sim_test adds.s  $all
-    run_sim_test addx.s  $all
-    run_sim_test andb.s  $all
-    run_sim_test andw.s  $all
-    run_sim_test andl.s  $all
-    run_sim_test band.s  $all
-    run_sim_test bfld.s  h8sx
-    run_sim_test biand.s $all
-    run_sim_test bra.s   $all
-    run_sim_test bset.s  $all
-    run_sim_test cmpb.s  $all
-    run_sim_test cmpw.s  $all
-    run_sim_test cmpl.s  $all
-    run_sim_test daa.s   $all
-    run_sim_test das.s   $all
-    run_sim_test dec.s   $all
-    run_sim_test div.s   $all
-    run_sim_test extw.s  $all
-    run_sim_test extl.s  $all
-    run_sim_test inc.s   $all
-    run_sim_test jmp.s   $all
-    run_sim_test ldc.s   $all
-    run_sim_test ldm.s   $all
-    run_sim_test mac.s   $all
-    run_sim_test movb.s  $all
-    run_sim_test movw.s  $all
-    run_sim_test movl.s  $all
-    run_sim_test mova.s  h8sx
-    run_sim_test movmd.s h8sx
-    run_sim_test movsd.s h8sx
-    run_sim_test mul.s   $all
-    run_sim_test neg.s   $all
-    run_sim_test nop.s   $all
-    run_sim_test not.s   $all
-    run_sim_test orb.s   $all
-    run_sim_test orw.s   $all
-    run_sim_test orl.s   $all
-    run_sim_test rotl.s  $all
-    run_sim_test rotr.s  $all
-    run_sim_test rotxl.s $all
-    run_sim_test rotxr.s $all
-    run_sim_test shal.s  $all
-    run_sim_test shar.s  $all
-    run_sim_test shll.s  $all
-    run_sim_test shlr.s  $all
-    run_sim_test stack.s $all
-    run_sim_test stc.s   $all
-    run_sim_test subb.s  $all
-    run_sim_test subw.s  $all
-    run_sim_test subl.s  $all
-    run_sim_test subs.s  $all
-    run_sim_test subx.s  $all
-    run_sim_test tas.s   $all
-    run_sim_test xorb.s  $all
-    run_sim_test xorw.s  $all
-    run_sim_test xorl.s  $all
-}
diff --git a/sim/testsuite/sim/h8300/andb.s b/sim/testsuite/sim/h8300/andb.s
deleted file mode 100644
index 8f11805517d..00000000000
--- a/sim/testsuite/sim/h8300/andb.s
+++ /dev/null
@@ -1,527 +0,0 @@
-# Hitachi H8 testcase 'and.b'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# and.b #xx:8, rd	;                     e rd   xxxxxxxx
-	# and.b #xx:8, @erd	;         7 d rd ???? e ???? xxxxxxxx
-	# and.b #xx:8, @erd+	; 0 1 7 4 6 c rd 1??? e ???? xxxxxxxx
-	# and.b #xx:8, @erd-	; 0 1 7 6 6 c rd 1??? e ???? xxxxxxxx
-	# and.b #xx:8, @+erd	; 0 1 7 5 6 c rd 1??? e ???? xxxxxxxx
-	# and.b #xx:8, @-erd	; 0 1 7 7 6 c rd 1??? e ???? xxxxxxxx
-	# and.b rs, rd		;                     1 6 rs rd
-	# and.b reg8, @erd	;         7 d rd ???? 1 6 rs ????
-	# and.b reg8, @erd+	;         0 1 7     9 8 rd 6 rs
-	# and.b reg8, @erd-	;         0 1 7     9 a rd 6 rs
-	# and.b reg8, @+erd	;         0 1 7     9 9 rd 6 rs
-	# and.b reg8, @-erd	;         0 1 7     9 b rd 6 rs
-	#
-	# andc #xx:8, ccr	;         0 6 xxxxxxxx
-	# andc #xx:8, exr	; 0 1 4 1 0 6 xxxxxxxx
-
-	# Coming soon:
-	# ...
-
-.data
-pre_byte:	.byte 0
-byte_dest:	.byte 0xa5
-post_byte:	.byte 0
-
-	start
-	
-and_b_imm8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  and.b #xx:8,Rd
-	and.b	#0xaa, r0l	; Immediate 8-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a0 r0	; and result:	a5 & aa
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5a0 er0	; and result:	 a5 & aa
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-and_b_imm8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b #xx:8,@eRd
-	mov	#byte_dest, er0
-	and.b	#0xaa:8, @er0	; Immediate 8-bit src, reg indirect dst
-;;; 	.word	0x7d00
-;;; 	.word	0xe0aa
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 byte_dest, er0	; er0 still contains address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa0, r0l
-	beq	.L1
-	fail
-.L1:
-
-and_b_imm8_rdpostinc:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b #xx:8,@eRd+
-	mov	#byte_dest, er0
-	and.b	#0x55:8, @er0+	; Immediate 8-bit src, reg post-incr dest
-;;; 	.word	0x0174
-;;; 	.word	0x6c08
-;;; 	.word	0xe055
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 post_byte, er0	; er0 contains address plus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x05, r0l
-	beq	.L2
-	fail
-.L2:
-
-and_b_imm8_rdpostdec:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b #xx:8,@eRd-
-	mov	#byte_dest, er0
-	and.b	#0xaa:8, @er0-	; Immediate 8-bit src, reg post-decr dest
-;;; 	.word	0x0176
-;;; 	.word	0x6c08
-;;; 	.word	0xe0aa
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 pre_byte, er0	; er0 contains address minus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa0, r0l
-	beq	.L3
-	fail
-.L3:
-
-and_b_imm8_rdpreinc:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b #xx:8,@+eRd
-	mov	#pre_byte, er0
-	and.b	#0x55:8, @+er0	; Immediate 8-bit src, reg pre-incr dest
-;;; 	.word	0x0175
-;;; 	.word	0x6c08
-;;; 	.word	0xe055
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 byte_dest, er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x05, r0l
-	beq	.L4
-	fail
-.L4:
-
-and_b_imm8_rdpredec:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b #xx:8,@-eRd
-	mov	#post_byte, er0
-	and.b	#0xaa:8, @-er0	; Immediate 8-bit src, reg pre-decr dest
-;;; 	.word	0x0177
-;;; 	.word	0x6c08
-;;; 	.word	0xe0aa
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 byte_dest, er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa0, r0l
-	beq	.L5
-	fail
-.L5:
-
-.endif				; h8sx
-
-and_b_reg8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  and.b Rs,Rd
-	mov.b	#0xaa, r0h
-	and.b	r0h, r0l	; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xaaa0 r0	; and result:	a5 & aa
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5aaa0 er0	; and result:	a5 & aa
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-and_b_reg8_rdind:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b rs8,@eRd	; And to register indirect
-	mov	#byte_dest, er0
-	mov	#0x55, r1l
-	and.b	r1l, @er0	; reg8 src, reg indirect dest
-;;; 	.word	0x7d00
-;;; 	.word	0x1690
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0	; er0 still contains address
-	test_h_gr32 0xa5a5a555 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x05, r0l
-	beq	.L6
-	fail
-.L6:
-
-and_b_reg8_rdpostinc:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b rs8,@eRd+	; And to register post-incr
-	mov	#byte_dest, er0
-	mov	#0xaa, r1l
-	and.b	r1l, @er0+	; reg8 src, reg post-incr dest
-;;; 	.word	0x0179
-;;; 	.word	0x8069
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 post_byte er0	; er0 contains address plus one
-	test_h_gr32 0xa5a5a5aa er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa0, r0l
-	beq	.L7
-	fail
-.L7:
-
-and_b_reg8_rdpostdec:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b rs8,@eRd-	; And to register post-decr
-	mov	#byte_dest, er0
-	mov	#0x55, r1l
-	and.b	r1l, @er0-	; reg8 src, reg post-decr dest
-;;; 	.word	0x0179
-;;; 	.word	0xa069
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5a555 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x05, r0l
-	beq	.L8
-	fail
-.L8:
-
-and_b_reg8_rdpreinc:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b rs8,@+eRd	; And to register post-incr
-	mov	#pre_byte, er0
-	mov	#0xaa, r1l
-	and.b	r1l, @+er0	; reg8 src, reg post-incr dest
-;;; 	.word	0x0179
-;;; 	.word	0x9069
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_h_gr32 0xa5a5a5aa er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa0, r0l
-	beq	.L9
-	fail
-.L9:
-
-and_b_reg8_rdpredec:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  and.b rs8,@-eRd	; And to register post-decr
-	mov	#post_byte, er0
-	mov	#0x55, r1l
-	and.b	r1l, @-er0	; reg8 src, reg post-decr dest
-;;; 	.word	0x0179
-;;; 	.word	0xb069
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_h_gr32 0xa5a5a555 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the and to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x05, r0l
-	beq	.L10
-	fail
-.L10:
-.endif				; h8sx
-
-andc_imm8_ccr:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  andc #xx:8,ccr
-	set_ccr 0xff
-
-	test_neg_set
-	andc	#0xf7, ccr	; Immediate 8-bit operand (neg flag)
-	test_neg_clear
-
-	test_zero_set
-	andc	#0xfb, ccr	; Immediate 8-bit operand (zero flag)
-	test_zero_clear
-
-	test_ovf_set
-	andc	#0xfd, ccr	; Immediate 8-bit operand (overflow flag)
-	test_ovf_clear
-
-	test_carry_set
-	andc	#0xfe, ccr	; Immediate 8-bit operand (carry flag)
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8300s || sim_cpu == h8sx)	; Earlier versions, no exr
-andc_imm8_exr:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	ldc	#0xff, exr
-	stc	exr, r0l
-	test_h_gr8 0x87, r0l
-
-	;;  andc #xx:8,exr
-	set_ccr_zero
-	andc	#0x7f, exr
-	test_cc_clear
-	stc	exr, r0l
-	test_h_gr8 0x7, r0l
-
-	andc	#0x3, exr
-	stc	exr, r0l
-	test_h_gr8 0x3, r0l
-
-	andc	#0x1, exr
-	stc	exr, r0l
-	test_h_gr8 0x1, r0l
-
-	andc	#0x0, exr
-	stc	exr, r0l
-	test_h_gr8 0x0, r0l
-
-	test_h_gr32  0xa5a5a500 er0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif				; not h8300 or h8300h
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/andl.s b/sim/testsuite/sim/h8300/andl.s
deleted file mode 100644
index ac09edc1218..00000000000
--- a/sim/testsuite/sim/h8300/andl.s
+++ /dev/null
@@ -1,77 +0,0 @@
-# Hitachi H8 testcase 'and.l'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-	
-.if (sim_cpu == h8sx)		; 16-bit immediate is only available on sx.
-and_l_imm16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  and.l #xx:16,Rd
-	and.l	#0xaaaa:16, er0	; Immediate 16-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0x0000a0a0 er0	; and result:	 a5a5a5a5 & aaaa
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-and_l_imm32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  and.l #xx:32,Rd
-	and.l	#0xaaaaaaaa, er0	; Immediate 32-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa0a0a0a0 er0	; and result:	 a5a5a5a5 & aaaaaaaa
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-and_l_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  and.l Rs,Rd
-	mov.l	#0xaaaaaaaa, er1
-	and.l	er1, er0	; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa0a0a0a0 er0	; and result:	a5a5a5a5 & aaaaaaaa
-	test_h_gr32 0xaaaaaaaa er1	; Make sure er1 is unchanged
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/andw.s b/sim/testsuite/sim/h8300/andw.s
deleted file mode 100644
index 42671790d7f..00000000000
--- a/sim/testsuite/sim/h8300/andw.s
+++ /dev/null
@@ -1,61 +0,0 @@
-# Hitachi H8 testcase 'and.w'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-	
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-and_w_imm16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  and.w #xx:16,Rd
-	and.w	#0xaaaa, r0	; Immediate 16-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa0a0 r0	; and result:	a5a5 & aaaa
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a0a0 er0	; and result:	 a5a5 & aaaa
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-and_w_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  and.w Rs,Rd
-	mov.w	#0xaaaa, r1
-	and.w	r1, r0		; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa0a0 r0	; and result:	a5a5 & aaaa
-	test_h_gr16 0xaaaa r1	; Make sure r1 is unchanged
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a0a0 er0	; and result:	a5a5 & aaaa
-	test_h_gr32 0xa5a5aaaa er1	; Make sure er1 is unchanged
-.endif
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/band.s b/sim/testsuite/sim/h8300/band.s
deleted file mode 100644
index 3c7e5a3aa4e..00000000000
--- a/sim/testsuite/sim/h8300/band.s
+++ /dev/null
@@ -1,525 +0,0 @@
-# Hitachi H8 testcase 'band', 'bor', 'bxor', 'bld', 'bst', 'bstz'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-byte_src:	.byte 0xa5
-byte_dst:	.byte 0
-
-	start
-
-band_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; band xx:3, reg8
-	band	#7, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-	band	#6, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr		; set the carry flag
-	band	#7, r0l		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	band	#6, r0l		; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-band_imm3_ind:
-	set_grs_a5a5
-.if (sim_cpu == h8300)
-	mov	#byte_src, r1
-	set_ccr_zero
-	;; band xx:3, ind
-	band	#7, @r1		; this should NOT set the carry flag.
-	test_cc_clear
-	band	#6, @r1		; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr		; set the carry flag
-	band	#7, @r1		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	band	#6, @r1		; this should clear the carry flag
-	test_cc_clear
-;;; 	test_h_gr16  byte_src r1	;FIXME
-.else
-	mov	#byte_src, er1
-	set_ccr_zero
-	;; band xx:3, ind
-	band	#7, @er1	; this should NOT set the carry flag.
-	test_cc_clear
-	band	#6, @er1	; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr		; set the carry flag
-	band	#7, @er1	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	band	#6, @er1	; this should clear the carry flag
-	test_cc_clear
-	test_h_gr32  byte_src er1
-.endif				; h8300
-	test_gr_a5a5 0		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-band_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; band xx:3, aa:8
-	band	#7, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-	band	#6, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr		; set the carry flag
-	band	#7, @0x20:8	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	band	#6, @0x20:8	; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-.if (sim_cpu > h8300h)
-band_imm3_abs16:
-	set_grs_a5a5
-	set_ccr_zero
-	;; band xx:3, aa:16
-	band	#7, @byte_src:16	; this should NOT set the carry flag.
-	test_cc_clear
-	band	#6, @byte_src:16	; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr			; set the carry flag
-	band	#7, @byte_src:16	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	band	#6, @byte_src:16	; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-band_imm3_abs32:
-	set_grs_a5a5
-	set_ccr_zero
-	;; band xx:3, aa:32
-	band	#7, @byte_src:32	; this should NOT set the carry flag.
-	test_cc_clear
-	band	#6, @byte_src:32	; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr			; set the carry flag
-	band	#7, @byte_src:32	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	band	#6, @byte_src:32	; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-.endif
-
-bor_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bor xx:3, reg8
-	bor	#6, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-
-	bor	#7, r0l		; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	orc	#1, ccr		; set the carry flag
-	bor	#7, r0l		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	bor	#6, r0l		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bor_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bor xx:3, aa:8
-	bor	#6, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-	bor	#7, @0x20:8	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	orc	#1, ccr		; set the carry flag
-	bor	#7, @0x20:8	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	bor	#6, @0x20:8	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bxor_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bxor xx:3, reg8
-	bxor	#6, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-
-	bxor	#7, r0l		; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	orc	#1, ccr		; set the carry flag
-	bxor	#6, r0l		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	bxor	#7, r0l		; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bxor_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bxor xx:3, aa:8
-	bxor	#6, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-	bxor	#7, @0x20:8	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	orc	#1, ccr		; set the carry flag
-	bxor	#6, @0x20:8	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	bxor	#7, @0x20:8	; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bld_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bld xx:3, reg8
-	bld	#6, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-	bld	#7, r0l		; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bld_imm3_ind:
-	set_grs_a5a5
-.if (sim_cpu == h8300)
-	mov	#byte_src, r1
-	set_ccr_zero
-	;; bld xx:3, ind
-	bld	#6, @r1		; this should NOT set the carry flag.
-	test_cc_clear
-	bld	#7, @r1		; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-;;; 	test_h_gr16  byte_src r1	;FIXME
-.else
-	mov	#byte_src, er1
-	set_ccr_zero
-	;; bld xx:3, ind
-	bld	#6, @er1	; this should NOT set the carry flag.
-	test_cc_clear
-	bld	#7, @er1	; this should NOT set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	test_h_gr32  byte_src er1
-.endif				; h8300
-	test_gr_a5a5 0		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-bld_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bld xx:3, aa:8
-	bld	#6, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-	bld	#7, @0x20:8	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-.if (sim_cpu > h8300h)
-bld_imm3_abs16:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bld xx:3, aa:16
-	bld	#6, @byte_src:16	; this should NOT set the carry flag.
-	test_cc_clear
-	bld	#7, @byte_src:16	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bld_imm3_abs32:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bld xx:3, aa:32
-	bld	#6, @byte_src:32	; this should NOT set the carry flag.
-	test_cc_clear
-	bld	#7, @byte_src:32	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-.endif
-
-bst_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bst xx:3, reg8
-	bst	#7, r0l		; this should clear bit 7
-	test_cc_clear
-	test_h_gr16 0xa525 r0
-
-	set_ccr_zero
-	orc	#1, ccr		; set the carry flag
-	bst	#6, r0l		; this should set bit 6
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	test_h_gr16 0xa565 r0
-
-	test_gr_a5a5 1		; Rest of general regs should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-bst_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bst xx:3, aa:8
-	bst	#7, @0x20:8	; this should clear bit 7
-	test_cc_clear
-	mov.b	@0x20, r0l
-	test_h_gr16 0xa525 r0
-
-	set_ccr_zero
-	orc	#1, ccr		; set the carry flag
-	bst	#6, @0x20:8	; this should set bit 6
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	mov.b	@0x20, r0l
-	test_h_gr16 0xa565 r0
-
-	test_gr_a5a5 1		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-bstz_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bstz xx:3, aa:8
-	bstz	#7, @0x20:8	; this should clear bit 7
-	test_cc_clear
-	mov.b	@0x20, r0l
-	test_h_gr16 0xa525 r0
-
-	set_ccr_zero
-	orc	#4, ccr		; set the zero flag
-	bstz	#6, @0x20:8	; this should set bit 6
-	test_carry_clear
-	test_ovf_clear
-	test_neg_clear
-	test_zero_set
-	mov.b	@0x20, r0l
-	test_h_gr16 0xa565 r0
-
-	test_gr_a5a5 1		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif				; h8sx
-
-btst_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; btst xx:3, reg8
-	btst	#7, r0l		; this should NOT set the zero flag.
-	test_cc_clear
-	btst	#6, r0l		; this should set the zero flag.
-	test_carry_clear
-	test_ovf_clear
-	test_neg_clear
-	test_zero_set
-
-	test_grs_a5a5		; general registers should not be changed.
-
-btst_imm3_ind:
-	set_grs_a5a5
-.if (sim_cpu == h8300)
-	mov	#byte_src, r1
-	set_ccr_zero
-	;; btst xx:3, ind
-	btst	#7, @r1		; this should NOT set the zero flag.
-	test_cc_clear
-	btst	#6, @r1		; this should set the zero flag.
-	test_carry_clear
-	test_ovf_clear
-	test_neg_clear
-	test_zero_set
-;;; 	test_h_gr16  byte_src r1	;FIXME
-.else
-	mov	#byte_src, er1
-	set_ccr_zero
-	;; btst xx:3, ind
-	btst	#7, @er1	; this should NOT set the zero flag.
-	test_cc_clear
-	btst	#6, @er1	; this should NOT set the zero flag.
-	test_carry_clear
-	test_ovf_clear
-	test_neg_clear
-	test_zero_set
-	test_h_gr32  byte_src er1
-.endif				; h8300
-	test_gr_a5a5 0		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-btst_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; btst xx:3, aa:8
-	btst	#7, @0x20:8	; this should NOT set the zero flag.
-	test_cc_clear
-	btst	#6, @0x20:8	; this should set the zero flag.
-	test_carry_clear
-	test_ovf_clear
-	test_neg_clear
-	test_zero_set
-
-	test_grs_a5a5		; general registers should not be changed.
-
-.if (sim_cpu > h8300h)
-btst_imm3_abs16:
-	set_grs_a5a5
-	set_ccr_zero
-	;; btst xx:3, aa:16
-	btst	#7, @byte_src:16	; this should NOT set the zero flag.
-	test_cc_clear
-	btst	#6, @byte_src:16	; this should set the zero flag.
-	test_carry_clear
-	test_ovf_clear
-	test_neg_clear
-	test_zero_set
-
-	test_grs_a5a5		; general registers should not be changed.
-
-btst_imm3_abs32:
-	set_grs_a5a5
-	set_ccr_zero
-	;; btst xx:3, aa:32
-	btst	#7, @byte_src:32	; this should NOT set the zero flag.
-	test_cc_clear
-	btst	#6, @byte_src:32	; this should set the zero flag.
-	test_carry_clear
-	test_ovf_clear
-	test_neg_clear
-	test_zero_set
-
-	test_grs_a5a5		; general registers should not be changed.
-.endif
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/h8300/bfld.s b/sim/testsuite/sim/h8300/bfld.s
deleted file mode 100644
index 7c55007b88e..00000000000
--- a/sim/testsuite/sim/h8300/bfld.s
+++ /dev/null
@@ -1,286 +0,0 @@
-# Hitachi H8 testcase 'bfld', 'bfst'
-# mach(): h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-byte_src:	.byte	0xa5
-byte_dst:	.byte	0
-
-	start
-
-.if (sim_cpu == h8sx)
-bfld_imm8_ind:
-	set_grs_a5a5
-	mov	#byte_src, er2
-
-	;; bfld #xx:8, @ers, rd8
-	set_ccr_zero
-	bfld	#1, @er2, r1l
-	test_cc_clear
-	test_h_gr8 1 r1l
-
-	set_ccr_zero
-	bfld	#2, @er2, r1l
-	test_cc_clear
-	test_h_gr8 0 r1l
-
-	set_ccr_zero
-	bfld	#7, @er2, r1l
-	test_cc_clear
-	test_h_gr8 5 r1l
-
-	set_ccr_zero
-	bfld	#0x10, @er2, r1l
-	test_cc_clear
-	test_h_gr8 0 r1l
-
-	set_ccr_zero
-	bfld	#0x20, @er2, r1l
-	test_cc_clear
-	test_h_gr8 1 r1l
-
-	set_ccr_zero
-	bfld	#0xf0, @er2, r1l
-	test_cc_clear
-	test_h_gr8 0xa r1l
-
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 0xa5a5a50a er1
-	test_h_gr32 byte_src   er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-bfld_imm8_abs16:
-	set_grs_a5a5
-
-	;; bfld #xx:8, @aa:16, rd8
-	set_ccr_zero
-	bfld	#0x80, @byte_src:16, r1l
-	test_cc_clear
-	test_h_gr8 1 r1l
-
-	set_ccr_zero
-	bfld	#0x40, @byte_src:16, r1l
-	test_cc_clear
-	test_h_gr8 0 r1l
-
-	set_ccr_zero
-	bfld	#0xe0, @byte_src:16, r1l
-	test_cc_clear
-	test_h_gr8 0x5 r1l
-
-	set_ccr_zero
-	bfld	#0x3c, @byte_src:16, r1l
-	test_cc_clear
-	test_h_gr8 9 r1l
-
-	set_ccr_zero
-	bfld	#0xfe, @byte_src:16, r1l
-	test_cc_clear
-	test_h_gr8 0x52 r1l
-
-	set_ccr_zero
-	bfld	#0, @byte_src:16, r1l
-	test_cc_clear
-	test_h_gr8 0 r1l
-
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 0xa5a5a500 er1
-	test_h_gr32 0xa5a5a5a5 er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-bfst_imm8_ind:
-	set_grs_a5a5
-	mov	#byte_dst, er2
-
-	;; bfst rd8, #xx:8, @ers
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #1, @er2
-;;; 	.word	0x7d20
-;;; 	.word	0xf901
-
-	test_cc_clear
-	cmp.b	#1, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #2, @er2
-;;; 	.word	0x7d20
-;;; 	.word	0xf902
-
-	test_cc_clear
-	cmp.b	#2, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #7, @er2
-;;; 	.word	0x7d20
-;;; 	.word	0xf907
-
-	test_cc_clear
-	cmp.b	#5, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0x10, @er2
-;;; 	.word	0x7d20
-;;; 	.word	0xf910
-
-	test_cc_clear
-	cmp.b	#0x10, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0x20, @er2
-;;; 	.word	0x7d20
-;;; 	.word	0xf920
-
-	test_cc_clear
-	cmp.b	#0x20, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0xf0, @er2
-;;; 	.word	0x7d20
-;;; 	.word	0xf9f0
-
-	test_cc_clear
-	cmp.b	#0x50, @byte_dst
-	bne	fail1:16
-
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 0xa5a5a5a5 er1
-	test_h_gr32 byte_dst   er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-bfst_imm8_abs32:
-	set_grs_a5a5
-
-	;; bfst #xx:8, @aa:32, rd8
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0x80, @byte_dst:32
-;;; 	.word	0x6a38
-;;; 	.long	byte_dst
-;;; 	.word	0xf980
-
-	test_cc_clear
-	cmp.b	#0x80, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0x40, @byte_dst:32
-;;; 	.word	0x6a38
-;;; 	.long	byte_dst
-;;; 	.word	0xf940
-
-	test_cc_clear
-	cmp.b	#0x40, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0xe0, @byte_dst:32
-;;; 	.word	0x6a38
-;;; 	.long	byte_dst
-;;; 	.word	0xf9e0
-
-	test_cc_clear
-	cmp.b	#0xa0, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0x3c, @byte_dst:32
-;;; 	.word	0x6a38
-;;; 	.long	byte_dst
-;;; 	.word	0xf93c
-
-	test_cc_clear
-	cmp.b	#0x14, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0xfe, @byte_dst:32
-;;; 	.word	0x6a38
-;;; 	.long	byte_dst
-;;; 	.word	0xf9fe
-
-	test_cc_clear
-	cmp.b	#0x4a, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0, @byte_dst:32
-;;; 	.word	0x6a38
-;;; 	.long	byte_dst
-;;; 	.word	0xf900
-
-	test_cc_clear
-	cmp.b	#0x0, @byte_dst
-	bne	fail1:16
-
-	mov.b	#0, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0x38, @byte_dst:32
-;;; 	.word	0x6a38
-;;; 	.long	byte_dst
-;;; 	.word	0xf938
-
-	test_cc_clear
-	cmp.b	#0x28, @byte_dst
-	bne	fail1:16
-
-	;;
-	;; Now let's do one in which the bits in the destination
-	;; are appropriately combined with the bits in the source.
-	;;
-
-	mov.b	#0xc3, @byte_dst
-	set_ccr_zero
-	bfst	r1l, #0x3c, @byte_dst:32
-;;; 	.word	0x6a38
-;;; 	.long	byte_dst
-;;; 	.word	0xf93c
-
-	test_cc_clear
-	cmp.b	#0xd7, @byte_dst
-	bne	fail1:16
-
-	test_grs_a5a5
-
-.endif
-	pass
-
-	exit 0
-
-fail1:	fail
-	
diff --git a/sim/testsuite/sim/h8300/biand.s b/sim/testsuite/sim/h8300/biand.s
deleted file mode 100644
index c4cf285dbd0..00000000000
--- a/sim/testsuite/sim/h8300/biand.s
+++ /dev/null
@@ -1,473 +0,0 @@
-# Hitachi H8 testcase 'biand', 'bior', 'bixor', 'bild', 'bist', 'bistz'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-byte_src:	.byte 0xa5
-byte_dst:	.byte 0
-
-	start
-
-biand_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; biand xx:3, reg8
-	biand	#6, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-	biand	#7, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr		; set the carry flag
-	biand	#6, r0l		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	biand	#7, r0l		; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-biand_imm3_ind:
-	set_grs_a5a5
-.if (sim_cpu == h8300)
-	mov	#byte_src, r1
-	set_ccr_zero
-	;; biand xx:3, ind
-	biand	#6, @r1		; this should NOT set the carry flag.
-	test_cc_clear
-	biand	#7, @r1		; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr		; set the carry flag
-	biand	#6, @r1		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	biand	#7, @r1		; this should clear the carry flag
-	test_cc_clear
-;;; 	test_h_gr16  byte_src r1	;FIXME
-.else
-	mov	#byte_src, er1
-	set_ccr_zero
-	;; biand xx:3, ind
-	biand	#6, @er1	; this should NOT set the carry flag.
-	test_cc_clear
-	biand	#7, @er1	; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr		; set the carry flag
-	biand	#6, @er1	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	biand	#7, @er1	; this should clear the carry flag
-	test_cc_clear
-	test_h_gr32  byte_src er1
-.endif				; h8300
-	test_gr_a5a5 0		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-biand_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; biand xx:3, aa:8
-	biand	#6, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-	biand	#7, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr		; set the carry flag
-	biand	#6, @0x20:8	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	biand	#7, @0x20:8	; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-.if (sim_cpu > h8300h)
-biand_imm3_abs16:
-	set_grs_a5a5
-	set_ccr_zero
-	;; biand xx:3, aa:16
-	biand	#6, @byte_src:16	; this should NOT set the carry flag.
-	test_cc_clear
-	biand	#7, @byte_src:16	; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr			; set the carry flag
-	biand	#6, @byte_src:16	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	biand	#7, @byte_src:16	; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-biand_imm3_abs32:
-	set_grs_a5a5
-	set_ccr_zero
-	;; biand xx:3, aa:32
-	biand	#6, @byte_src:32	; this should NOT set the carry flag.
-	test_cc_clear
-	biand	#7, @byte_src:32	; this should NOT set the carry flag.
-	test_cc_clear
-
-	orc	#1, ccr			; set the carry flag
-	biand	#6, @byte_src:32	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	biand	#7, @byte_src:32	; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-.endif
-
-bior_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bior xx:3, reg8
-	bior	#7, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-
-	bior	#6, r0l		; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	orc	#1, ccr		; set the carry flag
-	bior	#6, r0l		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	bior	#7, r0l		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bior_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bior xx:3, aa:8
-	bior	#7, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-	bior	#6, @0x20:8	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	orc	#1, ccr		; set the carry flag
-	bior	#6, @0x20:8	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	bior	#7, @0x20:8	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bixor_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bixor xx:3, reg8
-	bixor	#7, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-
-	bixor	#6, r0l		; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	orc	#1, ccr		; set the carry flag
-	bixor	#7, r0l		; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	bixor	#6, r0l		; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bixor_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bixor xx:3, aa:8
-	bixor	#7, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-	bixor	#6, @0x20:8	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	orc	#1, ccr		; set the carry flag
-	bixor	#7, @0x20:8	; this should NOT clear the carry flag
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	bixor	#6, @0x20:8	; this should clear the carry flag
-	test_cc_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bild_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bild xx:3, reg8
-	bild	#7, r0l		; this should NOT set the carry flag.
-	test_cc_clear
-	bild	#6, r0l		; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bild_imm3_ind:
-	set_grs_a5a5
-.if (sim_cpu == h8300)
-	mov	#byte_src, r1
-	set_ccr_zero
-	;; bild xx:3, ind
-	bild	#7, @r1		; this should NOT set the carry flag.
-	test_cc_clear
-	bild	#6, @r1		; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-;;; 	test_h_gr16  byte_src r1	;FIXME
-.else
-	mov	#byte_src, er1
-	set_ccr_zero
-	;; bild xx:3, ind
-	bild	#7, @er1	; this should NOT set the carry flag.
-	test_cc_clear
-	bild	#6, @er1	; this should NOT set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	test_h_gr32  byte_src er1
-.endif				; h8300
-	test_gr_a5a5 0		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-bild_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bild xx:3, aa:8
-	bild	#7, @0x20:8	; this should NOT set the carry flag.
-	test_cc_clear
-	bild	#6, @0x20:8	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-.if (sim_cpu > h8300h)
-bild_imm3_abs16:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bild xx:3, aa:16
-	bild	#7, @byte_src:16	; this should NOT set the carry flag.
-	test_cc_clear
-	bild	#6, @byte_src:16	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-
-bild_imm3_abs32:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bild xx:3, aa:32
-	bild	#7, @byte_src:32	; this should NOT set the carry flag.
-	test_cc_clear
-	bild	#6, @byte_src:32	; this should set the carry flag.
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-
-	test_grs_a5a5		; general registers should not be changed.
-.endif
-
-bist_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bist xx:3, reg8
-	bist	#6, r0l		; this should set bit 6
-	test_cc_clear
-	test_h_gr16 0xa5e5 r0
-
-	set_ccr_zero
-	orc	#1, ccr		; set the carry flag
-	bist	#7, r0l		; this should clear bit 7
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	test_h_gr16 0xa565 r0
-
-	test_gr_a5a5 1		; Rest of general regs should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-bist_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bist xx:3, aa:8
-	bist	#6, @0x20:8	; this should set bit 6
-	test_cc_clear
-	mov.b	@0x20, r0l
-	test_h_gr16 0xa5e5 r0
-
-	set_ccr_zero
-	orc	#1, ccr		; set the carry flag
-	bist	#7, @0x20:8	; this should clear bit 7
-	test_carry_set
-	test_ovf_clear
-	test_neg_clear
-	test_zero_clear
-	mov.b	@0x20, r0l
-	test_h_gr16 0xa565 r0
-
-	test_gr_a5a5 1		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-bistz_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bistz xx:3, aa:8
-	bistz	#6, @0x20:8	; this should set bit 6
-	test_cc_clear
-	mov.b	@0x20, r0l
-	test_h_gr16 0xa5e5 r0
-
-	set_ccr_zero
-	orc	#4, ccr		; set the zero flag
-	bistz	#7, @0x20:8	; this should clear bit 7
-	test_carry_clear
-	test_ovf_clear
-	test_neg_clear
-	test_zero_set
-	mov.b	@0x20, r0l
-	test_h_gr16 0xa565 r0
-
-	test_gr_a5a5 1		; general registers should not be changed.
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif				; h8sx
-
-bnot_imm3_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bnot xx:3, reg8
-	bnot	#7, r0l
-	test_cc_clear
-	test_h_gr16 0xa525 r0
-	set_ccr_zero
-	bnot	#6, r0l
-	test_cc_clear
-	test_h_gr16 0xa565 r0
-	set_ccr_zero
-	bnot	#5, r0l
-	test_cc_clear
-	test_h_gr16 0xa545 r0
-	set_ccr_zero
-	bnot	#4, r0l
-	test_cc_clear
-	test_h_gr16 0xa555 r0
-	set_ccr_zero
-
-	bnot	#4, r0l
-	bnot	#5, r0l
-	bnot	#6, r0l
-	bnot	#7, r0l
-	test_cc_clear
-	test_grs_a5a5		; general registers should not be changed.
-
-bnot_imm3_abs8:
-	set_grs_a5a5
-	mov.b	r1l, @0x20
-	set_ccr_zero
-	;; bnot xx:3, aa:8
-	bnot	#7, @0x20:8
-	bnot	#6, @0x20:8
-	bnot	#5, @0x20:8
-	bnot	#4, @0x20:8
-	test_cc_clear
-	test_grs_a5a5
-	mov	@0x20, r0l
-	test_h_gr16 0xa555 r0
-	
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/h8300/bra.s b/sim/testsuite/sim/h8300/bra.s
deleted file mode 100644
index 2ec10dc2f51..00000000000
--- a/sim/testsuite/sim/h8300/bra.s
+++ /dev/null
@@ -1,165 +0,0 @@
-# Hitachi H8 testcase 'bra'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-.if (sim_cpu == h8sx)	
-	.data
-	.align 4
-disp8:	.long	tgt_reg8 
-disp16:	.long	tgt_reg16
-disp32:	.long	tgt_reg32
-dslot:	.byte	0
-	.text
-.endif
-
-bra_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  bra dd:8		; 8-bit displacement
-	bra tgt_8:8
-;;;	.word	0x40xx		; where "xx" is tgt_8 - '.'.
-	fail
-
-tgt_8:	
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu)			; not available in h8/300 mode
-bra_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  bra dd:16		; 16-bit displacement
-	bra tgt_24:16	; NOTE: hard-coded to avoid relaxing.
-;;; 	.word 0x5800
-;;; 	.word tgt_24 - .
-	fail
-
-tgt_24:	
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-.if	(sim_cpu == h8sx)
-bra_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  bra rn.b		; 8-bit register indirect
-	sub.l	#src8, @disp8
-	mov.l	@disp8, er5
-	bra	r5l.b
-;;; 	.word	0x5955
-src8:	fail
-	
-tgt_reg8:
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-;;; 	test_h_gr32 tgt_reg8 er5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-bra_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  bra rn.w		; 16-bit register indirect
-	sub.l	#src16, @disp16
-	mov.l	@disp16, er5
-	bra	r5.w
-;;; 	.word	0x5956
-src16:	fail
-	
-tgt_reg16:
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-;;; 	test_h_gr32 tgt_reg16 er5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-bra_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  bra ern		; 32-bit register indirect
-	sub.l	#src32, @disp32
-	mov.l	@disp32, er5
-	bra	er5.l
-;;; 	.word	0x5957
-src32:	fail
-
-tgt_reg32:	
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-;;; 	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-bra_s:	set_grs_a5a5
-	set_ccr_zero
-
-	bra/s	tgt_post_delay
-;;; 	.word	0x4017
-	;; The following instruction is in the delay slot, and should execute.
-	mov.b	#1, @dslot
-	;; After this, the next instructions should not execute.
-	fail
-	
-tgt_post_delay:
-	test_cc_clear
-	cmp.b	#0, @dslot	; Should be non-zero if delay slot executed.
-	bne	dslot_ok
-	fail
-
-dslot_ok:
-	test_gr_a5a5 0		; Make sure all general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.endif
-
-	pass
-	exit 0
-
-	
\ No newline at end of file
diff --git a/sim/testsuite/sim/h8300/brabc.s b/sim/testsuite/sim/h8300/brabc.s
deleted file mode 100644
index b9a08ea02ef..00000000000
--- a/sim/testsuite/sim/h8300/brabc.s
+++ /dev/null
@@ -1,116 +0,0 @@
-# Hitachi H8 testcase 'bra/bc'
-# mach(): h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-byte_src:	.byte	0xa5
-
-	start
-
-.if (sim_cpu == h8sx)
-brabc_ind_disp8:
-	set_grs_a5a5
-	mov	#byte_src, er1
-	set_ccr_zero
-	;; bra/bc xx:3, @erd, disp8
-	bra/bc	#1, @er1, .Lpass1:8
-;;; 	.word	0x7c10
-;;; 	.word	0x4110
-	fail
-.Lpass1:
-	bra/bc	#2, @er1, .Lfail1:8
-;;; 	.word	0x7c10
-;;; 	.word	0x4202
-	bra	.Lpass2
-.Lfail1:
-	fail
-.Lpass2:	
-	test_cc_clear
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 byte_src   er1
-	test_h_gr32 0xa5a5a5a5 er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-brabc_abs8_disp16:
-	set_grs_a5a5
-	mov.b	#0xa5, @0x20:32
-	set_ccr_zero
-	;; bra/bc xx:3, @aa:8, disp16
-	bra/bc	#1, @0x20:8, .Lpass3:16
-	fail
-.Lpass3:
-	bra/bc	#2, @0x20:8, Lfail:16
-
-	test_cc_clear
-	test_grs_a5a5
-
-brabc_abs16_disp16:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bra/bc xx:3, @aa:16, disp16
-	bra/bc	#1, @byte_src:16, .Lpass5:16
-	fail
-.Lpass5:
-	bra/bc	#2, @byte_src:16, Lfail:16
-
-	test_cc_clear
-	test_grs_a5a5
-
-brabs_ind_disp8:
-	set_grs_a5a5
-	mov	#byte_src, er1
-	set_ccr_zero
-	;; bra/bs xx:3, @erd, disp8
-	bra/bs	#2, @er1, .Lpass7:8
-;;; 	.word	0x7c10
-;;; 	.word	0x4a10
-	fail
-.Lpass7:
-	bra/bs	#1, @er1, .Lfail3:8
-;;; 	.word	0x7c10
-;;; 	.word	0x4902
-	bra	.Lpass8
-.Lfail3:
-	fail
-.Lpass8:
-	test_cc_clear
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 byte_src   er1
-	test_h_gr32 0xa5a5a5a5 er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-brabs_abs32_disp16:
-	set_grs_a5a5
-	set_ccr_zero
-	;; bra/bs xx:3, @aa:32, disp16
-	bra/bs	#2, @byte_src:32, .Lpass9:16
-	fail
-.Lpass9:
-	bra/bs	#1, @byte_src:32, Lfail:16
-
-	test_cc_clear
-	test_grs_a5a5
-
-.endif
-
-	pass
-
-	exit 0
-
-Lfail:	fail
diff --git a/sim/testsuite/sim/h8300/bset.s b/sim/testsuite/sim/h8300/bset.s
deleted file mode 100644
index 0e16fc1f9d2..00000000000
--- a/sim/testsuite/sim/h8300/bset.s
+++ /dev/null
@@ -1,890 +0,0 @@
-# Hitachi H8 testcase 'bset', 'bclr'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	#
-	# bset xx:3, rd8	;                   7 0 ?xxx rd8
-	# bclr xx:3, rd8	;                   7 2 ?xxx rd8
-	# bset xx:3, @erd	; 7 d 0rd ????      7 0 ?xxx ????
-	# bclr xx:3, @erd	; 7 d 0rd ????      7 2 ?xxx ????
-	# bset xx:3, @abs16	; 6 a 1 1??? aa:16  7 0 ?xxx ????
-	# bclr xx:3, @abs16	; 6 a 1 1??? aa:16  7 2 ?xxx ???? 
-	# bset reg8, rd8	;                   6 0 rs8  rd8
-	# bclr reg8, rd8	;                   6 2 rs8  rd8
-	# bset reg8, @erd	; 7 d 0rd ????      6 0 rs8  ????
-	# bclr reg8, @erd	; 7 d 0rd ????      6 2 rs8  ????
-	# bset reg8, @abs32	; 6 a 3 1??? aa:32  6 0 rs8  ????
-	# bclr reg8, @abs32	; 6 a 3 1??? aa:32  6 2 rs8  ???? 
-	#
-	# bset/eq xx:3, rd8
-	# bclr/eq xx:3, rd8
-	# bset/ne xx:3, rd8
-	# bclr/ne xx:3, rd8
-
-	.data
-byte_dst:	.byte 0
-
-	start
-
-bset_imm3_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  bset xx:3, rd8
-	mov	#0, r1l
-	set_ccr_zero
-	bset	#0, r1l
-	test_cc_clear
-	test_h_gr8 1 r1l
-
-	set_ccr_zero
-	bset	#1, r1l
-	test_cc_clear
-	test_h_gr8 3 r1l
-
-	set_ccr_zero
-	bset	#2, r1l
-	test_cc_clear
-	test_h_gr8 7 r1l
-
-	set_ccr_zero
-	bset	#3, r1l
-	test_cc_clear
-	test_h_gr8 15 r1l
-
-	set_ccr_zero
-	bset	#4, r1l
-	test_cc_clear
-	test_h_gr8 31 r1l
-
-	set_ccr_zero
-	bset	#5, r1l
-	test_cc_clear
-	test_h_gr8 63 r1l
-
-	set_ccr_zero
-	bset	#6, r1l
-	test_cc_clear
-	test_h_gr8 127 r1l
-
-	set_ccr_zero
-	bset	#7, r1l
-	test_cc_clear
-	test_h_gr8 255 r1l
-
-.if (sim_cpu == h8300)
-	test_h_gr16 0xa5ff, r1
-.else
-	test_h_gr32  0xa5a5a5ff er1
-.endif
-
-bclr_imm3_reg8:	
-	set_ccr_zero
-	bclr	#7, r1l
-	test_cc_clear
-	test_h_gr8 127 r1l
-
-	set_ccr_zero
-	bclr	#6, r1l
-	test_cc_clear
-	test_h_gr8 63 r1l
-
-	set_ccr_zero
-	bclr	#5, r1l
-	test_cc_clear
-	test_h_gr8 31 r1l
-
-	set_ccr_zero
-	bclr	#4, r1l
-	test_cc_clear
-	test_h_gr8 15 r1l
-
-	set_ccr_zero
-	bclr	#3, r1l
-	test_cc_clear
-	test_h_gr8 7 r1l
-
-	set_ccr_zero
-	bclr	#2, r1l
-	test_cc_clear
-	test_h_gr8 3 r1l
-
-	set_ccr_zero
-	bclr	#1, r1l
-	test_cc_clear
-	test_h_gr8 1 r1l
-
-	set_ccr_zero
-	bclr	#0, r1l
-	test_cc_clear
-	test_h_gr8 0 r1l
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-.if (sim_cpu == h8300)
-	test_h_gr16 0xa500 r1
-.else
-	test_h_gr32  0xa5a5a500 er1
-.endif
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu)
-bset_imm3_ind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  bset xx:3, @erd
-	mov	#byte_dst, er1
-	set_ccr_zero
-	bset	#0, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 1 r2l
-
-	set_ccr_zero
-	bset	#1, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 3 r2l
-
-	set_ccr_zero
-	bset	#2, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 7 r2l
-
-	set_ccr_zero
-	bset	#3, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 15 r2l
-
-	set_ccr_zero
-	bset	#4, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 31 r2l
-
-	set_ccr_zero
-	bset	#5, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 63 r2l
-
-	set_ccr_zero
-	bset	#6, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 127 r2l
-
-	set_ccr_zero
-	bset	#7, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 255 r2l
-
-.if (sim_cpu == h8300)
-	test_h_gr16  0xa5ff r2
-.else
-	test_h_gr32  0xa5a5a5ff er2
-.endif
-
-bclr_imm3_ind:	
-	set_ccr_zero
-	bclr	#7, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 127 r2l
-
-	set_ccr_zero
-	bclr	#6, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 63 r2l
-
-	set_ccr_zero
-	bclr	#5, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 31 r2l
-
-	set_ccr_zero
-	bclr	#4, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 15 r2l
-
-	set_ccr_zero
-	bclr	#3, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 7  r2l
-
-	set_ccr_zero
-	bclr	#2, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 3  r2l
-
-	set_ccr_zero
-	bclr	#1, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 1  r2l
-
-	set_ccr_zero
-	bclr	#0, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 0  r2l
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-.if (sim_cpu == h8300)
-	test_h_gr16  byte_dst r1
-	test_h_gr16  0xa500   r2
-.else
-	test_h_gr32  byte_dst   er1
-	test_h_gr32  0xa5a5a500 er2
-.endif
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu > h8300h)
-bset_imm3_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  bset xx:3, @aa:16
-	set_ccr_zero
-	bset	#0, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 1 r2l
-
-	set_ccr_zero
-	bset	#1, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 3 r2l
-
-	set_ccr_zero
-	bset	#2, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 7 r2l
-
-	set_ccr_zero
-	bset	#3, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 15 r2l
-
-	set_ccr_zero
-	bset	#4, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 31 r2l
-
-	set_ccr_zero
-	bset	#5, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 63 r2l
-
-	set_ccr_zero
-	bset	#6, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 127 r2l
-
-	set_ccr_zero
-	bset	#7, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 255 r2l
-
-.if (sim_cpu == h8300)
-	test_h_gr16  0xa5ff r2
-.else
-	test_h_gr32  0xa5a5a5ff er2
-.endif
-
-bclr_imm3_abs16:	
-	set_ccr_zero
-	bclr	#7, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 127 r2l
-
-	set_ccr_zero
-	bclr	#6, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 63 r2l
-
-	set_ccr_zero
-	bclr	#5, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 31 r2l
-
-	set_ccr_zero
-	bclr	#4, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 15 r2l
-
-	set_ccr_zero
-	bclr	#3, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 7  r2l
-
-	set_ccr_zero
-	bclr	#2, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 3  r2l
-
-	set_ccr_zero
-	bclr	#1, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 1  r2l
-
-	set_ccr_zero
-	bclr	#0, @byte_dst:16
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 0  r2l
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-.if (sim_cpu == h8300)
-	test_h_gr16  0xa500   r2
-.else
-	test_h_gr32  0xa5a5a500 er2
-.endif
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-.endif
-
-bset_rs8_rd8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  bset rs8, rd8
-	mov	#0, r1h
-	mov	#0, r1l
-	set_ccr_zero
-	bset	r1h, r1l
-	test_cc_clear
-	test_h_gr8 1 r1l
-
-	mov	#1, r1h
-	set_ccr_zero
-	bset	r1h, r1l
-	test_cc_clear
-	test_h_gr8 3 r1l
-
-	mov	#2, r1h
-	set_ccr_zero
-	bset	r1h, r1l
-	test_cc_clear
-	test_h_gr8 7 r1l
-
-	mov	#3, r1h
-	set_ccr_zero
-	bset	r1h, r1l
-	test_cc_clear
-	test_h_gr8 15 r1l
-
-	mov	#4, r1h
-	set_ccr_zero
-	bset	r1h, r1l
-	test_cc_clear
-	test_h_gr8 31 r1l
-
-	mov	#5, r1h
-	set_ccr_zero
-	bset	r1h, r1l
-	test_cc_clear
-	test_h_gr8 63 r1l
-
-	mov	#6, r1h
-	set_ccr_zero
-	bset	r1h, r1l
-	test_cc_clear
-	test_h_gr8 127 r1l
-
-	mov	#7, r1h
-	set_ccr_zero
-	bset	r1h, r1l
-	test_cc_clear
-	test_h_gr8 255 r1l
-
-.if (sim_cpu == h8300)
-	test_h_gr16 0x07ff, r1
-.else
-	test_h_gr32  0xa5a507ff er1
-.endif
-
-bclr_rs8_rd8:	
-	mov	#7, r1h
-	set_ccr_zero
-	bclr	r1h, r1l
-	test_cc_clear
-	test_h_gr8 127 r1l
-
-	mov	#6, r1h
-	set_ccr_zero
-	bclr	r1h, r1l
-	test_cc_clear
-	test_h_gr8 63 r1l
-
-	mov	#5, r1h
-	set_ccr_zero
-	bclr	r1h, r1l
-	test_cc_clear
-	test_h_gr8 31 r1l
-
-	mov	#4, r1h
-	set_ccr_zero
-	bclr	r1h, r1l
-	test_cc_clear
-	test_h_gr8 15 r1l
-
-	mov	#3, r1h
-	set_ccr_zero
-	bclr	r1h, r1l
-	test_cc_clear
-	test_h_gr8 7 r1l
-
-	mov	#2, r1h
-	set_ccr_zero
-	bclr	r1h, r1l
-	test_cc_clear
-	test_h_gr8 3 r1l
-
-	mov	#1, r1h
-	set_ccr_zero
-	bclr	r1h, r1l
-	test_cc_clear
-	test_h_gr8 1 r1l
-
-	mov	#0, r1h
-	set_ccr_zero
-	bclr	r1h, r1l
-	test_cc_clear
-	test_h_gr8 0 r1l
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-.if (sim_cpu == h8300)
-	test_h_gr16 0x0000 r1
-.else
-	test_h_gr32  0xa5a50000 er1
-.endif
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu)
-bset_rs8_ind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  bset rs8, @erd
-	mov	#byte_dst, er1
-	mov	#0, r2h
-	set_ccr_zero
-	bset	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 1 r2l
-
-	mov	#1, r2h
-	set_ccr_zero
-	bset	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 3 r2l
-
-	mov	#2, r2h
-	set_ccr_zero
-	bset	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 7 r2l
-
-	mov	#3, r2h
-	set_ccr_zero
-	bset	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 15 r2l
-
-	mov	#4, r2h
-	set_ccr_zero
-	bset	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 31 r2l
-
-	mov	#5, r2h
-	set_ccr_zero
-	bset	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 63 r2l
-
-	mov	#6, r2h
-	set_ccr_zero
-	bset	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 127 r2l
-
-	mov	#7, r2h
-	set_ccr_zero
-	bset	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 255 r2l
-
-.if (sim_cpu == h8300)
-	test_h_gr16  0x07ff r2
-.else
-	test_h_gr32  0xa5a507ff er2
-.endif
-
-bclr_rs8_ind:	
-	mov	#7, r2h
-	set_ccr_zero
-	bclr	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 127 r2l
-
-	mov	#6, r2h
-	set_ccr_zero
-	bclr	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 63 r2l
-
-	mov	#5, r2h
-	set_ccr_zero
-	bclr	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 31 r2l
-
-	mov	#4, r2h
-	set_ccr_zero
-	bclr	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 15 r2l
-
-	mov	#3, r2h
-	set_ccr_zero
-	bclr	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 7  r2l
-
-	mov	#2, r2h
-	set_ccr_zero
-	bclr	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 3  r2l
-
-	mov	#1, r2h
-	set_ccr_zero
-	bclr	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 1  r2l
-
-	mov	#0, r2h
-	set_ccr_zero
-	bclr	r2h, @er1
-	test_cc_clear
-	mov	@er1, r2l
-	test_h_gr8 0  r2l
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-.if (sim_cpu == h8300)
-	test_h_gr16  byte_dst r1
-	test_h_gr16  0x0000   r2
-.else
-	test_h_gr32  byte_dst   er1
-	test_h_gr32  0xa5a50000 er2
-.endif
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu > h8300h)
-bset_rs8_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  bset rs8, @aa:32
-	mov	#0, r2h
-	set_ccr_zero
-	bset	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 1 r2l
-
-	mov	#1, r2h
-	set_ccr_zero
-	bset	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 3 r2l
-
-	mov	#2, r2h
-	set_ccr_zero
-	bset	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 7 r2l
-
-	mov	#3, r2h
-	set_ccr_zero
-	bset	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 15 r2l
-
-	mov	#4, r2h
-	set_ccr_zero
-	bset	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 31 r2l
-
-	mov	#5, r2h
-	set_ccr_zero
-	bset	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 63 r2l
-
-	mov	#6, r2h
-	set_ccr_zero
-	bset	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 127 r2l
-
-	mov	#7, r2h
-	set_ccr_zero
-	bset	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 255 r2l
-
-.if (sim_cpu == h8300)
-	test_h_gr16  0x07ff r2
-.else
-	test_h_gr32  0xa5a507ff er2
-.endif
-
-bclr_rs8_abs32:	
-	mov	#7, r2h
-	set_ccr_zero
-	bclr	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 127 r2l
-
-	mov	#6, r2h
-	set_ccr_zero
-	bclr	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 63 r2l
-
-	mov	#5, r2h
-	set_ccr_zero
-	bclr	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 31 r2l
-
-	mov	#4, r2h
-	set_ccr_zero
-	bclr	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 15 r2l
-
-	mov	#3, r2h
-	set_ccr_zero
-	bclr	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 7  r2l
-
-	mov	#2, r2h
-	set_ccr_zero
-	bclr	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 3  r2l
-
-	mov	#1, r2h
-	set_ccr_zero
-	bclr	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 1  r2l
-
-	mov	#0, r2h
-	set_ccr_zero
-	bclr	r2h, @byte_dst:32
-	test_cc_clear
-	mov	@byte_dst, r2l
-	test_h_gr8 0  r2l
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-.if (sim_cpu == h8300)
-	test_h_gr16  0x0000   r2
-.else
-	test_h_gr32  0xa5a50000 er2
-.endif
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-.endif
-
-.if (sim_cpu == h8sx)
-bset_eq_imm3_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  bset/eq xx:3, rd8
-	mov	#0, @byte_dst
-	set_ccr_zero
-	bset/eq	#0, @byte_dst:16 ; Zero is clear, should have no effect.
-	test_cc_clear
-	mov	@byte_dst, r1l
-	test_h_gr8 0 r1l
-
-	set_ccr_zero
-	orc	#4, ccr		; Set zero flag
-	bset/eq	#0, @byte_dst:16 ; Zero is set: operation should succeed.
-
-	test_neg_clear
-	test_zero_set
-	test_ovf_clear
-	test_carry_clear
-
-	mov	@byte_dst, r1l
-	test_h_gr8 1 r1l
-
-bclr_eq_imm3_abs32:
-	mov	#1, @byte_dst
-	set_ccr_zero
-	bclr/eq	#0, @byte_dst:32 ; Zero is clear, should have no effect.
-	test_cc_clear
-	mov	@byte_dst, r1l
-	test_h_gr8 1 r1l
-
-	set_ccr_zero
-	orc	#4, ccr		; Set zero flag
-	bclr/eq	#0, @byte_dst:32 ; Zero is set: operation should succeed.
-	test_neg_clear
-	test_zero_set
-	test_ovf_clear
-	test_carry_clear
-	mov	@byte_dst, r1l
-	test_h_gr8 0 r1l
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32  0xa5a5a500 er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-bset_ne_imm3_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  bset/ne xx:3, aa:16
-	mov	#0, @byte_dst
-	set_ccr_zero
-	orc	#4, ccr		; Set zero flag
-	bset/ne	#0, @byte_dst:16 ; Zero is set; should have no effect.
-	test_zero_set
-	test_neg_clear
-	test_ovf_clear
-	test_carry_clear
-	mov	@byte_dst, r1l
-	test_h_gr8 0 r1l
-
-	set_ccr_zero
-	bset/ne	#0, @byte_dst:16 ; Zero is clear: operation should succeed.
-	test_cc_clear
-	mov	@byte_dst, r1l
-	test_h_gr8 1 r1l
-
-bclr_ne_imm3_abs32:
-	mov	#1, @byte_dst
-	set_ccr_zero
-	orc	#4, ccr		; Set zero flag
-	;; bclr/ne xx:3, aa:16
-	bclr/ne	#0, @byte_dst:32 ; Zero is set, should have no effect.
-	test_neg_clear
-	test_zero_set
-	test_ovf_clear
-	test_carry_clear
-	mov	@byte_dst, r1l
-	test_h_gr8 1 r1l
-
-	set_ccr_zero
-	bclr/ne	#0, @byte_dst:32 ; Zero is clear: operation should succeed.
-	test_cc_clear
-	mov	@byte_dst, r1l
-	test_h_gr8 0 r1l
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32  0xa5a5a500 er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/h8300/cmpb.s b/sim/testsuite/sim/h8300/cmpb.s
deleted file mode 100644
index 1a4f23c8b29..00000000000
--- a/sim/testsuite/sim/h8300/cmpb.s
+++ /dev/null
@@ -1,1086 +0,0 @@
-# Hitachi H8 testcase 'cmp.b'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# cmp.b #xx:8, rd	;                     a rd   xxxxxxxx
-	# cmp.b #xx:8, @erd	;         7 d rd ???? a ???? xxxxxxxx
-	# cmp.b #xx:8, @erd+	; 0 1 7 4 6 c rd 1??? a ???? xxxxxxxx
-	# cmp.b #xx:8, @erd-	; 0 1 7 6 6 c rd 1??? a ???? xxxxxxxx
-	# cmp.b #xx:8, @+erd	; 0 1 7 5 6 c rd 1??? a ???? xxxxxxxx
-	# cmp.b #xx:8, @-erd	; 0 1 7 7 6 c rd 1??? a ???? xxxxxxxx
-	# cmp.b rs, rd		;                     1 c rs rd
-	# cmp.b reg8, @erd	;         7 d rd ???? 1 c rs ????
-	# cmp.b reg8, @erd+	;         0 1 7     9 8 rd 2 rs
-	# cmp.b reg8, @erd-	;         0 1 7     9 a rd 2 rs
-	# cmp.b reg8, @+erd	;         0 1 7     9 9 rd 2 rs
-	# cmp.b reg8, @-erd	;         0 1 7     9 b rd 2 rs
-	# cmp.b rsind, rdind	     ; 7 c 0rs 5 0 ?rd 2 ????
-	# cmp.b rspostinc, rdpostinc ; 0 1 7 4 6 c 0rs c 8 ?rd 2 ????
-	# cmp.b rspostdec, rdpostdec ; 0 1 7 6 6 c 0rs c a ?rd 2 ????
-	# cmp.b rspreinc, rdpreinc   ; 0 1 7 5 6 c 0rs c 9 ?rd 2 ????
-	# cmp.b rspredec, rdpredec   ; 0 1 7 7 6 c 0rs c b ?rd 2 ????
-	# cmp.b disp2, disp2	     ; 0 1 7 01dd:2 6 8 0rs c 00dd:2 ?rd 2 ????
-	# cmp.b disp16, disp16	     ; 0 1 7 4 6 e 0rs c dd:16 c 0rd 2 ???? dd:16
-	# cmp.b disp32, disp32	     ; 7 8 0rs 4 6 a 2 c dd:32 c 1rd 2 ???? dd:32
-	# cmp.b indexb16, indexb16   ; 0 1 7 5 6 e 0rs c dd:16 d 0rd 2 ???? dd:16
-	# cmp.b indexw16, indexw16   ; 0 1 7 6 6 e 0rs c dd:16 e 0rd 2 ???? dd:16
-	# cmp.b indexl16, indexl16   ; 0 1 7 7 6 e 0rs c dd:16 f 0rd 2 ???? dd:16
-	# cmp.b indexb32, indexb32   ; 7 8 0rs 5 6 a 2 c dd:32 d 1rd 2 ???? dd:32
-	# cmp.b indexw32, indexw32   ; 7 8 0rs 6 6 a 2 c dd:32 e 1rd 2 ???? dd:32
-	# cmp.b indexl32, indexl32   ; 7 8 0rs 7 6 a 2 c dd:32 f 1rd 2 ???? dd:32
-	# cmp.b abs16, abs16	     ; 6 a 1 5 aa:16 4 0??? 2 ???? aa:16
-	# cmp.b abs32, abs32	     ; 6 a 3 5 aa:32 4 1??? 2 ???? aa:32
-	#
-
-	# Coming soon:
-	
-	# ...
-
-.data
-byte_src:	.byte 0x5a
-pre_byte:	.byte 0
-byte_dst:	.byte 0xa5
-post_byte:	.byte 0
-
-	start
-	
-cmp_b_imm8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  cmp.b #xx:8,Rd
-	cmp.b	#0xa5, r0l	; Immediate 8-bit src, reg8 dest
-	beq	.Leq1
-	fail
-.Leq1:	cmp.b	#0xa6, r0l
-	blt	.Llt1
-	fail
-.Llt1:	cmp.b	#0xa4, r0l
-	bgt	.Lgt1
-	fail
-.Lgt1:	
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a5 r0	; r0 unchanged
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5a5 er0	; er0 unchanged
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-cmp_b_imm8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b #xx:8,@eRd
-	mov	#byte_dst, er0
-	cmp.b	#0xa5:8, @er0	; Immediate 8-bit src, reg indirect dst
-;;; 	.word	0x7d00
-;;; 	.word	0xa0a5
-	beq	.Leq2
-	fail
-.Leq2:	set_ccr_zero
-	cmp.b	#0xa6, @er0
-;;; 	.word	0x7d00
-;;; 	.word	0xa0a6
-	blt	.Llt2
-	fail
-.Llt2:	set_ccr_zero
-	cmp.b	#0xa4, @er0
-;;; 	.word	0x7d00
-;;; 	.word	0xa0a4
-	bgt	.Lgt2
-	fail
-.Lgt2:		
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 byte_dst er0	; er0 still contains address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L2
-	fail
-.L2:
-
-cmp_b_imm8_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b #xx:8,@eRd+
-	mov	#byte_dst, er0
-	cmp.b	#0xa5:8, @er0+	; Immediate 8-bit src, reg postinc dst
-;;; 	.word	0x0174
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a5
-	beq	.Leq3
-	fail
-.Leq3:	test_h_gr32 post_byte er0	; er0 contains address plus one
-	mov	#byte_dst, er0
-	set_ccr_zero
-	cmp.b	#0xa6, @er0+
-;;; 	.word	0x0174
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a6
-	blt	.Llt3
-	fail
-.Llt3:	test_h_gr32 post_byte er0	; er0 contains address plus one
-	mov	#byte_dst, er0
-	set_ccr_zero
-	cmp.b	#0xa4, @er0+
-;;; 	.word	0x0174
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a4
-	bgt	.Lgt3
-	fail
-.Lgt3:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 post_byte er0	; er0 contains address plus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L3
-	fail
-.L3:
-
-cmp_b_imm8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b #xx:8,@eRd-
-	mov	#byte_dst, er0
-	cmp.b	#0xa5:8, @er0-	; Immediate 8-bit src, reg postdec dst
-;;; 	.word	0x0176
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a5
-	beq	.Leq4
-	fail
-.Leq4:	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	mov	#byte_dst, er0
-	set_ccr_zero
-	cmp.b	#0xa6, @er0-
-;;; 	.word	0x0176
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a6
-	blt	.Llt4
-	fail
-.Llt4:	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	mov	#byte_dst, er0
-	set_ccr_zero
-	cmp.b	#0xa4, @er0-
-;;; 	.word	0x0176
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a4
-	bgt	.Lgt4
-	fail
-.Lgt4:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L4
-	fail
-.L4:
-
-cmp_b_imm8_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b #xx:8,@+eRd
-	mov	#pre_byte, er0
-	cmp.b	#0xa5:8, @+er0	; Immediate 8-bit src, reg pre-inc dst
-;;; 	.word	0x0175
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a5
-	beq	.Leq5
-	fail
-.Leq5:	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	mov	#pre_byte, er0
-	set_ccr_zero
-	cmp.b	#0xa6, @+er0
-;;; 	.word	0x0175
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a6
-	blt	.Llt5
-	fail
-.Llt5:	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	mov	#pre_byte, er0
-	set_ccr_zero
-	cmp.b	#0xa4, @+er0
-;;; 	.word	0x0175
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a4
-	bgt	.Lgt5
-	fail
-.Lgt5:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L5
-	fail
-.L5:
-
-cmp_b_imm8_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b #xx:8,@-eRd
-	mov	#post_byte, er0
-	cmp.b	#0xa5:8, @-er0	; Immediate 8-bit src, reg pre-dec dst
-;;; 	.word	0x0177
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a5
-	beq	.Leq6
-	fail
-.Leq6:	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	mov	#post_byte, er0
-	set_ccr_zero
-	cmp.b	#0xa6, @-er0
-;;; 	.word	0x0177
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a6
-	blt	.Llt6
-	fail
-.Llt6:	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	mov	#post_byte, er0
-	set_ccr_zero
-	cmp.b	#0xa4, @-er0
-;;; 	.word	0x0177
-;;; 	.word	0x6c08
-;;; 	.word	0xa0a4
-	bgt	.Lgt6
-	fail
-.Lgt6:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L6
-	fail
-.L6:
-
-
-.endif
-
-cmp_b_reg8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  cmp.b Rs,Rd
-	mov.b	#0xa5, r0h
-	cmp.b	r0h, r0l	; Reg8 src, reg8 dst
-	beq	.Leq7
-	fail
-.Leq7:	mov.b	#0xa6, r0h
-	cmp.b	r0h, r0l
-	blt	.Llt7
-	fail
-.Llt7:	mov.b	#0xa4, r0h
-	cmp.b	r0h, r0l
-	bgt	.Lgt7
-	fail
-.Lgt7:
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa4a5 r0	; r0l unchanged.
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a4a5 er0	; r0l unchanged
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-cmp_b_reg8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b rs8,@eRd	; cmp reg8 to register indirect
-	mov	#byte_dst, er0
-	mov	#0xa5, r1l
-	cmp.b	r1l, @er0	; reg8 src, reg indirect dest
-;;; 	.word	0x7d00
-;;; 	.word	0x1c90
-	beq	.Leq8
-	fail
-.Leq8:	set_ccr_zero
-	mov	#0xa6, r1l
-	cmp.b	r1l, @er0
-;;; 	.word	0x7d00
-;;; 	.word	0x1c90
-	blt	.Llt8
-	fail
-.Llt8:	set_ccr_zero
-	mov	#0xa4, r1l
-	cmp.b	r1l, @er0
-;;; 	.word	0x7d00
-;;; 	.word	0x1c90
-	bgt	.Lgt8
-	fail
-.Lgt8:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dst er0	; er0 still contains address
-	test_h_gr32 0xa5a5a5a4 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (no change).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L8
-	fail
-.L8:
-
-cmp_b_reg8_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b reg8,@eRd+
-	mov	#byte_dst, er0
-	mov	#0xa5, r1l
-	cmp.b	r1l, @er0+	; Immediate 8-bit src, reg post-incr dst
-;;; 	.word	0x0179
-;;; 	.word	0x8029
-	beq	.Leq9
-	fail
-.Leq9:	test_h_gr32 post_byte er0	; er0 contains address plus one
-	mov	#byte_dst er0
-	mov	#0xa6, r1l
-	set_ccr_zero
-	cmp.b	r1l, @er0+
-;;; 	.word	0x0179
-;;; 	.word	0x8029
-	blt	.Llt9
-	fail
-.Llt9:	test_h_gr32 post_byte er0	; er0 contains address plus one
-	mov	#byte_dst er0
-	mov	#0xa4, r1l
-	set_ccr_zero
-	cmp.b	r1l, @er0+
-;;; 	.word	0x0179
-;;; 	.word	0x8029
-	bgt	.Lgt9
-	fail
-.Lgt9:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 post_byte er0	; er0 contains address plus one
-	test_h_gr32 0xa5a5a5a4 er1	; er1 contains test load
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L9
-	fail
-.L9:
-
-cmp_b_reg8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b reg8,@eRd-
-	mov	#byte_dst, er0
-	mov	#0xa5, r1l
-	cmp.b	r1l, @er0-	; Immediate 8-bit src, reg postdec dst
-;;; 	.word	0x0179
-;;; 	.word	0xa029
-	beq	.Leq10
-	fail
-.Leq10:	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	mov	#byte_dst er0
-	mov	#0xa6, r1l
-	set_ccr_zero
-	cmp.b	r1l, @er0-
-;;; 	.word	0x0179
-;;; 	.word	0xa029
-	blt	.Llt10
-	fail
-.Llt10:	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	mov	#byte_dst er0
-	mov	#0xa4, r1l
-	set_ccr_zero
-	cmp.b	r1l, @er0-
-;;; 	.word	0x0179
-;;; 	.word	0xa029
-	bgt	.Lgt10
-	fail
-.Lgt10:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5a5a4 er1	; er1 contains test load
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L10
-	fail
-.L10:
-
-cmp_b_reg8_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b reg8,@+eRd
-	mov	#pre_byte, er0
-	mov	#0xa5, r1l
-	cmp.b	r1l, @+er0	; Immediate 8-bit src, reg post-incr dst
-;;; 	.word	0x0179
-;;; 	.word	0x9029
-	beq	.Leq11
-	fail
-.Leq11:	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	mov	#pre_byte er0
-	mov	#0xa6, r1l
-	set_ccr_zero
-	cmp.b	r1l, @+er0
-;;; 	.word	0x0179
-;;; 	.word	0x9029
-	blt	.Llt11
-	fail
-.Llt11:	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	mov	#pre_byte er0
-	mov	#0xa4, r1l
-	set_ccr_zero
-	cmp.b	r1l, @+er0
-;;; 	.word	0x0179
-;;; 	.word	0x9029
-	bgt	.Lgt11
-	fail
-.Lgt11:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	test_h_gr32 0xa5a5a5a4 er1	; er1 contains test load
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L11
-	fail
-.L11:
-
-cmp_b_reg8_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  cmp.b reg8,@-eRd
-	mov	#post_byte, er0
-	mov	#0xa5, r1l
-	cmp.b	r1l, @-er0	; Immediate 8-bit src, reg postdec dst
-;;; 	.word	0x0179
-;;; 	.word	0xb029
-	beq	.Leq12
-	fail
-.Leq12:	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	mov	#post_byte er0
-	mov	#0xa6, r1l
-	set_ccr_zero
-	cmp.b	r1l, @-er0
-;;; 	.word	0x0179
-;;; 	.word	0xb029
-	blt	.Llt12
-	fail
-.Llt12:	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	mov	#post_byte er0
-	mov	#0xa4, r1l
-	set_ccr_zero
-	cmp.b	r1l, @-er0
-;;; 	.word	0x0179
-;;; 	.word	0xb029
-	bgt	.Lgt12
-	fail
-.Lgt12:
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dst er0	; er0 contains destination address 
-	test_h_gr32 0xa5a5a5a4 er1	; er1 contains test load
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the cmp to memory (memory unchanged).
-	sub.b	r0l, r0l
-	mov.b	@byte_dst, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L12
-	fail
-.L12:
-
-cmp_b_rsind_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#byte_src, er1
-	mov	#byte_dst, er2	
-	set_ccr_zero
-	cmp.b	@er1, @er2
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	byte_src er1	
-	test_h_gr32	byte_dst er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-.if 1				; ambiguous
-cmp_b_rspostinc_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#byte_src, er1
-	mov	#byte_dst, er2	
-	set_ccr_zero
-	cmp.b	@er1+, @er2+
-;;;	.word	0x0174
-;;;	.word	0x6c1c
-;;;	.word	0x8220
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	byte_src+1 er1	
-	test_h_gr32	byte_dst+1 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-.endif
-.if 1				; ambiguous
-cmp_b_rspostdec_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#byte_src, er1
-	mov	#byte_dst, er2	
-	set_ccr_zero
-	cmp.b	@er1-, @er2-
-;;;	.word	0x0176
-;;;	.word	0x6c1c
-;;;	.word	0xa220
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	byte_src-1 er1	
-	test_h_gr32	byte_dst-1 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-.endif
-
-cmp_b_rspreinc_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#byte_src-1, er1
-	mov	#byte_dst-1, er2	
-	set_ccr_zero
-	cmp.b	@+er1, @+er2
-;;;	.word	0x0175
-;;;	.word	0x6c1c
-;;;	.word	0x9220
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	byte_src er1	
-	test_h_gr32	byte_dst er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-cmp_b_rspredec_predec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#byte_src+1, er1
-	mov	#byte_dst+1, er2	
-	set_ccr_zero
-	cmp.b	@-er1, @-er2
-;;;	.word	0x0177
-;;;	.word	0x6c1c
-;;;	.word	0xb220
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	byte_src er1	
-	test_h_gr32	byte_dst er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-cmp_b_disp2_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#byte_src-1, er1
-	mov	#byte_dst-2, er2
-	set_ccr_zero
-	cmp.b	@(1:2, er1), @(2:2, er2)
-;;;	.word	0x0175
-;;;	.word	0x681c
-;;;	.word	0x2220
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	byte_src-1 er1	
-	test_h_gr32	byte_dst-2 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-cmp_b_disp16_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#byte_src-3, er1
-	mov	#byte_dst-4, er2
-	set_ccr_zero
-	cmp.b	@(3:16, er1), @(4:16, er2)
-;;;	.word	0x0174
-;;;	.word	0x6e1c
-;;;	.word	3
-;;;	.word	0xc220
-;;;	.word	4
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	byte_src-3 er1	
-	test_h_gr32	byte_dst-4 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-cmp_b_disp32_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#byte_src+5, er1
-	mov	#byte_dst+6, er2
-	set_ccr_zero
-	cmp.b	@(-5:32, er1), @(-6:32, er2)
-;;;	.word	0x7814
-;;;	.word	0x6a2c
-;;;	.long	-5
-;;;	.word	0xca20
-;;;	.long	-6
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	byte_src+5 er1	
-	test_h_gr32	byte_dst+6 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-cmp_b_indexb16_indexb16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#0xffffff01, er1
-	mov	#0xffffff02, er2
-	set_ccr_zero
-	cmp.b	@(byte_src-1:16, r1.b), @(byte_dst-2:16, r2.b)
-;;; 	.word	0x0175
-;;; 	.word	0x6e1c
-;;; 	.word	byte_src-1
-;;; 	.word	0xd220
-;;; 	.word	byte_dst-2
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0xffffff01 er1	
-	test_h_gr32	0xffffff02 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-.if 1				; ambiguous
-cmp_b_indexw16_indexw16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#0xffff0003, er1
-	mov	#0xffff0004, er2
-	set_ccr_zero
-	cmp.b	@(byte_src-3:16, r1.w), @(byte_dst-4:16, r2.w)
-;;; 	.word	0x0176
-;;; 	.word	0x6e1c
-;;; 	.word	byte_src-3
-;;; 	.word	0xe220
-;;; 	.word	byte_dst-4
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0xffff0003 er1	
-	test_h_gr32	0xffff0004 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-.endif
-
-cmp_b_indexl16_indexl16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#0x00000005, er1
-	mov	#0x00000006, er2
-	set_ccr_zero
-	cmp.b	@(byte_src-5:16, er1.l), @(byte_dst-6:16, er2.l)
-;;; 	.word	0x0177
-;;; 	.word	0x6e1c
-;;; 	.word	byte_src-5
-;;; 	.word	0xf220
-;;; 	.word	byte_dst-6
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0x00000005 er1	
-	test_h_gr32	0x00000006 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-cmp_b_indexb32_indexb32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#0xffffff01, er1
-	mov	#0xffffff02, er2
-	set_ccr_zero
-	cmp.b	@(byte_src-1:32, r1.b), @(byte_dst-2:32, r2.b)
-;;;	.word	0x7815
-;;;	.word	0x6a2c
-;;;	.long	byte_src-1
-;;;	.word	0xda20
-;;;	.long	byte_dst-2
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0xffffff01 er1	
-	test_h_gr32	0xffffff02 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-.if 1				; ambiguous
-cmp_b_indexw32_indexw32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#0xffff0003, er1
-	mov	#0xffff0004, er2
-	set_ccr_zero
-	cmp.b	@(byte_src-3:32, r1.w), @(byte_dst-4:32, r2.w)
-;;;	.word	0x7816
-;;;	.word	0x6a2c
-;;;	.long	byte_src-3
-;;;	.word	0xea20
-;;;	.long	byte_dst-4
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0xffff0003 er1	
-	test_h_gr32	0xffff0004 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-.endif
-
-cmp_b_indexl32_indexl32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov	#0x00000005, er1
-	mov	#0x00000006, er2
-	set_ccr_zero
-	cmp.b	@(byte_src-5:32, er1.l), @(byte_dst-6:32, er2.l)
-;;;	.word	0x7817
-;;;	.word	0x6a2c
-;;;	.long	byte_src-5
-;;;	.word	0xfa20
-;;;	.long	byte_dst-6
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0x00000005 er1	
-	test_h_gr32	0x00000006 er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-cmp_b_abs16_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-	cmp.b	@byte_src:16, @byte_dst:16
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_grs_a5a5
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-cmp_b_abs32_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-	cmp.b	@byte_src:32, @byte_dst:32
-
-	test_neg_clear		; N=0, Z=0, V=1, C=0
-	test_zero_clear
-	test_ovf_set
-	test_carry_clear
-
-	test_grs_a5a5
-	cmp.b	#0x5a, @byte_src:16
-	bne	fail1
-	cmp.b	#0xa5, @byte_dst:16
-	bne	fail1
-
-.endif
-	pass
-
-	exit 0
-
-fail1:	fail
diff --git a/sim/testsuite/sim/h8300/cmpl.s b/sim/testsuite/sim/h8300/cmpl.s
deleted file mode 100644
index 55f235a2ee1..00000000000
--- a/sim/testsuite/sim/h8300/cmpl.s
+++ /dev/null
@@ -1,106 +0,0 @@
-# Hitachi H8 testcase 'cmp.w'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-	
-.if (sim_cpu == h8sx)		; 3-bit immediate mode only for h8sx
-cmp_l_imm3:			; 
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  cmp.l #xx:3,eRd	; Immediate 3-bit operand
-	mov.l	#5, er0
-	cmp.l	#5, er0
-	beq	eq3
-	fail
-eq3:
-	cmp.l	#6, er0
-	blt	lt3
-	fail
-lt3:
-	cmp.l	#4, er0
-	bgt	gt3
-	fail
-gt3:	
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0x00000005 er0	; er0 unchanged
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-cmp_l_imm16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  cmp.l #xx:8,Rd
-	cmp.l	#0xa5a5a5a5, er0	; Immediate 16-bit operand
-	beq	eqi
-	fail
-eqi:	cmp.l	#0xa5a5a5a6, er0
-	blt	lti
-	fail
-lti:	cmp.l	#0xa5a5a5a4, er0
-	bgt	gti
-	fail
-gti:	
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa5a5a5a5 er0	; er0 unchanged
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-cmp_w_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  cmp.l Rs,Rd
-	mov.l	#0xa5a5a5a5, er1
-	cmp.l	er1, er0		; Register operand
-	beq	eqr
-	fail
-eqr:	mov.l	#0xa5a5a5a6, er1
-	cmp.l	er1, er0
-	blt	ltr
-	fail
-ltr:	mov.l	#0xa5a5a5a4, er1
-	cmp.l	er1, er0
-	bgt	gtr
-	fail
-gtr:
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa5a5a5a5 er0	; r0 unchanged
-	test_h_gr32 0xa5a5a5a4 er1	; r1 unchanged
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/cmpw.s b/sim/testsuite/sim/h8300/cmpw.s
deleted file mode 100644
index 872c56c3ba1..00000000000
--- a/sim/testsuite/sim/h8300/cmpw.s
+++ /dev/null
@@ -1,126 +0,0 @@
-# Hitachi H8 testcase 'cmp.w'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-.if (sim_cpu == h8sx)		; 3-bit immediate mode only for h8sx
-cmp_w_imm3:			; 
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  cmp.w #xx:3,Rd	; Immediate 3-bit operand
-	mov.w	#5, r0
-	cmp.w	#5, r0
-	beq	eq3
-	fail
-eq3:
-	cmp.w	#6, r0
-	blt	lt3
-	fail
-lt3:
-	cmp.w	#4, r0
-	bgt	gt3
-	fail
-gt3:	
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr32 0xa5a50005 er0	; er0 unchanged
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-cmp_w_imm16:			; cmp.w immediate not available in h8300 mode.
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  cmp.w #xx:16,Rd
-	cmp.w	#0xa5a5, r0	; Immediate 16-bit operand
-	beq	eqi
-	fail
-eqi:	cmp.w	#0xa5a6, r0
-	blt	lti
-	fail
-lti:	cmp.w	#0xa5a4, r0
-	bgt	gti
-	fail
-gti:	
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a5 r0	; r0 unchanged
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5a5 er0	; er0 unchanged
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-cmp_w_imm16_less_than_zero:	; Test for less-than-zero immediate
-	set_grs_a5a5
-	;; cmp.w #xx:16, Rd, where #xx < 0 (ie. #xx > 0x7fff).
-	sub.w	r0, r0
-	cmp.w	#0x8001, r0
-	bls	ltz
-	fail
-ltz:	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.endif
-	
-cmp_w_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  cmp.w Rs,Rd
-	mov.w	#0xa5a5, r1
-	cmp.w	r1, r0		; Register operand
-	beq	eqr
-	fail
-eqr:	mov.w	#0xa5a6, r1
-	cmp.w	r1, r0
-	blt	ltr
-	fail
-ltr:	mov.w	#0xa5a4, r1
-	cmp.w	r1, r0
-	bgt	gtr
-	fail
-gtr:
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a5 r0	; r0 unchanged.
-	test_h_gr16 0xa5a4 r1	; r1 unchanged.
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5a5 er0	; r0 unchanged
-	test_h_gr32 0xa5a5a5a4 er1	; r1 unchanged
-.endif
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/daa.s b/sim/testsuite/sim/h8300/daa.s
deleted file mode 100644
index 5f81ebad491..00000000000
--- a/sim/testsuite/sim/h8300/daa.s
+++ /dev/null
@@ -1,36 +0,0 @@
-# Hitachi H8 testcase 'daa'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-	
-daa_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  daa Rd
-	daa	r0l		; register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr8 5 r0l
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/das.s b/sim/testsuite/sim/h8300/das.s
deleted file mode 100644
index 9317f198be3..00000000000
--- a/sim/testsuite/sim/h8300/das.s
+++ /dev/null
@@ -1,36 +0,0 @@
-# Hitachi H8 testcase 'das'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-	
-das_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  das Rd
-	das	r0l		; register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/dec.s b/sim/testsuite/sim/h8300/dec.s
deleted file mode 100644
index 122f3115a33..00000000000
--- a/sim/testsuite/sim/h8300/dec.s
+++ /dev/null
@@ -1,117 +0,0 @@
-# Hitachi H8 testcase 'dec.b, dec.w, dec.l'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-dec_b:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  dec.b Rd
-	dec.b	r0h		; Decrement 8-bit reg by one
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa4a5 r0	; dec result: a4|a5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a4a5 er0	; dec result: a5|a5|a4|a5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-dec_w_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  dec.w #1, Rd
-	dec.w	#1, r0		; Decrement 16-bit reg by one
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a4 r0	; dec result: a5|a4
-
-	test_h_gr32 0xa5a5a5a4 er0	; dec result:	a5|a5|a5|a4
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-dec_w_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  dec.w #2, Rd
-	dec.w	#2, r0		; Decrement 16-bit reg by two
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a3 r0	; dec result: a5|a3
-
-	test_h_gr32 0xa5a5a5a3 er0	; dec result:	a5|a5|a5|a3
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-dec_l_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  dec.l #1, eRd
-	dec.l	#1, er0		; Decrement 32-bit reg by one
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa5a5a5a4 er0	; dec result:	a5|a5|a5|a4
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-dec_l_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  dec.l #2, eRd
-	dec.l	#2, er0		; Decrement 32-bit reg by two
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa5a5a5a3 er0	; dec result:	a5|a5|a5|a3
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/div.s b/sim/testsuite/sim/h8300/div.s
deleted file mode 100644
index fd53bafa62c..00000000000
--- a/sim/testsuite/sim/h8300/div.s
+++ /dev/null
@@ -1,387 +0,0 @@
-# Hitachi H8 testcase 'divs', 'divu', 'divxs', 'divxu'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-.if (sim_cpu == h8sx)	
-divs_w_reg_reg:	
-	set_grs_a5a5
-
-	;; divs.w rs, rd
-	mov.w	#32, r1
-	mov.w	#-2, r2
-	set_ccr_zero
-	divs.w	r2, r1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr16	0xfff0	r1
-	test_h_gr32	0xa5a5fffe	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-divs_w_imm4_reg:
-	set_grs_a5a5
-
-	;; divs.w xx:4, rd
-	mov.w	#-32, r1
-	set_ccr_zero
-	divs.w	#2:4, r1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	-16	r1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-divs_l_reg_reg:	
-	set_grs_a5a5
-
-	;; divs.l ers, erd
-	mov.l	#320000, er1
-	mov.l	#-2, er2
-	set_ccr_zero
-	divs.l	er2, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	-160000	er1
-	test_h_gr32	-2	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-divs_l_imm4_reg:
-	set_grs_a5a5
-
-	;; divs.l xx:4, rd
-	mov.l	#-320000, er1
-	set_ccr_zero
-	divs.l	#2:4, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	-160000	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-divu_w_reg_reg:	
-	set_grs_a5a5
-
-	;; divu.w rs, rd
-	mov.w	#32, r1
-	mov.w	#2, r2
-	set_ccr_zero
-	divu.w	r2, r1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	16	r1
-	test_h_gr32	0xa5a50002	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-divu_w_imm4_reg:
-	set_grs_a5a5
-
-	;; divu.w xx:4, rd
-	mov.w	#32, r1
-	set_ccr_zero
-	divu.w	#2:4, r1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	16	r1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-divu_l_reg_reg:	
-	set_grs_a5a5
-
-	;; divu.l ers, erd
-	mov.l	#320000, er1
-	mov.l	#2, er2
-	set_ccr_zero
-	divu.l	er2, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	160000	er1
-	test_h_gr32	2	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-divu_l_imm4_reg:
-	set_grs_a5a5
-
-	;; divu.l xx:4, rd
-	mov.l	#320000, er1
-	set_ccr_zero
-	divu.l	#2:4, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	160000	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.endif
-
-.if (sim_cpu)			; not equal to zero ie. not h8
-divxs_b_reg_reg:
-	set_grs_a5a5
-
-	;; divxs.b rs, rd
-	mov.w	#32, r1
-	mov.b	#-2, r2l
-	set_ccr_zero
-	divxs.b	r2l, r1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr16	0x00f0	r1
-	test_h_gr32	0xa5a5a5fe	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.if (sim_cpu == h8sx)	
-divxs_b_imm4_reg:
-	set_grs_a5a5
-
-	;; divxs.b xx:4, rd
-	mov.w	#-32, r1
-	set_ccr_zero
-	divxs.b	#2:4, r1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	0x00f0	r1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif				; h8sx
-
-divxs_w_reg_reg:	
-	set_grs_a5a5
-
-	;; divxs.w ers, erd
-	mov.l	#0x1000,  er1
-	mov.w	#-0x1000, r2
-	set_ccr_zero
-	divxs.w	r2, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	0x0000ffff	er1
-	test_h_gr32	0xa5a5f000	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.if (sim_cpu == h8sx)
-divxs_w_imm4_reg:
-	set_grs_a5a5
-
-	;; divxs.w xx:4, rd
-	mov.l	#-4, er1
-	set_ccr_zero
-	divxs.w	#2:4, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0x0000fffe	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif				; h8sx
-.endif				; not h8
-
-divxu_b_reg_reg:
-	set_grs_a5a5
-
-	;; divxu.b rs, rd
-	mov.w	#32, r1
-	mov.b	#2, r2l
-	set_ccr_zero
-	divxu.b	r2l, r1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-	
-	test_gr_a5a5	0
-	test_h_gr16	0x0010	r1
-	test_h_gr16	0xa502  r2
-.if (sim_cpu)
-	test_h_gr32	0xa5a5a502	er2
-.endif
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.if (sim_cpu)			; not h8
-.if (sim_cpu == h8sx)
-divxu_b_imm4_reg:
-	set_grs_a5a5
-
-	;; divxu.b xx:4, rd
-	mov.w	#32, r1
-	set_ccr_zero
-	divxu.b	#2:4, r1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	0x0010	r1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif				; h8sx
-
-divxu_w_reg_reg:	
-	set_grs_a5a5
-
-	;; divxu.w ers, erd
-	mov.l	#0x1000, er1
-	mov.w	#0x1000, r2
-	set_ccr_zero
-	divxu.w	r2, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	0x00000001	er1
-	test_h_gr32	0xa5a51000	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.if (sim_cpu == h8sx)
-divxu_w_imm4_reg:
-	set_grs_a5a5
-
-	;; divxu.w xx:4, rd
-	mov.l	#0xffff, er1
-	set_ccr_zero
-	divxu.w	#2:4, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0x00017fff	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif				; h8sx
-.endif				; not h8
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/extl.s b/sim/testsuite/sim/h8300/extl.s
deleted file mode 100644
index 001f6d35457..00000000000
--- a/sim/testsuite/sim/h8300/extl.s
+++ /dev/null
@@ -1,1146 +0,0 @@
-# Hitachi H8 testcase 'exts.l, extu.l'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-	.align 4
-pos:	.long	0xffff0001
-neg:	.long	0x00008000
-
-pos2:	.long	0xffffff01
-neg2:	.long	0x00000080
-
-	.text
-
-exts_l_reg32_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l ern32
-	mov.w	#1, r0
-	exts.l	er0
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  0x00000001 er0	; result of sign extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-exts_l_reg32_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l ern32
-	mov.w	#0xffff, r0
-	exts.l	er0
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  0xffffffff er0	; result of sign extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-extu_l_reg32_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l ern32
-	mov.w	#0xffff, r0
-	extu.l	er0
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  0x0000ffff er0	; result of zero extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-exts_l_ind_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @ern32
-	mov.l	#pos, er1
-	exts.l	@er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos
-	beq	.Lslindp
-	fail
-.Lslindp:
-	mov.l	#0xffff0001, @pos	; Restore initial value
-
-exts_l_ind_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @ern32
-	mov.l	#neg, er1
-	exts.l	@er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffff8000, @neg
-	beq     .Lslindn
-	fail
-.Lslindn:
-;;;  Note:	 leave the value as 0xffff8000, so that extu has work to do.
-	
-extu_l_ind_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @ern32
-	mov.l	#neg, er1
-	extu.l	@er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Lulindn
-	fail
-.Lulindn:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-exts_l_postinc_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @ern32+
-	mov.l	#pos, er1
-	exts.l	@er1+
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos+4 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos
-	beq	.Lslpostincp
-	fail
-.Lslpostincp:
-	mov.l	#0xffff0001, @pos	; Restore initial value
-
-exts_l_postinc_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @ern32+
-	mov.l	#neg, er1
-	exts.l	@er1+
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg+4 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffff8000, @neg
-	beq     .Lslpostincn
-	fail
-.Lslpostincn:
-;;;  Note:	 leave the value as 0xffff8000, so that extu has work to do.
-	
-extu_l_postinc_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @ern32+
-	mov.l	#neg, er1
-	extu.l	@er1+
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg+4 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Lulpostincn
-	fail
-.Lulpostincn:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-exts_l_postdec_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @ern32-
-	mov.l	#pos, er1
-	exts.l	@er1-
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos-4 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos
-	beq	.Lslpostdecp
-	fail
-.Lslpostdecp:
-	mov.l	#0xffff0001, @pos	; Restore initial value
-
-exts_l_postdec_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @ern32-
-	mov.l	#neg, er1
-	exts.l	@er1-
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg-4 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffff8000, @neg
-	beq     .Lslpostdecn
-	fail
-.Lslpostdecn:
-;;;  Note:	 leave the value as 0xffff8000, so that extu has work to do.
-	
-extu_l_postdec_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @ern32-
-	mov.l	#neg, er1
-	extu.l	@er1-
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg-4 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Lulpostdecn
-	fail
-.Lulpostdecn:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-exts_l_preinc_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @+ern32
-	mov.l	#pos-4, er1
-	exts.l	@+er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos
-	beq	.Lslpreincp
-	fail
-.Lslpreincp:
-	mov.l	#0xffff0001, @pos	; Restore initial value
-
-exts_l_preinc_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @+ern32
-	mov.l	#neg-4, er1
-	exts.l	@+er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffff8000, @neg
-	beq     .Lslpreincn
-	fail
-.Lslpreincn:
-;;;  Note:	 leave the value as 0xffff8000, so that extu has work to do.
-	
-extu_l_preinc_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @+ern32
-	mov.l	#neg-4, er1
-	extu.l	@+er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Lulpreincn
-	fail
-.Lulpreincn:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-exts_l_predec_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @-ern32
-	mov.l	#pos+4, er1
-	exts.l	@-er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos
-	beq	.Lslpredecp
-	fail
-.Lslpredecp:
-	mov.l	#0xffff0001, @pos	; Restore initial value
-
-exts_l_predec_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l @-ern32
-	mov.l	#neg+4, er1
-	exts.l	@-er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffff8000, @neg
-	beq     .Lslpredecn
-	fail
-.Lslpredecn:
-;;;  Note:	 leave the value as 0xffff8000, so that extu has work to do.
-	
-extu_l_predec_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @-ern32
-	mov.l	#neg+4, er1
-	extu.l	@-er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Lulpredecn
-	fail
-.Lulpredecn:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-extu_l_disp2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @(dd:2, ern32)
-	mov.l	#neg-8, er1
-	extu.l	@(8:2, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg-8 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Luldisp2n
-	fail
-.Luldisp2n:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-extu_l_disp16_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @(dd:16, ern32)
-	mov.l	#neg-44, er1
-	extu.l	@(44:16, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg-44 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Luldisp16n
-	fail
-.Luldisp16n:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-extu_l_disp32_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @(dd:32, ern32)
-	mov.l	#neg+444, er1
-	extu.l	@(-444:32, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg+444 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Luldisp32n
-	fail
-.Luldisp32n:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-extu_l_abs16_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @aa:16
-	extu.l	@neg:16
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Lulabs16n
-	fail
-.Lulabs16n:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-extu_l_abs32_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l @aa:32
-	extu.l	@neg:32
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00008000, @neg
-	beq     .Lulabs32n
-	fail
-.Lulabs32n:
-;;;  Note:	 leave the value as 0x00008000, so that extu has work to do.
-
-
-
-	#
-	# exts #2, nn
-	#
-
-exts_l_reg32_2_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, ern32
-	mov.b	#1, r0l
-	exts.l	#2, er0
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  0x00000001 er0	; result of sign extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-exts_l_reg32_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, ern32
-	mov.b	#0xff, r0l
-	exts.l	#2, er0
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_ovf_clear
-	test_zero_clear
-	test_carry_clear
-
-	test_h_gr32  0xffffffff er0	; result of sign extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-extu_l_reg32_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, ern32
-	mov.b	#0xff, r0l
-	extu.l	#2, er0
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  0x000000ff er0	; result of zero extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-exts_l_ind_2_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @ern32
-	mov.l	#pos2, er1
-	exts.l	#2, @er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos2 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos2
-	beq	.Lslindp2
-	fail
-.Lslindp2:
-	mov.l	#0xffffff01, @pos2	; Restore initial value
-
-exts_l_ind_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @ern32
-	mov.l	#neg2, er1
-	exts.l	#2, @er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_ovf_clear
-	test_zero_clear
-	test_carry_clear
-
-	test_h_gr32  neg2 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffffff80, @neg2
-	beq     .Lslindn2
-	fail
-.Lslindn2:
-;;;  Note:	 leave the value as 0xffffff80, so that extu has work to do.
-
-extu_l_ind_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @ern32
-	mov.l	#neg2, er1
-	extu.l	#2, @er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg2 er1	; result of zero extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Lulindn2
-	fail
-.Lulindn2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-exts_l_postinc_2_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @ern32+
-	mov.l	#pos2, er1
-	exts.l	#2, @er1+
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos2+4 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos2
-	beq	.Lslpostincp2
-	fail
-.Lslpostincp2:
-	mov.l	#0xffffff01, @pos2	; Restore initial value
-
-exts_l_postinc_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @ern32+
-	mov.l	#neg2, er1
-	exts.l	#2, @er1+
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_ovf_clear
-	test_zero_clear
-	test_carry_clear
-
-	test_h_gr32  neg2+4 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffffff80, @neg2
-	beq     .Lslpostincn2
-	fail
-.Lslpostincn2:
-;;;  Note:	 leave the value as 0xffffff80, so that extu has work to do.
-
-extu_l_postinc_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @ern32+
-	mov.l	#neg2, er1
-	extu.l	#2, @er1+
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg2+4 er1	; result of zero extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Lulpostincn2
-	fail
-.Lulpostincn2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-exts_l_postdec_2_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @ern32-
-	mov.l	#pos2, er1
-	exts.l	#2, @er1-
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos2-4 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos2
-	beq	.Lslpostdecp2
-	fail
-.Lslpostdecp2:
-	mov.l	#0xffffff01, @pos2	; Restore initial value
-
-exts_l_postdec_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @ern32-
-	mov.l	#neg2, er1
-	exts.l	#2, @er1-
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_ovf_clear
-	test_zero_clear
-	test_carry_clear
-
-	test_h_gr32  neg2-4 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffffff80, @neg2
-	beq     .Lslpostdecn2
-	fail
-.Lslpostdecn2:
-;;;  Note:	 leave the value as 0xffffff80, so that extu has work to do.
-
-extu_l_postdec_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @ern32-
-	mov.l	#neg2, er1
-	extu.l	#2, @er1-
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg2-4 er1	; result of zero extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Lulpostdecn2
-	fail
-.Lulpostdecn2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-exts_l_preinc_2_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @+ern32
-	mov.l	#pos2-4, er1
-	exts.l	#2, @+er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos2 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos2
-	beq	.Lslpreincp2
-	fail
-.Lslpreincp2:
-	mov.l	#0xffffff01, @pos2	; Restore initial value
-
-exts_l_preinc_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @+ern32
-	mov.l	#neg2-4, er1
-	exts.l	#2, @+er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_ovf_clear
-	test_zero_clear
-	test_carry_clear
-
-	test_h_gr32  neg2 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffffff80, @neg2
-	beq     .Lslpreincn2
-	fail
-.Lslpreincn2:
-;;;  Note:	 leave the value as 0xffffff80, so that extu has work to do.
-
-extu_l_preinc_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @+ern32
-	mov.l	#neg2-4, er1
-	extu.l	#2, @+er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg2 er1	; result of zero extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Lulpreincn2
-	fail
-.Lulpreincn2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-exts_l_predec_2_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @-ern32
-	mov.l	#pos2+4, er1
-	exts.l	#2, @-er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos2 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.l	#0x00000001, @pos2
-	beq	.Lslpredecp2
-	fail
-.Lslpredecp2:
-	mov.l	#0xffffff01, @pos2	; Restore initial value
-
-exts_l_predec_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.l #2, @-ern32
-	mov.l	#neg2+4, er1
-	exts.l	#2, @-er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_ovf_clear
-	test_zero_clear
-	test_carry_clear
-
-	test_h_gr32  neg2 er1	; result of sign extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0xffffff80, @neg2
-	beq     .Lslpredecn2
-	fail
-.Lslpredecn2:
-;;;  Note:	 leave the value as 0xffffff80, so that extu has work to do.
-
-extu_l_predec_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @-ern32
-	mov.l	#neg2+4, er1
-	extu.l	#2, @-er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg2 er1	; result of zero extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Lulpredecn2
-	fail
-.Lulpredecn2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-extu_l_disp2_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @(dd:2, ern32)
-	mov.l	#neg2-8, er1
-	extu.l	#2, @(8:2, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg2-8 er1	; result of zero extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Luldisp2n2
-	fail
-.Luldisp2n2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-extu_l_disp16_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @(dd:16, ern32)
-	mov.l	#neg2-44, er1
-	extu.l	#2, @(44:16, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg2-44 er1	; result of zero extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Luldisp16n2
-	fail
-.Luldisp16n2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-extu_l_disp32_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @(dd:32, ern32)
-	mov.l	#neg2+444, er1
-	extu.l	#2, @(-444:32, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg2+444 er1	; result of zero extend
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Luldisp32n2
-	fail
-.Luldisp32n2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-extu_l_abs16_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @aa:16
-	extu.l	#2, @neg2:16
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Lulabs16n2
-	fail
-.Lulabs16n2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-extu_l_abs32_2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.l #2, @aa:32
-	extu.l	#2, @neg2:32
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-        cmp.l   #0x00000080, @neg2
-	beq     .Lulabs32n2
-	fail
-.Lulabs32n2:
-;;;  Note:	 leave the value as 0x00000080, like it started out.
-
-.endif
-
-	pass
-
-	exit 0
-
-
-
-
diff --git a/sim/testsuite/sim/h8300/extw.s b/sim/testsuite/sim/h8300/extw.s
deleted file mode 100644
index b1eb491b427..00000000000
--- a/sim/testsuite/sim/h8300/extw.s
+++ /dev/null
@@ -1,580 +0,0 @@
-# Hitachi H8 testcase 'exts.w, extu.w'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-	.align 2
-pos:	.word	0xff01
-neg:	.word	0x0080
-
-	.text
-
-exts_w_reg16_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w rn16
-	mov.b	#1, r0l
-	exts.w	r0
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  0xa5a50001 er0	; result of sign extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-exts_w_reg16_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w rn16
-	mov.b	#0xff, r0l
-	exts.w	r0
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  0xa5a5ffff er0	; result of sign extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-extu_w_reg16_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w rn16
-	mov.b	#0xff, r0l
-	extu.w	r0
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  0xa5a500ff er0	; result of zero extend
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-exts_w_ind_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @ern
-	mov.l	#pos, er1
-	exts.w	@er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0001, @pos
-	beq	.Lswindp
-	fail
-.Lswindp:
-	mov.w	#0xff01, @pos	; Restore initial value
-
-exts_w_ind_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @ern
-	mov.l	#neg, er1
-	exts.w	@er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0xff80, @neg
-	beq	.Lswindn
-	fail
-.Lswindn:
-	;; Note: leave the value as 0xff80, so that extu has work to do.
-	
-extu_w_ind_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @ern
-	mov.l	#neg, er1
-	extu.w	@er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwindn
-	fail
-.Luwindn:
-	;; Note: leave the value as 0x0080, like it started out.
-
-exts_w_postinc_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @ern+
-	mov.l	#pos, er1
-	exts.w	@er1+
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos+2 er1	; er1 still contains target address plus 2
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0001, @pos
-	beq	.Lswpostincp
-	fail
-.Lswpostincp:
-	mov.w	#0xff01, @pos	; Restore initial value
-
-exts_w_postinc_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @ern+
-	mov.l	#neg, er1
-	exts.w	@er1+
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg+2 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0xff80, @neg
-	beq	.Lswpostincn
-	fail
-.Lswpostincn:
-	;; Note: leave the value as 0xff80, so that extu has work to do.
-	
-extu_w_postinc_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @ern+
-	mov.l	#neg, er1
-	extu.w	@er1+
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg+2 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwpostincn
-	fail
-.Luwpostincn:
-	;; Note: leave the value as 0x0080, like it started out.
-
-exts_w_postdec_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @ern-
-	mov.l	#pos, er1
-	exts.w	@er1-
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos-2 er1	; er1 still contains target address plus 2
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0001, @pos
-	beq	.Lswpostdecp
-	fail
-.Lswpostdecp:
-	mov.w	#0xff01, @pos	; Restore initial value
-
-exts_w_postdec_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @ern-
-	mov.l	#neg, er1
-	exts.w	@er1-
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg-2 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0xff80, @neg
-	beq	.Lswpostdecn
-	fail
-.Lswpostdecn:
-	;; Note: leave the value as 0xff80, so that extu has work to do.
-	
-extu_w_postdec_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @ern-
-	mov.l	#neg, er1
-	extu.w	@er1-
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg-2 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwpostdecn
-	fail
-.Luwpostdecn:
-	;; Note: leave the value as 0x0080, like it started out.
-
-exts_w_preinc_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @+ern
-	mov.l	#pos-2, er1
-	exts.w	@+er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos er1	; er1 still contains target address plus 2
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0001, @pos
-	beq	.Lswpreincp
-	fail
-.Lswpreincp:
-	mov.w	#0xff01, @pos	; Restore initial value
-
-exts_w_preinc_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @+ern
-	mov.l	#neg-2, er1
-	exts.w	@+er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0xff80, @neg
-	beq	.Lswpreincn
-	fail
-.Lswpreincn:
-	;; Note: leave the value as 0xff80, so that extu has work to do.
-	
-extu_w_preinc_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @+ern
-	mov.l	#neg-2, er1
-	extu.w	@+er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwpreincn
-	fail
-.Luwpreincn:
-	;; Note: leave the value as 0x0080, like it started out.
-
-exts_w_predec_p:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @-ern
-	mov.l	#pos+2, er1
-	exts.w	@-er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  pos er1	; er1 still contains target address plus 2
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0001, @pos
-	beq	.Lswpredecp
-	fail
-.Lswpredecp:
-	mov.w	#0xff01, @pos	; Restore initial value
-
-exts_w_predec_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; exts.w @-ern
-	mov.l	#neg+2, er1
-	exts.w	@-er1
-
-	;; Test ccr		H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0xff80, @neg
-	beq	.Lswpredecn
-	fail
-.Lswpredecn:
-	;; Note: leave the value as 0xff80, so that extu has work to do.
-	
-extu_w_predec_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @-ern
-	mov.l	#neg+2, er1
-	extu.w	@-er1
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwpredecn
-	fail
-.Luwpredecn:
-	;; Note: leave the value as 0x0080, like it started out.
-
-extu_w_disp2_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @(dd:2, ern)
-	mov.l	#neg-2, er1
-	extu.w	@(2:2, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg-2 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwdisp2n
-	fail
-.Luwdisp2n:
-	;; Note: leave the value as 0x0080, like it started out.
-
-extu_w_disp16_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @(dd:16, ern)
-	mov.l	#neg-44, er1
-	extu.w	@(44:16, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg-44 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwdisp16n
-	fail
-.Luwdisp16n:
-	;; Note: leave the value as 0x0080, like it started out.
-
-extu_w_disp32_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @(dd:32, ern)
-	mov.l	#neg+444, er1
-	extu.w	@(-444:32, er1)
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_h_gr32  neg+444 er1	; er1 still contains target address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwdisp32n
-	fail
-.Luwdisp32n:
-	;; Note: leave the value as 0x0080, like it started out.
-
-extu_w_abs16_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @aa:16
-	extu.w	@neg:16
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwabs16n
-	fail
-.Luwabs16n:
-	;; Note: leave the value as 0x0080, like it started out.
-
-extu_w_abs32_n:
-	set_grs_a5a5
-	set_ccr_zero
-	;; extu.w @aa:32
-	extu.w	@neg:32
-
-	;; Test ccr		H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	cmp.w	#0x0080, @neg
-	beq	.Luwabs32n
-	fail
-.Luwabs32n:
-	;; Note: leave the value as 0x0080, like it started out.
-
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/inc.s b/sim/testsuite/sim/h8300/inc.s
deleted file mode 100644
index 69d2c3b6b4b..00000000000
--- a/sim/testsuite/sim/h8300/inc.s
+++ /dev/null
@@ -1,117 +0,0 @@
-# Hitachi H8 testcase 'inc, inc.w, inc.l'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-inc_b:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  inc.b Rd
-	inc.b	r0h		; Increment 8-bit reg by one
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa6a5 r0	; inc result: a6|a5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a6a5 er0	; inc result: a5|a5|a6|a5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-inc_w_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  inc.w #1, Rd
-	inc.w	#1, r0		; Increment 16-bit reg by one
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a6 r0	; inc result: a5|a6
-
-	test_h_gr32 0xa5a5a5a6 er0	; inc result:	a5|a5|a5|a6
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-inc_w_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  inc.w #2, Rd
-	inc.w	#2, r0		; Increment 16-bit reg by two
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a7 r0	; inc result: a5|a7
-
-	test_h_gr32 0xa5a5a5a7 er0	; inc result:	a5|a5|a5|a7
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-inc_l_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  inc.l #1, eRd
-	inc.l	#1, er0		; Increment 32-bit reg by one
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa5a5a5a6 er0	; inc result:	a5|a5|a5|a6
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-inc_l_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  inc.l #2, eRd
-	inc.l	#2, er0		; Increment 32-bit reg by two
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa5a5a5a7 er0	; inc result:	a5|a5|a5|a7
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/jmp.s b/sim/testsuite/sim/h8300/jmp.s
deleted file mode 100644
index 30a4b284caa..00000000000
--- a/sim/testsuite/sim/h8300/jmp.s
+++ /dev/null
@@ -1,123 +0,0 @@
-# Hitachi H8 testcase 'jmp'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-vector_area:
-	.fill	0x400, 1, 0
-
-	start
-	
-.if (sim_cpu == h8sx)
-jmp_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#.Ltgt_8:32, @0x20
-	set_ccr_zero
-	;;  jmp @@aa:8		; 8-bit displacement
-	jmp @@0x20
-	fail
-
-.Ltgt_8:	
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-jmp_7:				; vector jump
-	mov.l	#vector_area, er0
-	ldc.l	er0, vbr
-	set_grs_a5a5
-	mov.l	#.Ltgt_7:32, @vector_area+0x300
-	set_ccr_zero
-
-	jmp	@@0x300
-	fail
-.Ltgt_7:
-	test_cc_clear
-	test_grs_a5a5
-	stc.l	vbr, er0
-	test_h_gr32 vector_area, er0
-	
-.endif				; h8sx
-
-jmp_24:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  jmp @aa:24		; 24-bit address
-	jmp @.Ltgt_24:24
-	fail
-
-.Ltgt_24:	
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu)			; Non-zero means h8300h, h8300s, or h8sx
-jmp_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  jmp @ern		; register indirect
-	mov.l	#.Ltgt_reg, er5
-	jmp	@er5
-	fail
-	
-.Ltgt_reg:
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_h_gr32 .Ltgt_reg er5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif				; not h8300
-
-.if (sim_cpu == h8sx)
-jmp_32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  jmp @aa:32		; 32-bit address
-;	jmp @.Ltgt_32:32	; NOTE:	hard-coded to avoid relaxing
-	.word	0x5908
-	.long	.Ltgt_32
-	fail
-
-.Ltgt_32:	
-	test_cc_clear
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif				; h8sx
-
-	pass
-	exit 0
-
-	
\ No newline at end of file
diff --git a/sim/testsuite/sim/h8300/ldc.s b/sim/testsuite/sim/h8300/ldc.s
deleted file mode 100644
index 3712a6c49ee..00000000000
--- a/sim/testsuite/sim/h8300/ldc.s
+++ /dev/null
@@ -1,375 +0,0 @@
-# Hitachi H8 testcase 'ldc'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-	.data
-byte_pre:
-	.byte	0
-byte_src:
-	.byte	0xff
-byte_post:
-	.byte	0
-	
-	start
-
-ldc_imm8_ccr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0xff, ccr	; set all ccr flags high, immediate operand
-	bcs	.L1		; carry flag set?
-	fail
-.L1:	bvs	.L2		; overflow flag set?
-	fail
-.L2:	beq	.L3		; zero flag set?
-	fail
-.L3:	bmi	.L4		; neg flag set?
-	fail
-.L4:
-	ldc	#0, ccr		; set all ccr flags low, immediate operand
-	bcc	.L5		; carry flag clear?
-	fail
-.L5:	bvc	.L6		; overflow flag clear?
-	fail
-.L6:	bne	.L7		; zero flag clear?
-	fail
-.L7:	bpl	.L8		; neg flag clear?
-	fail
-.L8:
-	test_cc_clear
-	test_grs_a5a5
-	
-ldc_reg8_ccr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#0xff, r0h
-	ldc	r0h, ccr	; set all ccr flags high, reg operand
-	bcs	.L11		; carry flag set?
-	fail
-.L11:	bvs	.L12		; overflow flag set?
-	fail
-.L12:	beq	.L13		; zero flag set?
-	fail
-.L13:	bmi	.L14		; neg flag set?
-	fail
-.L14:
-	mov	#0, r0h
-	ldc	r0h, ccr	; set all ccr flags low, reg operand
-	bcc	.L15		; carry flag clear?
-	fail
-.L15:	bvc	.L16		; overflow flag clear?
-	fail
-.L16:	bne	.L17		; zero flag clear?
-	fail
-.L17:	bpl	.L18		; neg flag clear?
-	fail
-.L18:
-	test_cc_clear
-	test_h_gr16  0x00a5 r0	; Register 0 modified by test procedure.
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8300s || sim_cpu == h8sx)	; Earlier versions, no exr
-ldc_imm8_exr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0, exr
-	ldc	#0x87, exr	; set exr to 0x87
-
-	stc	exr, r0l	; retrieve and check exr value
-	cmp.b	#0x87, r0l
-	beq	.L19
-	fail
-.L19:
-	test_h_gr16  0xa587 r0	; Register 0 modified by test procedure.
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-ldc_reg8_exr:	
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0, exr
-	mov	#0x87, r0h
-	ldc	r0h, exr	; set exr to 0x87
-
-	stc	exr, r0l	; retrieve and check exr value
-	cmp.b	#0x87, r0l
-	beq	.L21
-	fail
-.L21:
-	test_h_gr16  0x8787 r0	; Register 0 modified by test procedure.
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_abs16_ccr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	@byte_src:16, ccr	; abs16 src
-	stc	ccr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a5ff er0	; ff in r0l, a5 elsewhere.
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_abs16_exr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0, exr
-	ldc	@byte_src:16, exr	; abs16 src
-	stc	exr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a587 er0	; 87 in r0l, a5 elsewhere.
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_abs32_ccr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	@byte_src:32, ccr	; abs32 src
-	stc	ccr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a5ff er0	; ff in r0l, a5 elsewhere.
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_abs32_exr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0, exr
-	ldc	@byte_src:32, exr	; abs32 src
-	stc	exr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a587 er0	; 87 in r0l, a5 elsewhere.
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_disp16_ccr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_pre, er1
-	ldc	@(1:16, er1), ccr	; disp16 src
-	stc	ccr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a5ff er0	; ff in r0l, a5 elsewhere.
-	test_h_gr32 byte_pre, er1	; er1 still contains address
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_disp16_exr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0, exr
-	mov	#byte_post, er1
-	ldc	@(-1:16, er1), exr	; disp16 src
-	stc	exr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a587 er0	; 87 in r0l, a5 elsewhere.
-	test_h_gr32 byte_post, er1	; er1 still contains address
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_disp32_ccr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_pre, er1
-	ldc	@(1:32, er1), ccr	; disp32 src
-	stc	ccr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a5ff er0	; ff in r0l, a5 elsewhere.
-	test_h_gr32 byte_pre, er1	; er1 still contains address
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_disp32_exr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0, exr
-	mov	#byte_post, er1
-	ldc	@(-1:32, er1), exr	; disp16 src
-	stc	exr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a587 er0	; 87 in r0l, a5 elsewhere.
-	test_h_gr32 byte_post, er1	; er1 still contains address
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_postinc_ccr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_src, er1
-	ldc	@er1+, ccr	; postinc src
-	stc	ccr, r0l	; copy into general reg
-
-	test_h_gr32  0xa5a5a5ff er0	; ff in r0l, a5 elsewhere.
-	test_h_gr32  byte_src+2, er1	; er1 still contains address
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-ldc_postinc_exr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0, exr
-	mov	#byte_src, er1
-	ldc	@er1+, exr	; postinc src
-	stc	exr, r0l	; copy into general reg
-
-	test_h_gr32  0xa5a5a587 er0	; 87 in r0l, a5 elsewhere.
-	test_h_gr32  byte_src+2, er1	; er1 still contains address
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-ldc_ind_ccr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_src, er1
-	ldc	@er1, ccr	; postinc src
-	stc	ccr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a5ff er0	; ff in r0l, a5 elsewhere.
-	test_h_gr32 byte_src, er1	; er1 still contains address
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-ldc_ind_exr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0, exr
-	mov	#byte_src, er1
-	ldc	@er1, exr	; postinc src
-	stc	exr, r0l	; copy into general reg
-
-	test_h_gr32 0xa5a5a587 er0	; 87 in r0l, a5 elsewhere.
-	test_h_gr32 byte_src, er1	; er1 still contains address
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.endif
-	
-.if (sim_cpu == h8sx)		; New vbr and sbr registers for h8sx
-ldc_reg_sbr:	
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#0xaaaaaaaa, er0
-	ldc	er0, sbr	; set sbr to 0xaaaaaaaa
- 	stc	sbr, er1	; retreive and check sbr value
-
-	test_h_gr32 0xaaaaaaaa er1
-	test_h_gr32 0xaaaaaaaa er0 ; Register 0 modified by test procedure.
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-ldc_reg_vbr:	
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#0xaaaaaaaa, er0
-	ldc	er0, vbr	; set sbr to 0xaaaaaaaa
-	stc	vbr, er1	; retreive and check sbr value
-
-	test_h_gr32 0xaaaaaaaa er1
-	test_h_gr32 0xaaaaaaaa er0 ; Register 0 modified by test procedure.
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.endif
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/ldm.s b/sim/testsuite/sim/h8300/ldm.s
deleted file mode 100644
index c8162217064..00000000000
--- a/sim/testsuite/sim/h8300/ldm.s
+++ /dev/null
@@ -1,233 +0,0 @@
-# Hitachi H8 testcase 'ldm', 'stm'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-	.data
-	.align 4
-_stack:	.long	0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0
-	.long	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-	.long	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-	.long	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-_stack_top:
-
-	start
-
-.if (sim_cpu == h8300s || sim_cpu == h8sx)	; Earlier versions, no exr
-stm_2reg:
-	set_grs_a5a5
-	mov	#_stack_top, er7
-	mov	#2, er2
-	mov	#3, er3
-	
-	set_ccr_zero
-	stm	er2-er3, @-sp
-	test_cc_clear
-	
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_h_gr32  2	er2
-	test_h_gr32  3	er3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_h_gr32  _stack_top-8, er7
-
-	mov	@_stack_top-4, er0
-	cmp	#2, er0
-	bne	fail1
-
-	mov	@_stack_top-8, er0
-	cmp	#3, er0
-	bne	fail1
-
-	mov	@_stack_top-12, er0
-	cmp	#0, er0
-	bne	fail1
-
-stm_3reg:
-	set_grs_a5a5
-	mov	#_stack_top, er7
-	mov	#4, er4
-	mov	#5, er5
-	mov	#6, er6
-	
-	set_ccr_zero
-	stm	er4-er6, @-sp
-	test_cc_clear
-	
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_h_gr32  4	er4
-	test_h_gr32  5	er5
-	test_h_gr32  6	er6
-	test_h_gr32  _stack_top-12, er7
-
-	mov	@_stack_top-4, er0
-	cmp	#4, er0
-	bne	fail1
-
-	mov	@_stack_top-8, er0
-	cmp	#5, er0
-	bne	fail1
-
-	mov	@_stack_top-12, er0
-	cmp	#6, er0
-	bne	fail1
-
-	mov	@_stack_top-16, er0
-	cmp	#0, er0
-	bne	fail1
-
-stm_4reg:
-	set_grs_a5a5
-	mov	#_stack_top, er7
-	mov	#1, er0
-	mov	#2, er1
-	mov	#3, er2
-	mov	#4, er3
-	
-	set_ccr_zero
-	stm	er0-er3, @-sp
-	test_cc_clear
-	
-	test_h_gr32  1	er0
-	test_h_gr32  2	er1
-	test_h_gr32  3	er2
-	test_h_gr32  4	er3
-	test_gr_a5a5 4		; Make sure other general regs not disturbed
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_h_gr32  _stack_top-16, er7
-
-	mov	@_stack_top-4, er0
-	cmp	#1, er0
-	bne	fail1
-
-	mov	@_stack_top-8, er0
-	cmp	#2, er0
-	bne	fail1
-
-	mov	@_stack_top-12, er0
-	cmp	#3, er0
-	bne	fail1
-
-	mov	@_stack_top-16, er0
-	cmp	#4, er0
-	bne	fail1
-
-	mov	@_stack_top-20, er0
-	cmp	#0, er0
-	bne	fail1
-
-ldm_2reg:
-	set_grs_a5a5
-	mov	#_stack, er7
-	
-	set_ccr_zero
-	ldm	@sp+, er2-er3
-	test_cc_clear
-	
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_h_gr32  1	er2
-	test_h_gr32  0	er3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_h_gr32  _stack+8, er7
-
-ldm_3reg:
-	set_grs_a5a5
-	mov	#_stack+4, er7
-	
-	set_ccr_zero
-	ldm	@sp+, er4-er6
-	test_cc_clear
-	
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_h_gr32  3	er4
-	test_h_gr32  2	er5
-	test_h_gr32  1	er6
-	test_h_gr32  _stack+16, er7
-
-ldm_4reg:
-	set_grs_a5a5
-	mov	#_stack+4, er7
-	
-	set_ccr_zero
-	ldm	@sp+, er0-er3
-	test_cc_clear
-	
-	test_h_gr32  4	er0
-	test_h_gr32  3	er1
-	test_h_gr32  2	er2
-	test_h_gr32  1	er3
-	test_gr_a5a5 4		; Make sure other general regs not disturbed
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_h_gr32  _stack+20, er7
-.endif
-
-pushpop:
-	set_grs_a5a5
-.if (sim_cpu == h8300)
-	mov	#_stack_top, r7
-	mov	#12, r1
-	mov	#34, r2
-	mov	#56, r3
-	push	r1
-	push	r2
-	push	r3
-	pop	r4
-	pop	r5
-	pop	r6
-
-	test_gr_a5a5 0		; Make sure other general _reg_ not disturbed
-	test_h_gr16  12	r1
-	test_h_gr16  34	r2
-	test_h_gr16  56	r3
-	test_h_gr16  56	r4
-	test_h_gr16  34	r5
-	test_h_gr16  12	r6
-	mov	#_stack_top, r0
-	cmp.w	r0, r7
-	bne	fail1
-.else
-	mov	#_stack_top, er7
-	mov	#12, er1
-	mov	#34, er2
-	mov	#56, er3
-	push	er1
-	push	er2
-	push	er3
-	pop	er4
-	pop	er5
-	pop	er6
-
-	test_gr_a5a5 0		; Make sure other general _reg_ not disturbed
-	test_h_gr32  12	er1
-	test_h_gr32  34	er2
-	test_h_gr32  56	er3
-	test_h_gr32  56	er4
-	test_h_gr32  34	er5
-	test_h_gr32  12	er6
-	test_h_gr32  _stack_top, er7
-.endif
-		
-	pass
-
-	exit 0
-
-fail1:	fail
diff --git a/sim/testsuite/sim/h8300/mac.s b/sim/testsuite/sim/h8300/mac.s
deleted file mode 100644
index d60fe30da29..00000000000
--- a/sim/testsuite/sim/h8300/mac.s
+++ /dev/null
@@ -1,263 +0,0 @@
-# Hitachi H8 testcase 'mac'
-# mach(): h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-src1:	.word	0
-src2:	.word	0
-
-array:	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-	.word	0x7fff
-
-	start
-
-.if (sim_cpu)
-_clrmac:
-	set_grs_a5a5
-	set_ccr_zero
-	clrmac
-	test_cc_clear
-	test_grs_a5a5
-	;; Now see if the mac is actually clear...
-	stmac	mach, er0
-	test_zero_set
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 0 er0
-	stmac	macl, er1
-	test_zero_set
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 0 er1
-
-ld_stmac:
-	set_grs_a5a5
-	sub.l	er2, er2
-	set_ccr_zero
-	ldmac	er1, macl
-	stmac	macl, er2
-	test_ovf_clear
-	test_carry_clear
-	;; neg and zero are undefined
-	test_h_gr32 0xa5a5a5a5 er2
-
-	sub.l	er2, er2
-	set_ccr_zero
-	ldmac	er1, mach
-	stmac	mach, er2
-	test_ovf_clear
-	test_carry_clear
-	;; neg and zero are undefined
-	test_h_gr32 0x0001a5 er2
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mac_2x2:
-	set_grs_a5a5
-	mov.w	#2, r1
-	mov.w	r1, @src1
-	mov.w	#2, r2
-	mov.w	r2, @src2
-	mov	#src1, er1
-	mov	#src2, er2
-	set_ccr_zero
-	clrmac
-	mac	@er1+, @er2+
-	test_cc_clear
-	
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 src1+2     er1
-	test_h_gr32 src2+2     er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-	stmac	macl, er0
-	test_zero_clear
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 4 er0
-
-	stmac	mach, er0
-	test_zero_clear
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 0 er0
-
-mac_same_reg_2x4:
-	;; Use same reg for src and dst.  Should be incremented twice,
-	;; and fetch values from consecutive locations.
-	set_grs_a5a5
-	mov.w	#2, r1
-	mov.w	r1, @src1
-	mov.w	#4, r2
-	mov.w	r2, @src2
-	mov	#src1, er1
-
-	set_ccr_zero
-	clrmac
-	mac	@er1+, @er1+	; same register for src and dst
-	test_cc_clear
-	
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 src1+4     er1
-	test_h_gr32 0xa5a50004 er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-	stmac	macl, er0
-	test_zero_clear
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 8 er0
-
-	stmac	mach, er0
-	test_zero_clear
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 0 er0
-
-mac_0x0:
-	set_grs_a5a5
-	mov.w	#0, r1
-	mov.w	r1, @src1
-	mov.w	#0, r2
-	mov.w	r2, @src2
-	mov	#src1, er1
-	mov	#src2, er2
-	set_ccr_zero
-	clrmac
-	mac	@er1+, @er2+
-	test_cc_clear
-	
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 src1+2     er1
-	test_h_gr32 src2+2     er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-	stmac	macl, er0
-	test_zero_set		; zero flag is set
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 0 er0	; result is zero
-
-	stmac	mach, er0
-	test_zero_set
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 0 er0
-
-mac_neg2x2:
-	set_grs_a5a5
-	mov.w	#-2, r1
-	mov.w	r1, @src1
-	mov.w	#2, r2
-	mov.w	r2, @src2
-	mov	#src1, er1
-	mov	#src2, er2
-	set_ccr_zero
-	clrmac
-	mac	@er1+, @er2+
-	test_cc_clear
-	
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 src1+2     er1
-	test_h_gr32 src2+2     er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-	stmac	macl, er0
-	test_zero_clear
-	test_neg_set		; neg flag is set
-	test_ovf_clear
-	test_h_gr32 -4 er0	; result is negative
-
-	stmac	mach, er0
-	test_zero_clear
-	test_neg_set
-	test_ovf_clear
-	test_h_gr32 -1 er0	; negative sign extend
-
-mac_array:
-	;; Use same reg for src and dst, pointing to an array of shorts
-	set_grs_a5a5
-	mov	#array, er1
-
-	set_ccr_zero
-	clrmac
-	mac	@er1+, @er1+	; same register for src and dst
-	mac	@er1+, @er1+	; repeat 8 times
-	mac	@er1+, @er1+
-	mac	@er1+, @er1+
-	mac	@er1+, @er1+
-	mac	@er1+, @er1+
-	mac	@er1+, @er1+
-	mac	@er1+, @er1+
-	test_cc_clear
-	
-	test_h_gr32 0xa5a5a5a5 er0
-	test_h_gr32 array+32     er1
-	test_h_gr32 0xa5a5a5a5 er2
-	test_h_gr32 0xa5a5a5a5 er3
-	test_h_gr32 0xa5a5a5a5 er4
-	test_h_gr32 0xa5a5a5a5 er5
-	test_h_gr32 0xa5a5a5a5 er6
-	test_h_gr32 0xa5a5a5a5 er7
-
-	stmac	macl, er0
-	test_zero_clear
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 0xfff80008 er0
-
-	stmac	mach, er0
-	test_zero_clear
-	test_neg_clear
-	test_ovf_clear
-	test_h_gr32 1 er0	; result is greater than 32 bits
-
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/mova.s b/sim/testsuite/sim/h8300/mova.s
deleted file mode 100644
index a4bcfd6ee0b..00000000000
--- a/sim/testsuite/sim/h8300/mova.s
+++ /dev/null
@@ -1,838 +0,0 @@
-# Hitachi H8 testcase 'mova'
-# mach(): h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-foo:	.long	0x01010101
-	.long	0x10101010
-	.long	0x11111111
-
-	start
-
-movabl16_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/b.l	@(1:16, r2l.b), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0xa6 er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movabl16_reg16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/b.l	@(1:16, r2.w), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0xa5a6 er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movabl32_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/b.l	@(1:32, r2l.b), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0xa6 er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movabl32_reg16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/b.l	@(1:32, r2.w), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0xa5a6 er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movawl16_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/w.l	@(1:16, r2l.b), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0x14b er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movawl16_reg16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/w.l	@(1:16, r2.w), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0x14b4b er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movawl32_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/w.l	@(1:32, r2l.b), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0x14b er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movawl32_reg16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/w.l	@(1:32, r2.w), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0x14b4b er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movall16_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/l.l	@(1:16, r2l.b), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0x295 er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movall16_reg16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/l.l	@(1:16, r2.w), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0x29695 er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movall32_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/l.l	@(1:32, r2l.b), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0x295 er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-movall32_reg16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mova/l.l	@(1:32, r2.w), er3
-
-	test_cc_clear
-	test_gr_a5a5	0	; Make sure other regs not affected
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_h_gr32	0x29695 er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-t02_mova:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov.l	#0x01010101, er1
-	mova/b.c @(0x1234:16,r1l.b),er1 ; 7A891234
-	test_h_gr32	0x1235, er1 ; 1s
-	mov.l	#0x01010101, er1
-	mova/b.c @(0x1234:16,r1.w),er1 ; 7A991234
-	test_h_gr32	0x1335, er1 ; 2s
-	mov.l	#0x01010101, er1
-	mova/w.c @(0x1234:16,r1l.b),er1 ; 7AA91234
-	test_h_gr32	0x1236, er1 ; 3s
-	mov.l	#0x01010101, er1
-	mova/w.c @(0x1234:16,r1.w),er1 ; 7AB91234
-	test_h_gr32	0x1436, er1 ; 4s
-	mov.l	#0x01010101, er1
-	mova/l.c @(0x1234:16,r1l.b),er1 ; 7AC91234
-	test_h_gr32	0x1238, er1 ; 5s
-	mov.l	#0x01010101, er1
-	mova/l.c @(0x1234:16,r1.w),er1 ; 7AD91234
-	test_h_gr32	0x1638, er1 ; 6s
-	mov.l	#0x01010101, er1
-	mova/b.c @(0x12345678:32,r1l.b),er1 ; 7A8112345678
-	test_h_gr32	0x12345679, er1	; 7s
-	mov.l	#0x01010101, er1
-	mova/b.c @(0x12345678:32,r1.w),er1 ; 7A9112345678
-	test_h_gr32	0x12345779, er1	; 8s
-	mov.l	#0x01010101, er1
-	mova/w.c @(0x12345678:32,r1l.b),er1 ; 7AA112345678
-	test_h_gr32	0x1234567a, er1	; 9s
-	mov.l	#0x01010101, er1
-	mova/w.c @(0x12345678:32,r1.w),er1 ; 7AB112345678
-	test_h_gr32	0x1234587a, er1	; 10s
-	mov.l	#0x01010101, er1
-	mova/l.c @(0x12345678:32,r1l.b),er1 ; 7AC112345678
-	test_h_gr32	0x1234567c, er1	; 11s
-	mov.l	#0x01010101, er1
-	mova/l.c @(0x12345678:32,r1.w),er1 ; 7AD112345678
-	test_h_gr32	0x12345a7c, er1	; 12s
-
-t02b:	
-	mov.l	#0x01010101, er3
-	mova/b.l @(0x1234:16,r3l.b),er1 ; 78B87A891234
-	test_h_gr32	0x1235, er1 ; 1
-	mova/b.l @(0x1234:16,r3.w),er1 ; 78397A991234
-	test_h_gr32	0x1335, er1 ; 2
-	mova/w.l @(0x1234:16,r3l.b),er1 ; 78B87AA91234
-	test_h_gr32	0x1236, er1 ; 3
-	mova/w.l @(0x1234:16,r3.w),er1 ; 78397AB91234
-	test_h_gr32	0x1436, er1 ; 4
-	mova/l.l @(0x1234:16,r3l.b),er1 ; 78B87AC91234
-	test_h_gr32	0x1238, er1 ; 5
-	mova/l.l @(0x1234:16,r3.w),er1 ; 78397AD91234
-	test_h_gr32	0x1638, er1 ; 6
-	mova/b.l @(0x12345678:32,r3l.b),er1 ; 78B87A8112345678
-	test_h_gr32	0x12345679, er1	; 7
-	mova/b.l @(0x12345678:32,r3.w),er1 ; 78397A9112345678
-	test_h_gr32	0x12345779, er1	; 8
-	mova/w.l @(0x12345678:32,r3l.b),er1 ; 78B87AA112345678
-	test_h_gr32	0x1234567a, er1	; 9
-	mova/w.l @(0x12345678:32,r3.w),er1 ; 78397AB112345678
-	test_h_gr32	0x1234587a, er1	; 10
-	mova/l.l @(0x12345678:32,r3l.b),er1 ; 78B87AC112345678
-	test_h_gr32	0x1234567c, er1	; 11
-	mova/l.l @(0x12345678:32,r3.w),er1 ; 78397AD112345678
-	test_h_gr32	0x12345a7c, er1	; 12
-	test_h_gr32	0x01010101, er3
-t02c:	
-	mov.l	#foo, er2
-	mova/b.l @(0x1234:16,@er2.b),er1              ;017F02811234
-	test_h_gr32	0x1235, er1 ; 13
-	test_h_gr32	foo, er2
-	mova/b.l @(0x1234:16,@(0x1:2,er2).b),er1       ;017F12811234
-	test_h_gr32	0x1235, er1 ; 18
-	test_h_gr32	foo, er2
-	mova/b.l @(0x1234:16,@er2+.b),er1             ;017F82811234
-	test_h_gr32	0x1235, er1 ; 14
-	test_h_gr32	foo+1, er2 
-	mova/b.l @(0x1234:16,@-er2.b),er1             ;017FB2811234
-	test_h_gr32	0x1235, er1 ; 17
-	test_h_gr32	foo, er2
-	mova/b.l @(0x1234:16,@+er2.b),er1             ;017F92811234
-	test_h_gr32	0x1235, er1 ; 16
-	test_h_gr32	foo+1, er2
-	mova/b.l @(0x1234:16,@er2-.b),er1             ;017FA2811234
-	test_h_gr32	0x1235, er1 ; 15
-	test_h_gr32	foo, er2
-t02d:
-	mov.l	#4, er2
-	mova/b.l @(0x1234:16, @(foo:16, er2).b), er1
-	test_h_gr32	0x1244, er1 ; 19
-	mova/b.l @(0x1234:16, @(foo:16, r2L.b).b), er1
-	test_h_gr32	0x1244, er1 ; 21
-	mova/b.l @(0x1234:16, @(foo:16, r2.w).b), er1
-	test_h_gr32	0x1244, er1 ; 22
-	mova/b.l @(0x1234:16, @(foo:16, er2.l).b), er1
-	test_h_gr32	0x1244, er1 ; 23
-
-	mov.l	#4, er2
-	mova/b.l @(0x1234:16, @(foo:32, er2).b), er1
-	test_h_gr32	0x1244, er1 ; 20
-	mova/b.l @(0x1234:16, @(foo:32, r2L.b).b), er1
-	test_h_gr32	0x1244, er1 ; 24
-	mova/b.l @(0x1234:16, @(foo:32, r2.w).b), er1
-	test_h_gr32	0x1244, er1 ; 25
-	mova/b.l @(0x1234:16, @(foo:32, er2.l).b), er1
-	test_h_gr32	0x1244, er1 ; 26
-
-	mova/b.l @(0x1234:16,@foo:16.b),er1
-	test_h_gr32	0x1235, er1 ; 27
-	mova/b.l @(0x1234:16,@foo:32.b),er1
-	test_h_gr32	0x1235, er1 ; 28
-
-t02e:
-	mov.l	#foo, er2
-	mova/b.l @(0x1234:16,@er2.w),er1              ;015F02911234
-	test_h_gr32	0x1335, er1 ; 29
-	test_h_gr32	foo, er2
-	mova/b.l @(0x1234:16,@(0x2:2,er2).w),er1    ;015F12911234
-	test_h_gr32	0x1335, er1 ; 34
-	test_h_gr32	foo, er2
-	mova/b.l @(0x1234:16,@er2+.w),er1             ;015F82911234
-	test_h_gr32	0x1335, er1 ; 30
-	test_h_gr32	foo+2, er2
-	mova/b.l @(0x1234:16,@-er2.w),er1             ;015FB2911234
-	test_h_gr32	0x1335, er1 ; 33
-	test_h_gr32	foo, er2
-	mova/b.l @(0x1234:16,@+er2.w),er1             ;015F92911234
-	test_h_gr32	0x1335, er1 ; 32
-	test_h_gr32	foo+2, er2
-	mova/b.l @(0x1234:16,@er2-.w),er1             ;015FA2911234
-	test_h_gr32	0x1335, er1 ; 31
-	test_h_gr32	foo, er2
-
-	mov.l	#4, er2
-	mova/b.l @(0x1234:16, @(foo:16, er2).w), er1
-	test_h_gr32	0x2244, er1 ; 35
-	shar.l	er2
-	mova/b.l @(0x1234:16, @(foo:16, r2L.b).w), er1
-	test_h_gr32	0x2244, er1 ; 37
-	mova/b.l @(0x1234:16, @(foo:16, r2.w).w), er1
-	test_h_gr32	0x2244, er1 ; 38
-	mova/b.l @(0x1234:16, @(foo:16, er2.l).w), er1
-	test_h_gr32	0x2244, er1 ; 39
-
-	mov.l	#4, er2
-	mova/b.l @(0x1234:16, @(foo:32, er2).w), er1
-	test_h_gr32	0x2244, er1 ; 36
-	shar.l	er2
-	mova/b.l @(0x1234:16, @(foo:32, r2L.b).w), er1
-	test_h_gr32	0x2244, er1 ; 40
-	mova/b.l @(0x1234:16, @(foo:32, r2.w).w), er1
-	test_h_gr32	0x2244, er1 ; 41
-	mova/b.l @(0x1234:16, @(foo:32, er2.l).w), er1
-	test_h_gr32	0x2244, er1 ; 42
-
-	mova/b.l @(0x1234:16,@foo:16.w),er1        ;015F40919ABC1234
-	test_h_gr32	0x1335, er1 ; 43
-	mova/b.l @(0x1234:16,@foo:32.w),er1        ;015F48919ABCDEF01234
-	test_h_gr32	0x1335, er1 ; 44
-
-t02f:
-	mov.l	#foo, er2
-	mova/w.l @(0x1234:16,@er2.b),er1           ;017F02A11234
-	test_h_gr32	0x1236, er1 ; 45
-	mova/w.l @(0x1234:16,@(0x1:2,er2).b),er1    ;017F12A11234
-	test_h_gr32	0x1236, er1 ; 50
-	mova/w.l @(0x1234:16,@er2+.b),er1          ;017F82A11234
-	test_h_gr32	0x1236, er1 ; 46
-	test_h_gr32	foo+1, er2
-	mova/w.l @(0x1234:16,@-er2.b),er1          ;017FB2A11234
-	test_h_gr32	0x1236, er1 ; 49
-	test_h_gr32	foo, er2
-	mova/w.l @(0x1234:16,@+er2.b),er1          ;017F92A11234
-	test_h_gr32	0x1236, er1 ; 48
-	test_h_gr32	foo+1, er2
-	mova/w.l @(0x1234:16,@er2-.b),er1          ;017FA2A11234
-	test_h_gr32	0x1236, er1 ; 47
-	test_h_gr32	foo, er2
-
-t02g:
-	mov.l	#4, er2
-	mova/w.l @(0x1234:16, @(foo:16, er2).b), er1
-	test_h_gr32	0x1254, er1 ; 51
-	mova/w.l @(0x1234:16, @(foo:16, r2L.b).b), er1
-	test_h_gr32	0x1254, er1 ; 53
-	mova/w.l @(0x1234:16, @(foo:16, r2.w).b), er1
-	test_h_gr32	0x1254, er1 ; 54
-	mova/w.l @(0x1234:16, @(foo:16, er2.l).b), er1
-	test_h_gr32	0x1254, er1 ; 55
-
-	mov.l	#4, er2
-	mova/w.l @(0x1234:16, @(foo:32, er2).b), er1
-	test_h_gr32	0x1254, er1 ; 52
-	mova/w.l @(0x1234:16, @(foo:32, r2L.b).b), er1
-	test_h_gr32	0x1254, er1 ; 56
-	mova/w.l @(0x1234:16, @(foo:32, r2.w).b), er1
-	test_h_gr32	0x1254, er1 ; 57
-	mova/w.l @(0x1234:16, @(foo:32, er2.l).b), er1
-	test_h_gr32	0x1254, er1 ; 58
-
-	mova/w.l @(0x1234:16,@foo:16.b),er1        ;017F40A19ABC1234
-	test_h_gr32	0x1236, er1 ; 59 (can't test -- points into the woods)
-	mova/w.l @(0x1234:16,@foo:32.b),er1        ;017F48A19ABCDEF01234
-	test_h_gr32	0x1236, er1 ; 60 (can't test -- points into the woods)
-
-t02h:
-	mov.l	#foo, er2
-	mova/w.l @(0x1234:16,@er2.w),er1           ;015F02B11234
-	test_h_gr32	0x1436, er1 ; 61
-	mova/w.l @(0x1234:16,@(0x2:2,er2).w),er1 ;015F12B11234
-	test_h_gr32	0x1436, er1 ; 66, 0x1234 + (@(4+foo).w << 1
-	mova/w.l @(0x1234:16,@er2+.w),er1          ;015F82B11234
-	test_h_gr32	0x1436, er1 ; 62
-	test_h_gr32	foo+2, er2
-	mova/w.l @(0x1234:16,@-er2.w),er1          ;015FB2B11234
-	test_h_gr32	0x1436, er1 ; 63
-	test_h_gr32	foo, er2 
-	mova/w.l @(0x1234:16,@+er2.w),er1          ;015F92B11234
-	test_h_gr32	0x1436, er1 ; 64
-	test_h_gr32	foo+2, er2
-	mova/w.l @(0x1234:16,@er2-.w),er1          ;015FA2B11234
-	test_h_gr32	0x1436, er1 ; 65
-	test_h_gr32	foo, er2 
-t02i:
-	mov.l	#4, er2
-	mova/w.l @(0x1234:16, @(foo:16, er2).w), er1
-	test_h_gr32	0x3254, er1 ; 67
-	shar.l	er2
-	mova/w.l @(0x1234:16, @(foo:16, r2L.b).w), er1
-	test_h_gr32	0x3254, er1 ; 69
-	mova/w.l @(0x1234:16, @(foo:16, r2.w).w), er1
-	test_h_gr32	0x3254, er1 ; 70
-	mova/w.l @(0x1234:16, @(foo:16, er2.l).w), er1
-	test_h_gr32	0x3254, er1 ; 71
-
-	mov.l	#4, er2
-	mova/w.l @(0x1234:16, @(foo:32, er2).w), er1
-	test_h_gr32	0x3254, er1 ; 68
-	shar.l	er2
-	mova/w.l @(0x1234:16, @(foo:32, r2L.b).w), er1
-	test_h_gr32	0x3254, er1 ; 72
-	mova/w.l @(0x1234:16, @(foo:32, r2.w).w), er1
-	test_h_gr32	0x3254, er1 ; 73
-	mova/w.l @(0x1234:16, @(foo:32, er2.l).w), er1
-	test_h_gr32	0x3254, er1 ; 74
-
-	mova/w.l @(0x1234:16,@foo:16.w),er1        ;015F40B19ABC1234
-	test_h_gr32	0x1436, er1 ; 75 (can't test -- points into the woods)
-	mova/w.l @(0x1234:16,@foo:32.w),er1        ;015F48B19ABCDEF01234
-	test_h_gr32	0x1436, er1 ; 76 (can't test -- points into the woods)
-
-t02j:
-	mov.l	#foo, er2
-	mova/l.l @(0x1234:16,@er2.b),er1           ;017F02C11234
-	test_h_gr32	0x1238, er1 ; 77
-	mova/l.l @(0x1234:16,@(0x1:2,er2).b),er1    ;017F12C11234
-	test_h_gr32	0x1238, er1 ; 82
-	mova/l.l @(0x1234:16,@er2+.b),er1          ;017F82C11234
-	test_h_gr32	0x1238, er1 ; 78
-	test_h_gr32	foo+1, er2
-	mova/l.l @(0x1234:16,@-er2.b),er1          ;017FB2C11234
-	test_h_gr32	0x1238, er1 ; 79
-	test_h_gr32	foo, er2
-	mova/l.l @(0x1234:16,@+er2.b),er1          ;017F92C11234
-	test_h_gr32	0x1238, er1 ; 80
-	test_h_gr32	foo+1, er2
-	mova/l.l @(0x1234:16,@er2-.b),er1          ;017FA2C11234
-	test_h_gr32	0x1238, er1 ; 81
-	test_h_gr32	foo, er2
-
-t02k:
-	mov.l	#4, er2
-	mova/l.l @(0x1234:16, @(foo:16, er2).b), er1
-	test_h_gr32	0x1274, er1 ; 83
-	mova/l.l @(0x1234:16, @(foo:16, r2L.b).b), er1
-	test_h_gr32	0x1274, er1 ; 85
-	mova/l.l @(0x1234:16, @(foo:16, r2.w).b), er1
-	test_h_gr32	0x1274, er1 ; 86
-	mova/l.l @(0x1234:16, @(foo:16, er2.l).b), er1
-	test_h_gr32	0x1274, er1 ; 87
-
-	mov.l	#4, er2
-	mova/l.l @(0x1234:16, @(foo:32, er2).b), er1
-	test_h_gr32	0x1274, er1 ; 84
-	mova/l.l @(0x1234:16, @(foo:32, r2L.b).b), er1
-	test_h_gr32	0x1274, er1 ; 88
-	mova/l.l @(0x1234:16, @(foo:32, r2.w).b), er1
-	test_h_gr32	0x1274, er1 ; 89
-	mova/l.l @(0x1234:16, @(foo:32, er2.l).b), er1
-	test_h_gr32	0x1274, er1 ; 90
-
-	mova/l.l @(0x1234:16,@foo:16.b),er1        ;017F40C19ABC1234
-	test_h_gr32	0x1238, er1 ; 91 (can't test -- points into the woods)
-	mova/l.l @(0x1234:16,@foo:32.b),er1        ;017F48C19ABCDEF01234
-	test_h_gr32	0x1238, er1 ; 92 (can't test -- points into the woods)
-
-t02l:
-	mov.l	#foo, er2
-	mova/l.l @(0x1234:16,@er2.w),er1           ;015F02D11234
-	test_h_gr32	0x1638, er1 ; 93
-	mova/l.l @(0x1234:16,@(0x2:2,er2).w),er1   ;015F12D11234
-	test_h_gr32	0x1638, er1 ; 98 
-	mova/l.l @(0x1234:16,@er2+.w),er1          ;015F82D11234
-	test_h_gr32	0x1638, er1 ; 94
-	test_h_gr32	foo+2, er2
-	mova/l.l @(0x1234:16,@-er2.w),er1          ;015FB2D11234
-	test_h_gr32	0x1638, er1 ; 97
-	test_h_gr32	foo, er2
-	mova/l.l @(0x1234:16,@+er2.w),er1          ;015F92D11234
-	test_h_gr32	0x1638, er1 ; 96
-	test_h_gr32	foo+2, er2
-	mova/l.l @(0x1234:16,@er2-.w),er1          ;015FA2D11234
-	test_h_gr32	0x1638, er1 ; 95
-	test_h_gr32	foo, er2
-
-t02o:
-	mov.l	#4, er2
-	mova/l.l @(0x1234:16, @(foo:16, er2).w), er1
-	test_h_gr32	0x5274, er1 ; 99
-	shar.l	er2
-	mova/l.l @(0x1234:16, @(foo:16, r2L.b).w), er1
-	test_h_gr32	0x5274, er1 ; 101
-	mova/l.l @(0x1234:16, @(foo:16, r2.w).w), er1
-	test_h_gr32	0x5274, er1 ; 102
-	mova/l.l @(0x1234:16, @(foo:16, er2.l).w), er1
-	test_h_gr32	0x5274, er1 ; 103
-
-	mov.l	#4, er2
-	mova/l.l @(0x1234:16, @(foo:32, er2).w), er1
-	test_h_gr32	0x5274, er1 ; 100
-	shar.l	er2
-	mova/l.l @(0x1234:16, @(foo:32, r2L.b).w), er1
-	test_h_gr32	0x5274, er1 ; 104
-	mova/l.l @(0x1234:16, @(foo:32, r2.w).w), er1
-	test_h_gr32	0x5274, er1 ; 105
-	mova/l.l @(0x1234:16, @(foo:32, er2.l).w), er1
-	test_h_gr32	0x5274, er1 ; 106
-
-	mova/l.l @(0x1234:16,@foo:16.w),er1        ;015F40D19ABC1234
-	test_h_gr32	0x1638, er1 ; 107 (can't test -- points into the woods)
-	mova/l.l @(0x1234:16,@foo:32.w),er1        ;015F48D19ABCDEF01234
-	test_h_gr32	0x1638, er1 ; 108 (can't test -- points into the woods)
-
-t02p:
-	mov.l	#foo, er2
-	mova/b.l @(0x12345678:32,@er2.b),er1              ;017F028912345678
-	test_h_gr32	0x12345679, er1	; 109
-	mova/b.l @(0x12345678:32,@(0x1:2,er2).b),er1      ;017F128912345678
-	test_h_gr32	0x12345679, er1	; 114
-	mova/b.l @(0x12345678:32,@er2+.b),er1             ;017F828912345678
-	test_h_gr32	0x12345679, er1	; 110
-	test_h_gr32	foo+1, er2
-	mova/b.l @(0x12345678:32,@-er2.b),er1             ;017FB28912345678
-	test_h_gr32	0x12345679, er1	; 113
-	test_h_gr32	foo, er2
-	mova/b.l @(0x12345678:32,@+er2.b),er1             ;017F928912345678
-	test_h_gr32	0x12345679, er1	; 112
-	test_h_gr32	foo+1, er2
-	mova/b.l @(0x12345678:32,@er2-.b),er1             ;017FA28912345678
-	test_h_gr32	0x12345679, er1	; 111
-	test_h_gr32	foo, er2
-
-t02q:
-	mov.l	#4, er2
-	mova/b.l @(0x12345678:32, @(foo:16, er2).b), er1
-	test_h_gr32	0x12345688, er1 ; 115
-	mova/b.l @(0x12345678:32, @(foo:16, r2L.b).b), er1
-	test_h_gr32	0x12345688, er1 ; 117
-	mova/b.l @(0x12345678:32, @(foo:16, r2.w).b), er1
-	test_h_gr32	0x12345688, er1 ; 118
-	mova/b.l @(0x12345678:32, @(foo:16, er2.l).b), er1
-	test_h_gr32	0x12345688, er1 ; 119
-
-	mov.l	#4, er2
-	mova/b.l @(0x12345678:32, @(foo:32, er2).b), er1
-	test_h_gr32	0x12345688, er1 ; 116
-	mova/b.l @(0x12345678:32, @(foo:32, r2L.b).b), er1
-	test_h_gr32	0x12345688, er1 ; 120
-	mova/b.l @(0x12345678:32, @(foo:32, r2.w).b), er1
-	test_h_gr32	0x12345688, er1 ; 121
-	mova/b.l @(0x12345678:32, @(foo:32, er2.l).b), er1
-	test_h_gr32	0x12345688, er1 ; 122
-
-	mova/b.l @(0x12345678:32,@foo:16.b),er1
-	test_h_gr32	0x12345679, er1 ; 123
-	mova/b.l @(0x12345678:32,@foo:32.b),er1
-	test_h_gr32	0x12345679, er1 ; 124
-
-t02r:
-	mov.l	#foo, er2
-	mova/b.l @(0x12345678:32,@er2.w),er1              ;015F029912345678
-	test_h_gr32	0x12345779, er1	; 125
-	mova/b.l @(0x12345678:32,@(0x2:2,er2).w),er1      ;015F129912345678
-	test_h_gr32	0x12345779, er1 ; 130
-	mova/b.l @(0x12345678:32,@er2+.w),er1             ;015F829912345678
-	test_h_gr32	0x12345779, er1	; 126
-	test_h_gr32	foo+2, er2
-	mova/b.l @(0x12345678:32,@-er2.w),er1             ;015FB29912345678
-	test_h_gr32	0x12345779, er1	; 129
-	test_h_gr32	foo, er2
-	mova/b.l @(0x12345678:32,@+er2.w),er1             ;015F929912345678
-	test_h_gr32	0x12345779, er1 ; 128
-	test_h_gr32	foo+2, er2
-	mova/b.l @(0x12345678:32,@er2-.w),er1             ;015FA29912345678
-	test_h_gr32	0x12345779, er1 ; 127
-	test_h_gr32	foo, er2
-
-	mov.l	#4, er2
-	mova/b.l @(0x12345678:32, @(foo:16, er2).w), er1
-	test_h_gr32	0x12346688, er1 ; 131
-	shar.l	er2
-	mova/b.l @(0x12345678:32, @(foo:16, r2L.b).w), er1
-	test_h_gr32	0x12346688, er1 ; 133
-	mova/b.l @(0x12345678:32, @(foo:16, r2.w).w), er1
-	test_h_gr32	0x12346688, er1 ; 134
-	mova/b.l @(0x12345678:32, @(foo:16, er2.l).w), er1
-	test_h_gr32	0x12346688, er1 ; 135
-
-	mov.l	#4, er2
-	mova/b.l @(0x12345678:32, @(foo:32, er2).w), er1
-	test_h_gr32	0x12346688, er1 ; 132
-	shar.l	er2
-	mova/b.l @(0x12345678:32, @(foo:32, r2L.b).w), er1
-	test_h_gr32	0x12346688, er1 ; 136
-	mova/b.l @(0x12345678:32, @(foo:32, r2.w).w), er1
-	test_h_gr32	0x12346688, er1 ; 137
-	mova/b.l @(0x12345678:32, @(foo:32, er2.l).w), er1
-	test_h_gr32	0x12346688, er1 ; 138
-
-	mova/b.l @(0x12345678:32,@foo:16.w),er1
-	test_h_gr32	0x12345779, er1 ; 139
-	mova/b.l @(0x12345678:32,@foo:32.w),er1
-	test_h_gr32	0x12345779, er1 ; 140
-
-t02s:
-	mov.l	#foo, er2
-	mova/w.l @(0x12345678:32,@er2.b),er1           ;017F02A912345678
-	test_h_gr32	0x1234567a, er1	; 141
-	mova/w.l @(0x12345678:32,@(0x1:2,er2).b),er1   ;017F12A912345678
-	test_h_gr32	0x1234567a, er1	; 146
-	mova/w.l @(0x12345678:32,@er2+.b),er1          ;017F82A912345678
-	test_h_gr32	0x1234567a, er1	; 142
-	test_h_gr32	foo+1, er2
-	mova/w.l @(0x12345678:32,@-er2.b),er1          ;017FB2A912345678
-	test_h_gr32	0x1234567a, er1	; 145
-	test_h_gr32	foo, er2
-	mova/w.l @(0x12345678:32,@+er2.b),er1          ;017F92A912345678
-	test_h_gr32	0x1234567a, er1	; 144
-	test_h_gr32	foo+1, er2
-	mova/w.l @(0x12345678:32,@er2-.b),er1          ;017FA2A912345678
-	test_h_gr32	0x1234567a, er1	; 143
-	test_h_gr32	foo, er2
-
-	mov.l	#4, er2
-	mova/w.l @(0x12345678:32, @(foo:16, er2).b), er1
-	test_h_gr32	0x12345698, er1 ; 147
-	mova/w.l @(0x12345678:32, @(foo:16, r2L.b).b), er1
-	test_h_gr32	0x12345698, er1 ; 149
-	mova/w.l @(0x12345678:32, @(foo:16, r2.w).b), er1
-	test_h_gr32	0x12345698, er1 ; 150
-	mova/w.l @(0x12345678:32, @(foo:16, er2.l).b), er1
-	test_h_gr32	0x12345698, er1 ; 151
-
-	mov.l	#4, er2
-	mova/w.l @(0x12345678:32, @(foo:32, er2).b), er1
-	test_h_gr32	0x12345698, er1 ; 148
-	mova/w.l @(0x12345678:32, @(foo:32, r2L.b).b), er1
-	test_h_gr32	0x12345698, er1 ; 152
-	mova/w.l @(0x12345678:32, @(foo:32, r2.w).b), er1
-	test_h_gr32	0x12345698, er1 ; 153
-	mova/w.l @(0x12345678:32, @(foo:32, er2.l).b), er1
-	test_h_gr32	0x12345698, er1 ; 154
-
-	mova/w.l @(0x12345678:32,@foo:16.b),er1
-	test_h_gr32	0x1234567a, er1 ; 155
-	mova/w.l @(0x12345678:32,@foo:32.b),er1
-	test_h_gr32	0x1234567a, er1 ; 156
-
-t02t:
-	mov.l	#foo, er2
-	mova/w.l @(0x12345678:32,@er2.w),er1           ;015F02B912345678
-	test_h_gr32	0x1234587a, er1	; 157
-	mova/w.l @(0x12345678:32,@(0x2:2,er2).w),er1   ;015F12B912345678
-	test_h_gr32	0x1234587a, er1	; 162
-	mova/w.l @(0x12345678:32,@er2+.w),er1          ;015F82B912345678
-	test_h_gr32	0x1234587a, er1	; 158
-	test_h_gr32	foo+2, er2
-	mova/w.l @(0x12345678:32,@-er2.w),er1          ;015FB2B912345678
-	test_h_gr32	0x1234587a, er1	; 161
-	test_h_gr32	foo, er2
-	mova/w.l @(0x12345678:32,@+er2.w),er1          ;015F92B912345678
-	test_h_gr32	0x1234587a, er1	; 160
-	test_h_gr32	foo+2, er2
-	mova/w.l @(0x12345678:32,@er2-.w),er1          ;015FA2B912345678
-	test_h_gr32	0x1234587a, er1	; 159
-	test_h_gr32	foo, er2
-
-	mov.l	#4, er2
-	mova/w.l @(0x12345678:32, @(foo:16, er2).w), er1
-	test_h_gr32	0x12347698, er1 ; 163
-	shar.l	er2
-	mova/w.l @(0x12345678:32, @(foo:16, r2L.b).w), er1
-	test_h_gr32	0x12347698, er1 ; 165
-	mova/w.l @(0x12345678:32, @(foo:16, r2.w).w), er1
-	test_h_gr32	0x12347698, er1 ; 166
-	mova/w.l @(0x12345678:32, @(foo:16, er2.l).w), er1
-	test_h_gr32	0x12347698, er1 ; 167
-
-	mov.l	#4, er2
-	mova/w.l @(0x12345678:32, @(foo:32, er2).w), er1
-	test_h_gr32	0x12347698, er1 ; 164
-	shar.l	er2
-	mova/w.l @(0x12345678:32, @(foo:32, r2L.b).w), er1
-	test_h_gr32	0x12347698, er1 ; 168
-	mova/w.l @(0x12345678:32, @(foo:32, r2.w).w), er1
-	test_h_gr32	0x12347698, er1 ; 169
-	mova/w.l @(0x12345678:32, @(foo:32, er2.l).w), er1
-	test_h_gr32	0x12347698, er1 ; 170
-
-	mova/w.l @(0x12345678:32,@foo:16.w),er1
-	test_h_gr32	0x1234587a, er1 ; 171
-	mova/w.l @(0x12345678:32,@foo:32.w),er1
-	test_h_gr32	0x1234587a, er1 ; 172
-
-t02u:
-	mov.l	#foo, er2
-	mova/l.l @(0x12345678:32,@er2.b),er1           ;017F02C912345678
-	test_h_gr32	0x1234567c, er1	; 173
-	mova/l.l @(0x12345678:32,@(0x1:2,er2).b),er1   ;017F12C912345678
-	test_h_gr32	0x1234567c, er1	; 178
-	mova/l.l @(0x12345678:32,@er2+.b),er1          ;017F82C912345678
-	test_h_gr32	0x1234567c, er1	; 174
-	test_h_gr32	foo+1, er2
-	mova/l.l @(0x12345678:32,@-er2.b),er1          ;017FB2C912345678
-	test_h_gr32	0x1234567c, er1	; 177
-	test_h_gr32	foo, er2
-	mova/l.l @(0x12345678:32,@+er2.b),er1          ;017F92C912345678
-	test_h_gr32	0x1234567c, er1	; 176
-	test_h_gr32	foo+1, er2
-	mova/l.l @(0x12345678:32,@er2-.b),er1          ;017FA2C912345678
-	test_h_gr32	0x1234567c, er1	; 175
-	test_h_gr32	foo, er2
-
-	mov.l	#4, er2
-	mova/l.l @(0x12345678:32, @(foo:16, er2).b), er1
-	test_h_gr32	0x123456b8, er1 ; 179
-	mova/l.l @(0x12345678:32, @(foo:16, r2L.b).b), er1
-	test_h_gr32	0x123456b8, er1 ; 181
-	mova/l.l @(0x12345678:32, @(foo:16, r2.w).b), er1
-	test_h_gr32	0x123456b8, er1 ; 182
-	mova/l.l @(0x12345678:32, @(foo:16, er2.l).b), er1
-	test_h_gr32	0x123456b8, er1 ; 183
-
-	mov.l	#4, er2
-	mova/l.l @(0x12345678:32, @(foo:32, er2).b), er1
-	test_h_gr32	0x123456b8, er1 ; 180
-	mova/l.l @(0x12345678:32, @(foo:32, r2L.b).b), er1
-	test_h_gr32	0x123456b8, er1 ; 184
-	mova/l.l @(0x12345678:32, @(foo:32, r2.w).b), er1
-	test_h_gr32	0x123456b8, er1 ; 185
-	mova/l.l @(0x12345678:32, @(foo:32, er2.l).b), er1
-	test_h_gr32	0x123456b8, er1 ; 186
-
-	mova/l.l @(0x12345678:32,@foo:16.b),er1
-	test_h_gr32	0x1234567c, er1 ; 187
-	mova/l.l @(0x12345678:32,@foo:32.b),er1
-	test_h_gr32	0x1234567c, er1 ; 188
-
-t02v:
-	mov.l	#foo, er2
-	mova/l.l @(0x12345678:32,@er2.w),er1           ;015F02D912345678
-	test_h_gr32	0x12345a7c, er1	; 189
-	mova/l.l @(0x12345678:32,@(0x2:2,er2).w),er1   ;015F12D912345678
-	test_h_gr32	0x12345a7c, er1	; 194
-	mova/l.l @(0x12345678:32,@er2+.w),er1          ;015F82D912345678
-	test_h_gr32	0x12345a7c, er1	; 190
-	test_h_gr32	foo+2, er2
-	mova/l.l @(0x12345678:32,@-er2.w),er1          ;015FB2D912345678
-	test_h_gr32	0x12345a7c, er1	; 193
-	test_h_gr32	foo, er2
-	mova/l.l @(0x12345678:32,@+er2.w),er1          ;015F92D912345678
-	test_h_gr32	0x12345a7c, er1	; 192
-	test_h_gr32	foo+2, er2
-	mova/l.l @(0x12345678:32,@er2-.w),er1          ;015FA2D912345678
-	test_h_gr32	0x12345a7c, er1	; 191
-	test_h_gr32	foo, er2
-
-	mov.l	#4, er2
-	mova/l.l @(0x12345678:32, @(foo:16, er2).w), er1
-	test_h_gr32	0x123496b8, er1 ; 195
-	shar.l	er2
-	mova/l.l @(0x12345678:32, @(foo:16, r2L.b).w), er1
-	test_h_gr32	0x123496b8, er1 ; 197
-	mova/l.l @(0x12345678:32, @(foo:16, r2.w).w), er1
-	test_h_gr32	0x123496b8, er1 ; 198
-	mova/l.l @(0x12345678:32, @(foo:16, er2.l).w), er1
-	test_h_gr32	0x123496b8, er1 ; 199
-
-	mov.l	#4, er2
-	mova/l.l @(0x12345678:32, @(foo:32, er2).w), er1
-	test_h_gr32	0x123496b8, er1 ; 195
-	shar.l	er2
-	mova/l.l @(0x12345678:32, @(foo:32, r2L.b).w), er1
-	test_h_gr32	0x123496b8, er1 ; 197
-	mova/l.l @(0x12345678:32, @(foo:32, r2.w).w), er1
-	test_h_gr32	0x123496b8, er1 ; 198
-	mova/l.l @(0x12345678:32, @(foo:32, er2.l).w), er1
-	test_h_gr32	0x123496b8, er1 ; 199
-
-	mova/l.l @(0x12345678:32,@foo:16.w),er1
-	test_h_gr32	0x12345a7c, er1 ; 203
-	mova/l.l @(0x12345678:32,@foo:32.w),er1
-	test_h_gr32	0x12345a7c, er1 ; 204
-
-	test_gr_a5a5	0
-	test_h_gr32	2, er2
-	test_h_gr32	0x01010101, er3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/movb.s b/sim/testsuite/sim/h8300/movb.s
deleted file mode 100644
index 87dcdf3fc40..00000000000
--- a/sim/testsuite/sim/h8300/movb.s
+++ /dev/null
@@ -1,2221 +0,0 @@
-# Hitachi H8 testcase 'mov.w'
-# mach(): h8300h h8300s h8sx
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-	.align	4
-byte_src:
-	.byte	0x77
-byte_dst:
-	.byte	0
-
-	.text
-
-	;;
-	;; Move byte from immediate source
-	;; 
-
-.if (sim_cpu == h8sx)
-mov_b_imm8_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, rd
-	mov.b	#0x77:8, r0l	; Immediate 3-bit operand
-;;;	.word	0xf877
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-.if (sim_cpu == h8sx)
-mov_b_imm4_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:4, @aa:16
-	mov.b	#0xf:4, @byte_dst:16	; 16-bit address-direct operand
-;;;	.word	0x6adf
-;;;	.word	@byte_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xf, @byte_dst
-	beq	.Lnext21
-	fail
-.Lnext21:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm4_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:4, @aa:32
-	mov.b	#0xf:4, @byte_dst:32	; 32-bit address-direct operand
-;;;	.word	0x6aff
-;;;	.long	@byte_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xf, @byte_dst
-	beq	.Lnext22
-	fail
-.Lnext22:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @erd
-	mov.l	#byte_dst, er1
-	mov.b	#0xa5:8, @er1	; Register indirect operand
-;;;	.word	0x017d
-;;;	.word	0x01a5
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext1
-	fail
-.Lnext1:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_postinc:		; post-increment from imm8 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @erd+
-	mov.l	#byte_dst, er1
-	mov.b	#0xa5:8, @er1+	; Imm8, register post-incr operands.
-;;;	.word	0x017d
-;;;	.word	0x81a5
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst+1, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext2
-	fail
-.Lnext2:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_postdec:		; post-decrement from imm8 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @erd-
-	mov.l	#byte_dst, er1
-	mov.b	#0xa5:8, @er1-	; Imm8, register post-decr operands.
-;;;	.word	0x017d
-;;;	.word	0xa1a5
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst-1, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext3
-	fail
-.Lnext3:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @+erd
-	mov.l	#byte_dst-1, er1
-	mov.b	#0xa5:8, @+er1	; Imm8, register pre-incr operands
-;;;	.word	0x017d
-;;;	.word	0x91a5
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext4
-	fail
-.Lnext4:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @-erd
-	mov.l	#byte_dst+1, er1
-	mov.b	#0xa5:8, @-er1	; Imm8, register pre-decr operands
-;;;	.word	0x017d
-;;;	.word	0xb1a5
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext5
-	fail
-.Lnext5:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @(dd:2, erd)
-	mov.l	#byte_dst-3, er1
-	mov.b	#0xa5:8, @(3:2, er1)	; Imm8, reg plus 2-bit disp. operand
-;;;	.word	0x017d
-;;;	.word	0x31a5
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst-3, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext6
-	fail
-.Lnext6:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @(dd:16, erd)
-	mov.l	#byte_dst-4, er1
-	mov.b	#0xa5:8, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x017d
-;;;	.word	0x6f90
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext7
-	fail
-.Lnext7:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @(dd:32, erd)
-	mov.l	#byte_dst-8, er1
-	mov.b	#0xa5:8, @(8:32, er1)	; Register plus 32-bit disp. operand
-;;;	.word	0x017d
-;;;	.word	0xc9a5
-;;;	.long	8
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst-8, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext8
-	fail
-.Lnext8:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_indexb16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffffff01, er1
-	set_ccr_zero
-	;; mov.b #xx:8, @(dd:16, rd.b)
-	mov.b	#0xa5:8, @(byte_dst-1:16, r1.b) ; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	0xffffff01, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_indexw16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffff0002, er1
-	set_ccr_zero
-	;; mov.b #xx:8, @(dd:16, rd.w)
-	mov.b	#0xa5:8, @(byte_dst-2:16, r1.w) ; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	0xffff0002, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_indexl16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0x00000003, er1
-	set_ccr_zero
-	;; mov.b #xx:8, @(dd:16, erd.l)
-	mov.b	#0xa5:8, @(byte_dst-3:16, er1.l) ; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	0x00000003, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_indexb32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffffff04, er1
-	set_ccr_zero
-	;; mov.b #xx:8, @(dd:32, rd.b)
-	mov.b	#0xa5:8, @(byte_dst-4:32, r1.b)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	0xffffff04 er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_indexw32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffff0005, er1
-	set_ccr_zero
-	;; mov.b #xx:8, @(dd:32, rd.w)
-	mov.b	#0xa5:8, @(byte_dst-5:32, r1.w)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	0xffff0005 er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_indexl32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0x00000006, er1
-	set_ccr_zero
-	;; mov.b #xx:8, @(dd:32, erd.l)
-	mov.b	#0xa5:8, @(byte_dst-6:32, er1.l)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	0x00000006 er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @aa:16
-	mov.b	#0xa5:8, @byte_dst:16	; 16-bit address-direct operand
-;;;	.word	0x017d
-;;;	.word	0x40a5
-;;;	.word	@byte_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext9
-	fail
-.Lnext9:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_imm8_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b #xx:8, @aa:32
-	mov.b	#0xa5:8, @byte_dst:32	; 32-bit address-direct operand
-;;;	.word	0x017d
-;;;	.word	0x48a5
-;;;	.long	@byte_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	#0xa5, @byte_dst
-	beq	.Lnext10
-	fail
-.Lnext10:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-.endif
-
-	;;
-	;; Move byte from register source
-	;; 
-
-mov_b_reg8_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, erd
-	mov.b	#0x12, r1l
-	mov.b	r1l, r0l	; Register 8-bit operand
-;;;	.word	0x0c98
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-	test_h_gr16 0xa512 r0
-	test_h_gr16 0xa512 r1	; mov src unchanged
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a512 er0
-	test_h_gr32 0xa5a5a512 er1	; mov src unchanged
-.endif
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-
-mov_b_reg8_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @erd
-	mov.l	#byte_dst, er1
-	mov.b	r0l, @er1	; Register indirect operand
-;;;	.word	0x6898
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.b	@byte_dst, r0l
-	cmp.b	r2l, r0l
-	beq	.Lnext44
-	fail
-.Lnext44:
-	mov.b	#0, r0l
-	mov.b	r0l, @byte_dst	; zero it again for the next use.
-
-.if (sim_cpu == h8sx)
-mov_b_reg8_to_postinc:		; post-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @erd+
-	mov.l	#byte_dst, er1
-	mov.b	r0l, @er1+	; Register post-incr operand
-;;;	.word	0x0173
-;;;	.word	0x6c98
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst+1, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	r2l, @byte_dst
-	beq	.Lnext49
-	fail
-.Lnext49:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_postdec:		; post-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @erd-
-	mov.l	#byte_dst, er1
-	mov.b	r0l, @er1-	; Register post-decr operand
-;;;	.word	0x0171
-;;;	.word	0x6c98
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst-1, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	r2l, @byte_dst
-	beq	.Lnext50
-	fail
-.Lnext50:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @+erd
-	mov.l	#byte_dst-1, er1
-	mov.b	r0l, @+er1	; Register pre-incr operand
-;;;	.word	0x0172
-;;;	.word	0x6c98
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	r2l, @byte_dst
-	beq	.Lnext51
-	fail
-.Lnext51:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-.endif
-
-mov_b_reg8_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @-erd
-	mov.l	#byte_dst+1, er1
-	mov.b	r0l, @-er1	; Register pre-decr operand
-;;;	.word	0x6c98
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.b	@byte_dst, r0l
-	cmp.b	r2l, r0l
-	beq	.Lnext48
-	fail
-.Lnext48:
-	mov.b	#0, r0l
-	mov.b	r0l, @byte_dst	; zero it again for the next use.
-
-.if (sim_cpu == h8sx)
-mov_b_reg8_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @(dd:2, erd)
-	mov.l	#byte_dst-3, er1
-	mov.b	r0l, @(3:2, er1)	; Register plus 2-bit disp. operand
-;;;	.word	0x0173
-;;;	.word	0x6898
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	byte_dst-3, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	r2l, @byte_dst
-	beq	.Lnext52
-	fail
-.Lnext52:
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-.endif
-
-mov_b_reg8_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @(dd:16, erd)
-	mov.l	#byte_dst-4, er1
-	mov.b	r0l, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x6e98
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	byte_dst-4, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.b	@byte_dst, r0l
-	cmp.b	r2l, r0l
-	beq	.Lnext45
-	fail
-.Lnext45:
-	mov.b	#0, r0l
-	mov.b	r0l, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @(dd:32, erd)
-	mov.l	#byte_dst-8, er1
-	mov.b	r0l, @(8:32, er1)	; Register plus 32-bit disp. operand
-;;;	.word	0x7810
-;;;	.word	0x6aa8
-;;;	.long	8
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	byte_dst-8, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.b	@byte_dst, r0l
-	cmp.b	r2l, r0l
-	beq	.Lnext46
-	fail
-.Lnext46:
-	mov.b	#0, r0l
-	mov.b	r0l, @byte_dst	; zero it again for the next use.
-
-.if (sim_cpu == h8sx)
-mov_b_reg8_to_indexb16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffffff01, er1
-	set_ccr_zero
-	;; mov.b ers, @(dd:16, rd.b)
-	mov.b	r0l, @(byte_dst-1:16, r1.b)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	0xffffff01 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_dst, r0l
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_indexw16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffff0002, er1
-	set_ccr_zero
-	;; mov.b ers, @(dd:16, rd.w)
-	mov.b	r0l, @(byte_dst-2:16, r1.w)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	0xffff0002 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_dst, r0l
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_indexl16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0x00000003, er1
-	set_ccr_zero
-	;; mov.b ers, @(dd:16, erd.l)
-	mov.b	r0l, @(byte_dst-3:16, er1.l)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	0x00000003 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_dst, r0l
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_indexb32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffffff04 er1
-	set_ccr_zero
-	;; mov.b ers, @(dd:32, rd.b)
-	mov.b	r0l, @(byte_dst-4:32, r1.b)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	0xffffff04, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_dst, r0l
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_indexw32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffff0005 er1
-	set_ccr_zero
-	;; mov.b ers, @(dd:32, rd.w)
-	mov.b	r0l, @(byte_dst-5:32, r1.w)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	0xffff0005, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_dst, r0l
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_indexl32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0x00000006 er1
-	set_ccr_zero
-	;; mov.b ers, @(dd:32, erd.l)
-	mov.b	r0l, @(byte_dst-6:32, er1.l)	; byte indexed operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	0x00000006, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_dst, r0l
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-.endif
-
-.if (sim_cpu == h8sx)
-mov_b_reg8_to_abs8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	mov.l	#byte_dst-20, er0
-	ldc	er0, sbr
-	set_ccr_zero
-	;; mov.b ers, @aa:8
-	mov.b	r1l, @20:8	; 8-bit address-direct (sbr-relative) operand
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32  byte_dst-20, er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_dst, r1l
-	bne	fail1
-	mov.b	#0, @byte_dst	; zero it again for the next use.
-.endif
-
-mov_b_reg8_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @aa:16
-	mov.b	r0l, @byte_dst:16	; 16-bit address-direct operand
-;;;	.word	0x6a88
-;;;	.word	@byte_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.b	@byte_dst, r0l
-	cmp.b	r0l, r1l
-	beq	.Lnext41
-	fail
-.Lnext41:
-	mov.b	#0, r0l
-	mov.b	r0l, @byte_dst	; zero it again for the next use.
-
-mov_b_reg8_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b ers, @aa:32
-	mov.b	r0l, @byte_dst:32	; 32-bit address-direct operand
-;;;	.word	0x6aa8
-;;;	.long	@byte_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.b	@byte_dst, r0l
-	cmp.b	r0l, r1l
-	beq	.Lnext42
-	fail
-.Lnext42:
-	mov.b	#0, r0l
-	mov.b	r0l, @byte_dst	; zero it again for the next use.
-
-	;;
-	;; Move byte to register destination.
-	;; 
-
-mov_b_indirect_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @ers, rd
-	mov.l	#byte_src, er1
-	mov.b	@er1, r0l	; Register indirect operand
-;;;	.word	0x6818
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_h_gr32	byte_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_postinc_to_reg8:		; post-increment from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @ers+, rd
-
-	mov.l	#byte_src, er1
-	mov.b	@er1+, r0l	; Register post-incr operand
-;;;	.word	0x6c18
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_h_gr32	byte_src+1, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-mov_b_postdec_to_reg8:		; post-decrement from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @ers-, rd
-
-	mov.l	#byte_src, er1
-	mov.b	@er1-, r0l	; Register post-decr operand
-;;;	.word	0x0172
-;;;	.word	0x6c18
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_h_gr32	byte_src-1, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_preinc_to_reg8:		; pre-increment from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @+ers, rd
-
-	mov.l	#byte_src-1, er1
-	mov.b	@+er1, r0l	; Register pre-incr operand
-;;;	.word	0x0171
-;;;	.word	0x6c18
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_h_gr32	byte_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_predec_to_reg8:		; pre-decrement from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @-ers, rd
-
-	mov.l	#byte_src+1, er1
-	mov.b	@-er1, r0l	; Register pre-decr operand
-;;;	.word	0x0173
-;;;	.word	0x6c18
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_h_gr32	byte_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	
-mov_b_disp2_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @(dd:2, ers), rd
-	mov.l	#byte_src-1, er1
-	mov.b	@(1:2, er1), r0l	; Register plus 2-bit disp. operand
-;;; 	.word	0x0171
-;;; 	.word	0x6818
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	byte_src-1, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-mov_b_disp16_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @(dd:16, ers), rd
-	mov.l	#byte_src+0x1234, er1
-	mov.b	@(-0x1234:16, er1), r0l	; Register plus 16-bit disp. operand
-;;;	.word	0x6e18
-;;;	.word	-0x1234
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	byte_src+0x1234, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_disp32_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @(dd:32, ers), rd
-	mov.l	#byte_src+65536, er1
-	mov.b	@(-65536:32, er1), r0l	; Register plus 32-bit disp. operand
-;;;	.word	0x7810
-;;;	.word	0x6a28
-;;;	.long	-65536
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	byte_src+65536, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-mov_b_indexb16_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffffff01, er1
-	set_ccr_zero
-	;; mov.b @(dd:16, rs.b), rd
-	mov.b	@(byte_src-1:16, r1.b), r0l	; indexed byte operand
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5a5 | 77
-
-	test_h_gr32  0xffffff01, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_indexw16_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffff0002, er1
-	set_ccr_zero
-	;; mov.b @(dd:16, rs.w), rd
-	mov.b	@(byte_src-2:16, r1.w), r0l	; indexed byte operand
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5a5 | 77
-
-	test_h_gr32  0xffff0002, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_indexl16_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0x00000003, er1
-	set_ccr_zero
-	;; mov.b @(dd:16, ers.l), rd
-	mov.b	@(byte_src-3:16, er1.l), r0l	; indexed byte operand
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5a5 | 77
-
-	test_h_gr32  0x00000003, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_indexb32_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffffff04, er1
-	set_ccr_zero
-	;; mov.b @(dd:32, rs.b), rd
-	mov.b	@(byte_src-4:32, r1.b), r0l	; indexed byte operand
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32  0xffffff04 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_indexw32_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffff0005, er1
-	set_ccr_zero
-	;; mov.b @(dd:32, rs.w), rd
-	mov.b	@(byte_src-5:32, r1.w), r0l	; indexed byte operand
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32  0xffff0005 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_indexl32_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0x00000006, er1
-	set_ccr_zero
-	;; mov.b @(dd:32, ers.l), rd
-	mov.b	@(byte_src-6:32, er1.l), r0l	; indexed byte operand
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32  0x00000006 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.endif
-
-.if (sim_cpu == h8sx)
-mov_b_abs8_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#byte_src-255, er1
-	ldc	er1, sbr
-	set_ccr_zero
-	;; mov.b @aa:8, rd
-	mov.b	@0xff:8, r0l	; 8-bit (sbr relative) address-direct operand
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_h_gr32  byte_src-255, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-mov_b_abs16_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @aa:16, rd
-	mov.b	@byte_src:16, r0l	; 16-bit address-direct operand
-;;;	.word	0x6a08
-;;;	.word	@byte_src
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_b_abs32_to_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @aa:32, rd
-	mov.b	@byte_src:32, r0l	; 32-bit address-direct operand
-;;;	.word	0x6a28
-;;;	.long	@byte_src
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a5a577 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-
-	;;
-	;; Move byte from memory to memory
-	;; 
-
-mov_b_indirect_to_indirect:	; reg indirect, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @ers, @erd
-
-	mov.l	#byte_src, er1
-	mov.l	#byte_dst, er0
-	mov.b	@er1, @er0
-;;;	.word	0x0178
-;;;	.word	0x0100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  byte_dst er0
-	test_h_gr32  byte_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext55
-	fail
-.Lnext55:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext56
-	fail
-.Lnext56:			; OK, pass on.
-
-mov_b_postinc_to_postinc:	; reg post-increment, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @ers+, @erd+
-
-	mov.l	#byte_src, er1
-	mov.l	#byte_dst, er0
-	mov.b	@er1+, @er0+
-;;;	.word	0x0178
-;;;	.word	0x8180
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  byte_dst+1 er0
-	test_h_gr32  byte_src+1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext65
-	fail
-.Lnext65:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext66
-	fail
-.Lnext66:			; OK, pass on.
-
-mov_b_postdec_to_postdec:	; reg post-decrement, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @ers-, @erd-
-
-	mov.l	#byte_src, er1
-	mov.l	#byte_dst, er0
-	mov.b	@er1-, @er0-
-;;;	.word	0x0178
-;;;	.word	0xa1a0
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  byte_dst-1 er0
-	test_h_gr32  byte_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext75
-	fail
-.Lnext75:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext76
-	fail
-.Lnext76:			; OK, pass on.
-
-mov_b_preinc_to_preinc:		; reg pre-increment, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @+ers, @+erd
-
-	mov.l	#byte_src-1, er1
-	mov.l	#byte_dst-1, er0
-	mov.b	@+er1, @+er0
-;;;	.word	0x0178
-;;;	.word	0x9190
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  byte_dst er0
-	test_h_gr32  byte_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext85
-	fail
-.Lnext85:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext86
-	fail
-.Lnext86:				; OK, pass on.
-
-mov_b_predec_to_predec:		; reg pre-decrement, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @-ers, @-erd
-
-	mov.l	#byte_src+1, er1
-	mov.l	#byte_dst+1, er0
-	mov.b	@-er1, @-er0
-;;;	.word	0x0178
-;;;	.word	0xb1b0
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  byte_dst er0
-	test_h_gr32  byte_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext95
-	fail
-.Lnext95:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext96
-	fail
-.Lnext96:			; OK, pass on.
-
-mov_b_disp2_to_disp2:		; reg 2-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @(dd:2, ers), @(dd:2, erd)
-
-	mov.l	#byte_src-1, er1
-	mov.l	#byte_dst-2, er0
-	mov.b	@(1:2, er1), @(2:2, er0)
-;;; 	.word	0x0178
-;;; 	.word	0x1120
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  byte_dst-2 er0
-	test_h_gr32  byte_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext105
-	fail
-.Lnext105:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext106
-	fail
-.Lnext106:			; OK, pass on.
-
-mov_b_disp16_to_disp16:		; reg 16-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @(dd:16, ers), @(dd:16, erd)
-
-	mov.l	#byte_src-1, er1
-	mov.l	#byte_dst-2, er0
-	mov.b	@(1:16, er1), @(2:16, er0)
-;;; 	.word	0x0178
-;;; 	.word	0xc1c0
-;;; 	.word	0x0001
-;;; 	.word	0x0002
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  byte_dst-2 er0
-	test_h_gr32  byte_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext115
-	fail
-.Lnext115:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext116
-	fail
-.Lnext116:			; OK, pass on.
-
-mov_b_disp32_to_disp32:		; reg 32-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @(dd:32, ers), @(dd:32, erd)
-
-	mov.l	#byte_src-1, er1
-	mov.l	#byte_dst-2, er0
-	mov.b	@(1:32, er1), @(2:32, er0)
-;;; 	.word	0x0178
-;;; 	.word	0xc9c8
-;;;	.long	1
-;;;	.long	2
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  byte_dst-2 er0
-	test_h_gr32  byte_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext125
-	fail
-.Lnext125:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext126
-	fail
-.Lnext126:				; OK, pass on.
-
-mov_b_indexb16_to_indexb16:	; reg 16-bit indexed, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffffff01, er1
-	mov.l	#0xffffff02, er0
-	;; mov.b @(dd:16, rs.b), @(dd:16, rd.b)
-	set_ccr_zero
-	mov.b	@(byte_src-1:16, r1.b), @(byte_dst-2:16, r0.b)
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  0xffffff02 er0
-	test_h_gr32  0xffffff01 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	bne	fail1
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	beq	fail1
-
-mov_b_indexw16_to_indewb16:	; reg 16-bit indexed, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffff0003, er1
-	mov.l	#0xffff0004, er0
-	;; mov.b @(dd:16, rs.w), @(dd:16, rd.w)
-	set_ccr_zero
-	mov.b	@(byte_src-3:16, r1.w), @(byte_dst-4:16, r0.w)
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  0xffff0004 er0
-	test_h_gr32  0xffff0003 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	bne	fail1
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	beq	fail1
-
-mov_b_indexl16_to_indexl16:	; reg 16-bit indexed, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0x00000005, er1
-	mov.l	#0x00000006, er0
-	;; mov.b @(dd:16, ers.l), @(dd:16, erd.l)
-	set_ccr_zero
-	mov.b	@(byte_src-5:16, er1.l), @(byte_dst-6:16, er0.l)
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  0x00000006 er0
-	test_h_gr32  0x00000005 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	bne	fail1
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	beq	fail1
-
-mov_b_indexb32_to_indexb32:	; reg 32-bit indexed, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffffff01, er1
-	mov.l	#0xffffff02, er0
-	set_ccr_zero
-	;; mov.b @(dd:32, rs.b), @(dd:32, rd.b)
-	mov.b	@(byte_src-1:32, r1.b), @(byte_dst-2:32, r0.b)
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  0xffffff02 er0
-	test_h_gr32  0xffffff01 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	bne	fail1
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	beq	fail1
-
-mov_b_indexw32_to_indexw32:	; reg 32-bit indexed, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0xffff0003, er1
-	mov.l	#0xffff0004, er0
-	set_ccr_zero
-	;; mov.b @(dd:32, rs.w), @(dd:32, rd.w)
-	mov.b	@(byte_src-3:32, r1.w), @(byte_dst-4:32, r0.w)
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  0xffff0004 er0
-	test_h_gr32  0xffff0003 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	bne	fail1
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	beq	fail1
-
-mov_b_indexl32_to_indexl32:	; reg 32-bit indexed, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	mov.l	#0x00000005, er1
-	mov.l	#0x00000006, er0
-	set_ccr_zero
-	;; mov.b @(dd:32, rs.w), @(dd:32, rd.w)
-	mov.b	@(byte_src-5:32, er1.l), @(byte_dst-6:32, er0.l)
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  0x00000006 er0
-	test_h_gr32  0x00000005 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	bne	fail1
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	beq	fail1
-
-mov_b_abs16_to_abs16:		; 16-bit absolute addr, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @aa:16, @aa:16
-
-	mov.b	@byte_src:16, @byte_dst:16
-;;; 	.word	0x0178
-;;; 	.word	0x4040
-;;;	.word	@byte_src
-;;;	.word	@byte_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-
-	test_gr_a5a5 0		; Make sure *NO* general registers are changed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext135
-	fail
-.Lnext135:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext136
-	fail
-.Lnext136:				; OK, pass on.
-
-mov_b_abs32_to_abs32:		; 32-bit absolute addr, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.b @aa:32, @aa:32
-
-	mov.b	@byte_src:32, @byte_dst:32
-;;; 	.word	0x0178
-;;; 	.word	0x4848
-;;;	.long	@byte_src
-;;;	.long	@byte_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure *NO* general registers are changed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.b	@byte_src, @byte_dst
-	beq	.Lnext145
-	fail
-.Lnext145:
-	;; Now clear the destination location, and verify that.
-	mov.b	#0, @byte_dst
-	cmp.b	@byte_src, @byte_dst
-	bne	.Lnext146
-	fail
-.Lnext146:				; OK, pass on.
-
-
-.endif
-
-	pass
-
-	exit 0
-
-fail1:
-	fail
-	
\ No newline at end of file
diff --git a/sim/testsuite/sim/h8300/movl.s b/sim/testsuite/sim/h8300/movl.s
deleted file mode 100644
index dcc392227e6..00000000000
--- a/sim/testsuite/sim/h8300/movl.s
+++ /dev/null
@@ -1,2160 +0,0 @@
-# Hitachi H8 testcase 'mov.l'
-# mach(): h8300h h8300s h8sx
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-	.align	4
-long_src:
-	.long	0x77777777
-long_dst:
-	.long	0
-
-	.text
-
-	;;
-	;; Move long from immediate source
-	;; 
-
-.if (sim_cpu == h8sx)
-mov_l_imm3_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:3, erd
-	mov.l	#0x3:3, er0	; Immediate 3-bit operand
-;;;	.word	0x0fb8
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x3 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_l_imm16_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, erd
-	mov.l	#0x1234, er0	; Immediate 16-bit operand
-;;;	.word	0x7a08
-;;;	.word	0x1234
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x1234 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-mov_l_imm32_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, erd
-	mov.l	#0x12345678, er0	; Immediate 32-bit operand
-;;;	.word	0x7a00
-;;;	.long	0x12345678
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x12345678 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-mov_l_imm8_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @erd
-	mov.l	#long_dst, er1
-	mov.l	#0xa5:8, @er1	; Register indirect operand
-;;;	.word	0x010d
-;;;	.word	0x01a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext1
-	fail
-.Lnext1:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_postinc:		; post-increment from imm8 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @erd+
-	mov.l	#long_dst, er1
-	mov.l	#0xa5:8, @er1+	; Imm8, register post-incr operands.
-;;;	.word	0x010d
-;;;	.word	0x81a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst+4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext2
-	fail
-.Lnext2:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_postdec:		; post-decrement from imm8 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @erd-
-	mov.l	#long_dst, er1
-	mov.l	#0xa5:8, @er1-	; Imm8, register post-decr operands.
-;;;	.word	0x010d
-;;;	.word	0xa1a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext3
-	fail
-.Lnext3:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @+erd
-	mov.l	#long_dst-4, er1
-	mov.l	#0xa5:8, @+er1	; Imm8, register pre-incr operands
-;;;	.word	0x010d
-;;;	.word	0x91a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext4
-	fail
-.Lnext4:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @-erd
-	mov.l	#long_dst+4, er1
-	mov.l	#0xa5:8, @-er1	; Imm8, register pre-decr operands
-;;;	.word	0x010d
-;;;	.word	0xb1a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext5
-	fail
-.Lnext5:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @(dd:2, erd)
-	mov.l	#long_dst-12, er1
-	mov.l	#0xa5:8, @(12:2, er1)	; Imm8, reg plus 2-bit disp. operand
-;;;	.word	0x010d
-;;;	.word	0x31a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-12, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext6
-	fail
-.Lnext6:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @(dd:16, erd)
-	mov.l	#long_dst-4, er1
-	mov.l	#0xa5:8, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x010d
-;;;	.word	0x6f90
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext7
-	fail
-.Lnext7:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @(dd:32, erd)
-	mov.l	#long_dst-8, er1
-	mov.l	#0xa5:8, @(8:32, er1)	; Register plus 32-bit disp. operand
-;;;	.word	0x010d
-;;;	.word	0xc9a5
-;;;	.long	8
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-8, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext8
-	fail
-.Lnext8:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @aa:16
-	mov.l	#0xa5:8, @long_dst:16	; 16-bit address-direct operand
-;;;	.word	0x010d
-;;;	.word	0x40a5
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext9
-	fail
-.Lnext9:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm8_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:8, @aa:32
-	mov.l	#0xa5:8, @long_dst:32	; 32-bit address-direct operand
-;;;	.word	0x010d
-;;;	.word	0x48a5
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xa5, @long_dst
-	beq	.Lnext10
-	fail
-.Lnext10:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @erd
-	mov.l	#long_dst, er1
-	mov.l	#0xdead:16, @er1	; Register indirect operand
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0x0100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext11
-	fail
-.Lnext11:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_postinc:		; post-increment from imm16 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @erd+
-	mov.l	#long_dst, er1
-	mov.l	#0xdead:16, @er1+	; Imm16, register post-incr operands.
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0x8100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst+4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext12
-	fail
-.Lnext12:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_postdec:		; post-decrement from imm16 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @erd-
-	mov.l	#long_dst, er1
-	mov.l	#0xdead:16, @er1-	; Imm16, register post-decr operands.
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0xa100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext13
-	fail
-.Lnext13:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @+erd
-	mov.l	#long_dst-4, er1
-	mov.l	#0xdead:16, @+er1	; Imm16, register pre-incr operands
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0x9100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext14
-	fail
-.Lnext14:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @-erd
-	mov.l	#long_dst+4, er1
-	mov.l	#0xdead:16, @-er1	; Imm16, register pre-decr operands
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0xb100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext15
-	fail
-.Lnext15:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @(dd:2, erd)
-	mov.l	#long_dst-12, er1
-	mov.l	#0xdead:16, @(12:2, er1)	; Imm16, reg plus 2-bit disp. operand
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0x3100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-12, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext16
-	fail
-.Lnext16:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @(dd:16, erd)
-	mov.l	#long_dst-4, er1
-	mov.l	#0xdead:16, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0xc100
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext17
-	fail
-.Lnext17:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @(dd:32, erd)
-	mov.l	#long_dst-8, er1
-	mov.l	#0xdead:16, @(8:32, er1)   ; Register plus 32-bit disp. operand
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0xc900
-;;;	.long	8
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-8, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext18
-	fail
-.Lnext18:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @aa:16
-	mov.l	#0xdead:16, @long_dst:16	; 16-bit address-direct operand
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0x4000
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext19
-	fail
-.Lnext19:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm16_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:16, @aa:32
-	mov.l	#0xdead:16, @long_dst:32	; 32-bit address-direct operand
-;;;	.word	0x7a7c
-;;;	.word	0xdead
-;;;	.word	0x4800
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xdead, @long_dst
-	beq	.Lnext20
-	fail
-.Lnext20:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @erd
-	mov.l	#long_dst, er1
-	mov.l	#0xcafedead:32, @er1	; Register indirect operand
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0x0100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext21
-	fail
-.Lnext21:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_postinc:		; post-increment from imm32 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @erd+
-	mov.l	#long_dst, er1
-	mov.l	#0xcafedead:32, @er1+	; Imm32, register post-incr operands.
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0x8100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst+4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext22
-	fail
-.Lnext22:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_postdec:		; post-decrement from imm32 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @erd-
-	mov.l	#long_dst, er1
-	mov.l	#0xcafedead:32, @er1-	; Imm32, register post-decr operands.
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0xa100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext23
-	fail
-.Lnext23:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @+erd
-	mov.l	#long_dst-4, er1
-	mov.l	#0xcafedead:32, @+er1	; Imm32, register pre-incr operands
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0x9100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext24
-	fail
-.Lnext24:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @-erd
-	mov.l	#long_dst+4, er1
-	mov.l	#0xcafedead:32, @-er1	; Imm32, register pre-decr operands
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0xb100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext25
-	fail
-.Lnext25:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @(dd:2, erd)
-	mov.l	#long_dst-12, er1
-	mov.l	#0xcafedead:32, @(12:2, er1)	; Imm32, reg plus 2-bit disp. operand
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0x3100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-12, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext26
-	fail
-.Lnext26:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @(dd:16, erd)
-	mov.l	#long_dst-4, er1
-	mov.l	#0xcafedead:32, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0xc100
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext27
-	fail
-.Lnext27:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @(dd:32, erd)
-	mov.l	#long_dst-8, er1
-	mov.l	#0xcafedead:32, @(8:32, er1)   ; Register plus 32-bit disp. operand
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0xc900
-;;;	.long	8
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-8, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext28
-	fail
-.Lnext28:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l #xx:32, @aa:16
-	mov.l	#0xcafedead:32, @long_dst:16	; 16-bit address-direct operand
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0x4000
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext29
-	fail
-.Lnext29:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_imm32_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  mov.l #xx:32, @aa:32
-	mov.l	#0xcafedead:32, @long_dst:32	; 32-bit address-direct operand
-;;;	.word	0x7a74
-;;;	.long	0xcafedead
-;;;	.word	0x4800
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	#0xcafedead, @long_dst
-	beq	.Lnext30
-	fail
-.Lnext30:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-.endif
-
-	;;
-	;; Move long from register source
-	;; 
-
-mov_l_reg32_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, erd
-	mov.l	#0x12345678, er1
-	mov.l	er1, er0	; Register 32-bit operand
-;;;	.word	0x0f90
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-	test_h_gr32 0x12345678 er0
-	test_h_gr32 0x12345678 er1	; mov src unchanged
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_l_reg32_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @erd
-	mov.l	#long_dst, er1
-	mov.l	er0, @er1	; Register indirect operand
-;;;	.word	0x0100
-;;;	.word	0x6990
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.l	#0, er0
-	mov.l	@long_dst, er0
-	cmp.l	er2, er0
-	beq	.Lnext44
-	fail
-.Lnext44:
-	mov.l	#0, er0
-	mov.l	er0, @long_dst	; zero it again for the next use.
-
-.if (sim_cpu == h8sx)
-mov_l_reg32_to_postinc:		; post-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @erd+
-	mov.l	#long_dst, er1
-	mov.l	er0, @er1+	; Register post-incr operand
-;;;	.word	0x0103
-;;;	.word	0x6d90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst+4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	er2, @long_dst
-	beq	.Lnext49
-	fail
-.Lnext49:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_reg32_to_postdec:		; post-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @erd-
-	mov.l	#long_dst, er1
-	mov.l	er0, @er1-	; Register post-decr operand
-;;;	.word	0x0101
-;;;	.word	0x6d90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	er2, @long_dst
-	beq	.Lnext50
-	fail
-.Lnext50:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-
-mov_l_reg32_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @+erd
-	mov.l	#long_dst-4, er1
-	mov.l	er0, @+er1	; Register pre-incr operand
-;;;	.word	0x0102
-;;;	.word	0x6d90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	er2, @long_dst
-	beq	.Lnext51
-	fail
-.Lnext51:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-.endif				; h8sx
-
-mov_l_reg32_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @-erd
-	mov.l	#long_dst+4, er1
-	mov.l	er0, @-er1	; Register pre-decr operand
-;;;	.word	0x0100
-;;;	.word	0x6d90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.l	#0, er0
-	mov.l	@long_dst, er0
-	cmp.l	er2, er0
-	beq	.Lnext48
-	fail
-.Lnext48:
-	mov.l	#0, er0
-	mov.l	er0, @long_dst	; zero it again for the next use.
-
-.if (sim_cpu == h8sx)
-mov_l_reg32_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @(dd:2, erd)
-	mov.l	#long_dst-12, er1
-	mov.l	er0, @(12:2, er1)	; Register plus 2-bit disp. operand
-;;;	.word	0x0103
-;;;	.word	0x6990
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	long_dst-12, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	er2, @long_dst
-	beq	.Lnext52
-	fail
-.Lnext52:
-	mov.l	#0, @long_dst	; zero it again for the next use.
-.endif				; h8sx
-
-mov_l_reg32_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @(dd:16, erd)
-	mov.l	#long_dst-4, er1
-	mov.l	er0, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x0100
-;;;	.word	0x6f90
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	long_dst-4, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.l	#0, er0
-	mov.l	@long_dst, er0
-	cmp.l	er2, er0
-	beq	.Lnext45
-	fail
-.Lnext45:
-	mov.l	#0, er0
-	mov.l	er0, @long_dst	; zero it again for the next use.
-
-mov_l_reg32_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @(dd:32, erd)
-	mov.l	#long_dst-8, er1
-	mov.l	er0, @(8:32, er1)	; Register plus 32-bit disp. operand
-;;;	.word	0x7890
-;;;	.word	0x6ba0
-;;;	.long	8
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	long_dst-8, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.l	#0, er0
-	mov.l	@long_dst, er0
-	cmp.l	er2, er0
-	beq	.Lnext46
-	fail
-.Lnext46:
-	mov.l	#0, er0
-	mov.l	er0, @long_dst	; zero it again for the next use.
-
-mov_l_reg32_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @aa:16
-	mov.l	er0, @long_dst:16	; 16-bit address-direct operand
-;;;	.word	0x0100
-;;;	.word	0x6b80
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.l	#0, er0
-	mov.l	@long_dst, er0
-	cmp.l	er0, er1
-	beq	.Lnext41
-	fail
-.Lnext41:
-	mov.l	#0, er0
-	mov.l	er0, @long_dst	; zero it again for the next use.
-
-mov_l_reg32_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l ers, @aa:32
-	mov.l	er0, @long_dst:32	; 32-bit address-direct operand
-;;;	.word	0x0100
-;;;	.word	0x6ba0
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.l	#0, er0
-	mov.l	@long_dst, er0
-	cmp.l	er0, er1
-	beq	.Lnext42
-	fail
-.Lnext42:
-	mov.l	#0, er0
-	mov.l	er0, @long_dst	; zero it again for the next use.
-
-	;;
-	;; Move long to register destination.
-	;; 
-
-mov_l_indirect_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @ers, erd
-	mov.l	#long_src, er1
-	mov.l	@er1, er0	; Register indirect operand
-;;;	.word	0x0100
-;;;	.word	0x6910
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0
-
-	test_h_gr32	long_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_l_postinc_to_reg32:		; post-increment from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @ers+, erd
-
-	mov.l	#long_src, er1
-	mov.l	@er1+, er0	; Register post-incr operand
-;;;	.word	0x0100
-;;;	.word	0x6d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0
-
-	test_h_gr32	long_src+4, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-mov_l_postdec_to_reg32:		; post-decrement from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @ers-, erd
-
-	mov.l	#long_src, er1
-	mov.l	@er1-, er0	; Register post-decr operand
-;;;	.word	0x0102
-;;;	.word	0x6d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0
-
-	test_h_gr32	long_src-4, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_l_preinc_to_reg32:		; pre-increment from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @+ers, erd
-
-	mov.l	#long_src-4, er1
-	mov.l	@+er1, er0	; Register pre-incr operand
-;;;	.word	0x0101
-;;;	.word	0x6d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0
-
-	test_h_gr32	long_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_l_predec_to_reg32:		; pre-decrement from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @-ers, erd
-
-	mov.l	#long_src+4, er1
-	mov.l	@-er1, er0	; Register pre-decr operand
-;;;	.word	0x0103
-;;;	.word	0x6d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0
-
-	test_h_gr32	long_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	
-mov_l_disp2_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @(dd:2, ers), erd
-	mov.l	#long_src-4, er1
-	mov.l	@(4:2, er1), er0	; Register plus 2-bit disp. operand
-;;; 	.word	0x0101
-;;; 	.word	0x6910
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	long_src-4, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif				; h8sx
-
-mov_l_disp16_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @(dd:16, ers), erd
-	mov.l	#long_src+0x1234, er1
-	mov.l	@(-0x1234:16, er1), er0	; Register plus 16-bit disp. operand
-;;;	.word	0x0100
-;;;	.word	0x6f10
-;;;	.word	-0x1234
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	long_src+0x1234, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_l_disp32_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @(dd:32, ers), erd
-	mov.l	#long_src+65536, er1
-	mov.l	@(-65536:32, er1), er0	; Register plus 32-bit disp. operand
-;;;	.word	0x7890
-;;;	.word	0x6b20
-;;;	.long	-65536
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	long_src+65536, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_l_abs16_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @aa:16, erd
-	mov.l	@long_src:16, er0	; 16-bit address-direct operand
-;;;	.word	0x0100
-;;;	.word	0x6b00
-;;;	.word	@long_src
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_l_abs32_to_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @aa:32, erd
-	mov.l	@long_src:32, er0	; 32-bit address-direct operand
-;;;	.word	0x0100
-;;;	.word	0x6b20
-;;;	.long	@long_src
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0x77777777 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-
-.if (sim_cpu == h8sx)
-
-	;;
-	;; Move long from memory to memory
-	;; 
-
-mov_l_indirect_to_indirect:	; reg indirect, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @ers, @erd
-
-	mov.l	#long_src, er1
-	mov.l	#long_dst, er0
-	mov.l	@er1, @er0
-;;;	.word	0x0108
-;;;	.word	0x0100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst er0
-	test_h_gr32  long_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext55
-	fail
-.Lnext55:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext56
-	fail
-.Lnext56:			; OK, pass on.
-
-mov_l_postinc_to_postinc:	; reg post-increment, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @ers+, @erd+
-
-	mov.l	#long_src, er1
-	mov.l	#long_dst, er0
-	mov.l	@er1+, @er0+
-;;;	.word	0x0108
-;;;	.word	0x8180
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst+4 er0
-	test_h_gr32  long_src+4 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext65
-	fail
-.Lnext65:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext66
-	fail
-.Lnext66:			; OK, pass on.
-
-mov_l_postdec_to_postdec:	; reg post-decrement, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @ers-, @erd-
-
-	mov.l	#long_src, er1
-	mov.l	#long_dst, er0
-	mov.l	@er1-, @er0-
-;;;	.word	0x0108
-;;;	.word	0xa1a0
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst-4 er0
-	test_h_gr32  long_src-4 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext75
-	fail
-.Lnext75:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext76
-	fail
-.Lnext76:			; OK, pass on.
-
-mov_l_preinc_to_preinc:		; reg pre-increment, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @+ers, @+erd
-
-	mov.l	#long_src-4, er1
-	mov.l	#long_dst-4, er0
-	mov.l	@+er1, @+er0
-;;;	.word	0x0108
-;;;	.word	0x9190
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst er0
-	test_h_gr32  long_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext85
-	fail
-.Lnext85:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext86
-	fail
-.Lnext86:				; OK, pass on.
-
-mov_l_predec_to_predec:		; reg pre-decrement, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @-ers, @-erd
-
-	mov.l	#long_src+4, er1
-	mov.l	#long_dst+4, er0
-	mov.l	@-er1, @-er0
-;;;	.word	0x0108
-;;;	.word	0xb1b0
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst er0
-	test_h_gr32  long_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext95
-	fail
-.Lnext95:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext96
-	fail
-.Lnext96:			; OK, pass on.
-
-mov_l_disp2_to_disp2:		; reg 2-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @(dd:2, ers), @(dd:2, erd)
-
-	mov.l	#long_src-4, er1
-	mov.l	#long_dst-8, er0
-	mov.l	@(4:2, er1), @(8:2, er0)
-;;; 	.word	0x0108
-;;; 	.word	0x1120
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst-8 er0
-	test_h_gr32  long_src-4 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext105
-	fail
-.Lnext105:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext106
-	fail
-.Lnext106:			; OK, pass on.
-
-mov_l_disp16_to_disp16:		; reg 16-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @(dd:16, ers), @(dd:16, erd)
-
-	mov.l	#long_src-1, er1
-	mov.l	#long_dst-2, er0
-	mov.l	@(1:16, er1), @(2:16, er0)
-;;; 	.word	0x0108
-;;; 	.word	0xc1c0
-;;; 	.word	0x0001
-;;; 	.word	0x0002
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst-2 er0
-	test_h_gr32  long_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext115
-	fail
-.Lnext115:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext116
-	fail
-.Lnext116:			; OK, pass on.
-
-mov_l_disp32_to_disp32:		; reg 32-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @(dd:32, ers), @(dd:32, erd)
-
-	mov.l	#long_src-1, er1
-	mov.l	#long_dst-2, er0
-	mov.l	@(1:32, er1), @(2:32, er0)
-;;; 	.word	0x0108
-;;; 	.word	0xc9c8
-;;;	.long	1
-;;;	.long	2
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  long_dst-2 er0
-	test_h_gr32  long_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext125
-	fail
-.Lnext125:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext126
-	fail
-.Lnext126:				; OK, pass on.
-
-mov_l_abs16_to_abs16:		; 16-bit absolute addr, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @aa:16, @aa:16
-
-	mov.l	@long_src:16, @long_dst:16
-;;; 	.word	0x0108
-;;; 	.word	0x4040
-;;;	.word	@long_src
-;;;	.word	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-
-	test_gr_a5a5 0		; Make sure *NO* general registers are changed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext135
-	fail
-.Lnext135:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext136
-	fail
-.Lnext136:				; OK, pass on.
-
-mov_l_abs32_to_abs32:		; 32-bit absolute addr, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.l @aa:32, @aa:32
-
-	mov.l	@long_src:32, @long_dst:32
-;;; 	.word	0x0108
-;;; 	.word	0x4848
-;;;	.long	@long_src
-;;;	.long	@long_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure *NO* general registers are changed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.l	@long_src, @long_dst
-	beq	.Lnext145
-	fail
-.Lnext145:
-	;; Now clear the destination location, and verify that.
-	mov.l	#0, @long_dst
-	cmp.l	@long_src, @long_dst
-	bne	.Lnext146
-	fail
-.Lnext146:				; OK, pass on.
-
-
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/movmd.s b/sim/testsuite/sim/h8300/movmd.s
deleted file mode 100644
index fefdc3365be..00000000000
--- a/sim/testsuite/sim/h8300/movmd.s
+++ /dev/null
@@ -1,129 +0,0 @@
-# Hitachi H8 testcase 'movmd'
-# mach(): h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-byte_src:
-	.byte	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-byte_dst:
-	.byte	0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0
-
-	.align 2
-word_src:
-	.word	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-word_dst:
-	.word	0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0
-
-	.align 4
-long_src:
-	.long	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-long_dst:
-	.long	0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0
-
-	start
-.if (sim_cpu == h8sx)
-movmd_b:#
-	# Byte block transfer
-	#
-	set_grs_a5a5
-
-	mov	#byte_src, er5
-	mov	#byte_dst, er6
-	mov	#10, r4
-	set_ccr_zero
-	;; movmd.b
-	movmd.b
-;;; 	.word	0x7b94
-
-	test_cc_clear
-	test_gr_a5a5 0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_h_gr32  0xa5a50000  er4
-	test_h_gr32  byte_src+10 er5
-	test_h_gr32  byte_dst+10 er6
-	test_gr_a5a5 7
-
-	#
-	# Now make sure exactly 10 bytes were transferred.
-	memcmp	byte_src byte_dst 10
-	cmp.b	#0, @byte_dst+10
-	beq	.L0
-	fail
-.L0:
-
-movmd_w:#
-	# Word block transfer
-	#
-	set_grs_a5a5
-
-	mov	#word_src, er5
-	mov	#word_dst, er6
-	mov	#10, r4
-	set_ccr_zero
-	;; movmd.w
-	movmd.w
-;;; 	.word	0x7ba4
-
-	test_cc_clear
-	test_gr_a5a5 0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_h_gr32  0xa5a50000  er4
-	test_h_gr32  word_src+20 er5
-	test_h_gr32  word_dst+20 er6
-	test_gr_a5a5 7
-
-	#
-	# Now make sure exactly 20 bytes were transferred.
-	memcmp	word_src word_dst 20
-	cmp.w	#0, @word_dst+20
-	beq	.L1
-	fail
-.L1:
-
-movmd_l:#
-	# Long block transfer
-	#
-	set_grs_a5a5
-
-	mov	#long_src, er5
-	mov	#long_dst, er6
-	mov	#10, r4
-	set_ccr_zero
-	;; movmd.b
-	movmd.l
-;;; 	.word	0x7bb4
-
-	test_cc_clear
-	test_gr_a5a5 0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_h_gr32  0xa5a50000  er4
-	test_h_gr32  long_src+40 er5
-	test_h_gr32  long_dst+40 er6
-	test_gr_a5a5 7
-
-	#
-	# Now make sure exactly 40 bytes were transferred.
-	memcmp	long_src long_dst 40
-	cmp.l	#0, @long_dst+40
-	beq	.L2
-	fail
-.L2:
-
-.endif	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/movsd.s b/sim/testsuite/sim/h8300/movsd.s
deleted file mode 100644
index 2689c531298..00000000000
--- a/sim/testsuite/sim/h8300/movsd.s
+++ /dev/null
@@ -1,100 +0,0 @@
-# Hitachi H8 testcase 'movsd'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-src:	.byte	'h', 'e', 'l', 'l', 'o', 0
-dst1:	.byte	0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-dst2:	.byte	0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-
-	start
-.if (sim_cpu == h8sx)	
-movsd_n:#
-	# In this test, the transfer will stop after n bytes.
-	#
-	set_grs_a5a5
-
-	mov	#src,  er5
-	mov	#dst1, er6
-	mov	#4, r4
-	set_ccr_zero
-	;; movsd.b disp:16
-	movsd.b	fail1:16
-;;; 	.word	0x7b84
-;;; 	.word	0x02
-	
-	bra	pass1
-fail1:	fail
-pass1:	test_cc_clear
-	test_gr_a5a5 0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_h_gr32  0xa5a50000 er4
-	test_h_gr32  src+4  er5
-	test_h_gr32  dst1+4 er6
-	test_gr_a5a5 7
-
-	#
-	# Now make sure exactly 4 bytes were transferred.
-	cmp.b	@src, @dst1
-	bne	fail1:16
-	cmp.b	@src+1, @dst1+1
-	bne	fail1:16
-	cmp.b	@src+2, @dst1+2
-	bne	fail1:16
-	cmp.b	@src+3, @dst1+3
-	bne	fail1:16
-	cmp.b	@src+4, @dst1+4
-	beq	fail1:16
-
-movsd_s:#
-	# In this test, the entire null-terminated string is transferred.
-	#
-	set_grs_a5a5
-
-	mov	#src,  er5
-	mov	#dst2, er6
-	mov	#8, r4
-	set_ccr_zero
-	;; movsd.b disp:16
-	movsd.b	pass2:16
-;;; 	.word	0x7b84
-;;; 	.word	0x10
-
-fail2:	fail
-pass2:	test_cc_clear
-	test_gr_a5a5 0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_h_gr32  0xa5a50002 er4
-	test_h_gr32  src+6  er5
-	test_h_gr32  dst2+6 er6
-	test_gr_a5a5 7
-	#
-	# Now make sure 5 bytes were transferred, and the 6th is zero.
-	cmp.b	@src, @dst2
-	bne	fail2:16
-	cmp.b	@src+1, @dst2+1
-	bne	fail2:16
-	cmp.b	@src+2, @dst2+2
-	bne	fail2:16
-	cmp.b	@src+3, @dst2+3
-	bne	fail2:16
-	cmp.b	@src+4, @dst2+4
-	bne	fail2:16
-	cmp.b	#0,     @dst2+5
-	bne	fail2:16
-.endif	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/movw.s b/sim/testsuite/sim/h8300/movw.s
deleted file mode 100644
index b8b09ea8baa..00000000000
--- a/sim/testsuite/sim/h8300/movw.s
+++ /dev/null
@@ -1,1857 +0,0 @@
-# Hitachi H8 testcase 'mov.w'
-# mach(): h8300h h8300s h8sx
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-	.align	2
-word_src:
-	.word	0x7777
-word_dst:
-	.word	0
-
-	.text
-
-	;;
-	;; Move word from immediate source
-	;; 
-
-.if (sim_cpu == h8sx)
-mov_w_imm3_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:3, rd
-	mov.w	#0x3:3, r0	; Immediate 3-bit operand
-;;;	.word	0x0f30
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a50003 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-mov_w_imm16_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, rd
-	mov.w	#0x1234, r0	; Immediate 16-bit operand
-;;;	.word	0x7900
-;;;	.word	0x1234
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a51234 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-mov_w_imm4_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:4, @aa:16
-	mov.w	#0xf:4, @word_dst:16	; 4-bit imm to 16-bit address-direct 
-;;;	.word	0x6bdf
-;;;	.word	@word_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xf, @word_dst
-	beq	.Lnext21
-	fail
-.Lnext21:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm4_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:4, @aa:32
-	mov.w	#0xf:4, @word_dst:32	; 4-bit imm to 32-bit address-direct 
-;;;	.word	0x6bff
-;;;	.long	@word_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xf, @word_dst
-	beq	.Lnext22
-	fail
-.Lnext22:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @erd
-	mov.l	#word_dst, er1
-	mov.w	#0xa5:8, @er1	; Register indirect operand
-;;;	.word	0x015d
-;;;	.word	0x01a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext1
-	fail
-.Lnext1:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_postinc:		; post-increment from imm8 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @erd+
-	mov.l	#word_dst, er1
-	mov.w	#0xa5:8, @er1+	; Imm8, register post-incr operands.
-;;;	.word	0x015d
-;;;	.word	0x81a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst+2, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext2
-	fail
-.Lnext2:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_postdec:		; post-decrement from imm8 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @erd-
-	mov.l	#word_dst, er1
-	mov.w	#0xa5:8, @er1-	; Imm8, register post-decr operands.
-;;;	.word	0x015d
-;;;	.word	0xa1a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-2, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext3
-	fail
-.Lnext3:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @+erd
-	mov.l	#word_dst-2, er1
-	mov.w	#0xa5:8, @+er1	; Imm8, register pre-incr operands
-;;;	.word	0x015d
-;;;	.word	0x91a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext4
-	fail
-.Lnext4:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @-erd
-	mov.l	#word_dst+2, er1
-	mov.w	#0xa5:8, @-er1	; Imm8, register pre-decr operands
-;;;	.word	0x015d
-;;;	.word	0xb1a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext5
-	fail
-.Lnext5:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @(dd:2, erd)
-	mov.l	#word_dst-6, er1
-	mov.w	#0xa5:8, @(6:2, er1)	; Imm8, reg plus 2-bit disp. operand
-;;;	.word	0x015d
-;;;	.word	0x31a5
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-6, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext6
-	fail
-.Lnext6:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @(dd:16, erd)
-	mov.l	#word_dst-4, er1
-	mov.w	#0xa5:8, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x015d
-;;;	.word	0x6f90
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext7
-	fail
-.Lnext7:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @(dd:32, erd)
-	mov.l	#word_dst-8, er1
-	mov.w	#0xa5:8, @(8:32, er1)	; Register plus 32-bit disp. operand
-;;;	.word	0x015d
-;;;	.word	0xc9a5
-;;;	.long	8
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-8, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext8
-	fail
-.Lnext8:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @aa:16
-	mov.w	#0xa5:8, @word_dst:16	; 16-bit address-direct operand
-;;;	.word	0x015d
-;;;	.word	0x40a5
-;;;	.word	@word_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext9
-	fail
-.Lnext9:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm8_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:8, @aa:32
-	mov.w	#0xa5:8, @word_dst:32	; 32-bit address-direct operand
-;;;	.word	0x015d
-;;;	.word	0x48a5
-;;;	.long	@word_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xa5, @word_dst
-	beq	.Lnext10
-	fail
-.Lnext10:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @erd
-	mov.l	#word_dst, er1
-	mov.w	#0xdead:16, @er1	; Register indirect operand
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0x0100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext11
-	fail
-.Lnext11:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_postinc:		; post-increment from imm16 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @erd+
-	mov.l	#word_dst, er1
-	mov.w	#0xdead:16, @er1+	; Imm16, register post-incr operands.
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0x8100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst+2, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext12
-	fail
-.Lnext12:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_postdec:		; post-decrement from imm16 to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @erd-
-	mov.l	#word_dst, er1
-	mov.w	#0xdead:16, @er1-	; Imm16, register post-decr operands.
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0xa100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-2, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext13
-	fail
-.Lnext13:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @+erd
-	mov.l	#word_dst-2, er1
-	mov.w	#0xdead:16, @+er1	; Imm16, register pre-incr operands
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0x9100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext14
-	fail
-.Lnext14:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @-erd
-	mov.l	#word_dst+2, er1
-	mov.w	#0xdead:16, @-er1	; Imm16, register pre-decr operands
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0xb100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext15
-	fail
-.Lnext15:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @(dd:2, erd)
-	mov.l	#word_dst-6, er1
-	mov.w	#0xdead:16, @(6:2, er1)	; Imm16, reg plus 2-bit disp. operand
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0x3100
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-6, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext16
-	fail
-.Lnext16:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @(dd:16, erd)
-	mov.l	#word_dst-4, er1
-	mov.w	#0xdead:16, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0xc100
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-4, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext17
-	fail
-.Lnext17:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @(dd:32, erd)
-	mov.l	#word_dst-8, er1
-	mov.w	#0xdead:16, @(8:32, er1)   ; Register plus 32-bit disp. operand
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0xc900
-;;;	.long	8
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-8, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext18
-	fail
-.Lnext18:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @aa:16
-	mov.w	#0xdead:16, @word_dst:16	; 16-bit address-direct operand
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0x4000
-;;;	.word	@word_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext19
-	fail
-.Lnext19:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_imm16_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w #xx:16, @aa:32
-	mov.w	#0xdead:16, @word_dst:32	; 32-bit address-direct operand
-;;;	.word	0x7974
-;;;	.word	0xdead
-;;;	.word	0x4800
-;;;	.long	@word_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	#0xdead, @word_dst
-	beq	.Lnext20
-	fail
-.Lnext20:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-.endif
-
-	;;
-	;; Move word from register source
-	;; 
-
-mov_w_reg16_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, erd
-	mov.w	#0x1234, r1
-	mov.w	r1, r0		; Register 16-bit operand
-;;;	.word	0x0d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-	test_h_gr16 0x1234 r0
-	test_h_gr16 0x1234 r1	; mov src unchanged
-.if (sim_cpu)
-	test_h_gr32 0xa5a51234 er0
-	test_h_gr32 0xa5a51234 er1	; mov src unchanged
-.endif
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-
-mov_w_reg16_to_indirect:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @erd
-	mov.l	#word_dst, er1
-	mov.w	r0, @er1	; Register indirect operand
-;;;	.word	0x6990
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.w	#0, r0
-	mov.w	@word_dst, r0
-	cmp.w	r2, r0
-	beq	.Lnext44
-	fail
-.Lnext44:
-	mov.w	#0, r0
-	mov.w	r0, @word_dst	; zero it again for the next use.
-
-.if (sim_cpu == h8sx)
-mov_w_reg16_to_postinc:		; post-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @erd+
-	mov.l	#word_dst, er1
-	mov.w	r0, @er1+	; Register post-incr operand
-;;;	.word	0x0153
-;;;	.word	0x6d90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst+2, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	r2, @word_dst
-	beq	.Lnext49
-	fail
-.Lnext49:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_reg16_to_postdec:		; post-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @erd-
-	mov.l	#word_dst, er1
-	mov.w	r0, @er1-	; Register post-decr operand
-;;;	.word	0x0151
-;;;	.word	0x6d90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-2, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	r2, @word_dst
-	beq	.Lnext50
-	fail
-.Lnext50:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-
-mov_w_reg16_to_preinc:		; pre-increment from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @+erd
-	mov.l	#word_dst-2, er1
-	mov.w	r0, @+er1	; Register pre-incr operand
-;;;	.word	0x0152
-;;;	.word	0x6d90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	r2, @word_dst
-	beq	.Lnext51
-	fail
-.Lnext51:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-.endif
-
-mov_w_reg16_to_predec:		; pre-decrement from register to mem
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @-erd
-	mov.l	#word_dst+2, er1
-	mov.w	r0, @-er1	; Register pre-decr operand
-;;;	.word	0x6d90
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.w	#0, r0
-	mov.w	@word_dst, r0
-	cmp.w	r2, r0
-	beq	.Lnext48
-	fail
-.Lnext48:
-	mov.w	#0, r0
-	mov.w	r0, @word_dst	; zero it again for the next use.
-
-.if (sim_cpu == h8sx)
-mov_w_reg16_to_disp2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @(dd:2, erd)
-	mov.l	#word_dst-6, er1
-	mov.w	r0, @(6:2, er1)	; Register plus 2-bit disp. operand
-;;;	.word	0x0153
-;;;	.word	0x6990
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_h_gr32	word_dst-6, er1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	r2, @word_dst
-	beq	.Lnext52
-	fail
-.Lnext52:
-	mov.w	#0, @word_dst	; zero it again for the next use.
-.endif
-
-mov_w_reg16_to_disp16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @(dd:16, erd)
-	mov.l	#word_dst-4, er1
-	mov.w	r0, @(4:16, er1)	; Register plus 16-bit disp. operand
-;;;	.word	0x6f90
-;;;	.word	0x0004
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	word_dst-4, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.w	#0, r0
-	mov.w	@word_dst, r0
-	cmp.w	r2, r0
-	beq	.Lnext45
-	fail
-.Lnext45:
-	mov.w	#0, r0
-	mov.w	r0, @word_dst	; zero it again for the next use.
-
-mov_w_reg16_to_disp32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @(dd:32, erd)
-	mov.l	#word_dst-8, er1
-	mov.w	r0, @(8:32, er1)	; Register plus 32-bit disp. operand
-;;;	.word	0x7810
-;;;	.word	0x6ba0
-;;;	.long	8
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32	word_dst-8, er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.w	#0, r0
-	mov.w	@word_dst, r0
-	cmp.w	r2, r0
-	beq	.Lnext46
-	fail
-.Lnext46:
-	mov.w	#0, r0
-	mov.w	r0, @word_dst	; zero it again for the next use.
-
-mov_w_reg16_to_abs16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @aa:16
-	mov.w	r0, @word_dst:16	; 16-bit address-direct operand
-;;;	.word	0x6b80
-;;;	.word	@word_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.w	#0, r0
-	mov.w	@word_dst, r0
-	cmp.w	r0, r1
-	beq	.Lnext41
-	fail
-.Lnext41:
-	mov.w	#0, r0
-	mov.w	r0, @word_dst	; zero it again for the next use.
-
-mov_w_reg16_to_abs32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w ers, @aa:32
-	mov.w	r0, @word_dst:32	; 32-bit address-direct operand
-;;;	.word	0x6ba0
-;;;	.long	@word_dst
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure _ALL_ general regs not disturbed
-	test_gr_a5a5 1		; (first, because on h8/300 we must use one
-	test_gr_a5a5 2		; to examine the destination memory).
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	mov.w	#0, r0
-	mov.w	@word_dst, r0
-	cmp.w	r0, r1
-	beq	.Lnext42
-	fail
-.Lnext42:
-	mov.w	#0, r0
-	mov.w	r0, @word_dst	; zero it again for the next use.
-
-	;;
-	;; Move word to register destination.
-	;; 
-
-mov_w_indirect_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @ers, rd
-	mov.l	#word_src, er1
-	mov.w	@er1, r0	; Register indirect operand
-;;;	.word	0x6910
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0
-
-	test_h_gr32	word_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_w_postinc_to_reg16:		; post-increment from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @ers+, rd
-
-	mov.l	#word_src, er1
-	mov.w	@er1+, r0	; Register post-incr operand
-;;;	.word	0x6d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0
-
-	test_h_gr32	word_src+2, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-mov_w_postdec_to_reg16:		; post-decrement from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @ers-, rd
-
-	mov.l	#word_src, er1
-	mov.w	@er1-, r0	; Register post-decr operand
-;;;	.word	0x0152
-;;;	.word	0x6d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0
-
-	test_h_gr32	word_src-2, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_w_preinc_to_reg16:		; pre-increment from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @+ers, rd
-
-	mov.l	#word_src-2, er1
-	mov.w	@+er1, r0	; Register pre-incr operand
-;;;	.word	0x0151
-;;;	.word	0x6d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0
-
-	test_h_gr32	word_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_w_predec_to_reg16:		; pre-decrement from mem to register
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @-ers, rd
-
-	mov.l	#word_src+2, er1
-	mov.w	@-er1, r0	; Register pre-decr operand
-;;;	.word	0x0153
-;;;	.word	0x6d10
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0
-
-	test_h_gr32	word_src, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	
-mov_w_disp2_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @(dd:2, ers), rd
-	mov.l	#word_src-2, er1
-	mov.w	@(2:2, er1), r0	; Register plus 2-bit disp. operand
-;;; 	.word	0x0151
-;;; 	.word	0x6910
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	word_src-2, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-mov_w_disp16_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @(dd:16, ers), rd
-	mov.l	#word_src+0x1234, er1
-	mov.w	@(-0x1234:16, er1), r0	; Register plus 16-bit disp. operand
-;;;	.word	0x6f10
-;;;	.word	-0x1234
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	word_src+0x1234, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_w_disp32_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @(dd:32, ers), rd
-	mov.l	#word_src+65536, er1
-	mov.w	@(-65536:32, er1), r0	; Register plus 32-bit disp. operand
-;;;	.word	0x7810
-;;;	.word	0x6b20
-;;;	.long	-65536
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0	; mov result:	a5a5 | 7777
-
-	test_h_gr32	word_src+65536, er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_w_abs16_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @aa:16, rd
-	mov.w	@word_src:16, r0	; 16-bit address-direct operand
-;;;	.word	0x6b00
-;;;	.word	@word_src
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-mov_w_abs32_to_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @aa:32, rd
-	mov.w	@word_src:32, r0	; 32-bit address-direct operand
-;;;	.word	0x6b20
-;;;	.long	@word_src
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_h_gr32 0xa5a57777 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-
-	;;
-	;; Move word from memory to memory
-	;; 
-
-mov_w_indirect_to_indirect:	; reg indirect, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @ers, @erd
-
-	mov.l	#word_src, er1
-	mov.l	#word_dst, er0
-	mov.w	@er1, @er0
-;;;	.word	0x0158
-;;;	.word	0x0100
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  word_dst er0
-	test_h_gr32  word_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext55
-	fail
-.Lnext55:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext56
-	fail
-.Lnext56:			; OK, pass on.
-
-mov_w_postinc_to_postinc:	; reg post-increment, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @ers+, @erd+
-
-	mov.l	#word_src, er1
-	mov.l	#word_dst, er0
-	mov.w	@er1+, @er0+
-;;;	.word	0x0158
-;;;	.word	0x8180
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  word_dst+2 er0
-	test_h_gr32  word_src+2 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext65
-	fail
-.Lnext65:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext66
-	fail
-.Lnext66:			; OK, pass on.
-
-mov_w_postdec_to_postdec:	; reg post-decrement, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @ers-, @erd-
-
-	mov.l	#word_src, er1
-	mov.l	#word_dst, er0
-	mov.w	@er1-, @er0-
-;;;	.word	0x0158
-;;;	.word	0xa1a0
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  word_dst-2 er0
-	test_h_gr32  word_src-2 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext75
-	fail
-.Lnext75:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext76
-	fail
-.Lnext76:			; OK, pass on.
-
-mov_w_preinc_to_preinc:		; reg pre-increment, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @+ers, @+erd
-
-	mov.l	#word_src-2, er1
-	mov.l	#word_dst-2, er0
-	mov.w	@+er1, @+er0
-;;;	.word	0x0158
-;;;	.word	0x9190
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  word_dst er0
-	test_h_gr32  word_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext85
-	fail
-.Lnext85:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext86
-	fail
-.Lnext86:				; OK, pass on.
-
-mov_w_predec_to_predec:		; reg pre-decrement, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @-ers, @-erd
-
-	mov.l	#word_src+2, er1
-	mov.l	#word_dst+2, er0
-	mov.w	@-er1, @-er0
-;;;	.word	0x0158
-;;;	.word	0xb1b0
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  word_dst er0
-	test_h_gr32  word_src er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext95
-	fail
-.Lnext95:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext96
-	fail
-.Lnext96:			; OK, pass on.
-
-mov_w_disp2_to_disp2:		; reg 2-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @(dd:2, ers), @(dd:2, erd)
-
-	mov.l	#word_src-2, er1
-	mov.l	#word_dst-4, er0
-	mov.w	@(2:2, er1), @(4:2, er0)
-;;; 	.word	0x0158
-;;; 	.word	0x1120
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  word_dst-4 er0
-	test_h_gr32  word_src-2 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext105
-	fail
-.Lnext105:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext106
-	fail
-.Lnext106:			; OK, pass on.
-
-mov_w_disp16_to_disp16:		; reg 16-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @(dd:16, ers), @(dd:16, erd)
-
-	mov.l	#word_src-1, er1
-	mov.l	#word_dst-2, er0
-	mov.w	@(1:16, er1), @(2:16, er0)
-;;; 	.word	0x0158
-;;; 	.word	0xc1c0
-;;; 	.word	0x0001
-;;; 	.word	0x0002
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  word_dst-2 er0
-	test_h_gr32  word_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext115
-	fail
-.Lnext115:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext116
-	fail
-.Lnext116:			; OK, pass on.
-
-mov_w_disp32_to_disp32:		; reg 32-bit disp, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @(dd:32, ers), @(dd:32, erd)
-
-	mov.l	#word_src-1, er1
-	mov.l	#word_dst-2, er0
-	mov.w	@(1:32, er1), @(2:32, er0)
-;;; 	.word	0x0158
-;;; 	.word	0xc9c8
-;;;	.long	1
-;;;	.long	2
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	;; Verify the affected registers.
-
-	test_h_gr32  word_dst-2 er0
-	test_h_gr32  word_src-1 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext125
-	fail
-.Lnext125:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext126
-	fail
-.Lnext126:				; OK, pass on.
-
-mov_w_abs16_to_abs16:		; 16-bit absolute addr, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @aa:16, @aa:16
-
-	mov.w	@word_src:16, @word_dst:16
-;;; 	.word	0x0158
-;;; 	.word	0x4040
-;;;	.word	@word_src
-;;;	.word	@word_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-
-	test_gr_a5a5 0		; Make sure *NO* general registers are changed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext135
-	fail
-.Lnext135:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext136
-	fail
-.Lnext136:				; OK, pass on.
-
-mov_w_abs32_to_abs32:		; 32-bit absolute addr, memory to memory
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;; mov.w @aa:32, @aa:32
-
-	mov.w	@word_src:32, @word_dst:32
-;;; 	.word	0x0158
-;;; 	.word	0x4848
-;;;	.long	@word_src
-;;;	.long	@word_dst
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_neg_clear
-	test_zero_clear
-	test_ovf_clear
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure *NO* general registers are changed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the move to memory.
-	cmp.w	@word_src, @word_dst
-	beq	.Lnext145
-	fail
-.Lnext145:
-	;; Now clear the destination location, and verify that.
-	mov.w	#0, @word_dst
-	cmp.w	@word_src, @word_dst
-	bne	.Lnext146
-	fail
-.Lnext146:				; OK, pass on.
-
-
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/mul.s b/sim/testsuite/sim/h8300/mul.s
deleted file mode 100644
index 02b9e9f846d..00000000000
--- a/sim/testsuite/sim/h8300/mul.s
+++ /dev/null
@@ -1,474 +0,0 @@
-# Hitachi H8 testcase 'muls', 'muls/u', mulu', 'mulu/u', 'mulxs', 'mulxu'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-
-.if (sim_cpu == h8sx)	
-muls_w_reg_reg:	
-	set_grs_a5a5
-
-	;; muls.w rs, rd
-	mov.w	#32, r1
-	mov.w	#-2, r2
-	set_ccr_zero
-	muls.w	r2, r1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr16	-64	r1
-	test_h_gr32	0xa5a5fffe	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-muls_w_imm4_reg:
-	set_grs_a5a5
-
-	;; muls.w xx:4, rd
-	mov.w	#-32, r1
-	set_ccr_zero
-	muls.w	#2:4, r1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	-64	r1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-muls_l_reg_reg:	
-	set_grs_a5a5
-
-	;; muls.l ers, erd
-	mov.l	#320000, er1
-	mov.l	#-2, er2
-	set_ccr_zero
-	muls.l	er2, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	-640000	er1
-	test_h_gr32	-2	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-muls_l_imm4_reg:
-	set_grs_a5a5
-
-	;; muls.l xx:4, rd
-	mov.l	#-320000, er1
-	set_ccr_zero
-	muls.l	#2:4, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	-640000	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-muls_u_l_reg_reg:
-	set_grs_a5a5
-
-	;; muls/u.l ers, erd
-	mov.l	#0x10000000, er1
-	mov.l	#-16, er2
-	set_ccr_zero
-	muls/u.l	er2, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	-1	er1
-	test_h_gr32	-16	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-muls_u_l_imm4_reg:
-	set_grs_a5a5
-
-	;; muls/u.l xx:4, rd
-	mov.l	#0xffffffff, er1
-	set_ccr_zero
-	muls/u.l	#2:4, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	-1	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-mulu_w_reg_reg:	
-	set_grs_a5a5
-
-	;; mulu.w rs, rd
-	mov.w	#32, r1
-	mov.w	#-2, r2
-	set_ccr_zero
-	mulu.w	r2, r1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-	
-	test_gr_a5a5	0
-	test_h_gr16	-64	r1
-	test_h_gr32	0xa5a5fffe	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-mulu_w_imm4_reg:
-	set_grs_a5a5
-
-	;; mulu.w xx:4, rd
-	mov.w	#32, r1
-	set_ccr_zero
-	mulu.w	#-2:4, r1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	0x1c0	r1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-mulu_l_reg_reg:	
-	set_grs_a5a5
-
-	;; mulu.l ers, erd
-	mov.l	#320000, er1
-	mov.l	#-2, er2
-	set_ccr_zero
-	mulu.l	er2, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	-640000	er1
-	test_h_gr32	-2	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-mulu_l_imm4_reg:
-	set_grs_a5a5
-
-	;; mulu.l xx:4, rd
-	mov.l	#320000, er1
-	set_ccr_zero
-	mulu.l	#-2:4, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0x445c00	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-mulu_u_l_reg_reg:
-	set_grs_a5a5
-
-	;; mulu/u.l ers, erd
-	mov.l	#0x10000000, er1
-	mov.l	#16, er2
-	set_ccr_zero
-	mulu/u.l	er2, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	1	er1
-	test_h_gr32	16	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-mulu_u_l_imm4_reg:
-	set_grs_a5a5
-
-	;; mulu/u.l xx:4, rd
-	mov.l	#0xffffffff, er1
-	set_ccr_zero
-	mulu/u.l	#2:4, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0x1	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif
-
-.if (sim_cpu)			; not equal to zero ie. not h8
-mulxs_b_reg_reg:
-	set_grs_a5a5
-
-	;; mulxs.b rs, rd
-	mov.b	#32, r1l
-	mov.b	#-2, r2l
-	set_ccr_zero
-	mulxs.b	r2l, r1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr16	-64	r1
-	test_h_gr32	0xa5a5a5fe	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.if (sim_cpu == h8sx)	
-mulxs_b_imm4_reg:
-	set_grs_a5a5
-
-	;; mulxs.b xx:4, rd
-	mov.w	#-32, r1
-	set_ccr_zero
-	mulxs.b	#2:4, r1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	-64	r1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif				; h8sx
-
-mulxs_w_reg_reg:	
-	set_grs_a5a5
-
-	;; mulxs.w ers, erd
-	mov.w	#0x1000,  r1
-	mov.w	#-0x1000, r2
-	set_ccr_zero
-	mulxs.w	r2, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	0xff000000	er1
-	test_h_gr32	0xa5a5f000	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.if (sim_cpu == h8sx)
-mulxs_w_imm4_reg:
-	set_grs_a5a5
-
-	;; mulxs.w xx:4, rd
-	mov.w	#-1, r1
-	set_ccr_zero
-	mulxs.w	#2:4, er1
-
-	;; test ccr		; H=0 N=1 Z=0 V=0 C=0
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	-2	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif				; h8sx
-.endif				; not h8
-
-mulxu_b_reg_reg:
-	set_grs_a5a5
-
-	;; mulxu.b rs, rd
-	mov.b	#32, r1l
-	mov.b	#-2, r2l
-	set_ccr_zero
-	mulxu.b	r2l, r1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-	
-	test_gr_a5a5	0
-	test_h_gr16	0x1fc0	r1
-	test_h_gr16	0xa5fe  r2
-.if (sim_cpu)
-	test_h_gr32	0xa5a5a5fe	er2
-.endif
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.if (sim_cpu)			; not h8
-.if (sim_cpu == h8sx)
-mulxu_b_imm4_reg:
-	set_grs_a5a5
-
-	;; mulxu.b xx:4, rd
-	mov.b	#-32, r1l
-	set_ccr_zero
-	mulxu.b	#2:4, r1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr16	0x1c0	r1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif				; h8sx
-
-mulxu_w_reg_reg:	
-	set_grs_a5a5
-
-	;; mulxu.w ers, erd
-	mov.w	#0x1000,  r1
-	mov.w	#-0x1000, r2
-	set_ccr_zero
-	mulxu.w	r2, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-	
-	test_gr_a5a5	0
-	test_h_gr32	0x0f000000	er1
-	test_h_gr32	0xa5a5f000	er2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-
-.if (sim_cpu == h8sx)
-mulxu_w_imm4_reg:
-	set_grs_a5a5
-
-	;; mulxu.w xx:4, rd
-	mov.w	#-1, r1
-	set_ccr_zero
-	mulxu.w	#2:4, er1
-
-	;; test ccr		; H=0 N=0 Z=0 V=0 C=0
-	test_cc_clear
-
-	test_gr_a5a5	0
-	test_h_gr32	0x1fffe	er1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_gr_a5a5	7
-.endif				; h8sx
-.endif				; not h8
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/neg.s b/sim/testsuite/sim/h8300/neg.s
deleted file mode 100644
index de82476068b..00000000000
--- a/sim/testsuite/sim/h8300/neg.s
+++ /dev/null
@@ -1,1022 +0,0 @@
-# Hitachi H8 testcase 'neg.b, neg.w, neg.l'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# neg.b rd	;                     1 7 8  rd
-	# neg.b @erd	;         7 d rd ???? 1 7 8  ignore
-	# neg.b @erd+	; 0 1 7 4 6 c rd 1??? 1 7 8  ignore
-	# neg.b @erd-	; 0 1 7 6 6 c rd 1??? 1 7 8  ignore
-	# neg.b @+erd	; 0 1 7 5 6 c rd 1??? 1 7 8  ignore
-	# neg.b @-erd	; 0 1 7 7 6 c rd 1??? 1 7 8  ignore
-	# neg.b @(d:2,  erd)	; 0 1 7 01dd  6 8 rd 8 1 7 8  ignore
-	# neg.b @(d:16, erd)	; 0 1 7  4 6 e rd 1??? dd:16 1 7 8  ignore
-	# neg.b @(d:32, erd)	; 7 8 rd 4 6 a  2 1??? dd:32 1 7 8  ignore
-	# neg.b @aa:16		; 6 a 1 1??? aa:16 1 7 8  ignore
-	# neg.b @aa:32		; 6 a 3 1??? aa:32 1 7 8  ignore
-	# word operations
-	# long operations
-	#
-	# Coming soon:
-	# neg.b @aa:8		; 7 f aaaaaaaa 1 7 8  ignore
-	#
-
-	.data
-byte_dest:	.byte 0xa5
-	.align 2
-word_dest:	.word 0xa5a5
-	.align 4
-long_dest:	.long 0xa5a5a5a5
-	start
-
-	#
-	# Note:	apparently carry is set for neg of anything except zero.
-	#
-	
-	#
-	# 8-bit byte operations 
-	#
-
-neg_b_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b Rd
-	neg	r0l		; 8-bit register
-;;;	.word	0x1788
-	
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	cmp.b	#0x5b, r0l	; result of "neg 0xa5"
-	beq	.Lbrd
-	fail
-.Lbrd:	
-	test_h_gr16 0xa55b r0	; r0 changed by 'neg'
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a55b er0	; er0 changed by 'neg' 
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-neg_b_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @eRd
-	mov	#byte_dest, er0
-	neg.b	@er0		; register indirect operand
-;;;	.word	0x7d00
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 byte_dest er0	; er0 still contains address
-	cmp.b	#0x5b, @er0	; memory contents changed
-	beq	.Lbind
-	fail
-.Lbind:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @eRd+
-	mov	#byte_dest, er0	; register post-increment operand
-	neg.b	@er0+
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest+1 er0	; er0 contains address plus one
-	cmp.b	#0xa5, @-er0
-	beq	.Lbpostinc
-	fail
-.Lbpostinc:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @eRd-
-	mov	#byte_dest, er0	; register post-decrement operand
-	neg.b	@er0-
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-1 er0	; er0 contains address minus one
-	cmp.b	#0x5b, @+er0
-	beq	.Lbpostdec
-	fail
-.Lbpostdec:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @+eRd
-	mov	#byte_dest-1, er0
-	neg.b	@+er0			; reg pre-increment operand
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.b	#0xa5, @er0
-	beq	.Lbpreinc
-	fail
-.Lbpreinc:
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @-eRd
-	mov	#byte_dest+1, er0
-	neg.b	@-er0		; reg pre-decr operand
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.b	#0x5b, @er0
-	beq	.Lbpredec
-	fail
-.Lbpredec:
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_disp2dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @(dd:2, erd)
-	mov	#byte_dest-1, er0
-	neg.b	@(1:2, er0)	; reg plus 2-bit displacement
-;;; 	.word	0x0175
-;;; 	.word	0x6808
-;;; 	.word	0x1780
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.b	#0xa5, @+er0
-	beq	.Lbdisp2
-	fail
-.Lbdisp2:
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_disp16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @(dd:16, erd)
-	mov	#byte_dest+100, er0
-	neg.b	@(-100:16, er0)	; reg plus 16-bit displacement
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	-100
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.b	#0x5b, @byte_dest
-	beq	.Lbdisp16
-	fail
-.Lbdisp16:
-	test_h_gr32 byte_dest+100 er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_disp32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @(dd:32, erd)
-	mov	#byte_dest-0xfffff, er0
-	neg.b	@(0xfffff:32, er0)	; reg plus 32-bit displacement
-;;;	.word	0x7804
-;;;	.word	0x6a28
-;;;	.long	0xfffff
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.b	#0xa5, @byte_dest
-	beq	.Lbdisp32
-	fail
-.Lbdisp32:
-	test_h_gr32 byte_dest-0xfffff er0 ; er0 contains destination address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_abs16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @aa:16
-	neg.b	@byte_dest:16	; 16-bit absolute address
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.b	#0x5b, @byte_dest
-	beq	.Lbabs16
-	fail
-.Lbabs16:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_b_abs32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.b @aa:32
-	neg.b	@byte_dest:32	; 32-bit absolute address
-;;;	.word	0x6a38
-;;;	.long	byte_dest
-;;;	.word	0x1780
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.b	#0xa5, @byte_dest
-	beq	.Lbabs32
-	fail
-.Lbabs32:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-	#
-	# 16-bit word operations
-	#
-
-.if (sim_cpu)			; any except plain-vanilla h8/300
-neg_w_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w Rd
-	neg	r1		; 16-bit register operand
-;;;	.word	0x1791
-	
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	cmp.w	#0x5a5b, r1	; result of "neg 0xa5a5"
-	beq	.Lwrd
-	fail
-.Lwrd:	
-	test_h_gr32 0xa5a55a5b er1	; er1 changed by 'neg' 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-neg_w_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @eRd
-	mov	#word_dest, er1
-	neg.w	@er1		; register indirect operand
-;;;	.word	0x0154
-;;;	.word	0x6d18
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5b, @word_dest	; memory contents changed
-	beq	.Lwind
-	fail
-.Lwind:
-	test_h_gr32 word_dest er1	; er1 still contains address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @eRd+
-	mov	#word_dest, er1	; register post-increment operand
-	neg.w	@er1+
-;;;	.word	0x0154
-;;;	.word	0x6d18
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwpostinc
-	fail
-.Lwpostinc:
-	test_h_gr32 word_dest+2 er1	; er1 contains address plus two
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @eRd-
-	mov	#word_dest, er1
-	neg.w	@er1-
-;;;	.word	0x0156
-;;;	.word	0x6d18
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5b, @word_dest
-	beq	.Lwpostdec
-	fail
-.Lwpostdec:
-	test_h_gr32 word_dest-2 er1	; er1 contains address minus two
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @+eRd
-	mov	#word_dest-2, er1
-	neg.w	@+er1		; reg pre-increment operand
-;;;	.word	0x0155
-;;;	.word	0x6d18
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwpreinc
-	fail
-.Lwpreinc:
-	test_h_gr32 word_dest er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @-eRd
-	mov	#word_dest+2, er1
-	neg.w	@-er1		; reg pre-decr operand
-;;;	.word	0x0157
-;;;	.word	0x6d18
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5b, @word_dest
-	beq	.Lwpredec
-	fail
-.Lwpredec:
-	test_h_gr32 word_dest er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_disp2dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @(dd:2, erd)
-	mov	#word_dest-2, er1
-	neg.w	@(2:2, er1)	; reg plus 2-bit displacement
-;;; 	.word	0x0155
-;;; 	.word	0x6918
-;;; 	.word	0x1790
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwdisp2
-	fail
-.Lwdisp2:
-	test_h_gr32 word_dest-2 er1	; er1 contains address minus one
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_disp16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @(dd:16, erd)
-	mov	#word_dest+100, er1
-	neg.w	@(-100:16, er1)	; reg plus 16-bit displacement
-;;;	.word	0x0154
-;;;	.word	0x6f18
-;;;	.word	-100
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5b, @word_dest
-	beq	.Lwdisp16
-	fail
-.Lwdisp16:
-	test_h_gr32 word_dest+100 er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_disp32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @(dd:32, erd)
-	mov	#word_dest-0xfffff, er1
-	neg.w	@(0xfffff:32, er1)	; reg plus 32-bit displacement
-;;;	.word	0x7814
-;;;	.word	0x6b28
-;;;	.long	0xfffff
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwdisp32
-	fail
-.Lwdisp32:
-	test_h_gr32 word_dest-0xfffff er1 ; er1 contains destination address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_abs16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @aa:16
-	neg.w	@word_dest:16	; 16-bit absolute address
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5b, @word_dest
-	beq	.Lwabs16
-	fail
-.Lwabs16:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_w_abs32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.w @aa:32
-	neg.w	@word_dest:32	; 32-bit absolute address
-;;;	.word	0x6b38
-;;;	.long	word_dest
-;;;	.word	0x1790
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwabs32
-	fail
-.Lwabs32:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.endif				; h8sx
-.endif				; h8/300
-
-	#
-	# 32-bit word operations
-	#
-
-.if (sim_cpu)			; any except plain-vanilla h8/300
-neg_l_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l eRd
-	neg	er1		; 32-bit register operand
-;;;	.word	0x17b1
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5b, er1	; result of "neg 0xa5a5a5a5"
-	beq	.Llrd
-	fail
-.Llrd:	
-	test_h_gr32 0x5a5a5a5b er1	; er1 changed by 'neg' 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-neg_l_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @eRd
-	mov	#long_dest, er1
-	neg.l	@er1		; register indirect operand
-;;;	.word	0x0104
-;;;	.word	0x6d18
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5b, @long_dest	; memory contents changed
-	beq	.Llind
-	fail
-.Llind:
-	test_h_gr32 long_dest er1	; er1 still contains address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @eRd+
-	mov	#long_dest, er1	; register post-increment operand
-	neg.l	@er1+
-;;;	.word	0x0104
-;;;	.word	0x6d18
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Llpostinc
-	fail
-.Llpostinc:
-	test_h_gr32 long_dest+4 er1	; er1 contains address plus two
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @eRd-
-	mov	#long_dest, er1
-	neg.l	@er1-
-;;;	.word	0x0106
-;;;	.word	0x6d18
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5b, @long_dest
-	beq	.Llpostdec
-	fail
-.Llpostdec:
-	test_h_gr32 long_dest-4 er1	; er1 contains address minus two
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @+eRd
-	mov	#long_dest-4, er1
-	neg.l	@+er1		; reg pre-increment operand
-;;;	.word	0x0105
-;;;	.word	0x6d18
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Llpreinc
-	fail
-.Llpreinc:
-	test_h_gr32 long_dest er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @-eRd
-	mov	#long_dest+4, er1
-	neg.l	@-er1		; reg pre-decr operand
-;;;	.word	0x0107
-;;;	.word	0x6d18
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5b, @long_dest
-	beq	.Llpredec
-	fail
-.Llpredec:
-	test_h_gr32 long_dest er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_disp2dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @(dd:2, erd)
-	mov	#long_dest-4, er1
-	neg.l	@(4:2, er1)	; reg plus 2-bit displacement
-;;; 	.word	0x0105
-;;; 	.word	0x6918
-;;; 	.word	0x17b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Lldisp2
-	fail
-.Lldisp2:
-	test_h_gr32 long_dest-4 er1	; er1 contains address minus one
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_disp16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @(dd:16, erd)
-	mov	#long_dest+100, er1
-	neg.l	@(-100:16, er1)	; reg plus 16-bit displacement
-;;;	.word	0x0104
-;;;	.word	0x6f18
-;;;	.word	-100
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5b, @long_dest
-	beq	.Lldisp16
-	fail
-.Lldisp16:
-	test_h_gr32 long_dest+100 er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_disp32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @(dd:32, erd)
-	mov	#long_dest-0xfffff, er1
-	neg.l	@(0xfffff:32, er1)	; reg plus 32-bit displacement
-;;;	.word	0x7894
-;;;	.word	0x6b28
-;;;	.long	0xfffff
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Lldisp32
-	fail
-.Lldisp32:
-	test_h_gr32 long_dest-0xfffff er1 ; er1 contains destination address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_abs16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @aa:16
-	neg.l	@long_dest:16	; 16-bit absolute address
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5b, @long_dest
-	beq	.Llabs16
-	fail
-.Llabs16:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-neg_l_abs32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  neg.l @aa:32
-	neg.l	@long_dest:32	; 32-bit absolute address
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;;	.long	long_dest
-;;;	.word	0x17b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Llabs32
-	fail
-.Llabs32:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.endif				; h8sx
-.endif				; h8/300
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/nop.s b/sim/testsuite/sim/h8300/nop.s
deleted file mode 100644
index 1d63b67fca9..00000000000
--- a/sim/testsuite/sim/h8300/nop.s
+++ /dev/null
@@ -1,26 +0,0 @@
-# Hitachi H8 testcase 'nop'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-	
-nop:	set_grs_a5a5
-	set_ccr_zero
-
-	nop
-
-	test_cc_clear
-	test_grs_a5a5
-	
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/not.s b/sim/testsuite/sim/h8300/not.s
deleted file mode 100644
index 862c2b22ef1..00000000000
--- a/sim/testsuite/sim/h8300/not.s
+++ /dev/null
@@ -1,1009 +0,0 @@
-# Hitachi H8 testcase 'not.b, not.w, not.l'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# not.b rd	;                     1 7 0  rd
-	# not.b @erd	;         7 d rd ???? 1 7 0  ignore
-	# not.b @erd+	; 0 1 7 4 6 c rd 1??? 1 7 0  ignore
-	# not.b @erd-	; 0 1 7 6 6 c rd 1??? 1 7 0  ignore
-	# not.b @+erd	; 0 1 7 5 6 c rd 1??? 1 7 0  ignore
-	# not.b @-erd	; 0 1 7 7 6 c rd 1??? 1 7 0  ignore
-	# not.b @(d:2,  erd)	; 0 1 7 01dd  6 8 rd 8 1 7 0  ignore
-	# not.b @(d:16, erd)	; 0 1 7  4 6 e rd 1??? dd:16 1 7 0  ignore
-	# not.b @(d:32, erd)	; 7 8 rd 4 6 a  2 1??? dd:32 1 7 0  ignore
-	# not.b @aa:16		; 6 a 1 1??? aa:16 1 7 0  ignore
-	# not.b @aa:32		; 6 a 3 1??? aa:32 1 7 0  ignore
-	# word operations
-	# long operations
-	#
-	# Coming soon:
-	# not.b @aa:8		; 7 f aaaaaaaa 1 7 0  ignore
-	#
-
-.data
-byte_dest:	.byte 0xa5
-	.align 2
-word_dest:	.word 0xa5a5
-	.align 4
-long_dest:	.long 0xa5a5a5a5
-	start
-
-	#
-	# 8-bit byte operations 
-	#
-
-not_b_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  not.b Rd
-	not	r0l		; 8-bit register
-;;;	.word	0x1708
-	
-	cmp.b	#0x5a, r0l	; result of "not 0xa5"
-	beq	.Lbrd
-	fail
-.Lbrd:	
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa55a r0	; r0 changed by 'not'
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a55a er0	; er0 changed by 'not' 
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-not_b_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @eRd
-	mov	#byte_dest, er0
-	not.b	@er0		; register indirect operand
-;;;	.word	0x7d00
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 byte_dest er0	; er0 still contains address
-	cmp.b	#0x5a:8, @er0	; memory contents changed
-	beq	.Lbind
-	fail
-.Lbind:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @eRd+
-	mov	#byte_dest, er0	; register post-increment operand
-	not.b	@er0+
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest+1 er0	; er0 contains address plus one
-	cmp.b	#0xa5:8, @-er0
-	beq	.Lbpostinc
-	fail
-.Lbpostinc:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @eRd-
-	mov	#byte_dest, er0	; register post-decrement operand
-	not.b	@er0-
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-1 er0	; er0 contains address minus one
-	cmp.b	#0x5a:8, @+er0
-;;; 	.word	0x0175
-;;; 	.word	0x6c08
-;;; 	.word	0xa05a
-	beq	.Lbpostdec
-	fail
-.Lbpostdec:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @+eRd
-	mov	#byte_dest-1, er0
-	not.b	@+er0			; reg pre-increment operand
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.b	#0xa5:8, @er0
-	beq	.Lbpreinc
-	fail
-.Lbpreinc:
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @-eRd
-	mov	#byte_dest+1, er0
-	not.b	@-er0		; reg pre-decr operand
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.b	#0x5a:8, @er0
-	beq	.Lbpredec
-	fail
-.Lbpredec:
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_disp2dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @(dd:2, erd)
-	mov	#byte_dest-1, er0
-	not.b	@(1:2, er0)	; reg plus 2-bit displacement
-;;; 	.word	0x0175
-;;; 	.word	0x6808
-;;; 	.word	0x1700
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.b	#0xa5:8, @+er0
-	beq	.Lbdisp2
-	fail
-.Lbdisp2:
-	test_h_gr32 byte_dest er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_disp16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @(dd:16, erd)
-	mov	#byte_dest+100, er0
-	not.b	@(-100:16, er0)	; reg plus 16-bit displacement
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	-100
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.b	#0x5a:8, @byte_dest
-	beq	.Lbdisp16
-	fail
-.Lbdisp16:
-	test_h_gr32 byte_dest+100 er0	; er0 contains destination address 
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_disp32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @(dd:32, erd)
-	mov	#byte_dest-0xfffff, er0
-	not.b	@(0xfffff:32, er0)	; reg plus 32-bit displacement
-;;;	.word	0x7804
-;;;	.word	0x6a28
-;;;	.long	0xfffff
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.b	#0xa5:8, @byte_dest
-	beq	.Lbdisp32
-	fail
-.Lbdisp32:
-	test_h_gr32 byte_dest-0xfffff er0 ; er0 contains destination address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_abs16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @aa:16
-	not.b	@byte_dest:16	; 16-bit absolute address
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.b	#0x5a:8, @byte_dest
-	beq	.Lbabs16
-	fail
-.Lbabs16:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_b_abs32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.b @aa:32
-	not.b	@byte_dest:32	; 32-bit absolute address
-;;;	.word	0x6a38
-;;;	.long	byte_dest
-;;;	.word	0x1700
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.b	#0xa5:8, @byte_dest
-	beq	.Lbabs32
-	fail
-.Lbabs32:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-	#
-	# 16-bit word operations
-	#
-
-.if (sim_cpu)			; any except plain-vanilla h8/300
-not_w_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  not.w Rd
-	not	r1		; 16-bit register operand
-;;;	.word	0x1711
-	
-	cmp.w	#0x5a5a, r1	; result of "not 0xa5a5"
-	beq	.Lwrd
-	fail
-.Lwrd:	
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr32 0xa5a55a5a er1	; er1 changed by 'not' 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-not_w_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @eRd
-	mov	#word_dest, er1
-	not.w	@er1		; register indirect operand
-;;;	.word	0x0154
-;;;	.word	0x6d18
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5a, @word_dest	; memory contents changed
-	beq	.Lwind
-	fail
-.Lwind:
-	test_h_gr32 word_dest er1	; er1 still contains address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @eRd+
-	mov	#word_dest, er1	; register post-increment operand
-	not.w	@er1+
-;;;	.word	0x0154
-;;;	.word	0x6d18
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwpostinc
-	fail
-.Lwpostinc:
-	test_h_gr32 word_dest+2 er1	; er1 contains address plus two
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @eRd-
-	mov	#word_dest, er1
-	not.w	@er1-
-;;;	.word	0x0156
-;;;	.word	0x6d18
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5a, @word_dest
-	beq	.Lwpostdec
-	fail
-.Lwpostdec:
-	test_h_gr32 word_dest-2 er1	; er1 contains address minus two
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @+eRd
-	mov	#word_dest-2, er1
-	not.w	@+er1		; reg pre-increment operand
-;;;	.word	0x0155
-;;;	.word	0x6d18
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwpreinc
-	fail
-.Lwpreinc:
-	test_h_gr32 word_dest er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @-eRd
-	mov	#word_dest+2, er1
-	not.w	@-er1		; reg pre-decr operand
-;;;	.word	0x0157
-;;;	.word	0x6d18
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5a, @word_dest
-	beq	.Lwpredec
-	fail
-.Lwpredec:
-	test_h_gr32 word_dest er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_disp2dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @(dd:2, erd)
-	mov	#word_dest-2, er1
-	not.w	@(2:2, er1)	; reg plus 2-bit displacement
-;;; 	.word	0x0155
-;;; 	.word	0x6918
-;;; 	.word	0x1710
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwdisp2
-	fail
-.Lwdisp2:
-	test_h_gr32 word_dest-2 er1	; er1 contains address minus one
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_disp16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @(dd:16, erd)
-	mov	#word_dest+100, er1
-	not.w	@(-100:16, er1)	; reg plus 16-bit displacement
-;;;	.word	0x0154
-;;;	.word	0x6f18
-;;;	.word	-100
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5a, @word_dest
-	beq	.Lwdisp16
-	fail
-.Lwdisp16:
-	test_h_gr32 word_dest+100 er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_disp32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @(dd:32, erd)
-	mov	#word_dest-0xfffff, er1
-	not.w	@(0xfffff:32, er1)	; reg plus 32-bit displacement
-;;;	.word	0x7814
-;;;	.word	0x6b28
-;;;	.long	0xfffff
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwdisp32
-	fail
-.Lwdisp32:
-	test_h_gr32 word_dest-0xfffff er1 ; er1 contains destination address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_abs16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @aa:16
-	not.w	@word_dest:16	; 16-bit absolute address
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.w	#0x5a5a, @word_dest
-	beq	.Lwabs16
-	fail
-.Lwabs16:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_w_abs32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.w @aa:32
-	not.w	@word_dest:32	; 32-bit absolute address
-;;;	.word	0x6b38
-;;;	.long	word_dest
-;;;	.word	0x1710
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.w	#0xa5a5, @word_dest
-	beq	.Lwabs32
-	fail
-.Lwabs32:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.endif				; h8sx
-.endif				; h8/300
-
-	#
-	# 32-bit word operations
-	#
-
-.if (sim_cpu)			; any except plain-vanilla h8/300
-not_l_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  not.l eRd
-	not	er1		; 32-bit register operand
-;;;	.word	0x1731
-
-	cmp.l	#0x5a5a5a5a, er1	; result of "not 0xa5a5a5a5"
-	beq	.Llrd
-	fail
-.Llrd:	
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr32 0x5a5a5a5a er1	; er1 changed by 'not' 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-not_l_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @eRd
-	mov	#long_dest, er1
-	not.l	@er1		; register indirect operand
-;;;	.word	0x0104
-;;;	.word	0x6d18
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5a, @long_dest	; memory contents changed
-	beq	.Llind
-	fail
-.Llind:
-	test_h_gr32 long_dest er1	; er1 still contains address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @eRd+
-	mov	#long_dest, er1	; register post-increment operand
-	not.l	@er1+
-;;;	.word	0x0104
-;;;	.word	0x6d18
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Llpostinc
-	fail
-.Llpostinc:
-	test_h_gr32 long_dest+4 er1	; er1 contains address plus two
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @eRd-
-	mov	#long_dest, er1
-	not.l	@er1-
-;;;	.word	0x0106
-;;;	.word	0x6d18
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5a, @long_dest
-	beq	.Llpostdec
-	fail
-.Llpostdec:
-	test_h_gr32 long_dest-4 er1	; er1 contains address minus two
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_rdpreinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @+eRd
-	mov	#long_dest-4, er1
-	not.l	@+er1		; reg pre-increment operand
-;;;	.word	0x0105
-;;;	.word	0x6d18
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Llpreinc
-	fail
-.Llpreinc:
-	test_h_gr32 long_dest er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_rdpredec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @-eRd
-	mov	#long_dest+4, er1
-	not.l	@-er1		; reg pre-decr operand
-;;;	.word	0x0107
-;;;	.word	0x6d18
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5a, @long_dest
-	beq	.Llpredec
-	fail
-.Llpredec:
-	test_h_gr32 long_dest er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_disp2dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @(dd:2, erd)
-	mov	#long_dest-4, er1
-	not.l	@(4:2, er1)	; reg plus 2-bit displacement
-;;; 	.word	0x0105
-;;; 	.word	0x6918
-;;; 	.word	0x1730
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Lldisp2
-	fail
-.Lldisp2:
-	test_h_gr32 long_dest-4 er1	; er1 contains address minus one
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_disp16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @(dd:16, erd)
-	mov	#long_dest+100, er1
-	not.l	@(-100:16, er1)	; reg plus 16-bit displacement
-;;;	.word	0x0104
-;;;	.word	0x6f18
-;;;	.word	-100
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5a, @long_dest
-	beq	.Lldisp16
-	fail
-.Lldisp16:
-	test_h_gr32 long_dest+100 er1	; er1 contains destination address 
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_disp32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @(dd:32, erd)
-	mov	#long_dest-0xfffff, er1
-	not.l	@(0xfffff:32, er1)	; reg plus 32-bit displacement
-;;;	.word	0x7894
-;;;	.word	0x6b28
-;;;	.long	0xfffff
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Lldisp32
-	fail
-.Lldisp32:
-	test_h_gr32 long_dest-0xfffff er1 ; er1 contains destination address
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_abs16dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @aa:16
-	not.l	@long_dest:16	; 16-bit absolute address
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	cmp.l	#0x5a5a5a5a, @long_dest
-	beq	.Llabs16
-	fail
-.Llabs16:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-not_l_abs32dst:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  not.l @aa:32
-	not.l	@long_dest:32	; 32-bit absolute address
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;;	.long	long_dest
-;;;	.word	0x1730
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	cmp.l	#0xa5a5a5a5, @long_dest
-	beq	.Llabs32
-	fail
-.Llabs32:
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.endif				; h8sx
-.endif				; h8/300
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/orb.s b/sim/testsuite/sim/h8300/orb.s
deleted file mode 100644
index 72da8e63a37..00000000000
--- a/sim/testsuite/sim/h8300/orb.s
+++ /dev/null
@@ -1,532 +0,0 @@
-# Hitachi H8 testcase 'or.b'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# or.b #xx:8, rd	;                     c rd   xxxxxxxx
-	# or.b #xx:8, @erd	;         7 d rd ???? c ???? xxxxxxxx
-	# or.b #xx:8, @erd+	; 0 1 7 4 6 c rd 1??? c ???? xxxxxxxx
-	# or.b #xx:8, @erd-	; 0 1 7 6 6 c rd 1??? c ???? xxxxxxxx
-	# or.b #xx:8, @+erd	; 0 1 7 5 6 c rd 1??? c ???? xxxxxxxx
-	# or.b #xx:8, @-erd	; 0 1 7 7 6 c rd 1??? c ???? xxxxxxxx
-	# or.b rs, rd		;                     1 4 rs rd
-	# or.b reg8, @erd	;         7 d rd ???? 1 4 rs ????
-	# or.b reg8, @erd+	;         0 1 7     9 8 rd 4 rs
-	# or.b reg8, @erd-	;         0 1 7     9 a rd 4 rs
-	# or.b reg8, @+erd	;         0 1 7     9 9 rd 4 rs
-	# or.b reg8, @-erd	;         0 1 7     9 b rd 4 rs
-	#
-	# orc  #xx:8, ccr
-	# orc  #xx:8, exr
-	
-
-	# Coming soon:
-	# ...
-
-.data
-pre_byte:	.byte 0
-byte_dest:	.byte 0xa5
-post_byte:	.byte 0
-
-	start
-	
-or_b_imm8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  or.b #xx:8,Rd
-	or.b	#0xaa, r0l	; Immediate 8-bit src, reg8 dest
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5af r0	; or result:	a5 | aa
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5af er0	; or result:	 a5 | aa
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-or_b_imm8_rdind:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b #xx:8,@eRd
-	mov	#byte_dest, er0
-	or.b	#0xaa:8, @er0	; Immediate 8-bit src, reg indirect dst
-;;; 	.word	0x7d00
-;;; 	.word	0xc0aa
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 byte_dest, er0	; er0 still contains address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xaf, r0l
-	beq	.L1
-	fail
-.L1:
-
-or_b_imm8_rdpostinc:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b #xx:8,@eRd+
-	mov	#byte_dest, er0
-	or.b	#0x55:8, @er0+	; Immediate 8-bit src, reg post-incr dest
-;;; 	.word	0x0174
-;;; 	.word	0x6c08
-;;; 	.word	0xc055
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 post_byte, er0	; er0 contains address plus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xf5, r0l
-	beq	.L2
-	fail
-.L2:
-
-or_b_imm8_rdpostdec:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b #xx:8,@eRd-
-	mov	#byte_dest, er0
-	or.b	#0xaa:8, @er0-	; Immediate 8-bit src, reg post-decr dest
-;;;  	.word	0x0176
-;;;  	.word	0x6c08
-;;;  	.word	0xc0aa
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 pre_byte, er0	; er0 contains address minus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xaf, r0l
-	beq	.L3
-	fail
-.L3:
-
-or_b_imm8_rdpreinc:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b #xx:8,@+eRd
-	mov	#pre_byte, er0
-	or.b	#0x55:8, @+er0	; Immediate 8-bit src, reg pre-incr dest
-;;;  	.word	0x0175
-;;;  	.word	0x6c08
-;;;  	.word	0xc055
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 byte_dest, er0	; er0 contains destination address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xf5, r0l
-	beq	.L4
-	fail
-.L4:
-
-or_b_imm8_rdpredec:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b #xx:8,@-eRd
-	mov	#post_byte, er0
-	or.b	#0xaa:8, @-er0	; Immediate 8-bit src, reg pre-decr dest
-;;; 	.word	0x0177
-;;; 	.word	0x6c08
-;;; 	.word	0xc0aa
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 byte_dest, er0	; er0 contains destination address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xaf, r0l
-	beq	.L5
-	fail
-.L5:
-
-
-.endif
-
-or_b_reg8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  or.b Rs,Rd
-	mov.b	#0xaa, r0h
-	or.b	r0h, r0l	; Reg8 src, reg8 dest
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xaaaf r0	; or result:	a5 | aa
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5aaaf er0	; or result:	a5 | aa
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-or_b_reg8_rdind:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b rs8,@eRd	; or reg8 to register indirect
-	mov	#byte_dest, er0
-	mov	#0xaa, r1l
-	or.b	r1l, @er0	; reg8 src, reg indirect dest
-;;; 	.word	0x7d00
-;;; 	.word	0x1490
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest er0	; er0 still contains address
-	test_h_gr32 0xa5a5a5aa er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xaf, r0l
-	beq	.L6
-	fail
-.L6:
-
-or_b_reg8_rdpostinc:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b rs8,@eRd+	; or reg8 to register indirect post-increment
-	mov	#byte_dest, er0
-	mov	#0x55, r1l
-	or.b	r1l, @er0+	; reg8 src, reg post-incr dest
-;;; 	.word	0x0179
-;;; 	.word	0x8049
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 post_byte er0	; er0 contains address plus one
-	test_h_gr32 0xa5a5a555 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xf5, r0l
-	beq	.L7
-	fail
-.L7:
-
-or_b_reg8_rdpostdec:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b rs8,@eRd-	; or reg8 to register indirect post-decrement
-	mov	#byte_dest, er0
-	mov	#0xaa, r1l
-	or.b	r1l, @er0-	; reg8 src, reg post-decr dest
-;;; 	.word	0x0179
-;;; 	.word	0xa049
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5a5aa er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xaf, r0l
-	beq	.L8
-	fail
-.L8:
-
-or_b_reg8_rdpreinc:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b rs8,@+eRd	; or reg8 to register indirect pre-increment
-	mov	#pre_byte, er0
-	mov	#0x55, r1l
-	or.b	r1l, @+er0	; reg8 src, reg pre-incr dest
-;;; 	.word	0x0179
-;;; 	.word	0x9049
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest er0	; er0 contains destination address
-	test_h_gr32 0xa5a5a555 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xf5, r0l
-	beq	.L9
-	fail
-.L9:
-
-or_b_reg8_rdpredec:
-	mov	#byte_dest, er0
-	mov.b	#0xa5, r1l
-	mov.b	r1l, @er0
-
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  or.b rs8,@-eRd	; or reg8 to register indirect pre-decrement
-	mov	#post_byte, er0
-	mov	#0xaa, r1l
-	or.b	r1l, @-er0	; reg8 src, reg pre-decr dest
-;;; 	.word	0x0179
-;;; 	.word	0xb049
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest er0	; er0 contains destination address
-	test_h_gr32 0xa5a5a5aa er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xaf, r0l
-	beq	.L10
-	fail
-.L10:
-
-.endif
-
-orc_imm8_ccr:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  orc #xx:8,ccr
-
-	test_neg_clear
-	orc	#0x8, ccr	; Immediate 8-bit operand (neg flag)
-	test_neg_set
-
-	test_zero_clear
-	orc	#0x4, ccr	; Immediate 8-bit operand (zero flag)
-	test_zero_set
-
-	test_ovf_clear
-	orc	#0x2, ccr	; Immediate 8-bit operand (overflow flag)
-	test_ovf_set
-
-	test_carry_clear
-	orc	#0x1, ccr	; Immediate 8-bit operand (carry flag)
-	test_carry_set
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8300s || sim_cpu == h8sx)	; Earlier versions, no exr
-orc_imm8_exr:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	ldc	#0, exr
-	stc	exr, r0l
-	test_h_gr8 0, r0l
-	
-	;;  orc #xx:8,exr
-
-	orc	#0x1, exr
-	stc	exr,r0l
-	test_h_gr8 1, r0l
-
-	orc	#0x2, exr
-	stc	exr,r0l
-	test_h_gr8 3, r0l
-
-	orc	#0x4, exr
-	stc	exr,r0l
-	test_h_gr8 7, r0l
-
-	orc	#0x80, exr
-	stc	exr,r0l
-	test_h_gr8 0x87, r0l
-
-	test_h_gr32  0xa5a5a587 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif				; not h8300 or h8300h
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/orl.s b/sim/testsuite/sim/h8300/orl.s
deleted file mode 100644
index 03c3f2228b5..00000000000
--- a/sim/testsuite/sim/h8300/orl.s
+++ /dev/null
@@ -1,77 +0,0 @@
-# Hitachi H8 testcase 'or.l'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-	
-.if (sim_cpu == h8sx)		; 16-bit immediate is only available on sx.
-or_l_imm16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  or.l #xx:16,Rd
-	or.l	#0xaaaa, er0	; Immediate 16-bit operand 
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa5a5afaf er0	; or result:	 a5a5a5a5 | aaaa
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-or_l_imm32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  or.l #xx:32,Rd
-	or.l	#0xaaaaaaaa, er0	; Immediate 32-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xafafafaf er0	; or result:	 a5a5a5a5 | aaaaaaaa
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-or_l_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  or.l Rs,Rd
-	mov.l	#0xaaaaaaaa, er1
-	or.l	er1, er0	; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xafafafaf er0	; or result:	a5a5a5a5 | aaaaaaaa
-	test_h_gr32 0xaaaaaaaa er1	; Make sure er1 is unchanged
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/orw.s b/sim/testsuite/sim/h8300/orw.s
deleted file mode 100644
index 32eef4559e8..00000000000
--- a/sim/testsuite/sim/h8300/orw.s
+++ /dev/null
@@ -1,61 +0,0 @@
-# Hitachi H8 testcase 'or.w'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-	
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-or_w_imm16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  or.w #xx:16,Rd
-	or.w	#0xaaaa, r0	; Immediate 16-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xafaf r0	; or result:	a5a5 | aaaa
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5afaf er0	; or result:	 a5a5 | aaaa
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-or_w_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  or.w Rs,Rd
-	mov.w	#0xaaaa, r1
-	or.w	r1, r0		; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xafaf r0	; or result:	a5a5 | aaaa
-	test_h_gr16 0xaaaa r1	; Make sure r1 is unchanged
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5afaf er0	; or result:	a5a5 | aaaa
-	test_h_gr32 0xa5a5aaaa er1	; Make sure er1 is unchanged
-.endif
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/rotl.s b/sim/testsuite/sim/h8300/rotl.s
deleted file mode 100644
index 088345d3df7..00000000000
--- a/sim/testsuite/sim/h8300/rotl.s
+++ /dev/null
@@ -1,1212 +0,0 @@
-# Hitachi H8 testcase 'rotl'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-byte_dest:	.byte	0xa5
-	.align 2
-word_dest:	.word	0xa5a5
-	.align 4
-long_dest:	.long	0xa5a5a5a5
-
-	.text
-
-rotl_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotl.b	r0l		; shift left arithmetic by one
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_clear
-	test_h_gr16 0xa54b r0	; 1010 0101 -> 0100 1011
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a54b er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotl_b_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotl.b	@er0	; shift right arithmetic by one, indirect
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0100 1011
-	cmp.b	#0x4b, @byte_dest
-	beq	.Lbind1
-	fail
-.Lbind1:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexb16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r0l
-	rotl.b	@(byte_dest-5:16, r0.b)	; indexed byte/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a5a505 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0100 1011
-	cmp.b	#0x4b, @byte_dest
-	beq	.Lbindexb161
-	fail
-.Lbindexb161:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexw16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r0
-	rotl.b	@(byte_dest-256:16, r0.w)	; indexed byte/word
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a50100 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0100 1011
-	cmp.b	#0x4b, @byte_dest
-	beq	.Lbindexw161
-	fail
-.Lbindexw161:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexl16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er0
-	rotl.b	@(byte_dest+1:16, er0.l)	; indexed byte/long
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xffffffff er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0100 1011
-	cmp.b	#0x4b, @byte_dest
-	beq	.Lbindexl161
-	fail
-.Lbindexl161:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexb32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r1l
-	rotl.b	@(byte_dest-5:32, r1.b)	; indexed byte/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a5a505 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0100 1011
-	cmp.b	#0x4b, @byte_dest
-	beq	.Lbindexb321
-	fail
-.Lbindexb321:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexw32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r1
-	rotl.b	@(byte_dest-256:32, r1.w)	; indexed byte/word
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a50100 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0100 1011
-	cmp.b	#0x4b, @byte_dest
-	beq	.Lbindexw321
-	fail
-.Lbindexw321:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexl32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er1
-	rotl.b	@(byte_dest+1:32, er1.l)	; indexed byte/long
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xffffffff er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0100 1011
-	cmp.b	#0x4b, @byte_dest
-	beq	.Lbindexl321
-	fail
-.Lbindexl321:
-	mov.b	#0xa5, @byte_dest
-
-.endif
-
-rotl_b_reg8_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotl.b	#2, r0l		; shift left arithmetic by two
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_set
-
-	test_h_gr16 0xa596 r0	; 1010 0101 -> 1001 0110
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a596 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotl_b_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotl.b	#2, @er0	; shift right arithmetic by one, indirect
-
-	test_carry_clear	; H=0 N=1 Z=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1001 0110
-	cmp.b	#0x96, @byte_dest
-	beq	.Lbind2
-	fail
-.Lbind2:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexb16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r0l
-	rotl.b	#2, @(byte_dest-5:16, r0.b)	; indexed byte/byte
-
-	test_carry_clear	; H=0 N=1 Z=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a5a505 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1001 0110
-	cmp.b	#0x96, @byte_dest
-	beq	.Lbindexb162
-	fail
-.Lbindexb162:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexw16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r0
-	rotl.b	#2, @(byte_dest-256:16, r0.w)	; indexed byte/word
-
-	test_carry_clear	; H=0 N=1 Z=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a50100 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1001 0110
-	cmp.b	#0x96, @byte_dest
-	beq	.Lbindexw162
-	fail
-.Lbindexw162:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexl16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er0
-	rotl.b	#2, @(byte_dest+1:16, er0.l)	; indexed byte/long
-
-	test_carry_clear	; H=0 N=1 Z=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xffffffff er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1001 0110
-	cmp.b	#0x96, @byte_dest
-	beq	.Lbindexl162
-	fail
-.Lbindexl162:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexb32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r1l
-	rotl.b	#2, @(byte_dest-5:32, r1.b)	; indexed byte/byte
-
-	test_carry_clear	; H=0 N=1 Z=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a5a505 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1001 0110
-	cmp.b	#0x96, @byte_dest
-	beq	.Lbindexb322
-	fail
-.Lbindexb322:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexw32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r1
-	rotl.b	#2, @(byte_dest-256:32, r1.w)	; indexed byte/word
-
-	test_carry_clear	; H=0 N=1 Z=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a50100 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1001 0110
-	cmp.b	#0x96, @byte_dest
-	beq	.Lbindexw322
-	fail
-.Lbindexw322:
-	mov.b	#0xa5, @byte_dest
-
-rotl_b_indexl32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er1
-	rotl.b	#2, @(byte_dest+1:32, er1.l)	; indexed byte/long
-
-	test_carry_clear	; H=0 N=1 Z=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xffffffff er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1001 0110
-	cmp.b	#0x96, @byte_dest
-	beq	.Lbindexl322
-	fail
-.Lbindexl322:
-	mov.b	#0xa5, @byte_dest
-
-.endif
-
-.if (sim_cpu)			; Not available in h8300 mode
-rotl_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotl.w	r0		; shift left arithmetic by one
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_clear
-	test_h_gr16 0x4b4b r0	; 1010 0101 1010 0101 -> 0100 1011 0100 1011
-	test_h_gr32 0xa5a54b4b er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotl_w_indexb16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r0l
-	rotl.w	@(word_dest-10:16, r0.b)	; indexed word/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a5a505 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0100 1011 0100 1011
-	cmp.w	#0x4b4b, @word_dest
-	beq	.Lwindexb161
-	fail
-.Lwindexb161:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexw16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r0
-	rotl.w	@(word_dest-512:16, r0.w)	; indexed word/word
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a50100 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0100 1011 0100 1011
-	cmp.w	#0x4b4b, @word_dest
-	beq	.Lwindexw161
-	fail
-.Lwindexw161:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexl16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er0
-	rotl.w	@(word_dest+2:16, er0.l)	; indexed word/long
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xffffffff er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0100 1011 0100 1011
-	cmp.w	#0x4b4b, @word_dest
-	beq	.Lwindexl161
-	fail
-.Lwindexl161:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexb32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r1l
-	rotl.w	@(word_dest-10:32, r1.b)	; indexed word/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a5a505 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0100 1011 0100 1011
-	cmp.w	#0x4b4b, @word_dest
-	beq	.Lwindexb321
-	fail
-.Lwindexb321:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexw32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r1
-	rotl.w	@(word_dest-512:32, r1.w)	; indexed word/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a50100 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0100 1011 0100 1011
-	cmp.w	#0x4b4b, @word_dest
-	beq	.Lwindexw321
-	fail
-.Lwindexw321:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexl32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er1
-	rotl.w	@(word_dest+2:32, er1.l)	; indexed word/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xffffffff er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0100 1011 0100 1011
-	cmp.w	#0x4b4b, @word_dest
-	beq	.Lwindexl321
-	fail
-.Lwindexl321:
-	mov.w	#0xa5a5, @word_dest
-.endif
-
-rotl_w_reg16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotl.w	#2, r0		; shift left arithmetic by two
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_set
-	test_h_gr16 0x9696 r0	; 1010 0101 1010 0101 -> 1001 0110 1001 0110
-	test_h_gr32 0xa5a59696 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotl_w_indexb16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r0l
-	rotl.w	#2, @(word_dest-10:16, r0.b)	; indexed word/byte
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a5a505 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1001 0110 1001 0110
-	cmp.w	#0x9696, @word_dest
-	beq	.Lwindexb162
-	fail
-.Lwindexb162:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexw16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r0
-	rotl.w	#2, @(word_dest-512:16, r0.w)	; indexed word/word
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a50100 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1001 0110 1001 0110
-	cmp.w	#0x9696, @word_dest
-	beq	.Lwindexw162
-	fail
-.Lwindexw162:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexl16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er0
-	rotl.w	#2, @(word_dest+2:16, er0.l)	; indexed word/long
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xffffffff er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1001 0110 1001 0110
-	cmp.w	#0x9696, @word_dest
-	beq	.Lwindexl162
-	fail
-.Lwindexl162:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexb32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r1l
-	rotl.w	#2, @(word_dest-10:32, r1.b)	; indexed word/byte
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a5a505 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1001 0110 1001 0110
-	cmp.w	#0x9696, @word_dest
-	beq	.Lwindexb322
-	fail
-.Lwindexb322:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexw32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r1
-	rotl.w	#2, @(word_dest-512:32, r1.w)	; indexed word/byte
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a50100 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1001 0110 1001 0110
-	cmp.w	#0x9696, @word_dest
-	beq	.Lwindexw322
-	fail
-.Lwindexw322:
-	mov.w	#0xa5a5, @word_dest
-
-rotl_w_indexl32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er1
-	rotl.w	#2, @(word_dest+2:32, er1.l)	; indexed word/byte
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xffffffff er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1001 0110 1001 0110
-	cmp.w	#0x9696, @word_dest
-	beq	.Lwindexl322
-	fail
-.Lwindexl322:
-	mov.w	#0xa5a5, @word_dest
-.endif
-
-rotl_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotl.l	er0		; shift left arithmetic by one
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1011
-	test_h_gr32 0x4b4b4b4b er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotl_l_indexb16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r0l
-	rotl.l	@(long_dest-20:16, er0.b)	; indexed long/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a5a505 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1011
-	cmp.l	#0x4b4b4b4b, @long_dest
-	beq	.Llindexb161
-	fail
-.Llindexb161:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexw16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r0
-	rotl.l	@(long_dest-1024:16, er0.w)	; indexed long/word
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a50100 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1011
-	cmp.l	#0x4b4b4b4b, @long_dest
-	beq	.Llindexw161
-	fail
-.Llindexw161:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexl16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er0
-	rotl.l	@(long_dest+4:16, er0.l)	; indexed long/long
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xffffffff er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1011
-	cmp.l	#0x4b4b4b4b, @long_dest
-	beq	.Llindexl161
-	fail
-.Llindexl161:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexb32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r1l
-	rotl.l	@(long_dest-20:32, er1.b)	; indexed long/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a5a505 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1011
-	cmp.l	#0x4b4b4b4b, @long_dest
-	beq	.Llindexb321
-	fail
-.Llindexb321:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexw32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r1
-	rotl.l	@(long_dest-1024:32, er1.w)	; indexed long/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xa5a50100 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1011
-	cmp.l	#0x4b4b4b4b, @long_dest
-	beq	.Llindexw321
-	fail
-.Llindexw321:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexl32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er1
-	rotl.l	@(long_dest+4:32, er1.l)	; indexed long/byte
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  0xffffffff er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1011
-	cmp.l	#0x4b4b4b4b, @long_dest
-	beq	.Llindexl321
-	fail
-.Llindexl321:
-	mov.l	#0xa5a5a5a5, @long_dest
-.endif
-
-rotl_l_reg32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotl.l	#2, er0		; shift left arithmetic by two
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_set
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 1001 0110 1001 0110 1001 0110 1001 0110
-	test_h_gr32 0x96969696 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotl_l_indexb16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r0l
-	rotl.l	#2, @(long_dest-20:16, er0.b)	; indexed long/byte
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a5a505 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 1001 0110 1001 0110 1001 0110 1001 0110
-	cmp.l	#0x96969696, @long_dest
-	beq	.Llindexb162
-	fail
-.Llindexb162:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexw16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r0
-	rotl.l	#2, @(long_dest-1024:16, er0.w)	; indexed long/word
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a50100 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 1001 0110 1001 0110 1001 0110 1001 0110
-	cmp.l	#0x96969696, @long_dest
-	beq	.Llindexw162
-	fail
-.Llindexw162:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexl16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er0
-	rotl.l	#2, @(long_dest+4:16, er0.l)	; indexed long/long
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xffffffff er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 1001 0110 1001 0110 1001 0110 1001 0110
-	cmp.l	#0x96969696, @long_dest
-	beq	.Llindexl162
-	fail
-.Llindexl162:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexb32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.b	#5, r1l
-	rotl.l	#2, @(long_dest-20:32, er1.b)	; indexed long/byte
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a5a505 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 1001 0110 1001 0110 1001 0110 1001 0110
-	cmp.l	#0x96969696, @long_dest
-	beq	.Llindexb322
-	fail
-.Llindexb322:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexw32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.w	#256, r1
-	rotl.l	#2, @(long_dest-1024:32, er1.w)	; indexed long/byte
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xa5a50100 er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 1001 0110 1001 0110 1001 0110 1001 0110
-	cmp.l	#0x96969696, @long_dest
-	beq	.Llindexw322
-	fail
-.Llindexw322:
-	mov.l	#0xa5a5a5a5, @long_dest
-
-rotl_l_indexl32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov.l	#0xffffffff, er1
-	rotl.l	#2, @(long_dest+4:32, er1.l)	; indexed long/byte
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  0xffffffff er1
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 1001 0110 1001 0110 1001 0110 1001 0110
-	cmp.l	#0x96969696, @long_dest
-	beq	.Llindexl322
-	fail
-.Llindexl322:
-	mov.l	#0xa5a5a5a5, @long_dest
-.endif
-.endif
-
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/rotr.s b/sim/testsuite/sim/h8300/rotr.s
deleted file mode 100644
index 2a964c1c29b..00000000000
--- a/sim/testsuite/sim/h8300/rotr.s
+++ /dev/null
@@ -1,1802 +0,0 @@
-# Hitachi H8 testcase 'rotr'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-byte_dest:	.byte	0xa5
-	.align 2
-word_dest:	.word	0xa5a5
-	.align 4
-long_dest:	.long	0xa5a5a5a5
-
-	.text
-
-rotr_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.b	r0l		; shift right arithmetic by one
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr16 0xa5d2 r0	; 1010 0101 -> 1101 0010
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a5d2 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotr_b_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotr.b	@er0	; shift right arithmetic by one, indirect
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbind1
-	fail
-.Lbind1:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotr.b	@er0+	; shift right arithmetic by one, postinc
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbpostinc1
-	fail
-.Lbpostinc1:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotr.b	@er0-	; shift right arithmetic by one, postdec
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbpostdec1
-	fail
-.Lbpostdec1:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	rotr.b	@+er0	; shift right arithmetic by one, preinc
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbpreinc1
-	fail
-.Lbpreinc1:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	rotr.b	@-er0	; shift right arithmetic by one, predec
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbpredec1
-	fail
-.Lbpredec1:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	rotr.b	@(2:2, er0)	; shift right arithmetic by one, disp2
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbdisp21
-	fail
-.Lbdisp21:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	rotr.b	@(44:16, er0)	; shift right arithmetic by one, disp16
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbdisp161
-	fail
-.Lbdisp161:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	rotr.b	@(666:32, er0)	; shift right arithmetic by one, disp32
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbdisp321
-	fail
-.Lbdisp321:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.b	@byte_dest:16	; shift right arithmetic by one, abs16
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbabs161
-	fail
-.Lbabs161:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.b	@byte_dest:32	; shift right arithmetic by one, abs32
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbabs321
-	fail
-.Lbabs321:
-	mov.b	#0xa5, @byte_dest
-.endif
-
-rotr_b_reg8_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.b	#2, r0l		; shift right arithmetic by two
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	test_h_gr16 0xa569 r0	; 1010 0101 -> 0110 1001
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a569 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotr_b_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotr.b	#2, @er0	; shift right arithmetic by two, indirect
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbind2
-	fail
-.Lbind2:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotr.b	#2, @er0+	; shift right arithmetic by two, postinc
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbpostinc2
-	fail
-.Lbpostinc2:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotr.b	#2, @er0-	; shift right arithmetic by two, postdec
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbpostdec2
-	fail
-.Lbpostdec2:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	rotr.b	#2, @+er0	; shift right arithmetic by two, preinc
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbpreinc2
-	fail
-.Lbpreinc2:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	rotr.b	#2, @-er0	; shift right arithmetic by two, predec
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbpredec2
-	fail
-.Lbpredec2:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	rotr.b	#2, @(2:2, er0)	; shift right arithmetic by two, disp2
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbdisp22
-	fail
-.Lbdisp22:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	rotr.b	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbdisp162
-	fail
-.Lbdisp162:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	rotr.b	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbdisp322
-	fail
-.Lbdisp322:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.b	#2, @byte_dest:16	; shift right arithmetic by two, abs16
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbabs162
-	fail
-.Lbabs162:
-	mov.b	#0xa5, @byte_dest
-
-rotr_b_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.b	#2, @byte_dest:32	; shift right arithmetic by two, abs32
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0110 1001
-	cmp.b	#0x69, @byte_dest
-	beq	.Lbabs322
-	fail
-.Lbabs322:
-	mov.b	#0xa5, @byte_dest
-.endif
-
-.if (sim_cpu)			; Not available in h8300 mode
-rotr_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.w	r0		; shift right arithmetic by one
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	test_h_gr16 0xd2d2 r0	; 1010 0101 1010 0101 -> 1101 0010 1101 0010
-	test_h_gr32 0xa5a5d2d2 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotr_w_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotr.w	@er0	; shift right arithmetic by one, indirect
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwind1
-	fail
-.Lwind1:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotr.w	@er0+	; shift right arithmetic by one, postinc
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwpostinc1
-	fail
-.Lwpostinc1:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotr.w	@er0-	; shift right arithmetic by one, postdec
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwpostdec1
-	fail
-.Lwpostdec1:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	rotr.w	@+er0	; shift right arithmetic by one, preinc
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwpreinc1
-	fail
-.Lwpreinc1:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	rotr.w	@-er0	; shift right arithmetic by one, predec
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwpredec1
-	fail
-.Lwpredec1:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	rotr.w	@(4:2, er0)	; shift right arithmetic by one, disp2
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwdisp21
-	fail
-.Lwdisp21:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	rotr.w	@(44:16, er0)	; shift right arithmetic by one, disp16
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwdisp161
-	fail
-.Lwdisp161:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	rotr.w	@(666:32, er0)	; shift right arithmetic by one, disp32
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwdisp321
-	fail
-.Lwdisp321:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.w	@word_dest:16	; shift right arithmetic by one, abs16
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwabs161
-	fail
-.Lwabs161:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.w	@word_dest:32	; shift right arithmetic by one, abs32
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwabs321
-	fail
-.Lwabs321:
-	mov.w	#0xa5a5, @word_dest
-.endif
-	
-rotr_w_reg16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.w	#2, r0		; shift right arithmetic by two
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0x6969 r0	; 1010 0101 1010 0101 -> 0110 1001 0110 1001
-	test_h_gr32 0xa5a56969 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotr_w_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotr.w	#2, @er0	; shift right arithmetic by two, indirect
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwind2
-	fail
-.Lwind2:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotr.w	#2, @er0+	; shift right arithmetic by two, postinc
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwpostinc2
-	fail
-.Lwpostinc2:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotr.w	#2, @er0-	; shift right arithmetic by two, postdec
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwpostdec2
-	fail
-.Lwpostdec2:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	rotr.w	#2, @+er0	; shift right arithmetic by two, preinc
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwpreinc2
-	fail
-.Lwpreinc2:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	rotr.w	#2, @-er0	; shift right arithmetic by two, predec
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwpredec2
-	fail
-.Lwpredec2:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	rotr.w	#2, @(4:2, er0)	; shift right arithmetic by two, disp2
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwdisp22
-	fail
-.Lwdisp22:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	rotr.w	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwdisp162
-	fail
-.Lwdisp162:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	rotr.w	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwdisp322
-	fail
-.Lwdisp322:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.w	#2, @word_dest:16	; shift right arithmetic by two, abs16
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwabs162
-	fail
-.Lwabs162:
-	mov.w	#0xa5a5, @word_dest
-
-rotr_w_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.w	#2, @word_dest:32	; shift right arithmetic by two, abs32
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0110 1001 0110 1001  
-	cmp.w	#0x6969, @word_dest
-	beq	.Lwabs322
-	fail
-.Lwabs322:
-	mov.w	#0xa5a5, @word_dest
-.endif
-
-rotr_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.l	er0		; shift right arithmetic by one, register
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	test_h_gr32  0xd2d2d2d2 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotr_l_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotr.l	@er0	; shift right arithmetic by one, indirect
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llind1
-	fail
-.Llind1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotr.l	@er0+	; shift right arithmetic by one, postinc
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llpostinc1
-	fail
-.Llpostinc1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotr.l	@er0-	; shift right arithmetic by one, postdec
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llpostdec1
-	fail
-.Llpostdec1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	rotr.l	@+er0	; shift right arithmetic by one, preinc
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llpreinc1
-	fail
-.Llpreinc1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	rotr.l	@-er0	; shift right arithmetic by one, predec
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llpredec1
-	fail
-.Llpredec1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	rotr.l	@(8:2, er0)	; shift right arithmetic by one, disp2
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Lldisp21
-	fail
-.Lldisp21:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	rotr.l	@(44:16, er0)	; shift right arithmetic by one, disp16
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Lldisp161
-	fail
-.Lldisp161:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	rotr.l	@(666:32, er0)	; shift right arithmetic by one, disp32
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Lldisp321
-	fail
-.Lldisp321:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.l	@long_dest:16	; shift right arithmetic by one, abs16
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llabs161
-	fail
-.Llabs161:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.l	@long_dest:32	; shift right arithmetic by one, abs32
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llabs321
-	fail
-.Llabs321:
-	mov	#0xa5a5a5a5, @long_dest
-.endif
-
-rotr_l_reg32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.l	#2, er0		; shift right arithmetic by two, register
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	test_h_gr32  0x69696969 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-
-rotr_l_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotr.l	#2, @er0	; shift right arithmetic by two, indirect
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Llind2
-	fail
-.Llind2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotr.l	#2, @er0+	; shift right arithmetic by two, postinc
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Llpostinc2
-	fail
-.Llpostinc2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotr.l	#2, @er0-	; shift right arithmetic by two, postdec
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Llpostdec2
-	fail
-.Llpostdec2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	rotr.l	#2, @+er0	; shift right arithmetic by two, preinc
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Llpreinc2
-	fail
-.Llpreinc2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	rotr.l	#2, @-er0	; shift right arithmetic by two, predec
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Llpredec2
-	fail
-.Llpredec2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	rotr.l	#2, @(8:2, er0)	; shift right arithmetic by two, disp2
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Lldisp22
-	fail
-.Lldisp22:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	rotr.l	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Lldisp162
-	fail
-.Lldisp162:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	rotr.l	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Lldisp322
-	fail
-.Lldisp322:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.l	#2, @long_dest:16	; shift right arithmetic by two, abs16
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Llabs162
-	fail
-.Llabs162:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotr_l_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotr.l	#2, @long_dest:32	; shift right arithmetic by two, abs32
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x69696969, @long_dest
-	beq	.Llabs322
-	fail
-.Llabs322:
-	mov	#0xa5a5a5a5, @long_dest
-	
-.endif
-.endif
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/rotxl.s b/sim/testsuite/sim/h8300/rotxl.s
deleted file mode 100644
index 3ae703ef800..00000000000
--- a/sim/testsuite/sim/h8300/rotxl.s
+++ /dev/null
@@ -1,167 +0,0 @@
-# Hitachi H8 testcase 'rotxl'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-byte_dest:	.byte	0xa5
-	.align 2
-word_dest:	.word	0xa5a5
-	.align 4
-long_dest:	.long	0xa5a5a5a5
-
-	.text
-
-rotxl_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxl.b	r0l		; shift left arithmetic by one
-;;;	.word	0x1208
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_clear
-	test_h_gr16 0xa54a r0	; 1010 0101 -> 0100 1010
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a54a er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-rotxl_b_reg8_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxl.b	#2, r0l		; shift left arithmetic by two
-;;; 	.word	0x1248
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_set
-
-	test_h_gr16 0xa595 r0	; 1010 0101 -> 1001 0101
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a595 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu)			; Not available in h8300 mode
-rotxl_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxl.w	r0		; shift left arithmetic by one
-;;;	.word	0x1210
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_clear
-	test_h_gr16 0x4b4a r0	; 1010 0101 1010 0101 -> 0100 1011 0100 1010
-	test_h_gr32 0xa5a54b4a er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-rotxl_w_reg16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxl.w	#2, r0		; shift left arithmetic by two
-;;;	.word	0x1250
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_set
-	test_h_gr16 0x9695 r0	; 1010 0101 1010 0101 -> 1001 0110 1001 0101
-	test_h_gr32 0xa5a59695 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-rotxl_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxl.l	er0		; shift left arithmetic by one
-;;;	.word	1030
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1010
-	test_h_gr32 0x4b4b4b4a er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-rotxl_l_reg32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxl.l	#2, er0		; shift left arithmetic by two
-;;;	.word	0x1270
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear		
-	test_neg_set
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 1001 0110 1001 0110 1001 0110 1001 0101
-	test_h_gr32 0x96969695 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.endif
-
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/rotxr.s b/sim/testsuite/sim/h8300/rotxr.s
deleted file mode 100644
index 96ec8a12b6a..00000000000
--- a/sim/testsuite/sim/h8300/rotxr.s
+++ /dev/null
@@ -1,2002 +0,0 @@
-# Hitachi H8 testcase 'rotxr'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-byte_dest:	.byte	0xa5
-	.align 2
-word_dest:	.word	0xa5a5
-	.align 4
-long_dest:	.long	0xa5a5a5a5
-
-	.text
-
-rotxr_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.b	r0l		; shift right arithmetic by one
-;;;	.word	0x1308
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0xa552 r0	; 1010 0101 -> 0101 0010
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a552 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotxr_b_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotxr.b	@er0	; shift right arithmetic by one, indirect
-;;;	.word	0x7d00
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbind1
-	fail
-.Lbind1:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotxr.b	@er0+	; shift right arithmetic by one, postinc
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbpostinc1
-	fail
-.Lbpostinc1:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotxr.b	@er0-	; shift right arithmetic by one, postdec
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbpostdec1
-	fail
-.Lbpostdec1:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	rotxr.b	@+er0	; shift right arithmetic by one, preinc
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbpreinc1
-	fail
-.Lbpreinc1:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	rotxr.b	@-er0	; shift right arithmetic by one, predec
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbpredec1
-	fail
-.Lbpredec1:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	rotxr.b	@(2:2, er0)	; shift right arithmetic by one, disp2
-;;;	.word	0x0176
-;;;	.word	0x6808
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbdisp21
-	fail
-.Lbdisp21:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	rotxr.b	@(44:16, er0)	; shift right arithmetic by one, disp16
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	44
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbdisp161
-	fail
-.Lbdisp161:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	rotxr.b	@(666:32, er0)	; shift right arithmetic by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6a28
-;;; 	.long	666
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbdisp321
-	fail
-.Lbdisp321:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.b	@byte_dest:16	; shift right arithmetic by one, abs16
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbabs161
-	fail
-.Lbabs161:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.b	@byte_dest:32	; shift right arithmetic by one, abs32
-;;;	.word	0x6a38
-;;; 	.long	byte_dest
-;;;	.word	0x1300
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbabs321
-	fail
-.Lbabs321:
-	mov	#0xa5a5a5a5, @byte_dest
-.endif
-
-rotxr_b_reg8_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.b	#2, r0l		; shift right arithmetic by two
-;;;	.word	0x1348
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr16 0xa5a9 r0	; 1010 0101 -> 1010 1001
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a5a9 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotxr_b_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotxr.b	#2, @er0	; shift right arithmetic by two, indirect
-;;;	.word	0x7d00
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbind2
-	fail
-.Lbind2:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotxr.b	#2, @er0+	; shift right arithmetic by two, postinc
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbpostinc2
-	fail
-.Lbpostinc2:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	rotxr.b	#2, @er0-	; shift right arithmetic by two, postdec
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbpostdec2
-	fail
-.Lbpostdec2:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	rotxr.b	#2, @+er0	; shift right arithmetic by two, preinc
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbpreinc2
-	fail
-.Lbpreinc2:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	rotxr.b	#2, @-er0	; shift right arithmetic by two, predec
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbpredec2
-	fail
-.Lbpredec2:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	rotxr.b	#2, @(2:2, er0)	; shift right arithmetic by two, disp2
-;;;	.word	0x0176
-;;;	.word	0x6808
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbdisp22
-	fail
-.Lbdisp22:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	rotxr.b	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	44
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbdisp162
-	fail
-.Lbdisp162:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	rotxr.b	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6a28
-;;; 	.long	666
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbdisp322
-	fail
-.Lbdisp322:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.b	#2, @byte_dest:16	; shift right arithmetic by two, abs16
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbabs162
-	fail
-.Lbabs162:
-	mov	#0xa5a5a5a5, @byte_dest
-
-rotxr_b_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.b	#2, @byte_dest:32	; shift right arithmetic by two, abs32
-;;;	.word	0x6a38
-;;; 	.long	byte_dest
-;;;	.word	0x1340
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1010 1001
-	cmp.b	#0xa9, @byte_dest
-	beq	.Lbabs322
-	fail
-.Lbabs322:
-	mov	#0xa5a5a5a5, @byte_dest
-.endif
-
-.if (sim_cpu)			; Not available in h8300 mode
-rotxr_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.w	r0		; shift right arithmetic by one
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0x52d2 r0	; 1010 0101 1010 0101 -> 0101 0010 1101 0010
-	test_h_gr32 0xa5a552d2 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotxr_w_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotxr.w	@er0	; shift right arithmetic by one, indirect
-;;;	.word	0x7d80
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwind1
-	fail
-.Lwind1:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotxr.w	@er0+	; shift right arithmetic by one, postinc
-;;;	.word	0x0154
-;;;	.word	0x6d08
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwpostinc1
-	fail
-.Lwpostinc1:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotxr.w	@er0-	; shift right arithmetic by one, postdec
-;;;	.word	0x0156
-;;;	.word	0x6d08
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwpostdec1
-	fail
-.Lwpostdec1:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	rotxr.w	@+er0	; shift right arithmetic by one, preinc
-;;;	.word	0x0155
-;;;	.word	0x6d08
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwpreinc1
-	fail
-.Lwpreinc1:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	rotxr.w	@-er0	; shift right arithmetic by one, predec
-;;;	.word	0x0157
-;;;	.word	0x6d08
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwpredec1
-	fail
-.Lwpredec1:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	rotxr.w	@(4:2, er0)	; shift right arithmetic by one, disp2
-;;;	.word	0x0156
-;;;	.word	0xa908
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwdisp21
-	fail
-.Lwdisp21:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	rotxr.w	@(44:16, er0)	; shift right arithmetic by one, disp16
-;;;	.word	0x0154
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwdisp161
-	fail
-.Lwdisp161:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	rotxr.w	@(666:32, er0)	; shift right arithmetic by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwdisp321
-	fail
-.Lwdisp321:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.w	@word_dest:16	; shift right arithmetic by one, abs16
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwabs161
-	fail
-.Lwabs161:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.w	@word_dest:32	; shift right arithmetic by one, abs32
-;;;	.word	0x6b38
-;;; 	.long	word_dest
-;;;	.word	0x1310
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwabs321
-	fail
-.Lwabs321:
-	mov	#0xa5a5a5a5, @word_dest
-.endif
-	
-rotxr_w_reg16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.w	#2, r0		; shift right arithmetic by two
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr16 0xa969 r0	; 1010 0101 1010 0101 -> 1010 1001 0110 1001
-	test_h_gr32 0xa5a5a969 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotxr_w_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotxr.w	#2, @er0	; shift right arithmetic by two, indirect
-;;;	.word	0x7d80
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwind2
-	fail
-.Lwind2:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotxr.w	#2, @er0+	; shift right arithmetic by two, postinc
-;;;	.word	0x0154
-;;;	.word	0x6d08
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwpostinc2
-	fail
-.Lwpostinc2:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	rotxr.w	#2, @er0-	; shift right arithmetic by two, postdec
-;;;	.word	0x0156
-;;;	.word	0x6d08
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwpostdec2
-	fail
-.Lwpostdec2:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	rotxr.w	#2, @+er0	; shift right arithmetic by two, preinc
-;;;	.word	0x0155
-;;;	.word	0x6d08
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwpreinc2
-	fail
-.Lwpreinc2:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	rotxr.w	#2, @-er0	; shift right arithmetic by two, predec
-;;;	.word	0x0157
-;;;	.word	0x6d08
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwpredec2
-	fail
-.Lwpredec2:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	rotxr.w	#2, @(4:2, er0)	; shift right arithmetic by two, disp2
-;;;	.word	0x0156
-;;;	.word	0xa908
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwdisp22
-	fail
-.Lwdisp22:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	rotxr.w	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-;;;	.word	0x0154
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwdisp162
-	fail
-.Lwdisp162:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	rotxr.w	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwdisp322
-	fail
-.Lwdisp322:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.w	#2, @word_dest:16	; shift right arithmetic by two, abs16
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwabs162
-	fail
-.Lwabs162:
-	mov	#0xa5a5a5a5, @word_dest
-
-rotxr_w_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.w	#2, @word_dest:32	; shift right arithmetic by two, abs32
-;;;	.word	0x6b38
-;;; 	.long	word_dest
-;;;	.word	0x1350
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1010 1001 0110 1001  
-	cmp.w	#0xa969, @word_dest
-	beq	.Lwabs322
-	fail
-.Lwabs322:
-	mov	#0xa5a5a5a5, @word_dest
-.endif
-
-rotxr_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.l	er0		; shift right arithmetic by one, register
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	test_h_gr32  0x52d2d2d2 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-rotxr_l_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotxr.l	@er0	; shift right arithmetic by one, indirect
-;;;	.word	0x0104
-;;;	.word	0xa908
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llind1
-	fail
-.Llind1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotxr.l	@er0+	; shift right arithmetic by one, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llpostinc1
-	fail
-.Llpostinc1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotxr.l	@er0-	; shift right arithmetic by one, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llpostdec1
-	fail
-.Llpostdec1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	rotxr.l	@+er0	; shift right arithmetic by one, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llpreinc1
-	fail
-.Llpreinc1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	rotxr.l	@-er0	; shift right arithmetic by one, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llpredec1
-	fail
-.Llpredec1:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	rotxr.l	@(8:2, er0)	; shift right arithmetic by one, disp2
-;;;	.word	0x0106
-;;;	.word	0xa908
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Lldisp21
-	fail
-.Lldisp21:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	rotxr.l	@(44:16, er0)	; shift right arithmetic by one, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Lldisp161
-	fail
-.Lldisp161:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	rotxr.l	@(666:32, er0)	; shift right arithmetic by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32  long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Lldisp321
-	fail
-.Lldisp321:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.l	@long_dest:16	; shift right arithmetic by one, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llabs161
-	fail
-.Llabs161:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.l	@long_dest:32	; shift right arithmetic by one, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x1330
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llabs321
-	fail
-.Llabs321:
-	mov	#0xa5a5a5a5, @long_dest
-.endif
-
-rotxr_l_reg32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.l	#2, er0		; shift right arithmetic by two, register
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	test_h_gr32  0xa9696969 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-
-rotxr_l_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotxr.l	#2, @er0	; shift right arithmetic by two, indirect
-;;;	.word	0x0104
-;;;	.word	0xa908
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Llind2
-	fail
-.Llind2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotxr.l	#2, @er0+	; shift right arithmetic by two, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Llpostinc2
-	fail
-.Llpostinc2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	rotxr.l	#2, @er0-	; shift right arithmetic by two, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Llpostdec2
-	fail
-.Llpostdec2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	rotxr.l	#2, @+er0	; shift right arithmetic by two, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Llpreinc2
-	fail
-.Llpreinc2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	rotxr.l	#2, @-er0	; shift right arithmetic by two, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Llpredec2
-	fail
-.Llpredec2:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	rotxr.l	#2, @(8:2, er0)	; shift right arithmetic by two, disp2
-;;;	.word	0x0106
-;;;	.word	0xa908
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Lldisp22
-	fail
-.Lldisp22:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	rotxr.l	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Lldisp162
-	fail
-.Lldisp162:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	rotxr.l	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Lldisp322
-	fail
-.Lldisp322:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.l	#2, @long_dest:16	; shift right arithmetic by two, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Llabs162
-	fail
-.Llabs162:
-	mov	#0xa5a5a5a5, @long_dest
-
-rotxr_l_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	rotxr.l	#2, @long_dest:32	; shift right arithmetic by two, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x1370
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xa9696969, @long_dest
-	beq	.Llabs322
-	fail
-.Llabs322:
-	mov	#0xa5a5a5a5, @long_dest
-	
-.endif
-.endif
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/shal.s b/sim/testsuite/sim/h8300/shal.s
deleted file mode 100644
index ccea9071a8b..00000000000
--- a/sim/testsuite/sim/h8300/shal.s
+++ /dev/null
@@ -1,167 +0,0 @@
-# Hitachi H8 testcase 'shal'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-byte_dest:	.byte	0xa5
-	.align 2
-word_dest:	.word	0xa5a5
-	.align 4
-long_dest:	.long	0xa5a5a5a5
-
-	.text
-
-shal_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shal.b	r0l		; shift left arithmetic by one
-;;;	.word	0x1088
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-;	test_ovf_clear		; FIXME
-	test_neg_clear
-	test_h_gr16 0xa54a r0	; 1010 0101 -> 0100 1010
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a54a er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shal_b_reg8_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shal.b	#2, r0l		; shift left arithmetic by two
-;;; 	.word	0x10c8
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-;	test_ovf_clear		; FIXME
-	test_neg_set
-
-	test_h_gr16 0xa594 r0	; 1010 0101 -> 1001 0100
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a594 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu)			; Not available in h8300 mode
-shal_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shal.w	r0		; shift left arithmetic by one
-;;;	.word	0x1090
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-;	test_ovf_clear		; FIXME
-	test_neg_clear
-	test_h_gr16 0x4b4a r0	; 1010 0101 1010 0101 -> 0100 1011 0100 1010
-	test_h_gr32 0xa5a54b4a er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shal_w_reg16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shal.w	#2, r0		; shift left arithmetic by two
-;;;	.word	0x10d0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-;	test_ovf_clear		; FIXME
-	test_neg_set
-	test_h_gr16 0x9694 r0	; 1010 0101 1010 0101 -> 1001 0110 1001 0100
-	test_h_gr32 0xa5a59694 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shal_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shal.l	er0		; shift left arithmetic by one
-;;;	.word	10b0
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-;	test_ovf_clear		; FIXME
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1010
-	test_h_gr32 0x4b4b4b4a er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shal_l_reg32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shal.l	#2, er0		; shift left arithmetic by two
-;;;	.word	0x10f0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-;	test_ovf_clear		; FIXME
-	test_neg_set
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 1001 0110 1001 0110 1001 0110 1001 0100
-	test_h_gr32 0x96969694 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.endif
-
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/shar.s b/sim/testsuite/sim/h8300/shar.s
deleted file mode 100644
index 9c9166be31b..00000000000
--- a/sim/testsuite/sim/h8300/shar.s
+++ /dev/null
@@ -1,2000 +0,0 @@
-# Hitachi H8 testcase 'shar'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-byte_dest:	.byte	0xa5
-	.align 2
-word_dest:	.word	0xa5a5
-	.align 4
-long_dest:	.long	0xa5a5a5a5
-
-	.text
-
-shar_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.b	r0l		; shift right arithmetic by one
-;;;	.word	0x1188
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr16 0xa5d2 r0	; 1010 0101 -> 1101 0010
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a5d2 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shar_b_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shar.b	@er0	; shift right arithmetic by one, indirect
-;;;	.word	0x7d00
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbind1
-	fail
-.Lbind1:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shar.b	@er0+	; shift right arithmetic by one, postinc
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbpostinc1
-	fail
-.Lbpostinc1:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shar.b	@er0-	; shift right arithmetic by one, postdec
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbpostdec1
-	fail
-.Lbpostdec1:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	shar.b	@+er0	; shift right arithmetic by one, preinc
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbpreinc1
-	fail
-.Lbpreinc1:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	shar.b	@-er0	; shift right arithmetic by one, predec
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbpredec1
-	fail
-.Lbpredec1:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	shar.b	@(2:2, er0)	; shift right arithmetic by one, disp2
-;;;	.word	0x0176
-;;;	.word	0x6808
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbdisp21
-	fail
-.Lbdisp21:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	shar.b	@(44:16, er0)	; shift right arithmetic by one, disp16
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	44
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbdisp161
-	fail
-.Lbdisp161:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	shar.b	@(666:32, er0)	; shift right arithmetic by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6a28
-;;; 	.long	666
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbdisp321
-	fail
-.Lbdisp321:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.b	@byte_dest:16	; shift right arithmetic by one, abs16
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbabs161
-	fail
-.Lbabs161:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.b	@byte_dest:32	; shift right arithmetic by one, abs32
-;;;	.word	0x6a38
-;;; 	.long	byte_dest
-;;;	.word	0x1180
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1101 0010
-	cmp.b	#0xd2, @byte_dest
-	beq	.Lbabs321
-	fail
-.Lbabs321:
-	mov.b	#0xa5, @byte_dest
-.endif
-
-shar_b_reg8_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.b	#2, r0l		; shift right arithmetic by two
-;;;	.word	0x11c8
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	test_h_gr16 0xa5e9 r0	; 1010 0101 -> 1110 1001
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a5e9 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shar_b_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shar.b	#2, @er0	; shift right arithmetic by two, indirect
-;;;	.word	0x7d00
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbind2
-	fail
-.Lbind2:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shar.b	#2, @er0+	; shift right arithmetic by two, postinc
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbpostinc2
-	fail
-.Lbpostinc2:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shar.b	#2, @er0-	; shift right arithmetic by two, postdec
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbpostdec2
-	fail
-.Lbpostdec2:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	shar.b	#2, @+er0	; shift right arithmetic by two, preinc
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbpreinc2
-	fail
-.Lbpreinc2:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	shar.b	#2, @-er0	; shift right arithmetic by two, predec
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbpredec2
-	fail
-.Lbpredec2:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	shar.b	#2, @(2:2, er0)	; shift right arithmetic by two, disp2
-;;;	.word	0x0176
-;;;	.word	0x6808
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbdisp22
-	fail
-.Lbdisp22:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	shar.b	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	44
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbdisp162
-	fail
-.Lbdisp162:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	shar.b	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6a28
-;;; 	.long	666
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbdisp322
-	fail
-.Lbdisp322:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.b	#2, @byte_dest:16	; shift right arithmetic by two, abs16
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbabs162
-	fail
-.Lbabs162:
-	mov.b	#0xa5, @byte_dest
-
-shar_b_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.b	#2, @byte_dest:32	; shift right arithmetic by two, abs32
-;;;	.word	0x6a38
-;;; 	.long	byte_dest
-;;;	.word	0x11c0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 1110 1001
-	cmp.b	#0xe9, @byte_dest
-	beq	.Lbabs322
-	fail
-.Lbabs322:
-	mov.b	#0xa5, @byte_dest
-.endif
-
-.if (sim_cpu)			; Not available in h8300 mode
-shar_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.w	r0		; shift right arithmetic by one
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	test_h_gr16 0xd2d2 r0	; 1010 0101 1010 0101 -> 1101 0010 1101 0010
-	test_h_gr32 0xa5a5d2d2 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shar_w_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shar.w	@er0	; shift right arithmetic by one, indirect
-;;;	.word	0x7d80
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwind1
-	fail
-.Lwind1:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shar.w	@er0+	; shift right arithmetic by one, postinc
-;;;	.word	0x0154
-;;;	.word	0x6d08
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwpostinc1
-	fail
-.Lwpostinc1:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shar.w	@er0-	; shift right arithmetic by one, postdec
-;;;	.word	0x0156
-;;;	.word	0x6d08
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwpostdec1
-	fail
-.Lwpostdec1:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	shar.w	@+er0	; shift right arithmetic by one, preinc
-;;;	.word	0x0155
-;;;	.word	0x6d08
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwpreinc1
-	fail
-.Lwpreinc1:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	shar.w	@-er0	; shift right arithmetic by one, predec
-;;;	.word	0x0157
-;;;	.word	0x6d08
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwpredec1
-	fail
-.Lwpredec1:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	shar.w	@(4:2, er0)	; shift right arithmetic by one, disp2
-;;;	.word	0x0156
-;;;	.word	0x6908
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwdisp21
-	fail
-.Lwdisp21:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	shar.w	@(44:16, er0)	; shift right arithmetic by one, disp16
-;;;	.word	0x0154
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwdisp161
-	fail
-.Lwdisp161:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	shar.w	@(666:32, er0)	; shift right arithmetic by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwdisp321
-	fail
-.Lwdisp321:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.w	@word_dest:16	; shift right arithmetic by one, abs16
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwabs161
-	fail
-.Lwabs161:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.w	@word_dest:32	; shift right arithmetic by one, abs32
-;;;	.word	0x6b38
-;;; 	.long	word_dest
-;;;	.word	0x1190
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1101 0010 1101 0010 
-	cmp.w	#0xd2d2, @word_dest
-	beq	.Lwabs321
-	fail
-.Lwabs321:
-	mov.w	#0xa5a5, @word_dest
-.endif
-	
-shar_w_reg16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.w	#2, r0		; shift right arithmetic by two
-;;;	.word	0x11d0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr16 0xe969 r0	; 1010 0101 1010 0101 -> 1110 1001 0110 1001
-	test_h_gr32 0xa5a5e969 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shar_w_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shar.w	#2, @er0	; shift right arithmetic by two, indirect
-;;;	.word	0x7d80
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwind2
-	fail
-.Lwind2:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shar.w	#2, @er0+	; shift right arithmetic by two, postinc
-;;;	.word	0x0154
-;;;	.word	0x6d08
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwpostinc2
-	fail
-.Lwpostinc2:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shar.w	#2, @er0-	; shift right arithmetic by two, postdec
-;;;	.word	0x0156
-;;;	.word	0x6d08
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwpostdec2
-	fail
-.Lwpostdec2:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	shar.w	#2, @+er0	; shift right arithmetic by two, preinc
-;;;	.word	0x0155
-;;;	.word	0x6d08
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwpreinc2
-	fail
-.Lwpreinc2:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	shar.w	#2, @-er0	; shift right arithmetic by two, predec
-;;;	.word	0x0157
-;;;	.word	0x6d08
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwpredec2
-	fail
-.Lwpredec2:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	shar.w	#2, @(4:2, er0)	; shift right arithmetic by two, disp2
-;;;	.word	0x0156
-;;;	.word	0x6908
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwdisp22
-	fail
-.Lwdisp22:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	shar.w	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-;;;	.word	0x0154
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwdisp162
-	fail
-.Lwdisp162:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	shar.w	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwdisp322
-	fail
-.Lwdisp322:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.w	#2, @word_dest:16	; shift right arithmetic by two, abs16
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwabs162
-	fail
-.Lwabs162:
-	mov.w	#0xa5a5, @word_dest
-
-shar_w_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.w	#2, @word_dest:32	; shift right arithmetic by two, abs32
-;;;	.word	0x6b38
-;;; 	.long	word_dest
-;;;	.word	0x11d0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 1110 1001 0110 1001  
-	cmp.w	#0xe969, @word_dest
-	beq	.Lwabs322
-	fail
-.Lwabs322:
-	mov.w	#0xa5a5, @word_dest
-.endif
-
-shar_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.l	er0		; shift right arithmetic by one, register
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	test_h_gr32  0xd2d2d2d2 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shar_l_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shar.l	@er0	; shift right arithmetic by one, indirect
-;;;	.word	0x0104
-;;;	.word	0x6908
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llind1
-	fail
-.Llind1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shar.l	@er0+	; shift right arithmetic by one, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llpostinc1
-	fail
-.Llpostinc1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shar.l	@er0-	; shift right arithmetic by one, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llpostdec1
-	fail
-.Llpostdec1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	shar.l	@+er0	; shift right arithmetic by one, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llpreinc1
-	fail
-.Llpreinc1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	shar.l	@-er0	; shift right arithmetic by one, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llpredec1
-	fail
-.Llpredec1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	shar.l	@(8:2, er0)	; shift right arithmetic by one, disp2
-;;;	.word	0x0106
-;;;	.word	0x6908
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Lldisp21
-	fail
-.Lldisp21:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	shar.l	@(44:16, er0)	; shift right arithmetic by one, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Lldisp161
-	fail
-.Lldisp161:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	shar.l	@(666:32, er0)	; shift right arithmetic by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Lldisp321
-	fail
-.Lldisp321:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.l	@long_dest:16	; shift right arithmetic by one, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llabs161
-	fail
-.Llabs161:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.l	@long_dest:32	; shift right arithmetic by one, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x11b0
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0xd2d2d2d2, @long_dest
-	beq	.Llabs321
-	fail
-.Llabs321:
-	mov	#0xa5a5a5a5, @long_dest
-.endif
-
-shar_l_reg32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.l	#2, er0		; shift right arithmetic by two, register
-;;;	.word	0x11f0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	test_h_gr32  0xe9696969 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-
-shar_l_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shar.l	#2, @er0	; shift right arithmetic by two, indirect
-;;;	.word	0x0104
-;;;	.word	0x6908
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Llind2
-	fail
-.Llind2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shar.l	#2, @er0+	; shift right arithmetic by two, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Llpostinc2
-	fail
-.Llpostinc2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shar.l	#2, @er0-	; shift right arithmetic by two, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Llpostdec2
-	fail
-.Llpostdec2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	shar.l	#2, @+er0	; shift right arithmetic by two, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Llpreinc2
-	fail
-.Llpreinc2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	shar.l	#2, @-er0	; shift right arithmetic by two, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Llpredec2
-	fail
-.Llpredec2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	shar.l	#2, @(8:2, er0)	; shift right arithmetic by two, disp2
-;;;	.word	0x0106
-;;;	.word	0x6908
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Lldisp22
-	fail
-.Lldisp22:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	shar.l	#2, @(44:16, er0)	; shift right arithmetic by two, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Lldisp162
-	fail
-.Lldisp162:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	shar.l	#2, @(666:32, er0)	; shift right arithmetic by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr32  long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Lldisp322
-	fail
-.Lldisp322:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.l	#2, @long_dest:16	; shift right arithmetic by two, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Llabs162
-	fail
-.Llabs162:
-	mov	#0xa5a5a5a5, @long_dest
-
-shar_l_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shar.l	#2, @long_dest:32	; shift right arithmetic by two, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x11f0
-
-	test_carry_clear		; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1110 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0xe9696969, @long_dest
-	beq	.Llabs322
-	fail
-.Llabs322:
-	mov	#0xa5a5a5a5, @long_dest
-	
-.endif
-.endif
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/shll.s b/sim/testsuite/sim/h8300/shll.s
deleted file mode 100644
index 7fbf14d056f..00000000000
--- a/sim/testsuite/sim/h8300/shll.s
+++ /dev/null
@@ -1,375 +0,0 @@
-# Hitachi H8 testcase 'shll'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-byte_dest:	.byte	0xa5
-	.align 2
-word_dest:	.word	0xa5a5
-	.align 4
-long_dest:	.long	0xa5a5a5a5
-
-	.text
-
-shll_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.b	r0l		; shift left logical by one
-;;;	.word	0x1008
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	test_h_gr16 0xa54a r0	; 1010 0101 -> 0100 1010
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a54a er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_b_reg8_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.b	#2, r0l		; shift left logical by two
-;;; 	.word	0x1048
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-
-	test_h_gr16 0xa594 r0	; 1010 0101 -> 1001 0100
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a594 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shll_b_reg8_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.b	#4, r0l		; shift left logical by four
-;;;	.word	0x10a8
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	test_h_gr16 0xa550 r0	; 1010 0101 -> 0101 0000
-	test_h_gr32 0xa5a5a550 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_b_reg8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#5, r0h
-	shll.b	r0h, r0l	; shift left logical by register value
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	test_h_gr16 0x05a0 r0	; 1010 0101 -> 1010 0000
-	test_h_gr32 0xa5a505a0 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-.if (sim_cpu)			; Not available in h8300 mode
-shll_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.w	r0		; shift left logical by one
-;;;	.word	0x1010
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	test_h_gr16 0x4b4a r0	; 1010 0101 1010 0101 -> 0100 1011 0100 1010
-	test_h_gr32 0xa5a54b4a er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_w_reg16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.w	#2, r0		; shift left logical by two
-;;;	.word	0x1050
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	test_h_gr16 0x9694 r0	; 1010 0101 1010 0101 -> 1001 0110 1001 0100
-	test_h_gr32 0xa5a59694 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shll_w_reg16_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.w	#4, r0		; shift left logical by four
-;;;	.word	0x1020
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	test_h_gr16 0x5a50 r0	; 1010 0101 1010 0101 -> 0101 1010 0101 0000
-	test_h_gr32 0xa5a55a50 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_w_reg16_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.w	#8, r0		; shift left logical by eight
-;;;	.word	0x1060
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	test_h_gr16 0xa500 r0	; 1010 0101 1010 0101 -> 1010 0101 0000 0000
-	test_h_gr32 0xa5a5a500 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_w_reg16_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#5, r0h
-	shll.w	r0h, r0		; shift left logical by register value
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	test_h_gr16 0xb4a0 r0	; 1010 0101 1010 0101 -> 1011 0100 1010 0000
-	test_h_gr32 0xa5a5b4a0 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-shll_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.l	er0		; shift left logical by one
-;;;	.word	1030
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0100 1011 0100 1011 0100 1011 0100 1010
-	test_h_gr32 0x4b4b4b4a er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_l_reg32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.l	#2, er0		; shift left logical by two
-;;;	.word	0x1070
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 1001 0110 1001 0110 1001 0110 1001 0100
-	test_h_gr32 0x96969694 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shll_l_reg32_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.l	#4, er0		; shift left logical by four
-;;;	.word	0x1038
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 0101 1010 0101 1010 0101 1010 0101 0000
-	test_h_gr32 0x5a5a5a50 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_l_reg32_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.l	#8, er0		; shift left logical by eight
-;;;	.word	0x1078
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	test_h_gr16 0xa500 r0	
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 1010 0101 1010 0101 1010 0101 0000 0000
-	test_h_gr32 0xa5a5a500 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_l_reg32_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shll.l	#16, er0	; shift left logical by sixteen
-;;;	.word	0x10f8
-
-	test_carry_set		; H=0 N=1 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 1010 0101 1010 0101 0000 0000 0000 0000
-	test_h_gr32 0xa5a50000 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shll_l_reg32_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#5, r1l
-	shll.l	r1l, er0	; shift left logical by register value
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_set
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 1011 0100 1011 0100 1011 0100 1010 0000
-	test_h_gr32  0xb4b4b4a0 er0
-
-	test_h_gr32  0xa5a5a505 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-.endif
-
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/shlr.s b/sim/testsuite/sim/h8300/shlr.s
deleted file mode 100644
index 42233134b45..00000000000
--- a/sim/testsuite/sim/h8300/shlr.s
+++ /dev/null
@@ -1,4085 +0,0 @@
-# Hitachi H8 testcase 'shlr'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-	.data
-byte_dest:	.byte	0xa5
-	.align 2
-word_dest:	.word	0xa5a5
-	.align 4
-long_dest:	.long	0xa5a5a5a5
-
-	.text
-
-shlr_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	r0l		; shift right logical by one
-;;;	.word	0x1108
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0xa552 r0	; 1010 0101 -> 0101 0010
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a552 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shlr_b_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	@er0	; shift right logical by one, indirect
-;;;	.word	0x7d00
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbind1
-	fail
-.Lbind1:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	@er0+	; shift right logical by one, postinc
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbpostinc1
-	fail
-.Lbpostinc1:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	@er0-	; shift right logical by one, postdec
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbpostdec1
-	fail
-.Lbpostdec1:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	shlr.b	@+er0	; shift right logical by one, preinc
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbpreinc1
-	fail
-.Lbpreinc1:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	shlr.b	@-er0	; shift right logical by one, predec
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbpredec1
-	fail
-.Lbpredec1:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	shlr.b	@(2:2, er0)	; shift right logical by one, disp2
-;;;	.word	0x0176
-;;;	.word	0x6808
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbdisp21
-	fail
-.Lbdisp21:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	shlr.b	@(44:16, er0)	; shift right logical by one, disp16
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	44
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbdisp161
-	fail
-.Lbdisp161:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	shlr.b	@(666:32, er0)	; shift right logical by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6a28
-;;; 	.long	666
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbdisp321
-	fail
-.Lbdisp321:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	@byte_dest:16	; shift right logical by one, abs16
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbabs161
-	fail
-.Lbabs161:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	@byte_dest:32	; shift right logical by one, abs32
-;;;	.word	0x6a38
-;;; 	.long	byte_dest
-;;;	.word	0x1100
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0101 0010
-	cmp.b	#0x52, @byte_dest
-	beq	.Lbabs321
-	fail
-.Lbabs321:
-	mov.b	#0xa5, @byte_dest
-.endif
-
-shlr_b_reg8_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	#2, r0l		; shift right logical by two
-;;;	.word	0x1148
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	test_h_gr16 0xa529 r0	; 1010 0101 -> 0010 1001
-.if (sim_cpu)
-	test_h_gr32 0xa5a5a529 er0
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shlr_b_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	#2, @er0	; shift right logical by two, indirect
-;;;	.word	0x7d00
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbind2
-	fail
-.Lbind2:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	#2, @er0+	; shift right logical by two, postinc
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbpostinc2
-	fail
-.Lbpostinc2:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	#2, @er0-	; shift right logical by two, postdec
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbpostdec2
-	fail
-.Lbpostdec2:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	shlr.b	#2, @+er0	; shift right logical by two, preinc
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbpreinc2
-	fail
-.Lbpreinc2:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	shlr.b	#2, @-er0	; shift right logical by two, predec
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbpredec2
-	fail
-.Lbpredec2:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	shlr.b	#2, @(2:2, er0)	; shift right logical by two, disp2
-;;;	.word	0x0176
-;;;	.word	0x6808
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbdisp22
-	fail
-.Lbdisp22:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	shlr.b	#2, @(44:16, er0)	; shift right logical by two, disp16
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	44
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbdisp162
-	fail
-.Lbdisp162:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	shlr.b	#2, @(666:32, er0)	; shift right logical by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6a28
-;;; 	.long	666
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbdisp322
-	fail
-.Lbdisp322:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	#2, @byte_dest:16	; shift right logical by two, abs16
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbabs162
-	fail
-.Lbabs162:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	#2, @byte_dest:32	; shift right logical by two, abs32
-;;;	.word	0x6a38
-;;; 	.long	byte_dest
-;;;	.word	0x1140
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0010 1001
-	cmp.b	#0x29, @byte_dest
-	beq	.Lbabs322
-	fail
-.Lbabs322:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_reg8_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	#4, r0l		; shift right logical by four
-;;;	.word	0x11a8
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0xa50a r0	; 1010 0101 -> 0000 1010 
-	test_h_gr32 0xa5a5a50a er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_b_reg8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#5, r0h
-	shlr.b	r0h, r0l	; shift right logical by register value
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0x0505 r0	; 1010 0101 -> 0000 0101
-	test_h_gr32 0xa5a50505 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_b_ind_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	#4, @er0	; shift right logical by four, indirect
-;;;	.word	0x7d00
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbind4
-	fail
-.Lbind4:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_postinc_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	#4, @er0+	; shift right logical by four, postinc
-;;;	.word	0x0174
-;;;	.word	0x6c08
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest+1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbpostinc4
-	fail
-.Lbpostinc4:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_postdec_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest, er0
-	shlr.b	#4, @er0-	; shift right logical by four, postdec
-;;;	.word	0x0176
-;;;	.word	0x6c08
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-1 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbpostdec4
-	fail
-.Lbpostdec4:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_preinc_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-1, er0
-	shlr.b	#4, @+er0	; shift right logical by four, preinc
-;;;	.word	0x0175
-;;;	.word	0x6c08
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbpreinc4
-	fail
-.Lbpreinc4:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_predec_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest+1, er0
-	shlr.b	#4, @-er0	; shift right logical by four, predec
-;;;	.word	0x0177
-;;;	.word	0x6c08
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbpredec4
-	fail
-.Lbpredec4:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp2_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-2, er0
-	shlr.b	#4, @(2:2, er0)	; shift right logical by four, disp2
-;;;	.word	0x0176
-;;;	.word	0x6808
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbdisp24
-	fail
-.Lbdisp24:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp16_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-44, er0
-	shlr.b	#4, @(44:16, er0)	; shift right logical by four, disp16
-;;;	.word	0x0174
-;;;	.word	0x6e08
-;;;	.word	44
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbdisp164
-	fail
-.Lbdisp164:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_disp32_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#byte_dest-666, er0
-	shlr.b	#4, @(666:32, er0)	; shift right logical by four, disp32
-;;;	.word	0x7884
-;;;	.word	0x6a28
-;;; 	.long	666
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 byte_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbdisp324
-	fail
-.Lbdisp324:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_abs16_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	#4, @byte_dest:16	; shift right logical by four, abs16
-;;;	.word	0x6a18
-;;;	.word	byte_dest
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbabs164
-	fail
-.Lbabs164:
-	mov.b	#0xa5, @byte_dest
-
-shlr_b_abs32_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.b	#4, @byte_dest:32	; shift right logical by four, abs32
-;;;	.word	0x6a38
-;;; 	.long	byte_dest
-;;;	.word	0x11a0
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 -> 0000 1010 
-	cmp.b	#0x0a, @byte_dest
-	beq	.Lbabs324
-	fail
-.Lbabs324:
-	mov.b	#0xa5, @byte_dest
-.endif
-
-.if (sim_cpu == h8sx)
-shlr_w_imm5_1:	
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#15:5, r0	; shift right logical by 5-bit immediate
-;;;	.word	0x038f
-;;;	.word	0x1110
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	; 1010 0101 1010 0101 -> 0000 0000 0000 0001
-	test_h_gr32 0xa5a50001 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-.if (sim_cpu)			; Not available in h8300 mode
-shlr_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	r0		; shift right logical by one
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	test_h_gr16 0x52d2 r0	; 1010 0101 1010 0101 -> 0101 0010 1101 0010
-	test_h_gr32 0xa5a552d2 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shlr_w_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	@er0	; shift right logical by one, indirect
-;;;	.word	0x7d80
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwind1
-	fail
-.Lwind1:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	@er0+	; shift right logical by one, postinc
-;;;	.word	0x0154
-;;;	.word	0x6d08
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwpostinc1
-	fail
-.Lwpostinc1:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	@er0-	; shift right logical by one, postdec
-;;;	.word	0x0156
-;;;	.word	0x6d08
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwpostdec1
-	fail
-.Lwpostdec1:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	shlr.w	@+er0	; shift right logical by one, preinc
-;;;	.word	0x0155
-;;;	.word	0x6d08
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwpreinc1
-	fail
-.Lwpreinc1:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	shlr.w	@-er0	; shift right logical by one, predec
-;;;	.word	0x0157
-;;;	.word	0x6d08
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwpredec1
-	fail
-.Lwpredec1:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	shlr.w	@(4:2, er0)	; shift right logical by one, disp2
-;;;	.word	0x0156
-;;;	.word	0x6908
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwdisp21
-	fail
-.Lwdisp21:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	shlr.w	@(44:16, er0)	; shift right logical by one, disp16
-;;;	.word	0x0154
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwdisp161
-	fail
-.Lwdisp161:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	shlr.w	@(666:32, er0)	; shift right logical by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwdisp321
-	fail
-.Lwdisp321:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	@word_dest:16	; shift right logical by one, abs16
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwabs161
-	fail
-.Lwabs161:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	@word_dest:32	; shift right logical by one, abs32
-;;;	.word	0x6b38
-;;; 	.long	word_dest
-;;;	.word	0x1110
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0101 0010 1101 0010 
-	cmp.w	#0x52d2, @word_dest
-	beq	.Lwabs321
-	fail
-.Lwabs321:
-	mov.w	#0xa5a5, @word_dest
-.endif
-	
-shlr_w_reg16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#2, r0		; shift right logical by two
-;;;	.word	0x1150
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0x2969 r0	; 1010 0101 1010 0101 -> 0010 1001 0110 1001
-	test_h_gr32 0xa5a52969 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shlr_w_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#2, @er0	; shift right logical by two, indirect
-;;;	.word	0x7d80
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwind2
-	fail
-.Lwind2:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#2, @er0+	; shift right logical by two, postinc
-;;;	.word	0x0154
-;;;	.word	0x6d08
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwpostinc2
-	fail
-.Lwpostinc2:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#2, @er0-	; shift right logical by two, postdec
-;;;	.word	0x0156
-;;;	.word	0x6d08
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwpostdec2
-	fail
-.Lwpostdec2:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	shlr.w	#2, @+er0	; shift right logical by two, preinc
-;;;	.word	0x0155
-;;;	.word	0x6d08
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwpreinc2
-	fail
-.Lwpreinc2:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	shlr.w	#2, @-er0	; shift right logical by two, predec
-;;;	.word	0x0157
-;;;	.word	0x6d08
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwpredec2
-	fail
-.Lwpredec2:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	shlr.w	#2, @(4:2, er0)	; shift right logical by two, disp2
-;;;	.word	0x0156
-;;;	.word	0x6908
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwdisp22
-	fail
-.Lwdisp22:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	shlr.w	#2, @(44:16, er0)	; shift right logical by two, disp16
-;;;	.word	0x0154
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwdisp162
-	fail
-.Lwdisp162:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	shlr.w	#2, @(666:32, er0)	; shift right logical by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwdisp322
-	fail
-.Lwdisp322:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#2, @word_dest:16	; shift right logical by two, abs16
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwabs162
-	fail
-.Lwabs162:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#2, @word_dest:32	; shift right logical by two, abs32
-;;;	.word	0x6b38
-;;; 	.long	word_dest
-;;;	.word	0x1150
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0010 1001 0110 1001  
-	cmp.w	#0x2969, @word_dest
-	beq	.Lwabs322
-	fail
-.Lwabs322:
-	mov.w	#0xa5a5, @word_dest
-	
-shlr_w_reg16_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#4, r0		; shift right logical by four
-;;;	.word	0x1120
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0x0a5a r0	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	test_h_gr32 0xa5a50a5a er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_w_reg16_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#5, r1l
-	shlr.w	r1l, r0		; shift right logical by register value
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16  0x052d r0	; 1010 0101 1010 0101 -> 0000 0101 0010 1101
-	test_h_gr32  0xa5a5052d er0
-	test_h_gr32  0xa5a5a505 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_w_ind_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#4, @er0	; shift right logical by four, indirect
-;;;	.word	0x7d80
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwind4
-	fail
-.Lwind4:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_postinc_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#4, @er0+	; shift right logical by four, postinc
-;;;	.word	0x0154
-;;;	.word	0x6d08
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwpostinc4
-	fail
-.Lwpostinc4:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_postdec_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#4, @er0-	; shift right logical by four, postdec
-;;;	.word	0x0156
-;;;	.word	0x6d08
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwpostdec4
-	fail
-.Lwpostdec4:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_preinc_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	shlr.w	#4, @+er0	; shift right logical by four, preinc
-;;;	.word	0x0155
-;;;	.word	0x6d08
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwpreinc4
-	fail
-.Lwpreinc4:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_predec_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	shlr.w	#4, @-er0	; shift right logical by four, predec
-;;;	.word	0x0157
-;;;	.word	0x6d08
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwpredec4
-	fail
-.Lwpredec4:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp2_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	shlr.w	#4, @(4:2, er0)	; shift right logical by four, disp2
-;;;	.word	0x0156
-;;;	.word	0x6908
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwdisp24
-	fail
-.Lwdisp24:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp16_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	shlr.w	#4, @(44:16, er0)	; shift right logical by four, disp16
-;;;	.word	0x0154
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwdisp164
-	fail
-.Lwdisp164:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp32_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	shlr.w	#4, @(666:32, er0)	; shift right logical by four, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwdisp324
-	fail
-.Lwdisp324:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_abs16_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#4, @word_dest:16	; shift right logical by four, abs16
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwabs164
-	fail
-.Lwabs164:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_abs32_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#4, @word_dest:32	; shift right logical by four, abs32
-;;;	.word	0x6b38
-;;; 	.long	word_dest
-;;;	.word	0x1120
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 1010 0101 1010 
-	cmp.w	#0x0a5a, @word_dest
-	beq	.Lwabs324
-	fail
-.Lwabs324:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_reg16_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#8, r0		; shift right logical by eight
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr16 0x00a5 r0	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	test_h_gr32 0xa5a500a5 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_w_ind_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#8, @er0	; shift right logical by eight, indirect
-;;;	.word	0x7d80
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwind8
-	fail
-.Lwind8:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_postinc_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#8, @er0+	; shift right logical by eight, postinc
-;;;	.word	0x0154
-;;;	.word	0x6d08
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest+2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwpostinc8
-	fail
-.Lwpostinc8:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_postdec_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest, er0
-	shlr.w	#8, @er0-	; shift right logical by eight, postdec
-;;;	.word	0x0156
-;;;	.word	0x6d08
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-2 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwpostdec8
-	fail
-.Lwpostdec8:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_preinc_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-2, er0
-	shlr.w	#8, @+er0	; shift right logical by eight, preinc
-;;;	.word	0x0155
-;;;	.word	0x6d08
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwpreinc8
-	fail
-.Lwpreinc8:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_predec_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest+2, er0
-	shlr.w	#8, @-er0	; shift right logical by eight, predec
-;;;	.word	0x0157
-;;;	.word	0x6d08
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwpredec8
-	fail
-.Lwpredec8:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp2_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-4, er0
-	shlr.w	#8, @(4:2, er0)	; shift right logical by eight, disp2
-;;;	.word	0x0156
-;;;	.word	0x6908
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwdisp28
-	fail
-.Lwdisp28:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp16_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-44, er0
-	shlr.w	#8, @(44:16, er0)	; shift right logical by eight, disp16
-;;;	.word	0x0154
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwdisp168
-	fail
-.Lwdisp168:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_disp32_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#word_dest-666, er0
-	shlr.w	#8, @(666:32, er0)	; shift right logical by eight, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 word_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwdisp328
-	fail
-.Lwdisp328:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_abs16_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#8, @word_dest:16	; shift right logical by eight, abs16
-;;;	.word	0x6b18
-;;;	.word	word_dest
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwabs168
-	fail
-.Lwabs168:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_w_abs32_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.w	#8, @word_dest:32	; shift right logical by eight, abs32
-;;;	.word	0x6b38
-;;; 	.long	word_dest
-;;;	.word	0x1160
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 -> 0000 0000 1010 0101 
-	cmp.w	#0x00a5, @word_dest
-	beq	.Lwabs328
-	fail
-.Lwabs328:
-	mov.w	#0xa5a5, @word_dest
-
-shlr_l_imm5_1:	
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#31:5, er0	; shift right logical by 5-bit immediate
-;;;	.word	0x0399
-;;;	.word	0x1130
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0000 0000 0000 0000 0000 0000 0000 0001
-	test_h_gr32 0x1 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-shlr_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	er0		; shift right logical by one, register
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	; 1010 0101 1010 0101 1010 0101 1010 0101 
-	; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	test_h_gr32 0x52d2d2d2 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-shlr_l_ind_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	@er0	; shift right logical by one, indirect
-;;;	.word	0x0104
-;;;	.word	0x6908
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llind1
-	fail
-.Llind1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	@er0+	; shift right logical by one, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llpostinc1
-	fail
-.Llpostinc1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postdec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	@er0-	; shift right logical by one, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llpostdec1
-	fail
-.Llpostdec1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_preinc_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	shlr.l	@+er0	; shift right logical by one, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llpreinc1
-	fail
-.Llpreinc1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_predec_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	shlr.l	@-er0	; shift right logical by one, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llpredec1
-	fail
-.Llpredec1:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp2_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	shlr.l	@(8:2, er0)	; shift right logical by one, disp2
-;;;	.word	0x0106
-;;;	.word	0x6908
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Lldisp21
-	fail
-.Lldisp21:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	shlr.l	@(44:16, er0)	; shift right logical by one, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Lldisp161
-	fail
-.Lldisp161:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	shlr.l	@(666:32, er0)	; shift right logical by one, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Lldisp321
-	fail
-.Lldisp321:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	@long_dest:16	; shift right logical by one, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llabs161
-	fail
-.Llabs161:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	@long_dest:32	; shift right logical by one, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x1130
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0101 0010 1101 0010 1101 0010 1101 0010
-	cmp.l	#0x52d2d2d2, @long_dest
-	beq	.Llabs321
-	fail
-.Llabs321:
-	mov	#0xa5a5a5a5, @long_dest
-.endif
-
-shlr_l_reg32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#2, er0		; shift right logical by two, register
-;;;	.word	0x1170
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	test_h_gr32 0x29696969 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-
-shlr_l_ind_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#2, @er0	; shift right logical by two, indirect
-;;;	.word	0x0104
-;;;	.word	0x6908
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Llind2
-	fail
-.Llind2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#2, @er0+	; shift right logical by two, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Llpostinc2
-	fail
-.Llpostinc2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postdec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#2, @er0-	; shift right logical by two, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Llpostdec2
-	fail
-.Llpostdec2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_preinc_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	shlr.l	#2, @+er0	; shift right logical by two, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Llpreinc2
-	fail
-.Llpreinc2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_predec_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	shlr.l	#2, @-er0	; shift right logical by two, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Llpredec2
-	fail
-.Llpredec2:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp2_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	shlr.l	#2, @(8:2, er0)	; shift right logical by two, disp2
-;;;	.word	0x0106
-;;;	.word	0x6908
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Lldisp22
-	fail
-.Lldisp22:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	shlr.l	#2, @(44:16, er0)	; shift right logical by two, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Lldisp162
-	fail
-.Lldisp162:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	shlr.l	#2, @(666:32, er0)	; shift right logical by two, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Lldisp322
-	fail
-.Lldisp322:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs16_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#2, @long_dest:16	; shift right logical by two, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Llabs162
-	fail
-.Llabs162:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs32_2:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#2, @long_dest:32	; shift right logical by two, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x1170
-
-	test_carry_clear		; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0010 1001 0110 1001 0110 1001 0110 1001
-	cmp.l	#0x29696969, @long_dest
-	beq	.Llabs322
-	fail
-.Llabs322:
-	mov	#0xa5a5a5a5, @long_dest
-	
-shlr_l_reg32_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#4, er0		; shift right logical by four, register
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 0000 1010 0101 1010 0101 1010 0101 1010 
-	test_h_gr32 0x0a5a5a5a er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_l_reg32_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#5, r1l
-	shlr.l	r1l, er0	; shift right logical by value of register
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 0000 0101 0010 1101 0010 1101 0010 1101
-	test_h_gr32  0x052d2d2d er0
-	test_h_gr32  0xa5a5a505 er1
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_l_ind_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#4, @er0	; shift right logical by four, indirect
-;;;	.word	0x0104
-;;;	.word	0x6908
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Llind4
-	fail
-.Llind4:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postinc_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#4, @er0+	; shift right logical by four, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Llpostinc4
-	fail
-.Llpostinc4:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postdec_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#4, @er0-	; shift right logical by four, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Llpostdec4
-	fail
-.Llpostdec4:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_preinc_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	shlr.l	#4, @+er0	; shift right logical by four, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Llpreinc4
-	fail
-.Llpreinc4:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_predec_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	shlr.l	#4, @-er0	; shift right logical by four, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Llpredec4
-	fail
-.Llpredec4:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp2_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	shlr.l	#4, @(8:2, er0)	; shift right logical by four, disp2
-;;;	.word	0x0106
-;;;	.word	0x6908
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Lldisp24
-	fail
-.Lldisp24:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp16_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	shlr.l	#4, @(44:16, er0)	; shift right logical by four, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Lldisp164
-	fail
-.Lldisp164:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp32_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	shlr.l	#4, @(666:32, er0)	; shift right logical by four, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Lldisp324
-	fail
-.Lldisp324:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs16_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#4, @long_dest:16	; shift right logical by four, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Llabs164
-	fail
-.Llabs164:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs32_4:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#4, @long_dest:32	; shift right logical by four, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x1138
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 1010 0101 1010 0101 1010 0101 1010
-	cmp.l	#0x0a5a5a5a, @long_dest
-	beq	.Llabs324
-	fail
-.Llabs324:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_reg32_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#8, er0		; shift right logical by eight, register
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	; -> 0000 0000 1010 0101 1010 0101 1010 0101 
-	test_h_gr32 0x00a5a5a5 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_l_ind_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#8, @er0	; shift right logical by eight, indirect
-;;;	.word	0x0104
-;;;	.word	0x6908
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Llind8
-	fail
-.Llind8:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postinc_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#8, @er0+	; shift right logical by eight, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Llpostinc8
-	fail
-.Llpostinc8:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postdec_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#8, @er0-	; shift right logical by eight, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Llpostdec8
-	fail
-.Llpostdec8:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_preinc_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	shlr.l	#8, @+er0	; shift right logical by eight, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Llpreinc8
-	fail
-.Llpreinc8:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_predec_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	shlr.l	#8, @-er0	; shift right logical by eight, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Llpredec8
-	fail
-.Llpredec8:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp2_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	shlr.l	#8, @(8:2, er0)	; shift right logical by eight, disp2
-;;;	.word	0x0106
-;;;	.word	0x6908
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Lldisp28
-	fail
-.Lldisp28:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp16_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	shlr.l	#8, @(44:16, er0)	; shift right logical by eight, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Lldisp168
-	fail
-.Lldisp168:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp32_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	shlr.l	#8, @(666:32, er0)	; shift right logical by eight, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Lldisp328
-	fail
-.Lldisp328:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs16_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#8, @long_dest:16	; shift right logical by eight, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Llabs168
-	fail
-.Llabs168:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs32_8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#8, @long_dest:32	; shift right logical by eight, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x1178
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 1010 0101 1010 0101 1010 0101
-	cmp.l	#0x00a5a5a5, @long_dest
-	beq	.Llabs328
-	fail
-.Llabs328:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_reg32_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#16, er0	; shift right logical by sixteen, register
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	test_h_gr32 0x0000a5a5 er0
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-shlr_l_ind_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#16, @er0	; shift right logical by sixteen, indirect
-;;;	.word	0x0104
-;;;	.word	0x6908
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Llind16
-	fail
-.Llind16:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postinc_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#16, @er0+	; shift right logical by sixteen, postinc
-;;;	.word	0x0104
-;;;	.word	0x6d08
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest+4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Llpostinc16
-	fail
-.Llpostinc16:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_postdec_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest, er0
-	shlr.l	#16, @er0-	; shift right logical by sixteen, postdec
-;;;	.word	0x0106
-;;;	.word	0x6d08
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-4 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Llpostdec16
-	fail
-.Llpostdec16:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_preinc_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-4, er0
-	shlr.l	#16, @+er0	; shift right logical by sixteen, preinc
-;;;	.word	0x0105
-;;;	.word	0x6d08
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Llpreinc16
-	fail
-.Llpreinc16:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_predec_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest+4, er0
-	shlr.l	#16, @-er0	; shift right logical by sixteen, predec
-;;;	.word	0x0107
-;;;	.word	0x6d08
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Llpredec16
-	fail
-.Llpredec16:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp2_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-8, er0
-	shlr.l	#16, @(8:2, er0)	; shift right logical by 16, dest2
-;;;	.word	0x0106
-;;;	.word	0x6908
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-8 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Lldisp216
-	fail
-.Lldisp216:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp16_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-44, er0
-	shlr.l	#16, @(44:16, er0)	; shift right logical by 16, disp16
-;;;	.word	0x0104
-;;;	.word	0x6f08
-;;;	.word	44
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-44 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Lldisp1616
-	fail
-.Lldisp1616:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_disp32_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	mov	#long_dest-666, er0
-	shlr.l	#16, @(666:32, er0)	; shift right logical by 16, disp32
-;;;	.word	0x7884
-;;;	.word	0x6b28
-;;; 	.long	666
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_h_gr32 long_dest-666 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Lldisp3216
-	fail
-.Lldisp3216:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs16_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#16, @long_dest:16	; shift right logical by 16, abs16
-;;;	.word	0x0104
-;;;	.word	0x6b08
-;;;	.word	long_dest
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Llabs1616
-	fail
-.Llabs1616:
-	mov	#0xa5a5a5a5, @long_dest
-
-shlr_l_abs32_16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	shlr.l	#16, @long_dest:32	; shift right logical by 16, abs32
-;;;	.word	0x0104
-;;;	.word	0x6b28
-;;; 	.long	long_dest
-;;;	.word	0x11f8
-
-	test_carry_set		; H=0 N=0 Z=0 V=0 C=1
-	test_zero_clear
-	test_ovf_clear
-	test_neg_clear
-
-	test_gr_a5a5 0		; Make sure ALL general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	; 1010 0101 1010 0101 1010 0101 1010 0101
-	;; -> 0000 0000 0000 0000 1010 0101 1010 0101
-	cmp.l	#0x0000a5a5, @long_dest
-	beq	.Llabs3216
-	fail
-.Llabs3216:
-	mov	#0xa5a5a5a5, @long_dest
-.endif
-.endif
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/h8300/stack.s b/sim/testsuite/sim/h8300/stack.s
deleted file mode 100644
index dd53445003e..00000000000
--- a/sim/testsuite/sim/h8300/stack.s
+++ /dev/null
@@ -1,445 +0,0 @@
-# Hitachi H8 testcase 'ldc'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-.data
-	.align 4
-stack:	
-.if (sim_cpu == h8300)
-	.fill	128, 2, 0
-.else
-	.fill	128, 4, 0
-.endif
-stacktop:
-
-	.text
-
-push_w:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-.if (sim_cpu == h8300)
-	mov.w	#stacktop, r7
-.else
-	mov.l	#stacktop, er7
-.endif
-	push.w	r0		; a5a5 is negative
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	push.w	r1
-	push.w	r2
-	push.w	r3
-
-	test_gr_a5a5 0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	
-	mov	@stacktop-2, r0
-	test_gr_a5a5 0
-	mov	@stacktop-4, r0
-	test_gr_a5a5 0
-	mov	@stacktop-6, r0
-	test_gr_a5a5 0
-	mov	@stacktop-8, r0
-	test_gr_a5a5 0
-
-	mov.w	#1, r1
-	mov.w	#2, r2
-	mov.w	#3, r3
-	mov.w	#4, r4
-
-	push.w	r1		; #1 is non-negative, non-zero
-	test_cc_clear
-	
-	push.w	r2
-	push.w	r3
-	push.w	r4
-
-	test_h_gr16 1 r1
-	test_h_gr16 2 r2
-	test_h_gr16 3 r3
-	test_h_gr16 4 r4
-
-	mov	@stacktop-10, r0
-	test_h_gr16 1 r0
-	mov	@stacktop-12, r0
-	test_h_gr16 2 r0
-	mov	@stacktop-14, r0
-	test_h_gr16 3 r0
-	mov	@stacktop-16, r0
-	test_h_gr16 4 r0
-
-.if (sim_cpu == h8300)
-	test_h_gr16	4 r0
-	test_h_gr16	1 r1
-	test_h_gr16	2 r2
-	test_h_gr16	3 r3
-	test_h_gr16	4 r4
-;;; 	test_h_gr16	stacktop-16 r7	; FIXME
-.else
-	test_h_gr32	0xa5a50004  er0
-	test_h_gr32	0xa5a50001  er1
-	test_h_gr32	0xa5a50002  er2
-	test_h_gr32	0xa5a50003  er3
-	test_h_gr32	0xa5a50004  er4
-	test_h_gr32	stacktop-16 er7
-.endif
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-
-pop_w:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-.if (sim_cpu == h8300)
-	mov.w	#stacktop-16, r7
-.else
-	mov.l	#stacktop-16, er7
-.endif
-	pop.w	r4
-	pop.w	r3
-	pop.w	r2
-	pop.w	r1		; Should set all flags zero
-	test_cc_clear
-
-	test_h_gr16	1 r1
-	test_h_gr16	2 r2
-	test_h_gr16	3 r3
-	test_h_gr16	4 r4
-
-	pop.w	r4
-	pop.w	r3
-	pop.w	r2
-	pop.w	r1		; a5a5 is negative
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-.if (sim_cpu == h8300)
-;;; 	test_h_gr16	stacktop r7	; FIXME
-.else
-	test_h_gr32	stacktop er7
-.endif
-
-.if (sim_cpu)			; non-zero means not h8300
-push_l:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-	mov.l	#stacktop, er7
-	push.l	er0		; a5a5 is negative
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-	
-	push.l	er1
-	push.l	er2
-	push.l	er3
-
-	test_gr_a5a5 0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	
-	mov	@stacktop-4, er0
-	test_gr_a5a5 0
-	mov	@stacktop-8, er0
-	test_gr_a5a5 0
-	mov	@stacktop-12, er0
-	test_gr_a5a5 0
-	mov	@stacktop-16, er0
-	test_gr_a5a5 0
-
-	mov	#1, er1
-	mov	#2, er2
-	mov	#3, er3
-	mov	#4, er4
-
-	push.l	er1		; #1 is non-negative, non-zero
-	test_cc_clear
-	
-	push.l	er2
-	push.l	er3
-	push.l	er4
-
-	test_h_gr32 1 er1
-	test_h_gr32 2 er2
-	test_h_gr32 3 er3
-	test_h_gr32 4 er4
-
-	mov	@stacktop-20, er0
-	test_h_gr32 1 er0
-	mov	@stacktop-24, er0
-	test_h_gr32 2 er0
-	mov	@stacktop-28, er0
-	test_h_gr32 3 er0
-	mov	@stacktop-32, er0
-	test_h_gr32 4 er0
-
-	test_h_gr32	4  er0
-	test_h_gr32	1  er1
-	test_h_gr32	2  er2
-	test_h_gr32	3  er3
-	test_h_gr32	4  er4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_h_gr32	stacktop-32 er7
-
-pop_l:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-	mov.l	#stacktop-32, er7
-	pop.l	er4
-	pop.l	er3
-	pop.l	er2
-	pop.l	er1		; Should set all flags zero
-	test_cc_clear
-
-	test_h_gr32	1 er1
-	test_h_gr32	2 er2
-	test_h_gr32	3 er3
-	test_h_gr32	4 er4
-
-	pop.l	er4
-	pop.l	er3
-	pop.l	er2
-	pop.l	er1		; a5a5 is negative
-	test_neg_set
-	test_carry_clear
-	test_zero_clear
-	test_ovf_clear
-
-	test_gr_a5a5	0
-	test_gr_a5a5	1
-	test_gr_a5a5	2
-	test_gr_a5a5	3
-	test_gr_a5a5	4
-	test_gr_a5a5	5
-	test_gr_a5a5	6
-	test_h_gr32	stacktop er7
-.endif
-
-	;; Jump over subroutine
-	jmp	_bsr
-
-bsr_jsr_func:	
-	test_ccr 0		; call should not affect ccr
-	mov.w	#0, r0
-	mov.w	#1, r1
-	mov.w	#2, r2
-	mov.w	#3, r3
-	mov.w	#4, r4
-	mov.w	#5, r5
-	mov.w	#6, r6
-	rts
-
-_bsr:	set_grs_a5a5
-.if (sim_cpu == h8300)
-	mov.w	#stacktop, r7
-.else
-	mov.l	#stacktop, er7
-.endif
-	set_ccr_zero
-	bsr	bsr_jsr_func
-
-	test_h_gr16	0 r0
-	test_h_gr16	1 r1
-	test_h_gr16	2 r2
-	test_h_gr16	3 r3
-	test_h_gr16	4 r4
-	test_h_gr16	5 r5
-	test_h_gr16	6 r6
-.if (sim_cpu == h8300)
-;;; 	test_h_gr16	stacktop, r7	; FIXME
-.else
-	test_h_gr32	stacktop, er7
-.endif
-
-_jsr:	set_grs_a5a5
-.if (sim_cpu == h8300)
-	mov.w	#stacktop, r7
-.else
-	mov.l	#stacktop, er7
-.endif
-	set_ccr_zero
-	jsr	bsr_jsr_func
-
-	test_h_gr16	0 r0
-	test_h_gr16	1 r1
-	test_h_gr16	2 r2
-	test_h_gr16	3 r3
-	test_h_gr16	4 r4
-	test_h_gr16	5 r5
-	test_h_gr16	6 r6
-.if (sim_cpu == h8300)
-;;; 	test_h_gr16	stacktop, r7	; FIXME
-.else
-	test_h_gr32	stacktop, er7
-.endif
-
-.if (sim_cpu)			; not zero ie. not h8300
-_trapa:
-	set_grs_a5a5
-	mov.l	#trap_handler, er7	; trap vector
-	mov.l	er7, @0x2c
-	mov.l	#stacktop, er7
-	set_ccr_zero
-	trapa	#3
-
-	test_cc_clear		; ccr should be restored by rte
-	test_h_gr16	0x10 r0
-	test_h_gr16	0x11 r1
-	test_h_gr16	0x12 r2
-	test_h_gr16	0x13 r3
-	test_h_gr16	0x14 r4
-	test_h_gr16	0x15 r5
-	test_h_gr16	0x16 r6
-	test_h_gr32	stacktop er7
-.endif
-
-.if (sim_cpu == h8sx)
-_rtsl:				; Test rts/l insn.
-	set_grs_a5a5
-	mov	#0,r0l
-	mov	#1,r1l
-	mov	#2,r2l
-	mov	#3,r3l
-	mov	#4,r4l
-	mov	#5,r5l
-	mov	#6,r6l
-	mov	#stacktop, er7
-
-	jsr	rtsl1_func
-	test_h_gr32	0xa5a5a500 er0
-	test_h_gr32	0xa5a5a501 er1
-	test_h_gr32	0xa5a5a502 er2
-	test_h_gr32	0xa5a5a503 er3
-	test_h_gr32	0xa5a5a504 er4
-	test_h_gr32	0xa5a5a505 er5
-	test_h_gr32	0xa5a5a506 er6
-	test_h_gr32	stacktop   er7
-
-	jsr	rtsl2_func
-	test_h_gr32	0xa5a5a500 er0
-	test_h_gr32	0xa5a5a501 er1
-	test_h_gr32	0xa5a5a502 er2
-	test_h_gr32	0xa5a5a503 er3
-	test_h_gr32	0xa5a5a504 er4
-	test_h_gr32	0xa5a5a505 er5
-	test_h_gr32	0xa5a5a506 er6
-	test_h_gr32	stacktop   er7
-
-	jsr	rtsl3_func
-	test_h_gr32	0xa5a5a500 er0
-	test_h_gr32	0xa5a5a501 er1
-	test_h_gr32	0xa5a5a502 er2
-	test_h_gr32	0xa5a5a503 er3
-	test_h_gr32	0xa5a5a504 er4
-	test_h_gr32	0xa5a5a505 er5
-	test_h_gr32	0xa5a5a506 er6
-	test_h_gr32	stacktop   er7
-
-	jsr	rtsl4_func
-	test_h_gr32	0xa5a5a500 er0
-	test_h_gr32	0xa5a5a501 er1
-	test_h_gr32	0xa5a5a502 er2
-	test_h_gr32	0xa5a5a503 er3
-	test_h_gr32	0xa5a5a504 er4
-	test_h_gr32	0xa5a5a505 er5
-	test_h_gr32	0xa5a5a506 er6
-	test_h_gr32	stacktop   er7
-.endif				; h8sx
-
-	pass
-
-	exit 0
-
-	;; Handler for a software exception (trap).
-trap_handler:
-	;; Test the 'i' interrupt mask flag.
-	stc	ccr, r0l
-	test_h_gr8	0x80, r0l
-	;; Change the registers (so we know we've been here)
-	mov.w	#0x10, r0
-	mov.w	#0x11, r1
-	mov.w	#0x12, r2
-	mov.w	#0x13, r3
-	mov.w	#0x14, r4
-	mov.w	#0x15, r5
-	mov.w	#0x16, r6
-	;; Change the ccr (which will be restored by RTE)
-	orc	#0xff, ccr
-	rte
-
-.if (sim_cpu == h8sx)
-	;; Functions for testing rts/l
-rtsl1_func:			; Save and restore R0
-	push.l	er0
-	;; Now modify it, and verify the modification.
-	mov	#0xfeedface, er0
-	test_h_gr32 0xfeedface, er0
-	;; Then use rts/l to restore them and return.
-	rts/l	er0
-
-rtsl2_func:			; Save and restore R5 and R6
-	push.l	er5
-	push.l	er6
-	;; Now modify them, and verify the modification.
-	mov	#0xdeadbeef, er5
-	mov	#0xfeedface, er6
-	test_h_gr32 0xdeadbeef, er5
-	test_h_gr32 0xfeedface, er6
-	;; Then use rts/l to restore them and return.
-	rts/l	(er5-er6)
-
-rtsl3_func:			; Save and restore R4, R5, and R6
-	push.l	er4
-	push.l	er5
-	push.l	er6
-	;; Now modify them, and verify the modification.
-	mov	#0xdeafcafe, er4
-	mov	#0xdeadbeef, er5
-	mov	#0xfeedface, er6
-	test_h_gr32 0xdeafcafe, er4
-	test_h_gr32 0xdeadbeef, er5
-	test_h_gr32 0xfeedface, er6
-	;; Then use rts/l to restore them and return.
-	rts/l	(er4-er6)
-
-rtsl4_func:			; Save and restore R0 - R3
-	push.l	er0
-	push.l	er1
-	push.l	er2
-	push.l	er3
-	;; Now modify them, and verify the modification.
-	mov	#0xdadacafe, er0
-	mov	#0xfeedbeef, er1
-	mov	#0xdeadface, er2
-	mov	#0xf00dd00d, er3
-	test_h_gr32 0xdadacafe, er0
-	test_h_gr32 0xfeedbeef, er1
-	test_h_gr32 0xdeadface, er2
-	test_h_gr32 0xf00dd00d, er3
-	;; Then use rts/l to restore them and return.
-	rts/l	(er0-er3)
-.endif				; h8sx
diff --git a/sim/testsuite/sim/h8300/stc.s b/sim/testsuite/sim/h8300/stc.s
deleted file mode 100644
index 232bd5a96eb..00000000000
--- a/sim/testsuite/sim/h8300/stc.s
+++ /dev/null
@@ -1,401 +0,0 @@
-# Hitachi H8 testcase 'stc'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-	.data
-byte_dest1:
-	.byte	0
-	.byte	0
-byte_dest2:
-	.byte	0
-	.byte	0
-byte_dest3:
-	.byte	0
-	.byte	0
-byte_dest4:
-	.byte	0
-	.byte	0
-byte_dest5:
-	.byte	0
-	.byte	0
-byte_dest6:
-	.byte	0
-	.byte	0
-byte_dest7:
-	.byte	0
-	.byte	0
-byte_dest8:
-	.byte	0
-	.byte	0
-byte_dest9:
-	.byte	0
-	.byte	0
-byte_dest10:
-	.byte	0
-	.byte	0
-byte_dest11:
-	.byte	0
-	.byte	0
-byte_dest12:
-	.byte	0
-	.byte	0
-	
-	start
-
-stc_ccr_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0xff, ccr	; test value
-	stc	ccr, r0h	; copy test value to r0h
-
-	test_h_gr16  0xffa5 r0	; ff in r0h, a5 in r0l
-.if (sim_cpu)			; h/s/sx
-	test_h_gr32  0xa5a5ffa5 er0	; ff in r0h, a5 everywhere else
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8300s || sim_cpu == h8sx)	; Earlier versions, no exr
-stc_exr_reg8:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0x87, exr	; set exr to 0x87
-	stc	exr, r0l	; retrieve and check exr value
-	cmp.b	#0x87, r0l
-	beq	.L21
-	fail
-.L21:
-	test_h_gr32  0xa5a5a587 er0	; Register 0 modified by test procedure.
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_ccr_abs16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0xff, ccr
-	stc	ccr, @byte_dest1:16	; abs16 dest
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_exr_abs16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0x87, exr
-	stc	exr, @byte_dest2:16	; abs16 dest
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_ccr_abs32:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0xff, ccr
-	stc	ccr, @byte_dest3:32	; abs32 dest
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_exr_abs32:
-	set_grs_a5a5
-	set_ccr_zero
-
-	ldc	#0x87, exr
-	stc	exr, @byte_dest4:32	; abs32 dest
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_ccr_disp16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_dest5-1, er1
-	ldc	#0xff, ccr
-	stc	ccr, @(1:16,er1)	; disp16 dest (5)
-
-	test_h_gr32 byte_dest5-1, er1	; er1 still contains address
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_exr_disp16:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_dest6+1, er1
-	ldc	#0x87, exr
-	stc	exr, @(-1:16,er1)	; disp16 dest (6)
-
-	test_h_gr32 byte_dest6+1, er1	; er1 still contains address
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_ccr_disp32:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_dest7-1, er1
-	ldc	#0xff, ccr
-	stc	ccr, @(1:32,er1)	; disp32 dest (7)
-
-	test_h_gr32 byte_dest7-1, er1	; er1 still contains address
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_exr_disp32:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_dest8+1, er1
-	ldc	#0x87, exr
-	stc	exr, @(-1:32,er1)	; disp16 dest (8)
-
-	test_h_gr32 byte_dest8+1, er1	; er1 still contains address
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_ccr_predecr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_dest9+2, er1
-	ldc	#0xff, ccr
-	stc	ccr, @-er1	; predecr dest (9)
-
-	test_h_gr32  byte_dest9 er1	; er1 still contains address
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-stc_exr_predecr:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_dest10+2, er1
-	ldc	#0x87, exr
-	stc	exr, @-er1	; predecr dest (10)
-
-	test_h_gr32 byte_dest10, er1	; er1 still contains address
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-stc_ccr_ind:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_dest11, er1
-	ldc	#0xff, ccr
-	stc	ccr, @er1	; postinc dest (11)
-
-	test_h_gr32 byte_dest11, er1	; er1 still contains address
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-stc_exr_ind:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#byte_dest12, er1
-	ldc	#0x87, exr
-	stc	exr, @er1, exr	; postinc dest (12)
-
-	test_h_gr32 byte_dest12, er1	; er1 still contains address
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.endif
-	
-.if (sim_cpu == h8sx)		; New vbr and sbr registers for h8sx
-stc_sbr_reg:
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#0xaaaaaaaa, er0
-	ldc	er0, sbr	; set sbr to 0xaaaaaaaa
- 	stc	sbr, er1	; retreive and check sbr value
-
-	test_h_gr32 0xaaaaaaaa er1
-	test_h_gr32 0xaaaaaaaa er0 ; Register 0 modified by test procedure.
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-stc_vbr_reg:	
-	set_grs_a5a5
-	set_ccr_zero
-
-	mov	#0xaaaaaaaa, er0
-	ldc	er0, vbr	; set sbr to 0xaaaaaaaa
-	stc	vbr, er1	; retreive and check sbr value
-
-	test_h_gr32 0xaaaaaaaa er1
-	test_h_gr32 0xaaaaaaaa er0 ; Register 0 modified by test procedure.
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-check_results:
-	;; Now check results
-	mov @byte_dest1, r0h
-	cmp.b	#0xff, r0h
-	beq .L1
-	fail
-
-.L1:	mov @byte_dest2, r0h
-	cmp.b	#0x87, r0h
-	beq .L2
-	fail
-
-.L2:	mov @byte_dest3, r0h
-	cmp.b	#0xff, r0h
-	beq .L3
-	fail
-
-.L3:	mov @byte_dest4, r0h
-	cmp.b	#0x87, r0h
-	beq .L4
-	fail
-
-.L4:	mov @byte_dest5, r0h
-	cmp.b	#0xff, r0h
-	beq .L5
-	fail
-
-.L5:	mov @byte_dest6, r0h
-	cmp.b	#0x87, r0h
-	beq .L6
-	fail
-
-.L6:	mov @byte_dest7, r0h
-	cmp.b	#0xff, r0h
-	beq .L7
-	fail
-
-.L7:	mov @byte_dest8, r0h
-	cmp.b	#0x87, r0h
-	beq .L8
-	fail
-
-.L8:	mov @byte_dest9, r0h
-	cmp.b	#0xff, r0h
-	beq .L9
-	fail
-
-.L9:	mov @byte_dest10, r0h
-	cmp.b	#0x87, r0h
-	beq .L10
-	fail
-
-.L10:	mov @byte_dest11, r0h
-	cmp.b	#0xff, r0h
-	beq .L11
-	fail
-
-.L11:	mov @byte_dest12, r0h
-	cmp.b	#0x87, r0h
-	beq .L12
-	fail
-
-.L12:	
-.endif
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/subb.s b/sim/testsuite/sim/h8300/subb.s
deleted file mode 100644
index 01832948e80..00000000000
--- a/sim/testsuite/sim/h8300/subb.s
+++ /dev/null
@@ -1,289 +0,0 @@
-# Hitachi H8 testcase 'sub.b'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# sub.b #xx:8, rd	; <illegal>
-	# sub.b #xx:8, @erd	;         7 d rd ???? a ???? xxxxxxxx
-	# sub.b #xx:8, @erd+	; 0 1 7 4 6 c rd 1??? a ???? xxxxxxxx
-	# sub.b #xx:8, @erd-	; 0 1 7 6 6 c rd 1??? a ???? xxxxxxxx
-	# sub.b rs, rd		;                     1 8 rs rd
-	# sub.b reg8, @erd	;         7 d rd ???? 1 8 rs ????
-	# sub.b reg8, @erd+	;         0 1 7     9 8 rd 3 rs
-	# sub.b reg8, @erd-	;         0 1 7     9 a rd 3 rs
-	#
-
-	# Coming soon:
-	# sub.b #xx:8, @+erd	; 0 1 7 5 6 c rd 1??? a ???? xxxxxxxx
-	# sub.b #xx:8, @-erd	; 0 1 7 7 6 c rd 1??? a ???? xxxxxxxx
-	# sub.b reg8, @+erd	;         0 1 7     9 9 rd 3 rs
-	# sub.b reg8, @-erd	;         0 1 7     9 b rd 3 rs
-	# ...
-
-.data
-pre_byte:	.byte 0
-byte_dest:	.byte 0xa5
-post_byte:	.byte 0
-
-	start
-	
-.if (0)				; Guess what?  Sub.b immediate reg8 is illegal!
-sub_b_imm8_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  sub.b #xx:8,Rd
-	sub.b	#5, r0l		; Immediate 8-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa5a0 r0	; sub result:	a5 - 5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5a0 er0	; sub result:	 a5 - 5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-.if (sim_cpu == h8sx)
-sub_b_imm8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  sub.b #xx:8,@eRd
-	mov	#byte_dest, er0
-	sub.b	#5:8, @er0	; Immediate 8-bit src, reg indirect dst
-;;; 	.word	0x7d00
-;;; 	.word	0xa105
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 byte_dest, er0	; er0 still contains address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa0, r0l
-	beq	.L1
-	fail
-.L1:
-
-sub_b_imm8_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  sub.b #xx:8,@eRd+
-	mov	#byte_dest, er0
-	sub.b	#5:8, @er0+	; Immediate 8-bit src, reg post-incr dest
-;;; 	.word	0x0174
-;;; 	.word	0x6c08
-;;; 	.word	0xa105
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 post_byte, er0	; er0 still contains address plus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x9b, r0l
-	beq	.L2
-	fail
-.L2:
-
-sub_b_imm8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  sub.b #xx:8,@eRd-
-	mov	#byte_dest, er0
-	sub.b	#5:8, @er0-	; Immediate 8-bit src, reg post-decr dest
-;;; 	.word	0x0176
-;;; 	.word	0x6c08
-;;; 	.word	0xa105
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 pre_byte, er0	; er0 still contains address minus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x96, r0l
-	beq	.L3
-	fail
-.L3:
-
-.endif
-
-sub_b_reg8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  sub.b Rs,Rd
-	mov.b	#5, r0h
-	sub.b	r0h, r0l	; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0x05a0 r0	; sub result:	a5 - 5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a505a0 er0	; sub result:	a5 - 5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-.if (sim_cpu == h8sx)
-sub_b_reg8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  sub.b rs8,@eRd	; Subx to register indirect
-	mov	#byte_dest, er0
-	mov	#5, r1l
-	sub.b	r1l, @er0	; reg8 src, reg indirect dest
-;;; 	.word	0x7d00
-;;; 	.word	0x1890
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest er0	; er0 still contains address
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x91, r0l
-	beq	.L4
-	fail
-.L4:
-
-sub_b_reg8_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  sub.b rs8,@eRd+	; Subx to register indirect
-	mov	#byte_dest, er0
-	mov	#5, r1l
-	sub.b	r1l, @er0+	; reg8 src, reg indirect dest
-;;; 	.word	0x0179
-;;; 	.word	0x8039
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 post_byte er0	; er0 still contains address plus one
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x8c, r0l
-	beq	.L5
-	fail
-.L5:
-
-sub_b_reg8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  sub.b rs8,@eRd-	; Subx to register indirect
-	mov	#byte_dest, er0
-	mov	#5, r1l
-	sub.b	r1l, @er0-	; reg8 src, reg indirect dest
-;;; 	.word	0x0179
-;;; 	.word	0xa039
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 pre_byte er0	; er0 still contains address minus one
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x87, r0l
-	beq	.L6
-	fail
-.L6:
-
-.endif
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/subl.s b/sim/testsuite/sim/h8300/subl.s
deleted file mode 100644
index 7f62f11a325..00000000000
--- a/sim/testsuite/sim/h8300/subl.s
+++ /dev/null
@@ -1,91 +0,0 @@
-# Hitachi H8 testcase 'sub.l'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-
-.if (sim_cpu == h8sx)		; 
-sub_l_imm3:			; 3-bit immediate mode only for h8sx
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  sub.l #xx:3,eRd	; Immediate 3-bit operand
-	sub.l	#7:3, er0
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr32 0xa5a5a59e er0	; sub result:	a5a5 - 7
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-sub_l_imm16:			; sub immediate 16-bit value
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  sub.l #xx:16,eRd	; Immediate 16-bit operand
-	sub.l	#0x1111:16, er0
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0x9494 r0	; sub result:	a5a5 - 1111
-	test_h_gr32 0xa5a59494 er0	; sub result:	a5a5 - 1111
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.endif
-	
-sub_l_imm32:
-	;; sub.l immediate not available in h8300 mode.
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  sub.l #xx:32,Rd
-	sub.l	#0x11111111, er0	; Immediate 32-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr32 0x94949494 er0	; sub result:	a5a5a5a5 - 11111111
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-sub.l.reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  add.l Rs,Rd
-	mov.l	#0x11111111, er1
-	sub.l	er1, er0	; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr32 0x94949494 er0	; sub result:	a5a5a5a5 - 11111111
-	test_h_gr32 0x11111111 er1
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/subs.s b/sim/testsuite/sim/h8300/subs.s
deleted file mode 100644
index 1bb5eea754d..00000000000
--- a/sim/testsuite/sim/h8300/subs.s
+++ /dev/null
@@ -1,74 +0,0 @@
-# Hitachi H8 testcase 'subs'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# subs #1, erd		; 1 b 0 0erd
-	# subs #2, erd		; 1 b 8 0erd
-	# subs #4, erd		; 1 b 9 0erd
-	#
-
-	start
-.if (sim_cpu)			; 32 bit only
-subs_1:	
-	set_grs_a5a5
-	set_ccr_zero
-
-	subs	#1, er0
-
-	test_cc_clear		; subs should not affect any condition codes
-	test_h_gr32  0xa5a5a5a4 er0	; result of subs #1
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subs_2:
-	set_grs_a5a5
-	set_ccr_zero
-
-	subs	#2, er0
-
-	test_cc_clear		; subs should not affect any condition codes
-	test_h_gr32  0xa5a5a5a3 er0	; result of subs #2
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subs_4:	
-	set_grs_a5a5
-	set_ccr_zero
-
-	subs	#4, er0
-
-	test_cc_clear		; subs should not affect any condition codes
-	test_h_gr32  0xa5a5a5a1 er0	; result of subs #4
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	pass
-.endif	
-	exit 0
diff --git a/sim/testsuite/sim/h8300/subw.s b/sim/testsuite/sim/h8300/subw.s
deleted file mode 100644
index 23702507063..00000000000
--- a/sim/testsuite/sim/h8300/subw.s
+++ /dev/null
@@ -1,78 +0,0 @@
-# Hitachi H8 testcase 'sub.w'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-.if (sim_cpu == h8sx)		; 3-bit immediate mode only for h8sx
-sub_w_imm3:			; sub.w immediate not available in h8300 mode. 
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  sub.w #xx:3,Rd	; Immediate 3-bit operand
-	sub.w	#7:3, r0
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa59e r0	; sub result:	a5a5 - 7
-	test_h_gr32 0xa5a5a59e er0	; sub result:	a5a5 - 7
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-	
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-sub_w_imm16:			; sub.w immediate not available in h8300 mode. 
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  sub.w #xx:16,Rd
-	sub.w	#0x111, r0	; Immediate 16-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa494 r0	; sub result:	a5a5 - 111
-	test_h_gr32 0xa5a5a494 er0	; sub result:	a5a5 - 111
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-	
-sub.w.reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  sub.w Rs,Rd
-	mov.w	#0x111, r1
-	sub.w	r1, r0		; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa494 r0	; sub result:	a5a5 - 111
-	test_h_gr16 0x0111 r1
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a494 er0	; sub result:	a5a5 - 111
-	test_h_gr32 0xa5a50111 er1
-.endif
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/subx.s b/sim/testsuite/sim/h8300/subx.s
deleted file mode 100644
index 78656bc2fd8..00000000000
--- a/sim/testsuite/sim/h8300/subx.s
+++ /dev/null
@@ -1,1010 +0,0 @@
-# Hitachi H8 testcase 'subx'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# subx.b #xx:8, rd8	; b rd8 xxxxxxxx
-	# subx.b #xx:8, @erd	; 7 d erd ???? b ???? xxxxxxxx 
-	# subx.b #xx:8, @erd-	; 0 1 7 6 6 c erd 1??? b ???? xxxxxxxx
-	# subx.b rs8, rd8	; 1 e rs8 rd8
-	# subx.b rs8, @erd	; 7 d erd ???? 1 e rs8 ????
-	# subx.b rs8, @erd-	; 0 1 7 6 6 c erd 1??? 1 e rs8 ????
-	# subx.b @ers, rd8	; 7 c ers ???? 1 e ???? rd8
-	# subx.b @ers-, rd8	; 0 1 7 6 6 c ers 00?? 1 e ???? rd8
-	# subx.b @ers, @erd	; 0 1 7 4 6 8 ers d 0 erd 3 ???? 
-	# subx.b @ers-, @erd-	; 0 1 7 6 6 c ers d a erd 3 ????
-	#
-	# word ops
-	# long ops	
-
-.data
-byte_src:	.byte 0x5
-byte_dest:	.byte 0
-
-	.align 2
-word_src:	.word 0x505
-word_dest:	.word 0
-
-	.align 4
-long_src:	.long 0x50505
-long_dest:	.long 0
-
-
-	start
-
-subx_b_imm8_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  subx.b #xx:8,Rd	; Subx with carry initially zero.
-	subx.b	#5, r0l		; Immediate 8-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0xa5a0 r0	; sub result:	a5 - 5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5a0 er0	; sub result:	 a5 - 5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-subx_b_imm8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  subx.b #xx:8,Rd	; Subx with carry initially one.
-	set_carry_flag
-	subx.b	#4, r0l		; Immediate 8-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0xa5a0 r0	; sub result:	a5 - (4 + 1)
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a5a0 er0	; sub result:	 a5 - (4 + 1)
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-subx_b_imm8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b #xx:8,@eRd	; Subx to register indirect
-	mov	#byte_dest, er0
-	mov.b	#0xa5, @er0
-	set_ccr_zero
-	subx.b	#5, @er0
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest er0	; er0 still contains subress
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.b	#0xa0, @byte_dest
-	beq	.Lb1
-	fail
-.Lb1:
-
-subx_b_imm8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b #xx:8,@eRd-	; Subx to register post-decrement
-	mov	#byte_dest, er0
-	mov.b	#0xa5, @er0
-	set_ccr_zero
-	subx.b	#5, @er0-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest-1 er0	; er0 contains subress minus one
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.b	#0xa0, @byte_dest
-	beq	.Lb2
-	fail
-.Lb2:
-.endif
-
-subx_b_reg8_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b Rs,Rd	; subx with carry initially zero
-	mov.b	#5, r0h
-	set_ccr_zero
-	subx.b	r0h, r0l	; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0x05a0 r0	; sub result:	a5 - 5
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a505a0 er0	; sub result:	a5 - 5
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_b_reg8_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b Rs,Rd	; subx with carry initially one
-	mov.b	#4, r0h
-	set_ccr_zero
-	set_carry_flag
-	subx.b	r0h, r0l	; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0x04a0 r0	; sub result:	a5 - (4 + 1)
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a504a0 er0	; sub result:	a5 - (4 + 1)
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-subx_b_reg8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b rs8,@eRd	; Subx to register indirect
-	mov	#byte_dest, er0
-	mov.b	#0xa5, @er0
-	mov.b	#5, r1l
-	set_ccr_zero
-	subx.b	r1l, @er0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest er0	; er0 still contains subress
-	test_h_gr32 0xa5a5a505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.b	#0xa0, @byte_dest
-	beq	.Lb3
-	fail
-.Lb3:
-
-subx_b_reg8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b rs8,@eRd-	; Subx to register post-decrement
-	mov	#byte_dest, er0
-	mov.b	#0xa5, @er0
-	mov.b	#5, r1l
-	set_ccr_zero
-	subx.b	r1l, @er0-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest-1 er0	; er0 contains subress minus one
-	test_h_gr32 0xa5a5a505 er1	; er1 contains the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.b	#0xa0, @byte_dest
-	beq	.Lb4
-	fail
-.Lb4:
-
-subx_b_rsind_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b @eRs,rd8	; Subx from reg indirect to reg
-	mov	#byte_src, er0
-	set_ccr_zero
-	subx.b	@er0, r1l
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_src er0	; er0 still contains subress
-	test_h_gr32 0xa5a5a5a0 er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_b_rspostdec_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b @eRs-,rd8	; Subx to register post-decrement
-	mov	#byte_src, er0
-	set_ccr_zero
-	subx.b	@er0-, r1l
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_src-1 er0	; er0 contains subress minus one
-	test_h_gr32 0xa5a5a5a0 er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_b_rsind_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.b @eRs,rd8	; Subx from reg indirect to reg
-	mov	#byte_src, er0
-	mov	#byte_dest, er1
-	mov.b	#0xa5, @er1
-	set_ccr_zero
-	subx.b	@er0, @er1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_src er0	; er0 still contains src subress
-	test_h_gr32 byte_dest er1	; er1 still contains dst subress
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the sub to memory.
-	cmp.b	#0xa0, @byte_dest
-	beq	.Lb5
-	fail
-.Lb5:
-
-subx_b_rspostdec_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	mov	#byte_src, er0
-	mov	#byte_dest, er1
-	mov.b	#0xa5, @er1
-	set_ccr_zero
-	;;  subx.b @eRs-,@erd-	; Subx post-decrement to post-decrement
-	subx.b	@er0-, @er1-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_src-1 er0	; er0 contains src subress minus one
-	test_h_gr32 byte_dest-1 er1	; er1 contains dst subress minus one
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the sub to memory.
-	cmp.b	#0xa0, @byte_dest
-	beq	.Lb6
-	fail
-.Lb6:
-
-subx_w_imm16_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  subx.w #xx:16,Rd	; Subx with carry initially zero.
-	subx.w	#0x505, r0	; Immediate 16-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0xa0a0 r0	; sub result:	0xa5a5 + 0x505
-	test_h_gr32 0xa5a5a0a0 er0	; sub result:	 0xa5a5 + 0x505
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-subx_w_imm16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  subx.w #xx:16,Rd	; Subx with carry initially one.
-	set_carry_flag
-	subx.w	#0x504, r0	; Immediate 16-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr16 0xa0a0 r0	; sub result:	0xa5a5 + 0x505 + 1
-	test_h_gr32 0xa5a5a0a0 er0	; sub result:	 0xa5a5 + 0x505 + 1
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-subx_w_imm16_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w #xx:16,@eRd	; Subx to register indirect
-	mov	#word_dest, er0
-	mov.w	#0xa5a5, @er0
-	set_ccr_zero
-	subx.w	#0x505, @er0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_dest er0	; er0 still contains subress
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.w	#0xa0a0, @word_dest
-	beq	.Lw1
-	fail
-.Lw1:
-
-subx_w_imm16_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w #xx:16,@eRd-	; Subx to register post-decrement
-	mov	#word_dest, er0
-	mov.w	#0xa5a5, @er0
-	set_ccr_zero
-	subx.w	#0x505, @er0-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_dest-2 er0	; er0 contains subress minus one
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.w	#0xa0a0, @word_dest
-	beq	.Lw2
-	fail
-.Lw2:
-
-subx_w_reg16_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w Rs,Rd	; subx with carry initially zero
-	mov.w	#0x505, e0
-	set_ccr_zero
-	subx.w	e0, r0		; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0x0505a0a0 er0	; sub result:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_w_reg16_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w Rs,Rd	; subx with carry initially one
-	mov.w	#0x504, e0
-	set_ccr_zero
-	set_carry_flag
-	subx.w	e0, r0		; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0x0504a0a0 er0	; sub result:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-subx_w_reg16_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w rs8,@eRd	; Subx to register indirect
-	mov	#word_dest, er0
-	mov.w	#0xa5a5, @er0
-	mov.w	#0x505, r1
-	set_ccr_zero
-	subx.w	r1, @er0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_dest er0	; er0 still contains subress
-	test_h_gr32 0xa5a50505 er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.w	#0xa0a0, @word_dest
-	beq	.Lw3
-	fail
-.Lw3:
-
-subx_w_reg16_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w rs8,@eRd-	; Subx to register post-decrement
-	mov	#word_dest, er0
-	mov.w	#0xa5a5, @er0
-	mov.w	#0x505, r1
-	set_ccr_zero
-	subx.w	r1, @er0-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_dest-2 er0	; er0 contains subress minus one
-	test_h_gr32 0xa5a50505  er1	; er1 contains the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.w	#0xa0a0, @word_dest
-	beq	.Lw4
-	fail
-.Lw4:
-
-subx_w_rsind_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w @eRs,rd8	; Subx from reg indirect to reg
-	mov	#word_src, er0
-	set_ccr_zero
-	subx.w	@er0, r1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_src er0	; er0 still contains subress
-	test_h_gr32 0xa5a5a0a0 er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_w_rspostdec_reg16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w @eRs-,rd8	; Subx to register post-decrement
-	mov	#word_src, er0
-	set_ccr_zero
-	subx.w	@er0-, r1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_src-2 er0	; er0 contains subress minus one
-	test_h_gr32 0xa5a5a0a0 er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_w_rsind_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w @eRs,rd8	; Subx from reg indirect to reg
-	mov	#word_src, er0
-	mov	#word_dest, er1
-	mov.w	#0xa5a5, @er1
-	set_ccr_zero
-	subx.w	@er0, @er1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_src er0	; er0 still contains src subress
-	test_h_gr32 word_dest er1	; er1 still contains dst subress
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the sub to memory.
-	cmp.w	#0xa0a0, @word_dest
-	beq	.Lw5
-	fail
-.Lw5:
-
-subx_w_rspostdec_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.w @eRs-,rd8	; Subx to register post-decrement
-	mov	#word_src, er0
-	mov	#word_dest, er1
-	mov.w	#0xa5a5, @er1
-	set_ccr_zero
-	subx.w	@er0-, @er1-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 word_src-2 er0	; er0 contains src subress minus one
-	test_h_gr32 word_dest-2 er1	; er1 contains dst subress minus one
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the sub to memory.
-	cmp.w	#0xa0a0, @word_dest
-	beq	.Lw6
-	fail
-.Lw6:
-
-subx_l_imm32_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  subx.l #xx:32,Rd	; Subx with carry initially zero.
-	subx.l	#0x50505, er0	; Immediate 32-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0xa5a0a0a0 er0	; sub result:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-subx_l_imm32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  subx.l #xx:32,Rd	; Subx with carry initially one.
-	set_carry_flag
-	subx.l	#0x50504, er0	; Immediate 32-bit operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0xa5a0a0a0 er0	; sub result:
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-subx_l_imm32_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l #xx:32,@eRd	; Subx to register indirect
-	mov	#long_dest, er0
-	mov.l	#0xa5a5a5a5, @er0
-	set_ccr_zero
-	subx.l	#0x50505, @er0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_dest er0	; er0 still contains subress
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.l	#0xa5a0a0a0, @long_dest
-	beq	.Ll1
-	fail
-.Ll1:
-
-subx_l_imm32_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l #xx:32,@eRd-	; Subx to register post-decrement
-	mov	#long_dest, er0
-	mov.l	#0xa5a5a5a5, @er0
-	set_ccr_zero
-	subx.l	#0x50505, @er0-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_dest-4 er0	; er0 contains subress minus one
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.l	#0xa5a0a0a0, @long_dest
-	beq	.Ll2
-	fail
-.Ll2:
-
-subx_l_reg32_0:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l Rs,Rd	; subx with carry initially zero
-	mov.l	#0x50505, er0
-	set_ccr_zero
-	subx.l	er0, er1	; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0x50505    er0	; sub load
-	test_h_gr32 0xa5a0a0a0 er1	; sub result:
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_l_reg32_1:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l Rs,Rd	; subx with carry initially one
-	mov.l	#0x50504, er0
-	set_ccr_zero
-	set_carry_flag
-	subx.l	er0, er1	; Register operand
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 0x50504    er0	; sub result:
-	test_h_gr32 0xa5a0a0a0 er1	; sub result:
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-subx_l_reg32_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l rs8,@eRd	; Subx to register indirect
-	mov	#long_dest, er0
-	mov.l	er1, @er0
-	mov.l	#0x50505, er1
-	set_ccr_zero
-	subx.l	er1, @er0
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_dest er0	; er0 still contains subress
-	test_h_gr32 0x50505   er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.l	#0xa5a0a0a0, @long_dest
-	beq	.Ll3
-	fail
-.Ll3:
-
-subx_l_reg32_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l rs8,@eRd-	; Subx to register post-decrement
-	mov	#long_dest, er0
-	mov.l	er1, @er0
-	mov.l	#0x50505, er1
-	set_ccr_zero
-	subx.l	er1, @er0-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_dest-4 er0	; er0 contains subress minus one
-	test_h_gr32 0x50505     er1	; er1 contains the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the sub to memory.
-	cmp.l	#0xa5a0a0a0, @long_dest
-	beq	.Ll4
-	fail
-.Ll4:
-
-subx_l_rsind_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l @eRs,rd8	; Subx from reg indirect to reg
-	mov	#long_src, er0
-	set_ccr_zero
-	subx.l	@er0, er1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_src er0	; er0 still contains subress
-	test_h_gr32 0xa5a0a0a0 er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_l_rspostdec_reg32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l @eRs-,rd8	; Subx to register post-decrement
-	mov	#long_src, er0
-	set_ccr_zero
-	subx.l	@er0-, er1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_src-4 er0	; er0 contains subress minus one
-	test_h_gr32 0xa5a0a0a0 er1	; er1 contains the sum
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-subx_l_rsind_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l @eRs,rd8	; Subx from reg indirect to reg
-	mov	#long_src, er0
-	mov	#long_dest, er1
-	mov.l	er2, @er1
-	set_ccr_zero
-	subx.l	@er0, @er1
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_src er0	; er0 still contains src subress
-	test_h_gr32 long_dest er1	; er1 still contains dst subress
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the sub to memory.
-	cmp.l	#0xa5a0a0a0, @long_dest
-	beq	.Ll5
-	fail
-.Ll5:
-
-subx_l_rspostdec_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-
-	;;  subx.l @eRs-,rd8	; Subx to register post-decrement
-	mov	#long_src, er0
-	mov	#long_dest, er1
-	mov.l	er2, @er1
-	set_ccr_zero
-	subx.l	@er0-, @er1-
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 long_src-4 er0	; er0 contains src subress minus one
-	test_h_gr32 long_dest-4 er1	; er1 contains dst subress minus one
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	;; Now check the result of the sub to memory.
-	cmp.l	#0xa5a0a0a0, @long_dest
-	beq	.Ll6
-	fail
-.Ll6:
-.endif
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/tas.s b/sim/testsuite/sim/h8300/tas.s
deleted file mode 100644
index b8aebd80dee..00000000000
--- a/sim/testsuite/sim/h8300/tas.s
+++ /dev/null
@@ -1,80 +0,0 @@
-# Hitachi H8 testcase 'tas'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	.data
-byte_dst:	.byte 0
-
-	start
-
-tas_ind:			; test and set instruction
-	set_grs_a5a5
-	mov	#byte_dst, er4
-	set_ccr_zero
-	;; tas @erd
-	tas	@er4		; should set zero flag
-	test_carry_clear
-	test_neg_clear
-	test_ovf_clear
-	test_zero_set
-
-	tas	@er4		; should clear zero, set neg
-	test_carry_clear
-	test_neg_set
-	test_ovf_clear
-	test_zero_clear
-
-	test_gr_a5a5 0		; general regs have not been modified
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_h_gr32  byte_dst, er4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	mov.b	@byte_dst, r0l	; test variable has MSB set?
-	test_h_gr8 0x80 r0l
-
-.if (sim_cpu == h8sx)		; h8sx can use any register for tas
-tas_h8sx:			; test and set instruction
-	mov.b	#0, @byte_dst
-	set_grs_a5a5
-	mov	#byte_dst, er3
-	set_ccr_zero
-	;; tas @erd
-	tas	@er3		; should set zero flag
-	test_carry_clear
-	test_neg_clear
-	test_ovf_clear
-	test_zero_set
-
-	tas	@er3		; should clear zero, set neg
-	test_carry_clear
-	test_neg_set
-	test_ovf_clear
-	test_zero_clear
-
-	test_gr_a5a5 0		; general regs have not been modified
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_h_gr32  byte_dst, er3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	mov.b	@byte_dst, r0l	; test variable has MSB set?
-	test_h_gr8 0x80 r0l
-.endif				; h8sx
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/h8300/testutils.inc b/sim/testsuite/sim/h8300/testutils.inc
deleted file mode 100644
index 9c2c27a8d78..00000000000
--- a/sim/testsuite/sim/h8300/testutils.inc
+++ /dev/null
@@ -1,351 +0,0 @@
-# Support macros for the Hitachi H8 assembly test cases.
-
-; Set up a minimal machine state
-	.macro start
-	.equ	h8300,  0
-	.equ	h8300h, 1
-	.equ	h8300s, 2
-	.equ	h8sx,   3
-	.if (sim_cpu == h8300s)
-	.h8300s
-	.else
-	.if (sim_cpu == h8300h)
-	.h8300h
-	.else
-	.if (sim_cpu == h8sx)
-	.h8300sx
-	.endif
-	.endif
-	.endif
-
-	.text
-	.align 2
-	.global _start
-_start:
-	jmp	_main
-
-	.data
-	.align 2
-	.global pass_str
-	.global fail_str
-	.global ok_str
-	.global pass_loc
-	.global fail_loc
-	.global ok_loc
-pass_str:
-	.ascii "pass\n"
-fail_str:
-	.ascii "fail\n"
-ok_str:
-	.ascii "ok\n"
-pass_loc16:
-	.word pass_str
-pass_loc32:
-	.long pass_str
-fail_loc16:
-	.word fail_str
-fail_loc32:
-	.long fail_str
-ok_loc16:
-	.word ok_str
-ok_loc32:
-	.long ok_str
-	.text
-
-	.global _write_and_exit
-_write_and_exit:
-;ssize_t write(int fd, const void *buf, size_t count);
-;Integer arguments have to be zero extended.
-.if (sim_cpu)
-#if __INT_MAX__ == 32767
-	extu.l  er0
-#endif
-.endif
-	jsr	@@0xc7
-	mov	#0, r0
-	jmp 	_exit
-
-	.global _exit
-_exit:
-	mov.b	r0l, r0h
-	mov.w	#0xdead, r1
-	mov.w	#0xbeef, r2
-	sleep
-
-	.global _main
-_main:
-	.endm
-
-
-; Exit with an exit code
-	.macro exit code
-	mov.w	#\code, r0
-	jmp	_exit
-	.endm
-
-; Output "pass\n"
-	.macro pass
-	mov.w	#0, r0		; fd == stdout
-.if (sim_cpu == h8300)
-	mov.w	#pass_str, r1	; buf == "pass\n"
-	mov.w	#5, r2		; len == 5
-.else
-	mov.l	#pass_str, er1	; buf == "pass\n"
-	mov.l	#5, er2		; len == 5
-.endif
-	jmp	_write_and_exit
-	.endm
-
-; Output "fail\n"
-	.macro fail
-	mov.w	#0, r0		; fd == stdout
-.if (sim_cpu == h8300)
-	mov.w	#fail_str, r1	; buf == "fail\n"
-	mov.w	#5, r2		; len == 5
-.else
-	mov.l	#fail_str, er1	; buf == "fail\n"
-	mov.l	#5, er2		; len == 5
-.endif
-	jmp	_write_and_exit
-	.endm
-
-
-; Load an 8-bit immediate value into a general register
-; (reg must be r0l - r7l or r0h - r7h)
-	.macro mvi_h_gr8 val reg
-	mov.b	#\val, \reg
-	.endm
-
-; Load a 16-bit immediate value into a general register
-; (reg must be r0 - r7)
-	.macro mvi_h_gr16 val reg
-	mov.w	#\val, \reg
-	.endm
-
-; Load a 32-bit immediate value into a general register
-; (reg must be er0 - er7)
-	.macro mvi_h_gr32 val reg
-	mov.l	#\val, \reg
-	.endm
-
-; Test the value of an 8-bit immediate against a general register
-; (reg must be r0l - r7l or r0h - r7h)
-	.macro test_h_gr8 val reg
-	cmp.b	#\val, \reg
-	beq	.Ltest_gr8\@
-	fail
-.Ltest_gr8\@:
-	.endm
-
-; Test the value of a 16-bit immediate against a general register
-; (reg must be r0 - r7)
-	.macro test_h_gr16 val reg h=h l=l
-	.if (sim_cpu == h8300)
-	test_h_gr8 (\val >> 8) \reg\h
-	test_h_gr8 (\val & 0xff) \reg\l
-	.else
-	cmp.w	#\val, \reg
-	beq	.Ltest_gr16\@
-	fail
-.Ltest_gr16\@:
-	.endif
-	.endm
-
-; Test the value of a 32-bit immediate against a general register
-; (reg must be er0 - er7)
-	.macro test_h_gr32 val reg
-	cmp.l	#\val, \reg
-	beq	.Ltest_gr32\@
-	fail
-.Ltest_gr32\@:
-	.endm
-
-; Set a general register to the fixed pattern 'a5a5a5a5'
-	.macro set_gr_a5a5 reg
-	.if (sim_cpu == 0)
-	; h8300
-	mov.w	#0xa5a5, r\reg
-	.else
-	mov.l	#0xa5a5a5a5, er\reg
-	.endif
-	.endm
-
-; Set all general registers to the fixed pattern 'a5a5a5a5'
-	.macro set_grs_a5a5
-	.if (sim_cpu == 0)
-	; h8300
-	mov.w	#0xa5a5, r0
-	mov.w	#0xa5a5, r1
-	mov.w	#0xa5a5, r2
-	mov.w	#0xa5a5, r3
-	mov.w	#0xa5a5, r4
-	mov.w	#0xa5a5, r5
-	mov.w	#0xa5a5, r6
-	mov.w	#0xa5a5, r7
-	.else
-	mov.l	#0xa5a5a5a5, er0
-	mov.l	#0xa5a5a5a5, er1
-	mov.l	#0xa5a5a5a5, er2
-	mov.l	#0xa5a5a5a5, er3
-	mov.l	#0xa5a5a5a5, er4
-	mov.l	#0xa5a5a5a5, er5
-	mov.l	#0xa5a5a5a5, er6
-	mov.l	#0xa5a5a5a5, er7
-	.endif
-	.endm
-
-; Test that a general register contains the fixed pattern 'a5a5a5a5'
-	.macro test_gr_a5a5 reg
-	.if (sim_cpu == 0)
-	; h8300
-	test_h_gr16 0xa5a5 r\reg
-	.else
-	test_h_gr32 0xa5a5a5a5 er\reg
-	.endif
-	.endm
-
-; Test that all general regs contain the fixed pattern 'a5a5a5a5'
-	.macro test_grs_a5a5
-	test_gr_a5a5 0
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	.endm
-
-; Set condition code register to an explicit value
-	.macro set_ccr val
-	ldc	#\val, ccr
-	.endm
-
-; Set all condition code flags to zero
-	.macro set_ccr_zero
-	ldc	#0, ccr
-	.endm
-
-; Set carry flag true
-	.macro set_carry_flag
-	orc	#1, ccr
-	.endm
-
-; Clear carry flag
-	.macro clear_carry_flag
-	andc	0xfe, ccr
-	.endm
-
-; Set zero flag true
-	.macro set_zero_flag
-	orc	#4, ccr
-	.endm
-
-; Clear zero flag
-	.macro clear_zero_flag
-	andc	0xfb, ccr
-	.endm
-
-; Set neg flag true
-	.macro set_neg_flag
-	orc	#8, ccr
-	.endm
-
-; Clear neg flag
-	.macro clear_neg_flag
-	andc	0xf7, ccr
-	.endm
-
-; Test that carry flag is clear
-	.macro test_carry_clear
-	bcc	.Lcc\@
-	fail	; carry flag not clear
-.Lcc\@:
-	.endm
-
-; Test that carry flag is set
-	.macro test_carry_set
-	bcs	.Lcs\@
-	fail	; carry flag not clear
-.Lcs\@:
-	.endm
-
-; Test that overflow flag is clear
-	.macro test_ovf_clear
-	bvc	.Lvc\@
-	fail	; overflow flag not clear
-.Lvc\@:
-	.endm
-
-; Test that overflow flag is set
-	.macro test_ovf_set
-	bvs	.Lvs\@
-	fail	; overflow flag not clear
-.Lvs\@:
-	.endm
-
-; Test that zero flag is clear
-	.macro test_zero_clear
-	bne	.Lne\@
-	fail	; zero flag not clear
-.Lne\@:
-	.endm
-
-; Test that zero flag is set
-	.macro test_zero_set
-	beq	.Leq\@
-	fail	; zero flag not clear
-.Leq\@:
-	.endm
-
-; Test that neg flag is clear
-	.macro test_neg_clear
-	bpl	.Lneg\@
-	fail	; negative flag not clear
-.Lneg\@:
-	.endm
-
-; Test that neg flag is set
-	.macro test_neg_set
-	bmi	.Lneg\@
-	fail	; negative flag not clear
-.Lneg\@:
-	.endm
-
-; Test ccr against an explicit value
-	.macro test_ccr val
-	.data
-tccr\@:	.byte	0
-	.text
-	mov.b	r0l, @tccr\@
-	stc	ccr, r0l
-	cmp.b	#\val, r0l
-	bne .Ltcc\@
-	fail
-.Ltcc\@:
-	mov.b	@tccr\@, r0l
-	.endm
-
-; Test that all (accessable) condition codes are clear
-	.macro test_cc_clear
-	test_carry_clear
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-		; leaves H, I, U, and UI untested
-	.endm
-
-; Compare memory, fail if not equal (h8sx only, len > 0).
-	.macro memcmp src dst len
-	mov.l	#\src, er5
-	mov.l	#\dst, er6
-	mov.l	#\len, er4
-.Lmemcmp_\@:
-	cmp.b	@er5+, @er6+
-	beq	.Lmemcmp2_\@
-	fail
-.Lmemcmp2_\@:
-	dec.l	#1, er4
-	bne	.Lmemcmp_\@
-	.endm
-
diff --git a/sim/testsuite/sim/h8300/xorb.s b/sim/testsuite/sim/h8300/xorb.s
deleted file mode 100644
index 337c3968a47..00000000000
--- a/sim/testsuite/sim/h8300/xorb.s
+++ /dev/null
@@ -1,378 +0,0 @@
-# Hitachi H8 testcase 'xor.b'
-# mach(): all
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf	
-# ld(h8300s):	-m h8300self	
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	# Instructions tested:
-	# xor.b #xx:8, rd	;                     d rd   xxxxxxxx
-	# xor.b #xx:8, @erd	;         7 d rd ???? d ???? xxxxxxxx
-	# xor.b #xx:8, @erd+	; 0 1 7 4 6 c rd 1??? d ???? xxxxxxxx
-	# xor.b #xx:8, @erd-	; 0 1 7 6 6 c rd 1??? d ???? xxxxxxxx
-	# xor.b #xx:8, @+erd	; 0 1 7 5 6 c rd 1??? d ???? xxxxxxxx
-	# xor.b #xx:8, @-erd	; 0 1 7 7 6 c rd 1??? d ???? xxxxxxxx
-	# xor.b rs, rd		;                     1 5 rs rd
-	# xor.b reg8, @erd	;         7 d rd ???? 1 5 rs ????
-	# xor.b reg8, @erd+	;         0 1 7     9 8 rd 5 rs
-	# xor.b reg8, @erd-	;         0 1 7     9 a rd 5 rs
-	# xor.b reg8, @+erd	;         0 1 7     9 9 rd 5 rs
-	# xor.b reg8, @-erd	;         0 1 7     9 b rd 5 rs
-	#
-	# xorc #xx:8, ccr	; 
-	# xorc #xx:8, exr	; 
-
-	# Coming soon:
-	# ...
-
-.data
-pre_byte:	.byte 0
-byte_dest:	.byte 0xa5
-post_byte:	.byte 0
-
-	start
-	
-xor_b_imm8_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  xor.b #xx:8,Rd
-	xor.b	#0xff, r0l	; Immediate 8-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xa55a r0	; xor result:	a5 ^ ff
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5a55a er0	; xor result:	 a5 ^ ff
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-xor_b_imm8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  xor.b #xx:8,@eRd
-	mov	#byte_dest, er0
-	xor.b	#0xff:8, @er0	; Immediate 8-bit src, reg indirect dst
-;;; 	.word	0x7d00
-;;; 	.word	0xd0ff
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 byte_dest, er0	; er0 still contains address
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the xor to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x5a, r0l
-	beq	.L1
-	fail
-.L1:
-
-xor_b_imm8_postinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  xor.b #xx:8,@eRd+
-	mov	#byte_dest, er0
-	xor.b	#0xff:8, @er0+	; Immediate 8-bit src, reg indirect dst
-;;; 	.word	0x0174
-;;; 	.word	0x6c08
-;;; 	.word	0xd0ff
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-	
-	test_h_gr32 post_byte, er0	; er0 contains address plus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the xor to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L2
-	fail
-.L2:
-
-xor_b_imm8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  xor.b #xx:8,@eRd-
-	mov	#byte_dest, er0
-	xor.b	#0xff:8, @er0-	; Immediate 8-bit src, reg indirect dst
-;;;  	.word	0x0176
-;;;  	.word	0x6c08
-;;;  	.word	0xd0ff
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-	
-	test_h_gr32 pre_byte, er0	; er0 contains address minus one
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the xor to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x5a, r0l
-	beq	.L3
-	fail
-.L3:
-
-
-.endif
-
-xor_b_reg8_reg8:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  xor.b Rs,Rd
-	mov.b	#0xff, r0h
-	xor.b	r0h, r0l	; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0xff5a r0	; xor result:	a5 ^ ff
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a5ff5a er0	; xor result:	a5 ^ ff
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8sx)
-xor_b_reg8_rdind:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  xor.b rs8,@eRd	; xor reg8 to register indirect
-	mov	#byte_dest, er0
-	mov	#0xff, r1l
-	xor.b	r1l, @er0	; reg8 src, reg indirect dest
-;;; 	.word	0x7d00
-;;; 	.word	0x1590
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 byte_dest er0	; er0 still contains address
-	test_h_gr32 0xa5a5a5ff er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L4
-	fail
-.L4:
-
-xor_b_reg8_rdpostinc:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  xor.b rs8,@eRd+	; xor reg8 to register post-increment
-	mov	#byte_dest, er0
-	mov	#0xff, r1l
-	xor.b	r1l, @er0+	; reg8 src, reg post-increment dest
-;;; 	.word	0x0179
-;;; 	.word	0x8059
-
-	test_carry_clear	; H=0 N=0 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_clear
-
-	test_h_gr32 post_byte er0	; er0 contains address plus one
-	test_h_gr32 0xa5a5a5ff er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0x5a, r0l
-	beq	.L5
-	fail
-.L5:
-
-xor_b_reg8_rdpostdec:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  xor.b rs8,@eRd-	; xor reg8 to register post-decrement
-	mov	#byte_dest, er0
-	mov	#0xff, r1l
-	xor.b	r1l, @er0-	; reg8 src, reg indirect dest
-;;; 	.word	0x0179
-;;; 	.word	0xa059
-
-	test_carry_clear	; H=0 N=1 Z=0 V=0 C=0
-	test_ovf_clear
-	test_zero_clear
-	test_neg_set
-
-	test_h_gr32 pre_byte er0	; er0 contains address minus one
-	test_h_gr32 0xa5a5a5ff er1	; er1 has the test load
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-	;; Now check the result of the or to memory.
-	sub.b	r0l, r0l
-	mov.b	@byte_dest, r0l
-	cmp.b	#0xa5, r0l
-	beq	.L6
-	fail
-.L6:
-
-.endif				; h8sx
-
-xorc_imm8_ccr:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	set_ccr_zero
-
-	;;  xorc #xx:8,ccr
-
-	test_neg_clear
-	xorc	#0x8, ccr	; Immediate 8-bit operand (neg flag)
-	test_neg_set
-	xorc	#0x8, ccr
-	test_neg_clear
-
-	test_zero_clear
-	xorc	#0x4, ccr	; Immediate 8-bit operand (zero flag)
-	test_zero_set
-	xorc	#0x4, ccr
-	test_zero_clear
-
-	test_ovf_clear
-	xorc	#0x2, ccr	; Immediate 8-bit operand (overflow flag)
-	test_ovf_set
-	xorc	#0x2, ccr
-	test_ovf_clear
-
-	test_carry_clear
-	xorc	#0x1, ccr	; Immediate 8-bit operand (carry flag)
-	test_carry_set
-	xorc	#0x1, ccr
-	test_carry_clear
-
-	test_gr_a5a5 0		; Make sure other general regs not disturbed
-	test_gr_a5a5 1
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-.if (sim_cpu == h8300s || sim_cpu == h8sx)	; Earlier versions, no exr
-xorc_imm8_exr:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	ldc	#0, exr
-	stc	exr, r0l
-	test_h_gr8 0, r0l
-
-	set_ccr_zero
-	;;  xorc #xx:8,exr
-
-	xorc	#0x80, exr
-	test_cc_clear
-	stc	exr, r0l
-	test_h_gr8 0x80, r0l
-	xorc	#0x80, exr
-	stc	exr, r0l
-	test_h_gr8 0, r0l
-
-	xorc	#0x4, exr
-	stc	exr, r0l
-	test_h_gr8 4, r0l
-	xorc	#0x4, exr
-	stc	exr, r0l
-	test_h_gr8 0, r0l
-
-	xorc	#0x2, exr	; Immediate 8-bit operand (overflow flag)
-	stc	exr, r0l
-	test_h_gr8 2, r0l
-	xorc	#0x2, exr
-	stc	exr, r0l
-	test_h_gr8 0, r0l
-
-	xorc	#0x1, exr	; Immediate 8-bit operand (carry flag)
-	stc	exr, r0l
-	test_h_gr8 1, r0l
-	xorc	#0x1, exr
-	stc	exr, r0l
-	test_h_gr8 0, r0l
-
-	test_h_gr32  0xa5a5a500 er0
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif				; not h8300 or h8300h
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/xorl.s b/sim/testsuite/sim/h8300/xorl.s
deleted file mode 100644
index 67b2e49fb0d..00000000000
--- a/sim/testsuite/sim/h8300/xorl.s
+++ /dev/null
@@ -1,77 +0,0 @@
-# Hitachi H8 testcase 'xor.l'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf	
-
-	.include "testutils.inc"
-
-	start
-	
-.if (sim_cpu == h8sx)		; 16-bit immediate is only available on sx.
-xor_l_imm16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  xor.l #xx:16,Rd
-	xor.l	#0xffff:16, er0	; Immediate 16-bit operand 
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0xa5a55a5a er0	; xor result:	 a5a5a5a5 | ffff
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-xor_l_imm32:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  xor.l #xx:32,Rd
-	xor.l	#0xffffffff, er0	; Immediate 32-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0x5a5a5a5a er0	; xor result:	 a5a5a5a5 ^ ffffffff
-
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-
-xor_l_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  xor.l Rs,Rd
-	mov.l	#0xffffffff, er1
-	xor.l	er1, er0	; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-
-	test_h_gr32 0x5a5a5a5a er0	; xor result:	a5a5a5a5 ^ ffffffff
-	test_h_gr32 0xffffffff er1	; Make sure er1 is unchanged
-
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/h8300/xorw.s b/sim/testsuite/sim/h8300/xorw.s
deleted file mode 100644
index 3c5e5b868e4..00000000000
--- a/sim/testsuite/sim/h8300/xorw.s
+++ /dev/null
@@ -1,61 +0,0 @@
-# Hitachi H8 testcase 'xor.w'
-# mach(): h8300h h8300s h8sx
-# as(h8300):	--defsym sim_cpu=0
-# as(h8300h):	--defsym sim_cpu=1
-# as(h8300s):	--defsym sim_cpu=2
-# as(h8sx):	--defsym sim_cpu=3
-# ld(h8300h):	-m h8300helf
-# ld(h8300s):	-m h8300self
-# ld(h8sx):	-m h8300sxelf
-
-	.include "testutils.inc"
-
-	start
-	
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-xor_w_imm16:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  xor.w #xx:16,Rd
-	xor.w	#0xffff, r0	; Immediate 16-bit operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0x5a5a r0	; xor result:	a5a5 ^ ffff
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a55a5a er0	; xor result:	 a5a5 ^ ffff
-.endif
-	test_gr_a5a5 1		; Make sure other general regs not disturbed
-	test_gr_a5a5 2
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-.endif
-
-xor_w_reg:
-	set_grs_a5a5		; Fill all general regs with a fixed pattern
-	;;  fixme set ccr
-
-	;;  xor.w Rs,Rd
-	mov.w	#0xffff, r1
-	xor.w	r1, r0		; Register operand
-
-	;; fixme test ccr	; H=0 N=1 Z=0 V=0 C=0
-	test_h_gr16 0x5a5a r0	; xor result:	a5a5 ^ ffff
-	test_h_gr16 0xffff r1	; Make sure r1 is unchanged
-.if (sim_cpu)			; non-zero means h8300h, s, or sx
-	test_h_gr32 0xa5a55a5a er0	; xor result:	a5a5 ^ ffff
-	test_h_gr32 0xa5a5ffff er1	; Make sure er1 is unchanged
-.endif
-	test_gr_a5a5 2		; Make sure other general regs not disturbed
-	test_gr_a5a5 3
-	test_gr_a5a5 4
-	test_gr_a5a5 5
-	test_gr_a5a5 6
-	test_gr_a5a5 7
-	
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/m32r/add.cgs b/sim/testsuite/sim/m32r/add.cgs
deleted file mode 100644
index 8ed2b3a2ad3..00000000000
--- a/sim/testsuite/sim/m32r/add.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# m32r testcase for add $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global add
-add:
-
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, 2
-	add r4, r5
-	test_h_gr r4, 3
-
-	pass
diff --git a/sim/testsuite/sim/m32r/add3.cgs b/sim/testsuite/sim/m32r/add3.cgs
deleted file mode 100644
index d1cc8480ad4..00000000000
--- a/sim/testsuite/sim/m32r/add3.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# m32r testcase for add3 $dr,$sr,#$slo16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global add3
-add3:
-
-	mvi_h_gr r5, 1
-	add3 r4, r5, 2
-	test_h_gr r4, 3
-
-	pass
diff --git a/sim/testsuite/sim/m32r/addi.cgs b/sim/testsuite/sim/m32r/addi.cgs
deleted file mode 100644
index 1448d0d2e2b..00000000000
--- a/sim/testsuite/sim/m32r/addi.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# m32r testcase for addi $dr,#$simm8
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global addi
-addi:
-
-	mvi_h_gr r5, 1
-	addi r5, 2
-	test_h_gr r5, 3
-
-	pass
-
diff --git a/sim/testsuite/sim/m32r/addv.cgs b/sim/testsuite/sim/m32r/addv.cgs
deleted file mode 100644
index 704be83c914..00000000000
--- a/sim/testsuite/sim/m32r/addv.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for addv $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global addv
-addv:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 0x80000000
-	mvi_h_gr r5, 0x80000000
-
-	addv r4, r5
-
-	bnc not_ok
-	test_h_gr r4, 0
-	
-	pass
-not_ok:
-	fail
diff --git a/sim/testsuite/sim/m32r/addv3.cgs b/sim/testsuite/sim/m32r/addv3.cgs
deleted file mode 100644
index a8c0a108561..00000000000
--- a/sim/testsuite/sim/m32r/addv3.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# m32r testcase for addv3 $dr,$sr,#$simm16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global addv3
-addv3:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, 1
-
-	addv3 r4, r5, #2
-
-	bc not_ok
-
-	test_h_gr r4, 3
-
-	mvi_h_gr r5, 0x7fff8001
-
-	addv3 r4, r5, #0x7fff
-
-	bnc not_ok
-
-	pass
-not_ok:
-	fail
diff --git a/sim/testsuite/sim/m32r/addx.cgs b/sim/testsuite/sim/m32r/addx.cgs
deleted file mode 100644
index 630e3dbe15a..00000000000
--- a/sim/testsuite/sim/m32r/addx.cgs
+++ /dev/null
@@ -1,42 +0,0 @@
-# m32r testcase for addx $dr,$sr
-# mach(): m32r m32rx
-# timeout(): 42
-
-# timeout is set to test it
-
-	.include "testutils.inc"
-
-	start
-
-	.global addx
-addx:
-	mvi_h_condbit 1
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, 2
-	addx r4, r5
-	bc not_ok
-	test_h_gr r4, 4
-
-	mvi_h_gr r4, 0xfffffffe
-	addx r4, r5
-	bnc not_ok
-	test_h_gr r4, 0
-
-	mvi_h_gr r4, -1
-	mvi_h_gr r5, -1
-	mvi_h_condbit 1
-	addx r4,r5
-	bnc not_ok
-	test_h_gr r4, -1
-
-	mvi_h_gr r4,-1
-	mvi_h_gr r5,0x7fffffff
-	mvi_h_condbit 1
-	addx r5,r4
-	bnc not_ok
-	test_h_gr r5,0x7fffffff
-
-	pass
-
-not_ok:
-	fail
diff --git a/sim/testsuite/sim/m32r/allinsn.exp b/sim/testsuite/sim/m32r/allinsn.exp
deleted file mode 100644
index 8eed80f91d6..00000000000
--- a/sim/testsuite/sim/m32r/allinsn.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-# M32R simulator testsuite.
-
-if [istarget m32r*-*-*] {
-    # load support procs
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "m32r"
-
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.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/m32r/and.cgs b/sim/testsuite/sim/m32r/and.cgs
deleted file mode 100644
index 1c268855411..00000000000
--- a/sim/testsuite/sim/m32r/and.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for and $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global and
-and:
-	mvi_h_gr r4, 3
-	mvi_h_gr r5, 6
-
-	and r4, r5
-
-	test_h_gr r4, 2
-
-	pass
diff --git a/sim/testsuite/sim/m32r/and3.cgs b/sim/testsuite/sim/m32r/and3.cgs
deleted file mode 100644
index 395de3028e9..00000000000
--- a/sim/testsuite/sim/m32r/and3.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for and3 $dr,$sr,#$uimm16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global and3
-and3:
-	mvi_h_gr r4, 0
-	mvi_h_gr r5, 6
-
-	and3 r4, r5, #3
-
-	test_h_gr r4, 2
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bc24.cgs b/sim/testsuite/sim/m32r/bc24.cgs
deleted file mode 100644
index 6bb43334e8f..00000000000
--- a/sim/testsuite/sim/m32r/bc24.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# m32r testcase for bc $disp24
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bc24
-bc24:
-
-	mvi_h_condbit 0
-	bc.l test0fail
-	bra test0pass
-test0fail:
-	fail
-test0pass:
-
-	mvi_h_condbit 1
-	bc.l test1pass
-	fail
-test1pass:
-
-	pass
-
diff --git a/sim/testsuite/sim/m32r/bc8.cgs b/sim/testsuite/sim/m32r/bc8.cgs
deleted file mode 100644
index ceb622c1661..00000000000
--- a/sim/testsuite/sim/m32r/bc8.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# m32r testcase for bc $disp8
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bc8
-bc8:
-
-	mvi_h_condbit 0
-	bc.s test0fail
-	bra test0pass
-test0fail:
-	fail
-test0pass:
-
-	mvi_h_condbit 1
-	bc.s test1pass
-	fail
-test1pass:
-
-	pass
diff --git a/sim/testsuite/sim/m32r/beq.cgs b/sim/testsuite/sim/m32r/beq.cgs
deleted file mode 100644
index c4d6d8bf0aa..00000000000
--- a/sim/testsuite/sim/m32r/beq.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for beq $src1,$src2,$disp16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global beq
-beq:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 12
-	mvi_h_gr r5, 12
-	beq r4, r5, ok
-not_ok:
-	fail
-ok:
-	mvi_h_gr r5, 11
-	beq r4, r5, not_ok
-
-	pass
diff --git a/sim/testsuite/sim/m32r/beqz.cgs b/sim/testsuite/sim/m32r/beqz.cgs
deleted file mode 100644
index 654737d3d46..00000000000
--- a/sim/testsuite/sim/m32r/beqz.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for beqz $src2,$disp16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global beqz
-beqz:
-	mvi_h_gr r4, 0
-	beqz r4, ok
-not_ok:
-	fail
-ok:
-	mvi_h_gr r4, 1
-	beqz r4, not_ok
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bgez.cgs b/sim/testsuite/sim/m32r/bgez.cgs
deleted file mode 100644
index f7031f0edcb..00000000000
--- a/sim/testsuite/sim/m32r/bgez.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for bgez $src2,$disp16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bgez
-bgez:
-	mvi_h_gr r4, 1
-	bgez r4, ok
-not_ok:
-	fail
-ok:
-	mvi_h_gr r4, -1
-	bgez r4, not_ok
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bgtz.cgs b/sim/testsuite/sim/m32r/bgtz.cgs
deleted file mode 100644
index 6ab8989c7e0..00000000000
--- a/sim/testsuite/sim/m32r/bgtz.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for bgtz $src2,$disp16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bgtz
-bgtz:
-	mvi_h_gr r4, 1
-	bgtz r4, ok
-not_ok:
-	fail
-ok:
-	mvi_h_gr r4, 0
-	bgtz r4, not_ok
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bl24.cgs b/sim/testsuite/sim/m32r/bl24.cgs
deleted file mode 100644
index fd6f0dd69d5..00000000000
--- a/sim/testsuite/sim/m32r/bl24.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for bl $disp24
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bl24
-bl24:
-	bl.l test0pass
-test1fail:
-	fail
-
-test0pass:
-	mvaddr_h_gr r4, test1fail
-	bne  r4, r14, test1fail
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bl8.cgs b/sim/testsuite/sim/m32r/bl8.cgs
deleted file mode 100644
index d26369853b7..00000000000
--- a/sim/testsuite/sim/m32r/bl8.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for bl $disp8
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bl8
-bl8:
-	bl.s test0pass
-test1fail:
-	fail
-
-test0pass:
-	mvaddr_h_gr r4, test1fail
-	bne  r4, r14, test1fail
-
-	pass
diff --git a/sim/testsuite/sim/m32r/blez.cgs b/sim/testsuite/sim/m32r/blez.cgs
deleted file mode 100644
index e3d198d93ad..00000000000
--- a/sim/testsuite/sim/m32r/blez.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# m32r testcase for blez $src2,$disp16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global blez
-blez:
-	mvi_h_gr r4, 0
-	blez r4, test0pass
-test1fail:
-	fail
-
-test0pass:
-	mvi_h_gr r4, 1
-	blez r4, test1fail
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bltz.cgs b/sim/testsuite/sim/m32r/bltz.cgs
deleted file mode 100644
index c9377fcaab1..00000000000
--- a/sim/testsuite/sim/m32r/bltz.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# m32r testcase for bltz $src2,$disp16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bltz
-bltz:
-	mvi_h_gr r4, -1
-	bltz r4, test0pass
-test1fail:
-	fail
-
-test0pass:
-	mvi_h_gr r4, 0
-	bltz r4, test1fail
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bnc24.cgs b/sim/testsuite/sim/m32r/bnc24.cgs
deleted file mode 100644
index 692d2d58436..00000000000
--- a/sim/testsuite/sim/m32r/bnc24.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for bnc $disp24
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnc24
-bnc24:
-	mvi_h_condbit 0
-	bnc.l test0pass
-
-test1fail:
-	fail
-test0pass:
-
-	mvi_h_condbit 1
-	bnc.l test1fail
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bnc8.cgs b/sim/testsuite/sim/m32r/bnc8.cgs
deleted file mode 100644
index dae2613cc9f..00000000000
--- a/sim/testsuite/sim/m32r/bnc8.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for bnc $disp8
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnc8
-bnc8:
-	mvi_h_condbit 0
-	bnc.s test0pass
-
-test1fail:
-	fail
-
-test0pass:
-	mvi_h_condbit 1
-	bnc.s test1fail
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bne.cgs b/sim/testsuite/sim/m32r/bne.cgs
deleted file mode 100644
index 5e1d7a6ecc5..00000000000
--- a/sim/testsuite/sim/m32r/bne.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for bne $src1,$src2,$disp16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bne
-bne:
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, 2
-	bne r4, r5, test0pass
-test1fail:
-	fail
-
-test0pass:
-	mvi_h_gr r4, 2
-	bne r4, r5, test1fail
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bnez.cgs b/sim/testsuite/sim/m32r/bnez.cgs
deleted file mode 100644
index 9f102895029..00000000000
--- a/sim/testsuite/sim/m32r/bnez.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# m32r testcase for bnez $src2,$disp16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bnez
-bnez:
-	mvi_h_gr r4, 1
-	bnez r4, test0pass
-test1fail:
-	fail
-
-test0pass:
-	mvi_h_gr r4, 0
-	bnez r4, test1fail
-
-	pass
diff --git a/sim/testsuite/sim/m32r/bra24.cgs b/sim/testsuite/sim/m32r/bra24.cgs
deleted file mode 100644
index d62d2bf0ec3..00000000000
--- a/sim/testsuite/sim/m32r/bra24.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# m32r testcase for bra $disp24
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bra24
-bra24:
-	bra.l ok
-
-	fail
-
-ok:
-	pass
diff --git a/sim/testsuite/sim/m32r/bra8.cgs b/sim/testsuite/sim/m32r/bra8.cgs
deleted file mode 100644
index f5f50ad2d93..00000000000
--- a/sim/testsuite/sim/m32r/bra8.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# m32r testcase for bra $disp8
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global bra8
-bra8:
-	bra.s ok
-
-	fail
-ok:
-	pass
diff --git a/sim/testsuite/sim/m32r/cmp.cgs b/sim/testsuite/sim/m32r/cmp.cgs
deleted file mode 100644
index 6ea67206218..00000000000
--- a/sim/testsuite/sim/m32r/cmp.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# m32r testcase for cmp $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmp
-cmp:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, 2
-	cmp r4, r5
-	bc ok
-not_ok:
-	fail
-ok:
-	mvi_h_condbit 1
-	mvi_h_gr r4, 2
-	cmp r4, r5
-	bc not_ok
-
-	pass
diff --git a/sim/testsuite/sim/m32r/cmpi.cgs b/sim/testsuite/sim/m32r/cmpi.cgs
deleted file mode 100644
index af11283d68d..00000000000
--- a/sim/testsuite/sim/m32r/cmpi.cgs
+++ /dev/null
@@ -1,24 +0,0 @@
-# m32r testcase for cmpi $src2,#$simm16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmpi
-cmpi:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 1
-
-	cmpi r4, #2
-	bc ok
-not_ok:
-	fail
-ok:
-	mvi_h_condbit 1
-	mvi_h_gr r4, 2
-	cmpi r4, #2
-	bc not_ok
-
-
-	pass
diff --git a/sim/testsuite/sim/m32r/cmpu.cgs b/sim/testsuite/sim/m32r/cmpu.cgs
deleted file mode 100644
index e0b4ef10180..00000000000
--- a/sim/testsuite/sim/m32r/cmpu.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# m32r testcase for cmpu $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmpu
-cmpu:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, -2
-	cmpu r4, r5
-	bc ok
-not_ok:
-	fail
-ok:
-	mvi_h_condbit 1
-	mvi_h_gr r4, -1
-	cmpu r4, r5
-	bc not_ok
-
-	pass
diff --git a/sim/testsuite/sim/m32r/cmpui.cgs b/sim/testsuite/sim/m32r/cmpui.cgs
deleted file mode 100644
index aa30207d933..00000000000
--- a/sim/testsuite/sim/m32r/cmpui.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# m32r testcase for cmpui $src2,#$simm16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global cmpui
-cmpui:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 1
-	cmpui r4, #2
-	bc ok
-not_ok:
-	fail
-ok:
-	mvi_h_condbit 1
-	mvi_h_gr r4, -1
-	cmpui r4, #2
-	bc not_ok
-
-	pass
diff --git a/sim/testsuite/sim/m32r/div.cgs b/sim/testsuite/sim/m32r/div.cgs
deleted file mode 100644
index 733f3629680..00000000000
--- a/sim/testsuite/sim/m32r/div.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for div $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global div
-div:
-	mvi_h_gr r4, 0x18000
-	mvi_h_gr r5, 8
-
-	div r4, r5
-
-	test_h_gr r4, 0x3000
-
-	pass
diff --git a/sim/testsuite/sim/m32r/divu.cgs b/sim/testsuite/sim/m32r/divu.cgs
deleted file mode 100644
index 25342d5dccc..00000000000
--- a/sim/testsuite/sim/m32r/divu.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for divu $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global divu
-divu:
-	mvi_h_gr r4, 0x18000
-	mvi_h_gr r5, 8
-
-	divu r4, r5
-
-	test_h_gr r4, 0x3000
-
-	pass
diff --git a/sim/testsuite/sim/m32r/hello.ms b/sim/testsuite/sim/m32r/hello.ms
deleted file mode 100644
index 7ae22778001..00000000000
--- a/sim/testsuite/sim/m32r/hello.ms
+++ /dev/null
@@ -1,19 +0,0 @@
-# output(): Hello world!\n
-# mach(): m32r m32rx
-
-	.globl _start
-_start:
-
-; write (hello world)
-	ldi8 r3,#14
-	ld24 r2,#hello
-	ldi8 r1,#1
-	ldi8 r0,#5
-	trap #0
-; exit (0)
-	ldi8 r1,#0
-	ldi8 r0,#1
-	trap #0
-
-length:	.long 14
-hello:	.ascii "Hello world!\r\n"
diff --git a/sim/testsuite/sim/m32r/hw-trap.ms b/sim/testsuite/sim/m32r/hw-trap.ms
deleted file mode 100644
index 2aa200b5d70..00000000000
--- a/sim/testsuite/sim/m32r/hw-trap.ms
+++ /dev/null
@@ -1,31 +0,0 @@
-# mach(): m32r m32rx
-# output(): pass\n
-
-	.include "testutils.inc"
-
-	start
-
-; construct bra trap2_handler in trap 2 slot
-	ld24 r0,#bra_insn
-	ld r0,@r0
-	ld24 r1,#trap2_handler
-	addi r1,#-0x48 ; pc relative address from trap 2 slot to handler
-	srai r1,#2
-	or r0,r1
-	ld24 r2,#0x48 ; address of trap 2 slot
-	st r0,@r2
-
-; perform trap
-	ldi r4,#0
-	trap #2
-	test_h_gr r4,42
-
-	pass
-
-; trap 2 handler
-trap2_handler:
-	ldi r4,#42
-	rte
-
-bra_insn:
-	bra.l 0
diff --git a/sim/testsuite/sim/m32r/jl.cgs b/sim/testsuite/sim/m32r/jl.cgs
deleted file mode 100644
index a89c26a86bf..00000000000
--- a/sim/testsuite/sim/m32r/jl.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for jl $sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global jl
-jl:
-	mvaddr_h_gr r4, ok
-	jl   r4
-not_ok:
-	fail
-ok:
-	mvaddr_h_gr r4, not_ok
-	bne  r4, r14, not_ok
-
-	pass
diff --git a/sim/testsuite/sim/m32r/jmp.cgs b/sim/testsuite/sim/m32r/jmp.cgs
deleted file mode 100644
index ba0864a53f0..00000000000
--- a/sim/testsuite/sim/m32r/jmp.cgs
+++ /dev/null
@@ -1,19 +0,0 @@
-# m32r testcase for jmp $sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global jmp
-jmp:
-	mvaddr_h_gr r4, ok1
-	jmp  r4
-	fail
-ok1:
-	mvaddr_h_gr r4, ok2
-	addi r4,#1
-	jmp r4
-	fail
-ok2:
-	pass
diff --git a/sim/testsuite/sim/m32r/ld-d.cgs b/sim/testsuite/sim/m32r/ld-d.cgs
deleted file mode 100644
index 151743672b2..00000000000
--- a/sim/testsuite/sim/m32r/ld-d.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# m32r testcase for ld $dr,@($slo16,$sr)
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ld_d
-ld_d:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ld r5, @(#4, r4)
-
-	test_h_gr r5, 0x12345678 
-
-	pass
-
-data_loc:
-	.word 0x11223344
-	.word 0x12345678
-
diff --git a/sim/testsuite/sim/m32r/ld-plus.cgs b/sim/testsuite/sim/m32r/ld-plus.cgs
deleted file mode 100644
index 5feaf62596e..00000000000
--- a/sim/testsuite/sim/m32r/ld-plus.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# m32r testcase for ld $dr,@$sr+
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ld_plus
-ld_plus:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ld r5, @r4+
-
-	test_h_gr r5, 0x12345678
-
-	mvaddr_h_gr r5, data_loc2
-	bne r4, r5, not_ok
-
-	pass
-not_ok:
-	fail
-
-data_loc:
-	.word 0x12345678
-data_loc2:
-	.word 0x11223344
-
diff --git a/sim/testsuite/sim/m32r/ld.cgs b/sim/testsuite/sim/m32r/ld.cgs
deleted file mode 100644
index ad0b86ff6d5..00000000000
--- a/sim/testsuite/sim/m32r/ld.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for ld $dr,@$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ld
-ld:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ld r5, @r4
-
-	test_h_gr r5, 0x12345678
-
-	pass
-
-data_loc:
-	.word 0x12345678
-
diff --git a/sim/testsuite/sim/m32r/ld24.cgs b/sim/testsuite/sim/m32r/ld24.cgs
deleted file mode 100644
index 74b155518c8..00000000000
--- a/sim/testsuite/sim/m32r/ld24.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# m32r testcase for ld24 $dr,#$uimm24
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ld24
-ld24:
-	ld24 r4, #0x123456
-
-	test_h_gr r4, 0x123456
-
-	pass
diff --git a/sim/testsuite/sim/m32r/ldb-d.cgs b/sim/testsuite/sim/m32r/ldb-d.cgs
deleted file mode 100644
index 4a1cebb1fc3..00000000000
--- a/sim/testsuite/sim/m32r/ldb-d.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for ldb $dr,@($slo16,$sr)
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldb_d
-ldb_d:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ldb r5, @(#2, r4)
-
-	test_h_gr r5, 0x56 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0x12345678
diff --git a/sim/testsuite/sim/m32r/ldb.cgs b/sim/testsuite/sim/m32r/ldb.cgs
deleted file mode 100644
index 9b895450f08..00000000000
--- a/sim/testsuite/sim/m32r/ldb.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for ldb $dr,@$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldb
-ldb:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ldb r5, @r4
-
-	test_h_gr r5, 0x12 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0x12345678
-
diff --git a/sim/testsuite/sim/m32r/ldh-d.cgs b/sim/testsuite/sim/m32r/ldh-d.cgs
deleted file mode 100644
index 0be0309b1ef..00000000000
--- a/sim/testsuite/sim/m32r/ldh-d.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for ldh $dr,@($slo16,$sr)
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldh_d
-ldh_d:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ldh r5, @(#2, r4)
-
-	test_h_gr r5, 0x5678 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0x12345678
-
diff --git a/sim/testsuite/sim/m32r/ldh.cgs b/sim/testsuite/sim/m32r/ldh.cgs
deleted file mode 100644
index 3d8db953d3d..00000000000
--- a/sim/testsuite/sim/m32r/ldh.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# m32r testcase for ldh $dr,@$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldh
-ldh:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ldh r5, @r4
-
-	test_h_gr r5, 0x1234 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0x12345678
-
-	pass
diff --git a/sim/testsuite/sim/m32r/ldi16.cgs b/sim/testsuite/sim/m32r/ldi16.cgs
deleted file mode 100644
index 478df1c1b32..00000000000
--- a/sim/testsuite/sim/m32r/ldi16.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# m32r testcase for ldi $dr,$slo16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldi16
-ldi16:
-	ldi r4, #0x1234
-
-	test_h_gr r4, 0x1234
-
-	pass
diff --git a/sim/testsuite/sim/m32r/ldi8.cgs b/sim/testsuite/sim/m32r/ldi8.cgs
deleted file mode 100644
index 081e7a86f35..00000000000
--- a/sim/testsuite/sim/m32r/ldi8.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# m32r testcase for ldi $dr,#$simm8
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldi8
-ldi8:
-	ldi r4, #0x78
-
-	test_h_gr r4, 0x78
-
-	pass
diff --git a/sim/testsuite/sim/m32r/ldub-d.cgs b/sim/testsuite/sim/m32r/ldub-d.cgs
deleted file mode 100644
index 7661071b820..00000000000
--- a/sim/testsuite/sim/m32r/ldub-d.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for ldub $dr,@($slo16,$sr)
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldub_d
-ldub_d:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ldub r5, @(#2, r4)
-
-	test_h_gr r5, 0xa0 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0x8090a0b0
-
diff --git a/sim/testsuite/sim/m32r/ldub.cgs b/sim/testsuite/sim/m32r/ldub.cgs
deleted file mode 100644
index 27913b51f59..00000000000
--- a/sim/testsuite/sim/m32r/ldub.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for ldub $dr,@$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global ldub
-ldub:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	ldub r5, @r4
-
-	test_h_gr r5, 0x80 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0x800000f0
-
diff --git a/sim/testsuite/sim/m32r/lduh-d.cgs b/sim/testsuite/sim/m32r/lduh-d.cgs
deleted file mode 100644
index 96e294f0ec8..00000000000
--- a/sim/testsuite/sim/m32r/lduh-d.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for lduh $dr,@($slo16,$sr)
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global lduh_d
-lduh_d:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	lduh r5, @(#2, r4)
-
-	test_h_gr r5, 0xf000 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0x8000f000
diff --git a/sim/testsuite/sim/m32r/lduh.cgs b/sim/testsuite/sim/m32r/lduh.cgs
deleted file mode 100644
index a03bbee240d..00000000000
--- a/sim/testsuite/sim/m32r/lduh.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# m32r testcase for lduh $dr,@$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global lduh
-lduh:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	lduh r5, @r4
-
-	test_h_gr r5, 0x8010 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0x8010f020
-
-	pass
diff --git a/sim/testsuite/sim/m32r/lock.cgs b/sim/testsuite/sim/m32r/lock.cgs
deleted file mode 100644
index 631525ebbbf..00000000000
--- a/sim/testsuite/sim/m32r/lock.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# m32r testcase for lock $dr,@$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global lock
-lock:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0
-
-	lock r5, @r4
-
-	test_h_gr r5, 0x12345678
-
-	; There is no way to test the lock bit
-
-	unlock r5, @r4 	; Unlock the processor
-
-	pass
-
-data_loc:
-	.word 0x12345678
-
diff --git a/sim/testsuite/sim/m32r/machi.cgs b/sim/testsuite/sim/m32r/machi.cgs
deleted file mode 100644
index 2e2ef00294c..00000000000
--- a/sim/testsuite/sim/m32r/machi.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for machi $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global machi
-machi:
-
-	mvi_h_accum0 0, 1
-	mvi_h_gr r4, 0x10123
-	mvi_h_gr r5, 0x20456
-	machi r4, r5
-	test_h_accum0 0, 0x20001
-
-	pass
diff --git a/sim/testsuite/sim/m32r/maclo.cgs b/sim/testsuite/sim/m32r/maclo.cgs
deleted file mode 100644
index 5d035394dc4..00000000000
--- a/sim/testsuite/sim/m32r/maclo.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for maclo $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global maclo
-maclo:
-
-	mvi_h_accum0 0, 1
-	mvi_h_gr r4, 0x1230001
-	mvi_h_gr r5, 0x4560002
-	maclo r4, r5
-	test_h_accum0 0, 0x20001
-
-	pass
diff --git a/sim/testsuite/sim/m32r/macwhi.cgs b/sim/testsuite/sim/m32r/macwhi.cgs
deleted file mode 100644
index 9ee7a5b0bb9..00000000000
--- a/sim/testsuite/sim/m32r/macwhi.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for macwhi $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global macwhi
-macwhi:
-	mvi_h_accum0 0, 1
-	mvi_h_gr r4, 0x10123
-	mvi_h_gr r5, 0x20456
-
-	macwhi r4, r5
-
-	test_h_accum0 0, 0x20247
-
-	pass
diff --git a/sim/testsuite/sim/m32r/macwlo.cgs b/sim/testsuite/sim/m32r/macwlo.cgs
deleted file mode 100644
index a7ce4edac5c..00000000000
--- a/sim/testsuite/sim/m32r/macwlo.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for macwlo $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global macwlo
-macwlo:
-	mvi_h_accum0 0, 1
-	mvi_h_gr r4, 0x10123
-	mvi_h_gr r5, 0x40002
-
-	macwlo r4, r5
-
-	test_h_accum0 0, 0x20247
-
-	pass
diff --git a/sim/testsuite/sim/m32r/misc.exp b/sim/testsuite/sim/m32r/misc.exp
deleted file mode 100644
index 6ed5638ab29..00000000000
--- a/sim/testsuite/sim/m32r/misc.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Miscellaneous M32R simulator testcases
-
-if [istarget m32r*-*-*] {
-    # load support procs
-    # load_lib cgen.exp
-
-    # all machines
-    set all_machs "m32r"
-
-
-    # The .ms suffix is for "miscellaneous .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
-	# 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/m32r/mul.cgs b/sim/testsuite/sim/m32r/mul.cgs
deleted file mode 100644
index c78f24b8117..00000000000
--- a/sim/testsuite/sim/m32r/mul.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for mul $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mul
-mul:
-	mvi_h_gr r4, 3
-	mvi_h_gr r5, 7
-
-	mul r5, r4
-
-	test_h_gr r5, 21
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mulhi.cgs b/sim/testsuite/sim/m32r/mulhi.cgs
deleted file mode 100644
index 77c103d6f36..00000000000
--- a/sim/testsuite/sim/m32r/mulhi.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# m32r testcase for mulhi $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mulhi
-mulhi:
-
-	mvi_h_gr r4, 0x40000
-	mvi_h_gr r5, 0x50000
-	mulhi r4, r5
-	test_h_accum0 0, 0x140000
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mullo.cgs b/sim/testsuite/sim/m32r/mullo.cgs
deleted file mode 100644
index 11aadff3794..00000000000
--- a/sim/testsuite/sim/m32r/mullo.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# m32r testcase for mullo $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mullo
-mullo:
-
-	mvi_h_gr r4, 4
-	mvi_h_gr r5, 5
-	mullo r4, r5
-	test_h_accum0 0, 0x140000
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mulwhi.cgs b/sim/testsuite/sim/m32r/mulwhi.cgs
deleted file mode 100644
index eb18562d9e7..00000000000
--- a/sim/testsuite/sim/m32r/mulwhi.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for mulwhi $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mulwhi
-mulwhi:
-	mvi_h_accum0 0, 1
-	mvi_h_gr r4, 0x10123
-	mvi_h_gr r5, 0x20456
-
-	mulwhi r4, r5
-
-	test_h_accum0 0, 0x20246
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mulwlo.cgs b/sim/testsuite/sim/m32r/mulwlo.cgs
deleted file mode 100644
index d22c26827cd..00000000000
--- a/sim/testsuite/sim/m32r/mulwlo.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for mulwlo $src1,$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mulwlo
-mulwlo:
-	mvi_h_accum0 0, 1
-	mvi_h_gr r4, 0x10123
-	mvi_h_gr r5, 0x40002
-
-	mulwlo r4, r5
-
-	test_h_accum0 0, 0x20246
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mv.cgs b/sim/testsuite/sim/m32r/mv.cgs
deleted file mode 100644
index 694569535b7..00000000000
--- a/sim/testsuite/sim/m32r/mv.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for mv $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mv
-mv:
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, 0
-
-	mv r5, r4
-
-	test_h_gr r5, 1
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mvfachi.cgs b/sim/testsuite/sim/m32r/mvfachi.cgs
deleted file mode 100644
index 0222e1b9118..00000000000
--- a/sim/testsuite/sim/m32r/mvfachi.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# m32r testcase for mvfachi $dr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvfachi
-mvfachi:
-	mvi_h_accum0 0x11223344, 0x55667788
-	mvi_h_gr r4, 0
-
-	mvfachi r4
-	test_h_gr r4, 0x223344
-
-	mvi_h_accum0 0x99aabbcc, 0x55667788
-	mvi_h_gr r4, 0
-
-	mvfachi r4
-	test_h_gr r4, 0xffaabbcc
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mvfaclo.cgs b/sim/testsuite/sim/m32r/mvfaclo.cgs
deleted file mode 100644
index 0a88d849aee..00000000000
--- a/sim/testsuite/sim/m32r/mvfaclo.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for mvfaclo $dr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvfaclo
-mvfaclo:
-	mvi_h_accum0 0x11223344, 0x55667788
-	mvi_h_gr r4, 0
-
-	mvfaclo r4
-
-	test_h_gr r4, 0x55667788
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mvfacmi.cgs b/sim/testsuite/sim/m32r/mvfacmi.cgs
deleted file mode 100644
index 580bcae9890..00000000000
--- a/sim/testsuite/sim/m32r/mvfacmi.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# m32r testcase for mvfacmi $dr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvfacmi
-mvfacmi:
-
-	mvi_h_accum0 0x12345678, 0x87654321
-	mvfacmi r4
-	test_h_gr r4, 0x56788765
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mvfc.cgs b/sim/testsuite/sim/m32r/mvfc.cgs
deleted file mode 100644
index ca2470e1e2d..00000000000
--- a/sim/testsuite/sim/m32r/mvfc.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# m32r testcase for mvfc $dr,$scr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvfc
-mvfc:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 1
-
-	mvfc r4, cr1
-
-	test_h_gr r4, 0
-
-	mvi_h_condbit 1
-
-	mvfc r4, cr1
-
-	test_h_gr r4, 1
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mvtachi.cgs b/sim/testsuite/sim/m32r/mvtachi.cgs
deleted file mode 100644
index 6d596169557..00000000000
--- a/sim/testsuite/sim/m32r/mvtachi.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for mvtachi $src1
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvtachi
-mvtachi:
-	mvi_h_accum0 0, 0
-
-	mvi_h_gr r4, 0x11223344
-	mvtachi r4
-	test_h_accum0 0x223344, 0x0
-
-	mvi_h_gr r4, 0x99aabbcc
-	mvtachi r4
-	test_h_accum0 0xffaabbcc, 0x0
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mvtaclo.cgs b/sim/testsuite/sim/m32r/mvtaclo.cgs
deleted file mode 100644
index baafd839acb..00000000000
--- a/sim/testsuite/sim/m32r/mvtaclo.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for mvtaclo $src1
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvtaclo
-mvtaclo:
-	mvi_h_accum0 0, 0
-	mvi_h_gr r4, 0x11223344
-
-	mvtaclo r4
-
-	test_h_accum0 0, 0x11223344
-
-	pass
diff --git a/sim/testsuite/sim/m32r/mvtc.cgs b/sim/testsuite/sim/m32r/mvtc.cgs
deleted file mode 100644
index 94780dfa11a..00000000000
--- a/sim/testsuite/sim/m32r/mvtc.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for mvtc $sr,$dcr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global mvtc
-mvtc:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 1
-
-	mvtc r4, cr1
-	bc ok
-
-	fail
-ok:
-	pass
diff --git a/sim/testsuite/sim/m32r/neg.cgs b/sim/testsuite/sim/m32r/neg.cgs
deleted file mode 100644
index 6051efaf256..00000000000
--- a/sim/testsuite/sim/m32r/neg.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for neg $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global neg
-neg:
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, 2
-
-	neg r4, r5
-
-	test_h_gr r4, -2
-
-	pass
diff --git a/sim/testsuite/sim/m32r/nop.cgs b/sim/testsuite/sim/m32r/nop.cgs
deleted file mode 100644
index e06d656f20e..00000000000
--- a/sim/testsuite/sim/m32r/nop.cgs
+++ /dev/null
@@ -1,11 +0,0 @@
-# m32r testcase for nop
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global nop
-nop:
-	nop
-	pass
diff --git a/sim/testsuite/sim/m32r/not.cgs b/sim/testsuite/sim/m32r/not.cgs
deleted file mode 100644
index e6ceb643ebf..00000000000
--- a/sim/testsuite/sim/m32r/not.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for not $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global not
-not:
-	mvi_h_gr r4, 1
-	mvi_h_gr r5, 2
-
-	not r4, r5
-
-	test_h_gr r4, 0xfffffffd
-
-	pass
diff --git a/sim/testsuite/sim/m32r/or.cgs b/sim/testsuite/sim/m32r/or.cgs
deleted file mode 100644
index 1b08bd0c2a7..00000000000
--- a/sim/testsuite/sim/m32r/or.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for or $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global or
-or:
-	mvi_h_gr r4, 3
-	mvi_h_gr r5, 6
-
-	or r4, r5
-
-	test_h_gr r4, 7
-
-	pass
diff --git a/sim/testsuite/sim/m32r/or3.cgs b/sim/testsuite/sim/m32r/or3.cgs
deleted file mode 100644
index dc76ada9333..00000000000
--- a/sim/testsuite/sim/m32r/or3.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for or3 $dr,$sr,#$ulo16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global or3
-or3:
-	mvi_h_gr r4, 0
-	mvi_h_gr r5, 6
-
-	or3 r4, r5, #3
-
-	test_h_gr r4, 7
-
-	pass
diff --git a/sim/testsuite/sim/m32r/rac.cgs b/sim/testsuite/sim/m32r/rac.cgs
deleted file mode 100644
index 35b9ae3cd91..00000000000
--- a/sim/testsuite/sim/m32r/rac.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# m32r testcase for rac
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global rac
-rac:
-
-	mvi_h_accum0 1, 0x4001
-	rac
-	test_h_accum0 2, 0x10000
-
-	mvi_h_accum0 0x3fff, 0xffff4000
-	rac
-	test_h_accum0 0x7fff, 0xffff0000
-
-	mvi_h_accum0 0xffff8000, 0
-	rac
-	test_h_accum0 0xffff8000, 0
-
-	pass
diff --git a/sim/testsuite/sim/m32r/rach.cgs b/sim/testsuite/sim/m32r/rach.cgs
deleted file mode 100644
index c22469834f7..00000000000
--- a/sim/testsuite/sim/m32r/rach.cgs
+++ /dev/null
@@ -1,22 +0,0 @@
-# m32r testcase for rach
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global rach
-rach:
-	mvi_h_accum0 1, 0x40004001
-	rach
-	test_h_accum0 3, 0
-
-	mvi_h_accum0 0x3fff, 0xc0000000
-	rach
-	test_h_accum0 0x7fff, 0
-
-	mvi_h_accum0 0xffff8000, 0
-	rach
-	test_h_accum0 0xffff8000, 0
-
-	pass
diff --git a/sim/testsuite/sim/m32r/rem.cgs b/sim/testsuite/sim/m32r/rem.cgs
deleted file mode 100644
index 78c11cbcf90..00000000000
--- a/sim/testsuite/sim/m32r/rem.cgs
+++ /dev/null
@@ -1,17 +0,0 @@
-# m32r testcase for rem $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global rem
-rem:
-	mvi_h_gr r4, 12345678
-	mvi_h_gr r5, 7
-
-	rem r4, r5
-
-	test_h_gr r4, 2
-
-	pass
diff --git a/sim/testsuite/sim/m32r/remu.cgs b/sim/testsuite/sim/m32r/remu.cgs
deleted file mode 100644
index 36336306b27..00000000000
--- a/sim/testsuite/sim/m32r/remu.cgs
+++ /dev/null
@@ -1,23 +0,0 @@
-# m32r testcase for remu $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global remu
-remu:
-	mvi_h_gr r4, 17
-	mvi_h_gr r5, 7
-
-	remu r4, r5
-
-	test_h_gr r4, 3
-
-	mvi_h_gr r4, -17
-
-	remu r4, r5
-
-	test_h_gr r4, 1
-
-	pass
diff --git a/sim/testsuite/sim/m32r/rte.cgs b/sim/testsuite/sim/m32r/rte.cgs
deleted file mode 100644
index b389fe15431..00000000000
--- a/sim/testsuite/sim/m32r/rte.cgs
+++ /dev/null
@@ -1,87 +0,0 @@
-# m32r testcase for rte
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global rte
-rte:
-
-; Test 1: bbpsw = 0, bpsw = 1, psw = 0
-
-	; bbsm = 0, bie = 0, bbcond = 0
-	mvi_h_gr r4, 0
-	mvtc r4, cr8
-
-	; bsm = 1, bie = 1, bcond = 1, sm = 0, ie = 0, cond = 0
-	mvi_h_gr r4, 0xc100
-	mvtc r4, cr0
-
-	; bbpc = 0
-	mvaddr_h_gr r4, 0
-	mvtc r4, bbpc
-
-	; bpc = ret1
-	mvaddr_h_gr r4, ret1
-	mvtc r4, bpc
-
-	rte
-	fail
-
-ret1:
-	; test bbsm = 0, bbie = 0, bbcond = 0
-	mvfc r4, cr8
-	test_h_gr r4, 0
-
-	; test bsm = 0, bie = 0, bcond = 0, sm = 1, ie = 1, cond = 1
-	mvfc r4, cr0
-	test_h_gr r4, 0xc1
-
-	; test bbpc = 0
-	mvfc r4, bbpc
-	test_h_gr r4, 0
-
-	; test bpc = 0
-	mvfc r4, bpc
-	test_h_gr r4, 0
-
-; Test 2: bbpsw = 1, bpsw = 0, psw = 1
-
-	; bbsm = 1, bie = 1, bbcond = 1
-	mvi_h_gr r4, 0xc1
-	mvtc r4, cr8
-
-	; bsm = 0, bie = 0, bcond = 0, sm = 1, ie = 1, cond = 1
-	mvi_h_gr r4, 0xc1
-	mvtc r4, cr0
-
-	; bbpc = 42
-	mvaddr_h_gr r4, 42
-	mvtc r4, bbpc
-
-	; bpc = ret2 + 2
-	mvaddr_h_gr r4, ret2 + 2
-	mvtc r4, bpc
-
-	rte
-	fail
-
-ret2:
-	; test bbsm = 1, bbie = 1, bbcond = 1
-	mvfc r4, cr8
-	test_h_gr r4, 0xc1
-
-	; test bsm = 1, bie = 1, bcond = 1, sm = 0, ie = 0, cond = 0
-	mvfc r4, cr0
-	test_h_gr r4, 0xc100
-
-	; test bbpc = 42
-	mvfc r4, bbpc
-	test_h_gr r4, 42
-
-	; test bpc = 42
-	mvfc r4, bpc
-	test_h_gr r4, 42
-
-	pass
diff --git a/sim/testsuite/sim/m32r/seth.cgs b/sim/testsuite/sim/m32r/seth.cgs
deleted file mode 100644
index aec3230a548..00000000000
--- a/sim/testsuite/sim/m32r/seth.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for seth $dr,#$hi16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global seth
-seth:
-	seth      r4, #0x1234
-
-	; do not use test_h_gr macro since this uses seth
-
-	srli      r4, #16
-	ld24	  r5, #0x1234
-	beq       r4, r5, ok
-
-	fail
-ok:
-	pass
diff --git a/sim/testsuite/sim/m32r/sll.cgs b/sim/testsuite/sim/m32r/sll.cgs
deleted file mode 100644
index fa3cfed8861..00000000000
--- a/sim/testsuite/sim/m32r/sll.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# m32r testcase for sll $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global sll
-sll:
-	mvi_h_gr  r4, 6
-	mvi_h_gr  r5, 1
-	sll       r4, r5
-	test_h_gr r4, 12
-
-	pass
diff --git a/sim/testsuite/sim/m32r/sll3.cgs b/sim/testsuite/sim/m32r/sll3.cgs
deleted file mode 100644
index ddd360cd111..00000000000
--- a/sim/testsuite/sim/m32r/sll3.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# m32r testcase for sll3 $dr,$sr,#$simm16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global sll3
-sll3:
-	mvi_h_gr  r4, 1
-	mvi_h_gr  r5, 6
-	sll3      r4, r5, #1
-	test_h_gr r4, 12
-
-	pass
diff --git a/sim/testsuite/sim/m32r/slli.cgs b/sim/testsuite/sim/m32r/slli.cgs
deleted file mode 100644
index eab77daa695..00000000000
--- a/sim/testsuite/sim/m32r/slli.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# m32r testcase for slli $dr,#$uimm5
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global slli
-slli:
-	mvi_h_gr  r4, 6
-	slli      r4, #1
-	test_h_gr r4, 12
-
-	pass
diff --git a/sim/testsuite/sim/m32r/sra.cgs b/sim/testsuite/sim/m32r/sra.cgs
deleted file mode 100644
index 11671ed8658..00000000000
--- a/sim/testsuite/sim/m32r/sra.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# m32r testcase for sra $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global sra
-sra:
-
-	mvi_h_gr  r4, 0xf0f0f0ff
-	mvi_h_gr  r5, 4
-	sra       r4, r5
-	test_h_gr r4, 0xff0f0f0f
-
-	pass
diff --git a/sim/testsuite/sim/m32r/sra3.cgs b/sim/testsuite/sim/m32r/sra3.cgs
deleted file mode 100644
index 0dd387adf46..00000000000
--- a/sim/testsuite/sim/m32r/sra3.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# m32r testcase for sra3 $dr,$sr,#$simm16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global sra3
-sra3:
-
-	mvi_h_gr  r4, 0
-	mvi_h_gr  r5, 0xf0f0f0ff
-	sra3      r4, r5, #4
-	test_h_gr r4, 0xff0f0f0f
-
-	pass
diff --git a/sim/testsuite/sim/m32r/srai.cgs b/sim/testsuite/sim/m32r/srai.cgs
deleted file mode 100644
index 2a1569422a5..00000000000
--- a/sim/testsuite/sim/m32r/srai.cgs
+++ /dev/null
@@ -1,14 +0,0 @@
-# m32r testcase for srai $dr,#$uimm5
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global srai
-srai:
-	mvi_h_gr  r5, 0xf0f0f0ff
-	srai      r5, #4
-	test_h_gr r5, 0xff0f0f0f
-
-	pass
diff --git a/sim/testsuite/sim/m32r/srl.cgs b/sim/testsuite/sim/m32r/srl.cgs
deleted file mode 100644
index 8838c2fbd48..00000000000
--- a/sim/testsuite/sim/m32r/srl.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# m32r testcase for srl $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global srl
-srl:
-	mvi_h_gr  r4, 6
-	mvi_h_gr  r5, 1
-	srl       r4, r5
-	test_h_gr r4, 3
-
-	pass
diff --git a/sim/testsuite/sim/m32r/srl3.cgs b/sim/testsuite/sim/m32r/srl3.cgs
deleted file mode 100644
index a1dc4840f63..00000000000
--- a/sim/testsuite/sim/m32r/srl3.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# m32r testcase for srl3 $dr,$sr,#$simm16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global srl3
-srl3:
-	mvi_h_gr  r4, 0
-	mvi_h_gr  r5, 6
-	srl3      r4, r5, #1
-	test_h_gr r4, 3
-
-	pass
diff --git a/sim/testsuite/sim/m32r/srli.cgs b/sim/testsuite/sim/m32r/srli.cgs
deleted file mode 100644
index f358a768a7f..00000000000
--- a/sim/testsuite/sim/m32r/srli.cgs
+++ /dev/null
@@ -1,15 +0,0 @@
-# m32r testcase for srli $dr,#$uimm5
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global srli
-srli:
-	mvi_h_gr  r5, 6
-	srli      r5, #1
-	test_h_gr r5, 3
-
-
-	pass
diff --git a/sim/testsuite/sim/m32r/st-d.cgs b/sim/testsuite/sim/m32r/st-d.cgs
deleted file mode 100644
index e2668a05c04..00000000000
--- a/sim/testsuite/sim/m32r/st-d.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# m32r testcase for st $src1,@($slo16,$src2)
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global st_d
-st_d:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 1
-
-	st r5, @(#8,r4)
-
-	mvaddr_h_gr r4, data_loc2
-	ld r4, @r4
-	test_h_gr r4, 1
-
-	pass
-
-data_loc:
-	.word 0
-	.word 0
-data_loc2:
-	.word 0
-
diff --git a/sim/testsuite/sim/m32r/st-minus.cgs b/sim/testsuite/sim/m32r/st-minus.cgs
deleted file mode 100644
index fc90351c389..00000000000
--- a/sim/testsuite/sim/m32r/st-minus.cgs
+++ /dev/null
@@ -1,29 +0,0 @@
-# m32r testcase for st $src1,@-$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global st_minus
-st_minus:
-	mvaddr_h_gr r4, data_loc2
-	mvi_h_gr    r5, 1
-
-	st r5, @-r4
-
-	mvaddr_h_gr r5, data_loc
-
-	bne r4, r5, not_ok
-	ld r4, @r4
-	test_h_gr r4, 1
-
-	pass
-not_ok:
-	fail
-
-data_loc:
-	.word 0
-data_loc2:
-	.word 0
-
diff --git a/sim/testsuite/sim/m32r/st-plus.cgs b/sim/testsuite/sim/m32r/st-plus.cgs
deleted file mode 100644
index 7bb4dd16fe7..00000000000
--- a/sim/testsuite/sim/m32r/st-plus.cgs
+++ /dev/null
@@ -1,28 +0,0 @@
-# m32r testcase for st $src1,@+$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global st_plus
-st_plus:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 1
-
-	st r5, @+r4
-
-	mvaddr_h_gr r5, data_loc2
-
-	bne r4, r5, not_ok
-	ld r4, @r4
-	test_h_gr r4, 1
-
-	pass
-not_ok:
-	fail
-
-data_loc:
-	.word 0
-data_loc2:
-	.word 0
diff --git a/sim/testsuite/sim/m32r/st.cgs b/sim/testsuite/sim/m32r/st.cgs
deleted file mode 100644
index 9588b8c40c8..00000000000
--- a/sim/testsuite/sim/m32r/st.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for st $src1,@$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global st
-st:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 1
-
-	st r5, @r4
-
-	ld r4, @r4
-	test_h_gr r4, 1
-
-	pass
-
-data_loc:
-	.word 0
diff --git a/sim/testsuite/sim/m32r/stb-d.cgs b/sim/testsuite/sim/m32r/stb-d.cgs
deleted file mode 100644
index 37c2d733d72..00000000000
--- a/sim/testsuite/sim/m32r/stb-d.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# m32r testcase for stb $src1,@($slo16,$src2)
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global stb_d
-stb_d:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0x1234
-
-	stb r5, @(#8,r4)
-
-	mvaddr_h_gr r4, data_loc2
-	ld r4, @r4
-	test_h_gr r4, 0x34000000 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0
-	.word 0
-data_loc2:
-	.word 0
diff --git a/sim/testsuite/sim/m32r/stb.cgs b/sim/testsuite/sim/m32r/stb.cgs
deleted file mode 100644
index 01283169023..00000000000
--- a/sim/testsuite/sim/m32r/stb.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for stb $src1,@$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global stb
-stb:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0x1234
-
-	stb r5, @r4
-
-	ld r4, @r4
-	test_h_gr r4, 0x34000000 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0
diff --git a/sim/testsuite/sim/m32r/sth-d.cgs b/sim/testsuite/sim/m32r/sth-d.cgs
deleted file mode 100644
index 11aaa6d76c1..00000000000
--- a/sim/testsuite/sim/m32r/sth-d.cgs
+++ /dev/null
@@ -1,25 +0,0 @@
-# m32r testcase for sth $src1,@($slo16,$src2)
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global sth_d
-sth_d:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0x123456
-
-	sth r5, @(#8,r4)
-
-	mvaddr_h_gr r4, data_loc2
-	ld r4, @r4
-	test_h_gr r4, 0x34560000 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0
-	.word 0
-data_loc2:
-	.word 0
diff --git a/sim/testsuite/sim/m32r/sth.cgs b/sim/testsuite/sim/m32r/sth.cgs
deleted file mode 100644
index 1a10fde1ce3..00000000000
--- a/sim/testsuite/sim/m32r/sth.cgs
+++ /dev/null
@@ -1,21 +0,0 @@
-# m32r testcase for sth $src1,@$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global sth
-sth:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 0x123456
-
-	sth r5, @r4
-
-	ld r4, @r4
-	test_h_gr r4, 0x34560000 ; big endian processor
-
-	pass
-
-data_loc:
-	.word 0
diff --git a/sim/testsuite/sim/m32r/sub.cgs b/sim/testsuite/sim/m32r/sub.cgs
deleted file mode 100644
index 4d676e58083..00000000000
--- a/sim/testsuite/sim/m32r/sub.cgs
+++ /dev/null
@@ -1,18 +0,0 @@
-# m32r testcase for sub $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global sub
-sub:
-
-	mvi_h_gr r4, 7
-	mvi_h_gr r5, 3
-
-	sub r4, r5
-
-	test_h_gr r4, 4
-
-	pass
diff --git a/sim/testsuite/sim/m32r/subv.cgs b/sim/testsuite/sim/m32r/subv.cgs
deleted file mode 100644
index 9474766e55b..00000000000
--- a/sim/testsuite/sim/m32r/subv.cgs
+++ /dev/null
@@ -1,20 +0,0 @@
-# m32r testcase for subv $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global subv
-subv:
-	mvi_h_condbit 0
-	mvi_h_gr r4, 0x80000000
-	mvi_h_gr r5, 3
-
-	subv r4, r5
-
-	bc ok
-
-	fail
-ok:
-	pass
diff --git a/sim/testsuite/sim/m32r/subx.cgs b/sim/testsuite/sim/m32r/subx.cgs
deleted file mode 100644
index e890fcfabd7..00000000000
--- a/sim/testsuite/sim/m32r/subx.cgs
+++ /dev/null
@@ -1,26 +0,0 @@
-# m32r testcase for subx $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global subx
-subx:
-	mvi_h_condbit 1
-	mvi_h_gr r4, 6
-	mvi_h_gr r5, 4
-	subx r4, r5
-	bc not_ok
-	test_h_gr r4, 1
-
-	mvi_h_condbit 1
-	mvi_h_gr r4, 4
-	mvi_h_gr r5, 4
-	subx r4, r5
-	bnc not_ok
-	test_h_gr r4, 0xffffffff
-
-	pass
-not_ok:
-	fail
diff --git a/sim/testsuite/sim/m32r/testutils.inc b/sim/testsuite/sim/m32r/testutils.inc
deleted file mode 100644
index 1d8822ae098..00000000000
--- a/sim/testsuite/sim/m32r/testutils.inc
+++ /dev/null
@@ -1,95 +0,0 @@
-# r0-r3 are used as tmps, consider them call clobbered by these macros.
-
-	.macro start
-	.data
-failmsg:
-	.ascii "fail\n"
-passmsg:
-	.ascii "pass\n"
-	.text
-	.global _start
-_start:
-	.endm
-
-	.macro exit rc
-	ldi8 r1, \rc
-	ldi8 r0, #1
-	trap #0
-	.endm
-
-	.macro pass
-	ldi8 r3, 5
-	ld24 r2, passmsg
-	ldi8 r1, 1
-	ldi8 r0, 5
-	trap #0
-	exit 0
-	.endm
-
-	.macro fail
-	ldi8 r3, 5
-	ld24 r2, failmsg
-	ldi8 r1, 1
-	ldi8 r0, 5
-	trap #0
-	exit 1
-	.endm
-
-	.macro mvi_h_gr reg, val
-	.if (\val >= -128) && (\val <= 127)
-	ldi8 \reg, \val
-	.else
-	seth \reg, high(\val)
-	or3 \reg, \reg, low(\val)
-	.endif
-	.endm
-
-	.macro mvaddr_h_gr reg, addr
-	seth \reg, high(\addr)
-	or3 \reg, \reg, low(\addr)
-	.endm
-
-# Other macros know this only clobbers r0.
-	.macro test_h_gr reg, val
-	mvaddr_h_gr r0, \val
-	beq \reg, r0, test_gr\@
-	fail
-test_gr\@:
-	.endm
-
-	.macro mvi_h_condbit val
-	ldi8 r0, 0
-	ldi8 r1, 1
-	.if \val
-	cmp r0, r1
-	.else
-	cmp r1, r0
-	.endif
-	.endm
-
-	.macro test_h_condbit val
-	.if \val
-	bc test_c1\@
-	fail
-test_c1\@:
-	.else
-	bnc test_c0\@
-	fail
-test_c0\@:
-	.endif
-	.endm
-
-	.macro mvi_h_accum0 hi, lo
-	mvi_h_gr r0, \hi
-	mvtachi r0
-	mvi_h_gr r0, \lo
-	mvtaclo r0
-	.endm
-
-	.macro test_h_accum0 hi, lo
-	mvfachi r1
-	test_h_gr r1, \hi
-	mvfaclo r1
-	test_h_gr r1, \lo
-	.endm
-
diff --git a/sim/testsuite/sim/m32r/trap.cgs b/sim/testsuite/sim/m32r/trap.cgs
deleted file mode 100644
index 59e136a0173..00000000000
--- a/sim/testsuite/sim/m32r/trap.cgs
+++ /dev/null
@@ -1,109 +0,0 @@
-# m32r testcase for trap #$uimm4
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global trap
-trap:
-
-; Test 1: bbpsw = 0, bpsw = 1, psw = 0
-
-	; bbsm = 0, bie = 0, bbcond = 0
-	mvi_h_gr r4, 0
-	mvtc r4, cr8
-
-	; bsm = 1, bie = 1, bcond = 1, sm = 0, ie = 0, cond = 0
-	mvi_h_gr r4, 0xc100
-	mvtc r4, cr0
-
-	; bbpc = 0
-	mvaddr_h_gr r4, 0
-	mvtc r4, bbpc
-
-	; bpc = 42
-	mvaddr_h_gr r4, 42
-	mvtc r4, bpc
-
-	; Copy trap2_handler to trap area of memory.
-	ld24 r0,#0x48 ; address of trap 2 handler
-	ld24 r1,#trap2_handler
-	ld r2,@r1
-	st r2,@r0
-	; Set up return address.
-	ld24 r5,#trap2_ret1
-
-trap_insn1:
-	trap #2
-	fail
-
-trap2_ret1:
-	; test bbsm = 1, bbie = 1, bbcond = 1
-	mvfc r4, cr8
-	test_h_gr r4, 0xc1
-
-	; test bsm = 0, bie = 0, bcond = 0, sm = 0, ie = 0, cond = 0
-	mvfc r4, cr0
-	test_h_gr r4, 0
-
-	; test bbpc = 42
-	mvfc r4, bbpc
-	test_h_gr r4, 42
-
-	; test bpc = proper return address
-	mvfc r4, bpc
-	test_h_gr r4, trap_insn1 + 4
-
-; Test 2: bbpsw = 1, bpsw = 0, psw = 1
-
-	; bbsm = 1, bie = 1, bbcond = 1
-	mvi_h_gr r4, 0xc1
-	mvtc r4, cr8
-
-	; bsm = 0, bie = 0, bcond = 0, sm = 1, ie = 1, cond = 1
-	mvi_h_gr r4, 0xc1
-	mvtc r4, cr0
-
-	; bbpc = 42
-	mvaddr_h_gr r4, 42
-	mvtc r4, bbpc
-
-	; bpc = 0
-	mvaddr_h_gr r4, 0
-	mvtc r4, bpc
-
-	; Set up return address.
-	ld24 r5,#trap2_ret2
-
-trap_insn2:
-	trap #2
-	fail
-
-trap2_ret2:
-	; test bbsm = 0, bbie = 0, bbcond = 0
-	mvfc r4, cr8
-	test_h_gr r4, 0
-
-	; test bsm = 1, bie = 1, bcond = 1, sm = 1, ie = 0, cond = 0
-	mvfc r4, cr0
-	test_h_gr r4, 0xc180
-
-	; test bbpc = 0
-	mvfc r4, bbpc
-	test_h_gr r4, 0
-
-	; test bpc = proper return address
-	mvfc r4, bpc
-	test_h_gr r4, trap_insn2 + 4
-
-	pass
-
-	.data
-
-; Don't use rte as it will undo the effects of trap we're testing.
-
-	.p2align 2
-trap2_handler:
-	jmp r5
-	nop
diff --git a/sim/testsuite/sim/m32r/unlock.cgs b/sim/testsuite/sim/m32r/unlock.cgs
deleted file mode 100644
index 1a51b7ae4cf..00000000000
--- a/sim/testsuite/sim/m32r/unlock.cgs
+++ /dev/null
@@ -1,30 +0,0 @@
-# m32r testcase for unlock $src1,@$src2
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global unlock
-unlock:
-	mvaddr_h_gr r4, data_loc
-	mvi_h_gr    r5, 1
-
-	lock r5, @r4
-
-	mvi_h_gr r5, 2
-	unlock r5, @r4
-
-	ld r6, @r4
-	test_h_gr r6, 2
-
-	mvi_h_gr r5, 0
-	unlock r5, @r4	; This should be a nop since the processor should be unlocked.
-
-	ld r6, @r4
-	test_h_gr r6, 2
-	
-	pass
-
-data_loc:
-	.word 0
diff --git a/sim/testsuite/sim/m32r/uread16.ms b/sim/testsuite/sim/m32r/uread16.ms
deleted file mode 100644
index 550e99a2dfc..00000000000
--- a/sim/testsuite/sim/m32r/uread16.ms
+++ /dev/null
@@ -1,18 +0,0 @@
-# mach: m32r m32rx
-# xerror:
-# output: *misaligned read*
-
-	.include "testutils.inc"
-
-	start
-
-; construct bra trap2_handler in trap 2 slot
-	ld24 r0,#foo+1
-	ldh r0,@r0
-	fail
-	exit 0
-
-.data
-	.p2align 2
-foo:
-	.short 42
diff --git a/sim/testsuite/sim/m32r/uread32.ms b/sim/testsuite/sim/m32r/uread32.ms
deleted file mode 100644
index 935c71624e4..00000000000
--- a/sim/testsuite/sim/m32r/uread32.ms
+++ /dev/null
@@ -1,18 +0,0 @@
-# mach: m32r m32rx
-# xerror:
-# output: *misaligned read*
-
-	.include "testutils.inc"
-
-	start
-
-; construct bra trap2_handler in trap 2 slot
-	ld24 r0,#foo+1
-	ld r0,@r0
-	fail
-	exit 0
-
-.data
-	.p2align 2
-foo:
-	.word 42
diff --git a/sim/testsuite/sim/m32r/uwrite16.ms b/sim/testsuite/sim/m32r/uwrite16.ms
deleted file mode 100644
index 11bfd6ee2a9..00000000000
--- a/sim/testsuite/sim/m32r/uwrite16.ms
+++ /dev/null
@@ -1,18 +0,0 @@
-# mach: m32r m32rx
-# xerror:
-# output: *misaligned write*
-
-	.include "testutils.inc"
-
-	start
-
-; construct bra trap2_handler in trap 2 slot
-	ld24 r0,#foo+1
-	sth r0,@r0
-	fail
-	exit 0
-
-.data
-	.p2align 2
-foo:
-	.short 42
diff --git a/sim/testsuite/sim/m32r/uwrite32.ms b/sim/testsuite/sim/m32r/uwrite32.ms
deleted file mode 100644
index 495a123b60e..00000000000
--- a/sim/testsuite/sim/m32r/uwrite32.ms
+++ /dev/null
@@ -1,18 +0,0 @@
-# mach: m32r m32rx
-# xerror:
-# output: *misaligned write*
-
-	.include "testutils.inc"
-
-	start
-
-; construct bra trap2_handler in trap 2 slot
-	ld24 r0,#foo+1
-	st r0,@r0
-	fail
-	exit 0
-
-.data
-	.p2align 2
-foo:
-	.word 42
diff --git a/sim/testsuite/sim/m32r/xor.cgs b/sim/testsuite/sim/m32r/xor.cgs
deleted file mode 100644
index 254da798167..00000000000
--- a/sim/testsuite/sim/m32r/xor.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# m32r testcase for xor $dr,$sr
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global xor
-xor:
-
-	mvi_h_gr  r4, 3
-	mvi_h_gr  r5, 6
-	xor       r4, r5
-	test_h_gr r4, 5
-
-	pass
diff --git a/sim/testsuite/sim/m32r/xor3.cgs b/sim/testsuite/sim/m32r/xor3.cgs
deleted file mode 100644
index eee7269f934..00000000000
--- a/sim/testsuite/sim/m32r/xor3.cgs
+++ /dev/null
@@ -1,16 +0,0 @@
-# m32r testcase for xor3 $dr,$sr,#$uimm16
-# mach(): m32r m32rx
-
-	.include "testutils.inc"
-
-	start
-
-	.global xor3
-xor3:
-
-	mvi_h_gr  r5, 0
-	mvi_h_gr  r4, 3
-	xor3      r5, r4, #6
-	test_h_gr r5, 5
-
-	pass
diff --git a/sim/testsuite/sim/mips/ChangeLog b/sim/testsuite/sim/mips/ChangeLog
deleted file mode 100644
index 7d756619a66..00000000000
--- a/sim/testsuite/sim/mips/ChangeLog
+++ /dev/null
@@ -1,40 +0,0 @@
-2004-04-11  Chris Demetriou  <cgd@broadcom.com>
-
-	* utils-fpu.inc (enable_fpu, ckm_fp_cc): New macros.
-	(clrset_fp_cc): Fix mask used for upper 7 condition codes.
-	* utils-mdmx.inc: Include utils-fpu.inc.
-	(enable_mdmx): Use enable_fpu.
-
-2004-04-10  Chris Demetriou  <cgd@broadcom.com>
-
-	* utils-fpu.inc: New file.
-	* utils-mdmx.inc: New file.
-	* mdmx-ob.s: New file.
-	* mdmx-ob-sb1.s: New file.
-	* basic.exp: Run new mdmx-ob and mdmx-ob-sb1 tests.
-
-2004-04-10  Chris Demetriou  <cgd@broadcom.com>
-
-	* fpu64-ps-sb1.s: New file.
-	* basic.exp: Recognize mipsisa64sb1 targets, and run fpu64-ps-sb1.s
-	if appropriate.
-
-2004-04-10  Chris Demetriou  <cgd@broadcom.com>
-
-	* fpu64-ps.s: New file.
-	* basic.exp: Run fpu64-ps.s.
-
-2004-03-29  Richard Sandiford  <rsandifo@redhat.com>
-
-	* hilo-hazard-[123].s: New files.
-	* basic.exp (run_hilo_test): New procedure.
-	(models): Only list models that are included in the configuration.
-	(submodels): New variable, set to submodels of the above.
-	(mips64vr-*-elf, mips64vrel-*-elf): New configuration stanza.
-	Run hilo-hazard-[123].s.
-
-2004-01-26  Chris Demetriou  <cgd@broadcom.com>
-
-	* basic.exp: New file.
-	* testutils.inc: New file.
-	* sanity.s: New file.
diff --git a/sim/testsuite/sim/mips/basic.exp b/sim/testsuite/sim/mips/basic.exp
deleted file mode 100644
index b7cb0576ac0..00000000000
--- a/sim/testsuite/sim/mips/basic.exp
+++ /dev/null
@@ -1,74 +0,0 @@
-# MIPS simulator instruction tests
-
-# As gross as it is, we unset the linker script specifid by the target
-# board.  The MIPS libgloss linker scripts include libgcc (and possibly
-# other libraries), which the linker (used to link these tests rather
-# than the compiler) can't necessarily find.
-unset_currtarget_info ldscript
-
-# Do "run_sim_test TESTFILE MODELS" for each combination of the
-# mf{lo,hi} -> mult/div/mt{lo,hi} hazard described in mips.igen.
-# Insert NOPS nops after the mflo or mfhi.
-proc run_hilo_test {testfile models nops} {
-    foreach reg {lo hi} {
-	foreach insn "{mult\t\$4,\$4} {div\t\$0,\$4,\$4} {mt$reg\t\$4}" {
-	    set contents ""
-	    append contents "\t.macro hilo\n"
-	    append contents "\tmf$reg\t\$4\n"
-	    append contents "\t.rept\t$nops\n"
-	    append contents "\tnop\n"
-	    append contents "\t.endr\n"
-	    append contents "\t$insn\n"
-	    append contents "\t.endm"
-
-	    verbose -log "HILO test:\n$contents"
-	    set file [open hilo-hazard.inc w]
-	    puts $file $contents
-	    close $file
-
-	    run_sim_test $testfile $models
-	}
-    }
-}
-
-
-# Only test mips*-elf (e.g., no mips-linux), and only test if the target
-# board really is a simulator (sim tests don't work on real HW).
-if {[istarget mips*-elf] && [board_info target exists is_simulator]} {
-
-    if {[istarget mipsisa64sb1*-elf]} {
-	set models "sb1"
-	set submodels "mips1 mips2 mips3 mips4 mips32 mips64"
-    } elseif {[istarget mipsisa64*-elf]} {
-	set models "mips32 mips64"
-	set submodels "mips1 mips2 mips3 mips4"
-    } elseif {[istarget mipsisa32*-elf]} {
-	set models "mips32"
-	set submodels "mips1 mips2"
-    } elseif {[istarget mips64vr-*-elf] || [istarget mips64vrel-*-elf]} {
-	set models "vr4100 vr4111 vr4120 vr5000 vr5400 vr5500"
-	set submodels "mips1 mips2 mips3 mips4"
-    } elseif {[istarget mips64*-elf]} {
-	set models "mips3"
-	set submodels "mips1 mips2"
-    } else {
-	# fall back to just testing mips1 code.
-	set models "mips1"
-	set submodels ""
-    }
-    append submodels " " $models
-    set cpu_option -march
-
-    run_sim_test sanity.s $submodels
-    foreach nops {0 1} {
-	run_hilo_test hilo-hazard-1.s $models $nops
-	run_hilo_test hilo-hazard-2.s $models $nops
-    }
-    run_hilo_test hilo-hazard-3.s $models 2
-
-    run_sim_test fpu64-ps.s $submodels
-    run_sim_test fpu64-ps-sb1.s $submodels
-
-    run_sim_test mdmx-ob.s $submodels
-    run_sim_test mdmx-ob-sb1.s $submodels
-}
diff --git a/sim/testsuite/sim/mips/fpu64-ps-sb1.s b/sim/testsuite/sim/mips/fpu64-ps-sb1.s
deleted file mode 100644
index a39d0799c0d..00000000000
--- a/sim/testsuite/sim/mips/fpu64-ps-sb1.s
+++ /dev/null
@@ -1,72 +0,0 @@
-# mips test sanity, expected to pass.
-# mach:	 sb1
-# as:		-mabi=eabi
-# ld:		-N -Ttext=0x80010000
-# output:	*\\npass\\n
-
-	.include "testutils.inc"
-
-        .macro check_ps psval, upperval, lowerval
-	.set push
-	.set noreorder
-	cvt.s.pu	$f0, \psval		# upper
-	cvt.s.pl	$f2, \psval		# lower
-	li.s		$f4, \upperval
-	li.s		$f6, \lowerval
-	c.eq.s		$fcc0, $f0, $f4
-	bc1f		$fcc0, _fail
-	 c.eq.s		$fcc0, $f2, $f6
-	bc1f		$fcc0, _fail
-	 nop
-	.set pop
-        .endm
-
-	setup
-
-	.set noreorder
-
-	.ent DIAG
-DIAG:
-
-	# make sure that Status.FR, .CU1, and .SBX are set.
-	mfc0	$2, $12
-	or	$2, $2, (1 << 26) | (1 << 29) | (1 << 16)
-	mtc0	$2, $12
-
-
-	li.s	$f10, 4.0
-	li.s	$f12, 16.0
-	cvt.ps.s $f20, $f10, $f12		# $f20: u=4.0, l=16.0
-
-	li.s	$f10, -1.0
-	li.s	$f12, 2.0
-	cvt.ps.s $f22, $f10, $f12		# $f22: u=-1.0, l=2.0
-
-
-	writemsg "div.ps"
-
-	div.ps $f8, $f20, $f22
-	check_ps $f8, -4.0, 8.0
-
-
-	writemsg "recip.ps"
-
-	recip.ps $f8, $f20
-	check_ps $f8, 0.25, 0.0625
-
-
-	writemsg "rsqrt.ps"
-
-	rsqrt.ps $f8, $f20
-	check_ps $f8, 0.5, 0.25
-
-
-	writemsg "sqrt.ps"
-
-	sqrt.ps $f8, $f20
-	check_ps $f8, 2.0, 4.0
-
-
-	pass
-
-	.end DIAG
diff --git a/sim/testsuite/sim/mips/fpu64-ps.s b/sim/testsuite/sim/mips/fpu64-ps.s
deleted file mode 100644
index ad493b8ac31..00000000000
--- a/sim/testsuite/sim/mips/fpu64-ps.s
+++ /dev/null
@@ -1,367 +0,0 @@
-# mips test sanity, expected to pass.
-# mach:	 mips64 sb1
-# as:		-mabi=eabi
-# ld:		-N -Ttext=0x80010000
-# output:	*\\npass\\n
-
-	.include "testutils.inc"
-
-        .macro check_ps psval, upperval, lowerval
-	.set push
-	.set noreorder
-	cvt.s.pu	$f0, \psval		# upper
-	cvt.s.pl	$f2, \psval		# lower
-	li.s		$f4, \upperval
-	li.s		$f6, \lowerval
-	c.eq.s		$fcc0, $f0, $f4
-	bc1f		$fcc0, _fail
-	 c.eq.s		$fcc0, $f2, $f6
-	bc1f		$fcc0, _fail
-	 nop
-	.set pop
-        .endm
-
-	setup
-
-	.set noreorder
-
-	.ent DIAG
-DIAG:
-
-	# make sure that Status.FR and .CU1 are set.
-	mfc0	$2, $12
-	or	$2, $2, (1 << 26) | (1 << 29)
-	mtc0	$2, $12
-
-
-	writemsg "ldc1"
-
-	.data
-1:	.dword	0xc1a8000042200000		# -21.0, 40.0
-	.text
-	la	$2, 1b
-	ldc1	$f8, 0($2)
-	check_ps $f8, -21.0, 40.0
-
-
-	writemsg "cvt.ps.s"
-
-	li.s	$f10, 1.0
-	li.s	$f12, 3.0
-	cvt.ps.s $f8, $f10, $f12		# upper, lower
-	check_ps $f8, 1.0, 3.0
-
-
-	writemsg "cvt.ps.s, sdc1, copy, ldc1"
-
-	.data
-1:	.dword	0
-	.dword	0
-	.text
-	la	$2, 1b
-	li.s	$f12, -4.0
-	li.s	$f14, 32.0
-	cvt.ps.s $f10, $f12, $f14		# upper, lower
-	sdc1	$f10, 8($2)
-	lw	$3, 8($2)
-	lw	$4, 12($2)
-	sw	$3, 0($2)
-	sw	$4, 4($2)
-	ldc1	$f8, 0($2)
-	check_ps $f8, -4.0, 32.0
-
-
-	# Load some constants for later use
-
-	li.s	$f10, 4.0
-	li.s	$f12, 16.0
-	cvt.ps.s $f20, $f10, $f12		# $f20: u=4.0, l=16.0
-
-	li.s	$f10, -1.0
-	li.s	$f12, 2.0
-	cvt.ps.s $f22, $f10, $f12		# $f22: u=-1.0, l=2.0
-
-	li.s	$f10, 17.0
-	li.s	$f12, -8.0
-	cvt.ps.s $f24, $f10, $f12		# $f24: u=17.0, l=-8.0
-
-
-	writemsg "pll.ps"
-
-	pll.ps	$f8, $f20, $f22
-	check_ps $f8, 16.0, 2.0
-
-
-	writemsg "plu.ps"
-
-	plu.ps	$f8, $f20, $f22
-	check_ps $f8, 16.0, -1.0
-
-
-	writemsg "pul.ps"
-
-	pul.ps	$f8, $f20, $f22
-	check_ps $f8, 4.0, 2.0
-
-
-	writemsg "puu.ps"
-
-	puu.ps	$f8, $f20, $f22
-	check_ps $f8, 4.0, -1.0
-
-
-	writemsg "abs.ps"
-
-	abs.ps	$f8, $f22
-	check_ps $f8, 1.0, 2.0
-
-
-	writemsg "mov.ps"
-
-	mov.ps	$f8, $f22
-	check_ps $f8, -1.0, 2.0
-
-
-	writemsg "neg.ps"
-
-	neg.ps	$f8, $f22
-	check_ps $f8, 1.0, -2.0
-
-
-	writemsg "add.ps"
-
-	add.ps	$f8, $f20, $f22
-	check_ps $f8, 3.0, 18.0
-
-
-	writemsg "mul.ps"
-
-	mul.ps	$f8, $f20, $f22
-	check_ps $f8, -4.0, 32.0
-
-
-	writemsg "sub.ps"
-
-	sub.ps	$f8, $f20, $f22
-	check_ps $f8, 5.0, 14.0
-
-
-	writemsg "madd.ps"
-
-	madd.ps	$f8, $f24, $f20, $f22
-	check_ps $f8, 13.0, 24.0
-
-
-	writemsg "msub.ps"
-
-	msub.ps	$f8, $f24, $f20, $f22
-	check_ps $f8, -21.0, 40.0
-
-
-	writemsg "nmadd.ps"
-
-	nmadd.ps $f8, $f24, $f20, $f22
-	check_ps $f8, -13.0, -24.0
-
-
-	writemsg "nmsub.ps"
-
-	nmsub.ps $f8, $f24, $f20, $f22
-	check_ps $f8, 21.0, -40.0
-
-
-	writemsg "movn.ps (n)"
-
-	li	$2, 0
-	mov.ps	$f8, $f20
-	movn.ps	$f8, $f22, $2		# doesn't move
-	check_ps $f8, 4.0, 16.0
-
-
-	writemsg "movn.ps (y)"
-
-	li	$2, 1
-	mov.ps	$f8, $f20
-	movn.ps	$f8, $f22, $2		# does move
-	check_ps $f8, -1.0, 2.0
-
-
-	writemsg "movz.ps (y)"
-
-	li	$2, 0
-	mov.ps	$f8, $f20
-	movz.ps	$f8, $f22, $2		# does move
-	check_ps $f8, -1.0, 2.0
-
-
-	writemsg "movz.ps (n)"
-
-	li	$2, 1
-	mov.ps	$f8, $f20
-	movz.ps	$f8, $f22, $2		# doesn't move
-	check_ps $f8, 4.0, 16.0
-
-
-	writemsg "movf.ps (y,y)"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (1 << 25)
-	xor	$2, $2, (1 << 23) | (1 << 25)
-	ctc1	$2, $31			# clear fcc0, clear fcc1
-	mov.ps	$f8, $f20
-	movf.ps	$f8, $f22, $fcc0	# moves both halves
-	check_ps $f8, -1.0, 2.0
-
-
-	writemsg "movf.ps (y,n)"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (1 << 25)
-	xor	$2, $2, (0 << 23) | (1 << 25)
-	ctc1	$2, $31			# set fcc0, clear fcc1
-	mov.ps	$f8, $f20
-	movf.ps	$f8, $f22, $fcc0	# moves upper half only
-	check_ps $f8, -1.0, 16.0
-
-
-	writemsg "movf.ps (n,y)"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (1 << 25)
-	xor	$2, $2, (1 << 23) | (0 << 25)
-	ctc1	$2, $31			# clear fcc0, set fcc1
-	mov.ps	$f8, $f20
-	movf.ps	$f8, $f22, $fcc0	# moves lower half only
-	check_ps $f8, 4.0, 2.0
-
-
-	writemsg "movf.ps (n,n)"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (1 << 25)
-	xor	$2, $2, (0 << 23) | (0 << 25)
-	ctc1	$2, $31			# set fcc0, set fcc1
-	mov.ps	$f8, $f20
-	movf.ps	$f8, $f22, $fcc0	# doesn't move either half
-	check_ps $f8, 4.0, 16.0
-
-
-	writemsg "movt.ps (n,n)"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (1 << 25)
-	xor	$2, $2, (1 << 23) | (1 << 25)
-	ctc1	$2, $31			# clear fcc0, clear fcc1
-	mov.ps	$f8, $f20
-	movt.ps	$f8, $f22, $fcc0	# doesn't move either half
-	check_ps $f8, 4.0, 16.0
-
-
-	writemsg "movt.ps (n,y)"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (1 << 25)
-	xor	$2, $2, (0 << 23) | (1 << 25)
-	ctc1	$2, $31			# set fcc0, clear fcc1
-	mov.ps	$f8, $f20
-	movt.ps	$f8, $f22, $fcc0	# moves lower half only
-	check_ps $f8, 4.0, 2.0
-
-
-	writemsg "movt.ps (y,n)"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (1 << 25)
-	xor	$2, $2, (1 << 23) | (0 << 25)
-	ctc1	$2, $31			# clear fcc0, set fcc1
-	mov.ps	$f8, $f20
-	movt.ps	$f8, $f22, $fcc0	# moves upper half only
-	check_ps $f8, -1.0, 16.0
-
-
-	writemsg "movt.ps (y,y)"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (1 << 25)
-	xor	$2, $2, (0 << 23) | (0 << 25)
-	ctc1	$2, $31			# set fcc0, set fcc1
-	mov.ps	$f8, $f20
-	movt.ps	$f8, $f22, $fcc0	# moves both halves
-	check_ps $f8, -1.0, 2.0
-
-
-	writemsg "alnv.ps (aligned)"
-
-	.data
-1:	.dword	0xc1a8000042200000		# -21.0, 40.0
-	.dword	0xc228000041a00000		# -42.0, 20.0
-	.text
-	la	$2, 1b
-	li	$3, 0
-	addu	$4, $3, 8
-	luxc1	$f10, $3($2)
-	luxc1	$f12, $4($2)
-	alnv.ps	$f8, $f10, $f12, $3
-	check_ps $f8, -21.0, 40.0
-
-
-	writemsg "alnv.ps (unaligned)"
-
-	.data
-1:	.dword	0xc1a8000042200000		# -21.0, 40.0
-	.dword	0xc228000041a00000		# -42.0, 20.0
-	.hword	0x0001
-	.text
-	la	$2, 1b
-	li	$3, 4
-	addu	$4, $3, 8
-	luxc1	$f10, $3($2)
-	luxc1	$f12, $4($2)
-	alnv.ps	$f8, $f10, $f12, $3
-
-	lb	$5, 16($2)
-	bnez	$5, 2f				# little endian
-	 nop
-
-	# big endian
-	check_ps $f8, 40.0, -42.0
-	b	3f
-	 nop
-2:
-	# little endian
-	check_ps $f8, 20.0, -21.0
-3:
-
-
-	# We test c.cond.ps only lightly, just to make sure it modifies
-	# two bits and compares the halves separately.  Perhaps it should
-	# be tested more thoroughly.
-
-	writemsg "c.f.ps"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (0x7f << 25)
-	ctc1	$2, $31			# set all fcc bits
-	c.f.ps	$fcc0, $f8, $f8		# -> f, f
-	bc1t	$fcc0, _fail
-	 nop
-	bc1t	$fcc1, _fail
-	 nop
-
-	
-	writemsg "c.olt.ps"
-
-	cfc1	$2, $31	
-	or	$2, $2, (1 << 23) | (0x7f << 25)
-	xor	$2, $2, (1 << 23) | (0x7f << 25)
-	ctc1	$2, $31			# clear all fcc bits
-	c.lt.ps $fcc0, $f22, $f24	# -> f, t
-	bc1t	$fcc0, _fail
-	 nop
-	bc1f	$fcc1, _fail
-	 nop
-	
-
-	pass
-
-	.end DIAG
diff --git a/sim/testsuite/sim/mips/hilo-hazard-1.s b/sim/testsuite/sim/mips/hilo-hazard-1.s
deleted file mode 100644
index f20c9390feb..00000000000
--- a/sim/testsuite/sim/mips/hilo-hazard-1.s
+++ /dev/null
@@ -1,19 +0,0 @@
-# Test for architectures with mf{hi,lo} -> mult/div/mt{hi,lo} hazards.
-#
-# mach:		mips1 mips2 mips3 mips4 vr4100 vr4111 vr4120 vr5000 vr5400
-# as:		-mabi=eabi
-# ld:		-N -Ttext=0x80010000
-# output:	HILO: * too close to MF at *\\n\\nprogram stopped*\\n
-# xerror:
-
-	.include "hilo-hazard.inc"
-	.include "testutils.inc"
-
-	setup
-
-	.set noreorder
-	.ent DIAG
-DIAG:
-	hilo
-	pass
-	.end DIAG
diff --git a/sim/testsuite/sim/mips/hilo-hazard-2.s b/sim/testsuite/sim/mips/hilo-hazard-2.s
deleted file mode 100644
index 07b84d26780..00000000000
--- a/sim/testsuite/sim/mips/hilo-hazard-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-# Test for architectures without mf{hi,lo} -> mult/div/mt{hi,lo} hazards.
-#
-# mach:		vr5500 mips32 mips64
-# as:		-mabi=eabi
-# ld:		-N -Ttext=0x80010000
-# output:	pass\\n
-
-	.include "hilo-hazard.inc"
-	.include "testutils.inc"
-
-	setup
-
-	.set noreorder
-	.ent DIAG
-DIAG:
-	hilo
-	pass
-	.end DIAG
diff --git a/sim/testsuite/sim/mips/hilo-hazard-3.s b/sim/testsuite/sim/mips/hilo-hazard-3.s
deleted file mode 100644
index 1a0949db6e0..00000000000
--- a/sim/testsuite/sim/mips/hilo-hazard-3.s
+++ /dev/null
@@ -1,18 +0,0 @@
-# Test for mf{hi,lo} -> mult/div/mt{hi,lo} with 2 nops inbetween.
-#
-# mach:		all
-# as:		-mabi=eabi
-# ld:		-N -Ttext=0x80010000
-# output:	pass\\n
-
-	.include "hilo-hazard.inc"
-	.include "testutils.inc"
-
-	setup
-
-	.set noreorder
-	.ent DIAG
-DIAG:
-	hilo
-	pass
-	.end DIAG
diff --git a/sim/testsuite/sim/mips/mdmx-ob-sb1.s b/sim/testsuite/sim/mips/mdmx-ob-sb1.s
deleted file mode 100644
index c8409fc0b42..00000000000
--- a/sim/testsuite/sim/mips/mdmx-ob-sb1.s
+++ /dev/null
@@ -1,102 +0,0 @@
-# MDMX .OB op tests.
-# mach:	 sb1
-# as:		-mabi=eabi
-# ld:		-N -Ttext=0x80010000
-# output:	*\\npass\\n
-
-	.include "testutils.inc"
-	.include "utils-mdmx.inc"
-
-	setup
-
-	.set noreorder
-
-	.ent DIAG
-DIAG:
-
-	enable_mdmx
-
-	# set Status.SBX to enable SB-1 extensions.
-	mfc0	$2, $12
-	or	$2, $2, (1 << 16)
-	mtc0	$2, $12
-
-
-	###
-	### SB-1 Non-accumulator .ob format ops.
-	###
-	### Key: v = vector
-	###      ev = vector of single element
-	###      cv = vector of constant.
-	###
-
-
-	writemsg "pavg.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	pavg.ob	$f10, $f8, $f9
-	ck_ob $f10, 0x3c4d5e6f8091a2b3
-
-	writemsg "pavg.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	pavg.ob	$f10, $f8, $f9[6]
-	ck_ob $f10, 0x444d555e666f7780
-
-	writemsg "pavg.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	pavg.ob	$f10, $f8, 0x10
-	ck_ob $f10, 0x1119222a333b444c
-
-
-	writemsg "pabsdiff.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	pabsdiff.ob	$f10, $f8, $f9
-	ck_ob $f10, 0x5555555555555555
-
-	writemsg "pabsdiff.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	pabsdiff.ob	$f10, $f8, $f9[7]
-	ck_ob $f10, 0x5544332211001122
-
-	writemsg "pabsdiff.ob (cv)"
-	ld_ob	$f8, 0x0001020304050607
-	pabsdiff.ob	$f10, $f8, 0x04
-	ck_ob $f10, 0x0403020100010203
-
-
-	###
-	### SB-1 Accumulator .ob format ops
-	###
-	### Key: v = vector
-	###      ev = vector of single element
-	###      cv = vector of constant.
-	###
-
-
-	writemsg "pabsdiffc.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	pabsdiffc.ob $f8, $f9
-	ck_acc_ob 0x0001020304050607, 0x0000000000000000, 0x5555555555555555
-
-	writemsg "pabsdiffc.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	pabsdiffc.ob $f8, $f9[7]
-	ck_acc_ob 0x0001020304050607, 0x0000000000000000, 0x5544332211001122
-
-	writemsg "pabsdiffc.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x0001020304050607
-	pabsdiffc.ob $f8, 0x04
-	ck_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0403020100010203
-
-
-	pass
-
-	.end DIAG
diff --git a/sim/testsuite/sim/mips/mdmx-ob.s b/sim/testsuite/sim/mips/mdmx-ob.s
deleted file mode 100644
index ad9bbda3cae..00000000000
--- a/sim/testsuite/sim/mips/mdmx-ob.s
+++ /dev/null
@@ -1,631 +0,0 @@
-# MDMX .OB op tests.
-# mach:	 mips64 sb1
-# as:		-mabi=eabi
-# as(mips64):	-mabi=eabi -mdmx
-# ld:		-N -Ttext=0x80010000
-# output:	*\\npass\\n
-
-	.include "testutils.inc"
-	.include "utils-fpu.inc"
-	.include "utils-mdmx.inc"
-
-	setup
-
-	.set noreorder
-
-	.ent DIAG
-DIAG:
-
-	enable_mdmx
-
-
-	###
-	### Non-accumulator, non-CC-using .ob format ops.
-	###
-	### Key: v = vector
-	###      ev = vector of single element
-	###      cv = vector of constant.
-	###
-
-
-	writemsg "add.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	add.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x7799bbddffffffff
-
-	writemsg "add.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	add.ob	$f10, $f8, $f9[6]
-	ck_ob	$f10, 0x8899aabbccddeeff
-
-	writemsg "add.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	add.ob	$f10, $f8, 0x10
-	ck_ob	$f10, 0x2132435465768798
-
-
-	writemsg "alni.ob"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	alni.ob	$f10, $f8, $f9, 3
-	ck_ob	$f10, 0x4455667788667788
-
-
-	writemsg "alnv.ob"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	li	$4, 5
-	alnv.ob	$f10, $f8, $f9, $4
-	ck_ob	$f10, 0x66778866778899aa
-
-
-	writemsg "and.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	and.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x0022000000224488
-
-	writemsg "and.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	and.ob	$f10, $f8, $f9[4]
-	ck_ob	$f10, 0x1100110011001188
-
-	writemsg "and.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	and.ob	$f10, $f8, 0x1e
-	ck_ob	$f10, 0x1002120414061608
-
-
-	writemsg "max.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	max.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x66778899aabbccdd
-
-	writemsg "max.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	max.ob	$f10, $f8, $f9[7]
-	ck_ob	$f10, 0x6666666666667788
-
-	writemsg "max.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	max.ob	$f10, $f8, 0x15
-	ck_ob	$f10, 0x1522334455667788
-
-
-	writemsg "min.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	min.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x1122334455667788
-
-	writemsg "min.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	min.ob	$f10, $f8, $f9[7]
-	ck_ob	$f10, 0x1122334455666666
-
-	writemsg "min.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	min.ob	$f10, $f8, 0x15
-	ck_ob	$f10, 0x1115151515151515
-
-
-	writemsg "mul.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x0001020304050607
-	mul.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x002266ccffffffff
-
-	writemsg "mul.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x0001020304050607
-	mul.ob	$f10, $f8, $f9[4]
-	ck_ob	$f10, 0x336699ccffffffff
-
-	writemsg "mul.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	mul.ob	$f10, $f8, 2
-	ck_ob	$f10, 0x22446688aacceeff
-
-
-	writemsg "nor.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	nor.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x8888442200000022
-
-	writemsg "nor.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	nor.ob	$f10, $f8, $f9[6]
-	ck_ob	$f10, 0x8888888888888800
-
-	writemsg "nor.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	nor.ob	$f10, $f8, 0x08
-	ck_ob	$f10, 0xe6d5c4b3a2918077
-
-
-	writemsg "or.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	or.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x7777bbddffffffdd
-
-	writemsg "or.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	or.ob	$f10, $f8, $f9[6]
-	ck_ob	$f10, 0x77777777777777ff
-
-	writemsg "or.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	or.ob	$f10, $f8, 0x08
-	ck_ob	$f10, 0x192a3b4c5d6e7f88
-
-
-	writemsg "shfl.mixh.ob"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	shfl.mixh.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x1166227733884499
-
-
-	writemsg "shfl.mixl.ob"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	shfl.mixl.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x55aa66bb77cc88dd
-
-
-	writemsg "shfl.pach.ob"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	shfl.pach.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x113355776688aacc
-
-
-	writemsg "shfl.upsl.ob"
-	ld_ob	$f8, 0x1122334455667788
-	shfl.upsl.ob	$f10, $f8, $f8
-	ck_ob	$f10, 0x005500660077ff88
-
-
-	writemsg "sll.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x0001020304050607
-	sll.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x1144cc2050c0c000
-
-	writemsg "sll.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x0001020304050607
-	sll.ob	$f10, $f8, $f9[3]
-	ck_ob	$f10, 0x1020304050607080
-
-	writemsg "sll.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	sll.ob	$f10, $f8, 1
-	ck_ob	$f10, 0x22446688aaccee10
-
-
-	writemsg "srl.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x0001020304050607
-	srl.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x11110c0805030101
-
-	writemsg "srl.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x0001020304050607
-	srl.ob	$f10, $f8, $f9[3]
-	ck_ob	$f10, 0x0102030405060708
-
-	writemsg "srl.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	srl.ob	$f10, $f8, 1
-	ck_ob	$f10, 0x081119222a333b44
-
-
-	writemsg "sub.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x0001020304050607
-	sub.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x1121314151617181
-
-	writemsg "sub.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	sub.ob	$f10, $f8, $f9[7]
-	ck_ob	$f10, 0x0000000000001122
-
-	writemsg "sub.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	sub.ob	$f10, $f8, 0x10
-	ck_ob	$f10, 0x0112233445566778
-
-
-	writemsg "xor.ob (v)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	xor.ob	$f10, $f8, $f9
-	ck_ob	$f10, 0x7755bbddffddbb55
-
-	writemsg "xor.ob (ev)"
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	xor.ob	$f10, $f8, $f9[6]
-	ck_ob	$f10, 0x66554433221100ff
-
-	writemsg "xor.ob (cv)"
-	ld_ob	$f8, 0x1122334455667788
-	xor.ob	$f10, $f8, 0x08
-	ck_ob	$f10, 0x192a3b4c5d6e7f80
-
-
-	###
-	### Accumulator .ob format ops (in order: rd/wr, math, scale/round)
-	###
-	### Key: v = vector
-	###      ev = vector of single element
-	###      cv = vector of constant.
-	###
-
-
-	writemsg "wacl.ob / rac[hml].ob"
-	ld_ob	$f8, 0x8001028304850687
-	ld_ob	$f9, 0x1011121314151617
-	wacl.ob	$f8, $f9
-	ck_acc_ob 0xff0000ff00ff00ff, 0x8001028304850687, 0x1011121314151617
-
-	# Note: relies on data left in accumulator by previous test.
-	writemsg "wach.ob / rac[hml].ob"
-	ld_ob	$f8, 0x2021222324252627
-	wach.ob	$f8
-	ck_acc_ob 0x2021222324252627, 0x8001028304850687, 0x1011121314151617
-
-
-	writemsg "adda.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	adda.ob	$f8, $f9
-	ck_acc_ob 0x0001020304050607, 0x0000000000010101, 0x7799bbddff214365
-
-	writemsg "adda.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	adda.ob	$f8, $f9[2]
-	ck_acc_ob 0x0001020304050607, 0x0000000001010101, 0xccddeeff10213243
-
-	writemsg "adda.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	adda.ob	$f8, 0x1f
-	ck_acc_ob 0x0001020304050607, 0x0000000000000000, 0x30415263748596a7
-
-
-	writemsg "addl.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	addl.ob	$f8, $f9
-	ck_acc_ob 0x0000000000000000, 0x0000000000010101, 0x7799bbddff214365
-
-	writemsg "addl.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	addl.ob	$f8, $f9[2]
-	ck_acc_ob 0x0000000000000000, 0x0000000001010101, 0xccddeeff10213243
-
-	writemsg "addl.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	addl.ob	$f8, 0x1f
-	ck_acc_ob 0x0000000000000000, 0x0000000000000000, 0x30415263748596a7
-
-
-	writemsg "mula.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	mula.ob	$f8, $f9
-	ck_acc_ob 0x0001020304050607, 0x060f1b28384a5e75, 0xc6ce18a47282d468
-
-	writemsg "mula.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	mula.ob	$f8, $f9[2]
-	ck_acc_ob 0x0001020304050607, 0x0c1825313e4a5663, 0x6bd641ac1782ed58
-
-	writemsg "mula.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	mula.ob	$f8, 0x1f
-	ck_acc_ob 0x0001020304050607, 0x020406080a0c0e10, 0x0f1e2d3c4b5a6978
-
-
-	writemsg "mull.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	mull.ob	$f8, $f9
-	ck_acc_ob 0x0000000000000000, 0x060f1b28384a5e75, 0xc6ce18a47282d468
-
-	writemsg "mull.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	mull.ob	$f8, $f9[2]
-	ck_acc_ob 0x0000000000000000, 0x0c1825313e4a5663, 0x6bd641ac1782ed58
-
-	writemsg "mull.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	mull.ob	$f8, 0x1f
-	ck_acc_ob 0x0000000000000000, 0x020406080a0c0e10, 0x0f1e2d3c4b5a6978
-
-
-	writemsg "muls.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	muls.ob	$f8, $f9
-	ck_acc_ob 0xff00010203040506, 0xf9f0e4d7c7b5a18a, 0x3a32e85c8e7e2c98
-
-	writemsg "muls.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	muls.ob	$f8, $f9[2]
-	ck_acc_ob 0xff00010203040506, 0xf3e7dacec1b5a99c, 0x952abf54e97e13a8
-
-	writemsg "muls.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	muls.ob	$f8, 0x1f
-	ck_acc_ob 0xff00010203040506, 0xfdfbf9f7f5f3f1ef, 0xf1e2d3c4b5a69788
-
-
-	writemsg "mulsl.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	mulsl.ob $f8, $f9
-	ck_acc_ob 0xffffffffffffffff, 0xf9f0e4d7c7b5a18a, 0x3a32e85c8e7e2c98
-
-	writemsg "mulsl.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	mulsl.ob $f8, $f9[2]
-	ck_acc_ob 0xffffffffffffffff, 0xf3e7dacec1b5a99c, 0x952abf54e97e13a8
-
-	writemsg "mulsl.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	mulsl.ob $f8, 0x1f
-	ck_acc_ob 0xffffffffffffffff, 0xfdfbf9f7f5f3f1ef, 0xf1e2d3c4b5a69788
-
-
-	writemsg "suba.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	suba.ob	$f8, $f9
-	ck_acc_ob 0xff00010203040506, 0xffffffffffffffff, 0xabababababababab
-
-	writemsg "suba.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	suba.ob	$f8, $f9[2]
-	ck_acc_ob 0xff00010203040506, 0xffffffffffffffff, 0x566778899aabbccd
-
-	writemsg "suba.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	suba.ob	$f8, 0x1f
-	ck_acc_ob 0xff01020304050607, 0xff00000000000000, 0xf203142536475869
-
-
-	writemsg "subl.ob (v)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	subl.ob	$f8, $f9
-	ck_acc_ob 0xffffffffffffffff, 0xffffffffffffffff, 0xabababababababab
-
-	writemsg "subl.ob (ev)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	ld_ob	$f9, 0x66778899aabbccdd
-	subl.ob	$f8, $f9[2]
-	ck_acc_ob 0xffffffffffffffff, 0xffffffffffffffff, 0x566778899aabbccd
-
-	writemsg "subl.ob (cv)"
-	ld_acc_ob 0x0001020304050607, 0x0000000000000000, 0x0000000000000000
-	ld_ob	$f8, 0x1122334455667788
-	subl.ob	$f8, 0x1f
-	ck_acc_ob 0xff00000000000000, 0xff00000000000000, 0xf203142536475869
-
-
-	writemsg "rnau.ob (v)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	ld_ob	$f8, 0x0001020304050607
-	rnau.ob	$f9, $f8
-	ck_ob	$f9, 0x4021110940201008
-
-	writemsg "rnau.ob (ev)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	ld_ob	$f8, 0x0001020304050607
-	rnau.ob	$f9, $f8[4]
-	ck_ob	$f9, 0x080809097f7f8080
-
-	writemsg "rnau.ob (cv)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	rnau.ob	$f9, 2
-	ck_ob	$f9, 0x10111112feffffff
-
-
-	writemsg "rneu.ob (v)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	ld_ob	$f8, 0x0001020304050607
-	rneu.ob	$f9, $f8
-	ck_ob	$f9, 0x4021110940201008
-
-	writemsg "rneu.ob (ev)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	ld_ob	$f8, 0x0001020304050607
-	rneu.ob	$f9, $f8[4]
-	ck_ob	$f9, 0x080808097f7f8080
-
-	writemsg "rneu.ob (cv)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	rneu.ob	$f9, 2
-	ck_ob	$f9, 0x10101112fefeffff
-
-
-	writemsg "rzu.ob (v)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	ld_ob	$f8, 0x0001020304050607
-	rzu.ob	$f9, $f8
-	ck_ob	$f9, 0x402111083f1f0f07
-
-	writemsg "rzu.ob (ev)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	ld_ob	$f8, 0x0001020304050607
-	rzu.ob	$f9, $f8[4]
-	ck_ob	$f9, 0x080808087f7f7f7f
-
-	writemsg "rzu.ob (cv)"
-	ld_acc_ob 0x0000000000000000, 0x0000000003030303, 0x40424446f8fafcfe
-	rzu.ob	$f9, 2
-	ck_ob	$f9, 0x10101111fefeffff
-
-
-	###
-	### CC-using .ob format ops.
-	###
-	### Key: v = vector
-	###      ev = vector of single element
-	###      cv = vector of constant.
-	###
-
-
-	writemsg "c.eq.ob (v)"
-	ld_ob	$f8, 0x0001010202030304
-	ld_ob	$f9, 0x0101020203030404
-	clr_fp_cc 0xff
-	c.eq.ob	$f8, $f9
-	ck_fp_cc 0x55
-
-	writemsg "c.eq.ob (ev)"
-	ld_ob	$f8, 0x0001010202030304
-	ld_ob	$f9, 0x0101020203030404
-	clr_fp_cc 0xff
-	c.eq.ob	$f8, $f9[5]
-	ck_fp_cc 0x18
-
-	writemsg "c.eq.ob (cv)"
-	ld_ob	$f8, 0x0001010202030304
-	clr_fp_cc 0xff
-	c.eq.ob	$f8, 0x03
-	ck_fp_cc 0x06
-
-
-	writemsg "c.le.ob (v)"
-	ld_ob	$f8, 0x0001010202030304
-	ld_ob	$f9, 0x0101020203030404
-	clr_fp_cc 0xff
-	c.le.ob	$f8, $f9
-	ck_fp_cc 0xff
-
-	writemsg "c.le.ob (ev)"
-	ld_ob	$f8, 0x0001010202030304
-	ld_ob	$f9, 0x0101020203030404
-	clr_fp_cc 0xff
-	c.le.ob	$f8, $f9[5]
-	ck_fp_cc 0xf8
-
-	writemsg "c.le.ob (cv)"
-	ld_ob	$f8, 0x0001010202030304
-	clr_fp_cc 0xff
-	c.le.ob	$f8, 0x03
-	ck_fp_cc 0xfe
-
-
-	writemsg "c.lt.ob (v)"
-	ld_ob	$f8, 0x0001010202030304
-	ld_ob	$f9, 0x0101020203030404
-	clr_fp_cc 0xff
-	c.lt.ob	$f8, $f9
-	ck_fp_cc 0xaa
-
-	writemsg "c.lt.ob (ev)"
-	ld_ob	$f8, 0x0001010202030304
-	ld_ob	$f9, 0x0101020203030404
-	clr_fp_cc 0xff
-	c.lt.ob	$f8, $f9[5]
-	ck_fp_cc 0xe0
-
-	writemsg "c.lt.ob (cv)"
-	ld_ob	$f8, 0x0001010202030304
-	clr_fp_cc 0xff
-	c.lt.ob	$f8, 0x03
-	ck_fp_cc 0xf8
-
-
-	writemsg "pickf.ob (v)"
-	ld_ob	$f8, 0x0001020304050607
-	ld_ob	$f9, 0x08090a0b0c0d0e0f
-	clrset_fp_cc 0xff, 0xaa
-	pickf.ob $f10, $f8, $f9
-	ck_ob	$f10, 0x08010a030c050e07
-
-	writemsg "pickf.ob (ev)"
-	ld_ob	$f8, 0x0001020304050607
-	ld_ob	$f9, 0x08090a0b0c0d0e0f
-	clrset_fp_cc 0xff, 0xaa
-	pickf.ob $f10, $f8, $f9[4]
-	ck_ob	$f10, 0x0b010b030b050b07
-
-	writemsg "pickf.ob (cv)"
-	ld_ob	$f8, 0x0001020304050607
-	clrset_fp_cc 0xff, 0xaa
-	pickf.ob $f10, $f8, 0x10
-	ck_ob	$f10, 0x1001100310051007
-
-
-	writemsg "pickt.ob (v)"
-	ld_ob	$f8, 0x0001020304050607
-	ld_ob	$f9, 0x08090a0b0c0d0e0f
-	clrset_fp_cc 0xff, 0xaa
-	pickt.ob $f10, $f8, $f9
-	ck_ob	$f10, 0x0009020b040d060f
-
-	writemsg "pickt.ob (ev)"
-	ld_ob	$f8, 0x0001020304050607
-	ld_ob	$f9, 0x08090a0b0c0d0e0f
-	clrset_fp_cc 0xff, 0xaa
-	pickt.ob $f10, $f8, $f9[5]
-	ck_ob	$f10, 0x000a020a040a060a
-
-	writemsg "pickt.ob (cv)"
-	ld_ob	$f8, 0x0001020304050607
-	clrset_fp_cc 0xff, 0xaa
-	pickt.ob $f10, $f8, 0x10
-	ck_ob	$f10, 0x0010021004100610
-
-
-	pass
-
-	.end DIAG
diff --git a/sim/testsuite/sim/mips/sanity.s b/sim/testsuite/sim/mips/sanity.s
deleted file mode 100644
index 74551edd404..00000000000
--- a/sim/testsuite/sim/mips/sanity.s
+++ /dev/null
@@ -1,20 +0,0 @@
-# mips test sanity, expected to pass.
-# mach:	 all
-# as:		-mabi=eabi
-# ld:		-N -Ttext=0x80010000
-# output:	*\\npass\\n
-
-	.include "testutils.inc"
-
-	setup
-
-	.set noreorder
-
-	.ent DIAG
-DIAG:
-
-	writemsg "Sanity is good!"
-
-	pass
-
-	.end DIAG
diff --git a/sim/testsuite/sim/mips/testutils.inc b/sim/testsuite/sim/mips/testutils.inc
deleted file mode 100644
index f111f793140..00000000000
--- a/sim/testsuite/sim/mips/testutils.inc
+++ /dev/null
@@ -1,149 +0,0 @@
-# MIPS simulator testsuite utility functions.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Contributed by Chris Demetriou of Broadcom Corporation.
-#
-# 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.  */
-
-
-# $1, $4, $5, %6, are used as temps by the macros defined here.
-
-	.macro writemsg msg
-	.data
-901:	.ascii	"\msg\n"
-902:
-	.previous
-	la	$5, 901b
-	li	$6, 902b - 901b
-	.set push
-	.set noreorder
-	jal	_dowrite
-	li	$4, 0
-	.set pop
-	.endm
-
-
-	# The MIPS simulator uses "break 0x3ff" as the code to exit,
-	# with the return value in $4 (a0).
-	.macro exit rc
-	li	$4, \rc
-	break	0x3ff
-	.endm
-
-
-	.macro setup
-
-	.global _start
-	.ent _start
-_start:
-	.set push
-	.set noreorder
-	j	DIAG
-	nop
-	.set pop
-	.end _start
-
-	.global _fail
-	.ent _fail
-_fail:
-	writemsg "fail"
-	exit 1
-	.end _fail
-
-	.global _pass
-	.ent _pass
-_pass:
-	writemsg "pass"
-	exit 0
-	.end _pass
-
-	# The MIPS simulator can use multiple different monitor types,
-	# so we hard-code the simulator "write" reserved instruction opcode,
-	# rather than jumping to a vector that invokes it.  The operation
-	# expects RA to point to the location at which to continue
-	# after writing.
-	.global _dowrite
-	.ent _dowrite
-_dowrite:
-	# Write opcode (reserved instruction).  See sim_monitor and its
-	# callers in sim/mips/interp.c.
-	.word	0x00000005 | ((8 << 1) << 6)
-	.end _dowrite
-
-	.endm	# setup
-
-
-	.macro pass
-	.set push
-	.set noreorder
-	j	_pass
-	nop	
-	.set pop
-	.endm
-
-
-	.macro fail
-	.set push
-	.set noreorder
-	j	_fail
-	nop	
-	.set pop
-	.endm
-
-
-	.macro load32 reg, val
-	li	\reg, \val
-	.endm
-
-
-	.macro load64 reg, val
-	dli	\reg, \val
-	.endm
-
-
-	.macro loadaddr reg, addr
-	la	\reg, \addr
-	.endm
-
-
-	.macro checkreg reg, expreg
-	.set push
-	.set noat
-	.set noreorder
-	beq	\expreg, \reg, 901f
-	nop
-	fail
-901:
-	.set pop
-	.endm
-
-
-	.macro check32 reg, val
-	.set push
-	.set noat
-	load32	$1, \val
-	checkreg \reg, $1
-	.set pop
-	.endm
-
-
-	.macro check64 reg, val
-	.set push
-	.set noat
-	load64	$1, \val
-	checkreg \reg, $1
-	.set pop
-	.endm
diff --git a/sim/testsuite/sim/mips/utils-fpu.inc b/sim/testsuite/sim/mips/utils-fpu.inc
deleted file mode 100644
index 82feb61ce9d..00000000000
--- a/sim/testsuite/sim/mips/utils-fpu.inc
+++ /dev/null
@@ -1,105 +0,0 @@
-# MIPS simulator testsuite FPU utility functions.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Contributed by Chris Demetriou of Broadcom Corporation.
-#
-# 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.  */
-
-	.macro	enable_fpu fr
-        mfc0    $20, $12
-        or      $20, $20, (1 << 29) | (\fr << 26)
-        mtc0    $20, $20
-	.endm
-
-	###
-	### Data movement macros
-	###
-
-	.macro ld_fp_df r, v
-	.data
-1:	.double	\v
-	.previous
-	ldc1	\r, 1b
-	.endm
-
-	.macro ld_fp_di r, v
-	.data
-1:	.dword	\v
-	.previous
-	ldc1	\r, 1b
-	.endm
-
-	.macro ld_fp_sf r, v
-	.data
-1:	.float	\v
-	.previous
-	lwc1	\r, 1b
-	.endm
-
-	.macro ld_fp_si r, v
-	.data
-1:	.word	\v
-	.previous
-	lwc1	\r, 1b
-	.endm
-
-
-	###
-	### FP condition code manipulation macros
-	###
-
-	.macro clrset_fp_cc clr, set
-	cfc1	$20, $31	
-	or	$20, $20, (((\clr & 0xfe) << 24) | ((\clr & 0x01) << 23))
-	xor	$20, $20, (((\clr & 0xfe) << 24) | ((\clr & 0x01) << 23))
-	or	$20, $20, (((\set & 0xfe) << 24) | ((\set & 0x01) << 23))
-	ctc1	$20, $31
-	.endm
-
-	.macro clr_fp_cc clr
-	clrset_fp_cc \clr, 0
-	.endm
-
-	.macro set_fp_cc set
-	clrset_fp_cc 0, \set
-	.endm
-
-	.macro get_fp_cc r
-	.set push
-	.set noat
-	cfc1	$1, $31
-	srl	$1, $1, 23
-	andi	\r, $1, 0x1fc
-	andi	$1, $1, 0x1
-	srl	\r, \r, 1
-	or	\r, \r, $1
-	.set pop
-	.endm
-
-	.macro ck_fp_cc v
-	get_fp_cc $20
-	xori	$20, $20, \v
-	bnez	$20, _fail
-	 nop
-	.endm
-
-	.macro ckm_fp_cc v, mask
-	get_fp_cc $20
-	xori	$20, $20, \v
-	andi	$20, $20, \mask
-	bnez	$20, _fail
-	 nop
-	.endm
diff --git a/sim/testsuite/sim/mips/utils-mdmx.inc b/sim/testsuite/sim/mips/utils-mdmx.inc
deleted file mode 100644
index cda6550dc8c..00000000000
--- a/sim/testsuite/sim/mips/utils-mdmx.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-# MIPS simulator testsuite MDMX utility functions.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Contributed by Chris Demetriou of Broadcom Corporation.
-#
-# 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 "utils-fpu.inc"
-
-	###
-	### Shared macros
-	###
-
-	# Enable MDMX: enable the FPU w/ FR=1, then set Status.MX
-	.macro	enable_mdmx
-	enable_fpu 1
-	mfc0	$20, $12
-	or	$20, $20, (1 << 24)
-	mtc0	$20, $12
-	.endm
-
-
-	###
-	### .OB-format macros
-	###
-
-	.macro ld_ob r, v
-	.data
-1:	.dword	\v
-	.previous
-	ldc1	\r, 1b
-	.endm
-
-	.macro ck_ob r, v
-	.data
-1:	.dword	\v
-	.previous
-	dmfc1	$20, \r
-	ld	$21, 1b
-	bne	$20, $21, _fail
-	 nop
-	.endm
-
-	.macro ld_acc_ob h, m, l
-	ld_ob	$f20, \m
-	ld_ob	$f21, \l
-	wacl.ob	$f20, $f21
-	ld_ob	$f20, \h
-	wach.ob	$f20
-	.endm
-
-	.macro ck_acc_ob h, m, l
-	rach.ob	$f20
-	ck_ob	$f20, \h
-	racm.ob	$f20
-	ck_ob	$f20, \m
-	racl.ob	$f20
-	ck_ob	$f20, \l
-	.endm
diff --git a/sim/testsuite/sim/sh/ChangeLog b/sim/testsuite/sim/sh/ChangeLog
deleted file mode 100644
index 33938feb0a3..00000000000
--- a/sim/testsuite/sim/sh/ChangeLog
+++ /dev/null
@@ -1,77 +0,0 @@
-2004-09-13  DJ Delorie  <dj@redhat.com>
-
-	* sim/sh/allinsn.exp: Set global_as_options and
-	global_ld_options appropriately for little endian builds.
-	* sim/sh/movua.s: Support little endian.
-
-2004-09-08  Michael Snyder  <msnyder@redhat.com>
-
-	Commited by Corinna Vinschen <vinschen@redhat.com>
-	* allinsn.exp: Add new tests.
-	* bandor.s: New file.
-	* bandornot.s: New file.
-	* bclr.s: New file.
-	* bld.s: New file.
-	* bldnot.s: New file.
-	* bset.s: New file.
-	* bst.s: New file.
-	* bxor.s: New file.
-	* clip.s: New file.
-	* div.s: New file.
-	* fail.s: New file, make sure fail works.
-	* fsca.s: New file.
-	* fsrra.s: New file.
-	* mov.s: New file.
-	* mulr.s: New file.
-	* pass.s: New file, make sure pass works.
-	* pushpop.s: New file.
-	* resbank.s: New file.
-	* testutils.inc (bf8k, bt8k, assertmem): New macros.
-
-2004-02-12  Michael Snyder  <msnyder@redhat.com>
-
-	* and.s, movi.s, sett.s: New files.
-	* allinsn.exp: Add new tests.
-	* testutils.inc (set_sr_bit): Fix macro labels.
-
-2004-01-07  Michael Snyder  <msnyder@redhat.com>
-
-	* dmxy.s, fipr.s, fpchg.s, ldrc.s, loop.s, movli.s, movua.s,
-	movxy.s, pabs.s, pclr.s, prnd.s, psub.s, pswap.s: New files.
-	* allinsn.exp: Add new tests.
-	* testutils.inc (set_sr_bit): Add argument.
-	(set_greg): Add .align directives.
-
-2003-08-11  Michael Snyder  <msnyder@redhat.com>
-
-	* macl.s: New file.
-	* macw.s: New file.
-	* allinsn.exp: Add new tests for mac.w and mac.l.
-
-2003-07-25  Michael Snyder  <msnyder@redhat.com>
-
-	* pshai.s, pshar.s, pshli.s, pshlr.s: New files.
-	* allinsn.exp: Add psha, pshl tests.
-	* pdec.s, pinc.s, padd.s, paddc.s: New files.
-	* allinsn.exp: Add pdec, pinc, padd, paddc tests.
-	* pand.s, pdmsb.s: New files.
-	* allinsn.exp: Add pand, pdmsb tests.
-
-2003-07-23  Michael Snyder  <msnyder@redhat.com>
-
-	* pmuls.s: New file.
-
-2003-07-08  Michael Snyder  <msnyder@redhat.com>
-
-	* allinsn.exp, testutils.inc, add.s, fabs.s, fadd.s, fcmpeq.s,
-	fcmpgt.s, fcnvds.s, fcnvsd.s, fdiv.s, fldi0.s, fldi1.s, flds.s,
-	float.s, fmac.s, fmov.s, fmul.s, fneg.s, frchg.s, fschg.s, 
-	fsqrt.s, fsub.s, ftrc.s, shll16.s, shll2.s, shll8.s, shll.s, 
-	shlr16.s, shlr2.s, shlr8.s, shlr.s, swap.s: New files.
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/sim/testsuite/sim/sh/add.s b/sim/testsuite/sim/sh/add.s
deleted file mode 100644
index 95192518a84..00000000000
--- a/sim/testsuite/sim/sh/add.s
+++ /dev/null
@@ -1,86 +0,0 @@
-# sh testcase for add
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	1
-_y:	.long	1
-	
-	start
-
-add_reg_reg_direct:
-	set_grs_a5a5
-	mov.l	i, r1
-	mov.l	j, r2
-	add	r1, r2
-	test_gr0_a5a5
-	assertreg 2 r1
-	assertreg 4 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-add_reg_reg_indirect:
-	set_grs_a5a5
-	mov.l	x, r1
-	mov.l	y, r2
-	mov.l	@r1, r1
-	mov.l	@r2, r2
-	add	r1, r2
-	test_gr0_a5a5
-	assertreg 1 r1
-	assertreg 2 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-	
-add_imm_reg:
-	set_grs_a5a5
-	add	#0x16, r1
-	test_gr0_a5a5 
-	assertreg 0xa5a5a5bb r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-	.align 2
-x:	.long	_x
-y:	.long	_y
-i:	.long	2
-j:	.long	2
-	
diff --git a/sim/testsuite/sim/sh/allinsn.exp b/sim/testsuite/sim/sh/allinsn.exp
deleted file mode 100644
index 40d13929942..00000000000
--- a/sim/testsuite/sim/sh/allinsn.exp
+++ /dev/null
@@ -1,89 +0,0 @@
-# sh tests
-
-set all "sh shdsp"
-
-set global_as_options ""
-set global_ld_options ""
-
-foreach opt $board_variant_list {
-    switch "x$opt" {
-	x-ml { set global_as_options "-little --defsym LITTLE=1"
-	       set global_ld_options "-EL" }
-    }
-}
-
-if [istarget sh-*elf] {
-    run_sim_test add.s    $all
-    run_sim_test and.s    $all
-    run_sim_test bandor.s sh
-    run_sim_test bandornot.s sh
-    run_sim_test bclr.s   sh
-    run_sim_test bld.s    sh
-    run_sim_test bldnot.s sh
-    run_sim_test bset.s   sh
-    run_sim_test bst.s    sh
-    run_sim_test bxor.s   sh
-    run_sim_test clip.s   sh
-    run_sim_test div.s    sh
-    run_sim_test dmxy.s   shdsp
-    run_sim_test fabs.s   sh
-    run_sim_test fadd.s   sh
-    run_sim_test fcmpeq.s sh
-    run_sim_test fcmpgt.s sh
-    run_sim_test fcnvds.s sh
-    run_sim_test fcnvsd.s sh
-    run_sim_test fdiv.s   sh
-    run_sim_test fipr.s   sh
-    run_sim_test fldi0.s  sh
-    run_sim_test fldi1.s  sh
-    run_sim_test flds.s   sh
-    run_sim_test float.s  sh
-    run_sim_test fmac.s   sh
-    run_sim_test fmov.s   sh
-    run_sim_test fmul.s   sh
-    run_sim_test fneg.s   sh
-    run_sim_test fpchg.s  sh
-    run_sim_test frchg.s  sh
-    run_sim_test fschg.s  sh
-    run_sim_test fsqrt.s  sh
-    run_sim_test fsub.s   sh
-    run_sim_test ftrc.s   sh
-    run_sim_test ldrc.s   shdsp
-    run_sim_test loop.s   shdsp
-    run_sim_test macl.s   sh
-    run_sim_test macw.s   sh
-    run_sim_test mov.s    $all
-    run_sim_test movi.s   $all
-    run_sim_test movli.s  $all
-    run_sim_test movua.s  $all
-    run_sim_test movxy.s  shdsp
-    run_sim_test mulr.s   sh
-    run_sim_test pabs.s   shdsp
-    run_sim_test paddc.s  shdsp
-    run_sim_test padd.s   shdsp
-    run_sim_test pand.s   shdsp
-    run_sim_test pclr.s   shdsp
-    run_sim_test pdec.s   shdsp
-    run_sim_test pdmsb.s  shdsp
-    run_sim_test pinc.s   shdsp
-    run_sim_test pmuls.s  shdsp
-    run_sim_test prnd.s   shdsp
-    run_sim_test pshai.s  shdsp
-    run_sim_test pshar.s  shdsp
-    run_sim_test pshli.s  shdsp
-    run_sim_test pshlr.s  shdsp
-    run_sim_test psub.s   shdsp
-    run_sim_test pswap.s  shdsp
-    run_sim_test pushpop.s sh
-    run_sim_test resbank.s sh
-    run_sim_test sett.s   sh
-    run_sim_test shll.s   $all
-    run_sim_test shll2.s  $all
-    run_sim_test shll8.s  $all
-    run_sim_test shll16.s $all
-    run_sim_test shlr.s   $all
-    run_sim_test shlr2.s  $all
-    run_sim_test shlr8.s  $all
-    run_sim_test shlr16.s $all
-    run_sim_test swap.s   $all
-}
diff --git a/sim/testsuite/sim/sh/and.s b/sim/testsuite/sim/sh/and.s
deleted file mode 100644
index 00934473f97..00000000000
--- a/sim/testsuite/sim/sh/and.s
+++ /dev/null
@@ -1,89 +0,0 @@
-# sh testcase for and
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0xa5a5a5a5
-_y:	.long	0x55555555
-	
-	start
-
-and_reg_reg_direct:
-	set_grs_a5a5
-	mov.l	i, r1
-	mov.l	j, r2
-	and	r1, r2
-	test_gr0_a5a5
-	assertreg 0xa5a5a5a5 r1
-	assertreg 0xa0a0a0a0 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-	bra	and_imm_reg
-	nop
-
-	.align	2
-i:	.long	0xa5a5a5a5
-j:	.long	0xaaaaaaaa
-
-and_imm_reg:
-	set_grs_a5a5
-	and	#0xff, r0
-	assertreg    0xa5, r0
-	test_gr_a5a5 r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-and_b_imm_ind:
-	set_grs_a5a5
-	mov.l	x, r0
-	and.b	#0x55, @(r0, GBR)	
-	mov.l	@r0, r0
-
-	assertreg 0xa5a5a505, r0
-	test_gr_a5a5 r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-	.align 2
-x:	.long	_x
-y:	.long	_y
-	
diff --git a/sim/testsuite/sim/sh/bandor.s b/sim/testsuite/sim/sh/bandor.s
deleted file mode 100644
index 9ada4850696..00000000000
--- a/sim/testsuite/sim/sh/bandor.s
+++ /dev/null
@@ -1,120 +0,0 @@
-# sh testcase for band, bor
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0xa5a5a5a5
-
-	start
-
-bandor_b_imm_disp12_reg:
-	set_grs_a5a5
-	# Make sure T is true to start.
-	sett
-
-	mov.l	x, r1
-
-	band.b	#0, @(3, r1)
-	bf8k	mfail
-	bor.b	#1, @(3, r1)
-	bf8k	mfail
-	band.b	#2, @(3, r1)
-	bf8k	mfail
-	bor.b	#3, @(3, r1)
-	bf8k	mfail
-
-	bor.b	#4, @(3, r1)
-	bf8k	mfail
-	band.b	#5, @(3, r1)
-	bf8k	mfail
-	bor.b	#6, @(3, r1)
-	bf8k	mfail
-	band.b	#7, @(3, r1)
-	bf8k	mfail
-
-	band.b	#0, @(2, r1)
-	bf8k	mfail
-	bor.b	#1, @(2, r1)
-	bf8k	mfail
-	band.b	#2, @(2, r1)
-	bf8k	mfail
-	bor.b	#3, @(2, r1)
-	bf8k	mfail
-
-	bra	.L2
-	nop
-
-	.align 2
-x:	.long	_x
-
-.L2:
-	bor.b	#4, @(2, r1)
-	bf8k	mfail
-	band.b	#5, @(2, r1)
-	bf8k	mfail
-	bor.b	#6, @(2, r1)
-	bf8k	mfail
-	band.b	#7, @(2, r1)
-	bf8k	mfail
-
-	band.b	#0, @(1, r1)
-	bf8k	mfail
-	bor.b	#1, @(1, r1)
-	bf8k	mfail
-	band.b	#2, @(1, r1)
-	bf8k	mfail
-	bor.b	#3, @(1, r1)
-	bf8k	mfail
-
-	bor.b	#4, @(1, r1)
-	bf8k	mfail
-	band.b	#5, @(1, r1)
-	bf8k	mfail
-	bor.b	#6, @(1, r1)
-	bf8k	mfail
-	band.b	#7, @(1, r1)
-	bf8k	mfail
-
-	band.b	#0, @(0, r1)
-	bf8k	mfail
-	bor.b	#1, @(0, r1)
-	bf8k	mfail
-	band.b	#2, @(0, r1)
-	bf8k	mfail
-	bor.b	#3, @(0, r1)
-	bf8k	mfail
-
-	bor.b	#4, @(0, r1)
-	bf8k	mfail
-	band.b	#5, @(0, r1)
-	bf8k	mfail
-	bor.b	#6, @(0, r1)
-	bf8k	mfail
-	band.b	#7, @(0, r1)
-	bf8k	mfail
-
-	assertreg _x, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-
diff --git a/sim/testsuite/sim/sh/bandornot.s b/sim/testsuite/sim/sh/bandornot.s
deleted file mode 100644
index 1787d0d92fb..00000000000
--- a/sim/testsuite/sim/sh/bandornot.s
+++ /dev/null
@@ -1,120 +0,0 @@
-# sh testcase for bandnot, bornot
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0xa5a5a5a5
-
-	start
-
-bandor_b_imm_disp12_reg:
-	set_grs_a5a5
-	# Make sure T is true to start.
-	sett
-
-	mov.l	x, r1
-
-	bandnot.b	#0, @(3, r1)
-	bt8k	mfail
-	bornot.b	#1, @(3, r1)
-	bf8k	mfail
-	bandnot.b	#2, @(3, r1)
-	bt8k	mfail
-	bornot.b	#3, @(3, r1)
-	bf8k	mfail
-
-	bornot.b	#4, @(3, r1)
-	bf8k	mfail
-	bandnot.b	#5, @(3, r1)
-	bt8k	mfail
-	bornot.b	#6, @(3, r1)
-	bf8k	mfail
-	bandnot.b	#7, @(3, r1)
-	bt8k	mfail
-
-	bandnot.b	#0, @(2, r1)
-	bt8k	mfail
-	bornot.b	#1, @(2, r1)
-	bf8k	mfail
-	bandnot.b	#2, @(2, r1)
-	bt8k	mfail
-	bornot.b	#3, @(2, r1)
-	bf8k	mfail
-
-	bra	.L2
-	nop
-
-	.align 2
-x:	.long	_x
-
-.L2:
-	bornot.b	#4, @(2, r1)
-	bf8k	mfail
-	bandnot.b	#5, @(2, r1)
-	bt8k	mfail
-	bornot.b	#6, @(2, r1)
-	bf8k	mfail
-	bandnot.b	#7, @(2, r1)
-	bt8k	mfail
-
-	bandnot.b	#0, @(1, r1)
-	bt8k	mfail
-	bornot.b	#1, @(1, r1)
-	bf8k	mfail
-	bandnot.b	#2, @(1, r1)
-	bt8k	mfail
-	bornot.b	#3, @(1, r1)
-	bf8k	mfail
-
-	bornot.b	#4, @(1, r1)
-	bf8k	mfail
-	bandnot.b	#5, @(1, r1)
-	bt8k	mfail
-	bornot.b	#6, @(1, r1)
-	bf8k	mfail
-	bandnot.b	#7, @(1, r1)
-	bt8k	mfail
-
-	bandnot.b	#0, @(0, r1)
-	bt8k	mfail
-	bornot.b	#1, @(0, r1)
-	bf8k	mfail
-	bandnot.b	#2, @(0, r1)
-	bt8k	mfail
-	bornot.b	#3, @(0, r1)
-	bf8k	mfail
-
-	bornot.b	#4, @(0, r1)
-	bf8k	mfail
-	bandnot.b	#5, @(0, r1)
-	bt8k	mfail
-	bornot.b	#6, @(0, r1)
-	bf8k	mfail
-	bandnot.b	#7, @(0, r1)
-	bt8k	mfail
-
-	assertreg _x, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-
diff --git a/sim/testsuite/sim/sh/bclr.s b/sim/testsuite/sim/sh/bclr.s
deleted file mode 100644
index cbe1c7e618d..00000000000
--- a/sim/testsuite/sim/sh/bclr.s
+++ /dev/null
@@ -1,139 +0,0 @@
-# sh testcase for bclr
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0xffffffff
-_y:	.long	0x55555555
-
-	start
-
-bclr_b_imm_disp12_reg:
-	set_grs_a5a5
-	mov.l	x, r1
-
-	bclr.b	#0, @(3, r1)
-	assertmem _x, 0xfffffffe
-	bclr.b	#1, @(3, r1)
-	assertmem _x, 0xfffffffc
-	bclr.b	#2, @(3, r1)
-	assertmem _x, 0xfffffff8
-	bclr.b	#3, @(3, r1)
-	assertmem _x, 0xfffffff0
-
-	bclr.b	#4, @(3, r1)
-	assertmem _x, 0xffffffe0
-	bclr.b	#5, @(3, r1)
-	assertmem _x, 0xffffffc0
-	bclr.b	#6, @(3, r1)
-	assertmem _x, 0xffffff80
-	bclr.b	#7, @(3, r1)
-	assertmem _x, 0xffffff00
-
-	bclr.b	#0, @(2, r1)
-	assertmem _x, 0xfffffe00
-	bclr.b	#1, @(2, r1)
-	assertmem _x, 0xfffffc00
-	bclr.b	#2, @(2, r1)
-	assertmem _x, 0xfffff800
-	bclr.b	#3, @(2, r1)
-	assertmem _x, 0xfffff000
-
-	bra	.L2
-	nop
-
-	.align 2
-x:	.long	_x
-y:	.long	_y
-
-.L2:
-	bclr.b	#4, @(2, r1)
-	assertmem _x, 0xffffe000
-	bclr.b	#5, @(2, r1)
-	assertmem _x, 0xffffc000
-	bclr.b	#6, @(2, r1)
-	assertmem _x, 0xffff8000
-	bclr.b	#7, @(2, r1)
-	assertmem _x, 0xffff0000
-
-	bclr.b	#0, @(1, r1)
-	assertmem _x, 0xfffe0000
-	bclr.b	#1, @(1, r1)
-	assertmem _x, 0xfffc0000
-	bclr.b	#2, @(1, r1)
-	assertmem _x, 0xfff80000
-	bclr.b	#3, @(1, r1)
-	assertmem _x, 0xfff00000
-
-	bclr.b	#4, @(1, r1)
-	assertmem _x, 0xffe00000
-	bclr.b	#5, @(1, r1)
-	assertmem _x, 0xffc00000
-	bclr.b	#6, @(1, r1)
-	assertmem _x, 0xff800000
-	bclr.b	#7, @(1, r1)
-	assertmem _x, 0xff000000
-
-	bclr.b	#0, @(0, r1)
-	assertmem _x, 0xfe000000
-	bclr.b	#1, @(0, r1)
-	assertmem _x, 0xfc000000
-	bclr.b	#2, @(0, r1)
-	assertmem _x, 0xf8000000
-	bclr.b	#3, @(0, r1)
-	assertmem _x, 0xf0000000
-
-	bclr.b	#4, @(0, r1)
-	assertmem _x, 0xe0000000
-	bclr.b	#5, @(0, r1)
-	assertmem _x, 0xc0000000
-	bclr.b	#6, @(0, r1)
-	assertmem _x, 0x80000000
-	bclr.b	#7, @(0, r1)
-	assertmem _x, 0x00000000
-
-	assertreg _x, r1
-
-bclr_imm_reg:
-	set_greg 0xff, r1
-	bclr	#0, r1
-	assertreg 0xfe, r1
-	bclr	#1, r1
-	assertreg 0xfc, r1
-	bclr	#2, r1
-	assertreg 0xf8, r1
-	bclr	#3, r1
-	assertreg 0xf0, r1
-
-	bclr	#4, r1
-	assertreg 0xe0, r1
-	bclr	#5, r1
-	assertreg 0xc0, r1
-	bclr	#6, r1
-	assertreg 0x80, r1
-	bclr	#7, r1
-	assertreg 0x00, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-
diff --git a/sim/testsuite/sim/sh/bld.s b/sim/testsuite/sim/sh/bld.s
deleted file mode 100644
index 172718df676..00000000000
--- a/sim/testsuite/sim/sh/bld.s
+++ /dev/null
@@ -1,121 +0,0 @@
-# sh testcase for bld
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0xa5a5a5a5
-_y:	.long	0x55555555
-
-	start
-
-bld_b_imm_disp12_reg:
-	set_grs_a5a5
-	mov.l	x, r1
-
-	bld.b	#0, @(0, r1)
-	bf8k	mfail
-	bld.b	#1, @(0, r1)
-	bt8k	mfail
-	bld.b	#2, @(0, r1)
-	bf8k	mfail
-	bld.b	#3, @(0, r1)
-	bt8k	mfail
-
-	bld.b	#4, @(0, r1)
-	bt8k	mfail
-	bld.b	#5, @(0, r1)
-	bf8k	mfail
-	bld.b	#6, @(0, r1)
-	bt8k	mfail
-	bld.b	#7, @(0, r1)
-	bf8k	mfail
-
-	bld.b	#0, @(1, r1)
-	bf8k	mfail
-	bld.b	#1, @(1, r1)
-	bt8k	mfail
-	bld.b	#2, @(1, r1)
-	bf8k	mfail
-	bld.b	#3, @(1, r1)
-	bt8k	mfail
-
-	bld.b	#4, @(1, r1)
-	bt8k	mfail
-	bld.b	#5, @(1, r1)
-	bf8k	mfail
-	bld.b	#6, @(1, r1)
-	bt8k	mfail
-	bld.b	#7, @(1, r1)
-	bf8k	mfail
-
-	bld.b	#0, @(2, r1)
-	bf8k	mfail
-	bld.b	#1, @(2, r1)
-	bt8k	mfail
-	bld.b	#2, @(2, r1)
-	bf8k	mfail
-	bld.b	#3, @(2, r1)
-	bt8k	mfail
-
-	bld.b	#4, @(2, r1)
-	bt8k	mfail
-	bld.b	#5, @(2, r1)
-	bf8k	mfail
-	bld.b	#6, @(2, r1)
-	bt8k	mfail
-	bld.b	#7, @(2, r1)
-	bf8k	mfail
-
-	bld.b	#0, @(3, r1)
-	bf8k	mfail
-	bld.b	#1, @(3, r1)
-	bt8k	mfail
-	bld.b	#2, @(3, r1)
-	bf8k	mfail
-	bld.b	#3, @(3, r1)
-	bt8k	mfail
-
-	bld.b	#4, @(3, r1)
-	bt8k	mfail
-	bld.b	#5, @(3, r1)
-	bf8k	mfail
-	bld.b	#6, @(3, r1)
-	bt8k	mfail
-	bld.b	#7, @(3, r1)
-	bf8k	mfail
-
-	assertreg _x, r1
-
-bld_imm_reg:
-	set_greg 0xa5a5a5a5, r1
-	bld	#0, r1
-	bf8k	mfail
-	bld	#1, r1
-	bt8k	mfail
-	bld	#2, r1
-	bf8k	mfail
-	bld	#3, r1
-	bt8k	mfail
-
-	bld	#4, r1
-	bt8k	mfail
-	bld	#5, r1
-	bf8k	mfail
-	bld	#6, r1
-	bt8k	mfail
-	bld	#7, r1
-	bf8k	mfail
-
-	test_grs_a5a5
-
-	pass
-
-	exit 0
-
-	.align 2
-x:	.long	_x
-y:	.long	_y
-
diff --git a/sim/testsuite/sim/sh/bldnot.s b/sim/testsuite/sim/sh/bldnot.s
deleted file mode 100644
index eda87def9c2..00000000000
--- a/sim/testsuite/sim/sh/bldnot.s
+++ /dev/null
@@ -1,102 +0,0 @@
-# sh testcase for bldnot
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0xa5a5a5a5
-_y:	.long	0x55555555
-
-	start
-
-bldnot_b_imm_disp12_reg:
-	set_grs_a5a5
-	mov.l	x, r1
-
-	bldnot.b	#0, @(0, r1)
-	bt8k	mfail
-	bldnot.b	#1, @(0, r1)
-	bf8k	mfail
-	bldnot.b	#2, @(0, r1)
-	bt8k	mfail
-	bldnot.b	#3, @(0, r1)
-	bf8k	mfail
-
-	bldnot.b	#4, @(0, r1)
-	bf8k	mfail
-	bldnot.b	#5, @(0, r1)
-	bt8k	mfail
-	bldnot.b	#6, @(0, r1)
-	bf8k	mfail
-	bldnot.b	#7, @(0, r1)
-	bt8k	mfail
-
-	bldnot.b	#0, @(1, r1)
-	bt8k	mfail
-	bldnot.b	#1, @(1, r1)
-	bf8k	mfail
-	bldnot.b	#2, @(1, r1)
-	bt8k	mfail
-	bldnot.b	#3, @(1, r1)
-	bf8k	mfail
-
-	bldnot.b	#4, @(1, r1)
-	bf8k	mfail
-	bldnot.b	#5, @(1, r1)
-	bt8k	mfail
-	bldnot.b	#6, @(1, r1)
-	bf8k	mfail
-	bldnot.b	#7, @(1, r1)
-	bt8k	mfail
-
-	bldnot.b	#0, @(2, r1)
-	bt8k	mfail
-	bldnot.b	#1, @(2, r1)
-	bf8k	mfail
-	bldnot.b	#2, @(2, r1)
-	bt8k	mfail
-	bldnot.b	#3, @(2, r1)
-	bf8k	mfail
-
-	bldnot.b	#4, @(2, r1)
-	bf8k	mfail
-	bldnot.b	#5, @(2, r1)
-	bt8k	mfail
-	bldnot.b	#6, @(2, r1)
-	bf8k	mfail
-	bldnot.b	#7, @(2, r1)
-	bt8k	mfail
-
-	bldnot.b	#0, @(3, r1)
-	bt8k	mfail
-	bldnot.b	#1, @(3, r1)
-	bf8k	mfail
-	bldnot.b	#2, @(3, r1)
-	bt8k	mfail
-	bldnot.b	#3, @(3, r1)
-	bf8k	mfail
-
-	bldnot.b	#4, @(3, r1)
-	bf8k	mfail
-	bldnot.b	#5, @(3, r1)
-	bt8k	mfail
-	bldnot.b	#6, @(3, r1)
-	bf8k	mfail
-	bldnot.b	#7, @(3, r1)
-	bt8k	mfail
-
-	assertreg _x, r1
-	set_greg 0xa5a5a5a5, r1
-
-	test_grs_a5a5
-
-	pass
-
-	exit 0
-
-	.align 2
-x:	.long	_x
-y:	.long	_y
-
diff --git a/sim/testsuite/sim/sh/bset.s b/sim/testsuite/sim/sh/bset.s
deleted file mode 100644
index 13ae246e39c..00000000000
--- a/sim/testsuite/sim/sh/bset.s
+++ /dev/null
@@ -1,139 +0,0 @@
-# sh testcase for bset
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0
-_y:	.long	0x55555555
-
-	start
-
-bset_b_imm_disp12_reg:
-	set_grs_a5a5
-	mov.l	x, r1
-
-	bset.b	#0, @(3, r1)
-	assertmem _x, 0x1
-	bset.b	#1, @(3, r1)
-	assertmem _x, 0x3
-	bset.b	#2, @(3, r1)
-	assertmem _x, 0x7
-	bset.b	#3, @(3, r1)
-	assertmem _x, 0xf
-
-	bset.b	#4, @(3, r1)
-	assertmem _x, 0x1f
-	bset.b	#5, @(3, r1)
-	assertmem _x, 0x3f
-	bset.b	#6, @(3, r1)
-	assertmem _x, 0x7f
-	bset.b	#7, @(3, r1)
-	assertmem _x, 0xff
-
-	bset.b	#0, @(2, r1)
-	assertmem _x, 0x1ff
-	bset.b	#1, @(2, r1)
-	assertmem _x, 0x3ff
-	bset.b	#2, @(2, r1)
-	assertmem _x, 0x7ff
-	bset.b	#3, @(2, r1)
-	assertmem _x, 0xfff
-
-	bra	.L2
-	nop
-
-	.align 2
-x:	.long	_x
-y:	.long	_y
-
-.L2:
-	bset.b	#4, @(2, r1)
-	assertmem _x, 0x1fff
-	bset.b	#5, @(2, r1)
-	assertmem _x, 0x3fff
-	bset.b	#6, @(2, r1)
-	assertmem _x, 0x7fff
-	bset.b	#7, @(2, r1)
-	assertmem _x, 0xffff
-
-	bset.b	#0, @(1, r1)
-	assertmem _x, 0x1ffff
-	bset.b	#1, @(1, r1)
-	assertmem _x, 0x3ffff
-	bset.b	#2, @(1, r1)
-	assertmem _x, 0x7ffff
-	bset.b	#3, @(1, r1)
-	assertmem _x, 0xfffff
-
-	bset.b	#4, @(1, r1)
-	assertmem _x, 0x1fffff
-	bset.b	#5, @(1, r1)
-	assertmem _x, 0x3fffff
-	bset.b	#6, @(1, r1)
-	assertmem _x, 0x7fffff
-	bset.b	#7, @(1, r1)
-	assertmem _x, 0xffffff
-
-	bset.b	#0, @(0, r1)
-	assertmem _x, 0x1ffffff
-	bset.b	#1, @(0, r1)
-	assertmem _x, 0x3ffffff
-	bset.b	#2, @(0, r1)
-	assertmem _x, 0x7ffffff
-	bset.b	#3, @(0, r1)
-	assertmem _x, 0xfffffff
-
-	bset.b	#4, @(0, r1)
-	assertmem _x, 0x1fffffff
-	bset.b	#5, @(0, r1)
-	assertmem _x, 0x3fffffff
-	bset.b	#6, @(0, r1)
-	assertmem _x, 0x7fffffff
-	bset.b	#7, @(0, r1)
-	assertmem _x, 0xffffffff
-
-	assertreg _x, r1
-
-bset_imm_reg:
-	set_greg 0, r1
-	bset	#0, r1
-	assertreg 0x1, r1
-	bset	#1, r1
-	assertreg 0x3, r1
-	bset	#2, r1
-	assertreg 0x7, r1
-	bset	#3, r1
-	assertreg 0xf, r1
-
-	bset	#4, r1
-	assertreg 0x1f, r1
-	bset	#5, r1
-	assertreg 0x3f, r1
-	bset	#6, r1
-	assertreg 0x7f, r1
-	bset	#7, r1
-	assertreg 0xff, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-
diff --git a/sim/testsuite/sim/sh/bst.s b/sim/testsuite/sim/sh/bst.s
deleted file mode 100644
index e8b6d656ec3..00000000000
--- a/sim/testsuite/sim/sh/bst.s
+++ /dev/null
@@ -1,142 +0,0 @@
-# sh testcase for bst
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0
-_y:	.long	0x55555555
-
-	start
-
-bst_b_imm_disp12_reg:
-	set_grs_a5a5
-	# Make sure T is true to start.
-	sett
-
-	mov.l	x, r1
-
-	bst.b	#0, @(3, r1)
-	assertmem _x, 0x1
-	bst.b	#1, @(3, r1)
-	assertmem _x, 0x3
-	bst.b	#2, @(3, r1)
-	assertmem _x, 0x7
-	bst.b	#3, @(3, r1)
-	assertmem _x, 0xf
-
-	bst.b	#4, @(3, r1)
-	assertmem _x, 0x1f
-	bst.b	#5, @(3, r1)
-	assertmem _x, 0x3f
-	bst.b	#6, @(3, r1)
-	assertmem _x, 0x7f
-	bst.b	#7, @(3, r1)
-	assertmem _x, 0xff
-
-	bst.b	#0, @(2, r1)
-	assertmem _x, 0x1ff
-	bst.b	#1, @(2, r1)
-	assertmem _x, 0x3ff
-	bst.b	#2, @(2, r1)
-	assertmem _x, 0x7ff
-	bst.b	#3, @(2, r1)
-	assertmem _x, 0xfff
-
-	bra	.L2
-	nop
-
-	.align 2
-x:	.long	_x
-y:	.long	_y
-
-.L2:
-	bst.b	#4, @(2, r1)
-	assertmem _x, 0x1fff
-	bst.b	#5, @(2, r1)
-	assertmem _x, 0x3fff
-	bst.b	#6, @(2, r1)
-	assertmem _x, 0x7fff
-	bst.b	#7, @(2, r1)
-	assertmem _x, 0xffff
-
-	bst.b	#0, @(1, r1)
-	assertmem _x, 0x1ffff
-	bst.b	#1, @(1, r1)
-	assertmem _x, 0x3ffff
-	bst.b	#2, @(1, r1)
-	assertmem _x, 0x7ffff
-	bst.b	#3, @(1, r1)
-	assertmem _x, 0xfffff
-
-	bst.b	#4, @(1, r1)
-	assertmem _x, 0x1fffff
-	bst.b	#5, @(1, r1)
-	assertmem _x, 0x3fffff
-	bst.b	#6, @(1, r1)
-	assertmem _x, 0x7fffff
-	bst.b	#7, @(1, r1)
-	assertmem _x, 0xffffff
-
-	bst.b	#0, @(0, r1)
-	assertmem _x, 0x1ffffff
-	bst.b	#1, @(0, r1)
-	assertmem _x, 0x3ffffff
-	bst.b	#2, @(0, r1)
-	assertmem _x, 0x7ffffff
-	bst.b	#3, @(0, r1)
-	assertmem _x, 0xfffffff
-
-	bst.b	#4, @(0, r1)
-	assertmem _x, 0x1fffffff
-	bst.b	#5, @(0, r1)
-	assertmem _x, 0x3fffffff
-	bst.b	#6, @(0, r1)
-	assertmem _x, 0x7fffffff
-	bst.b	#7, @(0, r1)
-	assertmem _x, 0xffffffff
-
-	assertreg _x, r1
-
-bst_imm_reg:
-	set_greg 0, r1
-	bst	#0, r1
-	assertreg 0x1, r1
-	bst	#1, r1
-	assertreg 0x3, r1
-	bst	#2, r1
-	assertreg 0x7, r1
-	bst	#3, r1
-	assertreg 0xf, r1
-
-	bst	#4, r1
-	assertreg 0x1f, r1
-	bst	#5, r1
-	assertreg 0x3f, r1
-	bst	#6, r1
-	assertreg 0x7f, r1
-	bst	#7, r1
-	assertreg 0xff, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-
diff --git a/sim/testsuite/sim/sh/bxor.s b/sim/testsuite/sim/sh/bxor.s
deleted file mode 100644
index abedd38eb09..00000000000
--- a/sim/testsuite/sim/sh/bxor.s
+++ /dev/null
@@ -1,120 +0,0 @@
-# sh testcase for bxor
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-_x:	.long	0xa5a5a5a5
-
-	start
-
-bxor_b_imm_disp12_reg:
-	set_grs_a5a5
-	# Make sure T is true to start.
-	sett
-
-	mov.l	x, r1
-
-	bxor.b	#0, @(3, r1)
-	bt8k	mfail
-	bxor.b	#1, @(3, r1)
-	bt8k	mfail
-	bxor.b	#2, @(3, r1)
-	bf8k	mfail
-	bxor.b	#3, @(3, r1)
-	bf8k	mfail
-
-	bxor.b	#4, @(3, r1)
-	bf8k	mfail
-	bxor.b	#5, @(3, r1)
-	bt8k	mfail
-	bxor.b	#6, @(3, r1)
-	bt8k	mfail
-	bxor.b	#7, @(3, r1)
-	bf8k	mfail
-
-	bxor.b	#0, @(2, r1)
-	bt8k	mfail
-	bxor.b	#1, @(2, r1)
-	bt8k	mfail
-	bxor.b	#2, @(2, r1)
-	bf8k	mfail
-	bxor.b	#3, @(2, r1)
-	bf8k	mfail
-
-	bra	.L2
-	nop
-
-	.align 2
-x:	.long	_x
-
-.L2:
-	bxor.b	#4, @(2, r1)
-	bf8k	mfail
-	bxor.b	#5, @(2, r1)
-	bt8k	mfail
-	bxor.b	#6, @(2, r1)
-	bt8k	mfail
-	bxor.b	#7, @(2, r1)
-	bf8k	mfail
-
-	bxor.b	#0, @(1, r1)
-	bt8k	mfail
-	bxor.b	#1, @(1, r1)
-	bt8k	mfail
-	bxor.b	#2, @(1, r1)
-	bf8k	mfail
-	bxor.b	#3, @(1, r1)
-	bf8k	mfail
-
-	bxor.b	#4, @(1, r1)
-	bf8k	mfail
-	bxor.b	#5, @(1, r1)
-	bt8k	mfail
-	bxor.b	#6, @(1, r1)
-	bt8k	mfail
-	bxor.b	#7, @(1, r1)
-	bf8k	mfail
-
-	bxor.b	#0, @(0, r1)
-	bt8k	mfail
-	bxor.b	#1, @(0, r1)
-	bt8k	mfail
-	bxor.b	#2, @(0, r1)
-	bf8k	mfail
-	bxor.b	#3, @(0, r1)
-	bf8k	mfail
-
-	bxor.b	#4, @(0, r1)
-	bf8k	mfail
-	bxor.b	#5, @(0, r1)
-	bt8k	mfail
-	bxor.b	#6, @(0, r1)
-	bt8k	mfail
-	bxor.b	#7, @(0, r1)
-	bf8k	mfail
-
-	assertreg _x, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-
diff --git a/sim/testsuite/sim/sh/clip.s b/sim/testsuite/sim/sh/clip.s
deleted file mode 100644
index 12770c381db..00000000000
--- a/sim/testsuite/sim/sh/clip.s
+++ /dev/null
@@ -1,89 +0,0 @@
-# sh testcase for clips, clipu
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-clips_b:
-	set_grs_a5a5
-	clips.b	r1
-	test_gr0_a5a5
-	assertreg 0xffffff80 r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-clipu_b:
-	set_grs_a5a5
-	clipu.b	r1
-	test_gr0_a5a5
-	assertreg 0xff r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-	
-clips_w:
-	set_grs_a5a5
-	clips.w	r1
-	test_gr0_a5a5
-	assertreg 0xffff8000 r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-clipu_w:
-	set_grs_a5a5
-	clipu.w	r1
-	test_gr0_a5a5
-	assertreg 0xffff r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-	
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/div.s b/sim/testsuite/sim/sh/div.s
deleted file mode 100644
index 8293c2117f1..00000000000
--- a/sim/testsuite/sim/sh/div.s
+++ /dev/null
@@ -1,199 +0,0 @@
-# sh testcase for divs and divu
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-divs_1:	! divide by one
-	set_grs_a5a5
-	mov	#1, r0
-	divs	r0, r1
-	assertreg0   1
-	test_gr_a5a5 r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-divs_2:	! divide by two
-	set_grs_a5a5
-	mov	#2, r0
-	divs	r0, r1
-	assertreg0   2
-	assertreg 0xd2d2d2d3, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-divs_3:	! divide by three
-	set_grs_a5a5
-	mov	#3, r0
-	divs	r0, r1
-	assertreg0   3
-	assertreg 0xe1e1e1e2, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-divs_0:	! divide by zero
-	set_grs_a5a5
-	mov	#0, r0
-	divs	r0, r1
-	assertreg0   0
-	assertreg 0x7fffffff, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-divs_o:	! divide signed overflow
-	set_grs_a5a5
-	mov	#16, r0
-	movi20	#0x8000, r1
-	shad	r0, r1	! r1 == 0x80000000
-	mov	#-1, r0
-	divs	r0, r1
-	assertreg0   -1
-	assertreg 0x7fffffff, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-
-divu_1:	! divide by one, unsigned
-	set_grs_a5a5
-	mov	#1, r0
-	divu	r0, r1
-	assertreg0   1
-	test_gr_a5a5 r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-divu_2:	! divide by two, unsigned
-	set_grs_a5a5
-	mov	#2, r0
-	divu	r0, r1
-	assertreg0   2
-	assertreg 0x52d2d2d2, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-divu_3:	! divide by three, unsigned
-	set_grs_a5a5
-	mov	#3, r0
-	divu	r0, r1
-	assertreg0   3
-	assertreg 0x37373737, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-divu_0:	! divide by zero, unsigned
-	set_grs_a5a5
-	mov	#0, r0
-	divu	r0, r1
-	assertreg0   0
-	assertreg 0xffffffff, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-
-	pass
-
-	exit 0
-
-	
\ No newline at end of file
diff --git a/sim/testsuite/sim/sh/dmxy.s b/sim/testsuite/sim/sh/dmxy.s
deleted file mode 100644
index 0e96963aee9..00000000000
--- a/sim/testsuite/sim/sh/dmxy.s
+++ /dev/null
@@ -1,21 +0,0 @@
-# sh testcase for setdmx, setdmy, clrdmxy
-# mach: shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	setdmx
-	test_sr_bit_set   0x400
-	test_sr_bit_clear 0x800
-	setdmy
-	test_sr_bit_clear 0x400
-	test_sr_bit_set   0x800
-	clrdmxy
-	test_sr_bit_clear 0x400
-	test_sr_bit_clear 0x800
-
-	test_grs_a5a5
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fabs.s b/sim/testsuite/sim/sh/fabs.s
deleted file mode 100644
index 1fb354e5922..00000000000
--- a/sim/testsuite/sim/sh/fabs.s
+++ /dev/null
@@ -1,115 +0,0 @@
-# sh testcase for fabs 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fabs_freg_b0:
-	single_prec
-	bank0
-	set_grs_a5a5
-	set_fprs_a5a5
-	# fabs(0.0) = 0.0.
-	fldi0	fr0
-	fabs	fr0
-	fldi0	fr1
-	fcmp/eq	fr0, fr1
-	bt	.L1
-	fail
-.L1:
-	# fabs(1.0) = 1.0.
-	fldi1	fr0
-	fabs	fr0
-	fldi1	fr1
-	fcmp/eq	fr0, fr1
-	bt	.L2
-	fail
-.L2:
-	# fabs(-1.0) = 1.0.
-	fldi1	fr0
-	fneg	fr0
-	fabs	fr0
-	fldi1	fr1
-	fcmp/eq	fr0, fr1
-	bt	.L3
-	fail
-.L3:
-	test_grs_a5a5
-	test_fpr_a5a5 fr2
-	test_fpr_a5a5 fr3
-	test_fpr_a5a5 fr4
-	test_fpr_a5a5 fr5
-	test_fpr_a5a5 fr6
-	test_fpr_a5a5 fr7
-	test_fpr_a5a5 fr8
-	test_fpr_a5a5 fr9
-	test_fpr_a5a5 fr10
-	test_fpr_a5a5 fr11
-	test_fpr_a5a5 fr12
-	test_fpr_a5a5 fr13
-	test_fpr_a5a5 fr14
-	test_fpr_a5a5 fr15
-
-fabs_dreg_b0:
-	# double precision tests.
-	set_grs_a5a5
-	set_fprs_a5a5
-	double_prec
-	# fabs(0.0) = 0.0.
-	fldi0	fr0
-	flds	fr0, fpul
-	fcnvsd	fpul, dr0
-	fabs dr0
-	assert_dpreg_i 0 dr0
-
-	# fabs(1.0) = 1.0.
-	fldi1	fr0
-	flds	fr0, fpul
-	fcnvsd	fpul, dr0
-	fabs dr0
-	assert_dpreg_i 1 dr0
-
-	# check.
-	fldi1 fr2
-	flds	fr2, fpul
-	fcnvsd	fpul, dr2
-	fcmp/eq dr0, dr2
-	bt	.L4
-	fail
-
-.L4:
-	# fabs(-1.0) = 1.0.
-	fldi1 fr0
-	fneg fr0
-	flds	fr0, fpul
-	fcnvsd	fpul, dr0
-	fabs dr0
-	assert_dpreg_i 1 dr0
-
-	# check.
-	fldi1 fr2
-	flds	fr2, fpul
-	fcnvsd	fpul, dr2
-	fcmp/eq dr0, dr2
-	bt	.L5
-	fail
-.L5:
-	test_grs_a5a5
-	assert_dpreg_i 1 dr0
-	assert_dpreg_i 1 dr2
-	test_fpr_a5a5 fr4
-	test_fpr_a5a5 fr5
-	test_fpr_a5a5 fr6
-	test_fpr_a5a5 fr7
-	test_fpr_a5a5 fr8
-	test_fpr_a5a5 fr9
-	test_fpr_a5a5 fr10
-	test_fpr_a5a5 fr11
-	test_fpr_a5a5 fr12
-	test_fpr_a5a5 fr13
-	test_fpr_a5a5 fr14
-	test_fpr_a5a5 fr15
-	
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fadd.s b/sim/testsuite/sim/sh/fadd.s
deleted file mode 100644
index 72431f0f871..00000000000
--- a/sim/testsuite/sim/sh/fadd.s
+++ /dev/null
@@ -1,75 +0,0 @@
-# sh testcase for fadd
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fadd_freg_freg_b0:
-	set_grs_a5a5
-	set_fprs_a5a5
-	bank0
-
-	fldi1 fr0
-	fldi1 fr1
-	fadd fr0, fr1
-	assert_fpreg_i 2 fr1
-
-	fldi0 fr0
-	fldi1 fr1
-	fadd fr0, fr1
-	assert_fpreg_i 1 fr1
-
-	fldi1 fr0
-	fldi0 fr1
-	fadd fr0, fr1
-	assert_fpreg_i 1 fr1
-	test_grs_a5a5
-	assert_fpreg_i 1 fr0
-	test_fpr_a5a5  fr2
-	test_fpr_a5a5  fr3
-	test_fpr_a5a5  fr4
-	test_fpr_a5a5  fr5
-	test_fpr_a5a5  fr6
-	test_fpr_a5a5  fr7
-	test_fpr_a5a5  fr8
-	test_fpr_a5a5  fr9
-	test_fpr_a5a5  fr10
-	test_fpr_a5a5  fr11
-	test_fpr_a5a5  fr12
-	test_fpr_a5a5  fr13
-	test_fpr_a5a5  fr14
-	test_fpr_a5a5  fr15
-
-fadd_dreg_dreg_b0:
-	set_grs_a5a5
-	set_fprs_a5a5
-	double_prec
-	fldi1	fr0
-	fldi1	fr2
-	flds	fr0, fpul
-	fcnvsd	fpul, dr0
-	flds	fr2, fpul
-	fcnvsd	fpul, dr2
-	fadd dr0, dr2
-	fcnvds	dr2, fpul
-	fsts	fpul, fr0
-
-	test_grs_a5a5
-	assert_fpreg_i	2, fr0
-	assert_dpreg_i	2, dr2
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fail.s b/sim/testsuite/sim/sh/fail.s
deleted file mode 100644
index 0ffb0b2a6ff..00000000000
--- a/sim/testsuite/sim/sh/fail.s
+++ /dev/null
@@ -1,13 +0,0 @@
-# sh testcase, fail
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-	
-	fail
-
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/fcmpeq.s b/sim/testsuite/sim/sh/fcmpeq.s
deleted file mode 100644
index 9c0ef57298e..00000000000
--- a/sim/testsuite/sim/sh/fcmpeq.s
+++ /dev/null
@@ -1,119 +0,0 @@
-# sh testcase for fcmpeq 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fcmpeq_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# 1.0 == 1.0.	
-	fldi1	fr0
-	fldi1	fr1
-	fcmp/eq	fr0, fr1
-	bt	.L0
-	fail
-.L0:
-	# 0.0 != 1.0.
-	fldi0	fr0
-	fldi1	fr1
-	fcmp/eq	fr0, fr1
-	bf	.L1
-	fail
-.L1:
-	# 1.0 != 0.0.
-	fldi1	fr0
-	fldi0	fr1
-	fcmp/eq	fr0, fr1
-	bf	.L2
-	fail
-.L2:
-	# 2.0 != 1.0
-	fldi1	fr0
-	fadd	fr0, fr0
-	fldi1	fr1
-	fcmp/eq	fr0, fr1
-	bf	.L3
-	fail
-.L3:
-	test_grs_a5a5
-	assert_fpreg_i	2, fr0
-	assert_fpreg_i	1, fr1
-	test_fpr_a5a5	fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-	
-fcmpeq_double:
-	# 1.0 == 1.0
-	set_grs_a5a5
-	set_fprs_a5a5
-	double_prec
-	fldi1 fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	fcmp/eq dr0, dr2
-	bt	.L10
-	fail
-.L10:
-	# 0.0 != 1.0
-	fldi0 fr0
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	fcmp/eq dr0, dr2
-	bf	.L11
-	fail
-.L11:
-	# 1.0 != 0.0
-	fldi1 fr0
-	fldi0 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	fcmp/eq dr0, dr2
-	bf	.L12
-	fail
-.L12:
-	# 2.0 != 1.0
-	fldi1 fr0
-	single_prec
-	fadd fr0, fr0
-	double_prec
-	fldi1 fr2
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	fcmp/eq dr0, dr2
-	bf	.L13
-	fail
-.L13:
-	test_grs_a5a5
-	assert_dpreg_i	2, dr0
-	assert_dpreg_i	1, dr2
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/fcmpgt.s b/sim/testsuite/sim/sh/fcmpgt.s
deleted file mode 100644
index c6945bae377..00000000000
--- a/sim/testsuite/sim/sh/fcmpgt.s
+++ /dev/null
@@ -1,119 +0,0 @@
-# sh testcase for fcmpgt 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fcmpgt_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# 1.0 !> 1.0.
-	fldi1	fr0
-	fldi1	fr1
-	fcmp/gt	fr0, fr1
-	bf	.L0
-	fail
-.L0:
-	# 0.0 !> 1.0.
-	fldi0	fr0
-	fldi1	fr1
-	fcmp/gt	fr0, fr1
-	bt	.L1
-	fail
-.L1:
-	# 1.0 > 0.0.
-	fldi1	fr0
-	fldi0	fr1
-	fcmp/gt	fr0, fr1
-	bf	.L2
-	fail
-.L2:
-	# 2.0 > 1.0
-	fldi1	fr0
-	fadd	fr0, fr0
-	fldi1	fr1
-	fcmp/gt	fr0, fr1
-	bf	.L3
-	fail
-.L3:
-	test_grs_a5a5
-	assert_fpreg_i	2, fr0
-	assert_fpreg_i	1, fr1
-	test_fpr_a5a5	fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-fcmpgt_double:
-	# double precision tests.
-	set_grs_a5a5
-	set_fprs_a5a5
-	double_prec
-	# 1.0 !> 1.0.
-	fldi1	fr0
-	fldi1	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fcmp/gt	dr0, dr2
-	bf	.L10
-	fail
-.L10:
-	# 0.0 !> 1.0.
-	fldi0	fr0
-	fldi1	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fcmp/gt	dr0, dr2
-	bt	.L11
-	fail
-.L11:
-	# 1.0 > 0.0.
-	fldi1	fr0
-	fldi0	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fcmp/gt	dr0, dr2
-	bf	.L12
-	fail
-.L12:
-	# 2.0 > 1.0.
-	fldi1	fr0
-	single_prec
-	fadd	fr0, fr0
-	double_prec
-	fldi1	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fcmp/gt	dr0, dr2
-	bf	.L13
-	fail
-.L13:
-	test_grs_a5a5
-	assert_dpreg_i	2, dr0
-	assert_dpreg_i	1, dr2
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fcnvds.s b/sim/testsuite/sim/sh/fcnvds.s
deleted file mode 100644
index cffcb4940b8..00000000000
--- a/sim/testsuite/sim/sh/fcnvds.s
+++ /dev/null
@@ -1,56 +0,0 @@
-# sh testcase for fcnvds 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-	double_prec
-	sz_64
-	set_grs_a5a5
-	set_fprs_a5a5
-	mov.l	ax, r0
-	fmov	@r0, dr0
-	fcnvds dr0, fpul
-	fsts	fpul, fr2
-
-	assert_dpreg_i	5, dr0
-	single_prec
-	assert_fpreg_i	5, fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	assertreg0	x
-	test_gr_a5a5	r1
-	test_gr_a5a5	r2
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-	pass
-	exit 0
-
-	.align 2
-x:	.double	5.0
-ax:	.long	x
-
diff --git a/sim/testsuite/sim/sh/fcnvsd.s b/sim/testsuite/sim/sh/fcnvsd.s
deleted file mode 100644
index 6592540e4f1..00000000000
--- a/sim/testsuite/sim/sh/fcnvsd.s
+++ /dev/null
@@ -1,40 +0,0 @@
-# sh testcase for fcnvsd 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	set_fprs_a5a5
-	double_prec
-	fldi1	fr0
-	flds	fr0, fpul
-	fcnvsd	fpul, dr2
-	assert_dpreg_i	1, dr2
-
-	# Convert back.
-	fcnvds	dr2, fpul
-	fsts	fpul, fr1
-	single_prec
-	assert_fpreg_i	1, fr1
-	fcmp/eq	fr0, fr1
-	bt	.L0
-	fail
-.L0:
-	test_grs_a5a5
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/fdiv.s b/sim/testsuite/sim/sh/fdiv.s
deleted file mode 100644
index 629e774bd67..00000000000
--- a/sim/testsuite/sim/sh/fdiv.s
+++ /dev/null
@@ -1,91 +0,0 @@
-# sh testcase for fdiv 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fdiv_single:
-	# Single test
-	set_grs_a5a5
-	set_fprs_a5a5
-	single_prec
-	# 1.0 / 0.0 should be INF
-	# (and not crash the sim).
-	fldi0	fr0
-	fldi1	fr1
-	fdiv	fr0, fr1
-	assert_fpreg_x	0x7f800000, fr1
-
-	# 0.0 / 1.0 == 0.0.
-	fldi0	fr0
-	fldi1	fr1
-	fdiv	fr1, fr0
-	assert_fpreg_x	0, fr0
-
-	# 2.0 / 1.0 == 2.0.
-	fldi1	fr1
-	fldi1	fr2
-	fadd	fr2, fr2
-	fdiv	fr1, fr2
-	assert_fpreg_i	2, fr2
-
-	# (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
-	assert_fpreg_i	1, fr1
-	test_grs_a5a5
-	assert_fpreg_i	2, fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-fdiv_double:	
-	# Double test
-	set_grs_a5a5
-	set_fprs_a5a5
-	# (1.0 / 2.0) + (1.0 / 2.0) == 1.0.
-	fldi1	fr1
-	fldi1	fr2
-	# This add must be in single precision.  The rest must be in double.
-	fadd	fr2, fr2
-	double_prec
-	_s2d	fr1, dr0
-	_s2d	fr2, dr2
-	fdiv	dr2, dr0
-	# dr0 should contain 0.5.
-	# double it, expect 1.0.
-	fadd	dr0, dr0
-	assert_dpreg_i	1, dr0
-	assert_dpreg_i	2, dr2
-	test_grs_a5a5
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/fipr.s b/sim/testsuite/sim/sh/fipr.s
deleted file mode 100644
index 6a949aa6ec7..00000000000
--- a/sim/testsuite/sim/sh/fipr.s
+++ /dev/null
@@ -1,137 +0,0 @@
-# sh testcase for fipr $fvm, $fvn
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-initv0:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# Load 1 into fr0.
-	fldi1	fr0
-	# Load 2 into fr1.
-	fldi1	fr1
-	fadd	fr1, fr1
-	# Load 4 into fr2.
-	fldi1	fr2
-	fadd	fr2, fr2
-	fadd	fr2, fr2
-	# Load 8 into fr3.
-	fmov	fr2, fr3
-	fadd	fr2, fr3
-
-initv8:
-	fldi1	fr8
-	fldi0	fr9
-	fldi1	fr10
-	fldi0	fr11
-
-	fipr	fv0, fv8
-test1:	
-	# Result will be in fr11.
-	assert_fpreg_i	1, fr0
-	assert_fpreg_i	2, fr1
-	assert_fpreg_i	4, fr2
-	assert_fpreg_i	8, fr3
-	assert_fpreg_x	0xa5a5a5a5, fr4
-	assert_fpreg_x	0xa5a5a5a5, fr5
-	assert_fpreg_x	0xa5a5a5a5, fr6
-	assert_fpreg_x	0xa5a5a5a5, fr7
-	assert_fpreg_i	1, fr8
-	assert_fpreg_i	0, fr9
-	assert_fpreg_i	1, fr10
-	assert_fpreg_i	5, fr11
-	assert_fpreg_x	0xa5a5a5a5, fr12
-	assert_fpreg_x	0xa5a5a5a5, fr13
-	assert_fpreg_x	0xa5a5a5a5, fr14
-	assert_fpreg_x	0xa5a5a5a5, fr15
-
-	test_grs_a5a5
-test_infp:
-	# Test positive infinity
-	fldi0	fr11
-	mov.l	infp, r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fipr	fv0, fv8
-	# fr11 should be plus infinity
-	assert_fpreg_x	0x7f800000, fr11
-test_infm:
-	# Test negitive infinity
-	fldi0	fr11
-	mov.l	infm, r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fipr	fv0, fv8
-	# fr11 should be plus infinity
-	assert_fpreg_x	0xff800000, fr11
-test_qnanp:
-	# Test positive qnan
-	fldi0	fr11
-	mov.l	qnanp, r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fipr	fv0, fv8
-	# fr11 should be plus qnan (or greater)
-	flds	fr11, fpul
-	sts	fpul, r1
-	cmp/ge	r0, r1
-	bt	.L0
-	fail
-.L0:
-test_snanp:
-	# Test positive snan
-	fldi0	fr11
-	mov.l	snanp, r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fipr	fv0, fv8
-	# fr11 should be plus snan (or greater)
-	flds	fr11, fpul
-	sts	fpul, r1
-	cmp/ge	r0, r1
-	bt	.L1
-	fail
-.L1:
-.if 0
-	# Handling of nan and inf not implemented yet.
-test_qnanm:
-	# Test negantive qnan
-	fldi0	fr11
-	mov.l	qnanm, r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fipr	fv0, fv8
-	# fr11 should be minus qnan (or less)
-	flds	fr11, fpul
-	sts	fpul, r1
-	cmp/ge	r1, r0
-	bt	.L2
-	fail
-.L2:
-test_snanm:
-	# Test negative snan
-	fldi0	fr11
-	mov.l	snanm, r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fipr	fv0, fv8
-	# fr11 should be minus snan (or less)
-	flds	fr11, fpul
-	sts	fpul, r1
-	cmp/ge	r1, r0
-	bt	.L3
-	fail
-.L3:	
-.endif
-	pass
-	exit 0
-
-	.align 2
-qnanp:	.long	0x7f800001
-qnanm:	.long	0xff800001
-snanp:	.long	0x7fc00000
-snanm:	.long	0xffc00000
-infp:	.long	0x7f800000
-infm:	.long	0xff800000
diff --git a/sim/testsuite/sim/sh/fldi0.s b/sim/testsuite/sim/sh/fldi0.s
deleted file mode 100644
index 1e2005832b0..00000000000
--- a/sim/testsuite/sim/sh/fldi0.s
+++ /dev/null
@@ -1,37 +0,0 @@
-# sh testcase for fldi0 $frn 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fldi0_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	fldi0	fr0
-	fldi0	fr2
-	fldi0	fr4
-	fldi0	fr6
-	fldi0	fr8
-	fldi0	fr10
-	fldi0	fr12
-	fldi0	fr14
-	test_grs_a5a5
-	assert_fpreg_i 0 fr0
-	assert_fpreg_i 0 fr2
-	assert_fpreg_i 0 fr4
-	assert_fpreg_i 0 fr6
-	assert_fpreg_i 0 fr8
-	assert_fpreg_i 0 fr10
-	assert_fpreg_i 0 fr12
-	assert_fpreg_i 0 fr14
-	assert_fpreg_x 0xa5a5a5a5 fr1
-	assert_fpreg_x 0xa5a5a5a5 fr3
-	assert_fpreg_x 0xa5a5a5a5 fr5
-	assert_fpreg_x 0xa5a5a5a5 fr7
-	assert_fpreg_x 0xa5a5a5a5 fr9
-	assert_fpreg_x 0xa5a5a5a5 fr11
-	assert_fpreg_x 0xa5a5a5a5 fr13
-	assert_fpreg_x 0xa5a5a5a5 fr15
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fldi1.s b/sim/testsuite/sim/sh/fldi1.s
deleted file mode 100644
index 1b7c1701c7d..00000000000
--- a/sim/testsuite/sim/sh/fldi1.s
+++ /dev/null
@@ -1,38 +0,0 @@
-# sh testcase for fldi1 $frn 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fldi1_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	fldi1	fr1
-	fldi1	fr3
-	fldi1	fr5
-	fldi1	fr7
-	fldi1	fr9
-	fldi1	fr11
-	fldi1	fr13
-	fldi1	fr15
-	test_grs_a5a5
-	assert_fpreg_x 0xa5a5a5a5 fr0
-	assert_fpreg_x 0xa5a5a5a5 fr2
-	assert_fpreg_x 0xa5a5a5a5 fr4
-	assert_fpreg_x 0xa5a5a5a5 fr6
-	assert_fpreg_x 0xa5a5a5a5 fr8
-	assert_fpreg_x 0xa5a5a5a5 fr10
-	assert_fpreg_x 0xa5a5a5a5 fr12
-	assert_fpreg_x 0xa5a5a5a5 fr14
-	assert_fpreg_i 1 fr1
-	assert_fpreg_i 1 fr3
-	assert_fpreg_i 1 fr5
-	assert_fpreg_i 1 fr7
-	assert_fpreg_i 1 fr9
-	assert_fpreg_i 1 fr11
-	assert_fpreg_i 1 fr13
-	assert_fpreg_i 1 fr15
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/flds.s b/sim/testsuite/sim/sh/flds.s
deleted file mode 100644
index 086b4edf057..00000000000
--- a/sim/testsuite/sim/sh/flds.s
+++ /dev/null
@@ -1,43 +0,0 @@
-# sh testcase for flds 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-flds_zero:
-	set_grs_a5a5
-	set_fprs_a5a5
-	fldi0	fr0
-	flds	fr0, fpul
-	fsts	fpul, fr1
-	fcmp/eq	fr0, fr1
-	bt	flds_one
-	fail
-flds_one:
-	fldi1	fr0
-	flds	fr0, fpul
-	fsts	fpul, fr1
-	fcmp/eq	fr0, fr1
-	bt	.L0
-	fail
-.L0:
-	test_grs_a5a5
-	assert_fpreg_i	1, fr0
-	assert_fpreg_i	1, fr1
-	test_fpr_a5a5	fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/float.s b/sim/testsuite/sim/sh/float.s
deleted file mode 100644
index e5a3bc6dbfc..00000000000
--- a/sim/testsuite/sim/sh/float.s
+++ /dev/null
@@ -1,149 +0,0 @@
-# sh testcase for float 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-
-float_pos:
-	set_grs_a5a5
-	set_fprs_a5a5
-	single_prec
-	mov	#3, r0
-	lds	r0, fpul
-	float	fpul, fr2
-
-	# Check the result.
-	fldi1	fr0
-	fldi1	fr1
-	fadd	fr0, fr1
-	fadd	fr0, fr1
-	fcmp/eq	fr1, fr2
-	bt	float_neg
-	fail
-
-float_neg:	
-	mov	#3, r0
-	neg	r0, r0
-	lds	r0, fpul
-	float	fpul, fr2
-
-	# Check the result.
-	fldi1	fr0
-	fldi1	fr1
-	fadd	fr0, fr1
-	fadd	fr0, fr1
-	fneg	fr1
-	fcmp/eq	fr1, fr2
-	bt	.L0
-	fail
-.L0:
-	assertreg0	-3
-	test_gr_a5a5	r1
-	test_gr_a5a5	r2
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-	assert_fpreg_i	 1, fr0
-	assert_fpreg_i	-3, fr1
-	assert_fpreg_i	-3, fr2	
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-double_pos:
-	set_grs_a5a5
-	set_fprs_a5a5
-	double_prec
-	mov	#3, r0
-	lds	r0, fpul
-	float	fpul, dr4
-
-	# check the result.
-	fldi1	fr0
-	fldi1	fr1
-	single_prec
-	fadd	fr0, fr1
-	fadd	fr0, fr1
-	double_prec
-	_s2d	fr1, dr2
-	fcmp/eq	dr2, dr4
-	bt	double_neg
-	fail
-
-double_neg:
-	double_prec
-	mov	#3, r0
-	neg	r0, r0
-	lds	r0, fpul
-	float	fpul, dr4
-
-	# check the result.
-	fldi1	fr0
-	fldi1	fr1
-	single_prec
-	fadd	fr0, fr1
-	fadd	fr0, fr1
-	fneg	fr1
-	double_prec
-	_s2d	fr1, dr2
-	fcmp/eq	dr2, dr4
-	bt	.L2
-	fail
-.L2:
-	assertreg0	-3
-	test_gr_a5a5	r1
-	test_gr_a5a5	r2
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-	single_prec
-	assert_fpreg_i	 1, fr0
-	assert_fpreg_i	-3, fr1
-	double_prec
-	assert_dpreg_i	-3, dr2
-	assert_dpreg_i	-3, dr4
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fmac.s b/sim/testsuite/sim/sh/fmac.s
deleted file mode 100644
index eba1da5f4d8..00000000000
--- a/sim/testsuite/sim/sh/fmac.s
+++ /dev/null
@@ -1,98 +0,0 @@
-# sh testcase for fmac 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fmac_:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# 0.0 * x + y = y.
-
-	fldi0	fr0
-	fldi1	fr1
-	fldi1	fr2
-	fmac	fr0, fr1, fr2
-	# check result.
-	fldi1	fr0
-	fcmp/eq	fr0, fr2
-	bt	.L0
-	fail
-.L0:
-	# 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
-	bt	.L1
-	fail
-.L1:	
-	# 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
-	bt	.L2
-	fail
-.L2:
-	# 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
-	bt	.L3
-	fail
-.L3:	
-	# 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
-	bt	.L4
-	fail
-.L4:
-	test_grs_a5a5
-	assert_fpreg_i	0, fr0
-	assert_fpreg_i	2, fr1
-	assert_fpreg_i	0, fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fmov.s b/sim/testsuite/sim/sh/fmov.s
deleted file mode 100644
index 29c51b5d1e5..00000000000
--- a/sim/testsuite/sim/sh/fmov.s
+++ /dev/null
@@ -1,322 +0,0 @@
-# sh testcase for all fmov instructions
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	.macro init
-	fldi0	fr0
-	fldi1	fr1
-	fldi1	fr2
-	fldi1	fr3
-	.endm
-
-	start
-
-fmov1:	# Test fr -> fr.
-	set_grs_a5a5
-	set_fprs_a5a5
-	init
-	single_prec
-	sz_32
-	fmov	fr0, fr1
-	# Ensure fr0 and fr1 are now equal.
-	fcmp/eq	fr0, fr1
-	bt	fmov2
-	fail
-
-fmov2:	# Test dr -> dr.
-	init
-	double_prec
-	sz_64
-	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
-	sz_64
-	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
-	sz_64
-	double_prec
-	fmov	dr0, xd0
-	fmov	xd0, xd2
-	fmov	xd2, dr2
-	# Ensure dr0 and dr2 are now equal.
-	fcmp/eq	dr0, dr2
-	bt	.L0
-	fail
-
-	# FIXME: test fmov.s fr -> @gr,      fmov dr -> @gr
-	# FIXME: test fmov.s @gr -> fr,      fmov @gr -> dr
-	# FIXME: test fmov.s @gr+ -> fr,     fmov @gr+ -> dr
-	# FIXME: test fmov.s fr -> @-gr,     fmov dr -> @-gr
-	# FIXME: test fmov.s @(r0,gr) -> fr, fmov @(r0,gr) -> dr
-	# FIXME: test fmov.s fr -> @(r0,gr), fmov dr -> @(r0,gr)
-	
-.L0:
-	test_grs_a5a5
-	sz_32
-	single_prec
-	assert_fpreg_i	0, fr0
-	assert_fpreg_i	1, fr1
-	assert_fpreg_i	0, fr2
-	assert_fpreg_i	1, fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-fmov5:	# Test fr -> @rn and @rn -> fr.
-	init
-	sz_32
-	single_prec
-	# FIXME!  Use a reserved memory location!
-	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
-	sz_64
-	double_prec
-	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
-	sz_64
-	double_prec
-	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
-	sz_32
-	single_prec
-	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
-	sz_64
-	double_prec
-	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
-	sz_64
-	double_prec
-	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
-	sz_32
-	single_prec
-	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
-	sz_64
-	double_prec
-	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
-	sz_64
-	double_prec
-	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
-	sz_32
-	single_prec
-	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
-	sz_64
-	double_prec
-	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
-	sz_64
-	double_prec
-	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	.L1
-	fail
-.L1:
-	assertreg0	0x2800
-	assertreg	0, r1
-	test_gr_a5a5	r2
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-	sz_32
-	single_prec
-	assert_fpreg_i	0, fr0
-	assert_fpreg_i	1, fr1
-	assert_fpreg_i	0, fr2
-	assert_fpreg_i	1, fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fmul.s b/sim/testsuite/sim/sh/fmul.s
deleted file mode 100644
index 81a2545ccfa..00000000000
--- a/sim/testsuite/sim/sh/fmul.s
+++ /dev/null
@@ -1,116 +0,0 @@
-# sh testcase for fmul 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	.macro init
-	fldi0 fr0
-	fldi1 fr1
-	fldi1 fr2
-	fadd fr2, fr2
-	.endm
-
-	start
-fmul_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# 0.0 * 0.0 = 0.0.
-	init
-	fmul	fr0, fr0
-	assert_fpreg_i	0, fr0
-
-	# 0.0 * 1.0 = 0.0.
-	init
-	fmul	fr1, fr0
-	assert_fpreg_i	0, fr0
-
-	# 1.0 * 0.0 = 0.0.
-	init
-	fmul	fr0, fr1
-	assert_fpreg_i	0, fr1
-
-	# 1.0 * 1.0 = 1.0.
-	init
-	fmul	fr1, fr1
-	assert_fpreg_i	1, fr1
-
-	# 2.0 * 1.0 = 2.0.
-	init
-	fmul	fr2, fr1
-	assert_fpreg_i	2, fr1
-
-	test_grs_a5a5
-	assert_fpreg_i	0, fr0
-	assert_fpreg_i	2, fr1
-	assert_fpreg_i	2, fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	.macro dinit
-	fldi0 fr0
-	fldi1 fr2
-	fldi1 fr4
-	single_prec
-	fadd fr4, fr4
-	double_prec
-	_s2d fr0, dr0
-	_s2d fr2, dr2
-	_s2d fr4, dr4
-	.endm
-	
-fmul_double:
-	double_prec
-	# 0.0 * 0.0 = 0.0.
-	dinit
-	fmul	dr0, dr0
-	assert_dpreg_i	0, dr0
-
-	# 0.0 * 1.0 = 0.0.
-	dinit
-	fmul	dr2, dr0
-	assert_dpreg_i	0, dr0
-
-	# 1.0 * 0.0 = 0.0.
-	dinit
-	fmul	dr0, dr2
-	assert_dpreg_i	0, dr2
-
-	# 1.0 * 1.0 = 1.0.
-	dinit
-	fmul	dr2, dr2
-	assert_dpreg_i	1, dr2
-
-	# 2.0 * 1.0 = 2.0.
-	dinit
-	fmul	dr4, dr2
-	assert_dpreg_i	2, dr2
-
-	test_grs_a5a5
-	assert_dpreg_i	0, dr0
-	assert_dpreg_i	2, dr2
-	assert_dpreg_i	2, dr4
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fneg.s b/sim/testsuite/sim/sh/fneg.s
deleted file mode 100644
index dd5fe5d8bab..00000000000
--- a/sim/testsuite/sim/sh/fneg.s
+++ /dev/null
@@ -1,112 +0,0 @@
-# sh testcase for fneg 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fneg_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# neg(0.0) = 0.0.
-	fldi0	fr0
-	fldi0	fr1
-	fneg	fr0
-	fcmp/eq	fr0, fr1
-	bt	.L0
-	fail
-.L0:
-	# neg(1.0) = fsub(0,1)
-	fldi1	fr0
-	fneg	fr0
-	fldi0	fr1
-	fldi1	fr2
-	fsub	fr2, fr1
-	fcmp/eq	fr0, fr1
-	bt	.L1
-	fail
-.L1:
-	# neg(neg(1.0)) = 1.0.
-	fldi1	fr0
-	fldi1	fr1
-	fneg	fr0
-	fneg	fr0
-	fcmp/eq	fr0, fr1
-	bt	.L2
-	fail
-.L2:
-	test_grs_a5a5
-	assert_fpreg_i	1, fr0
-	assert_fpreg_i	1, fr1
-	assert_fpreg_i	1, fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-fneg_double:
-	set_grs_a5a5
-	set_fprs_a5a5
-	double_prec
-	# neg(0.0) = 0.0.
-	fldi0	fr0
-	fldi0	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fneg	dr0
-	fcmp/eq	dr0, dr2
-	bt	.L10
-	fail
-.L10:
-	# neg(1.0) = fsub(0,1)
-	fldi1	fr0
-	_s2d	fr0, dr0
-	fneg	dr0
-	fldi0	fr2
-	fldi1	fr3
-	single_prec
-	fsub	fr3, fr2
-	double_prec
-	_s2d	fr2, dr2
-	fcmp/eq dr0, dr2
-	bt	.L11
-	fail
-.L11:
-	# neg(neg(1.0)) = 1.0.
-	fldi1	fr0
-	_s2d	fr0, dr0
-	fldi1	fr2
-	_s2d	fr2, dr2
-	fneg	dr2
-	fneg	dr2
-	fcmp/eq	dr0, dr2
-	bt	.L12
-	fail
-.L12:
-	test_grs_a5a5
-	assert_dpreg_i	1, dr0
-	assert_dpreg_i	1, dr2
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fpchg.s b/sim/testsuite/sim/sh/fpchg.s
deleted file mode 100644
index 47ba03b1c03..00000000000
--- a/sim/testsuite/sim/sh/fpchg.s
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for fpchg
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	set_fprs_a5a5
-	sts	fpscr, r0
-	assertreg0	0
-	fpchg
-	sts	fpscr, r0
-	assertreg0	0x80000
-	fpchg
-	sts	fpscr, r0
-	assertreg0	0
-	fpchg
-	sts	fpscr, r0
-	assertreg0	0x80000
-	fpchg
-	sts	fpscr, r0
-	assertreg0	0
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	test_fprs_a5a5
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/frchg.s b/sim/testsuite/sim/sh/frchg.s
deleted file mode 100644
index c5dc0992e5f..00000000000
--- a/sim/testsuite/sim/sh/frchg.s
+++ /dev/null
@@ -1,30 +0,0 @@
-# sh testcase for frchg
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	set_fprs_a5a5
-	sts	fpscr, r0
-	assertreg0	0
-	frchg
-	sts	fpscr, r0
-	assertreg0	0x200000
-	frchg
-	sts	fpscr, r0
-	assertreg0	0
-	frchg
-	sts	fpscr, r0
-	assertreg0	0x200000
-	frchg
-	sts	fpscr, r0
-	assertreg0	0
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	test_fprs_a5a5
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fsca.s b/sim/testsuite/sim/sh/fsca.s
deleted file mode 100644
index 90df6c97680..00000000000
--- a/sim/testsuite/sim/sh/fsca.s
+++ /dev/null
@@ -1,97 +0,0 @@
-# sh testcase for fsca
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fsca:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# Start with angle zero
-	mov.l	zero, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i 0, fr2
-	assert_fpreg_i 1, fr3
-	
-	mov.l	plus_90, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i 1, fr2
-	assert_fpreg_i 0, fr3
-	
-	mov.l	plus_180, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i 0, fr2
-	assert_fpreg_i -1, fr3
-	
-	mov.l	plus_270, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i -1, fr2
-	assert_fpreg_i 0, fr3
-	
-	mov.l	plus_360, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i 0, fr2
-	assert_fpreg_i 1, fr3
-
-	mov.l	minus_90, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i -1, fr2
-	assert_fpreg_i 0, fr3
-	
-	mov.l	minus_180, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i 0, fr2
-	assert_fpreg_i -1, fr3
-	
-	mov.l	minus_270, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i 1, fr2
-	assert_fpreg_i 0, fr3
-	
-	mov.l	minus_360, r0
-	lds	r0, fpul
-	fsca	fpul, dr2
-	assert_fpreg_i 0, fr2
-	assert_fpreg_i 1, fr3
-
-	assertreg0      0xffff0000
-	set_greg        0xa5a5a5a5, r0
-	test_grs_a5a5
-	test_fpr_a5a5	fr0
-	test_fpr_a5a5	fr1
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-	pass
-	exit 0
-
-		.align 2
-zero:		.long	0
-one_bitty:	.long	1
-plus_90:	.long	0x04000
-plus_180:	.long	0x08000
-plus_270:	.long	0x0c000
-plus_360:	.long	0x10000
-minus_90:	.long	0xffffc000
-minus_180:	.long	0xffff8000
-minus_270:	.long	0xffff4000
-minus_360:	.long	0xffff0000
-minus_1_bitty:	.long	0xffffffff
diff --git a/sim/testsuite/sim/sh/fschg.s b/sim/testsuite/sim/sh/fschg.s
deleted file mode 100644
index 7454787b1d6..00000000000
--- a/sim/testsuite/sim/sh/fschg.s
+++ /dev/null
@@ -1,29 +0,0 @@
-# sh testcase for fschg
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	set_fprs_a5a5
-	sts	fpscr, r0
-	assertreg0	0
-	fschg
-	sts	fpscr, r0
-	assertreg0	0x100000
-	fschg
-	sts	fpscr, r0
-	assertreg0	0
-	fschg
-	sts	fpscr, r0
-	assertreg0	0x100000
-	fschg
-	sts	fpscr, r0
-	assertreg0	0
-
-	set_greg 0xa5a5a5a5 r0
-	test_grs_a5a5
-	test_fprs_a5a5
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fsqrt.s b/sim/testsuite/sim/sh/fsqrt.s
deleted file mode 100644
index cb61bcf4085..00000000000
--- a/sim/testsuite/sim/sh/fsqrt.s
+++ /dev/null
@@ -1,120 +0,0 @@
-# sh testcase for fsqrt 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fsqrt_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# sqrt(0.0) = 0.0.
-	fldi0	fr0
-	fsqrt	fr0
-	fldi0	fr1
-	fcmp/eq	fr0, fr1
-	bt	.L0
-	fail
-.L0:
-	# sqrt(1.0) = 1.0.
-	fldi1	fr0
-	fsqrt	fr0
-	fldi1	fr1
-	fcmp/eq	fr0, fr1
-	bt	.L1
-	fail
-.L1:
-	# 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
-	bt	.L2
-	fail
-.L2:
-	test_grs_a5a5
-	assert_fpreg_i	2, fr0
-	assert_fpreg_i	2, fr1
-	test_fpr_a5a5	fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-fsqrt_double:
-	double_prec
-	set_grs_a5a5
-	set_fprs_a5a5
-	# sqrt(0.0) = 0.0.
-	fldi0	fr0
-	_s2d	fr0, dr0
-	fsqrt	dr0
-	fldi0	fr2
-	_s2d	fr2, dr2
-	fcmp/eq	dr0, dr2
-	bt	.L10
-	fail
-.L10:
-	# sqrt(1.0) = 1.0.
-	fldi1	fr0
-	_s2d	fr0, dr0
-	fsqrt	dr0
-	fldi1	fr2
-	_s2d	fr2, dr2
-	fcmp/eq	dr0, dr2
-	bt	.L11
-	fail
-.L11:
-	# sqrt(4.0) = 2.0.
-	fldi1	fr0
-	# Double it.
-	single_prec
-	fadd	fr0, fr0
-	# Double it again.
-	fadd	fr0, fr0
-	double_prec
-	_s2d	fr0, dr0
-	fsqrt	dr0
-	fldi1	fr2
-	# Double it.
-	single_prec
-	fadd	fr2, fr2
-	double_prec
-	_s2d	fr2, dr2
-	fcmp/eq	dr0, dr2
-	bt	.L12
-	fail
-.L12:
-	test_grs_a5a5
-	assert_dpreg_i	2, dr0
-	assert_dpreg_i	2, dr2
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fsrra.s b/sim/testsuite/sim/sh/fsrra.s
deleted file mode 100644
index fdd22356d66..00000000000
--- a/sim/testsuite/sim/sh/fsrra.s
+++ /dev/null
@@ -1,62 +0,0 @@
-# sh testcase for fsrra
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fsrra_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# 1/sqrt(0.0) = +infinity.
-	fldi0	fr0
-	fsrra	fr0
-	assert_fpreg_x	0x7f800000, fr0
-
-	# 1/sqrt(1.0) = 1.0.
-	fldi1	fr0
-	fsrra	fr0
-	assert_fpreg_i	1, fr0
-
-	# 1/sqrt(4.0) = 1/2.0
-	fldi1	fr0
-	# Double it.
-	fadd	fr0, fr0
-	# Double it again.
-	fadd	fr0, fr0
-	fsrra	fr0
-	fldi1	fr2
-	# Double it.
-	fadd	fr2, fr2
-	fldi1	fr1
-	# Divide
-	fdiv	fr2, fr1
-	fcmp/eq	fr0, fr1
-	bt	.L2
-	fail
-.L2:
-	# Double-check (pun intended)
-	fadd	fr0, fr0
-	assert_fpreg_i	1, fr0
-	fadd	fr1, fr1
-	assert_fpreg_i	1, fr1
-
-	# And make sure the rest of the regs are un-affected.
-	assert_fpreg_i	2, fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-	test_grs_a5a5
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/fsub.s b/sim/testsuite/sim/sh/fsub.s
deleted file mode 100644
index dfe9172f57a..00000000000
--- a/sim/testsuite/sim/sh/fsub.s
+++ /dev/null
@@ -1,136 +0,0 @@
-# sh testcase for fsub
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-fsub_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# 0.0 - 0.0 = 0.0.
-	fldi0	fr0
-	fldi0	fr1
-	fsub	fr0, fr1
-	fldi0	fr2
-	fcmp/eq	fr1, fr2
-	bt	.L0
-	fail
-.L0:
-	# 1.0 - 0.0 = 1.0.
-	fldi0	fr0
-	fldi1	fr1
-	fsub	fr0, fr1
-	fldi1	fr2
-	fcmp/eq	fr1, fr2
-	bt	.L1
-	fail
-.L1:
-	# 1.0 - 1.0 = 0.0.
-	fldi1	fr0
-	fldi1	fr1
-	fsub	fr0, fr1
-	fldi0	fr2
-	fcmp/eq	fr1, fr2
-	bt	.L2
-	fail
-.L2:
-	# 0.0 - 1.0 = -1.0.
-	fldi1	fr0
-	fldi0	fr1
-	fsub	fr0, fr1
-	fldi1	fr2
-	fneg	fr2
-	fcmp/eq	fr1, fr2
-	bt	.L3
-	fail
-.L3:
-	test_grs_a5a5
-	assert_fpreg_i	 1, fr0
-	assert_fpreg_i	-1, fr1
-	assert_fpreg_i	-1, fr2
-	test_fpr_a5a5	fr3
-	test_fpr_a5a5	fr4
-	test_fpr_a5a5	fr5
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-
-fsub_double:
-	set_grs_a5a5
-	set_fprs_a5a5
-	double_prec
-	# 0.0 - 0.0 = 0.0.
-	fldi0	fr0
-	fldi0	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fsub	dr0, dr2
-	fldi0	fr4
-	_s2d	fr4, dr4
-	fcmp/eq	dr2, dr4
-	bt	.L10
-	fail
-.L10:	
-	# 1.0 - 0.0 = 1.0.
-	fldi0	fr0
-	fldi1	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fsub	dr0, dr2
-	fldi1	fr4
-	_s2d	fr4, dr4
-	fcmp/eq	dr2, dr4
-	bt	.L11
-	fail
-.L11:	
-	# 1.0 - 1.0 = 0.0.
-	fldi1	fr0
-	fldi1	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fsub	dr0, dr2
-	fldi0	fr4
-	_s2d	fr4, dr4
-	fcmp/eq	dr2, dr4
-	bt	.L12
-	fail
-.L12:	
-	# 0.0 - 1.0 = -1.0.
-	fldi1	fr0
-	fldi0	fr2
-	_s2d	fr0, dr0
-	_s2d	fr2, dr2
-	fsub	dr0, dr2
-	fldi1	fr4
-	single_prec
-	fneg	fr4
-	double_prec
-	_s2d	fr4, dr4
-	fcmp/eq	dr2, dr4
-	bt	.L13
-	fail
-.L13:
-	test_grs_a5a5
-	assert_dpreg_i	 1, dr0
-	assert_dpreg_i	-1, dr2
-	assert_dpreg_i	-1, dr4
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/ftrc.s b/sim/testsuite/sim/sh/ftrc.s
deleted file mode 100644
index 25e33be33ad..00000000000
--- a/sim/testsuite/sim/sh/ftrc.s
+++ /dev/null
@@ -1,156 +0,0 @@
-# sh testcase for ftrc 
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-ftrc_single:
-	set_grs_a5a5
-	set_fprs_a5a5
-	# ftrc(0.0) = 0.
-	fldi0	fr0
-	ftrc	fr0, fpul
-	# check results.
-	mov	#0, r0
-	sts	fpul, r1
-	cmp/eq	r0, r1
-	bt	.L0
-	fail
-.L0:
-	# 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
-	bt	.L1
-	fail
-.L1:
-	# 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
-	bt	ftrc_double
-	fail
-
-ftrc_double:
-	double_prec
-	# ftrc(0.0) = 0.
-	fldi0	fr0
-	_s2d	fr0, dr0
-	ftrc	dr0, fpul
-	# check results.
-	mov	#0, r0
-	sts	fpul, r1
-	cmp/eq	r0, r1
-	bt	.L10
-	fail
-.L10:
-	# ftrc(1.5) = 1.
-	fldi1	fr0
-	fldi1	fr2
-	fldi1	fr4
-	# double it.
-	single_prec
-	fadd	fr4, fr4
-	# form 0.5.
-	fdiv	fr4, fr2
-	fadd	fr2, fr0
-	double_prec
-	# 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
-	ftrc	dr0, fpul
-	
-	# check results.
-	mov	#1, r0
-	sts	fpul, r1
-	cmp/eq	r0, r1
-	bt	.L11
-	fail
-.L11:
-	# ftrc(-1.5) = -1.
-	fldi1	fr0
-	fneg	fr0
-	fldi1	fr2
-	fldi1	fr4
-	single_prec
-	# double it.
-	fadd	fr4, fr4
-	# form the fraction.
-	fdiv	fr4, fr2
-	fneg	fr2
-	# -1 + -0.5 = -1.5.
-	fadd	fr2, fr0
-	double_prec
-	# 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
-	ftrc	dr0, fpul
-	
-	# check results.
-	mov	#1, r0
-	neg	r0, r0
-	sts	fpul, r1
-	cmp/eq	r0, r1
-	bt	.L12
-	fail
-.L12:
-	assertreg0	-1
-	assertreg	-1, r1
-	test_gr_a5a5	r2
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-	assert_dpreg_i	2, dr4
-	test_fpr_a5a5	fr6
-	test_fpr_a5a5	fr7
-	test_fpr_a5a5	fr8
-	test_fpr_a5a5	fr9
-	test_fpr_a5a5	fr10
-	test_fpr_a5a5	fr11
-	test_fpr_a5a5	fr12
-	test_fpr_a5a5	fr13
-	test_fpr_a5a5	fr14
-	test_fpr_a5a5	fr15
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/ldrc.s b/sim/testsuite/sim/sh/ldrc.s
deleted file mode 100644
index 444131302f4..00000000000
--- a/sim/testsuite/sim/sh/ldrc.s
+++ /dev/null
@@ -1,118 +0,0 @@
-# sh testcase for ldrc, strc
-# mach: shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-setrc_imm:
-	set_grs_a5a5
-	# Test setrc
-	#
-	ldrs	lstart
-	ldre	lend
-	setrc	#0xff
-	get_sr	r1
-	shlr16	r1
-	set_greg 0xfff, r0
-	and	r0, r1
-	assertreg 0xff, r1
-
-	stc	rs, r0	! rs unchanged
-	assertreg0	lstart
-	stc	re, r0	! re unchanged
-	assertreg0	lend
-
-	set_greg 0xa5a5a5a5, r0
-	set_greg 0xa5a5a5a5, r1
-
-	test_grs_a5a5
-
-setrc_reg:
-	set_grs_a5a5
-	# Test setrc
-	#
-	ldrs	lstart
-	ldre	lend
-	set_greg	0xfff, r0
-	setrc	r0
-	get_sr	r1
-	shlr16	r1
-	set_greg 0xfff, r0
-	and	r0, r1
-	assertreg 0xfff, r1
-
-	stc	rs, r0	! rs unchanged
-	assertreg0	lstart
-	stc	re, r0	! re unchanged
-	assertreg0	lend
-
-	set_greg 0xa5a5a5a5, r0
-	set_greg 0xa5a5a5a5, r1
-
-	test_grs_a5a5
-
-	bra	ldrc_imm
-
-	.global lstart
-	.align 2
-lstart:	nop
-	nop
-	nop
-	nop
-	.global lend
-	.align 2
-lend:	nop
-	nop
-	nop
-	nop
-
-ldrc_imm:
-	set_grs_a5a5
-	# Test ldrc
-	setrc	#0x0	! zero rc
-	ldrc	#0xa5
-	get_sr	r1
-	shlr16	r1
-	set_greg 0xfff, r0
-	and	r0, r1
-	assertreg 0xa5, r1
-	stc	rs, r0	! rs unchanged
-	assertreg0	lstart
-	stc	re, r0
-	assertreg0	lend+1	! bit 0 set in re
-
-	# fix up re for next test
-	dt	r0	! Ugh!  No DEC insn!
-	ldc	r0, re
-
-	set_greg 0xa5a5a5a5, r0
-	set_greg 0xa5a5a5a5, r1
-
-	test_grs_a5a5
-
-ldrc_reg:
-	set_grs_a5a5
-	# Test ldrc
-	setrc	#0x0	! zero rc
-	set_greg 0xa5a, r0
-	ldrc	r0
-	get_sr	r1
-	shlr16	r1
-	set_greg 0xfff, r0
-	and	r0, r1
-	assertreg 0xa5a, r1
-	stc	rs, r0	! rs unchanged
-	assertreg0	lstart
-	stc	re, r0
-	assertreg0	lend+1	! bit 0 set in re
-
-	set_greg 0xa5a5a5a5, r0
-	set_greg 0xa5a5a5a5, r1
-
-	test_grs_a5a5
-
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/loop.s b/sim/testsuite/sim/sh/loop.s
deleted file mode 100644
index 604051938e7..00000000000
--- a/sim/testsuite/sim/sh/loop.s
+++ /dev/null
@@ -1,311 +0,0 @@
-# sh testcase for loop control
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-loop1:
-	set_grs_a5a5
-
-	ldrs	Loop1_start0+8
-	ldre	Loop1_start0+4
-	setrc	#5
-Loop1_start0:
-	add	#1, r1	! Before loop
-	# Loop should execute one instruction five times.
-Loop1_begin:
-	add	#1, r1	! Within loop
-Loop1_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 8 (five in loop, two after, one before)
-	assertreg	0xa5a5a5a5+8, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop2:
-	set_grs_a5a5
-
-	ldrs	Loop2_start0+6
-	ldre	Loop2_start0+4
-	setrc	#5
-Loop2_start0:	
-	add	#1, r1	! Before loop
-	# Loop should execute two instructions five times.
-Loop2_begin:
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-Loop2_end:
-	add	#3, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 14 (ten in loop, three after, one before)
-	assertreg	0xa5a5a5a5+14, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop3:
-	set_grs_a5a5
-
-	ldrs	Loop3_start0+4
-	ldre	Loop3_start0+4
-	setrc	#5
-Loop3_start0:
-	add	#1, r1	! Before loop
-	# Loop should execute three instructions five times.
-Loop3_begin:
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-Loop3_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 18 (fifteen in loop, two after, one before)
-	assertreg	0xa5a5a5a5+18, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop4:
-	set_grs_a5a5
-
-	ldrs	Loop4_begin
-	ldre	Loop4_last3+4
-	setrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute four instructions five times.
-Loop4_begin:
-Loop4_last3:
-	add	#1, r1	! Within loop
-Loop4_last2:
-	add	#1, r1	! Within loop
-Loop4_last1:
-	add	#1, r1	! Within loop
-Loop4_last:
-	add	#1, r1	! Within loop
-Loop4_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 23 (20 in loop, two after, one before)
-	assertreg	0xa5a5a5a5+23, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop5:
-	set_grs_a5a5
-
-	ldrs	Loop5_begin
-	ldre	Loop5_last3+4
-	setrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute five instructions five times.
-Loop5_begin:
-	add	#1, r1	! Within loop
-Loop5_last3:
-	add	#1, r1	! Within loop
-Loop5_last2:
-	add	#1, r1	! Within loop
-Loop5_last1:
-	add	#1, r1	! Within loop
-Loop5_last:
-	add	#1, r1	! Within loop
-Loop5_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 28 (25 in loop, two after, one before)
-	assertreg	0xa5a5a5a5+28, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loopn:
-	set_grs_a5a5
-
-	ldrs	Loopn_begin
-	ldre	Loopn_last3+4
-	setrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute n instructions five times.
-Loopn_begin:
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-Loopn_last3:
-	add	#1, r1	! Within loop
-Loopn_last2:
-	add	#1, r1	! Within loop
-Loopn_last1:
-	add	#1, r1	! Within loop
-Loopn_last:
-	add	#1, r1	! Within loop
-Loopn_end:
-	add	#3, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 64 (60 in loop, three after, one before)
-	assertreg	0xa5a5a5a5+64, r1
-
-	set_greg 0xa5a5a5a5, r0
-	set_greg 0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop1e:
-	set_grs_a5a5
-
-	ldrs	Loop1e_begin
-	ldre	Loop1e_last
-	ldrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute one instruction five times.
-Loop1e_begin:
-Loop1e_last:
-	add	#1, r1	! Within loop
-Loop1e_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 8 (five in loop, two after, one before)
-	assertreg	0xa5a5a5a5+8, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop2e:
-	set_grs_a5a5
-
-	ldrs	Loop2e_begin
-	ldre	Loop2e_last
-	ldrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute two instructions five times.
-Loop2e_begin:
-	add	#1, r1	! Within loop
-Loop2e_last:
-	add	#1, r1	! Within loop
-Loop2e_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 13 (ten in loop, two after, one before)
-	assertreg	0xa5a5a5a5+13, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop3e:
-	set_grs_a5a5
-
-	ldrs	Loop3e_begin
-	ldre	Loop3e_last
-	ldrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute three instructions five times.
-Loop3e_begin:
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-Loop3e_last:
-	add	#1, r1	! Within loop
-Loop3e_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 18 (fifteen in loop, two after, one before)
-	assertreg	0xa5a5a5a5+18, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop4e:
-	set_grs_a5a5
-
-	ldrs	Loop4e_begin
-	ldre	Loop4e_last
-	ldrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute four instructions five times.
-Loop4e_begin:
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-Loop4e_last:
-	add	#1, r1	! Within loop
-Loop4e_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 23 (twenty in loop, two after, one before)
-	assertreg	0xa5a5a5a5+23, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop5e:
-	set_grs_a5a5
-
-	ldrs	Loop5e_begin
-	ldre	Loop5e_last
-	ldrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute five instructions five times.
-Loop5e_begin:
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-Loop5e_last:
-	add	#1, r1	! Within loop
-Loop5e_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 28 (twenty five in loop, two after, one before)
-	assertreg	0xa5a5a5a5+28, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-loop_n_e:
-	set_grs_a5a5
-
-	ldrs	Loop_n_e_begin
-	ldre	Loop_n_e_last
-	ldrc	#5
-	add	#1, r1	! Before loop
-	# Loop should execute n instructions five times.
-Loop_n_e_begin:
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-	add	#1, r1	! Within loop
-Loop_n_e_last:
-	add	#1, r1	! Within loop
-Loop_n_e_end:
-	add	#2, r1	! After loop
-
-	# r1 = 0xa5a5a5a5 + 48 (forty five in loop, two after, one before)
-	assertreg	0xa5a5a5a5+48, r1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/macl.s b/sim/testsuite/sim/sh/macl.s
deleted file mode 100644
index 39b3b7d604b..00000000000
--- a/sim/testsuite/sim/sh/macl.s
+++ /dev/null
@@ -1,54 +0,0 @@
-# sh testcase for mac.l 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-	# force S-bit clear
-	clrs
-
-init:
-	# Prime {MACL, MACH} to #1.
-	mov #1, r0
-	dmulu.l r0, r0
-
-	# Set up addresses.
-	mov.l	pfour00, r0	! 85
-	mov.l	pfour12, r1	! 17
-
-test:
-	mac.l @r0+, @r1+
-
-check:
-	# Check result.
-	assert_sreg	0, mach
-	assert_sreg	85*17+1, macl
-
-	# Ensure post-increment occurred.
-	assertreg0	four00+4
-	assertreg	four12+4, r1
-
-doubleinc:
-	mov.l	pfour00, r0
-	mac.l	@r0+, @r0+
-	assertreg0 four00+8
-
-
-	pass
-	exit 0
-
-	.align 1
-four00:
-	.long	85
-	.long	2
-four12:
-	.long	17
-	.long	3
-
-	.align 2
-pfour00:
-	.long four00
-pfour12:
-	.long four12
diff --git a/sim/testsuite/sim/sh/macw.s b/sim/testsuite/sim/sh/macw.s
deleted file mode 100644
index 7e3ebc07d7b..00000000000
--- a/sim/testsuite/sim/sh/macw.s
+++ /dev/null
@@ -1,56 +0,0 @@
-# sh testcase for mac.w 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-
-	# Prime {MACL, MACH} to #1.
-	mov	#1, r0
-	dmulu.l	r0, r0
-
-	# Set up addresses.
-	mov.l	pfour00, r0	! 85
-	mov.l	pfour12, r1	! 17
-
-test:
-	mac.w	@r0+, @r1+	! MAC = 85 * 17 + 1
-
-check:
-	# Check result.
-	assert_sreg	0, mach
-	assert_sreg	85*17+1, macl
-
-	# Ensure post-increment occurred.
-	assertreg0	four00+2
-	assertreg	four12+2, r1
-
-doubleinc:
-	mov.l	pfour00, r0
-	mac.w	@r0+, @r0+
-	assertreg0 four00+4
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-
-	test_grs_a5a5
-
-	pass
-	exit 0
-
-	.align 2
-four00:
-	.word	85
-	.word	2
-four12:
-	.word	17
-	.word	3
-
-
-pfour00:
-	.long four00
-pfour12:
-	.long four12
diff --git a/sim/testsuite/sim/sh/mov.s b/sim/testsuite/sim/sh/mov.s
deleted file mode 100644
index 37fef514401..00000000000
--- a/sim/testsuite/sim/sh/mov.s
+++ /dev/null
@@ -1,118 +0,0 @@
-# sh testcase for all mov.[bwl] instructions
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	.align 2
-_lsrc:	.long	0x55555555
-_wsrc:	.long	0x55550000
-_bsrc:	.long	0x55000000
-
-	.align 2
-_ldst:	.long	0
-_wdst:	.long	0
-_bdst:	.long	0
-
-
-	start
-
-movb_disp12_reg:	# Test 8-bit @(disp12,gr) -> gr
-	set_grs_a5a5
-	mov.l	bsrc, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	mov.b	@(444,r1), r2
-
-	assertreg _bsrc-444, r1
-	assertreg 0x55, r2
-
-movb_reg_disp12:	# Test 8-bit gr -> @(disp12,gr)
-	set_grs_a5a5
-	mov.l	bdst, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	mov.b	r2, @(444,r1)
-
-	assertreg _bdst-444, r1
-	assertmem _bdst, 0xa5000000
-
-movw_disp12_reg:	# Test 16-bit @(disp12,gr) -> gr
-	set_grs_a5a5
-	mov.l	wsrc, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	mov.w	@(444,r1), r2
-
-	assertreg _wsrc-444, r1
-	assertreg 0x5555, r2
-
-movw_reg_disp12:	# Test 16-bit gr -> @(disp12,gr)
-	set_grs_a5a5
-	mov.l	wdst, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	mov.w	r2, @(444,r1)
-
-	assertreg _wdst-444, r1
-	assertmem _wdst, 0xa5a50000
-
-movl_disp12_reg:	# Test 32-bit @(disp12,gr) -> gr
-	set_grs_a5a5
-	mov.l	lsrc, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	mov.l	@(444,r1), r2
-
-	assertreg _lsrc-444, r1
-	assertreg 0x55555555, r2
-
-movl_reg_disp12:	# Test 32-bit gr -> @(disp12,gr)
-	set_grs_a5a5
-	mov.l	ldst, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	add	#-111, r1
-	mov.l	r2, @(444,r1)
-
-	assertreg _ldst-444, r1
-	assertmem _ldst, 0xa5a5a5a5
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-lsrc:	.long _lsrc
-wsrc:	.long _wsrc
-bsrc:	.long _bsrc
-
-ldst:	.long _ldst
-wdst:	.long _wdst
-bdst:	.long _bdst
-
diff --git a/sim/testsuite/sim/sh/movi.s b/sim/testsuite/sim/sh/movi.s
deleted file mode 100644
index e54f4f6597a..00000000000
--- a/sim/testsuite/sim/sh/movi.s
+++ /dev/null
@@ -1,76 +0,0 @@
-# sh testcase for all mov <#imm> instructions
-# mach: sh
-# as(sh):	-defsym sim_cpu=0
-
-	.include "testutils.inc"
-
-	start
-
-mov_i_reg:	# Test <imm8>
-	set_grs_a5a5
-	mov	#-0x55, r1
-
-	assertreg 0xffffffab, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-movi20_reg:	# Test <imm20>
-	set_grs_a5a5
-	movi20	#-0x55555,r1
-
-	assertreg 0xfffaaaab, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-movi20s_reg:	# Test <imm20> << 8
-	set_grs_a5a5
-	movi20s	#-0x5555500,r1
-
-	assertreg 0xfaaaab00, r1
-
-	test_gr_a5a5 r0
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
-
-
diff --git a/sim/testsuite/sim/sh/movli.s b/sim/testsuite/sim/sh/movli.s
deleted file mode 100644
index eacd10358ba..00000000000
--- a/sim/testsuite/sim/sh/movli.s
+++ /dev/null
@@ -1,55 +0,0 @@
-# sh testcase for movli
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align 2
-x:	.long	1
-y:	.long	2
-z:	.long	3
-	
-	start
-	set_grs_a5a5
-	mov.l	xptr, r1
-	mov.l	yptr, r2
-	# Move linked/conditional, x to y
-	movli.l	@r1, r0
-	movco.l r0, @r2
-
-	# Check result.
-	assertreg0 1
-	mov.l	yptr, r1
-	mov.l	@r1, r2
-	assertreg  1, r2
-
-	# Now attempt an unlinked move of r0 to z
-	mov.l	zptr, r1
-	movco.l	r0, @r1
-
-	# Check that z is unchanged.
-	mov.l	zptr, r1
-	mov.l	@r1, r2
-	assertreg 3, r2
-
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-	pass
-	exit 0
-
-	.align 2
-xptr:	.long	x
-yptr:	.long	y
-zptr:	.long	z
diff --git a/sim/testsuite/sim/sh/movua.s b/sim/testsuite/sim/sh/movua.s
deleted file mode 100644
index fa12fe53f8c..00000000000
--- a/sim/testsuite/sim/sh/movua.s
+++ /dev/null
@@ -1,197 +0,0 @@
-# sh testcase for movua
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-movua_1:
-	set_grs_a5a5
-	mov.l	srcp, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x03020100
-.else
-	assertreg0	0x00010203
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x04030201
-.else
-	assertreg0	0x01020304
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x05040302
-.else
-	assertreg0	0x02030405
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x06050403
-.else
-	assertreg0	0x03040506
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x07060504
-.else
-	assertreg0	0x04050607
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x08070605
-.else
-	assertreg0	0x05060708
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x09080706
-.else
-	assertreg0	0x06070809
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x0a090807
-.else
-	assertreg0	0x0708090a
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x0b0a0908
-.else
-	assertreg0	0x08090a0b
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x0c0b0a09
-.else
-	assertreg0	0x090a0b0c
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x0d0c0b0a
-.else
-	assertreg0	0x0a0b0c0d
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x0e0d0c0b
-.else
-	assertreg0	0x0b0c0d0e
-.endif
-
-	add	#1, r1
-	movua.l	@r1, r0
-.ifdef LITTLE
-	assertreg0	0x0f0e0d0c
-.else
-	assertreg0	0x0c0d0e0f
-.endif
-
-	assertreg	src+12, r1
-	test_gr_a5a5	r2
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-	bra	movua_4:
-	nop
-	
-	.align 0
-src:	.byte	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
-	.align 2
-srcp:	.long	src
-
-movua_4:
-	set_grs_a5a5
-	mov.l	srcp2, r1
-	movua.l	@r1+, r0
-.ifdef LITTLE
-	assertreg0	0x03020100
-.else
-	assertreg0	0x00010203
-.endif
-	assertreg	src+4, r1
-
-	mov.l	srcp2, r1
-	add	#1, r1
-	movua.l	@r1+, r0
-.ifdef LITTLE
-	assertreg0	0x04030201
-.else
-	assertreg0	0x01020304
-.endif
-	assertreg	src+5, r1
-
-	mov.l	srcp2, r1
-	add	#2, r1
-	movua.l	@r1+, r0
-.ifdef LITTLE
-	assertreg0	0x05040302
-.else
-	assertreg0	0x02030405
-.endif
-	assertreg	src+6, r1
-
-	mov.l	srcp2, r1
-	add	#3, r1
-	movua.l	@r1+, r0
-.ifdef LITTLE
-	assertreg0	0x06050403
-.else
-	assertreg0	0x03040506
-.endif
-	assertreg	src+7, r1
-
-	test_gr_a5a5	r2
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-	pass
-	exit 0
-
-srcp2:	.long	src
-
diff --git a/sim/testsuite/sim/sh/movxy.s b/sim/testsuite/sim/sh/movxy.s
deleted file mode 100644
index 7768ef96d50..00000000000
--- a/sim/testsuite/sim/sh/movxy.s
+++ /dev/null
@@ -1,1186 +0,0 @@
-# sh testcase for movxy
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.align	2
-src1:	.word	1
-src2:	.word	2
-src3:	.word	3
-src4:	.word	4
-src5:	.word	5
-src6:	.word	6
-src7:	.word	7
-src8:	.word	8
-src9:	.word	9
-	.word	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-
-dst1:	.word	0
-dst2:	.word	0
-dst3:	.word	0
-dst4:	.word	0
-dst5:	.word	0
-dst6:	.word	0
-dst7:	.word	0
-dst8:	.word	0
-dst9:	.word	0
-	.word	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-
-	start
-movxw_nopy:
-	set_grs_a5a5
-	# load up pointers
-	mov.l	srcp1, r4
-	mov.l	dstp1, r5
-
-	# perform moves
-	movx.w	@r4, x0
-	pcopy	x0, a0
-	movx.w	a0, @r5
-
-	# verify pointers unchanged
-	mov.l	srcp1, r0
-	cmp/eq	r0, r4
-	bt	.L0
-	fail
-.L0:
-	mov.l	dstp1, r1
-	cmp/eq	r1, r5
-	bt	.L1
-	fail
-.L1:
-	# verify copied values
-	mov.w	@r0, r0
-	mov.w	@r1, r1
-	cmp/eq	r0, r1
-	bt	.L2
-	fail
-.L2:
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-movyw_nopx:
-	set_grs_a5a5
-	# load up pointers
-	mov.l	srcp2, r6
-	mov.l	dstp2, r7
-
-	# perform moves
-	movy.w	@r6, y0
-	pcopy	y0, a0
-	movy.w	a0, @r7
-
-	# verify pointers unchanged
-	mov.l	srcp2, r2
-	cmp/eq	r2, r6
-	bt	.L3
-	fail
-.L3:
-	mov.l	dstp2, r3
-	cmp/eq	r3, r7
-	bt	.L4
-	fail
-.L4:
-	# verify copied values
-	mov.w	@r2, r2
-	mov.w	@r3, r3
-	cmp/eq	r2, r3
-	bt	.L5
-	fail
-.L5:
-	test_gr_a5a5 r0
-	test_gr_a5a5 r1
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-movxw_movyw:
-	set_grs_a5a5
-	# load up pointers
-	mov.l	srcp3, r4
-	mov.l	dstp3, r5
-	mov.l	srcp4, r6
-	mov.l	dstp4, r7
-
-	# perform moves
-	movx.w	@r4, x1	movy.w	@r6, y1
-	pcopy	x1, a0	
-	pcopy	y1, a1
-	movx.w	a0, @r5 movy.w	a1, @r7
-
-	# verify pointers unchanged
-	mov.l	srcp3, r0
-	cmp/eq	r0, r4
-	bt	.L6
-	fail
-.L6:
-	mov.l	dstp3, r1
-	cmp/eq	r1, r5
-	bt	.L7
-	fail
-.L7:
-	mov.l	srcp4, r2
-	cmp/eq	r2, r6
-	bt	.L8
-	fail
-.L8:
-	mov.l	dstp4, r3
-	cmp/eq	r3, r7
-	bt	.L9
-	fail
-.L9:
-	# verify copied values
-	mov.w	@r0, r0
-	mov.w	@r1, r1
-	cmp/eq	r0, r1
-	bt	.L10
-	fail
-.L10:
-	mov.w	@r2, r2
-	mov.w	@r3, r3
-	cmp/eq	r2, r3
-	bt	.L11
-	fail
-.L11:
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	bra	movxw_movyw_new
-	nop
-
-	.align	2
-srcp1:	.long	src1
-srcp2:	.long	src2
-srcp3:	.long	src3
-srcp4:	.long	src4
-srcp5:	.long	src5
-srcp6:	.long	src6
-srcp7:	.long	src7
-srcp8:	.long	src8
-srcp9:	.long	src9
-
-dstp1:	.long	dst1
-dstp2:	.long	dst2
-dstp3:	.long	dst3
-dstp4:	.long	dst4
-dstp5:	.long	dst5
-dstp6:	.long	dst6
-dstp7:	.long	dst7
-dstp8:	.long	dst8
-dstp9:	.long	dst9
-
-movxw_movyw_new:
-	set_grs_a5a5
-	# load up pointers
-	mov.l	srcp5b, r0
-	mov.l	dstp5b, r1
-	mov.l	srcp6b, r2
-	mov.l	dstp6b, r3
-
-	# perform moves
-	movx.w	@r0, x1	
-	movy.w	@r2, y1
-	movx.w	x1, @r1 
-	movy.w	y1, @r3
-
-	# verify pointers unchanged
-	mov.l	srcp5b, r4
-	cmp/eq	r0, r4
-	bt	.L12
-	fail
-
-.L12:
-	mov.l	dstp5b, r5
-	cmp/eq	r1, r5
-	bt	.L13
-	fail
-.L13:
-	mov.l	srcp6b, r6
-	cmp/eq	r2, r6
-	bt	.L14
-	fail
-.L14:
-	mov.l	dstp6b, r7
-	cmp/eq	r3, r7
-	bt	.L15
-	fail
-.L15:
-	# verify copied values
-	mov.w	@r0, r0
-	mov.w	@r1, r1
-	cmp/eq	r0, r1
-	bt	.L16
-	fail
-.L16:
-	mov.w	@r2, r2
-	mov.w	@r3, r3
-	cmp/eq	r2, r3
-	bt	.L17
-	fail
-.L17:
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	mov.l	srcp1b, r0
-	mov.l	dstp1b, r1
-	mov.l	srcp2b, r2
-	mov.l	dstp2b, r3
-	mov.l	srcp1b, r4
-	mov.l	dstp1b, r5
-	mov.l	srcp2b, r6
-	mov.l	dstp2b, r7
-	mov	#4, r8
-	mov	#4, r9
-	bra	.L18
-	nop
-
-	.align	2
-srcp1b:	.long	src1
-srcp2b:	.long	src2
-srcp3b:	.long	src3
-srcp4b:	.long	src4
-srcp5b:	.long	src5
-srcp6b:	.long	src6
-srcp7b:	.long	src7
-srcp8b:	.long	src8
-srcp9b:	.long	src9
-
-dstp1b:	.long	dst1
-dstp2b:	.long	dst2
-dstp3b:	.long	dst3
-dstp4b:	.long	dst4
-dstp5b:	.long	dst5
-dstp6b:	.long	dst6
-dstp7b:	.long	dst7
-dstp8b:	.long	dst8
-dstp9b:	.long	dst9
-
-.L18:
-
-	# movx.w @Ax{}, Dx | nopy 
-movxwaxdx_nopy:
-	movx.w	@r4,x0		! .word	0xf004
-	movx.w	@r4,x1		! .word	0xf084
-	movx.w	@r5,x0		! .word	0xf204
-	movx.w	@r5,x1		! .word	0xf284
-	movx.w	@r4+,x0		! .word	0xf008
-	movx.w	@r4+,x1		! .word	0xf088
-	movx.w	@r5+,x0		! .word	0xf208
-	movx.w	@r5+,x1		! .word	0xf288
-	movx.w	@r4+r8,x0	! .word	0xf00c
-	movx.w	@r4+r8,x1	! .word	0xf08c
-	movx.w	@r5+r8,x0	! .word	0xf20c
-	movx.w	@r5+r8,x1	! .word	0xf28c
-	# movx.w Da, @Ax{} | nopy
-movxwdaax_nopy:
-	movx.w	a0,@r4		! .word	0xf024
-	movx.w	a1,@r4		! .word	0xf0a4
-	movx.w	a0,@r5		! .word	0xf224
-	movx.w	a1,@r5		! .word	0xf2a4
-	movx.w	a0,@r4+		! .word	0xf028
-	movx.w	a1,@r4+		! .word	0xf0a8
-	movx.w	a0,@r5+		! .word	0xf228
-	movx.w	a1,@r5+		! .word	0xf2a8
-	movx.w	a0,@r4+r8	! .word	0xf02c
-	movx.w	a1,@r4+r8	! .word	0xf0ac
-	movx.w	a0,@r5+r8	! .word	0xf22c
-	movx.w	a1,@r5+r8	! .word	0xf2ac
-	# movy.w @Ay{}, Dy | nopx 
-movywaydy_nopx:
-	movy.w	@r6,y0		! .word	0xf001
-	movy.w	@r6,y1		! .word	0xf041
-	movy.w	@r7,y0		! .word	0xf101
-	movy.w	@r7,y1		! .word	0xf141
-	movy.w	@r6+,y0		! .word	0xf002
-	movy.w	@r6+,y1		! .word	0xf042
-	movy.w	@r7+,y0		! .word	0xf102
-	movy.w	@r7+,y1		! .word	0xf142
-	movy.w	@r6+r9,y0	! .word	0xf003
-	movy.w	@r6+r9,y1	! .word	0xf043
-	movy.w	@r7+r9,y0	! .word	0xf103
-	movy.w	@r7+r9,y1	! .word	0xf143
-	# movy.w Da, @Ay{} | nopx
-movywdaay_nopx:
-	movy.w	a0,@r6		! .word	0xf011
-	movy.w	a1,@r6		! .word	0xf051
-	movy.w	a0,@r7		! .word	0xf111
-	movy.w	a1,@r7		! .word	0xf151
-	movy.w	a0,@r6+		! .word	0xf012
-	movy.w	a1,@r6+		! .word	0xf052
-	movy.w	a0,@r7+		! .word	0xf112
-	movy.w	a1,@r7+		! .word	0xf152
-	movy.w	a0,@r6+r9	! .word	0xf013
-	movy.w	a1,@r6+r9	! .word	0xf053
-	movy.w	a0,@r7+r9	! .word	0xf113
-	movy.w	a1,@r7+r9	! .word	0xf153
-	# movx {} || movy {} 
-movx_movy:
-	movx.w	@r4,x0	movy.w	@r6,y0	! .word	0xf005
-	movx.w	@r4,x0	movy.w	@r6,y1	! .word	0xf045
-	movx.w	@r4,x1	movy.w	@r6,y0	! .word	0xf085
-	movx.w	@r4,x1	movy.w	@r6,y1	! .word	0xf0c5
-	movx.w	@r4,x0	movy.w	@r7,y0	! .word	0xf105
-	movx.w	@r4,x0	movy.w	@r7,y1	! .word	0xf145
-	movx.w	@r4,x1	movy.w	@r7,y0	! .word	0xf185
-	movx.w	@r4,x1	movy.w	@r7,y1	! .word	0xf1c5
-	movx.w	@r5,x0	movy.w	@r6,y0	! .word	0xf205
-	movx.w	@r5,x0	movy.w	@r6,y1	! .word	0xf245
-	movx.w	@r5,x1	movy.w	@r6,y0	! .word	0xf285
-	movx.w	@r5,x1	movy.w	@r6,y1	! .word	0xf2c5
-	movx.w	@r5,x0	movy.w	@r7,y0	! .word	0xf305
-	movx.w	@r5,x0	movy.w	@r7,y1	! .word	0xf345
-	movx.w	@r5,x1	movy.w	@r7,y0	! .word	0xf385
-	movx.w	@r5,x1	movy.w	@r7,y1	! .word	0xf3c5
-	movx.w	@r4,x0	movy.w	@r6+,y0	! .word	0xf006
-	movx.w	@r4,x0	movy.w	@r6+,y1	! .word	0xf046
-	movx.w	@r4,x1	movy.w	@r6+,y0	! .word	0xf086
-	movx.w	@r4,x1	movy.w	@r6+,y1	! .word	0xf0c6
-	movx.w	@r4,x0	movy.w	@r7+,y0	! .word	0xf106
-	movx.w	@r4,x0	movy.w	@r7+,y1	! .word	0xf146
-	movx.w	@r4,x1	movy.w	@r7+,y0	! .word	0xf186
-	movx.w	@r4,x1	movy.w	@r7+,y1	! .word	0xf1c6
-	movx.w	@r5,x0	movy.w	@r6+,y0	! .word	0xf206
-	movx.w	@r5,x0	movy.w	@r6+,y1	! .word	0xf246
-	movx.w	@r5,x1	movy.w	@r6+,y0	! .word	0xf286
-	movx.w	@r5,x1	movy.w	@r6+,y1	! .word	0xf2c6
-	movx.w	@r5,x0	movy.w	@r7+,y0	! .word	0xf306
-	movx.w	@r5,x0	movy.w	@r7+,y1	! .word	0xf346
-	movx.w	@r5,x1	movy.w	@r7+,y0	! .word	0xf386
-	movx.w	@r5,x1	movy.w	@r7+,y1	! .word	0xf3c6
-	movx.w	@r4,x0	movy.w	@r6+r9,y0	! .word	0xf007
-	movx.w	@r4,x0	movy.w	@r6+r9,y1	! .word	0xf047
-	movx.w	@r4,x1	movy.w	@r6+r9,y0	! .word	0xf087
-	movx.w	@r4,x1	movy.w	@r6+r9,y1	! .word	0xf0c7
-	movx.w	@r4,x0	movy.w	@r7+r9,y0	! .word	0xf107
-	movx.w	@r4,x0	movy.w	@r7+r9,y1	! .word	0xf147
-	movx.w	@r4,x1	movy.w	@r7+r9,y0	! .word	0xf187
-	movx.w	@r4,x1	movy.w	@r7+r9,y1	! .word	0xf1c7
-	movx.w	@r5,x0	movy.w	@r6+r9,y0	! .word	0xf207
-	movx.w	@r5,x0	movy.w	@r6+r9,y1	! .word	0xf247
-	movx.w	@r5,x1	movy.w	@r6+r9,y0	! .word	0xf287
-	movx.w	@r5,x1	movy.w	@r6+r9,y1	! .word	0xf2c7
-	movx.w	@r5,x0	movy.w	@r7+r9,y0	! .word	0xf307
-	movx.w	@r5,x0	movy.w	@r7+r9,y1	! .word	0xf347
-	movx.w	@r5,x1	movy.w	@r7+r9,y0	! .word	0xf387
-	movx.w	@r5,x1	movy.w	@r7+r9,y1	! .word	0xf3c7
-	movx.w	@r4+,x0	movy.w	@r6,y0	! .word	0xf009
-	movx.w	@r4+,x0	movy.w	@r6,y1	! .word	0xf049
-	movx.w	@r4+,x1	movy.w	@r6,y0	! .word	0xf089
-	movx.w	@r4+,x1	movy.w	@r6,y1	! .word	0xf0c9
-	movx.w	@r4+,x0	movy.w	@r7,y0	! .word	0xf109
-	movx.w	@r4+,x0	movy.w	@r7,y1	! .word	0xf149
-	movx.w	@r4+,x1	movy.w	@r7,y0	! .word	0xf189
-	movx.w	@r4+,x1	movy.w	@r7,y1	! .word	0xf1c9
-	movx.w	@r5+,x0	movy.w	@r6,y0	! .word	0xf209
-	movx.w	@r5+,x0	movy.w	@r6,y1	! .word	0xf249
-	movx.w	@r5+,x1	movy.w	@r6,y0	! .word	0xf289
-	movx.w	@r5+,x1	movy.w	@r6,y1	! .word	0xf2c9
-	movx.w	@r5+,x0	movy.w	@r7,y0	! .word	0xf309
-	movx.w	@r5+,x0	movy.w	@r7,y1	! .word	0xf349
-	movx.w	@r5+,x1	movy.w	@r7,y0	! .word	0xf389
-	movx.w	@r5+,x1	movy.w	@r7,y1	! .word	0xf3c9
-	movx.w	@r4+,x0	movy.w	@r6+,y0	! .word	0xf00a
-	movx.w	@r4+,x0	movy.w	@r6+,y1	! .word	0xf04a
-	movx.w	@r4+,x1	movy.w	@r6+,y0	! .word	0xf08a
-	movx.w	@r4+,x1	movy.w	@r6+,y1	! .word	0xf0ca
-	movx.w	@r4+,x0	movy.w	@r7+,y0	! .word	0xf10a
-	movx.w	@r4+,x0	movy.w	@r7+,y1	! .word	0xf14a
-	movx.w	@r4+,x1	movy.w	@r7+,y0	! .word	0xf18a
-	movx.w	@r4+,x1	movy.w	@r7+,y1	! .word	0xf1ca
-	movx.w	@r5+,x0	movy.w	@r6+,y0	! .word	0xf20a
-	movx.w	@r5+,x0	movy.w	@r6+,y1	! .word	0xf24a
-	movx.w	@r5+,x1	movy.w	@r6+,y0	! .word	0xf28a
-	movx.w	@r5+,x1	movy.w	@r6+,y1	! .word	0xf2ca
-	movx.w	@r5+,x0	movy.w	@r7+,y0	! .word	0xf30a
-	movx.w	@r5+,x0	movy.w	@r7+,y1	! .word	0xf34a
-	movx.w	@r5+,x1	movy.w	@r7+,y0	! .word	0xf38a
-	movx.w	@r5+,x1	movy.w	@r7+,y1	! .word	0xf3ca
-	movx.w	@r4+,x0	movy.w	@r6+r9,y0	! .word	0xf00b
-	movx.w	@r4+,x0	movy.w	@r6+r9,y1	! .word	0xf04b
-	movx.w	@r4+,x1	movy.w	@r6+r9,y0	! .word	0xf08b
-	movx.w	@r4+,x1	movy.w	@r6+r9,y1	! .word	0xf0cb
-	movx.w	@r4+,x0	movy.w	@r7+r9,y0	! .word	0xf10b
-	movx.w	@r4+,x0	movy.w	@r7+r9,y1	! .word	0xf14b
-	movx.w	@r4+,x1	movy.w	@r7+r9,y0	! .word	0xf18b
-	movx.w	@r4+,x1	movy.w	@r7+r9,y1	! .word	0xf1cb
-	movx.w	@r5+,x0	movy.w	@r6+r9,y0	! .word	0xf20b
-	movx.w	@r5+,x0	movy.w	@r6+r9,y1	! .word	0xf24b
-	movx.w	@r5+,x1	movy.w	@r6+r9,y0	! .word	0xf28b
-	movx.w	@r5+,x1	movy.w	@r6+r9,y1	! .word	0xf2cb
-	movx.w	@r5+,x0	movy.w	@r7+r9,y0	! .word	0xf30b
-	movx.w	@r5+,x0	movy.w	@r7+r9,y1	! .word	0xf34b
-	movx.w	@r5+,x1	movy.w	@r7+r9,y0	! .word	0xf38b
-	movx.w	@r5+,x1	movy.w	@r7+r9,y1	! .word	0xf3cb
-	movx.w	@r4+r8,x0	movy.w	@r6,y0	! .word	0xf00d
-	movx.w	@r4+r8,x0	movy.w	@r6,y1	! .word	0xf04d
-	movx.w	@r4+r8,x1	movy.w	@r6,y0	! .word	0xf08d
-	movx.w	@r4+r8,x1	movy.w	@r6,y1	! .word	0xf0cd
-	movx.w	@r4+r8,x0	movy.w	@r7,y0	! .word	0xf10d
-	movx.w	@r4+r8,x0	movy.w	@r7,y1	! .word	0xf14d
-	movx.w	@r4+r8,x1	movy.w	@r7,y0	! .word	0xf18d
-	movx.w	@r4+r8,x1	movy.w	@r7,y1	! .word	0xf1cd
-	movx.w	@r5+r8,x0	movy.w	@r6,y0	! .word	0xf20d
-	movx.w	@r5+r8,x0	movy.w	@r6,y1	! .word	0xf24d
-	movx.w	@r5+r8,x1	movy.w	@r6,y0	! .word	0xf28d
-	movx.w	@r5+r8,x1	movy.w	@r6,y1	! .word	0xf2cd
-	movx.w	@r5+r8,x0	movy.w	@r7,y0	! .word	0xf30d
-	movx.w	@r5+r8,x0	movy.w	@r7,y1	! .word	0xf34d
-	movx.w	@r5+r8,x1	movy.w	@r7,y0	! .word	0xf38d
-	movx.w	@r5+r8,x1	movy.w	@r7,y1	! .word	0xf3cd
-	movx.w	@r4+r8,x0	movy.w	@r6+,y0	! .word	0xf00e
-	movx.w	@r4+r8,x0	movy.w	@r6+,y1	! .word	0xf04e
-	movx.w	@r4+r8,x1	movy.w	@r6+,y0	! .word	0xf08e
-	movx.w	@r4+r8,x1	movy.w	@r6+,y1	! .word	0xf0ce
-	movx.w	@r4+r8,x0	movy.w	@r7+,y0	! .word	0xf10e
-	movx.w	@r4+r8,x0	movy.w	@r7+,y1	! .word	0xf14e
-	movx.w	@r4+r8,x1	movy.w	@r7+,y0	! .word	0xf18e
-	movx.w	@r4+r8,x1	movy.w	@r7+,y1	! .word	0xf1ce
-	movx.w	@r5+r8,x0	movy.w	@r6+,y0	! .word	0xf20e
-	movx.w	@r5+r8,x0	movy.w	@r6+,y1	! .word	0xf24e
-	movx.w	@r5+r8,x1	movy.w	@r6+,y0	! .word	0xf28e
-	movx.w	@r5+r8,x1	movy.w	@r6+,y1	! .word	0xf2ce
-	movx.w	@r5+r8,x0	movy.w	@r7+,y0	! .word	0xf30e
-	movx.w	@r5+r8,x0	movy.w	@r7+,y1	! .word	0xf34e
-	movx.w	@r5+r8,x1	movy.w	@r7+,y0	! .word	0xf38e
-	movx.w	@r5+r8,x1	movy.w	@r7+,y1	! .word	0xf3ce
-	movx.w	@r4+r8,x0	movy.w	@r6+r9,y0	! .word	0xf00f
-	movx.w	@r4+r8,x0	movy.w	@r6+r9,y1	! .word	0xf04f
-	movx.w	@r4+r8,x1	movy.w	@r6+r9,y0	! .word	0xf08f
-	movx.w	@r4+r8,x1	movy.w	@r6+r9,y1	! .word	0xf0cf
-	movx.w	@r4+r8,x0	movy.w	@r7+r9,y0	! .word	0xf10f
-	movx.w	@r4+r8,x0	movy.w	@r7+r9,y1	! .word	0xf14f
-	movx.w	@r4+r8,x1	movy.w	@r7+r9,y0	! .word	0xf18f
-	movx.w	@r4+r8,x1	movy.w	@r7+r9,y1	! .word	0xf1cf
-	movx.w	@r5+r8,x0	movy.w	@r6+r9,y0	! .word	0xf20f
-	movx.w	@r5+r8,x0	movy.w	@r6+r9,y1	! .word	0xf24f
-	movx.w	@r5+r8,x1	movy.w	@r6+r9,y0	! .word	0xf28f
-	movx.w	@r5+r8,x1	movy.w	@r6+r9,y1	! .word	0xf2cf
-	movx.w	@r5+r8,x0	movy.w	@r7+r9,y0	! .word	0xf30f
-	movx.w	@r5+r8,x0	movy.w	@r7+r9,y1	! .word	0xf34f
-	movx.w	@r5+r8,x1	movy.w	@r7+r9,y0	! .word	0xf38f
-	movx.w	@r5+r8,x1	movy.w	@r7+r9,y1	! .word	0xf3cf
-	movx.w	@r4,x0	movy.w	a0,@r6	! .word	0xf015
-	movx.w	@r4,x0	movy.w	a1,@r6	! .word	0xf055
-	movx.w	@r4,x1	movy.w	a0,@r6	! .word	0xf095
-	movx.w	@r4,x1	movy.w	a1,@r6	! .word	0xf0d5
-	movx.w	@r4,x0	movy.w	a0,@r7	! .word	0xf115
-	movx.w	@r4,x0	movy.w	a1,@r7	! .word	0xf155
-	movx.w	@r4,x1	movy.w	a0,@r7	! .word	0xf195
-	movx.w	@r4,x1	movy.w	a1,@r7	! .word	0xf1d5
-	movx.w	@r5,x0	movy.w	a0,@r6	! .word	0xf215
-	movx.w	@r5,x0	movy.w	a1,@r6	! .word	0xf255
-	movx.w	@r5,x1	movy.w	a0,@r6	! .word	0xf295
-	movx.w	@r5,x1	movy.w	a1,@r6	! .word	0xf2d5
-	movx.w	@r5,x0	movy.w	a0,@r7	! .word	0xf315
-	movx.w	@r5,x0	movy.w	a1,@r7	! .word	0xf355
-	movx.w	@r5,x1	movy.w	a0,@r7	! .word	0xf395
-	movx.w	@r5,x1	movy.w	a1,@r7	! .word	0xf3d5
-	movx.w	@r4,x0	movy.w	a0,@r6+	! .word	0xf016
-	movx.w	@r4,x0	movy.w	a1,@r6+	! .word	0xf056
-	movx.w	@r4,x1	movy.w	a0,@r6+	! .word	0xf096
-	movx.w	@r4,x1	movy.w	a1,@r6+	! .word	0xf0d6
-	movx.w	@r4,x0	movy.w	a0,@r7+	! .word	0xf116
-	movx.w	@r4,x0	movy.w	a1,@r7+	! .word	0xf156
-	movx.w	@r4,x1	movy.w	a0,@r7+	! .word	0xf196
-	movx.w	@r4,x1	movy.w	a1,@r7+	! .word	0xf1d6
-	movx.w	@r5,x0	movy.w	a0,@r6+	! .word	0xf216
-	movx.w	@r5,x0	movy.w	a1,@r6+	! .word	0xf256
-	movx.w	@r5,x1	movy.w	a0,@r6+	! .word	0xf296
-	movx.w	@r5,x1	movy.w	a1,@r6+	! .word	0xf2d6
-	movx.w	@r5,x0	movy.w	a0,@r7+	! .word	0xf316
-	movx.w	@r5,x0	movy.w	a1,@r7+	! .word	0xf356
-	movx.w	@r5,x1	movy.w	a0,@r7+	! .word	0xf396
-	movx.w	@r5,x1	movy.w	a1,@r7+	! .word	0xf3d6
-	movx.w	@r4,x0	movy.w	a0,@r6+r9	! .word	0xf017
-	movx.w	@r4,x0	movy.w	a1,@r6+r9	! .word	0xf057
-	movx.w	@r4,x1	movy.w	a0,@r6+r9	! .word	0xf097
-	movx.w	@r4,x1	movy.w	a1,@r6+r9	! .word	0xf0d7
-	movx.w	@r4,x0	movy.w	a0,@r7+r9	! .word	0xf117
-	movx.w	@r4,x0	movy.w	a1,@r7+r9	! .word	0xf157
-	movx.w	@r4,x1	movy.w	a0,@r7+r9	! .word	0xf197
-	movx.w	@r4,x1	movy.w	a1,@r7+r9	! .word	0xf1d7
-	movx.w	@r5,x0	movy.w	a0,@r6+r9	! .word	0xf217
-	movx.w	@r5,x0	movy.w	a1,@r6+r9	! .word	0xf257
-	movx.w	@r5,x1	movy.w	a0,@r6+r9	! .word	0xf297
-	movx.w	@r5,x1	movy.w	a1,@r6+r9	! .word	0xf2d7
-	movx.w	@r5,x0	movy.w	a0,@r7+r9	! .word	0xf317
-	movx.w	@r5,x0	movy.w	a1,@r7+r9	! .word	0xf357
-	movx.w	@r5,x1	movy.w	a0,@r7+r9	! .word	0xf397
-	movx.w	@r5,x1	movy.w	a1,@r7+r9	! .word	0xf3d7
-	movx.w	@r4+,x0	movy.w	a0,@r6	! .word	0xf019
-	movx.w	@r4+,x0	movy.w	a1,@r6	! .word	0xf059
-	movx.w	@r4+,x1	movy.w	a0,@r6	! .word	0xf099
-	movx.w	@r4+,x1	movy.w	a1,@r6	! .word	0xf0d9
-	movx.w	@r4+,x0	movy.w	a0,@r7	! .word	0xf119
-	movx.w	@r4+,x0	movy.w	a1,@r7	! .word	0xf159
-	movx.w	@r4+,x1	movy.w	a0,@r7	! .word	0xf199
-	movx.w	@r4+,x1	movy.w	a1,@r7	! .word	0xf1d9
-	movx.w	@r5+,x0	movy.w	a0,@r6	! .word	0xf219
-	movx.w	@r5+,x0	movy.w	a1,@r6	! .word	0xf259
-	movx.w	@r5+,x1	movy.w	a0,@r6	! .word	0xf299
-	movx.w	@r5+,x1	movy.w	a1,@r6	! .word	0xf2d9
-	movx.w	@r5+,x0	movy.w	a0,@r7	! .word	0xf319
-	movx.w	@r5+,x0	movy.w	a1,@r7	! .word	0xf359
-	movx.w	@r5+,x1	movy.w	a0,@r7	! .word	0xf399
-	movx.w	@r5+,x1	movy.w	a1,@r7	! .word	0xf3d9
-	movx.w	@r4+,x0	movy.w	a0,@r6+	! .word	0xf01a
-	movx.w	@r4+,x0	movy.w	a1,@r6+	! .word	0xf05a
-	movx.w	@r4+,x1	movy.w	a0,@r6+	! .word	0xf09a
-	movx.w	@r4+,x1	movy.w	a1,@r6+	! .word	0xf0da
-	movx.w	@r4+,x0	movy.w	a0,@r7+	! .word	0xf11a
-	movx.w	@r4+,x0	movy.w	a1,@r7+	! .word	0xf15a
-	movx.w	@r4+,x1	movy.w	a0,@r7+	! .word	0xf19a
-	movx.w	@r4+,x1	movy.w	a1,@r7+	! .word	0xf1da
-	movx.w	@r5+,x0	movy.w	a0,@r6+	! .word	0xf21a
-	movx.w	@r5+,x0	movy.w	a1,@r6+	! .word	0xf25a
-	movx.w	@r5+,x1	movy.w	a0,@r6+	! .word	0xf29a
-	movx.w	@r5+,x1	movy.w	a1,@r6+	! .word	0xf2da
-	movx.w	@r5+,x0	movy.w	a0,@r7+	! .word	0xf31a
-	movx.w	@r5+,x0	movy.w	a1,@r7+	! .word	0xf35a
-	movx.w	@r5+,x1	movy.w	a0,@r7+	! .word	0xf39a
-	movx.w	@r5+,x1	movy.w	a1,@r7+	! .word	0xf3da
-	movx.w	@r4+,x0	movy.w	a0,@r6+r9	! .word	0xf01b
-	movx.w	@r4+,x0	movy.w	a1,@r6+r9	! .word	0xf05b
-	movx.w	@r4+,x1	movy.w	a0,@r6+r9	! .word	0xf09b
-	movx.w	@r4+,x1	movy.w	a1,@r6+r9	! .word	0xf0db
-	movx.w	@r4+,x0	movy.w	a0,@r7+r9	! .word	0xf11b
-	movx.w	@r4+,x0	movy.w	a1,@r7+r9	! .word	0xf15b
-	movx.w	@r4+,x1	movy.w	a0,@r7+r9	! .word	0xf19b
-	movx.w	@r4+,x1	movy.w	a1,@r7+r9	! .word	0xf1db
-	movx.w	@r5+,x0	movy.w	a0,@r6+r9	! .word	0xf21b
-	movx.w	@r5+,x0	movy.w	a1,@r6+r9	! .word	0xf25b
-	movx.w	@r5+,x1	movy.w	a0,@r6+r9	! .word	0xf29b
-	movx.w	@r5+,x1	movy.w	a1,@r6+r9	! .word	0xf2db
-	movx.w	@r5+,x0	movy.w	a0,@r7+r9	! .word	0xf31b
-	movx.w	@r5+,x0	movy.w	a1,@r7+r9	! .word	0xf35b
-	movx.w	@r5+,x1	movy.w	a0,@r7+r9	! .word	0xf39b
-	movx.w	@r5+,x1	movy.w	a1,@r7+r9	! .word	0xf3db
-	movx.w	@r4+r8,x0	movy.w	a0,@r6	! .word	0xf01d
-	movx.w	@r4+r8,x0	movy.w	a1,@r6	! .word	0xf05d
-	movx.w	@r4+r8,x1	movy.w	a0,@r6	! .word	0xf09d
-	movx.w	@r4+r8,x1	movy.w	a1,@r6	! .word	0xf0dd
-	movx.w	@r4+r8,x0	movy.w	a0,@r7	! .word	0xf11d
-	movx.w	@r4+r8,x0	movy.w	a1,@r7	! .word	0xf15d
-	movx.w	@r4+r8,x1	movy.w	a0,@r7	! .word	0xf19d
-	movx.w	@r4+r8,x1	movy.w	a1,@r7	! .word	0xf1dd
-	movx.w	@r5+r8,x0	movy.w	a0,@r6	! .word	0xf21d
-	movx.w	@r5+r8,x0	movy.w	a1,@r6	! .word	0xf25d
-	movx.w	@r5+r8,x1	movy.w	a0,@r6	! .word	0xf29d
-	movx.w	@r5+r8,x1	movy.w	a1,@r6	! .word	0xf2dd
-	movx.w	@r5+r8,x0	movy.w	a0,@r7	! .word	0xf31d
-	movx.w	@r5+r8,x0	movy.w	a1,@r7	! .word	0xf35d
-	movx.w	@r5+r8,x1	movy.w	a0,@r7	! .word	0xf39d
-	movx.w	@r5+r8,x1	movy.w	a1,@r7	! .word	0xf3dd
-	movx.w	@r4+r8,x0	movy.w	a0,@r6+	! .word	0xf01e
-	movx.w	@r4+r8,x0	movy.w	a1,@r6+	! .word	0xf05e
-	movx.w	@r4+r8,x1	movy.w	a0,@r6+	! .word	0xf09e
-	movx.w	@r4+r8,x1	movy.w	a1,@r6+	! .word	0xf0de
-	movx.w	@r4+r8,x0	movy.w	a0,@r7+	! .word	0xf11e
-	movx.w	@r4+r8,x0	movy.w	a1,@r7+	! .word	0xf15e
-	movx.w	@r4+r8,x1	movy.w	a0,@r7+	! .word	0xf19e
-	movx.w	@r4+r8,x1	movy.w	a1,@r7+	! .word	0xf1de
-	movx.w	@r5+r8,x0	movy.w	a0,@r6+	! .word	0xf21e
-	movx.w	@r5+r8,x0	movy.w	a1,@r6+	! .word	0xf25e
-	movx.w	@r5+r8,x1	movy.w	a0,@r6+	! .word	0xf29e
-	movx.w	@r5+r8,x1	movy.w	a1,@r6+	! .word	0xf2de
-	movx.w	@r5+r8,x0	movy.w	a0,@r7+	! .word	0xf31e
-	movx.w	@r5+r8,x0	movy.w	a1,@r7+	! .word	0xf35e
-	movx.w	@r5+r8,x1	movy.w	a0,@r7+	! .word	0xf39e
-	movx.w	@r5+r8,x1	movy.w	a1,@r7+	! .word	0xf3de
-	movx.w	@r4+r8,x0	movy.w	a0,@r6+r9	! .word	0xf01f
-	movx.w	@r4+r8,x0	movy.w	a1,@r6+r9	! .word	0xf05f
-	movx.w	@r4+r8,x1	movy.w	a0,@r6+r9	! .word	0xf09f
-	movx.w	@r4+r8,x1	movy.w	a1,@r6+r9	! .word	0xf0df
-	movx.w	@r4+r8,x0	movy.w	a0,@r7+r9	! .word	0xf11f
-	movx.w	@r4+r8,x0	movy.w	a1,@r7+r9	! .word	0xf15f
-	movx.w	@r4+r8,x1	movy.w	a0,@r7+r9	! .word	0xf19f
-	movx.w	@r4+r8,x1	movy.w	a1,@r7+r9	! .word	0xf1df
-	movx.w	@r5+r8,x0	movy.w	a0,@r6+r9	! .word	0xf21f
-	movx.w	@r5+r8,x0	movy.w	a1,@r6+r9	! .word	0xf25f
-	movx.w	@r5+r8,x1	movy.w	a0,@r6+r9	! .word	0xf29f
-	movx.w	@r5+r8,x1	movy.w	a1,@r6+r9	! .word	0xf2df
-	movx.w	@r5+r8,x0	movy.w	a0,@r7+r9	! .word	0xf31f
-	movx.w	@r5+r8,x0	movy.w	a1,@r7+r9	! .word	0xf35f
-	movx.w	@r5+r8,x1	movy.w	a0,@r7+r9	! .word	0xf39f
-	movx.w	@r5+r8,x1	movy.w	a1,@r7+r9	! .word	0xf3df
-	movx.w	a0,@r4	movy.w	@r6,y0	! .word	0xf025
-	movx.w	a0,@r4	movy.w	@r6,y1	! .word	0xf065
-	movx.w	a1,@r4	movy.w	@r6,y0	! .word	0xf0a5
-	movx.w	a1,@r4	movy.w	@r6,y1	! .word	0xf0e5
-	movx.w	a0,@r4	movy.w	@r7,y0	! .word	0xf125
-	movx.w	a0,@r4	movy.w	@r7,y1	! .word	0xf165
-	movx.w	a1,@r4	movy.w	@r7,y0	! .word	0xf1a5
-	movx.w	a1,@r4	movy.w	@r7,y1	! .word	0xf1e5
-	movx.w	a0,@r5	movy.w	@r6,y0	! .word	0xf225
-	movx.w	a0,@r5	movy.w	@r6,y1	! .word	0xf265
-	movx.w	a1,@r5	movy.w	@r6,y0	! .word	0xf2a5
-	movx.w	a1,@r5	movy.w	@r6,y1	! .word	0xf2e5
-	movx.w	a0,@r5	movy.w	@r7,y0	! .word	0xf325
-	movx.w	a0,@r5	movy.w	@r7,y1	! .word	0xf365
-	movx.w	a0,@r5	movy.w	@r7,y1	! .word	0xf3a5
-	movx.w	a1,@r5	movy.w	@r7,y1	! .word	0xf3e5
-	movx.w	a0,@r4	movy.w	@r6+,y0	! .word	0xf026
-	movx.w	a0,@r4	movy.w	@r6+,y1	! .word	0xf066
-	movx.w	a1,@r4	movy.w	@r6+,y0	! .word	0xf0a6
-	movx.w	a1,@r4	movy.w	@r6+,y1	! .word	0xf0e6
-	movx.w	a0,@r4	movy.w	@r7+,y0	! .word	0xf126
-	movx.w	a0,@r4	movy.w	@r7+,y1	! .word	0xf166
-	movx.w	a1,@r4	movy.w	@r7+,y0	! .word	0xf1a6
-	movx.w	a1,@r4	movy.w	@r7+,y1	! .word	0xf1e6
-	movx.w	a0,@r5	movy.w	@r6+,y0	! .word	0xf226
-	movx.w	a0,@r5	movy.w	@r6+,y1	! .word	0xf266
-	movx.w	a1,@r5	movy.w	@r6+,y0	! .word	0xf2a6
-	movx.w	a1,@r5	movy.w	@r6+,y1	! .word	0xf2e6
-	movx.w	a0,@r5	movy.w	@r7+,y0	! .word	0xf326
-	movx.w	a0,@r5	movy.w	@r7+,y1	! .word	0xf366
-	movx.w	a1,@r5	movy.w	@r7+,y0	! .word	0xf3a6
-	movx.w	a1,@r5	movy.w	@r7+,y1	! .word	0xf3e6
-	movx.w	a0,@r4	movy.w	@r6+r9,y0	! .word	0xf027
-	movx.w	a0,@r4	movy.w	@r6+r9,y1	! .word	0xf067
-	movx.w	a1,@r4	movy.w	@r6+r9,y0	! .word	0xf0a7
-	movx.w	a1,@r4	movy.w	@r6+r9,y1	! .word	0xf0e7
-	movx.w	a0,@r4	movy.w	@r7+r9,y0	! .word	0xf127
-	movx.w	a0,@r4	movy.w	@r7+r9,y1	! .word	0xf167
-	movx.w	a1,@r4	movy.w	@r7+r9,y0	! .word	0xf1a7
-	movx.w	a1,@r4	movy.w	@r7+r9,y1	! .word	0xf1e7
-	movx.w	a0,@r5	movy.w	@r6+r9,y0	! .word	0xf227
-	movx.w	a0,@r5	movy.w	@r6+r9,y1	! .word	0xf267
-	movx.w	a1,@r5	movy.w	@r6+r9,y0	! .word	0xf2a7
-	movx.w	a1,@r5	movy.w	@r6+r9,y1	! .word	0xf2e7
-	movx.w	a0,@r5	movy.w	@r7+r9,y0	! .word	0xf327
-	movx.w	a0,@r5	movy.w	@r7+r9,y1	! .word	0xf367
-	movx.w	a1,@r5	movy.w	@r7+r9,y0	! .word	0xf3a7
-	movx.w	a1,@r5	movy.w	@r7+r9,y1	! .word	0xf3e7
-	movx.w	a0,@r4+	movy.w	@r6,y0	! .word	0xf029
-	movx.w	a0,@r4+	movy.w	@r6,y1	! .word	0xf069
-	movx.w	a1,@r4+	movy.w	@r6,y0	! .word	0xf0a9
-	movx.w	a1,@r4+	movy.w	@r6,y1	! .word	0xf0e9
-	movx.w	a0,@r4+	movy.w	@r7,y0	! .word	0xf129
-	movx.w	a0,@r4+	movy.w	@r7,y1	! .word	0xf169
-	movx.w	a1,@r4+	movy.w	@r7,y0	! .word	0xf1a9
-	movx.w	a1,@r4+	movy.w	@r7,y1	! .word	0xf1e9
-	movx.w	a0,@r5+	movy.w	@r6,y0	! .word	0xf229
-	movx.w	a0,@r5+	movy.w	@r6,y1	! .word	0xf269
-	movx.w	a1,@r5+	movy.w	@r6,y0	! .word	0xf2a9
-	movx.w	a1,@r5+	movy.w	@r6,y1	! .word	0xf2e9
-	movx.w	a0,@r5+	movy.w	@r7,y0	! .word	0xf329
-	movx.w	a0,@r5+	movy.w	@r7,y1	! .word	0xf369
-	movx.w	a1,@r5+	movy.w	@r7,y0	! .word	0xf3a9
-	movx.w	a1,@r5+	movy.w	@r7,y1	! .word	0xf3e9
-	movx.w	a0,@r4+	movy.w	@r6+,y0	! .word	0xf02a
-	movx.w	a0,@r4+	movy.w	@r6+,y1	! .word	0xf06a
-	movx.w	a1,@r4+	movy.w	@r6+,y0	! .word	0xf0aa
-	movx.w	a1,@r4+	movy.w	@r6+,y1	! .word	0xf0ea
-	movx.w	a0,@r4+	movy.w	@r7+,y0	! .word	0xf12a
-	movx.w	a0,@r4+	movy.w	@r7+,y1	! .word	0xf16a
-	movx.w	a1,@r4+	movy.w	@r7+,y0	! .word	0xf1aa
-	movx.w	a1,@r4+	movy.w	@r7+,y1	! .word	0xf1ea
-	movx.w	a0,@r5+	movy.w	@r6+,y0	! .word	0xf22a
-	movx.w	a0,@r5+	movy.w	@r6+,y1	! .word	0xf26a
-	movx.w	a1,@r5+	movy.w	@r6+,y0	! .word	0xf2aa
-	movx.w	a1,@r5+	movy.w	@r6+,y1	! .word	0xf2ea
-	movx.w	a0,@r5+	movy.w	@r7+,y0	! .word	0xf32a
-	movx.w	a0,@r5+	movy.w	@r7+,y1	! .word	0xf36a
-	movx.w	a1,@r5+	movy.w	@r7+,y0	! .word	0xf3aa
-	movx.w	a1,@r5+	movy.w	@r7+,y1	! .word	0xf3ea
-	movx.w	a0,@r4+	movy.w	@r6+r9,y0	! .word	0xf02b
-	movx.w	a0,@r4+	movy.w	@r6+r9,y1	! .word	0xf06b
-	movx.w	a1,@r4+	movy.w	@r6+r9,y0	! .word	0xf0ab
-	movx.w	a1,@r4+	movy.w	@r6+r9,y1	! .word	0xf0eb
-	movx.w	a0,@r4+	movy.w	@r7+r9,y0	! .word	0xf12b
-	movx.w	a0,@r4+	movy.w	@r7+r9,y1	! .word	0xf16b
-	movx.w	a1,@r4+	movy.w	@r7+r9,y0	! .word	0xf1ab
-	movx.w	a1,@r4+	movy.w	@r7+r9,y1	! .word	0xf1eb
-	movx.w	a0,@r5+	movy.w	@r6+r9,y0	! .word	0xf22b
-	movx.w	a0,@r5+	movy.w	@r6+r9,y1	! .word	0xf26b
-	movx.w	a1,@r5+	movy.w	@r6+r9,y0	! .word	0xf2ab
-	movx.w	a1,@r5+	movy.w	@r6+r9,y1	! .word	0xf2eb
-	movx.w	a0,@r5+	movy.w	@r7+r9,y0	! .word	0xf32b
-	movx.w	a0,@r5+	movy.w	@r7+r9,y1	! .word	0xf36b
-	movx.w	a1,@r5+	movy.w	@r7+r9,y0	! .word	0xf3ab
-	movx.w	a1,@r5+	movy.w	@r7+r9,y1	! .word	0xf3eb
-	movx.w	a0,@r4+r8	movy.w	@r6,y0	! .word	0xf02d
-	movx.w	a0,@r4+r8	movy.w	@r6,y1	! .word	0xf06d
-	movx.w	a1,@r4+r8	movy.w	@r6,y0	! .word	0xf0ad
-	movx.w	a1,@r4+r8	movy.w	@r6,y1	! .word	0xf0ed
-	movx.w	a0,@r4+r8	movy.w	@r7,y0	! .word	0xf12d
-	movx.w	a0,@r4+r8	movy.w	@r7,y1	! .word	0xf16d
-	movx.w	a1,@r4+r8	movy.w	@r7,y0	! .word	0xf1ad
-	movx.w	a1,@r4+r8	movy.w	@r7,y1	! .word	0xf1ed
-	movx.w	a0,@r5+r8	movy.w	@r6,y0	! .word	0xf22d
-	movx.w	a0,@r5+r8	movy.w	@r6,y1	! .word	0xf26d
-	movx.w	a1,@r5+r8	movy.w	@r6,y0	! .word	0xf2ad
-	movx.w	a1,@r5+r8	movy.w	@r6,y1	! .word	0xf2ed
-	movx.w	a0,@r5+r8	movy.w	@r7,y0	! .word	0xf32d
-	movx.w	a0,@r5+r8	movy.w	@r7,y1	! .word	0xf36d
-	movx.w	a1,@r5+r8	movy.w	@r7,y0	! .word	0xf3ad
-	movx.w	a1,@r5+r8	movy.w	@r7,y1	! .word	0xf3ed
-	movx.w	a0,@r4+r8	movy.w	@r6+,y0	! .word	0xf02e
-	movx.w	a0,@r4+r8	movy.w	@r6+,y1	! .word	0xf06e
-	movx.w	a1,@r4+r8	movy.w	@r6+,y0	! .word	0xf0ae
-	movx.w	a1,@r4+r8	movy.w	@r6+,y1	! .word	0xf0ee
-	movx.w	a0,@r4+r8	movy.w	@r7+,y0	! .word	0xf12e
-	movx.w	a0,@r4+r8	movy.w	@r7+,y1	! .word	0xf16e
-	movx.w	a1,@r4+r8	movy.w	@r7+,y0	! .word	0xf1ae
-	movx.w	a1,@r4+r8	movy.w	@r7+,y1	! .word	0xf1ee
-	movx.w	a0,@r5+r8	movy.w	@r6+,y0	! .word	0xf22e
-	movx.w	a0,@r5+r8	movy.w	@r6+,y1	! .word	0xf26e
-	movx.w	a1,@r5+r8	movy.w	@r6+,y0	! .word	0xf2ae
-	movx.w	a1,@r5+r8	movy.w	@r6+,y1	! .word	0xf2ee
-	movx.w	a0,@r5+r8	movy.w	@r7+,y0	! .word	0xf32e
-	movx.w	a0,@r5+r8	movy.w	@r7+,y1	! .word	0xf36e
-	movx.w	a1,@r5+r8	movy.w	@r7+,y0	! .word	0xf3ae
-	movx.w	a1,@r5+r8	movy.w	@r7+,y1	! .word	0xf3ee
-	movx.w	a0,@r4+r8	movy.w	@r6+r9,y0	! .word	0xf02f
-	movx.w	a0,@r4+r8	movy.w	@r6+r9,y1	! .word	0xf06f
-	movx.w	a1,@r4+r8	movy.w	@r6+r9,y0	! .word	0xf0af
-	movx.w	a1,@r4+r8	movy.w	@r6+r9,y1	! .word	0xf0ef
-	movx.w	a0,@r4+r8	movy.w	@r7+r9,y0	! .word	0xf12f
-	movx.w	a0,@r4+r8	movy.w	@r7+r9,y1	! .word	0xf16f
-	movx.w	a1,@r4+r8	movy.w	@r7+r9,y0	! .word	0xf1af
-	movx.w	a1,@r4+r8	movy.w	@r7+r9,y1	! .word	0xf1ef
-	movx.w	a0,@r5+r8	movy.w	@r6+r9,y0	! .word	0xf22f
-	movx.w	a0,@r5+r8	movy.w	@r6+r9,y1	! .word	0xf26f
-	movx.w	a1,@r5+r8	movy.w	@r6+r9,y0	! .word	0xf2af
-	movx.w	a1,@r5+r8	movy.w	@r6+r9,y1	! .word	0xf2ef
-	movx.w	a0,@r5+r8	movy.w	@r7+r9,y0	! .word	0xf32f
-	movx.w	a0,@r5+r8	movy.w	@r7+r9,y1	! .word	0xf36f
-	movx.w	a1,@r5+r8	movy.w	@r7+r9,y0	! .word	0xf3af
-	movx.w	a1,@r5+r8	movy.w	@r7+r9,y1	! .word	0xf3ef
-
-movxwaxydxy:
-	movx.w	@r4,x0	! 
-	movx.w	@r4,y0	! 
-	movx.w	@r4,x1	! 
-	movx.w	@r4,y1	! 
-	movx.w	@r0,x0	! 
-	movx.w	@r0,y0	! 
-	movx.w	@r0,x1	! 
-	movx.w	@r0,y1	! 
-	movx.w	@r5,x0	! 
-	movx.w	@r5,y0	! 
-	movx.w	@r5,x1	! 
-	movx.w	@r5,y1	! 
-	movx.w	@r1,x0	! 
-	movx.w	@r1,y0	! 
-	movx.w	@r1,x1	! 
-	movx.w	@r1,y1	! 
-	movx.w	@r4+,x0	! 
-	movx.w	@r4+,y0	! 
-	movx.w	@r4+,x1	! 
-	movx.w	@r4+,y1	! 
-	movx.w	@r0+,x0	! 
-	movx.w	@r0+,y0	! 
-	movx.w	@r0+,x1	! 
-	movx.w	@r0+,y1	! 
-	movx.w	@r5+,x0	! 
-	movx.w	@r5+,y0	! 
-	movx.w	@r5+,x1	! 
-	movx.w	@r5+,y1	! 
-	movx.w	@r1+,x0	! 
-	movx.w	@r1+,y0	! 
-	movx.w	@r1+,x1	! 
-	movx.w	@r1+,y1	! 
-	movx.w	@r4+r8,x0	! 
-	movx.w	@r4+r8,y0	! 
-	movx.w	@r4+r8,x1	! 
-	movx.w	@r4+r8,y1	! 
-	movx.w	@r0+r8,x0	! 
-	movx.w	@r0+r8,y0	! 
-	movx.w	@r0+r8,x1	! 
-	movx.w	@r0+r8,y1	! 
-	movx.w	@r5+r8,x0	! 
-	movx.w	@r5+r8,y0	! 
-	movx.w	@r5+r8,x1	! 
-	movx.w	@r5+r8,y1	! 
-	movx.w	@r1+r8,x0	! 
-	movx.w	@r1+r8,y0	! 
-	movx.w	@r1+r8,x1	! 
-	movx.w	@r1+r8,y1	! 
-	
-movxwdaxaxy:	! 
-	movx.w	a0,@r4	! 
-	movx.w	x0,@r4	! 
-	movx.w	a1,@r4	! 
-	movx.w	x1,@r4	! 
-	movx.w	a0,@r0	! 
-	movx.w	x0,@r0	! 
-	movx.w	a1,@r0	! 
-	movx.w	x1,@r0	! 
-	movx.w	a0,@r5	! 
-	movx.w	x0,@r5	! 
-	movx.w	a1,@r5	! 
-	movx.w	x1,@r5	! 
-	movx.w	a0,@r1	! 
-	movx.w	x0,@r1	! 
-	movx.w	a1,@r1	! 
-	movx.w	x1,@r1	! 
-	movx.w	a0,@r4+	! 
-	movx.w	x0,@r4+	! 
-	movx.w	a1,@r4+	! 
-	movx.w	x1,@r4+	! 
-	movx.w	a0,@r0+	! 
-	movx.w	x0,@r0+	! 
-	movx.w	a1,@r0+	! 
-	movx.w	x1,@r0+	! 
-	movx.w	a0,@r5+	! 
-	movx.w	x0,@r5+	! 
-	movx.w	a1,@r5+	! 
-	movx.w	x1,@r5+	! 
-	movx.w	a0,@r1+	! 
-	movx.w	x0,@r1+	! 
-	movx.w	a1,@r1+	! 
-	movx.w	x1,@r1+	! 
-	movx.w	a0,@r4+r8	! 
-	movx.w	x0,@r4+r8	! 
-	movx.w	a1,@r4+r8	! 
-	movx.w	x1,@r4+r8	! 
-	movx.w	a0,@r0+r8	! 
-	movx.w	x0,@r0+r8	! 
-	movx.w	a1,@r0+r8	! 
-	movx.w	x1,@r0+r8	! 
-	movx.w	a0,@r5+r8	! 
-	movx.w	x0,@r5+r8	! 
-	movx.w	a1,@r5+r8	! 
-	movx.w	x1,@r5+r8	! 
-	movx.w	a0,@r1+r8	! 
-	movx.w	x0,@r1+r8	! 
-	movx.w	a1,@r1+r8	! 
-	movx.w	x1,@r1+r8	! 
-
-movywayxdyx:	! 
-	movy.w	@r6,y0	! 
-	movy.w	@r6,y1	! 
-	movy.w	@r6,x0	! 
-	movy.w	@r6,x1	! 
-	movy.w	@r7,y0	! 
-	movy.w	@r7,y1	! 
-	movy.w	@r7,x0	! 
-	movy.w	@r7,x1	! 
-	movy.w	@r2,y0	! 
-	movy.w	@r2,y1	! 
-	movy.w	@r2,x0	! 
-	movy.w	@r2,x1	! 
-	movy.w	@r3,y0	! 
-	movy.w	@r3,y1	! 
-	movy.w	@r3,x0	! 
-	movy.w	@r3,x1	! 
-	movy.w	@r6+,y0	! 
-	movy.w	@r6+,y1	! 
-	movy.w	@r6+,x0	! 
-	movy.w	@r6+,x1	! 
-	movy.w	@r7+,y0	! 
-	movy.w	@r7+,y1	! 
-	movy.w	@r7+,x0	! 
-	movy.w	@r7+,x1	! 
-	movy.w	@r2+,y0	! 
-	movy.w	@r2+,y1	! 
-	movy.w	@r2+,x0	! 
-	movy.w	@r2+,x1	! 
-	movy.w	@r3+,y0	! 
-	movy.w	@r3+,y1	! 
-	movy.w	@r3+,x0	! 
-	movy.w	@r3+,x1	! 
-	movy.w	@r6+r9,y0	! 
-	movy.w	@r6+r9,y1	! 
-	movy.w	@r6+r9,x0	! 
-	movy.w	@r6+r9,x1	! 
-	movy.w	@r7+r9,y0	! 
-	movy.w	@r7+r9,y1	! 
-	movy.w	@r7+r9,x0	! 
-	movy.w	@r7+r9,x1	! 
-	movy.w	@r2+r9,y0	! 
-	movy.w	@r2+r9,y1	! 
-	movy.w	@r2+r9,x0	! 
-	movy.w	@r2+r9,x1	! 
-	movy.w	@r3+r9,y0	! 
-	movy.w	@r3+r9,y1	! 
-	movy.w	@r3+r9,x0	! 
-	movy.w	@r3+r9,x1	! 
-
-movywdayayx:
-	movy.w	a0,@r6
-	movy.w	a1,@r6
-	movy.w	y0,@r6
-	movy.w	y1,@r6
-	movy.w	a0,@r7
-	movy.w	a1,@r7
-	movy.w	y0,@r7
-	movy.w	y1,@r7
-	movy.w	a0,@r2
-	movy.w	a1,@r2
-	movy.w	y0,@r2
-	movy.w	y1,@r2
-	movy.w	a0,@r3
-	movy.w	a1,@r3
-	movy.w	y0,@r3
-	movy.w	y1,@r3
-	movy.w	a0,@r6+
-	movy.w	a1,@r6+
-	movy.w	y0,@r6+
-	movy.w	y1,@r6+
-	movy.w	a0,@r7+
-	movy.w	a1,@r7+
-	movy.w	y0,@r7+
-	movy.w	y1,@r7+
-	movy.w	a0,@r2+
-	movy.w	a1,@r2+
-	movy.w	y0,@r2+
-	movy.w	y1,@r2+
-	movy.w	a0,@r3+
-	movy.w	a1,@r3+
-	movy.w	y0,@r3+
-	movy.w	y1,@r3+
-	movy.w	a0,@r6+r9
-	movy.w	a1,@r6+r9
-	movy.w	y0,@r6+r9
-	movy.w	y1,@r6+r9
-	movy.w	a0,@r7+r9
-	movy.w	a1,@r7+r9
-	movy.w	y0,@r7+r9
-	movy.w	y1,@r7+r9
-	movy.w	a0,@r2+r9
-	movy.w	a1,@r2+r9
-	movy.w	y0,@r2+r9
-	movy.w	y1,@r2+r9
-	movy.w	a0,@r3+r9
-	movy.w	a1,@r3+r9
-	movy.w	y0,@r3+r9
-	movy.w	y1,@r3+r9
-
-	mov	r4, r0
-	mov	r4, r1
-	mov	r4, r2
-	mov	r4, r3
-	mov	r4, r5
-	mov	r4, r6
-	mov	r5, r7
-
-movxlaxydxy:
-	movx.l	@r4,x0
-	movx.l	@r4,y0
-	movx.l	@r4,x1
-	movx.l	@r4,y1
-	movx.l	@r0,x0
-	movx.l	@r0,y0
-	movx.l	@r0,x1
-	movx.l	@r0,y1
-	movx.l	@r5,x0
-	movx.l	@r5,y0
-	movx.l	@r5,x1
-	movx.l	@r5,y1
-	movx.l	@r1,x0
-	movx.l	@r1,y0
-	movx.l	@r1,x1
-	movx.l	@r1,y1
-	movx.l	@r4+,x0
-	movx.l	@r4+,y0
-	movx.l	@r4+,x1
-	movx.l	@r4+,y1
-	movx.l	@r0+,x0
-	movx.l	@r0+,y0
-	movx.l	@r0+,x1
-	movx.l	@r0+,y1
-	movx.l	@r5+,x0
-	movx.l	@r5+,y0
-	movx.l	@r5+,x1
-	movx.l	@r5+,y1
-	movx.l	@r1+,x0
-	movx.l	@r1+,y0
-	movx.l	@r1+,x1
-	movx.l	@r1+,y1
-	movx.l	@r4+r8,x0
-	movx.l	@r4+r8,y0
-	movx.l	@r4+r8,x1
-	movx.l	@r4+r8,y1
-	movx.l	@r0+r8,x0
-	movx.l	@r0+r8,y0
-	movx.l	@r0+r8,x1
-	movx.l	@r0+r8,y1
-	movx.l	@r5+r8,x0
-	movx.l	@r5+r8,y0
-	movx.l	@r5+r8,x1
-	movx.l	@r5+r8,y1
-	movx.l	@r1+r8,x0
-	movx.l	@r1+r8,y0
-	movx.l	@r1+r8,x1
-	movx.l	@r1+r8,y1
-
-movxldaxaxy:
-	movx.l	a0,@r4
-	movx.l	x0,@r4
-	movx.l	a1,@r4
-	movx.l	x1,@r4
-	movx.l	a0,@r0
-	movx.l	x0,@r0
-	movx.l	a1,@r0
-	movx.l	x1,@r0
-	movx.l	a0,@r5
-	movx.l	x0,@r5
-	movx.l	a1,@r5
-	movx.l	x1,@r5
-	movx.l	a0,@r1
-	movx.l	x0,@r1
-	movx.l	a1,@r1
-	movx.l	x1,@r1
-	movx.l	a0,@r4+
-	movx.l	x0,@r4+
-	movx.l	a1,@r4+
-	movx.l	x1,@r4+
-	movx.l	a0,@r0+
-	movx.l	x0,@r0+
-	movx.l	a1,@r0+
-	movx.l	x1,@r0+
-	movx.l	a0,@r5+
-	movx.l	x0,@r5+
-	movx.l	a1,@r5+
-	movx.l	x1,@r5+
-	movx.l	a0,@r1+
-	movx.l	x0,@r1+
-	movx.l	a1,@r1+
-	movx.l	x1,@r1+
-	movx.l	a0,@r4+r8
-	movx.l	x0,@r4+r8
-	movx.l	a1,@r4+r8
-	movx.l	x1,@r4+r8
-	movx.l	a0,@r0+r8
-	movx.l	x0,@r0+r8
-	movx.l	a1,@r0+r8
-	movx.l	x1,@r0+r8
-	movx.l	a0,@r5+r8
-	movx.l	x0,@r5+r8
-	movx.l	a1,@r5+r8
-	movx.l	x1,@r5+r8
-	movx.l	a0,@r1+r8
-	movx.l	x0,@r1+r8
-	movx.l	a1,@r1+r8
-	movx.l	x1,@r1+r8
-
-movylayxdyx:
-	movy.l	@r6,y0
-	movy.l	@r6,y1
-	movy.l	@r6,x0
-	movy.l	@r6,x1
-	movy.l	@r7,y0
-	movy.l	@r7,y1
-	movy.l	@r7,x0
-	movy.l	@r7,x1
-	movy.l	@r2,y0
-	movy.l	@r2,y1
-	movy.l	@r2,x0
-	movy.l	@r2,x1
-	movy.l	@r3,y0
-	movy.l	@r3,y1
-	movy.l	@r3,x0
-	movy.l	@r3,x1
-	movy.l	@r6+,y0
-	movy.l	@r6+,y1
-	movy.l	@r6+,x0
-	movy.l	@r6+,x1
-	movy.l	@r7+,y0
-	movy.l	@r7+,y1
-	movy.l	@r7+,x0
-	movy.l	@r7+,x1
-	movy.l	@r2+,y0
-	movy.l	@r2+,y1
-	movy.l	@r2+,x0
-	movy.l	@r2+,x1
-	movy.l	@r3+,y0
-	movy.l	@r3+,y1
-	movy.l	@r3+,x0
-	movy.l	@r3+,x1
-	movy.l	@r6+r9,y0
-	movy.l	@r6+r9,y1
-	movy.l	@r6+r9,x0
-	movy.l	@r6+r9,x1
-	movy.l	@r7+r9,y0
-	movy.l	@r7+r9,y1
-	movy.l	@r7+r9,x0
-	movy.l	@r7+r9,x1
-	movy.l	@r2+r9,y0
-	movy.l	@r2+r9,y1
-	movy.l	@r2+r9,x0
-	movy.l	@r2+r9,x1
-	movy.l	@r3+r9,y0
-	movy.l	@r3+r9,y1
-	movy.l	@r3+r9,x0
-	movy.l	@r3+r9,x1
-
-movyldayayx:
-	movy.l	a0,@r6
-	movy.l	a1,@r6
-	movy.l	y0,@r6
-	movy.l	y1,@r6
-	movy.l	a0,@r7
-	movy.l	a1,@r7
-	movy.l	y0,@r7
-	movy.l	y1,@r7
-	movy.l	a0,@r2
-	movy.l	a1,@r2
-	movy.l	y0,@r2
-	movy.l	y1,@r2
-	movy.l	a0,@r3
-	movy.l	a1,@r3
-	movy.l	y0,@r3
-	movy.l	y1,@r3
-	movy.l	a0,@r6+
-	movy.l	a1,@r6+
-	movy.l	y0,@r6+
-	movy.l	y1,@r6+
-	movy.l	a0,@r7+
-	movy.l	a1,@r7+
-	movy.l	y0,@r7+
-	movy.l	y1,@r7+
-	movy.l	a0,@r2+
-	movy.l	a1,@r2+
-	movy.l	y0,@r2+
-	movy.l	y1,@r2+
-	movy.l	a0,@r3+
-	movy.l	a1,@r3+
-	movy.l	y0,@r3+
-	movy.l	y1,@r3+
-	movy.l	a0,@r6+r9
-	movy.l	a1,@r6+r9
-	movy.l	y0,@r6+r9
-	movy.l	y1,@r6+r9
-	movy.l	a0,@r7+r9
-	movy.l	a1,@r7+r9
-	movy.l	y0,@r7+r9
-	movy.l	y1,@r7+r9
-	movy.l	a0,@r2+r9
-	movy.l	a1,@r2+r9
-	movy.l	y0,@r2+r9
-	movy.l	y1,@r2+r9
-	movy.l	a0,@r3+r9
-	movy.l	a1,@r3+r9
-	movy.l	y0,@r3+r9
-	movy.l	y1,@r3+r9
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/mulr.s b/sim/testsuite/sim/sh/mulr.s
deleted file mode 100644
index 1e755ab2de7..00000000000
--- a/sim/testsuite/sim/sh/mulr.s
+++ /dev/null
@@ -1,162 +0,0 @@
-# sh testcase for mulr
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-mulr_1:	! multiply by one
-	set_grs_a5a5
-	mov	#1, r0
-	mulr	r0, r1
-	assertreg0   1
-	test_gr_a5a5 r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-mulr_2:	! multiply by two
-	set_grs_a5a5
-	mov	#2, r0
-	mov	#12, r1
-	mulr	r0, r1
-	assertreg0   2
-	assertreg 24, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-mulr_3:	! multiply five by five
-	set_grs_a5a5
-	mov	#5, r0
-	mov	#5, r1
-	mulr	r0, r1
-	assertreg0   5
-	assertreg 25, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-
-mulr_4:	! multiply 127 by 127
-	set_grs_a5a5
-	mov	#127, r0
-	mov	#127, r1
-	mulr	r0, r1
-	assertreg0   127
-	assertreg 0x3f01, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-mulr_5:	! multiply -1 by -1
-	set_grs_a5a5
-	mov	#-1, r0
-	mov	#-1, r1
-	mulr	r0, r1
-	assertreg0   -1
-	assertreg 1, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-mulr_6:	! multiply 46340 by 46340
-	set_grs_a5a5
-	movi20	#46340, r0
-	movi20	#46340, r1
-	mulr	r0, r1
-	assertreg0   46340
-	assertreg 0x7ffea810, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-mulr_7:	! multiply 7ffff by 7ffff (overflow)
-	set_grs_a5a5
-	movi20	#0x7ffff, r0
-	movi20	#0x7ffff, r1
-	mulr	r0, r1
-	assertreg0   0x7ffff
-	assertreg 0xfff00001, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-
-	pass
-
-	exit 0
-
-	
\ No newline at end of file
diff --git a/sim/testsuite/sim/sh/pabs.s b/sim/testsuite/sim/sh/pabs.s
deleted file mode 100644
index 6a9e4f24226..00000000000
--- a/sim/testsuite/sim/sh/pabs.s
+++ /dev/null
@@ -1,54 +0,0 @@
-# sh testcase for pabs
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	# FIXME: opcode table ambiguity in ignored bits 4-7.
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	pabs	x0, x1
-	pabs	y0, y1
-	assert_sreg	0x5a5a5a5b, x1
-	assert_sreg	0x5a5a5a5b, y1
-	pabs	x1, x0
-	pabs	y1, y0
-	assert_sreg	0x5a5a5a5b, x0
-	assert_sreg	0x5a5a5a5b, y0
-
-	set_dcfalse
-	dct pabs a0, a0
-	dct pabs m0, m0
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, m0
-	set_dctrue
-	dct pabs a0, a0
-	dct pabs m0, m0
-	assert_sreg	0x5a5a5a5b, a0
-	assert_sreg2	0x5a5a5a5b, m0
-
-	set_dctrue
-	dcf pabs a1, a1
-	dcf pabs m1, m1
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m1
-	set_dcfalse
-	dcf pabs a1, a1
-	dcf pabs m1, m1
-	assert_sreg2	0x5a5a5a5b, a1
-	assert_sreg2	0x5a5a5a5b, m1
-
-	test_grs_a5a5
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/padd.s b/sim/testsuite/sim/sh/padd.s
deleted file mode 100644
index 072935dcdf5..00000000000
--- a/sim/testsuite/sim/sh/padd.s
+++ /dev/null
@@ -1,54 +0,0 @@
-# sh testcase for padd
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	padd	x0, y0, a0
-	assert_sreg	0x4b4b4b4a, a0
-
-	# 2 + 2 = 4
-	mov	#2, r0
-	lds	r0, x0
-	lds	r0, y0
-	padd	x0, y0, a0
-	assert_sreg	4, a0
-		
-	set_dcfalse
-	dct padd x0, y0, a1
-	assert_sreg2	0xa5a5a5a5, a1
-	set_dctrue
-	dct padd x0, y0, a1
-	assert_sreg2	4, a1
-
-	set_dctrue
-	dcf padd x0, y0, m1
-	assert_sreg2	0xa5a5a5a5, m1
-	set_dcfalse
-	dcf padd x0, y0, m1
-	assert_sreg2	4, m1
-
-	# padd / pmuls
-
-	padd	x0, y0, y0	pmuls	x1, y1, m1
-	assert_sreg	4, y0
-	assert_sreg2	0x3fc838b2, m1	! (int) 0xa5a5 x (int) 0xa5a5 x 2
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/paddc.s b/sim/testsuite/sim/sh/paddc.s
deleted file mode 100644
index 0dd3b67b172..00000000000
--- a/sim/testsuite/sim/sh/paddc.s
+++ /dev/null
@@ -1,39 +0,0 @@
-# sh testcase for paddc
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	# 2 + 2 = 4
-	set_dcfalse
-	mov	#2, r0
-	lds	r0, x0
-	lds	r0, y0
-	paddc	x0, y0, a0
-	assert_sreg	4, a0
-
-	# 2 + 2 + carry = 5
-	set_dctrue
-	paddc	x0, y0, a1
-	assert_sreg2	5, a1
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pand.s b/sim/testsuite/sim/sh/pand.s
deleted file mode 100644
index cddf05892cb..00000000000
--- a/sim/testsuite/sim/sh/pand.s
+++ /dev/null
@@ -1,48 +0,0 @@
-# sh testcase for pand
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	pand	x0, y0, a0
-	assert_sreg	0xa5a50000, a0
-
-	# 0xa5a5a5a5 & 0x5a5a5a5a == 0
-	set_greg	0x5a5a5a5a r0
-	lds	r0, x0
-	pand	x0, y0, a0
-	assert_sreg	0, a0
-		
-	set_dcfalse
-	dct pand x0, y0, m0
-	assert_sreg2	0xa5a5a5a5, m0
-	set_dctrue
-	dct pand x0, y0, m0
-	assert_sreg2	0, m0
-
-	set_dctrue
-	dcf pand x0, y0, m1
-	assert_sreg2	0xa5a5a5a5, m1
-	set_dcfalse
-	dcf pand x0, y0, m1
-	assert_sreg2	0, m1
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, a1
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pass.s b/sim/testsuite/sim/sh/pass.s
deleted file mode 100644
index cc3bbccd740..00000000000
--- a/sim/testsuite/sim/sh/pass.s
+++ /dev/null
@@ -1,14 +0,0 @@
-# sh testcase, pass
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	test_grs_a5a5
-	pass
-
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/pclr.s b/sim/testsuite/sim/sh/pclr.s
deleted file mode 100644
index c396f832dee..00000000000
--- a/sim/testsuite/sim/sh/pclr.s
+++ /dev/null
@@ -1,65 +0,0 @@
-# sh testcase for pclr
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	# FIXME: opcode table ambiguity in ignored bits 4-7.
-
-	.include "testutils.inc"
-
-	start
-pclr_cc:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	assert_sreg	0xa5a5a5a5, x0
-	pclr	x0
-	assert_sreg	0, x0
-
-	set_dcfalse
-	dct	pclr	x1
-	assert_sreg	0xa5a5a5a5, x1
-	set_dctrue
-	dct	pclr	x1
-	assert_sreg	0, x1
-	
-	set_dctrue
-	dcf	pclr	y0
-	assert_sreg	0xa5a5a5a5, y0
-	set_dcfalse
-	dcf	pclr	y0
-	assert_sreg	0, y0
-
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-pclr_pmuls:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	pclr	x0	pmuls	y0, y1, a0
-
-	assert_sreg	0, x0
-	assert_sreg	0x3fc838b2, a0	! 0xa5a5 x 0xa5a5
-
-	test_grs_a5a5
-	
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pdec.s b/sim/testsuite/sim/sh/pdec.s
deleted file mode 100644
index fa4b6a56e9c..00000000000
--- a/sim/testsuite/sim/sh/pdec.s
+++ /dev/null
@@ -1,110 +0,0 @@
-# sh testcase for pdec
-# mach: shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-pdecx:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	pdec	x0, y0
-	assert_sreg	0xa5a40000, y0
-
-	test_grs_a5a5 
-	assert_sreg	0xa5a5a5a5, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-pdecy:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	pdec	y0, x0
-	assert_sreg	0xa5a40000, x0
-
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, y0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-dct_pdecx:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_dcfalse
-	dct	pdec	x0, y0
-	assert_sreg	0xa5a5a5a5, y0
-	set_dctrue
-	dct	pdec	x0, y0
-	assert_sreg	0xa5a40000, y0
-
-	test_grs_a5a5 
-	assert_sreg	0xa5a5a5a5, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-dcf_pdecy:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_dctrue
-	dcf	pdec	y0, x0
-	assert_sreg	0xa5a5a5a5, x0
-	set_dcfalse
-	dcf	pdec	y0, x0
-	assert_sreg	0xa5a40000, x0
-
-	test_grs_a5a5 
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y0
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pdmsb.s b/sim/testsuite/sim/sh/pdmsb.s
deleted file mode 100644
index 0cb78293265..00000000000
--- a/sim/testsuite/sim/sh/pdmsb.s
+++ /dev/null
@@ -1,230 +0,0 @@
-# sh testcase for pdmsb
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_sreg 0x0, x0
-L0:	pdmsb	x0, x1
-#	assert_sreg 31<<16, x1
-	set_sreg 0x1, x0
-L1:	pdmsb	x0, x1
-	assert_sreg 30<<16, x1
-	set_sreg 0x3, x0
-L2:	pdmsb	x0, x1
-	assert_sreg 29<<16, x1
-	set_sreg 0x7, x0
-L3:	pdmsb	x0, x1
-	assert_sreg 28<<16, x1
-	set_sreg 0xf, x0
-L4:	pdmsb	x0, x1
-	assert_sreg 27<<16, x1
-	set_sreg 0x1f, x0
-L5:	pdmsb	x0, x1
-	assert_sreg 26<<16, x1
-	set_sreg 0x3f, x0
-L6:	pdmsb	x0, x1
-	assert_sreg 25<<16, x1
-	set_sreg 0x7f, x0
-L7:	pdmsb	x0, x1
-	assert_sreg 24<<16, x1
-	set_sreg 0xff, x0
-L8:	pdmsb	x0, x1
-	assert_sreg 23<<16, x1
-	
-	set_sreg 0x1ff, x0
-L9:	pdmsb	x0, x1
-	assert_sreg 22<<16, x1
-	set_sreg 0x3ff, x0
-L10:	pdmsb	x0, x1
-	assert_sreg 21<<16, x1
-	set_sreg 0x7ff, x0
-L11:	pdmsb	x0, x1
-	assert_sreg 20<<16, x1
-	set_sreg 0xfff, x0
-L12:	pdmsb	x0, x1
-	assert_sreg 19<<16, x1
-	set_sreg 0x1fff, x0
-L13:	pdmsb	x0, x1
-	assert_sreg 18<<16, x1
-	set_sreg 0x3fff, x0
-L14:	pdmsb	x0, x1
-	assert_sreg 17<<16, x1
-	set_sreg 0x7fff, x0
-L15:	pdmsb	x0, x1
-	assert_sreg 16<<16, x1
-	set_sreg 0xffff, x0
-L16:	pdmsb	x0, x1
-	assert_sreg 15<<16, x1
-
-	set_sreg 0x1ffff, x0
-L17:	pdmsb	x0, x1
-	assert_sreg 14<<16, x1
-	set_sreg 0x3ffff, x0
-L18:	pdmsb	x0, x1
-	assert_sreg 13<<16, x1
-	set_sreg 0x7ffff, x0
-L19:	pdmsb	x0, x1
-	assert_sreg 12<<16, x1
-	set_sreg 0xfffff, x0
-L20:	pdmsb	x0, x1
-	assert_sreg 11<<16, x1
-	set_sreg 0x1fffff, x0
-L21:	pdmsb	x0, x1
-	assert_sreg 10<<16, x1
-	set_sreg 0x3fffff, x0
-L22:	pdmsb	x0, x1
-	assert_sreg 9<<16, x1
-	set_sreg 0x7fffff, x0
-L23:	pdmsb	x0, x1
-	assert_sreg 8<<16, x1
-	set_sreg 0xffffff, x0
-L24:	pdmsb	x0, x1
-	assert_sreg 7<<16, x1
-
-	set_sreg 0x1ffffff, x0
-L25:	pdmsb	x0, x1
-	assert_sreg 6<<16, x1
-	set_sreg 0x3ffffff, x0
-L26:	pdmsb	x0, x1
-	assert_sreg 5<<16, x1
-	set_sreg 0x7ffffff, x0
-L27:	pdmsb	x0, x1
-	assert_sreg 4<<16, x1
-	set_sreg 0xfffffff, x0
-L28:	pdmsb	x0, x1
-	assert_sreg 3<<16, x1
-	set_sreg 0x1fffffff, x0
-L29:	pdmsb	x0, x1
-	assert_sreg 2<<16, x1
-	set_sreg 0x3fffffff, x0
-L30:	pdmsb	x0, x1
-	assert_sreg 1<<16, x1
-	set_sreg 0x7fffffff, x0
-L31:	pdmsb	x0, x1
-	assert_sreg 0<<16, x1
-	set_sreg 0xffffffff, x0
-L32:	pdmsb	x0, x1
-#	assert_sreg 31<<16, x1
-
-	set_sreg 0xfffffffe, x0
-L33:	pdmsb	x0, x1
-	assert_sreg 30<<16, x1
-	set_sreg 0xfffffffc, x0
-L34:	pdmsb	x0, x1
-	assert_sreg 29<<16, x1
-	set_sreg 0xfffffff8, x0
-L35:	pdmsb	x0, x1
-	assert_sreg 28<<16, x1
-	set_sreg 0xfffffff0, x0
-L36:	pdmsb	x0, x1
-	assert_sreg 27<<16, x1
-	set_sreg 0xffffffe0, x0
-L37:	pdmsb	x0, x1
-	assert_sreg 26<<16, x1
-	set_sreg 0xffffffc0, x0
-L38:	pdmsb	x0, x1
-	assert_sreg 25<<16, x1
-	set_sreg 0xffffff80, x0
-L39:	pdmsb	x0, x1
-	assert_sreg 24<<16, x1
-	set_sreg 0xffffff00, x0
-L40:	pdmsb	x0, x1
-	assert_sreg 23<<16, x1
-
-	set_sreg 0xfffffe00, x0
-L41:	pdmsb	x0, x1
-	assert_sreg 22<<16, x1
-	set_sreg 0xfffffc00, x0
-L42:	pdmsb	x0, x1
-	assert_sreg 21<<16, x1
-	set_sreg 0xfffff800, x0
-L43:	pdmsb	x0, x1
-	assert_sreg 20<<16, x1
-	set_sreg 0xfffff000, x0
-L44:	pdmsb	x0, x1
-	assert_sreg 19<<16, x1
-	set_sreg 0xffffe000, x0
-L45:	pdmsb	x0, x1
-	assert_sreg 18<<16, x1
-	set_sreg 0xffffc000, x0
-L46:	pdmsb	x0, x1
-	assert_sreg 17<<16, x1
-	set_sreg 0xffff8000, x0
-L47:	pdmsb	x0, x1
-	assert_sreg 16<<16, x1
-	set_sreg 0xffff0000, x0
-L48:	pdmsb	x0, x1
-	assert_sreg 15<<16, x1
-
-	set_sreg 0xfffe0000, x0
-L49:	pdmsb	x0, x1
-	assert_sreg 14<<16, x1
-	set_sreg 0xfffc0000, x0
-L50:	pdmsb	x0, x1
-	assert_sreg 13<<16, x1
-	set_sreg 0xfff80000, x0
-L51:	pdmsb	x0, x1
-	assert_sreg 12<<16, x1
-	set_sreg 0xfff00000, x0
-L52:	pdmsb	x0, x1
-	assert_sreg 11<<16, x1
-	set_sreg 0xffe00000, x0
-L53:	pdmsb	x0, x1
-	assert_sreg 10<<16, x1
-	set_sreg 0xffc00000, x0
-L54:	pdmsb	x0, x1
-	assert_sreg 9<<16, x1
-	set_sreg 0xff800000, x0
-L55:	pdmsb	x0, x1
-	assert_sreg 8<<16, x1
-	set_sreg 0xff000000, x0
-L56:	pdmsb	x0, x1
-	assert_sreg 7<<16, x1
-
-	set_sreg 0xfe000000, x0
-L57:	pdmsb	x0, x1
-	assert_sreg 6<<16, x1
-	set_sreg 0xfc000000, x0
-L58:	pdmsb	x0, x1
-	assert_sreg 5<<16, x1
-	set_sreg 0xf8000000, x0
-L59:	pdmsb	x0, x1
-	assert_sreg 4<<16, x1
-	set_sreg 0xf0000000, x0
-L60:	pdmsb	x0, x1
-	assert_sreg 3<<16, x1
-	set_sreg 0xe0000000, x0
-L61:	pdmsb	x0, x1
-	assert_sreg 2<<16, x1
-	set_sreg 0xc0000000, x0
-L62:	pdmsb	x0, x1
-	assert_sreg 1<<16, x1
-	set_sreg 0x80000000, x0
-L63:	pdmsb	x0, x1
-	assert_sreg 0<<16, x1
-	set_sreg 0x00000000, x0
-L64:	pdmsb	x0, x1
-#	assert_sreg 31<<16, x1
-
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, y0
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pinc.s b/sim/testsuite/sim/sh/pinc.s
deleted file mode 100644
index 0067bc00ebe..00000000000
--- a/sim/testsuite/sim/sh/pinc.s
+++ /dev/null
@@ -1,110 +0,0 @@
-# sh testcase for pinc
-# mach: shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-pincx:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	pinc	x0, y0
-	assert_sreg	0xa5a60000, y0
-
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-pincy:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	pinc	y0, x0
-	assert_sreg	0xa5a60000, x0
-
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, y0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-dct_pincx:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_dcfalse
-	dct	pinc	x0, y0
-	assert_sreg	0xa5a5a5a5, y0
-	set_dctrue
-	dct	pinc	x0, y0
-	assert_sreg	0xa5a60000, y0
-
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-dcf_pincy:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_dctrue
-	dcf	pinc	y0, x0
-	assert_sreg	0xa5a5a5a5, x0
-	set_dcfalse
-	dcf	pinc	y0, x0
-	assert_sreg	0xa5a60000, x0
-
-	test_grs_a5a5 
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y0
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pmuls.s b/sim/testsuite/sim/sh/pmuls.s
deleted file mode 100644
index 4cff8787f4e..00000000000
--- a/sim/testsuite/sim/sh/pmuls.s
+++ /dev/null
@@ -1,33 +0,0 @@
-# sh testcase for pmuls
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	# 2 x 2 = 8 (?)
-	# (I don't understand why the result is x2,
-	# but that's what it says in the manual...)
-	mov	#2, r0
-	shll16	r0
-	lds	r0, y0
-	lds	r0, y1
-	pmuls	y0, y1, a0
-
-	assert_sreg	8, a0
-
-	set_greg 0xa5a5a5a5, r0
-	test_grs_a5a5
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/prnd.s b/sim/testsuite/sim/sh/prnd.s
deleted file mode 100644
index 897d5b9ded9..00000000000
--- a/sim/testsuite/sim/sh/prnd.s
+++ /dev/null
@@ -1,90 +0,0 @@
-# sh testcase for prnd
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	# FIXME: opcode table ambiguity in ignored bits 4-7.
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	# prnd(0xa5a5a5a5) = 0xa5a60000
-	prnd	x0, x0
-	prnd	y0, y0
-	assert_sreg	0xa5a60000, x0
-	assert_sreg	0xa5a60000, y0
-
-	# prnd(1) = 1
-	mov	#1, r0
-	shll16	r0
-	lds	r0, x0
-	pcopy	x0, y0
-	prnd	x0, x0
-	prnd	y0, y0
-	assert_sreg	0x10000, x0
-	assert_sreg	0x10000, y0
-
-	# prnd(1.4999999) = 1
-	mov	#1, r0
-	shll8	r0
-	or	#0x7f, r0
-	shll8	r0
-	or	#0xff, r0
-	lds	r0, x0
-	pcopy	x0, y0
-	prnd	x0, x0
-	prnd	y0, y0
-	assert_sreg	0x10000, x0
-	assert_sreg	0x10000, y0
-
-	# prnd(1.5) = 2
-	mov	#1, r0
-	shll8	r0
-	or	#0x80, r0
-	shll8	r0
-	lds	r0, x0
-	pcopy	x0, y0
-	prnd	x0, x0
-	prnd	y0, y0
-	assert_sreg	0x20000, x0
-	assert_sreg	0x20000, y0
-
-	# dct prnd
-	set_dcfalse
-	dct	prnd	x0, x1
-	dct	prnd	y0, y1
-	assert_sreg2	0xa5a5a5a5, x1
-	assert_sreg2	0xa5a5a5a5, y1
-	set_dctrue
-	dct	prnd	x0, x1
-	dct	prnd	y0, y1
-	assert_sreg2	0x20000, x1
-	assert_sreg2	0x20000, y1
-
-	# dcf prnd
-	set_dctrue
-	dcf	prnd	x0, m0
-	dcf	prnd	y0, m1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-	set_dcfalse
-	dcf	prnd	x0, m0
-	dcf	prnd	y0, m1
-	assert_sreg2	0x20000, m0
-	assert_sreg2	0x20000, m1
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pshai.s b/sim/testsuite/sim/sh/pshai.s
deleted file mode 100644
index b2cdbbc81b8..00000000000
--- a/sim/testsuite/sim/sh/pshai.s
+++ /dev/null
@@ -1,200 +0,0 @@
-# sh testcase for psha <imm>
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-psha_imm:			! shift arithmetic, immediate operand
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_sreg 0x1, a0
-	psha	#0, a0
-	assert_sreg	0x1, a0
-	psha	#-0, a0
-	assert_sreg	0x1, a0
-
-	psha	#1, a0
-	assert_sreg	0x2, a0
-	psha	#-1, a0
-	assert_sreg	0x1, a0
-
-	psha	#2, a0
-	assert_sreg	0x4, a0
-	psha	#-2, a0
-	assert_sreg	0x1, a0
-
-	psha	#3, a0
-	assert_sreg	0x8, a0
-	psha	#-3, a0
-	assert_sreg	0x1, a0
-
-	psha	#4, a0
-	assert_sreg	0x10, a0
-	psha	#-4, a0
-	assert_sreg	0x1, a0
-
-	psha	#5, a0
-	assert_sreg	0x20, a0
-	psha	#-5, a0
-	assert_sreg	0x1, a0
-
-	psha	#6, a0
-	assert_sreg	0x40, a0
-	psha	#-6, a0
-	assert_sreg	0x1, a0
-
-	psha	#7, a0
-	assert_sreg	0x80, a0
-	psha	#-7, a0
-	assert_sreg	0x1, a0
-
-	psha	#8, a0
-	assert_sreg	0x100, a0
-	psha	#-8, a0
-	assert_sreg	0x1, a0
-
-	psha	#9, a0
-	assert_sreg	0x200, a0
-	psha	#-9, a0
-	assert_sreg	0x1, a0
-
-	psha	#10, a0
-	assert_sreg	0x400, a0
-	psha	#-10, a0
-	assert_sreg	0x1, a0
-
-	psha	#11, a0
-	assert_sreg	0x800, a0
-	psha	#-11, a0
-	assert_sreg	0x1, a0
-
-	psha	#12, a0
-	assert_sreg	0x1000, a0
-	psha	#-12, a0
-	assert_sreg	0x1, a0
-
-	psha	#13, a0
-	assert_sreg	0x2000, a0
-	psha	#-13, a0
-	assert_sreg	0x1, a0
-
-	psha	#14, a0
-	assert_sreg	0x4000, a0
-	psha	#-14, a0
-	assert_sreg	0x1, a0
-
-	psha	#15, a0
-	assert_sreg	0x8000, a0
-	psha	#-15, a0
-	assert_sreg	0x1, a0
-
-	psha	#16, a0
-	assert_sreg	0x10000, a0
-	psha	#-16, a0
-	assert_sreg	0x1, a0
-
-	psha	#17, a0
-	assert_sreg	0x20000, a0
-	psha	#-17, a0
-	assert_sreg	0x1, a0
-
-	psha	#18, a0
-	assert_sreg	0x40000, a0
-	psha	#-18, a0
-	assert_sreg	0x1, a0
-
-	psha	#19, a0
-	assert_sreg	0x80000, a0
-	psha	#-19, a0
-	assert_sreg	0x1, a0
-
-	psha	#20, a0
-	assert_sreg	0x100000, a0
-	psha	#-20, a0
-	assert_sreg	0x1, a0
-
-	psha	#21, a0
-	assert_sreg	0x200000, a0
-	psha	#-21, a0
-	assert_sreg	0x1, a0
-
-	psha	#22, a0
-	assert_sreg	0x400000, a0
-	psha	#-22, a0
-	assert_sreg	0x1, a0
-
-	psha	#23, a0
-	assert_sreg	0x800000, a0
-	psha	#-23, a0
-	assert_sreg	0x1, a0
-
-	psha	#24, a0
-	assert_sreg	0x1000000, a0
-	psha	#-24, a0
-	assert_sreg	0x1, a0
-
-	psha	#25, a0
-	assert_sreg	0x2000000, a0
-	psha	#-25, a0
-	assert_sreg	0x1, a0
-
-	psha	#26, a0
-	assert_sreg	0x4000000, a0
-	psha	#-26, a0
-	assert_sreg	0x1, a0
-
-	psha	#27, a0
-	assert_sreg	0x8000000, a0
-	psha	#-27, a0
-	assert_sreg	0x1, a0
-
-	psha	#28, a0
-	assert_sreg	0x10000000, a0
-	psha	#-28, a0
-	assert_sreg	0x1, a0
-
-	psha	#29, a0
-	assert_sreg	0x20000000, a0
-	psha	#-29, a0
-	assert_sreg	0x1, a0
-
-	psha	#30, a0
-	assert_sreg	0x40000000, a0
-	psha	#-30, a0
-	assert_sreg	0x1, a0
-
-	psha	#31, a0
-	assert_sreg	0x80000000, a0
-	psha	#-31, a0
-	assert_sreg	0xffffffff, a0
-
-	psha	#32, a0
-	assert_sreg	0x00000000, a0
-#	I don't grok what should happen here...
-#	psha	#-32, a0
-#	assert_sreg	0x0, a0
-
-	test_grs_a5a5
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg	0xa5a5a5a5, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y0
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/pshar.s b/sim/testsuite/sim/sh/pshar.s
deleted file mode 100644
index 01c4b5fdef2..00000000000
--- a/sim/testsuite/sim/sh/pshar.s
+++ /dev/null
@@ -1,265 +0,0 @@
-# sh testcase for psha <reg>
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-psha_reg:			! shift arithmetic, register operand
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_sreg 0x1, x0
-	set_sreg 0x0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x10000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x2, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x20000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x4, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x30000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x8, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x40000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x10, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x50000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x20, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x60000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x40, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x70000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x80, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x80000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x100, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x90000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x200, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0xa0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x400, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0xb0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x800, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0xc0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0xd0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x2000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0xe0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x4000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0xf0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x8000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x100000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x10000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x110000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x20000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x120000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x40000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x130000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x80000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x140000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x100000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x150000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x200000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x160000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x400000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x170000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x800000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x180000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1000000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x190000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x2000000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x1a0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x4000000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x1b0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x8000000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x1c0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x10000000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x1d0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x20000000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x1e0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x40000000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0x1, x0
-
-	set_sreg 0x1f0000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x80000000, x0
-	pneg	y0, y0
-	psha	x0, y0, x0
-	assert_sreg	0xffffffff, x0
-
-	set_sreg 0x200000, y0
-	psha	x0, y0, x0
-	assert_sreg	0x00000000, x0
-#	I don't grok what should happen here...
-#	pneg	y0, y0
-#	psha	x0, y0, x0
-#	assert_sreg	0x0, x0
-
-	test_grs_a5a5
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/pshli.s b/sim/testsuite/sim/sh/pshli.s
deleted file mode 100644
index a6616e896ac..00000000000
--- a/sim/testsuite/sim/sh/pshli.s
+++ /dev/null
@@ -1,119 +0,0 @@
-# sh testcase for pshl <imm>
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-pshl_imm:			! shift logical, immediate operand
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_sreg 0x10000, a0
-	pshl	#0, a0
-	assert_sreg	0x10000, a0
-	pshl	#-0, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#1, a0
-	assert_sreg	0x20000, a0
-	pshl	#-1, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#2, a0
-	assert_sreg	0x40000, a0
-	pshl	#-2, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#3, a0
-	assert_sreg	0x80000, a0
-	pshl	#-3, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#4, a0
-	assert_sreg	0x100000, a0
-	pshl	#-4, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#5, a0
-	assert_sreg	0x200000, a0
-	pshl	#-5, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#6, a0
-	assert_sreg	0x400000, a0
-	pshl	#-6, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#7, a0
-	assert_sreg	0x800000, a0
-	pshl	#-7, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#8, a0
-	assert_sreg	0x1000000, a0
-	pshl	#-8, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#9, a0
-	assert_sreg	0x2000000, a0
-	pshl	#-9, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#10, a0
-	assert_sreg	0x4000000, a0
-	pshl	#-10, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#11, a0
-	assert_sreg	0x8000000, a0
-	pshl	#-11, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#12, a0
-	assert_sreg	0x10000000, a0
-	pshl	#-12, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#13, a0
-	assert_sreg	0x20000000, a0
-	pshl	#-13, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#14, a0
-	assert_sreg	0x40000000, a0
-	pshl	#-14, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#15, a0
-	assert_sreg	0x80000000, a0
-	pshl	#-15, a0
-	assert_sreg	0x10000, a0
-
-	pshl	#16, a0
-	assert_sreg	0x00000000, a0
-	pshl	#-16, a0
-	assert_sreg	0x0, a0
-
-	test_grs_a5a5
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg	0xa5a5a5a5, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y0
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/pshlr.s b/sim/testsuite/sim/sh/pshlr.s
deleted file mode 100644
index 36cb47f4188..00000000000
--- a/sim/testsuite/sim/sh/pshlr.s
+++ /dev/null
@@ -1,152 +0,0 @@
-# sh testcase for pshl <reg>
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-pshl_reg:			! shift arithmetic, register operand
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_sreg 0x10000, x0
-	set_sreg 0x0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x10000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x20000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x20000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x40000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x30000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x80000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x40000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x100000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x50000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x200000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x60000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x400000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x70000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x800000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x80000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x1000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x90000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x2000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0xa0000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x4000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0xb0000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x8000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0xc0000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0xd0000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x20000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0xe0000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x40000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0xf0000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x80000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x10000, x0
-
-	set_sreg 0x100000, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x00000000, x0
-	pneg	y0, y0
-	pshl	x0, y0, x0
-	assert_sreg	0x0, x0
-
-	test_grs_a5a5
-	assert_sreg2	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/psub.s b/sim/testsuite/sim/sh/psub.s
deleted file mode 100644
index bcfd26e9514..00000000000
--- a/sim/testsuite/sim/sh/psub.s
+++ /dev/null
@@ -1,64 +0,0 @@
-# sh testcase for psub
-# mach:	 shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp
-
-	.include "testutils.inc"
-
-	start
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-psub_sx_sy:
-	# 0xa5a5a5a5 minus 0xa5a5a5a5 equals zero
-	psub	x0, y0, a0
-	assert_sreg	0, a0
-
-psub_sy_sx:
-	# 100 - 25 = 75
-	mov	#100, r0
-	mov	#25, r1
-	lds	r0, y1
-	lds	r1, x1
-	psub	y1, x1, a0
-	assert_sreg	75, a0
-
-dct_psub:
-	# 100 - 25 = 75
-	set_dcfalse
-	dct	psub	y1, x1, a1
-	assert_sreg2	0xa5a5a5a5, a1
-	set_dctrue
-	dct	psub	y1, x1, a1
-	assert_sreg2	75, a1
-
-dcf_psub:
-	# 25 - 100 = -75
-	set_dctrue
-	dcf	psub	x1, y1, m1
-	assert_sreg2	0xa5a5a5a5, m1
-	set_dcfalse
-	dcf	psub	x1, y1, m1
-	assert_sreg2	-75, m1
-
-psub_pmuls:
-	# 25 - 100 = -75, and 2 x 2 = 8 (yes, eight, not four)
-	mov	#2, r0
-	shll16	r0
-	lds	r0, x0
-	lds	r0, y0
-	psub	x1, y1, a1	pmuls	x0, y0, a0
-	assert_sreg	8, a0
-	assert_sreg2	-75, a1
-
-	set_greg	0xa5a5a5a5, r0
-	set_greg	0xa5a5a5a5, r1
-	test_grs_a5a5
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pswap.s b/sim/testsuite/sim/sh/pswap.s
deleted file mode 100644
index 5bd6a5939cc..00000000000
--- a/sim/testsuite/sim/sh/pswap.s
+++ /dev/null
@@ -1,177 +0,0 @@
-# sh testcase for pswap
-# mach: shdsp
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-pswapx:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_greg	0xa5a57777, r0
-	lds	r0, x0
-	pswap	x0, y0
-	assert_sreg	0x7777a5a5, y0
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5 
-	assert_sreg	0xa5a57777, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-pswapy:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_greg	0xa5a57777, r0
-	lds	r0, y0
-	pswap	y0, x0
-	assert_sreg	0x7777a5a5, x0
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	assert_sreg	0xa5a57777, y0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-pswapa:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_greg	0xa5a57777, r0
-	lds	r0, a0
-	pcopy	a0, a1
-	pswap	a1, y0
-	assert_sreg	0x7777a5a5, y0
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	assert_sreg	0xa5a57777, a0
-	assert_sreg2	0xa5a57777, a1
-	assert_sreg	0xa5a5a5a5, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-pswapm:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_greg	0xa5a57777, r0
-	lds	r0, a0
-	pcopy	a0, m1
-	pswap	m1, y0
-	assert_sreg	0x7777a5a5, y0
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5
-	assert_sreg	0xa5a57777, a0
-	assert_sreg2	0xa5a57777, m1
-	assert_sreg	0xa5a5a5a5, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-
-
-dct_pswapx:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_greg	0xa5a57777, r0
-	lds	r0, x0
-	set_dcfalse
-	dct	pswap	x0, y0
-	assert_sreg	0xa5a5a5a5, y0
-	set_dctrue
-	dct	pswap	x0, y0
-	assert_sreg	0x7777a5a5, y0
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5 
-	assert_sreg	0xa5a57777, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-dcf_pswapy:
-	set_grs_a5a5
-	lds	r0, a0
-	pcopy	a0, a1
-	lds	r0, x0
-	lds	r0, x1
-	lds	r0, y0
-	lds	r0, y1
-	pcopy	x0, m0
-	pcopy	y1, m1
-
-	set_greg	0xa5a57777, r0
-	lds	r0, x0
-	set_dctrue
-	dcf	pswap	x0, y0
-	assert_sreg	0xa5a5a5a5, y0
-	set_dcfalse
-	dcf	pswap	x0, y0
-	assert_sreg	0x7777a5a5, y0
-
-	set_greg	0xa5a5a5a5, r0
-	test_grs_a5a5 
-	assert_sreg	0xa5a57777, x0
-	assert_sreg	0xa5a5a5a5, x1
-	assert_sreg	0xa5a5a5a5, y1
-	assert_sreg	0xa5a5a5a5, a0
-	assert_sreg2	0xa5a5a5a5, a1
-	assert_sreg2	0xa5a5a5a5, m0
-	assert_sreg2	0xa5a5a5a5, m1
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/pushpop.s b/sim/testsuite/sim/sh/pushpop.s
deleted file mode 100644
index 9ee5bfd6888..00000000000
--- a/sim/testsuite/sim/sh/pushpop.s
+++ /dev/null
@@ -1,146 +0,0 @@
-# sh testcase for push/pop (mov,movml,movmu...) insns.
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-movml_1:
-	set_greg 0, r0
-	set_greg 1, r1
-	set_greg 2, r2
-	set_greg 3, r3
-	set_greg 4, r4
-	set_greg 5, r5
-	set_greg 6, r6
-	set_greg 7, r7
-	set_greg 8, r8
-	set_greg 9, r9
-	set_greg 10, r10
-	set_greg 11, r11
-	set_greg 12, r12
-	set_greg 13, r13
-	set_greg 14, r14
-	set_sreg 15, pr
-
-	movml.l		r15,@-r15
-
-	assertmem	stackt-4,  15
-	assertmem	stackt-8,  14
-	assertmem	stackt-12, 13
-	assertmem	stackt-16, 12
-	assertmem	stackt-20, 11
-	assertmem	stackt-24, 10
-	assertmem	stackt-28, 9
-	assertmem	stackt-32, 8
-	assertmem	stackt-36, 7
-	assertmem	stackt-40, 6
-	assertmem	stackt-44, 5
-	assertmem	stackt-48, 4
-	assertmem	stackt-52, 3
-	assertmem	stackt-56, 2
-	assertmem	stackt-60, 1
-	assertmem	stackt-64, 0
-
-	assertreg0	0
-	assertreg	1, r1
-	assertreg	2, r2
-	assertreg	3, r3
-	assertreg	4, r4
-	assertreg	5, r5
-	assertreg	6, r6
-	assertreg	7, r7
-	assertreg	8, r8
-	assertreg	9, r9
-	assertreg	10, r10
-	assertreg	11, r11
-	assertreg	12, r12
-	assertreg	13, r13
-	assertreg	14, r14
-	mov		r15, r0
-	assertreg0	stackt-64
-
-movml_2:
-	set_grs_a5a5
-	movml.l		@r15+, r15
-	assert_sreg	15, pr
-	assertreg0	0
-	assertreg	1, r1
-	assertreg	2, r2
-	assertreg	3, r3
-	assertreg	4, r4
-	assertreg	5, r5
-	assertreg	6, r6
-	assertreg	7, r7
-	assertreg	8, r8
-	assertreg	9, r9
-	assertreg	10, r10
-	assertreg	11, r11
-	assertreg	12, r12
-	assertreg	13, r13
-	assertreg	14, r14
-	mov		r15, r0
-	assertreg0	stackt
-
-movmu_1:
-	set_grs_a5a5
-	add	#1,r14
-	add	#2,r13
-	add	#3,r12
-	set_sreg 0xa5a5,pr
-
-	movmu.l	r12,@-r15
-
-	assert_sreg	0xa5a5,pr
-	assertreg	0xa5a5a5a6, r14
-	assertreg	0xa5a5a5a7, r13
-	assertreg	0xa5a5a5a8, r12
-	test_gr_a5a5	r11
-	test_gr_a5a5	r10
-	test_gr_a5a5	r9
-	test_gr_a5a5	r8
-	test_gr_a5a5	r7
-	test_gr_a5a5	r6
-	test_gr_a5a5	r5
-	test_gr_a5a5	r4
-	test_gr_a5a5	r3
-	test_gr_a5a5	r2
-	test_gr_a5a5	r1
-	test_gr_a5a5	r0
-	mov	r15, r0
-	assertreg	stackt-16, r0
-
-	assertmem	stackt-4, 0xa5a5
-	assertmem	stackt-8, 0xa5a5a5a6
-	assertmem	stackt-12, 0xa5a5a5a7
-	assertmem	stackt-16, 0xa5a5a5a8
-
-movmu_2:
-	set_grs_a5a5
-	movmu.l		@r15+,r12
-
-	assert_sreg	0xa5a5, pr
-	assertreg	0xa5a5a5a6, r14
-	assertreg	0xa5a5a5a7, r13
-	assertreg	0xa5a5a5a8, r12
-	test_gr_a5a5	r11
-	test_gr_a5a5	r10
-	test_gr_a5a5	r9
-	test_gr_a5a5	r8
-	test_gr_a5a5	r7
-	test_gr_a5a5	r6
-	test_gr_a5a5	r5
-	test_gr_a5a5	r4
-	test_gr_a5a5	r3
-	test_gr_a5a5	r2
-	test_gr_a5a5	r1
-	test_gr_a5a5	r0
-	mov	r15, r0
-	assertreg	stackt, r0
-
-	pass
-
-	exit 0
-
-	
\ No newline at end of file
diff --git a/sim/testsuite/sim/sh/resbank.s b/sim/testsuite/sim/sh/resbank.s
deleted file mode 100644
index 33801b86586..00000000000
--- a/sim/testsuite/sim/sh/resbank.s
+++ /dev/null
@@ -1,268 +0,0 @@
-# sh testcase for ldbank stbank resbank
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	.macro	SEND reg bankno regno
-	set_greg ((\bankno << 7) + (\regno << 2)), \reg
-	.endm
-
-	start
-
-stbank_1:
-	set_grs_a5a5
-	mov	#0, r0
-	SEND	r1, 0, 0
-	stbank	r0, @r1
-	mov	#1, r0
-	SEND	r1, 0, 1
-	stbank	r0, @r1
-	mov	#2, r0
-	SEND	r1, 0, 2
-	stbank	r0, @r1
-	mov	#3, r0
-	SEND	r1, 0, 3
-	stbank	r0, @r1
-	mov	#4, r0
-	SEND	r1, 0, 4
-	stbank	r0, @r1
-	mov	#5, r0
-	SEND	r1, 0, 5
-	stbank	r0, @r1
-	mov	#6, r0
-	SEND	r1, 0, 6
-	stbank	r0, @r1
-	mov	#7, r0
-	SEND	r1, 0, 7
-	stbank	r0, @r1
-	mov	#8, r0
-	SEND	r1, 0, 8
-	stbank	r0, @r1
-	mov	#9, r0
-	SEND	r1, 0, 9
-	stbank	r0, @r1
-	mov	#10, r0
-	SEND	r1, 0, 10
-	stbank	r0, @r1
-	mov	#11, r0
-	SEND	r1, 0, 11
-	stbank	r0, @r1
-	mov	#12, r0
-	SEND	r1, 0, 12
-	stbank	r0, @r1
-	mov	#13, r0
-	SEND	r1, 0, 13
-	stbank	r0, @r1
-	mov	#14, r0
-	SEND	r1, 0, 14
-	stbank	r0, @r1
-	mov	#15, r0
-	SEND	r1, 0, 15
-	stbank	r0, @r1
-	mov	#16, r0
-	SEND	r1, 0, 16
-	stbank	r0, @r1
-	mov	#17, r0
-	SEND	r1, 0, 17
-	stbank	r0, @r1
-	mov	#18, r0
-	SEND	r1, 0, 18
-	stbank	r0, @r1
-	mov	#19, r0
-	SEND	r1, 0, 19
-	stbank	r0, @r1
-
-	assertreg0	19
-	assertreg	19 << 2, r1
-	test_gr_a5a5	r2
-	test_gr_a5a5	r3
-	test_gr_a5a5	r4
-	test_gr_a5a5	r5
-	test_gr_a5a5	r6
-	test_gr_a5a5	r7
-	test_gr_a5a5	r8
-	test_gr_a5a5	r9
-	test_gr_a5a5	r10
-	test_gr_a5a5	r11
-	test_gr_a5a5	r12
-	test_gr_a5a5	r13
-	test_gr_a5a5	r14
-
-ldbank_1:
-	set_grs_a5a5
-	SEND	r1, 0, 0
-	ldbank	@r1, r0
-	assertreg0 0
-	SEND	r1, 0, 1
-	ldbank	@r1, r0
-	assertreg0 1
-	SEND	r1, 0, 2
-	ldbank	@r1, r0
-	assertreg0 2
-	SEND	r1, 0, 3
-	ldbank	@r1, r0
-	assertreg0 3
-	SEND	r1, 0, 4
-	ldbank	@r1, r0
-	assertreg0 4
-	SEND	r1, 0, 5
-	ldbank	@r1, r0
-	assertreg0 5
-	SEND	r1, 0, 6
-	ldbank	@r1, r0
-	assertreg0 6
-	SEND	r1, 0, 7
-	ldbank	@r1, r0
-	assertreg0 7
-	SEND	r1, 0, 8
-	ldbank	@r1, r0
-	assertreg0 8
-	SEND	r1, 0, 9
-	ldbank	@r1, r0
-	assertreg0 9
-	SEND	r1, 0, 10
-	ldbank	@r1, r0
-	assertreg0 10
-	SEND	r1, 0, 11
-	ldbank	@r1, r0
-	assertreg0 11
-	SEND	r1, 0, 12
-	ldbank	@r1, r0
-	assertreg0 12
-	SEND	r1, 0, 13
-	ldbank	@r1, r0
-	assertreg0 13
-	SEND	r1, 0, 14
-	ldbank	@r1, r0
-	assertreg0 14
-	SEND	r1, 0, 15
-	ldbank	@r1, r0
-	assertreg0 15
-	SEND	r1, 0, 16
-	ldbank	@r1, r0
-	assertreg0 16
-	SEND	r1, 0, 17
-	ldbank	@r1, r0
-	assertreg0 17
-	SEND	r1, 0, 18
-	ldbank	@r1, r0
-	assertreg0 18
-	SEND	r1, 0, 19
-	ldbank	@r1, r0
-	assertreg0 19
-
-	assertreg (19 << 2), r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-resbank_1:
-	set_grs_a5a5
-	mov	#1, r0
-	trapa	#13	! magic trap, sets ibnr
-
-	resbank
-
-	assertreg0	0
-	assertreg	1, r1
-	assertreg	2, r2
-	assertreg	3, r3
-	assertreg	4, r4
-	assertreg	5, r5
-	assertreg	6, r6
-	assertreg	7, r7
-	assertreg	8, r8
-	assertreg	9, r9
-	assertreg	10, r10
-	assertreg	11, r11
-	assertreg	12, r12
-	assertreg	13, r13
-	assertreg	14, r14
-	assert_sreg	15, mach
-	assert_sreg	17, pr
-	assert_creg	18, gbr
-	assert_sreg	19, macl
-
-resbank_2:
-	set_grs_a5a5
-	movi20	#555, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-	add	#-1, r0
-	mov.l	r0, @-r15
-
-	set_sr_bit	(1 << 14)	! set BO
-
-	resbank
-
-	assert_sreg	555, macl
-	assert_sreg	554, mach
-	assert_creg	553, gbr
-	assert_sreg	552, pr
-	assertreg	551, r14
-	assertreg	550, r13
-	assertreg	549, r12
-	assertreg	548, r11
-	assertreg	547, r10
-	assertreg	546, r9
-	assertreg	545, r8
-	assertreg	544, r7
-	assertreg	543, r6
-	assertreg	542, r5
-	assertreg	541, r4
-	assertreg	540, r3
-	assertreg	539, r2
-	assertreg	538, r1
-	assertreg0	537
-
-	mov		r15, r0
-	assertreg0	stackt
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/sh/sett.s b/sim/testsuite/sim/sh/sett.s
deleted file mode 100644
index fff2d2d4a6d..00000000000
--- a/sim/testsuite/sim/sh/sett.s
+++ /dev/null
@@ -1,65 +0,0 @@
-# sh testcase for sett, clrt, movt
-# mach:	 all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-sett_1:	set_grs_a5a5
-	sett
-	bt .Lsett
-	nop
-	fail
-.Lsett:
-	test_grs_a5a5
-
-clrt_1:	set_grs_a5a5
-	clrt
-	bf .Lclrt
-	nop
-	fail
-.Lclrt:
-	test_grs_a5a5
-
-movt_1:	set_grs_a5a5
-	sett
-	movt	r1
-	test_gr_a5a5 r0
-	assertreg 1, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-movt_2:	set_grs_a5a5
-	clrt
-	movt	r1
-	test_gr_a5a5 r0
-	assertreg 0, r1
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-
-	exit 0
diff --git a/sim/testsuite/sim/sh/shll.s b/sim/testsuite/sim/sh/shll.s
deleted file mode 100644
index ec2ea12d671..00000000000
--- a/sim/testsuite/sim/sh/shll.s
+++ /dev/null
@@ -1,91 +0,0 @@
-# sh testcase for shll 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-shll:
-	set_grs_a5a5
-	mov #1, r1
-	shll r1
-	assertreg 2, r1
-	shll r1
-	assertreg 4, r1
-	shll r1
-	assertreg 8, r1
-	shll r1
-	assertreg 16, r1
-	shll r1
-	assertreg 32, r1
-	shll r1
-	assertreg 64, r1
-	shll r1
-	assertreg 0x80, r1
-	shll r1
-	assertreg 0x100, r1
-	shll r1
-	assertreg 0x200, r1
-	shll r1
-	assertreg 0x400, r1
-	shll r1
-	assertreg 0x800, r1
-	shll r1
-	assertreg 0x1000, r1
-	shll r1
-	assertreg 0x2000, r1
-	shll r1
-	assertreg 0x4000, r1
-	shll r1
-	assertreg 0x8000, r1
-	shll r1
-	assertreg 0x10000, r1
-	shll r1
-	assertreg 0x20000, r1
-	shll r1
-	assertreg 0x40000, r1
-	shll r1
-	assertreg 0x80000, r1
-	shll r1
-	assertreg 0x100000, r1
-	shll r1
-	assertreg 0x200000, r1
-	shll r1
-	assertreg 0x400000, r1
-	shll r1
-	assertreg 0x800000, r1
-	shll r1
-	assertreg 0x1000000, r1
-	shll r1
-	assertreg 0x2000000, r1
-	shll r1
-	assertreg 0x4000000, r1
-	shll r1
-	assertreg 0x8000000, r1
-	shll r1
-	assertreg 0x10000000, r1
-	shll r1
-	assertreg 0x20000000, r1
-	shll r1
-	assertreg 0x40000000, r1
-	shll r1
-	assertreg 0x80000000, r1
-	shll r1
-	assertreg 0, r1
-	shll r1
-	assertreg 0, r1
-
-	# another:
-	mov #1, r1
-	shll r1
-	shll r1
-	shll r1
-	assertreg 8, r1
-
-	set_greg     0xa5a5a5a5, r1
-	test_grs_a5a5
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/shll16.s b/sim/testsuite/sim/sh/shll16.s
deleted file mode 100644
index 4574835f8e3..00000000000
--- a/sim/testsuite/sim/sh/shll16.s
+++ /dev/null
@@ -1,46 +0,0 @@
-# sh testcase for shll16 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-shll16:
-	set_grs_a5a5
-	mov #0x18, r1
-	shll16 r1
-	assertreg 0x180000, r1
-	shll16 r1
-	assertreg 0, r1
-
-	# 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
-	bt   okay
-	fail
-okay:
-	set_greg 0xa5a5a5a5, r1
-	set_greg 0xa5a5a5a5, r7
-	test_grs_a5a5
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/shll2.s b/sim/testsuite/sim/sh/shll2.s
deleted file mode 100644
index 01a784c9390..00000000000
--- a/sim/testsuite/sim/sh/shll2.s
+++ /dev/null
@@ -1,51 +0,0 @@
-# sh testcase for shll2 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-shll2:
-	set_grs_a5a5
-	mov #1, r1
-	shll2 r1
-	assertreg 4, r1
-	shll2 r1
-	assertreg 16, r1
-	shll2 r1
-	assertreg 64, r1
-	shll2 r1
-	assertreg 0x100, r1
-	shll2 r1
-	assertreg 0x400, r1
-	shll2 r1
-	assertreg 0x1000, r1
-	shll2 r1
-	assertreg 0x4000, r1
-	shll2 r1
-	assertreg 0x10000, r1
-	shll2 r1
-	assertreg 0x40000, r1
-	shll2 r1
-	assertreg 0x100000, r1
-	shll2 r1
-	assertreg 0x400000, r1
-	shll2 r1
-	assertreg 0x1000000, r1
-	shll2 r1
-	assertreg 0x4000000, r1
-	shll2 r1
-	assertreg 0x10000000, r1
-	shll2 r1
-	assertreg 0x40000000, r1
-	shll2 r1
-	assertreg 0, r1
-
-	set_greg 0xa5a5a5a5, r1
-	test_grs_a5a5
-
-	pass
-	exit 0
-
diff --git a/sim/testsuite/sim/sh/shll8.s b/sim/testsuite/sim/sh/shll8.s
deleted file mode 100644
index 71e241d1e6b..00000000000
--- a/sim/testsuite/sim/sh/shll8.s
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for shll8 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-shll8:
-	set_grs_a5a5
-	mov #1, r1
-	shll8 r1
-	assertreg 0x100, r1
-	shll8 r1
-	assertreg 0x10000, r1
-	shll8 r1
-	assertreg 0x1000000, r1
-	shll8 r1
-	assertreg 0, r1
-
-	# another:
-	mov #1, r1
-	shll8 r1
-	mov #1, r2
-	shll r2
-	shll r2
-	shll r2
-	shll r2
-	shll r2
-	shll r2
-	shll r2
-	shll r2
-	cmp/eq r1, r2
-	bt   okay
-	fail
-okay:
-	set_greg 0xa5a5a5a5, r1
-	set_greg 0xa5a5a5a5, r2
-	test_grs_a5a5
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/shlr.s b/sim/testsuite/sim/sh/shlr.s
deleted file mode 100644
index 8755afb707f..00000000000
--- a/sim/testsuite/sim/sh/shlr.s
+++ /dev/null
@@ -1,42 +0,0 @@
-# sh testcase for shlr 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-shlr:
-	set_grs_a5a5
-	mov #0, r0
-	or #192, r0
-	shlr r0
-	assertreg0 96
-	shlr r0
-	assertreg0 48
-	shlr r0
-	assertreg0 24
-	shlr r0
-	assertreg0 12
-	shlr r0
-	assertreg0 6
-	shlr r0
-	assertreg0 3
-
-	# Make sure a bit is shifted into T.
-	shlr r0
-	bf wrong
-	assertreg0 1
-	# Ditto.
-	shlr r0
-	bf wrong
-	assertreg0 0
-
-	set_greg 0xa5a5a5a5, r0
-	test_grs_a5a5
-	pass
-	exit 0
-
-wrong:
-	fail
diff --git a/sim/testsuite/sim/sh/shlr16.s b/sim/testsuite/sim/sh/shlr16.s
deleted file mode 100644
index 1161c6666f9..00000000000
--- a/sim/testsuite/sim/sh/shlr16.s
+++ /dev/null
@@ -1,20 +0,0 @@
-# sh testcase for shlr16 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-shrl16:
-	set_grs_a5a5
-	shlr16 r0
-	assertreg0 0xa5a5
-	shlr16 r0
-	assertreg0 0
-
-	set_greg 0xa5a5a5a5, r0
-	test_grs_a5a5
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/shlr2.s b/sim/testsuite/sim/sh/shlr2.s
deleted file mode 100644
index ce554dd0f09..00000000000
--- a/sim/testsuite/sim/sh/shlr2.s
+++ /dev/null
@@ -1,48 +0,0 @@
-# sh testcase for shlr2 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-shrl2:
-	set_grs_a5a5
-	shlr2 r0
-	assertreg0 0x29696969
-	shlr2 r0
-	assertreg0 0x0a5a5a5a
-	shlr2 r0
-	assertreg0 0x02969696
-	shlr2 r0
-	assertreg0 0x00a5a5a5
-	shlr2 r0
-	assertreg0 0x00296969
-	shlr2 r0
-	assertreg0 0x000a5a5a
-	shlr2 r0
-	assertreg0 0x00029696
-	shlr2 r0
-	assertreg0 0x0000a5a5
-	shlr2 r0
-	assertreg0 0x00002969
-	shlr2 r0
-	assertreg0 0x00000a5a
-	shlr2 r0
-	assertreg0 0x00000296
-	shlr2 r0
-	assertreg0 0x000000a5
-	shlr2 r0
-	assertreg0 0x00000029
-	shlr2 r0
-	assertreg0 0x0000000a
-	shlr2 r0
-	assertreg0 0x00000002
-	shlr2 r0
-	assertreg0 0
-
-	set_greg 0xa5a5a5a5 r0
-	test_grs_a5a5
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/shlr8.s b/sim/testsuite/sim/sh/shlr8.s
deleted file mode 100644
index d609af119e3..00000000000
--- a/sim/testsuite/sim/sh/shlr8.s
+++ /dev/null
@@ -1,24 +0,0 @@
-# sh testcase for shlr8 
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-shrl8:
-	set_grs_a5a5
-	shlr8 r0
-	assertreg0 0xa5a5a5
-	shlr8 r0
-	assertreg0 0xa5a5
-	shlr8 r0
-	assertreg0 0xa5
-	shlr8 r0
-	assertreg0 0x0
-
-	set_greg 0xa5a5a5a5, r0
-	test_grs_a5a5
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/swap.s b/sim/testsuite/sim/sh/swap.s
deleted file mode 100644
index 4dd6572695c..00000000000
--- a/sim/testsuite/sim/sh/swap.s
+++ /dev/null
@@ -1,59 +0,0 @@
-# sh testcase for swap
-# mach: all
-# as(sh):	-defsym sim_cpu=0
-# as(shdsp):	-defsym sim_cpu=1 -dsp 
-
-	.include "testutils.inc"
-
-	start
-
-swapb:
-	set_grs_a5a5
-	mov	#0x5a, r0
-	shll8	r0
-	or	#0xa5, r0
-	assertreg0	0x5aa5
-	
-	swap.b	r0, r1
-	assertreg	0xa55a, r1
-
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-swapw:	
-	set_grs_a5a5
-	mov	#0x5a, r0
-	shll16	r0
-	or	#0xa5, r0
-	assertreg0	0x5a00a5
-
-	swap.w	r0, r1
-	assertreg	0xa5005a, r1
-
-	test_gr_a5a5 r2
-	test_gr_a5a5 r3
-	test_gr_a5a5 r4
-	test_gr_a5a5 r5
-	test_gr_a5a5 r6
-	test_gr_a5a5 r7
-	test_gr_a5a5 r8
-	test_gr_a5a5 r9
-	test_gr_a5a5 r10
-	test_gr_a5a5 r11
-	test_gr_a5a5 r12
-	test_gr_a5a5 r13
-	test_gr_a5a5 r14
-
-	pass
-	exit 0
diff --git a/sim/testsuite/sim/sh/testutils.inc b/sim/testsuite/sim/sh/testutils.inc
deleted file mode 100644
index c9644b40f8c..00000000000
--- a/sim/testsuite/sim/sh/testutils.inc
+++ /dev/null
@@ -1,617 +0,0 @@
-# Support macros for the sh assembly test cases.
-
-	.equ	no_dsp,  0
-	.equ	yes_dsp, 1
-
-	.section	.rodata
-	.align 2
-_pass:	.string	"pass\n"
-_fail:	.string "fail\n"
-_stack:	.fill	128, 4, 0
-stackt:	
-
-	.macro	push reg
-	mov.l	\reg, @-r15
-	.endm
-
-	.macro	pop reg
-	mov.l	@r15+, \reg
-	.endm
-
-	.macro start
-	.text
-	.align 1
-	.global start
-start:	mov.l	stackp, r15
-	bra	main
-	nop
-	.align 2
-stackp:	.long	stackt
-mpass:
-	mov	#4, r4
-	mov	#1, r5
-	mov.l	ppass, r6
-	mov	#5, r7
-	trapa	#34
-	rts
-	nop
-mfail:
-	mov	#4, r4
-	mov	#1, r5
-	mov.l	pfail, r6
-	mov	#5, r7
-	trapa	#34
-	mov	#1, r5
-mexit:
-	mov	#1, r4
-	mov	#0, r6
-	mov	#0, r7
-	trapa	#34
-	.align 2
-ppass:	.long	_pass
-pfail:	.long	_fail
-
-mtesta5:
-	push	r0
-	mov.l	a5a5, r0
-	cmp/eq	r1, r0
-	bf	mfail
-	cmp/eq	r2, r0
-	bf	mfail
-	cmp/eq	r3, r0
-	bf	mfail
-	cmp/eq	r4, r0
-	bf	mfail
-	cmp/eq	r5, r0
-	bf	mfail
-	cmp/eq	r6, r0
-	bf	mfail
-	cmp/eq	r7, r0
-	bf	mfail
-	cmp/eq	r8, r0
-	bf	mfail
-	cmp/eq	r9, r0
-	bf	mfail
-	cmp/eq	r10, r0
-	bf	mfail
-	cmp/eq	r11, r0
-	bf	mfail
-	cmp/eq	r12, r0
-	bf	mfail
-	cmp/eq	r13, r0
-	bf	mfail
-	cmp/eq	r14, r0
-	bf	mfail
-	# restore and check r0
-	pop	r0
-	cmp/eq	r0, r1
-	bf	mfail
-	# pass
-	rts
-	nop
-.if (sim_cpu == no_dsp)
-mtesta5_fp:
-	push	r0
-	flds	fr0, fpul
-	sts	fpul, r0
-	push	r0
-	mov.l	a5a5, r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fcmp/eq	fr1, fr0
-	bf	mfail
-	fcmp/eq	fr2, fr0
-	bf	mfail
-	fcmp/eq	fr3, fr0
-	bf	mfail
-	fcmp/eq	fr4, fr0
-	bf	mfail
-	fcmp/eq	fr5, fr0
-	bf	mfail
-	fcmp/eq	fr6, fr0
-	bf	mfail
-	fcmp/eq	fr7, fr0
-	bf	mfail
-	fcmp/eq	fr8, fr0
-	bf	mfail
-	fcmp/eq	fr9, fr0
-	bf	mfail
-	fcmp/eq	fr10, fr0
-	bf	mfail
-	fcmp/eq	fr11, fr0
-	bf	mfail
-	fcmp/eq	fr12, fr0
-	bf	mfail
-	fcmp/eq	fr13, fr0
-	bf	mfail
-	fcmp/eq	fr14, fr0
-	bf	mfail
-	fcmp/eq	fr15, fr0
-	bf	mfail
-	# restore and check fr0
-	pop	r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fcmp/eq	fr0, fr1
-	bf	mfail
-	# restore r0 and pass
-	pop	r0
-	rts
-	nop
-.endif
-
-mseta5:
-	mov.l	a5a5, r0
-	mov.l	a5a5, r1
-	mov.l	a5a5, r2
-	mov.l	a5a5, r3
-	mov.l	a5a5, r4
-	mov.l	a5a5, r5
-	mov.l	a5a5, r6
-	mov.l	a5a5, r7
-	mov.l	a5a5, r8
-	mov.l	a5a5, r9
-	mov.l	a5a5, r10
-	mov.l	a5a5, r11
-	mov.l	a5a5, r12
-	mov.l	a5a5, r13
-	mov.l	a5a5, r14
-	rts
-	nop
-
-.if (sim_cpu == no_dsp)
-mseta5_fp:
-	push	r0
-	mov.l	a5a5, r0
-	lds	r0, fpul
-	fsts	fpul, fr0
-	fsts	fpul, fr1
-	fsts	fpul, fr2
-	fsts	fpul, fr3
-	fsts	fpul, fr4
-	fsts	fpul, fr5
-	fsts	fpul, fr6
-	fsts	fpul, fr7
-	fsts	fpul, fr8
-	fsts	fpul, fr9
-	fsts	fpul, fr10
-	fsts	fpul, fr11
-	fsts	fpul, fr12
-	fsts	fpul, fr13
-	fsts	fpul, fr14
-	fsts	fpul, fr15
-	pop	r0
-	rts
-	nop
-.endif
-
-	.align 2
-a5a5:	.long	0xa5a5a5a5
-main:
-	.endm
-
-	.macro exit val
-	mov	#\val, r5
-	bra	mexit
-	nop
-	.endm
-
-	.macro pass
-	bsr	mpass
-	nop
-	.endm
-
-	.macro fail
-	bra	mfail
-	nop
-	.endm
-	# Branch if false -- 8k range
-	.macro bf8k label
-	bt	.Lbf8k\@
-	bra	\label
-.Lbf8k\@:
-	.endm
-
-	# Branch if true -- 8k range
-	.macro bt8k label
-	bf	.Lbt8k\@
-	bra	\label
-.Lbt8k\@:
-	.endm
-
-	# Assert value of register (any general register but r0)
-	# Preserves r0 on stack, restores it on success.
-	.macro assertreg val reg
-	push	r0
-	mov.l	.Larval\@, r0
-	cmp/eq	r0, \reg
-	bt	.Lar\@
-	fail
-	.align 2
-.Larval\@:
-	.long	\val
-.Lar\@:	pop	r0
-	.endm
-
-	# Assert value of register zero
-	# Preserves r1 on stack, restores it on success.
-	.macro assertreg0 val
-	push	r1
-	mov.l	.Lazval\@, r1
-	cmp/eq	r1, r0
-	bt	.Laz\@
-	fail
-	.align 2
-.Lazval\@:
-	.long	\val
-.Laz\@:	pop	r1
-	.endm
-
-	# Assert value of system register 
-	# [mach, macl, pr, dsr, a0, x0, x1, y0, y1, ...]
-	.macro assert_sreg val reg
-	push	r0
-	sts	\reg, r0
-	assertreg0 \val
-	pop	r0
-	.endm
-
-	# Assert value of system register that isn't directly stc-able
-	# [a1, m0, m1, ...]
-	.macro assert_sreg2 val reg
-	push	r0
-	sts	a0, r0
-	push	r0
-	pcopy	\reg, a0
-	sts	a0, r0
-	assertreg0 \val
-	pop	r0
-	lds	r0, a0
-	pop	r0
-	.endm
-
-	# Assert value of control register 
-	# [gbr, vbr, ssr, spc, sgr, dbr, r[0-7]_bank, sr, mod, re, rs, ...]
-	.macro assert_creg val reg
-	push	r0
-	stc	\reg, r0
-	assertreg0 \val
-	pop	r0
-	.endm
-
-	# Assert integer value of fp register
-	# Preserves r0 on stack, restores it on success
-	# Assumes single-precision fp mode
-	.macro assert_fpreg_i val freg
-	push	r0
-	ftrc	\freg, fpul
-	sts	fpul, r0
-	assertreg0	\val
-	pop	r0
-	.endm
-
-	# Assert integer value of dp register
-	# Preserves r0 on stack, restores it on success
-	# Assumes double-precision fp mode
-	.macro assert_dpreg_i val dreg
-	push	r0
-	ftrc	\dreg, fpul
-	sts	fpul, r0
-	assertreg0	\val
-	pop	r0
-	.endm
-
-	# Assert hex value of fp register
-	# Preserves r0 on stack, restores it on success
-	# Assumes single-precision fp mode
-	.macro assert_fpreg_x val freg
-	push	r0
-	flds	\freg, fpul
-	sts	fpul, r0
-	assertreg0	\val
-	pop	r0
-	.endm
-
-	# Set FP bank 0
-	# Saves and restores r0 and r1
-	.macro	bank0
-	push	r0
-	push	r1
-	mov	#32, r1
-	shll16	r1
-	not	r1, r1
-	sts	fpscr, r0
-	and	r1, r0
-	lds	r0, fpscr
-	pop	r1
-	pop	r0
-	.endm
-
-	# Set FP bank 1
-	.macro	bank1
-	push	r0
-	push	r1
-	mov	#32,  r1
-	shll16	r1
-	sts	fpscr, r0
-	or	r1, r0
-	lds	r0, fpscr
-	pop	r1
-	pop	r0
-	.endm
-
-	# Set FP 32-bit xfer
-	.macro	sz_32
-	push	r0
-	push	r1
-	mov	#16,  r1
-	shll16	r1
-	not	r1, r1
-	sts	fpscr, r0
-	and	r1, r0
-	lds	r0, fpscr
-	pop	r1
-	pop	r0
-	.endm
-
-	# Set FP 64-bit xfer
-	.macro	sz_64
-	push	r0
-	push	r1
-	mov	#16,  r1
-	shll16	r1
-	sts	fpscr, r0
-	or	r1, r0
-	lds	r0, fpscr
-	pop	r1
-	pop	r0
-	.endm
-
-	# Set FP single precision
-	.macro	single_prec
-	push	r0
-	push	r1
-	mov	#8, r1
-	shll16	r1
-	not	r1, r1
-	sts	fpscr, r0
-	and	r1, r0
-	lds	r0, fpscr
-	pop	r1
-	pop	r0
-	.endm
-
-	# Set FP double precision
-	.macro	double_prec
-	push	r0
-	push	r1
-	mov	#8, r1
-	shll16	r1
-	sts	fpscr, r0
-	or	r1, r0
-	lds	r0, fpscr
-	pop	r1
-	pop	r0
-	.endm
-
-	.macro	set_carry
-	sett
-	.endm
-
-	.macro	set_ovf
-	sett
-	.endm
-
-	.macro	clear_carry
-	clrt
-	.endm
-
-	.macro	clear_ovf
-	clrt
-	.endm
-
-	# sets, clrs
-
-
-	.macro set_grs_a5a5
-	bsr	mseta5
-	nop
-	.endm
-
-	.macro set_greg val greg
-	mov.l	gregval\@, \greg
-	bra	set_greg\@
-	nop
-	.align	2
-gregval\@:	.long	\val
-set_greg\@:
-	.endm
-
-	.macro set_fprs_a5a5
-	bsr	mseta5_fp
-	nop
-	.endm
-
-	.macro test_grs_a5a5
-	bsr	mtesta5
-	nop
-	.endm
-
-	.macro test_fprs_a5a5	
-	bsr	mtesta5_fp
-	nop
-	.endm
-
-	.macro test_gr_a5a5 reg
-	assertreg 0xa5a5a5a5 \reg
-	.endm
-
-	.macro test_fpr_a5a5 reg
-	assert_fpreg_x 0xa5a5a5a5 \reg
-	.endm
-
-	.macro test_gr0_a5a5
-	assertreg0 0xa5a5a5a5
-	.endm
-
-	# Perform a single to double precision floating point conversion.
-	# Assumes correct settings of fpscr.
-	.macro _s2d fpr dpr
-	flds \fpr, fpul
-	fcnvsd fpul, \dpr
-	.endm
-
-	# Manipulate the status register
-	.macro set_sr	val
-	push	r0
-	mov.l	.Lsrval\@, r0
-	ldc	r0, sr
-	pop	r0
-	bra	.Lsetsr\@
-	nop
-	.align 2
-.Lsrval\@:
-	.long	\val
-.Lsetsr\@:
-	.endm
-
-	.macro	get_sr	reg
-	stc	sr, \reg
-	.endm
-
-	.macro	test_sr val
-	push	r0
-	get_sr	r0
-	assertreg0 \val
-	pop	r0
-	.endm
-
-	.macro	set_sr_bit val
-	push	r0
-	push	r1
-	get_sr	r0
-	mov.l	.Lsrbitval\@, r1
-	or	r1, r0
-	ldc	r0, sr
-	pop	r1
-	pop	r0
-	bra	.Lsrbit\@
-	nop
-	.align 2
-.Lsrbitval\@:
-	.long	\val
-.Lsrbit\@:
-	.endm
-
-	.macro	test_sr_bit_set val
-	push	r0
-	push	r1
-	get_sr	r0
-	mov.l	.Ltsbsval\@, r1
-	tst	r1, r0
-	bf	.Ltsbs\@
-	fail
-	.align	2
-.Ltsbsval\@:
-	.long	\val
-.Ltsbs\@:
-	pop	r1
-	pop	r0
-	.endm
-
-	.macro	test_sr_bit_clear val
-	push	r0
-	push	r1
-	get_sr	r0
-	mov.l	.Ltsbcval\@, r1
-	not	r0, r0
-	tst	r1, r0
-	bf	.Ltsbc\@
-	fail
-	.align	2
-.Ltsbcval\@:
-	.long	\val
-.Ltsbc\@:
-	pop	r1
-	pop	r0
-	.endm
-
-	# Set system registers
-	.macro set_sreg val reg
-	# [mach, macl, pr, dsr, a0, x0, x1, y0, y1, ...]
-	push	r0
-	mov.l	.Lssrval\@, r0
-	lds	r0, \reg
-	pop	r0
-	bra	.Lssr\@
-	nop
-	.align 2
-.Lssrval\@:
-	.long	\val
-.Lssr\@:
-	.endm
-
-	.macro set_sreg2 val reg
-	# [a1, m0, m1, ...]
-	push	r0
-	sts	a0, r0
-	push	r0
-	mov.l	.Lssr2val\@, r0
-	lds	r0, a0
-	pcopy	a0, \reg
-	pop	r0
-	lds	r0, a0
-	pop	r0
-	bra	.Lssr2_\@
-	nop
-	.align 2
-.Lssr2val\@:
-	.long	\val
-.Lssr2_\@:
-	.endm
-
-
-	.macro set_creg val reg
-	# [gbr, vbr, ssr, spc, sgr, dbr... ]
-	push	r0
-	mov.l	.Lscrval\@, r0
-	ldc	r0, \reg
-	pop	r0
-	bra	.Lscr\@
-	nop
-	.align 2
-.Lscrval\@:
-	.long	\val
-.Lscr\@:
-	.endm
-
-	.macro	set_dctrue
-	push	r0
-	sts	dsr, r0
-	or	#1, r0
-	lds	r0, dsr
-	pop	r0
-	.endm
-
-	.macro	set_dcfalse
-	push	r0
-	sts	dsr, r0
-	not	r0, r0
-	or	#1, r0
-	not	r0, r0
-	lds	r0, dsr
-	pop	r0
-	.endm
-
-	.macro	assertmem addr val
-	push	r0
-	mov.l	.Laddr\@, r0
-	mov.l	@r0, r0
-	assertreg0 \val
-	bra	.Lam\@
-	nop
-	.align	2
-.Laddr\@:
-	.long	\addr
-.Lam\@:	pop	r0
-	.endm
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